From fedora-cvs-commits at redhat.com  Sat Apr  1 02:07:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 31 Mar 2006 21:07:36 -0500
Subject: rpms/kernel/devel patch-2.6.16-git19.bz2.sign, NONE, 1.1 .cvsignore,
	1.399, 1.400 kernel-2.6.spec, 1.2111,
	1.2112 linux-2.6-tux.patch, 1.16, 1.17 sources, 1.340,
	1.341 upstream, 1.313, 1.314 linux-2.6-drm-cripple-r300.patch,
	1.1, NONE patch-2.6.16-git18.bz2.sign, 1.1, NONE
Message-ID: <200604010207.k3127aHH025305@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-tux.patch sources 
	upstream 
Added Files:
	patch-2.6.16-git19.bz2.sign 
Removed Files:
	linux-2.6-drm-cripple-r300.patch patch-2.6.16-git18.bz2.sign 
Log Message:
git19



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

iD8DBQBELNVcyGugalF9Dw4RAgT4AJ48Zt7dO8+e13YPSE3lsH5OZXkeEACeLGku
mn4HFvKwj+y0OO8xBniS8g0=
=UTqf
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -r1.399 -r1.400
--- .cvsignore	30 Mar 2006 20:18:29 -0000	1.399
+++ .cvsignore	1 Apr 2006 02:07:21 -0000	1.400
@@ -3,5 +3,4 @@
 kernel-2.6.16
 linux-2.6.16.tar.bz2
 xen-20060320.tar.bz2
-patch-2.6.16-git17.bz2
-patch-2.6.16-git18.bz2
+patch-2.6.16-git19.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2111
retrieving revision 1.2112
diff -u -r1.2111 -r1.2112
--- kernel-2.6.spec	31 Mar 2006 21:47:50 -0000	1.2111
+++ kernel-2.6.spec	1 Apr 2006 02:07:21 -0000	1.2112
@@ -217,7 +217,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16-git18.bz2
+Patch1: patch-2.6.16-git19.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -357,7 +357,6 @@
 Patch1710: linux-2.6-sched-up-migration-cost.patch
 Patch1730: linux-2.6-signal-trampolines-unwind-info.patch
 Patch1740: linux-2.6-softlockup-disable.patch
-Patch1750: linux-2.6-drm-cripple-r300.patch
 Patch1760: linux-2.6-suspend-slab-warnings.patch
 Patch1770: linux-2.6-optimise-spinlock-debug.patch
 
@@ -952,8 +951,6 @@
 %patch1730 -p1
 # Add a safety net to softlockup so that it doesn't prevent installs.
 %patch1740 -p1
-# Disable R300 and above DRI as it's unstable.
-%patch1750 -p1
 # Fix up kmalloc whilst atomic warning during resume.
 %patch1760 -p1
 # Speed up spinlock debug.
@@ -1616,6 +1613,9 @@
 %endif
 
 %changelog
+* Fri Mar 31 2006 Dave Jones <davej at redhat.com>
+- 2.6.16-git19
+
 * Fri Mar 31 2006 David Woodhouse <dwmw2 at redhat.com>
 - Send standard WEXT events on softmac assoc/disassociation.
 - OFFB udpate

linux-2.6-tux.patch:
 linux-2.6.16.noarch/include/linux/buffer_head.h |    1 
 linux-2.6.16.noarch/include/linux/sysctl.h      |   50 
 linux-2.6.16.noarch/net/socket.c                |   54 
 linux-tux.q/arch/alpha/kernel/systbls.S         |    8 
 linux-tux.q/arch/i386/kernel/syscall_table.S    |   10 
 linux-tux.q/arch/ia64/kernel/entry.S            |    8 
 linux-tux.q/arch/ia64/kernel/ia64_ksyms.c       |    5 
 linux-tux.q/arch/x86_64/ia32/ia32entry.S        |   10 
 linux-tux.q/fs/dcache.c                         |   36 
 linux-tux.q/fs/exec.c                           |    2 
 linux-tux.q/fs/fcntl.c                          |    4 
 linux-tux.q/fs/namei.c                          |   18 
 linux-tux.q/fs/namespace.c                      |    2 
 linux-tux.q/fs/open.c                           |    4 
 linux-tux.q/fs/pipe.c                           |    2 
 linux-tux.q/fs/read_write.c                     |    2 
 linux-tux.q/include/asm-alpha/fcntl.h           |    1 
 linux-tux.q/include/asm-generic/fcntl.h         |    4 
 linux-tux.q/include/asm-i386/unistd.h           |    5 
 linux-tux.q/include/asm-ia64/unistd.h           |    2 
 linux-tux.q/include/asm-sparc/fcntl.h           |    1 
 linux-tux.q/include/asm-sparc64/fcntl.h         |    1 
 linux-tux.q/include/asm-x86_64/unistd.h         |   10 
 linux-tux.q/include/linux/dcache.h              |    8 
 linux-tux.q/include/linux/errno.h               |    3 
 linux-tux.q/include/linux/file.h                |    2 
 linux-tux.q/include/linux/fs.h                  |    7 
 linux-tux.q/include/linux/kmod.h                |    2 
 linux-tux.q/include/linux/namei.h               |    2 
 linux-tux.q/include/linux/net.h                 |    1 
 linux-tux.q/include/linux/sched.h               |    5 
 linux-tux.q/include/linux/skbuff.h              |    2 
 linux-tux.q/include/linux/socket.h              |    4 
 linux-tux.q/include/net/sock.h                  |    8 
 linux-tux.q/include/net/tcp.h                   |    3 
 linux-tux.q/include/net/tux.h                   |  804 ++++++++
 linux-tux.q/include/net/tux_u.h                 |  163 +
 linux-tux.q/kernel/exit.c                       |    7 
 linux-tux.q/kernel/fork.c                       |    1 
 linux-tux.q/kernel/kmod.c                       |   28 
 linux-tux.q/kernel/signal.c                     |    1 
 linux-tux.q/mm/filemap.c                        |   19 
 linux-tux.q/mm/truncate.c                       |    2 
 linux-tux.q/net/Kconfig                         |    1 
 linux-tux.q/net/Makefile                        |    1 
 linux-tux.q/net/core/sock.c                     |    5 
 linux-tux.q/net/ipv4/tcp.c                      |    3 
 linux-tux.q/net/ipv4/tcp_input.c                |    1 
 linux-tux.q/net/ipv4/tcp_output.c               |    3 
 linux-tux.q/net/tux/Kconfig                     |   25 
 linux-tux.q/net/tux/Makefile                    |   12 
 linux-tux.q/net/tux/abuf.c                      |  190 ++
 linux-tux.q/net/tux/accept.c                    |  863 +++++++++
 linux-tux.q/net/tux/cachemiss.c                 |  265 ++
 linux-tux.q/net/tux/cgi.c                       |  171 +
 linux-tux.q/net/tux/directory.c                 |  302 +++
 linux-tux.q/net/tux/extcgi.c                    |  329 +++
 linux-tux.q/net/tux/gzip.c                      |   40 
 linux-tux.q/net/tux/input.c                     |  641 +++++++
 linux-tux.q/net/tux/logger.c                    |  837 +++++++++
 linux-tux.q/net/tux/main.c                      | 1417 +++++++++++++++
 linux-tux.q/net/tux/mod.c                       |  262 ++
 linux-tux.q/net/tux/output.c                    |  352 +++
 linux-tux.q/net/tux/parser.h                    |  102 +
 linux-tux.q/net/tux/postpone.c                  |   77 
 linux-tux.q/net/tux/proc.c                      | 1149 ++++++++++++
 linux-tux.q/net/tux/proto_ftp.c                 | 1555 ++++++++++++++++
 linux-tux.q/net/tux/proto_http.c                | 2197 ++++++++++++++++++++++++
 linux-tux.q/net/tux/redirect.c                  |  172 +
 linux-tux.q/net/tux/times.c                     |  392 ++++
 linux-tux.q/net/tux/times.h                     |   26 
 linux-tux.q/net/tux/userspace.c                 |   27 
 72 files changed, 12697 insertions(+), 32 deletions(-)

Index: linux-2.6-tux.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-tux.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- linux-2.6-tux.patch	27 Mar 2006 18:54:19 -0000	1.16
+++ linux-2.6-tux.patch	1 Apr 2006 02:07:22 -0000	1.17
@@ -526,15 +526,15 @@
 ===================================================================
 --- linux-tux.q.orig/include/linux/fs.h
 +++ linux-tux.q/include/linux/fs.h
-@@ -1575,7 +1575,7 @@ ssize_t generic_file_write_nolock(struct
+@@ -1610,7 +1610,7 @@ ssize_t generic_file_write_nolock(struct
  extern ssize_t generic_file_sendfile(struct file *, loff_t *, size_t, read_actor_t, void *);
  extern void do_generic_mapping_read(struct address_space *mapping,
  				    struct file_ra_state *, struct file *,
 -				    loff_t *, read_descriptor_t *, read_actor_t);
 +				    loff_t *, read_descriptor_t *, read_actor_t, int);
+ extern ssize_t generic_file_splice_read(struct file *, struct inode *, size_t, unsigned int);
+ extern ssize_t generic_file_splice_write(struct inode *, struct file *, size_t, unsigned int);
  extern void
- file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping);
- extern ssize_t generic_file_readv(struct file *filp, const struct iovec *iov, 
 @@ -1607,14 +1607,15 @@ static inline int xip_truncate_page(stru
  
  static inline void do_generic_file_read(struct file * filp, loff_t *ppos,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- sources	30 Mar 2006 20:18:29 -0000	1.340
+++ sources	1 Apr 2006 02:07:22 -0000	1.341
@@ -1,4 +1,3 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 8c70806f9075ebc0087f7ce1b8911700  xen-20060320.tar.bz2
-b27c802de6487f2f0aeacc289f1d3ae2  patch-2.6.16-git17.bz2
-5dca5f5b52ccb2bfab6a88015af5fc2c  patch-2.6.16-git18.bz2
+832ae3ce48fa9d298ee294d72dc44670  patch-2.6.16-git19.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -r1.313 -r1.314
--- upstream	30 Mar 2006 20:18:29 -0000	1.313
+++ upstream	1 Apr 2006 02:07:22 -0000	1.314
@@ -1,2 +1,2 @@
 linux-2.6.16.tar.bz2
-patch-2.6.16-git18.bz2
+patch-2.6.16-git19.bz2


--- linux-2.6-drm-cripple-r300.patch DELETED ---


--- patch-2.6.16-git18.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sat Apr  1 02:54:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 31 Mar 2006 21:54:14 -0500
Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.61,1.62
Message-ID: <200604010254.k312sEsv020490@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
more compile fixes for cell


linux-2.6-compile-fixes.patch:
 spu_callbacks.c |    1 +
 spufs/run.c     |    1 +
 2 files changed, 2 insertions(+)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- linux-2.6-compile-fixes.patch	30 Mar 2006 20:48:41 -0000	1.61
+++ linux-2.6-compile-fixes.patch	1 Apr 2006 02:54:10 -0000	1.62
@@ -8,3 +8,13 @@
  
  #include "spufs.h"
  
+--- linux-2.6.16.noarch/arch/powerpc/platforms/cell/spu_callbacks.c~	2006-03-31 21:53:04.000000000 -0500
++++ linux-2.6.16.noarch/arch/powerpc/platforms/cell/spu_callbacks.c	2006-03-31 21:53:43.000000000 -0500
+@@ -316,6 +316,7 @@ void *spu_syscall_table[] = {
+ 	[__NR_pselect6]			sys_ni_syscall, /* sys_pselect */
+ 	[__NR_ppoll]			sys_ni_syscall, /* sys_ppoll */
+ 	[__NR_unshare]			sys_unshare,
++	[__NR_splice]			sys_splice,
+ };
+ 
+ long spu_sys_callback(struct spu_syscall_block *s)



From fedora-cvs-commits at redhat.com  Sat Apr  1 05:09:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 1 Apr 2006 00:09:25 -0500
Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.62,1.63
Message-ID: <200604010509.k3159PA0010971@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
implicit declarations.


linux-2.6-compile-fixes.patch:
 arch/powerpc/platforms/cell/spu_callbacks.c |    1 +
 arch/powerpc/platforms/cell/spufs/run.c     |    1 +
 include/asm-s390/atomic.h                   |    2 ++
 3 files changed, 4 insertions(+)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- linux-2.6-compile-fixes.patch	1 Apr 2006 02:54:10 -0000	1.62
+++ linux-2.6-compile-fixes.patch	1 Apr 2006 05:09:18 -0000	1.63
@@ -18,3 +18,18 @@
  };
  
  long spu_sys_callback(struct spu_syscall_block *s)
+
+include/asm/atomic.h:94: warning: implicit declaration of function 'unlikely'
+include/asm/atomic.h:97: warning: implicit declaration of function 'likely'
+
+--- linux-2.6.16.noarch/include/asm-s390/atomic.h~	2006-04-01 00:07:45.000000000 -0500
++++ linux-2.6.16.noarch/include/asm-s390/atomic.h	2006-04-01 00:08:08.000000000 -0500
+@@ -1,6 +1,8 @@
+ #ifndef __ARCH_S390_ATOMIC__
+ #define __ARCH_S390_ATOMIC__
+ 
++#include <linux/compiler.h>
++
+ /*
+  *  include/asm-s390/atomic.h
+  *



From fedora-cvs-commits at redhat.com  Sat Apr  1 05:21:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 1 Apr 2006 00:21:51 -0500
Subject: rpms/kernel/devel linux-2.6-debug-Wundef.patch,1.2,1.3
Message-ID: <200604010521.k315LpKM024805@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-debug-Wundef.patch 
Log Message:
warnings+++


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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-debug-Wundef.patch	12 Feb 2006 20:28:24 -0000	1.2
+++ linux-2.6-debug-Wundef.patch	1 Apr 2006 05:21:45 -0000	1.3
@@ -6,12 +6,12 @@
 
 --- linux-2.6/Makefile~	2005-05-28 18:48:02.000000000 -0400
 +++ linux-2.6/Makefile	2005-05-28 18:48:27.000000000 -0400
-@@ -203,7 +203,7 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
+@@ -306,7 +306,7 @@ LINUXINCLUDE    := -Iinclude \
+ CPPFLAGS        := -D__KERNEL__ $(LINUXINCLUDE)
  
- HOSTCC  	= gcc
- HOSTCXX  	= g++
--HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
-+HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -Wundef -Werror-implicit-function-declaration
- HOSTCXXFLAGS	= -O2
+ CFLAGS 		:= -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
+-	  	   -fno-strict-aliasing -fno-common
++	  	   -fno-strict-aliasing -fno-common -Wextra -Wstrict-prototypes -Wundef -Werror-implicit-function-declaration
+ AFLAGS		:= -D__ASSEMBLY__
  
- # 	Decide whether to build built-in, modular, or both.
+ # Read KERNELRELEASE from .kernelrelease (if it exists)



From fedora-cvs-commits at redhat.com  Sat Apr  1 06:05:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 1 Apr 2006 01:05:14 -0500
Subject: rpms/mesa/devel mesa-6.5-texture-from-pixmap-fixes.patch, NONE,
	1.1 .cvsignore, 1.6, 1.7 mesa-modular-dri-dir.patch, 1.1,
	1.2 mesa.spec, 1.46, 1.47 sources, 1.6,
	1.7 mesa-6.4.2-dprintf-to-debugprintf-for-bug180122.patch, 1.1, NONE
	mesa-6.4.2-xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835.patch,
	1.1, NONE
Message-ID: <200604010605.k3165EnP006207@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	.cvsignore mesa-modular-dri-dir.patch mesa.spec sources 
Added Files:
	mesa-6.5-texture-from-pixmap-fixes.patch 
Removed Files:
	mesa-6.4.2-dprintf-to-debugprintf-for-bug180122.patch 
	mesa-6.4.2-xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835.patch 
Log Message:
* Sat Apr  1 2006 Kristian H??gsberg <krh at redhat.com> 6.5-1
- Update to mesa 6.5 snapshot.
- 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
  as these are upstream now.
- Drop mesa-6.4.1-texture-from-drawable.patch and add
  mesa-6.5-texture-from-pixmap-fixes.patch.
- Update mesa-modular-dri-dir.patch to apply.


mesa-6.5-texture-from-pixmap-fixes.patch:
 include/GL/glx.h      |   25 +++++++++----------------
 src/glx/x11/glxcmds.c |    3 ++-
 2 files changed, 11 insertions(+), 17 deletions(-)

--- NEW FILE mesa-6.5-texture-from-pixmap-fixes.patch ---
Index: include/GL/glx.h
===================================================================
RCS file: /cvs/mesa/Mesa/include/GL/glx.h,v
retrieving revision 1.49
diff -u -p -r1.49 glx.h
--- include/GL/glx.h	26 Mar 2006 05:09:03 -0000	1.49
+++ include/GL/glx.h	31 Mar 2006 18:09:02 -0000
@@ -355,20 +355,6 @@ typedef GLuint (* PFNGLXGETMEMORYOFFSETM
 
 
 /*
- * ARB ?. GLX_ARB_render_texture
- * XXX This was never finalized!
- */
-#ifndef GLX_ARB_render_texture
-#define GLX_ARB_render_texture 1
-
-extern Bool glXBindTexImageARB(Display *dpy, GLXPbuffer pbuffer, int buffer);
-extern Bool glXReleaseTexImageARB(Display *dpy, GLXPbuffer pbuffer, int buffer);
-extern Bool glXDrawableAttribARB(Display *dpy, GLXDrawable draw, const int *attribList);
-
-#endif /* GLX_ARB_render_texture */
-
-
-/*
  * Remove this when glxext.h is updated.
  */
 #ifndef GLX_NV_float_buffer
@@ -423,9 +409,16 @@ typedef int (*PFNGLXGETSWAPINTERVALMESAP
 #ifndef GLX_EXT_texture_from_pixmap
 #define GLX_EXT_texture_from_pixmap 1
 
-/* XXX need enums/tokens! */
+/* XXX need real enums/tokens, these are just place holders! */
+
+#define GLX_TEXTURE_TARGET_EXT		0x6001
+#define GLX_TEXTURE_2D_EXT		0x6002
+#define GLX_TEXTURE_RECTANGLE_EXT	0x6003
+#define GLX_NO_TEXTURE_EXT		0x6004
+#define GLX_FRONT_LEFT_EXT		0x6005
+#define GLX_Y_INVERTED_EXT		0x6006
 
-extern Bool glXBindTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer);
+extern Bool glXBindTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer, const int *attribList);
 extern Bool glXReleaseTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer);
 
 #endif /* GLX_EXT_texture_from_pixmap */
Index: src/glx/x11/glxcmds.c
===================================================================
RCS file: /cvs/mesa/Mesa/src/glx/x11/glxcmds.c,v
retrieving revision 1.13
diff -u -p -r1.13 glxcmds.c
--- src/glx/x11/glxcmds.c	9 Mar 2006 16:25:46 -0000	1.13
+++ src/glx/x11/glxcmds.c	31 Mar 2006 18:09:07 -0000
@@ -2592,7 +2592,8 @@ PUBLIC Bool glXSet3DfxModeMESA( int mode
 
 PUBLIC Bool glXBindTexImageEXT(Display *dpy,
 			       GLXDrawable drawable,
-			       int buffer)
+			       int buffer,
+			       const int *attribList)
 {
     xGLXVendorPrivateReq *req;
     GLXContext gc = __glXGetCurrentContext();


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 Feb 2006 11:05:09 -0000	1.6
+++ .cvsignore	1 Apr 2006 06:05:02 -0000	1.7
@@ -1,3 +1,2 @@
-*.tar.bz2
-*.tar.gz
-clog
+MesaDemos-6.5.tar.bz2
+MesaLib-6.5.tar.bz2

mesa-modular-dri-dir.patch:
 Makefile |    1 +
 1 files changed, 1 insertion(+)

Index: mesa-modular-dri-dir.patch
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa-modular-dri-dir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mesa-modular-dri-dir.patch	20 Nov 2005 20:49:23 -0000	1.1
+++ mesa-modular-dri-dir.patch	1 Apr 2006 06:05:02 -0000	1.2
@@ -3,8 +3,8 @@
 @@ -2,6 +2,7 @@
  include $(TOP)/configs/current
  
- DEFINES += -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER
-+DEFINES += -DDEFAULT_DRIVER_DIR='"$(DRI_DRIVER_DIR)"'
+ EXTRA_DEFINES = -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER
++EXTRA_DEFINES += -DDEFAULT_DRIVER_DIR='"$(DRI_DRIVER_DIR)"'
  
- C_SOURCES = \
- 	  $(TOP)/src/mesa/glapi/glapi.c \
+ SOURCES = \
+ 	  glcontextmodes.c \


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- mesa.spec	1 Mar 2006 13:01:51 -0000	1.46
+++ mesa.spec	1 Apr 2006 06:05:02 -0000	1.47
@@ -52,8 +52,8 @@
 
 Summary: Mesa graphics libraries
 Name: mesa
-Version: 6.4.2
-Release: 6
+Version: 6.5
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -67,20 +67,16 @@
 Source10: redhat-mesa-target
 Source11: redhat-mesa-driver-install
 Source12: redhat-mesa-source-filelist-generator
-#Patch0: mesa-6.3.2-makedepend.patch
 Patch0: mesa-6.3.2-build-configuration-v4.patch
 Patch1: mesa-6.3.2-fix-installmesa.patch
 Patch2: mesa-6.4-multilib-fix.patch
 Patch3: mesa-modular-dri-dir.patch
 Patch4: mesa-6.4.1-libGLw-enable-motif-support.patch
-Patch5: mesa-6.4.2-dprintf-to-debugprintf-for-bug180122.patch
-Patch6: mesa-6.4.2-xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835.patch
-#Patch4: mesa-6.4.1-enable-osmesa.patch
 
 # General patches from upstream go here:
 
 # Red Hat custom patches, feature development
-Patch200: mesa-6.4.1-texture-from-drawable.patch
+Patch200: mesa-6.5-texture-from-pixmap-fixes.patch
 Patch201: mesa-6.4.1-radeon-use-right-texture-format.patch
 
 BuildRequires: pkgconfig
@@ -241,16 +237,12 @@
 %if %{with_motif}
 %patch4 -p0 -b .libGLw-enable-motif-support
 %endif
-%patch5 -p1 -b .dprintf-to-debugprintf-for-bug180122
-%patch6 -p0 -b .xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835
 
-# NOT NEEDED NOW%patch100 -p1 -b .amd64-assyntax-fix
-
-%patch200 -p0 -b .texture-from-drawable
 # According to Adam, this patch makes metacity's compositing
 # manager noticeably faster, but also may be a little too big of
 # a change for post feature freeze.  Leaving off for now...
-#%patch201 -p1 -b .radeon-use-right-format
+%patch200 -p0 -b  texture-from-pixmap-fixes
+%patch201 -p1 -b .radeon-use-right-format
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
 # license and are not open source/free software, so we remove them.
@@ -259,7 +251,7 @@
 #-- Build ------------------------------------------------------------
 %build
 # Macroize this to simplify things
-%define makeopts MKDEP="gcc -M" MKDEP_OPTIONS="-MF depend"
+%define makeopts MKDEP="gcc -M" MKDEP_OPTIONS="-MF depend" ARCH_FLAGS=-DGLX_USE_TLS
 export CFLAGS="$RPM_OPT_FLAGS"
 export LIB_DIR=$RPM_BUILD_ROOT%{_libdir}
 export INCLUDE_DIR=$RPM_BUILD_ROOT%{_includedir}
@@ -438,6 +430,18 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Sat Apr  1 2006 Kristian H??gsberg <krh at redhat.com> 6.5-1
+- Update to mesa 6.5 snapshot.
+- 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
+  as these are upstream now.
+- Drop mesa-6.4.1-texture-from-drawable.patch and add
+  mesa-6.5-texture-from-pixmap-fixes.patch.
+- Update mesa-modular-dri-dir.patch to apply.
+
+* Fri Mar 24 2006 Kristian H??gsberg <krh at redhat.com> 6.4.2-7
+- Set ARCH_FLAGS=-DGLX_USE_TLS to enable TLS for GL contexts.
+
 * Wed Mar 01 2006 Karsten Hopp <karsten at redhat.de> 6.4.2-6
 - Buildrequires: libXt-devel (#183479)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Feb 2006 11:06:42 -0000	1.6
+++ sources	1 Apr 2006 06:05:02 -0000	1.7
@@ -1,2 +1,2 @@
-7674d2c603b5834259e4e5a820cefd5b  MesaLib-6.4.2.tar.bz2
-9cae1ab874af533ce356bd7dfe2e0bb0  MesaDemos-6.4.2.tar.bz2
+ab95b590dcd640726a2d89e62068c66e  MesaDemos-6.5.tar.bz2
+61beda590bfc5b4a12e979d5f2d70d7a  MesaLib-6.5.tar.bz2


--- mesa-6.4.2-dprintf-to-debugprintf-for-bug180122.patch DELETED ---


--- mesa-6.4.2-xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sat Apr  1 08:24:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 1 Apr 2006 03:24:54 -0500
Subject: rpms/cups/devel cups-string.patch,NONE,1.1 cups.spec,1.149,1.150
Message-ID: <200604010824.k318Ospo011461@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-string.patch 
Log Message:
* Sat Apr  1 2006 Tim Waugh <twaugh at redhat.com>
- Fixed _cupsStrFree() (STR #1529).


cups-string.patch:
 string.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE cups-string.patch ---
--- cups-1.2rc1/cups/string.c.string	2006-03-31 18:44:20.000000000 +0100
+++ cups-1.2rc1/cups/string.c	2006-03-31 18:45:13.000000000 +0100
@@ -269,7 +269,8 @@
 
   key.str = (char *)s;
 
-  if ((item = (_cups_sp_item_t *)cupsArrayFind(cg->stringpool, &key)) != NULL)
+  if ((item = (_cups_sp_item_t *)cupsArrayFind(cg->stringpool, &key)) != NULL
+      && item->str == s)
   {
    /*
     * Found it, dereference...


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- cups.spec	31 Mar 2006 15:34:43 -0000	1.149
+++ cups.spec	1 Apr 2006 08:24:52 -0000	1.150
@@ -35,6 +35,7 @@
 Patch12: cups-locale.patch
 Patch13: cups-CAN-2005-0064.patch
 Patch14: cups-str1521.patch
+Patch15: cups-string.patch
 Patch16: cups-pie.patch
 Patch17: cups-1.1.19-no_rpath.patch
 Patch18: cups-language.patch
@@ -124,6 +125,7 @@
 %patch12 -p1 -b .locale
 %patch13 -p1 -b .CAN-2005-0064
 %patch14 -p1 -b .str1521
+%patch15 -p1 -b .string
 %if %build_as_pie
 %patch16 -p1 -b .pie
 %endif
@@ -379,6 +381,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Sat Apr  1 2006 Tim Waugh <twaugh at redhat.com>
+- Fixed _cupsStrFree() (STR #1529).
+
 * Fri Mar 31 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.4
 - Fixed interaction with CUPS 1.1 servers (STR #1528).
 



From fedora-cvs-commits at redhat.com  Sat Apr  1 08:26:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 1 Apr 2006 03:26:00 -0500
Subject: rpms/cups/FC-5 cups-string.patch,NONE,1.1 cups.spec,1.136,1.137
Message-ID: <200604010826.k318Q0lw011489@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-string.patch 
Log Message:
* Sat Apr  1 2006 Tim Waugh <twaugh at redhat.com>
- Fixed _cupsStrFree() (STR #1529).


cups-string.patch:
 string.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE cups-string.patch ---
--- cups-1.2rc1/cups/string.c.string	2006-03-31 18:44:20.000000000 +0100
+++ cups-1.2rc1/cups/string.c	2006-03-31 18:45:13.000000000 +0100
@@ -269,7 +269,8 @@
 
   key.str = (char *)s;
 
-  if ((item = (_cups_sp_item_t *)cupsArrayFind(cg->stringpool, &key)) != NULL)
+  if ((item = (_cups_sp_item_t *)cupsArrayFind(cg->stringpool, &key)) != NULL
+      && item->str == s)
   {
    /*
     * Found it, dereference...


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- cups.spec	31 Mar 2006 15:39:27 -0000	1.136
+++ cups.spec	1 Apr 2006 08:25:58 -0000	1.137
@@ -35,6 +35,7 @@
 Patch12: cups-locale.patch
 Patch13: cups-CAN-2005-0064.patch
 Patch14: cups-str1521.patch
+Patch15: cups-string.patch
 Patch16: cups-pie.patch
 Patch17: cups-1.1.19-no_rpath.patch
 Patch18: cups-language.patch
@@ -128,6 +129,7 @@
 %patch12 -p1 -b .locale
 %patch13 -p1 -b .CAN-2005-0064
 %patch14 -p1 -b .str1521
+%patch15 -p1 -b .string
 %if %build_as_pie
 %patch16 -p1 -b .pie
 %endif
@@ -383,6 +385,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Sat Apr  1 2006 Tim Waugh <twaugh at redhat.com>
+- Fixed _cupsStrFree() (STR #1529).
+
 * Fri Mar 31 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.4
 - Fixed interaction with CUPS 1.1 servers (STR #1528).
 



From fedora-cvs-commits at redhat.com  Sat Apr  1 18:36:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 1 Apr 2006 13:36:52 -0500
Subject: rpms/xorg-x11-server/FC-5 xorg-server-1.0.1-CVE-2006-0745.patch,
	NONE, 1.1 xorg-x11-server.spec, 1.45, 1.46
Message-ID: <200604011836.k31IaqS0028918@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/xorg-x11-server/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv28889

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-server-1.0.1-CVE-2006-0745.patch 
Log Message:
Move old embargo branch stuff over to FC-5 updates branch
(CVE-2006-0745 (bug 185084))


xorg-server-1.0.1-CVE-2006-0745.patch:
 xf86Init.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xorg-server-1.0.1-CVE-2006-0745.patch ---
--- xorg-server-1.0.1/hw/xfree86/common/xf86Init.c.CVE-2006-0745	2006-03-15 14:22:28.000000000 -0500
+++ xorg-server-1.0.1/hw/xfree86/common/xf86Init.c	2006-03-15 14:22:55.000000000 -0500
@@ -1376,7 +1376,7 @@ ddxProcessArgument(int argc, char **argv
     }
   
   /* First the options that are only allowed for root */
-  if (getuid() == 0 || geteuid != 0)
+  if (getuid() == 0 || geteuid() != 0)
   {
     if (!strcmp(argv[i], "-modulepath"))
     {
@@ -1679,7 +1679,7 @@ ddxProcessArgument(int argc, char **argv
   }
   if (!strcmp(argv[i], "-configure"))
   {
-    if (getuid() != 0 && geteuid == 0) {
+    if (getuid() != 0 && geteuid() == 0) {
 	ErrorF("The '-configure' option can only be used by root.\n");
 	exit(1);
     }


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/FC-5/xorg-x11-server.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- xorg-x11-server.spec	6 Mar 2006 20:38:28 -0000	1.45
+++ xorg-x11-server.spec	1 Apr 2006 18:36:49 -0000	1.46
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.0.1
-Release:   8
+Release:   9
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -25,6 +25,8 @@
 Patch6:    xserver-1.0.1-randr-sdk.patch
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=181292.  hacky patch
 Patch7:    xorg-x11-server-1.0.1-fpic-libxf86config.patch
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=185084
+Patch8:    xorg-server-1.0.1-CVE-2006-0745.patch
 
 # Patches taken from xserver/xorg CVS HEAD, post-1.0.1
 Patch100:  xorg-x11-server-1.0.1-fbpict-fix-rounding.patch
@@ -243,6 +245,7 @@
 %patch5 -p0 -b .backtrace
 %patch6 -p1 -b .randrsdk
 %patch7 -p1 -b .xf86configfpic
+%patch8 -p1 -b .CVE-2006-0745
 
 %patch100 -p2 -b .fbpict-fix-rounding
 %patch101 -p2 -b .SEGV-on-null-interface
@@ -522,6 +525,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Wed Mar 15 2006 Ray Strode <rstrode at redhat.com> - 1.0.1-9
+- CVE-2006-0745 (bug 185084)
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 1.0.1-8
 - build libxf86config with -fPIC (#181292)
 - fix sgi 1600sw extra mode (#182430)



From fedora-cvs-commits at redhat.com  Sat Apr  1 21:14:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 1 Apr 2006 16:14:37 -0500
Subject: rpms/fetchmail/devel fetchmail-6.3.3-resolv.patch, 1.1,
	1.2 fetchmail.spec, 1.42, 1.43
Message-ID: <200604012114.k31LEbR2001095@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/fetchmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1080

Modified Files:
	fetchmail-6.3.3-resolv.patch fetchmail.spec 
Log Message:
* Sat Apr  1 2006 Miloslav Trmac <mitr at redhat.com> - 6.3.3-3
- Fix fetchmail-6.3.3-resolv.patch


fetchmail-6.3.3-resolv.patch:
 configure.ac |   33 ++++++++++++++++++++++++++++-----
 1 files changed, 28 insertions(+), 5 deletions(-)

Index: fetchmail-6.3.3-resolv.patch
===================================================================
RCS file: /cvs/dist/rpms/fetchmail/devel/fetchmail-6.3.3-resolv.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fetchmail-6.3.3-resolv.patch	31 Mar 2006 20:46:42 -0000	1.1
+++ fetchmail-6.3.3-resolv.patch	1 Apr 2006 21:14:33 -0000	1.2
@@ -1,6 +1,5 @@
-diff --exclude '*~' --exclude '*.o' -urN fetchmail/configure.ac fetchmail-6.3.3/configure.ac
---- fetchmail/configure.ac	2006-03-29 12:30:05.000000000 +0200
-+++ fetchmail-6.3.3/configure.ac	2006-03-31 19:29:12.000000000 +0200
+--- fetchmail-6.3.3/configure.ac.resolv	2006-03-29 12:30:05.000000000 +0200
++++ fetchmail-6.3.3/configure.ac	2006-04-01 23:08:49.000000000 +0200
 @@ -137,7 +137,7 @@
  AC_SUBST(EXTRAOBJ)
  
@@ -10,7 +9,7 @@
    atexit inet_aton strftime setrlimit socketpair sigprocmask dnl
    sigaction strdup setlocale)
  
-@@ -147,10 +147,32 @@
+@@ -147,10 +147,33 @@
  # and breaks gethostbyname(2).  It's better to use the bind stuff in the C
  # library.  So don't add -lresolv to the link list unless it's necessary
  # (It will be necessary when using GNU libc6).
@@ -18,7 +17,7 @@
 -    AC_MSG_RESULT(using libc's resolver functions),
 -    AC_CHECK_LIB(resolv,res_search, 
 -	[AC_DEFINE(HAVE_RES_SEARCH) AC_MSG_RESULT(found resolver functions in libresolv); LIBS="$LIBS -lresolv"], AC_MSG_RESULT(no resolver calls found)))
-+old_libs=$LIBS
++old_LIBS=$LIBS
 +for lib in '' -lresolv; do
 +    if test -z "$lib"; then
 +       AC_MSG_CHECKING([for res_search in libc])
@@ -43,6 +42,7 @@
 +     AC_DEFINE(HAVE_RES_SEARCH, [1],
 +	       [Define to 1 if you have the `res_search' function.])
 +     break], [AC_MSG_RESULT([not found])])
++    LIBS=$old_LIBS
 +done
  
  dnl Check for libcrypt -- it may live in libc or libcrypt, as on IRIX


Index: fetchmail.spec
===================================================================
RCS file: /cvs/dist/rpms/fetchmail/devel/fetchmail.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- fetchmail.spec	31 Mar 2006 20:46:42 -0000	1.42
+++ fetchmail.spec	1 Apr 2006 21:14:33 -0000	1.43
@@ -4,7 +4,7 @@
 Summary: A remote mail retrieval and forwarding utility.
 Name: fetchmail
 Version: 6.3.3
-Release: 2
+Release: 3
 Requires: smtpdaemon
 Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2
 Source1: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2.asc
@@ -90,6 +90,9 @@
 %endif
 
 %changelog
+* Sat Apr  1 2006 Miloslav Trmac <mitr at redhat.com> - 6.3.3-3
+- Fix fetchmail-6.3.3-resolv.patch
+
 * Fri Mar 31 2006 Miloslav Trmac <mitr at redhat.com> - 6.3.3-2
 - Fix some type mismatches on 64-bit architectures
 - Fix checking for res_* on architectures with newer glibc ABI



From fedora-cvs-commits at redhat.com  Sat Apr  1 21:26:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 1 Apr 2006 16:26:09 -0500
Subject: rpms/kernel/devel/configs config-generic,1.173,1.174
Message-ID: <200604012126.k31LQ9Gr014930@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
git20



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- config-generic	30 Mar 2006 23:54:42 -0000	1.173
+++ config-generic	1 Apr 2006 21:26:07 -0000	1.174
@@ -2720,5 +2720,4 @@
 # CONFIG_FORCED_INLINING is not set
 
 CONFIG_MIGRATION=y
-
-
+# CONFIG_NEW_LEDS is not set



From fedora-cvs-commits at redhat.com  Sat Apr  1 21:26:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 1 Apr 2006 16:26:09 -0500
Subject: rpms/kernel/devel patch-2.6.16-git20.bz2.sign, NONE, 1.1 .cvsignore,
	1.400, 1.401 kernel-2.6.spec, 1.2112,
	1.2113 linux-2.6-dump_smp_call_function.patch, 1.12,
	1.13 linux-2.6-execshield.patch, 1.16, 1.17 sources, 1.341,
	1.342 upstream, 1.314, 1.315 linux-2.6-diskdump.patch, 1.7,
	NONE linux-2.6-signal-trampolines-unwind-info.patch, 1.1,
	NONE patch-2.6.16-git19.bz2.sign, 1.1, NONE
Message-ID: <200604012126.k31LQ9Gv014920@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec 
	linux-2.6-dump_smp_call_function.patch 
	linux-2.6-execshield.patch sources upstream 
Added Files:
	patch-2.6.16-git20.bz2.sign 
Removed Files:
	linux-2.6-diskdump.patch 
	linux-2.6-signal-trampolines-unwind-info.patch 
	patch-2.6.16-git19.bz2.sign 
Log Message:
git20



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

iD8DBQBELiXryGugalF9Dw4RArADAJ9Cb5tO3P+9cjQWKas5+wCOoT4ZGACfSkRD
+Qy8IT+yE37q9BfvR2fRXBI=
=NJyW
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -r1.400 -r1.401
--- .cvsignore	1 Apr 2006 02:07:21 -0000	1.400
+++ .cvsignore	1 Apr 2006 21:26:06 -0000	1.401
@@ -3,4 +3,4 @@
 kernel-2.6.16
 linux-2.6.16.tar.bz2
 xen-20060320.tar.bz2
-patch-2.6.16-git19.bz2
+patch-2.6.16-git20.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2112
retrieving revision 1.2113
diff -u -r1.2112 -r1.2113
--- kernel-2.6.spec	1 Apr 2006 02:07:21 -0000	1.2112
+++ kernel-2.6.spec	1 Apr 2006 21:26:06 -0000	1.2113
@@ -217,7 +217,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16-git19.bz2
+Patch1: patch-2.6.16-git20.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -340,9 +340,8 @@
 Patch1500: linux-2.6-crashdump-common.patch
 Patch1501: linux-2.6-netdump.patch
 Patch1502: linux-2.6-netconsole.patch
-Patch1503: linux-2.6-diskdump.patch
-Patch1504: linux-2.6-crashdump-reboot-exports.patch
-Patch1505: linux-2.6-dump_smp_call_function.patch
+Patch1503: linux-2.6-crashdump-reboot-exports.patch
+Patch1504: linux-2.6-dump_smp_call_function.patch
 
 # Misc bits.
 Patch1600: linux-2.6-module_version.patch
@@ -355,7 +354,6 @@
 Patch1690: linux-2.6-smsc-ircc2-pnp.patch
 Patch1700: linux-2.6-w1-hush-debug.patch
 Patch1710: linux-2.6-sched-up-migration-cost.patch
-Patch1730: linux-2.6-signal-trampolines-unwind-info.patch
 Patch1740: linux-2.6-softlockup-disable.patch
 Patch1760: linux-2.6-suspend-slab-warnings.patch
 Patch1770: linux-2.6-optimise-spinlock-debug.patch
@@ -920,7 +918,6 @@
 %patch1502 -p1
 %patch1503 -p1
 %patch1504 -p1
-%patch1505 -p1
 
 #
 # Various SELinux fixes from 2.6.10rc
@@ -947,8 +944,6 @@
 %patch1700 -p1
 # Only print migration info on SMP
 %patch1710 -p1
-# Mark unwind info for signal trampolines in vDSOs
-%patch1730 -p1
 # Add a safety net to softlockup so that it doesn't prevent installs.
 %patch1740 -p1
 # Fix up kmalloc whilst atomic warning during resume.
@@ -1613,6 +1608,9 @@
 %endif
 
 %changelog
+* Sat Apr  1 2006 Dave Jones <davej at redhat.com>
+- 2.6.16-git20
+
 * Fri Mar 31 2006 Dave Jones <davej at redhat.com>
 - 2.6.16-git19
 

linux-2.6-dump_smp_call_function.patch:
 linux-2.6.12/arch/i386/kernel/smp.c     |   46 ++++++++++++++++++++++++++++++++
 linux-2.6.12/arch/ia64/kernel/smp.c     |   44 ++++++++++++++++++++++++++++++
 linux-2.6.12/arch/powerpc/kernel/smp.c  |   45 ++++++++++++++++++++++++++++++-
 linux-2.6.12/arch/x86_64/kernel/smp.c   |   45 +++++++++++++++++++++++++++++++
 linux-2.6.12/drivers/net/netdump.c      |    2 -
 linux-2.6.16.noarch/include/linux/smp.h |    2 +
 6 files changed, 182 insertions(+), 2 deletions(-)

Index: linux-2.6-dump_smp_call_function.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-dump_smp_call_function.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6-dump_smp_call_function.patch	27 Mar 2006 18:54:19 -0000	1.12
+++ linux-2.6-dump_smp_call_function.patch	1 Apr 2006 21:26:06 -0000	1.13
@@ -263,17 +263,6 @@
  
  void lock_ipi_call_lock(void)
  {
---- linux-2.6.12/drivers/block/diskdump.c.orig	2005-08-23 10:50:16.489416520 -0400
-+++ linux-2.6.12/drivers/block/diskdump.c	2005-08-23 10:51:04.773472987 -0400
-@@ -456,7 +456,7 @@ static void freeze_other_cpus(void)
- #if CONFIG_SMP
- 	int	i;
- 
--	smp_call_function(freeze_cpu, NULL, 1, -1);
-+	dump_smp_call_function(freeze_cpu, NULL);
- 	diskdump_mdelay(3000);
- 	printk("CPU frozen: ");
- 	for (i = 0; i < NR_CPUS; i++) {
 --- linux-2.6.12/drivers/net/netdump.c.orig	2005-08-23 10:50:16.449423099 -0400
 +++ linux-2.6.12/drivers/net/netdump.c	2005-08-23 10:51:04.774472823 -0400
 @@ -356,7 +356,7 @@ static void netpoll_start_netdump(struct

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

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- linux-2.6-execshield.patch	26 Mar 2006 00:13:38 -0000	1.16
+++ linux-2.6-execshield.patch	1 Apr 2006 21:26:06 -0000	1.17
@@ -612,7 +612,7 @@
  		do_not_nx = 1;
  		__supported_pte_mask &= ~_PAGE_NX;
          }
--	return 0;
+-	return 1;
 -} 
 -__setup("noexec=", nonx_setup);	/* parsed early actually */
 -
@@ -631,7 +631,7 @@
 -		force_personality32 &= ~READ_IMPLIES_EXEC;
 -	else if (!strcmp(str, "off"))
 -		force_personality32 |= READ_IMPLIES_EXEC;
--	return 0;
+-	return 1;
  }
 -__setup("noexec32=", nonx32_setup);
  


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- sources	1 Apr 2006 02:07:22 -0000	1.341
+++ sources	1 Apr 2006 21:26:06 -0000	1.342
@@ -1,3 +1,3 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 8c70806f9075ebc0087f7ce1b8911700  xen-20060320.tar.bz2
-832ae3ce48fa9d298ee294d72dc44670  patch-2.6.16-git19.bz2
+9a7d6fd1f2b53ed419f351a1b7cedd80  patch-2.6.16-git20.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -r1.314 -r1.315
--- upstream	1 Apr 2006 02:07:22 -0000	1.314
+++ upstream	1 Apr 2006 21:26:06 -0000	1.315
@@ -1,2 +1,2 @@
 linux-2.6.16.tar.bz2
-patch-2.6.16-git19.bz2
+patch-2.6.16-git20.bz2


--- linux-2.6-diskdump.patch DELETED ---


--- linux-2.6-signal-trampolines-unwind-info.patch DELETED ---


--- patch-2.6.16-git19.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sat Apr  1 21:43:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 1 Apr 2006 16:43:05 -0500
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2113,
	1.2114 linux-2.6-crashdump-common.patch, 1.16,
	NONE linux-2.6-crashdump-reboot-exports.patch, 1.4,
	NONE linux-2.6-dump_smp_call_function.patch, 1.13,
	NONE linux-2.6-netconsole.patch, 1.1,
	NONE linux-2.6-netdump.patch, 1.4, NONE
Message-ID: <200604012143.k31Lh54T015137@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-crashdump-common.patch 
	linux-2.6-crashdump-reboot-exports.patch 
	linux-2.6-dump_smp_call_function.patch 
	linux-2.6-netconsole.patch linux-2.6-netdump.patch 
Log Message:
untested, unused, unmaintained.
I'm tired of fixing this for no reason.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2113
retrieving revision 1.2114
diff -u -r1.2113 -r1.2114
--- kernel-2.6.spec	1 Apr 2006 21:26:06 -0000	1.2113
+++ kernel-2.6.spec	1 Apr 2006 21:43:03 -0000	1.2114
@@ -336,13 +336,6 @@
 # Squashfs
 Patch1400: linux-2.6-squashfs.patch
 
-# Netdump and Diskdump bits.
-Patch1500: linux-2.6-crashdump-common.patch
-Patch1501: linux-2.6-netdump.patch
-Patch1502: linux-2.6-netconsole.patch
-Patch1503: linux-2.6-crashdump-reboot-exports.patch
-Patch1504: linux-2.6-dump_smp_call_function.patch
-
 # Misc bits.
 Patch1600: linux-2.6-module_version.patch
 Patch1610: linux-2.6-input-kill-stupid-messages.patch
@@ -912,13 +905,6 @@
 # Squashfs
 %patch1400 -p1
 
-# netdump bits
-%patch1500 -p1
-%patch1501 -p1
-%patch1502 -p1
-%patch1503 -p1
-%patch1504 -p1
-
 #
 # Various SELinux fixes from 2.6.10rc
 #


--- linux-2.6-crashdump-common.patch DELETED ---


--- linux-2.6-crashdump-reboot-exports.patch DELETED ---


--- linux-2.6-dump_smp_call_function.patch DELETED ---


--- linux-2.6-netconsole.patch DELETED ---


--- linux-2.6-netdump.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sat Apr  1 21:49:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 1 Apr 2006 16:49:45 -0500
Subject: rpms/xorg-x11-proto-devel/devel .cvsignore, 1.12, 1.13 sources, 1.11,
	1.12 xorg-x11-proto-devel.spec, 1.25, 1.26
Message-ID: <200604012149.k31LnjSE028952@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	.cvsignore sources xorg-x11-proto-devel.spec 
Log Message:
auto-import xorg-x11-proto-devel-7.0-9 on branch devel from xorg-x11-proto-devel-7.0-9.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	20 Mar 2006 14:22:55 -0000	1.12
+++ .cvsignore	1 Apr 2006 21:49:42 -0000	1.13
@@ -1,9 +1,12 @@
 bigreqsproto-1.0.2.tar.bz2
+compositeproto-0.3.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.6.tar.bz2
 inputproto-1.3.2.tar.bz2
 kbproto-1.0.2.tar.bz2
 printproto-1.0.3.tar.bz2
@@ -11,7 +14,6 @@
 recordproto-1.13.2.tar.bz2
 renderproto-0.9.2.tar.bz2
 resourceproto-1.0.2.tar.bz2
-scrnsaverproto-1.0.2.tar.bz2
 trapproto-3.4.3.tar.bz2
 videoproto-2.2.2.tar.bz2
 xcmiscproto-1.1.2.tar.bz2
@@ -25,6 +27,4 @@
 xineramaproto-1.1.2.tar.bz2
 xproto-7.0.4.tar.bz2
 xproxymanagementprotocol-1.0.2.tar.bz2
-compositeproto-0.3.tar.bz2
-fixesproto-4.0.tar.bz2
-glproto-1.4.6.tar.bz2
+scrnsaverproto-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	20 Mar 2006 14:22:55 -0000	1.11
+++ sources	1 Apr 2006 21:49:42 -0000	1.12
@@ -1,9 +1,12 @@
 95c29d9d10bf2868996c0c47a3b9a8dc  bigreqsproto-1.0.2.tar.bz2
+85e7abb79de5b49cb83524a608744b0b  compositeproto-0.3.tar.bz2
 b3eaee9850bb23020b9ac751626c7976  damageproto-1.0.3.tar.bz2
 d80acad88411e7944b9b085463d53302  dmxproto-2.2.2.tar.bz2
 2507b5d0f4b2848147fbddd155aa6cfe  evieext-1.0.2.tar.bz2
+8b298cc3424597f8138c7faf7763dce9  fixesproto-4.0.tar.bz2
 60df6b625074a9790e28543dcea71651  fontcacheproto-0.1.2.tar.bz2
 c946f166107b016a21cc7a02e1132724  fontsproto-2.0.2.tar.bz2
+b30bff86821f0636563289e5911c74c6  glproto-1.4.6.tar.bz2
 e0b7df0fc69f0712aa7f2161faa94e1d  inputproto-1.3.2.tar.bz2
 3ae193c317a3621966c3c53d83a254f4  kbproto-1.0.2.tar.bz2
 0f4e7982c6d4ec3b2cf38502dd1293a3  printproto-1.0.3.tar.bz2
@@ -11,7 +14,6 @@
 0ed4706564a34fc2aff724aa16d3ff00  recordproto-1.13.2.tar.bz2
 28fbe8a59ebd31f098b90ec64f3d133a  renderproto-0.9.2.tar.bz2
 b823b314e37eb19dae1f297951d2e933  resourceproto-1.0.2.tar.bz2
-a7ddc31ab80637cae83042190d5001ec  scrnsaverproto-1.0.2.tar.bz2
 3b713239e5e6b269b31cb665563358df  trapproto-3.4.3.tar.bz2
 44292d74a9a3c94b1ecb9d77a0da83e8  videoproto-2.2.2.tar.bz2
 fde0b050901f024b19159cdacdcfbd20  xcmiscproto-1.1.2.tar.bz2
@@ -25,6 +27,4 @@
 1cc292c562962ad0ad3a253cae68c632  xineramaproto-1.1.2.tar.bz2
 9b7c807841c28289151f911fc1bea707  xproto-7.0.4.tar.bz2
 d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.tar.bz2
-85e7abb79de5b49cb83524a608744b0b  compositeproto-0.3.tar.bz2
-8b298cc3424597f8138c7faf7763dce9  fixesproto-4.0.tar.bz2
-b30bff86821f0636563289e5911c74c6  glproto-1.4.6.tar.bz2
+5d551850e6f4acdf49a13f4eb3a5bbfa  scrnsaverproto-1.1.0.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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xorg-x11-proto-devel.spec	20 Mar 2006 14:44:04 -0000	1.25
+++ xorg-x11-proto-devel.spec	1 Apr 2006 21:49:42 -0000	1.26
@@ -10,7 +10,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.0
-Release: 8
+Release: 9
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
@@ -33,7 +33,7 @@
 Source14: %{sourceurl}/recordproto-1.13.2.tar.bz2
 Source15: %{sourceurl}/renderproto-0.9.2.tar.bz2
 Source16: %{sourceurl}/resourceproto-1.0.2.tar.bz2
-Source17: %{sourceurl}/scrnsaverproto-1.0.2.tar.bz2
+Source17: %{sourceurl}/scrnsaverproto-1.1.0.tar.bz2
 Source18: %{sourceurl}/trapproto-3.4.3.tar.bz2
 Source19: %{sourceurl}/videoproto-2.2.2.tar.bz2
 Source20: %{sourceurl}/xcmiscproto-1.1.2.tar.bz2
@@ -278,6 +278,9 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Sat Apr  1 2006 Adam Jackson <ajackson at redhat.com> 7.0-9
+- Update to scrnsaverproto-1.1
+
 * Mon Mar 20 2006 Adam Jackson <ajackson at redhat.com> 7.0-8
 - Fix the base URL.
 



From fedora-cvs-commits at redhat.com  Sat Apr  1 23:12:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 1 Apr 2006 18:12:53 -0500
Subject: rpms/libXfont/devel .cvsignore, 1.6, 1.7 libXfont.spec, 1.13,
	1.14 sources, 1.7, 1.8
Message-ID: <200604012312.k31NCrU6024332@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXfont/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24307/devel

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXfont/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Dec 2005 11:07:28 -0000	1.6
+++ .cvsignore	1 Apr 2006 23:12:51 -0000	1.7
@@ -1 +1 @@
-libXfont-1.0.0.tar.bz2
+libXfont-1.1.0.tar.bz2


Index: libXfont.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfont/devel/libXfont.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXfont.spec	11 Feb 2006 04:19:18 -0000	1.13
+++ libXfont.spec	1 Apr 2006 23:12:51 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
-Version: 1.0.0
-Release: 2.2
+Version: 1.1.0
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -86,6 +86,8 @@
 %{_includedir}/X11/fonts/fontutil.h
 %{_includedir}/X11/fonts/fontxlfd.h
 %{_includedir}/X11/fonts/pcf.h
+%{_includedir}/X11/fonts/ft.h
+%{_includedir}/X11/fonts/ftfuncs.h
 %if %{with_static}
 %{_libdir}/libXfont.a
 %endif
@@ -94,6 +96,9 @@
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
+* Sat Apr  1 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 for crash fix and new headers
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXfont/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jan 2006 22:26:05 -0000	1.7
+++ sources	1 Apr 2006 23:12:51 -0000	1.8
@@ -1 +1 @@
-36e41e5966d8ab36bf019a6d64cac878  libXfont-1.0.0.tar.bz2
+d40f0da6cb2b3017ec0f5c44d5dc9821  libXfont-1.1.0.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Apr  2 02:40:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 1 Apr 2006 21:40:16 -0500
Subject: rpms/mesa/devel mesa.spec,1.47,1.48
Message-ID: <200604020240.k322eGqZ023586@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	mesa.spec 
Log Message:
+- Use -MG for generating deps and some files aren't yet symlinked at
+  make depend time.



Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- mesa.spec	1 Apr 2006 06:05:02 -0000	1.47
+++ mesa.spec	2 Apr 2006 02:40:00 -0000	1.48
@@ -251,7 +251,7 @@
 #-- Build ------------------------------------------------------------
 %build
 # Macroize this to simplify things
-%define makeopts MKDEP="gcc -M" MKDEP_OPTIONS="-MF depend" ARCH_FLAGS=-DGLX_USE_TLS
+%define makeopts MKDEP="gcc -M" MKDEP_OPTIONS="-MG depend" ARCH_FLAGS=-DGLX_USE_TLS
 export CFLAGS="$RPM_OPT_FLAGS"
 export LIB_DIR=$RPM_BUILD_ROOT%{_libdir}
 export INCLUDE_DIR=$RPM_BUILD_ROOT%{_includedir}
@@ -432,6 +432,8 @@
 %changelog
 * Sat Apr  1 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
+  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
   as these are upstream now.



From fedora-cvs-commits at redhat.com  Sun Apr  2 05:28:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 2 Apr 2006 00:28:02 -0500
Subject: rpms/mesa/devel mesa-6.5-drop-static-inline.patch, NONE,
	1.1 mesa.spec, 1.48, 1.49
Message-ID: <200604020528.k325S1mt009093@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	mesa.spec 
Added Files:
	mesa-6.5-drop-static-inline.patch 
Log Message:
Remove inline keyword from a few functions that have their address taken; resolves linker error on x86-64.

mesa-6.5-drop-static-inline.patch:
 savagetex.c  |    2 +-
 savagetris.c |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE mesa-6.5-drop-static-inline.patch ---
Some functions in the savage driver are marked static and inline,
which is usually okay, and typically just means that if they're always
only inlined no code will be generated for such a function.  In a few
places, however, the address of such a function is taken, which should
be ok, it should just force code to be generated for that function.
But no... on x86-64 it generates a linker error:

/usr/bin/ld: savagetex.o: relocation R_X86_64_PC32 against `savageUploadSubtile_2x8' can not be used when making a shared object; recompile with -fPIC

The files *are* compiled with -fPIC.  Not sure what's going on, but
removing the inline keyword from those functions fixes the link.

krh at redhat.com, Sun Apr  2 00:26:35 EST 2006

--- ./src/mesa/drivers/dri/savage/savagetex.c.drop-static-inline	2005-10-10 15:15:48.000000000 -0400
+++ ./src/mesa/drivers/dri/savage/savagetex.c	2006-04-02 00:18:29.000000000 -0500
@@ -101,7 +101,7 @@
  * \param w   width in bytes
  */
 #define SUBTILE_FUNC(w,h)					\
-static __inline GLubyte *savageUploadSubtile_##w##x##h		\
+static GLubyte *savageUploadSubtile_##w##x##h		\
 (GLubyte *dest, GLubyte *src, GLuint srcStride)			\
 {								\
     GLuint y;							\
--- ./src/mesa/drivers/dri/savage/savagetris.c.drop-static-inline	2005-10-10 15:15:48.000000000 -0400
+++ ./src/mesa/drivers/dri/savage/savagetris.c	2006-04-02 00:19:03.000000000 -0500
@@ -215,7 +215,7 @@
    tmp.f[vertex_size-1] *= rhw;				\
 } while (0)
 
-static void __inline__ savage_ptex_tri (savageContextPtr imesa,
+static void savage_ptex_tri (savageContextPtr imesa,
 					savageVertexPtr v0,
 					savageVertexPtr v1,
 					savageVertexPtr v2) {
@@ -229,7 +229,7 @@
    PTEX_VERTEX (j, tmp, vertsize, 0, v2); EMIT_VERT (j, vb, vertsize, 0, &tmp);
 }
 
-static __inline__ void savage_ptex_line (savageContextPtr imesa,
+static void savage_ptex_line (savageContextPtr imesa,
 					 savageVertexPtr v0,
 					 savageVertexPtr v1 ) {
    GLuint vertsize = imesa->HwVertexSize;
@@ -275,7 +275,7 @@
    EMIT_VERT (j, vb, vertsize, 2, &tmp1);
 } 
 
-static __inline__ void savage_ptex_point (savageContextPtr imesa,
+static void savage_ptex_point (savageContextPtr imesa,
 					  savageVertexPtr v0) {
    GLuint vertsize = imesa->HwVertexSize;
    u_int32_t *vb = savageAllocVtxBuf (imesa, 6*vertsize);


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- mesa.spec	2 Apr 2006 02:40:00 -0000	1.48
+++ mesa.spec	2 Apr 2006 05:27:56 -0000	1.49
@@ -72,6 +72,7 @@
 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
 
 # General patches from upstream go here:
 
@@ -237,6 +238,7 @@
 %if %{with_motif}
 %patch4 -p0 -b .libGLw-enable-motif-support
 %endif
+%patch5 -p0 -b .drop-static-inline
 
 # According to Adam, this patch makes metacity's compositing
 # manager noticeably faster, but also may be a little too big of



From fedora-cvs-commits at redhat.com  Sun Apr  2 06:13:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 2 Apr 2006 01:13:59 -0500
Subject: rpms/mesa/devel mesa.spec, 1.49, 1.50 redhat-mesa-driver-install,
	1.5, 1.6
Message-ID: <200604020613.k326Dx74023068@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	mesa.spec redhat-mesa-driver-install 
Log Message:
- Widen libGLU glob.
- Reenable r300 driver install.



Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- mesa.spec	2 Apr 2006 05:27:56 -0000	1.49
+++ mesa.spec	2 Apr 2006 06:13:56 -0000	1.50
@@ -402,7 +402,7 @@
 %files libGLU
 %defattr(-,root,root,-)
 %{_libdir}/libGLU.so.1
-%{_libdir}/libGLU.so.1.3.0604*
+%{_libdir}/libGLU.so.1.3.*
 
 %files libGLU-devel
 %defattr(-,root,root,-)
@@ -442,6 +442,8 @@
 - Drop mesa-6.4.1-texture-from-drawable.patch and add
   mesa-6.5-texture-from-pixmap-fixes.patch.
 - Update mesa-modular-dri-dir.patch to apply.
+- Widen libGLU glob.
+- Reenable r300 driver install.
 
 * Fri Mar 24 2006 Kristian H??gsberg <krh at redhat.com> 6.4.2-7
 - Set ARCH_FLAGS=-DGLX_USE_TLS to enable TLS for GL contexts.


Index: redhat-mesa-driver-install
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/redhat-mesa-driver-install,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- redhat-mesa-driver-install	25 Feb 2006 18:47:36 -0000	1.5
+++ redhat-mesa-driver-install	2 Apr 2006 06:13:56 -0000	1.6
@@ -40,11 +40,11 @@
 
 # Define per arch list of DRI drivers we wish to build and ship for DRI
 # enabled builds on particular platforms.
-DRI_DRIVERS_x86="i810 i830 i915 mga r128 r200 radeon savage sis unichrome"
-DRI_DRIVERS_x86_64="i810 i830 i915 mga r128 r200 radeon savage sis unichrome"
-DRI_DRIVERS_ppc="mga r128 r200 radeon"
-DRI_DRIVERS_ia64="i810 i830 i915 mga r128 r200 radeon"
-DRI_DRIVERS_alpha="mga r128 r200 radeon"
+DRI_DRIVERS_x86="i810 i830 i915 mga r128 r200 r300 radeon savage sis unichrome"
+DRI_DRIVERS_x86_64="i810 i830 i915 mga r128 r200 r300 radeon savage sis unichrome"
+DRI_DRIVERS_ppc="mga r128 r200 r300 radeon"
+DRI_DRIVERS_ia64="i810 i830 i915 mga r128 r200 r300 radeon"
+DRI_DRIVERS_alpha="mga r128 r200 r300 radeon"
 
 # Current build architecture, passed by rpm spec
 if [ $# -lt 1 ] ; then



From fedora-cvs-commits at redhat.com  Sun Apr  2 07:24:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 2 Apr 2006 03:24:42 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2114,
	1.2115 xen-sched-sedf.patch, 1.1, 1.2
Message-ID: <200604020724.k327Ogaj031995@cvs.devel.redhat.com>

Author: jmorris

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

Modified Files:
	kernel-2.6.spec xen-sched-sedf.patch 
Log Message:
Rework dom0 sedf scheduler defaults patch, bz # 181856



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2114
retrieving revision 1.2115
diff -u -r1.2114 -r1.2115
--- kernel-2.6.spec	1 Apr 2006 21:43:03 -0000	1.2114
+++ kernel-2.6.spec	2 Apr 2006 07:24:38 -0000	1.2115
@@ -681,7 +681,7 @@
 cp -rl xen-vanilla xen
 
 # Any necessary hypervisor patches go here
-%patch20000 -p1
+%patch20000 -p0
 
 cd linux-%{kversion}.%{_target_cpu}
 
@@ -1594,6 +1594,9 @@
 %endif
 
 %changelog
+* Sun Apr  2 2006 James Morris <jmorris at redhat.com>
+- Rework dom0 sedf scheduler defaults patch, bz # 181856
+
 * Sat Apr  1 2006 Dave Jones <davej at redhat.com>
 - 2.6.16-git20
 

xen-sched-sedf.patch:
 sched_sedf.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

Index: xen-sched-sedf.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/xen-sched-sedf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-sched-sedf.patch	13 Mar 2006 17:13:59 -0000	1.1
+++ xen-sched-sedf.patch	2 Apr 2006 07:24:38 -0000	1.2
@@ -1,20 +1,23 @@
 Signed-off-by: James Morris <jmorris at redhat.com>
 
---- xen-3.0.1/xen/common/sched_sedf.c	2006-03-01 17:39:01.000000000 -0500
-+++ xen-3.0.1.w/xen/common/sched_sedf.c	2006-03-13 02:29:18.000000000 -0500
-@@ -374,9 +374,15 @@
+diff -pur xen/common/sched_sedf.c xen.w/common/sched_sedf.c
+--- xen/common/sched_sedf.c	2006-04-02 00:00:27.000000000 -0500
++++ xen.w/common/sched_sedf.c	2006-04-02 00:34:11.000000000 -0500
+@@ -374,9 +374,15 @@ static void sedf_add_task(struct vcpu *d
      if ( d->domain->domain_id == 0 )
      {
          /*set dom0 to something useful to boot the machine*/
+-        inf->period    = MILLISECS(20);
+-        inf->slice     = MILLISECS(15);
 +        /*
-+         * jmorris at redhat.com: workaround to stop soft cpu lockups
-+         * in guests, per
-+         * http://lists.xensource.com/archives/html/xen-devel/2006-02/msg00721.html
++         * Simulate manual workaround for bz #181856, which assigns
++         * the lowest slice weight value for dom0 + extra time.
 +         */
-         inf->period    = MILLISECS(20);
-         inf->slice     = MILLISECS(15);
++        inf->period    = WEIGHT_PERIOD;
++        inf->slice     = 0;
          inf->latency   = 0;
 +        inf->extraweight = 1;
++        inf->weight    = 0;
          inf->deadl_abs = 0;
          inf->status     = EXTRA_AWARE | SEDF_ASLEEP;
      }



From fedora-cvs-commits at redhat.com  Sun Apr  2 13:09:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 2 Apr 2006 09:09:15 -0400
Subject: rpms/xorg-x11-server/FC-5 xorg-x11-server.spec,1.46,1.46.2.1
Message-ID: <200604021309.k32D9Fd6024480@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/xorg-x11-server/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24460

Modified Files:
      Tag: private-wtf-bz187083-branch
	xorg-x11-server.spec 
Log Message:
Test build which _should_ be identical to 1.0.1-9



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/FC-5/xorg-x11-server.spec,v
retrieving revision 1.46
retrieving revision 1.46.2.1
diff -u -r1.46 -r1.46.2.1
--- xorg-x11-server.spec	1 Apr 2006 18:36:49 -0000	1.46
+++ xorg-x11-server.spec	2 Apr 2006 13:09:12 -0000	1.46.2.1
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.0.1
-Release:   9
+Release:   9.wtf.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -36,7 +36,8 @@
 Patch1001:  xorg-x11-server-1.0.1-Red-Hat-extramodes.patch
 
 # INFO: We don't ship the X server on s390/s390x/ppc64
-ExcludeArch: s390 s390x ppc64
+#ExcludeArch: s390 s390x ppc64
+ExclusiveArch: ppc
 
 %define moduledir	%{_libdir}/xorg/modules
 %define sdkdir		%{_includedir}/xorg



From fedora-cvs-commits at redhat.com  Sun Apr  2 15:05:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 2 Apr 2006 11:05:46 -0400
Subject: rpms/wpa_supplicant/devel wpa_supplicant-ssid-len-fix.patch, NONE,
	1.1 wpa_supplicant.spec, 1.13, 1.14
Message-ID: <200604021505.k32F5kDR014980@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/wpa_supplicant/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14962

Modified Files:
	wpa_supplicant.spec 
Added Files:
	wpa_supplicant-ssid-len-fix.patch 
Log Message:
* Sun Apr  2 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-7
- Work around older & incorrect drivers that return null-terminated SSIDs



wpa_supplicant-ssid-len-fix.patch:
 wpa_supplicant.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE wpa_supplicant-ssid-len-fix.patch ---
--- wpa_supplicant-0.4.8/wpa_supplicant.c.ssid-len-fix	2006-04-01 15:02:58.000000000 -0500
+++ wpa_supplicant-0.4.8/wpa_supplicant.c	2006-04-01 15:03:02.000000000 -0500
@@ -1425,6 +1425,9 @@
 		return NULL;
 	}
 
+	if ((ssid_len > 0) && (ssid[ssid_len-1] == '\0'))
+		ssid_len--;
+
 	if (wpa_drv_get_bssid(wpa_s, bssid) < 0) {
 		wpa_printf(MSG_WARNING, "Could not read BSSID from driver.");
 		return NULL;


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wpa_supplicant.spec	27 Mar 2006 19:06:52 -0000	1.13
+++ wpa_supplicant.spec	2 Apr 2006 15:05:15 -0000	1.14
@@ -2,7 +2,7 @@
 Name: wpa_supplicant
 Epoch: 1
 Version: 0.4.8
-Release: 6.fc6
+Release: 7.fc6
 License: GPL
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -17,6 +17,7 @@
 Patch3: wpa_supplicant-assoc-timeout.patch
 Patch4: wpa_supplicant-driver-wext-debug.patch
 Patch5: wpa_supplicant-wep-key-fix.patch
+Patch6: wpa_supplicant-ssid-len-fix.patch
 URL: http://hostap.epitest.fi/wpa_supplicant/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -48,6 +49,7 @@
 %patch3 -p1 -b .assoc-timeout
 %patch4 -p1 -b .driver-wext-debug
 %patch5 -p1 -b .wep-key-fix
+%patch6 -p1 -b .ssid-len-fix
 
 %build
 cp %{SOURCE1} ./.config
@@ -125,6 +127,9 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* Sun Apr  2 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-7
+- Work around older & incorrect drivers that return null-terminated SSIDs
+
 * Mon Mar 27 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-6
 - Add patch to make orinoco happy with WEP keys
 - Enable Prism54-specific driver



From fedora-cvs-commits at redhat.com  Sun Apr  2 15:09:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 2 Apr 2006 11:09:50 -0400
Subject: rpms/wpa_supplicant/FC-5 wpa_supplicant-ssid-len-fix.patch, NONE,
	1.1 wpa_supplicant.spec, 1.13, 1.14
Message-ID: <200604021509.k32F9oEa015070@cvs.devel.redhat.com>

Author: dcbw

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

Modified Files:
	wpa_supplicant.spec 
Added Files:
	wpa_supplicant-ssid-len-fix.patch 
Log Message:
* Sun Apr  2 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-7
- Work around older & incorrect drivers that return null-terminated SSIDs



wpa_supplicant-ssid-len-fix.patch:
 wpa_supplicant.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE wpa_supplicant-ssid-len-fix.patch ---
--- wpa_supplicant-0.4.8/wpa_supplicant.c.ssid-len-fix	2006-04-01 15:02:58.000000000 -0500
+++ wpa_supplicant-0.4.8/wpa_supplicant.c	2006-04-01 15:03:02.000000000 -0500
@@ -1425,6 +1425,9 @@
 		return NULL;
 	}
 
+	if ((ssid_len > 0) && (ssid[ssid_len-1] == '\0'))
+		ssid_len--;
+
 	if (wpa_drv_get_bssid(wpa_s, bssid) < 0) {
 		wpa_printf(MSG_WARNING, "Could not read BSSID from driver.");
 		return NULL;


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/FC-5/wpa_supplicant.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wpa_supplicant.spec	27 Mar 2006 19:10:21 -0000	1.13
+++ wpa_supplicant.spec	2 Apr 2006 15:09:47 -0000	1.14
@@ -2,7 +2,7 @@
 Name: wpa_supplicant
 Epoch: 1
 Version: 0.4.8
-Release: 6.fc5
+Release: 7.fc5
 License: GPL
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -17,6 +17,7 @@
 Patch3: wpa_supplicant-assoc-timeout.patch
 Patch4: wpa_supplicant-driver-wext-debug.patch
 Patch5: wpa_supplicant-wep-key-fix.patch
+Patch6: wpa_supplicant-ssid-len-fix.patch
 URL: http://hostap.epitest.fi/wpa_supplicant/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -48,6 +49,7 @@
 %patch3 -p1 -b .assoc-timeout
 %patch4 -p1 -b .driver-wext-debug
 %patch5 -p1 -b .wep-key-fix
+%patch6 -p1 -b .ssid-len-fix
 
 %build
 cp %{SOURCE1} ./.config
@@ -125,6 +127,9 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* Sun Apr  2 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-7
+- Work around older & incorrect drivers that return null-terminated SSIDs
+
 * Mon Mar 27 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-6
 - Add patch to make orinoco happy with WEP keys
 - Enable Prism54-specific driver



From fedora-cvs-commits at redhat.com  Sun Apr  2 15:32:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 2 Apr 2006 11:32:54 -0400
Subject: rpms/wpa_supplicant/devel wpa_supplicant-ssid-len-fix.patch, 1.1,
	1.2
Message-ID: <200604021532.k32FWste028902@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/wpa_supplicant/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28882

Modified Files:
	wpa_supplicant-ssid-len-fix.patch 
Log Message:
Add fix comment

wpa_supplicant-ssid-len-fix.patch:
 wpa_supplicant.c |    8 ++++++++
 1 files changed, 8 insertions(+)

Index: wpa_supplicant-ssid-len-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/devel/wpa_supplicant-ssid-len-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wpa_supplicant-ssid-len-fix.patch	2 Apr 2006 15:05:14 -0000	1.1
+++ wpa_supplicant-ssid-len-fix.patch	2 Apr 2006 15:32:23 -0000	1.2
@@ -1,9 +1,14 @@
 --- wpa_supplicant-0.4.8/wpa_supplicant.c.ssid-len-fix	2006-04-01 15:02:58.000000000 -0500
 +++ wpa_supplicant-0.4.8/wpa_supplicant.c	2006-04-01 15:03:02.000000000 -0500
-@@ -1425,6 +1425,9 @@
+@@ -1425,6 +1425,14 @@
  		return NULL;
  	}
  
++	/* Older/incorrect drivers return null-terminated SSIDs with
++	 * the null included in the length.  wpa_supplicant does memcmp()
++	 * with driver-reported SSIDs and SSIDs from the config file, which
++	 * don't include the null in their length.  Badness.
++	 */
 +	if ((ssid_len > 0) && (ssid[ssid_len-1] == '\0'))
 +		ssid_len--;
 +



From fedora-cvs-commits at redhat.com  Sun Apr  2 15:37:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 2 Apr 2006 11:37:48 -0400
Subject: rpms/xorg-x11-server/FC-5
	xorg-x11-server-1.0.1-debug-bz187083.patch, NONE,
	1.1.2.1 xorg-x11-server.spec, 1.46.2.1, 1.46.2.2
Message-ID: <200604021537.k32FbmUS028950@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/xorg-x11-server/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv28932

Modified Files:
      Tag: private-wtf-bz187083-branch
	xorg-x11-server.spec 
Added Files:
      Tag: private-wtf-bz187083-branch
	xorg-x11-server-1.0.1-debug-bz187083.patch 
Log Message:
more debug


xorg-x11-server-1.0.1-debug-bz187083.patch:
 lnx_KbdMap.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE xorg-x11-server-1.0.1-debug-bz187083.patch ---
--- xorg-server-1.0.1/hw/xfree86/os-support/linux/lnx_KbdMap.c~	2005-07-03 11:51:16.000000000 +0100
+++ xorg-server-1.0.1/hw/xfree86/os-support/linux/lnx_KbdMap.c	2006-04-02 16:36:39.000000000 +0100
@@ -36,7 +36,7 @@
  *      and the modifiermap is computed.
  */
 
-static void readKernelMapping(InputInfoPtr pInfo,
+void readKernelMapping(InputInfoPtr pInfo,
                               KeySymsPtr pKeySyms, CARD8 *pModMap);
 void
 KbdGetMapping (InputInfoPtr pInfo, KeySymsPtr pKeySyms, CARD8 *pModMap)
@@ -251,7 +251,7 @@ static unsigned char at2lnx[NUM_KEYCODES
 
 #define NUM_CUSTOMKEYS	NR_KEYS
 
-static void
+void
 readKernelMapping(InputInfoPtr pInfo, KeySymsPtr pKeySyms, CARD8 *pModMap)
 {
   KbdDevPtr pKbd = (KbdDevPtr) pInfo->private;
@@ -286,6 +286,8 @@ readKernelMapping(InputInfoPtr pInfo, Ke
     k = map+GLYPHS_PER_KEY;
     maxkey = NUM_AT2LNX;
   }
+  ErrorF("readKernelMapping. map %p is of size 0x%x (i.e. ends %p)\n", map, sizeof(map), ((char *)map)+sizeof(map));
+  ErrorF("NUM_CUSTOMKEYS %d, NUM_AT2LNX %d, NUM_KEYCODES %d, GLYPHS_PER_KEY %d\n", NUM_CUSTOMKEYS, NUM_AT2LNX, NUM_KEYCODES, GLYPHS_PER_KEY);
 
   for (i = 0; i < maxkey; ++i)
   {
@@ -301,6 +303,7 @@ readKernelMapping(InputInfoPtr pInfo, Ke
     {
       unsigned short kval;
 
+      ErrorF("i is %d, j is %d, k is %p\n", i, j, k);
       *k = NoSymbol;
 
       kbe.kb_table = tbl[j];


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/FC-5/xorg-x11-server.spec,v
retrieving revision 1.46.2.1
retrieving revision 1.46.2.2
diff -u -r1.46.2.1 -r1.46.2.2
--- xorg-x11-server.spec	2 Apr 2006 13:09:12 -0000	1.46.2.1
+++ xorg-x11-server.spec	2 Apr 2006 15:37:46 -0000	1.46.2.2
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.0.1
-Release:   9.wtf.1
+Release:   9.wtf.2
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -35,6 +35,8 @@
 Patch1000:  xorg-redhat-die-ugly-pattern-die-die-die.patch
 Patch1001:  xorg-x11-server-1.0.1-Red-Hat-extramodes.patch
 
+Patch2000: xorg-x11-server-1.0.1-debug-bz187083.patch
+
 # INFO: We don't ship the X server on s390/s390x/ppc64
 #ExcludeArch: s390 s390x ppc64
 ExclusiveArch: ppc
@@ -254,6 +256,8 @@
 %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
 %patch1001 -p1 -b .Red-Hat-extramodes
 
+%patch2000 -p1 -b .wtf
+
 %build
 #FONTDIR="${datadir}/X11/fonts"
 #DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/CID/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled"



From fedora-cvs-commits at redhat.com  Sun Apr  2 16:41:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 2 Apr 2006 12:41:53 -0400
Subject: rpms/xorg-x11-server/FC-5 xorg-x11-server-1.0.1-fix-bz187083.patch,
	NONE, 1.1.2.1
Message-ID: <200604021641.k32GfrFs024190@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/xorg-x11-server/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24172

Added Files:
      Tag: private-wtf-bz187083-branch
	xorg-x11-server-1.0.1-fix-bz187083.patch 
Log Message:
Fox for BZ187083

xorg-x11-server-1.0.1-fix-bz187083.patch:
 lnx_KbdMap.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xorg-x11-server-1.0.1-fix-bz187083.patch ---
--- xorg-server-1.0.1/hw/xfree86/os-support/linux/lnx_KbdMap.c~	2005-07-03 11:51:16.000000000 +0100
+++ xorg-server-1.0.1/hw/xfree86/os-support/linux/lnx_KbdMap.c	2006-04-02 17:37:10.000000000 +0100
@@ -180,7 +180,7 @@ static KeySym linux_to_x[256] = {
 /*
  * Maps the AT keycodes to Linux keycodes
  */
-static unsigned char at2lnx[NUM_KEYCODES] =
+static unsigned char at2lnx[] =
 {
 	0x01,	/* KEY_Escape */	0x02,	/* KEY_1 */
 	0x03,	/* KEY_2 */		0x04,	/* KEY_3 */



From fedora-cvs-commits at redhat.com  Sun Apr  2 19:19:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 2 Apr 2006 15:19:30 -0400
Subject: rpms/cups/devel cups-gnome.patch,NONE,1.1 cups.spec,1.150,1.151
Message-ID: <200604021919.k32JJUBf009629@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-gnome.patch 
Log Message:
* Sun Apr  2 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.5
- Backported svn 5365:5366 change for mutex-protected stringpool.


cups-gnome.patch:
 globals.c   |    4 -
 globals.h   |   11 ---
 i18n.h      |    2 
 language.c  |   83 ++++++++++++++++++++-----
 string.c    |  107 ++++++++++++++++++++++++++-------
 string.h    |    1 
 transcode.c |  193 ++++++++++++++++++++++++++++++++++++++++++++----------------
 7 files changed, 297 insertions(+), 104 deletions(-)

--- NEW FILE cups-gnome.patch ---
--- cups-1.2rc1/cups/string.h.gnome	2006-03-07 04:41:42.000000000 +0000
+++ cups-1.2rc1/cups/string.h	2006-04-02 20:04:23.000000000 +0100
@@ -131,6 +131,7 @@
  */
 
 extern char	*_cupsStrAlloc(const char *s);
+extern void	_cupsStrFlush(void);
 extern void	_cupsStrFree(const char *s);
 extern size_t	_cupsStrStatistics(size_t *alloc_bytes, size_t *total_bytes);
 
--- cups-1.2rc1/cups/language.c.gnome	2006-03-31 18:31:36.000000000 +0100
+++ cups-1.2rc1/cups/language.c	2006-04-02 20:08:27.000000000 +0100
@@ -66,6 +66,18 @@
 
 
 /*
+ * Local globals...
+ */
+
+#ifdef HAVE_PTHREAD_H
+static pthread_mutex_t	lang_mutex = PTHREAD_MUTEX_INITIALIZER;
+					/* Mutex to control access to cache */
+#endif /* HAVE_PTHREAD_H */
+static cups_lang_t	*lang_cache = NULL;
+					/* Language string cache */
+
+
+/*
  * Local functions...
  */
 
@@ -204,17 +216,6 @@
 void
 cupsLangFlush(void)
 {
-  _cupsLangFlush(_cupsGlobals());
-}
-
-
-/*
- * '_cupsLangFlush()' - Flush all language data out of the cache.
- */
-
-void
-_cupsLangFlush(_cups_globals_t *cg)	/* I - Global data */
-{
   cups_lang_t	*lang,			/* Current language */
 		*next;			/* Next language */
 
@@ -223,7 +224,11 @@
   * Free all languages in the cache...
   */
 
-  for (lang = cg->lang_cache; lang != NULL; lang = next)
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_lock(&lang_mutex);
+#endif /* HAVE_PTHREAD_H */
+
+  for (lang = lang_cache; lang != NULL; lang = next)
   {
    /*
     * Free all messages...
@@ -239,7 +244,11 @@
     free(lang);
   }
 
-  cg->lang_cache = NULL;
+  lang_cache = NULL;
+
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_unlock(&lang_mutex);
+#endif /* HAVE_PTHREAD_H */
 }
 
 
@@ -252,8 +261,16 @@
 void
 cupsLangFree(cups_lang_t *lang)		/* I - Language to free */
 {
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_lock(&lang_mutex);
+#endif /* HAVE_PTHREAD_H */
+
   if (lang != NULL && lang->used > 0)
     lang->used --;
+
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_unlock(&lang_mutex);
+#endif /* HAVE_PTHREAD_H */
 }
 
 
@@ -577,9 +594,17 @@
     * Country localization not available, look for generic localization...
     */
 
+#ifdef HAVE_PTHREAD_H
+    pthread_mutex_lock(&lang_mutex);
+#endif /* HAVE_PTHREAD_H */
+
     if ((lang = cups_cache_lookup(langname, encoding)) != NULL)
       return (lang);
 
+#ifdef HAVE_PTHREAD_H
+    pthread_mutex_unlock(&lang_mutex);
+#endif /* HAVE_PTHREAD_H */
+
     snprintf(filename, sizeof(filename), "%s/%s/cups_%s.po", cg->localedir,
              langname, langname);
 
@@ -603,7 +628,7 @@
   * record...
   */
 
-  for (lang = cg->lang_cache; lang != NULL; lang = lang->next)
+  for (lang = lang_cache; lang != NULL; lang = lang->next)
     if (lang->used == 0)
       break;
 
@@ -614,10 +639,16 @@
     */
 
     if ((lang = calloc(sizeof(cups_lang_t), 1)) == NULL)
+    {
+#ifdef HAVE_PTHREAD_H
+      pthread_mutex_unlock(&lang_mutex);
+#endif /* HAVE_PTHREAD_H */
+
       return (NULL);
+    }
 
-    lang->next     = cg->lang_cache;
-    cg->lang_cache = lang;
+    lang->next = lang_cache;
+    lang_cache = lang;
   }
   else
   {
@@ -650,6 +681,10 @@
   * Return...
   */
 
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_unlock(&lang_mutex);
+#endif /* HAVE_PTHREAD_H */
+
   return (lang);
 }
 
@@ -672,7 +707,21 @@
   if (!lang || !message)
     return (message);
 
+#ifdef HAVE_PTHREAD_H
+  {
+    const char *s;			/* Localized message */
+
+    pthread_mutex_lock(&lang_mutex);
+
+    s = _cupsMessageLookup(lang->strings, message);
+
+    pthread_mutex_unlock(&lang_mutex);
+
+    return (s);
+  }
+#else
   return (_cupsMessageLookup(lang->strings, message));
+#endif /* HAVE_PTHREAD_H */
 }
 
 
@@ -1170,7 +1219,7 @@
   * Loop through the cache and return a match if found...
   */
 
-  for (lang = _cupsGlobals()->lang_cache; lang != NULL; lang = lang->next)
+  for (lang = lang_cache; lang != NULL; lang = lang->next)
   {
     DEBUG_printf(("cups_cache_lookup: lang=%p, language=\"%s\", encoding=%d(%s)\n",
                   lang, lang->language, lang->encoding,
--- cups-1.2rc1/cups/i18n.h.gnome	2006-03-15 21:09:32.000000000 +0000
+++ cups-1.2rc1/cups/i18n.h	2006-04-02 20:04:23.000000000 +0100
@@ -31,6 +31,7 @@
  * Include necessary headers...
  */
 
+#  include <stdio.h>
 #  include "transcode.h"
 
 #  ifdef __cplusplus
@@ -90,6 +91,7 @@
  * Prototypes...
  */
 
+extern void		_cupsCharmapFlush(void);
 extern void		_cupsCharmapFree(const cups_encoding_t encoding);
 extern void		*_cupsCharmapGet(const cups_encoding_t encoding);
 extern const char	*_cupsEncodingName(cups_encoding_t encoding);
--- cups-1.2rc1/cups/globals.c.gnome	2006-03-21 15:28:29.000000000 +0000
+++ cups-1.2rc1/cups/globals.c	2006-04-02 20:04:23.000000000 +0100
@@ -163,10 +163,6 @@
   for (i = 0; i < 3; i ++)
     cupsFileClose(cg->stdio_files[i]);
 
-  _cupsStrFlush(cg);
-  _cupsLangFlush(cg);
-  _cupsCharmapFlush(cg);
-
   cupsFreeOptions(cg->cupsd_num_settings, cg->cupsd_settings);
 
   free(value);
--- cups-1.2rc1/cups/transcode.c.gnome	2006-03-17 19:50:14.000000000 +0000
+++ cups-1.2rc1/cups/transcode.c	2006-04-02 20:04:23.000000000 +0100
@@ -37,6 +37,7 @@
  *   conv_vbcs_to_utf8() - Convert legacy DBCS/VBCS to UTF-8.
  *   free_sbcs_charmap() - Free memory used by a single byte character set.
  *   free_vbcs_charmap() - Free memory used by a variable byte character set.
+ *   get_charmap()       - Lookup or get a character set map (private).
  *   get_charmap_count() - Count lines in a charmap file.
  *   get_sbcs_charmap()  - Get SBCS Charmap.
  *   get_vbcs_charmap()  - Get DBCS/VBCS Charmap.
@@ -54,6 +55,20 @@
 
 
 /*
+ * Local globals...
+ */
+
+#ifdef HAVE_PTHREAD_H
+static pthread_mutex_t	map_mutex = PTHREAD_MUTEX_INITIALIZER;
+					/* Mutex to control access to maps */
+#endif /* HAVE_PTHREAD_H */
+static _cups_cmap_t	*cmap_cache = NULL;
+					/* SBCS Charmap Cache */
+static _cups_vmap_t	*vmap_cache = NULL;
+					/* VBCS Charmap Cache */
+
+
+/*
  * Local functions...
  */
 
@@ -76,6 +91,7 @@
 					  const cups_encoding_t encoding);
 static void		free_sbcs_charmap(_cups_cmap_t *sbcs);
 static void		free_vbcs_charmap(_cups_vmap_t *vbcs);
+static void		*get_charmap(const cups_encoding_t encoding);
 static int		get_charmap_count(cups_file_t *fp);
 static _cups_cmap_t	*get_sbcs_charmap(const cups_encoding_t encoding,
 				          const char *filename);
@@ -88,7 +104,7 @@
  */
 
 void
-_cupsCharmapFlush(_cups_globals_t *cg)	/* I - Global data */
+_cupsCharmapFlush(void)
 {
   _cups_cmap_t	*cmap,			/* Legacy SBCS / Unicode Charset Map */
 		*cnext;			/* Next Legacy SBCS Charset Map */
@@ -96,24 +112,28 @@
 		*vnext;			/* Next Legacy VBCS Charset Map */
 
 
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_lock(&map_mutex);
+#endif /* HAVE_PTHREAD_H */
+
  /*
   * Loop through SBCS charset map cache, free all memory...
   */
 
-  for (cmap = cg->cmap_cache; cmap; cmap = cnext)
+  for (cmap = cmap_cache; cmap; cmap = cnext)
   {
     cnext = cmap->next;
 
     free_sbcs_charmap(cmap);
   }
 
-  cg->cmap_cache = NULL;
+  cmap_cache = NULL;
 
  /*
   * Loop through DBCS/VBCS charset map cache, free all memory...
   */
 
-  for (vmap = cg->vmap_cache; vmap; vmap = vnext)
+  for (vmap = vmap_cache; vmap; vmap = vnext)
   {
     vnext = vmap->next;
 
@@ -122,7 +142,11 @@
     free(vmap);
   }
 
-  cg->vmap_cache = NULL;
+  vmap_cache = NULL;
+
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_unlock(&map_mutex);
+#endif /* HAVE_PTHREAD_H */
 }
 
 
@@ -138,21 +162,23 @@
 {
   _cups_cmap_t	*cmap;			/* Legacy SBCS / Unicode Charset Map */
   _cups_vmap_t	*vmap;			/* Legacy VBCS / Unicode Charset Map */
-  _cups_globals_t *cg = _cupsGlobals(); /* Pointer to library globals */
 
 
  /*
   * See if we already have this SBCS charset map loaded...
   */
 
-  for (cmap = cg->cmap_cache; cmap; cmap = cmap->next)
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_lock(&map_mutex);
+#endif /* HAVE_PTHREAD_H */
+
+  for (cmap = cmap_cache; cmap; cmap = cmap->next)
   {
     if (cmap->encoding == encoding)
     {
       if (cmap->used > 0)
 	cmap->used --;
-
-      return;
+      break;
     }
   }
 
@@ -160,15 +186,19 @@
   * See if we already have this DBCS/VBCS charset map loaded...
   */
 
-  for (vmap = cg->vmap_cache; vmap; vmap = vmap->next)
+  for (vmap = vmap_cache; vmap; vmap = vmap->next)
   {
     if (vmap->encoding == encoding)
     {
       if (vmap->used > 0)
 	vmap->used --;
-      return;
+      break;
     }
   }
+
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_unlock(&map_mutex);
+#endif /* HAVE_PTHREAD_H */
 }
 
 
@@ -185,8 +215,7 @@
 _cupsCharmapGet(
     const cups_encoding_t encoding)	/* I - Encoding */
 {
-  char		filename[1024];		/* Filename for charset map file */
-  _cups_globals_t *cg = _cupsGlobals(); /* Global data */
+  void	*charmap;			/* Charset map pointer */
 
 
   DEBUG_printf(("_cupsCharmapGet(encoding=%d)\n", encoding));
@@ -202,24 +231,20 @@
   }
 
  /*
-  * Get the data directory and charset map name...
+  * Lookup or get the charset map pointer and return...
   */
 
-  snprintf(filename, sizeof(filename), "%s/charmaps/%s.txt",
-	   cg->cups_datadir, _cupsEncodingName(encoding));
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_lock(&map_mutex);
+#endif /* HAVE_PTHREAD_H */
 
-  DEBUG_printf(("    filename=\"%s\"\n", filename));
+  charmap = get_charmap(encoding);
 
- /*
-  * Read charset map input file into cache...
-  */
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_unlock(&map_mutex);
+#endif /* HAVE_PTHREAD_H */
 
-  if (encoding < CUPS_ENCODING_SBCS_END)
-    return (get_sbcs_charmap(encoding, filename));
-  else if (encoding < CUPS_ENCODING_VBCS_END)
-    return (get_vbcs_charmap(encoding, filename));
-  else
-    return (NULL);
+  return (charmap);
 }
 
 
@@ -239,6 +264,9 @@
     const int maxout,			/* I - Max output */
     const cups_encoding_t encoding)	/* I - Encoding */
 {
+  int	bytes;				/* Number of bytes converted */
+
+
  /*
   * Check for valid arguments...
   */
@@ -270,15 +298,25 @@
   * Convert input legacy charset to UTF-8...
   */
 
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_lock(&map_mutex);
+#endif /* HAVE_PTHREAD_H */
+
   if (encoding < CUPS_ENCODING_SBCS_END)
-    return (conv_sbcs_to_utf8(dest, (cups_sbcs_t *)src, maxout, encoding));
+    bytes = conv_sbcs_to_utf8(dest, (cups_sbcs_t *)src, maxout, encoding);
   else if (encoding < CUPS_ENCODING_VBCS_END)
-    return (conv_vbcs_to_utf8(dest, (cups_sbcs_t *)src, maxout, encoding));
+    bytes = conv_vbcs_to_utf8(dest, (cups_sbcs_t *)src, maxout, encoding);
   else
   {
-    puts("    Bad encoding, returning -1");
-    return (-1);
+    DEBUG_puts("    Bad encoding, returning -1");
+    bytes = -1;
   }
+
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_unlock(&map_mutex);
+#endif /* HAVE_PTHREAD_H */
+
+  return (bytes);
 }
 
 
@@ -298,6 +336,9 @@
     const int		  maxout,	/* I - Max output */
     const cups_encoding_t encoding)	/* I - Encoding */
 {
+  int	bytes;				/* Number of bytes converted */
+
+
  /*
   * Check for valid arguments...
   */
@@ -325,12 +366,22 @@
   * Convert input UTF-8 to legacy charset...
   */
 
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_lock(&map_mutex);
+#endif /* HAVE_PTHREAD_H */
+
   if (encoding < CUPS_ENCODING_SBCS_END)
-    return (conv_utf8_to_sbcs((cups_sbcs_t *)dest, src, maxout, encoding));
+    bytes = conv_utf8_to_sbcs((cups_sbcs_t *)dest, src, maxout, encoding);
   else if (encoding < CUPS_ENCODING_VBCS_END)
-    return (conv_utf8_to_vbcs((cups_sbcs_t *)dest, src, maxout, encoding));
+    bytes = conv_utf8_to_vbcs((cups_sbcs_t *)dest, src, maxout, encoding);
   else
-    return (-1);
+    bytes = -1;
+
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_unlock(&map_mutex);
+#endif /* HAVE_PTHREAD_H */
+
+  return (bytes);
 }
 
 
@@ -675,7 +726,7 @@
   * Find legacy charset map in cache...
   */
 
-  if ((cmap = (_cups_cmap_t *)_cupsCharmapGet(encoding)) == NULL)
+  if ((cmap = (_cups_cmap_t *)get_charmap(encoding)) == NULL)
     return (-1);
 
  /*
@@ -714,7 +765,7 @@
   * Convert internal UCS-4 to output UTF-8 (and delete BOM)...
   */
 
-  _cupsCharmapFree(encoding);
+  cmap->used --;
 
   return (cupsUTF32ToUTF8(dest, work, maxout));
 }
@@ -743,7 +794,7 @@
   * Find legacy charset map in cache...
   */
 
-  if ((cmap = (_cups_cmap_t *) _cupsCharmapGet(encoding)) == NULL)
+  if ((cmap = (_cups_cmap_t *)get_charmap(encoding)) == NULL)
     return (-1);
 
  /*
@@ -790,7 +841,7 @@
 
   *dest = '\0';
 
-  _cupsCharmapFree(encoding);
+  cmap->used --;
 
   return ((int)(dest - start));
 }
@@ -820,7 +871,7 @@
   * Find legacy charset map in cache...
   */
 
-  if ((vmap = (_cups_vmap_t *)_cupsCharmapGet(encoding)) == NULL)
+  if ((vmap = (_cups_vmap_t *)get_charmap(encoding)) == NULL)
     return (-1);
 
  /*
@@ -902,7 +953,7 @@
 
   *dest = '\0';
 
-  _cupsCharmapFree(encoding);
+  vmap->used --;
 
   return ((int)(dest - start));
 }
@@ -932,7 +983,7 @@
   * Find legacy charset map in cache...
   */
 
-  if ((vmap = (_cups_vmap_t *)_cupsCharmapGet(encoding)) == NULL)
+  if ((vmap = (_cups_vmap_t *)get_charmap(encoding)) == NULL)
     return (-1);
 
  /*
@@ -1027,7 +1078,7 @@
 
   *workptr = 0;
 
-  _cupsCharmapFree(encoding);
+  vmap->used --;
 
  /*
   * Convert internal UCS-4 to output UTF-8 (and delete BOM)...
@@ -1081,6 +1132,46 @@
 
 
 /*
+ * 'get_charmap()' - Lookup or get a character set map (private).
+ *
+ * This code handles single-byte (SBCS), double-byte (DBCS), and
+ * variable-byte (VBCS) character sets _without_ charset escapes...
+ * This code does not handle multiple-byte character sets (MBCS)
+ * (such as ISO-2022-JP) with charset switching via escapes...
+ */
+
+
+void *					/* O - Charset map pointer */
+get_charmap(
+    const cups_encoding_t encoding)	/* I - Encoding */
+{
+  char		filename[1024];		/* Filename for charset map file */
+  _cups_globals_t *cg = _cupsGlobals();	/* Global data */
+
+
+ /*
+  * Get the data directory and charset map name...
+  */
+
+  snprintf(filename, sizeof(filename), "%s/charmaps/%s.txt",
+	   cg->cups_datadir, _cupsEncodingName(encoding));
+
+  DEBUG_printf(("    filename=\"%s\"\n", filename));
+
+ /*
+  * Read charset map input file into cache...
+  */
+
+  if (encoding < CUPS_ENCODING_SBCS_END)
+    return (get_sbcs_charmap(encoding, filename));
+  else if (encoding < CUPS_ENCODING_VBCS_END)
+    return (get_vbcs_charmap(encoding, filename));
+  else
+    return (NULL);
+}
+
+
+/*
  * 'get_charmap_count()' - Count lines in a charmap file.
  */
 
@@ -1129,19 +1220,19 @@
   cups_ucs2_t	*crow;			/* Pointer to UCS-2 row in 'char2uni' */
   cups_sbcs_t	*srow;			/* Pointer to SBCS row in 'uni2char' */
   char		line[256];		/* Line from charset map file */
-  _cups_globals_t *cg = _cupsGlobals();	/* Pointer to library globals */
 
 
  /*
   * See if we already have this SBCS charset map loaded...
   */
 
-  for (cmap = cg->cmap_cache; cmap; cmap = cmap->next)
+  for (cmap = cmap_cache; cmap; cmap = cmap->next)
   {
     if (cmap->encoding == encoding)
     {
       cmap->used ++;
       DEBUG_printf(("    returning existing cmap=%p\n", cmap));
+
       return ((void *)cmap);
     }
   }
@@ -1161,6 +1252,7 @@
   {
     cupsFileClose(fp);
     DEBUG_puts("    Unable to allocate memory!");
+
     return (NULL);
   }
 
@@ -1228,8 +1320,8 @@
   * Add it to the cache and return...
   */
 
-  cmap->next     = cg->cmap_cache;
-  cg->cmap_cache = cmap;
+  cmap->next = cmap_cache;
+  cmap_cache = cmap;
 
   DEBUG_printf(("    returning new cmap=%p\n", cmap));
 
@@ -1273,7 +1365,6 @@
   char		line[256];		/* Line from charset map file */
   int		i;			/* Loop variable */
   int		wide;			/* 32-bit legacy char */
-  _cups_globals_t *cg = _cupsGlobals();	/* Pointer to library globals */
 
 
   DEBUG_printf(("get_vbcs_charmap(encoding=%d, filename=\"%s\")\n",
@@ -1283,12 +1374,13 @@
   * See if we already have this DBCS/VBCS charset map loaded...
   */
 
-  for (vmap = cg->vmap_cache; vmap; vmap = vmap->next)
+  for (vmap = vmap_cache; vmap; vmap = vmap->next)
   {
     if (vmap->encoding == encoding)
     {
       vmap->used ++;
       DEBUG_printf(("    returning existing vmap=%p\n", vmap));
+
       return ((void *)vmap);
     }
   }
@@ -1300,6 +1392,7 @@
   if ((fp = cupsFileOpen(filename, "r")) == NULL)
   {
     DEBUG_printf(("    Unable to open file: %s\n", strerror(errno)));
+
     return (NULL);
   }
 
@@ -1310,6 +1403,7 @@
   if ((mapcount = get_charmap_count(fp)) <= 0)
   {
     DEBUG_puts("    Unable to get charmap count!");
+
     return (NULL);
   }
 
@@ -1323,6 +1417,7 @@
   {
     cupsFileClose(fp);
     DEBUG_puts("    Unable to allocate memory!");
+
     return (NULL);
   }
 
@@ -1465,8 +1560,8 @@
   * Add it to the cache and return...
   */
 
-  vmap->next     = cg->vmap_cache;
-  cg->vmap_cache = vmap;
+  vmap->next     = vmap_cache;
+  vmap_cache = vmap;
 
   DEBUG_printf(("    returning new vmap=%p\n", vmap));
 
--- cups-1.2rc1/cups/string.c.gnome	2006-03-31 18:45:13.000000000 +0100
+++ cups-1.2rc1/cups/string.c	2006-04-02 20:06:54.000000000 +0100
@@ -46,9 +46,24 @@
 
 #include <stdlib.h>
 #include <limits.h>
+#include "array.h"
 #include "debug.h"
 #include "string.h"
-#include "globals.h"
+#ifdef HAVE_PTHREAD_H
+#  include <pthread.h>
+#endif /* HAVE_PTHREAD_H */
+
+
+/*
+ * Local globals...
+ */
+
+#ifdef HAVE_PTHREAD_H
+static pthread_mutex_t	sp_mutex = PTHREAD_MUTEX_INITIALIZER;
+					/* Mutex to control access to pool */
+#endif /* HAVE_PTHREAD_H */
+static cups_array_t	*stringpool = NULL;
+					/* Global string pool */
 
 
 /*
@@ -65,7 +80,6 @@
 char *					/* O - String pointer */
 _cupsStrAlloc(const char *s)		/* I - String */
 {
-  _cups_globals_t	*cg;		/* Global data */
   _cups_sp_item_t	*item,		/* String pool item */
 			key;		/* Search key */
 
@@ -81,13 +95,21 @@
   * Get the string pool...
   */
 
-  cg = _cupsGlobals();
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_lock(&sp_mutex);
+#endif /* HAVE_PTHREAD_H */
+
+  if (!stringpool)
+    stringpool = cupsArrayNew((cups_array_func_t)compare_sp_items, NULL);
+
+  if (!stringpool)
+  {
+#ifdef HAVE_PTHREAD_H
+    pthread_mutex_unlock(&sp_mutex);
+#endif /* HAVE_PTHREAD_H */
 
-  if (!cg->stringpool)
-    cg->stringpool = cupsArrayNew((cups_array_func_t)compare_sp_items, NULL);
-
-  if (!cg->stringpool)
     return (NULL);
+  }
 
  /*
   * See if the string is already in the pool...
@@ -95,7 +117,7 @@
 
   key.str = (char *)s;
 
-  if ((item = (_cups_sp_item_t *)cupsArrayFind(cg->stringpool, &key)) != NULL)
+  if ((item = (_cups_sp_item_t *)cupsArrayFind(stringpool, &key)) != NULL)
   {
    /*
     * Found it, return the cached string...
@@ -103,6 +125,10 @@
 
     item->ref_count ++;
 
+#ifdef HAVE_PTHREAD_H
+    pthread_mutex_unlock(&sp_mutex);
+#endif /* HAVE_PTHREAD_H */
+
     return (item->str);
   }
 
@@ -112,7 +138,13 @@
 
   item = (_cups_sp_item_t *)calloc(1, sizeof(_cups_sp_item_t));
   if (!item)
+  {
+#ifdef HAVE_PTHREAD_H
+    pthread_mutex_unlock(&sp_mutex);
+#endif /* HAVE_PTHREAD_H */
+
     return (NULL);
+  }
 
   item->ref_count = 1;
   item->str       = strdup(s);
@@ -120,6 +152,11 @@
   if (!item->str)
   {
     free(item);
+
+#ifdef HAVE_PTHREAD_H
+    pthread_mutex_unlock(&sp_mutex);
+#endif /* HAVE_PTHREAD_H */
+
     return (NULL);
   }
 
@@ -127,7 +164,11 @@
   * Add the string to the pool and return it...
   */
 
-  cupsArrayAdd(cg->stringpool, item);
+  cupsArrayAdd(stringpool, item);
+
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_unlock(&sp_mutex);
+#endif /* HAVE_PTHREAD_H */
 
   return (item->str);
 }
@@ -138,20 +179,30 @@
  */
 
 void
-_cupsStrFlush(_cups_globals_t *cg)	/* I - Global data */
+_cupsStrFlush(void)
 {
   _cups_sp_item_t	*item;		/* Current item */
 
+  DEBUG_printf(("    %d strings in array\n", cupsArrayCount(stringpool)));
+
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_lock(&sp_mutex);
+#endif /* HAVE_PTHREAD_H */
 
-  for (item = (_cups_sp_item_t *)cupsArrayFirst(cg->stringpool);
+  for (item = (_cups_sp_item_t *)cupsArrayFirst(stringpool);
        item;
-       item = (_cups_sp_item_t *)cupsArrayNext(cg->stringpool))
+       item = (_cups_sp_item_t *)cupsArrayNext(stringpool))
   {
     free(item->str);
     free(item);
   }
 
-  cupsArrayDelete(cg->stringpool);
+  cupsArrayDelete(stringpool);
+  stringpool = NULL;
+
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_unlock(&sp_mutex);
+#endif /* HAVE_PTHREAD_H */
 }
 
 
@@ -242,7 +293,6 @@
 void
 _cupsStrFree(const char *s)		/* I - String to free */
 {
-  _cups_globals_t	*cg;		/* Global data */
   _cups_sp_item_t	*item,		/* String pool item */
 			key;		/* Search key */
 
@@ -258,18 +308,20 @@
   * Get the string pool...
   */
 
-  cg = _cupsGlobals();
-
-  if (!cg->stringpool)
+  if (!stringpool)
     return;
 
  /*
   * See if the string is already in the pool...
   */
 
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_lock(&sp_mutex);
+#endif /* HAVE_PTHREAD_H */
+
   key.str = (char *)s;
 
-  if ((item = (_cups_sp_item_t *)cupsArrayFind(cg->stringpool, &key)) != NULL
+  if ((item = (_cups_sp_item_t *)cupsArrayFind(stringpool, &key)) != NULL
       && item->str == s)
   {
    /*
@@ -284,12 +336,16 @@
       * Remove and free...
       */
 
-      cupsArrayRemove(cg->stringpool, item);
+      cupsArrayRemove(stringpool, item);
 
       free(item->str);
       free(item);
     }
   }
+
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_unlock(&sp_mutex);
+#endif /* HAVE_PTHREAD_H */
 }
 
 
@@ -403,19 +459,20 @@
 			tbytes,		/* Total string bytes */
 			len;		/* Length of string */
   _cups_sp_item_t	*item;		/* Current item */
-  _cups_globals_t	*cg;		/* Global data */
 
 
  /*
   * Loop through strings in pool, counting everything up...
   */
 
-  cg = _cupsGlobals();
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_lock(&sp_mutex);
+#endif /* HAVE_PTHREAD_H */
 
   for (count = 0, abytes = 0, tbytes = 0,
-           item = (_cups_sp_item_t *)cupsArrayFirst(cg->stringpool);
+           item = (_cups_sp_item_t *)cupsArrayFirst(stringpool);
        item;
-       item = (_cups_sp_item_t *)cupsArrayNext(cg->stringpool))
+       item = (_cups_sp_item_t *)cupsArrayNext(stringpool))
   {
    /*
     * Count allocated memory, using a 64-bit aligned buffer as a basis.
@@ -427,6 +484,10 @@
     tbytes += item->ref_count * len;
   }
 
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_unlock(&sp_mutex);
+#endif /* HAVE_PTHREAD_H */
+
  /*
   * Return values...
   */
--- cups-1.2rc1/cups/globals.h.gnome	2006-03-21 15:28:29.000000000 +0000
+++ cups-1.2rc1/cups/globals.h	2006-04-02 20:04:23.000000000 +0100
@@ -95,7 +95,6 @@
 					/* Unknown error statuses */
 
   /* language.c */
-  cups_lang_t		*lang_cache;	/* Language string cache */
   cups_lang_t		*lang_default;	/* Default language */
 #  ifdef __APPLE__
 #    ifdef HAVE_CF_LOCALE_ID
@@ -113,10 +112,6 @@
   /* tempfile.c */
   char			tempfile[1024];	/* cupsTempFd/File buffer */
 
-  /* transcode.c */
-  _cups_cmap_t		*cmap_cache;	/* SBCS Charmap Cache */
-  _cups_vmap_t		*vmap_cache;	/* VBCS Charmap Cache */
-
   /* usersys.c */
   http_encryption_t	encryption;	/* Encryption setting */
   char			user[65],	/* User name */
@@ -134,9 +129,6 @@
 					/* Default printer */
   char			ppd_filename[HTTP_MAX_URI];
 					/* PPD filename */
-
-  /* string.c */
-  cups_array_t		*stringpool;	/* String pool */
 } _cups_globals_t;
 
 
@@ -144,12 +136,9 @@
  * Prototypes...
  */
 
-extern void		_cupsCharmapFlush(_cups_globals_t *cg);
 extern const char	*_cupsGetPassword(const char *prompt);
 extern _cups_globals_t	*_cupsGlobals(void);
-extern void		_cupsLangFlush(_cups_globals_t *cg);
 extern void		_cupsSetError(ipp_status_t status, const char *message);
-extern void		_cupsStrFlush(_cups_globals_t *cg);
 
 
 /*


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- cups.spec	1 Apr 2006 08:24:52 -0000	1.150
+++ cups.spec	2 Apr 2006 19:19:27 -0000	1.151
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2
-Release: 0.2.%{beta}.4
+Release: 0.2.%{beta}.5
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
@@ -39,6 +39,7 @@
 Patch16: cups-pie.patch
 Patch17: cups-1.1.19-no_rpath.patch
 Patch18: cups-language.patch
+Patch19: cups-gnome.patch
 Patch22: cups-dest-cache-v2.patch
 Patch24: cups-maxlogsize.patch
 Patch28: cups-no-propagate-ipp-port.patch
@@ -131,6 +132,7 @@
 %endif
 %patch17 -p1 -b .no_rpath
 %patch18 -p1 -b .language
+%patch19 -p1 -b .gnome
 %patch22 -p1 -b .dest-cache-v2
 %patch24 -p1 -b .maxlogsize
 %patch28 -p1 -b .no-propagate-ipp-port
@@ -381,6 +383,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Sun Apr  2 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.5
+- Backported svn 5365:5366 change for mutex-protected stringpool.
+
 * Sat Apr  1 2006 Tim Waugh <twaugh at redhat.com>
 - Fixed _cupsStrFree() (STR #1529).
 



From fedora-cvs-commits at redhat.com  Sun Apr  2 19:22:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 2 Apr 2006 15:22:21 -0400
Subject: rpms/cups/FC-5 cups-gnome.patch,NONE,1.1 cups.spec,1.137,1.138
Message-ID: <200604021922.k32JMLUB009717@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-gnome.patch 
Log Message:
* Sun Apr  2 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.5
- Backported svn 5365:5366 change for mutex-protected stringpool.


cups-gnome.patch:
 globals.c   |    4 -
 globals.h   |   11 ---
 i18n.h      |    2 
 language.c  |   83 ++++++++++++++++++++-----
 string.c    |  107 ++++++++++++++++++++++++++-------
 string.h    |    1 
 transcode.c |  193 ++++++++++++++++++++++++++++++++++++++++++++----------------
 7 files changed, 297 insertions(+), 104 deletions(-)

--- NEW FILE cups-gnome.patch ---
--- cups-1.2rc1/cups/string.h.gnome	2006-03-07 04:41:42.000000000 +0000
+++ cups-1.2rc1/cups/string.h	2006-04-02 20:04:23.000000000 +0100
@@ -131,6 +131,7 @@
  */
 
 extern char	*_cupsStrAlloc(const char *s);
+extern void	_cupsStrFlush(void);
 extern void	_cupsStrFree(const char *s);
 extern size_t	_cupsStrStatistics(size_t *alloc_bytes, size_t *total_bytes);
 
--- cups-1.2rc1/cups/language.c.gnome	2006-03-31 18:31:36.000000000 +0100
+++ cups-1.2rc1/cups/language.c	2006-04-02 20:08:27.000000000 +0100
@@ -66,6 +66,18 @@
 
 
 /*
+ * Local globals...
+ */
+
+#ifdef HAVE_PTHREAD_H
+static pthread_mutex_t	lang_mutex = PTHREAD_MUTEX_INITIALIZER;
+					/* Mutex to control access to cache */
+#endif /* HAVE_PTHREAD_H */
+static cups_lang_t	*lang_cache = NULL;
+					/* Language string cache */
+
+
+/*
  * Local functions...
  */
 
@@ -204,17 +216,6 @@
 void
 cupsLangFlush(void)
 {
-  _cupsLangFlush(_cupsGlobals());
-}
-
-
-/*
- * '_cupsLangFlush()' - Flush all language data out of the cache.
- */
-
-void
-_cupsLangFlush(_cups_globals_t *cg)	/* I - Global data */
-{
   cups_lang_t	*lang,			/* Current language */
 		*next;			/* Next language */
 
@@ -223,7 +224,11 @@
   * Free all languages in the cache...
   */
 
-  for (lang = cg->lang_cache; lang != NULL; lang = next)
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_lock(&lang_mutex);
+#endif /* HAVE_PTHREAD_H */
+
+  for (lang = lang_cache; lang != NULL; lang = next)
   {
    /*
     * Free all messages...
@@ -239,7 +244,11 @@
     free(lang);
   }
 
-  cg->lang_cache = NULL;
+  lang_cache = NULL;
+
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_unlock(&lang_mutex);
+#endif /* HAVE_PTHREAD_H */
 }
 
 
@@ -252,8 +261,16 @@
 void
 cupsLangFree(cups_lang_t *lang)		/* I - Language to free */
 {
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_lock(&lang_mutex);
+#endif /* HAVE_PTHREAD_H */
+
   if (lang != NULL && lang->used > 0)
     lang->used --;
+
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_unlock(&lang_mutex);
+#endif /* HAVE_PTHREAD_H */
 }
 
 
@@ -577,9 +594,17 @@
     * Country localization not available, look for generic localization...
     */
 
+#ifdef HAVE_PTHREAD_H
+    pthread_mutex_lock(&lang_mutex);
+#endif /* HAVE_PTHREAD_H */
+
     if ((lang = cups_cache_lookup(langname, encoding)) != NULL)
       return (lang);
 
+#ifdef HAVE_PTHREAD_H
+    pthread_mutex_unlock(&lang_mutex);
+#endif /* HAVE_PTHREAD_H */
+
     snprintf(filename, sizeof(filename), "%s/%s/cups_%s.po", cg->localedir,
              langname, langname);
 
@@ -603,7 +628,7 @@
   * record...
   */
 
-  for (lang = cg->lang_cache; lang != NULL; lang = lang->next)
+  for (lang = lang_cache; lang != NULL; lang = lang->next)
     if (lang->used == 0)
       break;
 
@@ -614,10 +639,16 @@
     */
 
     if ((lang = calloc(sizeof(cups_lang_t), 1)) == NULL)
+    {
+#ifdef HAVE_PTHREAD_H
+      pthread_mutex_unlock(&lang_mutex);
+#endif /* HAVE_PTHREAD_H */
+
       return (NULL);
+    }
 
-    lang->next     = cg->lang_cache;
-    cg->lang_cache = lang;
+    lang->next = lang_cache;
+    lang_cache = lang;
   }
   else
   {
@@ -650,6 +681,10 @@
   * Return...
   */
 
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_unlock(&lang_mutex);
+#endif /* HAVE_PTHREAD_H */
+
   return (lang);
 }
 
@@ -672,7 +707,21 @@
   if (!lang || !message)
     return (message);
 
+#ifdef HAVE_PTHREAD_H
+  {
+    const char *s;			/* Localized message */
+
+    pthread_mutex_lock(&lang_mutex);
+
+    s = _cupsMessageLookup(lang->strings, message);
+
+    pthread_mutex_unlock(&lang_mutex);
+
+    return (s);
+  }
+#else
   return (_cupsMessageLookup(lang->strings, message));
+#endif /* HAVE_PTHREAD_H */
 }
 
 
@@ -1170,7 +1219,7 @@
   * Loop through the cache and return a match if found...
   */
 
-  for (lang = _cupsGlobals()->lang_cache; lang != NULL; lang = lang->next)
+  for (lang = lang_cache; lang != NULL; lang = lang->next)
   {
     DEBUG_printf(("cups_cache_lookup: lang=%p, language=\"%s\", encoding=%d(%s)\n",
                   lang, lang->language, lang->encoding,
--- cups-1.2rc1/cups/i18n.h.gnome	2006-03-15 21:09:32.000000000 +0000
+++ cups-1.2rc1/cups/i18n.h	2006-04-02 20:04:23.000000000 +0100
@@ -31,6 +31,7 @@
  * Include necessary headers...
  */
 
+#  include <stdio.h>
 #  include "transcode.h"
 
 #  ifdef __cplusplus
@@ -90,6 +91,7 @@
  * Prototypes...
  */
 
+extern void		_cupsCharmapFlush(void);
 extern void		_cupsCharmapFree(const cups_encoding_t encoding);
 extern void		*_cupsCharmapGet(const cups_encoding_t encoding);
 extern const char	*_cupsEncodingName(cups_encoding_t encoding);
--- cups-1.2rc1/cups/globals.c.gnome	2006-03-21 15:28:29.000000000 +0000
+++ cups-1.2rc1/cups/globals.c	2006-04-02 20:04:23.000000000 +0100
@@ -163,10 +163,6 @@
   for (i = 0; i < 3; i ++)
     cupsFileClose(cg->stdio_files[i]);
 
-  _cupsStrFlush(cg);
-  _cupsLangFlush(cg);
-  _cupsCharmapFlush(cg);
-
   cupsFreeOptions(cg->cupsd_num_settings, cg->cupsd_settings);
 
   free(value);
--- cups-1.2rc1/cups/transcode.c.gnome	2006-03-17 19:50:14.000000000 +0000
+++ cups-1.2rc1/cups/transcode.c	2006-04-02 20:04:23.000000000 +0100
@@ -37,6 +37,7 @@
  *   conv_vbcs_to_utf8() - Convert legacy DBCS/VBCS to UTF-8.
  *   free_sbcs_charmap() - Free memory used by a single byte character set.
  *   free_vbcs_charmap() - Free memory used by a variable byte character set.
+ *   get_charmap()       - Lookup or get a character set map (private).
  *   get_charmap_count() - Count lines in a charmap file.
  *   get_sbcs_charmap()  - Get SBCS Charmap.
  *   get_vbcs_charmap()  - Get DBCS/VBCS Charmap.
@@ -54,6 +55,20 @@
 
 
 /*
+ * Local globals...
+ */
+
+#ifdef HAVE_PTHREAD_H
+static pthread_mutex_t	map_mutex = PTHREAD_MUTEX_INITIALIZER;
+					/* Mutex to control access to maps */
+#endif /* HAVE_PTHREAD_H */
+static _cups_cmap_t	*cmap_cache = NULL;
+					/* SBCS Charmap Cache */
+static _cups_vmap_t	*vmap_cache = NULL;
+					/* VBCS Charmap Cache */
+
+
+/*
  * Local functions...
  */
 
@@ -76,6 +91,7 @@
 					  const cups_encoding_t encoding);
 static void		free_sbcs_charmap(_cups_cmap_t *sbcs);
 static void		free_vbcs_charmap(_cups_vmap_t *vbcs);
+static void		*get_charmap(const cups_encoding_t encoding);
 static int		get_charmap_count(cups_file_t *fp);
 static _cups_cmap_t	*get_sbcs_charmap(const cups_encoding_t encoding,
 				          const char *filename);
@@ -88,7 +104,7 @@
  */
 
 void
-_cupsCharmapFlush(_cups_globals_t *cg)	/* I - Global data */
+_cupsCharmapFlush(void)
 {
   _cups_cmap_t	*cmap,			/* Legacy SBCS / Unicode Charset Map */
 		*cnext;			/* Next Legacy SBCS Charset Map */
@@ -96,24 +112,28 @@
 		*vnext;			/* Next Legacy VBCS Charset Map */
 
 
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_lock(&map_mutex);
+#endif /* HAVE_PTHREAD_H */
+
  /*
   * Loop through SBCS charset map cache, free all memory...
   */
 
-  for (cmap = cg->cmap_cache; cmap; cmap = cnext)
+  for (cmap = cmap_cache; cmap; cmap = cnext)
   {
     cnext = cmap->next;
 
     free_sbcs_charmap(cmap);
   }
 
-  cg->cmap_cache = NULL;
+  cmap_cache = NULL;
 
  /*
   * Loop through DBCS/VBCS charset map cache, free all memory...
   */
 
-  for (vmap = cg->vmap_cache; vmap; vmap = vnext)
+  for (vmap = vmap_cache; vmap; vmap = vnext)
   {
     vnext = vmap->next;
 
@@ -122,7 +142,11 @@
     free(vmap);
   }
 
-  cg->vmap_cache = NULL;
+  vmap_cache = NULL;
+
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_unlock(&map_mutex);
+#endif /* HAVE_PTHREAD_H */
 }
 
 
@@ -138,21 +162,23 @@
 {
   _cups_cmap_t	*cmap;			/* Legacy SBCS / Unicode Charset Map */
   _cups_vmap_t	*vmap;			/* Legacy VBCS / Unicode Charset Map */
-  _cups_globals_t *cg = _cupsGlobals(); /* Pointer to library globals */
 
 
  /*
   * See if we already have this SBCS charset map loaded...
   */
 
-  for (cmap = cg->cmap_cache; cmap; cmap = cmap->next)
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_lock(&map_mutex);
+#endif /* HAVE_PTHREAD_H */
+
+  for (cmap = cmap_cache; cmap; cmap = cmap->next)
   {
     if (cmap->encoding == encoding)
     {
       if (cmap->used > 0)
 	cmap->used --;
-
-      return;
+      break;
     }
   }
 
@@ -160,15 +186,19 @@
   * See if we already have this DBCS/VBCS charset map loaded...
   */
 
-  for (vmap = cg->vmap_cache; vmap; vmap = vmap->next)
+  for (vmap = vmap_cache; vmap; vmap = vmap->next)
   {
     if (vmap->encoding == encoding)
     {
       if (vmap->used > 0)
 	vmap->used --;
-      return;
+      break;
     }
   }
+
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_unlock(&map_mutex);
+#endif /* HAVE_PTHREAD_H */
 }
 
 
@@ -185,8 +215,7 @@
 _cupsCharmapGet(
     const cups_encoding_t encoding)	/* I - Encoding */
 {
-  char		filename[1024];		/* Filename for charset map file */
-  _cups_globals_t *cg = _cupsGlobals(); /* Global data */
+  void	*charmap;			/* Charset map pointer */
 
 
   DEBUG_printf(("_cupsCharmapGet(encoding=%d)\n", encoding));
@@ -202,24 +231,20 @@
   }
 
  /*
-  * Get the data directory and charset map name...
+  * Lookup or get the charset map pointer and return...
   */
 
-  snprintf(filename, sizeof(filename), "%s/charmaps/%s.txt",
-	   cg->cups_datadir, _cupsEncodingName(encoding));
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_lock(&map_mutex);
+#endif /* HAVE_PTHREAD_H */
 
-  DEBUG_printf(("    filename=\"%s\"\n", filename));
+  charmap = get_charmap(encoding);
 
- /*
-  * Read charset map input file into cache...
-  */
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_unlock(&map_mutex);
+#endif /* HAVE_PTHREAD_H */
 
-  if (encoding < CUPS_ENCODING_SBCS_END)
-    return (get_sbcs_charmap(encoding, filename));
-  else if (encoding < CUPS_ENCODING_VBCS_END)
-    return (get_vbcs_charmap(encoding, filename));
-  else
-    return (NULL);
+  return (charmap);
 }
 
 
@@ -239,6 +264,9 @@
     const int maxout,			/* I - Max output */
     const cups_encoding_t encoding)	/* I - Encoding */
 {
+  int	bytes;				/* Number of bytes converted */
+
+
  /*
   * Check for valid arguments...
   */
@@ -270,15 +298,25 @@
   * Convert input legacy charset to UTF-8...
   */
 
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_lock(&map_mutex);
+#endif /* HAVE_PTHREAD_H */
+
   if (encoding < CUPS_ENCODING_SBCS_END)
-    return (conv_sbcs_to_utf8(dest, (cups_sbcs_t *)src, maxout, encoding));
+    bytes = conv_sbcs_to_utf8(dest, (cups_sbcs_t *)src, maxout, encoding);
   else if (encoding < CUPS_ENCODING_VBCS_END)
-    return (conv_vbcs_to_utf8(dest, (cups_sbcs_t *)src, maxout, encoding));
+    bytes = conv_vbcs_to_utf8(dest, (cups_sbcs_t *)src, maxout, encoding);
   else
   {
-    puts("    Bad encoding, returning -1");
-    return (-1);
+    DEBUG_puts("    Bad encoding, returning -1");
+    bytes = -1;
   }
+
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_unlock(&map_mutex);
+#endif /* HAVE_PTHREAD_H */
+
+  return (bytes);
 }
 
 
@@ -298,6 +336,9 @@
     const int		  maxout,	/* I - Max output */
     const cups_encoding_t encoding)	/* I - Encoding */
 {
+  int	bytes;				/* Number of bytes converted */
+
+
  /*
   * Check for valid arguments...
   */
@@ -325,12 +366,22 @@
   * Convert input UTF-8 to legacy charset...
   */
 
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_lock(&map_mutex);
+#endif /* HAVE_PTHREAD_H */
+
   if (encoding < CUPS_ENCODING_SBCS_END)
-    return (conv_utf8_to_sbcs((cups_sbcs_t *)dest, src, maxout, encoding));
+    bytes = conv_utf8_to_sbcs((cups_sbcs_t *)dest, src, maxout, encoding);
   else if (encoding < CUPS_ENCODING_VBCS_END)
-    return (conv_utf8_to_vbcs((cups_sbcs_t *)dest, src, maxout, encoding));
+    bytes = conv_utf8_to_vbcs((cups_sbcs_t *)dest, src, maxout, encoding);
   else
-    return (-1);
+    bytes = -1;
+
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_unlock(&map_mutex);
+#endif /* HAVE_PTHREAD_H */
+
+  return (bytes);
 }
 
 
@@ -675,7 +726,7 @@
   * Find legacy charset map in cache...
   */
 
-  if ((cmap = (_cups_cmap_t *)_cupsCharmapGet(encoding)) == NULL)
+  if ((cmap = (_cups_cmap_t *)get_charmap(encoding)) == NULL)
     return (-1);
 
  /*
@@ -714,7 +765,7 @@
   * Convert internal UCS-4 to output UTF-8 (and delete BOM)...
   */
 
-  _cupsCharmapFree(encoding);
+  cmap->used --;
 
   return (cupsUTF32ToUTF8(dest, work, maxout));
 }
@@ -743,7 +794,7 @@
   * Find legacy charset map in cache...
   */
 
-  if ((cmap = (_cups_cmap_t *) _cupsCharmapGet(encoding)) == NULL)
+  if ((cmap = (_cups_cmap_t *)get_charmap(encoding)) == NULL)
     return (-1);
 
  /*
@@ -790,7 +841,7 @@
 
   *dest = '\0';
 
-  _cupsCharmapFree(encoding);
+  cmap->used --;
 
   return ((int)(dest - start));
 }
@@ -820,7 +871,7 @@
   * Find legacy charset map in cache...
   */
 
-  if ((vmap = (_cups_vmap_t *)_cupsCharmapGet(encoding)) == NULL)
+  if ((vmap = (_cups_vmap_t *)get_charmap(encoding)) == NULL)
     return (-1);
 
  /*
@@ -902,7 +953,7 @@
 
   *dest = '\0';
 
-  _cupsCharmapFree(encoding);
+  vmap->used --;
 
   return ((int)(dest - start));
 }
@@ -932,7 +983,7 @@
   * Find legacy charset map in cache...
   */
 
-  if ((vmap = (_cups_vmap_t *)_cupsCharmapGet(encoding)) == NULL)
+  if ((vmap = (_cups_vmap_t *)get_charmap(encoding)) == NULL)
     return (-1);
 
  /*
@@ -1027,7 +1078,7 @@
 
   *workptr = 0;
 
-  _cupsCharmapFree(encoding);
+  vmap->used --;
 
  /*
   * Convert internal UCS-4 to output UTF-8 (and delete BOM)...
@@ -1081,6 +1132,46 @@
 
 
 /*
+ * 'get_charmap()' - Lookup or get a character set map (private).
+ *
+ * This code handles single-byte (SBCS), double-byte (DBCS), and
+ * variable-byte (VBCS) character sets _without_ charset escapes...
+ * This code does not handle multiple-byte character sets (MBCS)
+ * (such as ISO-2022-JP) with charset switching via escapes...
+ */
+
+
+void *					/* O - Charset map pointer */
+get_charmap(
+    const cups_encoding_t encoding)	/* I - Encoding */
+{
+  char		filename[1024];		/* Filename for charset map file */
+  _cups_globals_t *cg = _cupsGlobals();	/* Global data */
+
+
+ /*
+  * Get the data directory and charset map name...
+  */
+
+  snprintf(filename, sizeof(filename), "%s/charmaps/%s.txt",
+	   cg->cups_datadir, _cupsEncodingName(encoding));
+
+  DEBUG_printf(("    filename=\"%s\"\n", filename));
+
+ /*
+  * Read charset map input file into cache...
+  */
+
+  if (encoding < CUPS_ENCODING_SBCS_END)
+    return (get_sbcs_charmap(encoding, filename));
+  else if (encoding < CUPS_ENCODING_VBCS_END)
+    return (get_vbcs_charmap(encoding, filename));
+  else
+    return (NULL);
+}
+
+
+/*
  * 'get_charmap_count()' - Count lines in a charmap file.
  */
 
@@ -1129,19 +1220,19 @@
   cups_ucs2_t	*crow;			/* Pointer to UCS-2 row in 'char2uni' */
   cups_sbcs_t	*srow;			/* Pointer to SBCS row in 'uni2char' */
   char		line[256];		/* Line from charset map file */
-  _cups_globals_t *cg = _cupsGlobals();	/* Pointer to library globals */
 
 
  /*
   * See if we already have this SBCS charset map loaded...
   */
 
-  for (cmap = cg->cmap_cache; cmap; cmap = cmap->next)
+  for (cmap = cmap_cache; cmap; cmap = cmap->next)
   {
     if (cmap->encoding == encoding)
     {
       cmap->used ++;
       DEBUG_printf(("    returning existing cmap=%p\n", cmap));
+
       return ((void *)cmap);
     }
   }
@@ -1161,6 +1252,7 @@
   {
     cupsFileClose(fp);
     DEBUG_puts("    Unable to allocate memory!");
+
     return (NULL);
   }
 
@@ -1228,8 +1320,8 @@
   * Add it to the cache and return...
   */
 
-  cmap->next     = cg->cmap_cache;
-  cg->cmap_cache = cmap;
+  cmap->next = cmap_cache;
+  cmap_cache = cmap;
 
   DEBUG_printf(("    returning new cmap=%p\n", cmap));
 
@@ -1273,7 +1365,6 @@
   char		line[256];		/* Line from charset map file */
   int		i;			/* Loop variable */
   int		wide;			/* 32-bit legacy char */
-  _cups_globals_t *cg = _cupsGlobals();	/* Pointer to library globals */
 
 
   DEBUG_printf(("get_vbcs_charmap(encoding=%d, filename=\"%s\")\n",
@@ -1283,12 +1374,13 @@
   * See if we already have this DBCS/VBCS charset map loaded...
   */
 
-  for (vmap = cg->vmap_cache; vmap; vmap = vmap->next)
+  for (vmap = vmap_cache; vmap; vmap = vmap->next)
   {
     if (vmap->encoding == encoding)
     {
       vmap->used ++;
       DEBUG_printf(("    returning existing vmap=%p\n", vmap));
+
       return ((void *)vmap);
     }
   }
@@ -1300,6 +1392,7 @@
   if ((fp = cupsFileOpen(filename, "r")) == NULL)
   {
     DEBUG_printf(("    Unable to open file: %s\n", strerror(errno)));
+
     return (NULL);
   }
 
@@ -1310,6 +1403,7 @@
   if ((mapcount = get_charmap_count(fp)) <= 0)
   {
     DEBUG_puts("    Unable to get charmap count!");
+
     return (NULL);
   }
 
@@ -1323,6 +1417,7 @@
   {
     cupsFileClose(fp);
     DEBUG_puts("    Unable to allocate memory!");
+
     return (NULL);
   }
 
@@ -1465,8 +1560,8 @@
   * Add it to the cache and return...
   */
 
-  vmap->next     = cg->vmap_cache;
-  cg->vmap_cache = vmap;
+  vmap->next     = vmap_cache;
+  vmap_cache = vmap;
 
   DEBUG_printf(("    returning new vmap=%p\n", vmap));
 
--- cups-1.2rc1/cups/string.c.gnome	2006-03-31 18:45:13.000000000 +0100
+++ cups-1.2rc1/cups/string.c	2006-04-02 20:06:54.000000000 +0100
@@ -46,9 +46,24 @@
 
 #include <stdlib.h>
 #include <limits.h>
+#include "array.h"
 #include "debug.h"
 #include "string.h"
-#include "globals.h"
+#ifdef HAVE_PTHREAD_H
+#  include <pthread.h>
+#endif /* HAVE_PTHREAD_H */
+
+
+/*
+ * Local globals...
+ */
+
+#ifdef HAVE_PTHREAD_H
+static pthread_mutex_t	sp_mutex = PTHREAD_MUTEX_INITIALIZER;
+					/* Mutex to control access to pool */
+#endif /* HAVE_PTHREAD_H */
+static cups_array_t	*stringpool = NULL;
+					/* Global string pool */
 
 
 /*
@@ -65,7 +80,6 @@
 char *					/* O - String pointer */
 _cupsStrAlloc(const char *s)		/* I - String */
 {
-  _cups_globals_t	*cg;		/* Global data */
   _cups_sp_item_t	*item,		/* String pool item */
 			key;		/* Search key */
 
@@ -81,13 +95,21 @@
   * Get the string pool...
   */
 
-  cg = _cupsGlobals();
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_lock(&sp_mutex);
+#endif /* HAVE_PTHREAD_H */
+
+  if (!stringpool)
+    stringpool = cupsArrayNew((cups_array_func_t)compare_sp_items, NULL);
+
+  if (!stringpool)
+  {
+#ifdef HAVE_PTHREAD_H
+    pthread_mutex_unlock(&sp_mutex);
+#endif /* HAVE_PTHREAD_H */
 
-  if (!cg->stringpool)
-    cg->stringpool = cupsArrayNew((cups_array_func_t)compare_sp_items, NULL);
-
-  if (!cg->stringpool)
     return (NULL);
+  }
 
  /*
   * See if the string is already in the pool...
@@ -95,7 +117,7 @@
 
   key.str = (char *)s;
 
-  if ((item = (_cups_sp_item_t *)cupsArrayFind(cg->stringpool, &key)) != NULL)
+  if ((item = (_cups_sp_item_t *)cupsArrayFind(stringpool, &key)) != NULL)
   {
    /*
     * Found it, return the cached string...
@@ -103,6 +125,10 @@
 
     item->ref_count ++;
 
+#ifdef HAVE_PTHREAD_H
+    pthread_mutex_unlock(&sp_mutex);
+#endif /* HAVE_PTHREAD_H */
+
     return (item->str);
   }
 
@@ -112,7 +138,13 @@
 
   item = (_cups_sp_item_t *)calloc(1, sizeof(_cups_sp_item_t));
   if (!item)
+  {
+#ifdef HAVE_PTHREAD_H
+    pthread_mutex_unlock(&sp_mutex);
+#endif /* HAVE_PTHREAD_H */
+
     return (NULL);
+  }
 
   item->ref_count = 1;
   item->str       = strdup(s);
@@ -120,6 +152,11 @@
   if (!item->str)
   {
     free(item);
+
+#ifdef HAVE_PTHREAD_H
+    pthread_mutex_unlock(&sp_mutex);
+#endif /* HAVE_PTHREAD_H */
+
     return (NULL);
   }
 
@@ -127,7 +164,11 @@
   * Add the string to the pool and return it...
   */
 
-  cupsArrayAdd(cg->stringpool, item);
+  cupsArrayAdd(stringpool, item);
+
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_unlock(&sp_mutex);
+#endif /* HAVE_PTHREAD_H */
 
   return (item->str);
 }
@@ -138,20 +179,30 @@
  */
 
 void
-_cupsStrFlush(_cups_globals_t *cg)	/* I - Global data */
+_cupsStrFlush(void)
 {
   _cups_sp_item_t	*item;		/* Current item */
 
+  DEBUG_printf(("    %d strings in array\n", cupsArrayCount(stringpool)));
+
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_lock(&sp_mutex);
+#endif /* HAVE_PTHREAD_H */
 
-  for (item = (_cups_sp_item_t *)cupsArrayFirst(cg->stringpool);
+  for (item = (_cups_sp_item_t *)cupsArrayFirst(stringpool);
        item;
-       item = (_cups_sp_item_t *)cupsArrayNext(cg->stringpool))
+       item = (_cups_sp_item_t *)cupsArrayNext(stringpool))
   {
     free(item->str);
     free(item);
   }
 
-  cupsArrayDelete(cg->stringpool);
+  cupsArrayDelete(stringpool);
+  stringpool = NULL;
+
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_unlock(&sp_mutex);
+#endif /* HAVE_PTHREAD_H */
 }
 
 
@@ -242,7 +293,6 @@
 void
 _cupsStrFree(const char *s)		/* I - String to free */
 {
-  _cups_globals_t	*cg;		/* Global data */
   _cups_sp_item_t	*item,		/* String pool item */
 			key;		/* Search key */
 
@@ -258,18 +308,20 @@
   * Get the string pool...
   */
 
-  cg = _cupsGlobals();
-
-  if (!cg->stringpool)
+  if (!stringpool)
     return;
 
  /*
   * See if the string is already in the pool...
   */
 
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_lock(&sp_mutex);
+#endif /* HAVE_PTHREAD_H */
+
   key.str = (char *)s;
 
-  if ((item = (_cups_sp_item_t *)cupsArrayFind(cg->stringpool, &key)) != NULL
+  if ((item = (_cups_sp_item_t *)cupsArrayFind(stringpool, &key)) != NULL
       && item->str == s)
   {
    /*
@@ -284,12 +336,16 @@
       * Remove and free...
       */
 
-      cupsArrayRemove(cg->stringpool, item);
+      cupsArrayRemove(stringpool, item);
 
       free(item->str);
       free(item);
     }
   }
+
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_unlock(&sp_mutex);
+#endif /* HAVE_PTHREAD_H */
 }
 
 
@@ -403,19 +459,20 @@
 			tbytes,		/* Total string bytes */
 			len;		/* Length of string */
   _cups_sp_item_t	*item;		/* Current item */
-  _cups_globals_t	*cg;		/* Global data */
 
 
  /*
   * Loop through strings in pool, counting everything up...
   */
 
-  cg = _cupsGlobals();
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_lock(&sp_mutex);
+#endif /* HAVE_PTHREAD_H */
 
   for (count = 0, abytes = 0, tbytes = 0,
-           item = (_cups_sp_item_t *)cupsArrayFirst(cg->stringpool);
+           item = (_cups_sp_item_t *)cupsArrayFirst(stringpool);
        item;
-       item = (_cups_sp_item_t *)cupsArrayNext(cg->stringpool))
+       item = (_cups_sp_item_t *)cupsArrayNext(stringpool))
   {
    /*
     * Count allocated memory, using a 64-bit aligned buffer as a basis.
@@ -427,6 +484,10 @@
     tbytes += item->ref_count * len;
   }
 
+#ifdef HAVE_PTHREAD_H
+  pthread_mutex_unlock(&sp_mutex);
+#endif /* HAVE_PTHREAD_H */
+
  /*
   * Return values...
   */
--- cups-1.2rc1/cups/globals.h.gnome	2006-03-21 15:28:29.000000000 +0000
+++ cups-1.2rc1/cups/globals.h	2006-04-02 20:04:23.000000000 +0100
@@ -95,7 +95,6 @@
 					/* Unknown error statuses */
 
   /* language.c */
-  cups_lang_t		*lang_cache;	/* Language string cache */
   cups_lang_t		*lang_default;	/* Default language */
 #  ifdef __APPLE__
 #    ifdef HAVE_CF_LOCALE_ID
@@ -113,10 +112,6 @@
   /* tempfile.c */
   char			tempfile[1024];	/* cupsTempFd/File buffer */
 
-  /* transcode.c */
-  _cups_cmap_t		*cmap_cache;	/* SBCS Charmap Cache */
-  _cups_vmap_t		*vmap_cache;	/* VBCS Charmap Cache */
-
   /* usersys.c */
   http_encryption_t	encryption;	/* Encryption setting */
   char			user[65],	/* User name */
@@ -134,9 +129,6 @@
 					/* Default printer */
   char			ppd_filename[HTTP_MAX_URI];
 					/* PPD filename */
-
-  /* string.c */
-  cups_array_t		*stringpool;	/* String pool */
 } _cups_globals_t;
 
 
@@ -144,12 +136,9 @@
  * Prototypes...
  */
 
-extern void		_cupsCharmapFlush(_cups_globals_t *cg);
 extern const char	*_cupsGetPassword(const char *prompt);
 extern _cups_globals_t	*_cupsGlobals(void);
-extern void		_cupsLangFlush(_cups_globals_t *cg);
 extern void		_cupsSetError(ipp_status_t status, const char *message);
-extern void		_cupsStrFlush(_cups_globals_t *cg);
 
 
 /*


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- cups.spec	1 Apr 2006 08:25:58 -0000	1.137
+++ cups.spec	2 Apr 2006 19:22:19 -0000	1.138
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2
-Release: 0.2.%{beta}.2.4
+Release: 0.2.%{beta}.2.5
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
@@ -39,6 +39,7 @@
 Patch16: cups-pie.patch
 Patch17: cups-1.1.19-no_rpath.patch
 Patch18: cups-language.patch
+Patch19: cups-gnome.patch
 Patch22: cups-dest-cache-v2.patch
 Patch24: cups-maxlogsize.patch
 Patch28: cups-no-propagate-ipp-port.patch
@@ -135,6 +136,7 @@
 %endif
 %patch17 -p1 -b .no_rpath
 %patch18 -p1 -b .language
+%patch19 -p1 -b .gnome
 %patch22 -p1 -b .dest-cache-v2
 %patch24 -p1 -b .maxlogsize
 %patch28 -p1 -b .no-propagate-ipp-port
@@ -385,6 +387,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Sun Apr  2 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.5
+- Backported svn 5365:5366 change for mutex-protected stringpool.
+
 * Sat Apr  1 2006 Tim Waugh <twaugh at redhat.com>
 - Fixed _cupsStrFree() (STR #1529).
 



From fedora-cvs-commits at redhat.com  Sun Apr  2 19:44:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 2 Apr 2006 15:44:36 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2084,
	1.2085 linux-2.6-drm-cripple-r300.patch, 1.1, 1.2
Message-ID: <200604021944.k32JiaGT009870@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec linux-2.6-drm-cripple-r300.patch 
Log Message:
Alternative radeon crippling


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2084
retrieving revision 1.2085
diff -u -r1.2084 -r1.2085
--- kernel-2.6.spec	31 Mar 2006 19:38:10 -0000	1.2084
+++ kernel-2.6.spec	2 Apr 2006 19:44:32 -0000	1.2085
@@ -1687,6 +1687,9 @@
 %endif
 
 %changelog
+* Sun Apr 2 2006 David Woodhouse <dwmw2 at redhat.com>
+- Alternative (and optional) disable for R300 DRI.
+
 * Fri Mar 31 2006 David Woodhouse <dwmw2 at redhat.com>
 - Send standard WEXT events on softmac assoc/disassociation.
 

linux-2.6-drm-cripple-r300.patch:
 radeon_cp.c |   10 ++++++++++
 1 files changed, 10 insertions(+)

Index: linux-2.6-drm-cripple-r300.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-drm-cripple-r300.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-drm-cripple-r300.patch	6 Mar 2006 21:44:45 -0000	1.1
+++ linux-2.6-drm-cripple-r300.patch	2 Apr 2006 19:44:32 -0000	1.2
@@ -1,81 +1,27 @@
-
-Cripple the Radeon driver so that it doesn't work on R300 and
-above right now.  Fedora Xorg isn't ready for it yet, and loading the
-module for it causes crashes.
-
-https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=174646
-https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=182196
-
---- linux-2.6.15.noarch/drivers/char/drm/drm_pciids.h~	2006-03-05 23:37:54.000000000 -0500
-+++ linux-2.6.15.noarch/drivers/char/drm/drm_pciids.h	2006-03-05 23:39:38.000000000 -0500
-@@ -3,19 +3,8 @@
-    Please contact dri-devel at lists.sf.net to add new cards to this list
- */
- #define radeon_PCI_IDS \
--	{0x1002, 0x3150, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350},\
- 	{0x1002, 0x4136, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS100|CHIP_IS_IGP}, \
- 	{0x1002, 0x4137, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS200|CHIP_IS_IGP}, \
--	{0x1002, 0x4144, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \
--	{0x1002, 0x4145, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \
--	{0x1002, 0x4146, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \
--	{0x1002, 0x4147, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \
--	{0x1002, 0x4150, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \
--	{0x1002, 0x4151, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \
--	{0x1002, 0x4152, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \
--	{0x1002, 0x4153, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \
--	{0x1002, 0x4154, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \
--	{0x1002, 0x4156, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \
- 	{0x1002, 0x4237, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS250|CHIP_IS_IGP}, \
- 	{0x1002, 0x4242, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \
- 	{0x1002, 0x4243, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \
-@@ -26,8 +15,6 @@
- 	{0x1002, 0x4965, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250}, \
- 	{0x1002, 0x4966, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250}, \
- 	{0x1002, 0x4967, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250}, \
--	{0x1002, 0x4A49, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420}, \
--	{0x1002, 0x4A4B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420}, \
- 	{0x1002, 0x4C57, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV200|CHIP_IS_MOBILITY}, \
- 	{0x1002, 0x4C58, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV200|CHIP_IS_MOBILITY}, \
- 	{0x1002, 0x4C59, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV100|CHIP_IS_MOBILITY}, \
-@@ -36,18 +23,6 @@
- 	{0x1002, 0x4C65, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250|CHIP_IS_MOBILITY}, \
- 	{0x1002, 0x4C66, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250|CHIP_IS_MOBILITY}, \
- 	{0x1002, 0x4C67, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250|CHIP_IS_MOBILITY}, \
--	{0x1002, 0x4E44, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \
--	{0x1002, 0x4E45, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \
--	{0x1002, 0x4E46, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \
--	{0x1002, 0x4E47, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \
--	{0x1002, 0x4E48, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \
--	{0x1002, 0x4E49, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \
--	{0x1002, 0x4E4A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \
--	{0x1002, 0x4E4B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \
--	{0x1002, 0x4E50, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350|CHIP_IS_MOBILITY}, \
--	{0x1002, 0x4E51, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350|CHIP_IS_MOBILITY}, \
--	{0x1002, 0x4E54, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350|CHIP_IS_MOBILITY}, \
--	{0x1002, 0x4E56, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350|CHIP_IS_MOBILITY}, \
- 	{0x1002, 0x5144, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R100|CHIP_SINGLE_CRTC}, \
- 	{0x1002, 0x5145, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R100|CHIP_SINGLE_CRTC}, \
- 	{0x1002, 0x5146, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R100|CHIP_SINGLE_CRTC}, \
-@@ -70,12 +45,6 @@
- 	{0x1002, 0x516A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \
- 	{0x1002, 0x516B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \
- 	{0x1002, 0x516C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \
--	{0x1002, 0x5460, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \
--	{0x1002, 0x554F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \
--	{0x1002, 0x5834, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|CHIP_IS_IGP}, \
--	{0x1002, 0x5835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|CHIP_IS_IGP|CHIP_IS_MOBILITY}, \
--	{0x1002, 0x5836, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|CHIP_IS_IGP}, \
--	{0x1002, 0x5837, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|CHIP_IS_IGP}, \
- 	{0x1002, 0x5960, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \
- 	{0x1002, 0x5961, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \
- 	{0x1002, 0x5962, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \
-@@ -89,8 +58,6 @@
- 	{0x1002, 0x5c62, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \
- 	{0x1002, 0x5c63, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280|CHIP_IS_MOBILITY}, \
- 	{0x1002, 0x5c64, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \
--	{0x1002, 0x5d4d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \
--	{0x1002, 0x5e4b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420}, \
- 	{0, 0, 0}
+--- linux-2.6.16.ppc/drivers/char/drm/radeon_cp.c~	2006-03-20 05:53:29.000000000 +0000
++++ linux-2.6.16.ppc/drivers/char/drm/radeon_cp.c	2006-03-31 18:26:00.000000000 +0100
+@@ -34,6 +34,11 @@
+ #include "radeon_drv.h"
+ #include "r300_reg.h"
+ 
++int radeon_allow_r300;
++
++MODULE_PARM_DESC(allow_r300, "Allow DRI on Radeon R300 and later cards");
++module_param_named(allow_r300, radeon_allow_r300, int, 0444);
++
+ #define RADEON_FIFO_DEBUG	0
+ 
+ static int radeon_do_cleanup_cp(drm_device_t * dev);
+@@ -2104,6 +2109,11 @@ int radeon_driver_load(struct drm_device
+ 	drm_radeon_private_t *dev_priv;
+ 	int ret = 0;
  
- #define r128_PCI_IDS \
++	if (!radeon_allow_r300 && (flags & CHIP_FAMILY_MASK) >= CHIP_R300) {
++		printk(KERN_NOTICE "Avoiding DRI on Radeon R300+. Use 'allow_r300=1' module option to override\n");
++		return DRM_ERR(ENXIO);
++	}
++
+ 	dev_priv = drm_alloc(sizeof(drm_radeon_private_t), DRM_MEM_DRIVER);
+ 	if (dev_priv == NULL)
+ 		return DRM_ERR(ENOMEM);
 



From fedora-cvs-commits at redhat.com  Sun Apr  2 21:02:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 2 Apr 2006 17:02:27 -0400
Subject: rpms/kernel/FC-5 linux-2.6-audit-ipc-rework.patch, NONE,
	1.1.2.1 linux-2.6-audit-more-sids.patch, NONE,
	1.1.2.1 linux-2.6-audit-user.patch, NONE,
	1.1.2.1 kernel-2.6.spec, 1.2074.2.3, 1.2074.2.4
Message-ID: <200604022102.k32L2RKR018805@cvs.devel.redhat.com>

Author: sgrubb

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

Modified Files:
      Tag: private-lspp-14-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-lspp-14-branch
	linux-2.6-audit-ipc-rework.patch 
	linux-2.6-audit-more-sids.patch linux-2.6-audit-user.patch 
Log Message:
* Sun Apr 02 2006 Steve Grubb <sgrubb at redhat.com>
- lspp.16 kernel



linux-2.6-audit-ipc-rework.patch:
 include/linux/audit.h |    7 ++++--
 ipc/msg.c             |   11 +++++++++-
 ipc/sem.c             |   11 +++++++++-
 ipc/shm.c             |   18 ++++++++++++++--
 ipc/util.c            |    7 +++++-
 kernel/auditsc.c      |   54 +++++++++++++++++++++++++++++++++++++++++++++++---
 6 files changed, 98 insertions(+), 10 deletions(-)

--- NEW FILE linux-2.6-audit-ipc-rework.patch ---
diff -urp linux-2.6.16.x86_64.orig/include/linux/audit.h linux-2.6.16.x86_64/include/linux/audit.h
--- linux-2.6.16.x86_64.orig/include/linux/audit.h	2006-04-02 15:48:21.000000000 -0400
+++ linux-2.6.16.x86_64/include/linux/audit.h	2006-04-02 15:48:55.000000000 -0400
@@ -83,6 +83,7 @@
 #define AUDIT_CONFIG_CHANGE	1305	/* Audit system configuration change */
 #define AUDIT_SOCKADDR		1306	/* sockaddr copied as syscall arg */
 #define AUDIT_CWD		1307	/* Current working directory */
+#define AUDIT_IPC_SET_PERM	1311	/* IPC new permissions record type */
 
 #define AUDIT_AVC		1400	/* SE Linux avc denial or grant */
 #define AUDIT_SELINUX_ERR	1401	/* Internal SE Linux Errors */
@@ -320,7 +321,8 @@ extern void auditsc_get_stamp(struct aud
 			      struct timespec *t, unsigned int *serial);
 extern int  audit_set_loginuid(struct task_struct *task, uid_t loginuid);
 extern uid_t audit_get_loginuid(struct audit_context *ctx);
-extern int audit_ipc_perms(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode, struct kern_ipc_perm *ipcp);
+extern int audit_ipc_obj(struct kern_ipc_perm *ipcp);
+extern int audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode, struct kern_ipc_perm *ipcp);
 extern int audit_socketcall(int nargs, unsigned long *args);
 extern int audit_sockaddr(int len, void *addr);
 extern int audit_avc_path(struct dentry *dentry, struct vfsmount *mnt);
@@ -339,7 +341,8 @@ extern int audit_set_macxattr(const char
 #define audit_inode_child(d,i,p) do { ; } while (0)
 #define auditsc_get_stamp(c,t,s) do { BUG(); } while (0)
 #define audit_get_loginuid(c) ({ -1; })
-#define audit_ipc_perms(q,u,g,m,i) ({ 0; })
+#define audit_ipc_obj(i) ({ 0; })
+#define audit_ipc_set_perm(q,u,g,m,i) ({ 0; })
 #define audit_socketcall(n,a) ({ 0; })
 #define audit_sockaddr(len, addr) ({ 0; })
 #define audit_avc_path(dentry, mnt) ({ 0; })
diff -urp linux-2.6.16.x86_64.orig/ipc/msg.c linux-2.6.16.x86_64/ipc/msg.c
--- linux-2.6.16.x86_64.orig/ipc/msg.c	2006-04-02 15:48:28.000000000 -0400
+++ linux-2.6.16.x86_64/ipc/msg.c	2006-04-02 15:48:55.000000000 -0400
@@ -13,6 +13,9 @@
  * mostly rewritten, threaded and wake-one semantics added
  * MSGMAX limit removed, sysctl's added
  * (c) 1999 Manfred Spraul <manfred at colorfullife.com>
+ *
+ * support for audit of ipc object properties and permission changes
+ * Dustin Kirkland <dustin.kirkland at us.ibm.com>
  */
 
 #include <linux/capability.h>
@@ -446,6 +449,11 @@ asmlinkage long sys_msgctl (int msqid, i
 	if (msg_checkid(msq,msqid))
 		goto out_unlock_up;
 	ipcp = &msq->q_perm;
+
+	err = audit_ipc_obj(ipcp);
+	if (err)
+		goto out_unlock_up;
+
 	err = -EPERM;
 	if (current->euid != ipcp->cuid && 
 	    current->euid != ipcp->uid && !capable(CAP_SYS_ADMIN))
@@ -459,7 +467,8 @@ asmlinkage long sys_msgctl (int msqid, i
 	switch (cmd) {
 	case IPC_SET:
 	{
-		if ((err = audit_ipc_perms(setbuf.qbytes, setbuf.uid, setbuf.gid, setbuf.mode, ipcp)))
+		err = audit_ipc_set_perm(setbuf.qbytes, setbuf.uid, setbuf.gid, setbuf.mode, ipcp);
+		if (err)
 			goto out_unlock_up;
 
 		err = -EPERM;
diff -urp linux-2.6.16.x86_64.orig/ipc/sem.c linux-2.6.16.x86_64/ipc/sem.c
--- linux-2.6.16.x86_64.orig/ipc/sem.c	2006-04-02 15:48:28.000000000 -0400
+++ linux-2.6.16.x86_64/ipc/sem.c	2006-04-02 15:48:55.000000000 -0400
@@ -61,6 +61,9 @@
  * (c) 2001 Red Hat Inc <alan at redhat.com>
  * Lockless wakeup
  * (c) 2003 Manfred Spraul <manfred at colorfullife.com>
+ *
+ * support for audit of ipc object properties and permission changes
+ * Dustin Kirkland <dustin.kirkland at us.ibm.com>
  */
 
 #include <linux/config.h>
@@ -819,6 +822,11 @@ static int semctl_down(int semid, int se
 		goto out_unlock;
 	}	
 	ipcp = &sma->sem_perm;
+
+	err = audit_ipc_obj(ipcp);
+	if (err)
+		goto out_unlock;
+
 	if (current->euid != ipcp->cuid && 
 	    current->euid != ipcp->uid && !capable(CAP_SYS_ADMIN)) {
 	    	err=-EPERM;
@@ -835,7 +843,8 @@ static int semctl_down(int semid, int se
 		err = 0;
 		break;
 	case IPC_SET:
-		if ((err = audit_ipc_perms(0, setbuf.uid, setbuf.gid, setbuf.mode, ipcp)))
+		err = audit_ipc_set_perm(0, setbuf.uid, setbuf.gid, setbuf.mode, ipcp);
+		if (err)
 			goto out_unlock;
 		ipcp->uid = setbuf.uid;
 		ipcp->gid = setbuf.gid;
diff -urp linux-2.6.16.x86_64.orig/ipc/shm.c linux-2.6.16.x86_64/ipc/shm.c
--- linux-2.6.16.x86_64.orig/ipc/shm.c	2006-04-02 15:48:28.000000000 -0400
+++ linux-2.6.16.x86_64/ipc/shm.c	2006-04-02 15:48:55.000000000 -0400
@@ -13,6 +13,8 @@
  * Shared /dev/zero support, Kanoj Sarcar <kanoj at sgi.com>
  * Move the mm functionality over to mm/shmem.c, Christoph Rohland <cr at sap.com>
  *
+ * support for audit of ipc object properties and permission changes
+ * Dustin Kirkland <dustin.kirkland at us.ibm.com>
  */
 
 #include <linux/config.h>
@@ -540,6 +542,10 @@ asmlinkage long sys_shmctl (int shmid, i
 		if(err)
 			goto out_unlock;
 
+		err = audit_ipc_obj(&(shp->shm_perm));
+		if (err)
+			goto out_unlock;
+
 		if (!capable(CAP_IPC_LOCK)) {
 			err = -EPERM;
 			if (current->euid != shp->shm_perm.uid &&
@@ -592,6 +598,10 @@ asmlinkage long sys_shmctl (int shmid, i
 		if(err)
 			goto out_unlock_up;
 
+		err = audit_ipc_obj(&(shp->shm_perm));
+		if (err)
+			goto out_unlock_up;
+
 		if (current->euid != shp->shm_perm.uid &&
 		    current->euid != shp->shm_perm.cuid && 
 		    !capable(CAP_SYS_ADMIN)) {
@@ -625,11 +635,15 @@ asmlinkage long sys_shmctl (int shmid, i
 		err=-EINVAL;
 		if(shp==NULL)
 			goto out_up;
-		if ((err = audit_ipc_perms(0, setbuf.uid, setbuf.gid, setbuf.mode, &(shp->shm_perm))))
-			goto out_unlock_up;
 		err = shm_checkid(shp,shmid);
 		if(err)
 			goto out_unlock_up;
+		err = audit_ipc_obj(&(shp->shm_perm));
+		if (err)
+			goto out_unlock_up;
+		err = audit_ipc_set_perm(0, setbuf.uid, setbuf.gid, setbuf.mode, &(shp->shm_perm));
+		if (err)
+			goto out_unlock_up;
 		err=-EPERM;
 		if (current->euid != shp->shm_perm.uid &&
 		    current->euid != shp->shm_perm.cuid && 
diff -urp linux-2.6.16.x86_64.orig/ipc/util.c linux-2.6.16.x86_64/ipc/util.c
--- linux-2.6.16.x86_64.orig/ipc/util.c	2006-04-02 15:48:28.000000000 -0400
+++ linux-2.6.16.x86_64/ipc/util.c	2006-04-02 15:49:18.000000000 -0400
@@ -10,6 +10,8 @@
  *	      Manfred Spraul <manfred at colorfullife.com>
  * Oct 2002 - One lock per IPC id. RCU ipc_free for lock-free grow_ary().
  *            Mingming Cao <cmm at us.ibm.com>
+ * Mar 2006 - support for audit of ipc object properties
+ *            Dustin Kirkland <dustin.kirkland at us.ibm.com>
  */
 
 #include <linux/config.h>
@@ -27,6 +29,7 @@
 #include <linux/workqueue.h>
 #include <linux/seq_file.h>
 #include <linux/proc_fs.h>
+#include <linux/audit.h>
 
 #include <asm/unistd.h>
 
@@ -466,8 +469,10 @@ void ipc_rcu_putref(void *ptr)
  
 int ipcperms (struct kern_ipc_perm *ipcp, short flag)
 {	/* flag will most probably be 0 or S_...UGO from <linux/stat.h> */
-	int requested_mode, granted_mode;
+	int requested_mode, granted_mode, err;
 
+	if (unlikely((err = audit_ipc_obj(ipcp))))
+		return err;
 	requested_mode = (flag >> 6) | (flag >> 3) | flag;
 	granted_mode = ipcp->mode;
 	if (current->euid == ipcp->cuid || current->euid == ipcp->uid)
diff -urp linux-2.6.16.x86_64.orig/kernel/auditsc.c linux-2.6.16.x86_64/kernel/auditsc.c
--- linux-2.6.16.x86_64.orig/kernel/auditsc.c	2006-04-02 15:48:28.000000000 -0400
+++ linux-2.6.16.x86_64/kernel/auditsc.c	2006-04-02 15:48:55.000000000 -0400
@@ -670,6 +670,25 @@ static void audit_log_exit(struct audit_
 			}
 			break; }
 
+		case AUDIT_IPC_SET_PERM: {
+			struct audit_aux_data_ipcctl *axi = (void *)aux;
+			audit_log_format(ab,
+				" new qbytes=%lx new iuid=%u new igid=%u new mode=%x",
+				axi->qbytes, axi->uid, axi->gid, axi->mode);
+			if (axi->osid != 0) {
+				char *ctx = NULL;
+				u32 len;
+				if (selinux_ctxid_to_string(
+						axi->osid, &ctx, &len)) { 
+					audit_log_format(ab, " osid=%u",
+							axi->osid);
+					call_panic = 1;
+				} else 
+					audit_log_format(ab, " obj=%s", ctx);
+				kfree(ctx);
+			}
+			break; }
+
 		case AUDIT_SOCKETCALL: {
 			int i;
 			struct audit_aux_data_socketcall *axs = (void *)aux;
@@ -1155,7 +1174,36 @@ uid_t audit_get_loginuid(struct audit_co
 }
 
 /**
- * audit_ipc_perms - record audit data for ipc
+ * audit_ipc_obj - record audit data for ipc object
+ * @ipcp: ipc permissions
+ *
+ * Returns 0 for success or NULL context or < 0 on error.
+ */
+int audit_ipc_obj(struct kern_ipc_perm *ipcp)
+{
+	struct audit_aux_data_ipcctl *ax;
+	struct audit_context *context = current->audit_context;
+
+	if (likely(!context))
+		return 0;
+
+	ax = kmalloc(sizeof(*ax), GFP_ATOMIC);
+	if (!ax)
+		return -ENOMEM;
+
+	ax->uid = ipcp->uid;
+	ax->gid = ipcp->gid;
+	ax->mode = ipcp->mode;
+	selinux_get_ipc_sid(ipcp, &ax->osid);
+
+	ax->d.type = AUDIT_IPC;
+	ax->d.next = context->aux;
+	context->aux = (void *)ax;
+	return 0;
+}
+
+/**
+ * audit_ipc_set_perm - record audit data for new ipc permissions
  * @qbytes: msgq bytes
  * @uid: msgq user id
  * @gid: msgq group id
@@ -1163,7 +1211,7 @@ uid_t audit_get_loginuid(struct audit_co
  *
  * Returns 0 for success or NULL context or < 0 on error.
  */
-int audit_ipc_perms(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode, struct kern_ipc_perm *ipcp)
+int audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode, struct kern_ipc_perm *ipcp)
 {
 	struct audit_aux_data_ipcctl *ax;
 	struct audit_context *context = current->audit_context;
@@ -1181,7 +1229,7 @@ int audit_ipc_perms(unsigned long qbytes
 	ax->mode = mode;
 	selinux_get_ipc_sid(ipcp, &ax->osid);
 
-	ax->d.type = AUDIT_IPC;
+	ax->d.type = AUDIT_IPC_SET_PERM;
 	ax->d.next = context->aux;
 	context->aux = (void *)ax;
 	return 0;

linux-2.6-audit-more-sids.patch:
 include/linux/audit.h |    2 
 kernel/audit.c        |  132 ++++++++++++++++++++++++++++++++++++++------------
 kernel/auditfilter.c  |   48 ++++++++++++++----
 kernel/auditsc.c      |    4 -
 4 files changed, 144 insertions(+), 42 deletions(-)

--- NEW FILE linux-2.6-audit-more-sids.patch ---
diff -urp linux-2.6.16.x86_64.orig/include/linux/audit.h linux-2.6.16.x86_64/include/linux/audit.h
--- linux-2.6.16.x86_64.orig/include/linux/audit.h	2006-04-01 19:34:18.000000000 -0500
+++ linux-2.6.16.x86_64/include/linux/audit.h	2006-04-01 19:35:58.000000000 -0500
@@ -372,7 +372,7 @@ extern void		    audit_log_d_path(struct
 extern int audit_filter_user(struct netlink_skb_parms *cb, int type);
 extern int audit_filter_type(int type);
 extern int  audit_receive_filter(int type, int pid, int uid, int seq,
-				 void *data, size_t datasz, uid_t loginuid);
+			 void *data, size_t datasz, uid_t loginuid, u32 sid);
 #else
 #define audit_log(c,g,t,f,...) do { ; } while (0)
 #define audit_log_start(c,g,t) ({ NULL; })
diff -urp linux-2.6.16.x86_64.orig/kernel/audit.c linux-2.6.16.x86_64/kernel/audit.c
--- linux-2.6.16.x86_64.orig/kernel/audit.c	2006-04-01 19:34:22.000000000 -0500
+++ linux-2.6.16.x86_64/kernel/audit.c	2006-04-01 19:53:58.000000000 -0500
@@ -229,49 +229,103 @@ void audit_log_lost(const char *message)
 	}
 }
 
-static int audit_set_rate_limit(int limit, uid_t loginuid)
+static int audit_set_rate_limit(int limit, uid_t loginuid, u32 sid)
 {
-	int old		 = audit_rate_limit;
-	audit_rate_limit = limit;
-	audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, 
+	int old	= audit_rate_limit;
+
+	if (sid) {
+		char *ctx = NULL;
+		u32 len;
+		int rc;
+		if ((rc = selinux_ctxid_to_string(sid, &ctx, &len))) 
+			return rc;
+		else
+			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, 
+				"audit_rate_limit=%d old=%d by auid=%u subj=%s",
+				limit, old, loginuid, ctx);
+		kfree(ctx);
+	} else
+		audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, 
 			"audit_rate_limit=%d old=%d by auid=%u",
-			audit_rate_limit, old, loginuid);
+			limit, old, loginuid);
+	audit_rate_limit = limit;
 	return old;
 }
 
-static int audit_set_backlog_limit(int limit, uid_t loginuid)
+static int audit_set_backlog_limit(int limit, uid_t loginuid, u32 sid)
 {
-	int old		 = audit_backlog_limit;
-	audit_backlog_limit = limit;
-	audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
+	int old	= audit_backlog_limit;
+
+	if (sid) {
+		char *ctx = NULL;
+		u32 len;
+		int rc;
+		if ((rc = selinux_ctxid_to_string(sid, &ctx, &len))) 
+			return rc;
+		else
+			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
+			    "audit_backlog_limit=%d old=%d by auid=%u subj=%s",
+				limit, old, loginuid, ctx);
+		kfree(ctx);
+	} else
+		audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
 			"audit_backlog_limit=%d old=%d by auid=%u",
-			audit_backlog_limit, old, loginuid);
+			limit, old, loginuid);
+	audit_backlog_limit = limit;
 	return old;
 }
 
-static int audit_set_enabled(int state, uid_t loginuid)
+static int audit_set_enabled(int state, uid_t loginuid, u32 sid)
 {
-	int old		 = audit_enabled;
+	int old = audit_enabled;
+
 	if (state != 0 && state != 1)
 		return -EINVAL;
-	audit_enabled = state;
-	audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
+
+	if (sid) {
+		char *ctx = NULL;
+		u32 len;
+		int rc;
+		if ((rc = selinux_ctxid_to_string(sid, &ctx, &len)))
+			return rc;
+		else
+			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
+				"audit_enabled=%d old=%d by auid=%u subj=%s",
+				state, old, loginuid, ctx);
+		kfree(ctx);
+	} else
+		audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
 			"audit_enabled=%d old=%d by auid=%u",
-			audit_enabled, old, loginuid);
+			state, old, loginuid);
+	audit_enabled = state;
 	return old;
 }
 
-static int audit_set_failure(int state, uid_t loginuid)
+static int audit_set_failure(int state, uid_t loginuid, u32 sid)
 {
-	int old		 = audit_failure;
+	int old = audit_failure;
+
 	if (state != AUDIT_FAIL_SILENT
 	    && state != AUDIT_FAIL_PRINTK
 	    && state != AUDIT_FAIL_PANIC)
 		return -EINVAL;
-	audit_failure = state;
-	audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
+
+	if (sid) {
+		char *ctx = NULL;
+		u32 len;
+		int rc;
+		if ((rc = selinux_ctxid_to_string(sid, &ctx, &len)))
+			return rc;
+		else
+			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
+				"audit_failure=%d old=%d by auid=%u subj=%s",
+				state, old, loginuid, ctx);
+		kfree(ctx);
+	} else
+		audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
 			"audit_failure=%d old=%d by auid=%u",
-			audit_failure, old, loginuid);
+			state, old, loginuid);
+	audit_failure = state;
 	return old;
 }
 
@@ -436,25 +490,43 @@ static int audit_receive_msg(struct sk_b
 			return -EINVAL;
 		status_get   = (struct audit_status *)data;
 		if (status_get->mask & AUDIT_STATUS_ENABLED) {
-			err = audit_set_enabled(status_get->enabled, loginuid);
+			err = audit_set_enabled(status_get->enabled,
+							loginuid, sid);
 			if (err < 0) return err;
 		}
 		if (status_get->mask & AUDIT_STATUS_FAILURE) {
-			err = audit_set_failure(status_get->failure, loginuid);
+			err = audit_set_failure(status_get->failure,
+							 loginuid, sid);
 			if (err < 0) return err;
 		}
 		if (status_get->mask & AUDIT_STATUS_PID) {
 			int old   = audit_pid;
+			if (sid) {
+				char *ctx = NULL;
+				u32 len;
+				int rc;
+				if ((rc = selinux_ctxid_to_string(
+						sid, &ctx, &len)))
+					return rc;
+				else
+					audit_log(NULL, GFP_KERNEL,
+						AUDIT_CONFIG_CHANGE,
+						"audit_pid=%d old=%d by auid=%u subj=%s",
+						status_get->pid, old,
+						loginuid, ctx);
+				kfree(ctx);
+			} else
+				audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
+					"audit_pid=%d old=%d by auid=%u",
+					  status_get->pid, old, loginuid);
 			audit_pid = status_get->pid;
-			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
-				"audit_pid=%d old=%d by auid=%u",
-				  audit_pid, old, loginuid);
 		}
 		if (status_get->mask & AUDIT_STATUS_RATE_LIMIT)
-			audit_set_rate_limit(status_get->rate_limit, loginuid);
+			audit_set_rate_limit(status_get->rate_limit,
+							 loginuid, sid);
 		if (status_get->mask & AUDIT_STATUS_BACKLOG_LIMIT)
 			audit_set_backlog_limit(status_get->backlog_limit,
-							loginuid);
+							loginuid, sid);
 		break;
 	case AUDIT_USER:
 	case AUDIT_FIRST_USER_MSG...AUDIT_LAST_USER_MSG:
@@ -476,7 +548,7 @@ static int audit_receive_msg(struct sk_b
 					if (selinux_ctxid_to_string(
 							sid, &ctx, &len)) {
 						audit_log_format(ab, 
-							" subj=%u", sid);
+							" ssid=%u", sid);
 						/* Maybe call audit_panic? */
 					} else
 						audit_log_format(ab, 
@@ -498,7 +570,7 @@ static int audit_receive_msg(struct sk_b
 	case AUDIT_LIST:
 		err = audit_receive_filter(nlh->nlmsg_type, NETLINK_CB(skb).pid,
 					   uid, seq, data, nlmsg_len(nlh),
-					   loginuid);
+					   loginuid, sid);
 		break;
 	case AUDIT_ADD_RULE:
 	case AUDIT_DEL_RULE:
@@ -508,7 +580,7 @@ static int audit_receive_msg(struct sk_b
 	case AUDIT_LIST_RULES:
 		err = audit_receive_filter(nlh->nlmsg_type, NETLINK_CB(skb).pid,
 					   uid, seq, data, nlmsg_len(nlh),
-					   loginuid);
+					   loginuid, sid);
 		break;
 	case AUDIT_SIGNAL_INFO:
 		sig_data.uid = audit_sig_uid;
diff -urp linux-2.6.16.x86_64.orig/kernel/auditfilter.c linux-2.6.16.x86_64/kernel/auditfilter.c
--- linux-2.6.16.x86_64.orig/kernel/auditfilter.c	2006-04-01 19:34:22.000000000 -0500
+++ linux-2.6.16.x86_64/kernel/auditfilter.c	2006-04-01 19:56:52.000000000 -0500
@@ -701,7 +701,7 @@ static inline void audit_update_watch(st
 		ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE);
 		audit_log_format(ab, "audit updated rules specifying watch=");
 		audit_log_untrustedstring(ab, owatch->path);
-		audit_log_format(ab, " with dev=%u ino=%lu\n", dev, ino);
+		audit_log_format(ab, " with dev=%u ino=%lu", dev, ino);
 		audit_log_end(ab);
 
 		list_del(&owatch->wlist);
@@ -733,7 +733,7 @@ static inline void audit_remove_parent_w
 			call_rcu(&e->rcu, audit_free_rule_rcu);
 
 			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
-				 "audit implicitly removed rule from list=%d\n",
+				 "audit implicitly removed rule from list=%d",
 				  AUDIT_FILTER_EXIT);
 		}
 		list_del(&w->wlist);
@@ -1118,9 +1118,10 @@ static int audit_list_rules(void *_dest)
  * @data: payload data
  * @datasz: size of payload data
  * @loginuid: loginuid of sender
+ * @sid: SE Linux Security ID of sender
  */
 int audit_receive_filter(int type, int pid, int uid, int seq, void *data,
-			 size_t datasz, uid_t loginuid)
+			 size_t datasz, uid_t loginuid, u32 sid)
 {
 	struct task_struct *tsk;
 	int *dest;
@@ -1163,9 +1164,23 @@ int audit_receive_filter(int type, int p
 
 		err = audit_add_rule(entry,
 				     &audit_filter_list[entry->rule.listnr]);
-		audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
-			"auid=%u add rule to list=%d res=%d\n",
-			loginuid, entry->rule.listnr, !err);
+		if (sid) {
+			char *ctx = NULL;
+			u32 len;
+			if (selinux_ctxid_to_string(sid, &ctx, &len)) {
+				/* Maybe call audit_panic? */
+				audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
+				 "auid=%u ssid=%u add rule to list=%d res=%d",
+				 loginuid, sid, entry->rule.listnr, !err);
+			} else
+				audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
+				 "auid=%u subj=%s add rule to list=%d res=%d",
+				 loginuid, ctx, entry->rule.listnr, !err);
+			kfree(ctx);
+		} else
+			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
+				"auid=%u add rule to list=%d res=%d",
+				loginuid, entry->rule.listnr, !err);
 
 		if (err)
 			audit_free_rule(entry);
@@ -1181,9 +1196,24 @@ int audit_receive_filter(int type, int p
 
 		err = audit_del_rule(entry,
 				     &audit_filter_list[entry->rule.listnr]);
-		audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
-			"auid=%u remove rule from list=%d res=%d\n",
-			loginuid, entry->rule.listnr, !err);
+
+		if (sid) {
+			char *ctx = NULL;
+			u32 len;
+			if (selinux_ctxid_to_string(sid, &ctx, &len)) {
+				/* Maybe call audit_panic? */
+				audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
+					"auid=%u ssid=%u remove rule from list=%d res=%d",
+					 loginuid, sid, entry->rule.listnr, !err);
+			} else
+				audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
+					"auid=%u subj=%s remove rule from list=%d res=%d",
+					 loginuid, ctx, entry->rule.listnr, !err);
+			kfree(ctx);
+		} else
+			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
+				"auid=%u remove rule from list=%d res=%d",
+				loginuid, entry->rule.listnr, !err);
 
 		audit_free_rule(entry);
 		break;
diff -urp linux-2.6.16.x86_64.orig/kernel/auditsc.c linux-2.6.16.x86_64/kernel/auditsc.c
--- linux-2.6.16.x86_64.orig/kernel/auditsc.c	2006-04-01 19:34:22.000000000 -0500
+++ linux-2.6.16.x86_64/kernel/auditsc.c	2006-04-01 19:35:58.000000000 -0500
@@ -661,7 +661,7 @@ static void audit_log_exit(struct audit_
 				u32 len;
 				if (selinux_ctxid_to_string(
 						axi->osid, &ctx, &len)) { 
-					audit_log_format(ab, " obj=%u",
+					audit_log_format(ab, " osid=%u",
 							axi->osid);
 					call_panic = 1;
 				} else 
@@ -736,7 +736,7 @@ static void audit_log_exit(struct audit_
 			u32 len;
 			if (selinux_ctxid_to_string(
 				context->names[i].osid, &ctx, &len)) { 
-				audit_log_format(ab, " obj=%u",
+				audit_log_format(ab, " osid=%u",
 						context->names[i].osid);
 				call_panic = 2;
 			} else 

linux-2.6-audit-user.patch:
 include/linux/netlink.h    |    1 +
 include/linux/selinux.h    |   16 ++++++++++++++++
 kernel/audit.c             |   22 +++++++++++++++++++---
 net/netlink/af_netlink.c   |    2 ++
 security/selinux/exports.c |   11 +++++++++++
 5 files changed, 49 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-audit-user.patch ---
diff -urp linux-2.6.16.x86_64.orig/include/linux/netlink.h linux-2.6.16.x86_64/include/linux/netlink.h
--- linux-2.6.16.x86_64.orig/include/linux/netlink.h	2006-04-01 08:19:04.000000000 -0500
+++ linux-2.6.16.x86_64/include/linux/netlink.h	2006-04-01 08:00:26.000000000 -0500
@@ -143,6 +143,7 @@ struct netlink_skb_parms
 	__u32			dst_group;
 	kernel_cap_t		eff_cap;
 	__u32			loginuid;	/* Login (audit) uid */
+	__u32			sid;		/* SELinux security id */
 };
 
 #define NETLINK_CB(skb)		(*(struct netlink_skb_parms*)&((skb)->cb))
diff -urp linux-2.6.16.x86_64.orig/include/linux/selinux.h linux-2.6.16.x86_64/include/linux/selinux.h
--- linux-2.6.16.x86_64.orig/include/linux/selinux.h	2006-04-01 08:19:05.000000000 -0500
+++ linux-2.6.16.x86_64/include/linux/selinux.h	2006-04-01 07:56:15.000000000 -0500
@@ -5,6 +5,7 @@
  *
  * Copyright (C) 2005 Red Hat, Inc., James Morris <jmorris at redhat.com>
  * Copyright (C) 2006 Trusted Computer Solutions, Inc. <dgoeddel at trustedcs.com>
+ * Copyright (C) 2006 IBM Corporation, Timothy R. Chavez <tinytim at us.ibm.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
@@ -108,6 +109,16 @@ void selinux_get_inode_sid(const struct 
  */
 void selinux_get_ipc_sid(const struct kern_ipc_perm *ipcp, u32 *sid);
 
+/**
+ *     selinux_get_task_sid - return the SID of task
+ *     @tsk: the task whose SID will be returned
+ *     @sid: pointer to security context ID to be filled in.
+ *
+ *     Returns nothing
+ */
+void selinux_get_task_sid(struct task_struct *tsk, u32 *sid);
+
+
 #else
 
 static inline int selinux_audit_rule_init(u32 field, u32 op,
@@ -156,6 +167,11 @@ static inline void selinux_get_ipc_sid(c
 	*sid = 0;
 }
 
+static inline void selinux_get_task_sid(struct task_struct *tsk, u32 *sid)
+{
+	*sid = 0;
+}
+
 #endif	/* CONFIG_SECURITY_SELINUX */
 
 #endif /* _LINUX_SELINUX_H */
diff -urp linux-2.6.16.x86_64.orig/kernel/audit.c linux-2.6.16.x86_64/kernel/audit.c
--- linux-2.6.16.x86_64.orig/kernel/audit.c	2006-04-01 08:19:12.000000000 -0500
+++ linux-2.6.16.x86_64/kernel/audit.c	2006-04-01 08:08:55.000000000 -0500
@@ -389,7 +389,7 @@ static int audit_netlink_ok(kernel_cap_t
 
 static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 {
-	u32			uid, pid, seq;
+	u32			uid, pid, seq, sid;
 	void			*data;
 	struct audit_status	*status_get, status_set;
 	int			err;
@@ -415,6 +415,7 @@ static int audit_receive_msg(struct sk_b
 	pid  = NETLINK_CREDS(skb)->pid;
 	uid  = NETLINK_CREDS(skb)->uid;
 	loginuid = NETLINK_CB(skb).loginuid;
+	sid  = NETLINK_CB(skb).sid;
 	seq  = nlh->nlmsg_seq;
 	data = NLMSG_DATA(nlh);
 
@@ -467,8 +468,23 @@ static int audit_receive_msg(struct sk_b
 			ab = audit_log_start(NULL, GFP_KERNEL, msg_type);
 			if (ab) {
 				audit_log_format(ab,
-						 "user pid=%d uid=%u auid=%u msg='%.1024s'",
-						 pid, uid, loginuid, (char *)data);
+						 "user pid=%d uid=%u auid=%u",
+						 pid, uid, loginuid);
+				if (sid) {
+					char *ctx = NULL;
+					u32 len;
+					if (selinux_ctxid_to_string(
+							sid, &ctx, &len)) {
+						audit_log_format(ab, 
+							" subj=%u", sid);
+						/* Maybe call audit_panic? */
+					} else
+						audit_log_format(ab, 
+							" subj=%s", ctx);
+					kfree(ctx);
+				}
+				audit_log_format(ab, " msg='%.1024s'",
+					 (char *)data);
 				audit_set_pid(ab, pid);
 				audit_log_end(ab);
 			}
diff -urp linux-2.6.16.x86_64.orig/net/netlink/af_netlink.c linux-2.6.16.x86_64/net/netlink/af_netlink.c
--- linux-2.6.16.x86_64.orig/net/netlink/af_netlink.c	2006-04-01 08:19:13.000000000 -0500
+++ linux-2.6.16.x86_64/net/netlink/af_netlink.c	2006-04-01 08:11:09.000000000 -0500
@@ -56,6 +56,7 @@
 #include <linux/mm.h>
 #include <linux/types.h>
 #include <linux/audit.h>
+#include <linux/selinux.h>
 
 #include <net/sock.h>
 #include <net/scm.h>
@@ -1122,6 +1123,7 @@ static int netlink_sendmsg(struct kiocb 
 	NETLINK_CB(skb).dst_pid = dst_pid;
 	NETLINK_CB(skb).dst_group = dst_group;
 	NETLINK_CB(skb).loginuid = audit_get_loginuid(current->audit_context);
+	selinux_get_task_sid(current, &(NETLINK_CB(skb).sid));
 	memcpy(NETLINK_CREDS(skb), &siocb->scm->creds, sizeof(struct ucred));
 
 	/* What can I do? Netlink is asynchronous, so that
diff -urp linux-2.6.16.x86_64.orig/security/selinux/exports.c linux-2.6.16.x86_64/security/selinux/exports.c
--- linux-2.6.16.x86_64.orig/security/selinux/exports.c	2006-04-01 08:19:14.000000000 -0500
+++ linux-2.6.16.x86_64/security/selinux/exports.c	2006-04-01 08:18:28.000000000 -0500
@@ -5,6 +5,7 @@
  *
  * Copyright (C) 2005 Red Hat, Inc., James Morris <jmorris at redhat.com>
  * Copyright (C) 2006 Trusted Computer Solutions, Inc. <dgoeddel at trustedcs.com>
+ * Copyright (C) 2006 IBM Corporation, Timothy R. Chavez <tinytim at us.ibm.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
@@ -61,3 +62,13 @@ void selinux_get_ipc_sid(const struct ke
 	*sid = 0;
 }
 
+void selinux_get_task_sid(struct task_struct *tsk, u32 *sid)
+{
+	if (selinux_enabled) {
+		struct task_security_struct *isec = tsk->security;
+		*sid = isec->sid;
+		return;
+	}
+	*sid = 0;
+}
+


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2074.2.3
retrieving revision 1.2074.2.4
diff -u -r1.2074.2.3 -r1.2074.2.4
--- kernel-2.6.spec	31 Mar 2006 21:04:06 -0000	1.2074.2.3
+++ kernel-2.6.spec	2 Apr 2006 21:01:24 -0000	1.2074.2.4
@@ -24,7 +24,7 @@
 %define sublevel 16
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define rhbsys  .lspp.15
+%define rhbsys  .lspp.16
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys}
 %define signmodules 0
 %define make_target bzImage
@@ -443,6 +443,9 @@
 Patch20108: linux-2.6-audit-ipc-sid.patch
 Patch20109: linux-2.6-audit-cur-cleanup.patch
 Patch20110: linux-2.6-audit-exit.patch
+Patch20111: linux-2.6-audit-user.patch
+Patch20112: linux-2.6-audit-more-sids.patch
+Patch20113: linux-2.6-audit-ipc-rework.patch
 
 
 # END OF PATCH DEFINITIONS
@@ -1105,6 +1108,9 @@
 %patch20108 -p1
 %patch20109 -p1
 %patch20110 -p1
+%patch20111 -p1
+%patch20112 -p1
+%patch20113 -p1
 
 
 # END OF PATCH APPLICATIONS
@@ -1696,6 +1702,9 @@
 %endif
 
 %changelog
+* Sun Apr 02 2006 Steve Grubb <sgrubb at redhat.com>
+- lspp.16 kernel
+
 * Fri Mar 31 2006 Steve Grubb <sgrubb at redhat.com>
 - lspp.15 kernel
 



From fedora-cvs-commits at redhat.com  Mon Apr  3 04:16:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 00:16:58 -0400
Subject: rpms/kernel/devel/configs config-generic,1.174,1.175
Message-ID: <200604030416.k334GwIn021508@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
rc1



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- config-generic	1 Apr 2006 21:26:07 -0000	1.174
+++ config-generic	3 Apr 2006 04:16:54 -0000	1.175
@@ -97,6 +97,8 @@
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_IPATH_CORE=m
+CONFIG_INFINIBAND_IPATH=m
 
 #
 # Executable file formats
@@ -648,11 +650,13 @@
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
@@ -672,18 +676,19 @@
 CONFIG_IP_NF_CONNTRACK_MARK=y
 CONFIG_IP_NF_CONNTRACK_EVENTS=y
 CONFIG_IP_NF_CONNTRACK_NETLINK=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_AH_ESP=m
+CONFIG_IP_NF_MATCH_DSCP=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_HASHLIMIT=m
 CONFIG_IP_NF_MATCH_IPRANGE=m
 CONFIG_IP_NF_MATCH_MULTIPORT=m
-CONFIG_IP_NF_MATCH_TOS=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_DSCP=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
-CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_HASHLIMIT=m
 CONFIG_IP_NF_MATCH_POLICY=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
@@ -727,15 +732,16 @@
 #
 CONFIG_IP6_NF_QUEUE=m
 CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_AHESP=m
+CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
 CONFIG_IP6_NF_MATCH_MULTIPORT=m
+CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AHESP=m
-CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_RT=m
 CONFIG_IP6_NF_MATCH_POLICY=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_MANGLE=m
@@ -1711,14 +1717,17 @@
 CONFIG_VIDEO_SAA7134_DVB=m
 CONFIG_VIDEO_SAA7134_DVB_ALL_FRONTENDS=y
 CONFIG_VIDEO_STRADIS=m
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+CONFIG_VIDEO_W9966=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
 CONFIG_VIDEO_ZORAN=m
 CONFIG_VIDEO_ZORAN_BUZ=m
 CONFIG_VIDEO_ZORAN_DC10=m
 CONFIG_VIDEO_ZORAN_DC30=m
 CONFIG_VIDEO_ZORAN_LML33=m
 CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_WM8775=m
 CONFIG_TUNER_3036=m
 
 #
@@ -1979,6 +1988,10 @@
 CONFIG_SND_INTEL8X0M=m
 CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDSPM=m
+CONFIG_SND_ADLIB=m
+CONFIG_SND_MIRO=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_RIPTIDE=m
 
 #
 # ALSA USB devices
@@ -2721,3 +2734,4 @@
 
 CONFIG_MIGRATION=y
 # CONFIG_NEW_LEDS is not set
+



From fedora-cvs-commits at redhat.com  Mon Apr  3 04:16:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 00:16:58 -0400
Subject: rpms/kernel/devel patch-2.6.17-rc1.bz2.sign, NONE, 1.1 .cvsignore,
	1.401, 1.402 kernel-2.6.spec, 1.2115,
	1.2116 linux-2.6-compile-fixes.patch, 1.63,
	1.64 linux-2.6-random-patches.patch, 1.4, 1.5 sources, 1.342,
	1.343 upstream, 1.315, 1.316 patch-2.6.16-git20.bz2.sign, 1.1, NONE
Message-ID: <200604030416.k334Gwcq021473@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch 
	linux-2.6-random-patches.patch sources upstream 
Added Files:
	patch-2.6.17-rc1.bz2.sign 
Removed Files:
	patch-2.6.16-git20.bz2.sign 
Log Message:
rc1



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

iD8DBQBEMJwMyGugalF9Dw4RAl/NAJ0dwQZ8sMyTPzC5iA+MKntc2HpHkgCgjgdi
Nv6YG+cBhoEIA4wOgmRxxSc=
=DL03
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -r1.401 -r1.402
--- .cvsignore	1 Apr 2006 21:26:06 -0000	1.401
+++ .cvsignore	3 Apr 2006 04:16:49 -0000	1.402
@@ -3,4 +3,4 @@
 kernel-2.6.16
 linux-2.6.16.tar.bz2
 xen-20060320.tar.bz2
-patch-2.6.16-git20.bz2
+patch-2.6.17-rc1.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2115
retrieving revision 1.2116
diff -u -r1.2115 -r1.2116
--- kernel-2.6.spec	2 Apr 2006 07:24:38 -0000	1.2115
+++ kernel-2.6.spec	3 Apr 2006 04:16:49 -0000	1.2116
@@ -217,7 +217,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16-git20.bz2
+Patch1: patch-2.6.17-rc1.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1594,6 +1594,9 @@
 %endif
 
 %changelog
+* Sun Apr  2 2006 Dave Jones <davej at redhat.com>
+- 2.6.17rc1
+
 * Sun Apr  2 2006 James Morris <jmorris at redhat.com>
 - Rework dom0 sedf scheduler defaults patch, bz # 181856
 

linux-2.6-compile-fixes.patch:
 atomic.h |    2 ++
 1 files changed, 2 insertions(+)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- linux-2.6-compile-fixes.patch	1 Apr 2006 05:09:18 -0000	1.63
+++ linux-2.6-compile-fixes.patch	3 Apr 2006 04:16:49 -0000	1.64
@@ -1,23 +1,3 @@
---- linux-2.6.16.noarch/arch/powerpc/platforms/cell/spufs/run.c~	2006-03-30 15:48:17.000000000 -0500
-+++ linux-2.6.16.noarch/arch/powerpc/platforms/cell/spufs/run.c	2006-03-30 15:48:25.000000000 -0500
-@@ -2,6 +2,7 @@
- #include <linux/ptrace.h>
- 
- #include <asm/spu.h>
-+#include <asm/unistd.h>
- 
- #include "spufs.h"
- 
---- linux-2.6.16.noarch/arch/powerpc/platforms/cell/spu_callbacks.c~	2006-03-31 21:53:04.000000000 -0500
-+++ linux-2.6.16.noarch/arch/powerpc/platforms/cell/spu_callbacks.c	2006-03-31 21:53:43.000000000 -0500
-@@ -316,6 +316,7 @@ void *spu_syscall_table[] = {
- 	[__NR_pselect6]			sys_ni_syscall, /* sys_pselect */
- 	[__NR_ppoll]			sys_ni_syscall, /* sys_ppoll */
- 	[__NR_unshare]			sys_unshare,
-+	[__NR_splice]			sys_splice,
- };
- 
- long spu_sys_callback(struct spu_syscall_block *s)
 
 include/asm/atomic.h:94: warning: implicit declaration of function 'unlikely'
 include/asm/atomic.h:97: warning: implicit declaration of function 'likely'

linux-2.6-random-patches.patch:
 linux-2.6.15.noarch/drivers/char/dtlk.c                    |    2 +-
 linux-2.6.15.noarch/drivers/char/watchdog/machzwd.c        |    3 +--
 linux-2.6.15.noarch/drivers/char/watchdog/sc1200wdt.c      |    2 +-
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/av7110.c       |    2 +-
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget-ci.c    |    2 +-
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget-patch.c |    2 +-
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget.c       |    5 +----
 linux-2.6.15/kernel/power/snapshot.c                       |    1 +
 8 files changed, 8 insertions(+), 11 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-random-patches.patch	24 Mar 2006 22:43:38 -0000	1.4
+++ linux-2.6-random-patches.patch	3 Apr 2006 04:16:53 -0000	1.5
@@ -1,20 +1,4 @@
 
-Missing newline.
-
-Signed-off-by: Dave Jones <davej at redhat.com>
-
---- linux-2.6.15.noarch/drivers/media/video/cpia.c~	2006-02-01 22:36:07.000000000 -0500
-+++ linux-2.6.15.noarch/drivers/media/video/cpia.c	2006-02-01 22:36:24.000000000 -0500
-@@ -4042,7 +4042,7 @@ static int __init cpia_init(void)
- 	       "allowed, it is disabled by default now. Users should fix the "
- 	       "applications in case they don't work without conversion "
- 	       "reenabled by setting the 'colorspace_conv' module "
--	       "parameter to 1");
-+	       "parameter to 1\n");
- 
- #ifdef CONFIG_PROC_FS
- 	proc_cpia_create();
-
 Doubletalk printk's an extraneous \n
 
 Signed-off-by: Dave Jones <davej at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -r1.342 -r1.343
--- sources	1 Apr 2006 21:26:06 -0000	1.342
+++ sources	3 Apr 2006 04:16:54 -0000	1.343
@@ -1,3 +1,3 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 8c70806f9075ebc0087f7ce1b8911700  xen-20060320.tar.bz2
-9a7d6fd1f2b53ed419f351a1b7cedd80  patch-2.6.16-git20.bz2
+ee1b5bf019ec60a34ef7bf1b2a0c1291  patch-2.6.17-rc1.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -r1.315 -r1.316
--- upstream	1 Apr 2006 21:26:06 -0000	1.315
+++ upstream	3 Apr 2006 04:16:54 -0000	1.316
@@ -1,2 +1,2 @@
 linux-2.6.16.tar.bz2
-patch-2.6.16-git20.bz2
+patch-2.6.17-rc1.bz2


--- patch-2.6.16-git20.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr  3 04:33:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 00:33:36 -0400
Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.64,1.65
Message-ID: <200604030433.k334XarD031706@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
build fix


linux-2.6-compile-fixes.patch:
 include/asm-s390/atomic.h |    2 ++
 security/selinux/xfrm.c   |    4 ++--
 2 files changed, 4 insertions(+), 2 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.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- linux-2.6-compile-fixes.patch	3 Apr 2006 04:16:49 -0000	1.64
+++ linux-2.6-compile-fixes.patch	3 Apr 2006 04:33:32 -0000	1.65
@@ -13,3 +13,23 @@
  /*
   *  include/asm-s390/atomic.h
   *
+--- linux-2.6.16.noarch/security/selinux/xfrm.c~	2006-04-02 23:27:07.000000000 -0500
++++ linux-2.6.16.noarch/security/selinux/xfrm.c	2006-04-02 23:27:40.000000000 -0500
+@@ -281,7 +281,7 @@ u32 selinux_socket_getpeer_dgram(struct 
+ 		int i;
+ 
+ 		for (i = sp->len-1; i >= 0; i--) {
+-			struct xfrm_state *x = sp->x[i].xvec;
++			struct xfrm_state *x = sp->xvec[i];
+ 			if (selinux_authorizable_xfrm(x)) {
+ 				struct xfrm_sec_ctx *ctx = x->security;
+ 				return ctx->ctx_sid;
+@@ -314,7 +314,7 @@ int selinux_xfrm_sock_rcv_skb(u32 isec_s
+ 		 *  Only need to verify the existence of an authorizable sp.
+ 		 */
+ 		for (i = 0; i < sp->len; i++) {
+-			struct xfrm_state *x = sp->x[i].xvec;
++			struct xfrm_state *x = sp->xvec[i];
+ 
+ 			if (x && selinux_authorizable_xfrm(x))
+ 				goto accept;



From fedora-cvs-commits at redhat.com  Mon Apr  3 09:14:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 05:14:22 -0400
Subject: rpms/irda-utils/devel irda-utils-0.9.16-io.patch, NONE,
	1.1 irda-utils.spec, 1.22, 1.23
Message-ID: <200604030914.k339EMoP028255@cvs.devel.redhat.com>

Author: karsten

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

Modified Files:
	irda-utils.spec 
Added Files:
	irda-utils-0.9.16-io.patch 
Log Message:
- don't use asm/io.h directly (Bastien Nocera #186875)


irda-utils-0.9.16-io.patch:
 nsc.c     |    2 +-
 smc.c     |    2 +-
 winbond.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE irda-utils-0.9.16-io.patch ---
diff -upr irda-utils-0.9.16/findchip/nsc.c irda-utils-0.9.16.new/findchip/nsc.c
--- irda-utils-0.9.16/findchip/nsc.c    2003-07-07 21:33:37.000000000 -0400
+++ irda-utils-0.9.16.new/findchip/nsc.c    2006-03-24 07:16:14.000000000 -0500
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <asm/io.h>
+#include <sys/io.h>
 
 #include "findchip.h"
 
diff -upr irda-utils-0.9.16/findchip/smc.c irda-utils-0.9.16.new/findchip/smc.c
--- irda-utils-0.9.16/findchip/smc.c    2003-07-07 21:33:37.000000000 -0400
+++ irda-utils-0.9.16.new/findchip/smc.c    2006-03-24 07:14:19.000000000 -0500
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <asm/io.h>
+#include <sys/io.h>
 
 #include "findchip.h"
 
diff -upr irda-utils-0.9.16/findchip/winbond.c irda-utils-0.9.16.new/findchip/winbond.c
--- irda-utils-0.9.16/findchip/winbond.c    2000-11-06 16:11:39.000000000 -0500
+++ irda-utils-0.9.16.new/findchip/winbond.c    2006-03-24 07:16:29.000000000 -0500
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <asm/io.h>
+#include <sys/io.h>
 
 #include "findchip.h"


Index: irda-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/irda-utils/devel/irda-utils.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- irda-utils.spec	11 Feb 2006 03:39:11 -0000	1.22
+++ irda-utils.spec	3 Apr 2006 09:14:19 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Utilities for infrared communication between devices.
 Name: irda-utils
 Version: 0.9.16
-Release: 7.2.1
+Release: 8
 Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.gz
 Patch1: irda-utils-0.9.14-chkconfig.patch
 Patch2: irda-utils-0.9.14-typo.patch
@@ -10,12 +10,14 @@
 Patch5: irda-utils-0.9.15-rh1.patch
 Patch6: irda-utils-0.9.16-rh2.patch
 Patch7: irda-utils-0.9.16-glib2.patch
+Patch8: irda-utils-0.9.16-io.patch
 Url: http://irda.sourceforge.net/
 License: GPL
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-root
 Prereq: /sbin/chkconfig, grep, modutils >= 2.3.21-4
 ExcludeArch: s390 s390x
+BuildRequires: glib2-devel
 
 %description
 IrDA(TM) (Infrared Data Association) is an industry standard for
@@ -43,6 +45,7 @@
 %patch5 -p1 -b .rh1
 %patch6 -p1 -b .rh2
 %patch7 -p1 -b .glib2
+%patch8 -p1 -b .io
 
 %build
 make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" CFLAGS="$RPM_OPT_FLAGS"
@@ -86,6 +89,9 @@
 %doc tekram/README.tekram
 
 %changelog
+* Mon Apr 03 2006 Karsten Hopp <karsten at redhat.de> 0.9.16-8
+- don't use asm/io.h directly (Bastien Nocera #186875)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.9.16-7.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr  3 09:39:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 05:39:48 -0400
Subject: rpms/gkrellm/devel .cvsignore, 1.15, 1.16 gkrellm.spec, 1.31,
	1.32 sources, 1.15, 1.16
Message-ID: <200604030939.k339dmuC009789@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gkrellm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9760

Modified Files:
	.cvsignore gkrellm.spec sources 
Log Message:
- update to 2.2.9
- remove explicit UID/GUIs from useradd/groupadd (#186974)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gkrellm/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	9 Jun 2005 10:53:07 -0000	1.15
+++ .cvsignore	3 Apr 2006 09:39:45 -0000	1.16
@@ -1,2 +1,2 @@
+gkrellm-2.2.9.tar.bz2
 gkrellm-wifi-0.9.12.tar.gz
-gkrellm-2.2.7.tar.bz2


Index: gkrellm.spec
===================================================================
RCS file: /cvs/dist/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gkrellm.spec	28 Feb 2006 11:34:32 -0000	1.31
+++ gkrellm.spec	3 Apr 2006 09:39:45 -0000	1.32
@@ -1,8 +1,8 @@
 %define		wifi_version 0.9.12
 Summary:	Multiple stacked system monitors in one process.
 Name:		gkrellm
-Version:	2.2.7
-Release:    7
+Version:	2.2.9
+Release:    1
 License:	GPL
 Group:		Applications/System
 URL:		http://www.gkrellm.net/
@@ -134,8 +134,8 @@
 
 %pre daemon
 # the daemon shouldn't run as nobody
-/usr/sbin/groupadd -g 101 gkrellmd 2>/dev/null ||:
-/usr/sbin/useradd -u 101 -s /sbin/nologin -M -d / -c "GNU Krell daemon" -r -g gkrellmd gkrellmd 2>/dev/null ||:
+/usr/sbin/groupadd gkrellmd 2>/dev/null ||:
+/usr/sbin/useradd -s /sbin/nologin -M -d / -c "GNU Krell daemon" -r -g gkrellmd gkrellmd 2>/dev/null ||:
 
 %post daemon
 chkconfig --add gkrellmd
@@ -184,6 +184,10 @@
 %endif
 
 %changelog
+* Mon Apr 03 2006 Karsten Hopp <karsten at redhat.de> 2.2.9-1
+- update to 2.2.9
+- remove explicit UID/GUIs from useradd/groupadd (#186974)  
+
 * Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de> 2.2.7-7
 - BuildRequires: libSM-devel
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gkrellm/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	9 Jun 2005 10:53:07 -0000	1.15
+++ sources	3 Apr 2006 09:39:45 -0000	1.16
@@ -1,2 +1,2 @@
+5334155797901724f4eb46a82ad72395  gkrellm-2.2.9.tar.bz2
 3b9a71c9177d8e058f5707baeb0da761  gkrellm-wifi-0.9.12.tar.gz
-6ff47bc8e66ba88f42932365a947f9f3  gkrellm-2.2.7.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr  3 10:57:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 06:57:30 -0400
Subject: rpms/jpilot/FC-5 jpilot.spec,1.32,1.33
Message-ID: <200604031057.k33AvULK018861@cvs.devel.redhat.com>

Author: varekova

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

Modified Files:
	jpilot.spec 
Log Message:
- rebuild against pilot-link-0.11.8



Index: jpilot.spec
===================================================================
RCS file: /cvs/dist/rpms/jpilot/FC-5/jpilot.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- jpilot.spec	27 Feb 2006 13:12:11 -0000	1.32
+++ jpilot.spec	3 Apr 2006 10:57:28 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Jpilot pilot desktop software
 Name: jpilot
 Version: 0.99.8
-Release: 3
+Release: 3.fc5
 License: GPL
 Group: Applications/Productivity
 URL: http://jpilot.org
@@ -81,6 +81,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Mon Apr  3 2006 Ivana Varekova <varekova at redhat.com> - 0.99.8-3.fc5
+- rebuild against pilot-link-0.11.8
+
 * Mon Feb 27 2006 Ivana Varekova <varekova at redhat.com> - 0.99.8-3
 - fix b183014 - jpilot startup problem
 



From fedora-cvs-commits at redhat.com  Mon Apr  3 11:33:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 07:33:13 -0400
Subject: rpms/jpilot/FC-4 jpilot.spec,1.25,1.26
Message-ID: <200604031133.k33BXDTk000328@cvs.devel.redhat.com>

Author: varekova

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

Modified Files:
	jpilot.spec 
Log Message:
- rebuild against pilot-link-0.11.8



Index: jpilot.spec
===================================================================
RCS file: /cvs/dist/rpms/jpilot/FC-4/jpilot.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jpilot.spec	21 Sep 2005 12:28:53 -0000	1.25
+++ jpilot.spec	3 Apr 2006 11:32:58 -0000	1.26
@@ -3,7 +3,7 @@
 Summary: Jpilot pilot desktop software
 Name: jpilot
 Version: 0.99.8
-Release: 0.pre10.fc4.1
+Release: 0.pre10.fc4.2
 License: GPL
 Group: Applications/Productivity
 URL: http://jpilot.org
@@ -83,6 +83,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Mon Apr  3 2006 Ivana Varekova <varekova at redhat.com> 0.99.8-0.pre10.fc4.2
+- rebuild against pilot-link-0.11.8
+
 * Wed Sep 21 2005 Ivana Varekova <varekova at redhat.com> 0.99.8-0.pre10.fc4.1
 - rebuilt new version
 



From fedora-cvs-commits at redhat.com  Mon Apr  3 12:45:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 08:45:16 -0400
Subject: rpms/shadow-utils/devel shadow-4.0.15-login.defs, NONE,
	1.1 shadow-4.0.15-redhat.patch, NONE, 1.1 .cvsignore, 1.10,
	1.11 shadow-utils.spec, 1.70, 1.71 sources, 1.10,
	1.11 shadow-4.0.14-redhat.patch, 1.1,
	NONE shadow-970616.login.defs, 1.2, NONE
Message-ID: <200604031245.k33CjGeQ028692@cvs.devel.redhat.com>

Author: pvrabec

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

Modified Files:
	.cvsignore shadow-utils.spec sources 
Added Files:
	shadow-4.0.15-login.defs shadow-4.0.15-redhat.patch 
Removed Files:
	shadow-4.0.14-redhat.patch shadow-970616.login.defs 
Log Message:
upgrade



--- NEW FILE shadow-4.0.15-login.defs ---
# *REQUIRED*
#   Directory where mailboxes reside, _or_ name of file, relative to the
#   home directory.  If you _do_ define both, MAIL_DIR takes precedence.
#   QMAIL_DIR is for Qmail
#
#QMAIL_DIR	Maildir
MAIL_DIR	/var/spool/mail
#MAIL_FILE	.mail

# Password aging controls:
#
#	PASS_MAX_DAYS	Maximum number of days a password may be used.
#	PASS_MIN_DAYS	Minimum number of days allowed between password changes.
#	PASS_MIN_LEN	Minimum acceptable password length.
#	PASS_WARN_AGE	Number of days warning given before a password expires.
#
PASS_MAX_DAYS	99999
PASS_MIN_DAYS	0
PASS_MIN_LEN	5
PASS_WARN_AGE	7

#
# Min/max values for automatic uid selection in useradd
#
UID_MIN			  500
UID_MAX			60000

#
# Min/max values for automatic gid selection in groupadd
#
GID_MIN			  500
GID_MAX			60000

#
# If defined, this command is run when removing a user.
# It should remove any at/cron/print jobs etc. owned by
# the user to be removed (passed as the first argument).
#
#USERDEL_CMD	/usr/sbin/userdel_local

#
# If useradd should create home directories for users by default
# On RH systems, we do. This option is ORed with the -m flag on
# useradd command line.
#
CREATE_HOME	yes

# The permission mask is initialized to this value. If not specified, 
# the permission mask will be initialized to 022.
UMASK           077


shadow-4.0.15-redhat.patch:
 man/groupadd.8 |    7 +++-
 man/useradd.8  |   22 +++++++++++--
 src/groupadd.c |   19 +++++++++--
 src/useradd.c  |   94 ++++++++++++++++++++++++++++++++++++++-------------------
 4 files changed, 103 insertions(+), 39 deletions(-)

--- NEW FILE shadow-4.0.15-redhat.patch ---
--- shadow-4.0.15/man/groupadd.8.redhat	2006-03-06 19:57:18.000000000 +0100
+++ shadow-4.0.15/man/groupadd.8	2006-04-03 13:43:56.000000000 +0200
@@ -11,7 +11,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
@@ -29,10 +29,13 @@
 \fB\-g\fR
 is turned off).
 .TP
+\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
 \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
 \fB\-h\fR, \fB\-\-help\fR
 Display help message and exit.
--- shadow-4.0.15/man/useradd.8.redhat	2006-03-06 19:57:18.000000000 +0100
+++ shadow-4.0.15/man/useradd.8	2006-04-03 13:43:56.000000000 +0200
@@ -22,7 +22,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
@@ -62,8 +62,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
 \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
-\fI/etc/default/useradd\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.
 .TP
 \fB\-G\fR, \fB\-\-groups\fR \fIGROUP1\fR[\fI,GROUP2,...\fR[\fI,GROUPN\fR]]]
 A list of supplementary groups which the user is also a member of. Each group is separated from the next by a comma, with no intervening whitespace. The groups are subject to the same restrictions as the group given with the
@@ -72,6 +71,9 @@
 .TP
 \fB\-h\fR, \fB\-\-help\fR
 Display help message and exit.
+.TP 
+\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
 \fB\-m\fR, \fB\-\-create\-home\fR
 The user's home directory will be created if it does not exist. The files contained in
@@ -89,6 +91,9 @@
 option is only valid in conjunction with the
 \fB\-m\fR
 option. The default is to not create the directory and to not copy any files.
+.TP 
+\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
 \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).
@@ -110,6 +115,9 @@
 \fB\-p\fR, \fB\-\-password\fR \fIPASSWORD\fR
 The encrypted password, as returned by
 \fBcrypt\fR(3). The default is to disable the account.
+.TP 
+\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
 \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.
@@ -153,6 +161,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.
@@ -173,9 +183,15 @@
 \fI/etc/group\fR
 group account information
 .TP
+\fI/etc/gshadow\fR
+secure group information
+.TP
 \fI/etc/default/useradd\fR
 default information
 .TP
+\fI/etc/login.defs\fR
+system-wide settings
+.TP
 \fI/etc/skel/\fR
 directory containing default files
 .TP
--- shadow-4.0.15/src/useradd.c.redhat	2006-03-07 16:50:33.000000000 +0100
+++ shadow-4.0.15/src/useradd.c	2006-04-03 13:43:56.000000000 +0200
@@ -81,7 +81,7 @@
 static gid_t def_group = 100;
 static const char *def_gname = "other";
 static const char *def_home = "/home";
-static const char *def_shell = "";
+static const char *def_shell = "/sbin/nologin";
 static const char *def_template = SKEL_DIR;
 static const char *def_create_mail_spool = "no";
 
@@ -93,7 +93,7 @@
 #define	VALID(s)	(strcspn (s, ":\n") == strlen (s))
 
 static const char *user_name = "";
-static const char *user_pass = "!";
+static const char *user_pass = "!!";
 static uid_t user_id;
 static gid_t user_gid;
 static const char *user_comment = "";
@@ -124,8 +124,10 @@
     Gflg = 0,			/* secondary group set for new account */
     kflg = 0,			/* specify a directory to fill new user directory */
     mflg = 0,			/* create user's home directory if it doesn't exist */
-    nflg = 0,			/* create a group having the same name as the user */
+    Mflg = 0,                   /* do NOT create user's home directory no matter what */
+    nflg = 0,                   /* do NOT create a group having the same name as the user */
     oflg = 0,			/* permit non-unique user ID to be specified with -u */
+    rflg = 0,                   /* create a system account */
     sflg = 0,			/* shell program for new account */
     uflg = 0;			/* specify user ID for new account */
 
@@ -628,6 +630,8 @@
 			   "  -K, --key KEY=VALUE		overrides /etc/login.defs defaults\n"
 			   "  -m, --create-home		create home directory for the new user\n"
 			   "				account\n"
+			   "  -M,                       do not create user's home directory(overrides /etc/login.defs)\n"
+			   "  -r,                       create system account\n"
 			   "  -o, --non-unique		allow create user with duplicate\n"
 			   "				(non-unique) UID\n"
 			   "  -p, --password PASSWORD	use encrypted password for the new user\n"
@@ -679,11 +683,20 @@
 	spent->sp_namp = (char *) user_name;
 	spent->sp_pwdp = (char *) user_pass;
 	spent->sp_lstchg = time ((time_t *) 0) / SCALE;
-	spent->sp_min = scale_age (getdef_num ("PASS_MIN_DAYS", -1));
-	spent->sp_max = scale_age (getdef_num ("PASS_MAX_DAYS", -1));
-	spent->sp_warn = scale_age (getdef_num ("PASS_WARN_AGE", -1));
-	spent->sp_inact = scale_age (def_inactive);
-	spent->sp_expire = scale_age (user_expire);
+	if (!rflg) {
+		spent->sp_min = scale_age (getdef_num ("PASS_MIN_DAYS", -1));
+		spent->sp_max = scale_age (getdef_num ("PASS_MAX_DAYS", -1));
+		spent->sp_warn = scale_age (getdef_num ("PASS_WARN_AGE", -1));
+		spent->sp_inact = scale_age (def_inactive);
+		spent->sp_expire = scale_age (user_expire);
+	}
+	else {
+		spent->sp_min = scale_age(-1);
+                spent->sp_max = scale_age(-1);
+                spent->sp_warn = scale_age(-1);
+                spent->sp_inact = scale_age(-1);
+        	spent->sp_expire = scale_age(-1);
+	}
 	spent->sp_flag = -1;
 }
 
@@ -831,8 +844,14 @@
 	const struct passwd *pwd;
 	uid_t uid_min, uid_max;
 
-	uid_min = getdef_unum ("UID_MIN", 1000);
-	uid_max = getdef_unum ("UID_MAX", 60000);
+        if (!rflg) {
+                uid_min = getdef_unum ("UID_MIN", 500);
+                uid_max = getdef_unum ("UID_MAX", 60000);
+        }
+        else {
+                uid_min = 1;
+                uid_max = getdef_unum ("UID_MIN", 500) - 1;
+        }
 
 	/*
 	 * Start with some UID value if the user didn't provide us with
@@ -862,7 +881,7 @@
 #endif
 			exit (E_NAME_IN_USE);
 		}
-		if (uflg && user_id == pwd->pw_uid) {
+		if (!oflg && uflg && user_id == pwd->pw_uid) {
 			fprintf (stderr, _("%s: UID %u is not unique\n"),
 				 Prog, (unsigned int) user_id);
 #ifdef WITH_AUDIT
@@ -1016,7 +1035,7 @@
 			{NULL, 0, NULL, '\0'}
 		};
 		while ((c =
-			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMop:s:u:",
+			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMnrop:s:u:",
 				     long_options, NULL)) != -1) {
 			switch (c) {
 			case 'b':
@@ -1188,6 +1207,15 @@
 				user_id = get_uid (optarg);
 				uflg++;
 				break;
+                        case 'n':
+                                nflg++;
+                                break;
+                        case 'r':
+                                rflg++;
+                                break;
+                        case 'M':
+                                Mflg++;
+                                break;
 			default:
 				usage ();
 			}
@@ -1195,6 +1223,9 @@
 		}
 	}
 
+        if (mflg && Mflg) /* the admin is not decided .. create or not ? */
+               usage();
+
 	/*
 	 * Certain options are only valid in combination with others.
 	 * Check it here so that they can be specified in any order.
@@ -1703,6 +1734,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.
@@ -1733,7 +1772,7 @@
 	 * to that group, use useradd -g username username.
 	 * --bero
 	 */
-	if (!gflg) {
+	if ( !(nflg || gflg) ) {
 		if (getgrnam (user_name)) {
 			fprintf (stderr,
 				 _
@@ -1784,25 +1823,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.15/src/groupadd.c.redhat	2006-01-18 20:55:15.000000000 +0100
+++ shadow-4.0.15/src/groupadd.c	2006-04-03 13:43:56.000000000 +0200
@@ -74,6 +74,7 @@
 static int oflg = 0;		/* permit non-unique group ID to be specified with -g */
 static int gflg = 0;		/* ID value for the new group */
 static int fflg = 0;		/* if group already exists, do nothing and exit(0) */
+static int rflg = 0;            /* for adding system accounts (Red Hat) */
 
 /* local function prototypes */
 static void usage (void);
@@ -99,6 +100,7 @@
 			   "Options:\n"
 			   "  -f, --force		force exit with success status if the specified\n"
 			   "				group already exists\n"
+			   "  -r,			create system account\n"
 			   "  -g, --gid GID		use GID for the new group\n"
 			   "  -h, --help			display this help message and exit\n"
 			   "  -K, --key KEY=VALUE		overrides /etc/login.defs defaults\n"
@@ -196,8 +198,13 @@
 	const struct group *grp;
 	gid_t gid_min, gid_max;
 
-	gid_min = getdef_unum ("GID_MIN", 1000);
-	gid_max = getdef_unum ("GID_MAX", 60000);
+	if (!rflg) {
+		gid_min = getdef_unum ("GID_MIN", 500);
+                gid_max = getdef_unum ("GID_MAX", 60000);
+        } else {
+                gid_min = 1;
+                gid_max = getdef_unum ("GID_MIN", 500) - 1;
+        }
 
 	/*
 	 * Start with some GID value if the user didn't provide us with
@@ -411,7 +418,7 @@
 		};
 
 		while ((c =
-			getopt_long (argc, argv, "fg:hK:o", long_options,
+			getopt_long (argc, argv, "frg:hK:o", long_options,
 				     &option_index)) != -1) {
 			switch (c) {
 			case 'f':
@@ -424,6 +431,12 @@
 				 */
 				fflg++;
 				break;
+	                case 'r':
+	                        /*
+	                         * create a system group
+	                         */
+	                        rflg++;
+	                        break;
 			case 'g':
 				gflg++;
 				if (!isdigit (optarg[0]))


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	6 Jan 2006 09:56:57 -0000	1.10
+++ .cvsignore	3 Apr 2006 12:45:14 -0000	1.11
@@ -1 +1 @@
-shadow-4.0.14.tar.bz2
+shadow-4.0.15.tar.bz2


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- shadow-utils.spec	10 Mar 2006 14:02:43 -0000	1.70
+++ shadow-utils.spec	3 Apr 2006 12:45:14 -0000	1.71
@@ -4,14 +4,14 @@
 
 Summary: Utilities for managing accounts and shadow password files.
 Name: shadow-utils
-Version: 4.0.14
-Release: 4
+Version: 4.0.15
+Release: 1
 Epoch: 2
 URL: http://shadow.pld.org.pl/
 Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2
-Source1: shadow-970616.login.defs
+Source1: shadow-4.0.15-login.defs
 Source2: shadow-970616.useradd
-Patch0: shadow-4.0.14-redhat.patch
+Patch0: shadow-4.0.15-redhat.patch
 Patch1: shadow-4.0.3-noinst.patch
 Patch2: shadow-4.0.11.1-vipw.patch
 Patch3: shadow-4.0.14-goodname.patch
@@ -99,6 +99,7 @@
 rm $RPM_BUILD_ROOT/%{_sbindir}/vipw
 rm $RPM_BUILD_ROOT/%{_sbindir}/vigr
 rm $RPM_BUILD_ROOT/%{_sbindir}/nologin
+rm $RPM_BUILD_ROOT/%{_sbindir}/chgpasswd
 rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/id.*
 rm $RPM_BUILD_ROOT/%{_mandir}/man1/chfn.*
 rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/chfn.*
@@ -128,6 +129,8 @@
 rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/logoutd.*
 rm $RPM_BUILD_ROOT/%{_mandir}/man8/vipw.*
 rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/vipw.*
+rm $RPM_BUILD_ROOT/%{_mandir}/man8/nologin.*
+rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/nologin.*
 rm $RPM_BUILD_ROOT/%{_mandir}/man8/vigr.*
 rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/vigr.*
 rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/sulogin.*
@@ -200,6 +203,9 @@
 %{_mandir}/*/man8/faillog.8*
 
 %changelog
+* Mon Apr 03 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.15-1
+- upgrade
+
 * Fri Mar 10 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.14-4
 - fix lrename() function to handle relative symlinks too
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	6 Jan 2006 09:56:57 -0000	1.10
+++ sources	3 Apr 2006 12:45:14 -0000	1.11
@@ -1 +1 @@
-903f55cf05bbe082617d3337743792fb  shadow-4.0.14.tar.bz2
+a0452fa989f8ba45023cc5a08136568e  shadow-4.0.15.tar.bz2


--- shadow-4.0.14-redhat.patch DELETED ---


--- shadow-970616.login.defs DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr  3 12:50:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 08:50:50 -0400
Subject: rpms/cups/devel cups.spec,1.151,1.152
Message-ID: <200604031250.k33CooIe009973@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Log Message:
Include STR reference.


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- cups.spec	2 Apr 2006 19:19:27 -0000	1.151
+++ cups.spec	3 Apr 2006 12:50:48 -0000	1.152
@@ -384,7 +384,7 @@
 
 %changelog
 * Sun Apr  2 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.5
-- Backported svn 5365:5366 change for mutex-protected stringpool.
+- Backported svn 5365:5366 change for mutex-protected stringpool (STR #1530).
 
 * Sat Apr  1 2006 Tim Waugh <twaugh at redhat.com>
 - Fixed _cupsStrFree() (STR #1529).



From fedora-cvs-commits at redhat.com  Mon Apr  3 12:53:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 08:53:46 -0400
Subject: rpms/cups/FC-5 cups.spec,1.138,1.139
Message-ID: <200604031253.k33CrkrN010050@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Log Message:
Include STR reference.


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- cups.spec	2 Apr 2006 19:22:19 -0000	1.138
+++ cups.spec	3 Apr 2006 12:53:44 -0000	1.139
@@ -388,7 +388,7 @@
 
 %changelog
 * Sun Apr  2 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.5
-- Backported svn 5365:5366 change for mutex-protected stringpool.
+- Backported svn 5365:5366 change for mutex-protected stringpool (STR #1530).
 
 * Sat Apr  1 2006 Tim Waugh <twaugh at redhat.com>
 - Fixed _cupsStrFree() (STR #1529).



From fedora-cvs-commits at redhat.com  Mon Apr  3 15:09:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 11:09:21 -0400
Subject: rpms/libXcomposite/devel .cvsignore, 1.6, 1.7 libXcomposite.spec,
	1.10, 1.11 sources, 1.7, 1.8
Message-ID: <200604031509.k33F9LV3002258@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXcomposite/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2231/devel

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXcomposite/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Dec 2005 11:04:59 -0000	1.6
+++ .cvsignore	3 Apr 2006 15:09:10 -0000	1.7
@@ -1 +1 @@
-libXcomposite-0.2.2.2.tar.bz2
+libXcomposite-0.3.tar.bz2


Index: libXcomposite.spec
===================================================================
RCS file: /cvs/dist/rpms/libXcomposite/devel/libXcomposite.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libXcomposite.spec	11 Feb 2006 04:17:46 -0000	1.10
+++ libXcomposite.spec	3 Apr 2006 15:09:10 -0000	1.11
@@ -1,11 +1,11 @@
 Summary: X.Org X11 libXcomposite runtime library
 Name: libXcomposite
-Version: 0.2.2.2
-Release: 2.2
+Version: 0.3
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: pkgconfig
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/xcomposite.pc
 
 %changelog
+* Mon Apr  3 2006 Adam Jackson <ajackson at redhat.com> - 0.3-1
+- Update to 0.3 from upstream.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.2.2.2-2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXcomposite/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jan 2006 22:23:21 -0000	1.7
+++ sources	3 Apr 2006 15:09:10 -0000	1.8
@@ -1 +1 @@
-053c12a71b6d0c47c4e90ccab572b483  libXcomposite-0.2.2.2.tar.bz2
+135d4b02d63c59178922cea8765a24c1  libXcomposite-0.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr  3 15:55:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 11:55:48 -0400
Subject: rpms/metacity/devel metacity.spec,1.64,1.65
Message-ID: <200604031555.k33FtmHx030542@cvs.devel.redhat.com>

Author: sandmann

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

Modified Files:
	metacity.spec 
Log Message:
* Mon Apr  3 2006 Soren Sandmann <sandmann at redhat.com> - 2.15.0-2
- Fix leftover libcm-snapshot-date, buildrequire libXcomposite-devel >= 0.3




Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- metacity.spec	31 Mar 2006 21:57:10 -0000	1.64
+++ metacity.spec	3 Apr 2006 15:55:46 -0000	1.65
@@ -7,7 +7,7 @@
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 1
+Release: 2
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
 Source0: metacity-%{metacity_version}.%{metacity_snapshot}.tar.gz
 Source1: libcm-%{libcm_version}.tar.gz
@@ -27,7 +27,7 @@
 BuildRequires: libSM-devel, libGL-devel, libGLU-devel, libICE-devel, libX11-devel
 BuildRequires: libXext-devel, libXinerama-devel, libXrandr-devel, libXrender-devel
 BuildRequires: libXcursor-devel, libXdamage-devel, libXtst-devel, libXfixes-devel, 
-BuildRequires: libXcomposite-devel
+BuildRequires: libXcomposite-devel >= 0.3
 BuildRequires: mesa-libGL-devel >= 6.4.2-3
 
 Requires: startup-notification >= 0.7
@@ -64,7 +64,7 @@
 LIBS="$LIBS -lXrender -lXcursor"
 LIBS="$LIBS -lXdamage -lXtst -lXfixes -lXcomposite"
 %ifnarch s390 s390x ppc64
-LIBS="$LIBS $PWD/libcm-%{libcm_version}.0.%{libcm_snapshot_date}/src/.libs/libcm.a"
+LIBS="$LIBS $PWD/libcm-%{libcm_version}/src/.libs/libcm.a"
 %endif
 export LIBS
 
@@ -138,6 +138,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Apr  3 2006 Soren Sandmann <sandmann at redhat.com> - 2.15.0-2
+- Fix leftover libcm-snapshot-date, buildrequire libXcomposite-devel >= 0.3
+
 * Fri Mar 31 2006 Soren Sandmann <sandmann at redhat.com> - 2.15.0
 - Update to 2.15.0
 



From fedora-cvs-commits at redhat.com  Mon Apr  3 16:27:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 12:27:53 -0400
Subject: rpms/bind/devel bind-chroot-admin.in,1.4,1.5
Message-ID: <200604031627.k33GRr64012645@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12628

Modified Files:
	bind-chroot-admin.in 
Log Message:
fix bug 187529


Index: bind-chroot-admin.in
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind-chroot-admin.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bind-chroot-admin.in	30 Mar 2006 00:35:52 -0000	1.4
+++ bind-chroot-admin.in	3 Apr 2006 16:27:51 -0000	1.5
@@ -229,9 +229,11 @@
     chown root:named ${pfx}/var/named/* >/dev/null 2>&1;
     chmod 750 ${pfx}/var/named  >/dev/null 2>&1;
     chmod 640 ${pfx}/var/named/* >/dev/null 2>&1;
+    chmod 750 ${pfx}/var/named/*/. >/dev/null 2>&1;
     chown named:named ${pfx}/var/named/{data{,/*},slaves{,*/}} >/dev/null 2>&1;
     chmod 770 ${pfx}/var/named/{data,slaves} >/dev/null 2>&1;
-    chmod 640 ${pfx}/var/named/{data/*,slaves/*} >/dev/null 2>&1;
+    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 [ -n "$pfx" ]; then



From fedora-cvs-commits at redhat.com  Mon Apr  3 16:45:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 12:45:32 -0400
Subject: rpms/bind/devel bind.spec,1.102,1.103
Message-ID: <200604031645.k33GjWLN012922@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12909

Modified Files:
	bind.spec 
Log Message:
fix bug 187529


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- bind.spec	30 Mar 2006 23:37:14 -0000	1.102
+++ bind.spec	3 Apr 2006 16:45:30 -0000	1.103
@@ -17,7 +17,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.3.2
-Release: 	16.FC6
+Release: 	18.FC6
 Epoch:   	30
 Url: 		http://www.isc.org/products/BIND/
 Buildroot: 	%{_tmppath}/%{name}-root
@@ -796,6 +796,9 @@
 :;
 
 %changelog
+* Mon Apr 03 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-18
+- fix bug 187529: make bind-chroot-admin deal with subdirectories properly
+
 * Thu Mar 30 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-16
 - fix bug 187286: 
      prevent host(1) printing duplicate 'is an alias for' messages



From fedora-cvs-commits at redhat.com  Mon Apr  3 16:51:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 12:51:55 -0400
Subject: rpms/bind/FC-5 bind-chroot-admin.in,1.4,1.5
Message-ID: <200604031651.k33GpteV026732@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	bind-chroot-admin.in 
Log Message:
fix bug 187529: make bind-chroot-admin deal with subdirectories properly


Index: bind-chroot-admin.in
===================================================================
RCS file: /cvs/dist/rpms/bind/FC-5/bind-chroot-admin.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bind-chroot-admin.in	30 Mar 2006 01:05:30 -0000	1.4
+++ bind-chroot-admin.in	3 Apr 2006 16:51:52 -0000	1.5
@@ -229,9 +229,11 @@
     chown root:named ${pfx}/var/named/* >/dev/null 2>&1;
     chmod 750 ${pfx}/var/named  >/dev/null 2>&1;
     chmod 640 ${pfx}/var/named/* >/dev/null 2>&1;
+    chmod 750 ${pfx}/var/named/*/. >/dev/null 2>&1;
     chown named:named ${pfx}/var/named/{data{,/*},slaves{,*/}} >/dev/null 2>&1;
     chmod 770 ${pfx}/var/named/{data,slaves} >/dev/null 2>&1;
-    chmod 640 ${pfx}/var/named/{data/*,slaves/*} >/dev/null 2>&1;
+    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 [ -n "$pfx" ]; then



From fedora-cvs-commits at redhat.com  Mon Apr  3 16:52:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 12:52:21 -0400
Subject: rpms/bind/FC-5 bind.spec,1.101,1.102
Message-ID: <200604031652.k33GqL7T026754@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	bind.spec 
Log Message:
fix bug 187286: upstream ISC bug #15702: make host(1) use any cname returned for the A lookup for the AAAA and MX lookups, avoiding redundant "is an alias for" messages; fix bug 187529: make bind-chroot-admin deal with subdirectories properly; fix bug 187333: fix SOURCE24 and SOURCE25 transposition


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/FC-5/bind.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- bind.spec	31 Mar 2006 00:31:34 -0000	1.101
+++ bind.spec	3 Apr 2006 16:52:19 -0000	1.102
@@ -796,12 +796,13 @@
 :;
 
 %changelog
-* Thu Mar 30 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-16
+* Mon Apr 03 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-16
 - fix bug 187286: 
      prevent host(1) printing duplicate 'is an alias for' messages
      for the default AAAA and MX lookups as well as for the A lookup
      (it now uses the CNAME returned for the A lookup for the AAAA and MX lookups).
      This is upstream bug #15702 fixed in the unreleased bind-9.3.3
+- fix bug 187529: make bind-chroot-admin deal with subdirectories properly
 - fix bug 187333: fix SOURCE24 and SOURCE25 transposition
 
 * Wed Mar 29 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-14



From fedora-cvs-commits at redhat.com  Mon Apr  3 16:55:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 12:55:09 -0400
Subject: rpms/valgrind/devel valgrind-3.1.1-amd64-speedup.patch, NONE,
	1.1 valgrind-3.1.1-cfa-val-expr.patch, NONE,
	1.1 valgrind-3.1.1-glibc24.patch, NONE,
	1.1 valgrind-3.1.1-valgrind_h.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 sources, 1.8, 1.9 valgrind.spec, 1.28,
	1.29 valgrind-3.1.0-amd64-highbase.patch, 1.1,
	NONE valgrind-3.1.0-amd64-speedup.patch, 1.1,
	NONE valgrind-3.1.0-cfa-val-expr.patch, 1.2,
	NONE valgrind-3.1.0-glibc24.patch, 1.1,
	NONE valgrind-3.1.0-valgrind_h.patch, 1.1, NONE
Message-ID: <200604031655.k33Gt95u026846@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/valgrind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26828

Modified Files:
	.cvsignore sources valgrind.spec 
Added Files:
	valgrind-3.1.1-amd64-speedup.patch 
	valgrind-3.1.1-cfa-val-expr.patch valgrind-3.1.1-glibc24.patch 
	valgrind-3.1.1-valgrind_h.patch 
Removed Files:
	valgrind-3.1.0-amd64-highbase.patch 
	valgrind-3.1.0-amd64-speedup.patch 
	valgrind-3.1.0-cfa-val-expr.patch valgrind-3.1.0-glibc24.patch 
	valgrind-3.1.0-valgrind_h.patch 
Log Message:
3.1.1-1


valgrind-3.1.1-amd64-speedup.patch:
 toIR.c |  384 ++++++++++++++++++++++++++++++++---------------------------------
 1 files changed, 193 insertions(+), 191 deletions(-)

--- NEW FILE valgrind-3.1.1-amd64-speedup.patch ---
Replaces 188 insn[0] == 0x0F tests with just one, allows for insn[0] != 0x0F
to quickly skip all the 188 if clauses.  I haven't analyzed if the compiler
could possibly figure this out itself, certainly it would be hard.
--- valgrind-3.1.1/VEX/priv/toIR.c.jj	2006-03-14 14:16:38.000000000 -0500
+++ valgrind-3.1.1/VEX/priv/toIR.c	2006-04-03 12:44:42.000000000 -0400
@@ -8139,13 +8139,14 @@ DisResult disInstr_AMD64_WRK ( 
 
    insn = (UChar*)&guest_code[delta];
 
+   if (insn[0] == 0x0F) {
 //..    /* Treat fxsave specially.  It should be doable even on an SSE0
 //..       (Pentium-II class) CPU.  Hence be prepared to handle it on
 //..       any subarchitecture variant.
 //..    */
 //.. 
 //..    /* 0F AE /0 = FXSAVE m512 -- write x87 and SSE state to memory */
-//..    if (sz == 4 && insn[0] == 0x0F && insn[1] == 0xAE
+//..    if (sz == 4 /* && insn[0] == 0x0F */ && insn[1] == 0xAE
 //..        && !epartIsReg(insn[2]) && gregOfRM(insn[2]) == 0) {
 //..       modrm = getUChar(delta+2);
 //..       vassert(sz == 4);
@@ -8225,42 +8226,42 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 0F 58 = ADDPS -- add 32Fx4 from R/M to R */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0x58) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x58) {
       delta = dis_SSE_E_to_G_all( pfx, delta+2, "addps", Iop_Add32Fx4 );
       goto decode_success;
    }
 
    /* F3 0F 58 = ADDSS -- add 32F0x4 from R/M to R */
    if (haveF3no66noF2(pfx) && sz == 4
-       && insn[0] == 0x0F && insn[1] == 0x58) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x58) {
       delta = dis_SSE_E_to_G_lo32( pfx, delta+2, "addss", Iop_Add32F0x4 );
       goto decode_success;
    }
 
    /* 0F 55 = ANDNPS -- G = (not G) and E */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0x55) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x55) {
       delta = dis_SSE_E_to_G_all_invG( pfx, delta+2, "andnps", Iop_AndV128 );
       goto decode_success;
    }
 
    /* 0F 54 = ANDPS -- G = G and E */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0x54) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x54) {
       delta = dis_SSE_E_to_G_all( pfx, delta+2, "andps", Iop_AndV128 );
       goto decode_success;
    }
 
    /* 0F C2 = CMPPS -- 32Fx4 comparison from R/M to R */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0xC2) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xC2) {
       delta = dis_SSEcmp_E_to_G( pfx, delta+2, "cmpps", True, 4 );
       goto decode_success;
    }
 
    /* F3 0F C2 = CMPSS -- 32F0x4 comparison from R/M to R */
    if (haveF3no66noF2(pfx) && sz == 4
-       && insn[0] == 0x0F && insn[1] == 0xC2) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xC2) {
       delta = dis_SSEcmp_E_to_G( pfx, delta+2, "cmpss", False, 4 );
       goto decode_success;
    }
@@ -8268,7 +8269,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* 0F 2F = COMISS  -- 32F0x4 comparison G,E, and set ZCP */
    /* 0F 2E = UCOMISS -- 32F0x4 comparison G,E, and set ZCP */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && (insn[1] == 0x2F || insn[1] == 0x2E)) {
+       /* && insn[0] == 0x0F */ && (insn[1] == 0x2F || insn[1] == 0x2E)) {
       IRTemp argL = newTemp(Ity_F32);
       IRTemp argR = newTemp(Ity_F32);
       modrm = getUChar(delta+2);
@@ -8308,7 +8309,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* 0F 2A = CVTPI2PS -- convert 2 x I32 in mem/mmx to 2 x F32 in low
       half xmm */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0x2A) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x2A) {
       IRTemp arg64 = newTemp(Ity_I64);
       IRTemp rmode = newTemp(Ity_I32);
 
@@ -8350,7 +8351,7 @@ DisResult disInstr_AMD64_WRK ( 
       -- sz==4: convert I32 in mem/ireg to F32 in low quarter xmm
       -- sz==8: convert I64 in mem/ireg to F32 in low quarter xmm */
    if (haveF3no66noF2(pfx) && (sz == 4 || sz == 8)
-       && insn[0] == 0x0F && insn[1] == 0x2A) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x2A) {
 
       IRTemp rmode = newTemp(Ity_I32);
       assign( rmode, get_sse_roundingmode() );
@@ -8405,7 +8406,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* 0F 2C = CVTTPS2PI -- convert 2 x F32 in mem/low half xmm to 2 x
       I32 in mmx, rounding towards zero */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && (insn[1] == 0x2D || insn[1] == 0x2C)) {
+       /* && insn[0] == 0x0F */ && (insn[1] == 0x2D || insn[1] == 0x2C)) {
       IRTemp dst64  = newTemp(Ity_I64);
       IRTemp rmode  = newTemp(Ity_I32);
       IRTemp f32lo  = newTemp(Ity_F32);
@@ -8469,7 +8470,7 @@ DisResult disInstr_AMD64_WRK ( 
                     truncating towards zero 
    */
    if (haveF3no66noF2(pfx) 
-       && insn[0] == 0x0F 
+       /* && insn[0] == 0x0F */ 
        && (insn[1] == 0x2D || insn[1] == 0x2C)) {
       IRTemp rmode  = newTemp(Ity_I32);
       IRTemp f32lo  = newTemp(Ity_F32);
@@ -8515,20 +8516,20 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 0F 5E = DIVPS -- div 32Fx4 from R/M to R */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0x5E) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x5E) {
       delta = dis_SSE_E_to_G_all( pfx, delta+2, "divps", Iop_Div32Fx4 );
       goto decode_success;
    }
 
    /* F3 0F 5E = DIVSS -- div 32F0x4 from R/M to R */
    if (haveF3no66noF2(pfx) && sz == 4
-       && insn[0] == 0x0F && insn[1] == 0x5E) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x5E) {
       delta = dis_SSE_E_to_G_lo32( pfx, delta+2, "divss", Iop_Div32F0x4 );
       goto decode_success;
    }
 
    /* 0F AE /2 = LDMXCSR m32 -- load %mxcsr */
-   if (insn[0] == 0x0F && insn[1] == 0xAE
+   if (/* insn[0] == 0x0F && */ insn[1] == 0xAE
        && haveNo66noF2noF3(pfx)
        && !epartIsReg(insn[2]) && gregLO3ofRM(insn[2]) == 2) {
 
@@ -8578,28 +8579,28 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 0F 5F = MAXPS -- max 32Fx4 from R/M to R */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0x5F) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x5F) {
       delta = dis_SSE_E_to_G_all( pfx, delta+2, "maxps", Iop_Max32Fx4 );
       goto decode_success;
    }
 
    /* F3 0F 5F = MAXSS -- max 32F0x4 from R/M to R */
    if (haveF3no66noF2(pfx) && sz == 4
-       && insn[0] == 0x0F && insn[1] == 0x5F) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x5F) {
       delta = dis_SSE_E_to_G_lo32( pfx, delta+2, "maxss", Iop_Max32F0x4 );
       goto decode_success;
    }
 
    /* 0F 5D = MINPS -- min 32Fx4 from R/M to R */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0x5D) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x5D) {
       delta = dis_SSE_E_to_G_all( pfx, delta+2, "minps", Iop_Min32Fx4 );
       goto decode_success;
    }
 
    /* F3 0F 5D = MINSS -- min 32F0x4 from R/M to R */
    if (haveF3no66noF2(pfx) && sz == 4
-       && insn[0] == 0x0F && insn[1] == 0x5D) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x5D) {
       delta = dis_SSE_E_to_G_lo32( pfx, delta+2, "minss", Iop_Min32F0x4 );
       goto decode_success;
    }
@@ -8607,7 +8608,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* 0F 28 = MOVAPS -- move from E (mem or xmm) to G (xmm). */
    /* 0F 10 = MOVUPS -- move from E (mem or xmm) to G (xmm). */
    if (haveNo66noF2noF3(pfx) && sz == 4
-       && insn[0] == 0x0F && (insn[1] == 0x28 || insn[1] == 0x10)) {
+       /* && insn[0] == 0x0F */ && (insn[1] == 0x28 || insn[1] == 0x10)) {
       modrm = getUChar(delta+2);
       if (epartIsReg(modrm)) {
          putXMMReg( gregOfRexRM(pfx,modrm), 
@@ -8629,7 +8630,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* 0F 29 = MOVAPS -- move from G (xmm) to E (mem or xmm). */
    /* 0F 11 = MOVUPS -- move from G (xmm) to E (mem or xmm). */
    if (haveNo66noF2noF3(pfx) && sz == 4
-       && insn[0] == 0x0F && (insn[1] == 0x29 || insn[1] == 0x11)) {
+       /* && insn[0] == 0x0F */ && (insn[1] == 0x29 || insn[1] == 0x11)) {
       modrm = getUChar(delta+2);
       if (epartIsReg(modrm)) {
          /* fall through; awaiting test case */
@@ -8646,7 +8647,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* 0F 16 = MOVHPS -- move from mem to high half of XMM. */
    /* 0F 16 = MOVLHPS -- move from lo half to hi half of XMM. */
    if (haveNo66noF2noF3(pfx) && sz == 4
-       && insn[0] == 0x0F && insn[1] == 0x16) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x16) {
       modrm = getUChar(delta+2);
       if (epartIsReg(modrm)) {
          delta += 2+1;
@@ -8667,7 +8668,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 0F 17 = MOVHPS -- move from high half of XMM to mem. */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0x17) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x17) {
       if (!epartIsReg(insn[2])) {
          delta += 2;
          addr = disAMode ( &alen, pfx, delta, dis_buf, 0 );
@@ -8685,7 +8686,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* 0F 12 = MOVLPS -- move from mem to low half of XMM. */
    /* OF 12 = MOVHLPS -- from from hi half to lo half of XMM. */
    if (haveNo66noF2noF3(pfx) && sz == 4
-       && insn[0] == 0x0F && insn[1] == 0x12) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x12) {
       modrm = getUChar(delta+2);
       if (epartIsReg(modrm)) {
          delta += 2+1;
@@ -8707,7 +8708,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 0F 13 = MOVLPS -- move from low half of XMM to mem. */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0x13) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x13) {
       if (!epartIsReg(insn[2])) {
          delta += 2;
          addr = disAMode ( &alen, pfx, delta, dis_buf, 0 );
@@ -8725,7 +8726,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* 0F 50 = MOVMSKPS - move 4 sign bits from 4 x F32 in xmm(E)
       to 4 lowest bits of ireg(G) */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0x50) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x50) {
       modrm = getUChar(delta+2);
       if (epartIsReg(modrm)) {
          Int src;
@@ -8765,7 +8766,7 @@ DisResult disInstr_AMD64_WRK ( 
    if ( ( (haveNo66noF2noF3(pfx) && sz == 4)
           || (have66noF2noF3(pfx) && sz == 2) 
         )
-        && insn[0] == 0x0F && insn[1] == 0x2B) {
+        /* && insn[0] == 0x0F */ && insn[1] == 0x2B) {
       modrm = getUChar(delta+2);
       if (!epartIsReg(modrm)) {
          addr = disAMode ( &alen, pfx, delta+2, dis_buf, 0 );
@@ -8786,7 +8787,7 @@ DisResult disInstr_AMD64_WRK ( 
       So we just leave them alone. 
    */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0xE7) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xE7) {
       modrm = getUChar(delta+2);
       if (!epartIsReg(modrm)) {
          /* do_MMX_preamble(); Intel docs don't specify this */
@@ -8803,7 +8804,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* F3 0F 10 = MOVSS -- move 32 bits from E (mem or lo 1/4 xmm) to G
       (lo 1/4 xmm).  If E is mem, upper 3/4 of G is zeroed out. */
    if (haveF3no66noF2(pfx) && sz == 4
-       && insn[0] == 0x0F && insn[1] == 0x10) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x10) {
       modrm = getUChar(delta+2);
       if (epartIsReg(modrm)) {
          putXMMRegLane32( gregOfRexRM(pfx,modrm), 0,
@@ -8826,7 +8827,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* F3 0F 11 = MOVSS -- move 32 bits from G (lo 1/4 xmm) to E (mem
       or lo 1/4 xmm). */
    if (haveF3no66noF2(pfx) && sz == 4
-       && insn[0] == 0x0F && insn[1] == 0x11) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x11) {
       modrm = getUChar(delta+2);
       if (epartIsReg(modrm)) {
          /* fall through, we don't yet have a test case */
@@ -8843,21 +8844,21 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 0F 59 = MULPS -- mul 32Fx4 from R/M to R */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0x59) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x59) {
       delta = dis_SSE_E_to_G_all( pfx, delta+2, "mulps", Iop_Mul32Fx4 );
       goto decode_success;
    }
 
    /* F3 0F 59 = MULSS -- mul 32F0x4 from R/M to R */
    if (haveF3no66noF2(pfx) && sz == 4
-       && insn[0] == 0x0F && insn[1] == 0x59) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x59) {
       delta = dis_SSE_E_to_G_lo32( pfx, delta+2, "mulss", Iop_Mul32F0x4 );
       goto decode_success;
    }
 
    /* 0F 56 = ORPS -- G = G and E */
    if (haveNo66noF2noF3(pfx) && sz == 4
-       && insn[0] == 0x0F && insn[1] == 0x56) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x56) {
       delta = dis_SSE_E_to_G_all( pfx, delta+2, "orps", Iop_OrV128 );
       goto decode_success;
    }
@@ -8865,7 +8866,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* ***--- this is an MMX class insn introduced in SSE1 ---*** */
    /* 0F E0 = PAVGB -- 8x8 unsigned Packed Average, with rounding */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0xE0) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xE0) {
       do_MMX_preamble();
       delta = dis_MMXop_regmem_to_reg ( 
                 pfx, delta+2, insn[1], "pavgb", False );
@@ -8875,7 +8876,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* ***--- this is an MMX class insn introduced in SSE1 ---*** */
    /* 0F E3 = PAVGW -- 16x4 unsigned Packed Average, with rounding */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0xE3) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xE3) {
       do_MMX_preamble();
       delta = dis_MMXop_regmem_to_reg ( 
                 pfx, delta+2, insn[1], "pavgw", False );
@@ -8886,7 +8887,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* 0F C5 = PEXTRW -- extract 16-bit field from mmx(E) and put 
       zero-extend of it in ireg(G). */
    if (haveNo66noF2noF3(pfx) && sz == 4
-       && insn[0] == 0x0F && insn[1] == 0xC5) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xC5) {
       modrm = insn[2];
       if (epartIsReg(modrm)) {
          IRTemp sV = newTemp(Ity_I64);
@@ -8918,7 +8919,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* 0F C4 = PINSRW -- get 16 bits from E(mem or low half ireg) and
       put it into the specified lane of mmx(G). */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0xC4) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xC4) {
       /* Use t0 .. t3 to hold the 4 original 16-bit lanes of the
          mmx reg.  t4 is the new lane value.  t5 is the original
          mmx value. t6 is the new mmx value. */
@@ -8963,7 +8964,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* ***--- this is an MMX class insn introduced in SSE1 ---*** */
    /* 0F EE = PMAXSW -- 16x4 signed max */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0xEE) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xEE) {
       do_MMX_preamble();
       delta = dis_MMXop_regmem_to_reg ( 
                 pfx, delta+2, insn[1], "pmaxsw", False );
@@ -8973,7 +8974,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* ***--- this is an MMX class insn introduced in SSE1 ---*** */
    /* 0F DE = PMAXUB -- 8x8 unsigned max */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0xDE) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xDE) {
       do_MMX_preamble();
       delta = dis_MMXop_regmem_to_reg ( 
                 pfx, delta+2, insn[1], "pmaxub", False );
@@ -8983,7 +8984,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* ***--- this is an MMX class insn introduced in SSE1 ---*** */
    /* 0F EA = PMINSW -- 16x4 signed min */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0xEA) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xEA) {
       do_MMX_preamble();
       delta = dis_MMXop_regmem_to_reg ( 
                 pfx, delta+2, insn[1], "pminsw", False );
@@ -8993,7 +8994,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* ***--- this is an MMX class insn introduced in SSE1 ---*** */
    /* 0F DA = PMINUB -- 8x8 unsigned min */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0xDA) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xDA) {
       do_MMX_preamble();
       delta = dis_MMXop_regmem_to_reg ( 
                 pfx, delta+2, insn[1], "pminub", False );
@@ -9005,7 +9006,7 @@ DisResult disInstr_AMD64_WRK ( 
       mmx(G), turn them into a byte, and put zero-extend of it in
       ireg(G). */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0xD7) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xD7) {
       modrm = insn[2];
       if (epartIsReg(modrm)) {
          do_MMX_preamble();
@@ -9029,7 +9030,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* ***--- this is an MMX class insn introduced in SSE1 ---*** */
    /* 0F E4 = PMULUH -- 16x4 hi-half of unsigned widening multiply */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0xE4) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xE4) {
       do_MMX_preamble();
       delta = dis_MMXop_regmem_to_reg ( 
                 pfx, delta+2, insn[1], "pmuluh", False );
@@ -9040,7 +9041,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* 0F 18 /1 = PREFETCH0   -- with various different hints */
    /* 0F 18 /2 = PREFETCH1 */
    /* 0F 18 /3 = PREFETCH2 */
-   if (insn[0] == 0x0F && insn[1] == 0x18
+   if (/* insn[0] == 0x0F && */ insn[1] == 0x18
        && haveNo66noF2noF3(pfx)
        && !epartIsReg(insn[2]) 
        && gregLO3ofRM(insn[2]) >= 0 && gregLO3ofRM(insn[2]) <= 3) {
@@ -9067,7 +9068,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* ***--- this is an MMX class insn introduced in SSE1 ---*** */
    /* 0F F6 = PSADBW -- sum of 8Ux8 absolute differences */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0xF6) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xF6) {
       do_MMX_preamble();
       delta = dis_MMXop_regmem_to_reg ( 
                  pfx, delta+2, insn[1], "psadbw", False );
@@ -9077,7 +9078,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* ***--- this is an MMX class insn introduced in SSE1 ---*** */
    /* 0F 70 = PSHUFW -- rearrange 4x16 from E(mmx or mem) to G(mmx) */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0x70) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x70) {
       Int order;
       IRTemp sV, dV, s3, s2, s1, s0;
       s3 = s2 = s1 = s0 = IRTemp_INVALID;
@@ -9116,7 +9117,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 0F 53 = RCPPS -- approx reciprocal 32Fx4 from R/M to R */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0x53) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x53) {
       delta = dis_SSE_E_to_G_unary_all( pfx, delta+2, 
                                         "rcpps", Iop_Recip32Fx4 );
       goto decode_success;
@@ -9124,7 +9125,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* F3 0F 53 = RCPSS -- approx reciprocal 32F0x4 from R/M to R */
    if (haveF3no66noF2(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0x53) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x53) {
       delta = dis_SSE_E_to_G_unary_lo32( pfx, delta+2, 
                                          "rcpss", Iop_Recip32F0x4 );
       goto decode_success;
@@ -9132,7 +9133,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 0F 52 = RSQRTPS -- approx reciprocal sqrt 32Fx4 from R/M to R */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0x52) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x52) {
       delta = dis_SSE_E_to_G_unary_all( pfx, delta+2, 
                                         "rsqrtps", Iop_RSqrt32Fx4 );
       goto decode_success;
@@ -9140,7 +9141,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* F3 0F 52 = RSQRTSS -- approx reciprocal sqrt 32F0x4 from R/M to R */
    if (haveF3no66noF2(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0x52) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x52) {
       delta = dis_SSE_E_to_G_unary_lo32( pfx, delta+2, 
                                          "rsqrtss", Iop_RSqrt32F0x4 );
       goto decode_success;
@@ -9148,7 +9149,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 0F AE /7 = SFENCE -- flush pending operations to memory */
    if (haveNo66noF2noF3(pfx) 
-       && insn[0] == 0x0F && insn[1] == 0xAE
+       /* && insn[0] == 0x0F */ && insn[1] == 0xAE
        && epartIsReg(insn[2]) && gregLO3ofRM(insn[2]) == 7
        && sz == 4) {
       delta += 3;
@@ -9161,7 +9162,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 0F C6 /r ib = SHUFPS -- shuffle packed F32s */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0xC6) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xC6) {
       Int    select;
       IRTemp sV, dV;
       IRTemp s3, s2, s1, s0, d3, d2, d1, d0;
@@ -9209,7 +9210,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 0F 51 = SQRTPS -- approx sqrt 32Fx4 from R/M to R */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0x51) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x51) {
       delta = dis_SSE_E_to_G_unary_all( pfx, delta+2, 
                                         "sqrtps", Iop_Sqrt32Fx4 );
       goto decode_success;
@@ -9217,14 +9218,14 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* F3 0F 51 = SQRTSS -- approx sqrt 32F0x4 from R/M to R */
    if (haveF3no66noF2(pfx) && sz == 4
-       && insn[0] == 0x0F && insn[1] == 0x51) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x51) {
       delta = dis_SSE_E_to_G_unary_lo32( pfx, delta+2, 
                                          "sqrtss", Iop_Sqrt32F0x4 );
       goto decode_success;
    }
 
    /* 0F AE /3 = STMXCSR m32 -- store %mxcsr */
-   if (insn[0] == 0x0F && insn[1] == 0xAE
+   if (/* insn[0] == 0x0F && */ insn[1] == 0xAE
        && haveNo66noF2noF3(pfx)
        && !epartIsReg(insn[2]) && gregLO3ofRM(insn[2]) == 3) {
 
@@ -9252,14 +9253,14 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 0F 5C = SUBPS -- sub 32Fx4 from R/M to R */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0x5C) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x5C) {
       delta = dis_SSE_E_to_G_all( pfx, delta+2, "subps", Iop_Sub32Fx4 );
       goto decode_success;
    }
 
    /* F3 0F 5C = SUBSS -- sub 32F0x4 from R/M to R */
    if (haveF3no66noF2(pfx) && sz == 4
-       && insn[0] == 0x0F && insn[1] == 0x5C) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x5C) {
       delta = dis_SSE_E_to_G_lo32( pfx, delta+2, "subss", Iop_Sub32F0x4 );
       goto decode_success;
    }
@@ -9268,7 +9269,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* 0F 14 = UNPCKLPS -- unpack and interleave low part F32s */
    /* These just appear to be special cases of SHUFPS */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && (insn[1] == 0x15 || insn[1] == 0x14)) {
+       /* && insn[0] == 0x0F */ && (insn[1] == 0x15 || insn[1] == 0x14)) {
       IRTemp sV, dV;
       IRTemp s3, s2, s1, s0, d3, d2, d1, d0;
       Bool hi = toBool(insn[1] == 0x15);
@@ -9307,7 +9308,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 0F 57 = XORPS -- G = G and E */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0x57) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x57) {
       delta = dis_SSE_E_to_G_all( pfx, delta+2, "xorps", Iop_XorV128 );
       goto decode_success;
    }
@@ -9322,13 +9323,13 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 58 = ADDPD -- add 32Fx4 from R/M to R */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x58) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x58) {
       delta = dis_SSE_E_to_G_all( pfx, delta+2, "addpd", Iop_Add64Fx2 );
       goto decode_success;
    }
  
    /* F2 0F 58 = ADDSD -- add 64F0x2 from R/M to R */
-   if (haveF2no66noF3(pfx) && insn[0] == 0x0F && insn[1] == 0x58) {
+   if (haveF2no66noF3(pfx) /* && insn[0] == 0x0F */ && insn[1] == 0x58) {
       vassert(sz == 4);
       delta = dis_SSE_E_to_G_lo64( pfx, delta+2, "addsd", Iop_Add64F0x2 );
       goto decode_success;
@@ -9336,28 +9337,28 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 55 = ANDNPD -- G = (not G) and E */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x55) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x55) {
       delta = dis_SSE_E_to_G_all_invG( pfx, delta+2, "andnpd", Iop_AndV128 );
       goto decode_success;
    }
 
    /* 66 0F 54 = ANDPD -- G = G and E */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x54) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x54) {
       delta = dis_SSE_E_to_G_all( pfx, delta+2, "andpd", Iop_AndV128 );
       goto decode_success;
    }
 
    /* 66 0F C2 = CMPPD -- 64Fx2 comparison from R/M to R */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xC2) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xC2) {
       delta = dis_SSEcmp_E_to_G( pfx, delta+2, "cmppd", True, 8 );
       goto decode_success;
    }
 
    /* F2 0F C2 = CMPSD -- 64F0x2 comparison from R/M to R */
    if (haveF2no66noF3(pfx) && sz == 4
-       && insn[0] == 0x0F && insn[1] == 0xC2) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xC2) {
       delta = dis_SSEcmp_E_to_G( pfx, delta+2, "cmpsd", False, 8 );
       goto decode_success;
    }
@@ -9365,7 +9366,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* 66 0F 2F = COMISD  -- 64F0x2 comparison G,E, and set ZCP */
    /* 66 0F 2E = UCOMISD -- 64F0x2 comparison G,E, and set ZCP */
    if (have66noF2noF3(pfx) && sz == 2
-       && insn[0] == 0x0F && (insn[1] == 0x2F || insn[1] == 0x2E)) {
+       /* && insn[0] == 0x0F */ && (insn[1] == 0x2F || insn[1] == 0x2E)) {
       IRTemp argL = newTemp(Ity_F64);
       IRTemp argR = newTemp(Ity_F64);
       modrm = getUChar(delta+2);
@@ -9402,7 +9403,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* F3 0F E6 = CVTDQ2PD -- convert 2 x I32 in mem/lo half xmm to 2 x
       F64 in xmm(G) */
-   if (haveF3no66noF2(pfx) && insn[0] == 0x0F && insn[1] == 0xE6) {
+   if (haveF3no66noF2(pfx) /* && insn[0] == 0x0F */ && insn[1] == 0xE6) {
       IRTemp arg64 = newTemp(Ity_I64);
       if (sz != 4) goto decode_failure;
 
@@ -9436,7 +9437,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* 0F 5B = CVTDQ2PS -- convert 4 x I32 in mem/xmm to 4 x F32 in
       xmm(G) */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0x5B) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x5B) {
       IRTemp argV  = newTemp(Ity_V128);
       IRTemp rmode = newTemp(Ity_I32);
 
@@ -9479,7 +9480,7 @@ DisResult disInstr_AMD64_WRK ( 
    if ( ( (haveF2no66noF3(pfx) && sz == 4)
           || (have66noF2noF3(pfx) && sz == 2)
         )
-        && insn[0] == 0x0F && insn[1] == 0xE6) {
+        /* && insn[0] == 0x0F */ && insn[1] == 0xE6) {
       IRTemp argV   = newTemp(Ity_V128);
       IRTemp rmode  = newTemp(Ity_I32);
       Bool   r2zero = toBool(sz == 2);
@@ -9532,7 +9533,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* 66 0F 2C = CVTTPD2PI -- convert 2 x F64 in mem/xmm to 2 x
       I32 in mmx, rounding towards zero */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && (insn[1] == 0x2D || insn[1] == 0x2C)) {
+       /* && insn[0] == 0x0F */ && (insn[1] == 0x2D || insn[1] == 0x2C)) {
       IRTemp dst64  = newTemp(Ity_I64);
       IRTemp rmode  = newTemp(Ity_I32);
       IRTemp f64lo  = newTemp(Ity_F64);
@@ -9586,7 +9587,7 @@ DisResult disInstr_AMD64_WRK ( 
       been nicer to merge them together, but the insn[] offsets differ
       by one. */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x5A) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x5A) {
       IRTemp argV  = newTemp(Ity_V128);
       IRTemp rmode = newTemp(Ity_I32);
 
@@ -9629,7 +9630,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* 66 0F 2A = CVTPI2PD -- convert 2 x I32 in mem/mmx to 2 x F64 in
       xmm(G) */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x2A) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x2A) {
       IRTemp arg64 = newTemp(Ity_I64);
 
       modrm = getUChar(delta+2);
@@ -9667,7 +9668,7 @@ DisResult disInstr_AMD64_WRK ( 
    if ( ( (have66noF2noF3(pfx) && sz == 2)
           || (haveF3no66noF2(pfx) && sz == 4)
         )
-        && insn[0] == 0x0F && insn[1] == 0x5B) {
+        /* && insn[0] == 0x0F */ && insn[1] == 0x5B) {
       IRTemp argV   = newTemp(Ity_V128);
       IRTemp rmode  = newTemp(Ity_I32);
       Bool   r2zero = toBool(sz == 4);
@@ -9715,7 +9716,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* 0F 5A = CVTPS2PD -- convert 2 x F32 in low half mem/xmm to 2 x
       F64 in xmm(G). */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0x5A) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x5A) {
       IRTemp f32lo = newTemp(Ity_F32);
       IRTemp f32hi = newTemp(Ity_F32);
 
@@ -9757,7 +9758,7 @@ DisResult disInstr_AMD64_WRK ( 
                     truncating towards zero 
    */
    if (haveF2no66noF3(pfx) 
-       && insn[0] == 0x0F 
+       /* && insn[0] == 0x0F */ 
        && (insn[1] == 0x2D || insn[1] == 0x2C)) {
       IRTemp rmode  = newTemp(Ity_I32);
       IRTemp f64lo  = newTemp(Ity_F64);
@@ -9800,7 +9801,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* F2 0F 5A = CVTSD2SS -- convert F64 in mem/low half xmm to F32 in
       low 1/4 xmm(G), according to prevailing SSE rounding mode */
    if (haveF2no66noF3(pfx) && sz == 4
-       && insn[0] == 0x0F && insn[1] == 0x5A) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x5A) {
       IRTemp rmode = newTemp(Ity_I32);
       IRTemp f64lo = newTemp(Ity_F64);
       vassert(sz == 4);
@@ -9833,7 +9834,7 @@ DisResult disInstr_AMD64_WRK ( 
       when sz==8 -- convert I64 in mem/ireg to F64 in low half xmm
    */
    if (haveF2no66noF3(pfx) && (sz == 4 || sz == 8)
-       && insn[0] == 0x0F && insn[1] == 0x2A) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x2A) {
       modrm = getUChar(delta+2);
 
       if (sz == 4) {
@@ -9885,7 +9886,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* F3 0F 5A = CVTSS2SD -- convert F32 in mem/low 1/4 xmm to F64 in
       low half xmm(G) */
    if (haveF3no66noF2(pfx) && sz == 4
-       && insn[0] == 0x0F && insn[1] == 0x5A) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x5A) {
       IRTemp f32lo = newTemp(Ity_F32);
 
       modrm = getUChar(delta+2);
@@ -9910,13 +9911,13 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 5E = DIVPD -- div 64Fx2 from R/M to R */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x5E) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x5E) {
       delta = dis_SSE_E_to_G_all( pfx, delta+2, "divpd", Iop_Div64Fx2 );
       goto decode_success;
    }
 
    /* F2 0F 5E = DIVSD -- div 64F0x2 from R/M to R */
-   if (haveF2no66noF3(pfx) && insn[0] == 0x0F && insn[1] == 0x5E) {
+   if (haveF2no66noF3(pfx) /* && insn[0] == 0x0F */ && insn[1] == 0x5E) {
       vassert(sz == 4);
       delta = dis_SSE_E_to_G_lo64( pfx, delta+2, "divsd", Iop_Div64F0x2 );
       goto decode_success;
@@ -9925,7 +9926,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* 0F AE /5 = LFENCE -- flush pending operations to memory */
    /* 0F AE /6 = MFENCE -- flush pending operations to memory */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0xAE
+       /* && insn[0] == 0x0F */ && insn[1] == 0xAE
        && epartIsReg(insn[2]) 
        && (gregLO3ofRM(insn[2]) == 5 || gregLO3ofRM(insn[2]) == 6)) {
       delta += 3;
@@ -9938,28 +9939,28 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 5F = MAXPD -- max 64Fx2 from R/M to R */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x5F) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x5F) {
       delta = dis_SSE_E_to_G_all( pfx, delta+2, "maxpd", Iop_Max64Fx2 );
       goto decode_success;
    }
 
    /* F2 0F 5F = MAXSD -- max 64F0x2 from R/M to R */
    if (haveF2no66noF3(pfx) && sz == 4
-       && insn[0] == 0x0F && insn[1] == 0x5F) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x5F) {
       delta = dis_SSE_E_to_G_lo64( pfx, delta+2, "maxsd", Iop_Max64F0x2 );
       goto decode_success;
    }
 
    /* 66 0F 5D = MINPD -- min 64Fx2 from R/M to R */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x5D) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x5D) {
       delta = dis_SSE_E_to_G_all( pfx, delta+2, "minpd", Iop_Min64Fx2 );
       goto decode_success;
    }
 
    /* F2 0F 5D = MINSD -- min 64F0x2 from R/M to R */
    if (haveF2no66noF3(pfx) && sz == 4
-       && insn[0] == 0x0F && insn[1] == 0x5D) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x5D) {
       delta = dis_SSE_E_to_G_lo64( pfx, delta+2, "minsd", Iop_Min64F0x2 );
       goto decode_success;
    }
@@ -9968,7 +9969,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* 66 0F 10 = MOVUPD -- move from E (mem or xmm) to G (xmm). */
    /* 66 0F 6F = MOVDQA -- move from E (mem or xmm) to G (xmm). */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F 
+       /* && insn[0] == 0x0F */ 
        && (insn[1] == 0x28 || insn[1] == 0x10 || insn[1] == 0x6F)) {
       HChar* wot = insn[1]==0x28 ? "apd" :
                    insn[1]==0x10 ? "upd" : "dqa";
@@ -9992,7 +9993,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 29 = MOVAPD -- move from G (xmm) to E (mem or xmm). */
    /* 66 0F 11 = MOVUPD -- move from G (xmm) to E (mem or xmm). */
-   if (have66noF2noF3(pfx) && insn[0] == 0x0F 
+   if (have66noF2noF3(pfx) /* && insn[0] == 0x0F */
        && (insn[1] == 0x29 || insn[1] == 0x11)) {
       modrm = getUChar(delta+2);
       if (epartIsReg(modrm)) {
@@ -10009,7 +10010,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 6E = MOVD from ireg32/m32 to xmm lo 1/4, zeroing high 3/4 of xmm. */
    /*              or from ireg64/m64 to xmm lo 1/2, zeroing high 1/2 of xmm. */
-   if (have66noF2noF3(pfx) && insn[0] == 0x0F && insn[1] == 0x6E) {
+   if (have66noF2noF3(pfx) /* && insn[0] == 0x0F */ && insn[1] == 0x6E) {
       vassert(sz == 2 || sz == 8);
       if (sz == 2) sz = 4;
       modrm = getUChar(delta+2);
@@ -10047,7 +10048,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 7E = MOVD from xmm low 1/4 to ireg32 or m32. */
    /*              or from xmm low 1/2 to ireg64 or m64. */
-   if (have66noF2noF3(pfx) && insn[0] == 0x0F && insn[1] == 0x7E) {
+   if (have66noF2noF3(pfx) /* && insn[0] == 0x0F */ && insn[1] == 0x7E) {
       if (sz == 2) sz = 4;
       vassert(sz == 4 || sz == 8);
       modrm = getUChar(delta+2);
@@ -10079,7 +10080,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 7F = MOVDQA -- move from G (xmm) to E (mem or xmm). */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x7F) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x7F) {
       modrm = getUChar(delta+2);
       if (epartIsReg(modrm)) {
          delta += 2+1;
@@ -10098,7 +10099,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* F3 0F 6F = MOVDQU -- move from E (mem or xmm) to G (xmm). */
    if (haveF3no66noF2(pfx) && sz == 4
-       && insn[0] == 0x0F && insn[1] == 0x6F) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x6F) {
       modrm = getUChar(delta+2);
       if (epartIsReg(modrm)) {
          putXMMReg( gregOfRexRM(pfx,modrm), 
@@ -10119,7 +10120,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* F3 0F 7F = MOVDQU -- move from G (xmm) to E (mem or xmm). */
    if (haveF3no66noF2(pfx) && sz == 4
-       && insn[0] == 0x0F && insn[1] == 0x7F) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x7F) {
       modrm = getUChar(delta+2);
       if (epartIsReg(modrm)) {
          goto decode_failure; /* awaiting test case */
@@ -10139,7 +10140,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* F2 0F D6 = MOVDQ2Q -- move from E (lo half xmm, not mem) to G (mmx). */
    if (haveF2no66noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0xD6) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xD6) {
       modrm = getUChar(delta+2);
       if (epartIsReg(modrm)) {
          do_MMX_preamble();
@@ -10158,7 +10159,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* 66 0F 16 = MOVHPD -- move from mem to high half of XMM. */
    /* These seems identical to MOVHPS.  This instruction encoding is
       completely crazy. */
-   if (have66noF2noF3(pfx) && insn[0] == 0x0F && insn[1] == 0x16) {
+   if (have66noF2noF3(pfx) /* && insn[0] == 0x0F */ && insn[1] == 0x16) {
       modrm = getUChar(delta+2);
       if (epartIsReg(modrm)) {
          /* fall through; apparently reg-reg is not possible */
@@ -10175,7 +10176,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 17 = MOVHPD -- move from high half of XMM to mem. */
    /* Again, this seems identical to MOVHPS. */
-   if (have66noF2noF3(pfx) && insn[0] == 0x0F && insn[1] == 0x17) {
+   if (have66noF2noF3(pfx) /* && insn[0] == 0x0F */ && insn[1] == 0x17) {
       if (!epartIsReg(insn[2])) {
          delta += 2;
          addr = disAMode ( &alen, pfx, delta, dis_buf, 0 );
@@ -10192,7 +10193,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 12 = MOVLPD -- move from mem to low half of XMM. */
    /* Identical to MOVLPS ? */
-   if (have66noF2noF3(pfx) && insn[0] == 0x0F && insn[1] == 0x12) {
+   if (have66noF2noF3(pfx) /* && insn[0] == 0x0F */ && insn[1] == 0x12) {
       modrm = getUChar(delta+2);
       if (epartIsReg(modrm)) {
          /* fall through; apparently reg-reg is not possible */
@@ -10210,7 +10211,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 13 = MOVLPD -- move from low half of XMM to mem. */
    /* Identical to MOVLPS ? */
-   if (have66noF2noF3(pfx) && insn[0] == 0x0F && insn[1] == 0x13) {
+   if (have66noF2noF3(pfx) /* && insn[0] == 0x0F */ && insn[1] == 0x13) {
       modrm = getUChar(delta+2);
       if (!epartIsReg(modrm)) {
          addr = disAMode ( &alen, pfx, delta+2, dis_buf, 0 );
@@ -10228,7 +10229,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* 66 0F 50 = MOVMSKPD - move 2 sign bits from 2 x F64 in xmm(E) to
       2 lowest bits of ireg(G) */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x50) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x50) {
       modrm = getUChar(delta+2);
       if (epartIsReg(modrm)) {
          Int src;
@@ -10255,7 +10256,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F E7 = MOVNTDQ -- for us, just a plain SSE store. */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xE7) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xE7) {
       modrm = getUChar(delta+2);
       if (!epartIsReg(modrm)) {
          addr = disAMode ( &alen, pfx, delta+2, dis_buf, 0 );
@@ -10271,7 +10272,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 0F C3 = MOVNTI -- for us, just a plain ireg store. */
    if (haveNo66noF2noF3(pfx) &&
-       insn[0] == 0x0F && insn[1] == 0xC3) {
+       /* insn[0] == 0x0F && */ insn[1] == 0xC3) {
       vassert(sz == 4 || sz == 8);
       modrm = getUChar(delta+2);
       if (!epartIsReg(modrm)) {
@@ -10287,7 +10288,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F D6 = MOVQ -- move 64 bits from G (lo half xmm) to E (mem
       or lo half xmm).  */
-   if (have66noF2noF3(pfx) && insn[0] == 0x0F && insn[1] == 0xD6) {
+   if (have66noF2noF3(pfx) /* && insn[0] == 0x0F */ && insn[1] == 0xD6) {
       vassert(sz == 2);
       modrm = getUChar(delta+2);
       if (epartIsReg(modrm)) {
@@ -10306,7 +10307,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* F3 0F D6 = MOVQ2DQ -- move from E (mmx) to G (lo half xmm, zero
       hi half). */
    if (haveF3no66noF2(pfx) && sz == 4
-       && insn[0] == 0x0F && insn[1] == 0xD6) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xD6) {
       modrm = getUChar(delta+2);
       if (epartIsReg(modrm)) {
          do_MMX_preamble();
@@ -10328,10 +10329,10 @@ DisResult disInstr_AMD64_WRK ( 
       G (lo half xmm).  If E is mem, upper half of G is zeroed out.
       If E is reg, upper half of G is unchanged. */
    if ( (haveF2no66noF3(pfx) && sz == 4 
-         && insn[0] == 0x0F && insn[1] == 0x10)
+         /* && insn[0] == 0x0F */ && insn[1] == 0x10)
         || 
         (haveF3no66noF2(pfx) && sz == 4 
-         && insn[0] == 0x0F && insn[1] == 0x7E)
+         /* && insn[0] == 0x0F */ && insn[1] == 0x7E)
       ) {
       modrm = getUChar(delta+2);
       if (epartIsReg(modrm)) {
@@ -10359,7 +10360,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* F2 0F 11 = MOVSD -- move 64 bits from G (lo half xmm) to E (mem
       or lo half xmm). */
    if (haveF2no66noF3(pfx) && sz == 4
-       && insn[0] == 0x0F && insn[1] == 0x11) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x11) {
       modrm = getUChar(delta+2);
       if (epartIsReg(modrm)) {
          /* fall through, we don't yet have a test case */
@@ -10376,28 +10377,28 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 59 = MULPD -- mul 64Fx2 from R/M to R */
    if (have66noF2noF3(pfx) && sz == 2
-       && insn[0] == 0x0F && insn[1] == 0x59) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x59) {
       delta = dis_SSE_E_to_G_all( pfx, delta+2, "mulpd", Iop_Mul64Fx2 );
       goto decode_success;
    }
 
    /* F2 0F 59 = MULSD -- mul 64F0x2 from R/M to R */
    if (haveF2no66noF3(pfx) && sz == 4
-       && insn[0] == 0x0F && insn[1] == 0x59) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x59) {
       delta = dis_SSE_E_to_G_lo64( pfx, delta+2, "mulsd", Iop_Mul64F0x2 );
       goto decode_success;
    }
 
    /* 66 0F 56 = ORPD -- G = G and E */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x56) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x56) {
       delta = dis_SSE_E_to_G_all( pfx, delta+2, "orpd", Iop_OrV128 );
       goto decode_success;
    }
 
    /* 66 0F C6 /r ib = SHUFPD -- shuffle packed F64s */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xC6) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xC6) {
       Int    select;
       IRTemp sV = newTemp(Ity_V128);
       IRTemp dV = newTemp(Ity_V128);
@@ -10447,14 +10448,14 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 51 = SQRTPD -- approx sqrt 64Fx2 from R/M to R */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x51) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x51) {
       delta = dis_SSE_E_to_G_unary_all( pfx, delta+2, 
                                         "sqrtpd", Iop_Sqrt64Fx2 );
       goto decode_success;
    }
 
    /* F2 0F 51 = SQRTSD -- approx sqrt 64F0x2 from R/M to R */
-   if (haveF2no66noF3(pfx) && insn[0] == 0x0F && insn[1] == 0x51) {
+   if (haveF2no66noF3(pfx) /* && insn[0] == 0x0F */ && insn[1] == 0x51) {
       vassert(sz == 4);
       delta = dis_SSE_E_to_G_unary_lo64( pfx, delta+2, 
                                          "sqrtsd", Iop_Sqrt64F0x2 );
@@ -10463,13 +10464,13 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 5C = SUBPD -- sub 64Fx2 from R/M to R */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x5C) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x5C) {
       delta = dis_SSE_E_to_G_all( pfx, delta+2, "subpd", Iop_Sub64Fx2 );
       goto decode_success;
    }
 
    /* F2 0F 5C = SUBSD -- sub 64F0x2 from R/M to R */
-   if (haveF2no66noF3(pfx) && insn[0] == 0x0F && insn[1] == 0x5C) {
+   if (haveF2no66noF3(pfx) /* && insn[0] == 0x0F */ && insn[1] == 0x5C) {
       vassert(sz == 4);
       delta = dis_SSE_E_to_G_lo64( pfx, delta+2, "subsd", Iop_Sub64F0x2 );
       goto decode_success;
@@ -10480,7 +10481,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* These just appear to be special cases of SHUFPS */
    if (have66noF2noF3(pfx) 
        && sz == 2 /* could be 8 if rex also present */
-       && insn[0] == 0x0F && (insn[1] == 0x15 || insn[1] == 0x14)) {
+       /* && insn[0] == 0x0F */ && (insn[1] == 0x15 || insn[1] == 0x14)) {
       IRTemp s1 = newTemp(Ity_I64);
       IRTemp s0 = newTemp(Ity_I64);
       IRTemp d1 = newTemp(Ity_I64);
@@ -10525,14 +10526,14 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 57 = XORPD -- G = G xor E */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x57) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x57) {
       delta = dis_SSE_E_to_G_all( pfx, delta+2, "xorpd", Iop_XorV128 );
       goto decode_success;
    }
 
    /* 66 0F 6B = PACKSSDW */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x6B) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x6B) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "packssdw", Iop_QNarrow32Sx4, True );
       goto decode_success;
@@ -10540,7 +10541,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 63 = PACKSSWB */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x63) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x63) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "packsswb", Iop_QNarrow16Sx8, True );
       goto decode_success;
@@ -10548,7 +10549,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 67 = PACKUSWB */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x67) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x67) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "packuswb", Iop_QNarrow16Ux8, True );
       goto decode_success;
@@ -10556,7 +10557,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F FC = PADDB */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xFC) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xFC) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "paddb", Iop_Add8x16, False );
       goto decode_success;
@@ -10564,7 +10565,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F FE = PADDD */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xFE) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xFE) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "paddd", Iop_Add32x4, False );
       goto decode_success;
@@ -10573,7 +10574,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* ***--- this is an MMX class insn introduced in SSE2 ---*** */
    /* 0F D4 = PADDQ -- add 64x1 */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0xD4) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xD4) {
       do_MMX_preamble();
       delta = dis_MMXop_regmem_to_reg ( 
                 pfx, delta+2, insn[1], "paddq", False );
@@ -10582,7 +10583,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F D4 = PADDQ */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xD4) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xD4) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "paddq", Iop_Add64x2, False );
       goto decode_success;
@@ -10590,7 +10591,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F FD = PADDW */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xFD) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xFD) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "paddw", Iop_Add16x8, False );
       goto decode_success;
@@ -10598,7 +10599,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F EC = PADDSB */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xEC) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xEC) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "paddsb", Iop_QAdd8Sx16, False );
       goto decode_success;
@@ -10606,7 +10607,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F ED = PADDSW */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xED) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xED) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "paddsw", Iop_QAdd16Sx8, False );
       goto decode_success;
@@ -10614,7 +10615,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F DC = PADDUSB */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xDC) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xDC) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "paddusb", Iop_QAdd8Ux16, False );
       goto decode_success;
@@ -10622,7 +10623,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F DD = PADDUSW */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xDD) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xDD) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "paddusw", Iop_QAdd16Ux8, False );
       goto decode_success;
@@ -10630,21 +10631,21 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F DB = PAND */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xDB) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xDB) {
       delta = dis_SSE_E_to_G_all( pfx, delta+2, "pand", Iop_AndV128 );
       goto decode_success;
    }
 
    /* 66 0F DF = PANDN */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xDF) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xDF) {
       delta = dis_SSE_E_to_G_all_invG( pfx, delta+2, "pandn", Iop_AndV128 );
       goto decode_success;
    }
 
    /* 66 0F E0 = PAVGB */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xE0) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xE0) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "pavgb", Iop_Avg8Ux16, False );
       goto decode_success;
@@ -10652,7 +10653,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F E3 = PAVGW */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xE3) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xE3) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "pavgw", Iop_Avg16Ux8, False );
       goto decode_success;
@@ -10660,7 +10661,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 74 = PCMPEQB */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x74) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x74) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "pcmpeqb", Iop_CmpEQ8x16, False );
       goto decode_success;
@@ -10668,7 +10669,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 76 = PCMPEQD */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x76) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x76) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "pcmpeqd", Iop_CmpEQ32x4, False );
       goto decode_success;
@@ -10676,7 +10677,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 75 = PCMPEQW */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x75) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x75) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "pcmpeqw", Iop_CmpEQ16x8, False );
       goto decode_success;
@@ -10684,7 +10685,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 64 = PCMPGTB */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x64) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x64) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "pcmpgtb", Iop_CmpGT8Sx16, False );
       goto decode_success;
@@ -10692,7 +10693,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 66 = PCMPGTD */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x66) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x66) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "pcmpgtd", Iop_CmpGT32Sx4, False );
       goto decode_success;
@@ -10700,7 +10701,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 65 = PCMPGTW */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x65) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x65) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "pcmpgtw", Iop_CmpGT16Sx8, False );
       goto decode_success;
@@ -10709,7 +10710,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* 66 0F C5 = PEXTRW -- extract 16-bit field from xmm(E) and put 
       zero-extend of it in ireg(G). */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xC5) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xC5) {
       modrm = insn[2];
       if (epartIsReg(modrm)) {
          t5 = newTemp(Ity_V128);
@@ -10742,7 +10743,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* 66 0F C4 = PINSRW -- get 16 bits from E(mem or low half ireg) and
       put it into the specified lane of xmm(G). */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xC4) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xC4) {
       Int lane;
       t4 = newTemp(Ity_I16);
       modrm = insn[2];
@@ -10771,7 +10772,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F EE = PMAXSW -- 16x8 signed max */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xEE) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xEE) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "pmaxsw", Iop_Max16Sx8, False );
       goto decode_success;
@@ -10779,7 +10780,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F DE = PMAXUB -- 8x16 unsigned max */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xDE) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xDE) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "pmaxub", Iop_Max8Ux16, False );
       goto decode_success;
@@ -10787,7 +10788,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F EA = PMINSW -- 16x8 signed min */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xEA) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xEA) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "pminsw", Iop_Min16Sx8, False );
       goto decode_success;
@@ -10795,7 +10796,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F DA = PMINUB -- 8x16 unsigned min */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xDA) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xDA) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "pminub", Iop_Min8Ux16, False );
       goto decode_success;
@@ -10807,7 +10808,7 @@ DisResult disInstr_AMD64_WRK ( 
       therefore and call a helper. */
    /* UInt x86g_calculate_sse_pmovmskb ( ULong w64hi, ULong w64lo ); */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xD7) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xD7) {
       modrm = insn[2];
       if (epartIsReg(modrm)) {
          t0 = newTemp(Ity_I64);
@@ -10831,7 +10832,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F E4 = PMULHUW -- 16x8 hi-half of unsigned widening multiply */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xE4) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xE4) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "pmulhuw", Iop_MulHi16Ux8, False );
       goto decode_success;
@@ -10839,7 +10840,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F E5 = PMULHW -- 16x8 hi-half of signed widening multiply */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xE5) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xE5) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "pmulhw", Iop_MulHi16Sx8, False );
       goto decode_success;
@@ -10847,7 +10848,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F D5 = PMULHL -- 16x8 multiply */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xD5) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xD5) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "pmullw", Iop_Mul16x8, False );
       goto decode_success;
@@ -10857,7 +10858,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* 0F F4 = PMULUDQ -- unsigned widening multiply of 32-lanes 0 x
       0 to form 64-bit result */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0xF4) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xF4) {
       IRTemp sV = newTemp(Ity_I64);
       IRTemp dV = newTemp(Ity_I64);
       t1 = newTemp(Ity_I32);
@@ -10893,7 +10894,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* This is a really poor translation -- could be improved if
       performance critical */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xF4) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xF4) {
       IRTemp sV, dV;
       IRTemp s3, s2, s1, s0, d3, d2, d1, d0;
       sV = newTemp(Ity_V128);
@@ -10929,14 +10930,14 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F EB = POR */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xEB) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xEB) {
       delta = dis_SSE_E_to_G_all( pfx, delta+2, "por", Iop_OrV128 );
       goto decode_success;
    }
 
    /* 66 0F 70 = PSHUFD -- rearrange 4x32 from E(xmm or mem) to G(xmm) */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x70) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x70) {
       Int order;
       IRTemp sV, dV, s3, s2, s1, s0;
       s3 = s2 = s1 = s0 = IRTemp_INVALID;
@@ -10976,7 +10977,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* F3 0F 70 = PSHUFHW -- rearrange upper half 4x16 from E(xmm or
       mem) to G(xmm), and copy lower half */
    if (haveF3no66noF2(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0x70) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x70) {
       Int order;
       IRTemp sVhi, dVhi, sV, dV, s3, s2, s1, s0;
       s3 = s2 = s1 = s0 = IRTemp_INVALID;
@@ -11022,7 +11023,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* F2 0F 70 = PSHUFLW -- rearrange lower half 4x16 from E(xmm or
       mem) to G(xmm), and copy upper half */
    if (haveF2no66noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0x70) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x70) {
       Int order;
       IRTemp sVlo, dVlo, sV, dV, s3, s2, s1, s0;
       s3 = s2 = s1 = s0 = IRTemp_INVALID;
@@ -11067,7 +11068,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 72 /6 ib = PSLLD by immediate */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x72
+       /* && insn[0] == 0x0F */ && insn[1] == 0x72
        && epartIsReg(insn[2])
        && gregLO3ofRM(insn[2]) == 6) {
       delta = dis_SSE_shiftE_imm( pfx, delta+2, "pslld", Iop_ShlN32x4 );
@@ -11076,7 +11077,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F F2 = PSLLD by E */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xF2) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xF2) {
       delta = dis_SSE_shiftG_byE( pfx, delta+2, "pslld", Iop_ShlN32x4 );
       goto decode_success;
    }
@@ -11084,7 +11085,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* 66 0F 73 /7 ib = PSLLDQ by immediate */
    /* note, if mem case ever filled in, 1 byte after amode */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x73
+       /* && insn[0] == 0x0F */ && insn[1] == 0x73
        && epartIsReg(insn[2])
        && gregLO3ofRM(insn[2]) == 7) {
       IRTemp sV, dV, hi64, lo64, hi64r, lo64r;
@@ -11145,7 +11146,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 73 /6 ib = PSLLQ by immediate */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x73
+       /* && insn[0] == 0x0F */ && insn[1] == 0x73
        && epartIsReg(insn[2])
        && gregLO3ofRM(insn[2]) == 6) {
       delta = dis_SSE_shiftE_imm( pfx, delta+2, "psllq", Iop_ShlN64x2 );
@@ -11154,14 +11155,14 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F F3 = PSLLQ by E */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xF3) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xF3) {
       delta = dis_SSE_shiftG_byE( pfx, delta+2, "psllq", Iop_ShlN64x2 );
       goto decode_success;
    }
 
    /* 66 0F 71 /6 ib = PSLLW by immediate */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x71
+       /* && insn[0] == 0x0F */ && insn[1] == 0x71
        && epartIsReg(insn[2])
        && gregLO3ofRM(insn[2]) == 6) {
       delta = dis_SSE_shiftE_imm( pfx, delta+2, "psllw", Iop_ShlN16x8 );
@@ -11170,14 +11171,14 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F F1 = PSLLW by E */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xF1) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xF1) {
       delta = dis_SSE_shiftG_byE( pfx, delta+2, "psllw", Iop_ShlN16x8 );
       goto decode_success;
    }
 
    /* 66 0F 72 /4 ib = PSRAD by immediate */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x72
+       /* && insn[0] == 0x0F */ && insn[1] == 0x72
        && epartIsReg(insn[2])
        && gregLO3ofRM(insn[2]) == 4) {
       delta = dis_SSE_shiftE_imm( pfx, delta+2, "psrad", Iop_SarN32x4 );
@@ -11186,14 +11187,14 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F E2 = PSRAD by E */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xE2) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xE2) {
       delta = dis_SSE_shiftG_byE( pfx, delta+2, "psrad", Iop_SarN32x4 );
       goto decode_success;
    }
 
    /* 66 0F 71 /4 ib = PSRAW by immediate */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x71
+       /* && insn[0] == 0x0F */ && insn[1] == 0x71
        && epartIsReg(insn[2])
        && gregLO3ofRM(insn[2]) == 4) {
       delta = dis_SSE_shiftE_imm( pfx, delta+2, "psraw", Iop_SarN16x8 );
@@ -11202,14 +11203,14 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F E1 = PSRAW by E */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xE1) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xE1) {
       delta = dis_SSE_shiftG_byE( pfx, delta+2, "psraw", Iop_SarN16x8 );
       goto decode_success;
    }
 
    /* 66 0F 72 /2 ib = PSRLD by immediate */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x72
+       /* && insn[0] == 0x0F */ && insn[1] == 0x72
        && epartIsReg(insn[2])
        && gregLO3ofRM(insn[2]) == 2) {
       delta = dis_SSE_shiftE_imm( pfx, delta+2, "psrld", Iop_ShrN32x4 );
@@ -11218,7 +11219,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F D2 = PSRLD by E */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xD2) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xD2) {
       delta = dis_SSE_shiftG_byE( pfx, delta+2, "psrld", Iop_ShrN32x4 );
       goto decode_success;
    }
@@ -11226,7 +11227,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* 66 0F 73 /3 ib = PSRLDQ by immediate */
    /* note, if mem case ever filled in, 1 byte after amode */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x73
+       /* && insn[0] == 0x0F */ && insn[1] == 0x73
        && epartIsReg(insn[2])
        && gregLO3ofRM(insn[2]) == 3) {
       IRTemp sV, dV, hi64, lo64, hi64r, lo64r;
@@ -11288,7 +11289,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 73 /2 ib = PSRLQ by immediate */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x73
+       /* && insn[0] == 0x0F */ && insn[1] == 0x73
        && epartIsReg(insn[2])
        && gregLO3ofRM(insn[2]) == 2) {
       delta = dis_SSE_shiftE_imm( pfx, delta+2, "psrlq", Iop_ShrN64x2 );
@@ -11297,14 +11298,14 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F D3 = PSRLQ by E */
    if (have66noF2noF3(pfx) && sz == 2
-       && insn[0] == 0x0F && insn[1] == 0xD3) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xD3) {
       delta = dis_SSE_shiftG_byE( pfx, delta+2, "psrlq", Iop_ShrN64x2 );
       goto decode_success;
    }
 
    /* 66 0F 71 /2 ib = PSRLW by immediate */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x71
+       /* && insn[0] == 0x0F */ && insn[1] == 0x71
        && epartIsReg(insn[2])
        && gregLO3ofRM(insn[2]) == 2) {
       delta = dis_SSE_shiftE_imm( pfx, delta+2, "psrlw", Iop_ShrN16x8 );
@@ -11313,14 +11314,14 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F D1 = PSRLW by E */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xD1) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xD1) {
       delta = dis_SSE_shiftG_byE( pfx, delta+2, "psrlw", Iop_ShrN16x8 );
       goto decode_success;
    }
 
    /* 66 0F F8 = PSUBB */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xF8) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xF8) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "psubb", Iop_Sub8x16, False );
       goto decode_success;
@@ -11328,7 +11329,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F FA = PSUBD */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xFA) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xFA) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "psubd", Iop_Sub32x4, False );
       goto decode_success;
@@ -11337,7 +11338,7 @@ DisResult disInstr_AMD64_WRK ( 
    /* ***--- this is an MMX class insn introduced in SSE2 ---*** */
    /* 0F FB = PSUBQ -- sub 64x1 */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0xFB) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xFB) {
       do_MMX_preamble();
       delta = dis_MMXop_regmem_to_reg ( 
                 pfx, delta+2, insn[1], "psubq", False );
@@ -11346,7 +11347,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F FB = PSUBQ */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xFB) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xFB) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "psubq", Iop_Sub64x2, False );
       goto decode_success;
@@ -11354,7 +11355,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F F9 = PSUBW */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xF9) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xF9) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "psubw", Iop_Sub16x8, False );
       goto decode_success;
@@ -11362,7 +11363,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F E8 = PSUBSB */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xE8) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xE8) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "psubsb", Iop_QSub8Sx16, False );
       goto decode_success;
@@ -11370,7 +11371,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F E9 = PSUBSW */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xE9) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xE9) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "psubsw", Iop_QSub16Sx8, False );
       goto decode_success;
@@ -11378,7 +11379,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F D8 = PSUBSB */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xD8) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xD8) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "psubusb", Iop_QSub8Ux16, False );
       goto decode_success;
@@ -11386,7 +11387,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F D9 = PSUBSW */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xD9) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xD9) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "psubusw", Iop_QSub16Ux8, False );
       goto decode_success;
@@ -11394,7 +11395,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 68 = PUNPCKHBW */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x68) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x68) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "punpckhbw",
                                  Iop_InterleaveHI8x16, True );
@@ -11403,7 +11404,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 6A = PUNPCKHDQ */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x6A) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x6A) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "punpckhdq",
                                  Iop_InterleaveHI32x4, True );
@@ -11412,7 +11413,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 6D = PUNPCKHQDQ */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x6D) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x6D) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "punpckhqdq",
                                  Iop_InterleaveHI64x2, True );
@@ -11421,7 +11422,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 69 = PUNPCKHWD */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x69) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x69) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "punpckhwd",
                                  Iop_InterleaveHI16x8, True );
@@ -11430,7 +11431,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 60 = PUNPCKLBW */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x60) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x60) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "punpcklbw",
                                  Iop_InterleaveLO8x16, True );
@@ -11439,7 +11440,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 62 = PUNPCKLDQ */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x62) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x62) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "punpckldq",
                                  Iop_InterleaveLO32x4, True );
@@ -11448,7 +11449,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 6C = PUNPCKLQDQ */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x6C) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x6C) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "punpcklqdq",
                                  Iop_InterleaveLO64x2, True );
@@ -11457,7 +11458,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F 61 = PUNPCKLWD */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0x61) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0x61) {
       delta = dis_SSEint_E_to_G( pfx, delta+2, 
                                  "punpcklwd",
                                  Iop_InterleaveLO16x8, True );
@@ -11466,13 +11467,13 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 66 0F EF = PXOR */
    if (have66noF2noF3(pfx) && sz == 2 
-       && insn[0] == 0x0F && insn[1] == 0xEF) {
+       /* && insn[0] == 0x0F */ && insn[1] == 0xEF) {
       delta = dis_SSE_E_to_G_all( pfx, delta+2, "pxor", Iop_XorV128 );
       goto decode_success;
    }
 
 //.. //--    /* FXSAVE/FXRSTOR m32 -- load/store the FPU/MMX/SSE state. */
-//.. //--    if (insn[0] == 0x0F && insn[1] == 0xAE 
+//.. //--    if (/* insn[0] == 0x0F && */ insn[1] == 0xAE 
 //.. //--        && (!epartIsReg(insn[2]))
 //.. //--        && (gregOfRM(insn[2]) == 1 || gregOfRM(insn[2]) == 0) ) {
 //.. //--       Bool store = gregOfRM(insn[2]) == 0;
@@ -11490,7 +11491,7 @@ DisResult disInstr_AMD64_WRK ( 
 
    /* 0F AE /7 = CLFLUSH -- flush cache line */
    if (haveNo66noF2noF3(pfx) && sz == 4 
-       && insn[0] == 0x0F && insn[1] == 0xAE
+       /* && insn[0] == 0x0F */ && insn[1] == 0xAE
        && !epartIsReg(insn[2]) && gregLO3ofRM(insn[2]) == 7) {
 
       /* This is something of a hack.  We need to know the size of the
@@ -11519,6 +11520,7 @@ DisResult disInstr_AMD64_WRK ( 
       DIP("clflush %s\n", dis_buf);
       goto decode_success;
    }
+   }
 
 
    /* ---------------------------------------------------- */

valgrind-3.1.1-cfa-val-expr.patch:
 dwarf.c |  190 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 186 insertions(+), 4 deletions(-)

--- NEW FILE valgrind-3.1.1-cfa-val-expr.patch ---
--- valgrind-3.1.1/coregrind/m_debuginfo/dwarf.c.jj	2005-11-25 07:36:18.000000000 -0500
+++ valgrind-3.1.1/coregrind/m_debuginfo/dwarf.c	2006-03-13 04:11:35.000000000 -0500
@@ -1303,8 +1303,8 @@ void ML_(read_debuginfo_dwarf1) ( 
       8 is the return address (EIP) */
 
 /* Note that we don't support DWARF3 expressions (DW_CFA_expression,
-   DW_CFA_def_cfa_expression).  The code just reads over them and
-   ignores them. 
+   DW_CFA_def_cfa_expression, DW_CFA_val_expression).  The code just
+   reads over them and ignores them.
 */
 
 /* --------------- Decls --------------- */
@@ -1357,10 +1357,15 @@ enum dwarf_cfa_secondary_ops
     DW_CFA_def_cfa_expression = 0x0f, /* DWARF3 only */
     DW_CFA_expression         = 0x10, /* DWARF3 only */
     DW_CFA_offset_extended_sf = 0x11, /* DWARF3 only */
+    DW_CFA_def_cfa_sf         = 0x12, /* DWARF3 only */
     DW_CFA_def_cfa_offset_sf  = 0x13, /* DWARF3 only */
+    DW_CFA_val_offset         = 0x14, /* DWARF3 only */
+    DW_CFA_val_offset_sf      = 0x15, /* DWARF3 only */
+    DW_CFA_val_expression     = 0x16, /* DWARF3 only */
     DW_CFA_lo_user            = 0x1c,
     DW_CFA_GNU_window_save    = 0x2d, /* GNU extension */
     DW_CFA_GNU_args_size      = 0x2e, /* GNU extension */
+    DW_CFA_GNU_negative_offset_extended = 0x2f, /* GNU extension */
     DW_CFA_hi_user            = 0x3f
   };
 
@@ -1393,7 +1398,8 @@ enum dwarf_cfa_secondary_ops
 */
 typedef
    struct {
-      enum { RR_Undef, RR_Same, RR_CFAoff, RR_Reg, RR_Arch, RR_Expr } tag;
+      enum { RR_Undef, RR_Same, RR_CFAoff, RR_Reg, RR_Arch, RR_Expr,
+	     RR_CFAValoff, RR_ValExpr } tag;
 
       /* Note, .coff and .reg are never both in use.  Therefore could
          merge them into one. */
@@ -1412,9 +1418,11 @@ static void ppRegRule ( RegRule* reg )
       case RR_Undef:  VG_(printf)("u  "); break;
       case RR_Same:   VG_(printf)("s  "); break;
       case RR_CFAoff: VG_(printf)("c%d ", reg->coff); break;
+      case RR_CFAValoff: VG_(printf)("v%d ", reg->coff); break;
       case RR_Reg:    VG_(printf)("r%d ", reg->reg); break;
       case RR_Arch:   VG_(printf)("a  "); break;
       case RR_Expr:   VG_(printf)("e  "); break;
+      case RR_ValExpr:   VG_(printf)("ve "); break;
       default:        VG_(core_panic)("ppRegRule");
    }
 }
@@ -1557,6 +1565,7 @@ static Bool summarise_context( /*OUT*/Cf
       case RR_Undef:  _how = CFIR_UNKNOWN;   _off = 0; break;            \
       case RR_Same:   _how = CFIR_SAME;      _off = 0; break;            \
       case RR_CFAoff: _how = CFIR_MEMCFAREL; _off = _ctxreg.coff; break; \
+      case RR_CFAValoff: _how = CFIR_CFAREL; _off = _ctxreg.coff; break; \
       default:        { why = 2; goto failed; } /* otherwise give up */  \
    }
 
@@ -1883,6 +1892,17 @@ static Int run_CF_instruction ( /*MOD*/U
          ctx->cfa_offset = off;
          break;
 
+      case DW_CFA_def_cfa_sf:
+         reg = read_leb128( &instr[i], &nleb, 0 );
+         i += nleb;
+         off = read_leb128( &instr[i], &nleb, 1 );
+         i += nleb;
+         if (reg < 0 || reg >= N_CFI_REGS)
+            return 0; /* fail */
+         ctx->cfa_reg    = reg;
+         ctx->cfa_offset = off;
+         break;
+
       case DW_CFA_register:
          reg = read_leb128( &instr[i], &nleb, 0);
          i += nleb;
@@ -1896,6 +1916,17 @@ static Int run_CF_instruction ( /*MOD*/U
          ctx->reg[reg].reg = reg2;
          break;
 
+      case DW_CFA_offset_extended:
+         reg = read_leb128( &instr[i], &nleb, 0 );
+         i += nleb;
+         off = read_leb128( &instr[i], &nleb, 0 );
+         i += nleb;
+         if (reg < 0 || reg >= N_CFI_REGS)
+            return 0; /* fail */
+         ctx->reg[reg].tag = RR_CFAoff;
+         ctx->reg[reg].coff = off * ctx->data_a_f;
+         break;
+
       case DW_CFA_offset_extended_sf:
          reg = read_leb128( &instr[i], &nleb, 0 );
          i += nleb;
@@ -1907,6 +1938,49 @@ static Int run_CF_instruction ( /*MOD*/U
          ctx->reg[reg].coff = off * ctx->data_a_f;
          break;         
 
+      case DW_CFA_GNU_negative_offset_extended:
+         reg = read_leb128( &instr[i], &nleb, 0 );
+         i += nleb;
+         off = read_leb128( &instr[i], &nleb, 0 );
+         i += nleb;
+         if (reg < 0 || reg >= N_CFI_REGS)
+            return 0; /* fail */
+         ctx->reg[reg].tag = RR_CFAoff;
+         ctx->reg[reg].coff = -off * ctx->data_a_f;
+         break;
+
+      case DW_CFA_restore_extended:
+         reg = read_leb128( &instr[i], &nleb, 0 );
+         i += nleb;
+         if (reg < 0 || reg >= N_CFI_REGS)
+            return 0; /* fail */
+	 if (restore_ctx == NULL)
+	    return 0; /* fail */
+	 ctx->reg[reg] = restore_ctx->reg[reg];
+         break;
+
+      case DW_CFA_val_offset:
+         reg = read_leb128( &instr[i], &nleb, 0 );
+         i += nleb;
+         off = read_leb128( &instr[i], &nleb, 0 );
+         i += nleb;
+         if (reg < 0 || reg >= N_CFI_REGS)
+            return 0; /* fail */
+         ctx->reg[reg].tag = RR_CFAValoff;
+         ctx->reg[reg].coff = off * ctx->data_a_f;
+         break;
+
+      case DW_CFA_val_offset_sf:
+         reg = read_leb128( &instr[i], &nleb, 0 );
+         i += nleb;
+         off = read_leb128( &instr[i], &nleb, 1 );
+         i += nleb;
+         if (reg < 0 || reg >= N_CFI_REGS)
+            return 0; /* fail */
+         ctx->reg[reg].tag = RR_CFAValoff;
+         ctx->reg[reg].coff = off * ctx->data_a_f;
+         break;
+
       case DW_CFA_def_cfa_register:
          reg = read_leb128( &instr[i], &nleb, 0);
          i += nleb;
@@ -1950,6 +2024,22 @@ static Int run_CF_instruction ( /*MOD*/U
          ctx->reg[reg].tag = RR_Expr;
          break;
 
+      case DW_CFA_val_expression:
+         /* Too difficult to really handle; just skip over it and say
+            that we don't know what do to with the register. */
+         if (VG_(clo_trace_cfi))
+            VG_(printf)("DWARF2 CFI reader: "
+                        "ignoring DW_CFA_val_expression\n");
+         reg = read_leb128( &instr[i], &nleb, 0 );
+         i += nleb;
+         len = read_leb128( &instr[i], &nleb, 0 );
+         i += nleb;
+         i += len;
+         if (reg < 0 || reg >= N_CFI_REGS)
+            return 0; /* fail */
+         ctx->reg[reg].tag = RR_ValExpr;
+         break;
+
       case DW_CFA_def_cfa_expression:
          if (VG_(clo_trace_cfi))
             VG_(printf)("DWARF2 CFI reader: "
@@ -2006,7 +2096,7 @@ static Int show_CF_instruction ( UChar* 
    }
 
    if (hi2 == DW_CFA_restore) {
-      VG_(printf)("DW_CFA_restore(%d)\n", (Int)lo6);
+      VG_(printf)("DW_CFA_restore(r%d)\n", (Int)lo6);
       return i;
    }
 
@@ -2046,6 +2136,14 @@ static Int show_CF_instruction ( UChar* 
          VG_(printf)("DW_CFA_def_cfa(r%d, off %d)\n", reg, off); 
          break;
 
+      case DW_CFA_def_cfa_sf:
+         reg = read_leb128( &instr[i], &nleb, 0 );
+         i += nleb;
+         off = read_leb128( &instr[i], &nleb, 1 );
+         i += nleb;
+         VG_(printf)("DW_CFA_def_cfa_sf(r%d, off %d)\n", reg, off);
+         break;
+
       case DW_CFA_register:
          reg = read_leb128( &instr[i], &nleb, 0);
          i += nleb;
@@ -2066,6 +2164,38 @@ static Int show_CF_instruction ( UChar* 
          VG_(printf)("DW_CFA_def_cfa_offset(%d)\n", off); 
          break;
 
+      case DW_CFA_def_cfa_offset_sf:
+         off = read_leb128( &instr[i], &nleb, 1);
+         i += nleb;
+         VG_(printf)("DW_CFA_def_cfa_offset_sf(%d)\n", off);
+         break;
+
+      case DW_CFA_restore_extended:
+         reg = read_leb128( &instr[i], &nleb, 0);
+         i += nleb;
+         VG_(printf)("DW_CFA_restore_extended(r%d)\n", reg);
+         break;
+
+      case DW_CFA_undefined:
+         reg = read_leb128( &instr[i], &nleb, 0);
+         i += nleb;
+         VG_(printf)("DW_CFA_undefined(r%d)\n", reg);
+         break;
+
+      case DW_CFA_same_value:
+         reg = read_leb128( &instr[i], &nleb, 0);
+         i += nleb;
+         VG_(printf)("DW_CFA_same_value(r%d)\n", reg);
+         break;
+
+      case DW_CFA_remember_state:
+         VG_(printf)("DW_CFA_remember_state\n");
+         break;
+
+      case DW_CFA_restore_state:
+         VG_(printf)("DW_CFA_restore_state\n");
+         break;
+
       case DW_CFA_GNU_args_size:
          off = read_leb128( &instr[i], &nleb, 0 );
          i += nleb;
@@ -2088,6 +2218,55 @@ static Int show_CF_instruction ( UChar* 
          VG_(printf)("DW_CFA_expression(r%d, length %d)\n", reg, len);
          break;
 
+      case DW_CFA_val_expression:
+         reg = read_leb128( &instr[i], &nleb, 0 );
+         i += nleb;
+         len = read_leb128( &instr[i], &nleb, 0 );
+         i += nleb;
+         i += len;
+         VG_(printf)("DW_CFA_val_expression(r%d, length %d)\n", reg, len);
+         break;
+
+      case DW_CFA_offset_extended:
+         reg = read_leb128( &instr[i], &nleb, 0 );
+         i += nleb;
+         off = read_leb128( &instr[i], &nleb, 0 );
+         i += nleb;
+         VG_(printf)("DW_CFA_offset_extended(r%d, off %d x data_af)\n", reg, off);
+         break;
+
+       case DW_CFA_offset_extended_sf:
+         reg = read_leb128( &instr[i], &nleb, 0 );
+         i += nleb;
+         off = read_leb128( &instr[i], &nleb, 1 );
+         i += nleb;
+         VG_(printf)("DW_CFA_offset_extended_sf(r%d, off %d x data_af)\n", reg, off);
+         break;
+
+      case DW_CFA_GNU_negative_offset_extended:
+         reg = read_leb128( &instr[i], &nleb, 0 );
+         i += nleb;
+         off = read_leb128( &instr[i], &nleb, 0 );
+         i += nleb;
+         VG_(printf)("DW_CFA_GNU_negative_offset_extended(r%d, off %d x data_af)\n", reg, -off);
+         break;
+
+      case DW_CFA_val_offset:
+         reg = read_leb128( &instr[i], &nleb, 0 );
+         i += nleb;
+         off = read_leb128( &instr[i], &nleb, 0 );
+         i += nleb;
+         VG_(printf)("DW_CFA_val_offset(r%d, off %d x data_af)\n", reg, off);
+         break;
+
+       case DW_CFA_val_offset_sf:
+         reg = read_leb128( &instr[i], &nleb, 0 );
+         i += nleb;
+         off = read_leb128( &instr[i], &nleb, 1 );
+         i += nleb;
+         VG_(printf)("DW_CFA_val_offset_sf(r%d, off %d x data_af)\n", reg, off);
+         break;
+
       case DW_CFA_GNU_window_save:
          VG_(printf)("DW_CFA_GNU_window_save\n");
          break;
@@ -2378,6 +2557,9 @@ void ML_(read_callframe_info_dwarf2) 
                   data++;
                   cie_augmentation++;
                   break;
+               case 'S':
+                  cie_augmentation++;
+                  break;
                default:
                   if (the_CIEs[this_CIE].instrs == NULL) {
                      how = "unhandled cie.augmentation";

valgrind-3.1.1-glibc24.patch:
 glibc-2.4.supp |    9 +++++++++
 1 files changed, 9 insertions(+)

--- NEW FILE valgrind-3.1.1-glibc24.patch ---
--- valgrind-3.1.1/glibc-2.4.supp.jj	2006-03-15 12:52:00.000000000 -0500
+++ valgrind-3.1.1/glibc-2.4.supp	2006-04-03 12:51:31.000000000 -0400
@@ -61,6 +61,15 @@
    obj:/lib*/libc-2.3.90.so
 }
 
+{
+   Fedora-Core-5-hack3a
+   Memcheck:Cond
+   obj:/lib*/ld-2.4*so
+   obj:/lib*/ld-2.4*so
+   obj:/lib*/ld-2.4*so
+   obj:/lib*/libc-2.4*so
+}
+
 ##----------------------------------------------------------------------##
 {
    glibc-2.3.x-on-SUSE-10.1-(PPC)-1

valgrind-3.1.1-valgrind_h.patch:
 valgrind.h |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE valgrind-3.1.1-valgrind_h.patch ---
--- valgrind-3.1.1/include/valgrind.h.jj	2005-03-11 01:28:13.000000000 -0500
+++ valgrind-3.1.1/include/valgrind.h	2005-03-29 16:42:31.000000000 -0500
@@ -215,10 +215,11 @@ typedef
 
 #else /* NVALGRIND */
 
-int VALGRIND_PRINTF(const char *format, ...)
-   __attribute__((format(__printf__, 1, 2)));
-__attribute__((weak))
-int
+/* Modern GCC will optimize the static routine out if unused,
+   and unused attribute will shut down warnings about it.  */
+static int VALGRIND_PRINTF(const char *format, ...)
+   __attribute__((format(__printf__, 1, 2), __unused__));
+static int
 VALGRIND_PRINTF(const char *format, ...)
 {
    unsigned long _qzz_res;
@@ -230,10 +231,9 @@ VALGRIND_PRINTF(const char *format, ...)
    return (int)_qzz_res;
 }
 
-int VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
-   __attribute__((format(__printf__, 1, 2)));
-__attribute__((weak))
-int
+static int VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
+   __attribute__((format(__printf__, 1, 2), __unused__));
+static int
 VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
 {
    unsigned long _qzz_res;


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/valgrind/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Jan 2006 10:36:37 -0000	1.8
+++ .cvsignore	3 Apr 2006 16:55:06 -0000	1.9
@@ -1 +1 @@
-valgrind-3.1.0.tar.bz2
+valgrind-3.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/valgrind/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Jan 2006 10:36:37 -0000	1.8
+++ sources	3 Apr 2006 16:55:06 -0000	1.9
@@ -1 +1 @@
-d92156e9172dc6097e56c69ea9c88013  valgrind-3.1.0.tar.bz2
+3bbfafedb59c19bf75977381ce2eb6d7  valgrind-3.1.1.tar.bz2


Index: valgrind.spec
===================================================================
RCS file: /cvs/dist/rpms/valgrind/devel/valgrind.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- valgrind.spec	13 Mar 2006 09:22:55 -0000	1.28
+++ valgrind.spec	3 Apr 2006 16:55:06 -0000	1.29
@@ -1,14 +1,13 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
-Version: 3.1.0
-Release: 2
+Version: 3.1.1
+Release: 1
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
-Patch1: valgrind-3.1.0-valgrind_h.patch
-Patch2: valgrind-3.1.0-amd64-highbase.patch
-Patch3: valgrind-3.1.0-amd64-speedup.patch
-Patch4: valgrind-3.1.0-cfa-val-expr.patch
-Patch5: valgrind-3.1.0-glibc24.patch
+Patch1: valgrind-3.1.1-valgrind_h.patch
+Patch2: valgrind-3.1.1-amd64-speedup.patch
+Patch3: valgrind-3.1.1-cfa-val-expr.patch
+Patch4: valgrind-3.1.1-glibc24.patch
 License: GPL
 URL: http://www.valgrind.org/
 Group: Development/Debuggers
@@ -32,12 +31,9 @@
 %prep
 %setup -q
 %patch1 -p1
-%ifarch x86_64
-#%patch2 -p1
-%endif
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
 %ifarch x86_64
@@ -115,6 +111,10 @@
 %{_mandir}/man1/valgrind*
 
 %changelog
+* Mon Apr  3 2006 Jakub Jelinek <jakub at redhat.com> 3.1.1-1
+- upgrade to 3.1.1
+  - many bugfixes
+
 * Mon Mar 13 2006 Jakub Jelinek <jakub at redhat.com> 3.1.0-2
 - add support for DW_CFA_val_offset{,_sf}, DW_CFA_def_cfa_sf
   and skip over DW_CFA_val_expression quietly


--- valgrind-3.1.0-amd64-highbase.patch DELETED ---


--- valgrind-3.1.0-amd64-speedup.patch DELETED ---


--- valgrind-3.1.0-cfa-val-expr.patch DELETED ---


--- valgrind-3.1.0-glibc24.patch DELETED ---


--- valgrind-3.1.0-valgrind_h.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr  3 17:03:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 13:03:13 -0400
Subject: rpms/tix/FC-5 tix.spec,1.13,1.14
Message-ID: <200604031703.k33H3DOO027058@cvs.devel.redhat.com>

Author: dcantrel

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

Modified Files:
	tix.spec 
Log Message:
libTix8.4.so shared lib placement fixup (#187739)



Index: tix.spec
===================================================================
RCS file: /cvs/dist/rpms/tix/FC-5/tix.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tix.spec	27 Mar 2006 15:53:27 -0000	1.13
+++ tix.spec	3 Apr 2006 17:02:55 -0000	1.14
@@ -5,7 +5,7 @@
 Name: tix
 Epoch: 1
 Version: %{tixmajor}.0
-Release: 4
+Release: 6
 License: BSD
 Group: Development/Languages
 URL: http://tix.sourceforge.net/
@@ -65,11 +65,15 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# devel symlinks
+# move shared lib
+rm -f $RPM_BUILD_ROOT%{_libdir}/libTix%{tixmajor}.so
+mv $RPM_BUILD_ROOT%{_libdir}/Tix%{tixmajor}/libTix%{tixmajor}.so $RPM_BUILD_ROOT%{_libdir}/libTix%{tixmajor}.so
+( cd $RPM_BUILD_ROOT%{_libdir}/Tix%{tixmajor}
+  ln -sf ../libTix%{tixmajor}.so .
+)
 ( cd $RPM_BUILD_ROOT%{_libdir}
-  rm -f libtix.so libTix.so
-  ln -s Tix%{tixmajor}/libTix%{tixmajor}.so libtix.so
-  ln -s Tix%{tixmajor}/libTix%{tixmajor}.so libTix.so
+  ln -sf libTix%{tixmajor}.so libTix.so
+  ln -sf libTix%{tixmajor}.so libtix.so
 )
 
 # install demo scripts
@@ -100,6 +104,7 @@
 
 %files
 %defattr(-,root,root,-)
+%{_libdir}/libTix%{tixmajor}.so
 %dir %{_libdir}/Tix%{tixmajor}
 %{_libdir}/Tix%{tixmajor}/libTix%{tixmajor}.so
 %{_libdir}/Tix%{tixmajor}/*.tcl
@@ -110,9 +115,9 @@
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/libTix.so
-%{_libdir}/libtix.so
 %{_includedir}/tix.h
+%{_libdir}/libtix.so
+%{_libdir}/libTix.so
 %{_mandir}/mann
 
 %files doc
@@ -120,6 +125,9 @@
 %doc docs/*
 
 %changelog
+* Mon Apr 03 2006 David Cantrell <dcantrell at redhat.com> - 1:8.4.0-6
+- libTix8.4.so shared lib placement fixup (#187739)
+
 * Mon Mar 27 2006 David Cantrell <dcantrell at redhat.com> - 1:8.4.0-4
 - Make sure libTix8.4.so is in /usr/lib/Tix8.4
 



From fedora-cvs-commits at redhat.com  Mon Apr  3 17:16:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 13:16:34 -0400
Subject: rpms/valgrind/devel valgrind-3.1.1-amd64-speedup.patch,1.1,1.2
Message-ID: <200604031716.k33HGY7p005821@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/valgrind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4423

Modified Files:
	valgrind-3.1.1-amd64-speedup.patch 
Log Message:
3.1.1-1


valgrind-3.1.1-amd64-speedup.patch:
 toIR.c |  384 ++++++++++++++++++++++++++++++++---------------------------------
 1 files changed, 193 insertions(+), 191 deletions(-)

Index: valgrind-3.1.1-amd64-speedup.patch
===================================================================
RCS file: /cvs/dist/rpms/valgrind/devel/valgrind-3.1.1-amd64-speedup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- valgrind-3.1.1-amd64-speedup.patch	3 Apr 2006 16:55:06 -0000	1.1
+++ valgrind-3.1.1-amd64-speedup.patch	3 Apr 2006 17:16:30 -0000	1.2
@@ -1,8 +1,8 @@
 Replaces 188 insn[0] == 0x0F tests with just one, allows for insn[0] != 0x0F
 to quickly skip all the 188 if clauses.  I haven't analyzed if the compiler
 could possibly figure this out itself, certainly it would be hard.
---- valgrind-3.1.1/VEX/priv/toIR.c.jj	2006-03-14 14:16:38.000000000 -0500
-+++ valgrind-3.1.1/VEX/priv/toIR.c	2006-04-03 12:44:42.000000000 -0400
+--- valgrind-3.1.1/VEX/priv/guest-amd64/toIR.c.jj	2006-03-14 14:16:38.000000000 -0500
++++ valgrind-3.1.1/VEX/priv/guest-amd64/toIR.c	2006-04-03 12:44:42.000000000 -0400
 @@ -8139,13 +8139,14 @@ DisResult disInstr_AMD64_WRK ( 
  
     insn = (UChar*)&guest_code[delta];



From fedora-cvs-commits at redhat.com  Mon Apr  3 17:17:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 13:17:17 -0400
Subject: rpms/selinux-policy/devel policy-20060323.patch, 1.7,
	1.8 selinux-policy.spec, 1.165, 1.166
Message-ID: <200604031717.k33HHHiZ008638@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20060323.patch selinux-policy.spec 
Log Message:
* Mon Mar 30 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-2
- Add mono dbus support
- Lots of file_context fixes for textrel_shlib_t in FC5
- Turn off execmem auditallow since they are filling log files


policy-20060323.patch:
 apps/mono.if               |   23 +++++++++++++++++++++++
 apps/mono.te               |    1 +
 kernel/devices.fc          |    1 +
 kernel/devices.if          |   40 ++++++++++++++++++++++++++++++++++++++++
 kernel/files.if            |   15 +++++++++++++++
 services/apache.if         |   20 ++++++++++++++++++++
 services/automount.te      |    1 +
 services/avahi.te          |    4 ++++
 services/bluetooth.te      |    7 +++++--
 services/dbus.te           |    1 +
 services/hal.te            |   12 +++++++++++-
 services/networkmanager.te |    1 +
 services/nscd.if           |   20 ++++++++++++++++++++
 services/xserver.if        |   21 +++++++++++++++++++++
 system/fstools.te          |    1 +
 system/getty.fc            |    1 +
 system/getty.te            |    2 ++
 system/init.te             |    1 +
 system/libraries.fc        |   20 +++++++++++++++-----
 system/logging.if          |   32 ++++++++++++++++++++++++++++++++
 system/mount.te            |    4 +++-
 system/unconfined.if       |   17 +++++------------
 system/unconfined.te       |    4 ----
 system/userdomain.te       |    4 ++--
 24 files changed, 226 insertions(+), 27 deletions(-)

Index: policy-20060323.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060323.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- policy-20060323.patch	31 Mar 2006 20:46:37 -0000	1.7
+++ policy-20060323.patch	3 Apr 2006 17:17:13 -0000	1.8
@@ -1,3 +1,41 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-2.2.29/policy/modules/apps/mono.if
+--- nsaserefpolicy/policy/modules/apps/mono.if	2006-03-23 16:46:10.000000000 -0500
++++ serefpolicy-2.2.29/policy/modules/apps/mono.if	2006-04-03 10:03:24.000000000 -0400
+@@ -23,3 +23,26 @@
+ 	allow mono_t $1:fifo_file rw_file_perms;
+ 	allow mono_t $1:process sigchld;
+ ')
++
++
++########################################
++## <summary>
++##	Send and receive messages from
++##	mono over dbus.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`mono_dbus_chat',`
++	gen_require(`
++		type mono_t;
++		class dbus send_msg;
++	')
++
++	allow $1 mono_t:dbus send_msg;
++	allow mono_t $1:dbus send_msg;
++')
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.2.29/policy/modules/apps/mono.te
+--- nsaserefpolicy/policy/modules/apps/mono.te	2006-03-23 16:46:10.000000000 -0500
++++ serefpolicy-2.2.29/policy/modules/apps/mono.te	2006-04-03 12:28:33.000000000 -0400
+@@ -22,3 +22,4 @@
+ 	unconfined_domain_noaudit(mono_t)
+ 	role system_r types mono_t;
+ ')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.29/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-03-23 16:45:31.000000000 -0500
 +++ serefpolicy-2.2.29/policy/modules/kernel/devices.fc	2006-03-31 11:49:27.000000000 -0500
@@ -11,8 +49,35 @@
  /dev/winradio.		-c	gen_context(system_u:object_r:v4l_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.29/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2006-03-30 10:03:20.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/kernel/devices.if	2006-03-31 11:21:52.000000000 -0500
-@@ -2860,3 +2860,23 @@
++++ serefpolicy-2.2.29/policy/modules/kernel/devices.if	2006-04-03 11:31:23.000000000 -0400
+@@ -2439,6 +2439,26 @@
+ 
+ ########################################
+ ## <summary>
++##	Set the attributes of usbfs filesystem.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dev_setattr_usbfs',`
++	gen_require(`
++		type device_t, usbfs_t;
++	')
++
++	allow $1 device_t:dir r_dir_perms;
++	allow $1 usbfs_t:file setattr;
++')
++
++
++########################################
++## <summary>
+ ##	Associate a file to a usbfs filesystem.
+ ## </summary>
+ ## <param name="file_type">
+@@ -2860,3 +2880,23 @@
  	allow $1 self:capability sys_rawio;
  	typeattribute $1 memory_raw_write, memory_raw_read;
  ')
@@ -61,6 +126,36 @@
  ## <summary>
  ##	Read files in /etc that are dynamically
  ##	created on boot, such as mtab.
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.29/policy/modules/services/apache.if
+--- nsaserefpolicy/policy/modules/services/apache.if	2006-03-24 11:09:14.000000000 -0500
++++ serefpolicy-2.2.29/policy/modules/services/apache.if	2006-04-03 13:02:08.000000000 -0400
+@@ -197,6 +197,26 @@
+ 		allow httpd_$1_script_t self:lnk_file read;
+ 	')
+ 
++	tunable_policy(`httpd_enable_cgi && httpd_can_network_connect_db',`
++		corenet_tcp_connect_postgresql_port(httpd_$1_script_t)
++		corenet_tcp_connect_mysqld_port(httpd_$1_script_t)
++		allow httpd_$1_script_t self:tcp_socket create_stream_socket_perms;
++		allow httpd_$1_script_t self:udp_socket create_socket_perms;
++
++		corenet_tcp_sendrecv_all_if(httpd_$1_script_t)
++		corenet_udp_sendrecv_all_if(httpd_$1_script_t)
++		corenet_raw_sendrecv_all_if(httpd_$1_script_t)
++		corenet_tcp_sendrecv_all_nodes(httpd_$1_script_t)
++		corenet_udp_sendrecv_all_nodes(httpd_$1_script_t)
++		corenet_raw_sendrecv_all_nodes(httpd_$1_script_t)
++		corenet_tcp_sendrecv_all_ports(httpd_$1_script_t)
++		corenet_udp_sendrecv_all_ports(httpd_$1_script_t)
++		corenet_non_ipsec_sendrecv(httpd_$1_script_t)
++		corenet_tcp_bind_all_nodes(httpd_$1_script_t)
++		corenet_udp_bind_all_nodes(httpd_$1_script_t)
++		sysnet_read_config(httpd_$1_script_t)
++	')
++
+ 	tunable_policy(`httpd_enable_cgi && httpd_can_network_connect',`
+ 		allow httpd_$1_script_t self:tcp_socket create_stream_socket_perms;
+ 		allow httpd_$1_script_t self:udp_socket create_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.29/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2006-03-24 11:09:13.000000000 -0500
 +++ serefpolicy-2.2.29/policy/modules/services/automount.te	2006-03-31 11:21:52.000000000 -0500
@@ -72,6 +167,58 @@
  
  # Run mount in the mount_t domain.
  mount_domtrans(automount_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.2.29/policy/modules/services/avahi.te
+--- nsaserefpolicy/policy/modules/services/avahi.te	2006-03-24 11:09:13.000000000 -0500
++++ serefpolicy-2.2.29/policy/modules/services/avahi.te	2006-04-03 10:04:43.000000000 -0400
+@@ -92,6 +92,10 @@
+ 	dbus_system_bus_client_template(avahi,avahi_t)
+ 	dbus_connect_system_bus(avahi_t)
+ 	dbus_send_system_bus(avahi_t)
++	optional_policy(`
++		mono_dbus_chat(avahi_t)
++	')
++
+ ')
+ 
+ optional_policy(`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.29/policy/modules/services/bluetooth.te
+--- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-03-30 10:59:02.000000000 -0500
++++ serefpolicy-2.2.29/policy/modules/services/bluetooth.te	2006-04-03 10:50:10.000000000 -0400
+@@ -41,7 +41,7 @@
+ # Bluetooth services local policy
+ #
+ 
+-allow bluetooth_t self:capability { net_admin net_raw sys_tty_config };
++allow bluetooth_t self:capability { net_admin net_raw sys_tty_config ipc_lock };
+ dontaudit bluetooth_t self:capability sys_tty_config;
+ allow bluetooth_t self:process { getsched signal_perms };
+ allow bluetooth_t self:fifo_file rw_file_perms;
+@@ -178,7 +178,7 @@
+ 
+ allow bluetooth_helper_t bluetooth_helper_tmp_t:dir create_dir_perms;
+ allow bluetooth_helper_t bluetooth_helper_tmp_t:file create_file_perms;
+-files_tmp_filetrans(bluetooth_helper_t, bluetooth_helper_tmp_t, { file dir })
++files_tmp_filetrans(bluetooth_helper_t, bluetooth_helper_tmp_t, { file dir sock_file })
+ 
+ kernel_read_system_state(bluetooth_helper_t)
+ kernel_read_kernel_sysctls(bluetooth_helper_t)
+@@ -217,6 +217,8 @@
+ 
+ 	userdom_read_all_users_home_content_files(bluetooth_helper_t)
+ 
++	term_dontaudit_use_generic_ptys(bluetooth_helper_t)
++
+ 	optional_policy(`
+ 		xserver_stream_connect_xdm(bluetooth_helper_t)
+ 	')
+@@ -226,6 +228,7 @@
+ 	dbus_system_bus_client_template(bluetooth_helper,bluetooth_helper_t)
+ 	dbus_connect_system_bus(bluetooth_helper_t)
+ 	dbus_send_system_bus(bluetooth_helper_t)
++	bluetooth_dbus_chat(bluetooth_helper_t)
+ ')
+ 
+ optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-2.2.29/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2006-03-24 11:09:14.000000000 -0500
 +++ serefpolicy-2.2.29/policy/modules/services/dbus.te	2006-03-31 11:21:52.000000000 -0500
@@ -85,19 +232,89 @@
  seutil_read_default_contexts(system_dbusd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.29/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2006-03-30 10:59:02.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/services/hal.te	2006-03-31 11:21:52.000000000 -0500
-@@ -52,6 +52,7 @@
++++ serefpolicy-2.2.29/policy/modules/services/hal.te	2006-04-03 11:31:34.000000000 -0400
+@@ -22,7 +22,7 @@
+ #
+ 
+ # execute openvt which needs setuid
+-allow hald_t self:capability { 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 { 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;
+@@ -52,6 +52,9 @@
  kernel_write_proc_files(hald_t)
  
  files_search_boot(hald_t)
 +files_getattr_home_dir(hald_t)
++
++auth_read_pam_console_data(hald_t)
  
  corecmd_exec_bin(hald_t)
  corecmd_exec_sbin(hald_t)
+@@ -77,6 +80,8 @@
+ dev_getattr_all_chr_files(hald_t)
+ dev_manage_generic_chr_files(hald_t)
+ dev_rw_generic_usb_dev(hald_t)
++dev_setattr_generic_usb_dev(hald_t)
++dev_setattr_usbfs(hald_t)
+ 
+ # hal is now execing pm-suspend
+ dev_rw_sysfs(hald_t)
+@@ -187,6 +192,11 @@
+ 	optional_policy(`
+ 		networkmanager_dbus_chat(hald_t)
+ 	')
++
++	optional_policy(`
++		mono_dbus_chat(hald_t)
++	')
++
+ ')
+ 
+ optional_policy(`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.29/policy/modules/services/networkmanager.te
+--- nsaserefpolicy/policy/modules/services/networkmanager.te	2006-03-24 11:09:15.000000000 -0500
++++ serefpolicy-2.2.29/policy/modules/services/networkmanager.te	2006-04-03 12:24:37.000000000 -0400
+@@ -155,6 +155,7 @@
+ 
+ optional_policy(`
+ 	nscd_socket_use(NetworkManager_t)
++	nscd_signal(NetworkManager_t)
+ ')
+ 
+ optional_policy(`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.2.29/policy/modules/services/nscd.if
+--- nsaserefpolicy/policy/modules/services/nscd.if	2006-03-23 16:46:11.000000000 -0500
++++ serefpolicy-2.2.29/policy/modules/services/nscd.if	2006-04-03 12:24:28.000000000 -0400
+@@ -126,3 +126,23 @@
+ 
+ 	allow $1 nscd_t:nscd *;
+ ')
++
++
++########################################
++## <summary>
++##	signal NSCD 
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`nscd_signal',`
++	gen_require(`
++		type nscd_t;
++	')
++
++	allow $1 nscd_t:process signal;
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.29/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2006-03-30 10:16:43.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/services/xserver.if	2006-03-31 11:21:52.000000000 -0500
-@@ -1015,3 +1015,23 @@
++++ serefpolicy-2.2.29/policy/modules/services/xserver.if	2006-04-03 10:43:12.000000000 -0400
+@@ -1015,3 +1015,24 @@
  
  	dontaudit $1 xdm_xserver_t:tcp_socket { read write };
  ')
@@ -121,6 +338,7 @@
 +	allow $1 xdm_xserver_tmp_t:dir search;
 +	allow $1 xdm_xserver_tmp_t:sock_file { read write };
 +')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.29/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2006-03-30 10:59:03.000000000 -0500
 +++ serefpolicy-2.2.29/policy/modules/system/fstools.te	2006-03-31 11:21:52.000000000 -0500
@@ -132,6 +350,26 @@
  
  fs_search_auto_mountpoints(fsadm_t)
  fs_getattr_xattr_fs(fsadm_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.fc serefpolicy-2.2.29/policy/modules/system/getty.fc
+--- nsaserefpolicy/policy/modules/system/getty.fc	2006-03-23 16:46:11.000000000 -0500
++++ serefpolicy-2.2.29/policy/modules/system/getty.fc	2006-04-03 12:51:51.000000000 -0400
+@@ -6,3 +6,4 @@
+ /var/log/mgetty\.log.*	--	gen_context(system_u:object_r:getty_log_t,s0)
+ 
+ /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)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-2.2.29/policy/modules/system/getty.te
+--- nsaserefpolicy/policy/modules/system/getty.te	2006-03-29 10:50:04.000000000 -0500
++++ serefpolicy-2.2.29/policy/modules/system/getty.te	2006-04-03 12:52:46.000000000 -0400
+@@ -104,6 +104,8 @@
+ 
+ miscfiles_read_localization(getty_t)
+ 
++mta_send_mail(getty_t)
++
+ ifdef(`targeted_policy',`
+ 	term_dontaudit_use_unallocated_ttys(getty_t)
+ 	term_dontaudit_use_generic_ptys(getty_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.29/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2006-03-30 10:13:28.000000000 -0500
 +++ serefpolicy-2.2.29/policy/modules/system/init.te	2006-03-31 11:21:52.000000000 -0500
@@ -145,8 +383,16 @@
  libs_use_ld_so(initrc_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.29/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-03-30 10:18:07.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/system/libraries.fc	2006-03-31 15:45:19.000000000 -0500
-@@ -55,6 +55,8 @@
++++ serefpolicy-2.2.29/policy/modules/system/libraries.fc	2006-04-03 12:44:37.000000000 -0400
+@@ -33,6 +33,7 @@
+ #
+ /opt(/.*)?/lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
+ /opt(/.*)?/lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
++/opt/.*/jre.*/lib/i386/libdeploy.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+ #
+ # /sbin
+@@ -55,6 +56,8 @@
  
  /usr(/.*)?/nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
@@ -155,7 +401,16 @@
  /usr/lib(64)?/pgsql/test/regress/.*\.so 	--	gen_context(system_u:object_r:shlib_t,s0)
  
  /usr/lib/win32/.*			--	gen_context(system_u:object_r:shlib_t,s0)
-@@ -70,10 +72,13 @@
+@@ -62,6 +65,8 @@
+ /usr/lib(64)?/im/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
+ /usr/lib(64)?/iiim/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
+ 
++/usr/lib(64)?/libsipphoneapi\.so.*	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
++
+ /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libGLU\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?(/.*)?/libnvidia.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -70,10 +75,15 @@
  /usr/(local/)?lib/wine/.*\.so  		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/(local/)?lib/libfame-.*\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/local/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
@@ -163,7 +418,8 @@
 +/usr/lib(64)?/libjs\.so.*     		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/X11R6/lib/libGL\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/X11R6/lib/libXvMCNVIDIA\.so.* 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
--
++/usr/lib(64)?/vmware(.*/)?/VmPerl\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
 +/usr/lib(64)?/nvidia-graphics(-[^/]*/)?libGL(core)?\.so(\.[^/]*)*             --      	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/nvidia-graphics(-[^/]*/)?libnvidia.*\.so(\.[^/]*)*              --      	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/nvidia-graphics(-[^/]*/)?libXvMCNVIDIA\.so.*            --      	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -171,7 +427,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)
  
-@@ -92,6 +97,7 @@
+@@ -92,6 +102,7 @@
  /usr/lib(64)?/libstdc\+\+\.so\.2\.7\.2\.8 --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libg\+\+\.so\.2\.7\.2\.8	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libglide3\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -179,6 +435,20 @@
  /usr/lib(64)?/libdv\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/helix/plugins/oggfformat\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/helix/plugins/theorarend\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -170,10 +181,9 @@
+ # Java, Sun Microsystems (JPackage SRPM)
+ /usr/.*/jre.*/lib/i386/libdeploy.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+-/usr(/.*)?/Reader/intellinux/plug_ins/.*\.api -- gen_context(system_u:object_r:shlib_t,s0)
+-/usr(/.*)?/Reader/intellinux/plug_ins/AcroForm\.api -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/usr(/.*)?/Reader/intellinux/plug_ins/EScript\.api -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/usr(/.*)?/Reader/intellinux/SPPlugins/ADMPlugin\.apl -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr(/.*)?/intellinux/nppdf\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0)
++/usr(/.*)?/intellinux/lib/\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0)
++/usr(/.*)?/intellinux/plug_ins/.*\.api -- gen_context(system_u:object_r:texrel_shlib_t,s0)
+ ') dnl end distro_redhat
+ 
+ ifdef(`distro_suse',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.2.29/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2006-03-23 16:46:11.000000000 -0500
 +++ serefpolicy-2.2.29/policy/modules/system/logging.if	2006-03-31 11:21:52.000000000 -0500
@@ -241,7 +511,16 @@
  fs_remount_all_fs(mount_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.29/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-03-29 09:34:53.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/system/unconfined.if	2006-03-31 11:21:52.000000000 -0500
++++ serefpolicy-2.2.29/policy/modules/system/unconfined.if	2006-04-03 11:09:45.000000000 -0400
+@@ -55,7 +55,7 @@
+ 	tunable_policy(`allow_execmem && allow_execstack',`
+ 		# Allow making the stack executable via mprotect.
+ 		allow $1 self:process execstack;
+-		auditallow $1 self:process execstack;
++#		auditallow $1 self:process execstack;
+ 	', `
+ 		# These are fairly common but seem to be harmless
+ 		# caused by using shared libraries built with old tool chains
 @@ -89,14 +89,6 @@
  		storage_unconfined($1)
  	')
@@ -257,6 +536,34 @@
  ')
  
  ########################################
+@@ -118,9 +110,10 @@
+ 		auditallow $1 self:process execheap;
+ 	')
+ 
+-	tunable_policy(`allow_execmem',`
+-		auditallow $1 self:process execmem;
+-	')
++# Turn off this audit for FC5
++#	tunable_policy(`allow_execmem',`
++#		auditallow $1 self:process execmem;
++#	')
+ ')
+ 
+ ########################################
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.29/policy/modules/system/unconfined.te
+--- nsaserefpolicy/policy/modules/system/unconfined.te	2006-03-29 09:34:53.000000000 -0500
++++ serefpolicy-2.2.29/policy/modules/system/unconfined.te	2006-04-03 12:27:56.000000000 -0400
+@@ -106,10 +106,6 @@
+ 	')
+ 
+ 	optional_policy(`
+-		netutils_domtrans_ping(unconfined_t)
+-	')
+-
+-	optional_policy(`
+ 		portmap_domtrans_helper(unconfined_t)
+ 	')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.29/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-03-28 12:58:49.000000000 -0500
 +++ serefpolicy-2.2.29/policy/modules/system/userdomain.te	2006-03-31 11:21:52.000000000 -0500


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- selinux-policy.spec	31 Mar 2006 20:17:33 -0000	1.165
+++ selinux-policy.spec	3 Apr 2006 17:17:13 -0000	1.166
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.29
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -320,6 +320,11 @@
 %endif
 
 %changelog
+* Mon Mar 30 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-2
+- Add mono dbus support
+- Lots of file_context fixes for textrel_shlib_t in FC5
+- Turn off execmem auditallow since they are filling log files
+
 * Fri Mar 30 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-1
 - Update to upstream
 



From fedora-cvs-commits at redhat.com  Mon Apr  3 17:32:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 13:32:24 -0400
Subject: rpms/selinux-policy/FC-5 .cvsignore, 1.48, 1.49 selinux-policy.spec,
	1.158, 1.159 sources, 1.52, 1.53
Message-ID: <200604031732.k33HWOxq008795@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore selinux-policy.spec sources 
Log Message:
* Mon Mar 30 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-2.fc5
- Rebuild for FC5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	22 Mar 2006 18:44:17 -0000	1.48
+++ .cvsignore	3 Apr 2006 17:32:00 -0000	1.49
@@ -49,3 +49,4 @@
 serefpolicy-2.2.22.tgz
 serefpolicy-2.2.23.tgz
 serefpolicy-2.2.25.tgz
+serefpolicy-2.2.29.tgz


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/selinux-policy.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- selinux-policy.spec	28 Mar 2006 15:20:51 -0000	1.158
+++ selinux-policy.spec	3 Apr 2006 17:32:00 -0000	1.159
@@ -9,12 +9,12 @@
 %define CHECKPOLICYVER 1.30-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.25
-Release: 3.fc5
+Version: 2.2.29
+Release: 2.fc5
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
-patch: policy-20060207.patch
+patch: policy-20060323.patch
 Source1: modules-targeted.conf
 Source2: booleans-targeted.conf
 Source3: Makefile.devel
@@ -163,7 +163,7 @@
 install -m 755 ${RPM_SOURCE_DIR}/policygentool ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/
 install -m 644 ${RPM_SOURCE_DIR}/Makefile.devel ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/Makefile
 install -m 644 doc/example.* ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/
-echo  "htmlview file:///usr/share/doc/selinux-policy-%{version}/html/index.html" > ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/policyhelp
+echo  "htmlview file:///usr/share/doc/selinux-policy-%{version}/html/index.html"> ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/policyhelp
 chmod +x ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/policyhelp
 
 # Build targeted policy
@@ -300,6 +300,17 @@
 %fileList strict
 
 %changelog
+* Mon Mar 30 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-2.fc5
+- Rebuild for FC5
+
+* Mon Mar 30 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-2
+- Add mono dbus support
+- Lots of file_context fixes for textrel_shlib_t in FC5
+- Turn off execmem auditallow since they are filling log files
+- Allow mono to dbus with networkmanager
+- Don't transition to ping from unconfined.
+- Fixes for getty-fax
+
 * Wed Mar 22 2006 Dan Walsh <dwalsh at redhat.com> 2.2.25-3.fc5
 - Fixes for hplip and klogd
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	22 Mar 2006 18:44:17 -0000	1.52
+++ sources	3 Apr 2006 17:32:00 -0000	1.53
@@ -1 +1 @@
-efdb10103ce8e6d7c86d1b3153a6f04a  serefpolicy-2.2.25.tgz
+a2106965fe20d1d3d41e0d4e05c2effb  serefpolicy-2.2.29.tgz



From fedora-cvs-commits at redhat.com  Mon Apr  3 17:35:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 13:35:14 -0400
Subject: rpms/tix/devel tix.spec,1.13,1.14
Message-ID: <200604031735.k33HZEw7008868@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/tix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8853

Modified Files:
	tix.spec 
Log Message:
libTix8.4.so shared lib placement fixup (#187739)



Index: tix.spec
===================================================================
RCS file: /cvs/dist/rpms/tix/devel/tix.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tix.spec	27 Mar 2006 16:11:04 -0000	1.13
+++ tix.spec	3 Apr 2006 17:35:11 -0000	1.14
@@ -5,7 +5,7 @@
 Name: tix
 Epoch: 1
 Version: %{tixmajor}.0
-Release: 5
+Release: 7
 License: BSD
 Group: Development/Languages
 URL: http://tix.sourceforge.net/
@@ -65,11 +65,15 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# devel symlinks
+# move shared lib
+rm -f $RPM_BUILD_ROOT%{_libdir}/libTix%{tixmajor}.so
+mv $RPM_BUILD_ROOT%{_libdir}/Tix%{tixmajor}/libTix%{tixmajor}.so $RPM_BUILD_ROOT%{_libdir}/libTix%{tixmajor}.so
+( cd $RPM_BUILD_ROOT%{_libdir}/Tix%{tixmajor}
+  ln -sf ../libTix%{tixmajor}.so .
+)
 ( cd $RPM_BUILD_ROOT%{_libdir}
-  rm -f libtix.so libTix.so
-  ln -s Tix%{tixmajor}/libTix%{tixmajor}.so libtix.so
-  ln -s Tix%{tixmajor}/libTix%{tixmajor}.so libTix.so
+  ln -sf libTix%{tixmajor}.so libTix.so
+  ln -sf libTix%{tixmajor}.so libtix.so
 )
 
 # install demo scripts
@@ -100,6 +104,7 @@
 
 %files
 %defattr(-,root,root,-)
+%{_libdir}/libTix%{tixmajor}.so
 %dir %{_libdir}/Tix%{tixmajor}
 %{_libdir}/Tix%{tixmajor}/libTix%{tixmajor}.so
 %{_libdir}/Tix%{tixmajor}/*.tcl
@@ -110,9 +115,9 @@
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/libTix.so
-%{_libdir}/libtix.so
 %{_includedir}/tix.h
+%{_libdir}/libtix.so
+%{_libdir}/libTix.so
 %{_mandir}/mann
 
 %files doc
@@ -120,6 +125,9 @@
 %doc docs/*
 
 %changelog
+* Mon Apr 03 2006 David Cantrell <dcantrell at redhat.com> - 1:8.4.0-7
+- libTix8.4.so shared lib placement fixup (#187739)
+
 * Mon Mar 27 2006 David Cantrell <dcantrell at redhat.com> - 1:8.4.0-5
 - Make sure libTix8.4.so is in /usr/lib/Tix8.4
 



From fedora-cvs-commits at redhat.com  Mon Apr  3 18:58:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 14:58:58 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2116,1.2117
Message-ID: <200604031858.k33IwwL7018996@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
* Mon Apr  3 2006 Dave Jones <davej at redhat.com>
- Disable 'quiet' mode.
- Enable page alloc debugging for a build.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2116
retrieving revision 1.2117
diff -u -r1.2116 -r1.2117
--- kernel-2.6.spec	3 Apr 2006 04:16:49 -0000	1.2116
+++ kernel-2.6.spec	3 Apr 2006 18:58:55 -0000	1.2117
@@ -845,7 +845,7 @@
 %patch1022 -p1
 %patch1025 -p1
 # Disable the 'quiet' boot switch for better bug reports.
-#%patch1026 -p1
+%patch1026 -p1
 # Slab leak detector.
 #%patch1027 -p1
 # Pause on oops.
@@ -1594,6 +1594,10 @@
 %endif
 
 %changelog
+* Mon Apr  3 2006 Dave Jones <davej at redhat.com>
+- Disable 'quiet' mode.
+- Enable page alloc debugging for a build.
+
 * Sun Apr  2 2006 Dave Jones <davej at redhat.com>
 - 2.6.17rc1
 



From fedora-cvs-commits at redhat.com  Mon Apr  3 18:58:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 14:58:58 -0400
Subject: rpms/kernel/devel/configs config-x86-generic,1.44,1.45
Message-ID: <200604031858.k33IwwKW019010@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-x86-generic 
Log Message:
* Mon Apr  3 2006 Dave Jones <davej at redhat.com>
- Disable 'quiet' mode.
- Enable page alloc debugging for a build.



Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- config-x86-generic	29 Mar 2006 00:03:23 -0000	1.44
+++ config-x86-generic	3 Apr 2006 18:58:56 -0000	1.45
@@ -213,7 +213,7 @@
 CONFIG_KPROBES=y
 
 # FIXME: Disable before release.
-# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_DEBUG_PAGEALLOC=y
 
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
@@ -224,7 +224,7 @@
 CONFIG_HOTPLUG_PCI_COMPAQ=m
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
 CONFIG_HOTPLUG_PCI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=m 
+CONFIG_HOTPLUG_PCI_ACPI=m
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 CONFIG_ACPI_IBM_DOCK=y
 # CONFIG_HOTPLUG_PCI_CPCI is not set



From fedora-cvs-commits at redhat.com  Mon Apr  3 19:34:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 15:34:41 -0400
Subject: rpms/mesa/devel mesa.spec,1.50,1.51
Message-ID: <200604031934.k33JYfml000868@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	mesa.spec 
Log Message:
Widen libOSMesa glob.


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- mesa.spec	2 Apr 2006 06:13:56 -0000	1.50
+++ mesa.spec	3 Apr 2006 19:34:38 -0000	1.51
@@ -365,8 +365,7 @@
 # NOTE: This is the software rasterizer only.  Why it is 1.5.* is not clear
 # to me currently, but it is a change from Xorg 6.8.2's Mesa.
 #%{_libdir}/libGL.so.1.5.060400
-%{_libdir}/libOSMesa.so.6
-%{_libdir}/libOSMesa.so.6.4.0604*
+%{_libdir}/libOSMesa.so.6*
 %endif
 
 %files libGL-devel
@@ -444,6 +443,7 @@
 - Update mesa-modular-dri-dir.patch to apply.
 - Widen libGLU glob.
 - Reenable r300 driver install.
+- Widen libOSMesa glob.
 
 * Fri Mar 24 2006 Kristian H??gsberg <krh at redhat.com> 6.4.2-7
 - Set ARCH_FLAGS=-DGLX_USE_TLS to enable TLS for GL contexts.



From fedora-cvs-commits at redhat.com  Mon Apr  3 20:50:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 16:50:02 -0400
Subject: rpms/libsemanage/devel libsemanage-rhat.patch, 1.11,
	1.12 libsemanage.spec, 1.80, 1.81
Message-ID: <200604032050.k33Ko2Dm011046@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsemanage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11031

Modified Files:
	libsemanage-rhat.patch libsemanage.spec 
Log Message:
* Wed Mar 29 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.2-2
- Fix leaky descriptor


libsemanage-rhat.patch:
 semanage_store.c |    2 ++
 1 files changed, 2 insertions(+)

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libsemanage-rhat.patch	17 Mar 2006 20:25:31 -0000	1.11
+++ libsemanage-rhat.patch	3 Apr 2006 20:49:58 -0000	1.12
@@ -1,11 +1,12 @@
---- libsemanage-1.5.28/src/Makefile~	2006-02-17 14:45:52.000000000 -0500
-+++ libsemanage-1.5.28/src/Makefile	2006-03-17 08:44:29.000000000 -0500
-@@ -3,7 +3,7 @@
- LIBDIR ?= $(PREFIX)/lib
- SHLIBDIR ?= $(DESTDIR)/lib
- INCLUDEDIR ?= $(PREFIX)/include
--PYLIBVER ?= python2.4
-+PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]')
- PYINC ?= /usr/include/${PYLIBVER}
- PYLIBDIR ?= $(LIBDIR)/${PYLIBVER}
- 
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-1.6.2/src/semanage_store.c
+--- nsalibsemanage/src/semanage_store.c	2006-03-10 09:48:01.000000000 -0500
++++ libsemanage-1.6.2/src/semanage_store.c	2006-03-29 14:20:16.000000000 -0500
+@@ -1159,6 +1159,8 @@
+ 		ERR(sh, "Could not open direct %s at %s.", lock_name, lock_file);
+ 		return -1;
+ 	}
++	fcntl(fd, F_SETFD, FD_CLOEXEC);
++
+ 	if (sh->timeout == 0) {
+ 		/* return immediately */
+ 		origtime.tv_sec = 0;


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- libsemanage.spec	21 Mar 2006 15:45:58 -0000	1.80
+++ libsemanage.spec	3 Apr 2006 20:49:58 -0000	1.81
@@ -3,10 +3,11 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
 Version: 1.6.2
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
+Patch: libsemanage-rhat.patch
 
 BuildRoot: %{_tmppath}/%{name}-buildroot
 BuildRequires: libselinux-devel >= %{libselinuxver} 
@@ -39,6 +40,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .rhat
 
 %build
 make clean
@@ -72,7 +74,10 @@
 %{_mandir}/man3/*
 
 %changelog
-* Tue Mar 21 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.2
+* Wed Mar 29 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.2-2
+- Fix leaky descriptor
+
+* Tue Mar 21 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.2-1
 - Upgrade to latest from NSA
 	* Merged Makefile PYLIBVER definition patch from Dan Walsh.
 	* Merged man page reorganization from Ivan Gyurdiev.



From fedora-cvs-commits at redhat.com  Mon Apr  3 20:53:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 16:53:05 -0400
Subject: rpms/valgrind-callgrind/devel valgrind-callgrind.spec,1.13,1.14
Message-ID: <200604032053.k33Kr5CQ011162@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/valgrind-callgrind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11149

Modified Files:
	valgrind-callgrind.spec 
Log Message:
0.10.1-2



Index: valgrind-callgrind.spec
===================================================================
RCS file: /cvs/dist/rpms/valgrind-callgrind/devel/valgrind-callgrind.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- valgrind-callgrind.spec	7 Feb 2006 14:12:11 -0000	1.13
+++ valgrind-callgrind.spec	3 Apr 2006 20:53:03 -0000	1.14
@@ -1,15 +1,15 @@
 Summary: Call-graph profiler plugin for valgrind
 Name: valgrind-callgrind
 Version: 0.10.1
-Release: 1.1
+Release: 2
 Source0: http://kcachegrind.sourceforge.net/callgrind-%{version}.tar.bz2
 License: GPL
 URL: http://kcachegrind.sourceforge.net/
 Group: Development/Debuggers
 BuildRoot: %{_tmppath}/%{name}-root
 ExclusiveArch: %{ix86} x86_64
-BuildRequires: valgrind >= 1:3.1.0
-Requires: valgrind = 1:3.1.0
+BuildRequires: valgrind >= 1:3.1.1
+Requires: valgrind = 1:3.1.1
 # For make check
 BuildRequires: qt-devel
 
@@ -61,7 +61,10 @@
 %{_mandir}/man1/*
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.10.1-1.1
+* Mon Apr 03 2006 Jakub Jelinek <jakub at redhat.com> 0.10.1-2
+- require valgrind 3.1.1
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 0.10.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Mon Jan 16 2006 Jakub Jelinek <jakub at redhat.com> 0.10.1-1



From fedora-cvs-commits at redhat.com  Mon Apr  3 21:03:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 17:03:06 -0400
Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec,1.38,1.39
Message-ID: <200604032103.k33L36ur011379@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	eclipse-cdt.spec 
Log Message:
Add ia64.


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- eclipse-cdt.spec	7 Mar 2006 16:14:04 -0000	1.38
+++ eclipse-cdt.spec	3 Apr 2006 21:03:04 -0000	1.39
@@ -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
@@ -67,7 +67,7 @@
 Requires: 	eclipse-platform < 1:3.1.3
 
 %if %{gcj_support}
-ExclusiveArch: %{ix86} x86_64 ppc
+ExclusiveArch: %{ix86} x86_64 ppc ia64
 %else
 ExclusiveArch: %{ix86} x86_64 ppc ia64
 %endif
@@ -232,6 +232,9 @@
 
 
 %changelog
+* Mon Apr 03 2006 Andrew Overholt <overholt at redhat.com> 3.0.2-1jpp_3fc
+- Add ia64.
+
 * Tue Mar 07 2006 Andrew Overholt <overholt at redhat.com> 3.0.2-1jpp_2fc
 - Bump release.
 



From fedora-cvs-commits at redhat.com  Mon Apr  3 21:06:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 17:06:03 -0400
Subject: rpms/selinux-policy/FC-5 policy-20060323.patch,NONE,1.1
Message-ID: <200604032106.k33L62CO011479@cvs.devel.redhat.com>

Author: dwalsh

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

Added Files:
	policy-20060323.patch 
Log Message:
* Mon Mar 30 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-2.fc5
- Rebuild for FC5


policy-20060323.patch:
 admin/rpm.te               |    1 +
 apps/mono.if               |   23 +++++++++++++++++++++++
 apps/mono.te               |    1 +
 kernel/devices.fc          |    1 +
 kernel/devices.if          |   40 ++++++++++++++++++++++++++++++++++++++++
 kernel/files.if            |   15 +++++++++++++++
 kernel/mls.te              |    1 +
 services/apache.if         |   20 ++++++++++++++++++++
 services/automount.te      |    1 +
 services/avahi.te          |    4 ++++
 services/bluetooth.te      |    7 +++++--
 services/dbus.te           |    1 +
 services/hal.te            |   12 +++++++++++-
 services/networkmanager.te |    1 +
 services/nscd.if           |   20 ++++++++++++++++++++
 services/samba.te          |    2 ++
 services/snmp.te           |    1 +
 services/xserver.if        |   21 +++++++++++++++++++++
 system/fstools.te          |    1 +
 system/getty.fc            |    1 +
 system/getty.te            |    2 ++
 system/init.te             |    1 +
 system/libraries.fc        |   22 +++++++++++++++++-----
 system/logging.if          |   32 ++++++++++++++++++++++++++++++++
 system/mount.te            |    4 +++-
 system/unconfined.if       |   17 +++++------------
 system/unconfined.te       |    4 ----
 system/userdomain.te       |    4 ++--
 28 files changed, 233 insertions(+), 27 deletions(-)

--- NEW FILE policy-20060323.patch ---
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.2.29/policy/modules/admin/rpm.te
--- nsaserefpolicy/policy/modules/admin/rpm.te	2006-03-30 10:59:02.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/admin/rpm.te	2006-04-03 16:38:39.000000000 -0400
@@ -117,6 +117,7 @@
 mls_file_read_up(rpm_t)
 mls_file_write_down(rpm_t)
 mls_file_upgrade(rpm_t)
+mls_file_downgrade(rpm_t)
 
 selinux_get_fs_mount(rpm_t)
 selinux_validate_context(rpm_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-2.2.29/policy/modules/apps/mono.if
--- nsaserefpolicy/policy/modules/apps/mono.if	2006-03-23 16:46:10.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/apps/mono.if	2006-04-03 10:03:24.000000000 -0400
@@ -23,3 +23,26 @@
 	allow mono_t $1:fifo_file rw_file_perms;
 	allow mono_t $1:process sigchld;
 ')
+
+
+########################################
+## <summary>
+##	Send and receive messages from
+##	mono over dbus.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`mono_dbus_chat',`
+	gen_require(`
+		type mono_t;
+		class dbus send_msg;
+	')
+
+	allow $1 mono_t:dbus send_msg;
+	allow mono_t $1:dbus send_msg;
+')
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.2.29/policy/modules/apps/mono.te
--- nsaserefpolicy/policy/modules/apps/mono.te	2006-03-23 16:46:10.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/apps/mono.te	2006-04-03 12:28:33.000000000 -0400
@@ -22,3 +22,4 @@
 	unconfined_domain_noaudit(mono_t)
 	role system_r types mono_t;
 ')
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.29/policy/modules/kernel/devices.fc
--- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-03-23 16:45:31.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/kernel/devices.fc	2006-03-31 11:49:27.000000000 -0500
@@ -59,6 +59,7 @@
 ')
 /dev/vbi.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
 /dev/video.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
+/dev/dvb/.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
 /dev/vttuner		-c	gen_context(system_u:object_r:v4l_device_t,s0)
 /dev/vtx.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
 /dev/winradio.		-c	gen_context(system_u:object_r:v4l_device_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.29/policy/modules/kernel/devices.if
--- nsaserefpolicy/policy/modules/kernel/devices.if	2006-03-30 10:03:20.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/kernel/devices.if	2006-04-03 11:31:23.000000000 -0400
@@ -2439,6 +2439,26 @@
 
 ########################################
 ## <summary>
+##	Set the attributes of usbfs filesystem.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`dev_setattr_usbfs',`
+	gen_require(`
+		type device_t, usbfs_t;
+	')
+
+	allow $1 device_t:dir r_dir_perms;
+	allow $1 usbfs_t:file setattr;
+')
+
+
+########################################
+## <summary>
 ##	Associate a file to a usbfs filesystem.
 ## </summary>
 ## <param name="file_type">
@@ -2860,3 +2880,23 @@
 	allow $1 self:capability sys_rawio;
 	typeattribute $1 memory_raw_write, memory_raw_read;
 ')
+
+########################################
+## <summary>
+##	Dontaudit getattr on all device nodes.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+#
+interface(`dev_dontaudit_getattr_all_device_nodes',`
+	gen_require(`
+		attribute device_node;
+	')
+
+	dontaudit $1 device_t:dir_file_class_set getattr;
+	dontaudit $1 device_node:dir_file_class_set getattr;
+')
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.29/policy/modules/kernel/files.if
--- nsaserefpolicy/policy/modules/kernel/files.if	2006-03-30 10:04:15.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/kernel/files.if	2006-03-31 11:21:52.000000000 -0500
@@ -1643,6 +1643,21 @@
 ')
 
 ########################################
+#
+# files_unlink_boot_flag(domain)
+#
+# /halt, /.autofsck, etc
+#
+interface(`files_unlink_boot_flag',`
+	gen_require(`
+		type root_t;
+	')
+
+	allow $1 root_t:file unlink;
+')
+
+
+########################################
 ## <summary>
 ##	Read files in /etc that are dynamically
 ##	created on boot, such as mtab.
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.29/policy/modules/kernel/mls.te
--- nsaserefpolicy/policy/modules/kernel/mls.te	2006-03-23 16:45:31.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/kernel/mls.te	2006-04-03 16:29:39.000000000 -0400
@@ -60,6 +60,7 @@
 
 ifdef(`enable_mls',`
 range_transition initrc_t auditd_exec_t s15:c0.c255;
+range_transition secadm_t auditctl_exec_t s15:c0.c255;
 range_transition kernel_t init_exec_t s0 - s15:c0.c255;
 range_transition kernel_t lvm_exec_t s0 - s15:c0.c255;
 ')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.29/policy/modules/services/apache.if
--- nsaserefpolicy/policy/modules/services/apache.if	2006-03-24 11:09:14.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/services/apache.if	2006-04-03 13:02:08.000000000 -0400
@@ -197,6 +197,26 @@
 		allow httpd_$1_script_t self:lnk_file read;
 	')
 
+	tunable_policy(`httpd_enable_cgi && httpd_can_network_connect_db',`
+		corenet_tcp_connect_postgresql_port(httpd_$1_script_t)
+		corenet_tcp_connect_mysqld_port(httpd_$1_script_t)
+		allow httpd_$1_script_t self:tcp_socket create_stream_socket_perms;
+		allow httpd_$1_script_t self:udp_socket create_socket_perms;
+
+		corenet_tcp_sendrecv_all_if(httpd_$1_script_t)
+		corenet_udp_sendrecv_all_if(httpd_$1_script_t)
+		corenet_raw_sendrecv_all_if(httpd_$1_script_t)
+		corenet_tcp_sendrecv_all_nodes(httpd_$1_script_t)
+		corenet_udp_sendrecv_all_nodes(httpd_$1_script_t)
+		corenet_raw_sendrecv_all_nodes(httpd_$1_script_t)
+		corenet_tcp_sendrecv_all_ports(httpd_$1_script_t)
+		corenet_udp_sendrecv_all_ports(httpd_$1_script_t)
+		corenet_non_ipsec_sendrecv(httpd_$1_script_t)
+		corenet_tcp_bind_all_nodes(httpd_$1_script_t)
+		corenet_udp_bind_all_nodes(httpd_$1_script_t)
+		sysnet_read_config(httpd_$1_script_t)
+	')
+
 	tunable_policy(`httpd_enable_cgi && httpd_can_network_connect',`
 		allow httpd_$1_script_t self:tcp_socket create_stream_socket_perms;
 		allow httpd_$1_script_t self:udp_socket create_socket_perms;
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.29/policy/modules/services/automount.te
--- nsaserefpolicy/policy/modules/services/automount.te	2006-03-24 11:09:13.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/services/automount.te	2006-03-31 11:21:52.000000000 -0500
@@ -123,6 +123,7 @@
 logging_search_logs(automount_t)
 
 miscfiles_read_localization(automount_t)
+miscfiles_read_certs(automount_t)
 
 # Run mount in the mount_t domain.
 mount_domtrans(automount_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.2.29/policy/modules/services/avahi.te
--- nsaserefpolicy/policy/modules/services/avahi.te	2006-03-24 11:09:13.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/services/avahi.te	2006-04-03 10:04:43.000000000 -0400
@@ -92,6 +92,10 @@
 	dbus_system_bus_client_template(avahi,avahi_t)
 	dbus_connect_system_bus(avahi_t)
 	dbus_send_system_bus(avahi_t)
+	optional_policy(`
+		mono_dbus_chat(avahi_t)
+	')
+
 ')
 
 optional_policy(`
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.29/policy/modules/services/bluetooth.te
--- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-03-30 10:59:02.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/services/bluetooth.te	2006-04-03 10:50:10.000000000 -0400
@@ -41,7 +41,7 @@
 # Bluetooth services local policy
 #
 
-allow bluetooth_t self:capability { net_admin net_raw sys_tty_config };
+allow bluetooth_t self:capability { net_admin net_raw sys_tty_config ipc_lock };
 dontaudit bluetooth_t self:capability sys_tty_config;
 allow bluetooth_t self:process { getsched signal_perms };
 allow bluetooth_t self:fifo_file rw_file_perms;
@@ -178,7 +178,7 @@
 
 allow bluetooth_helper_t bluetooth_helper_tmp_t:dir create_dir_perms;
 allow bluetooth_helper_t bluetooth_helper_tmp_t:file create_file_perms;
-files_tmp_filetrans(bluetooth_helper_t, bluetooth_helper_tmp_t, { file dir })
+files_tmp_filetrans(bluetooth_helper_t, bluetooth_helper_tmp_t, { file dir sock_file })
 
 kernel_read_system_state(bluetooth_helper_t)
 kernel_read_kernel_sysctls(bluetooth_helper_t)
@@ -217,6 +217,8 @@
 
 	userdom_read_all_users_home_content_files(bluetooth_helper_t)
 
+	term_dontaudit_use_generic_ptys(bluetooth_helper_t)
+
 	optional_policy(`
 		xserver_stream_connect_xdm(bluetooth_helper_t)
 	')
@@ -226,6 +228,7 @@
 	dbus_system_bus_client_template(bluetooth_helper,bluetooth_helper_t)
 	dbus_connect_system_bus(bluetooth_helper_t)
 	dbus_send_system_bus(bluetooth_helper_t)
+	bluetooth_dbus_chat(bluetooth_helper_t)
 ')
 
 optional_policy(`
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-2.2.29/policy/modules/services/dbus.te
--- nsaserefpolicy/policy/modules/services/dbus.te	2006-03-24 11:09:14.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/services/dbus.te	2006-03-31 11:21:52.000000000 -0500
@@ -102,6 +102,7 @@
 logging_send_syslog_msg(system_dbusd_t)
 
 miscfiles_read_localization(system_dbusd_t)
+miscfiles_read_certs(system_dbusd_t)
 
 seutil_read_config(system_dbusd_t)
 seutil_read_default_contexts(system_dbusd_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.29/policy/modules/services/hal.te
--- nsaserefpolicy/policy/modules/services/hal.te	2006-03-30 10:59:02.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/services/hal.te	2006-04-03 11:31:34.000000000 -0400
@@ -22,7 +22,7 @@
 #
 
 # execute openvt which needs setuid
-allow hald_t self:capability { 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 { 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;
@@ -52,6 +52,9 @@
 kernel_write_proc_files(hald_t)
 
 files_search_boot(hald_t)
+files_getattr_home_dir(hald_t)
+
+auth_read_pam_console_data(hald_t)
 
 corecmd_exec_bin(hald_t)
 corecmd_exec_sbin(hald_t)
@@ -77,6 +80,8 @@
 dev_getattr_all_chr_files(hald_t)
 dev_manage_generic_chr_files(hald_t)
 dev_rw_generic_usb_dev(hald_t)
+dev_setattr_generic_usb_dev(hald_t)
+dev_setattr_usbfs(hald_t)
 
 # hal is now execing pm-suspend
 dev_rw_sysfs(hald_t)
@@ -187,6 +192,11 @@
 	optional_policy(`
 		networkmanager_dbus_chat(hald_t)
 	')
+
+	optional_policy(`
+		mono_dbus_chat(hald_t)
+	')
+
 ')
 
 optional_policy(`
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.29/policy/modules/services/networkmanager.te
--- nsaserefpolicy/policy/modules/services/networkmanager.te	2006-03-24 11:09:15.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/services/networkmanager.te	2006-04-03 12:24:37.000000000 -0400
@@ -155,6 +155,7 @@
 
 optional_policy(`
 	nscd_socket_use(NetworkManager_t)
+	nscd_signal(NetworkManager_t)
 ')
 
 optional_policy(`
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.2.29/policy/modules/services/nscd.if
--- nsaserefpolicy/policy/modules/services/nscd.if	2006-03-23 16:46:11.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/services/nscd.if	2006-04-03 12:24:28.000000000 -0400
@@ -126,3 +126,23 @@
 
 	allow $1 nscd_t:nscd *;
 ')
+
+
+########################################
+## <summary>
+##	signal NSCD 
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`nscd_signal',`
+	gen_require(`
+		type nscd_t;
+	')
+
+	allow $1 nscd_t:process signal;
+')
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.29/policy/modules/services/samba.te
--- nsaserefpolicy/policy/modules/services/samba.te	2006-03-24 11:09:15.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/services/samba.te	2006-04-03 14:24:40.000000000 -0400
@@ -105,6 +105,8 @@
 allow samba_net_t samba_net_tmp_t:file create_file_perms;
 files_tmp_filetrans(samba_net_t, samba_net_tmp_t, { file dir })
 
+allow smbd_t samba_net_tmp_t:file getattr;
+
 allow samba_net_t samba_var_t:dir rw_dir_perms;
 allow samba_net_t samba_var_t:lnk_file create_lnk_perms;
 allow samba_net_t samba_var_t:file create_lnk_perms;
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-2.2.29/policy/modules/services/snmp.te
--- nsaserefpolicy/policy/modules/services/snmp.te	2006-03-24 11:09:13.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/services/snmp.te	2006-04-03 13:11:33.000000000 -0400
@@ -49,6 +49,7 @@
 allow snmpd_t snmpd_var_run_t:dir rw_dir_perms;
 files_pid_filetrans(snmpd_t,snmpd_var_run_t,file)
 
+kernel_read_device_sysctls(snmpd_t)
 kernel_read_kernel_sysctls(snmpd_t)
 kernel_read_net_sysctls(snmpd_t)
 kernel_read_proc_symlinks(snmpd_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.29/policy/modules/services/xserver.if
--- nsaserefpolicy/policy/modules/services/xserver.if	2006-03-30 10:16:43.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/services/xserver.if	2006-04-03 10:43:12.000000000 -0400
@@ -1015,3 +1015,24 @@
 
 	dontaudit $1 xdm_xserver_t:tcp_socket { read write };
 ')
+
+########################################
+## <summary>
+##	Allow read and write to
+##	a XDM X server socket.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to allow
+##	</summary>
+## </param>
+#
+interface(`xserver_rw_xdm_sockets',`
+	gen_require(`
+		type xdm_xserver_tmp_t;
+	')
+
+	allow $1 xdm_xserver_tmp_t:dir search;
+	allow $1 xdm_xserver_tmp_t:sock_file { read write };
+')
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.29/policy/modules/system/fstools.te
--- nsaserefpolicy/policy/modules/system/fstools.te	2006-03-30 10:59:03.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/system/fstools.te	2006-03-31 11:21:52.000000000 -0500
@@ -77,6 +77,7 @@
 dev_getattr_usbfs_dirs(fsadm_t)
 # Access to /dev/mapper/control
 dev_rw_lvm_control(fsadm_t)
+dev_dontaudit_getattr_all_device_nodes(fsadm_t)
 
 fs_search_auto_mountpoints(fsadm_t)
 fs_getattr_xattr_fs(fsadm_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.fc serefpolicy-2.2.29/policy/modules/system/getty.fc
--- nsaserefpolicy/policy/modules/system/getty.fc	2006-03-23 16:46:11.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/system/getty.fc	2006-04-03 12:51:51.000000000 -0400
@@ -6,3 +6,4 @@
 /var/log/mgetty\.log.*	--	gen_context(system_u:object_r:getty_log_t,s0)
 
 /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)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-2.2.29/policy/modules/system/getty.te
--- nsaserefpolicy/policy/modules/system/getty.te	2006-03-29 10:50:04.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/system/getty.te	2006-04-03 12:52:46.000000000 -0400
@@ -104,6 +104,8 @@
 
 miscfiles_read_localization(getty_t)
 
+mta_send_mail(getty_t)
+
 ifdef(`targeted_policy',`
 	term_dontaudit_use_unallocated_ttys(getty_t)
 	term_dontaudit_use_generic_ptys(getty_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.29/policy/modules/system/init.te
--- nsaserefpolicy/policy/modules/system/init.te	2006-03-30 10:13:28.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/system/init.te	2006-03-31 11:21:52.000000000 -0500
@@ -353,6 +353,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.29/policy/modules/system/libraries.fc
--- nsaserefpolicy/policy/modules/system/libraries.fc	2006-03-30 10:18:07.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/system/libraries.fc	2006-04-03 14:29:38.000000000 -0400
@@ -33,6 +33,7 @@
 #
 /opt(/.*)?/lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
 /opt(/.*)?/lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
+/opt/.*/jre.*/lib/i386/libdeploy.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 
 #
 # /sbin
@@ -55,6 +56,8 @@
 
 /usr(/.*)?/nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 
+/usr(/.*)?/lib(64)?(/.*)?/nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+
 /usr/lib(64)?/pgsql/test/regress/.*\.so 	--	gen_context(system_u:object_r:shlib_t,s0)
 
 /usr/lib/win32/.*			--	gen_context(system_u:object_r:shlib_t,s0)
@@ -62,18 +65,27 @@
 /usr/lib(64)?/im/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
 /usr/lib(64)?/iiim/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
 
+/usr/lib(64)?/libsipphoneapi\.so.*	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
+
 /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?/libGLU\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?(/.*)?/libnvidia.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?(/.*)?/nvidia_drv.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
 
+/usr/lib(64)?/vmware/lib(/.*)?/libgdk-x11-.*\.so.*  -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+
 /usr/(local/)?lib/wine/.*\.so  		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/(local/)?lib/libfame-.*\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/local/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
-
+/usr/lib(64)?/libjs\.so.*     		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/X11R6/lib/libGL\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/X11R6/lib/libXvMCNVIDIA\.so.* 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+/usr/lib(64)?/vmware(.*/)?/VmPerl\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 
+/usr/lib(64)?/nvidia-graphics(-[^/]*/)?libGL(core)?\.so(\.[^/]*)*             --      	gen_context(system_u:object_r:textrel_shlib_t,s0)
+/usr/lib(64)?/nvidia-graphics(-[^/]*/)?libnvidia.*\.so(\.[^/]*)*              --      	gen_context(system_u:object_r:textrel_shlib_t,s0)
+/usr/lib(64)?/nvidia-graphics(-[^/]*/)?libXvMCNVIDIA\.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)
 /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)
 
@@ -92,6 +104,7 @@
 /usr/lib(64)?/libstdc\+\+\.so\.2\.7\.2\.8 --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?/libg\+\+\.so\.2\.7\.2\.8	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?/libglide3\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+/usr/lib(64)?/libglide-v[0-9]*\.so.* 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?/libdv\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?/helix/plugins/oggfformat\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?/helix/plugins/theorarend\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -170,10 +183,9 @@
 # Java, Sun Microsystems (JPackage SRPM)
 /usr/.*/jre.*/lib/i386/libdeploy.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 
-/usr(/.*)?/Reader/intellinux/plug_ins/.*\.api -- gen_context(system_u:object_r:shlib_t,s0)
-/usr(/.*)?/Reader/intellinux/plug_ins/AcroForm\.api -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-/usr(/.*)?/Reader/intellinux/plug_ins/EScript\.api -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-/usr(/.*)?/Reader/intellinux/SPPlugins/ADMPlugin\.apl -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+/usr(/.*)?/intellinux/nppdf\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0)
+/usr(/.*)?/intellinux/lib/\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0)
+/usr(/.*)?/intellinux/plug_ins/.*\.api -- gen_context(system_u:object_r:texrel_shlib_t,s0)
 ') dnl end distro_redhat
 
 ifdef(`distro_suse',`
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.2.29/policy/modules/system/logging.if
--- nsaserefpolicy/policy/modules/system/logging.if	2006-03-23 16:46:11.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/system/logging.if	2006-03-31 11:21:52.000000000 -0500
@@ -368,3 +368,35 @@
 	allow $1 var_log_t:dir rw_dir_perms;
 	allow $1 var_log_t:file create_file_perms;
 ')
+
+########################################
+## <summary>
+##	Execute auditctl in the auditctl domain, and
+##	allow the specified role the auditctl domain.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	The type of the process performing this action.
+##	</summary>
+## </param>
+## <param name="role">
+##	<summary>
+##	The role to be allowed the auditctl domain.
+##	</summary>
+## </param>
+## <param name="terminal">
+##	<summary>
+##	The type of the terminal allow the auditctl domain to use.
+##	</summary>
+## </param>
+#
+interface(`logging_run_auditctl',`
+	gen_require(`
+		type auditctl_t;
+	')
+
+	logging_domtrans_auditctl($1)
+	role $2 types auditctl_t;
+	allow auditctl_t $3:chr_file rw_term_perms;
+')
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.29/policy/modules/system/mount.te
--- nsaserefpolicy/policy/modules/system/mount.te	2006-03-30 10:59:03.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/system/mount.te	2006-03-31 15:12:44.000000000 -0500
@@ -19,7 +19,8 @@
 # mount local policy
 #
 
-allow mount_t self:capability { ipc_lock sys_rawio sys_admin dac_override chown sys_tty_config };
+# setuid/setgid needed to mount cifs 
+allow mount_t self:capability { ipc_lock sys_rawio sys_admin dac_override chown sys_tty_config setuid setgid };
 
 allow mount_t mount_tmp_t:file create_file_perms;
 allow mount_t mount_tmp_t:dir create_dir_perms;
@@ -44,6 +45,7 @@
 storage_raw_write_removable_device(mount_t)
 
 fs_getattr_xattr_fs(mount_t)
+fs_getattr_cifs(mount_t)
 fs_mount_all_fs(mount_t)
 fs_unmount_all_fs(mount_t)
 fs_remount_all_fs(mount_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.29/policy/modules/system/unconfined.if
--- nsaserefpolicy/policy/modules/system/unconfined.if	2006-03-29 09:34:53.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/system/unconfined.if	2006-04-03 11:09:45.000000000 -0400
@@ -55,7 +55,7 @@
 	tunable_policy(`allow_execmem && allow_execstack',`
 		# Allow making the stack executable via mprotect.
 		allow $1 self:process execstack;
-		auditallow $1 self:process execstack;
+#		auditallow $1 self:process execstack;
 	', `
 		# These are fairly common but seem to be harmless
 		# caused by using shared libraries built with old tool chains
@@ -89,14 +89,6 @@
 		storage_unconfined($1)
 	')
 
-	ifdef(`TODO',`
-	if (allow_execmod) {
-		ifdef(`targeted_policy', `', `
-			# Allow text relocations on system shared libraries, e.g. libGL.
-			allow $1 home_type:file execmod;
-		')
-	}
-	') dnl end TODO
 ')
 
 ########################################
@@ -118,9 +110,10 @@
 		auditallow $1 self:process execheap;
 	')
 
-	tunable_policy(`allow_execmem',`
-		auditallow $1 self:process execmem;
-	')
+# Turn off this audit for FC5
+#	tunable_policy(`allow_execmem',`
+#		auditallow $1 self:process execmem;
+#	')
 ')
 
 ########################################
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.29/policy/modules/system/unconfined.te
--- nsaserefpolicy/policy/modules/system/unconfined.te	2006-03-29 09:34:53.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/system/unconfined.te	2006-04-03 12:27:56.000000000 -0400
@@ -106,10 +106,6 @@
 	')
 
 	optional_policy(`
-		netutils_domtrans_ping(unconfined_t)
-	')
-
-	optional_policy(`
 		portmap_domtrans_helper(unconfined_t)
 	')
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.29/policy/modules/system/userdomain.te
--- nsaserefpolicy/policy/modules/system/userdomain.te	2006-03-28 12:58:49.000000000 -0500
+++ serefpolicy-2.2.29/policy/modules/system/userdomain.te	2006-03-31 11:21:52.000000000 -0500
@@ -179,10 +179,10 @@
 		mls_file_downgrade(secadm_t)
 		init_exec(secadm_t)
 		logging_read_audit_log(secadm_t)
-		logging_domtrans_auditctl(secadm_t)
+		logging_run_auditctl(secadm_t,secadm_r,admin_terminal)
 		userdom_dontaudit_append_staff_home_content_files(secadm_t)
 	', `
-		logging_domtrans_auditctl(sysadm_t)
+		logging_run_auditctl(sysadm_t,sysadm_r,admin_terminal)
 		logging_read_audit_log(sysadm_t)
 	')
 



From fedora-cvs-commits at redhat.com  Mon Apr  3 21:14:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 17:14:24 -0400
Subject: rpms/cryptsetup-luks/devel cryptsetup-luks.spec,1.23,1.24
Message-ID: <200604032114.k33LEOAg011893@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/cryptsetup-luks/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11880

Modified Files:
	cryptsetup-luks.spec 
Log Message:
typo (#187212)


Index: cryptsetup-luks.spec
===================================================================
RCS file: /cvs/dist/rpms/cryptsetup-luks/devel/cryptsetup-luks.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- cryptsetup-luks.spec	27 Feb 2006 19:23:48 -0000	1.23
+++ cryptsetup-luks.spec	3 Apr 2006 21:14:21 -0000	1.24
@@ -27,7 +27,7 @@
 
 %description devel
 The cryptsetup-luks-devel package contain libraries and header files
-used for writing code that makes use of encrypted filesstems.
+used for writing code that makes use of encrypted filesystems.
 
 
 %prep



From fedora-cvs-commits at redhat.com  Mon Apr  3 21:15:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 17:15:29 -0400
Subject: rpms/selinux-policy/FC-5 modules-targeted.conf,1.18,1.19
Message-ID: <200604032115.k33LFT8Q011990@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	modules-targeted.conf 
Log Message:
* Mon Mar 30 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-2.fc5
- Rebuild for FC5



Index: modules-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/modules-targeted.conf,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- modules-targeted.conf	7 Mar 2006 22:22:14 -0000	1.18
+++ modules-targeted.conf	3 Apr 2006 21:15:26 -0000	1.19
@@ -989,11 +989,11 @@
 
 
 # Layer: system
-# Module: xend
+# Module: xen
 #
 # TCP/IP encryption
 # 
-xend = base
+xen = base
 
 
 # Layer: apps



From fedora-cvs-commits at redhat.com  Mon Apr  3 21:19:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 17:19:02 -0400
Subject: rpms/kde-i18n/FC-5 .cvsignore, 1.32, 1.33 kde-i18n.spec, 1.54,
	1.55 sources, 1.34, 1.35
Message-ID: <200604032119.k33LJ23a025798@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kde-i18n.spec sources 
Log Message:
pdate to 3.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/FC-5/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	8 Mar 2006 15:19:17 -0000	1.32
+++ .cvsignore	3 Apr 2006 21:18:59 -0000	1.33
@@ -220,3 +220,40 @@
 kde-i18n-uk-3.5.1.tar.bz2
 kde-i18n-zh_CN-3.5.1.tar.bz2
 kde-i18n-zh_TW-3.5.1.tar.bz2
+kde-i18n-ar-3.5.2.tar.bz2
+kde-i18n-bg-3.5.2.tar.bz2
+kde-i18n-bn-3.5.2.tar.bz2
+kde-i18n-ca-3.5.2.tar.bz2
+kde-i18n-cs-3.5.2.tar.bz2
+kde-i18n-da-3.5.2.tar.bz2
+kde-i18n-de-3.5.2.tar.bz2
+kde-i18n-el-3.5.2.tar.bz2
+kde-i18n-en_GB-3.5.2.tar.bz2
+kde-i18n-es-3.5.2.tar.bz2
+kde-i18n-et-3.5.2.tar.bz2
+kde-i18n-fi-3.5.2.tar.bz2
+kde-i18n-fr-3.5.2.tar.bz2
+kde-i18n-he-3.5.2.tar.bz2
+kde-i18n-hi-3.5.2.tar.bz2
+kde-i18n-hu-3.5.2.tar.bz2
+kde-i18n-is-3.5.2.tar.bz2
+kde-i18n-it-3.5.2.tar.bz2
+kde-i18n-ja-3.5.2.tar.bz2
+kde-i18n-nb-3.5.2.tar.bz2
+kde-i18n-nl-3.5.2.tar.bz2
+kde-i18n-nn-3.5.2.tar.bz2
+kde-i18n-pa-3.5.2.tar.bz2
+kde-i18n-pl-3.5.2.tar.bz2
+kde-i18n-pt-3.5.2.tar.bz2
+kde-i18n-pt_BR-3.5.2.tar.bz2
+kde-i18n-ro-3.5.2.tar.bz2
+kde-i18n-ru-3.5.2.tar.bz2
+kde-i18n-sk-3.5.2.tar.bz2
+kde-i18n-sl-3.5.2.tar.bz2
+kde-i18n-sr-3.5.2.tar.bz2
+kde-i18n-sv-3.5.2.tar.bz2
+kde-i18n-ta-3.5.2.tar.bz2
+kde-i18n-tr-3.5.2.tar.bz2
+kde-i18n-uk-3.5.2.tar.bz2
+kde-i18n-zh_CN-3.5.2.tar.bz2
+kde-i18n-zh_TW-3.5.2.tar.bz2


Index: kde-i18n.spec
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/FC-5/kde-i18n.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kde-i18n.spec	8 Mar 2006 15:19:17 -0000	1.54
+++ kde-i18n.spec	3 Apr 2006 21:18:59 -0000	1.55
@@ -3,8 +3,8 @@
 %define redhatify 1
 
 Name: kde-i18n
-Version: 3.5.1
-Release: 2
+Version: 3.5.2
+Release: 0.1.fc5
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Epoch: 1
@@ -1154,6 +1154,9 @@
 %lang(zh_TW) %doc %{_docdir}/HTML/zh_TW
 
 %changelog
+* Mon Apr 03 2006 Than Ngo <than at redhat.com> 1:3.5.2-0.1.fc5
+- update to 3.5.2
+
 * Wed Mar 08 2006 Than Ngo <than at redhat.com> 1:3.5.1-2 
 - add missing zh_TW
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/FC-5/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	8 Mar 2006 15:19:17 -0000	1.34
+++ sources	3 Apr 2006 21:18:59 -0000	1.35
@@ -1,37 +1,37 @@
-7914d80d0ab41709b61674a679a591aa  kde-i18n-ar-3.5.1.tar.bz2
-ef385a222ae6ed99f2715add155ffd14  kde-i18n-bg-3.5.1.tar.bz2
-c260d39e9c81045979614ab1efa71647  kde-i18n-bn-3.5.1.tar.bz2
-dac29cc60e4d39faec8f232097c7c3f6  kde-i18n-ca-3.5.1.tar.bz2
-1bd6e2b120b674e492d60990223b084f  kde-i18n-cs-3.5.1.tar.bz2
-424fb6ac034a1df1298689033093b3f2  kde-i18n-da-3.5.1.tar.bz2
-32a095984a17bcfa6ede3dd2c7013863  kde-i18n-de-3.5.1.tar.bz2
-684fa286f3541eab5b55ee141180e2af  kde-i18n-el-3.5.1.tar.bz2
-0f4f0bf3a7d0501bd7211687e11fdcaa  kde-i18n-en_GB-3.5.1.tar.bz2
-ad5ced34f31804701a68d2d64bccefd5  kde-i18n-es-3.5.1.tar.bz2
-8b23d4585f1621dd8184709bc2f3d2ab  kde-i18n-et-3.5.1.tar.bz2
-a94da3fb9427b410cd6a61731317d458  kde-i18n-fi-3.5.1.tar.bz2
-8ce740f45eebca8f87bdd6faf2d61d44  kde-i18n-fr-3.5.1.tar.bz2
-8578ada5131d1a4da7f714a52c6972c0  kde-i18n-he-3.5.1.tar.bz2
-2e7f52f02ea4a97986e0a78e26b7eafc  kde-i18n-hi-3.5.1.tar.bz2
-3911e1c525b6411c30b3848ec6d95503  kde-i18n-hu-3.5.1.tar.bz2
-381d659a746dd70eea9ea23c5fb80464  kde-i18n-is-3.5.1.tar.bz2
-1c637c5cebac6d61c13be2c56215e321  kde-i18n-it-3.5.1.tar.bz2
-30e060d0bd29cfae1d9cd85d4ea91d7f  kde-i18n-ja-3.5.1.tar.bz2
-8fef7b3f29ba8eb68ebd23f228af26ce  kde-i18n-nb-3.5.1.tar.bz2
-2cc0069ac1c8b5fde1dbc87df90329a7  kde-i18n-nl-3.5.1.tar.bz2
-303be4ff9cfb38617e4d30534c3b570b  kde-i18n-nn-3.5.1.tar.bz2
-ec6c5fd0ef940497993b5b6913445412  kde-i18n-pa-3.5.1.tar.bz2
-e058a3964abce47d8cd98c8edb49d6f2  kde-i18n-pl-3.5.1.tar.bz2
-e12cbd70fd6f95309f03ace2a7d3eb41  kde-i18n-pt-3.5.1.tar.bz2
-24fa0b4c146fce9cc7a0046865a9fd94  kde-i18n-pt_BR-3.5.1.tar.bz2
-b903996011ae71248f14ed20c55dce80  kde-i18n-ro-3.5.1.tar.bz2
-a134f766c77f2bbe72761c8d06aa19f1  kde-i18n-ru-3.5.1.tar.bz2
-567a3062c6b7b7cf69fac54a8c255c91  kde-i18n-sk-3.5.1.tar.bz2
-4df423236ce7410bc9108d9208beafaa  kde-i18n-sl-3.5.1.tar.bz2
-8ef952cac32b9b1f97575e3ace02bfc0  kde-i18n-sr-3.5.1.tar.bz2
-d3d71739a1ffcdaa20a35371cbac48ee  kde-i18n-sv-3.5.1.tar.bz2
-05d4060272ef4768292cc556505296cf  kde-i18n-ta-3.5.1.tar.bz2
-d60ba5802f565cd7568bd4359fe01f06  kde-i18n-tr-3.5.1.tar.bz2
-8c4a0a6a1779f09d84b6ddfe55df7ba9  kde-i18n-uk-3.5.1.tar.bz2
-809fc565769b2dffed4098d4a3230296  kde-i18n-zh_CN-3.5.1.tar.bz2
-9bf0f18a06e4a915a6868a4eba15d0f2  kde-i18n-zh_TW-3.5.1.tar.bz2
+e5751af9f27c7fcb8ae691565c0150e0  kde-i18n-ar-3.5.2.tar.bz2
+d2ead3b2e13e851026fa9e685bec3dd7  kde-i18n-bg-3.5.2.tar.bz2
+7579ee4cd94f47b15773e85d8ba9437a  kde-i18n-bn-3.5.2.tar.bz2
+01793ef292bfa573ac6dc469af0105c3  kde-i18n-ca-3.5.2.tar.bz2
+8301411b09198bcdc5aec9096959b46f  kde-i18n-cs-3.5.2.tar.bz2
+de4a0854323591412dcb0fd973a828df  kde-i18n-da-3.5.2.tar.bz2
+af0d1dddc3fdbcc3f57f592c118336b7  kde-i18n-de-3.5.2.tar.bz2
+e08304492dca910772ef644522863d0b  kde-i18n-el-3.5.2.tar.bz2
+f9187d95c02ef569841b619d7dcd92b4  kde-i18n-en_GB-3.5.2.tar.bz2
+957dc11b57ade36543f09170dd319daa  kde-i18n-es-3.5.2.tar.bz2
+adb0d578fcc6f0489a70463a4ab27ba6  kde-i18n-et-3.5.2.tar.bz2
+56ccbbbe792ace2db28a36561ed73baa  kde-i18n-fi-3.5.2.tar.bz2
+d5ee851fdca9491dcb007d120e41ca66  kde-i18n-fr-3.5.2.tar.bz2
+c4d4f74171a00d99c942a454b4bf2031  kde-i18n-he-3.5.2.tar.bz2
+7bbf72d240bf936dffcb8a10b39bc0b8  kde-i18n-hi-3.5.2.tar.bz2
+5f56f6776207de40b6f08f15cf738f5d  kde-i18n-hu-3.5.2.tar.bz2
+2afa1257a615c57689d018cf4f0a5ce5  kde-i18n-is-3.5.2.tar.bz2
+f9593f15023920f274d633d93a1f71ac  kde-i18n-it-3.5.2.tar.bz2
+b267752f706d73792455671100b45e78  kde-i18n-ja-3.5.2.tar.bz2
+3173be9cf4021e7ceab17aa5208a9ff2  kde-i18n-nb-3.5.2.tar.bz2
+e626d95e7399fce30af12103d8e5abbc  kde-i18n-nl-3.5.2.tar.bz2
+7688c9e32d1bd0fe86d8929491436abf  kde-i18n-nn-3.5.2.tar.bz2
+15ae531f16c41983cc9513a3b39af360  kde-i18n-pa-3.5.2.tar.bz2
+ed2038f4a158435298e5d592c1897317  kde-i18n-pl-3.5.2.tar.bz2
+0b34803baab37652581a7930fa90f8a1  kde-i18n-pt-3.5.2.tar.bz2
+e2d4eca4287ca58d89a6b9e0afb1ed83  kde-i18n-pt_BR-3.5.2.tar.bz2
+ce015703992dfdfaa2b0a1a1b68613bf  kde-i18n-ro-3.5.2.tar.bz2
+6ada1113e2f16a04f67efff4a277afe2  kde-i18n-ru-3.5.2.tar.bz2
+ce005e23d4769643e80799e311d420fe  kde-i18n-sk-3.5.2.tar.bz2
+0abde80912580fc6981f12d33533c7a7  kde-i18n-sl-3.5.2.tar.bz2
+5646220dc1449378914bbace9cb0ed4f  kde-i18n-sr-3.5.2.tar.bz2
+15baccdec08346e5379bf88487a81e4d  kde-i18n-sv-3.5.2.tar.bz2
+2b9fcc05c46676421ac9c84833f238ec  kde-i18n-ta-3.5.2.tar.bz2
+f6f84000f374e0cacae6f74cb14be234  kde-i18n-tr-3.5.2.tar.bz2
+da83d2460f25478a61cf8eb09dd2540e  kde-i18n-uk-3.5.2.tar.bz2
+d451f1d96fd2bcdf7c432b6c9b0e5963  kde-i18n-zh_CN-3.5.2.tar.bz2
+2371a7ff043e9944e091ac30a48bcc07  kde-i18n-zh_TW-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr  3 21:24:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 17:24:47 -0400
Subject: rpms/kde-i18n/devel .cvsignore, 1.32, 1.33 kde-i18n.spec, 1.54,
	1.55 sources, 1.34, 1.35
Message-ID: <200604032124.k33LOltQ026041@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kde-i18n.spec sources 
Log Message:
update to 3.5.2




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	8 Mar 2006 15:19:17 -0000	1.32
+++ .cvsignore	3 Apr 2006 21:24:45 -0000	1.33
@@ -220,3 +220,40 @@
 kde-i18n-uk-3.5.1.tar.bz2
 kde-i18n-zh_CN-3.5.1.tar.bz2
 kde-i18n-zh_TW-3.5.1.tar.bz2
+kde-i18n-ar-3.5.2.tar.bz2
+kde-i18n-bg-3.5.2.tar.bz2
+kde-i18n-bn-3.5.2.tar.bz2
+kde-i18n-ca-3.5.2.tar.bz2
+kde-i18n-cs-3.5.2.tar.bz2
+kde-i18n-da-3.5.2.tar.bz2
+kde-i18n-de-3.5.2.tar.bz2
+kde-i18n-el-3.5.2.tar.bz2
+kde-i18n-en_GB-3.5.2.tar.bz2
+kde-i18n-es-3.5.2.tar.bz2
+kde-i18n-et-3.5.2.tar.bz2
+kde-i18n-fi-3.5.2.tar.bz2
+kde-i18n-fr-3.5.2.tar.bz2
+kde-i18n-he-3.5.2.tar.bz2
+kde-i18n-hi-3.5.2.tar.bz2
+kde-i18n-hu-3.5.2.tar.bz2
+kde-i18n-is-3.5.2.tar.bz2
+kde-i18n-it-3.5.2.tar.bz2
+kde-i18n-ja-3.5.2.tar.bz2
+kde-i18n-nb-3.5.2.tar.bz2
+kde-i18n-nl-3.5.2.tar.bz2
+kde-i18n-nn-3.5.2.tar.bz2
+kde-i18n-pa-3.5.2.tar.bz2
+kde-i18n-pl-3.5.2.tar.bz2
+kde-i18n-pt-3.5.2.tar.bz2
+kde-i18n-pt_BR-3.5.2.tar.bz2
+kde-i18n-ro-3.5.2.tar.bz2
+kde-i18n-ru-3.5.2.tar.bz2
+kde-i18n-sk-3.5.2.tar.bz2
+kde-i18n-sl-3.5.2.tar.bz2
+kde-i18n-sr-3.5.2.tar.bz2
+kde-i18n-sv-3.5.2.tar.bz2
+kde-i18n-ta-3.5.2.tar.bz2
+kde-i18n-tr-3.5.2.tar.bz2
+kde-i18n-uk-3.5.2.tar.bz2
+kde-i18n-zh_CN-3.5.2.tar.bz2
+kde-i18n-zh_TW-3.5.2.tar.bz2


Index: kde-i18n.spec
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/devel/kde-i18n.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kde-i18n.spec	8 Mar 2006 15:19:17 -0000	1.54
+++ kde-i18n.spec	3 Apr 2006 21:24:45 -0000	1.55
@@ -3,8 +3,8 @@
 %define redhatify 1
 
 Name: kde-i18n
-Version: 3.5.1
-Release: 2
+Version: 3.5.2
+Release: 1
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Epoch: 1
@@ -1154,6 +1154,9 @@
 %lang(zh_TW) %doc %{_docdir}/HTML/zh_TW
 
 %changelog
+* Mon Apr 03 2006 Than Ngo <than at redhat.com> 1:3.5.2-1
+- update to 3.5.2
+
 * Wed Mar 08 2006 Than Ngo <than at redhat.com> 1:3.5.1-2 
 - add missing zh_TW
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	8 Mar 2006 15:19:17 -0000	1.34
+++ sources	3 Apr 2006 21:24:45 -0000	1.35
@@ -1,37 +1,37 @@
-7914d80d0ab41709b61674a679a591aa  kde-i18n-ar-3.5.1.tar.bz2
-ef385a222ae6ed99f2715add155ffd14  kde-i18n-bg-3.5.1.tar.bz2
-c260d39e9c81045979614ab1efa71647  kde-i18n-bn-3.5.1.tar.bz2
-dac29cc60e4d39faec8f232097c7c3f6  kde-i18n-ca-3.5.1.tar.bz2
-1bd6e2b120b674e492d60990223b084f  kde-i18n-cs-3.5.1.tar.bz2
-424fb6ac034a1df1298689033093b3f2  kde-i18n-da-3.5.1.tar.bz2
-32a095984a17bcfa6ede3dd2c7013863  kde-i18n-de-3.5.1.tar.bz2
-684fa286f3541eab5b55ee141180e2af  kde-i18n-el-3.5.1.tar.bz2
-0f4f0bf3a7d0501bd7211687e11fdcaa  kde-i18n-en_GB-3.5.1.tar.bz2
-ad5ced34f31804701a68d2d64bccefd5  kde-i18n-es-3.5.1.tar.bz2
-8b23d4585f1621dd8184709bc2f3d2ab  kde-i18n-et-3.5.1.tar.bz2
-a94da3fb9427b410cd6a61731317d458  kde-i18n-fi-3.5.1.tar.bz2
-8ce740f45eebca8f87bdd6faf2d61d44  kde-i18n-fr-3.5.1.tar.bz2
-8578ada5131d1a4da7f714a52c6972c0  kde-i18n-he-3.5.1.tar.bz2
-2e7f52f02ea4a97986e0a78e26b7eafc  kde-i18n-hi-3.5.1.tar.bz2
-3911e1c525b6411c30b3848ec6d95503  kde-i18n-hu-3.5.1.tar.bz2
-381d659a746dd70eea9ea23c5fb80464  kde-i18n-is-3.5.1.tar.bz2
-1c637c5cebac6d61c13be2c56215e321  kde-i18n-it-3.5.1.tar.bz2
-30e060d0bd29cfae1d9cd85d4ea91d7f  kde-i18n-ja-3.5.1.tar.bz2
-8fef7b3f29ba8eb68ebd23f228af26ce  kde-i18n-nb-3.5.1.tar.bz2
-2cc0069ac1c8b5fde1dbc87df90329a7  kde-i18n-nl-3.5.1.tar.bz2
-303be4ff9cfb38617e4d30534c3b570b  kde-i18n-nn-3.5.1.tar.bz2
-ec6c5fd0ef940497993b5b6913445412  kde-i18n-pa-3.5.1.tar.bz2
-e058a3964abce47d8cd98c8edb49d6f2  kde-i18n-pl-3.5.1.tar.bz2
-e12cbd70fd6f95309f03ace2a7d3eb41  kde-i18n-pt-3.5.1.tar.bz2
-24fa0b4c146fce9cc7a0046865a9fd94  kde-i18n-pt_BR-3.5.1.tar.bz2
-b903996011ae71248f14ed20c55dce80  kde-i18n-ro-3.5.1.tar.bz2
-a134f766c77f2bbe72761c8d06aa19f1  kde-i18n-ru-3.5.1.tar.bz2
-567a3062c6b7b7cf69fac54a8c255c91  kde-i18n-sk-3.5.1.tar.bz2
-4df423236ce7410bc9108d9208beafaa  kde-i18n-sl-3.5.1.tar.bz2
-8ef952cac32b9b1f97575e3ace02bfc0  kde-i18n-sr-3.5.1.tar.bz2
-d3d71739a1ffcdaa20a35371cbac48ee  kde-i18n-sv-3.5.1.tar.bz2
-05d4060272ef4768292cc556505296cf  kde-i18n-ta-3.5.1.tar.bz2
-d60ba5802f565cd7568bd4359fe01f06  kde-i18n-tr-3.5.1.tar.bz2
-8c4a0a6a1779f09d84b6ddfe55df7ba9  kde-i18n-uk-3.5.1.tar.bz2
-809fc565769b2dffed4098d4a3230296  kde-i18n-zh_CN-3.5.1.tar.bz2
-9bf0f18a06e4a915a6868a4eba15d0f2  kde-i18n-zh_TW-3.5.1.tar.bz2
+e5751af9f27c7fcb8ae691565c0150e0  kde-i18n-ar-3.5.2.tar.bz2
+d2ead3b2e13e851026fa9e685bec3dd7  kde-i18n-bg-3.5.2.tar.bz2
+7579ee4cd94f47b15773e85d8ba9437a  kde-i18n-bn-3.5.2.tar.bz2
+01793ef292bfa573ac6dc469af0105c3  kde-i18n-ca-3.5.2.tar.bz2
+8301411b09198bcdc5aec9096959b46f  kde-i18n-cs-3.5.2.tar.bz2
+de4a0854323591412dcb0fd973a828df  kde-i18n-da-3.5.2.tar.bz2
+af0d1dddc3fdbcc3f57f592c118336b7  kde-i18n-de-3.5.2.tar.bz2
+e08304492dca910772ef644522863d0b  kde-i18n-el-3.5.2.tar.bz2
+f9187d95c02ef569841b619d7dcd92b4  kde-i18n-en_GB-3.5.2.tar.bz2
+957dc11b57ade36543f09170dd319daa  kde-i18n-es-3.5.2.tar.bz2
+adb0d578fcc6f0489a70463a4ab27ba6  kde-i18n-et-3.5.2.tar.bz2
+56ccbbbe792ace2db28a36561ed73baa  kde-i18n-fi-3.5.2.tar.bz2
+d5ee851fdca9491dcb007d120e41ca66  kde-i18n-fr-3.5.2.tar.bz2
+c4d4f74171a00d99c942a454b4bf2031  kde-i18n-he-3.5.2.tar.bz2
+7bbf72d240bf936dffcb8a10b39bc0b8  kde-i18n-hi-3.5.2.tar.bz2
+5f56f6776207de40b6f08f15cf738f5d  kde-i18n-hu-3.5.2.tar.bz2
+2afa1257a615c57689d018cf4f0a5ce5  kde-i18n-is-3.5.2.tar.bz2
+f9593f15023920f274d633d93a1f71ac  kde-i18n-it-3.5.2.tar.bz2
+b267752f706d73792455671100b45e78  kde-i18n-ja-3.5.2.tar.bz2
+3173be9cf4021e7ceab17aa5208a9ff2  kde-i18n-nb-3.5.2.tar.bz2
+e626d95e7399fce30af12103d8e5abbc  kde-i18n-nl-3.5.2.tar.bz2
+7688c9e32d1bd0fe86d8929491436abf  kde-i18n-nn-3.5.2.tar.bz2
+15ae531f16c41983cc9513a3b39af360  kde-i18n-pa-3.5.2.tar.bz2
+ed2038f4a158435298e5d592c1897317  kde-i18n-pl-3.5.2.tar.bz2
+0b34803baab37652581a7930fa90f8a1  kde-i18n-pt-3.5.2.tar.bz2
+e2d4eca4287ca58d89a6b9e0afb1ed83  kde-i18n-pt_BR-3.5.2.tar.bz2
+ce015703992dfdfaa2b0a1a1b68613bf  kde-i18n-ro-3.5.2.tar.bz2
+6ada1113e2f16a04f67efff4a277afe2  kde-i18n-ru-3.5.2.tar.bz2
+ce005e23d4769643e80799e311d420fe  kde-i18n-sk-3.5.2.tar.bz2
+0abde80912580fc6981f12d33533c7a7  kde-i18n-sl-3.5.2.tar.bz2
+5646220dc1449378914bbace9cb0ed4f  kde-i18n-sr-3.5.2.tar.bz2
+15baccdec08346e5379bf88487a81e4d  kde-i18n-sv-3.5.2.tar.bz2
+2b9fcc05c46676421ac9c84833f238ec  kde-i18n-ta-3.5.2.tar.bz2
+f6f84000f374e0cacae6f74cb14be234  kde-i18n-tr-3.5.2.tar.bz2
+da83d2460f25478a61cf8eb09dd2540e  kde-i18n-uk-3.5.2.tar.bz2
+d451f1d96fd2bcdf7c432b6c9b0e5963  kde-i18n-zh_CN-3.5.2.tar.bz2
+2371a7ff043e9944e091ac30a48bcc07  kde-i18n-zh_TW-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr  3 21:26:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 17:26:47 -0400
Subject: rpms/libsemanage/devel libsemanage.spec,1.81,1.82
Message-ID: <200604032126.k33LQlOd026103@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsemanage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26090

Modified Files:
	libsemanage.spec 
Log Message:
* Wed Mar 29 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.2-2
- Fix leaky descriptor



Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- libsemanage.spec	3 Apr 2006 20:49:58 -0000	1.81
+++ libsemanage.spec	3 Apr 2006 21:26:44 -0000	1.82
@@ -44,6 +44,8 @@
 
 %build
 make clean
+# Don't want to rebuild
+touch src/semanage_wrap.c
 make CFLAGS="%{optflags}" all pywrap
 
 %install



From fedora-cvs-commits at redhat.com  Mon Apr  3 21:45:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 17:45:38 -0400
Subject: rpms/kdebase/devel kdebase-3.5.2-dbus.patch, 1.1, 1.2 kdebase.spec,
	1.161, 1.162
Message-ID: <200604032145.k33LjcVu026700@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdebase-3.5.2-dbus.patch kdebase.spec 
Log Message:
- update dbus patch


kdebase-3.5.2-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 
 8 files changed, 1285 insertions(+), 68 deletions(-)

Index: kdebase-3.5.2-dbus.patch
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase-3.5.2-dbus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-3.5.2-dbus.patch	26 Mar 2006 11:31:45 -0000	1.1
+++ kdebase-3.5.2-dbus.patch	3 Apr 2006 21:45:35 -0000	1.2
@@ -1380,3 +1380,39 @@
    AC_DEFINE_UNQUOTED([COMPILE_HALBACKEND],1, [media HAL backend compilation])
    HALBACKEND=yes
    AC_SUBST(HALBACKEND)
+--- kdebase-3.5.2/kioslave/media/mediamanager/Makefile.am.tn	2006-04-03 23:29:27.000000000 +0200
++++ kdebase-3.5.2/kioslave/media/mediamanager/Makefile.am	2006-04-03 23:29:31.000000000 +0200
+@@ -1,17 +1,22 @@
+ kde_module_LTLIBRARIES = kded_mediamanager.la
+ 
+ if include_media_halbackend
+-HALBACKEND_INCS = $(HAL_INCS) $(DBUS_INCS) $(DBUSQT_INCS)
++HALBACKEND_INCS = $(HAL_INCS) $(DBUS_INCS)
+ endif
+ 
+ METASOURCES = AUTO
+ INCLUDES = -I$(srcdir)/../libmediacommon -I../libmediacommon $(HALBACKEND_INCS) $(all_includes)
+ 
++DBUSQT3BINDING_LIB = libdbusqt3.la
++libdbusqt3_la_SOURCES = connection.cpp integrator.cpp message.cpp
++libdbusqt3_la_LDFLAGS = -avoid-version $(all_libraries) -no-undefined
++libdbusqt3_la_LIBADD = $(HAL_LIBS) $(DBUS_LIBS)
++
+ if include_media_halbackend
+ HALBACKEND_LIB = libhalbackend.la
+ libhalbackend_la_SOURCES = halbackend.cpp
+ libhalbackend_la_LDFLAGS = -avoid-version $(all_libraries) -no-undefined
+-libhalbackend_la_LIBADD = $(HAL_LIBS) $(DBUS_LIBS) $(DBUSQT_LIBS)
++libhalbackend_la_LIBADD = $(HAL_LIBS) $(DBUS_LIBS) $(DBUSQT3BINDING_LIB)
+ endif
+ 
+ if include_media_linuxcdpolling
+@@ -20,7 +25,7 @@
+ liblinuxcdpolling_la_LDFLAGS = -avoid-version $(all_libraries) -no-undefined
+ endif
+ 
+-noinst_LTLIBRARIES = $(LINUXCDPOLLING_LIB) $(HALBACKEND_LIB)
++noinst_LTLIBRARIES = $(LINUXCDPOLLING_LIB) $(HALBACKEND_LIB) $(DBUSQT3BINDING_LIB)
+ 
+ kded_mediamanager_la_SOURCES = mediamanager.cpp mediamanager.skel medialist.cpp backendbase.cpp fstabbackend.cpp removablebackend.cpp mediadirnotify.cpp mediadirnotify.skel
+ kded_mediamanager_la_LDFLAGS = $(all_libraries) -module -avoid-version


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- kdebase.spec	28 Mar 2006 13:52:39 -0000	1.161
+++ kdebase.spec	3 Apr 2006 21:45:35 -0000	1.162
@@ -20,7 +20,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.2
-Release: 1
+Release: 2
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -422,6 +422,9 @@
 %{_includedir}/kde/ksplash/*
 
 %changelog
+* Mon Apr 03 2006 Than Ngo <than at redhat.com> 6:3.5.2-2
+- update dbus patch
+
 * Sun Mar 26 2006 Than Ngo <than at redhat.com> 6:3.5.2-1
 - update to 3.5.2
 - update dbus patch



From fedora-cvs-commits at redhat.com  Mon Apr  3 21:47:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 17:47:12 -0400
Subject: rpms/libsepol/FC-5 libsepol.spec,1.115,1.116
Message-ID: <200604032147.k33LlCbZ007020@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	libsepol.spec 
Log Message:
* Mon Apr 3 2006 Dan Walsh <dwalsh at redhat.com> 1.12.4-1.fc5
- Bump for FC5



Index: libsepol.spec
===================================================================
RCS file: /cvs/dist/rpms/libsepol/FC-5/libsepol.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- libsepol.spec	20 Mar 2006 20:28:26 -0000	1.115
+++ libsepol.spec	3 Apr 2006 21:47:08 -0000	1.116
@@ -1,6 +1,6 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
-Version: 1.12.1
+Version: 1.12.4
 Release: 1.fc5
 License: GPL
 Group: System Environment/Libraries
@@ -80,10 +80,23 @@
 %{_includedir}/sepol/policydb/*.h
 
 %changelog
-* Fri Mar 10 2006 Dan Walsh <dwalsh at redhat.com> 1.12.1-1.fc5
-- Rebuild for FC5
+* Mon Apr 3 2006 Dan Walsh <dwalsh at redhat.com> 1.12.4-1.fc5
+- Bump for FC5
 
-* Fri Mar 10 2006 Dan Walsh <dwalsh at redhat.com> 1.12.1-1
+* Wed Mar 29 2006 Dan Walsh <dwalsh at redhat.com> 1.12.4-1
+- Upgrade to latest from NSA
+	* Generalize test for bitmap overflow in ebitmap_set_bit.
+
+* Mon Mar 27 2006 Dan Walsh <dwalsh at redhat.com> 1.12.3-1
+- Upgrade to latest from NSA
+	* Fixed attr_convert_callback and expand_convert_type_set
+	  typemap bug.
+
+* Fri Mar 24 2006 Dan Walsh <dwalsh at redhat.com> 1.12.2-1
+- Upgrade to latest from NSA
+	* Fixed avrule_block_write num_decls endian bug.
+
+* Fri Mar 17 2006 Dan Walsh <dwalsh at redhat.com> 1.12.1-1
 - Upgrade to latest from NSA
 	* Fixed sepol_module_package_write buffer overflow bug.
 



From fedora-cvs-commits at redhat.com  Mon Apr  3 21:48:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 17:48:19 -0400
Subject: rpms/libsepol/FC-5 .cvsignore,1.88,1.89 sources,1.89,1.90
Message-ID: <200604032148.k33LmJmr008265@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Apr 3 2006 Dan Walsh <dwalsh at redhat.com> 1.12.4-1.fc5
- Bump for FC5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsepol/FC-5/.cvsignore,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- .cvsignore	20 Mar 2006 20:30:50 -0000	1.88
+++ .cvsignore	3 Apr 2006 21:48:17 -0000	1.89
@@ -86,3 +86,4 @@
 libsepol-1.11.17.tgz
 libsepol-1.11.18.tgz
 libsepol-1.12.1.tgz
+libsepol-1.12.4.tgz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsepol/FC-5/sources,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- sources	20 Mar 2006 20:30:50 -0000	1.89
+++ sources	3 Apr 2006 21:48:17 -0000	1.90
@@ -1 +1 @@
-2d99e03cd065f1e846da2e682d4d5366  libsepol-1.12.1.tgz
+ddadf7b00a8f64143de3085ea17336cc  libsepol-1.12.4.tgz



From fedora-cvs-commits at redhat.com  Mon Apr  3 21:51:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 17:51:25 -0400
Subject: rpms/libsemanage/devel libsemanage.spec,1.82,1.83
Message-ID: <200604032151.k33LpPDx008409@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsemanage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8396

Modified Files:
	libsemanage.spec 
Log Message:
* Wed Mar 29 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.2-2
- Fix leaky descriptor



Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- libsemanage.spec	3 Apr 2006 21:26:44 -0000	1.82
+++ libsemanage.spec	3 Apr 2006 21:51:23 -0000	1.83
@@ -45,8 +45,9 @@
 %build
 make clean
 # Don't want to rebuild
+make CFLAGS="%{optflags}" all
 touch src/semanage_wrap.c
-make CFLAGS="%{optflags}" all pywrap
+make CFLAGS="%{optflags}" pywrap
 
 %install
 rm -rf ${RPM_BUILD_ROOT}



From fedora-cvs-commits at redhat.com  Mon Apr  3 22:15:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 18:15:40 -0400
Subject: rpms/libsemanage/devel libsemanage.spec,1.83,1.84
Message-ID: <200604032215.k33MFerU008709@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsemanage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8696

Modified Files:
	libsemanage.spec 
Log Message:
* Wed Mar 29 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.2-2
- Fix leaky descriptor



Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- libsemanage.spec	3 Apr 2006 21:51:23 -0000	1.83
+++ libsemanage.spec	3 Apr 2006 22:15:37 -0000	1.84
@@ -44,10 +44,7 @@
 
 %build
 make clean
-# Don't want to rebuild
-make CFLAGS="%{optflags}" all
-touch src/semanage_wrap.c
-make CFLAGS="%{optflags}" pywrap
+make CFLAGS="%{optflags}" LIBDIR="${RPM_BUILD_ROOT}%{_libdir}" SHLIBDIR="${RPM_BUILD_ROOT}/%{_lib}" all pywrap
 
 %install
 rm -rf ${RPM_BUILD_ROOT}



From fedora-cvs-commits at redhat.com  Mon Apr  3 22:19:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 18:19:57 -0400
Subject: rpms/libsemanage/devel libsemanage.spec,1.84,1.85
Message-ID: <200604032219.k33MJvNB022462@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsemanage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22448

Modified Files:
	libsemanage.spec 
Log Message:
* Wed Mar 29 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.2-2
- Fix leaky descriptor



Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- libsemanage.spec	3 Apr 2006 22:15:37 -0000	1.84
+++ libsemanage.spec	3 Apr 2006 22:19:54 -0000	1.85
@@ -44,7 +44,7 @@
 
 %build
 make clean
-make CFLAGS="%{optflags}" LIBDIR="${RPM_BUILD_ROOT}%{_libdir}" SHLIBDIR="${RPM_BUILD_ROOT}/%{_lib}" all pywrap
+make CFLAGS="%{optflags}" LIBDIR="%{_libdir}" SHLIBDIR="%{_lib}" all pywrap
 
 %install
 rm -rf ${RPM_BUILD_ROOT}



From fedora-cvs-commits at redhat.com  Mon Apr  3 23:02:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 19:02:15 -0400
Subject: rpms/mesa/devel mesa-6.5-build-config.patch, NONE, 1.1 mesa.spec,
	1.51, 1.52 mesa-6.3.2-build-configuration-v4.patch, 1.1, NONE
Message-ID: <200604032302.k33N2FgF004165@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	mesa.spec 
Added Files:
	mesa-6.5-build-config.patch 
Removed Files:
	mesa-6.3.2-build-configuration-v4.patch 
Log Message:
+- Go back to patching config/linux-dri, add mesa-6.5-build-config.patch,
+  drop mesa-6.3.2-build-configuration-v4.patch.
+- Disable sis dri driver for now, only builds on x86 and x86-64.


mesa-6.5-build-config.patch:
 linux     |    3 +++
 linux-dri |   10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

--- NEW FILE mesa-6.5-build-config.patch ---
--- ./configs/linux-dri.build-config	2006-03-31 12:29:46.000000000 -0500
+++ ./configs/linux-dri	2006-04-03 18:13:52.000000000 -0400
@@ -10,21 +10,21 @@
 CXX = g++
 
 #MKDEP = /usr/X11R6/bin/makedepend
-#MKDEP = gcc -M
+#MKDEP = gcc -M 
 #MKDEP_OPTIONS = -MF depend
 
 OPT_FLAGS  = -g
 PIC_FLAGS  = -fPIC
 
 # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
-ARCH_FLAGS ?=
+ARCH_FLAGS ?= -DGLX_USE_TLS
 
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
 	-D_BSD_SOURCE -D_GNU_SOURCE \
 	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
 	-DGLX_DIRECT_RENDERING -DHAVE_ALIAS
 
-X11_INCLUDES = -I/usr/X11R6/include
+X11_INCLUDES =
 
 CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \
 	$(DEFINES) $(ASM_FLAGS) -std=c99 -ffast-math 
@@ -35,7 +35,7 @@
 ASM_SOURCES = 
 
 # Library/program dependencies
-EXTRA_LIB_PATH=-L/usr/X11R6/lib
+EXTRA_LIB_PATH =
 
 LIBDRM_LIB = `pkg-config --libs libdrm`
 DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
@@ -64,4 +64,4 @@
 # gamma are missing because they have not been converted to use the new
 # interface.
 DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon s3v \
-	savage sis tdfx trident unichrome ffb
+	savage tdfx trident unichrome ffb
--- ./configs/linux.build-config	2006-04-03 18:13:19.000000000 -0400
+++ ./configs/linux	2006-04-03 18:13:47.000000000 -0400
@@ -8,6 +8,9 @@
 CC = gcc
 CXX = g++
 
+MKDEP = gcc -M -MG
+MKDEP_OPTIONS = -MF depend
+
 OPT_FLAGS  = -O3 -g
 PIC_FLAGS  = -fPIC
 


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- mesa.spec	3 Apr 2006 19:34:38 -0000	1.51
+++ mesa.spec	3 Apr 2006 23:02:12 -0000	1.52
@@ -67,7 +67,7 @@
 Source10: redhat-mesa-target
 Source11: redhat-mesa-driver-install
 Source12: redhat-mesa-source-filelist-generator
-Patch0: mesa-6.3.2-build-configuration-v4.patch
+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
@@ -231,7 +231,7 @@
 install -m 755 %{SOURCE11} ./
 install -m 755 %{SOURCE12} ./
 
-#%patch0 -p0 -b .makedepend
+%patch0 -p0 -b .build-config
 %patch1 -p0 -b .fix-installmesa
 %patch2 -p0 -b .multilib-fix
 %patch3 -p1 -b .modular
@@ -253,7 +253,6 @@
 #-- Build ------------------------------------------------------------
 %build
 # Macroize this to simplify things
-%define makeopts MKDEP="gcc -M" MKDEP_OPTIONS="-MG depend" ARCH_FLAGS=-DGLX_USE_TLS
 export CFLAGS="$RPM_OPT_FLAGS"
 export LIB_DIR=$RPM_BUILD_ROOT%{_libdir}
 export INCLUDE_DIR=$RPM_BUILD_ROOT%{_includedir}
@@ -444,6 +443,9 @@
 - Widen libGLU glob.
 - Reenable r300 driver install.
 - Widen libOSMesa glob.
+- Go back to patching config/linux-dri, add mesa-6.5-build-config.patch,
+  drop mesa-6.3.2-build-configuration-v4.patch.
+- Disable sis dri driver for now, only builds on x86 and x86-64.
 
 * Fri Mar 24 2006 Kristian H??gsberg <krh at redhat.com> 6.4.2-7
 - Set ARCH_FLAGS=-DGLX_USE_TLS to enable TLS for GL contexts.


--- mesa-6.3.2-build-configuration-v4.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr  3 23:16:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 19:16:24 -0400
Subject: rpms/mesa/devel mesa.spec,1.52,1.53
Message-ID: <200604032316.k33NGOHG013539@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	mesa.spec 
Log Message:
Drop %{makeopts} from make invocation.


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- mesa.spec	3 Apr 2006 23:02:12 -0000	1.52
+++ mesa.spec	3 Apr 2006 23:16:22 -0000	1.53
@@ -264,7 +264,7 @@
 #DRIVER_DIRS="dri osmesa"
 
 echo -e "********************\nMESATARGET=$MESATARGET\n********************\n"
-make ${MESATARGET} %{makeopts}
+make ${MESATARGET}
 make -C progs/xdemos glxgears glxinfo
 
 #-- Install ----------------------------------------------------------



From fedora-cvs-commits at redhat.com  Mon Apr  3 23:54:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 19:54:09 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2117,1.2118
Message-ID: <200604032354.k33Ns9Sa032141@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
back off.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2117
retrieving revision 1.2118
diff -u -r1.2117 -r1.2118
--- kernel-2.6.spec	3 Apr 2006 18:58:55 -0000	1.2117
+++ kernel-2.6.spec	3 Apr 2006 23:54:07 -0000	1.2118
@@ -1596,7 +1596,6 @@
 %changelog
 * Mon Apr  3 2006 Dave Jones <davej at redhat.com>
 - Disable 'quiet' mode.
-- Enable page alloc debugging for a build.
 
 * Sun Apr  2 2006 Dave Jones <davej at redhat.com>
 - 2.6.17rc1



From fedora-cvs-commits at redhat.com  Mon Apr  3 23:54:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Apr 2006 19:54:10 -0400
Subject: rpms/kernel/devel/configs config-x86-generic,1.45,1.46
Message-ID: <200604032354.k33Ns9H0032151@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-x86-generic 
Log Message:
back off.



Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- config-x86-generic	3 Apr 2006 18:58:56 -0000	1.45
+++ config-x86-generic	3 Apr 2006 23:54:07 -0000	1.46
@@ -213,7 +213,7 @@
 CONFIG_KPROBES=y
 
 # FIXME: Disable before release.
-CONFIG_DEBUG_PAGEALLOC=y
+# CONFIG_DEBUG_PAGEALLOC is not set
 
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y



From fedora-cvs-commits at redhat.com  Tue Apr  4 05:11:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 01:11:09 -0400
Subject: rpms/gnome-screensaver/devel
	gnome-screensaver-2.14.0-fix-timeout.patch, NONE,
	1.1 gnome-screensaver.spec, 1.64, 1.65
Message-ID: <200604040511.k345B9o6008966@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-screensaver.spec 
Added Files:
	gnome-screensaver-2.14.0-fix-timeout.patch 
Log Message:
- don't ignore idle timers after long suspend
  (bug 183668)


gnome-screensaver-2.14.0-fix-timeout.patch:
 gs-watcher-x11.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE gnome-screensaver-2.14.0-fix-timeout.patch ---
--- gnome-screensaver-2.14.0/src/gs-watcher-x11.c.fix-timeout	2006-04-04 00:56:39.000000000 -0400
+++ gnome-screensaver-2.14.0/src/gs-watcher-x11.c	2006-04-04 00:56:48.000000000 -0400
@@ -1323,6 +1323,7 @@ check_for_clock_skew (GSWatcher *watcher
 
                 watcher->priv->emergency_lock = TRUE;
                 maybe_send_signal (watcher);
+                watcher->priv->emergency_lock = FALSE;
         }
 
         watcher->priv->last_wall_clock_time = now;


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- gnome-screensaver.spec	31 Mar 2006 22:29:17 -0000	1.64
+++ gnome-screensaver.spec	4 Apr 2006 05:11:04 -0000	1.65
@@ -14,7 +14,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.14.0
-Release: 3
+Release: 4
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -28,6 +28,7 @@
 Patch1: gnome-screensaver-0.0.23-use-floaters-by-default.patch
 Patch2: gnome-screensaver-2.13.91-shrink-em.patch
 Patch3: gnome-screensaver-2.14.0-pass-krb-environment.patch
+Patch4: gnome-screensaver-2.14.0-fix-timeout.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.gnome.org
@@ -65,6 +66,7 @@
 %patch1 -p1 -b .use-floaters-by-default
 %patch2 -p1 -b .shrink-em
 %patch3 -p1 -b .pass-krb-environment
+%patch4 -p1 -b .fix-timeout
 
 %build
 intltoolize --force
@@ -164,6 +166,10 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Tue Apr  4 2006 Ray Strode <rstrode at redhat.com> 2.14.0-4
+- don't ignore idle timers after long suspend
+  (bug 183668)
+
 * Thu Mar 30 2006 Ray Strode <rstrode at redhat.com> 2.14.0-3
 - refresh kerberos credentials when unlocking screen 
   (bug 187341)



From fedora-cvs-commits at redhat.com  Tue Apr  4 06:38:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 02:38:13 -0400
Subject: rpms/shadow-utils/devel shadow-4.0.15-nscdFlushCash.patch, NONE,
	1.1 shadow-utils.spec, 1.71, 1.72
Message-ID: <200604040638.k346cDDx018675@cvs.devel.redhat.com>

Author: pvrabec

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

Modified Files:
	shadow-utils.spec 
Added Files:
	shadow-4.0.15-nscdFlushCash.patch 
Log Message:
properly notify nscd to flush its cache(#186803)


shadow-4.0.15-nscdFlushCash.patch:
 nscd.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE shadow-4.0.15-nscdFlushCash.patch ---
--- shadow-4.0.15/lib/nscd.c.nscdFlushCash	2006-04-04 08:18:08.000000000 +0200
+++ shadow-4.0.15/lib/nscd.c	2006-04-04 08:18:30.000000000 +0200
@@ -87,7 +87,7 @@
 
 	req.version = NSCD_VERSION;
 	req.type = INVALIDATE;
-	req.key_len = strlen (service);
+	req.key_len = strlen (service) + 1;
 
 	iov[0].iov_base = &req;
 	iov[0].iov_len = sizeof (req);


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- shadow-utils.spec	3 Apr 2006 12:45:14 -0000	1.71
+++ shadow-utils.spec	4 Apr 2006 06:38:10 -0000	1.72
@@ -5,7 +5,7 @@
 Summary: Utilities for managing accounts and shadow password files.
 Name: shadow-utils
 Version: 4.0.15
-Release: 1
+Release: 2
 Epoch: 2
 URL: http://shadow.pld.org.pl/
 Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2
@@ -18,6 +18,7 @@
 Patch4: shadow-4.0.13-newgrpPwd.patch
 Patch5: shadow-4.0.12-lOption.patch
 Patch6: shadow-4.0.14-symlinks.patch
+Patch7: shadow-4.0.15-nscdFlushCash.patch
 
 License: BSD
 Group: System Environment/Base
@@ -50,6 +51,7 @@
 %patch4 -p1 -b .newgrpPwd
 %patch5 -p1 -b .lOption
 %patch6 -p1 -b .symlinks
+%patch7 -p1 -b .nscdFlushCash
 
 rm po/*.gmo
 rm po/stamp-po
@@ -203,6 +205,9 @@
 %{_mandir}/*/man8/faillog.8*
 
 %changelog
+* Tue Apr 04 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.15-2
+- properly notify nscd to flush its cache(#186803)
+
 * Mon Apr 03 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.15-1
 - upgrade
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 06:42:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 02:42:46 -0400
Subject: rpms/gnucash/devel qof.patch,NONE,1.1 gnucash.spec,1.27,1.28
Message-ID: <200604040642.k346gkaQ019228@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19210

Modified Files:
	gnucash.spec 
Added Files:
	qof.patch 
Log Message:
fix qof conflict by moving libs out of the way


qof.patch:
 configure                           |    2 -
 lib/libqof/backend/file/Makefile.in |   48 ++++++++++++++++++------------------
 lib/libqof/qof/Makefile.in          |   46 +++++++++++++++++-----------------
 3 files changed, 48 insertions(+), 48 deletions(-)

--- NEW FILE qof.patch ---
--- gnucash-1.9.3/lib/libqof/qof/Makefile.in.qof	2006-04-04 01:42:17.000000000 -0400
+++ gnucash-1.9.3/lib/libqof/qof/Makefile.in	2006-04-04 01:45:37.000000000 -0400
@@ -63,8 +63,8 @@
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(qofincludedir)" \
 	"$(DESTDIR)$(qofincludedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
+pkglibLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(pkglib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libqof_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(top_builddir)/lib/libc/libc-missing.la
@@ -433,7 +433,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-lib_LTLIBRARIES = libqof.la
+pkglib_LTLIBRARIES = libqof.la
 libqof_la_LDFLAGS = -version-info $(LIBQOF_LIBRARY_VERSION)
 libqof_la_LIBADD = \
   $(GLIB_LIBS) \
@@ -556,35 +556,35 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
+	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
 	  else :; fi; \
 	done
 
-uninstall-libLTLIBRARIES:
+uninstall-pkglibLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@set -x; list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
 	done
 
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+clean-pkglibLTLIBRARIES:
+	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
+	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
 	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libqof.la: $(libqof_la_OBJECTS) $(libqof_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libqof_la_LDFLAGS) $(libqof_la_OBJECTS) $(libqof_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(pkglibdir) $(libqof_la_LDFLAGS) $(libqof_la_OBJECTS) $(libqof_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -760,7 +760,7 @@
 	$(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(qofincludedir)" "$(DESTDIR)$(qofincludedir)"; do \
+	for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(qofincludedir)" "$(DESTDIR)$(qofincludedir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -792,7 +792,7 @@
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-am
 
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-generic clean-pkglibLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
@@ -814,7 +814,7 @@
 install-data-am: install-nodist_qofincludeHEADERS \
 	install-qofincludeHEADERS
 
-install-exec-am: install-libLTLIBRARIES
+install-exec-am: install-pkglibLTLIBRARIES
 
 install-info: install-info-am
 
@@ -840,22 +840,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
+uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES \
 	uninstall-nodist_qofincludeHEADERS uninstall-qofincludeHEADERS
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags distclean \
+	clean-pkglibLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-exec \
 	install-exec-am install-info install-info-am \
-	install-libLTLIBRARIES install-man \
+	install-pkglibLTLIBRARIES install-man \
 	install-nodist_qofincludeHEADERS install-qofincludeHEADERS \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am uninstall-libLTLIBRARIES \
+	uninstall-info-am uninstall-pkglibLTLIBRARIES \
 	uninstall-nodist_qofincludeHEADERS uninstall-qofincludeHEADERS
 
 
--- gnucash-1.9.3/configure.qof	2006-03-19 21:55:17.000000000 -0500
+++ gnucash-1.9.3/configure	2006-04-04 00:21:20.000000000 -0400
@@ -26023,7 +26023,7 @@
 echo "$as_me: External QOF Disabled.  Using Internal QOF Code." >&6;}
 fi
 if test x$QOF_XML_DIR = x; then
-	QOF_LIB_DIR='${libdir}'
+	QOF_LIB_DIR='${libdir}/gnucash'
 	QOF_CFLAGS='-I${top_builddir}/lib/libqof/qof -I${top_srcdir}/lib/libqof/qof'
 	QOF_LIBS='${top_builddir}/lib/libqof/qof/libqof.la'
 	QOF_VERSION="internal"
--- gnucash-1.9.3/lib/libqof/backend/file/Makefile.in.foo	2006-04-04 02:08:33.000000000 -0400
+++ gnucash-1.9.3/lib/libqof/backend/file/Makefile.in	2006-04-04 02:09:27.000000000 -0400
@@ -59,9 +59,9 @@
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(qsfschemadir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
+am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(qsfschemadir)"
+pkglibLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(pkglib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libqof_backend_qsf_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -433,7 +433,7 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 SUBDIRS = . 
-lib_LTLIBRARIES = libqof-backend-qsf.la
+pkglib_LTLIBRARIES = libqof-backend-qsf.la
 AM_CFLAGS = \
   -I.. -I../.. \
   -DLOCALE_DIR=\""$(datadir)/locale"\" \
@@ -500,35 +500,35 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
+	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
 	  else :; fi; \
 	done
 
-uninstall-libLTLIBRARIES:
+uninstall-pkglibLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@set -x; list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
 	done
 
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+clean-pkglibLTLIBRARIES:
+	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
+	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
 	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libqof-backend-qsf.la: $(libqof_backend_qsf_la_OBJECTS) $(libqof_backend_qsf_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libqof_backend_qsf_la_LDFLAGS) $(libqof_backend_qsf_la_OBJECTS) $(libqof_backend_qsf_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(pkglibdir) $(libqof_backend_qsf_la_LDFLAGS) $(libqof_backend_qsf_la_OBJECTS) $(libqof_backend_qsf_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -768,7 +768,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(qsfschemadir)"; do \
+	for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(qsfschemadir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -799,7 +799,7 @@
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-recursive
 
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-generic clean-pkglibLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-recursive
@@ -820,7 +820,7 @@
 
 install-data-am: install-qsfschemaDATA
 
-install-exec-am: install-libLTLIBRARIES
+install-exec-am: install-pkglibLTLIBRARIES
 
 install-info: install-info-recursive
 
@@ -846,26 +846,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
+uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES \
 	uninstall-qsfschemaDATA
 
 uninstall-info: uninstall-info-recursive
 
 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libLTLIBRARIES clean-libtool \
+	clean clean-generic clean-pkglibLTLIBRARIES clean-libtool \
 	clean-recursive ctags ctags-recursive distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-recursive distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-libLTLIBRARIES install-man \
+	install-info-am install-pkglibLTLIBRARIES install-man \
 	install-qsfschemaDATA install-strip installcheck \
 	installcheck-am installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic maintainer-clean-recursive \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
 	tags tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-libLTLIBRARIES uninstall-qsfschemaDATA
+	uninstall-pkglibLTLIBRARIES uninstall-qsfschemaDATA
 
 
 qsf-dir.h: qsf-dir.h.in Makefile


Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gnucash.spec	27 Mar 2006 21:47:16 -0000	1.27
+++ gnucash.spec	4 Apr 2006 06:42:44 -0000	1.28
@@ -8,7 +8,7 @@
 %if %{buildsvn}
 Release: 1.svn%{svnrev}.1
 %else
-Release: 1
+Release: 2
 %endif
 License: GPL/GFDL
 Group: Applications/Productivity
@@ -23,6 +23,7 @@
 Patch3: gnucash-1.8.11-icon.patch
 Patch4: gnucash-1.8.6-64bit-fixes.patch
 Patch5: gnucash-1.8.12-aq.patch
+Patch6: qof.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: g-wrap-devel >= 1.3.2, gtkhtml3-devel
 BuildRequires: libgsf-devel >= 1.12.2
@@ -52,6 +53,7 @@
 #%patch3 -p1 -b .icon
 %patch4 -p1 -b .64bit
 #%patch5 -p1 -b .aq
+%patch6 -p1 -b .qof
 
 %build
 %if %{buildsvn}
@@ -136,6 +138,9 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Tue Apr  4 2006 Bill Nottingham <notting at redhat.com> - 1.9.3-2
+- fix conflict with qof (#187267)
+
 * Mon Mar 27 2006 Bill Nottingham <notting at redhat.com> - 1.9.3-1
 - update to 1.9.x
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 06:42:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 02:42:49 -0400
Subject: rpms/shadow-utils/FC-5 shadow-4.0.14-nscdFlushCash.patch, NONE,
	1.1 shadow-utils.spec, 1.71, 1.72
Message-ID: <200604040642.k346gn8h019254@cvs.devel.redhat.com>

Author: pvrabec

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

Modified Files:
	shadow-utils.spec 
Added Files:
	shadow-4.0.14-nscdFlushCash.patch 
Log Message:
properly notify nscd to flush its cache(#186803)


shadow-4.0.14-nscdFlushCash.patch:
 nscd.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE shadow-4.0.14-nscdFlushCash.patch ---
--- shadow-4.0.15/lib/nscd.c.nscdFlushCash	2006-04-04 08:18:08.000000000 +0200
+++ shadow-4.0.15/lib/nscd.c	2006-04-04 08:18:30.000000000 +0200
@@ -87,7 +87,7 @@
 
 	req.version = NSCD_VERSION;
 	req.type = INVALIDATE;
-	req.key_len = strlen (service);
+	req.key_len = strlen (service) + 1;
 
 	iov[0].iov_base = &req;
 	iov[0].iov_len = sizeof (req);


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/FC-5/shadow-utils.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- shadow-utils.spec	22 Mar 2006 10:56:29 -0000	1.71
+++ shadow-utils.spec	4 Apr 2006 06:42:46 -0000	1.72
@@ -5,7 +5,7 @@
 Summary: Utilities for managing accounts and shadow password files.
 Name: shadow-utils
 Version: 4.0.14
-Release: 5.FC5
+Release: 6.FC5
 Epoch: 2
 URL: http://shadow.pld.org.pl/
 Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2
@@ -18,6 +18,7 @@
 Patch4: shadow-4.0.13-newgrpPwd.patch
 Patch5: shadow-4.0.12-lOption.patch
 Patch6: shadow-4.0.14-symlinks.patch
+Patch7: shadow-4.0.14-nscdFlushCash.patch
 
 License: BSD
 Group: System Environment/Base
@@ -50,6 +51,7 @@
 %patch4 -p1 -b .newgrpPwd
 %patch5 -p1 -b .lOption
 %patch6 -p1 -b .symlinks
+%patch7 -p1 -b .nscdFlushCash
 
 rm po/*.gmo
 rm po/stamp-po
@@ -200,6 +202,9 @@
 %{_mandir}/*/man8/faillog.8*
 
 %changelog
+* Tue Apr 04 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.14-6.FC5
+- properly notify nscd to flush its cache(#186803)
+
 * Wed Mar 22 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.14-5.FC5
 * FC5 update
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 07:43:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 03:43:35 -0400
Subject: rpms/logwatch/FC-5 logwatch-7.2.1-audit.patch, NONE,
	1.1 logwatch-7.2.1-http.patch, NONE,
	1.1 logwatch-7.2.1-mountd.patch, NONE,
	1.1 logwatch-7.2.1-named.patch, NONE,
	1.1 logwatch-7.2.1-nosegfault.patch, NONE,
	1.1 logwatch-7.2.1-pam_unix.patch, NONE,
	1.1 logwatch-7.2.1-secure.patch, NONE,
	1.1 logwatch-7.2.1-smart.patch, NONE,
	1.1 logwatch-7.2.1-sshd.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 logwatch.spec, 1.35, 1.36 sources, 1.12,
	1.13 logwatch-7.1-audit.patch, 1.1,
	NONE logwatch-7.1-http.patch, 1.1,
	NONE logwatch-7.1-http2.patch, 1.1,
	NONE logwatch-7.1-iptables.patch, 1.1,
	NONE logwatch-7.1-named.patch, 1.2,
	NONE logwatch-7.1-pam_unix.patch, 1.2,
	NONE logwatch-7.1-samba.patch, 1.1,
	NONE logwatch-7.1-secure.patch, 1.1,
	NONE logwatch-7.1-sshd.patch, 1.1, NONE
Message-ID: <200604040743.k347hZVF014653@cvs.devel.redhat.com>

Author: varekova

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

Modified Files:
	.cvsignore logwatch.spec sources 
Added Files:
	logwatch-7.2.1-audit.patch logwatch-7.2.1-http.patch 
	logwatch-7.2.1-mountd.patch logwatch-7.2.1-named.patch 
	logwatch-7.2.1-nosegfault.patch logwatch-7.2.1-pam_unix.patch 
	logwatch-7.2.1-secure.patch logwatch-7.2.1-smart.patch 
	logwatch-7.2.1-sshd.patch 
Removed Files:
	logwatch-7.1-audit.patch logwatch-7.1-http.patch 
	logwatch-7.1-http2.patch logwatch-7.1-iptables.patch 
	logwatch-7.1-named.patch logwatch-7.1-pam_unix.patch 
	logwatch-7.1-samba.patch logwatch-7.1-secure.patch 
	logwatch-7.1-sshd.patch 
Log Message:
- update to 7.2.1
- add new service patches


logwatch-7.2.1-audit.patch:
 audit |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-7.2.1-audit.patch ---
--- logwatch-7.2.1/scripts/services/audit.pom	2005-12-06 03:36:35.000000000 +0100
+++ logwatch-7.2.1/scripts/services/audit	2006-03-16 13:48:35.655605784 +0100
@@ -63,7 +63,8 @@
 	( $ThisLine =~ /audit_backlog_limit=[0-9]* old=[0-9]*(?: by auid=[0-9]*)?/) or
 	( $ThisLine =~ /SELinux:  unrecognized netlink message type=[0-9]+ for sclass=[0-9]+/) or
 	( $ThisLine =~ /audit\([0-9.]+:[0-9]+\): saddr=[0-9]+/) or
-	( $ThisLine =~ /nargs=[0-9]+ a0=[0-9a-f]+ a1=[0-9a-f]+ a2=[0-9a-f]+ a3=[0-9a-f]+ a4=[0-9a-f]+ a5=[0-9a-f]+/)
+	( $ThisLine =~ /nargs=[0-9]+ a0=[0-9a-f]+ a1=[0-9a-f]+ a2=[0-9a-f]+ a3=[0-9a-f]+ a4=[0-9a-f]+ a5=[0-9a-f]+/) or
+	( $ThisLine =~ /^audit\([0-9.]+:[0-9]+\): ( ?(path|cwd|item|name|flags)=["\/A-Za-z0-9]*)*$/) 
     ) { 
 	# Ignore these entries
     } elsif ( $ThisLine =~ /audit\([0-9]{10}.[0-9]{3}:[0-9]\): initialized$/) {

logwatch-7.2.1-http.patch:
 http |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE logwatch-7.2.1-http.patch ---
--- logwatch-7.2.1/scripts/services/http.pom	2006-01-04 22:26:08.000000000 +0100
+++ logwatch-7.2.1/scripts/services/http	2006-03-15 13:27:31.935011448 +0100
@@ -266,7 +266,7 @@
 #   what to look for as an attack  USE LOWER CASE!!!!!!
 #
 my @exploits = (
-   'null',
+   '^null$',
    '/\.\./\.\./\.\./',
    '\.\./\.\./config\.sys',
    '/\.\./\.\./\.\./autoexec\.bat',

logwatch-7.2.1-mountd.patch:
 mountd |   10 ++++++++++
 1 files changed, 10 insertions(+)

--- NEW FILE logwatch-7.2.1-mountd.patch ---
--- logwatch-7.2.1/scripts/services/mountd.pom	2005-02-24 18:08:04.000000000 +0100
+++ logwatch-7.2.1/scripts/services/mountd	2006-03-16 13:54:42.943769496 +0100
@@ -47,6 +47,9 @@
       $Mount = "      " . $Mount;
       $Mounted{$Name}{$Mount}++;
    }
+   elsif ( ($Number) = ($ThisLine =~ /Caught signal ([0-9]*), un-registering and exiting/) ) {
+      $SignalExit{$Number}++;
+   }
    else {
       # Report any unmatched entries...
       push @OtherList,$ThisLine;
@@ -70,6 +73,13 @@
    }
 }
 
+if (keys %SignalExit) {
+   printf "\nExit after catching signal:\n";
+   foreach $Number (keys %SignalExit) {
+      print "   Signal " . $Number. ": " . $SignalExit{$Number} . " Time(s)\n"; 
+   }
+}
+
 if (($Detail >= 5) and (keys %Mounted)) {
    print "\nSuccessful NFS mounts:\n";
    foreach $ThisOne (keys %Mounted) {

logwatch-7.2.1-named.patch:
 named |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-7.2.1-named.patch ---
--- logwatch-7.2.1/scripts/services/named.pom	2005-11-30 06:01:44.000000000 +0100
+++ logwatch-7.2.1/scripts/services/named	2006-03-16 13:51:39.351679736 +0100
@@ -130,7 +130,8 @@
       ($ThisLine =~ /sending notifies/) or
       # file syntax error get reported twice and are already caught below
       ($ThisLine =~ /loading master file/) or
-      ($ThisLine =~ /^ succeeded$/)
+      ($ThisLine =~ /^ succeeded$/) or
+      ($ThisLine =~ /\*\*\* POKED TIMER \*\*\*/)
    ) {
       # Don't care about these...
    } elsif (

logwatch-7.2.1-nosegfault.patch:
 kernel.conf |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE logwatch-7.2.1-nosegfault.patch ---
--- logwatch-7.2.1/conf/services/kernel.conf.pom	2006-01-04 22:06:53.000000000 +0100
+++ logwatch-7.2.1/conf/services/kernel.conf	2006-03-14 14:01:29.290219488 +0100
@@ -20,6 +20,9 @@
 # Only give lines pertaining to the kernel service...
 *OnlyService = (kernel|SUNW,[-\w]+?)
 *RemoveHeaders
+*Remove = segfault
+*Remove = locate module
+
 
 ########################################################
 # This was written and is maintained by:

logwatch-7.2.1-pam_unix.patch:
 pam_unix |    7 +++++--
 secure   |    1 +
 sshd     |    1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE logwatch-7.2.1-pam_unix.patch ---
--- logwatch-7.2.1/scripts/services/sshd.pom	2005-12-01 05:13:47.000000000 +0100
+++ logwatch-7.2.1/scripts/services/sshd	2006-03-16 13:42:52.220815808 +0100
@@ -191,6 +191,7 @@
        ($ThisLine =~ m/^pam_ldap: error trying to bind as user "[^"]+" \(Invalid credentials\)/) or
        ($ThisLine =~ m/^pam_ldap: ldap_starttls_s: Can't contact LDAP server/) or
        ($ThisLine =~ m/^\(pam_unix\) .*/) or
+       ($ThisLine =~ m/^pam_unix\(.*:.*\)/) or
        # We won't count the following two because they're always followed by a
        # failed login entry...
        ($ThisLine =~ /^input_userauth_request: (illegal|invalid) user (.*)$/ ) or
--- logwatch-7.2.1/scripts/services/pam_unix.pom	2005-12-01 05:15:04.000000000 +0100
+++ logwatch-7.2.1/scripts/services/pam_unix	2006-03-16 13:42:52.221815656 +0100
@@ -99,12 +99,15 @@
    } elsif ( $line =~ s/^... .. ..:..:.. .+ [^\s:\[\]]+: [0-9:\[\]\.]+ \(pam_unix\) //) {
       $service =~ s/^... .. ..:..:.. .+ ([^\s:\[\]]+): [0-9:\[\]\.]+ \(pam_unix\) .*$/$1/;
    #for debian woody
-   } elsif ( ( $line =~ s/^... .. ..:..:.. .+ PAM_unix\[\d+\]: \((.*?)\) // )) {
+   } elsif ( $line =~ s/^... .. ..:..:.. .+ PAM_unix\[\d+\]: \((.*?)\) // ) {
       $service =~ s/^... .. ..:..:.. .+ PAM_unix\[\d+\]: \(([^ ]*)\) .*/$1/;
+   } elsif ( $line =~ s/^... .. ..:..:.. .+ pam_unix(.+:.+): //  ) {
+      $service =~ s/^... .. ..:..:.. .+ pam_unix\((.+):.+\): .*$/$1/;
+   #new version 
 	} else {
 		next;
 	}
-   #lowercase the service
+   #lowercase the service 
    $service = lc($service); 
 	if (($service eq 'sshd') or ($service eq 'login') or ($service eq 'ftp') or ($service eq 'rsh')) {
 		if ($line =~ s/^session opened for user (.+) by \(uid=\d+\)/$1/) {
--- logwatch-7.2.1/scripts/services/secure.pom	2005-12-06 03:37:34.000000000 +0100
+++ logwatch-7.2.1/scripts/services/secure	2006-03-16 13:42:52.222815504 +0100
@@ -114,6 +114,7 @@
       ( $ThisLine =~ /pam_succeed_if: requirement "uid < 100" (was|not) met by user /) or
       ( $ThisLine =~ /pam_rhosts_auth\[\d+\]: allowed to [^ ]+ as \w+/) or
       ( $ThisLine =~ /^(.*)\(pam_unix\)/) or
+      ( $ThisLine =~ /pam_unix\(.*:.*\)/) or
       ( $ThisLine =~ m/^[^ ]+\[\d+\]: connect from localhost$/ ) or
       ( $ThisLine =~ /^\/usr\/bin\/sudo:/) or
       ( $ThisLine =~ /^halt:/) or

logwatch-7.2.1-secure.patch:
 secure |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-7.2.1-secure.patch ---
--- logwatch-7.2.1/scripts/services/secure.pom	2006-03-16 13:40:03.105525240 +0100
+++ logwatch-7.2.1/scripts/services/secure	2006-03-16 13:39:03.000000000 +0100
@@ -133,7 +133,9 @@
       ( $ThisLine =~ /^ipop3d\[\d+\]:/) or
       ( $ThisLine =~ /pam_timestamp: updated timestamp file/) or
       ( $ThisLine =~ /pam_timestamp: timestamp file `([^ ]+)' is only \d+ seconds old, allowing access to ([^ ]+) for user ([^ ]+)/) or
-      ( $ThisLine =~ /pam_timestamp: timestamp file `([^ ]+)' has unacceptable age \(\d+ seconds\), disallowing access to ([^ ]+) for user ([^ ]+)/) 
+      ( $ThisLine =~ /pam_timestamp: timestamp file `([^ ]+)' has unacceptable age \(\d+ seconds\), disallowing access to ([^ ]+) for user ([^ ]+)/) or
+      ( $ThisLine =~ /userhelper\[\d+\]: running '([^ ]+)' with [^ ]+ context/) or
+      ( $ThisLine =~ /pam_timestamp\(.*:session\): updated timestamp file `\/var\/run\/sudo.*'/)   
    ) {
       # Ignore these entries
    } elsif ($ThisLine =~ /^spop3d/ || $ThisLine =~ /^pop\(\w+\)\[\d+\]:/) {
@@ -319,6 +321,8 @@
       $PwdChange{"$User"}++;
    } elsif ( ($User) = ($ThisLine =~ /^cvs: password mismatch for ([^']+): ([^']+) vs. ([^']+)/) ){
       $cvs_passwd_mismatch{$User}++;       
+   } elsif ( ($User,$From,$To) = ($ThisLine =~ /usermod\[[0-9]*\]: change user `([^ ]*)' shell from `([^ ]*)' to `([^ ]*)'/) ) {
+      $ChangedShell{"$User,$From,$To"}++;
    } else {
       # Unmatched entries...
       push @OtherList, "$ThisLine\n";
@@ -592,6 +596,15 @@
    }
 }
 
+if (keys %ChangedShell) {
+   print "\nChanged users default login shell: \n";
+   foreach (keys %ChangedShell) {
+     ($User,$From,$To) = split ",";
+     print "   User " . $User . " change shell from " . $From . " to " . $To . ": " . $ChangedShell{"$User,$From,$To"} . " Time(s)\n";
+   }
+
+}
+
 if (keys %cvs_passwd_mismatch) {
    print "\n cvs:";
    print "\n   Authentication Failures:\n";

logwatch-7.2.1-smart.patch:
 smartd |   29 ++++++++++++++++++++++++++++-
 1 files changed, 28 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-7.2.1-smart.patch ---
--- logwatch-7.2.1/scripts/services/smartd.pom	2005-12-02 17:41:12.000000000 +0100
+++ logwatch-7.2.1/scripts/services/smartd	2006-03-16 14:37:37.034448232 +0100
@@ -13,7 +13,10 @@
 my %Offsectors = ();
 my %NumOffsectors = ();
 my %Warnings = ();
+my %UnableToReg = ();
 my @OtherList = ();
+my $ShutdownFailed = 0;
+my $StartupFailed = 0;
 
 my $Detail = $ENV{'LOGWATCH_DETAIL_LEVEL'} || 0;
 my $IgnoreUnmatched = $ENV{'smartd_ignore_unmatched'} || 0;
@@ -60,7 +63,10 @@
           || ($ThisLine =~ /smartd received signal 15: Terminated/)
           || ($ThisLine =~ /smartd is exiting \(exit status 0\)/)
           || ($ThisLine =~ /smartd has fork/)
-          || ($ThisLine =~ /smartd startup succeeded/)  ) {
+	  || ($ThisLine =~ /smartd startup succeeded/)
+	  || ($ThisLine =~ /Unable to register device (.*) \(no Directive -d removable\). Exiting/)
+	  || ($ThisLine =~ /Device (.*), SATA disks accessed via libata are not currently supported by smartmontools./) )
+   {
        # ignore
 
 #   } elsif ( ($Device,$Msg) = ($ThisLine =~ /^Device: ([^,]+), (.*)$/)) {
@@ -80,6 +86,12 @@
       $NumOffsectors{$Device} = $Num;
    } elsif ( ( $ThisLine =~ /warning/i ) ) {
       $Warnings{$ThisLine}++;
+   } elsif ( ($ThisLine =~ /smartd startup failed/ ) ) {
+      $StartupFailed++;
+   } elsif ( ($ThisLine =~ /smartd shutdown failed/ ) ) {
+      $ShutdownFailed++;
+   } elsif ( my ($Device) = ($ThisLine =~ /Unable to register SCSI device (.*) at line 1 of file \/etc\/smartd.conf/) ) {
+      $UnableToReg{$Device}++  
    } else {
       # Report any unmatched entries...
       push @OtherList,"$ThisLine\n";
@@ -156,6 +168,21 @@
    }
 }
 
+if ($StartupFailed) {
+   print "\n Smartd startup failed: " . $StartupFailed . " Time(s)\n";
+}
+
+if ($ShutdownFailed) {
+   print "\n Smartd shutdown failed: " . $ShutdownFailed . " Time(s)\n";
+}
+
+if ( (keys %UnableToReg) ) {
+   print "\n Wrong configuration for devices:\n";
+   foreach my $Device (sort keys %UnableToReg) {
+      print "   " . $Device .": ". $UnableToReg{$Device} . " Time(s)\n";
+   }
+}
+
 if (($#OtherList >= 0) and (not $IgnoreUnmatched)){
    print "\n**Unmatched Entries**\n";
    print @OtherList;

logwatch-7.2.1-sshd.patch:
 sshd |   39 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 38 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-7.2.1-sshd.patch ---
--- logwatch-7.2.1/scripts/services/sshd.pom	2006-03-16 14:17:12.221648080 +0100
+++ logwatch-7.2.1/scripts/services/sshd	2006-03-16 14:20:13.607073304 +0100
@@ -140,6 +140,9 @@
 my %NoShellUsers = ();
 my %DeprecatedOption = ();
 my %MisMatch = ();
+my %KrbAutFail = ();
+my %KrbAutErr = ();
+my %KrbErr = ();
 my @BadRSA = ();
 my @Scanned = ();
 my %OtherList = ();
@@ -195,7 +198,8 @@
        # We won't count the following two because they're always followed by a
        # failed login entry...
        ($ThisLine =~ /^input_userauth_request: (illegal|invalid) user (.*)$/ ) or
-       ($ThisLine =~ m/^(Illegal|Invalid) user (.*) from ([^ ]+)/ )
+       ($ThisLine =~ m/^(Illegal|Invalid) user (.*) from ([^ ]+)/ ) or
+       ($ThisLine =~ /pam_krb5: authentication succeeds for `([^ ]*)'/)
    ) {
       # Ignore these
    } elsif ( my ($Method,$User,$Host,$Port) = ($ThisLine =~ /^Accepted (\S+) for (\S+) from ([\d\.:a-f]+) port (\d+)/) ) {
@@ -311,6 +315,16 @@
       push @Scanned, $IP;
    } elsif ( my ($Line,$Option) = ($ThisLine =~ /^rexec line (\d+): Deprecated option (.*)$/)) {
       $DeprecatedOption{"$Option - line $Line"}++;
+   } elsif ( my ($Pom1,$Pom2,$User) = ($ThisLine =~ /pam_krb5(\[\d*\])?: authentication fails for (`|')([^ ]*)'/)) {
+      $KrbAutFail{$User}++;	 
+   } elsif ( my ($Error) = ($ThisLine =~ /pam_krb5: authenticate error: (.*)$/)) {
+      $KrbAutErr{$Error}++;
+   } elsif ( ($ThisLine =~ /pam_krb5: unable to determine uid\/gid for user$/)) {
+      $KrbAutErr{"unable to determine uid/gid for user"}++;
+   } elsif ( my ($Error) = ($ThisLine =~ /pam_krb5: error removing file (.*)$/)) {
+      $KrbErr{"error removing file " . $Error}++;     
+   } elsif ( my ($Pom,$Error) = ($ThisLine =~ /pam_krb5(\[\d*\]): error resolving user name '[^ ]*' to uid\/gid pai/)) {
+      $KrbErr{"error resolving user name '$Error' to uid\/gid pai"}++;
    } else {
       # Report any unmatched entries...
       unless ($ThisLine =~ /fwd X11 connect/) {
@@ -499,6 +513,29 @@
    }
 }
 
+if (keys %KrbAutFail) {
+   print "\n\Failed pam_krb5 authentication:\n";
+   foreach my $User (sort keys %KrbAutFail) {
+      print "   $User: " .  $KrbAutFail{$User} . " Time(s)\n";
+   }
+}
+	       
+if (keys %KrbAutErr) {
+   print "\n\pam_krb5 authentication errors:\n";
+   foreach my $Error (sort keys %KrbAutErr) {
+      print "   $Error: " .  $KrbAutErr{$Error} . " Time(s)\n";
+   }
+}
+	       
+
+if (keys %KrbErr) {
+   print "\n pam_krb5 errors:\n";
+   foreach my $Error (sort keys %KrbErr) {
+      print "   $Error: " . $KrbErr{$Error} . " Time(s)\n";
+   }
+}
+
+
 if (keys %DisconnectReceived) {
    print "\n\nReceived disconnect:\n";
    foreach my $Reason (sort {$a cmp $b} keys %DisconnectReceived) {


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/logwatch/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	23 Nov 2005 14:30:46 -0000	1.12
+++ .cvsignore	4 Apr 2006 07:43:32 -0000	1.13
@@ -1 +1 @@
-logwatch-7.1.tar.gz
+logwatch-7.2.1.tar.gz


Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/FC-5/logwatch.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- logwatch.spec	20 Feb 2006 08:42:37 -0000	1.35
+++ logwatch.spec	4 Apr 2006 07:43:33 -0000	1.36
@@ -1,21 +1,21 @@
 Summary: A log file analysis program.
 Name: logwatch
-Version: 7.1
-Release: 8
+Version: 7.2.1
+Release: 1.fc5
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
 Source: ftp://ftp.kaybee.org/pub/linux/logwatch-%{version}.tar.gz
-Patch2: logwatch-7.0-nosegfault.patch
-Patch3: logwatch-7.1-sshd.patch
-Patch4: logwatch-7.1-samba.patch
-Patch5: logwatch-7.1-named.patch
-Patch6: logwatch-7.1-secure.patch
-Patch7: logwatch-7.1-iptables.patch
-Patch8: logwatch-7.1-audit.patch
-Patch9: logwatch-7.1-http.patch
-Patch10: logwatch-7.1-pam_unix.patch
-Patch11: logwatch-7.1-http2.patch
+Patch2: logwatch-7.2.1-nosegfault.patch
+Patch3: logwatch-7.2.1-pam_unix.patch
+Patch4: logwatch-7.2.1-http.patch
+Patch5: logwatch-7.2.1-sshd.patch
+Patch6: logwatch-7.2.1-smart.patch
+Patch7: logwatch-7.2.1-named.patch
+Patch8: logwatch-7.2.1-audit.patch
+Patch9: logwatch-7.2.1-secure.patch
+Patch10: logwatch-7.2.1-mountd.patch
+
 
 Requires: textutils sh-utils grep mailx
 BuildRoot: %{_tmppath}/logwatch-build
@@ -38,7 +38,6 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1 
-%patch11 -p1
 
 %install
 
@@ -140,6 +139,10 @@
 %doc License project/CHANGES project/TODO
 
 %changelog
+* Tue Apr  4 2006 Ivana Varekova <varekova at redhat.com> 7.2.1-1.fc5
+- update to 7.2.1
+- add new service patches
+
 * Mon Feb 20 2006 Ivana Varekova <varekova at redhat.com> 7.1-8
 - fix http exploit problem #181802
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/logwatch/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	23 Nov 2005 14:30:46 -0000	1.12
+++ sources	4 Apr 2006 07:43:33 -0000	1.13
@@ -1 +1 @@
-6abe774abb10f45472c387f5e646a251  logwatch-7.1.tar.gz
+a3b6f24d8976bbcf9e6e956891560635  logwatch-7.2.1.tar.gz


--- logwatch-7.1-audit.patch DELETED ---


--- logwatch-7.1-http.patch DELETED ---


--- logwatch-7.1-http2.patch DELETED ---


--- logwatch-7.1-iptables.patch DELETED ---


--- logwatch-7.1-named.patch DELETED ---


--- logwatch-7.1-pam_unix.patch DELETED ---


--- logwatch-7.1-samba.patch DELETED ---


--- logwatch-7.1-secure.patch DELETED ---


--- logwatch-7.1-sshd.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr  4 09:09:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 05:09:51 -0400
Subject: rpms/subversion/FC-5 subversion.spec, 1.72, 1.73 upstream, 1.10,
	1.11 upstream-key.gpg, 1.4, 1.5 subversion-1.3.0-neonver.patch,
	1.1, NONE
Message-ID: <200604040909.k3499ptb024624@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	subversion.spec upstream upstream-key.gpg 
Removed Files:
	subversion-1.3.0-neonver.patch 
Log Message:
* Tue Apr  4 2006 Joe Orton <jorton at redhat.com> 1.3.1-2
- update to 1.3.1



Index: subversion.spec
===================================================================
RCS file: /cvs/dist/rpms/subversion/FC-5/subversion.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- subversion.spec	16 Feb 2006 19:39:46 -0000	1.72
+++ subversion.spec	4 Apr 2006 09:09:48 -0000	1.73
@@ -15,8 +15,8 @@
 
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
-Version: 1.3.0
-Release: 5
+Version: 1.3.1
+Release: 2
 License: BSD
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -24,7 +24,6 @@
 Source1: subversion.conf
 Source3: filter-requires.sh
 Source4: http://www.xsteve.at/prg/emacs/psvn.el
-Patch1: subversion-1.3.0-neonver.patch
 Patch2: subversion-0.20.1-deplibs.patch
 Patch3: subversion-0.31.0-rpath.patch
 Patch6: subversion-1.0.3-pie.patch
@@ -102,7 +101,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .neonver
 %patch2 -p1 -b .deplibs
 %patch3 -p1 -b .rpath
 %patch6 -p1 -b .pie
@@ -253,6 +251,9 @@
 %endif
 
 %changelog
+* Tue Apr  4 2006 Joe Orton <jorton at redhat.com> 1.3.1-2
+- update to 1.3.1
+
 * Thu Feb 16 2006 Florian La Roche <laroche at redhat.com> - 1.3.0-5
 - do not package libs within subversion-ruby, these are already
   available via the main package


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/subversion/FC-5/upstream,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- upstream	4 Jan 2006 13:07:01 -0000	1.10
+++ upstream	4 Apr 2006 09:09:48 -0000	1.11
@@ -1 +1 @@
-subversion-1.3.0.tar.gz
+subversion-1.3.1.tar.gz


Index: upstream-key.gpg
===================================================================
RCS file: /cvs/dist/rpms/subversion/FC-5/upstream-key.gpg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- upstream-key.gpg	4 Jan 2006 13:07:01 -0000	1.4
+++ upstream-key.gpg	4 Apr 2006 09:09:48 -0000	1.5
@@ -1,5 +1,5 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
 mQGiBDZHWLsRBACtzInKFFsS4RgRU4NTxvDXWcrasf8Bilpz2+BYqTl+TbKQETkc
 181PYu3sApuIuXwlya4X5bCceo+yThdM8dN+4nktDLl3i6E2+tXfAsIR6MEQWzsI
@@ -92,140 +92,381 @@
 yKvxH4ELYJdEujib9ohkBBMRAgAkAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheABQJD
 gmAoBQkHoHdwAAoJEAm8NePuUGRhetYAn2UHN6+sFgrRFQopgFWtNDJ4SY+MAJ9q
 vUlDTNt1UF/vntmvf/2dlzYUj4hGBBARAgAGBQJDgmJWAAoJEOyrDnuD5q4NzT4A
-n2FWZoHV8FcAc1a45lxjnQP8dUPcAKCR8oiEOOE7Usp4oE+Otjb4EK8JCLQxRGF2
-aWQgQW5kZXJzb24gKERhdmUpIDxkYXZpZC5hbmRlcnNvbkBjYWxpeG8ubmV0Pohn
-BBMRAgAnAhsDBQkB4TOABgsJCAcDAgMVAgMDFgIBAh4BAheABQJBhYWpAhkBAAoJ
-EAm8NePuUGRhO/wAoM3wW6JiZKh2VNs7JHHfLVCxpD/RAJ9AEDmmzmGRGD8xS00h
-guGX75vNRIhnBBMRAgAnAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAhkBBQJDcMwL
-BQkDzHxWAAoJEAm8NePuUGRhyKAAn3s3+lKtAdj+YmGUIW/iGY9oz58gAKDKVAFm
-Y6MswnjIwnDidYvvV0Mc2IhnBBMRAgAnAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheA
-AhkBBQJDgmAlBQkHoHdwAAoJEAm8NePuUGRh9AoAoJClXCbuxBj4KPnVpVm7nVmv
-RxEYAJ9vJlUx3XPc1n7DSvGIlXG0Lr+rUIhGBBARAgAGBQJDgmJUAAoJEOyrDnuD
-5q4N+AIAnRCbALiCGh8WzjJa8+xfNUoB45NCAKCI6i0EIL+XM2hwWRrdYK3Ndck6
-mbQ1RGF2aWQgQW5kZXJzb24gKEFkcmVzc2Ugc2Vjb25kYWlyZSkgPGRhdmVhQG5l
-cmltLm5ldD6IZAQTEQIAJAUCQYWFSAIbAwUJAeEzgAYLCQgHAwIDFQIDAxYCAQIe
-AQIXgAAKCRAJvDXj7lBkYekPAKCf65I3amTBfsAX59ocgFgZ2fKGYwCdHNtn/G9s
-b71Bryxkmz1eTxiUiLCIZAQTEQIAJAIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAUC
-Q3DMFAUJA8x8VgAKCRAJvDXj7lBkYRNjAKDS+B9h3miafZxXTR46wgdfhyicLwCf
-fpAqIIQneVXd2zxLeKGMoEiY5/KIZAQTEQIAJAIbAwYLCQgHAwIDFQIDAxYCAQIe
-AQIXgAUCQ4JgKAUJB6B3cAAKCRAJvDXj7lBkYWvQAKC5eftT6gE29ceRNnad99pJ
-z9qd8wCbByDbM/r/2hAz/gnDD+BFeuwzgC2IRgQQEQIABgUCQ4JiVgAKCRDsqw57
-g+auDeAmAJ9GkCnfAIzmslzH+kQf8tt6/HPuEwCgyIG5lzjpOWxjGa5mHbTJhGxe
-xwm5Ag0EQYWDPBAIAIibRsMb2zRV4wBoZEjlNza19qN68lmOsW3ekZrMzjelWzBI
-JtEHOzDR1fPQjppTPuaMiLD6k5vV9xf2nFwwK5002wmifQKAnQZK2vpIO7JnNY92
-wAD0qlSl2bMCc878SPzmvhCKR5E2lKC1GAGcqPlOInsezNNofgDNyI+RSxZFmP+i
-zwrx1EFhAPplIrxJEykhqLW5kvopdnmfic69rfKkCGHbIue8JI8vuiVdu/C4oN1n
-3j9bn9iIMYvCnVVHZYEvzxYEYFOlI2m9gk70L2ZvkHRUI7KcYNuttZTmRwa94OYn
-60bZp3LfGG6tyafY3d1FJmAKJ/rwAjIshWg1jH8ABAsH/RSwLtorJuXy4j1ogHyX
-MDGNXB+rnejAgDtCYdzJmIBzorxksPFJ2YljOUa3yg4v/Ocw6ZEguMN7bzXOL0LE
-8tPsPcxbb0+4+bL2YVwFm5dXCNPKeHYFuO1xhTYp5EpjHGTK4Xq4+OdafsZoTSj5
-2d9xIXpn99dlCh5rTsTWpR52gRfSrXVZdN5ugzYgnEo1rxQRe1CELLf90kL0Mrw/
-l9JLUwwaTwwdlk2hrpxU/O5g0c4Gg3naJzGZfav7DZwN4TYcLQhTcX4JXni/iNxA
-eeLFg5k1KIDjX6lORgJ4aZX5/VwUhMWXINDpJYpV37uuaybHKaj2glxoz7cxCvvU
-NzOITwQYEQIADwIbDAUCQ4JgNQUJB6B3eQAKCRAJvDXj7lBkYVLoAKC3tFHCEzfs
-oc02WxtKGM1RHeYbSwCgsgoaJONU+ID7PSBEZshH7Eu1IoqZAQsEQoOfuAEIAJou
-IzS+PvTMDI3PbAKhlv9ecTBaTm1ZgCaZIHTaKPcNHYWilBr5OXSV/2SZVngNnSpd
-rLUZOJfaCjbG5NvSDfThpfGz0fudZt7H12BJiV2VWNmuOrbTWmOiO5Vhb0m1D9JR
-1InlQ5/BiAMbXOWRuq+cX7KlZ9qR4vW9AYBpmUPINiUgoJOOtPk/48JanHP+h+vZ
-Cknl9ClZc5Y0mmF2/HccX3zxf31FRirCG5euywwZXL+iWi6kcwJ9RxSm3kF1Glue
-MLESn9mNmd+i5WyDcLEzA2QZB19tKjn6O+nTWojWphgH7g0fnZquuBw/ispiA2gX
-9BMKRIm2XWDF/ujJ9dEABim0O01hcmsgUGhpcHBhcmQgKFNvZnRMYW5kaW5nIFN5
-c3RlbXMpIDxtYXJrcEBzb2Z0bGFuZGluZy5jb20+iQE1BBMBAgAfBQJCg5+4AhsP
-BwsJCAcDAgEDFQIDAxYCAQIeAQIXgAAKCRAVnjeBfdZnZ6hNB/4ydPO7divBn2TX
-Q9mWDGHW+BLhYBYdjnTPww+yRw6Mli2MPraiephH9wqTZxxqWEgqYiTfGZczVs13
-pFSoBw5rSJRY2IpnroGL1FbnqFLs+x0n68HA9S1wwqE7Ij4S3cjkMFHFXKygd9yf
-ZwPeRkWJEYhpiegL8gyKXOaonB0/w72EqbtZzS6P1rBwCNWn4mWzvP6ZU/lAdK51
-6f/UA0WOH5kMo50USK/K0uUTQaqWhVTS5PtqbZ8wCo+sI+eIKwKxF2u/Zgh+4xEu
-8fejoIJ0eBhHbJr6FDsly2CWLFAGF+VdeBrK4dwnOH+PfvbP7t69LVBN5p0IWc8g
-6aX7j/e7mQGiBDx6SmIRBACARE4kEq8R0I6ozUI6HK4qeA771hZtV3IEvCojpdPR
-LscFV8Pa2kje0nPsPQWXxKIWD1wp0U0cMxPz5YxQTvUGnRkylm8oNlL+GiM0WPXt
-A27qmopjkW7bMdLBT3b3Uxwo45U6VZkqKFYPgE/XJPIimmerkV9SC6zs2E6gDcA6
-XwCgwml5/wNkTc36w6pkb71SfgS+nvcD/jZIf2F1jMR4BevvqagwBQtdF2bZ/hmk
-CFnepU/GRsZnF+8Zl9F7FRQ/+8PqLPizKhZMUqbxDNLikcUCtQ94oRYjhbSUMTiM
-7I/r69jdkZtl8JPKouHp5rKzluFVcPDrQ7QHTeBD890hHHIX+2bmVztDVjkqnEg4
-tJ98f0oGXsnwA/9TwSPuYoFDVhQmJVLRQ+2sNT+Ugt6QWcbNVbyK7TQtSuBeLZiP
-XM1DQ72OkK8s1RgDkoXcbQmtEvmixHuMklTyeIPayZmFhBq+80sDIyQBYAuM8f9M
-RhNblsQo6mH1Co7utcV98vZO2vdFsj0j/qf0mx/TsMGEw62u4Ftllixws7QiRGFu
-aWVsIEouIEJlcmxpbiA8ZGFuQGRiZXJsaW4ub3JnPohXBBMRAgAXBQsHCgMEAxUD
-AgMWAgECF4AFAj9BsMAACgkQ7FmgR1HlB6zT3gCfVOU90yKacrB38ufI2D+MLUm8
-ayIAni++5k82Cz/UGN+7Eu04MgErOCD8iF0EExECAB0FAjx6SmIFCQDtTgAFCwcK
-AwQDFQMCAxYCAQIXgAAKCRDsWaBHUeUHrFoJAJ4zqNiL1LjFaJsfq2jNWFvIO7RK
-dgCdGc4x7xdrblO+OB0Pcj7ZG62NiZiIRgQTEQIABgUCQr15gQAKCRBxc32m+MTR
-T1PSAKDFFZ7gGVoc+//9f6J2qyPudzYYPACcDrcliNan9AXHv61iwZ27m2qgJGO0
-JkRhbmllbCBKLiBCZXJsaW4gPGRiZXJsaW5AZGJlcmxpbi5vcmc+iF4EExECAB4C
-GwMGCwkIBwMCAxUCAwMWAgECHgECF4AFAj9BsMIACgkQ7FmgR1HlB6wa7wCghmXN
-4ntxrIUFA25f01K8JnVyyKYAoJFbJX7xvK2/cK6RvKlLMyHm4BdoiGQEExECACQF
-Aj9Br10CGwMFCQDtTgAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQ7FmgR1HlB6yQ
-FgCfT813+x3yiS5t/aKBv0149lmIXPoAoLhOEjemx8F+Iml1SNB5/XmMnIHbiEYE
-ExECAAYFAkK9eXYACgkQcXN9pvjE0U/B7gCfarHlXQPxiGj1N0+R8WGuabPRZYwA
-oJRZS4DGjVz8LEqtvoiSXEHOtWo/uQENBDx6Sm0QBADibADROabTTQDu+qMVtVcA
-xq6yS8F3LERDHNJUgX+GShdm5cBcY2aLQ4FjvkVn9rfIG1ItufxU/fAecyqRo+EO
-E/3Ibhye3srm8c0E8QvUBVBpEMJul3gPfEzKBZAO6UogZPEg7HDPZWwqj7mKoSTB
-uTjZMDC5cZHw3zfFrvq8wwADBQP8Dmh9CLccMsT7C//6af73s8pYCKqj1qrdhS97
-dvZAek8VvZ8OP6S2jd1lFwSTSnxTL49KcPr3yVDt5CohNLCPAjSbcyRIpR2P7R/w
-Q9X3K6MIiqiajRHO7P/XuxAk0CozHz++RyIJExaymA1eLCy4AWUWLEXrGZxPPb57
-bH0QJQ6ITAQYEQIADAUCPHpKbQUJAO1OAAAKCRDsWaBHUeUHrKYhAKCn7EvU1BTT
-UALeG/XajV2tAFSlPACfR22/zNoVU9kqJdK0oKOSnYWn31q5AQ0EQHb2XBAEAKvn
-E0b70EzT/KxqZOOPT185ieUOp8GpNiUQ4HrHqP1xOt53vCIBe1TIGwqUPPdSamul
-PrQJYJYGvPHrnrBr4FkCM5X2sD5of2+sQ3Zrkwz5zdRNKK3kajvFfkB4InTsHOSD
-qfnT/tD7AEFrwRXcaO924nVpNzI5Q8niwJ3NwJcHAAMFBACOmSpQd22DipeuT1ON
-GgCmgylk68tbbvtLh8tzsBP3rpU1Om2yBEWhA5/LVOoyBC1xjb7wynZyiiTG/eYG
-gE3R6cCmIDxKtBDrhqb7/kS02HTDY8eWQcuxpnKA2pMrXtl8JMT67WVgY+rWN/Kq
-I1Wnu62xOYknKyx1sZVndmt5gYhJBBgRAgAJBQJAdvZcAhsMAAoJEOxZoEdR5Qes
-6yYAniK9gwFA3bk8tzGIE+JHCa9qeDhLAJ4p9MK9X+FGCKz0nG8MmInSN92AqpkB
-ogRDg4rXEQQA8PFuB8Z6Di8jbB7JcZf365IlxhD0gRbbh/JrQQnOupua78ISAg7c
-SPvuUgoPkq/XuciAgsGtZ1IYCjXcK6ySycxcbwB8KWB9CcolpChbxZ7axUvKHljv
-NoUg63RB3eHv8pNd78DvZyDRQbjgYCP5MxnBOnTCTAb/FH/g4eEc77MAoPYnfc56
-JoDoPz+xKID+i0C0xjsLA/wJQPIEk/WAVznj+DKWWIJPYNGPNclzu90YhmPufiM0
-RhV4ahJhnMiPAx4TbpqvVS33shq3Ea7j376c0Q5kIt42fCVzecLMeYeopAJ/iN0x
-2To57gtpdTxpe4kAv7cdObQ9IQ/a8ftPZhNK7JLxq59KxJEEwhAre5i9dGGC6oRD
-MQP+KUVHIeZK17gHuvqNav7DcIRvtA/kmY/cPWJoPW+Opta1+1YN0IETLbl3iPW8
-wa9QIzUU9g/ABEwhYJz7hmvdFZfIlCbIwbcchLhKHoPnQrnFk6jP0WWfBcOLvYUn
-zpWQrXnNEC44XAr+I0ReEbWRD5zXb+91BWcy6pR4X3ldOYW0LUdhcnJldHQgUm9v
-bmV5IDxyb29uZWdAZWxlY3RyaWNqZWxseWZpc2gubmV0PohgBBMRAgAgBQJDg4rX
-AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQyR242pvPzi/dAACg8AeMW9qE
-T74SdX8mMNJ/5DM/r9wAn0vNI46aYq8WMfgMJyf0iRtrSDlGiEYEEBECAAYFAkOU
-eRQACgkQZ9mySWdPBeAjFQCeMrK+TXtjJ8lph7c5cIPCLeW5QcYAn1k58UEXdtNv
-E0IOvWHUIuQuW4aAtCJHYXJyZXR0IFJvb25leSA8cm9vbmVnQGFwYWNoZS5vcmc+
-iF4EExECAB4FAkOPuMYCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQyR242pvP
-zi+ugwCfTQA9AjfmwMYuwpNu18QSXbryYUMAn3G64OWK0BlcWRNMqW1Zy9DoOj0Z
-iEYEEBECAAYFAkOUeRMACgkQZ9mySWdPBeDIeQCfdBcrDsa3AfNkt+KElbl81bAh
-IJcAoJw1vuM/oYtSoGztVXnA9MufpoCAuQINBEODiuIQCAD5sN9bqMtNSINKBJ1S
-jVByyUUWeCrLuBwsCl8Ak2RYvA4e+PFkmoGcla9/3DRdlMz8u8tmWWcU1J7PqP21
-hRa0hb7mVT2MTLIjHmBhu8gARQyF++rMnYxeu+5DZa1GvmuHkQ09KWDwlD8OEGU9
-RwZXUHymK2tl+tBQ6W1wmxMevIF2Uq0rJGzAGqPsDnXpbZlAQVxMvdyg1vfVMcaz
-tNsmP38MSVIAxLJLpt3Y8PDuSkcH3SaCoxBqWp8eogBJUMrfDKfKOJCW9aQbfh5L
-787isCr/Xi4YQYl1CJHS/7AVqnSwbXeBUn2CNBcNRdh8e2AZXUHVAqDzQLppXWzY
-8tP7AAMFCADx/IuPBFnrhJX59MhHNWI1syjSsfX/l9Sw/zmJb1zEooqttIC+dLJl
-iGaGIcTxiULJjBC/hf8D87v67wd75BzGwtzpA2PZf6BvXao9nKb9HqjBHPOtpVvo
-/6HDRqKClPlvZs//jHPqFxnOy4HZC9dsyde8iQdSlsVbdahC379uepJHLis2kunw
-M1u+yuTgbr1ToQMyM5ZSe8etCkQ7UMjAH6uvaBnIHn0I9zNs5G4drJ1hGce8L6AH
-e+SIhpshYGvIgOd21ad+6TrRAgL4k6rczsGqJxxZp3Aae385PMVPIqnF2ggSMI9D
-Eb5IO5c72FA/JFoy3JLQS899VORRDZuGiEkEGBECAAkFAkODiuICGwwACgkQyR24
-2pvPzi8cLgCeJ19REJxW4gdWafNHNoFbtMfic2cAniZM6mFSuSPkBcpjKOUU5P3q
-i+n8mQGiBEBMrdURBAC/xT1huk8n0wa5dN0gcF9x5i2laSvD/ioY4vyhcNBPCwW9
-os45TYZbDOhaZqm3uMlTT3veOhYHaeduQjSd4gNIh4GPWy9TMD9W7jUHa/k51dO5
-gZ8q528MWH6sykKK9FmkmAT9gceTqt9aY6Z7NJuAqc/0YOQFu1WC/byiRwt+IwCg
-grkJBa0sU/Da2CyfMftKpgsKOdcD/1izXnJXjXsl7tiSsQxCXZs4WtJtikjcij/t
-D1aRtHz0327kKeYTU3j7oCiBZdplx9OQtYwwZFd6iqx0OWn8Z0KBsTrVwQCQmf+J
-tWiuk+TDStqw69LfgzIoMVZ/w8ghVzijXQYZqUPPSEzlIwgAUtS0HfwwcBIezbA4
-gW4KGl2ZA/0eumt3QwVgYuAVPVQHMaleF6BHUnSi8C4NNWNu3ddl+yxvd/LevdpI
-MZPxS0QFNAR7Y89UiysbK5Drz0GG1+zK2GFaBbkYAtIVCOdMxdTA9UdLme1cS45t
-+LpS+nFQ2HMZ8WFeDhbnp1C5qfiyHxmSlCF4yfircptuRVFVyxo0w7QkRXJpayBI
-dWVsc21hbm4gPGUuaHVlbHNtYW5uQGdteC5uZXQ+iF8EExECAB8FAkBMrdUFCQHa
-nAAECwcDAgMVAgMDFgIBAh4BAheAAAoJEIuTtBKWs/U5k0wAmwbmjkRPwaLVHlus
-apRqU6Tu8TO2AJ4rPMnUqR/tYry8lB2/C+U3VphjkohGBBARAgAGBQJAia2cAAoJ
-EPbQZreyjt2CtGQAmgN1fy34CnS1D1zOucstvyKedtPFAJ9UbMfjo98zU7Oly08Y
-LYXvZxA2WYhGBBARAgAGBQJAkVCEAAoJEGY1tsDeiF3TrDYAoJnnIKNqiIwan3Wf
-JM3haFSrcUOAAJ96uDhl4dJFsdhx+ixGi3JQtdEcFIhGBBMRAgAGBQJDgiboAAoJ
-ELyduxPbAKJIKBMAoLcKUoNzd5p23bKiRAOv8ukMPCOqAJ9tN5UcQFLpGdmo3lic
-CFuIb9T0sLkBDQRATK3WEAQAvEEc8qQgg+ly44jZ/VMK38R2SNjlO0noor8YtBPi
-X0qaJUlywfxAy9nGLCQlDVcyupjETXAvCQDwrkO+GdZ1W96fG2AhiL2oAaYVSt7v
-VZy1peVla/DLO9jpPXdCJP0KLCN7CH7p0IrkCQcK2OdzJRWCZHs7Ua+oM4HQjkl2
-FMcABAsD/AgpXwdJI1nQnFx5+etP/2BEuqIWmAnyW3/qaAfKeMqmBLkNdTa6yqvW
-vd+MzWbIse7ClEMMwRdF0x/wQwNc6izRBI1djJ0fS4moMsNbtMLf48FdunpMF+uu
-7GlNQ/PTmu9ud+bRbzGgNnkJ5RGRmMK5bi9goA26va/BKgcgQ7MhiEwEGBECAAwF
-AkBMrdYFCQHanAAACgkQi5O0Epaz9TlcHwCeM90tM1VaPqS7QHW31Tq+GlPsrEIA
-n3XvPxBbvJUFwy3Y7bEr4YW/Cy9f
-=4sB1
+n2FWZoHV8FcAc1a45lxjnQP8dUPcAKCR8oiEOOE7Usp4oE+Otjb4EK8JCIhQBBAR
+AgAQBQJDwaiDBYMFZFIiAwUBeAAKCRBT9n90cV/G17W8AJ93C5d4YZDAAZLEv6aN
++LDvAaJw5gCeOxFHLpWo1F57qmddi390wtOq3EqIRgQQEQIABgUCQ8RNtQAKCRDN
+MP4CNU/ZUvgHAJ9KuSTNH/+saLSIlQS+mr7ybdPmIACggxk0yO6RSKiLMWqU4Xm3
+WisstHWIRgQQEQIABgUCQ9JZ8wAKCRDNKLeZ/VaoTs+YAKCb4hllGJP0rtkwUGpW
+5ZrVhDJcFACcDtxQAH/EA42AO5MSvHD0CukDp5uIRgQQEQIABgUCRB7/KgAKCRCD
+Va7YgeieUPHBAJ9Ni9r1WtH8bzoXAFCQryXIx2lfgACgiRknK7BAqMO1XY87toER
+sM9gWU+ITAQSEQIADAUCQYWbiwWDAeEbKgAKCRDsqw57g+auDeq6AJ4tYWbO6Ihb
+I09WxanEhNSHxa/teACggDleO/WFCc8U9+vHax/XIuxDlOqITAQTEQIADAUCQY1X
+XgWDAdlfVwAKCRBd2E16/7S3O69TAKDtsO3zXhwE2Vu8RFLS6MiJjjSOKwCgzXs0
+9gDrXfoP9N/ueNlA6usIuFu0MURhdmlkIEFuZGVyc29uIChEYXZlKSA8ZGF2aWQu
+YW5kZXJzb25AY2FsaXhvLm5ldD6IZwQTEQIAJwIbAwUJAeEzgAYLCQgHAwIDFQID
+AxYCAQIeAQIXgAUCQYWFqQIZAQAKCRAJvDXj7lBkYTv8AKDN8FuiYmSodlTbOyRx
+3y1QsaQ/0QCfQBA5ps5hkRg/MUtNIYLhl++bzUSIZwQTEQIAJwIbAwYLCQgHAwID
+FQIDAxYCAQIeAQIXgAIZAQUCQ3DMCwUJA8x8VgAKCRAJvDXj7lBkYcigAJ97N/pS
+rQHY/mJhlCFv4hmPaM+fIACgylQBZmOjLMJ4yMJw4nWL71dDHNiIZwQTEQIAJwIb
+AwYLCQgHAwIDFQIDAxYCAQIeAQIXgAIZAQUCQ4JgJQUJB6B3cAAKCRAJvDXj7lBk
+YfQKAKCQpVwm7sQY+Cj51aVZu51Zr0cRGACfbyZVMd1z3NZ+w0rxiJVxtC6/q1CI
+RgQQEQIABgUCQ4JiVAAKCRDsqw57g+auDfgCAJ0QmwC4ghofFs4yWvPsXzVKAeOT
+QgCgiOotBCC/lzNocFka3WCtzXXJOpmIUAQQEQIAEAUCQ8GogwWDBWRSIgMFAXgA
+CgkQU/Z/dHFfxterjQCeMAr43nl/QHVlRWIBx63Y0xOkP24AniOaICs1x4EDIWHf
+aBIaxOHeR76uiEYEEBECAAYFAkPETbAACgkQzTD+AjVP2VI4RgCdH3P2e5X5BjBc
+a94G7dwLN5XsrcYAniZIHMxhn3XayCmCx5ey3e7iQerTiEYEEBECAAYFAkPSWfAA
+CgkQzSi3mf1WqE6GZgCgmsq6rEMapvsus0xesX1ZDrVqSe4An3W+FpeBX2watiHs
+9h1R0U1WR6K0iEYEEBECAAYFAkQe/xsACgkQg1Wu2IHonlBx7QCgg3TUNQejy8Vf
+4d/Qkx7IKhSnQEIAoOrQHktbZnVOf9bTP6tr3D9TpRc+iEwEEhECAAwFAkGFm4sF
+gwHhGyoACgkQ7KsOe4Pmrg1zEACfSgRlUmFGhwzOGVtMR/4yaT/sNkIAn0nurJer
+881hborwsjM3+QmSSYeHiEwEExECAAwFAkGNV14FgwHZX1cACgkQXdhNev+0tzuV
+FwCaA9moagl4Pe2Et85Fjy5UNPMj63kAnA2aJG/9oatAX4OzhKfSITCEYsDFtDVE
+YXZpZCBBbmRlcnNvbiAoQWRyZXNzZSBzZWNvbmRhaXJlKSA8ZGF2ZWFAbmVyaW0u
+bmV0PohkBBMRAgAkBQJBhYVIAhsDBQkB4TOABgsJCAcDAgMVAgMDFgIBAh4BAheA
+AAoJEAm8NePuUGRh6Q8AoJ/rkjdqZMF+wBfn2hyAWBnZ8oZjAJ0c22f8b2xvvUGv
+LGSbPV5PGJSIsIhkBBMRAgAkAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheABQJDcMwU
+BQkDzHxWAAoJEAm8NePuUGRhE2MAoNL4H2HeaJp9nFdNHjrCB1+HKJwvAJ9+kCog
+hCd5Vd3bPEt4oYygSJjn8ohkBBMRAgAkAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheA
+BQJDgmAoBQkHoHdwAAoJEAm8NePuUGRha9AAoLl5+1PqATb1x5E2dp332knP2p3z
+AJsHINsz+v/aEDP+CcMP4EV67DOALYhGBBARAgAGBQJDgmJWAAoJEOyrDnuD5q4N
+4CYAn0aQKd8AjOayXMf6RB/y23r8c+4TAKDIgbmXOOk5bGMZrmYdtMmEbF7HCYhQ
+BBARAgAQBQJDwaiDBYMFZFIiAwUBeAAKCRBT9n90cV/G1xV8AKD7XY3qpmyWBtW6
+cPlpIqC2AIepBQCg3e88jDJvG8eP8dmj9897iGfy5lGIRgQQEQIABgUCQ8RNtQAK
+CRDNMP4CNU/ZUv1EAJwPKsP0A3RH81p/3ifXPfH4TFZUxQCghYaMwu63B6rRBtjb
+xY35VvA4H0aIRgQQEQIABgUCQ9JZ8wAKCRDNKLeZ/VaoTh2GAKDPC2QHhYxmia4N
+fNp4qSCogBba7ACbBOcVZGw68sYVo/NwOHh8pVuhH3+IRgQQEQIABgUCRB7/KgAK
+CRCDVa7YgeieUD/DAKCXZG8rE7Qr2EaDlBotYzUqwKDKXQCgo33GTDJxeRoHGNuG
+M0n9+9JZISiITAQSEQIADAUCQYWbiwWDAeEbKgAKCRDsqw57g+auDURVAJ9Tw37s
+zWvvS2YHFTR+EaJ1o35utwCffzQe6B6zsWiC+vhiD7EoDXu+a4eITAQTEQIADAUC
+QY1XXgWDAdlfVwAKCRBd2E16/7S3O7yeAKCfiL/jsmHpjqZyk7Cw2PlRTuioggCf
+fKBinOjAp/M0bj3aHdI0aacM4oC5Ag0EQYWDPBAIAIibRsMb2zRV4wBoZEjlNza1
+9qN68lmOsW3ekZrMzjelWzBIJtEHOzDR1fPQjppTPuaMiLD6k5vV9xf2nFwwK500
+2wmifQKAnQZK2vpIO7JnNY92wAD0qlSl2bMCc878SPzmvhCKR5E2lKC1GAGcqPlO
+InsezNNofgDNyI+RSxZFmP+izwrx1EFhAPplIrxJEykhqLW5kvopdnmfic69rfKk
+CGHbIue8JI8vuiVdu/C4oN1n3j9bn9iIMYvCnVVHZYEvzxYEYFOlI2m9gk70L2Zv
+kHRUI7KcYNuttZTmRwa94OYn60bZp3LfGG6tyafY3d1FJmAKJ/rwAjIshWg1jH8A
+BAsH/RSwLtorJuXy4j1ogHyXMDGNXB+rnejAgDtCYdzJmIBzorxksPFJ2YljOUa3
+yg4v/Ocw6ZEguMN7bzXOL0LE8tPsPcxbb0+4+bL2YVwFm5dXCNPKeHYFuO1xhTYp
+5EpjHGTK4Xq4+OdafsZoTSj52d9xIXpn99dlCh5rTsTWpR52gRfSrXVZdN5ugzYg
+nEo1rxQRe1CELLf90kL0Mrw/l9JLUwwaTwwdlk2hrpxU/O5g0c4Gg3naJzGZfav7
+DZwN4TYcLQhTcX4JXni/iNxAeeLFg5k1KIDjX6lORgJ4aZX5/VwUhMWXINDpJYpV
+37uuaybHKaj2glxoz7cxCvvUNzOITwQYEQIADwIbDAUCQ4JgNQUJB6B3eQAKCRAJ
+vDXj7lBkYVLoAKC3tFHCEzfsoc02WxtKGM1RHeYbSwCgsgoaJONU+ID7PSBEZshH
+7Eu1IoqZAQsEQoOfuAEIAJouIzS+PvTMDI3PbAKhlv9ecTBaTm1ZgCaZIHTaKPcN
+HYWilBr5OXSV/2SZVngNnSpdrLUZOJfaCjbG5NvSDfThpfGz0fudZt7H12BJiV2V
+WNmuOrbTWmOiO5Vhb0m1D9JR1InlQ5/BiAMbXOWRuq+cX7KlZ9qR4vW9AYBpmUPI
+NiUgoJOOtPk/48JanHP+h+vZCknl9ClZc5Y0mmF2/HccX3zxf31FRirCG5euywwZ
+XL+iWi6kcwJ9RxSm3kF1GlueMLESn9mNmd+i5WyDcLEzA2QZB19tKjn6O+nTWojW
+phgH7g0fnZquuBw/ispiA2gX9BMKRIm2XWDF/ujJ9dEABim0O01hcmsgUGhpcHBh
+cmQgKFNvZnRMYW5kaW5nIFN5c3RlbXMpIDxtYXJrcEBzb2Z0bGFuZGluZy5jb20+
+iQE1BBMBAgAfBQJCg5+4AhsPBwsJCAcDAgEDFQIDAxYCAQIeAQIXgAAKCRAVnjeB
+fdZnZ6hNB/4ydPO7divBn2TXQ9mWDGHW+BLhYBYdjnTPww+yRw6Mli2MPraiephH
+9wqTZxxqWEgqYiTfGZczVs13pFSoBw5rSJRY2IpnroGL1FbnqFLs+x0n68HA9S1w
+wqE7Ij4S3cjkMFHFXKygd9yfZwPeRkWJEYhpiegL8gyKXOaonB0/w72EqbtZzS6P
+1rBwCNWn4mWzvP6ZU/lAdK516f/UA0WOH5kMo50USK/K0uUTQaqWhVTS5PtqbZ8w
+Co+sI+eIKwKxF2u/Zgh+4xEu8fejoIJ0eBhHbJr6FDsly2CWLFAGF+VdeBrK4dwn
+OH+PfvbP7t69LVBN5p0IWc8g6aX7j/e7mQGiBEODitcRBADw8W4HxnoOLyNsHslx
+l/frkiXGEPSBFtuH8mtBCc66m5rvwhICDtxI++5SCg+Sr9e5yICCwa1nUhgKNdwr
+rJLJzFxvAHwpYH0JyiWkKFvFntrFS8oeWO82hSDrdEHd4e/yk13vwO9nINFBuOBg
+I/kzGcE6dMJMBv8Uf+Dh4RzvswCg9id9znomgOg/P7EogP6LQLTGOwsD/AlA8gST
+9YBXOeP4MpZYgk9g0Y81yXO73RiGY+5+IzRGFXhqEmGcyI8DHhNumq9VLfeyGrcR
+ruPfvpzRDmQi3jZ8JXN5wsx5h6ikAn+I3THZOjnuC2l1PGl7iQC/tx05tD0hD9rx
++09mE0rskvGrn0rEkQTCECt7mL10YYLqhEMxA/4pRUch5krXuAe6+o1q/sNwhG+0
+D+SZj9w9Ymg9b46m1rX7Vg3QgRMtuXeI9bzBr1AjNRT2D8AETCFgnPuGa90Vl8iU
+JsjBtxyEuEoeg+dCucWTqM/RZZ8Fw4u9hSfOlZCtec0QLjhcCv4jRF4RtZEPnNdv
+73UFZzLqlHhfeV05hbQtR2FycmV0dCBSb29uZXkgPHJvb25lZ0BlbGVjdHJpY2pl
+bGx5ZmlzaC5uZXQ+iGAEExECACAFAkODitcCGwMGCwkIBwMCBBUCCAMEFgIDAQIe
+AQIXgAAKCRDJHbjam8/OL90AAKDwB4xb2oRPvhJ1fyYw0n/kMz+v3ACfS80jjppi
+rxYx+AwnJ/SJG2tIOUaIRgQQEQIABgUCQ5R5FAAKCRBn2bJJZ08F4CMVAJ4ysr5N
+e2MnyWmHtzlwg8It5blBxgCfWTnxQRd2028TQg69YdQi5C5bhoCIRgQQEQIABgUC
+Q9mo1gAKCRD3iHX2QnIfADWXAJ9lUJrHU6FIMhEx80bKru1gXd4h9gCcCEaE74nK
+xhyp1Cp5hS67VvzfnLGIYwQTEQIAIwIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheA
+BQJD2auAAhkBAAoJEMkduNqbz84vlDoAoJCgwCm8CfFC+C+0WNi4LEc83zkzAKCR
+IQK2TX2bXedu5vP3MsOXYKzx9rQiR2FycmV0dCBSb29uZXkgPHJvb25lZ0BhcGFj
+aGUub3JnPoheBBMRAgAeBQJDj7jGAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJ
+EMkduNqbz84vroMAn00APQI35sDGLsKTbtfEEl268mFDAJ9xuuDlitAZXFkTTKlt
+WcvQ6Do9GYhGBBARAgAGBQJDlHkTAAoJEGfZsklnTwXgyHkAn3QXKw7GtwHzZLfi
+hJW5fNWwISCXAKCcNb7jP6GLUqBs7VV5wPTLn6aAgIhGBBARAgAGBQJD2ajUAAoJ
+EPeIdfZCch8Ah8UAnRkEdrxw+jW4EqVNJ0vMthxDTjIeAKC9gDj0HPVKWIJ7x7/U
+oKSNhApv77kCDQRDg4riEAgA+bDfW6jLTUiDSgSdUo1QcslFFngqy7gcLApfAJNk
+WLwOHvjxZJqBnJWvf9w0XZTM/LvLZllnFNSez6j9tYUWtIW+5lU9jEyyIx5gYbvI
+AEUMhfvqzJ2MXrvuQ2WtRr5rh5ENPSlg8JQ/DhBlPUcGV1B8pitrZfrQUOltcJsT
+HryBdlKtKyRswBqj7A516W2ZQEFcTL3coNb31THGs7TbJj9/DElSAMSyS6bd2PDw
+7kpHB90mgqMQalqfHqIASVDK3wynyjiQlvWkG34eS+/O4rAq/14uGEGJdQiR0v+w
+Fap0sG13gVJ9gjQXDUXYfHtgGV1B1QKg80C6aV1s2PLT+wADBQgA8fyLjwRZ64SV
++fTIRzViNbMo0rH1/5fUsP85iW9cxKKKrbSAvnSyZYhmhiHE8YlCyYwQv4X/A/O7
++u8He+QcxsLc6QNj2X+gb12qPZym/R6owRzzraVb6P+hw0aigpT5b2bP/4xz6hcZ
+zsuB2QvXbMnXvIkHUpbFW3WoQt+/bnqSRy4rNpLp8DNbvsrk4G69U6EDMjOWUnvH
+rQpEO1DIwB+rr2gZyB59CPczbORuHaydYRnHvC+gB3vkiIabIWBryIDndtWnfuk6
+0QIC+JOq3M7BqiccWadwGnt/OTzFTyKpxdoIEjCPQxG+SDuXO9hQPyRaMtyS0EvP
+fVTkUQ2bhohJBBgRAgAJBQJDg4riAhsMAAoJEMkduNqbz84vHC4AnidfURCcVuIH
+VmnzRzaBW7TH4nNnAJ4mTOphUrkj5AXKYyjlFOT96ovp/JkBCwRCT8XeAQgAohmw
+geEqHoUOfJFWv900GhVXfFxNfil9ryJt2eTnd8Zpom21cmFcYNgvzSLBABKRQRgD
+VD65JaAjdmhN4UGzW3eqwdgQrwZJPinlafjjhNgaXVAQZ2vvC3NjZBUGHvi5O5wi
+AGgRi08zGEmrFTs/MbPgVymmF5XA66Kuh5Y/Q4axeyPmBW6XipNYlB+GIHM1+5nX
+Wztv7p83wEkyA00zceDjrBNNevvKbhiebi59mZEVmTH1ZA5RuqD4yuAto97I+IvI
+nND+GQKIQ0zOPeCvYZ8Y19OVrnJV0TsLsAGYXqPJJkALLPBqjE5Du2uDDO7I/3Zy
+K1Igf0okRXhuVWhjkQAGKbQcQnJhbmtvIMSMaWJlaiA8YnJhbmVAeGJjLm51PohG
+BBARAgAGBQJC3uErAAoJEMppOXSBA6N+654An1/g1QfRHnwv7P+YErEzc7L+zBsz
+AKCobMOYck69KQB6FaaAn8r6blhGx4hGBBARAgAGBQJC31FjAAoJEEHqCaBXk0mP
+lEwAn1X8mXdPf8nuQ2yjLBfDiqxcNQNRAJ9OamXAuthf7gDHavgli+pF6cEzJ4hG
+BBARAgAGBQJC5H11AAoJEIzjdrgc1IYfihEAnjwF5fMop7FYgAtL0Jyh0vSkvy1G
+AJsE7SAZz85yRZBMWi3zfL7/3Op4UYhGBBARAgAGBQJC5JAWAAoJEASRNELqG6ON
+Dp4An2IPEb+fcBDdMT5o0xCaMWeJIy7HAJ9LIxs089EHYJ3UaBwcQAEeL+nE34hG
+BBARAgAGBQJC6maIAAoJELK+vEAVKSSvqwYAniscHbze2zPR/woj7cpUXUTodQw6
+AKCy9Uzf4IU6hyo1WewO1SsxTpApUohGBBARAgAGBQJDJHyTAAoJEPwPhYn4lL4S
+sf8Anjpl0m06yi8kx62318neXjbEYCMgAJ0ajc+mMOI3qg0iSucHrMVqmpQJlYhG
+BBIRAgAGBQJC4TcgAAoJEKIRWuFfa4tyjysAoIfnXT5UIfm9Od7OqbUFQt31Fo0X
+AKCNwuY1yi36PR3pKV6aWC5ixLni8IhGBBIRAgAGBQJD+8MGAAoJEBU/oM11pnaS
+jv0An0Wndd/NnHtNj6PpLXK/3v6+dAQ1AJ9OJMRcE/8w6OI71WA91wKB9W558IhG
+BBMRAgAGBQJC3rJLAAoJEP1viMYh0Kcb8fsAnRILTd5GV+Kzoz8Pm7i9we50ALwP
+AJ4xKGHe58QJ6GQm5H1zw0QV/aEM0YhGBBMRAgAGBQJC3rsgAAoJEIuWKUP8JD88
+NTwAnjkHdWDleU2UkPsNiDln7rlxild8AJ4jYkdu874SvZkL2vjJtwOn6r2om4hG
+BBMRAgAGBQJC3rwWAAoJEDLJ5M42QstLIggAnihj3lriVCEWNBhX3zCmm2pNUHeZ
+AKDPB7zK6i+YdwPPeYkn70GFuLDzq4hGBBMRAgAGBQJC3t0TAAoJEO7R6jkiYdBz
+CxgAn00Qicsl5h896Yfcd/Cu7ZvN3cdzAJ0UnXQ4HiqMtls1nnUdh43dbVkORIhG
+BBMRAgAGBQJC32zHAAoJEFCOrsUwLaVoOG8An1jVflCH4WnBmwTH/UQaaOZOhJCi
+AJ4uYBKHVbiKgPoLyYcM35Lak5PUTIhGBBMRAgAGBQJC32zKAAoJEN26ZLosMS0v
+U3UAniut9FDsPNYCnVavQIcaswcR9ZmDAJ9WkmtABT2ldGVT3FlcGJkoK+0rCYhG
+BBMRAgAGBQJC3+75AAoJEFz9N/rMeMiTBicAoJZnaDEzG+ncm36lhwBjeqE1lkQ8
+AKCkzw6M3JqYgcOkP2gUluLkV24xuYhGBBMRAgAGBQJC4O1DAAoJEMm1puzi13Tf
+jvkAnj8oUnLOF3j69/gPm23VlX8jRhtfAJ4+XtMz9TsTTNRH4Hj/6SWmHdvgnohG
+BBMRAgAGBQJC4PG7AAoJEFuWgBDgT5qJnooAn0IwHM1GJwXm8MIEC+clkY9Y0rUT
+AKCGjklb3Ogxa8nRQgPoJNEliKNL4YhGBBMRAgAGBQJC4mOGAAoJEG2YjReHMVwx
+Py4Anjf1FW5/tamnvdcTFu3Hk9KSD6DEAKCf5gXupIu8Tn2YLjcThwZvcUuP5IhG
+BBMRAgAGBQJC41tZAAoJEBMuSdTkHtx+05sAnjdxmPycmdCt7bucRBM24sWuhRe2
+AJwOHGt0ogTQia0queOd/nkwd2nIr4hGBBMRAgAGBQJC42UwAAoJEHXKoqPzmzdQ
+tIkAnRiasHTPqhOJWPwPy09XfqpPKkNcAJ0c2sxjAVoIzJ6YKp09bZ+iiypzB4hG
+BBMRAgAGBQJC4+4DAAoJEDKGTkGchSIr/AAAn3U5cGGUdR0U6lwYIToHkr/revjt
+AJ90gsbzzTH1OIsP0FSCRKuLBhQahYhGBBMRAgAGBQJC5B9TAAoJEGtzoQYqYj9y
+7OUAoMh3EZ7Tso9CbmIr+xw91GjTBfRXAJ4tpuvn4pMsSkz1qGmKxkgnDdMKeYhG
+BBMRAgAGBQJC5RECAAoJEFJ5L6+ZeK+GRQgAoPQVzSw6oGirp73fFOWpgi4ksrQV
+AKDOE73eH7l3PFbG4vV5U2/Pa72ChIhGBBMRAgAGBQJC5pnyAAoJEGjrjHb46iln
+MaoAn1TGfmfx2PAXH/xQW2f1SzNhyhbpAJ4pOz/JxdxPh57TCTKACzqSyLuahIhG
+BBMRAgAGBQJC52HFAAoJEG6UdZTBUkMarGUAnjZCSy0Sm5uhMOmOk94qAMXGS5ko
+AKCcaapiq9AVz+GICb2vcOI6UlsevIicBBMBAgAGBQJC3q1RAAoJEDGmPZbsFAuB
+n84D/R834PgBiGaPSSMHV+cr+x9f6v6stXWFRyhWm1lffgo5x80o2pyosgiR1J3X
+qjtCH4Lh0yoRvQAGrluz/HCGMm3bN78Y+AjAwA8UvwcU8JsPTm8F8CyNIPVgCPP+
+RadE/u/nu3NkB6P1vnk331m79oEnKPDRea9rLxEJ/4u0JQmtiJwEEwECAAYFAkLe
+yPoACgkQN+P0X+5l4yHWIQP/bIc1pNECnZ/wfWpPwVcR5P4vHV1gew7uvnJgBNcB
+gLd3STCrd/v70qU3e0VOQNSaRNRF4VwAsGHk3qRsD6ytKwErbV95hG8GxnKcqxRu
+XrDI+9tZkCq1I4KygZaLtfsYCaA7Akc/p8fSrzjK/sGMqyijXvsaRggodmeNpjNN
+MXyInAQTAQIABgUCQt9sxQAKCRCazTzAqZ913YABA/9n2syOSUFxzLzA2vTpD/5D
+STdyc/FWBSf+4N4mAAkQXcxTjEQGhGwMDC4LvwyrlY+KsKgymTGsnyyIJPXMYT3j
+T33SKSXNl+ThgqCYaFI7eRdAdg6o+wWzb4+7fzDG8yjZ4kYrlYVHnbEPKxyMV+Po
+eL+G6z9R+QdrVpb6eihBx4kBNAQTAQIAHgUCQk/F3gIbAwYLCQgHAwIDFQIDAxYC
+AQIeAQIXgAAKCRApuJLQyGKFAUXSCACZABvLs+qb+glfGv3jPGCjug2nP7gcMk9Y
+f0bc296J4OmbWcGWMqaSNDF72+fPw5XUf/xGbqPMb43zT6NlVAa2jPYX6ik61t+z
+QeYZiVxEMShwL2st5QMrA9dGbf5VPtZ2s6n5zj7nx6FM9cg+y18D9VMyenz9H3OZ
+HlWO8ibN0ZtEZlRNg3uHjuaUlZQUHWzuOIRcCNwMqSP55Ykyl1LTs+slcl4faJDH
+xm8KHMWm6THceRMBunz45PfaWQqNSLhH4cyTh/sgkzONHyNWMWhVdfqPgyRBwUif
+qNanoBa0+nMAa9qG3M3H+3NgDN8924/gfNSm5VPCesB1aai71y9qiQE3BBMBAgAh
+AhsDBgsJCAcDAgMVAgMDFgIBAh4BAheABQJCzg5eAhkBAAoJECm4ktDIYoUBvYgH
+/258awDCARVMruf+NRsFpvTx3pMt/vn+iqCTXDJbEfvkfXobDzfXNOEVaw4eHPuG
+swKlM4w9Tl3V5fKpXmvMVkDI84wd5IeFFDsYI/JRLQwvEH9KMlqkzMX+0JTlIrQ2
+KePtsbt3Qt5eClu91NrwZyT6LMp2WyovoG4Kan00wteJxYZDlUkLR0yUlYiru3Si
+ZrkRbIO5bOZGBRU76wwj/9kzCY1BOLGJyFwm9IXnrIHAUTiNwcdyG7029xshoOd/
+a361dPozUcXJBcR96TyaUrJJyYT6usvEPNaEFJXO5WcRn6eipdXpPytZKlznGV0J
+rwvf4CyGcfs/OWKFcD+fTy60H0JyYW5rbyDEjGliZWogPGJyYW5lQGhlcm1lcy5z
+aT6IRgQQEQIABgUCQt7hKwAKCRDKaTl0gQOjfv45AJ9D5ukn9j4P5o7YoxUk0QzT
+Ar8p/ACZAR9DPnFPbcTaEueHLOBtaQbr1mOIRgQQEQIABgUCQt9RcQAKCRBB6gmg
+V5NJj5RVAKCDETG+OW705HzeUJ2kYIYEWoA+HACgpqP1e7kr47dOPCsUNeFD1WT1
+zi2IRgQQEQIABgUCQuR9dwAKCRCM43a4HNSGH7NwAJ9MayifnhgUudUZ71wA/PHj
+JGdyRgCfe56gHFJXJ1BhF5rdGnK3l5pQRgiIRgQQEQIABgUCQuSQGgAKCRAEkTRC
+6hujjSAWAJ9U8Te3DMiPsllbqWyoUys9aP/juwCggX2/hvmvw299vejERmYWHDh+
+6CyIRgQQEQIABgUCQupmjQAKCRCyvrxAFSkkr8dcAKDD8ZPkkKXqBWqAIzLeP1nt
+l4OJKQCgm04OSIxAB4wPLg7e4wmQbh7RtV2IRgQQEQIABgUCQyR8lgAKCRD8D4WJ
++JS+Eoc8AJwMIYu4mE/9B+B3Y2WFeTHyapu9MgCfVFcayG3g/LYWEl9sBxpiNoCg
+KKeIRgQSEQIABgUCQuE3LgAKCRCiEVrhX2uLcjMLAKCfSfngRkc7HDGn9sneEfFE
+Au8LMACggMMpFlFuQeoyyzSa7+qhgL6CF32IRgQSEQIABgUCQ/vDCAAKCRAVP6DN
+daZ2kizfAJsHpLPJMUWRWYlP60YAI1mN5FMQfQCeMqcIKmAO5qgrcYqas6khc1DC
+c/SIRgQTEQIABgUCQt6yTwAKCRD9b4jGIdCnGzfeAJ4otI73DOxOvTpC4nDlsxf7
+XG/uCQCeM38+DU5q1rpOY6VQEiT63Ig7ybGIRgQTEQIABgUCQt68GwAKCRAyyeTO
+NkLLS08SAKCrmvDHi5s+pf3dslR3xfTqjGnWSwCePu2D436BPCTO1VPZgiVShTXU
+Ii2IRgQTEQIABgUCQt7dGAAKCRDu0eo5ImHQc3yAAJwJCADK1nhOE6/mHgff5/0t
+RvYg1wCeK2IIQ0phO2YVPKRn3qEu8JqzOp+IRgQTEQIABgUCQt9syQAKCRBQjq7F
+MC2laFCeAJsEZJNP+BjveUNhjVSUGqXyTue7EgCeOuhAexkgD7FQDHYtE8m9tQCX
+mdKIRgQTEQIABgUCQt9sywAKCRDdumS6LDEtLzG+AKCP6YbRqI62E2l6MieRwbUI
+SkV2awCggR2BPayWVN8wkSxjg3CViMspga+IRgQTEQIABgUCQt/u+wAKCRBc/Tf6
+zHjIk7gsAKDJPMkBsAn8n06X/XpUnKzykvlPowCbBQ5GQwiauiYc5yxQIOsIQ3n2
+ODyIRgQTEQIABgUCQuDtRAAKCRDJtabs4td033njAJ4jMwBRClEm+C+XVEwb5cvt
+FITYrgCcDXrVPhEq6SNm06cZHXZjF5a/DKaIRgQTEQIABgUCQuDxvwAKCRBbloAQ
+4E+aiVDJAJ4vjfHl2F53sidNRXGH9sfpH7ivWgCffFEY5R7xaWnVGMVVeojviTih
+WneIRgQTEQIABgUCQuJjhgAKCRBtmI0XhzFcMZa4AKCJiJ7hXI7xm4djzit9s+7Q
+cmsezQCfSXxTkp5gyf4cQA4Yml1WkL4bLD6IRgQTEQIABgUCQuNbXAAKCRATLknU
+5B7cfp7xAKCJiFE0RQwgu+BxGbwllPO7bVwoagCfRT+f3rpWexc3ts8pqTMEZsVl
+B3GIRgQTEQIABgUCQuNlMQAKCRB1yqKj85s3UMINAKDMDNl7upo6kCCautrlbG5U
+xZrlFwCgvcRgfwi+H9PQ5SxG40W28pvls4uIRgQTEQIABgUCQuPuBgAKCRAyhk5B
+nIUiK/mNAJwJXxs3/3OEVhUgNYZUl60SuPMkFACeMN8MvsCVpRmckq0Jd+LRB/Em
+ycuIRgQTEQIABgUCQuQfUwAKCRBrc6EGKmI/ckuiAJ9LtoVo132PMjgLpO24oCGe
+uXNasgCaAmv/wNwyXTrrUY5btz9wkqzGvC6IRgQTEQIABgUCQuURAgAKCRBSeS+v
+mXivhluzAJ40tOJNa6mj4VXEJno9R0ovSzRX0gCgzzbbGOEJ0bb55OLYbiPd/rC2
+mIKIRgQTEQIABgUCQuaZ8wAKCRBo64x2+OopZ/u+AJ0ae74j4TuwVJsxREO5eivV
+beFzNACgkGjbbHbh55dyxmZFyXjHHNYcPJ+IRgQTEQIABgUCQudhyAAKCRBulHWU
+wVJDGh5gAKCbFpOJZB8ifBj9/rlMgTX2GYZr9ACgxjlY7uRukYPSVsdT1bhAPiO3
+43aInAQTAQIABgUCQt6tVgAKCRAxpj2W7BQLgdeuA/4gWSDeX8ywoT6kf7guzNUk
+RcxBIxvqg193raxQXwWP6OoCFL4fJ/Uc/uS0UlxBEtujruxiYveykyqN38+epfLY
+Y/1hEsDc65yMH2E3I02Cs6Vqz19oR1h5BZqH82Aw700mOr7IYTUb4c7KKA2fNFzB
+BeP/l7HI9HRDnpWDKZwpy4icBBMBAgAGBQJC3sj/AAoJEDfj9F/uZeMhMBgD/A31
+xCm7ON6txAkVsNo6LKoJX8u0WWSdx0SARU+/9dlSxGXHC9UEc2kiGvnQSHl72Mpi
+uN78PwDc73n+Pap6SZMAL3Vm3han03+Tou/MDE8dllvlqW0xSNi39xHTNpHnIjTe
+mjDvuQOqNUY3oljaSGnW4xpRZEArwBmU7rOJ3pH0iJwEEwECAAYFAkLfbMYACgkQ
+ms08wKmfdd1RkwQAtbo9aOVHC7ocJIkJbndP4mkAOZiEyyEuZlEi9ao+6qNrLlFO
+ELZ5MHTpe8hdpGBMCpC15/dcxDavBDpXUJL5g4yt817jGZP1zaCNvDqBDQULujav
+maQdmkj2nZ6pPa7wUvtp8iC6pgF84g4z+B4tr46y3oezt9EdQK/GftiwipqJATQE
+EwECAB4FAkLOCrkCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQKbiS0MhihQHu
+Dgf/cI88QbiS1bMpRtStZLsJxrK69Pj3gA49N1z+plWdffVRrdJxpPq/bMzTC7gz
+uKwDRZjm2SSnoY2pdXXFrRot/ApqUfUHEj3UY2udz0XNrrZg7pEJsTasEaOdc9ww
+Y9Q95B7n0AZrnI4fpiBpEmwFXnYPkEnV9Tor/SXgPOS1MGfrBM21u8hNJ2WsjYh/
+w4N2Zqdboeoi4sZCAvYQ5fI5Iehve7K8hnt5a4QRihdedYqRhL2gkPhp44zjZ7ND
+xzoLku3dxhmwMcuPUPw6HcTJzA0RvLdRcPWdv+BIrLZrd4s479jqW421xb82Lquh
+dxBE90OvAvTfVjMAoX/U5KWnw7QgQnJhbmtvIMSMaWJlaiA8YnJhbmVAYXBhY2hl
+Lm9yZz6IRQQQEQIABgUCQt+SLAAKCRABBWa85BNjkhbFAJdLSSTToeID1O9tzXML
+QsX+5G6VAJwJ5omvtxYqY3M7ZVwLGQgvHFj6uYhGBBARAgAGBQJC3uErAAoJEMpp
+OXSBA6N+RK0An19Ht1wFV+8whLQDm44J+glw5tWlAJ43rAH2I6E7P638J7hWJV7D
+IfGi7YhGBBARAgAGBQJC31FwAAoJEEHqCaBXk0mPMfEAoJ2tMGqdyMmBes7b9Ark
+gdey/4wxAKChoCWI+Wzo3kGPIoU8KS1X8CmhMohGBBARAgAGBQJC5H13AAoJEIzj
+drgc1IYfxzAAn1qJe0dvrdKyxw+fKKqYOr2Vz47CAJ97tTDYe12XWbxhLvrDGpcL
+aO3YB4hGBBARAgAGBQJC5JAaAAoJEASRNELqG6ON3wgAn2dAtfOZNciKpqTiNgOD
+3ir1bK2GAJ0T8ltPa2ml4AndIGe5ZhrX/bSefIhGBBARAgAGBQJC6maNAAoJELK+
+vEAVKSSvjMoAnjKDuJXg/RWM9hWtfO4KHtcdUFE6AJ4kkAQ5Wwongv03xxTG+fKy
+yNnHDYhGBBARAgAGBQJDJHyWAAoJEPwPhYn4lL4SCD0AniOzQJtT8K7Di7Fd1HcM
++5zamPRDAJ9x9w+bIZi89Gzv+H7pg2R8gLdZd4hGBBIRAgAGBQJC4TcuAAoJEKIR
+WuFfa4ty6S4AoIZ82kxJPQc6+T5zny7qJmUv0UxLAKCyiSf9S6MYVfUAsJcvxuKA
+j8aZeYhGBBIRAgAGBQJD+8MIAAoJEBU/oM11pnaSdV4An1CiGlBNqkcLkkpMadik
+OsrWj3S6AJ4suQqs3HlmKCCGR91F2n3uYh24nIhGBBMRAgAGBQJC3rJPAAoJEP1v
+iMYh0KcbUzoAn1SPzKEwhg2bEh/E2xEH68mya4bkAKDzlH7PzieNCSrQYXI0dMVm
+yifxl4hGBBMRAgAGBQJC3rskAAoJEIuWKUP8JD88cCQAnAr6hUUGhg7Oc7cyNewv
+v7rJV1FJAJ9BjXBbp+wLMZNc428IsDinSX6lnohGBBMRAgAGBQJC3rwbAAoJEDLJ
+5M42QstLLLwAoMhJCFQyN7k8EdfPq0io5oJDPNfQAKDHJpkNTnIOax4roxosAFYI
+GjddSIhGBBMRAgAGBQJC3t0YAAoJEO7R6jkiYdBzi30Anjclzhw/gzmEQPBVMzs2
+0iP9OmvoAJ0fw+O69dOvB65XdpQQmISmWOsC44hGBBMRAgAGBQJC32zJAAoJEFCO
+rsUwLaVoI40AnjHxtEMPGXfiuu1HfPslpM9aauStAKC0lgaspKHU3Q1fbkSyGfPd
+dnS2JohGBBMRAgAGBQJC32zLAAoJEN26ZLosMS0vyAsAoLrfj1LHh89eUbt49KnE
+ml4gTacBAJ9kYvlzks+e9dFPGp9x301nP6PakIhGBBMRAgAGBQJC3+77AAoJEFz9
+N/rMeMiT1JQAmgOj7lcQASFubjtGs6mrT5JtXG8QAKDjdALPPpD6EwP9Wd/1YEFY
+zIdYFIhGBBMRAgAGBQJC4O1EAAoJEMm1puzi13TfhpkAoKorofVcb9tokfK8l7Re
+o637pos4AJ9Xipq2ieuKdu5Lf5MXLZrcg3WXj4hGBBMRAgAGBQJC4O3VAAoJEDf2
+j/UBWvyKvBUAoOqxd0SvEdnWidnEBE68Rb+mSi5vAKCd+BcWQvbrBM+LDI9V8BI+
+eXM9zohGBBMRAgAGBQJC4PG/AAoJEFuWgBDgT5qJxNoAn2RHGID4lJMnSM5ykFZS
+S1ilv9n/AKCKLWw+uXNoKTAOsgI4AC8/vo93c4hGBBMRAgAGBQJC4mOGAAoJEG2Y
+jReHMVwx7IkAoIhBt/YoFo6dZoST+9vxtdI1jK9JAJ9/KmvnqcVif3W+o9SXe25N
+AzM644hGBBMRAgAGBQJC41tcAAoJEBMuSdTkHtx+f4sAn2ffIfmDO1jFmojkxerL
+bihK1PfQAJ98/amS/EB8So6hje857mrAlfGRm4hGBBMRAgAGBQJC42UxAAoJEHXK
+oqPzmzdQIv8Anioy8g+a/5XYXucQ6/u5PgKid/uyAKDcDis6wUFmiTyjNvRY5wuk
+6tLHA4hGBBMRAgAGBQJC4+4GAAoJEDKGTkGchSIrKUEAnRz1V6lvWM6Gf4gJGFlI
+MPOFuoSDAJ4/LLK8D6v1A9ZNwvg9TOaoaDJmB4hGBBMRAgAGBQJC5B9TAAoJEGtz
+oQYqYj9yG60An2Wle5LQhVMZW8TzhjVSAJtzmvd9AJ9zpqFttnj60V/EVlQnuUGl
+srPT44hGBBMRAgAGBQJC5RECAAoJEFJ5L6+ZeK+G/yYAoMdijd/ZVgyq09aNyQMj
+cYLA9Z+/AKDk4Yzm9m7fXzFUCu8P6HQEnNbQCIhGBBMRAgAGBQJC5pnzAAoJEGjr
+jHb46ilnyg4An08RlUHPxabZKqyhGzsGIJhpv3MUAJ9Qf51ULX8618NQPzGMeo2M
+Vq5FVIhGBBMRAgAGBQJC52HIAAoJEG6UdZTBUkMaVCAAoMi3+Ncoe/LnrIdEHwuI
+QMLFfCg0AJ4/oaHgmhXjYss3NcX5rafEpu5QqoicBBMBAgAGBQJC3q1WAAoJEDGm
+PZbsFAuBcxUD/jvTknaBf4mrliwwuVqBZ3QE/W6CDGaX99v9GuU26uylFVLoHWdi
+mVoX/x/RW2BOdSCdCUpSH09sQJaH1ywSA2sFYzE85sBEJQHj3vTgOmA8FM2JClml
+Wmk0kMVc8QZoAugSXi1zVYjKNjdLC3hdN26BbKXWH34aYmcfnStF6pvwiJwEEwEC
+AAYFAkLeyP8ACgkQN+P0X+5l4yF65wQAl3CPdjoSZ0GqZsOaXkwrg04HszMeSMom
+xF0K+mHlaxIbX9ZJYUYQ8JH0hl/SDzjrPXyc6mlhnXRBaqqUyjQe0BG6MnOWZ6yQ
+JkoKE2hahht0nSRO+aCoHdrnq2TCcX+T8bCqJyoIUX52nHA3VBMsD+rOzlgrZ9DO
+/c+wZi26CLOInAQTAQIABgUCQt9sxgAKCRCazTzAqZ913UUaBADGK2M4Eyuwntq3
+jzZDKYfqztHQUvZC77AkPVqWJcjaowIf4t+0JvMKcLV464F5gYK7WTJEapYTymFS
+vm90flM4muBscBYk4rtCV33KZMmWQg6kRJ7m//w+xceBNIgJp66F9ySNWdzESQfv
+eSxnYWcBzCd3xmmFTlu0jR1G/rUyAokBNAQTAQIAHgUCQk/GLwIbAwYLCQgHAwID
+FQIDAxYCAQIeAQIXgAAKCRApuJLQyGKFAbIMCACJsAo53d1baydJ9fC6bpXL2UI0
+si9NYoIbRp2Uz7jQAcy7UGsH38ksoVbVI1keO1kMKXYVOL25FDAS4h9RmjsiCNPL
+4eikwHWERQ8HIjlvCLE7W6zqgNhovt3lww1DhOCS+9w3qCK2CTKbCHHb+Om3nv1F
+LfPzlTKeqIMbsw5x12qYba9m2w89EI2OX9NBsRGksMZ2k1g7PjYHX578Zjmy/cjW
+jDjGtDTnm4qVwmE0bKEkCbC69O4XQty7To2FrMoPIIhBXxeVS1e31mhv3/qz73ld
+264P2x5EBQuXTcDGZP/PwOxstelt+h5V+xvDkUozm+iZfMg2S+IdM36/joWJtCZC
+cmFua28gxIxpYmVqIDxicmFua28uY2liZWpAaGVybWVzLnNpPohGBBARAgAGBQJC
+3uErAAoJEMppOXSBA6N+58MAmgKoD/xtD9W2QdSoyMiOzPwVq2R6AKC1ZSJdnpoE
+9dYpjY4pAngrkp2zfIhGBBARAgAGBQJC31FwAAoJEEHqCaBXk0mPIawAn2fjZAeW
+9VOWAqzZ0NOQtyEPSX+JAJ9lTTdUx09JgQ2oPF3b741lrMIa7IhGBBARAgAGBQJC
+5H13AAoJEIzjdrgc1IYfg+AAnR0AFo8Er6vN5RFYSHcj2ViT1wLjAJ9yLYgpSf/+
+/pIRjeu4dbNXHQikKIhGBBARAgAGBQJC5JAaAAoJEASRNELqG6ONa6EAn35VmMwb
+qL7GflDfHUAE05dkq6OTAJ9ZnZzVX/2nRqY+gSQmVBjwEzhVmIhGBBARAgAGBQJC
+6maNAAoJELK+vEAVKSSv5XUAnRhwW6w95vzVOQTeNhPsqUCnEsJ1AKDL7nb5A+w+
+CcOSptrzUweQZ9mLrIhGBBARAgAGBQJDJHyWAAoJEPwPhYn4lL4S7DYAnRZRXJIS
+/Es4GdYkKGZKvA162mndAJ4ynlOAcMznKqZV2vA8PEwEpnrRVYhGBBIRAgAGBQJC
+4TctAAoJEKIRWuFfa4tyRv8Anj7Hd67er0tDxInXppwhHwjF6yljAJ91RWhrbrbF
+dAzZtgVYTn/Fkn3IG4hGBBIRAgAGBQJD+8MIAAoJEBU/oM11pnaSTvMAmQHR59eo
+AzjAynFO5voQ68PjCFBBAJ4+INZGDaZ+IK2OC/BY0EQdrYN6/ohGBBMRAgAGBQJC
+3rJPAAoJEP1viMYh0KcbG1cAoL7Gel+r4xNdfYe49ESPnf6i9wO5AJ9bdi0BFUey
+6zTzwMGnVZ04Xe8KVohGBBMRAgAGBQJC3rwcAAoJEDLJ5M42QstLULIAoNeyhfSD
+dXt5Ri58S8pW0s0cBQpaAKCFN2LdpbHyYKhQSp5hMEfRB4uSiYhGBBMRAgAGBQJC
+3t0YAAoJEO7R6jkiYdBzFEwAn0C1cMlnMaStRbY+o5in/kiCkTSqAJkB7CWVXvQu
+1whmFsJw/S4bbiMNFohGBBMRAgAGBQJC32zJAAoJEFCOrsUwLaVoWAUAmQHzk9JZ
+Ab+wQuihNwqByTImPQzPAJsEEYt3drtRaebklOr5qbucyHF5kYhGBBMRAgAGBQJC
+32zLAAoJEN26ZLosMS0vwx8AoNEt0SN7Th/4m4yex/acOaCNO+hkAKCfgU+8nrwz
+qyPvwl9LOePv1cCViYhGBBMRAgAGBQJC3+77AAoJEFz9N/rMeMiTMiMAn0o8t8DR
+1HVIPTvFzX+uYqMA3xJOAKCCgzePrTTPpJfeaLVmGAow3gScD4hGBBMRAgAGBQJC
+4O1EAAoJEMm1puzi13TfR1AAoKrgASZr6+KnB95aaAFcL1u8VN1DAJ9VQmesQ/C4
+rCrhWcSGkxWVLw10mYhGBBMRAgAGBQJC4PG/AAoJEFuWgBDgT5qJOJ8AnioFeFTM
+LRSPGumqjQEnWtIbGjspAJ9CcEEBRoYLJjQHxgzo0vPge9fMYIhGBBMRAgAGBQJC
+4mOGAAoJEG2YjReHMVwxsXkAn1YsuqEX6oGvyqb23hC3uRpGR+99AKDscm3t9mVq
+mV3FaGbqL7ojzrpJh4hGBBMRAgAGBQJC41tcAAoJEBMuSdTkHtx+b3wAnir8fXYe
+DQjEDQRmXuvxBwdakS27AJ96zI2cA7+8cvzK5obY6bx/iuu9vIhGBBMRAgAGBQJC
+42UxAAoJEHXKoqPzmzdQsMcAni4YUk2u+3kQY+TK27G5DK6ZDlLKAJ9A9u4fQ2LZ
+pcq70qGSUpB3XQOzr4hGBBMRAgAGBQJC4+4GAAoJEDKGTkGchSIrur4AoIKYVuBN
+j6zHCoadA7qZG8Eei/AiAJ91NI9tJEuKQofLmxNAuYvEHMa3KIhGBBMRAgAGBQJC
+5B9TAAoJEGtzoQYqYj9yFagAnRO7pnGKDc0TZOzAXNYGhxenZBCMAKC15pKRqp8X
+ZtXJ6ro9Fz4PFRzWDYhGBBMRAgAGBQJC5RECAAoJEFJ5L6+ZeK+GtJ4AoIkQI8O7
+L5Py7kxY66pO4c3tmOC9AKDwpy4YUhY7OHkwcBXMxjygmPaLyYhGBBMRAgAGBQJC
+5pnzAAoJEGjrjHb46ilncz0An0SSIdfEDjudWMcmxo4clwU5ved0AJ478y9fB8HK
+hFzjyBmvDWGnOLJKyIhGBBMRAgAGBQJC52HIAAoJEG6UdZTBUkMaUZEAnjCQzVYT
+eCj9EemzGHW2bt4nq1etAJwKF5dGPQ4184E2Rzn9stq8KAyG1YicBBMBAgAGBQJC
+3q1WAAoJEDGmPZbsFAuBocwD/ioGcJeupW1kPzxZoqhHOVZdMsDsmJLRII/v7fCY
+qgbf/gfYL6+9h8zHLAR4rPpsj1tVR7O+o8aIpzoII8frlEG3x5j6Q8QxnGd8rd2h
+1mkmWMQXmIsZ4AZFMkpnkgatNtbsvA367nwABJ9fWZMt2A+Em4bua6h3FP+0SCxH
+gr36iJwEEwECAAYFAkLeyP8ACgkQN+P0X+5l4yF1vwQAivOP3UPyw9giRaDMoLw7
+2BeCsu2y1L+926VxF54kZ1wHRZHX2SeVo+ZdHjSGmbqzi9laCJicEAzzwYfG/oNI
++TT9KEzsl8cs7kU90HjP9gnKWB2ZNagx1e5L5Lspw0SwuSgq7NNtGTMcAF/xFwk8
+rDTNwAOde66CPWdsjlBngkaInAQTAQIABgUCQt9sxgAKCRCazTzAqZ913Q7xA/46
+TN+6YsFyezr62A3rr8W05A5urEXzCr9eZdGyHNgDlfKppjUhQKYQG5hP+pZBwPko
+s7h0biFgrmTcM62m7HPx3BOXWG6eDe3h/0ozNvLwKcpTxGD8lXlQ7Y4CgHYQdOI2
+zbko/fba+bhoCC+ru7Lc8jfwTUrU/l6gLhX4a/b/2IkBNAQTAQIAHgUCQs4K/gIb
+AwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRApuJLQyGKFAQqtB/9QZ7y5AJPEDsN9
+x76V8wqpHL5ueT0b0m+Tg27D+XpuNmJLgin8b2ZJoptwJJgFE16lf1JgfVEfcp4M
+PJsqnYyoT3eRiyUzFnSGSTOj4WBZ80ufI+ykL1OByNyHOPBZq4Qd+76ymw3Glx/r
+uwjeQiIvNModZW18JIPw0DRWfg7H/weOd5uW25/i/YZKNPkCoW1KvUjHi5lqTvAE
+3DNWQQ6Xw4A/WW4/6WdSQqiKRMZnp5aV/Dp0YA9RgADlcrJdKh4BAn0Q/GEkBERi
+7zdCErbNh0giDOR9nNfP9zgPIxTY56sjnLl081ggGMlhxR9ESu0G6AEYgEU2lTlv
+i8GMmzl6uQELBEJPxogBCACsFe7PW9eEAp1bL67yK2fD/cnkTFZYR3nkf5cQEmqN
+6Y1us36eSGPkFTVmhsOjfnzv14ks9Vhum5leeVvWQRJxzJSfDOgtu4vWESptwYdA
+d3ZQjmu7AGo9HjIgRdwInAaxLOSjPKGsHkYc9OThkvS8/IQW1xaA1G4XWzmLZaOE
+Y56j6CDIpGQsz8RLjfq1f/6R20yvQVtS0n8YBwM1W9o2Zekhkl4KMHpEGpZaN85s
+bn7bTzeJffNPTDAIt47q7RhkA0HzB9YJ2twScIdSA/aqoLqdv56Mz935uVUd1nCf
+/ONhIjKrSnyA9yu819Fw97+9WS8jpajSFi29+t1Rf+9FAAYpiQEfBBgBAgAJBQJC
+T8aIAhsMAAoJECm4ktDIYoUBTasH+wVmAGsAMC/l3w+mYHUMoqUSLABoaZ5b9ZZe
+OjVa6mpJQCGK1QqS3MaXNpjBFhbQEcgRvVZ3aI64CxHqJv7tmUYz2mhz1CtEUsy7
+Cq0AG11ZEDZCWT4Do8xyFtZRkSSJ3oxMTkF+VduP0D20ag+yhiD7wv8iEC/Mwk+Y
+4wlA1UqFyONjERV9ujtVUgDmtFKban7t63xDbgI3iLY0dTomJU6hWoOE+BkeSFNi
+zrvD3JXdaWNiBB9csYvSgHTB9+WIITjfzv0i2m0Jx5zYu9WvEgBPe5qvmYfI0Tex
+lMdjxrtIQjZuNWHf+XBciAw14ouXbzK8StO6Br9XM/LsTVw3dMCZAaIEQ1/PnxEE
+AIMNMWC8W3GqOQmxe1rIWGBQZxZqYef/E0fjpYxZPXQyv7w85tDglJBP4/Xh25YW
+QSR5VUkBFeTBkO2VOcTr+hLwcxEFPKKZMA4oDDxIsOK5rDKZssTOb1MEZjcEi8Qa
+tHo+rrFkcTLYbScvdFzbKcNAzxevGITFKdN4lcxjIrmzAKDCt6E/l+Jx13SUAxEy
+IwYyULVKTQP/WyINg8IYFHNRuPabfHIXjsUndMC1xaduLizUGBWflvzY1NN5mT5c
+646nA5u8876pFsNLeWQt1LjaIuHhZcdJA7j17kX+qpAuk6Q7zS/O29/vnQm6UWFU
+uYHeOB/jiQcA8GpzpWASTbpcPAdYWrzEbpd+Pbsc5mBdL1wdJ3CB0dsD/3uLJUag
+Vs0uPBZAktoduJ2fS3QMA0+7mKQ2W482lfVhvgd4Q3c6vk6y7sXOHmy9IsGiht0E
+o/6dnWF8bLJrty30VlrPeN5W+aXYSHc2rVrgAGeCEjHaWelNtOYB4bg6CLsgvXv/
+oC9AlD1IKD5IM/P3fZa+uetceOq3NG7Zqo9otChQZXRlciBOLiBMdW5kYmxhZCA8
+cGV0ZXJAZmFtbHVuZGJsYWQuc2U+iGQEExECACQFAkNfz58CGwMFCRLMAwAGCwkI
+BwMCAxUCAwMWAgECHgECF4AACgkQ6GFjKbrWIbbrvgCfYyQhtd+wedK1XQso4hh9
+98RRkNcAnifJgi4IaL0YwD4HD59cbQBTOPkiuQINBENfz7AQCACLBahiHlmVnJlR
+jGX0ZtQjd2yMtcE0TN+JpRMJ6BtKzEVj1MLDy+rZCWDatAJFrMVqvYlTdW97yVl7
+fcKhGfMs/veMOwT76LZ8rBMgbbtKlZrMArqrR8ZpAWUMpLGYHHaJq47g1p9e/A6u
+fQXURalhDy44zj1XoboYSV98ZfXhwBIDEeqOu89LWZlzJvn8GutKUUAbANULFL0E
+g7WOP6VsbbfJARN2euBdSvN2dAHBlYvhnMf+pdWUhWaKQ/VotL404b453dqJr9aB
+IEZdHkwhxwxbS/662DeuRYAMCOl5KST6nIC4HxRpTrTh78xrVl0Ek1xwOLO88JAp
+98BiubVTAAMGB/9pHbd6lfZVREcGTXZYheriKmLRIUP7gAlZlFiStTOIIkmuXO67
+TgUV3kFkcOzEY7+ERacwaZhpN4FilMFrOgbkDDF+6s7puZNJ0G+bMFkjeGcQ8boP
+RRASFucFq1lZ91DkcgTyueOLrrRccm0O7zfO0PBRfoPItEqqDs1rt3ql+p43XsuM
+iV3IAEVoC5JbxFjrT+RvqHnkismnppALLBjUVYOjPG0nyXK8mIk768TrEYJtfkJX
+uZiTAvi98dOowhJgLFux4S6LZG0uqnYVx1/W6BoOpZAxbao9GOxBE+QwExNu+5x3
+vozVltBMJj2o9i6vMzgfrsp0H5B0OYoMuyhoiE8EGBECAA8FAkNfz7ACGwwFCRLM
+AwAACgkQ6GFjKbrWIbYWygCgmw8Ch/BRFvEdq9Y0WCH8agqBSa4AoMJRQPkigiGt
+ue5s0DtZ1WJgpzQU
+=0Kc2
 -----END PGP PUBLIC KEY BLOCK-----


--- subversion-1.3.0-neonver.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr  4 09:10:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 05:10:15 -0400
Subject: rpms/checkpolicy/FC-5 .cvsignore, 1.58, 1.59 checkpolicy.spec, 1.95,
	1.96 sources, 1.59, 1.60
Message-ID: <200604040910.k349AFvo024659@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore checkpolicy.spec sources 
Log Message:
* Tue Apr 4 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.3-1.fc5
- Bump for FC-5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/checkpolicy/FC-5/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	22 Mar 2006 16:51:15 -0000	1.58
+++ .cvsignore	4 Apr 2006 09:10:13 -0000	1.59
@@ -41,3 +41,4 @@
 checkpolicy-1.29.2.tgz
 checkpolicy-1.29.4.tgz
 checkpolicy-1.30.tgz
+checkpolicy-1.30.3.tgz


Index: checkpolicy.spec
===================================================================
RCS file: /cvs/dist/rpms/checkpolicy/FC-5/checkpolicy.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- checkpolicy.spec	22 Mar 2006 16:49:15 -0000	1.95
+++ checkpolicy.spec	4 Apr 2006 09:10:13 -0000	1.96
@@ -1,7 +1,7 @@
-%define libsepolver 1.12-1
+%define libsepolver 1.12.3-1
 Summary: SELinux policy compiler
 Name: checkpolicy
-Version: 1.30
+Version: 1.30.3
 Release: 1.fc5
 License: GPL
 Group: Development/System
@@ -47,6 +47,23 @@
 %{_mandir}/man8/checkmodule.8.gz
 
 %changelog
+* Tue Apr 4 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.3-1.fc5
+- Bump for FC-5
+
+* Tue Mar 28 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.3-1
+- Latest upgrade from NSA
+	* Fixed checkmodule to call link_modules prior to expand_module
+	  to handle optionals.
+	* Fixed require_class to avoid shadowing permissions already defined
+	  in an inherited common definition.
+
+* Mon Mar 27 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.1-2
+- Rebuild with new libsepol
+
+* Thu Mar 23 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.1-1
+- Latest upgrade from NSA
+	* Moved processing of role and user require statements to 2nd pass.
+
 * Wed Mar 22 2006 Dan Walsh <dwalsh at redhat.com> - 1.30-1.fc5
 - Bump for FC5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/checkpolicy/FC-5/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	22 Mar 2006 16:51:15 -0000	1.59
+++ sources	4 Apr 2006 09:10:13 -0000	1.60
@@ -1 +1 @@
-20f388415dbdd002f0cb3bf726df0536  checkpolicy-1.30.tgz
+82ccee7997d31663c842c707b4771b70  checkpolicy-1.30.3.tgz



From fedora-cvs-commits at redhat.com  Tue Apr  4 09:16:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 05:16:01 -0400
Subject: rpms/subversion/FC-5 subversion-1.3.1.tar.gz.asc, NONE,
	1.1 .cvsignore, 1.18, 1.19 sources, 1.20,
	1.21 subversion-1.2.3.tar.gz.asc, 1.1,
	NONE subversion-1.3.0.tar.gz.asc, 1.1, NONE
Message-ID: <200604040916.k349G1sd029244@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	.cvsignore sources 
Added Files:
	subversion-1.3.1.tar.gz.asc 
Removed Files:
	subversion-1.2.3.tar.gz.asc subversion-1.3.0.tar.gz.asc 
Log Message:
- update sources



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

iD8DBQBEJKSiCbw14+5QZGERAifpAJ9Xoc9z8T/kieXGCXKo4vBr1wlRgACgvvw2
7QqGfPiN/cUTAuTpobiet9U=
=BKtf
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)

iD8DBQBEJjpl6GFjKbrWIbYRAo2FAKCOr2c3iu/hhTmToE3iwj1o0NfFfQCggYKj
ia//Zk2/nT5OSdYCvkA6cfA=
=znph
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (FreeBSD)

iD8DBQBEKMHRyR242pvPzi8RAl7CAKCvEpuAb66tLuV5iBZruX3N0t4xWACfVYEm
3RMXqaYvCQcCPI6EImLPq7k=
=NQZI
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (GNU/Linux)

iD8DBQBELIk71sYklxbYtBwRAlS/AJ9J1SOz8JSP2jcyjPUN5Lz5uiTLIACfc+gi
SMp8A8h0rvx0PHCDBuTnM30=
=adC7
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/subversion/FC-5/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	4 Jan 2006 13:07:01 -0000	1.18
+++ .cvsignore	4 Apr 2006 09:15:59 -0000	1.19
@@ -1,2 +1 @@
-subversion-1.3.0.tar.gz
-subversion-1.2.3-3.src.rpm subversion-1.2.3-5.src.rpm
+subversion-1.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/subversion/FC-5/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	4 Jan 2006 13:07:01 -0000	1.20
+++ sources	4 Apr 2006 09:15:59 -0000	1.21
@@ -1 +1 @@
-0d91a7fe152d0373044c47c54deb2c9a  subversion-1.3.0.tar.gz
+6d650e918255596ef8b74255b3938547  subversion-1.3.1.tar.gz


--- subversion-1.2.3.tar.gz.asc DELETED ---


--- subversion-1.3.0.tar.gz.asc DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr  4 09:16:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 05:16:45 -0400
Subject: rpms/libsemanage/FC-5 libsemanage-rhat.patch, 1.11,
	1.12 libsemanage.spec, 1.79, 1.80
Message-ID: <200604040916.k349Gjxp004966@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	libsemanage-rhat.patch libsemanage.spec 
Log Message:
* Tue Apr 4 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.2-2.fc5
- Fix leaky descriptor


libsemanage-rhat.patch:
 semanage_store.c |    2 ++
 1 files changed, 2 insertions(+)

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/FC-5/libsemanage-rhat.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libsemanage-rhat.patch	20 Mar 2006 20:41:19 -0000	1.11
+++ libsemanage-rhat.patch	4 Apr 2006 09:16:42 -0000	1.12
@@ -1,11 +1,12 @@
---- libsemanage-1.5.28/src/Makefile~	2006-02-17 14:45:52.000000000 -0500
-+++ libsemanage-1.5.28/src/Makefile	2006-03-17 08:44:29.000000000 -0500
-@@ -3,7 +3,7 @@
- LIBDIR ?= $(PREFIX)/lib
- SHLIBDIR ?= $(DESTDIR)/lib
- INCLUDEDIR ?= $(PREFIX)/include
--PYLIBVER ?= python2.4
-+PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]')
- PYINC ?= /usr/include/${PYLIBVER}
- PYLIBDIR ?= $(LIBDIR)/${PYLIBVER}
- 
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-1.6.2/src/semanage_store.c
+--- nsalibsemanage/src/semanage_store.c	2006-03-10 09:48:01.000000000 -0500
++++ libsemanage-1.6.2/src/semanage_store.c	2006-04-03 18:58:56.000000000 -0400
+@@ -1159,6 +1159,8 @@
+ 		ERR(sh, "Could not open direct %s at %s.", lock_name, lock_file);
+ 		return -1;
+ 	}
++	fcntl(fd, F_SETFD, FD_CLOEXEC);
++
+ 	if (sh->timeout == 0) {
+ 		/* return immediately */
+ 		origtime.tv_sec = 0;


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/FC-5/libsemanage.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- libsemanage.spec	22 Mar 2006 16:50:55 -0000	1.79
+++ libsemanage.spec	4 Apr 2006 09:16:42 -0000	1.80
@@ -1,9 +1,9 @@
-%define libsepolver 1.12-1
+%define libsepolver 1.12.4-1
 %define libselinuxver 1.30-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 1.6
-Release: 1.fc5
+Version: 1.6.2
+Release: 2
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -44,7 +44,7 @@
 
 %build
 make clean
-make CFLAGS="%{optflags}" all pywrap
+make CFLAGS="%{optflags}" LIBDIR="%{_libdir}" SHLIBDIR="%{_lib}" all pywrap
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -74,6 +74,17 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Apr 4 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.2-2.fc5
+- Fix leaky descriptor
+
+* Wed Mar 29 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.2-2
+- Fix leaky descriptor
+
+* Tue Mar 21 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.2-1
+- Upgrade to latest from NSA
+	* Merged Makefile PYLIBVER definition patch from Dan Walsh.
+	* Merged man page reorganization from Ivan Gyurdiev.
+
 * Mon Mar 18 2006 Dan Walsh <dwalsh at redhat.com> - 1.6-1.fc5
 - Rebuild for FC5
 
@@ -345,7 +356,7 @@
 	* Merged interface parse/print, context_to_string interface change,
 	  move assert_noeof, and order preserving patches from Ivan Gyurdiev.
         * Added src/dso.h in preparation for other changes.
-	* Merged install seusers, handle/error messages, MLS parsing,
+p	* Merged install seusers, handle/error messages, MLS parsing,
 	  and seusers validation patches from Ivan Gyurdiev.
 
 * Mon Oct 31 2005 Dan Walsh <dwalsh at redhat.com> 1.3.39-1



From fedora-cvs-commits at redhat.com  Tue Apr  4 09:17:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 05:17:54 -0400
Subject: rpms/libsemanage/FC-5 .cvsignore, 1.55, 1.56 libsemanage.spec, 1.80,
	1.81 sources, 1.57, 1.58
Message-ID: <200604040917.k349HsoN006184@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore libsemanage.spec sources 
Log Message:
* Tue Apr 4 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.2-2.fc5
- Bump for fc5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/FC-5/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	20 Mar 2006 20:41:19 -0000	1.55
+++ .cvsignore	4 Apr 2006 09:17:51 -0000	1.56
@@ -58,3 +58,4 @@
 libsemanage-1.5.26.tgz
 libsemanage-1.5.28.tgz
 libsemanage-1.6.tgz
+libsemanage-1.6.2.tgz


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/FC-5/libsemanage.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- libsemanage.spec	4 Apr 2006 09:16:42 -0000	1.80
+++ libsemanage.spec	4 Apr 2006 09:17:51 -0000	1.81
@@ -3,7 +3,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
 Version: 1.6.2
-Release: 2
+Release: 2.fc5
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -75,7 +75,7 @@
 
 %changelog
 * Tue Apr 4 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.2-2.fc5
-- Fix leaky descriptor
+- Bump for fc5
 
 * Wed Mar 29 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.2-2
 - Fix leaky descriptor


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/FC-5/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	20 Mar 2006 20:41:19 -0000	1.57
+++ sources	4 Apr 2006 09:17:51 -0000	1.58
@@ -1 +1 @@
-3f547c9b5ca5d300957a2b36230dbb30  libsemanage-1.6.tgz
+187deb14a3577967b5ddac2013cd641c  libsemanage-1.6.2.tgz



From fedora-cvs-commits at redhat.com  Tue Apr  4 09:21:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 05:21:11 -0400
Subject: rpms/subversion/devel subversion-1.3.1.tar.gz.asc, NONE, 1.1 psvn.el,
	1.5, 1.6 sources, 1.20, 1.21 subversion.spec, 1.72,
	1.73 upstream, 1.10, 1.11 upstream-key.gpg, 1.4,
	1.5 subversion-1.3.0-neonver.patch, 1.1,
	NONE subversion-1.3.0.tar.gz.asc, 1.1, NONE
Message-ID: <200604040921.k349LBwb006329@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	psvn.el sources subversion.spec upstream upstream-key.gpg 
Added Files:
	subversion-1.3.1.tar.gz.asc 
Removed Files:
	subversion-1.3.0-neonver.patch subversion-1.3.0.tar.gz.asc 
Log Message:
* Tue Apr  4 2006 Joe Orton <jorton at redhat.com> 1.3.1-3
- update to 1.3.1
- update to psvn.el r19138 (Stefan Reichoer)
- build -java on s390 again



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

iD8DBQBEJKSiCbw14+5QZGERAifpAJ9Xoc9z8T/kieXGCXKo4vBr1wlRgACgvvw2
7QqGfPiN/cUTAuTpobiet9U=
=BKtf
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)

iD8DBQBEJjpl6GFjKbrWIbYRAo2FAKCOr2c3iu/hhTmToE3iwj1o0NfFfQCggYKj
ia//Zk2/nT5OSdYCvkA6cfA=
=znph
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (FreeBSD)

iD8DBQBEKMHRyR242pvPzi8RAl7CAKCvEpuAb66tLuV5iBZruX3N0t4xWACfVYEm
3RMXqaYvCQcCPI6EImLPq7k=
=NQZI
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (GNU/Linux)

iD8DBQBELIk71sYklxbYtBwRAlS/AJ9J1SOz8JSP2jcyjPUN5Lz5uiTLIACfc+gi
SMp8A8h0rvx0PHCDBuTnM30=
=adC7
-----END PGP SIGNATURE-----


Index: psvn.el
===================================================================
RCS file: /cvs/dist/rpms/subversion/devel/psvn.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- psvn.el	4 Jan 2006 13:07:01 -0000	1.5
+++ psvn.el	4 Apr 2006 09:21:08 -0000	1.6
@@ -1,5 +1,5 @@
 ;;; psvn.el --- Subversion interface for emacs
-;; Copyright (C) 2002-2005 by Stefan Reichoer
+;; Copyright (C) 2002-2006 by Stefan Reichoer
 
 ;; Author: Stefan Reichoer, <stefan at xsteve.at>
 ;; $Id$
@@ -22,7 +22,7 @@
 ;;; Commentary
 
 ;; psvn.el is tested with GNU Emacs 21.3 on windows, debian linux,
-;; freebsd5, red hat el3 with svn 1.1.1
+;; freebsd5, red hat el3 with svn 1.2.3
 
 ;; psvn.el is an interface for the revision control tool subversion
 ;; (see http://subversion.tigris.org)
@@ -185,7 +185,11 @@
 ;;; Code:
 
 (require 'easymenu)
-(require 'diff-mode nil t)
+
+(condition-case nil
+    (progn
+      (require 'diff-mode))
+  (error nil))
 
 ;;; user setable variables
 (defcustom svn-status-verbose t
@@ -220,9 +224,11 @@
   :type 'boolean
   :group 'psvn)
 (defcustom svn-status-sort-status-buffer t
-  "Sort the `svn-status-buffer-name' buffer.
-Setting this variable to nil speeds up M-x svn-status.
-However, it is possible, that the sorting is wrong in this case.
+  "*Whether to sort the `svn-status-buffer-name' buffer.
+
+Setting this variable to nil speeds up \[M-x svn-status], however the
+listing may then become incorrect.
+
 This can be toggled with \\[svn-status-toggle-sort-status-buffer]."
   :type 'boolean
   :group 'psvn)
@@ -387,10 +393,11 @@
 This can be set with \\[svn-status-set-trac-project-root].")
 
 (defvar svn-status-module-name nil
-  "A nice short name for the actual project.
+  "*A short name for the actual project.
 This can be set with \\[svn-status-set-module-name].")
 
-(defvar svn-status-load-state-before-svn-status t "Load the ++psvn.state file, before running svn-status")
+(defvar svn-status-load-state-before-svn-status t
+  "*Whether to automatically restore state from ++psvn.state file before running svn-status.")
 
 ;;; hooks
 (defvar svn-log-edit-mode-hook nil "Hook run when entering `svn-log-edit-mode'.")
@@ -401,7 +408,7 @@
 
 (defvar svn-status-coding-system nil
   "A special coding system is needed for the output of svn.
-svn-status-coding-system is used in svn-run-svn, if it is not nil.")
+svn-status-coding-system is used in svn-run, if it is not nil.")
 
 (defcustom svn-status-wash-control-M-in-process-buffers
   (eq system-type 'windows-nt)
@@ -488,6 +495,7 @@
 (defvar svn-status-mode-line-process-edit-flag "")
 (defvar svn-status-edit-svn-command nil)
 (defvar svn-status-update-previous-process-output nil)
+(defvar svn-pre-run-asynch-recent-keys nil)
 (defvar svn-status-temp-dir
   (expand-file-name
    (or
@@ -579,7 +587,7 @@
     (((class color) (background light)) (:foreground "blue4"))
     (((class color) (background dark)) (:foreground "lightskyblue1"))
     (t (:weight bold)))
-  "Face for directories in svn status buffers.
+  "Face for directories in *svn-status* buffers.
 See `svn-status--line-info->directory-p' for what counts as a directory."
   :group 'psvn-faces)
 
@@ -587,7 +595,7 @@
 (defface svn-status-filename-face
   '((((class color) (background light)) (:foreground "chocolate"))
     (((class color) (background dark)) (:foreground "beige")))
-  "Face for non-directories in svn status buffers.
+  "Face for non-directories in *svn-status* buffers.
 See `svn-status--line-info->directory-p' for what counts as a directory."
   :group 'psvn-faces)
 
@@ -709,6 +717,9 @@
                                          ,value-type)))))
     widget))
 
+
+;;; keymaps
+
 (defvar svn-global-keymap nil "Global keymap for psvn.el.
 To bind this to a different key, customize `svn-status-prefix-key'.")
 (put 'svn-global-keymap 'risky-local-variable t)
@@ -718,7 +729,9 @@
   (define-key svn-global-keymap (kbd "l") 'svn-status-show-svn-log)
   (define-key svn-global-keymap (kbd "u") 'svn-status-update-cmd)
   (define-key svn-global-keymap (kbd "=") 'svn-status-show-svn-diff)
-  (define-key svn-global-keymap (kbd "c") 'svn-status-commit))
+  (define-key svn-global-keymap (kbd "c") 'svn-status-commit)
+  (define-key svn-global-keymap (kbd "b") 'svn-status-switch-to-status-buffer)
+  (define-key svn-global-keymap (kbd "o") 'svn-status-pop-to-status-buffer))
 
 (defvar svn-status-diff-mode-map ()
   "Keymap used in `svn-status-diff-mode' for additional commands that are not defined in diff-mode.")
@@ -778,7 +791,9 @@
 ;;;###autoload
 (defun svn-status (dir &optional arg)
   "Examine the status of Subversion working copy in directory DIR.
-If ARG then pass the -u argument to `svn status'."
+If ARG is -, allow editing of the parameters. One could add -N to
+run svn status non recursively to make it faster.
+For every other non nil ARG pass the -u argument to `svn status'."
   (interactive (list (svn-read-directory-name "SVN status directory: "
                                               nil default-directory nil)
                      current-prefix-arg))
@@ -805,16 +820,20 @@
       (setq svn-status-initial-window-configuration (current-window-configuration)))
     (let* ((status-buf (get-buffer-create svn-status-buffer-name))
            (proc-buf (get-buffer-create "*svn-process*"))
-           (status-option (if svn-status-verbose
-                              (if arg "-uv" "-v")
-                            (if arg "-u" ""))))
+           (want-edit (eq arg '-))
+           (status-option (if want-edit
+                              (if svn-status-verbose "-v" "")
+                            (if svn-status-verbose
+                                (if arg "-uv" "-v")
+                              (if arg "-u" ""))))
+           (svn-status-edit-svn-command (or want-edit svn-status-edit-svn-command)))
       (save-excursion
         (set-buffer status-buf)
         (setq default-directory dir)
         (set-buffer proc-buf)
         (setq default-directory dir
               svn-status-remote (when arg t))
-        (svn-run-svn t t 'status "status" status-option)))))
+        (svn-run t t 'status "status" status-option)))))
 
 (defun svn-status-this-directory (arg)
   "Run `svn-status' for the `default-directory'"
@@ -831,6 +850,9 @@
         (svn-status dir)
       (error "%s is not a directory" dir))))
 
+(defun svn-had-user-input-since-asynch-run ()
+  (not (equal (recent-keys) svn-pre-run-asynch-recent-keys)))
+
 (defun svn-process-environment ()
   "Construct the environment for the svn process.
 It is a combination of `svn-status-svn-environment-var-list' and
@@ -850,7 +872,7 @@
           and when has-value
             collect elt))
 
-(defun svn-run-svn (run-asynchron clear-process-buffer cmdtype &rest arglist)
+(defun svn-run (run-asynchron clear-process-buffer cmdtype &rest arglist)
   "Run svn with arguments ARGLIST.
 
 If RUN-ASYNCHRON is t then run svn asynchronously.
@@ -866,19 +888,20 @@
 ARGLIST is flattened and any every nil value is discarded.
 
 If the variable `svn-status-edit-svn-command' is non-nil then the user
-is prompted for give extra arguments, which are appended to ARGLIST."
+can edit ARGLIST before running svn."
   (setq arglist (svn-status-flatten-list arglist))
   (if (eq (process-status "svn") nil)
       (progn
         (when svn-status-edit-svn-command
-          (setq arglist (append arglist
-                                (split-string
-                                 (read-from-minibuffer
-                                  (format "Run `svn %s' with extra arguments: "
-                                          (mapconcat 'identity arglist " "))))))
+          (setq arglist (append
+                         (list (car arglist))
+                         (split-string
+                          (read-from-minibuffer
+                           (format "svn %s flags: " (car arglist))
+                           (mapconcat 'identity (cdr arglist) " ")))))
           (when (eq svn-status-edit-svn-command t)
             (svn-status-toggle-edit-cmd-flag t))
-          (message "svn-run-svn %s: %S" cmdtype arglist))
+          (message "svn-run %s: %S" cmdtype arglist))
         (let* ((proc-buf (get-buffer-create "*svn-process*"))
                (svn-exe svn-status-svn-executable)
                (svn-proc))
@@ -900,6 +923,7 @@
             (if run-asynchron
                 (progn
                   ;;(message "running asynchron: %s %S" svn-exe arglist)
+                  (setq svn-pre-run-asynch-recent-keys (recent-keys))
                   (let ((process-environment (svn-process-environment))
                         (process-connection-type nil))
                     ;; Communicate with the subprocess via pipes rather
@@ -924,9 +948,10 @@
               (svn-status-update-mode-line)))))
     (error "You can only run one svn process at once!")))
 
-(defun svn-process-sentinel-fixup-path-seperators()
+(defun svn-process-sentinel-fixup-path-seperators ()
+	"Convert all path separators to UNIX style.
+\(This is a no-op unless `system-type' is windows-nt\)"
   (when (eq system-type 'windows-nt)
-      ;; convert path separator to UNIX style
       (save-excursion
         (goto-char (point-min))
         (while (search-forward "\\" nil t)
@@ -955,7 +980,9 @@
                     (setq svn-status-update-previous-process-output nil))
                   (when svn-status-display-new-status-buffer
                     (set-window-configuration svn-status-initial-window-configuration)
-                    (switch-to-buffer svn-status-buffer-name)))
+                    (if (svn-had-user-input-since-asynch-run)
+                        (message "svn status finished")
+                      (switch-to-buffer svn-status-buffer-name))))
                  ((eq svn-process-cmd 'log)
                   (svn-status-show-process-output 'log t)
                   (pop-to-buffer svn-status-last-output-buffer-name)
@@ -1038,7 +1065,7 @@
     (goto-char (point-max))
     (insert str)
     (save-excursion
-      (goto-char (line-beginning-position))
+      (goto-char (svn-point-at-bol))
       (when (looking-at "Password for '\\(.+\\)': ")
         ;(svn-status-show-process-buffer)
         (let ((passwd (read-passwd
@@ -1464,7 +1491,7 @@
                ["svn info" svn-status-info t]
                ["svn blame" svn-status-blame t]))
       (svn-status-face-set-temporary-during-popup
-       'svn-status-marked-popup-face (line-beginning-position) (line-end-position)
+       'svn-status-marked-popup-face (svn-point-at-bol) (svn-point-at-eol)
        svn-status-actual-popup-menu))))
 
 (defun svn-status-face-set-temporary-during-popup (face begin end menu &optional prefix)
@@ -1536,6 +1563,29 @@
            (when (string= (buffer-name) svn-status-buffer-name)
              (bury-buffer))))))
 
+(defun svn-status-save-some-buffers (&optional tree)
+  "Save all buffers visiting a file in TREE.
+If TREE is not given, try `svn-status-base-dir' as TREE."
+  (interactive)
+  (let ((ok t)
+        (tree (or (svn-status-base-dir)
+                  tree)))
+    (unless tree
+      (error "Not in a svn project tree"))
+    (dolist (buffer (buffer-list))
+      (with-current-buffer buffer
+        (when (buffer-modified-p)
+          (let ((file (buffer-file-name)))
+            (when file
+              (let ((root (svn-status-base-dir (file-name-directory file))))
+                (when (and root
+                           (string= root tree)
+                           ;; buffer is modified and in the tree TREE.
+                           (or (y-or-n-p (concat "Save buffer " (buffer-name) "? "))
+                               (setq ok nil)))
+                  (save-buffer))))))))
+    ok))
+
 (defun svn-status-find-files ()
   "Open selected file(s) for editing.
 See `svn-status-marked-files' for what counts as selected."
@@ -1793,6 +1843,8 @@
            (setq tag-string " <added>"))
           ((equal action 'deleted)
            (setq tag-string " <deleted>"))
+          ((equal action 'replaced)
+           (setq tag-string " <replaced>"))
           ((equal action 'added-wc)
            (svn-status-line-info->set-filemark line-info ?A)
            (svn-status-line-info->set-localrev line-info 0))
@@ -1816,7 +1868,6 @@
 ;; (svn-status-update-with-command-list '(("++ideas" committed) ("a.txt" committed) ("alf")))
 ;; (svn-status-update-with-command-list (svn-status-parse-commit-output))
 
-
 (defun svn-status-parse-commit-output ()
   "Parse the output of svn commit.
 Return a list that is suitable for `svn-status-update-with-command-list'"
@@ -1838,6 +1889,8 @@
                (setq action 'added))
               ((looking-at "Deleting")
                (setq action 'deleted))
+              ((looking-at "Replacing")
+               (setq action 'replaced))
               ((looking-at "Transmitting file data")
                (setq skip t))
               ((looking-at "Committed revision \\([0-9]+\\)")
@@ -1891,6 +1944,16 @@
 ;;(svn-status-parse-ar-output)
 ;; (svn-status-update-with-command-list (svn-status-parse-ar-output))
 
+(defun svn-status-line-info->symlink-p (line-info)
+  "Return non-nil if LINE-INFO refers to a symlink, nil otherwise.
+The value is the name of the file to which it is linked. \(See
+`file-symlink-p'.\)
+
+On win32 systems this won't work, even though symlinks are supported
+by subversion on such systems."
+  ;; on win32 would need to see how svn does symlinks
+  (file-symlink-p (svn-status-line-info->filename line-info)))
+
 (defun svn-status-line-info->directory-p (line-info)
   "Return t if LINE-INFO refers to a directory, nil otherwise.
 Symbolic links to directories count as directories (see `file-directory-p')."
@@ -1941,7 +2004,24 @@
                        (svn-status-line-info->directory-p line-info)
                        (svn-status-line-info->filename-nondirectory line-info)
                        'svn-status-directory-face
-                       'svn-status-filename-face)))
+                       'svn-status-filename-face)
+                      ;; if it's a symlkink, add '-> target'
+                      (let ((target (svn-status-line-info->symlink-p line-info)))
+                        (when target
+                          (concat " -> "
+                                  ;; add face to target: could maybe
+                                  ;; use different faces for
+                                  ;; unversioned targets?
+                                  (svn-status-choose-face-to-add
+                                   (file-directory-p target)
+                                   (file-relative-name
+                                    target
+                                    (svn-status-line-info->directory-containing-line-info
+                                     line-info t)); name relative to dir of line-info, not '.'
+                                   'svn-status-directory-face
+                                   'svn-status-filename-face)
+                                  )))
+                      ))
         (elide-hint (if (svn-status-line-info->show-user-elide-continuation line-info) " ..." "")))
     (svn-puthash (svn-status-line-info->filename line-info)
                  (point)
@@ -2060,12 +2140,12 @@
 When called with the prefix argument 0, reset the information to nil.
 This hides the repository information again.
 
-When ARG is t, don't update the svn status buffer. This useful for
+When ARG is t, don't update the svn status buffer. This is useful for
 non-interactive use."
   (interactive "P")
   (if (eq arg 0)
       (setq svn-status-base-info nil)
-    (svn-run-svn nil t 'parse-info "info" ".")
+    (svn-run nil t 'parse-info "info" ".")
     (svn-status-parse-info-result))
   (unless (eq arg t)
     (svn-status-update-buffer)))
@@ -2167,7 +2247,9 @@
 
 
 (defun svn-status-get-file-list (use-marked-files)
-  "Get either the marked files or the files, where the cursor is on."
+  "Get either the selected files or the file under point.
+USE-MARKED-FILES decides which we do.
+See `svn-status-marked-files' for what counts as selected."
   (if use-marked-files
       (svn-status-marked-files)
     (list (svn-status-get-line-information))))
@@ -2176,6 +2258,8 @@
   (mapcar 'svn-status-line-info->filename (svn-status-get-file-list use-marked-files)))
 
 (defun svn-status-select-line ()
+	"Return information about the file under point.
+\(Only used for debugging\)"
   (interactive)
   (let ((info (svn-status-get-line-information)))
     (if info
@@ -2184,6 +2268,7 @@
       (message "No file on this line"))))
 
 (defun svn-status-ensure-cursor-on-file ()
+	"Raise an error unless point is on a valid file."
   (unless (svn-status-get-line-information)
     (error "No file on the current line")))
 
@@ -2506,7 +2591,6 @@
             (other-window 1))
         (svn-status-show-process-buffer-internal scroll-to-top)))))
 
-
 (defun svn-status-show-svn-log (arg)
   "Run `svn log' on selected files.
 The output is put into the *svn-log* buffer
@@ -2523,7 +2607,7 @@
                         (arg         '("-v"))
                         (t           svn-status-default-log-arguments))))
     (svn-status-create-arg-file svn-status-temp-arg-file "" (svn-status-marked-files) "")
-    (svn-run-svn t t 'log "log" "--targets" svn-status-temp-arg-file switches)
+    (svn-run t t 'log "log" "--targets" svn-status-temp-arg-file switches)
     (save-excursion
       (set-buffer "*svn-process*")
       (svn-log-view-mode))))
@@ -2533,14 +2617,14 @@
 See `svn-status-marked-files' for what counts as selected."
   (interactive)
   (svn-status-create-arg-file svn-status-temp-arg-file "" (svn-status-marked-files) "")
-  (svn-run-svn t t 'info "info" "--targets" svn-status-temp-arg-file))
+  (svn-run t t 'info "info" "--targets" svn-status-temp-arg-file))
 
 ;; Todo: add possiblity to specify the revision
 (defun svn-status-blame ()
   "Run `svn blame' on the current file."
   (interactive)
-  ;;(svn-run-svn t t 'blame "blame" "-r" "BASE" (svn-status-line-info->filename (svn-status-get-line-information))))
-  (svn-run-svn t t 'blame "blame" (svn-status-line-info->filename (svn-status-get-line-information))))
+  ;;(svn-run t t 'blame "blame" "-r" "BASE" (svn-status-line-info->filename (svn-status-get-line-information))))
+  (svn-run t t 'blame "blame" (svn-status-line-info->filename (svn-status-get-line-information))))
 
 (defun svn-status-show-svn-diff (arg)
   "Run `svn diff' on the current file.
@@ -2580,7 +2664,7 @@
   (let ((clear-buf t)
         (beginning nil))
     (dolist (line-info line-infos)
-      (svn-run-svn nil clear-buf 'diff "diff" svn-status-default-diff-arguments
+      (svn-run nil clear-buf 'diff "diff" svn-status-default-diff-arguments
                    "-r" (if (eq revision :auto)
                             (if (svn-status-line-info->update-available line-info)
                                 "HEAD" "BASE")
@@ -2639,7 +2723,6 @@
         major-mode mode-name)
     (diff-mode)))
 
-
 (defun svn-status-show-process-buffer ()
   "Show the content of the *svn-process* buffer"
   (interactive)
@@ -2653,7 +2736,7 @@
   (interactive "P")
   (message "adding: %S" (svn-status-get-file-list-names (not arg)))
   (svn-status-create-arg-file svn-status-temp-arg-file "" (svn-status-get-file-list (not arg)) "")
-  (svn-run-svn t t 'add "add" "--targets" svn-status-temp-arg-file))
+  (svn-run t t 'add "add" "--targets" svn-status-temp-arg-file))
 
 (defun svn-status-add-file (arg)
   "Run `svn add' on all selected files.
@@ -2664,7 +2747,7 @@
   (interactive "P")
   (message "adding: %S" (svn-status-get-file-list-names (not arg)))
   (svn-status-create-arg-file svn-status-temp-arg-file "" (svn-status-get-file-list (not arg)) "")
-  (svn-run-svn t t 'add "add" "--non-recursive" "--targets" svn-status-temp-arg-file))
+  (svn-run t t 'add "add" "--non-recursive" "--targets" svn-status-temp-arg-file))
 
 (defun svn-status-make-directory (dir)
   "Run `svn mkdir DIR'."
@@ -2674,7 +2757,7 @@
                                      (svn-status-directory-containing-point t))))
   (unless (string-match "^[^:/]+://" dir) ; Is it a URI?
     (setq dir (file-relative-name dir)))
-  (svn-run-svn t t 'mkdir "mkdir" "--" dir))
+  (svn-run t t 'mkdir "mkdir" "--" dir))
 
 ;;TODO: write a svn-status-cp similar to this---maybe a common
 ;;function to do both?
@@ -2703,7 +2786,8 @@
         ;; file into.
         (setq dest (read-file-name (format "Rename %s to: "
                                            (svn-status-line-info->filename (car marked-files)))
-                                   (svn-status-directory-containing-point t)))
+                                   (svn-status-directory-containing-point t)
+                                   (svn-status-line-info->full-path (car marked-files))))
       ;;multiple files selected, so prompt for existing directory to mv them into.
       (setq dest (svn-read-directory-name (format "Move %d files to directory: " num-of-files)
                                           (svn-status-directory-containing-point t) nil t))
@@ -2716,7 +2800,7 @@
 ;
     ;;do the move: svn mv only lets us move things once at a time, so
     ;;we need to run svn mv once for each file (hence second arg to
-    ;;svn-run-svn is nil.)
+    ;;svn-run is nil.)
 
     ;;TODO: before doing any moving, For every marked directory,
     ;;ensure none of its contents are also marked, since we dont want
@@ -2739,7 +2823,7 @@
               (eq original-propmarks 77)) ;;original has local prop mods: maybe do `svn mv --force'
           (if (yes-or-no-p (format "%s has local modifications; use `--force' to really move it? "
                                    original-name))
-              (svn-run-svn nil t 'mv "mv" "--force" "--" original-name dest)
+              (svn-run nil t 'mv "mv" "--force" "--" original-name dest)
             (message "Not moving %s" original-name)))
          ((eq original-filemarks 63) ;;original is unversioned: maybe do plain `mv'
           (if (yes-or-no-p (format "%s is unversioned.  Use plain `mv -i %s %s'? "
@@ -2751,12 +2835,12 @@
           (message "Not moving %s (try committing it first)" original-name))
 
          ((eq original-filemarks 32) ;;original is unmodified: can use `svn mv'
-          (svn-run-svn nil t 'mv "mv" "--" original-name dest))
+          (svn-run nil t 'mv "mv" "--" original-name dest))
 
          ;;file is conflicted in some way?
          (t
           (if (yes-or-no-p (format "The status of %s looks scary.  Risk moving it anyway? " original-name))
-              (svn-run-svn nil t 'mv "mv" "--" original-name dest)
+              (svn-run nil t 'mv "mv" "--" original-name dest)
             (message "Not moving %s" original-name))))))
         (svn-status-update)))
 
@@ -2772,7 +2856,7 @@
              (format "Revert %d files? " num-of-files)))
       (message "reverting: %S" (svn-status-marked-file-names))
       (svn-status-create-arg-file svn-status-temp-arg-file "" (svn-status-marked-files) "")
-      (svn-run-svn t t 'revert "revert" "--targets" svn-status-temp-arg-file))))
+      (svn-run t t 'revert "revert" "--targets" svn-status-temp-arg-file))))
 
 (defun svn-status-rm (force)
   "Run `svn rm' on all selected files.
@@ -2788,15 +2872,15 @@
       (message "removing: %S" (svn-status-marked-file-names))
       (svn-status-create-arg-file svn-status-temp-arg-file "" (svn-status-marked-files) "")
       (if force
-          (svn-run-svn t t 'rm "rm" "--force" "--targets" svn-status-temp-arg-file)
-        (svn-run-svn t t 'rm "rm" "--targets" svn-status-temp-arg-file)))))
+          (svn-run t t 'rm "rm" "--force" "--targets" svn-status-temp-arg-file)
+        (svn-run t t 'rm "rm" "--targets" svn-status-temp-arg-file)))))
 
 (defun svn-status-update-cmd ()
   "Run svn update."
   (interactive)
   (message "Running svn-update for %s" default-directory)
   ;TODO: use file names also
-  (svn-run-svn t t 'update "update"))
+  (svn-run t t 'update "update"))
 
 (defun svn-status-commit ()
   "Commit selected files.
@@ -2805,6 +2889,7 @@
 normally marks all of its files as well.
 If no files have been marked, commit recursively the file at point."
   (interactive)
+  (svn-status-save-some-buffers)
   (let* ((selected-files (svn-status-marked-files))
          (marked-files-p (svn-status-some-files-marked-p)))
     (setq svn-status-files-to-commit selected-files
@@ -2827,6 +2912,16 @@
         (insert-file-contents svn-log-edit-file-name)))
     (svn-log-edit-mode)))
 
+(defun svn-status-switch-to-status-buffer ()
+  "Switch to the `svn-status-buffer-name' buffer."
+  (interactive)
+  (switch-to-buffer svn-status-buffer-name))
+
+(defun svn-status-pop-to-status-buffer ()
+  "Pop to the `svn-status-buffer-name' buffer."
+  (interactive)
+  (pop-to-buffer svn-status-buffer-name))
+
 (defun svn-status-export ()
   "Run `svn export' for the current working copy.
 Ask the user for the destination path.
@@ -2835,7 +2930,7 @@
   (let* ((src default-directory)
          (dir1-name (nth 1 (nreverse (split-string src "/"))))
          (dest (read-file-name (format "Export %s to " src) (concat svn-status-default-export-directory dir1-name))))
-    (svn-run-svn t t 'export "export" (expand-file-name src) (expand-file-name dest))
+    (svn-run t t 'export "export" (expand-file-name src) (expand-file-name dest))
     (message "svn-status-export %s %s" src dest)))
 
 (defun svn-status-cleanup (arg)
@@ -2847,7 +2942,7 @@
     (if file-names
         (progn
           (message "svn-status-cleanup %S" file-names)
-          (svn-run-svn t t 'cleanup (append (list "cleanup") file-names)))
+          (svn-run t t 'cleanup (append (list "cleanup") file-names)))
       (message "No valid file selected - No status cleanup possible"))))
 
 (defun svn-status-resolved ()
@@ -2862,7 +2957,7 @@
              (format "Resolve %d files? " num-of-files)))
       (message "resolving: %S" (svn-status-marked-file-names))
       (svn-status-create-arg-file svn-status-temp-arg-file "" (svn-status-marked-files) "")
-      (svn-run-svn t t 'resolved "resolved" "--targets" svn-status-temp-arg-file))))
+      (svn-run t t 'resolved "resolved" "--targets" svn-status-temp-arg-file))))
 
 
 (defun svn-status-svnversion ()
@@ -3008,7 +3103,7 @@
                                                    (file-name-nondirectory file-name)
                                                    ".svn-base"))
                    (progn
-                     (svn-run-svn nil t 'cat "cat" "-r" revision file-name)
+                     (svn-run nil t 'cat "cat" "-r" revision file-name)
                      ;;todo: error processing
                      ;;svn: Filesystem has no item
                      ;;svn: file not found: revision `15', path `/trunk/file.txt'
@@ -3098,12 +3193,12 @@
   (let ((file-names (svn-status-marked-file-names)))
     (if file-names
         (progn
-          (svn-run-svn t t 'proplist (append (list "proplist" "-v") file-names)))
+          (svn-run t t 'proplist (append (list "proplist" "-v") file-names)))
       (message "No valid file selected - No property listing possible"))))
 
 (defun svn-status-proplist-start ()
   (svn-status-ensure-cursor-on-file)
-  (svn-run-svn t t 'proplist-parse "proplist" (svn-status-line-info->filename
+  (svn-run t t 'proplist-parse "proplist" (svn-status-line-info->filename
                                                (svn-status-get-line-information))))
 (defun svn-status-property-edit-one-entry (arg)
   "Edit a property.
@@ -3158,7 +3253,7 @@
                         (svn-status-marked-file-names))
                (let ((file-names (svn-status-marked-file-names)))
                  (when file-names
-                   (svn-run-svn nil t 'propset
+                   (svn-run nil t 'propset
                                 (append (list "propset" prop-name prop-value) file-names))
                    )
                  )
@@ -3173,7 +3268,7 @@
                (let ((file-names (svn-status-marked-file-names)))
                  (when file-names
                    (message "Going to delete prop %s for %s" prop-name file-names)
-                   (svn-run-svn t t 'propdel
+                   (svn-run t t 'propdel
                                 (append (list "propdel" prop-name) file-names))))))))))
 
 (defun svn-status-property-edit (file-info-list prop-name &optional new-prop-value)
@@ -3183,7 +3278,7 @@
          (file-name (svn-status-line-info->filename (car file-info-list)))
          (prop-value))
     (message "Edit property %s for file %s" prop-name file-name)
-    (svn-run-svn nil t 'propget-parse "propget" prop-name file-name)
+    (svn-run nil t 'propget-parse "propget" prop-name file-name)
     (save-excursion
       (set-buffer "*svn-process*")
       (setq prop-value (if (> (point-max) 1)
@@ -3388,7 +3483,7 @@
     (svn-status-create-arg-file svn-status-temp-arg-file ""
                                 svn-status-propedit-file-list "")
     (setq svn-status-propedit-file-list nil)
-    (svn-run-svn async t 'propset "propset"
+    (svn-run async t 'propset "propset"
          svn-status-propedit-property-name
                  "--targets" svn-status-temp-arg-file
                  "-F" (concat svn-status-temp-dir "svn-prop-edit.txt" svn-temp-suffix))
@@ -3426,7 +3521,6 @@
     (define-derived-mode svn-log-edit-mode log-edit-mode "svn-log-edit"
       "Wrapper around `log-edit-mode' for psvn.el"
       (easy-menu-add svn-log-edit-mode-menu)
-      (run-hooks 'svn-log-edit-mode-hook)
       (setq svn-log-edit-update-log-entry nil)
       (set (make-local-variable 'log-edit-callback) 'svn-log-edit-done)
       (set (make-local-variable 'log-edit-listfun) 'svn-log-edit-files-to-commit)
@@ -3479,6 +3573,7 @@
 
 (defun svn-log-edit-done ()
   (interactive)
+  (svn-status-save-some-buffers)
   (save-excursion
     (set-buffer (get-buffer "*svn-log-edit*"))
     (when svn-log-edit-insert-files-to-commit
@@ -3488,11 +3583,12 @@
     (when (or svn-log-edit-update-log-entry svn-status-files-to-commit)
       (setq svn-status-temp-file-to-remove
             (concat svn-status-temp-dir "svn-log-edit.txt" svn-temp-suffix))
-      (write-region (point-min) (point-max) svn-status-temp-file-to-remove nil 1)))
+      (write-region (point-min) (point-max) svn-status-temp-file-to-remove nil 1))
+    (bury-buffer))
   (if svn-log-edit-update-log-entry
       (when (y-or-n-p "Update the log entry? ")
         ;;   svn propset svn:log --revprop -r11672 -F file
-        (svn-run-svn nil t 'propset "propset" "svn:log" "--revprop"
+        (svn-run nil t 'propset "propset" "svn:log" "--revprop"
                      (concat "-r" svn-log-edit-update-log-entry)
                      "-F" svn-status-temp-file-to-remove)
         (save-excursion
@@ -3504,7 +3600,7 @@
                  (string= "." (svn-status-line-info->filename (car svn-status-files-to-commit)))))
       (svn-status-create-arg-file svn-status-temp-arg-file ""
                                   svn-status-files-to-commit "")
-      (svn-run-svn t t 'commit "commit"
+      (svn-run t t 'commit "commit"
                    (unless svn-status-recursive-commit "--non-recursive")
                    "--targets" svn-status-temp-arg-file
                    "-F" svn-status-temp-file-to-remove
@@ -3592,18 +3688,38 @@
   (define-key svn-log-view-mode-map (kbd "e") 'svn-log-edit-log-entry)
   (define-key svn-log-view-mode-map (kbd "q") 'bury-buffer))
 
+(defvar svn-log-view-popup-menu-map ()
+  "Keymap used to show popup menu in `svn-log-view-mode' buffers.")
+(put 'svn-log-view-popup-menu-map 'risky-local-variable t) ;for Emacs 20.7
+(when (not svn-log-view-popup-menu-map)
+  (setq svn-log-view-popup-menu-map (make-sparse-keymap))
+  (suppress-keymap svn-log-view-popup-menu-map)
+  (define-key svn-log-view-popup-menu-map [down-mouse-3] 'svn-log-view-popup-menu))
+
 (easy-menu-define svn-log-view-mode-menu svn-log-view-mode-map
 "'svn-log-view-mode' menu"
                   '("SVN-LogView"
                     ["Show Changeset" svn-log-view-diff t]
                     ["Edit log message" svn-log-edit-log-entry t]))
 
+(defun svn-log-view-popup-menu (event)
+  (interactive "e")
+  (mouse-set-point event)
+  (let* ((rev (svn-log-revision-at-point)))
+    (when rev
+      (svn-status-face-set-temporary-during-popup
+       'svn-status-marked-popup-face (svn-point-at-bol) (svn-point-at-eol)
+       svn-log-view-mode-menu))))
+
 (defvar svn-log-view-font-lock-keywords
-  '(("^r.+" . font-lock-keyword-face)
-  "Keywords in svn-log-view-mode."))
+  '(("^r[0-9]+ .+" (0 `(face
+                        font-lock-keyword-face
+                        mouse-face
+                        highlight
+                        keymap ,svn-log-view-popup-menu-map))))
+  "Keywords in svn-log-view-mode.")
 (put 'svn-log-view-font-lock-keywords 'risky-local-variable t) ;for Emacs 20.7
 
-
 (define-derived-mode svn-log-view-mode fundamental-mode "svn-log-view"
   "Major Mode to show the output from svn log.
 Commands:
@@ -3637,7 +3753,7 @@
         (rev-arg (concat lower-rev ":" upper-rev)))
     (when arg
       (setq rev-arg (read-string "Revision for changeset: " rev-arg)))
-    (svn-run-svn nil t 'diff "diff" (concat "-r" rev-arg))
+    (svn-run nil t 'diff "diff" (concat "-r" rev-arg))
     (svn-status-activate-diff-mode)))
 
 (defun svn-log-edit-log-entry ()
@@ -3645,7 +3761,7 @@
   (interactive)
   (let ((rev (svn-log-revision-at-point))
         (log-message))
-    (svn-run-svn nil t 'propget-parse "propget" "--revprop" (concat "-r" rev) "svn:log")
+    (svn-run nil t 'propget-parse "propget" "--revprop" (concat "-r" rev) "svn:log")
     (save-excursion
       (set-buffer "*svn-process*")
       (setq log-message (if (> (point-max) 1)
@@ -3663,19 +3779,24 @@
 ;; svn status persistent options
 ;; --------------------------------------------------------------------------------
 
-(defun svn-status-base-dir ()
-  (let ((base-dir (expand-file-name default-directory))
-        (dot-svn-dir)
-        (dir-below (expand-file-name default-directory)))
-    (setq dot-svn-dir (concat base-dir (svn-wc-adm-dir-name)))
+(defun svn-status-base-dir (&optional start-directory)
+  "Find the svn root directory for the current working copy.
+Return nil, if not in a svn working copy."
+  (let* ((base-dir (expand-file-name (or start-directory default-directory)))
+         (dot-svn-dir (concat base-dir (svn-wc-adm-dir-name)))
+         (in-tree (file-exists-p dot-svn-dir))
+         (dir-below (expand-file-name default-directory)))
     (while (when (and dir-below (file-exists-p dot-svn-dir))
              (setq base-dir (file-name-directory dot-svn-dir))
              (string-match "\\(.+/\\).+/" dir-below)
-             (setq dir-below (match-string 1 dir-below))
+             (setq dir-below
+                   (and (string-match "\(.*/\)[^/]+/" dir-below)
+                        (match-string 1 dir-below)))
              (setq dot-svn-dir (concat dir-below (svn-wc-adm-dir-name)))))
-    base-dir))
+    (and in-tree base-dir)))
 
 (defun svn-status-save-state ()
+  "Save psvn persistent options for this working copy to a file."
   (interactive)
   (let ((buf (find-file (concat (svn-status-base-dir) "++psvn.state"))))
     (erase-buffer)        ;Widen, because we'll save the whole buffer.
@@ -3690,6 +3811,7 @@
     (kill-buffer buf)))
 
 (defun svn-status-load-state (&optional no-error)
+  "Load psvn persistent options for this working copy from a file."
   (interactive)
   (let ((file (concat (svn-status-base-dir) "++psvn.state")))
     (if (file-readable-p file)
@@ -3709,14 +3831,16 @@
       (unless no-error (error "psvn.el: %s is not readable." file)))))
 
 (defun svn-status-toggle-sort-status-buffer ()
-  "If you turn off sorting, you can speed up M-x svn-status.
-However, the buffer is not correct sorted then.
-This function will be removed again, when a faster parsing and
-display routine for svn-status is available."
+  "Toggle sorting of the *svn-status* buffer.
+
+If you turn off sorting, you can speed up \[svn-status].  However,
+the buffer is not correctly sorted then.  This function will be
+removed again, when a faster parsing and display routine for
+`svn-status' is available."
   (interactive)
   (setq svn-status-sort-status-buffer (not svn-status-sort-status-buffer))
-  (message "The %s buffer will be%s sorted." svn-status-buffer-name
-           (if svn-status-sort-status-buffer "" " not")))
+  (message "The %s buffer will %sbe sorted." svn-status-buffer-name
+           (if svn-status-sort-status-buffer "" "not ")))
 
 (defun svn-status-toggle-display-full-path ()
   "Toggle displaying the full path in the `svn-status-buffer-name' buffer"


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/subversion/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	4 Jan 2006 13:07:01 -0000	1.20
+++ sources	4 Apr 2006 09:21:08 -0000	1.21
@@ -1 +1 @@
-0d91a7fe152d0373044c47c54deb2c9a  subversion-1.3.0.tar.gz
+6d650e918255596ef8b74255b3938547  subversion-1.3.1.tar.gz


Index: subversion.spec
===================================================================
RCS file: /cvs/dist/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- subversion.spec	16 Feb 2006 19:39:46 -0000	1.72
+++ subversion.spec	4 Apr 2006 09:21:08 -0000	1.73
@@ -2,8 +2,8 @@
 %define make_check 1
 
 %ifarch s390
-# weird gjnih error on s390 
-%define with_java 0
+# weird gjnih error on s390?
+%define with_java 1
 %else
 %define with_java 1
 %endif
@@ -15,8 +15,8 @@
 
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
-Version: 1.3.0
-Release: 5
+Version: 1.3.1
+Release: 3
 License: BSD
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -24,7 +24,6 @@
 Source1: subversion.conf
 Source3: filter-requires.sh
 Source4: http://www.xsteve.at/prg/emacs/psvn.el
-Patch1: subversion-1.3.0-neonver.patch
 Patch2: subversion-0.20.1-deplibs.patch
 Patch3: subversion-0.31.0-rpath.patch
 Patch6: subversion-1.0.3-pie.patch
@@ -102,7 +101,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .neonver
 %patch2 -p1 -b .deplibs
 %patch3 -p1 -b .rpath
 %patch6 -p1 -b .pie
@@ -253,6 +251,11 @@
 %endif
 
 %changelog
+* Tue Apr  4 2006 Joe Orton <jorton at redhat.com> 1.3.1-3
+- update to 1.3.1
+- update to psvn.el r19138 (Stefan Reichoer)
+- build -java on s390 again
+
 * Thu Feb 16 2006 Florian La Roche <laroche at redhat.com> - 1.3.0-5
 - do not package libs within subversion-ruby, these are already
   available via the main package


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/subversion/devel/upstream,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- upstream	4 Jan 2006 13:07:01 -0000	1.10
+++ upstream	4 Apr 2006 09:21:08 -0000	1.11
@@ -1 +1 @@
-subversion-1.3.0.tar.gz
+subversion-1.3.1.tar.gz


Index: upstream-key.gpg
===================================================================
RCS file: /cvs/dist/rpms/subversion/devel/upstream-key.gpg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- upstream-key.gpg	4 Jan 2006 13:07:01 -0000	1.4
+++ upstream-key.gpg	4 Apr 2006 09:21:08 -0000	1.5
@@ -1,5 +1,5 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
 mQGiBDZHWLsRBACtzInKFFsS4RgRU4NTxvDXWcrasf8Bilpz2+BYqTl+TbKQETkc
 181PYu3sApuIuXwlya4X5bCceo+yThdM8dN+4nktDLl3i6E2+tXfAsIR6MEQWzsI
@@ -92,140 +92,381 @@
 yKvxH4ELYJdEujib9ohkBBMRAgAkAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheABQJD
 gmAoBQkHoHdwAAoJEAm8NePuUGRhetYAn2UHN6+sFgrRFQopgFWtNDJ4SY+MAJ9q
 vUlDTNt1UF/vntmvf/2dlzYUj4hGBBARAgAGBQJDgmJWAAoJEOyrDnuD5q4NzT4A
-n2FWZoHV8FcAc1a45lxjnQP8dUPcAKCR8oiEOOE7Usp4oE+Otjb4EK8JCLQxRGF2
-aWQgQW5kZXJzb24gKERhdmUpIDxkYXZpZC5hbmRlcnNvbkBjYWxpeG8ubmV0Pohn
-BBMRAgAnAhsDBQkB4TOABgsJCAcDAgMVAgMDFgIBAh4BAheABQJBhYWpAhkBAAoJ
-EAm8NePuUGRhO/wAoM3wW6JiZKh2VNs7JHHfLVCxpD/RAJ9AEDmmzmGRGD8xS00h
-guGX75vNRIhnBBMRAgAnAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAhkBBQJDcMwL
-BQkDzHxWAAoJEAm8NePuUGRhyKAAn3s3+lKtAdj+YmGUIW/iGY9oz58gAKDKVAFm
-Y6MswnjIwnDidYvvV0Mc2IhnBBMRAgAnAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheA
-AhkBBQJDgmAlBQkHoHdwAAoJEAm8NePuUGRh9AoAoJClXCbuxBj4KPnVpVm7nVmv
-RxEYAJ9vJlUx3XPc1n7DSvGIlXG0Lr+rUIhGBBARAgAGBQJDgmJUAAoJEOyrDnuD
-5q4N+AIAnRCbALiCGh8WzjJa8+xfNUoB45NCAKCI6i0EIL+XM2hwWRrdYK3Ndck6
-mbQ1RGF2aWQgQW5kZXJzb24gKEFkcmVzc2Ugc2Vjb25kYWlyZSkgPGRhdmVhQG5l
-cmltLm5ldD6IZAQTEQIAJAUCQYWFSAIbAwUJAeEzgAYLCQgHAwIDFQIDAxYCAQIe
-AQIXgAAKCRAJvDXj7lBkYekPAKCf65I3amTBfsAX59ocgFgZ2fKGYwCdHNtn/G9s
-b71Bryxkmz1eTxiUiLCIZAQTEQIAJAIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAUC
-Q3DMFAUJA8x8VgAKCRAJvDXj7lBkYRNjAKDS+B9h3miafZxXTR46wgdfhyicLwCf
-fpAqIIQneVXd2zxLeKGMoEiY5/KIZAQTEQIAJAIbAwYLCQgHAwIDFQIDAxYCAQIe
-AQIXgAUCQ4JgKAUJB6B3cAAKCRAJvDXj7lBkYWvQAKC5eftT6gE29ceRNnad99pJ
-z9qd8wCbByDbM/r/2hAz/gnDD+BFeuwzgC2IRgQQEQIABgUCQ4JiVgAKCRDsqw57
-g+auDeAmAJ9GkCnfAIzmslzH+kQf8tt6/HPuEwCgyIG5lzjpOWxjGa5mHbTJhGxe
-xwm5Ag0EQYWDPBAIAIibRsMb2zRV4wBoZEjlNza19qN68lmOsW3ekZrMzjelWzBI
-JtEHOzDR1fPQjppTPuaMiLD6k5vV9xf2nFwwK5002wmifQKAnQZK2vpIO7JnNY92
-wAD0qlSl2bMCc878SPzmvhCKR5E2lKC1GAGcqPlOInsezNNofgDNyI+RSxZFmP+i
-zwrx1EFhAPplIrxJEykhqLW5kvopdnmfic69rfKkCGHbIue8JI8vuiVdu/C4oN1n
-3j9bn9iIMYvCnVVHZYEvzxYEYFOlI2m9gk70L2ZvkHRUI7KcYNuttZTmRwa94OYn
-60bZp3LfGG6tyafY3d1FJmAKJ/rwAjIshWg1jH8ABAsH/RSwLtorJuXy4j1ogHyX
-MDGNXB+rnejAgDtCYdzJmIBzorxksPFJ2YljOUa3yg4v/Ocw6ZEguMN7bzXOL0LE
-8tPsPcxbb0+4+bL2YVwFm5dXCNPKeHYFuO1xhTYp5EpjHGTK4Xq4+OdafsZoTSj5
-2d9xIXpn99dlCh5rTsTWpR52gRfSrXVZdN5ugzYgnEo1rxQRe1CELLf90kL0Mrw/
-l9JLUwwaTwwdlk2hrpxU/O5g0c4Gg3naJzGZfav7DZwN4TYcLQhTcX4JXni/iNxA
-eeLFg5k1KIDjX6lORgJ4aZX5/VwUhMWXINDpJYpV37uuaybHKaj2glxoz7cxCvvU
-NzOITwQYEQIADwIbDAUCQ4JgNQUJB6B3eQAKCRAJvDXj7lBkYVLoAKC3tFHCEzfs
-oc02WxtKGM1RHeYbSwCgsgoaJONU+ID7PSBEZshH7Eu1IoqZAQsEQoOfuAEIAJou
-IzS+PvTMDI3PbAKhlv9ecTBaTm1ZgCaZIHTaKPcNHYWilBr5OXSV/2SZVngNnSpd
-rLUZOJfaCjbG5NvSDfThpfGz0fudZt7H12BJiV2VWNmuOrbTWmOiO5Vhb0m1D9JR
-1InlQ5/BiAMbXOWRuq+cX7KlZ9qR4vW9AYBpmUPINiUgoJOOtPk/48JanHP+h+vZ
-Cknl9ClZc5Y0mmF2/HccX3zxf31FRirCG5euywwZXL+iWi6kcwJ9RxSm3kF1Glue
-MLESn9mNmd+i5WyDcLEzA2QZB19tKjn6O+nTWojWphgH7g0fnZquuBw/ispiA2gX
-9BMKRIm2XWDF/ujJ9dEABim0O01hcmsgUGhpcHBhcmQgKFNvZnRMYW5kaW5nIFN5
-c3RlbXMpIDxtYXJrcEBzb2Z0bGFuZGluZy5jb20+iQE1BBMBAgAfBQJCg5+4AhsP
-BwsJCAcDAgEDFQIDAxYCAQIeAQIXgAAKCRAVnjeBfdZnZ6hNB/4ydPO7divBn2TX
-Q9mWDGHW+BLhYBYdjnTPww+yRw6Mli2MPraiephH9wqTZxxqWEgqYiTfGZczVs13
-pFSoBw5rSJRY2IpnroGL1FbnqFLs+x0n68HA9S1wwqE7Ij4S3cjkMFHFXKygd9yf
-ZwPeRkWJEYhpiegL8gyKXOaonB0/w72EqbtZzS6P1rBwCNWn4mWzvP6ZU/lAdK51
-6f/UA0WOH5kMo50USK/K0uUTQaqWhVTS5PtqbZ8wCo+sI+eIKwKxF2u/Zgh+4xEu
-8fejoIJ0eBhHbJr6FDsly2CWLFAGF+VdeBrK4dwnOH+PfvbP7t69LVBN5p0IWc8g
-6aX7j/e7mQGiBDx6SmIRBACARE4kEq8R0I6ozUI6HK4qeA771hZtV3IEvCojpdPR
-LscFV8Pa2kje0nPsPQWXxKIWD1wp0U0cMxPz5YxQTvUGnRkylm8oNlL+GiM0WPXt
-A27qmopjkW7bMdLBT3b3Uxwo45U6VZkqKFYPgE/XJPIimmerkV9SC6zs2E6gDcA6
-XwCgwml5/wNkTc36w6pkb71SfgS+nvcD/jZIf2F1jMR4BevvqagwBQtdF2bZ/hmk
-CFnepU/GRsZnF+8Zl9F7FRQ/+8PqLPizKhZMUqbxDNLikcUCtQ94oRYjhbSUMTiM
-7I/r69jdkZtl8JPKouHp5rKzluFVcPDrQ7QHTeBD890hHHIX+2bmVztDVjkqnEg4
-tJ98f0oGXsnwA/9TwSPuYoFDVhQmJVLRQ+2sNT+Ugt6QWcbNVbyK7TQtSuBeLZiP
-XM1DQ72OkK8s1RgDkoXcbQmtEvmixHuMklTyeIPayZmFhBq+80sDIyQBYAuM8f9M
-RhNblsQo6mH1Co7utcV98vZO2vdFsj0j/qf0mx/TsMGEw62u4Ftllixws7QiRGFu
-aWVsIEouIEJlcmxpbiA8ZGFuQGRiZXJsaW4ub3JnPohXBBMRAgAXBQsHCgMEAxUD
-AgMWAgECF4AFAj9BsMAACgkQ7FmgR1HlB6zT3gCfVOU90yKacrB38ufI2D+MLUm8
-ayIAni++5k82Cz/UGN+7Eu04MgErOCD8iF0EExECAB0FAjx6SmIFCQDtTgAFCwcK
-AwQDFQMCAxYCAQIXgAAKCRDsWaBHUeUHrFoJAJ4zqNiL1LjFaJsfq2jNWFvIO7RK
-dgCdGc4x7xdrblO+OB0Pcj7ZG62NiZiIRgQTEQIABgUCQr15gQAKCRBxc32m+MTR
-T1PSAKDFFZ7gGVoc+//9f6J2qyPudzYYPACcDrcliNan9AXHv61iwZ27m2qgJGO0
-JkRhbmllbCBKLiBCZXJsaW4gPGRiZXJsaW5AZGJlcmxpbi5vcmc+iF4EExECAB4C
-GwMGCwkIBwMCAxUCAwMWAgECHgECF4AFAj9BsMIACgkQ7FmgR1HlB6wa7wCghmXN
-4ntxrIUFA25f01K8JnVyyKYAoJFbJX7xvK2/cK6RvKlLMyHm4BdoiGQEExECACQF
-Aj9Br10CGwMFCQDtTgAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQ7FmgR1HlB6yQ
-FgCfT813+x3yiS5t/aKBv0149lmIXPoAoLhOEjemx8F+Iml1SNB5/XmMnIHbiEYE
-ExECAAYFAkK9eXYACgkQcXN9pvjE0U/B7gCfarHlXQPxiGj1N0+R8WGuabPRZYwA
-oJRZS4DGjVz8LEqtvoiSXEHOtWo/uQENBDx6Sm0QBADibADROabTTQDu+qMVtVcA
-xq6yS8F3LERDHNJUgX+GShdm5cBcY2aLQ4FjvkVn9rfIG1ItufxU/fAecyqRo+EO
-E/3Ibhye3srm8c0E8QvUBVBpEMJul3gPfEzKBZAO6UogZPEg7HDPZWwqj7mKoSTB
-uTjZMDC5cZHw3zfFrvq8wwADBQP8Dmh9CLccMsT7C//6af73s8pYCKqj1qrdhS97
-dvZAek8VvZ8OP6S2jd1lFwSTSnxTL49KcPr3yVDt5CohNLCPAjSbcyRIpR2P7R/w
-Q9X3K6MIiqiajRHO7P/XuxAk0CozHz++RyIJExaymA1eLCy4AWUWLEXrGZxPPb57
-bH0QJQ6ITAQYEQIADAUCPHpKbQUJAO1OAAAKCRDsWaBHUeUHrKYhAKCn7EvU1BTT
-UALeG/XajV2tAFSlPACfR22/zNoVU9kqJdK0oKOSnYWn31q5AQ0EQHb2XBAEAKvn
-E0b70EzT/KxqZOOPT185ieUOp8GpNiUQ4HrHqP1xOt53vCIBe1TIGwqUPPdSamul
-PrQJYJYGvPHrnrBr4FkCM5X2sD5of2+sQ3Zrkwz5zdRNKK3kajvFfkB4InTsHOSD
-qfnT/tD7AEFrwRXcaO924nVpNzI5Q8niwJ3NwJcHAAMFBACOmSpQd22DipeuT1ON
-GgCmgylk68tbbvtLh8tzsBP3rpU1Om2yBEWhA5/LVOoyBC1xjb7wynZyiiTG/eYG
-gE3R6cCmIDxKtBDrhqb7/kS02HTDY8eWQcuxpnKA2pMrXtl8JMT67WVgY+rWN/Kq
-I1Wnu62xOYknKyx1sZVndmt5gYhJBBgRAgAJBQJAdvZcAhsMAAoJEOxZoEdR5Qes
-6yYAniK9gwFA3bk8tzGIE+JHCa9qeDhLAJ4p9MK9X+FGCKz0nG8MmInSN92AqpkB
-ogRDg4rXEQQA8PFuB8Z6Di8jbB7JcZf365IlxhD0gRbbh/JrQQnOupua78ISAg7c
-SPvuUgoPkq/XuciAgsGtZ1IYCjXcK6ySycxcbwB8KWB9CcolpChbxZ7axUvKHljv
-NoUg63RB3eHv8pNd78DvZyDRQbjgYCP5MxnBOnTCTAb/FH/g4eEc77MAoPYnfc56
-JoDoPz+xKID+i0C0xjsLA/wJQPIEk/WAVznj+DKWWIJPYNGPNclzu90YhmPufiM0
-RhV4ahJhnMiPAx4TbpqvVS33shq3Ea7j376c0Q5kIt42fCVzecLMeYeopAJ/iN0x
-2To57gtpdTxpe4kAv7cdObQ9IQ/a8ftPZhNK7JLxq59KxJEEwhAre5i9dGGC6oRD
-MQP+KUVHIeZK17gHuvqNav7DcIRvtA/kmY/cPWJoPW+Opta1+1YN0IETLbl3iPW8
-wa9QIzUU9g/ABEwhYJz7hmvdFZfIlCbIwbcchLhKHoPnQrnFk6jP0WWfBcOLvYUn
-zpWQrXnNEC44XAr+I0ReEbWRD5zXb+91BWcy6pR4X3ldOYW0LUdhcnJldHQgUm9v
-bmV5IDxyb29uZWdAZWxlY3RyaWNqZWxseWZpc2gubmV0PohgBBMRAgAgBQJDg4rX
-AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQyR242pvPzi/dAACg8AeMW9qE
-T74SdX8mMNJ/5DM/r9wAn0vNI46aYq8WMfgMJyf0iRtrSDlGiEYEEBECAAYFAkOU
-eRQACgkQZ9mySWdPBeAjFQCeMrK+TXtjJ8lph7c5cIPCLeW5QcYAn1k58UEXdtNv
-E0IOvWHUIuQuW4aAtCJHYXJyZXR0IFJvb25leSA8cm9vbmVnQGFwYWNoZS5vcmc+
-iF4EExECAB4FAkOPuMYCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQyR242pvP
-zi+ugwCfTQA9AjfmwMYuwpNu18QSXbryYUMAn3G64OWK0BlcWRNMqW1Zy9DoOj0Z
-iEYEEBECAAYFAkOUeRMACgkQZ9mySWdPBeDIeQCfdBcrDsa3AfNkt+KElbl81bAh
-IJcAoJw1vuM/oYtSoGztVXnA9MufpoCAuQINBEODiuIQCAD5sN9bqMtNSINKBJ1S
-jVByyUUWeCrLuBwsCl8Ak2RYvA4e+PFkmoGcla9/3DRdlMz8u8tmWWcU1J7PqP21
-hRa0hb7mVT2MTLIjHmBhu8gARQyF++rMnYxeu+5DZa1GvmuHkQ09KWDwlD8OEGU9
-RwZXUHymK2tl+tBQ6W1wmxMevIF2Uq0rJGzAGqPsDnXpbZlAQVxMvdyg1vfVMcaz
-tNsmP38MSVIAxLJLpt3Y8PDuSkcH3SaCoxBqWp8eogBJUMrfDKfKOJCW9aQbfh5L
-787isCr/Xi4YQYl1CJHS/7AVqnSwbXeBUn2CNBcNRdh8e2AZXUHVAqDzQLppXWzY
-8tP7AAMFCADx/IuPBFnrhJX59MhHNWI1syjSsfX/l9Sw/zmJb1zEooqttIC+dLJl
-iGaGIcTxiULJjBC/hf8D87v67wd75BzGwtzpA2PZf6BvXao9nKb9HqjBHPOtpVvo
-/6HDRqKClPlvZs//jHPqFxnOy4HZC9dsyde8iQdSlsVbdahC379uepJHLis2kunw
-M1u+yuTgbr1ToQMyM5ZSe8etCkQ7UMjAH6uvaBnIHn0I9zNs5G4drJ1hGce8L6AH
-e+SIhpshYGvIgOd21ad+6TrRAgL4k6rczsGqJxxZp3Aae385PMVPIqnF2ggSMI9D
-Eb5IO5c72FA/JFoy3JLQS899VORRDZuGiEkEGBECAAkFAkODiuICGwwACgkQyR24
-2pvPzi8cLgCeJ19REJxW4gdWafNHNoFbtMfic2cAniZM6mFSuSPkBcpjKOUU5P3q
-i+n8mQGiBEBMrdURBAC/xT1huk8n0wa5dN0gcF9x5i2laSvD/ioY4vyhcNBPCwW9
-os45TYZbDOhaZqm3uMlTT3veOhYHaeduQjSd4gNIh4GPWy9TMD9W7jUHa/k51dO5
-gZ8q528MWH6sykKK9FmkmAT9gceTqt9aY6Z7NJuAqc/0YOQFu1WC/byiRwt+IwCg
-grkJBa0sU/Da2CyfMftKpgsKOdcD/1izXnJXjXsl7tiSsQxCXZs4WtJtikjcij/t
-D1aRtHz0327kKeYTU3j7oCiBZdplx9OQtYwwZFd6iqx0OWn8Z0KBsTrVwQCQmf+J
-tWiuk+TDStqw69LfgzIoMVZ/w8ghVzijXQYZqUPPSEzlIwgAUtS0HfwwcBIezbA4
-gW4KGl2ZA/0eumt3QwVgYuAVPVQHMaleF6BHUnSi8C4NNWNu3ddl+yxvd/LevdpI
-MZPxS0QFNAR7Y89UiysbK5Drz0GG1+zK2GFaBbkYAtIVCOdMxdTA9UdLme1cS45t
-+LpS+nFQ2HMZ8WFeDhbnp1C5qfiyHxmSlCF4yfircptuRVFVyxo0w7QkRXJpayBI
-dWVsc21hbm4gPGUuaHVlbHNtYW5uQGdteC5uZXQ+iF8EExECAB8FAkBMrdUFCQHa
-nAAECwcDAgMVAgMDFgIBAh4BAheAAAoJEIuTtBKWs/U5k0wAmwbmjkRPwaLVHlus
-apRqU6Tu8TO2AJ4rPMnUqR/tYry8lB2/C+U3VphjkohGBBARAgAGBQJAia2cAAoJ
-EPbQZreyjt2CtGQAmgN1fy34CnS1D1zOucstvyKedtPFAJ9UbMfjo98zU7Oly08Y
-LYXvZxA2WYhGBBARAgAGBQJAkVCEAAoJEGY1tsDeiF3TrDYAoJnnIKNqiIwan3Wf
-JM3haFSrcUOAAJ96uDhl4dJFsdhx+ixGi3JQtdEcFIhGBBMRAgAGBQJDgiboAAoJ
-ELyduxPbAKJIKBMAoLcKUoNzd5p23bKiRAOv8ukMPCOqAJ9tN5UcQFLpGdmo3lic
-CFuIb9T0sLkBDQRATK3WEAQAvEEc8qQgg+ly44jZ/VMK38R2SNjlO0noor8YtBPi
-X0qaJUlywfxAy9nGLCQlDVcyupjETXAvCQDwrkO+GdZ1W96fG2AhiL2oAaYVSt7v
-VZy1peVla/DLO9jpPXdCJP0KLCN7CH7p0IrkCQcK2OdzJRWCZHs7Ua+oM4HQjkl2
-FMcABAsD/AgpXwdJI1nQnFx5+etP/2BEuqIWmAnyW3/qaAfKeMqmBLkNdTa6yqvW
-vd+MzWbIse7ClEMMwRdF0x/wQwNc6izRBI1djJ0fS4moMsNbtMLf48FdunpMF+uu
-7GlNQ/PTmu9ud+bRbzGgNnkJ5RGRmMK5bi9goA26va/BKgcgQ7MhiEwEGBECAAwF
-AkBMrdYFCQHanAAACgkQi5O0Epaz9TlcHwCeM90tM1VaPqS7QHW31Tq+GlPsrEIA
-n3XvPxBbvJUFwy3Y7bEr4YW/Cy9f
-=4sB1
+n2FWZoHV8FcAc1a45lxjnQP8dUPcAKCR8oiEOOE7Usp4oE+Otjb4EK8JCIhQBBAR
+AgAQBQJDwaiDBYMFZFIiAwUBeAAKCRBT9n90cV/G17W8AJ93C5d4YZDAAZLEv6aN
++LDvAaJw5gCeOxFHLpWo1F57qmddi390wtOq3EqIRgQQEQIABgUCQ8RNtQAKCRDN
+MP4CNU/ZUvgHAJ9KuSTNH/+saLSIlQS+mr7ybdPmIACggxk0yO6RSKiLMWqU4Xm3
+WisstHWIRgQQEQIABgUCQ9JZ8wAKCRDNKLeZ/VaoTs+YAKCb4hllGJP0rtkwUGpW
+5ZrVhDJcFACcDtxQAH/EA42AO5MSvHD0CukDp5uIRgQQEQIABgUCRB7/KgAKCRCD
+Va7YgeieUPHBAJ9Ni9r1WtH8bzoXAFCQryXIx2lfgACgiRknK7BAqMO1XY87toER
+sM9gWU+ITAQSEQIADAUCQYWbiwWDAeEbKgAKCRDsqw57g+auDeq6AJ4tYWbO6Ihb
+I09WxanEhNSHxa/teACggDleO/WFCc8U9+vHax/XIuxDlOqITAQTEQIADAUCQY1X
+XgWDAdlfVwAKCRBd2E16/7S3O69TAKDtsO3zXhwE2Vu8RFLS6MiJjjSOKwCgzXs0
+9gDrXfoP9N/ueNlA6usIuFu0MURhdmlkIEFuZGVyc29uIChEYXZlKSA8ZGF2aWQu
+YW5kZXJzb25AY2FsaXhvLm5ldD6IZwQTEQIAJwIbAwUJAeEzgAYLCQgHAwIDFQID
+AxYCAQIeAQIXgAUCQYWFqQIZAQAKCRAJvDXj7lBkYTv8AKDN8FuiYmSodlTbOyRx
+3y1QsaQ/0QCfQBA5ps5hkRg/MUtNIYLhl++bzUSIZwQTEQIAJwIbAwYLCQgHAwID
+FQIDAxYCAQIeAQIXgAIZAQUCQ3DMCwUJA8x8VgAKCRAJvDXj7lBkYcigAJ97N/pS
+rQHY/mJhlCFv4hmPaM+fIACgylQBZmOjLMJ4yMJw4nWL71dDHNiIZwQTEQIAJwIb
+AwYLCQgHAwIDFQIDAxYCAQIeAQIXgAIZAQUCQ4JgJQUJB6B3cAAKCRAJvDXj7lBk
+YfQKAKCQpVwm7sQY+Cj51aVZu51Zr0cRGACfbyZVMd1z3NZ+w0rxiJVxtC6/q1CI
+RgQQEQIABgUCQ4JiVAAKCRDsqw57g+auDfgCAJ0QmwC4ghofFs4yWvPsXzVKAeOT
+QgCgiOotBCC/lzNocFka3WCtzXXJOpmIUAQQEQIAEAUCQ8GogwWDBWRSIgMFAXgA
+CgkQU/Z/dHFfxterjQCeMAr43nl/QHVlRWIBx63Y0xOkP24AniOaICs1x4EDIWHf
+aBIaxOHeR76uiEYEEBECAAYFAkPETbAACgkQzTD+AjVP2VI4RgCdH3P2e5X5BjBc
+a94G7dwLN5XsrcYAniZIHMxhn3XayCmCx5ey3e7iQerTiEYEEBECAAYFAkPSWfAA
+CgkQzSi3mf1WqE6GZgCgmsq6rEMapvsus0xesX1ZDrVqSe4An3W+FpeBX2watiHs
+9h1R0U1WR6K0iEYEEBECAAYFAkQe/xsACgkQg1Wu2IHonlBx7QCgg3TUNQejy8Vf
+4d/Qkx7IKhSnQEIAoOrQHktbZnVOf9bTP6tr3D9TpRc+iEwEEhECAAwFAkGFm4sF
+gwHhGyoACgkQ7KsOe4Pmrg1zEACfSgRlUmFGhwzOGVtMR/4yaT/sNkIAn0nurJer
+881hborwsjM3+QmSSYeHiEwEExECAAwFAkGNV14FgwHZX1cACgkQXdhNev+0tzuV
+FwCaA9moagl4Pe2Et85Fjy5UNPMj63kAnA2aJG/9oatAX4OzhKfSITCEYsDFtDVE
+YXZpZCBBbmRlcnNvbiAoQWRyZXNzZSBzZWNvbmRhaXJlKSA8ZGF2ZWFAbmVyaW0u
+bmV0PohkBBMRAgAkBQJBhYVIAhsDBQkB4TOABgsJCAcDAgMVAgMDFgIBAh4BAheA
+AAoJEAm8NePuUGRh6Q8AoJ/rkjdqZMF+wBfn2hyAWBnZ8oZjAJ0c22f8b2xvvUGv
+LGSbPV5PGJSIsIhkBBMRAgAkAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheABQJDcMwU
+BQkDzHxWAAoJEAm8NePuUGRhE2MAoNL4H2HeaJp9nFdNHjrCB1+HKJwvAJ9+kCog
+hCd5Vd3bPEt4oYygSJjn8ohkBBMRAgAkAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheA
+BQJDgmAoBQkHoHdwAAoJEAm8NePuUGRha9AAoLl5+1PqATb1x5E2dp332knP2p3z
+AJsHINsz+v/aEDP+CcMP4EV67DOALYhGBBARAgAGBQJDgmJWAAoJEOyrDnuD5q4N
+4CYAn0aQKd8AjOayXMf6RB/y23r8c+4TAKDIgbmXOOk5bGMZrmYdtMmEbF7HCYhQ
+BBARAgAQBQJDwaiDBYMFZFIiAwUBeAAKCRBT9n90cV/G1xV8AKD7XY3qpmyWBtW6
+cPlpIqC2AIepBQCg3e88jDJvG8eP8dmj9897iGfy5lGIRgQQEQIABgUCQ8RNtQAK
+CRDNMP4CNU/ZUv1EAJwPKsP0A3RH81p/3ifXPfH4TFZUxQCghYaMwu63B6rRBtjb
+xY35VvA4H0aIRgQQEQIABgUCQ9JZ8wAKCRDNKLeZ/VaoTh2GAKDPC2QHhYxmia4N
+fNp4qSCogBba7ACbBOcVZGw68sYVo/NwOHh8pVuhH3+IRgQQEQIABgUCRB7/KgAK
+CRCDVa7YgeieUD/DAKCXZG8rE7Qr2EaDlBotYzUqwKDKXQCgo33GTDJxeRoHGNuG
+M0n9+9JZISiITAQSEQIADAUCQYWbiwWDAeEbKgAKCRDsqw57g+auDURVAJ9Tw37s
+zWvvS2YHFTR+EaJ1o35utwCffzQe6B6zsWiC+vhiD7EoDXu+a4eITAQTEQIADAUC
+QY1XXgWDAdlfVwAKCRBd2E16/7S3O7yeAKCfiL/jsmHpjqZyk7Cw2PlRTuioggCf
+fKBinOjAp/M0bj3aHdI0aacM4oC5Ag0EQYWDPBAIAIibRsMb2zRV4wBoZEjlNza1
+9qN68lmOsW3ekZrMzjelWzBIJtEHOzDR1fPQjppTPuaMiLD6k5vV9xf2nFwwK500
+2wmifQKAnQZK2vpIO7JnNY92wAD0qlSl2bMCc878SPzmvhCKR5E2lKC1GAGcqPlO
+InsezNNofgDNyI+RSxZFmP+izwrx1EFhAPplIrxJEykhqLW5kvopdnmfic69rfKk
+CGHbIue8JI8vuiVdu/C4oN1n3j9bn9iIMYvCnVVHZYEvzxYEYFOlI2m9gk70L2Zv
+kHRUI7KcYNuttZTmRwa94OYn60bZp3LfGG6tyafY3d1FJmAKJ/rwAjIshWg1jH8A
+BAsH/RSwLtorJuXy4j1ogHyXMDGNXB+rnejAgDtCYdzJmIBzorxksPFJ2YljOUa3
+yg4v/Ocw6ZEguMN7bzXOL0LE8tPsPcxbb0+4+bL2YVwFm5dXCNPKeHYFuO1xhTYp
+5EpjHGTK4Xq4+OdafsZoTSj52d9xIXpn99dlCh5rTsTWpR52gRfSrXVZdN5ugzYg
+nEo1rxQRe1CELLf90kL0Mrw/l9JLUwwaTwwdlk2hrpxU/O5g0c4Gg3naJzGZfav7
+DZwN4TYcLQhTcX4JXni/iNxAeeLFg5k1KIDjX6lORgJ4aZX5/VwUhMWXINDpJYpV
+37uuaybHKaj2glxoz7cxCvvUNzOITwQYEQIADwIbDAUCQ4JgNQUJB6B3eQAKCRAJ
+vDXj7lBkYVLoAKC3tFHCEzfsoc02WxtKGM1RHeYbSwCgsgoaJONU+ID7PSBEZshH
+7Eu1IoqZAQsEQoOfuAEIAJouIzS+PvTMDI3PbAKhlv9ecTBaTm1ZgCaZIHTaKPcN
+HYWilBr5OXSV/2SZVngNnSpdrLUZOJfaCjbG5NvSDfThpfGz0fudZt7H12BJiV2V
+WNmuOrbTWmOiO5Vhb0m1D9JR1InlQ5/BiAMbXOWRuq+cX7KlZ9qR4vW9AYBpmUPI
+NiUgoJOOtPk/48JanHP+h+vZCknl9ClZc5Y0mmF2/HccX3zxf31FRirCG5euywwZ
+XL+iWi6kcwJ9RxSm3kF1GlueMLESn9mNmd+i5WyDcLEzA2QZB19tKjn6O+nTWojW
+phgH7g0fnZquuBw/ispiA2gX9BMKRIm2XWDF/ujJ9dEABim0O01hcmsgUGhpcHBh
+cmQgKFNvZnRMYW5kaW5nIFN5c3RlbXMpIDxtYXJrcEBzb2Z0bGFuZGluZy5jb20+
+iQE1BBMBAgAfBQJCg5+4AhsPBwsJCAcDAgEDFQIDAxYCAQIeAQIXgAAKCRAVnjeB
+fdZnZ6hNB/4ydPO7divBn2TXQ9mWDGHW+BLhYBYdjnTPww+yRw6Mli2MPraiephH
+9wqTZxxqWEgqYiTfGZczVs13pFSoBw5rSJRY2IpnroGL1FbnqFLs+x0n68HA9S1w
+wqE7Ij4S3cjkMFHFXKygd9yfZwPeRkWJEYhpiegL8gyKXOaonB0/w72EqbtZzS6P
+1rBwCNWn4mWzvP6ZU/lAdK516f/UA0WOH5kMo50USK/K0uUTQaqWhVTS5PtqbZ8w
+Co+sI+eIKwKxF2u/Zgh+4xEu8fejoIJ0eBhHbJr6FDsly2CWLFAGF+VdeBrK4dwn
+OH+PfvbP7t69LVBN5p0IWc8g6aX7j/e7mQGiBEODitcRBADw8W4HxnoOLyNsHslx
+l/frkiXGEPSBFtuH8mtBCc66m5rvwhICDtxI++5SCg+Sr9e5yICCwa1nUhgKNdwr
+rJLJzFxvAHwpYH0JyiWkKFvFntrFS8oeWO82hSDrdEHd4e/yk13vwO9nINFBuOBg
+I/kzGcE6dMJMBv8Uf+Dh4RzvswCg9id9znomgOg/P7EogP6LQLTGOwsD/AlA8gST
+9YBXOeP4MpZYgk9g0Y81yXO73RiGY+5+IzRGFXhqEmGcyI8DHhNumq9VLfeyGrcR
+ruPfvpzRDmQi3jZ8JXN5wsx5h6ikAn+I3THZOjnuC2l1PGl7iQC/tx05tD0hD9rx
++09mE0rskvGrn0rEkQTCECt7mL10YYLqhEMxA/4pRUch5krXuAe6+o1q/sNwhG+0
+D+SZj9w9Ymg9b46m1rX7Vg3QgRMtuXeI9bzBr1AjNRT2D8AETCFgnPuGa90Vl8iU
+JsjBtxyEuEoeg+dCucWTqM/RZZ8Fw4u9hSfOlZCtec0QLjhcCv4jRF4RtZEPnNdv
+73UFZzLqlHhfeV05hbQtR2FycmV0dCBSb29uZXkgPHJvb25lZ0BlbGVjdHJpY2pl
+bGx5ZmlzaC5uZXQ+iGAEExECACAFAkODitcCGwMGCwkIBwMCBBUCCAMEFgIDAQIe
+AQIXgAAKCRDJHbjam8/OL90AAKDwB4xb2oRPvhJ1fyYw0n/kMz+v3ACfS80jjppi
+rxYx+AwnJ/SJG2tIOUaIRgQQEQIABgUCQ5R5FAAKCRBn2bJJZ08F4CMVAJ4ysr5N
+e2MnyWmHtzlwg8It5blBxgCfWTnxQRd2028TQg69YdQi5C5bhoCIRgQQEQIABgUC
+Q9mo1gAKCRD3iHX2QnIfADWXAJ9lUJrHU6FIMhEx80bKru1gXd4h9gCcCEaE74nK
+xhyp1Cp5hS67VvzfnLGIYwQTEQIAIwIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheA
+BQJD2auAAhkBAAoJEMkduNqbz84vlDoAoJCgwCm8CfFC+C+0WNi4LEc83zkzAKCR
+IQK2TX2bXedu5vP3MsOXYKzx9rQiR2FycmV0dCBSb29uZXkgPHJvb25lZ0BhcGFj
+aGUub3JnPoheBBMRAgAeBQJDj7jGAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJ
+EMkduNqbz84vroMAn00APQI35sDGLsKTbtfEEl268mFDAJ9xuuDlitAZXFkTTKlt
+WcvQ6Do9GYhGBBARAgAGBQJDlHkTAAoJEGfZsklnTwXgyHkAn3QXKw7GtwHzZLfi
+hJW5fNWwISCXAKCcNb7jP6GLUqBs7VV5wPTLn6aAgIhGBBARAgAGBQJD2ajUAAoJ
+EPeIdfZCch8Ah8UAnRkEdrxw+jW4EqVNJ0vMthxDTjIeAKC9gDj0HPVKWIJ7x7/U
+oKSNhApv77kCDQRDg4riEAgA+bDfW6jLTUiDSgSdUo1QcslFFngqy7gcLApfAJNk
+WLwOHvjxZJqBnJWvf9w0XZTM/LvLZllnFNSez6j9tYUWtIW+5lU9jEyyIx5gYbvI
+AEUMhfvqzJ2MXrvuQ2WtRr5rh5ENPSlg8JQ/DhBlPUcGV1B8pitrZfrQUOltcJsT
+HryBdlKtKyRswBqj7A516W2ZQEFcTL3coNb31THGs7TbJj9/DElSAMSyS6bd2PDw
+7kpHB90mgqMQalqfHqIASVDK3wynyjiQlvWkG34eS+/O4rAq/14uGEGJdQiR0v+w
+Fap0sG13gVJ9gjQXDUXYfHtgGV1B1QKg80C6aV1s2PLT+wADBQgA8fyLjwRZ64SV
++fTIRzViNbMo0rH1/5fUsP85iW9cxKKKrbSAvnSyZYhmhiHE8YlCyYwQv4X/A/O7
++u8He+QcxsLc6QNj2X+gb12qPZym/R6owRzzraVb6P+hw0aigpT5b2bP/4xz6hcZ
+zsuB2QvXbMnXvIkHUpbFW3WoQt+/bnqSRy4rNpLp8DNbvsrk4G69U6EDMjOWUnvH
+rQpEO1DIwB+rr2gZyB59CPczbORuHaydYRnHvC+gB3vkiIabIWBryIDndtWnfuk6
+0QIC+JOq3M7BqiccWadwGnt/OTzFTyKpxdoIEjCPQxG+SDuXO9hQPyRaMtyS0EvP
+fVTkUQ2bhohJBBgRAgAJBQJDg4riAhsMAAoJEMkduNqbz84vHC4AnidfURCcVuIH
+VmnzRzaBW7TH4nNnAJ4mTOphUrkj5AXKYyjlFOT96ovp/JkBCwRCT8XeAQgAohmw
+geEqHoUOfJFWv900GhVXfFxNfil9ryJt2eTnd8Zpom21cmFcYNgvzSLBABKRQRgD
+VD65JaAjdmhN4UGzW3eqwdgQrwZJPinlafjjhNgaXVAQZ2vvC3NjZBUGHvi5O5wi
+AGgRi08zGEmrFTs/MbPgVymmF5XA66Kuh5Y/Q4axeyPmBW6XipNYlB+GIHM1+5nX
+Wztv7p83wEkyA00zceDjrBNNevvKbhiebi59mZEVmTH1ZA5RuqD4yuAto97I+IvI
+nND+GQKIQ0zOPeCvYZ8Y19OVrnJV0TsLsAGYXqPJJkALLPBqjE5Du2uDDO7I/3Zy
+K1Igf0okRXhuVWhjkQAGKbQcQnJhbmtvIMSMaWJlaiA8YnJhbmVAeGJjLm51PohG
+BBARAgAGBQJC3uErAAoJEMppOXSBA6N+654An1/g1QfRHnwv7P+YErEzc7L+zBsz
+AKCobMOYck69KQB6FaaAn8r6blhGx4hGBBARAgAGBQJC31FjAAoJEEHqCaBXk0mP
+lEwAn1X8mXdPf8nuQ2yjLBfDiqxcNQNRAJ9OamXAuthf7gDHavgli+pF6cEzJ4hG
+BBARAgAGBQJC5H11AAoJEIzjdrgc1IYfihEAnjwF5fMop7FYgAtL0Jyh0vSkvy1G
+AJsE7SAZz85yRZBMWi3zfL7/3Op4UYhGBBARAgAGBQJC5JAWAAoJEASRNELqG6ON
+Dp4An2IPEb+fcBDdMT5o0xCaMWeJIy7HAJ9LIxs089EHYJ3UaBwcQAEeL+nE34hG
+BBARAgAGBQJC6maIAAoJELK+vEAVKSSvqwYAniscHbze2zPR/woj7cpUXUTodQw6
+AKCy9Uzf4IU6hyo1WewO1SsxTpApUohGBBARAgAGBQJDJHyTAAoJEPwPhYn4lL4S
+sf8Anjpl0m06yi8kx62318neXjbEYCMgAJ0ajc+mMOI3qg0iSucHrMVqmpQJlYhG
+BBIRAgAGBQJC4TcgAAoJEKIRWuFfa4tyjysAoIfnXT5UIfm9Od7OqbUFQt31Fo0X
+AKCNwuY1yi36PR3pKV6aWC5ixLni8IhGBBIRAgAGBQJD+8MGAAoJEBU/oM11pnaS
+jv0An0Wndd/NnHtNj6PpLXK/3v6+dAQ1AJ9OJMRcE/8w6OI71WA91wKB9W558IhG
+BBMRAgAGBQJC3rJLAAoJEP1viMYh0Kcb8fsAnRILTd5GV+Kzoz8Pm7i9we50ALwP
+AJ4xKGHe58QJ6GQm5H1zw0QV/aEM0YhGBBMRAgAGBQJC3rsgAAoJEIuWKUP8JD88
+NTwAnjkHdWDleU2UkPsNiDln7rlxild8AJ4jYkdu874SvZkL2vjJtwOn6r2om4hG
+BBMRAgAGBQJC3rwWAAoJEDLJ5M42QstLIggAnihj3lriVCEWNBhX3zCmm2pNUHeZ
+AKDPB7zK6i+YdwPPeYkn70GFuLDzq4hGBBMRAgAGBQJC3t0TAAoJEO7R6jkiYdBz
+CxgAn00Qicsl5h896Yfcd/Cu7ZvN3cdzAJ0UnXQ4HiqMtls1nnUdh43dbVkORIhG
+BBMRAgAGBQJC32zHAAoJEFCOrsUwLaVoOG8An1jVflCH4WnBmwTH/UQaaOZOhJCi
+AJ4uYBKHVbiKgPoLyYcM35Lak5PUTIhGBBMRAgAGBQJC32zKAAoJEN26ZLosMS0v
+U3UAniut9FDsPNYCnVavQIcaswcR9ZmDAJ9WkmtABT2ldGVT3FlcGJkoK+0rCYhG
+BBMRAgAGBQJC3+75AAoJEFz9N/rMeMiTBicAoJZnaDEzG+ncm36lhwBjeqE1lkQ8
+AKCkzw6M3JqYgcOkP2gUluLkV24xuYhGBBMRAgAGBQJC4O1DAAoJEMm1puzi13Tf
+jvkAnj8oUnLOF3j69/gPm23VlX8jRhtfAJ4+XtMz9TsTTNRH4Hj/6SWmHdvgnohG
+BBMRAgAGBQJC4PG7AAoJEFuWgBDgT5qJnooAn0IwHM1GJwXm8MIEC+clkY9Y0rUT
+AKCGjklb3Ogxa8nRQgPoJNEliKNL4YhGBBMRAgAGBQJC4mOGAAoJEG2YjReHMVwx
+Py4Anjf1FW5/tamnvdcTFu3Hk9KSD6DEAKCf5gXupIu8Tn2YLjcThwZvcUuP5IhG
+BBMRAgAGBQJC41tZAAoJEBMuSdTkHtx+05sAnjdxmPycmdCt7bucRBM24sWuhRe2
+AJwOHGt0ogTQia0queOd/nkwd2nIr4hGBBMRAgAGBQJC42UwAAoJEHXKoqPzmzdQ
+tIkAnRiasHTPqhOJWPwPy09XfqpPKkNcAJ0c2sxjAVoIzJ6YKp09bZ+iiypzB4hG
+BBMRAgAGBQJC4+4DAAoJEDKGTkGchSIr/AAAn3U5cGGUdR0U6lwYIToHkr/revjt
+AJ90gsbzzTH1OIsP0FSCRKuLBhQahYhGBBMRAgAGBQJC5B9TAAoJEGtzoQYqYj9y
+7OUAoMh3EZ7Tso9CbmIr+xw91GjTBfRXAJ4tpuvn4pMsSkz1qGmKxkgnDdMKeYhG
+BBMRAgAGBQJC5RECAAoJEFJ5L6+ZeK+GRQgAoPQVzSw6oGirp73fFOWpgi4ksrQV
+AKDOE73eH7l3PFbG4vV5U2/Pa72ChIhGBBMRAgAGBQJC5pnyAAoJEGjrjHb46iln
+MaoAn1TGfmfx2PAXH/xQW2f1SzNhyhbpAJ4pOz/JxdxPh57TCTKACzqSyLuahIhG
+BBMRAgAGBQJC52HFAAoJEG6UdZTBUkMarGUAnjZCSy0Sm5uhMOmOk94qAMXGS5ko
+AKCcaapiq9AVz+GICb2vcOI6UlsevIicBBMBAgAGBQJC3q1RAAoJEDGmPZbsFAuB
+n84D/R834PgBiGaPSSMHV+cr+x9f6v6stXWFRyhWm1lffgo5x80o2pyosgiR1J3X
+qjtCH4Lh0yoRvQAGrluz/HCGMm3bN78Y+AjAwA8UvwcU8JsPTm8F8CyNIPVgCPP+
+RadE/u/nu3NkB6P1vnk331m79oEnKPDRea9rLxEJ/4u0JQmtiJwEEwECAAYFAkLe
+yPoACgkQN+P0X+5l4yHWIQP/bIc1pNECnZ/wfWpPwVcR5P4vHV1gew7uvnJgBNcB
+gLd3STCrd/v70qU3e0VOQNSaRNRF4VwAsGHk3qRsD6ytKwErbV95hG8GxnKcqxRu
+XrDI+9tZkCq1I4KygZaLtfsYCaA7Akc/p8fSrzjK/sGMqyijXvsaRggodmeNpjNN
+MXyInAQTAQIABgUCQt9sxQAKCRCazTzAqZ913YABA/9n2syOSUFxzLzA2vTpD/5D
+STdyc/FWBSf+4N4mAAkQXcxTjEQGhGwMDC4LvwyrlY+KsKgymTGsnyyIJPXMYT3j
+T33SKSXNl+ThgqCYaFI7eRdAdg6o+wWzb4+7fzDG8yjZ4kYrlYVHnbEPKxyMV+Po
+eL+G6z9R+QdrVpb6eihBx4kBNAQTAQIAHgUCQk/F3gIbAwYLCQgHAwIDFQIDAxYC
+AQIeAQIXgAAKCRApuJLQyGKFAUXSCACZABvLs+qb+glfGv3jPGCjug2nP7gcMk9Y
+f0bc296J4OmbWcGWMqaSNDF72+fPw5XUf/xGbqPMb43zT6NlVAa2jPYX6ik61t+z
+QeYZiVxEMShwL2st5QMrA9dGbf5VPtZ2s6n5zj7nx6FM9cg+y18D9VMyenz9H3OZ
+HlWO8ibN0ZtEZlRNg3uHjuaUlZQUHWzuOIRcCNwMqSP55Ykyl1LTs+slcl4faJDH
+xm8KHMWm6THceRMBunz45PfaWQqNSLhH4cyTh/sgkzONHyNWMWhVdfqPgyRBwUif
+qNanoBa0+nMAa9qG3M3H+3NgDN8924/gfNSm5VPCesB1aai71y9qiQE3BBMBAgAh
+AhsDBgsJCAcDAgMVAgMDFgIBAh4BAheABQJCzg5eAhkBAAoJECm4ktDIYoUBvYgH
+/258awDCARVMruf+NRsFpvTx3pMt/vn+iqCTXDJbEfvkfXobDzfXNOEVaw4eHPuG
+swKlM4w9Tl3V5fKpXmvMVkDI84wd5IeFFDsYI/JRLQwvEH9KMlqkzMX+0JTlIrQ2
+KePtsbt3Qt5eClu91NrwZyT6LMp2WyovoG4Kan00wteJxYZDlUkLR0yUlYiru3Si
+ZrkRbIO5bOZGBRU76wwj/9kzCY1BOLGJyFwm9IXnrIHAUTiNwcdyG7029xshoOd/
+a361dPozUcXJBcR96TyaUrJJyYT6usvEPNaEFJXO5WcRn6eipdXpPytZKlznGV0J
+rwvf4CyGcfs/OWKFcD+fTy60H0JyYW5rbyDEjGliZWogPGJyYW5lQGhlcm1lcy5z
+aT6IRgQQEQIABgUCQt7hKwAKCRDKaTl0gQOjfv45AJ9D5ukn9j4P5o7YoxUk0QzT
+Ar8p/ACZAR9DPnFPbcTaEueHLOBtaQbr1mOIRgQQEQIABgUCQt9RcQAKCRBB6gmg
+V5NJj5RVAKCDETG+OW705HzeUJ2kYIYEWoA+HACgpqP1e7kr47dOPCsUNeFD1WT1
+zi2IRgQQEQIABgUCQuR9dwAKCRCM43a4HNSGH7NwAJ9MayifnhgUudUZ71wA/PHj
+JGdyRgCfe56gHFJXJ1BhF5rdGnK3l5pQRgiIRgQQEQIABgUCQuSQGgAKCRAEkTRC
+6hujjSAWAJ9U8Te3DMiPsllbqWyoUys9aP/juwCggX2/hvmvw299vejERmYWHDh+
+6CyIRgQQEQIABgUCQupmjQAKCRCyvrxAFSkkr8dcAKDD8ZPkkKXqBWqAIzLeP1nt
+l4OJKQCgm04OSIxAB4wPLg7e4wmQbh7RtV2IRgQQEQIABgUCQyR8lgAKCRD8D4WJ
++JS+Eoc8AJwMIYu4mE/9B+B3Y2WFeTHyapu9MgCfVFcayG3g/LYWEl9sBxpiNoCg
+KKeIRgQSEQIABgUCQuE3LgAKCRCiEVrhX2uLcjMLAKCfSfngRkc7HDGn9sneEfFE
+Au8LMACggMMpFlFuQeoyyzSa7+qhgL6CF32IRgQSEQIABgUCQ/vDCAAKCRAVP6DN
+daZ2kizfAJsHpLPJMUWRWYlP60YAI1mN5FMQfQCeMqcIKmAO5qgrcYqas6khc1DC
+c/SIRgQTEQIABgUCQt6yTwAKCRD9b4jGIdCnGzfeAJ4otI73DOxOvTpC4nDlsxf7
+XG/uCQCeM38+DU5q1rpOY6VQEiT63Ig7ybGIRgQTEQIABgUCQt68GwAKCRAyyeTO
+NkLLS08SAKCrmvDHi5s+pf3dslR3xfTqjGnWSwCePu2D436BPCTO1VPZgiVShTXU
+Ii2IRgQTEQIABgUCQt7dGAAKCRDu0eo5ImHQc3yAAJwJCADK1nhOE6/mHgff5/0t
+RvYg1wCeK2IIQ0phO2YVPKRn3qEu8JqzOp+IRgQTEQIABgUCQt9syQAKCRBQjq7F
+MC2laFCeAJsEZJNP+BjveUNhjVSUGqXyTue7EgCeOuhAexkgD7FQDHYtE8m9tQCX
+mdKIRgQTEQIABgUCQt9sywAKCRDdumS6LDEtLzG+AKCP6YbRqI62E2l6MieRwbUI
+SkV2awCggR2BPayWVN8wkSxjg3CViMspga+IRgQTEQIABgUCQt/u+wAKCRBc/Tf6
+zHjIk7gsAKDJPMkBsAn8n06X/XpUnKzykvlPowCbBQ5GQwiauiYc5yxQIOsIQ3n2
+ODyIRgQTEQIABgUCQuDtRAAKCRDJtabs4td033njAJ4jMwBRClEm+C+XVEwb5cvt
+FITYrgCcDXrVPhEq6SNm06cZHXZjF5a/DKaIRgQTEQIABgUCQuDxvwAKCRBbloAQ
+4E+aiVDJAJ4vjfHl2F53sidNRXGH9sfpH7ivWgCffFEY5R7xaWnVGMVVeojviTih
+WneIRgQTEQIABgUCQuJjhgAKCRBtmI0XhzFcMZa4AKCJiJ7hXI7xm4djzit9s+7Q
+cmsezQCfSXxTkp5gyf4cQA4Yml1WkL4bLD6IRgQTEQIABgUCQuNbXAAKCRATLknU
+5B7cfp7xAKCJiFE0RQwgu+BxGbwllPO7bVwoagCfRT+f3rpWexc3ts8pqTMEZsVl
+B3GIRgQTEQIABgUCQuNlMQAKCRB1yqKj85s3UMINAKDMDNl7upo6kCCautrlbG5U
+xZrlFwCgvcRgfwi+H9PQ5SxG40W28pvls4uIRgQTEQIABgUCQuPuBgAKCRAyhk5B
+nIUiK/mNAJwJXxs3/3OEVhUgNYZUl60SuPMkFACeMN8MvsCVpRmckq0Jd+LRB/Em
+ycuIRgQTEQIABgUCQuQfUwAKCRBrc6EGKmI/ckuiAJ9LtoVo132PMjgLpO24oCGe
+uXNasgCaAmv/wNwyXTrrUY5btz9wkqzGvC6IRgQTEQIABgUCQuURAgAKCRBSeS+v
+mXivhluzAJ40tOJNa6mj4VXEJno9R0ovSzRX0gCgzzbbGOEJ0bb55OLYbiPd/rC2
+mIKIRgQTEQIABgUCQuaZ8wAKCRBo64x2+OopZ/u+AJ0ae74j4TuwVJsxREO5eivV
+beFzNACgkGjbbHbh55dyxmZFyXjHHNYcPJ+IRgQTEQIABgUCQudhyAAKCRBulHWU
+wVJDGh5gAKCbFpOJZB8ifBj9/rlMgTX2GYZr9ACgxjlY7uRukYPSVsdT1bhAPiO3
+43aInAQTAQIABgUCQt6tVgAKCRAxpj2W7BQLgdeuA/4gWSDeX8ywoT6kf7guzNUk
+RcxBIxvqg193raxQXwWP6OoCFL4fJ/Uc/uS0UlxBEtujruxiYveykyqN38+epfLY
+Y/1hEsDc65yMH2E3I02Cs6Vqz19oR1h5BZqH82Aw700mOr7IYTUb4c7KKA2fNFzB
+BeP/l7HI9HRDnpWDKZwpy4icBBMBAgAGBQJC3sj/AAoJEDfj9F/uZeMhMBgD/A31
+xCm7ON6txAkVsNo6LKoJX8u0WWSdx0SARU+/9dlSxGXHC9UEc2kiGvnQSHl72Mpi
+uN78PwDc73n+Pap6SZMAL3Vm3han03+Tou/MDE8dllvlqW0xSNi39xHTNpHnIjTe
+mjDvuQOqNUY3oljaSGnW4xpRZEArwBmU7rOJ3pH0iJwEEwECAAYFAkLfbMYACgkQ
+ms08wKmfdd1RkwQAtbo9aOVHC7ocJIkJbndP4mkAOZiEyyEuZlEi9ao+6qNrLlFO
+ELZ5MHTpe8hdpGBMCpC15/dcxDavBDpXUJL5g4yt817jGZP1zaCNvDqBDQULujav
+maQdmkj2nZ6pPa7wUvtp8iC6pgF84g4z+B4tr46y3oezt9EdQK/GftiwipqJATQE
+EwECAB4FAkLOCrkCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQKbiS0MhihQHu
+Dgf/cI88QbiS1bMpRtStZLsJxrK69Pj3gA49N1z+plWdffVRrdJxpPq/bMzTC7gz
+uKwDRZjm2SSnoY2pdXXFrRot/ApqUfUHEj3UY2udz0XNrrZg7pEJsTasEaOdc9ww
+Y9Q95B7n0AZrnI4fpiBpEmwFXnYPkEnV9Tor/SXgPOS1MGfrBM21u8hNJ2WsjYh/
+w4N2Zqdboeoi4sZCAvYQ5fI5Iehve7K8hnt5a4QRihdedYqRhL2gkPhp44zjZ7ND
+xzoLku3dxhmwMcuPUPw6HcTJzA0RvLdRcPWdv+BIrLZrd4s479jqW421xb82Lquh
+dxBE90OvAvTfVjMAoX/U5KWnw7QgQnJhbmtvIMSMaWJlaiA8YnJhbmVAYXBhY2hl
+Lm9yZz6IRQQQEQIABgUCQt+SLAAKCRABBWa85BNjkhbFAJdLSSTToeID1O9tzXML
+QsX+5G6VAJwJ5omvtxYqY3M7ZVwLGQgvHFj6uYhGBBARAgAGBQJC3uErAAoJEMpp
+OXSBA6N+RK0An19Ht1wFV+8whLQDm44J+glw5tWlAJ43rAH2I6E7P638J7hWJV7D
+IfGi7YhGBBARAgAGBQJC31FwAAoJEEHqCaBXk0mPMfEAoJ2tMGqdyMmBes7b9Ark
+gdey/4wxAKChoCWI+Wzo3kGPIoU8KS1X8CmhMohGBBARAgAGBQJC5H13AAoJEIzj
+drgc1IYfxzAAn1qJe0dvrdKyxw+fKKqYOr2Vz47CAJ97tTDYe12XWbxhLvrDGpcL
+aO3YB4hGBBARAgAGBQJC5JAaAAoJEASRNELqG6ON3wgAn2dAtfOZNciKpqTiNgOD
+3ir1bK2GAJ0T8ltPa2ml4AndIGe5ZhrX/bSefIhGBBARAgAGBQJC6maNAAoJELK+
+vEAVKSSvjMoAnjKDuJXg/RWM9hWtfO4KHtcdUFE6AJ4kkAQ5Wwongv03xxTG+fKy
+yNnHDYhGBBARAgAGBQJDJHyWAAoJEPwPhYn4lL4SCD0AniOzQJtT8K7Di7Fd1HcM
++5zamPRDAJ9x9w+bIZi89Gzv+H7pg2R8gLdZd4hGBBIRAgAGBQJC4TcuAAoJEKIR
+WuFfa4ty6S4AoIZ82kxJPQc6+T5zny7qJmUv0UxLAKCyiSf9S6MYVfUAsJcvxuKA
+j8aZeYhGBBIRAgAGBQJD+8MIAAoJEBU/oM11pnaSdV4An1CiGlBNqkcLkkpMadik
+OsrWj3S6AJ4suQqs3HlmKCCGR91F2n3uYh24nIhGBBMRAgAGBQJC3rJPAAoJEP1v
+iMYh0KcbUzoAn1SPzKEwhg2bEh/E2xEH68mya4bkAKDzlH7PzieNCSrQYXI0dMVm
+yifxl4hGBBMRAgAGBQJC3rskAAoJEIuWKUP8JD88cCQAnAr6hUUGhg7Oc7cyNewv
+v7rJV1FJAJ9BjXBbp+wLMZNc428IsDinSX6lnohGBBMRAgAGBQJC3rwbAAoJEDLJ
+5M42QstLLLwAoMhJCFQyN7k8EdfPq0io5oJDPNfQAKDHJpkNTnIOax4roxosAFYI
+GjddSIhGBBMRAgAGBQJC3t0YAAoJEO7R6jkiYdBzi30Anjclzhw/gzmEQPBVMzs2
+0iP9OmvoAJ0fw+O69dOvB65XdpQQmISmWOsC44hGBBMRAgAGBQJC32zJAAoJEFCO
+rsUwLaVoI40AnjHxtEMPGXfiuu1HfPslpM9aauStAKC0lgaspKHU3Q1fbkSyGfPd
+dnS2JohGBBMRAgAGBQJC32zLAAoJEN26ZLosMS0vyAsAoLrfj1LHh89eUbt49KnE
+ml4gTacBAJ9kYvlzks+e9dFPGp9x301nP6PakIhGBBMRAgAGBQJC3+77AAoJEFz9
+N/rMeMiT1JQAmgOj7lcQASFubjtGs6mrT5JtXG8QAKDjdALPPpD6EwP9Wd/1YEFY
+zIdYFIhGBBMRAgAGBQJC4O1EAAoJEMm1puzi13TfhpkAoKorofVcb9tokfK8l7Re
+o637pos4AJ9Xipq2ieuKdu5Lf5MXLZrcg3WXj4hGBBMRAgAGBQJC4O3VAAoJEDf2
+j/UBWvyKvBUAoOqxd0SvEdnWidnEBE68Rb+mSi5vAKCd+BcWQvbrBM+LDI9V8BI+
+eXM9zohGBBMRAgAGBQJC4PG/AAoJEFuWgBDgT5qJxNoAn2RHGID4lJMnSM5ykFZS
+S1ilv9n/AKCKLWw+uXNoKTAOsgI4AC8/vo93c4hGBBMRAgAGBQJC4mOGAAoJEG2Y
+jReHMVwx7IkAoIhBt/YoFo6dZoST+9vxtdI1jK9JAJ9/KmvnqcVif3W+o9SXe25N
+AzM644hGBBMRAgAGBQJC41tcAAoJEBMuSdTkHtx+f4sAn2ffIfmDO1jFmojkxerL
+bihK1PfQAJ98/amS/EB8So6hje857mrAlfGRm4hGBBMRAgAGBQJC42UxAAoJEHXK
+oqPzmzdQIv8Anioy8g+a/5XYXucQ6/u5PgKid/uyAKDcDis6wUFmiTyjNvRY5wuk
+6tLHA4hGBBMRAgAGBQJC4+4GAAoJEDKGTkGchSIrKUEAnRz1V6lvWM6Gf4gJGFlI
+MPOFuoSDAJ4/LLK8D6v1A9ZNwvg9TOaoaDJmB4hGBBMRAgAGBQJC5B9TAAoJEGtz
+oQYqYj9yG60An2Wle5LQhVMZW8TzhjVSAJtzmvd9AJ9zpqFttnj60V/EVlQnuUGl
+srPT44hGBBMRAgAGBQJC5RECAAoJEFJ5L6+ZeK+G/yYAoMdijd/ZVgyq09aNyQMj
+cYLA9Z+/AKDk4Yzm9m7fXzFUCu8P6HQEnNbQCIhGBBMRAgAGBQJC5pnzAAoJEGjr
+jHb46ilnyg4An08RlUHPxabZKqyhGzsGIJhpv3MUAJ9Qf51ULX8618NQPzGMeo2M
+Vq5FVIhGBBMRAgAGBQJC52HIAAoJEG6UdZTBUkMaVCAAoMi3+Ncoe/LnrIdEHwuI
+QMLFfCg0AJ4/oaHgmhXjYss3NcX5rafEpu5QqoicBBMBAgAGBQJC3q1WAAoJEDGm
+PZbsFAuBcxUD/jvTknaBf4mrliwwuVqBZ3QE/W6CDGaX99v9GuU26uylFVLoHWdi
+mVoX/x/RW2BOdSCdCUpSH09sQJaH1ywSA2sFYzE85sBEJQHj3vTgOmA8FM2JClml
+Wmk0kMVc8QZoAugSXi1zVYjKNjdLC3hdN26BbKXWH34aYmcfnStF6pvwiJwEEwEC
+AAYFAkLeyP8ACgkQN+P0X+5l4yF65wQAl3CPdjoSZ0GqZsOaXkwrg04HszMeSMom
+xF0K+mHlaxIbX9ZJYUYQ8JH0hl/SDzjrPXyc6mlhnXRBaqqUyjQe0BG6MnOWZ6yQ
+JkoKE2hahht0nSRO+aCoHdrnq2TCcX+T8bCqJyoIUX52nHA3VBMsD+rOzlgrZ9DO
+/c+wZi26CLOInAQTAQIABgUCQt9sxgAKCRCazTzAqZ913UUaBADGK2M4Eyuwntq3
+jzZDKYfqztHQUvZC77AkPVqWJcjaowIf4t+0JvMKcLV464F5gYK7WTJEapYTymFS
+vm90flM4muBscBYk4rtCV33KZMmWQg6kRJ7m//w+xceBNIgJp66F9ySNWdzESQfv
+eSxnYWcBzCd3xmmFTlu0jR1G/rUyAokBNAQTAQIAHgUCQk/GLwIbAwYLCQgHAwID
+FQIDAxYCAQIeAQIXgAAKCRApuJLQyGKFAbIMCACJsAo53d1baydJ9fC6bpXL2UI0
+si9NYoIbRp2Uz7jQAcy7UGsH38ksoVbVI1keO1kMKXYVOL25FDAS4h9RmjsiCNPL
+4eikwHWERQ8HIjlvCLE7W6zqgNhovt3lww1DhOCS+9w3qCK2CTKbCHHb+Om3nv1F
+LfPzlTKeqIMbsw5x12qYba9m2w89EI2OX9NBsRGksMZ2k1g7PjYHX578Zjmy/cjW
+jDjGtDTnm4qVwmE0bKEkCbC69O4XQty7To2FrMoPIIhBXxeVS1e31mhv3/qz73ld
+264P2x5EBQuXTcDGZP/PwOxstelt+h5V+xvDkUozm+iZfMg2S+IdM36/joWJtCZC
+cmFua28gxIxpYmVqIDxicmFua28uY2liZWpAaGVybWVzLnNpPohGBBARAgAGBQJC
+3uErAAoJEMppOXSBA6N+58MAmgKoD/xtD9W2QdSoyMiOzPwVq2R6AKC1ZSJdnpoE
+9dYpjY4pAngrkp2zfIhGBBARAgAGBQJC31FwAAoJEEHqCaBXk0mPIawAn2fjZAeW
+9VOWAqzZ0NOQtyEPSX+JAJ9lTTdUx09JgQ2oPF3b741lrMIa7IhGBBARAgAGBQJC
+5H13AAoJEIzjdrgc1IYfg+AAnR0AFo8Er6vN5RFYSHcj2ViT1wLjAJ9yLYgpSf/+
+/pIRjeu4dbNXHQikKIhGBBARAgAGBQJC5JAaAAoJEASRNELqG6ONa6EAn35VmMwb
+qL7GflDfHUAE05dkq6OTAJ9ZnZzVX/2nRqY+gSQmVBjwEzhVmIhGBBARAgAGBQJC
+6maNAAoJELK+vEAVKSSv5XUAnRhwW6w95vzVOQTeNhPsqUCnEsJ1AKDL7nb5A+w+
+CcOSptrzUweQZ9mLrIhGBBARAgAGBQJDJHyWAAoJEPwPhYn4lL4S7DYAnRZRXJIS
+/Es4GdYkKGZKvA162mndAJ4ynlOAcMznKqZV2vA8PEwEpnrRVYhGBBIRAgAGBQJC
+4TctAAoJEKIRWuFfa4tyRv8Anj7Hd67er0tDxInXppwhHwjF6yljAJ91RWhrbrbF
+dAzZtgVYTn/Fkn3IG4hGBBIRAgAGBQJD+8MIAAoJEBU/oM11pnaSTvMAmQHR59eo
+AzjAynFO5voQ68PjCFBBAJ4+INZGDaZ+IK2OC/BY0EQdrYN6/ohGBBMRAgAGBQJC
+3rJPAAoJEP1viMYh0KcbG1cAoL7Gel+r4xNdfYe49ESPnf6i9wO5AJ9bdi0BFUey
+6zTzwMGnVZ04Xe8KVohGBBMRAgAGBQJC3rwcAAoJEDLJ5M42QstLULIAoNeyhfSD
+dXt5Ri58S8pW0s0cBQpaAKCFN2LdpbHyYKhQSp5hMEfRB4uSiYhGBBMRAgAGBQJC
+3t0YAAoJEO7R6jkiYdBzFEwAn0C1cMlnMaStRbY+o5in/kiCkTSqAJkB7CWVXvQu
+1whmFsJw/S4bbiMNFohGBBMRAgAGBQJC32zJAAoJEFCOrsUwLaVoWAUAmQHzk9JZ
+Ab+wQuihNwqByTImPQzPAJsEEYt3drtRaebklOr5qbucyHF5kYhGBBMRAgAGBQJC
+32zLAAoJEN26ZLosMS0vwx8AoNEt0SN7Th/4m4yex/acOaCNO+hkAKCfgU+8nrwz
+qyPvwl9LOePv1cCViYhGBBMRAgAGBQJC3+77AAoJEFz9N/rMeMiTMiMAn0o8t8DR
+1HVIPTvFzX+uYqMA3xJOAKCCgzePrTTPpJfeaLVmGAow3gScD4hGBBMRAgAGBQJC
+4O1EAAoJEMm1puzi13TfR1AAoKrgASZr6+KnB95aaAFcL1u8VN1DAJ9VQmesQ/C4
+rCrhWcSGkxWVLw10mYhGBBMRAgAGBQJC4PG/AAoJEFuWgBDgT5qJOJ8AnioFeFTM
+LRSPGumqjQEnWtIbGjspAJ9CcEEBRoYLJjQHxgzo0vPge9fMYIhGBBMRAgAGBQJC
+4mOGAAoJEG2YjReHMVwxsXkAn1YsuqEX6oGvyqb23hC3uRpGR+99AKDscm3t9mVq
+mV3FaGbqL7ojzrpJh4hGBBMRAgAGBQJC41tcAAoJEBMuSdTkHtx+b3wAnir8fXYe
+DQjEDQRmXuvxBwdakS27AJ96zI2cA7+8cvzK5obY6bx/iuu9vIhGBBMRAgAGBQJC
+42UxAAoJEHXKoqPzmzdQsMcAni4YUk2u+3kQY+TK27G5DK6ZDlLKAJ9A9u4fQ2LZ
+pcq70qGSUpB3XQOzr4hGBBMRAgAGBQJC4+4GAAoJEDKGTkGchSIrur4AoIKYVuBN
+j6zHCoadA7qZG8Eei/AiAJ91NI9tJEuKQofLmxNAuYvEHMa3KIhGBBMRAgAGBQJC
+5B9TAAoJEGtzoQYqYj9yFagAnRO7pnGKDc0TZOzAXNYGhxenZBCMAKC15pKRqp8X
+ZtXJ6ro9Fz4PFRzWDYhGBBMRAgAGBQJC5RECAAoJEFJ5L6+ZeK+GtJ4AoIkQI8O7
+L5Py7kxY66pO4c3tmOC9AKDwpy4YUhY7OHkwcBXMxjygmPaLyYhGBBMRAgAGBQJC
+5pnzAAoJEGjrjHb46ilncz0An0SSIdfEDjudWMcmxo4clwU5ved0AJ478y9fB8HK
+hFzjyBmvDWGnOLJKyIhGBBMRAgAGBQJC52HIAAoJEG6UdZTBUkMaUZEAnjCQzVYT
+eCj9EemzGHW2bt4nq1etAJwKF5dGPQ4184E2Rzn9stq8KAyG1YicBBMBAgAGBQJC
+3q1WAAoJEDGmPZbsFAuBocwD/ioGcJeupW1kPzxZoqhHOVZdMsDsmJLRII/v7fCY
+qgbf/gfYL6+9h8zHLAR4rPpsj1tVR7O+o8aIpzoII8frlEG3x5j6Q8QxnGd8rd2h
+1mkmWMQXmIsZ4AZFMkpnkgatNtbsvA367nwABJ9fWZMt2A+Em4bua6h3FP+0SCxH
+gr36iJwEEwECAAYFAkLeyP8ACgkQN+P0X+5l4yF1vwQAivOP3UPyw9giRaDMoLw7
+2BeCsu2y1L+926VxF54kZ1wHRZHX2SeVo+ZdHjSGmbqzi9laCJicEAzzwYfG/oNI
++TT9KEzsl8cs7kU90HjP9gnKWB2ZNagx1e5L5Lspw0SwuSgq7NNtGTMcAF/xFwk8
+rDTNwAOde66CPWdsjlBngkaInAQTAQIABgUCQt9sxgAKCRCazTzAqZ913Q7xA/46
+TN+6YsFyezr62A3rr8W05A5urEXzCr9eZdGyHNgDlfKppjUhQKYQG5hP+pZBwPko
+s7h0biFgrmTcM62m7HPx3BOXWG6eDe3h/0ozNvLwKcpTxGD8lXlQ7Y4CgHYQdOI2
+zbko/fba+bhoCC+ru7Lc8jfwTUrU/l6gLhX4a/b/2IkBNAQTAQIAHgUCQs4K/gIb
+AwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRApuJLQyGKFAQqtB/9QZ7y5AJPEDsN9
+x76V8wqpHL5ueT0b0m+Tg27D+XpuNmJLgin8b2ZJoptwJJgFE16lf1JgfVEfcp4M
+PJsqnYyoT3eRiyUzFnSGSTOj4WBZ80ufI+ykL1OByNyHOPBZq4Qd+76ymw3Glx/r
+uwjeQiIvNModZW18JIPw0DRWfg7H/weOd5uW25/i/YZKNPkCoW1KvUjHi5lqTvAE
+3DNWQQ6Xw4A/WW4/6WdSQqiKRMZnp5aV/Dp0YA9RgADlcrJdKh4BAn0Q/GEkBERi
+7zdCErbNh0giDOR9nNfP9zgPIxTY56sjnLl081ggGMlhxR9ESu0G6AEYgEU2lTlv
+i8GMmzl6uQELBEJPxogBCACsFe7PW9eEAp1bL67yK2fD/cnkTFZYR3nkf5cQEmqN
+6Y1us36eSGPkFTVmhsOjfnzv14ks9Vhum5leeVvWQRJxzJSfDOgtu4vWESptwYdA
+d3ZQjmu7AGo9HjIgRdwInAaxLOSjPKGsHkYc9OThkvS8/IQW1xaA1G4XWzmLZaOE
+Y56j6CDIpGQsz8RLjfq1f/6R20yvQVtS0n8YBwM1W9o2Zekhkl4KMHpEGpZaN85s
+bn7bTzeJffNPTDAIt47q7RhkA0HzB9YJ2twScIdSA/aqoLqdv56Mz935uVUd1nCf
+/ONhIjKrSnyA9yu819Fw97+9WS8jpajSFi29+t1Rf+9FAAYpiQEfBBgBAgAJBQJC
+T8aIAhsMAAoJECm4ktDIYoUBTasH+wVmAGsAMC/l3w+mYHUMoqUSLABoaZ5b9ZZe
+OjVa6mpJQCGK1QqS3MaXNpjBFhbQEcgRvVZ3aI64CxHqJv7tmUYz2mhz1CtEUsy7
+Cq0AG11ZEDZCWT4Do8xyFtZRkSSJ3oxMTkF+VduP0D20ag+yhiD7wv8iEC/Mwk+Y
+4wlA1UqFyONjERV9ujtVUgDmtFKban7t63xDbgI3iLY0dTomJU6hWoOE+BkeSFNi
+zrvD3JXdaWNiBB9csYvSgHTB9+WIITjfzv0i2m0Jx5zYu9WvEgBPe5qvmYfI0Tex
+lMdjxrtIQjZuNWHf+XBciAw14ouXbzK8StO6Br9XM/LsTVw3dMCZAaIEQ1/PnxEE
+AIMNMWC8W3GqOQmxe1rIWGBQZxZqYef/E0fjpYxZPXQyv7w85tDglJBP4/Xh25YW
+QSR5VUkBFeTBkO2VOcTr+hLwcxEFPKKZMA4oDDxIsOK5rDKZssTOb1MEZjcEi8Qa
+tHo+rrFkcTLYbScvdFzbKcNAzxevGITFKdN4lcxjIrmzAKDCt6E/l+Jx13SUAxEy
+IwYyULVKTQP/WyINg8IYFHNRuPabfHIXjsUndMC1xaduLizUGBWflvzY1NN5mT5c
+646nA5u8876pFsNLeWQt1LjaIuHhZcdJA7j17kX+qpAuk6Q7zS/O29/vnQm6UWFU
+uYHeOB/jiQcA8GpzpWASTbpcPAdYWrzEbpd+Pbsc5mBdL1wdJ3CB0dsD/3uLJUag
+Vs0uPBZAktoduJ2fS3QMA0+7mKQ2W482lfVhvgd4Q3c6vk6y7sXOHmy9IsGiht0E
+o/6dnWF8bLJrty30VlrPeN5W+aXYSHc2rVrgAGeCEjHaWelNtOYB4bg6CLsgvXv/
+oC9AlD1IKD5IM/P3fZa+uetceOq3NG7Zqo9otChQZXRlciBOLiBMdW5kYmxhZCA8
+cGV0ZXJAZmFtbHVuZGJsYWQuc2U+iGQEExECACQFAkNfz58CGwMFCRLMAwAGCwkI
+BwMCAxUCAwMWAgECHgECF4AACgkQ6GFjKbrWIbbrvgCfYyQhtd+wedK1XQso4hh9
+98RRkNcAnifJgi4IaL0YwD4HD59cbQBTOPkiuQINBENfz7AQCACLBahiHlmVnJlR
+jGX0ZtQjd2yMtcE0TN+JpRMJ6BtKzEVj1MLDy+rZCWDatAJFrMVqvYlTdW97yVl7
+fcKhGfMs/veMOwT76LZ8rBMgbbtKlZrMArqrR8ZpAWUMpLGYHHaJq47g1p9e/A6u
+fQXURalhDy44zj1XoboYSV98ZfXhwBIDEeqOu89LWZlzJvn8GutKUUAbANULFL0E
+g7WOP6VsbbfJARN2euBdSvN2dAHBlYvhnMf+pdWUhWaKQ/VotL404b453dqJr9aB
+IEZdHkwhxwxbS/662DeuRYAMCOl5KST6nIC4HxRpTrTh78xrVl0Ek1xwOLO88JAp
+98BiubVTAAMGB/9pHbd6lfZVREcGTXZYheriKmLRIUP7gAlZlFiStTOIIkmuXO67
+TgUV3kFkcOzEY7+ERacwaZhpN4FilMFrOgbkDDF+6s7puZNJ0G+bMFkjeGcQ8boP
+RRASFucFq1lZ91DkcgTyueOLrrRccm0O7zfO0PBRfoPItEqqDs1rt3ql+p43XsuM
+iV3IAEVoC5JbxFjrT+RvqHnkismnppALLBjUVYOjPG0nyXK8mIk768TrEYJtfkJX
+uZiTAvi98dOowhJgLFux4S6LZG0uqnYVx1/W6BoOpZAxbao9GOxBE+QwExNu+5x3
+vozVltBMJj2o9i6vMzgfrsp0H5B0OYoMuyhoiE8EGBECAA8FAkNfz7ACGwwFCRLM
+AwAACgkQ6GFjKbrWIbYWygCgmw8Ch/BRFvEdq9Y0WCH8agqBSa4AoMJRQPkigiGt
+ue5s0DtZ1WJgpzQU
+=0Kc2
 -----END PGP PUBLIC KEY BLOCK-----


--- subversion-1.3.0-neonver.patch DELETED ---


--- subversion-1.3.0.tar.gz.asc DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr  4 09:24:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 05:24:03 -0400
Subject: rpms/selinux-policy/FC-5 policy-20060323.patch, 1.1,
	1.2 selinux-policy.spec, 1.159, 1.160
Message-ID: <200604040924.k349O3m9006413@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20060323.patch selinux-policy.spec 
Log Message:
* Mon Mar 30 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-2.fc5
- Rebuild for FC5


policy-20060323.patch:
 admin/rpm.te               |    1 +
 apps/mono.if               |   23 +++++++++++++++++++++++
 apps/mono.te               |    1 +
 kernel/devices.fc          |    1 +
 kernel/devices.if          |   40 ++++++++++++++++++++++++++++++++++++++++
 kernel/files.if            |   15 +++++++++++++++
 kernel/mls.te              |    1 +
 services/apache.if         |   20 ++++++++++++++++++++
 services/automount.te      |    1 +
 services/avahi.te          |    4 ++++
 services/bluetooth.te      |    7 +++++--
 services/cups.te           |    2 +-
 services/dbus.te           |    1 +
 services/hal.te            |   13 ++++++++++++-
 services/networkmanager.te |    1 +
 services/nscd.if           |   20 ++++++++++++++++++++
 services/samba.te          |    2 ++
 services/snmp.te           |    1 +
 services/xserver.if        |   21 +++++++++++++++++++++
 system/fstools.te          |    1 +
 system/getty.fc            |    1 +
 system/getty.te            |    2 ++
 system/init.te             |    1 +
 system/libraries.fc        |   22 +++++++++++++++++-----
 system/logging.if          |   32 ++++++++++++++++++++++++++++++++
 system/mount.te            |    4 +++-
 system/unconfined.if       |   17 +++++------------
 system/unconfined.te       |    4 ----
 system/userdomain.te       |    4 ++--
 29 files changed, 235 insertions(+), 28 deletions(-)

Index: policy-20060323.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/policy-20060323.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- policy-20060323.patch	3 Apr 2006 21:05:55 -0000	1.1
+++ policy-20060323.patch	4 Apr 2006 09:24:00 -0000	1.2
@@ -114,7 +114,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.29/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-03-30 10:04:15.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/kernel/files.if	2006-03-31 11:21:52.000000000 -0500
++++ serefpolicy-2.2.29/policy/modules/kernel/files.if	2006-04-03 17:43:29.000000000 -0400
 @@ -1643,6 +1643,21 @@
  ')
  
@@ -241,6 +241,18 @@
  ')
  
  optional_policy(`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.29/policy/modules/services/cups.te
+--- nsaserefpolicy/policy/modules/services/cups.te	2006-03-30 10:59:02.000000000 -0500
++++ serefpolicy-2.2.29/policy/modules/services/cups.te	2006-04-03 17:42:39.000000000 -0400
+@@ -110,7 +110,7 @@
+ files_tmp_filetrans(cupsd_t, cupsd_tmp_t, { file dir fifo_file })
+ 
+ allow cupsd_t cupsd_var_run_t:file create_file_perms;
+-allow cupsd_t cupsd_var_run_t:dir rw_dir_perms;
++allow cupsd_t cupsd_var_run_t:dir { setattr rw_dir_perms };
+ allow cupsd_t cupsd_var_run_t:sock_file create_file_perms;
+ files_pid_filetrans(cupsd_t,cupsd_var_run_t,file)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-2.2.29/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2006-03-24 11:09:14.000000000 -0500
 +++ serefpolicy-2.2.29/policy/modules/services/dbus.te	2006-03-31 11:21:52.000000000 -0500
@@ -254,7 +266,7 @@
  seutil_read_default_contexts(system_dbusd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.29/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2006-03-30 10:59:02.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/services/hal.te	2006-04-03 11:31:34.000000000 -0400
++++ serefpolicy-2.2.29/policy/modules/services/hal.te	2006-04-03 17:43:25.000000000 -0400
 @@ -22,7 +22,7 @@
  #
  
@@ -283,7 +295,15 @@
  
  # hal is now execing pm-suspend
  dev_rw_sysfs(hald_t)
-@@ -187,6 +192,11 @@
+@@ -93,6 +98,7 @@
+ files_read_usr_files(hald_t)
+ # hal is now execing pm-suspend
+ files_create_boot_flag(hald_t)
++files_getattr_default_dirs(hald_t)
+ 
+ fs_getattr_all_fs(hald_t)
+ fs_search_all(hald_t)
+@@ -187,6 +193,11 @@
  	optional_policy(`
  		networkmanager_dbus_chat(hald_t)
  	')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/selinux-policy.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- selinux-policy.spec	3 Apr 2006 17:32:00 -0000	1.159
+++ selinux-policy.spec	4 Apr 2006 09:24:00 -0000	1.160
@@ -6,7 +6,7 @@
 %define BUILD_MLS 1
 %define POLICYVER 20
 %define POLICYCOREUTILSVER 1.30-1
-%define CHECKPOLICYVER 1.30-1
+%define CHECKPOLICYVER 1.30.3-1
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.29



From fedora-cvs-commits at redhat.com  Tue Apr  4 09:41:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 05:41:08 -0400
Subject: rpms/selinux-policy/FC-5 modules-strict.conf, 1.7,
	1.8 selinux-policy.spec, 1.160, 1.161
Message-ID: <200604040941.k349f85h006566@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	modules-strict.conf selinux-policy.spec 
Log Message:
* Tue Apr 4 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-3
- Bump for fc5



Index: modules-strict.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/modules-strict.conf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- modules-strict.conf	20 Feb 2006 22:11:40 -0000	1.7
+++ modules-strict.conf	4 Apr 2006 09:41:05 -0000	1.8
@@ -20,6 +20,14 @@
 terminal = base
 
 # Layer: kernel
+# Module: mcs
+# Required in base
+#
+# Multicategory security policy
+# 
+mcs = base
+
+# Layer: kernel
 # Module: files
 # Required in base
 #
@@ -81,17 +89,9 @@
 # Module: mls
 # Required in base
 #
-# MultiCategory security policy
-# 
-mls = base
-
-# Layer: kernel
-# Module: mcs
-# Required in base
-#
 # Multilevel security policy
 # 
-mcs = base
+mls = base
 
 # Layer: kernel
 # Module: selinux
@@ -144,6 +144,13 @@
 kudzu = module
 
 # Layer: admin
+# Module: bootloader
+#
+# Policy for the kernel modules, kernel image, and bootloader.
+# 
+bootloader = base
+
+# Layer: admin
 # Module: updfstab
 #
 # Red Hat utility to change /etc/fstab.
@@ -155,7 +162,7 @@
 #
 # Network analysis utilities
 # 
-netutils = module
+netutils = base
 
 # Layer: admin
 # Module: alsa
@@ -187,6 +194,13 @@
 su = module
 
 # Layer: admin
+# Module: apt
+#
+# APT advanced package toll.
+# 
+apt = module
+
+# Layer: admin
 # Module: dmesg
 #
 # Policy for dmesg.
@@ -201,6 +215,13 @@
 anaconda = module
 
 # Layer: admin
+# Module: dpkg
+#
+# Policy for the Debian package manager.
+# 
+dpkg = off
+
+# Layer: admin
 # Module: amanda
 #
 # Automated backup program.
@@ -279,6 +300,13 @@
 tmpreaper = module
 
 # Layer: admin
+# Module: mrtg
+#
+# Network traffic graphing
+# 
+mrtg = module
+
+# Layer: admin
 # Module: dmidecode
 #
 # Decode DMI data for x86/ia64 bioses.
@@ -292,6 +320,27 @@
 # 
 logwatch = module
 
+# Layer: kernel
+# Module: storage
+#
+# Policy controlling access to storage devices
+# 
+storage = base
+
+# Layer: apps
+# Module: evolution
+#
+# Evolution email client
+# 
+evolution = module
+
+# Layer: apps
+# Module: mozilla
+#
+# Policy for Mozilla and related web browsers
+# 
+mozilla = module
+
 # Layer: apps
 # Module: irc
 #
@@ -321,6 +370,13 @@
 gpg = module
 
 # Layer: apps
+# Module: thunderbird
+#
+# Thunderbird email client
+# 
+thunderbird = module
+
+# Layer: apps
 # Module: wine
 #
 # Wine Is Not an Emulator.  Run Windows programs in Linux.
@@ -342,6 +398,20 @@
 screen = module
 
 # Layer: apps
+# Module: calamaris
+#
+# Squid log analysis
+# 
+calamaris = module
+
+# Layer: apps
+# Module: tvtime
+#
+# tvtime - a high quality television application
+# 
+tvtime = module
+
+# Layer: apps
 # Module: java
 #
 # Java virtual machine
@@ -349,6 +419,13 @@
 java = module
 
 # Layer: apps
+# Module: uml
+#
+# Policy for UML
+# 
+uml = module
+
+# Layer: apps
 # Module: cdrecord
 #
 # Policy for cdrecord
@@ -356,6 +433,13 @@
 cdrecord = module
 
 # Layer: apps
+# Module: mplayer
+#
+# Mplayer media player and encoder
+# 
+mplayer = module
+
+# Layer: apps
 # Module: webalizer
 #
 # Web server log analysis
@@ -363,6 +447,13 @@
 webalizer = module
 
 # Layer: apps
+# Module: ethereal
+#
+# Ethereal packet capture tool.
+# 
+ethereal = module
+
+# Layer: apps
 # Module: userhelper
 #
 # SELinux utility to run a shell with a new role
@@ -370,6 +461,13 @@
 userhelper = module
 
 # Layer: apps
+# Module: games
+#
+# Games
+# 
+games = module
+
+# Layer: apps
 # Module: mono
 #
 # Run .NET server and client applications on Linux.
@@ -383,19 +481,181 @@
 # 
 slocate = module
 
-# Layer: kernel
-# Module: bootloader
+# Layer: system
+# Module: xen
 #
-# Policy for the kernel modules, kernel image, and bootloader.
+# Xen hypervisor
 # 
-bootloader = module
+xen = module
 
-# Layer: kernel
-# Module: storage
+# Layer: system
+# Module: fstools
 #
-# Policy controlling access to storage devices
+# Tools for filesystem management, such as mkfs and fsck.
 # 
-storage = module
+fstools = base
+
+# Layer: system
+# Module: logging
+#
+# Policy for the kernel message logger and system logging daemon.
+# 
+logging = base
+
+# Layer: system
+# Module: hostname
+#
+# Policy for changing the system host name.
+# 
+hostname = module
+
+# Layer: system
+# Module: daemontools
+#
+# Collection of tools for managing UNIX services
+# 
+daemontools = module
+
+# Layer: system
+# Module: getty
+#
+# Policy for getty.
+# 
+getty = module
+
+# Layer: system
+# Module: lvm
+#
+# Policy for logical volume management programs.
+# 
+lvm = base
+
+# Layer: system
+# Module: sysnetwork
+#
+# Policy for network configuration: ifconfig and dhcp client.
+# 
+sysnetwork = base
+
+# Layer: system
+# Module: init
+#
+# System initialization programs (init and init scripts).
+# 
+init = base
+
+# Layer: system
+# Module: selinuxutil
+#
+# Policy for SELinux policy and userland applications.
+# 
+selinuxutil = base
+
+# Layer: system
+# Module: udev
+#
+# Policy for udev.
+# 
+udev = base
+
+# Layer: system
+# Module: pcmcia
+#
+# PCMCIA card management services
+# 
+pcmcia = module
+
+# Layer: system
+# Module: authlogin
+#
+# Common policy for authentication and user login.
+# 
+authlogin = base
+
+# Layer: system
+# Module: libraries
+#
+# Policy for system libraries.
+# 
+libraries = base
+
+# Layer: system
+# Module: raid
+#
+# RAID array management tools
+# 
+raid = module
+
+# Layer: system
+# Module: userdomain
+#
+# Policy for user domains
+# 
+userdomain = base
+
+# Layer: system
+# Module: modutils
+#
+# Policy for kernel module utilities
+# 
+modutils = base
+
+# Layer: system
+# Module: hotplug
+#
+# Policy for hotplug system, for supporting the
+# connection and disconnection of devices at runtime.
+# 
+hotplug = base
+
+# Layer: system
+# Module: clock
+#
+# Policy for reading and setting the hardware clock.
+# 
+clock = base
+
+# Layer: system
+# Module: locallogin
+#
+# Policy for local logins.
+# 
+locallogin = base
+
+# Layer: system
+# Module: iptables
+#
+# Policy for iptables.
+# 
+iptables = module
+
+# Layer: system
+# Module: mount
+#
+# Policy for mount.
+# 
+mount = base
+
+# Layer: system
+# Module: unconfined
+#
+# The unconfined domain.
+# 
+unconfined = module
+
+# Layer: system
+# Module: miscfiles
+#
+# Miscelaneous files.
+# 
+miscfiles = base
+
+# Layer: system
+# Module: ipsec
+#
+# TCP/IP encryption
+# 
+ipsec = module
 
 # Layer: services
 # Module: nis
@@ -412,6 +672,13 @@
 distcc = module
 
 # Layer: services
+# Module: tor
+#
+# TOR, the onion router
+# 
+tor = module
+
+# Layer: services
 # Module: rshd
 #
 # Remote shell service.
@@ -433,6 +700,13 @@
 bind = module
 
 # Layer: services
+# Module: cipe
+#
+# Encrypted tunnel daemon
+# 
+cipe = module
+
+# Layer: services
 # Module: canna
 #
 # Canna - kana-kanji conversion server
@@ -624,6 +898,14 @@
 dovecot = module
 
 # Layer: services
+# Module: amavis
+#
+# Daemon that interfaces mail transfer agents and content
+# checkers, such as virus scanners.
+# 
+amavis = module
+
+# Layer: services
 # Module: cups
 #
 # Common UNIX printing system
@@ -715,13 +997,6 @@
 rdisc = module
 
 # Layer: services
-# Module: xserver
-#
-# X windows login display manager
-# 
-xserver = module
-
-# Layer: services
 # Module: nscd
 #
 # Name service cache daemon
@@ -757,11 +1032,25 @@
 gpm = module
 
 # Layer: services
+# Module: audioentropy
+#
+# Generate entropy from audio input
+# 
+audioentropy = module
+
+# Layer: services
 # Module: mta
 #
 # Policy common to all email tranfer agents.
 # 
-mta = module
+mta = base
+
+# Layer: services
+# Module: rhgb
+#
+# Red Hat Graphical Boot
+# 
+rhgb = module
 
 # Layer: services
 # Module: postfix
@@ -834,6 +1123,13 @@
 slrnpull = module
 
 # Layer: services
+# Module: clamav
+#
+# ClamAV Virus Scanner
+# 
+clamav = module
+
+# Layer: services
 # Module: rsync
 #
 # Fast incremental file transfer for synchronization
@@ -966,179 +1262,3 @@
 # 
 rlogin = module
 
-# Layer: system
-# Module: fstools
-#
-# Tools for filesystem management, such as mkfs and fsck.
-# 
-fstools = module
-
-# Layer: system
-# Module: logging
-#
-# Policy for the kernel message logger and system logging daemon.
-# 
-logging = module
-
-# Layer: system
-# Module: hostname
-#
-# Policy for changing the system host name.
-# 
-hostname = module
-
-# Layer: system
-# Module: daemontools
-#
-# Collection of tools for managing UNIX services
-# 
-daemontools = module
-
-# Layer: system
-# Module: getty
-#
-# Policy for getty.
-# 
-getty = module
-
-# Layer: system
-# Module: lvm
-#
-# Policy for logical volume management programs.
-# 
-lvm = module
-
-# Layer: system
-# Module: sysnetwork
-#
-# Policy for network configuration: ifconfig and dhcp client.
-# 
-sysnetwork = module
-
-# Layer: system
-# Module: init
-#
-# System initialization programs (init and init scripts).
-# 
-init = module
-
-# Layer: system
-# Module: selinuxutil
-#
-# Policy for SELinux policy and userland applications.
-# 
-selinuxutil = module
-
-# Layer: system
-# Module: udev
-#
-# Policy for udev.
-# 
-udev = module
-
-# Layer: system
-# Module: pcmcia
-#
-# PCMCIA card management services
-# 
-pcmcia = module
-
-# Layer: system
-# Module: authlogin
-#
-# Common policy for authentication and user login.
-# 
-authlogin = base
-
-# Layer: system
-# Module: libraries
-#
-# Policy for system libraries.
-# 
-libraries = base
-
-# Layer: system
-# Module: raid
-#
-# RAID array management tools
-# 
-raid = module
-
-# Layer: system
-# Module: userdomain
-#
-# Policy for user domains
-# 
-userdomain = module
-
-# Layer: system
-# Module: modutils
-#
-# Policy for kernel module utilities
-# 
-modutils = module
-
-# Layer: system
-# Module: hotplug
-#
-# Policy for hotplug system, for supporting the
-# connection and disconnection of devices at runtime.
-# 
-hotplug = module
-
-# Layer: system
-# Module: clock
-#
-# Policy for reading and setting the hardware clock.
-# 
-clock = module
-
-# Layer: system
-# Module: locallogin
-#
-# Policy for local logins.
-# 
-locallogin = module
-
-# Layer: system
-# Module: iptables
-#
-# Policy for iptables.
-# 
-iptables = module
-
-# Layer: system
-# Module: mount
-#
-# Policy for mount.
-# 
-mount = module
-
-# Layer: system
-# Module: unconfined
-#
-# The unconfined domain.
-# 
-unconfined = module
-
-# Layer: system
-# Module: miscfiles
-#
-# Miscelaneous files.
-# 
-miscfiles = module
-
-# Layer: system
-# Module: ipsec
-#
-# TCP/IP encryption
-# 
-ipsec = module
-
-# Layer: admin
-# Module: mrtg
-#
-# System log analyzer and reporter
-# 
-mrtg = module
-


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/selinux-policy.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- selinux-policy.spec	4 Apr 2006 09:24:00 -0000	1.160
+++ selinux-policy.spec	4 Apr 2006 09:41:05 -0000	1.161
@@ -1,16 +1,22 @@
 %define distro redhat
 %define polyinstatiate n
 %define monolithic n
-%define BUILD_STRICT 0
-%define BUILD_TARGETED 0
+%if %{?BUILD_STRICT:0}%{!?BUILD_STRICT:1}
+%define BUILD_STRICT 1
+%endif
+%if %{?BUILD_TARGETED:0}%{!?BUILD_TARGETED:1}
+%define BUILD_TARGETED 1
+%endif
+%if %{?BUILD_MLS:0}%{!?BUILD_MLS:1}
 %define BUILD_MLS 1
+%endif
 %define POLICYVER 20
 %define POLICYCOREUTILSVER 1.30-1
-%define CHECKPOLICYVER 1.30.3-1
+%define CHECKPOLICYVER 1.30.3-2
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.29
-Release: 2.fc5
+Release: 3.fc5
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -143,7 +149,7 @@
 %prep 
 %setup -q -n serefpolicy-%{version}
 %patch -p1 
-	
+
 %install
 # Build targeted policy
 %{__rm} -fR $RPM_BUILD_ROOT
@@ -166,45 +172,31 @@
 echo  "htmlview file:///usr/share/doc/selinux-policy-%{version}/html/index.html"> ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/policyhelp
 chmod +x ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/policyhelp
 
+%if %{BUILD_TARGETED}
 # Build targeted policy
 # Commented out because only targeted ref policy currently builds
-
-
-
 %setupCmds targeted targeted-mcs y n
 %installCmds targeted targeted-mcs y  n
+%endif
 
+%if %{BUILD_STRICT}
 # Build strict policy
 # Commented out because only targeted ref policy currently builds
 make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=n bare 
 make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=n conf
+cp -f ${RPM_SOURCE_DIR}/modules-strict.conf  ./policy/modules.conf 
 %installCmds strict strict-mcs y n
+%endif
 
+%if %{BUILD_MLS}
 # Build mls policy
 %setupCmds mls strict-mls n y
 %installCmds mls strict-mls n y 
+%endif
 
 %clean
 %{__rm} -fR $RPM_BUILD_ROOT
 
-%package targeted
-Summary: SELinux targeted base policy
-Group: System Environment/Base
-Provides: selinux-policy-base
-Obsoletes: selinux-policy-targeted-sources
-Prereq: policycoreutils >= %{POLICYCOREUTILSVER}
-Prereq: coreutils
-Prereq: selinux-policy = %{version}-%{release}
-
-%description targeted
-SELinux Reference policy targeted base module.
-
-%files targeted
-%fileList targeted
-
-%pre targeted
-%saveFileContext targeted
-
 %post
 if [ ! -s /etc/selinux/config ]; then
 	#
@@ -240,6 +232,22 @@
 ">> /etc/selinux/config
 fi
 
+%if %{BUILD_TARGETED}
+%package targeted
+Summary: SELinux targeted base policy
+Group: System Environment/Base
+Provides: selinux-policy-base
+Obsoletes: selinux-policy-targeted-sources
+Prereq: policycoreutils >= %{POLICYCOREUTILSVER}
+Prereq: coreutils
+Prereq: selinux-policy = %{version}-%{release}
+
+%description targeted
+SELinux Reference policy targeted base module.
+
+%pre targeted
+%saveFileContext targeted
+
 %post targeted
 %rebuildpolicy targeted
 %relabel targeted
@@ -247,6 +255,12 @@
 %triggerpostun targeted -- selinux-policy-targeted <= 2.0.7
 %rebuildpolicy targeted
 
+%files targeted
+%fileList targeted
+
+%endif
+
+%if %{BUILD_MLS}
 %package mls 
 Summary: SELinux mls base policy
 Group: System Environment/Base
@@ -273,6 +287,10 @@
 %files mls
 %fileList mls
 
+%endif
+
+%if %{BUILD_STRICT}
+
 %package strict 
 Summary: SELinux strict base policy
 Group: System Environment/Base
@@ -299,21 +317,43 @@
 %files strict
 %fileList strict
 
+%endif
+
 %changelog
-* Mon Mar 30 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-2.fc5
-- Rebuild for FC5
+* Tue Apr 4 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-3
+- Bump for fc5
+
+* Mon Apr 3 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-3
+- Get auditctl working in MLS policy
 
-* Mon Mar 30 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-2
+* Mon Apr 3 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-2
 - Add mono dbus support
 - Lots of file_context fixes for textrel_shlib_t in FC5
 - Turn off execmem auditallow since they are filling log files
-- Allow mono to dbus with networkmanager
-- Don't transition to ping from unconfined.
-- Fixes for getty-fax
+
+* Fri Mar 30 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-1
+- Update to upstream
+
+* Thu Mar 30 2006 Dan Walsh <dwalsh at redhat.com> 2.2.28-3
+- Allow automount and dbus to read cert files
+
+* Thu Mar 30 2006 Dan Walsh <dwalsh at redhat.com> 2.2.28-2
+- Fix ftp policy
+- Fix secadm running of auditctl
+
+* Mon Mar 27 2006 Dan Walsh <dwalsh at redhat.com> 2.2.28-1
+- Update to upstream
+
+* Wed Mar 22 2006 Dan Walsh <dwalsh at redhat.com> 2.2.27-1
+- Update to upstream
 
 * Wed Mar 22 2006 Dan Walsh <dwalsh at redhat.com> 2.2.25-3.fc5
+- Bump for fc5
 - Fixes for hplip and klogd
 
+* Wed Mar 22 2006 Dan Walsh <dwalsh at redhat.com> 2.2.25-3
+- Fix policyhelp
+
 * Wed Mar 22 2006 Dan Walsh <dwalsh at redhat.com> 2.2.25-2.fc5
 - Rebuild for FC5
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 09:46:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 05:46:39 -0400
Subject: rpms/selinux-policy/FC-5 selinux-policy.spec,1.161,1.162
Message-ID: <200604040946.k349kdPU019128@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	selinux-policy.spec 
Log Message:
* Tue Apr 4 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-3.fc5
- Bump for fc5



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/selinux-policy.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- selinux-policy.spec	4 Apr 2006 09:41:05 -0000	1.161
+++ selinux-policy.spec	4 Apr 2006 09:46:37 -0000	1.162
@@ -320,7 +320,7 @@
 %endif
 
 %changelog
-* Tue Apr 4 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-3
+* Tue Apr 4 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-3.fc5
 - Bump for fc5
 
 * Mon Apr 3 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-3



From fedora-cvs-commits at redhat.com  Tue Apr  4 09:47:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 05:47:56 -0400
Subject: rpms/selinux-policy/FC-5 selinux-policy.spec,1.162,1.163
Message-ID: <200604040947.k349luQk020452@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	selinux-policy.spec 
Log Message:
* Tue Apr 4 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-3.fc5
- Bump for fc5



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/selinux-policy.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- selinux-policy.spec	4 Apr 2006 09:46:37 -0000	1.162
+++ selinux-policy.spec	4 Apr 2006 09:47:54 -0000	1.163
@@ -12,7 +12,7 @@
 %endif
 %define POLICYVER 20
 %define POLICYCOREUTILSVER 1.30-1
-%define CHECKPOLICYVER 1.30.3-2
+%define CHECKPOLICYVER 1.30.3-1
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.29



From fedora-cvs-commits at redhat.com  Tue Apr  4 09:54:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 05:54:48 -0400
Subject: rpms/kdebase/FC-5 kdebase-3.5.2-dbus.patch, 1.1, 1.2 kdebase.spec,
	1.160, 1.161
Message-ID: <200604040954.k349smLs020541@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdebase-3.5.2-dbus.patch kdebase.spec 
Log Message:
update dbus patch


kdebase-3.5.2-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 
 8 files changed, 1285 insertions(+), 68 deletions(-)

Index: kdebase-3.5.2-dbus.patch
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase-3.5.2-dbus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-3.5.2-dbus.patch	30 Mar 2006 13:46:23 -0000	1.1
+++ kdebase-3.5.2-dbus.patch	4 Apr 2006 09:54:44 -0000	1.2
@@ -1298,7 +1298,7 @@
 +}
 +
 +#endif
---- kdebase-3.5.1/kioslave/media/configure.in.in.dbus	2006-01-26 15:45:06.000000000 +0100
+--- kdebase-3.5.1/kioslave/media/configure.in.in.tn	2006-01-26 15:45:06.000000000 +0100
 +++ kdebase-3.5.1/kioslave/media/configure.in.in	2006-01-26 15:53:54.000000000 +0100
 @@ -106,70 +106,6 @@
  
@@ -1380,3 +1380,39 @@
    AC_DEFINE_UNQUOTED([COMPILE_HALBACKEND],1, [media HAL backend compilation])
    HALBACKEND=yes
    AC_SUBST(HALBACKEND)
+--- kdebase-3.5.2/kioslave/media/mediamanager/Makefile.am.tn	2006-04-03 23:29:27.000000000 +0200
++++ kdebase-3.5.2/kioslave/media/mediamanager/Makefile.am	2006-04-03 23:29:31.000000000 +0200
+@@ -1,17 +1,22 @@
+ kde_module_LTLIBRARIES = kded_mediamanager.la
+ 
+ if include_media_halbackend
+-HALBACKEND_INCS = $(HAL_INCS) $(DBUS_INCS) $(DBUSQT_INCS)
++HALBACKEND_INCS = $(HAL_INCS) $(DBUS_INCS)
+ endif
+ 
+ METASOURCES = AUTO
+ INCLUDES = -I$(srcdir)/../libmediacommon -I../libmediacommon $(HALBACKEND_INCS) $(all_includes)
+ 
++DBUSQT3BINDING_LIB = libdbusqt3.la
++libdbusqt3_la_SOURCES = connection.cpp integrator.cpp message.cpp
++libdbusqt3_la_LDFLAGS = -avoid-version $(all_libraries) -no-undefined
++libdbusqt3_la_LIBADD = $(HAL_LIBS) $(DBUS_LIBS)
++
+ if include_media_halbackend
+ HALBACKEND_LIB = libhalbackend.la
+ libhalbackend_la_SOURCES = halbackend.cpp
+ libhalbackend_la_LDFLAGS = -avoid-version $(all_libraries) -no-undefined
+-libhalbackend_la_LIBADD = $(HAL_LIBS) $(DBUS_LIBS) $(DBUSQT_LIBS)
++libhalbackend_la_LIBADD = $(HAL_LIBS) $(DBUS_LIBS) $(DBUSQT3BINDING_LIB)
+ endif
+ 
+ if include_media_linuxcdpolling
+@@ -20,7 +25,7 @@
+ liblinuxcdpolling_la_LDFLAGS = -avoid-version $(all_libraries) -no-undefined
+ endif
+ 
+-noinst_LTLIBRARIES = $(LINUXCDPOLLING_LIB) $(HALBACKEND_LIB)
++noinst_LTLIBRARIES = $(LINUXCDPOLLING_LIB) $(HALBACKEND_LIB) $(DBUSQT3BINDING_LIB)
+ 
+ kded_mediamanager_la_SOURCES = mediamanager.cpp mediamanager.skel medialist.cpp backendbase.cpp fstabbackend.cpp removablebackend.cpp mediadirnotify.cpp mediadirnotify.skel
+ kded_mediamanager_la_LDFLAGS = $(all_libraries) -module -avoid-version


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- kdebase.spec	30 Mar 2006 13:46:23 -0000	1.160
+++ kdebase.spec	4 Apr 2006 09:54:44 -0000	1.161
@@ -20,7 +20,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.2
-Release: 0.1.fc5
+Release: 0.2.fc5
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -422,6 +422,9 @@
 %{_includedir}/kde/ksplash/*
 
 %changelog
+* Tue Apr 04 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.2.fc5
+- rebuilt
+
 * Thu Mar 30 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc5
 - update to 3.5.2
 - drop kdebase-3.5.1-kwin-systray.patch, kdebase-3.5.1-keyboardlayout.patch,



From fedora-cvs-commits at redhat.com  Tue Apr  4 10:08:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 06:08:10 -0400
Subject: rpms/selinux-policy/devel policy-20060323.patch, 1.8,
	1.9 selinux-policy.spec, 1.166, 1.167
Message-ID: <200604041008.k34A8ACE020760@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20060323.patch selinux-policy.spec 
Log Message:
* Mon Mar 30 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-3
- Get auditctl working in MLS policy


policy-20060323.patch:
 admin/rpm.te               |    1 +
 apps/mono.if               |   23 +++++++++++++++++++++++
 apps/mono.te               |    1 +
 kernel/devices.fc          |    1 +
 kernel/devices.if          |   40 ++++++++++++++++++++++++++++++++++++++++
 kernel/files.if            |   15 +++++++++++++++
 kernel/mls.te              |    1 +
 services/apache.if         |   20 ++++++++++++++++++++
 services/automount.te      |    1 +
 services/avahi.te          |    4 ++++
 services/bluetooth.te      |    7 +++++--
 services/cups.te           |    2 +-
 services/dbus.te           |    1 +
 services/hal.te            |   13 ++++++++++++-
 services/networkmanager.te |    1 +
 services/nscd.if           |   20 ++++++++++++++++++++
 services/samba.te          |    2 ++
 services/snmp.te           |    1 +
 services/xserver.if        |   21 +++++++++++++++++++++
 system/fstools.te          |    1 +
 system/getty.fc            |    1 +
 system/getty.te            |    2 ++
 system/init.te             |    1 +
 system/libraries.fc        |   22 +++++++++++++++++-----
 system/logging.if          |   32 ++++++++++++++++++++++++++++++++
 system/mount.te            |    4 +++-
 system/unconfined.if       |   17 +++++------------
 system/unconfined.te       |    4 ----
 system/userdomain.te       |    4 ++--
 29 files changed, 235 insertions(+), 28 deletions(-)

Index: policy-20060323.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060323.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- policy-20060323.patch	3 Apr 2006 17:17:13 -0000	1.8
+++ policy-20060323.patch	4 Apr 2006 10:07:53 -0000	1.9
@@ -1,3 +1,14 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.2.29/policy/modules/admin/rpm.te
+--- nsaserefpolicy/policy/modules/admin/rpm.te	2006-03-30 10:59:02.000000000 -0500
++++ serefpolicy-2.2.29/policy/modules/admin/rpm.te	2006-04-03 16:38:39.000000000 -0400
+@@ -117,6 +117,7 @@
+ mls_file_read_up(rpm_t)
+ mls_file_write_down(rpm_t)
+ mls_file_upgrade(rpm_t)
++mls_file_downgrade(rpm_t)
+ 
+ selinux_get_fs_mount(rpm_t)
+ selinux_validate_context(rpm_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-2.2.29/policy/modules/apps/mono.if
 --- nsaserefpolicy/policy/modules/apps/mono.if	2006-03-23 16:46:10.000000000 -0500
 +++ serefpolicy-2.2.29/policy/modules/apps/mono.if	2006-04-03 10:03:24.000000000 -0400
@@ -103,7 +114,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.29/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-03-30 10:04:15.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/kernel/files.if	2006-03-31 11:21:52.000000000 -0500
++++ serefpolicy-2.2.29/policy/modules/kernel/files.if	2006-04-03 17:43:29.000000000 -0400
 @@ -1643,6 +1643,21 @@
  ')
  
@@ -126,6 +137,17 @@
  ## <summary>
  ##	Read files in /etc that are dynamically
  ##	created on boot, such as mtab.
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.29/policy/modules/kernel/mls.te
+--- nsaserefpolicy/policy/modules/kernel/mls.te	2006-03-23 16:45:31.000000000 -0500
++++ serefpolicy-2.2.29/policy/modules/kernel/mls.te	2006-04-03 16:29:39.000000000 -0400
+@@ -60,6 +60,7 @@
+ 
+ ifdef(`enable_mls',`
+ range_transition initrc_t auditd_exec_t s15:c0.c255;
++range_transition secadm_t auditctl_exec_t s15:c0.c255;
+ range_transition kernel_t init_exec_t s0 - s15:c0.c255;
+ range_transition kernel_t lvm_exec_t s0 - s15:c0.c255;
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.29/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2006-03-24 11:09:14.000000000 -0500
 +++ serefpolicy-2.2.29/policy/modules/services/apache.if	2006-04-03 13:02:08.000000000 -0400
@@ -219,6 +241,18 @@
  ')
  
  optional_policy(`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.29/policy/modules/services/cups.te
+--- nsaserefpolicy/policy/modules/services/cups.te	2006-03-30 10:59:02.000000000 -0500
++++ serefpolicy-2.2.29/policy/modules/services/cups.te	2006-04-03 17:42:39.000000000 -0400
+@@ -110,7 +110,7 @@
+ files_tmp_filetrans(cupsd_t, cupsd_tmp_t, { file dir fifo_file })
+ 
+ allow cupsd_t cupsd_var_run_t:file create_file_perms;
+-allow cupsd_t cupsd_var_run_t:dir rw_dir_perms;
++allow cupsd_t cupsd_var_run_t:dir { setattr rw_dir_perms };
+ allow cupsd_t cupsd_var_run_t:sock_file create_file_perms;
+ files_pid_filetrans(cupsd_t,cupsd_var_run_t,file)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-2.2.29/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2006-03-24 11:09:14.000000000 -0500
 +++ serefpolicy-2.2.29/policy/modules/services/dbus.te	2006-03-31 11:21:52.000000000 -0500
@@ -232,7 +266,7 @@
  seutil_read_default_contexts(system_dbusd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.29/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2006-03-30 10:59:02.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/services/hal.te	2006-04-03 11:31:34.000000000 -0400
++++ serefpolicy-2.2.29/policy/modules/services/hal.te	2006-04-03 17:43:25.000000000 -0400
 @@ -22,7 +22,7 @@
  #
  
@@ -261,7 +295,15 @@
  
  # hal is now execing pm-suspend
  dev_rw_sysfs(hald_t)
-@@ -187,6 +192,11 @@
+@@ -93,6 +98,7 @@
+ files_read_usr_files(hald_t)
+ # hal is now execing pm-suspend
+ files_create_boot_flag(hald_t)
++files_getattr_default_dirs(hald_t)
+ 
+ fs_getattr_all_fs(hald_t)
+ fs_search_all(hald_t)
+@@ -187,6 +193,11 @@
  	optional_policy(`
  		networkmanager_dbus_chat(hald_t)
  	')
@@ -311,6 +353,29 @@
 +	allow $1 nscd_t:process signal;
 +')
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.29/policy/modules/services/samba.te
+--- nsaserefpolicy/policy/modules/services/samba.te	2006-03-24 11:09:15.000000000 -0500
++++ serefpolicy-2.2.29/policy/modules/services/samba.te	2006-04-03 14:24:40.000000000 -0400
+@@ -105,6 +105,8 @@
+ allow samba_net_t samba_net_tmp_t:file create_file_perms;
+ files_tmp_filetrans(samba_net_t, samba_net_tmp_t, { file dir })
+ 
++allow smbd_t samba_net_tmp_t:file getattr;
++
+ allow samba_net_t samba_var_t:dir rw_dir_perms;
+ allow samba_net_t samba_var_t:lnk_file create_lnk_perms;
+ allow samba_net_t samba_var_t:file create_lnk_perms;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-2.2.29/policy/modules/services/snmp.te
+--- nsaserefpolicy/policy/modules/services/snmp.te	2006-03-24 11:09:13.000000000 -0500
++++ serefpolicy-2.2.29/policy/modules/services/snmp.te	2006-04-03 13:11:33.000000000 -0400
+@@ -49,6 +49,7 @@
+ allow snmpd_t snmpd_var_run_t:dir rw_dir_perms;
+ files_pid_filetrans(snmpd_t,snmpd_var_run_t,file)
+ 
++kernel_read_device_sysctls(snmpd_t)
+ kernel_read_kernel_sysctls(snmpd_t)
+ kernel_read_net_sysctls(snmpd_t)
+ kernel_read_proc_symlinks(snmpd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.29/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2006-03-30 10:16:43.000000000 -0500
 +++ serefpolicy-2.2.29/policy/modules/services/xserver.if	2006-04-03 10:43:12.000000000 -0400
@@ -383,7 +448,7 @@
  libs_use_ld_so(initrc_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.29/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-03-30 10:18:07.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/system/libraries.fc	2006-04-03 12:44:37.000000000 -0400
++++ serefpolicy-2.2.29/policy/modules/system/libraries.fc	2006-04-03 14:29:38.000000000 -0400
 @@ -33,6 +33,7 @@
  #
  /opt(/.*)?/lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
@@ -401,7 +466,7 @@
  /usr/lib(64)?/pgsql/test/regress/.*\.so 	--	gen_context(system_u:object_r:shlib_t,s0)
  
  /usr/lib/win32/.*			--	gen_context(system_u:object_r:shlib_t,s0)
-@@ -62,6 +65,8 @@
+@@ -62,18 +65,27 @@
  /usr/lib(64)?/im/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
  /usr/lib(64)?/iiim/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
  
@@ -410,7 +475,10 @@
  /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libGLU\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?(/.*)?/libnvidia.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -70,10 +75,15 @@
+ /usr/lib(64)?(/.*)?/nvidia_drv.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
++/usr/lib(64)?/vmware/lib(/.*)?/libgdk-x11-.*\.so.*  -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++
  /usr/(local/)?lib/wine/.*\.so  		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/(local/)?lib/libfame-.*\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/local/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
@@ -427,7 +495,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)
  
-@@ -92,6 +102,7 @@
+@@ -92,6 +104,7 @@
  /usr/lib(64)?/libstdc\+\+\.so\.2\.7\.2\.8 --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libg\+\+\.so\.2\.7\.2\.8	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libglide3\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -435,7 +503,7 @@
  /usr/lib(64)?/libdv\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/helix/plugins/oggfformat\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/helix/plugins/theorarend\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -170,10 +181,9 @@
+@@ -170,10 +183,9 @@
  # Java, Sun Microsystems (JPackage SRPM)
  /usr/.*/jre.*/lib/i386/libdeploy.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- selinux-policy.spec	3 Apr 2006 17:17:13 -0000	1.166
+++ selinux-policy.spec	4 Apr 2006 10:07:53 -0000	1.167
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.29
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -320,6 +320,9 @@
 %endif
 
 %changelog
+* Mon Mar 30 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-3
+- Get auditctl working in MLS policy
+
 * Mon Mar 30 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-2
 - Add mono dbus support
 - Lots of file_context fixes for textrel_shlib_t in FC5



From fedora-cvs-commits at redhat.com  Tue Apr  4 10:24:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 06:24:40 -0400
Subject: rpms/gphoto2/devel gphoto2-2.1.99-library-null.patch, NONE,
	1.1 gphoto2.spec, 1.59, 1.60
Message-ID: <200604041024.k34AOeOV002124@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/gphoto2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2108

Modified Files:
	gphoto2.spec 
Added Files:
	gphoto2-2.1.99-library-null.patch 
Log Message:
 - fix crash in ptp2 module

gphoto2-2.1.99-library-null.patch:
 library.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gphoto2-2.1.99-library-null.patch ---
--- gphoto2-2.1.99/libgphoto2-2.1.99/camlibs/ptp2/library.c.null	2006-04-04 12:04:07.000000000 +0200
+++ gphoto2-2.1.99/libgphoto2-2.1.99/camlibs/ptp2/library.c	2006-04-04 12:06:25.000000000 +0200
@@ -1021,7 +1021,7 @@
 static int
 camera_capture_preview (Camera *camera, CameraFile *file, GPContext *context)
 {
-	char		*data;
+	unsigned char	*data = NULL;
 	uint32_t	size;
 	int ret;
 	PTPParams *params = &camera->pl->params;


Index: gphoto2.spec
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- gphoto2.spec	14 Mar 2006 11:06:41 -0000	1.59
+++ gphoto2.spec	4 Apr 2006 10:24:37 -0000	1.60
@@ -5,7 +5,7 @@
 %define libpkg libgphoto2
 %define libver 2.1.99
 Version: %{pkgver}
-Release: 9
+Release: 10
 License: LGPL
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -18,6 +18,7 @@
 Patch3: gphoto2-2.1.99-dbus.patch
 Patch4: gphoto2-2.1.99-canon_segv.patch
 Patch5: gphoto2-2.1.99-config.patch
+Patch6: gphoto2-2.1.99-library-null.patch
 Url: http://www.gphoto.org/
 ExcludeArch: s390 s390x
 PreReq: /sbin/ldconfig, grep, fileutils
@@ -77,6 +78,7 @@
 %patch3 -p1 -b .dbus
 %patch4 -p1 -b .segv
 %patch5 -p1 -b .config
+%patch6 -p1 -b .null
 
 ####################################
 %build
@@ -215,6 +217,9 @@
 # ChangeLog
 ########################################################################
 %changelog
+* Tue Apr 04 2006 Radek Vok??l <rvokal at redhat.com> 2.1.99-10
+- fix crash in ptp2 module
+
 * Tue Mar 14 2006 Than Ngo <than at redhat.com> 2.1.99-9
 - fix gphoto2-config
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 10:34:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 06:34:26 -0400
Subject: rpms/subversion/FC-5 subversion.spec,1.73,1.74
Message-ID: <200604041034.k34AYQ0s002304@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	subversion.spec 
Log Message:
* Tue Apr  4 2006 Joe Orton <jorton at redhat.com> 1.3.1-2.1
- move libsvn_swig_ruby back to -ruby subpackage
- build -java subpackage on s390 again



Index: subversion.spec
===================================================================
RCS file: /cvs/dist/rpms/subversion/FC-5/subversion.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- subversion.spec	4 Apr 2006 09:09:48 -0000	1.73
+++ subversion.spec	4 Apr 2006 10:34:23 -0000	1.74
@@ -1,12 +1,7 @@
 # set to zero to avoid running test suite
 %define make_check 1
 
-%ifarch s390
-# weird gjnih error on s390 
-%define with_java 0
-%else
 %define with_java 1
-%endif
 
 # set JDK path to build javahl; default for JPackage
 %define jdk_path /usr/lib/jvm/java
@@ -16,7 +11,7 @@
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
 Version: 1.3.1
-Release: 2
+Release: 2.1
 License: BSD
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -211,6 +206,7 @@
 %{_datadir}/emacs/site-lisp
 %{_datadir}/xemacs/site-packages/lisp
 %exclude %{_libdir}/libsvn_swig_perl*
+%exclude %{_libdir}/libsvn_swig_ruby*
 %exclude %{_mandir}/man*/*::*
 
 %files devel
@@ -238,8 +234,7 @@
 
 %files ruby
 %defattr(-,root,root,-)
-# This is already in the main package and that is also required:
-#%{_libdir}/libsvn_swig_ruby*
+%{_libdir}/libsvn_swig_ruby*
 %{_libdir}/site_ruby/*/svn
 %{_libdir}/site_ruby/*/*-linux/svn
 
@@ -251,6 +246,10 @@
 %endif
 
 %changelog
+* Tue Apr  4 2006 Joe Orton <jorton at redhat.com> 1.3.1-2.1
+- move libsvn_swig_ruby back to -ruby subpackage
+- build -java subpackage on s390 again
+
 * Tue Apr  4 2006 Joe Orton <jorton at redhat.com> 1.3.1-2
 - update to 1.3.1
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 10:44:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 06:44:45 -0400
Subject: rpms/hplip/FC-5 hplip-strcasecmp.patch, NONE, 1.1 hplip.spec, 1.56,
	1.57
Message-ID: <200604041044.k34Aiju7002508@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Added Files:
	hplip-strcasecmp.patch 
Log Message:
* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com>
- Use case-insensitive matching.  0.9.10 gave all-uppercase in some
  situations.


hplip-strcasecmp.patch:
 device.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hplip-strcasecmp.patch ---
--- hplip-0.9.10/io/hpiod/device.cpp.strcasecmp	2006-04-04 11:00:24.000000000 +0100
+++ hplip-0.9.10/io/hpiod/device.cpp	2006-04-04 11:00:40.000000000 +0100
@@ -633,7 +633,7 @@
    pSys->GeneralizeModel(sz, gen, sizeof(gen));
 
    pSys->GetURIModel(uri, uriModel, sizeof(uriModel));
-   if (strcmp(uriModel, gen) != 0)
+   if (strcasecmp(uriModel, gen) != 0)
       goto bugout;
 
    if (usb_get_string_simple(hd, dev->descriptor.iSerialNumber, sz, sizeof(sz)) < 0)


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/hplip.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- hplip.spec	28 Mar 2006 12:55:37 -0000	1.56
+++ hplip.spec	4 Apr 2006 10:44:43 -0000	1.57
@@ -14,6 +14,7 @@
 Patch2: hplip-config.patch
 Patch3: hplip-quiet.patch
 Patch4: hplip-cups-backend.patch
+Patch5: hplip-strcasecmp.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -71,7 +72,12 @@
 
 # Always use /usr/lib/cups/backend.
 %patch4 -p1 -b .cups-backend
-autoconf
+
+# Use case-insensitive matching.  0.9.10 gave all-uppercase in some
+# situations.
+%patch5 -p1 -b .strcasecmp
+
+autoconf # for patch4
 
 %build
 %configure --disable-foomatic-install --disable-cups-install
@@ -174,6 +180,10 @@
 fi
 
 %changelog
+* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com>
+- Use case-insensitive matching.  0.9.10 gave all-uppercase in some
+  situations.
+
 * Tue Mar 28 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-1.1
 - 0.9.10.
 - Ship PPDs.



From fedora-cvs-commits at redhat.com  Tue Apr  4 10:46:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 06:46:02 -0400
Subject: rpms/hplip/devel hplip-strcasecmp.patch, NONE, 1.1 hplip.spec, 1.61,
	1.62
Message-ID: <200604041046.k34Ak2DC007450@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Added Files:
	hplip-strcasecmp.patch 
Log Message:
* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com>
- Use case-insensitive matching.  0.9.8 gave all-uppercase in some
  situations.


hplip-strcasecmp.patch:
 device.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hplip-strcasecmp.patch ---
--- hplip-0.9.10/io/hpiod/device.cpp.strcasecmp	2006-04-04 11:00:24.000000000 +0100
+++ hplip-0.9.10/io/hpiod/device.cpp	2006-04-04 11:00:40.000000000 +0100
@@ -633,7 +633,7 @@
    pSys->GeneralizeModel(sz, gen, sizeof(gen));
 
    pSys->GetURIModel(uri, uriModel, sizeof(uriModel));
-   if (strcmp(uriModel, gen) != 0)
+   if (strcasecmp(uriModel, gen) != 0)
       goto bugout;
 
    if (usb_get_string_simple(hd, dev->descriptor.iSerialNumber, sz, sizeof(sz)) < 0)


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- hplip.spec	28 Mar 2006 13:04:03 -0000	1.61
+++ hplip.spec	4 Apr 2006 10:45:59 -0000	1.62
@@ -14,6 +14,7 @@
 Patch2: hplip-config.patch
 Patch3: hplip-quiet.patch
 Patch4: hplip-cups-backend.patch
+Patch5: hplip-strcasecmp.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -71,7 +72,12 @@
 
 # Always use /usr/lib/cups/backend.
 %patch4 -p1 -b .cups-backend
-autoconf
+
+# Use case-insensitive matching.  0.9.10 gave all-uppercase in some
+# situations.
+%patch5 -p1 -b .strcasecmp
+
+autoconf # for patch4
 
 %build
 %configure --disable-foomatic-install --disable-cups-install
@@ -160,6 +166,10 @@
 fi
 
 %changelog
+* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com>
+- Use case-insensitive matching.  0.9.8 gave all-uppercase in some
+  situations.
+
 * Tue Mar 28 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-3
 - Always use /usr/lib/cups/backend.
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 10:46:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 06:46:17 -0400
Subject: rpms/hplip/FC-5 hplip.spec,1.57,1.58
Message-ID: <200604041046.k34AkHGR010163@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
Fixed changelog.


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/hplip.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- hplip.spec	4 Apr 2006 10:44:43 -0000	1.57
+++ hplip.spec	4 Apr 2006 10:46:14 -0000	1.58
@@ -181,7 +181,7 @@
 
 %changelog
 * Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com>
-- Use case-insensitive matching.  0.9.10 gave all-uppercase in some
+- Use case-insensitive matching.  0.9.8 gave all-uppercase in some
   situations.
 
 * Tue Mar 28 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-1.1



From fedora-cvs-commits at redhat.com  Tue Apr  4 11:42:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 07:42:05 -0400
Subject: rpms/hplip/FC-5 hplip-revert-hpijs.patch, NONE, 1.1 hplip.spec, 1.58,
	1.59
Message-ID: <200604041142.k34Bg5QA030272@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Added Files:
	hplip-revert-hpijs.patch 
Log Message:
- Last known working hpijs comes from 0.9.8, so use that.

hplip-revert-hpijs.patch:
 Makefile.am                       |   33 
 Makefile.am.0.9.8-4               |  313 ++
 Makefile.in                       |   66 
 PrinterProperties.cpp             |  182 -
 PrinterProperties.h               |  130 -
 configure                         |   21 
 configure.in                      |    3 
 context.cpp                       |    2 
 dj3600.h                          |    1 
 gdevijs-krgb-1.1.patch            |  302 ++
 gdevijs-krgb-1.2-gs7.07.patch     |  616 -----
 gdevijs-krgb-1.2-gs8.50.patch     |  614 -----
 hpijs.cpp                         |   26 
 hpijs_readme.html                 |   13 
 hpijs_readme.html.0.9.8-4         | 4147 ++++++++++++++++++++++++++++++++++++++
 hpijsfax.cpp                      |    2 
 ljfastraster.cpp.0.9.8-4          | 1278 +++++++++++
 ppd/HP-DeskJet_F300-hpijs.ppd     |  440 ----
 ppd/HP-Fax-hplip.ppd              |  129 +
 ppd/HP-LaserJet_3030-hpijs.ppd    |    2 
 ppd/HP_Business_Inkjet_2800.ppd   |    2 
 ppd/HP_Color_LaserJet_2605.ppd    | 1875 +++++++++++++++++
 ppd/HP_LaserJet_1200.ppd          |    4 
 ppd/HP_LaserJet_1220.ppd          |    4 
 ppd/HP_LaserJet_1320_Series.ppd   |    4 
 ppd/HP_LaserJet_2200.ppd          |    4 
 ppd/HP_LaserJet_2410.ppd          |    4 
 ppd/HP_LaserJet_2420.ppd          |    4 
 ppd/HP_LaserJet_2430.ppd          |    4 
 ppd/HP_LaserJet_3200.ppd          |    4 
 ppd/HP_LaserJet_3300_Series.ppd   |    4 
 ppd/HP_LaserJet_4050_Series.ppd   |    4 
 ppd/HP_LaserJet_4100_MFP.ppd      |    4 
 ppd/HP_LaserJet_4100_Series.ppd   |    4 
 ppd/HP_LaserJet_4240.ppd          |    4 
 ppd/HP_LaserJet_4250.ppd          |    4 
 ppd/HP_LaserJet_4345_MFP.ppd      |    4 
 ppd/HP_LaserJet_4350.ppd          |    4 
 ppd/HP_LaserJet_8000_Series.ppd   |    4 
 ppd/HP_LaserJet_8100_Series.ppd   |    4 
 ppd/HP_LaserJet_8150_Series.ppd   |    4 
 ppd/HP_LaserJet_9000_MFP.ppd      |    4 
 ppd/HP_LaserJet_9000_Series.ppd   |    4 
 ppd/HP_LaserJet_9040.ppd          |    4 
 ppd/HP_LaserJet_9040_9050_MFP.ppd |    4 
 ppd/HP_LaserJet_9050.ppd          |    4 
 ppd/HP_Mopier_240.ppd             |    4 
 ppd/HP_Mopier_320.ppd             |    4 
 ppd/hp_LaserJet_1300_series.ppd   |    4 
 ppd/hp_LaserJet_2300.ppd          |    4 
 ppd/hp_LaserJet_3015.ppd          |    4 
 ppd/hp_LaserJet_3020_3030.ppd     |    4 
 ppd/hp_LaserJet_3380.ppd          |    4 
 ppd/hp_LaserJet_4200_Series.ppd   |    4 
 ppd/hp_LaserJet_4300_Series.ppd   |    4 
 services.cpp                      |    3 
 56 files changed, 8176 insertions(+), 2156 deletions(-)

--- NEW FILE hplip-revert-hpijs.patch ---
diff -durN hplip-0.9.10/prnt/hpijs/configure hplip-0.9.8/prnt/hpijs/configure
--- hplip-0.9.10/prnt/hpijs/configure	2006-03-21 20:00:12.000000000 +0000
+++ hplip-0.9.8/prnt/hpijs/configure	2006-01-28 00:02:18.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for HP Printer Driver 2.1.9.
+# Generated by GNU Autoconf 2.59 for HP Printer Driver 2.1.7x.
 #
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
@@ -421,8 +421,8 @@
 # Identity of this package.
 PACKAGE_NAME='HP Printer Driver'
 PACKAGE_TARNAME='hpijs'
-PACKAGE_VERSION='2.1.9'
-PACKAGE_STRING='HP Printer Driver 2.1.9'
+PACKAGE_VERSION='2.1.7x'
+PACKAGE_STRING='HP Printer Driver 2.1.7x'
 PACKAGE_BUGREPORT=''
 
 # Factoring default headers for most tests.
@@ -952,7 +952,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 HP Printer Driver 2.1.9 to adapt to many kinds of systems.
+\`configure' configures HP Printer Driver 2.1.7x to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1018,7 +1018,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of HP Printer Driver 2.1.9:";;
+     short | recursive ) echo "Configuration of HP Printer Driver 2.1.7x:";;
    esac
   cat <<\_ACEOF
 
@@ -1159,7 +1159,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-HP Printer Driver configure 2.1.9
+HP Printer Driver configure 2.1.7x
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1173,7 +1173,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by HP Printer Driver $as_me 2.1.9, which was
+It was created by HP Printer Driver $as_me 2.1.7x, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1816,7 +1816,7 @@
 
 # Define the identity of the package.
  PACKAGE='hpijs'
- VERSION='2.1.9'
+ VERSION='2.1.7x'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -21788,7 +21788,7 @@
 -DAPDK_DJ890 -DAPDK_DJ3320 -DAPDK_LJCOLOR -DAPDK_DJGENERICVIP \
 -DAPDK_LJJETREADY  -DAPDK_LJFASTRASTER \
 -DAPDK_BUFFER_SEND -DAPDK_LDL_COMPRESS -DAPDK_EXTENDED_MEDIASIZE \
--DAPDK_MLC_PRINTER -DAPDK_DJ3600 -DAPDK_LINUX $NDBFLAG"
+-DAPDK_MLC_PRINTER -DAPDK_DJ3600 -DAPDK_LINUX"
 
 # Autoconf-style header tests for APDK
 cat >auto-include.h <<EOFH
@@ -22821,7 +22821,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by HP Printer Driver $as_me 2.1.9, which was
+This file was extended by HP Printer Driver $as_me 2.1.7x, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22879,7 +22879,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-HP Printer Driver config.status 2.1.9
+HP Printer Driver config.status 2.1.7x
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff -durN hplip-0.9.10/prnt/hpijs/configure.in hplip-0.9.8/prnt/hpijs/configure.in
--- hplip-0.9.10/prnt/hpijs/configure.in	2006-03-21 18:01:25.000000000 +0000
+++ hplip-0.9.8/prnt/hpijs/configure.in	2005-12-02 20:05:09.000000000 +0000
@@ -5,7 +5,7 @@
 #
 
 AC_PREREQ(2.59)
-AC_INIT([HP Printer Driver], 2.1.9,, hpijs)
+AC_INIT([HP Printer Driver], 2.1.7x,, hpijs)
 AM_INIT_AUTOMAKE([1.9 foreign])
 AC_PROG_LIBTOOL
 AC_CONFIG_SRCDIR([hpijs.cpp])
@@ -38,7 +38,7 @@
 -DAPDK_DJ890 -DAPDK_DJ3320 -DAPDK_LJCOLOR -DAPDK_DJGENERICVIP \
 -DAPDK_LJJETREADY  -DAPDK_LJFASTRASTER \
 -DAPDK_BUFFER_SEND -DAPDK_LDL_COMPRESS -DAPDK_EXTENDED_MEDIASIZE \
--DAPDK_MLC_PRINTER -DAPDK_DJ3600 -DAPDK_LINUX $NDBFLAG"
+-DAPDK_MLC_PRINTER -DAPDK_DJ3600 -DAPDK_LINUX"
 
 # Autoconf-style header tests for APDK
 cat >auto-include.h <<EOFH
diff -durN hplip-0.9.10/prnt/hpijs/context.cpp hplip-0.9.8/prnt/hpijs/context.cpp
--- hplip-0.9.10/prnt/hpijs/context.cpp	2006-03-22 22:50:45.000000000 +0000
+++ hplip-0.9.8/prnt/hpijs/context.cpp	2006-01-30 20:48:09.000000000 +0000
@@ -1156,7 +1156,6 @@
     if (thePrinter)     // if printer exists due to bidi or previous call
     {
         delete thePrinter;
-        thePrinter = NULL;
     }
 
     err = DR->SelectDevice(Model);
@@ -1227,7 +1226,6 @@
     if (thePrinter)     // if printer exists due to bidi or previous call
     {
         delete thePrinter;
-        thePrinter = NULL;
     }
 
     FAMILY_HANDLE familyHandle = pPFI->FindDevIdMatch(szDeviceId);
diff -durN hplip-0.9.10/prnt/hpijs/dj3600.h hplip-0.9.8/prnt/hpijs/dj3600.h
--- hplip-0.9.10/prnt/hpijs/dj3600.h	2006-03-22 22:50:45.000000000 +0000
+++ hplip-0.9.8/prnt/hpijs/dj3600.h	2006-01-30 20:48:09.000000000 +0000
@@ -62,7 +62,6 @@
         "Deskjet 3745\0"
 		"Deskjet 3840\0"
         "Deskjet 3845\0"
-        "Deskjet F300\0"
 #ifdef APDK_MLC_PRINTER
 		"officejet 5500\0"
         "Officejet 5600\0"
diff -durN hplip-0.9.10/prnt/hpijs/gdevijs-krgb-1.1.patch hplip-0.9.8/prnt/hpijs/gdevijs-krgb-1.1.patch
--- hplip-0.9.10/prnt/hpijs/gdevijs-krgb-1.1.patch	1970-01-01 01:00:00.000000000 +0100
+++ hplip-0.9.8/prnt/hpijs/gdevijs-krgb-1.1.patch	2005-02-25 20:24:46.000000000 +0000
@@ -0,0 +1,660 @@
+diff -uNr old/gdevijs.c new/gdevijs.c
+--- old/gdevijs.c	2005-02-20 15:43:15.284386019 -0800
++++ new/gdevijs.c	2005-02-20 15:43:36.682297237 -0800
+@@ -27,15 +27,29 @@
+  * which is a security risk, since any program can be run.
+  * You should use -dSAFER which sets .LockSafetyParams to true 
+  * before opening this device.
++ *
++ * 11/26/03 David Suffield
++ * (c) 2003-2004 Copyright Hewlett-Packard Development Company, LP
++ *
++ * 1. Removed hpijs 1.0-1.0.2 workarounds, use hpijs 1.0.3 or higher.
++ * 2. Added krgb support.
++ *
++ * 02/21/05 David Suffield
++ * 1. Fixed segfault issue with 1-bit color space.
++ * 2. Fixed z-order issue with colored text on black rectangle.
++ *
+  */
+ 
+ #include "unistd_.h"	/* for dup() */
+ #include <stdlib.h>
++#include <fcntl.h>
+ #include "gdevprn.h"
+ #include "gp.h"
+ #include "ijs.h"
+ #include "ijs_client.h"
+ 
++//#define KRGB_DEBUG
++
+ /* This should go into gdevprn.h, or, better yet, gdevprn should
+    acquire an API for changing resolution. */
+ int gdev_prn_maybe_realloc_memory(gx_device_printer *pdev,
+@@ -51,6 +65,14 @@
+ private dev_proc_get_params(gsijs_get_params);
+ private dev_proc_put_params(gsijs_put_params);
+ 
++/* Following definitions are for krgb support. */
++private dev_proc_create_buf_device(gsijs_create_buf_device);
++private dev_proc_fill_rectangle(gsijs_fill_rectangle);
++private dev_proc_copy_mono(gsijs_copy_mono);
++private dev_proc_fill_mask(gsijs_fill_mask);
++private dev_proc_fill_path(gsijs_fill_path);
++private dev_proc_stroke_path(gsijs_stroke_path);
++
+ private const gx_device_procs gsijs_procs =
+ prn_color_params_procs(gsijs_open, gsijs_output_page, gsijs_close,
+ 		   gx_default_rgb_map_rgb_color, gx_default_rgb_map_color_rgb,
+@@ -83,6 +105,14 @@
+ 
[...11456 lines suppressed...]
-            if (pSys)
-            {
-                delete pSys;
-            }
-            return FALSE;
-        }
-        err = pPC->SelectDevice ((PRINTER_TYPE) iCurrentPrinter);
-        if (err != NO_ERROR)
-        {
-            if (iCurrentPrinter < iLastPrinter)
-            {
-                continue;
-            }
-            delete pPC;
-            delete pSys;
-            return FALSE;
-        }
-        strcpy (pPrinterProperties->szClassName, ModelName[iCurrentPrinter]);
-        for (i = 0; i < (int) (sizeof (PaperSizeInfoData) / sizeof (PaperSizeInfo)); i++)
-        {
-            err = pPC->SetPaperSize (PaperSizeInfoData[i].iPaperSize, 0);
-            if (err == WARN_ILLEGAL_PAPERSIZE)
-            {
-                continue;
-            }
-            strcpy (pPrinterProperties->szPaperSize, PaperSizeInfoData[i].szName);
-            pPrinterProperties->fPhysicalWidth   = pPC->PhysicalPageSizeX ();
-            pPrinterProperties->fPhysicalHeight  = pPC->PhysicalPageSizeY ();
-            pPrinterProperties->fPrintableWidth  = pPC->PrintableWidth ();
-            pPrinterProperties->fPrintableHeight = pPC->PrintableHeight ();
-            pPrinterProperties->fTopLeftX        = pPC->PrintableStartX ();
-            pPrinterProperties->fTopLeftY        = pPC->PrintableStartY ();
-
-            fprintf (stdout, "%s,%s,%.4f,%.4f,%.4f,%.4f,%.4f,%.4f\n",
-                     pPrinterProperties->szClassName,
-                     pPrinterProperties->szPaperSize,
-                     pPrinterProperties->fPhysicalWidth,
-                     pPrinterProperties->fPhysicalHeight,
-                     pPrinterProperties->fTopLeftX,
-                     pPrinterProperties->fTopLeftY,
-                     pPrinterProperties->fPrintableWidth,
-                     pPrinterProperties->fPrintableHeight);
-
-        }
-    }
-}
-
-int    main ()
-{
-    PrinterProperties   pPrProp;
-    GetPrinterProperties (&pPrProp);
-    return 0;
-}
diff -durN hplip-0.9.10/prnt/hpijs/PrinterProperties.h hplip-0.9.8/prnt/hpijs/PrinterProperties.h
--- hplip-0.9.10/prnt/hpijs/PrinterProperties.h	2006-03-03 01:21:41.000000000 +0000
+++ hplip-0.9.8/prnt/hpijs/PrinterProperties.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,130 +0,0 @@
-/*****************************************************************************\
-  Copyright (c) 2002 - 2006, Hewlett-Packard Co.
-  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 Hewlett-Packard 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 AUTHOR "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 AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-  TO, PATENT INFRINGEMENT; 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.
-\*****************************************************************************/
-#include <stdio.h>
-
-#include "hpprintapi.h"
-
-APDK_USING_NAMESPACE
-
-class PlatformServices : public SystemServices
-{
-public:
-    PlatformServices ();
-    ~PlatformServices ();
-    void            DisplayPrinterStatus (DISPLAY_STATUS ePrinterStatus);
-    DRIVER_ERROR    BusyWait (DWORD msec);
-    DRIVER_ERROR    ReadDeviceID (BYTE *strID, int iSize);
-    BYTE            *AllocMem (int iMemSize);
-    void            FreeMem (BYTE* pMem);
-    BOOL            GetStatusInfo (BYTE *bStatReg);
-    DRIVER_ERROR    ToDevice (const BYTE *pBuffer, DWORD *dwCount);
-    DRIVER_ERROR    FromDevice (BYTE *pReadBuff, DWORD *wReadCount);
-    DWORD           GetSystemTickCount (void);
-    float           power (float x, float y);
-};
-
-typedef struct
-{
-    PAPER_SIZE      iPaperSize;
-    char            *szName;
-} PaperSizeInfo;
-
-PaperSizeInfo   PaperSizeInfoData[] =
-{
-    {LETTER, "Letter"},
-    {LEGAL,  "Legal"},
-    {EXECUTIVE, "Executive"},
-    {A3,        "A3"},
-    {A4,        "A4"},
-    {A5,        "A5"},
-    {A6,        "A6"},
-    {PHOTO_SIZE,     "Photo"},
-    {PHOTO_5x7,       "5x7"},
-    {B4,        "B4"},
-    {B5,        "B5"},
-    {OUFUKU,    "Oufuku-Hagaki"},
-    {HAGAKI,    "Hagaki"},
-    {SUPERB_SIZE,   "Super B"},
-    {FLSA,      "Flsa"},
-    {ENVELOPE_NO_10,   "Number 10 Envelope"},
-    {ENVELOPE_A2,   "A2 Envelope"},
-    {ENVELOPE_C6,   "C6 Envelope"},
-    {ENVELOPE_DL,   "DL Envelope"},
-    {ENVELOPE_JPN3,    "Japanese Envelope #3"},
-    {ENVELOPE_JPN4,    "Japanese Envelope #4"}
-};
-
-typedef struct
-{
-    char    szClassName[16];
-    char    szPaperSize[32];
-    float   fPhysicalWidth;
-    float   fPhysicalHeight;
-    float   fPrintableWidth;
-    float   fPrintableHeight;
-    float   fTopLeftX;
-    float   fTopLeftY;
-} PrinterProperties;
-
-PlatformServices    *pSys = NULL;
-PrintContext        *pPC  = NULL;
-BOOL                CreatePrinterProperties ();
-int                 iCurrentPrinter = UNSUPPORTED;
-int                 iPrinterClasses[MAX_PRINTER_TYPE];
-int                 iLastPrinter = 0;
-
-#if 0
-char    *szPaperSizeNames[] =
-{
-    "Letter",
-    "A4",
-    "Legal"
-    "4x6 with tear-off tab",
-    "A6",
-    "4x6 Index Card",
-    "B4",
-    "B5",
-    "Oufuku-Hagaki",
-    "Hagaki",
-    "A6 with tear-off tab",
-    "A3",
-    "A5",
-    "Ledger",
-    "Super B",
-    "Executive",
-    "Flsa",
-    "CUSTOM_SIZE",
-	"Number 10 Envelope",
-	"A2 Envelope",
-	"C6 Envelope",
-	"DL Envelope",
-	"Japanese Envelope #3",
-	"Japanese Envelope #4",
-    "5x7"
-};
-#endif
diff -durN hplip-0.9.10/prnt/hpijs/services.cpp hplip-0.9.8/prnt/hpijs/services.cpp
--- hplip-0.9.10/prnt/hpijs/services.cpp	2006-03-01 02:07:27.000000000 +0000
+++ hplip-0.9.8/prnt/hpijs/services.cpp	2005-12-10 00:01:02.000000000 +0000
@@ -484,9 +484,6 @@
    if (size == CUSTOM_SIZE)
       pPC->SetCustomSize(width, height);
 
-   PaperWidth = pPC->PhysicalPageSizeX ();
-   PaperHeight = pPC->PhysicalPageSizeY ();
-
    if ((r = pPC->SetPaperSize((PAPER_SIZE)size, FullBleed)) != NO_ERROR)
    {
       if (r > 0)


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/hplip.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- hplip.spec	4 Apr 2006 10:46:14 -0000	1.58
+++ hplip.spec	4 Apr 2006 11:42:02 -0000	1.59
@@ -15,6 +15,7 @@
 Patch3: hplip-quiet.patch
 Patch4: hplip-cups-backend.patch
 Patch5: hplip-strcasecmp.patch
+Patch6: hplip-revert-hpijs.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -77,6 +78,9 @@
 # situations.
 %patch5 -p1 -b .strcasecmp
 
+# Last known working hpijs comes from 0.9.8, so use that.
+%patch6 -p1 -b .revert-hpijs
+
 autoconf # for patch4
 
 %build
@@ -152,7 +156,7 @@
 %defattr(-,root,root)
 %doc prnt/hpijs/COPYING prnt/hpijs/hpijs_readme.html prnt/hpijs/gs_hpijs.png
 %{_bindir}/hpijs
-%{_bindir}/hppgsz
+#%{_bindir}/hppgsz
 
 %files -n libsane-hpaio
 %defattr(-,root,root)
@@ -183,6 +187,7 @@
 * Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com>
 - Use case-insensitive matching.  0.9.8 gave all-uppercase in some
   situations.
+- Last known working hpijs comes from 0.9.8, so use that.
 
 * Tue Mar 28 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-1.1
 - 0.9.10.



From fedora-cvs-commits at redhat.com  Tue Apr  4 11:42:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 07:42:26 -0400
Subject: rpms/hplip/FC-5 hplip.spec,1.59,1.60
Message-ID: <200604041142.k34BgPdk030299@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
0.9.10-1.2


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/hplip.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- hplip.spec	4 Apr 2006 11:42:02 -0000	1.59
+++ hplip.spec	4 Apr 2006 11:42:23 -0000	1.60
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 0.9.10
-Release: 1.1
+Release: 1.2
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -184,7 +184,7 @@
 fi
 
 %changelog
-* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com>
+* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-1.2
 - Use case-insensitive matching.  0.9.8 gave all-uppercase in some
   situations.
 - Last known working hpijs comes from 0.9.8, so use that.



From fedora-cvs-commits at redhat.com  Tue Apr  4 11:43:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 07:43:46 -0400
Subject: rpms/hplip/devel hplip-revert-hpijs.patch, NONE, 1.1 hplip.spec,
	1.62, 1.63
Message-ID: <200604041143.k34Bhk7C030413@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Added Files:
	hplip-revert-hpijs.patch 
Log Message:
- Last known working hpijs comes from 0.9.8, so use that.

hplip-revert-hpijs.patch:
 Makefile.am                       |   33 
 Makefile.am.0.9.8-4               |  313 ++
 Makefile.in                       |   66 
 PrinterProperties.cpp             |  182 -
 PrinterProperties.h               |  130 -
 configure                         |   21 
 configure.in                      |    3 
 context.cpp                       |    2 
 dj3600.h                          |    1 
 gdevijs-krgb-1.1.patch            |  302 ++
 gdevijs-krgb-1.2-gs7.07.patch     |  616 -----
 gdevijs-krgb-1.2-gs8.50.patch     |  614 -----
 hpijs.cpp                         |   26 
 hpijs_readme.html                 |   13 
 hpijs_readme.html.0.9.8-4         | 4147 ++++++++++++++++++++++++++++++++++++++
 hpijsfax.cpp                      |    2 
 ljfastraster.cpp.0.9.8-4          | 1278 +++++++++++
 ppd/HP-DeskJet_F300-hpijs.ppd     |  440 ----
 ppd/HP-Fax-hplip.ppd              |  129 +
 ppd/HP-LaserJet_3030-hpijs.ppd    |    2 
 ppd/HP_Business_Inkjet_2800.ppd   |    2 
 ppd/HP_Color_LaserJet_2605.ppd    | 1875 +++++++++++++++++
 ppd/HP_LaserJet_1200.ppd          |    4 
 ppd/HP_LaserJet_1220.ppd          |    4 
 ppd/HP_LaserJet_1320_Series.ppd   |    4 
 ppd/HP_LaserJet_2200.ppd          |    4 
 ppd/HP_LaserJet_2410.ppd          |    4 
 ppd/HP_LaserJet_2420.ppd          |    4 
 ppd/HP_LaserJet_2430.ppd          |    4 
 ppd/HP_LaserJet_3200.ppd          |    4 
 ppd/HP_LaserJet_3300_Series.ppd   |    4 
 ppd/HP_LaserJet_4050_Series.ppd   |    4 
 ppd/HP_LaserJet_4100_MFP.ppd      |    4 
 ppd/HP_LaserJet_4100_Series.ppd   |    4 
 ppd/HP_LaserJet_4240.ppd          |    4 
 ppd/HP_LaserJet_4250.ppd          |    4 
 ppd/HP_LaserJet_4345_MFP.ppd      |    4 
 ppd/HP_LaserJet_4350.ppd          |    4 
 ppd/HP_LaserJet_8000_Series.ppd   |    4 
 ppd/HP_LaserJet_8100_Series.ppd   |    4 
 ppd/HP_LaserJet_8150_Series.ppd   |    4 
 ppd/HP_LaserJet_9000_MFP.ppd      |    4 
 ppd/HP_LaserJet_9000_Series.ppd   |    4 
 ppd/HP_LaserJet_9040.ppd          |    4 
 ppd/HP_LaserJet_9040_9050_MFP.ppd |    4 
 ppd/HP_LaserJet_9050.ppd          |    4 
 ppd/HP_Mopier_240.ppd             |    4 
 ppd/HP_Mopier_320.ppd             |    4 
 ppd/hp_LaserJet_1300_series.ppd   |    4 
 ppd/hp_LaserJet_2300.ppd          |    4 
 ppd/hp_LaserJet_3015.ppd          |    4 
 ppd/hp_LaserJet_3020_3030.ppd     |    4 
 ppd/hp_LaserJet_3380.ppd          |    4 
 ppd/hp_LaserJet_4200_Series.ppd   |    4 
 ppd/hp_LaserJet_4300_Series.ppd   |    4 
 services.cpp                      |    3 
 56 files changed, 8176 insertions(+), 2156 deletions(-)

--- NEW FILE hplip-revert-hpijs.patch ---
diff -durN hplip-0.9.10/prnt/hpijs/configure hplip-0.9.8/prnt/hpijs/configure
--- hplip-0.9.10/prnt/hpijs/configure	2006-03-21 20:00:12.000000000 +0000
+++ hplip-0.9.8/prnt/hpijs/configure	2006-01-28 00:02:18.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for HP Printer Driver 2.1.9.
+# Generated by GNU Autoconf 2.59 for HP Printer Driver 2.1.7x.
 #
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
@@ -421,8 +421,8 @@
 # Identity of this package.
 PACKAGE_NAME='HP Printer Driver'
 PACKAGE_TARNAME='hpijs'
-PACKAGE_VERSION='2.1.9'
-PACKAGE_STRING='HP Printer Driver 2.1.9'
+PACKAGE_VERSION='2.1.7x'
+PACKAGE_STRING='HP Printer Driver 2.1.7x'
 PACKAGE_BUGREPORT=''
 
 # Factoring default headers for most tests.
@@ -952,7 +952,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 HP Printer Driver 2.1.9 to adapt to many kinds of systems.
+\`configure' configures HP Printer Driver 2.1.7x to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1018,7 +1018,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of HP Printer Driver 2.1.9:";;
+     short | recursive ) echo "Configuration of HP Printer Driver 2.1.7x:";;
    esac
   cat <<\_ACEOF
 
@@ -1159,7 +1159,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-HP Printer Driver configure 2.1.9
+HP Printer Driver configure 2.1.7x
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1173,7 +1173,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by HP Printer Driver $as_me 2.1.9, which was
+It was created by HP Printer Driver $as_me 2.1.7x, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1816,7 +1816,7 @@
 
 # Define the identity of the package.
  PACKAGE='hpijs'
- VERSION='2.1.9'
+ VERSION='2.1.7x'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -21788,7 +21788,7 @@
 -DAPDK_DJ890 -DAPDK_DJ3320 -DAPDK_LJCOLOR -DAPDK_DJGENERICVIP \
 -DAPDK_LJJETREADY  -DAPDK_LJFASTRASTER \
 -DAPDK_BUFFER_SEND -DAPDK_LDL_COMPRESS -DAPDK_EXTENDED_MEDIASIZE \
--DAPDK_MLC_PRINTER -DAPDK_DJ3600 -DAPDK_LINUX $NDBFLAG"
+-DAPDK_MLC_PRINTER -DAPDK_DJ3600 -DAPDK_LINUX"
 
 # Autoconf-style header tests for APDK
 cat >auto-include.h <<EOFH
@@ -22821,7 +22821,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by HP Printer Driver $as_me 2.1.9, which was
+This file was extended by HP Printer Driver $as_me 2.1.7x, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22879,7 +22879,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-HP Printer Driver config.status 2.1.9
+HP Printer Driver config.status 2.1.7x
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff -durN hplip-0.9.10/prnt/hpijs/configure.in hplip-0.9.8/prnt/hpijs/configure.in
--- hplip-0.9.10/prnt/hpijs/configure.in	2006-03-21 18:01:25.000000000 +0000
+++ hplip-0.9.8/prnt/hpijs/configure.in	2005-12-02 20:05:09.000000000 +0000
@@ -5,7 +5,7 @@
 #
 
 AC_PREREQ(2.59)
-AC_INIT([HP Printer Driver], 2.1.9,, hpijs)
+AC_INIT([HP Printer Driver], 2.1.7x,, hpijs)
 AM_INIT_AUTOMAKE([1.9 foreign])
 AC_PROG_LIBTOOL
 AC_CONFIG_SRCDIR([hpijs.cpp])
@@ -38,7 +38,7 @@
 -DAPDK_DJ890 -DAPDK_DJ3320 -DAPDK_LJCOLOR -DAPDK_DJGENERICVIP \
 -DAPDK_LJJETREADY  -DAPDK_LJFASTRASTER \
 -DAPDK_BUFFER_SEND -DAPDK_LDL_COMPRESS -DAPDK_EXTENDED_MEDIASIZE \
--DAPDK_MLC_PRINTER -DAPDK_DJ3600 -DAPDK_LINUX $NDBFLAG"
+-DAPDK_MLC_PRINTER -DAPDK_DJ3600 -DAPDK_LINUX"
 
 # Autoconf-style header tests for APDK
 cat >auto-include.h <<EOFH
diff -durN hplip-0.9.10/prnt/hpijs/context.cpp hplip-0.9.8/prnt/hpijs/context.cpp
--- hplip-0.9.10/prnt/hpijs/context.cpp	2006-03-22 22:50:45.000000000 +0000
+++ hplip-0.9.8/prnt/hpijs/context.cpp	2006-01-30 20:48:09.000000000 +0000
@@ -1156,7 +1156,6 @@
     if (thePrinter)     // if printer exists due to bidi or previous call
     {
         delete thePrinter;
-        thePrinter = NULL;
     }
 
     err = DR->SelectDevice(Model);
@@ -1227,7 +1226,6 @@
     if (thePrinter)     // if printer exists due to bidi or previous call
     {
         delete thePrinter;
-        thePrinter = NULL;
     }
 
     FAMILY_HANDLE familyHandle = pPFI->FindDevIdMatch(szDeviceId);
diff -durN hplip-0.9.10/prnt/hpijs/dj3600.h hplip-0.9.8/prnt/hpijs/dj3600.h
--- hplip-0.9.10/prnt/hpijs/dj3600.h	2006-03-22 22:50:45.000000000 +0000
+++ hplip-0.9.8/prnt/hpijs/dj3600.h	2006-01-30 20:48:09.000000000 +0000
@@ -62,7 +62,6 @@
         "Deskjet 3745\0"
 		"Deskjet 3840\0"
         "Deskjet 3845\0"
-        "Deskjet F300\0"
 #ifdef APDK_MLC_PRINTER
 		"officejet 5500\0"
         "Officejet 5600\0"
diff -durN hplip-0.9.10/prnt/hpijs/gdevijs-krgb-1.1.patch hplip-0.9.8/prnt/hpijs/gdevijs-krgb-1.1.patch
--- hplip-0.9.10/prnt/hpijs/gdevijs-krgb-1.1.patch	1970-01-01 01:00:00.000000000 +0100
+++ hplip-0.9.8/prnt/hpijs/gdevijs-krgb-1.1.patch	2005-02-25 20:24:46.000000000 +0000
@@ -0,0 +1,660 @@
+diff -uNr old/gdevijs.c new/gdevijs.c
+--- old/gdevijs.c	2005-02-20 15:43:15.284386019 -0800
++++ new/gdevijs.c	2005-02-20 15:43:36.682297237 -0800
+@@ -27,15 +27,29 @@
+  * which is a security risk, since any program can be run.
+  * You should use -dSAFER which sets .LockSafetyParams to true 
+  * before opening this device.
++ *
++ * 11/26/03 David Suffield
++ * (c) 2003-2004 Copyright Hewlett-Packard Development Company, LP
++ *
++ * 1. Removed hpijs 1.0-1.0.2 workarounds, use hpijs 1.0.3 or higher.
++ * 2. Added krgb support.
++ *
++ * 02/21/05 David Suffield
++ * 1. Fixed segfault issue with 1-bit color space.
++ * 2. Fixed z-order issue with colored text on black rectangle.
++ *
+  */
+ 
+ #include "unistd_.h"	/* for dup() */
+ #include <stdlib.h>
++#include <fcntl.h>
+ #include "gdevprn.h"
+ #include "gp.h"
+ #include "ijs.h"
+ #include "ijs_client.h"
+ 
++//#define KRGB_DEBUG
++
+ /* This should go into gdevprn.h, or, better yet, gdevprn should
+    acquire an API for changing resolution. */
+ int gdev_prn_maybe_realloc_memory(gx_device_printer *pdev,
+@@ -51,6 +65,14 @@
+ private dev_proc_get_params(gsijs_get_params);
+ private dev_proc_put_params(gsijs_put_params);
+ 
++/* Following definitions are for krgb support. */
++private dev_proc_create_buf_device(gsijs_create_buf_device);
++private dev_proc_fill_rectangle(gsijs_fill_rectangle);
++private dev_proc_copy_mono(gsijs_copy_mono);
++private dev_proc_fill_mask(gsijs_fill_mask);
++private dev_proc_fill_path(gsijs_fill_path);
++private dev_proc_stroke_path(gsijs_stroke_path);
++
+ private const gx_device_procs gsijs_procs =
+ prn_color_params_procs(gsijs_open, gsijs_output_page, gsijs_close,
+ 		   gx_default_rgb_map_rgb_color, gx_default_rgb_map_color_rgb,
+@@ -83,6 +105,14 @@
+ 
[...11456 lines suppressed...]
-            if (pSys)
-            {
-                delete pSys;
-            }
-            return FALSE;
-        }
-        err = pPC->SelectDevice ((PRINTER_TYPE) iCurrentPrinter);
-        if (err != NO_ERROR)
-        {
-            if (iCurrentPrinter < iLastPrinter)
-            {
-                continue;
-            }
-            delete pPC;
-            delete pSys;
-            return FALSE;
-        }
-        strcpy (pPrinterProperties->szClassName, ModelName[iCurrentPrinter]);
-        for (i = 0; i < (int) (sizeof (PaperSizeInfoData) / sizeof (PaperSizeInfo)); i++)
-        {
-            err = pPC->SetPaperSize (PaperSizeInfoData[i].iPaperSize, 0);
-            if (err == WARN_ILLEGAL_PAPERSIZE)
-            {
-                continue;
-            }
-            strcpy (pPrinterProperties->szPaperSize, PaperSizeInfoData[i].szName);
-            pPrinterProperties->fPhysicalWidth   = pPC->PhysicalPageSizeX ();
-            pPrinterProperties->fPhysicalHeight  = pPC->PhysicalPageSizeY ();
-            pPrinterProperties->fPrintableWidth  = pPC->PrintableWidth ();
-            pPrinterProperties->fPrintableHeight = pPC->PrintableHeight ();
-            pPrinterProperties->fTopLeftX        = pPC->PrintableStartX ();
-            pPrinterProperties->fTopLeftY        = pPC->PrintableStartY ();
-
-            fprintf (stdout, "%s,%s,%.4f,%.4f,%.4f,%.4f,%.4f,%.4f\n",
-                     pPrinterProperties->szClassName,
-                     pPrinterProperties->szPaperSize,
-                     pPrinterProperties->fPhysicalWidth,
-                     pPrinterProperties->fPhysicalHeight,
-                     pPrinterProperties->fTopLeftX,
-                     pPrinterProperties->fTopLeftY,
-                     pPrinterProperties->fPrintableWidth,
-                     pPrinterProperties->fPrintableHeight);
-
-        }
-    }
-}
-
-int    main ()
-{
-    PrinterProperties   pPrProp;
-    GetPrinterProperties (&pPrProp);
-    return 0;
-}
diff -durN hplip-0.9.10/prnt/hpijs/PrinterProperties.h hplip-0.9.8/prnt/hpijs/PrinterProperties.h
--- hplip-0.9.10/prnt/hpijs/PrinterProperties.h	2006-03-03 01:21:41.000000000 +0000
+++ hplip-0.9.8/prnt/hpijs/PrinterProperties.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,130 +0,0 @@
-/*****************************************************************************\
-  Copyright (c) 2002 - 2006, Hewlett-Packard Co.
-  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 Hewlett-Packard 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 AUTHOR "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 AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-  TO, PATENT INFRINGEMENT; 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.
-\*****************************************************************************/
-#include <stdio.h>
-
-#include "hpprintapi.h"
-
-APDK_USING_NAMESPACE
-
-class PlatformServices : public SystemServices
-{
-public:
-    PlatformServices ();
-    ~PlatformServices ();
-    void            DisplayPrinterStatus (DISPLAY_STATUS ePrinterStatus);
-    DRIVER_ERROR    BusyWait (DWORD msec);
-    DRIVER_ERROR    ReadDeviceID (BYTE *strID, int iSize);
-    BYTE            *AllocMem (int iMemSize);
-    void            FreeMem (BYTE* pMem);
-    BOOL            GetStatusInfo (BYTE *bStatReg);
-    DRIVER_ERROR    ToDevice (const BYTE *pBuffer, DWORD *dwCount);
-    DRIVER_ERROR    FromDevice (BYTE *pReadBuff, DWORD *wReadCount);
-    DWORD           GetSystemTickCount (void);
-    float           power (float x, float y);
-};
-
-typedef struct
-{
-    PAPER_SIZE      iPaperSize;
-    char            *szName;
-} PaperSizeInfo;
-
-PaperSizeInfo   PaperSizeInfoData[] =
-{
-    {LETTER, "Letter"},
-    {LEGAL,  "Legal"},
-    {EXECUTIVE, "Executive"},
-    {A3,        "A3"},
-    {A4,        "A4"},
-    {A5,        "A5"},
-    {A6,        "A6"},
-    {PHOTO_SIZE,     "Photo"},
-    {PHOTO_5x7,       "5x7"},
-    {B4,        "B4"},
-    {B5,        "B5"},
-    {OUFUKU,    "Oufuku-Hagaki"},
-    {HAGAKI,    "Hagaki"},
-    {SUPERB_SIZE,   "Super B"},
-    {FLSA,      "Flsa"},
-    {ENVELOPE_NO_10,   "Number 10 Envelope"},
-    {ENVELOPE_A2,   "A2 Envelope"},
-    {ENVELOPE_C6,   "C6 Envelope"},
-    {ENVELOPE_DL,   "DL Envelope"},
-    {ENVELOPE_JPN3,    "Japanese Envelope #3"},
-    {ENVELOPE_JPN4,    "Japanese Envelope #4"}
-};
-
-typedef struct
-{
-    char    szClassName[16];
-    char    szPaperSize[32];
-    float   fPhysicalWidth;
-    float   fPhysicalHeight;
-    float   fPrintableWidth;
-    float   fPrintableHeight;
-    float   fTopLeftX;
-    float   fTopLeftY;
-} PrinterProperties;
-
-PlatformServices    *pSys = NULL;
-PrintContext        *pPC  = NULL;
-BOOL                CreatePrinterProperties ();
-int                 iCurrentPrinter = UNSUPPORTED;
-int                 iPrinterClasses[MAX_PRINTER_TYPE];
-int                 iLastPrinter = 0;
-
-#if 0
-char    *szPaperSizeNames[] =
-{
-    "Letter",
-    "A4",
-    "Legal"
-    "4x6 with tear-off tab",
-    "A6",
-    "4x6 Index Card",
-    "B4",
-    "B5",
-    "Oufuku-Hagaki",
-    "Hagaki",
-    "A6 with tear-off tab",
-    "A3",
-    "A5",
-    "Ledger",
-    "Super B",
-    "Executive",
-    "Flsa",
-    "CUSTOM_SIZE",
-	"Number 10 Envelope",
-	"A2 Envelope",
-	"C6 Envelope",
-	"DL Envelope",
-	"Japanese Envelope #3",
-	"Japanese Envelope #4",
-    "5x7"
-};
-#endif
diff -durN hplip-0.9.10/prnt/hpijs/services.cpp hplip-0.9.8/prnt/hpijs/services.cpp
--- hplip-0.9.10/prnt/hpijs/services.cpp	2006-03-01 02:07:27.000000000 +0000
+++ hplip-0.9.8/prnt/hpijs/services.cpp	2005-12-10 00:01:02.000000000 +0000
@@ -484,9 +484,6 @@
    if (size == CUSTOM_SIZE)
       pPC->SetCustomSize(width, height);
 
-   PaperWidth = pPC->PhysicalPageSizeX ();
-   PaperHeight = pPC->PhysicalPageSizeY ();
-
    if ((r = pPC->SetPaperSize((PAPER_SIZE)size, FullBleed)) != NO_ERROR)
    {
       if (r > 0)


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- hplip.spec	4 Apr 2006 10:45:59 -0000	1.62
+++ hplip.spec	4 Apr 2006 11:43:44 -0000	1.63
@@ -15,6 +15,7 @@
 Patch3: hplip-quiet.patch
 Patch4: hplip-cups-backend.patch
 Patch5: hplip-strcasecmp.patch
+Patch6: hplip-revert-hpijs.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -77,6 +78,9 @@
 # situations.
 %patch5 -p1 -b .strcasecmp
 
+# Last known working hpijs comes from 0.9.8, so use that.
+%patch6 -p1 -b .revert-hpijs
+
 autoconf # for patch4
 
 %build
@@ -169,6 +173,7 @@
 * Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com>
 - Use case-insensitive matching.  0.9.8 gave all-uppercase in some
   situations.
+- Last known working hpijs comes from 0.9.8, so use that.
 
 * Tue Mar 28 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-3
 - Always use /usr/lib/cups/backend.



From fedora-cvs-commits at redhat.com  Tue Apr  4 11:44:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 07:44:41 -0400
Subject: rpms/hplip/devel hplip.spec,1.63,1.64
Message-ID: <200604041144.k34BifNx030443@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
0.9.10-4


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- hplip.spec	4 Apr 2006 11:43:44 -0000	1.63
+++ hplip.spec	4 Apr 2006 11:44:38 -0000	1.64
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 0.9.10
-Release: 3
+Release: 4
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -170,7 +170,7 @@
 fi
 
 %changelog
-* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com>
+* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-4
 - Use case-insensitive matching.  0.9.8 gave all-uppercase in some
   situations.
 - Last known working hpijs comes from 0.9.8, so use that.



From fedora-cvs-commits at redhat.com  Tue Apr  4 12:02:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 08:02:39 -0400
Subject: rpms/hplip/devel hplip.spec,1.64,1.65
Message-ID: <200604041202.k34C2dOg012036@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
Forgot to comment out this line.


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- hplip.spec	4 Apr 2006 11:44:38 -0000	1.64
+++ hplip.spec	4 Apr 2006 12:02:26 -0000	1.65
@@ -142,7 +142,7 @@
 %defattr(-,root,root)
 %doc prnt/hpijs/COPYING prnt/hpijs/hpijs_readme.html prnt/hpijs/gs_hpijs.png
 %{_bindir}/hpijs
-%{_bindir}/hppgsz
+#%{_bindir}/hppgsz
 
 %files -n libsane-hpaio
 %defattr(-,root,root)



From fedora-cvs-commits at redhat.com  Tue Apr  4 12:06:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 08:06:49 -0400
Subject: rpms/vim/devel .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 vim.spec,
	1.101, 1.102 vim-6.3-dnssyntax.patch, 1.1, NONE
Message-ID: <200604041206.k34C6nsh012128@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12111

Modified Files:
	.cvsignore sources vim.spec 
Removed Files:
	vim-6.3-dnssyntax.patch 
Log Message:
- vim-7.0c BETA


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	23 Mar 2006 13:07:01 -0000	1.12
+++ .cvsignore	4 Apr 2006 12:06:46 -0000	1.13
@@ -1,4 +1,4 @@
-vim-7.0aa-extra.tar.gz
-vim-7.0aa-lang.tar.gz
-vim-7.0aa.tar.bz2
+vim-7.0c-20060404.tar.bz2
+vim-7.0c-extra-20060404.tar.gz
+vim-7.0c-lang-20060404.tar.gz
 cvim.zip


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	23 Mar 2006 13:07:01 -0000	1.12
+++ sources	4 Apr 2006 12:06:46 -0000	1.13
@@ -1,4 +1,4 @@
-67ac6821f0f61e8dc8384a2c4eaae5d2  vim-7.0aa-extra.tar.gz
-1e59128c0c39e2d48c90bb0f7bd76e00  vim-7.0aa-lang.tar.gz
-e3466da8a1025093cb93735486d66f8b  vim-7.0aa.tar.bz2
+26b4c3234c87e9cc361bee6e02925181  vim-7.0c-20060404.tar.bz2
+3b3edf7a1573532f5ad66e7a001ce677  vim-7.0c-extra-20060404.tar.gz
+c4b45ad62766e674fbea90ce922a92e0  vim-7.0c-lang-20060404.tar.gz
 1f17af2008ae94359a48be7e865b084f  cvim.zip


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- vim.spec	23 Mar 2006 13:07:01 -0000	1.101
+++ vim.spec	4 Apr 2006 12:06:46 -0000	1.102
@@ -1,3 +1,4 @@
+%define CVSDATE -20060404
 %define WITH_SELINUX 1
 %define desktop_file 1
 %if %{desktop_file}
@@ -18,19 +19,19 @@
 %define withcvim 0
 
 
-%define baseversion 7.0aa
-%define vimdir vim70aa
+%define baseversion 7.0c
+%define vimdir vim70c
 %define patchlevel 000
 
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 3
+Release: 1
 License: freeware
 Group: Applications/Editors
-Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}.tar.bz2
-Source1: ftp://ftp.vim.org/pub/vim/extra/vim-%{baseversion}-lang.tar.gz
-Source2: ftp://ftp.vim.org/pub/vim/extra/vim-%{baseversion}-extra.tar.gz
+Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{CVSDATE}.tar.bz2
+Source1: ftp://ftp.vim.org/pub/vim/extra/vim-%{baseversion}-lang%{CVSDATE}.tar.gz
+Source2: ftp://ftp.vim.org/pub/vim/extra/vim-%{baseversion}-extra%{CVSDATE}.tar.gz
 Source3: gvim.desktop
 Source4: vimrc
 #Source5: ftp://ftp.vim.org/pub/vim/patches/README.patches
@@ -57,7 +58,6 @@
 Patch3004: vim-7.0-rclocation.patch
 Patch3005: vim-6.2-rh4.patch
 Patch3006: vim-6.2-rh5.patch
-Patch3007: vim-6.3-dnssyntax.patch
 #Patch3008: vim-6.4-cvim.patch
 Patch3009: vim-6.4-checkhl.patch
 Patch3010: vim-7.0-fstabsyntax.patch
@@ -183,7 +183,6 @@
 %patch3004 -p1
 %patch3005 -p1
 %patch3006 -p1
-%patch3007 -p1
 
 %patch3009 -p1
 %patch3010 -p1
@@ -460,6 +459,7 @@
 %lang(fr) %{_mandir}/fr*/*
 %lang(it) %{_mandir}/it*/*
 %lang(ru) %{_mandir}/ru*/*
+%lang(pl) %{_mandir}/pl*/*
 
 %files minimal
 %defattr(-,root,root)
@@ -500,6 +500,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Apr 04 2006 Karsten Hopp <karsten at redhat.de> 7.0c.000-1
+- vim-7.0c BETA
+
 * Wed Mar 22 2006 Karsten Hopp <karsten at redhat.de> 7.0aa.000-3
 - Rawhide build as vim, opposed to vim7 (prerelease)
 - conflict with older man-pages-{it,fr} packages


--- vim-6.3-dnssyntax.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr  4 12:44:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 08:44:32 -0400
Subject: rpms/bash/devel bash31-015, NONE, 1.1 bash31-016, NONE,
	1.1 bash.spec, 1.114, 1.115
Message-ID: <200604041244.k34CiWjS026160@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/bash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26140

Modified Files:
	bash.spec 
Added Files:
	bash31-015 bash31-016 
Log Message:
* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 3.1-11
- Patchlevel 15.



--- NEW FILE bash31-015 ---
			     BASH PATCH REPORT
			     =================

Bash-Release: 3.1
Patch-ID: bash31-015

Bug-Reported-by: Benoit Vila
Bug-Reference-ID: <43FCA614.1090108 at free.fr>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-02/msg00058.html

Bug-Description:

A problem with the extended globbing code prevented dots from matching
filenames when used in some extended matching patterns.

Patch:

*** ../bash-3.1-patched/lib/glob/sm_loop.c	Sun Oct 16 21:21:04 2005
--- lib/glob/sm_loop.c	Mon Feb 27 17:18:43 2006
***************
*** 639,643 ****
    CHAR *pnext;			/* pointer to next sub-pattern */
    CHAR *srest;			/* pointer to rest of string */
!   int m1, m2;
  
  #if DEBUG_MATCHING
--- 638,642 ----
    CHAR *pnext;			/* pointer to next sub-pattern */
    CHAR *srest;			/* pointer to rest of string */
!   int m1, m2, xflags;		/* xflags = flags passed to recursive matches */
  
  #if DEBUG_MATCHING
***************
*** 645,648 ****
--- 644,648 ----
  fprintf(stderr, "extmatch: s = %s; se = %s\n", s, se);
  fprintf(stderr, "extmatch: p = %s; pe = %s\n", p, pe);
+ fprintf(stderr, "extmatch: flags = %d\n", flags);
  #endif
  
***************
*** 678,683 ****
  		 multiple matches of the pattern. */
  	      if (m1)
! 		m2 = (GMATCH (srest, se, prest, pe, flags) == 0) ||
! 		      (s != srest && GMATCH (srest, se, p - 1, pe, flags) == 0);
  	      if (m1 && m2)
  		return (0);
--- 678,687 ----
  		 multiple matches of the pattern. */
  	      if (m1)
! 		{
! 		  /* if srest > s, we are not at start of string */
! 		  xflags = (srest > s) ? (flags & ~FNM_PERIOD) : flags;
! 		  m2 = (GMATCH (srest, se, prest, pe, xflags) == 0) ||
! 			(s != srest && GMATCH (srest, se, p - 1, pe, xflags) == 0);
! 		}
  	      if (m1 && m2)
  		return (0);
***************
*** 705,710 ****
  	  for ( ; srest <= se; srest++)
  	    {
  	      if (GMATCH (s, srest, psub, pnext - 1, flags) == 0 &&
! 		  GMATCH (srest, se, prest, pe, flags) == 0)
  		return (0);
  	    }
--- 709,716 ----
  	  for ( ; srest <= se; srest++)
  	    {
+ 	      /* if srest > s, we are not at start of string */
+ 	      xflags = (srest > s) ? (flags & ~FNM_PERIOD) : flags;
  	      if (GMATCH (s, srest, psub, pnext - 1, flags) == 0 &&
! 		  GMATCH (srest, se, prest, pe, xflags) == 0)
  		return (0);
  	    }
***************
*** 727,731 ****
  		break;
  	    }
! 	  if (m1 == 0 && GMATCH (srest, se, prest, pe, flags) == 0)
  	    return (0);
  	}
--- 733,739 ----
  		break;
  	    }
! 	  /* if srest > s, we are not at start of string */
! 	  xflags = (srest > s) ? (flags & ~FNM_PERIOD) : flags;
! 	  if (m1 == 0 && GMATCH (srest, se, prest, pe, xflags) == 0)
  	    return (0);
  	}
*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
--- patchlevel.h	Wed Dec  7 13:48:42 2005
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 14
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 15
  
  #endif /* _PATCHLEVEL_H_ */


--- NEW FILE bash31-016 ---
			     BASH PATCH REPORT
			     =================

Bash-Release: 3.1
Patch-ID: bash31-016

Bug-Reported-by: Nikita Danilov <nikita at clusterfs.com>
Bug-Reference-ID: <17397.51015.769854.541057 at gargle.gargle.HOWL>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-02/msg00064.html

Bug-Description:

Bash will dump core when attempting to perform globbing in directories with
very large numbers of files.

Patch:

*** ../bash-3.1-patched/lib/glob/glob.c	Thu Mar 24 12:42:27 2005
--- lib/glob/glob.c	Fri Mar  3 16:54:12 2006
***************
*** 361,364 ****
--- 361,365 ----
  
    firstmalloc = 0;
+   nalloca = 0;
  
    /* If PAT is empty, skip the loop, but return one (empty) filename. */
***************
*** 547,550 ****
--- 551,556 ----
  	      tmplink = lastlink;
  	    }
+ 	  else
+ 	    tmplink = 0;
  	  free (lastlink->name);
  	  lastlink = lastlink->next;
*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
--- patchlevel.h	Wed Dec  7 13:48:42 2005
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 15
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 16
  
  #endif /* _PATCHLEVEL_H_ */


Index: bash.spec
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- bash.spec	23 Mar 2006 10:01:51 -0000	1.114
+++ bash.spec	4 Apr 2006 12:44:29 -0000	1.115
@@ -1,7 +1,7 @@
 Version: 3.1
 Name: bash
 Summary: The GNU Bourne Again shell (bash) version %{version}.
-Release: 10
+Release: 11
 Group: System Environment/Shells
 License: GPL
 Url: http://www.gnu.org/software/bash
@@ -25,6 +25,8 @@
 Patch12: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-012
 Patch13: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-013
 Patch14: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-014
+Patch15: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-015
+Patch16: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-016
 # Other patches
 Patch100: bash-2.03-paths.patch
 Patch101: bash-2.02-security.patch
@@ -77,6 +79,8 @@
 %patch12 -p0 -b .012
 %patch13 -p0 -b .013
 %patch14 -p0 -b .014
+%patch15 -p0 -b .015
+%patch16 -p0 -b .016
 
 # Other patches
 %patch100 -p1 -b .paths
@@ -228,6 +232,9 @@
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 3.1-11
+- Patchlevel 15.
+
 * Thu Mar 23 2006 Tim Waugh <twaugh at redhat.com> 3.1-10
 - Patchlevel 14.
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 12:44:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 08:44:47 -0400
Subject: rpms/bash/devel bash.spec,1.115,1.116
Message-ID: <200604041244.k34Cil6D026220@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	bash.spec 
Log Message:
Fixed typo.


Index: bash.spec
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- bash.spec	4 Apr 2006 12:44:29 -0000	1.115
+++ bash.spec	4 Apr 2006 12:44:45 -0000	1.116
@@ -233,7 +233,7 @@
 
 %changelog
 * Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 3.1-11
-- Patchlevel 15.
+- Patchlevel 16.
 
 * Thu Mar 23 2006 Tim Waugh <twaugh at redhat.com> 3.1-10
 - Patchlevel 14.



From fedora-cvs-commits at redhat.com  Tue Apr  4 13:04:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 09:04:33 -0400
Subject: rpms/a2ps/devel a2ps-sort.patch,NONE,1.1 a2ps.spec,1.32,1.33
Message-ID: <200604041304.k34D4XvO007770@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/a2ps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7755

Modified Files:
	a2ps.spec 
Added Files:
	a2ps-sort.patch 
Log Message:
* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 4.13b-50
- Use sort correctly in make_font_map.sh (bug #187884).


a2ps-sort.patch:
 afm/make_fonts_map.sh            |    2 +-
 i18n-fonts-0.1/make_fonts_map.sh |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE a2ps-sort.patch ---
--- a2ps-4.13/i18n-fonts-0.1/make_fonts_map.sh.sort	2006-04-04 13:49:44.000000000 +0100
+++ a2ps-4.13/i18n-fonts-0.1/make_fonts_map.sh	2006-04-04 13:52:00.000000000 +0100
@@ -80,7 +80,7 @@
 
 # Sort them by name, and keep a unique file for each font
 echo "Sorting entries..." 1>&2
-sort -u -t' ' +0 -1 fonts.map.new > fonts.map.tmp
+sort -u -t' ' -k1,2 fonts.map.new > fonts.map.tmp
 
 echo "Finishing." 1>&2
 cat > fonts.map.new <<EOF
--- a2ps-4.13/afm/make_fonts_map.sh.sort	2006-04-04 13:52:32.000000000 +0100
+++ a2ps-4.13/afm/make_fonts_map.sh	2006-04-04 13:52:40.000000000 +0100
@@ -72,7 +72,7 @@
 
 # Sort them by name, and keep a unique file for each font
 echo "Sorting entries..." 1>&2
-sort -u -t' ' +0 -1 fonts.map.new > fonts.map.tmp
+sort -u -t' ' -k1,2 fonts.map.new > fonts.map.tmp
 
 echo "Finishing." 1>&2
 cat > fonts.map.new <<EOF


Index: a2ps.spec
===================================================================
RCS file: /cvs/dist/rpms/a2ps/devel/a2ps.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- a2ps.spec	15 Feb 2006 11:19:38 -0000	1.32
+++ a2ps.spec	4 Apr 2006 13:04:31 -0000	1.33
@@ -1,5 +1,5 @@
 %define	ver	4.13b
-%define rel 	49
+%define rel 	50
 
 Summary: Converts text and other types of files to PostScript(TM).
 Name: a2ps
@@ -16,6 +16,7 @@
 Patch4: a2ps-4.13-glibcpaper.patch
 Patch5: a2ps-4.13-varargs.patch
 Patch6: a2ps-tmpdir.patch
+Patch7: a2ps-sort.patch
 # EUC-JP support
 Patch10: a2ps-4.13-eucjp.patch.bz2
 Patch11: a2ps-4.13-autoenc.patch
@@ -61,6 +62,7 @@
 %patch4 -p1 -b .glibcpaper
 %patch5 -p1
 %patch6 -p1 -b .tmpdir
+%patch7 -p1 -b .sort
 
 %patch10 -p1 -b .euc
 %patch11 -p1 -b .ae
@@ -228,6 +230,9 @@
 %dir %{_datadir}/a2ps
 
 %changelog
+* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 4.13b-50
+- Use sort correctly in make_font_map.sh (bug #187884).
+
 * Wed Feb 15 2006 Tim Waugh <twaugh at redhat.com> 4.13b-49
 - Use mktemp in scripts.
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 13:42:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 09:42:32 -0400
Subject: rpms/eclipse-changelog/devel eclipse-changelog.spec,1.30,1.31
Message-ID: <200604041342.k34DgW9x022546@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	eclipse-changelog.spec 
Log Message:
Add ia64.


Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- eclipse-changelog.spec	10 Feb 2006 16:53:51 -0000	1.30
+++ eclipse-changelog.spec	4 Apr 2006 13:42:29 -0000	1.31
@@ -21,7 +21,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-changelog
 Version: 	%{changelog_majmin}.%{changelog_micro}_fc
-Release:        25
+Release:        26
 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
@@ -54,7 +54,7 @@
 %endif
 
 %if %{gcj_support}
-ExclusiveArch: %{ix86} x86_64 ppc
+ExclusiveArch: %{ix86} x86_64 ppc ia64
 %else
 BuildArch:     noarch
 %endif
@@ -138,6 +138,9 @@
 %endif
 
 %changelog
+* Tue Apr 04 2006 Andrew Overholt <overholt at redhat.com> 2.0.1_fc-26
+- Add ia64.
+
 * Fri Feb 10 2006 Andrew Overholt <overholt at redhat.com> 2.0.1_fc-25
 - Use Epoch in Requires (rh#180915).
 - Require >= 3.1.2 but < 3.1.3 to ensure we get 3.1.2.



From fedora-cvs-commits at redhat.com  Tue Apr  4 13:44:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 09:44:40 -0400
Subject: rpms/eclipse-bugzilla/devel eclipse-bugzilla.spec,1.42,1.43
Message-ID: <200604041344.k34DieT5022615@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	eclipse-bugzilla.spec 
Log Message:
Add ia64.


Index: eclipse-bugzilla.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- eclipse-bugzilla.spec	17 Feb 2006 16:31:22 -0000	1.42
+++ eclipse-bugzilla.spec	4 Apr 2006 13:44:38 -0000	1.43
@@ -1,5 +1,5 @@
 Epoch: 1
-ExclusiveArch: i386 ppc x86_64
+ExclusiveArch: i386 ppc x86_64 ia64
 
 %define gcj_support 		1
 %define pkg_summary		Eclipse Bugzilla plug-in
@@ -22,7 +22,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-bugzilla
 Version: 	%{version_majmin}.%{version_micro}
-Release:	3
+Release:	4
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		
@@ -156,6 +156,9 @@
 %endif
 
 %changelog
+* Tue Apr 04 2006 Andrew Overholt <overholt at redhat.com> 0.2.2-4
+- Add ia64.
+
 * Tue Feb 14 2006 Igor Foox <ifoox at redhat.com> 0.2.2-2
 - Updated source, removes extraneous debug output.
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 13:46:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 09:46:44 -0400
Subject: rpms/eclipse-pydev/devel eclipse-pydev.spec,1.16,1.17
Message-ID: <200604041346.k34DkiJL002413@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	eclipse-pydev.spec 
Log Message:
Add ia64.


Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- eclipse-pydev.spec	9 Feb 2006 21:18:30 -0000	1.16
+++ eclipse-pydev.spec	4 Apr 2006 13:46:41 -0000	1.17
@@ -21,7 +21,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-pydev
 Version: 	%{version_majmin}.%{version_micro}_fc
-Release:	14
+Release:	15
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		
@@ -53,7 +53,7 @@
 %endif
 
 %if %{gcj_support}
-ExclusiveArch: %{ix86} x86_64 ppc
+ExclusiveArch: %{ix86} x86_64 ppc ia64
 %else
 BuildArch:     noarch
 %endif
@@ -133,6 +133,9 @@
 %endif
 
 %changelog
+* 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.
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 14:06:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 10:06:24 -0400
Subject: rpms/gnome-screensaver/FC-5
	gnome-screensaver-2.14.0-detect-more-user-events.patch, NONE,
	1.1 gnome-screensaver-2.14.0-fix-timeout.patch, NONE,
	1.1 gnome-screensaver.spec, 1.63, 1.64
Message-ID: <200604041406.k34E6OeI004266@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-screensaver.spec 
Added Files:
	gnome-screensaver-2.14.0-detect-more-user-events.patch 
	gnome-screensaver-2.14.0-fix-timeout.patch 
Log Message:
- Don't unconditionally activate every timeout period regardless
  of user activity after long suspends (bug 183668)

- Detect scroll wheel events when pointer isn't moved 
  (upstream bug 335831)


gnome-screensaver-2.14.0-detect-more-user-events.patch:
 gs-watcher-x11.c |    7 +++++++
 1 files changed, 7 insertions(+)

--- NEW FILE gnome-screensaver-2.14.0-detect-more-user-events.patch ---
--- gnome-screensaver-2.14.0/src/gs-watcher-x11.c	30 Mar 2006 16:45:48 -0000	1.34
+++ gnome-screensaver-2.14.0/src/gs-watcher-x11.c	2 Apr 2006 03:52:22 -0000
@@ -317,6 +316,9 @@ notice_events_inner (Window   window,
 
                 /* Select for SubstructureNotify on all windows */
                 events = SubstructureNotifyMask | events;
+
+                /* Select for PropertyNotify events to get user time changes */
+                events = PropertyChangeMask | events;
         } else {
                 /* We want to disable all events */
 
@@ -607,6 +609,10 @@ gs_watcher_xevent (GSWatcher *watcher,
         case ButtonPress:
         case ButtonRelease:
                 _gs_watcher_notice_activity (watcher);
+                break;
+        case PropertyNotify:
+                if (ev->xproperty.atom == gdk_x11_get_xatom_by_name ("_NET_WM_USER_TIME"))
+			_gs_watcher_notice_activity (watcher);
                 break;
         case CreateNotify:
                 {


gnome-screensaver-2.14.0-fix-timeout.patch:
 gs-watcher-x11.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE gnome-screensaver-2.14.0-fix-timeout.patch ---
--- gnome-screensaver-2.14.0/src/gs-watcher-x11.c.fix-timeout	2006-04-04 00:56:39.000000000 -0400
+++ gnome-screensaver-2.14.0/src/gs-watcher-x11.c	2006-04-04 00:56:48.000000000 -0400
@@ -1323,6 +1323,7 @@ check_for_clock_skew (GSWatcher *watcher
 
                 watcher->priv->emergency_lock = TRUE;
                 maybe_send_signal (watcher);
+                watcher->priv->emergency_lock = FALSE;
         }
 
         watcher->priv->last_wall_clock_time = now;


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/FC-5/gnome-screensaver.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- gnome-screensaver.spec	31 Mar 2006 04:22:42 -0000	1.63
+++ gnome-screensaver.spec	4 Apr 2006 14:06:22 -0000	1.64
@@ -14,7 +14,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.14.0
-Release: 1.fc5
+Release: 1.fc5.1
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -28,6 +28,8 @@
 Patch1: gnome-screensaver-0.0.23-use-floaters-by-default.patch
 Patch2: gnome-screensaver-2.13.91-shrink-em.patch
 Patch3: gnome-screensaver-2.14.0-pass-krb-environment.patch
+Patch4: gnome-screensaver-2.14.0-fix-timeout.patch
+Patch5: gnome-screensaver-2.14.0-detect-more-user-events.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.gnome.org
@@ -65,6 +67,8 @@
 %patch1 -p1 -b .use-floaters-by-default
 %patch2 -p1 -b .shrink-em
 %patch3 -p1 -b .pass-krb-environment
+%patch4 -p1 -b .timeout
+%patch5 -p1 -b .detect-more-user-events
 
 %build
 intltoolize --force
@@ -164,6 +168,13 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Thu Mar 30 2006 Ray Strode <rstrode at redhat.com> 2.14.0-1.fc5.1
+- Don't unconditionally activate every timeout period regardless
+  of user activity after long suspends (bug 183668)
+
+- Detect scroll wheel events when pointer isn't moved 
+  (upstream bug 335831)
+
 * Thu Mar 30 2006 Ray Strode <rstrode at redhat.com> 2.14.0-1.fc5
 - refresh kerberos credentials when unlocking screen 
   (bug 187341)



From fedora-cvs-commits at redhat.com  Tue Apr  4 14:21:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 10:21:05 -0400
Subject: rpms/vim/devel vim-7.0-warning.patch,NONE,1.1 vim.spec,1.102,1.103
Message-ID: <200604041421.k34EL5KA018160@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18143

Modified Files:
	vim.spec 
Added Files:
	vim-7.0-warning.patch 
Log Message:
make array large enough

vim-7.0-warning.patch:
 structs.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE vim-7.0-warning.patch ---
--- vim70c/src/structs.h.warning1	2006-04-04 15:58:16.000000000 +0200
+++ vim70c/src/structs.h	2006-04-04 15:58:20.000000000 +0200
@@ -1082,7 +1082,7 @@
 {
     typval_T	di_tv;		/* type and value of the variable */
     char_u	di_flags;	/* flags (only used for variable) */
-    char_u	di_key[1];	/* key (actually longer!) */
+    char_u	di_key[10];	/* key (actually longer!) */
 };
 
 typedef struct dictitem_S dictitem_T;


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- vim.spec	4 Apr 2006 12:06:46 -0000	1.102
+++ vim.spec	4 Apr 2006 14:21:02 -0000	1.103
@@ -62,6 +62,7 @@
 Patch3009: vim-6.4-checkhl.patch
 Patch3010: vim-7.0-fstabsyntax.patch
 Patch3011: vim-6.4-lib64.patch
+Patch3012: vim-7.0-warning.patch
 
 Patch3100: vim-selinux.patch
 
@@ -187,6 +188,7 @@
 %patch3009 -p1
 %patch3010 -p1
 %patch3011 -p1
+%patch3012 -p1
 
 %if %{WITH_SELINUX}
 %patch3100 -p1



From fedora-cvs-commits at redhat.com  Tue Apr  4 14:27:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 10:27:35 -0400
Subject: rpms/sane-backends/devel sane-backends.spec,1.58,1.59
Message-ID: <200604041427.k34ERZxw018373@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/sane-backends/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18318

Modified Files:
	sane-backends.spec 
Log Message:
require gphoto2-devel in sane-backends-devel



Index: sane-backends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sane-backends.spec	24 Mar 2006 12:04:40 -0000	1.58
+++ sane-backends.spec	4 Apr 2006 14:27:32 -0000	1.59
@@ -43,6 +43,9 @@
 Summary: The SANE (a universal scanner interface) development toolkit.
 Group: Development/Libraries
 Requires: sane-backends = %{version}, libusb-devel, libieee1284-devel
+%if %{gphoto2_support}
+Requires: gphoto2-devel
+%endif
 Obsoletes: sane-devel
 Provides: sane-devel
 
@@ -153,6 +156,9 @@
 %{_docdir}/%{name}-%{version}/sane.ps
 
 %changelog
+* Tue Apr 04 2006 Nils Philippsen <nphilipp at redhat.com>
+- require gphoto2-devel in sane-backends-devel
+
 * Fri Mar 24 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-7
 - don't include *.la files
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 14:35:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 10:35:53 -0400
Subject: rpms/at-spi/devel .cvsignore, 1.21, 1.22 at-spi.spec, 1.31,
	1.32 sources, 1.21, 1.22
Message-ID: <200604041435.k34EZrJI018497@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/at-spi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18475

Modified Files:
	.cvsignore at-spi.spec sources 
Log Message:
1.7.7



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	28 Feb 2006 02:33:12 -0000	1.21
+++ .cvsignore	4 Apr 2006 14:35:51 -0000	1.22
@@ -11,3 +11,4 @@
 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


Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- at-spi.spec	9 Mar 2006 13:59:28 -0000	1.31
+++ at-spi.spec	4 Apr 2006 14:35:51 -0000	1.32
@@ -6,13 +6,11 @@
 
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
-Version: 1.7.6
-Release: 2
+Version: 1.7.7
+Release: 1
 URL: http://developer.gnome.org/projects/gap/
 Source0: %{name}-%{version}.tar.bz2
 
-Patch0: at-spi-1.7.6-x86_64-crash.patch
-
 License: LGPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
@@ -52,7 +50,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .crash
 
 %build
 %configure --disable-gtk-doc
@@ -93,6 +90,9 @@
 %{_includedir}/* 
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	28 Feb 2006 02:33:12 -0000	1.21
+++ sources	4 Apr 2006 14:35:51 -0000	1.22
@@ -1 +1 @@
-9515f730ea7e9d00690d4181b20990a0  at-spi-1.7.6.tar.bz2
+2988cd21d9f292fd404a8c532fe2723d  at-spi-1.7.7.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr  4 14:47:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 10:47:02 -0400
Subject: rpms/kdemultimedia/devel kdemultimedia.spec,1.58,1.59
Message-ID: <200604041447.k34El2rn032448@cvs.devel.redhat.com>

Author: than

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

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.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- kdemultimedia.spec	4 Apr 2006 14:25:23 -0000	1.58
+++ kdemultimedia.spec	4 Apr 2006 14:46:59 -0000	1.59
@@ -207,6 +207,7 @@
 %doc %{_docdir}/HTML/en/juk
 %endif
 %doc %{_docdir}/HTML/en/kaboodle
+%doc %{_docdir}/HTML/en/kaudiocreator
 %doc %{_docdir}/HTML/en/kdemultimedia-patched-apidocs
 %doc %{_docdir}/HTML/en/kioslave
 %doc %{_docdir}/HTML/en/kmid



From fedora-cvs-commits at redhat.com  Tue Apr  4 14:49:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 10:49:45 -0400
Subject: rpms/atk/devel .cvsignore, 1.20, 1.21 atk.spec, 1.30, 1.31 sources,
	1.20, 1.21
Message-ID: <200604041449.k34EnjdQ032525@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore atk.spec sources 
Log Message:
1.11.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/atk/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	13 Mar 2006 17:41:51 -0000	1.20
+++ .cvsignore	4 Apr 2006 14:49:43 -0000	1.21
@@ -7,3 +7,4 @@
 atk-1.11.0.tar.bz2
 atk-1.11.2.tar.bz2
 atk-1.11.3.tar.bz2
+atk-1.11.4.tar.bz2


Index: atk.spec
===================================================================
RCS file: /cvs/dist/rpms/atk/devel/atk.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- atk.spec	13 Mar 2006 17:41:51 -0000	1.30
+++ atk.spec	4 Apr 2006 14:49:43 -0000	1.31
@@ -2,7 +2,7 @@
 
 Summary: Interfaces for accessibility support.
 Name: atk
-Version: 1.11.3
+Version: 1.11.4
 Release: 1
 License: LGPL
 Group: System Environment/Libraries
@@ -68,6 +68,9 @@
 %{_datadir}/gtk-doc/
 
 %changelog
+* Tue Apr  4 2006 Matthias Clasen <mclasen at redhat.com> - 1.11.4-1
+- Update to 1.11.4
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 1.11.3-1
 - Update to 1.11.3
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/atk/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	13 Mar 2006 17:41:51 -0000	1.20
+++ sources	4 Apr 2006 14:49:43 -0000	1.21
@@ -1 +1 @@
-b9ab9ad4ac99cb7c00deb5bbb6cca2e4  atk-1.11.3.tar.bz2
+2f7132e46a62a2586545bca40eeeef39  atk-1.11.4.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr  4 14:50:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 10:50:51 -0400
Subject: rpms/atk/devel atk.spec,1.31,1.32
Message-ID: <200604041450.k34EopjI032650@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	atk.spec 
Log Message:
bump rev



Index: atk.spec
===================================================================
RCS file: /cvs/dist/rpms/atk/devel/atk.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- atk.spec	4 Apr 2006 14:49:43 -0000	1.31
+++ atk.spec	4 Apr 2006 14:50:49 -0000	1.32
@@ -3,7 +3,7 @@
 Summary: Interfaces for accessibility support.
 Name: atk
 Version: 1.11.4
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source: atk-%{version}.tar.bz2 
@@ -68,7 +68,7 @@
 %{_datadir}/gtk-doc/
 
 %changelog
-* Tue Apr  4 2006 Matthias Clasen <mclasen at redhat.com> - 1.11.4-1
+* Tue Apr  4 2006 Matthias Clasen <mclasen at redhat.com> - 1.11.4-2
 - Update to 1.11.4
 
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 1.11.3-1



From fedora-cvs-commits at redhat.com  Tue Apr  4 14:51:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 10:51:23 -0400
Subject: rpms/kdemultimedia/FC-5 kdemultimedia.spec, 1.57, 1.58 sources, 1.34,
	1.35
Message-ID: <200604041451.k34EpNrp032674@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdemultimedia.spec sources 
Log Message:
update to 3.5.2




Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/FC-5/kdemultimedia.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kdemultimedia.spec	22 Feb 2006 15:41:34 -0000	1.57
+++ kdemultimedia.spec	4 Apr 2006 14:51:06 -0000	1.58
@@ -27,8 +27,8 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.1
-Release: 2
+Version: 3.5.2
+Release: 0.1.fc5
 Epoch: 6
 Name: kdemultimedia
 Prefix: /usr
@@ -207,6 +207,7 @@
 %doc %{_docdir}/HTML/en/juk
 %endif
 %doc %{_docdir}/HTML/en/kaboodle
+%doc %{_docdir}/HTML/en/kaudiocreator
 %doc %{_docdir}/HTML/en/kdemultimedia-patched-apidocs
 %doc %{_docdir}/HTML/en/kioslave
 %doc %{_docdir}/HTML/en/kmid
@@ -234,6 +235,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Tue Apr 04 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc5
+- update to 3.5.2
+
 * Wed Feb 22 2006 Than Ngo <than at redhat.com> 6:3.5.1-2
 - add missing protocol audiocd #176637
 - remove useless rpm macro #180009


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/FC-5/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	2 Feb 2006 21:30:17 -0000	1.34
+++ sources	4 Apr 2006 14:51:06 -0000	1.35
@@ -1 +1 @@
-31630864143d052b8f4342da0fa098fd  kdemultimedia-3.5.1-patched.tar.bz2
+54f9947051ee5cf50c81a5ea382943f1  kdemultimedia-3.5.2-patched.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr  4 14:59:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 10:59:30 -0400
Subject: rpms/kdeaccessibility/FC-5 .cvsignore, 1.10,
	1.11 kdeaccessibility.spec, 1.15, 1.16 sources, 1.10, 1.11
Message-ID: <200604041459.k34ExUa9000452@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdeaccessibility.spec sources 
Log Message:
update to 3.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	3 Feb 2006 22:07:18 -0000	1.10
+++ .cvsignore	4 Apr 2006 14:59:27 -0000	1.11
@@ -7,3 +7,4 @@
 kdeaccessibility-3.4.92.tar.bz2
 kdeaccessibility-3.5.0.tar.bz2
 kdeaccessibility-3.5.1.tar.bz2
+kdeaccessibility-3.5.2.tar.bz2


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/FC-5/kdeaccessibility.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kdeaccessibility.spec	1 Mar 2006 15:47:06 -0000	1.15
+++ kdeaccessibility.spec	4 Apr 2006 14:59:27 -0000	1.16
@@ -6,8 +6,8 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.1
-Release: 2
+Version: 3.5.2
+Release: 0.1.fc5
 Epoch: 1
 Summary: K Desktop Environment - Accessibility
 Name: kdeaccessibility
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Tue Apr 04 2006 Than Ngo <than at redhat.com> 1:3.5.2-0.1.fc5
+- update to 3.5.2
+
 * Wed Mar 01 2006 Karsten Hopp <karsten at redhat.de> 3.5.1-2
 - BuildRequires: libXtst-devel
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	3 Feb 2006 22:07:18 -0000	1.10
+++ sources	4 Apr 2006 14:59:27 -0000	1.11
@@ -1 +1 @@
-cc0773103053a6800b3d35e6021b6719  kdeaccessibility-3.5.1.tar.bz2
+bcfd51875aa2a168fbc97055a576a33c  kdeaccessibility-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr  4 15:07:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 11:07:12 -0400
Subject: rpms/kdeaccessibility/devel kdeaccessibility.spec, 1.15,
	1.16 sources, 1.10, 1.11
Message-ID: <200604041507.k34F7CVw000627@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdeaccessibility.spec sources 
Log Message:
update to 3.5.2




Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kdeaccessibility.spec	1 Mar 2006 15:47:06 -0000	1.15
+++ kdeaccessibility.spec	4 Apr 2006 15:07:08 -0000	1.16
@@ -1,13 +1,13 @@
 %define debug 0
 %define final 1
 
-%define qt_version 3.3.5
+%define qt_version 3.3.6
 %define kdebase_epoch 6
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.1
-Release: 2
+Version: 3.5.2
+Release: 1
 Epoch: 1
 Summary: K Desktop Environment - Accessibility
 Name: kdeaccessibility
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Tue Apr 04 2006 Than Ngo <than at redhat.com> 1:3.5.2-1
+- update to 3.5.2
+
 * Wed Mar 01 2006 Karsten Hopp <karsten at redhat.de> 3.5.1-2
 - BuildRequires: libXtst-devel
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	3 Feb 2006 22:07:18 -0000	1.10
+++ sources	4 Apr 2006 15:07:08 -0000	1.11
@@ -1 +1 @@
-cc0773103053a6800b3d35e6021b6719  kdeaccessibility-3.5.1.tar.bz2
+bcfd51875aa2a168fbc97055a576a33c  kdeaccessibility-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr  4 15:10:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 11:10:40 -0400
Subject: rpms/cups/devel cups-direct-usb.patch, NONE, 1.1 cups.spec, 1.152,
	1.153
Message-ID: <200604041510.k34FAeu7000743@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-direct-usb.patch 
Log Message:
* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.6
- Tweak to allow 'usb:/dev/usb/lp0'-style URIs again.


cups-direct-usb.patch:
 usb-unix.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-direct-usb.patch ---
--- 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 @@
 
   if (!strncmp(uri, "usb:/dev/", 9))
 #ifdef __linux
-    return (-1); /* Do not allow direct devices anymore */
+    return (open(uri + 4, O_RDWR | O_EXCL));
   else if (!strncmp(uri, "usb://", 6))
   {
    /*


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- cups.spec	3 Apr 2006 12:50:48 -0000	1.152
+++ cups.spec	4 Apr 2006 15:10:37 -0000	1.153
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2
-Release: 0.2.%{beta}.5
+Release: 0.2.%{beta}.6
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
@@ -40,6 +40,7 @@
 Patch17: cups-1.1.19-no_rpath.patch
 Patch18: cups-language.patch
 Patch19: cups-gnome.patch
+Patch20: cups-direct-usb.patch
 Patch22: cups-dest-cache-v2.patch
 Patch24: cups-maxlogsize.patch
 Patch28: cups-no-propagate-ipp-port.patch
@@ -133,6 +134,7 @@
 %patch17 -p1 -b .no_rpath
 %patch18 -p1 -b .language
 %patch19 -p1 -b .gnome
+%patch20 -p1 -b .direct-usb
 %patch22 -p1 -b .dest-cache-v2
 %patch24 -p1 -b .maxlogsize
 %patch28 -p1 -b .no-propagate-ipp-port
@@ -383,6 +385,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.6
+- Tweak to allow 'usb:/dev/usb/lp0'-style URIs again.
+
 * Sun Apr  2 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.5
 - Backported svn 5365:5366 change for mutex-protected stringpool (STR #1530).
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 15:20:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 11:20:29 -0400
Subject: rpms/cups/FC-5 cups-direct-usb.patch, NONE, 1.1 cups.spec, 1.139,
	1.140
Message-ID: <200604041520.k34FKTT4014771@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-direct-usb.patch 
Log Message:
* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.6
- Tweak to allow 'usb:/dev/usb/lp0'-style URIs again (bug #186880).


cups-direct-usb.patch:
 usb-unix.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-direct-usb.patch ---
--- 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 @@
 
   if (!strncmp(uri, "usb:/dev/", 9))
 #ifdef __linux
-    return (-1); /* Do not allow direct devices anymore */
+    return (open(uri + 4, O_RDWR | O_EXCL));
   else if (!strncmp(uri, "usb://", 6))
   {
    /*


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- cups.spec	3 Apr 2006 12:53:44 -0000	1.139
+++ cups.spec	4 Apr 2006 15:20:26 -0000	1.140
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2
-Release: 0.2.%{beta}.2.5
+Release: 0.2.%{beta}.2.6
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
@@ -40,6 +40,7 @@
 Patch17: cups-1.1.19-no_rpath.patch
 Patch18: cups-language.patch
 Patch19: cups-gnome.patch
+Patch20: cups-direct-usb.patch
 Patch22: cups-dest-cache-v2.patch
 Patch24: cups-maxlogsize.patch
 Patch28: cups-no-propagate-ipp-port.patch
@@ -137,6 +138,7 @@
 %patch17 -p1 -b .no_rpath
 %patch18 -p1 -b .language
 %patch19 -p1 -b .gnome
+%patch20 -p1 -b .direct-usb
 %patch22 -p1 -b .dest-cache-v2
 %patch24 -p1 -b .maxlogsize
 %patch28 -p1 -b .no-propagate-ipp-port
@@ -387,6 +389,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.6
+- Tweak to allow 'usb:/dev/usb/lp0'-style URIs again (bug #186880).
+
 * Sun Apr  2 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.5
 - Backported svn 5365:5366 change for mutex-protected stringpool (STR #1530).
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 15:37:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 11:37:54 -0400
Subject: rpms/netdump/devel netdump-glib2.patch, NONE, 1.1 netdump.spec, 1.22,
	1.23
Message-ID: <200604041537.k34FbsOv015156@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/netdump/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15142

Modified Files:
	netdump.spec 
Added Files:
	netdump-glib2.patch 
Log Message:
build against glib2


netdump-glib2.patch:
 Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE netdump-glib2.patch ---
--- netdump-0.7.14/Makefile.ook	2006-04-04 11:34:48.000000000 -0400
+++ netdump-0.7.14/Makefile	2006-04-04 11:35:10.000000000 -0400
@@ -1,7 +1,7 @@
 DEBUG_FLAGS=-Wall -g
 
-CFLAGS=`glib-config --cflags` $(DEBUG_FLAGS) -D_FILE_OFFSET_BITS=64
-LDFLAGS=`glib-config --libs` -lpopt
+CFLAGS=`pkg-config --cflags glib-2.0` $(DEBUG_FLAGS) -D_FILE_OFFSET_BITS=64
+LDFLAGS=`pkg-config --libs glib-2.0` -lpopt
 
 VERSION=$(shell awk '/Version:/ { print $$2 }' netdump.spec)
 # Used to append this to CVSTAG: _$(subst .,-,$(RELEASE)), but now that


Index: netdump.spec
===================================================================
RCS file: /cvs/dist/rpms/netdump/devel/netdump.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- netdump.spec	11 Feb 2006 04:44:04 -0000	1.22
+++ netdump.spec	4 Apr 2006 15:37:46 -0000	1.23
@@ -1,12 +1,13 @@
 Summary: Client setup for network kernel message logging and crash dumps
 Name: netdump
 Version: 0.7.14
-Release: 1.2.1
+Release: 2
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: glib-devel
+BuildRequires: glib2-devel
+Patch: netdump-glib2.patch
 Requires: /usr/bin/ssh-keygen /usr/bin/ssh fileutils textutils gawk /sbin/ifconfig
 
 %package server
@@ -95,6 +96,9 @@
 %doc example_scripts
 
 %changelog
+* Tue Apr  4 2006 Bill Nottingham <notting at redhat.com> - 0.7.14-2
+- build against glib2
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.7.14-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 15:38:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 11:38:30 -0400
Subject: rpms/netdump/devel netdump.spec,1.23,1.24
Message-ID: <200604041538.k34FcUXW015220@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/netdump/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15203

Modified Files:
	netdump.spec 
Log Message:
pick a release not used elsewhere



Index: netdump.spec
===================================================================
RCS file: /cvs/dist/rpms/netdump/devel/netdump.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- netdump.spec	4 Apr 2006 15:37:46 -0000	1.23
+++ netdump.spec	4 Apr 2006 15:38:28 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Client setup for network kernel message logging and crash dumps
 Name: netdump
 Version: 0.7.14
-Release: 2
+Release: 5
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Daemons
@@ -96,7 +96,7 @@
 %doc example_scripts
 
 %changelog
-* Tue Apr  4 2006 Bill Nottingham <notting at redhat.com> - 0.7.14-2
+* Tue Apr  4 2006 Bill Nottingham <notting at redhat.com> - 0.7.14-5
 - build against glib2
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.7.14-1.2.1



From fedora-cvs-commits at redhat.com  Tue Apr  4 15:57:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 11:57:24 -0400
Subject: rpms/kdegames/FC-5 .cvsignore, 1.33, 1.34 kdegames.spec, 1.48,
	1.49 sources, 1.34, 1.35
Message-ID: <200604041557.k34FvOiv029146@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdegames.spec sources 
Log Message:
update to 3.5.2




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdegames/FC-5/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	3 Feb 2006 21:52:02 -0000	1.33
+++ .cvsignore	4 Apr 2006 15:57:22 -0000	1.34
@@ -11,3 +11,4 @@
 kdegames-3.4.92-patched.tar.bz2
 kdegames-3.5.0-patched.tar.bz2
 kdegames-3.5.1-patched.tar.bz2
+kdegames-3.5.2-patched.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegames/FC-5/kdegames.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- kdegames.spec	11 Feb 2006 03:46:42 -0000	1.48
+++ kdegames.spec	4 Apr 2006 15:57:22 -0000	1.49
@@ -18,8 +18,8 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.1
-Release: 1.2
+Version: 3.5.2
+Release: 0.1.fc5
 Epoch: 6
 Summary: K Desktop Environment - Games
 Name: kdegames
@@ -153,6 +153,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Tue Apr 04 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc5
+- update to 3.5.2
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdegames/FC-5/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	3 Feb 2006 21:52:02 -0000	1.34
+++ sources	4 Apr 2006 15:57:22 -0000	1.35
@@ -1 +1 @@
-fb44a24d646801989a4e7e837e628c00  kdegames-3.5.1-patched.tar.bz2
+143bbcb02e997767b4ba15f6bb5a653e  kdegames-3.5.2-patched.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr  4 15:57:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 11:57:33 -0400
Subject: rpms/xferstats/devel xferstats-glib2.patch, NONE, 1.1 xferstats.spec,
	1.11, 1.12
Message-ID: <200604041557.k34FvXjo029201@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/xferstats/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29186

Modified Files:
	xferstats.spec 
Added Files:
	xferstats-glib2.patch 
Log Message:
build against glib-2.0


xferstats-glib2.patch:
 configure.in |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE xferstats-glib2.patch ---
--- xferstats-2.16/configure.in.moo	2006-04-04 11:52:55.000000000 -0400
+++ xferstats-2.16/configure.in	2006-04-04 11:53:55.000000000 -0400
@@ -157,9 +157,9 @@
 if test x$with_glib = x ; then
   # Look for separately installed glib
 
-  AM_PATH_GLIB(1.1.3,,
+  AM_PATH_GLIB_2_0(2.0.0,,
     AC_MSG_ERROR([
-*** GLIB 1.1.3 or better is required. The latest version of GLIB
+*** GLIB 2.0.0 or better is required. The latest version of GLIB
 *** is always available from ftp://ftp.gtk.org.]),
     gmodule)
 
@@ -168,17 +168,17 @@
 else
   # Use uninstalled glib (assume they got the version right)
 
-  if test -x $with_glib/glib-config ; then
+  if test -x $with_glib/pkg-config ; then
     :
   else
     AC_MSG_ERROR([GLIB directory ($with_glib) not present or not configured])
   fi
 
   # For use in gtk-config
-  glib_cflags=`$with_glib/glib-config --cflags`
-  glib_libs=`$with_glib/glib-config --libs`
+  glib_cflags=`$with_glib/pkg-config --cflags glib-2.0`
+  glib_libs=`$with_glib/pkg-config --libs glib-2.0`
 
-  glib_release=`$with_glib/glib-config --version | sed 's%\\.[[0-9]]*$%%'`
+  glib_release=`$with_glib/pkg-config --modversion glib-2.0 | sed 's%\\.[[0-9]]*$%%'`
 
   # canonicalize relative paths
   case $with_glib in


Index: xferstats.spec
===================================================================
RCS file: /cvs/dist/rpms/xferstats/devel/xferstats.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xferstats.spec	11 Feb 2006 06:11:00 -0000	1.11
+++ xferstats.spec	4 Apr 2006 15:57:30 -0000	1.12
@@ -1,16 +1,17 @@
 Summary: Compiles information about file transfers from logfiles
 Name: xferstats
 Version: 2.16
-Release: 13.2.1
+Release: 14
 URL: http://xferstats.off.net/
 Source0: ftp://xferstats.off.net/%{name}-%{version}.tar.gz
 Patch0: xferstats.patch
 Patch1: xferstats-2.16-config-loc.patch
 Patch2: xferstats-2.16-display.patch
+Patch3: xferstats-glib2.patch
 License: GPL
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildPrereq: glib-devel
+BuildPrereq: glib2-devel autoconf
 
 %description
 xferstats compiles information about file transfers from logfiles.
@@ -20,8 +21,11 @@
 %patch0 -p1
 %patch1 -p1 -b .config
 %patch2 -p1 -b .display
+%patch3 -p1 -b .glib2
 
 %build
+cp /usr/share/aclocal/glib-2.0.m4 ./aclocal.m4
+autoconf
 %configure
 make
 
@@ -44,6 +48,9 @@
 %{_datadir}/xferstats
 
 %changelog
+* TUe Apr 14 2006 Bill Nottingham <notting at redhat.com> - 2.16-14
+- build against glib2
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.16-13.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 15:58:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 11:58:00 -0400
Subject: rpms/kdegames/devel kdegames.spec,1.48,1.49 sources,1.34,1.35
Message-ID: <200604041558.k34Fw0Ab029255@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdegames.spec sources 
Log Message:
update to 3.5.2



Index: kdegames.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- kdegames.spec	11 Feb 2006 03:46:42 -0000	1.48
+++ kdegames.spec	4 Apr 2006 15:57:57 -0000	1.49
@@ -11,15 +11,15 @@
 %define patch_name %{nil}
 %endif
 
-%define qt_version 3.3.5
+%define qt_version 3.3.6
 %define qt_epoch 1
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.1
-Release: 1.2
+Version: 3.5.2
+Release: 1
 Epoch: 6
 Summary: K Desktop Environment - Games
 Name: kdegames
@@ -153,6 +153,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Tue Apr 04 2006 Than Ngo <than at redhat.com> 6:3.5.2-1
+- update to 3.5.2
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdegames/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	3 Feb 2006 21:52:02 -0000	1.34
+++ sources	4 Apr 2006 15:57:57 -0000	1.35
@@ -1 +1 @@
-fb44a24d646801989a4e7e837e628c00  kdegames-3.5.1-patched.tar.bz2
+143bbcb02e997767b4ba15f6bb5a653e  kdegames-3.5.2-patched.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr  4 16:02:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 12:02:31 -0400
Subject: rpms/xsane/devel xsane-0.99-medium-definitions.patch, NONE,
	1.1 xsane.spec, 1.30, 1.31 xsane-medium-definitions.patch, 1.1, NONE
Message-ID: <200604041602.k34G2Vte029398@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/xsane/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29336

Modified Files:
	xsane.spec 
Added Files:
	xsane-0.99-medium-definitions.patch 
Removed Files:
	xsane-medium-definitions.patch 
Log Message:
fix medium-definitions patch to not barf on obsolete options in config file (#185269, by Aldy Hernandez)


xsane-0.99-medium-definitions.patch:
 xsane-preferences.c |    7 +++++++
 1 files changed, 7 insertions(+)

--- NEW FILE xsane-0.99-medium-definitions.patch ---
--- xsane-0.99/src/xsane-preferences.c.medium-definitions	2005-12-29 12:18:09.000000000 +0100
+++ xsane-0.99/src/xsane-preferences.c	2006-04-04 17:53:11.000000000 +0200
@@ -446,6 +446,13 @@
       {
         break;
       }
+      else if (!strcmp(name, "medium-definitions"))
+      {
+        /* Ignore medium_definitions */
+        SANE_Word discard;
+        xsane_rc_io_w_space(&w, 3);
+        xsane_rc_io_w_word(&w, &discard);
+      }
       else if (i == NELEMS(desc))
       {
         DBG(DBG_info2, "preferences identifier %s unknown\n", name);


Index: xsane.spec
===================================================================
RCS file: /cvs/dist/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xsane.spec	11 Feb 2006 06:33:50 -0000	1.30
+++ xsane.spec	4 Apr 2006 16:02:28 -0000	1.31
@@ -1,11 +1,11 @@
 Name: xsane
 Summary: An X Window System front-end for the SANE scanner interface.
 Version: 0.99
-Release: 2.2
+Release: 3
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane-install-gimp-plugin
 Patch0: xsane-0.90-htmlview.patch
-Patch1: xsane-medium-definitions.patch
+Patch1: xsane-0.99-medium-definitions.patch
 Patch2: xsane-0.92_gimp2.0.patch
 Patch3: xsane-0.99-buffer.patch
 License: GPL
@@ -97,6 +97,10 @@
 exit 0
 
 %changelog
+* Tue Apr 04 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-3
+- fix medium-definitions patch to not barf on obsolete options in config file
+  (#185269, by Aldy Hernandez)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.99-2.2
 - bump again for double-long bug on ppc(64)
 


--- xsane-medium-definitions.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr  4 16:03:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 12:03:38 -0400
Subject: rpms/xferstats/devel xferstats.spec,1.12,1.13
Message-ID: <200604041603.k34G3cOW029423@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/xferstats/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29404

Modified Files:
	xferstats.spec 
Log Message:
fix typo



Index: xferstats.spec
===================================================================
RCS file: /cvs/dist/rpms/xferstats/devel/xferstats.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xferstats.spec	4 Apr 2006 15:57:30 -0000	1.12
+++ xferstats.spec	4 Apr 2006 16:03:32 -0000	1.13
@@ -48,7 +48,7 @@
 %{_datadir}/xferstats
 
 %changelog
-* TUe Apr 14 2006 Bill Nottingham <notting at redhat.com> - 2.16-14
+* Tue Apr 14 2006 Bill Nottingham <notting at redhat.com> - 2.16-14
 - build against glib2
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.16-13.2.1



From fedora-cvs-commits at redhat.com  Tue Apr  4 16:08:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 12:08:31 -0400
Subject: rpms/xsane/FC-5 xsane.spec, 1.30,
	1.31 xsane-medium-definitions.patch, 1.1, NONE
Message-ID: <200604041608.k34G8VfW029504@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	xsane.spec 
Removed Files:
	xsane-medium-definitions.patch 
Log Message:
fix medium-definitions patch to not barf on obsolete options in config file (#185269, by Aldy Hernandez)



Index: xsane.spec
===================================================================
RCS file: /cvs/dist/rpms/xsane/FC-5/xsane.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xsane.spec	11 Feb 2006 06:33:50 -0000	1.30
+++ xsane.spec	4 Apr 2006 16:08:29 -0000	1.31
@@ -1,11 +1,11 @@
 Name: xsane
 Summary: An X Window System front-end for the SANE scanner interface.
 Version: 0.99
-Release: 2.2
+Release: 0.fc5.3
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane-install-gimp-plugin
 Patch0: xsane-0.90-htmlview.patch
-Patch1: xsane-medium-definitions.patch
+Patch1: xsane-0.99-medium-definitions.patch
 Patch2: xsane-0.92_gimp2.0.patch
 Patch3: xsane-0.99-buffer.patch
 License: GPL
@@ -97,6 +97,10 @@
 exit 0
 
 %changelog
+* Tue Apr 04 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-0.fc5.3
+- fix medium-definitions patch to not barf on obsolete options in config file
+  (#185269, by Aldy Hernandez)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.99-2.2
 - bump again for double-long bug on ppc(64)
 


--- xsane-medium-definitions.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr  4 16:27:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 12:27:40 -0400
Subject: rpms/sane-backends/devel sane-backends.spec,1.59,1.60
Message-ID: <200604041627.k34GRegW011491@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/sane-backends/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11478

Modified Files:
	sane-backends.spec 
Log Message:
bump release



Index: sane-backends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sane-backends.spec	4 Apr 2006 14:27:32 -0000	1.59
+++ sane-backends.spec	4 Apr 2006 16:27:37 -0000	1.60
@@ -4,7 +4,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.17
-Release: 7
+Release: 8
 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
@@ -156,7 +156,7 @@
 %{_docdir}/%{name}-%{version}/sane.ps
 
 %changelog
-* Tue Apr 04 2006 Nils Philippsen <nphilipp at redhat.com>
+* Tue Apr 04 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-8
 - require gphoto2-devel in sane-backends-devel
 
 * Fri Mar 24 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-7



From fedora-cvs-commits at redhat.com  Tue Apr  4 16:34:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 12:34:14 -0400
Subject: rpms/sane-backends/FC-5 sane-backends.spec,1.57,1.58
Message-ID: <200604041634.k34GYE1Y011603@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/sane-backends/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11575

Modified Files:
	sane-backends.spec 
Log Message:
require gphoto2-devel in sane-backends-devel



Index: sane-backends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/FC-5/sane-backends.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sane-backends.spec	24 Mar 2006 12:04:20 -0000	1.57
+++ sane-backends.spec	4 Apr 2006 16:33:27 -0000	1.58
@@ -4,7 +4,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.17
-Release: 5
+Release: 5.fc5.8
 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
@@ -43,6 +43,9 @@
 Summary: The SANE (a universal scanner interface) development toolkit.
 Group: Development/Libraries
 Requires: sane-backends = %{version}, libusb-devel, libieee1284-devel
+%if %{gphoto2_support}
+Requires: gphoto2-devel
+%endif
 Obsoletes: sane-devel
 Provides: sane-devel
 
@@ -153,9 +156,15 @@
 %{_docdir}/%{name}-%{version}/sane.ps
 
 %changelog
-* Fri Mar 24 2006 Nils Philippsen <nphilipp at redhat.com>
+* Tue Apr 04 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-5.fc5.8
+- require gphoto2-devel in sane-backends-devel
+
+* Fri Mar 24 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-7
 - don't include *.la files
 
+* Thu Mar 23 2006 Than Ngo <than at redhat.com> 1.0.17-6
+- rebuild against gphoto2 to get rid of gphoto2.la
+
 * Tue Mar 14 2006 Nils Philippsen <nphilipp at redhat.com> - 1.0.17-5
 - buildrequire automake, autoconf, libtool (#178596)
 - don't require /sbin/ldconfig, /bin/mktemp, /bin/grep, /bin/cat, /bin/rm



From fedora-cvs-commits at redhat.com  Tue Apr  4 16:37:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 12:37:48 -0400
Subject: rpms/xsane/FC-5 xsane-0.99-medium-definitions.patch,NONE,1.1
Message-ID: <200604041637.k34GbmsN011784@cvs.devel.redhat.com>

Author: nphilipp

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

Added Files:
	xsane-0.99-medium-definitions.patch 
Log Message:
add missing patch


xsane-0.99-medium-definitions.patch:
 xsane-preferences.c |    7 +++++++
 1 files changed, 7 insertions(+)

--- NEW FILE xsane-0.99-medium-definitions.patch ---
--- xsane-0.99/src/xsane-preferences.c.medium-definitions	2005-12-29 12:18:09.000000000 +0100
+++ xsane-0.99/src/xsane-preferences.c	2006-04-04 17:53:11.000000000 +0200
@@ -446,6 +446,13 @@
       {
         break;
       }
+      else if (!strcmp(name, "medium-definitions"))
+      {
+        /* Ignore medium_definitions */
+        SANE_Word discard;
+        xsane_rc_io_w_space(&w, 3);
+        xsane_rc_io_w_word(&w, &discard);
+      }
       else if (i == NELEMS(desc))
       {
         DBG(DBG_info2, "preferences identifier %s unknown\n", name);



From fedora-cvs-commits at redhat.com  Tue Apr  4 16:42:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 12:42:20 -0400
Subject: rpms/netdump/devel netdump.spec,1.24,1.25
Message-ID: <200604041642.k34GgKXB011942@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/netdump/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11913

Modified Files:
	netdump.spec 
Log Message:
fix build



Index: netdump.spec
===================================================================
RCS file: /cvs/dist/rpms/netdump/devel/netdump.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- netdump.spec	4 Apr 2006 15:38:28 -0000	1.24
+++ netdump.spec	4 Apr 2006 16:42:18 -0000	1.25
@@ -27,6 +27,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 make %{?_smp_mflags}



From fedora-cvs-commits at redhat.com  Tue Apr  4 16:44:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 12:44:56 -0400
Subject: rpms/xsane/FC-5 xsane.spec,1.31,1.32
Message-ID: <200604041644.k34GiuwW012034@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	xsane.spec 
Log Message:
fix release



Index: xsane.spec
===================================================================
RCS file: /cvs/dist/rpms/xsane/FC-5/xsane.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- xsane.spec	4 Apr 2006 16:08:29 -0000	1.31
+++ xsane.spec	4 Apr 2006 16:44:54 -0000	1.32
@@ -1,7 +1,7 @@
 Name: xsane
 Summary: An X Window System front-end for the SANE scanner interface.
 Version: 0.99
-Release: 0.fc5.3
+Release: 2.2.fc5.3
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane-install-gimp-plugin
 Patch0: xsane-0.90-htmlview.patch
@@ -97,7 +97,7 @@
 exit 0
 
 %changelog
-* Tue Apr 04 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-0.fc5.3
+* Tue Apr 04 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-2.2.fc5.3
 - fix medium-definitions patch to not barf on obsolete options in config file
   (#185269, by Aldy Hernandez)
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 17:20:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 13:20:12 -0400
Subject: rpms/hal-cups-utils/FC-5 hal-cups-utils.spec,1.25,1.26
Message-ID: <200604041720.k34HKCT0007371@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hal-cups-utils.spec 
Log Message:
* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> - 0.5.5-1.2.fc5.2
- hal backend lives in both /usr/lib and /usr/lib64 on 64bit architectures
  for FC5.



Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/FC-5/hal-cups-utils.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- hal-cups-utils.spec	28 Mar 2006 17:33:09 -0000	1.25
+++ hal-cups-utils.spec	4 Apr 2006 17:20:10 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Halified CUPS utilities 
 Name: hal-cups-utils
 Version: 0.5.5
-Release: 1.2.fc5.1
+Release: 1.2.fc5.2
 License: GPL
 Group: Applications/System
 Source: %{name}-%{version}.tar.gz
@@ -39,7 +39,7 @@
 
 if [ -n "`echo %{_libdir} | grep lib64`" ] ; then
   mkdir -p $RPM_BUILD_ROOT/usr/lib/cups/backend
-    mv $RPM_BUILD_ROOT/usr/lib64/cups/backend/* $RPM_BUILD_ROOT/usr/lib/cups/backend/
+    cp -a $RPM_BUILD_ROOT/usr/lib64/cups/backend/* $RPM_BUILD_ROOT/usr/lib/cups/backend/
 
 fi
     
@@ -72,11 +72,18 @@
 %{_bindir}/cups-config-daemon
 %{_sbindir}/hal_lpadmin
 /usr/lib/cups/backend/hal
+%if "%_libdir" == "/usr/lib64"
+%{_libdir}/cups/backend/hal
+%endif
 %{_datadir}/hal/fdi/policy/10osvendor/10-hal_lpadmin.fdi
 %{_sysconfdir}/dbus-1/system.d/cups-config-daemon-dbus.conf
 %{_sysconfdir}/rc.d/init.d/cups-config-daemon
 
 %changelog
+* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> - 0.5.5-1.2.fc5.2
+- hal backend lives in both /usr/lib and /usr/lib64 on 64bit architectures
+  for FC5.
+
 * Tue Mar 28 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.5-1.2.fc5.1
 - Move the hal backend to /usr/lib on 64bit arch's
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 17:23:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 13:23:02 -0400
Subject: rpms/cups/devel cups.spec,1.153,1.154
Message-ID: <200604041723.k34HN2FS007469@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Log Message:
* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com>
- Build requires openldap-devel.



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- cups.spec	4 Apr 2006 15:10:37 -0000	1.153
+++ cups.spec	4 Apr 2006 17:22:59 -0000	1.154
@@ -63,6 +63,7 @@
 
 BuildPrereq: pam-devel openssl-devel pkgconfig
 BuildPrereq: gnutls-devel
+BuildRequires: openldap-devel
 BuildRequires: make >= 1:3.80
 BuildRequires: php-devel, aspell-devel, pcre-devel
 
@@ -385,6 +386,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com>
+- Build requires openldap-devel.
+
 * Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.6
 - Tweak to allow 'usb:/dev/usb/lp0'-style URIs again.
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 17:23:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 13:23:55 -0400
Subject: rpms/cups/FC-5 cups.spec,1.140,1.141
Message-ID: <200604041723.k34HNtiM007491@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Log Message:
* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com>
- Build requires openldap-devel.



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- cups.spec	4 Apr 2006 15:20:26 -0000	1.140
+++ cups.spec	4 Apr 2006 17:23:53 -0000	1.141
@@ -63,6 +63,7 @@
 
 BuildPrereq: pam-devel openssl-devel pkgconfig
 BuildPrereq: gnutls-devel
+BuildRequires: openldap-devel
 BuildRequires: make >= 1:3.80
 BuildRequires: php-devel, aspell-devel, pcre-devel
 
@@ -389,6 +390,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com>
+- Build requires openldap-devel.
+
 * Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.6
 - Tweak to allow 'usb:/dev/usb/lp0'-style URIs again (bug #186880).
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 17:33:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 13:33:58 -0400
Subject: rpms/rhpxl/devel .cvsignore, 1.21, 1.22 rhpxl.spec, 1.23,
	1.24 sources, 1.23, 1.24
Message-ID: <200604041733.k34HXwxZ007562@cvs.devel.redhat.com>

Author: clumens

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	6 Mar 2006 20:12:06 -0000	1.21
+++ .cvsignore	4 Apr 2006 17:33:24 -0000	1.22
@@ -1 +1,2 @@
 rhpxl-0.18.tar.gz
+rhpxl-0.19.tar.gz


Index: rhpxl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/rhpxl.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- rhpxl.spec	6 Mar 2006 20:12:06 -0000	1.23
+++ rhpxl.spec	4 Apr 2006 17:33:24 -0000	1.24
@@ -2,7 +2,7 @@
 
 Summary: Python library for configuring and running X.
 Name: rhpxl
-Version: 0.18
+Version: 0.19
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -43,6 +43,10 @@
 %{_sbindir}/ddcprobe
 
 %changelog
+* Tue Apr 04 2006 Chris Lumens <clumens at redhat.com> 0.19-1 
+- Remove obsolete functions in mouse.py.
+- Create a new Modes class.
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0.18-1
 - allow forcing vesa (#184015)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	6 Mar 2006 20:12:06 -0000	1.23
+++ sources	4 Apr 2006 17:33:24 -0000	1.24
@@ -1 +1 @@
-60088c7d19309600375f16ef1dbdb952  rhpxl-0.18.tar.gz
+d86b72375a3d76e5deae69498c25d562  rhpxl-0.19.tar.gz



From fedora-cvs-commits at redhat.com  Tue Apr  4 17:45:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 13:45:18 -0400
Subject: rpms/firstboot/devel .cvsignore, 1.50, 1.51 firstboot.spec, 1.70,
	1.71 sources, 1.66, 1.67
Message-ID: <200604041745.k34HjISw007992@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/firstboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7978

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	20 Mar 2006 10:21:07 -0000	1.50
+++ .cvsignore	4 Apr 2006 17:45:15 -0000	1.51
@@ -22,3 +22,4 @@
 firstboot-1.4.5.tar.bz2
 firstboot-1.4.6.tar.bz2
 firstboot-1.4.7.tar.bz2
+firstboot-1.4.8.tar.bz2


Index: firstboot.spec
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/firstboot.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- firstboot.spec	20 Mar 2006 16:36:29 -0000	1.70
+++ firstboot.spec	4 Apr 2006 17:45:15 -0000	1.71
@@ -1,6 +1,6 @@
 Summary: Initial system configuration utility
 Name: firstboot
-Version: 1.4.7
+Version: 1.4.8
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -15,7 +15,7 @@
 Requires: pygtk2
 Requires: metacity
 Requires: rhpl
-Requires: rhpxl
+Requires: rhpxl >= 0.19
 Requires: system-config-display
 Requires: system-config-language
 Requires: system-config-soundcard
@@ -109,6 +109,10 @@
 
 
 %changelog
+* Tue Apr 04 2006 Chris Lumens <clumens at redhat.com> 1.4.8-1
+- Allow firstboot to run in kadischi (#186870).
+- Updated for rhpxl changes.
+
 * Mon Mar 20 2006 Martin Stransky <stransky at redhat.com> 1.4.7-1
 - replaced "Play test button" by "Play" button for s-c-s (#185931)
 - Fix soundcard string (#177425).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources	20 Mar 2006 10:21:07 -0000	1.66
+++ sources	4 Apr 2006 17:45:15 -0000	1.67
@@ -1 +1 @@
-32ec5c5965255384f7e6e55320ebb977  firstboot-1.4.7.tar.bz2
+795c22baae67a4435cc82abfab1431d4  firstboot-1.4.8.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr  4 17:45:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 13:45:58 -0400
Subject: rpms/openssl/devel libica-1.3.6-stale-handles.patch, NONE,
	1.1 openssl-0.9.8a-padlock.patch, NONE, 1.1 openssl.spec, 1.69, 1.70
Message-ID: <200604041745.k34HjwWE012306@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11618

Modified Files:
	openssl.spec 
Added Files:
	libica-1.3.6-stale-handles.patch openssl-0.9.8a-padlock.patch 
Log Message:
* Tue Apr  4 2006 Tomas Mraz <tmraz at redhat.com> - 0.9.8a-6
- fix stale open handles in libica (#177155)
- fix build if 'rand' or 'passwd' in buildroot path (#178782)
- initialize VIA Padlock engine (#186857)


libica-1.3.6-stale-handles.patch:
 icalinux.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libica-1.3.6-stale-handles.patch ---
--- libica-1.3.6-rc3/src/icalinux.c.stale-handles	2005-10-21 17:35:03.000000000 +0200
+++ libica-1.3.6-rc3/src/icalinux.c	2006-01-12 21:01:20.000000000 +0100
@@ -1024,7 +1024,7 @@
 		NEWMECH(CKM_AES_KEY_GEN, 0, 0, CKF_GENERATE)
 	}
 
-	if (icaOpenAdapter(0, &handle)) {
+	if (icaOpenAdapter(0, &handle) == 0) { // 0 == success
 		NEWMECH(CKM_RSA_PKCS, 128, 2048,
 			CKF_HW | CKF_ENCRYPT | CKF_DECRYPT | CKF_SIGN |
 			CKF_SIGN_RECOVER | CKF_VERIFY | CKF_VERIFY_RECOVER |

openssl-0.9.8a-padlock.patch:
 eng_all.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE openssl-0.9.8a-padlock.patch ---
--- openssl-0.9.8a/crypto/engine/eng_all.c.padlock	2005-11-22 16:36:22.000000000 +0100
+++ openssl-0.9.8a/crypto/engine/eng_all.c	2006-04-04 18:03:13.000000000 +0200
@@ -72,6 +72,9 @@
 #if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_IBMCA)
 	ENGINE_load_ibmca();
 #endif
+#if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_PADLOCK)
+	ENGINE_load_padlock();
+#endif
 #ifndef OPENSSL_NO_STATIC_ENGINE
 #ifndef OPENSSL_NO_HW
 #ifndef OPENSSL_NO_HW_4758_CCA
@@ -98,9 +101,6 @@
 #ifndef OPENSSL_NO_HW_UBSEC
 	ENGINE_load_ubsec();
 #endif
-#ifndef OPENSSL_NO_HW_PADLOCK
-	ENGINE_load_padlock();
-#endif
 #endif
 #if defined(__OpenBSD__) || defined(__FreeBSD__)
 	ENGINE_load_cryptodev();


Index: openssl.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- openssl.spec	11 Feb 2006 04:53:59 -0000	1.69
+++ openssl.spec	4 Apr 2006 17:45:56 -0000	1.70
@@ -23,7 +23,7 @@
 Summary: The OpenSSL toolkit.
 Name: openssl
 Version: 0.9.8a
-Release: 5.2
+Release: 6
 Source: openssl-%{version}-usa.tar.bz2
 Source1: hobble-openssl
 Source2: Makefile.certificate
@@ -48,6 +48,8 @@
 Patch20: libica-1.3.4-urandom.patch
 Patch21: libica-1.3.6-linkcrypto.patch
 Patch22: openssl-0.9.8a-ICA_engine-sep142005.patch
+Patch23: libica-1.3.6-stale-handles.patch
+Patch24: openssl-0.9.8a-padlock.patch
 # Functionality changes
 Patch32: openssl-0.9.7-beta6-ia64.patch
 Patch33: openssl-0.9.7f-ca-dir.patch
@@ -111,8 +113,10 @@
 # generator.
 %patch20 -p2 -b .urandom
 %patch21 -p1 -b .linkcrypto
+%patch23 -p1 -b .stale-handles
 popd
 %patch22 -p1 -b .ibmca
+%patch24 -p1 -b .padlock
 
 %patch32 -p1 -b .ia64
 #patch33 is applied after make test
@@ -232,7 +236,8 @@
 done
 
 # Rename man pages so that they don't conflict with other system man pages.
-for manpage in $RPM_BUILD_ROOT%{_mandir}/man*/* ; do
+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
@@ -242,8 +247,9 @@
 	fi
 done
 for conflict in passwd rand ; do
-	rename ${conflict} ssl${conflict} $RPM_BUILD_ROOT%{_mandir}/man*/${conflict}*
+	rename ${conflict} ssl${conflict} man*/${conflict}*
 done
+popd
 
 # Pick a CA script.
 pushd  $RPM_BUILD_ROOT%{_sysconfdir}/pki/tls/misc
@@ -382,6 +388,11 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Apr  4 2006 Tomas Mraz <tmraz at redhat.com> - 0.9.8a-6
+- fix stale open handles in libica (#177155)
+- fix build if 'rand' or 'passwd' in buildroot path (#178782)
+- initialize VIA Padlock engine (#186857)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.9.8a-5.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 17:50:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 13:50:33 -0400
Subject: rpms/at-spi/devel at-spi-1.7.7-miscompile.patch, NONE,
	1.1 at-spi.spec, 1.32, 1.33
Message-ID: <200604041750.k34HoXiH022009@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/at-spi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21992

Modified Files:
	at-spi.spec 
Added Files:
	at-spi-1.7.7-miscompile.patch 
Log Message:
fix a missing declaration


at-spi-1.7.7-miscompile.patch:
 util.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE at-spi-1.7.7-miscompile.patch ---
--- at-spi-1.7.7/libspi/util.c.miscompile	2006-04-04 13:47:50.000000000 -0400
+++ at-spi-1.7.7/libspi/util.c	2006-04-04 13:48:35.000000000 -0400
@@ -36,6 +36,8 @@
 
 static char *spi_atk_bridge_null_string = "";
 
+Accessibility_Role spi_accessible_role_from_atk_role (AtkRole role);
+
 Accessibility_Role
 spi_role_from_atk_role (AtkRole role)
 {


Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- at-spi.spec	4 Apr 2006 14:35:51 -0000	1.32
+++ at-spi.spec	4 Apr 2006 17:50:31 -0000	1.33
@@ -7,9 +7,10 @@
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
 Version: 1.7.7
-Release: 1
+Release: 3
 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
@@ -50,6 +51,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .miscompile
 
 %build
 %configure --disable-gtk-doc
@@ -90,6 +92,9 @@
 %{_includedir}/* 
 
 %changelog
+* Tue Apr  4 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-3
+- Fix a missing declaration
+
 * Tue Apr  4 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-1
 - Update to 1.7.7
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 17:56:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 13:56:18 -0400
Subject: rpms/atk/FC-5 atk.spec,1.30,1.31 sources,1.20,1.21
Message-ID: <200604041756.k34HuIOk023482@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	atk.spec sources 
Log Message:
11.4.1



Index: atk.spec
===================================================================
RCS file: /cvs/dist/rpms/atk/FC-5/atk.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- atk.spec	13 Mar 2006 17:41:51 -0000	1.30
+++ atk.spec	4 Apr 2006 17:56:10 -0000	1.31
@@ -2,8 +2,8 @@
 
 Summary: Interfaces for accessibility support.
 Name: atk
-Version: 1.11.3
-Release: 1
+Version: 1.11.4
+Release: 1.fc5.1
 License: LGPL
 Group: System Environment/Libraries
 Source: atk-%{version}.tar.bz2 
@@ -68,6 +68,9 @@
 %{_datadir}/gtk-doc/
 
 %changelog
+* Tue Apr  4 2006 Matthias Clasen <mclasen at redhat.com> - 1.11.4-1.fc5.1
+- Update to 1.11.4
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 1.11.3-1
 - Update to 1.11.3
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/atk/FC-5/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	13 Mar 2006 17:41:51 -0000	1.20
+++ sources	4 Apr 2006 17:56:10 -0000	1.21
@@ -1 +1 @@
-b9ab9ad4ac99cb7c00deb5bbb6cca2e4  atk-1.11.3.tar.bz2
+2f7132e46a62a2586545bca40eeeef39  atk-1.11.4.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr  4 18:24:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 14:24:41 -0400
Subject: rpms/at-spi/devel at-spi-1.7.7-miscompile.patch, 1.1,
	1.2 at-spi.spec, 1.33, 1.34
Message-ID: <200604041824.k34IOfNM006018@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/at-spi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6004

Modified Files:
	at-spi-1.7.7-miscompile.patch at-spi.spec 
Log Message:
another attempt


at-spi-1.7.7-miscompile.patch:
 atk-bridge/bridge.c       |    2 +-
 cspi/bonobo/cspi-bonobo.c |    5 ++++-
 libspi/util.c             |    2 ++
 registryd/registry-main.c |    2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

Index: at-spi-1.7.7-miscompile.patch
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi-1.7.7-miscompile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- at-spi-1.7.7-miscompile.patch	4 Apr 2006 17:50:31 -0000	1.1
+++ at-spi-1.7.7-miscompile.patch	4 Apr 2006 18:24:39 -0000	1.2
@@ -1,3 +1,46 @@
+--- at-spi-1.7.7/registryd/registry-main.c.miscompile	2006-04-04 14:10:38.000000000 -0400
++++ at-spi-1.7.7/registryd/registry-main.c	2006-04-04 14:10:55.000000000 -0400
+@@ -56,7 +56,7 @@
+       display_name = g_strdup (gdk_display_get_name (gdk_display_get_default ()));
+       cp = strrchr (display_name, '.');
+       dp = strrchr (display_name, ':');
+-      if (cp && dp && ((guint) cp > (guint) dp)) *cp = '\0';
++      if (cp && dp && (cp > dp)) *cp = '\0';
+   }
+ 
+   reg_env = bonobo_activation_registration_env_set ( reg_env, "AT_SPI_DISPLAY", 
+--- at-spi-1.7.7/atk-bridge/bridge.c.miscompile	2006-04-04 14:11:43.000000000 -0400
++++ at-spi-1.7.7/atk-bridge/bridge.c	2006-04-04 14:11:52.000000000 -0400
+@@ -311,7 +311,7 @@
+ 		canonical_display_name = g_strdup (display_env);
+ 		display_p = strrchr (canonical_display_name, ':');
+ 		screen_p = strrchr (canonical_display_name, '.');
+-		if (screen_p && display_p && ((guint) screen_p > (guint) display_p))
++		if (screen_p && display_p && (screen_p > display_p))
+ 		{
+ 		    *screen_p = '\0';
+ 		}
+--- at-spi-1.7.7/cspi/bonobo/cspi-bonobo.c.miscompile	2006-04-04 14:20:31.000000000 -0400
++++ at-spi-1.7.7/cspi/bonobo/cspi-bonobo.c	2006-04-04 14:21:18.000000000 -0400
+@@ -26,6 +26,9 @@
+ #include <libbonobo.h>
+ #include "../cspi-lowlevel.h"
+ 
++gboolean
++cspi_exception_throw (CORBA_Environment *ev, char *desc_prefix);
++
+ CORBA_Object
+ cspi_dup_ref (CORBA_Object object)
+ {
+@@ -100,7 +103,7 @@
+ 		canonical_display_name = g_strdup (display_env);
+ 		display_p = strrchr (canonical_display_name, ':');
+ 		screen_p = strrchr (canonical_display_name, '.');
+-		if (screen_p && display_p && ((guint) screen_p > (guint) display_p))
++		if (screen_p && display_p && (screen_p > display_p))
+ 		{
+ 		    *screen_p = '\0';
+ 		}
 --- at-spi-1.7.7/libspi/util.c.miscompile	2006-04-04 13:47:50.000000000 -0400
 +++ at-spi-1.7.7/libspi/util.c	2006-04-04 13:48:35.000000000 -0400
 @@ -36,6 +36,8 @@


Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- at-spi.spec	4 Apr 2006 17:50:31 -0000	1.33
+++ at-spi.spec	4 Apr 2006 18:24:39 -0000	1.34
@@ -7,7 +7,7 @@
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
 Version: 1.7.7
-Release: 3
+Release: 4
 URL: http://developer.gnome.org/projects/gap/
 Source0: %{name}-%{version}.tar.bz2
 Patch0: at-spi-1.7.7-miscompile.patch
@@ -92,7 +92,7 @@
 %{_includedir}/* 
 
 %changelog
-* Tue Apr  4 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-3
+* Tue Apr  4 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-4
 - Fix a missing declaration
 
 * Tue Apr  4 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-1



From fedora-cvs-commits at redhat.com  Tue Apr  4 18:37:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 14:37:07 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2118,1.2119
Message-ID: <200604041837.k34Ib7QS006280@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Reenable non-standard serial ports.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2118
retrieving revision 1.2119
diff -u -r1.2118 -r1.2119
--- kernel-2.6.spec	3 Apr 2006 23:54:07 -0000	1.2118
+++ kernel-2.6.spec	4 Apr 2006 18:37:04 -0000	1.2119
@@ -1594,6 +1594,9 @@
 %endif
 
 %changelog
+* Tue Apr  4 2006 Dave Jones <davej at redhat.com>
+- Reenable non-standard serial ports.
+
 * Mon Apr  3 2006 Dave Jones <davej at redhat.com>
 - Disable 'quiet' mode.
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 18:37:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 14:37:07 -0400
Subject: rpms/kernel/devel/configs config-generic,1.175,1.176
Message-ID: <200604041837.k34Ib73d006294@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
Reenable non-standard serial ports.




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- config-generic	3 Apr 2006 04:16:54 -0000	1.175
+++ config-generic	4 Apr 2006 18:37:05 -0000	1.176
@@ -1390,7 +1390,7 @@
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_UINPUT=m 
+CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WISTRON_BTNS=m
 
 #
@@ -1399,7 +1399,7 @@
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
+CONFIG_SERIAL_NONSTANDARD=y
 # CONFIG_ROCKETPORT is not set
 # CONFIG_SYNCLINK is not set
 # CONFIG_SYNCLINKMP is not set



From fedora-cvs-commits at redhat.com  Tue Apr  4 18:37:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 14:37:21 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2085,1.2086
Message-ID: <200604041837.k34IbLaL006328@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Reenable non-standard serial ports.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2085
retrieving revision 1.2086
diff -u -r1.2085 -r1.2086
--- kernel-2.6.spec	2 Apr 2006 19:44:32 -0000	1.2085
+++ kernel-2.6.spec	4 Apr 2006 18:37:08 -0000	1.2086
@@ -1687,6 +1687,9 @@
 %endif
 
 %changelog
+* Tue Apr  4 2006 Dave Jones <davej at redhat.com>
+- Reenable non-standard serial ports.
+
 * Sun Apr 2 2006 David Woodhouse <dwmw2 at redhat.com>
 - Alternative (and optional) disable for R300 DRI.
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 18:37:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 14:37:39 -0400
Subject: rpms/kernel/FC-5/configs config-generic,1.162,1.163
Message-ID: <200604041837.k34IbdWZ006340@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
Reenable non-standard serial ports.




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-generic,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- config-generic	24 Mar 2006 23:49:46 -0000	1.162
+++ config-generic	4 Apr 2006 18:37:28 -0000	1.163
@@ -1367,7 +1367,7 @@
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_UINPUT=m 
+CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WISTRON_BTNS=m
 
 #
@@ -1376,7 +1376,7 @@
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
+CONFIG_SERIAL_NONSTANDARD=y
 # CONFIG_ROCKETPORT is not set
 # CONFIG_SYNCLINK is not set
 # CONFIG_SYNCLINKMP is not set



From fedora-cvs-commits at redhat.com  Tue Apr  4 18:37:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 14:37:11 -0400
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1617,1.1618
Message-ID: <200604041837.k34IbBwi006310@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Reenable non-standard serial ports.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1617
retrieving revision 1.1618
diff -u -r1.1617 -r1.1618
--- kernel-2.6.spec	31 Mar 2006 04:02:34 -0000	1.1617
+++ kernel-2.6.spec	4 Apr 2006 18:37:06 -0000	1.1618
@@ -1062,6 +1062,9 @@
 %endif
 
 %changelog
+* Tue Apr  4 2006 Dave Jones <davej at redhat.com>
+- Reenable non-standard serial ports.
+
 * Thu Mar 30 2006 Dave Jones <davej at redhat.com>
 - ship the .kernelrelease file in -devel too.
 - Disable EDAC debug.



From fedora-cvs-commits at redhat.com  Tue Apr  4 18:37:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 14:37:11 -0400
Subject: rpms/kernel/FC-4/configs config-generic,1.55,1.56
Message-ID: <200604041837.k34IbBDs006313@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
Reenable non-standard serial ports.




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- config-generic	28 Mar 2006 16:14:10 -0000	1.55
+++ config-generic	4 Apr 2006 18:37:08 -0000	1.56
@@ -1474,7 +1474,7 @@
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_UINPUT=m 
+CONFIG_INPUT_UINPUT=m
 
 #
 # Character devices
@@ -1482,7 +1482,7 @@
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
+CONFIG_SERIAL_NONSTANDARD=y
 # CONFIG_ROCKETPORT is not set
 # CONFIG_SYNCLINK is not set
 # CONFIG_SYNCLINKMP is not set



From fedora-cvs-commits at redhat.com  Tue Apr  4 18:42:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 14:42:18 -0400
Subject: rpms/kernel/devel/configs config-x86-generic,1.46,1.47
Message-ID: <200604041842.k34IgI02006491@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-x86-generic 
Log Message:
reenable es18xx




Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- config-x86-generic	3 Apr 2006 23:54:07 -0000	1.46
+++ config-x86-generic	4 Apr 2006 18:42:16 -0000	1.47
@@ -290,3 +290,5 @@
 
 CONFIG_SCHED_MC=y
 
+CONFIG_SND_ES18XX=m
+



From fedora-cvs-commits at redhat.com  Tue Apr  4 18:42:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 14:42:18 -0400
Subject: rpms/kernel/FC-4/configs config-x86-generic,1.22,1.23
Message-ID: <200604041842.k34IgIoY006507@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-x86-generic 
Log Message:
reenable es18xx




Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86-generic,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- config-x86-generic	31 Mar 2006 04:02:37 -0000	1.22
+++ config-x86-generic	4 Apr 2006 18:42:16 -0000	1.23
@@ -290,3 +290,4 @@
 CONFIG_EDAC_I82860=m
 CONFIG_EDAC_R82600=m
 
+CONFIG_SND_ES18XX=m



From fedora-cvs-commits at redhat.com  Tue Apr  4 18:42:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 14:42:19 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2086,1.2087
Message-ID: <200604041842.k34IgJtP006520@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
reenable es18xx




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2086
retrieving revision 1.2087
diff -u -r1.2086 -r1.2087
--- kernel-2.6.spec	4 Apr 2006 18:37:08 -0000	1.2086
+++ kernel-2.6.spec	4 Apr 2006 18:42:17 -0000	1.2087
@@ -1688,7 +1688,8 @@
 
 %changelog
 * Tue Apr  4 2006 Dave Jones <davej at redhat.com>
-- Reenable non-standard serial ports.
+- Reenable non-standard serial ports. (#187466)
+- Reenable snd-es18xx for x86-32 (#187733)
 
 * Sun Apr 2 2006 David Woodhouse <dwmw2 at redhat.com>
 - Alternative (and optional) disable for R300 DRI.



From fedora-cvs-commits at redhat.com  Tue Apr  4 18:42:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 14:42:19 -0400
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1618,1.1619
Message-ID: <200604041842.k34IgJAp006527@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
reenable es18xx




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1618
retrieving revision 1.1619
diff -u -r1.1618 -r1.1619
--- kernel-2.6.spec	4 Apr 2006 18:37:06 -0000	1.1618
+++ kernel-2.6.spec	4 Apr 2006 18:42:17 -0000	1.1619
@@ -1063,7 +1063,8 @@
 
 %changelog
 * Tue Apr  4 2006 Dave Jones <davej at redhat.com>
-- Reenable non-standard serial ports.
+- Reenable non-standard serial ports. (#187466)
+- Reenable snd-es18xx for x86-32 (#187733)
 
 * Thu Mar 30 2006 Dave Jones <davej at redhat.com>
 - ship the .kernelrelease file in -devel too.



From fedora-cvs-commits at redhat.com  Tue Apr  4 18:42:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 14:42:20 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2119,1.2120
Message-ID: <200604041842.k34IgKjf006573@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
reenable es18xx




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2119
retrieving revision 1.2120
diff -u -r1.2119 -r1.2120
--- kernel-2.6.spec	4 Apr 2006 18:37:04 -0000	1.2119
+++ kernel-2.6.spec	4 Apr 2006 18:42:17 -0000	1.2120
@@ -1595,7 +1595,8 @@
 
 %changelog
 * Tue Apr  4 2006 Dave Jones <davej at redhat.com>
-- Reenable non-standard serial ports.
+- Reenable non-standard serial ports. (#187466)
+- Reenable snd-es18xx for x86-32 (#187733)
 
 * Mon Apr  3 2006 Dave Jones <davej at redhat.com>
 - Disable 'quiet' mode.



From fedora-cvs-commits at redhat.com  Tue Apr  4 18:42:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 14:42:18 -0400
Subject: rpms/kernel/FC-5/configs config-x86-generic,1.39,1.40
Message-ID: <200604041842.k34IgIBM006499@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-x86-generic 
Log Message:
reenable es18xx




Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-x86-generic,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- config-x86-generic	12 Mar 2006 00:53:17 -0000	1.39
+++ config-x86-generic	4 Apr 2006 18:42:16 -0000	1.40
@@ -283,3 +283,5 @@
 CONFIG_EDAC_I82860=m
 CONFIG_EDAC_R82600=m
 
+CONFIG_SND_ES18XX=m
+



From fedora-cvs-commits at redhat.com  Tue Apr  4 18:42:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 14:42:36 -0400
Subject: rpms/xorg-x11-drv-i810/devel more-libcunwrap.patch, NONE,
	1.1 xorg-x11-drv-i810.spec, 1.11, 1.12
Message-ID: <200604041842.k34Iga6R006600@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	xorg-x11-drv-i810.spec 
Added Files:
	more-libcunwrap.patch 
Log Message:
* Tue Apr  4 2006 Kristian H??gsberg <krh at redhat.com> 1.4.1.3-4.cvs20060322.1
- Add patch to add missing #include's, specifically assert.h.


more-libcunwrap.patch:
 i810_dri.c    |    1 +
 i810_driver.c |    2 ++
 i830_dri.c    |    1 +
 i830_driver.c |    3 +++
 4 files changed, 7 insertions(+)

--- NEW FILE more-libcunwrap.patch ---
--- xf86-video-i810-cvs20060322/src/i830_driver.c.orig	2006-04-04 10:00:12.000000000 -0400
+++ xf86-video-i810-cvs20060322/src/i830_driver.c	2006-04-04 10:00:34.000000000 -0400
@@ -187,6 +187,9 @@
 #include "dri.h"
 #endif
 
+#include <unistd.h> /* for sleep variants */
+#include <stdlib.h> /* for atoi */
+
 #define BIT(x) (1 << (x))
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 #define NB_OF(x) (sizeof (x) / sizeof (*x))
--- xf86-video-i810-cvs20060322/src/i810_driver.c.orig	2006-04-04 09:57:28.000000000 -0400
+++ xf86-video-i810-cvs20060322/src/i810_driver.c	2006-04-04 09:58:57.000000000 -0400
@@ -90,6 +90,8 @@
 #include "dri.h"
 #endif
 
+#include <unistd.h> /* needed for sleep variants */
+
 /* Required Functions: */
 
 static void I810Identify(int flags);
--- xf86-video-i810-cvs20060322/src/i830_dri.c.orig	2006-04-04 10:01:53.000000000 -0400
+++ xf86-video-i810-cvs20060322/src/i830_dri.c	2006-04-04 10:01:57.000000000 -0400
@@ -64,6 +64,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <assert.h>
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
--- xf86-video-i810-cvs20060322/src/i810_dri.c.orig	2006-04-04 10:01:28.000000000 -0400
+++ xf86-video-i810-cvs20060322/src/i810_dri.c	2006-04-04 10:01:29.000000000 -0400
@@ -19,6 +19,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
+#include <assert.h>
 
 #include "xf86.h"
 #include "xf86_OSproc.h"


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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-i810.spec	23 Mar 2006 00:23:58 -0000	1.11
+++ xorg-x11-drv-i810.spec	4 Apr 2006 18:42:34 -0000	1.12
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 i810 video driver
 Name:      xorg-x11-drv-i810
 Version:   1.4.1.3
-Release:   4.%{cvsdate}
+Release:   4.%{cvsdate}.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}.tar.bz2
 Source1:   i810.xinf
@@ -23,6 +23,8 @@
 
 Requires:  xorg-x11-server-Xorg
 
+Patch0: more-libcunwrap.patch
+
 %description 
 X.Org X11 i810 video driver.
 
@@ -37,6 +39,8 @@
 %prep
 %setup -q -n %{tarball}
 
+%patch0 -p1 -b .more-libcunwrap
+
 %build
 %configure --disable-static
 make
@@ -74,6 +78,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Tue Apr  4 2006 Kristian H??gsberg <krh at redhat.com> 1.4.1.3-4.cvs20060322.1
+- Add patch to add missing #include's, specifically assert.h.
+
 * Wed Mar 22 2006 Kristian H??gsberg <krh at redhat.com> 1.4.1.3-4.cvs20060322
 - Update to CVS snapshot of 20060322.
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 18:55:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 14:55:38 -0400
Subject: rpms/librsvg2/FC-5 .cvsignore, 1.24, 1.25 librsvg2.spec, 1.43,
	1.44 sources, 1.24, 1.25
Message-ID: <200604041855.k34Itc0B023736@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore librsvg2.spec sources 
Log Message:
2.14.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/librsvg2/FC-5/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	12 Mar 2006 19:39:44 -0000	1.24
+++ .cvsignore	4 Apr 2006 18:55:36 -0000	1.25
@@ -1 +1,2 @@
 librsvg-2.14.2.tar.bz2
+librsvg-2.14.3.tar.bz2


Index: librsvg2.spec
===================================================================
RCS file: /cvs/dist/rpms/librsvg2/FC-5/librsvg2.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- librsvg2.spec	12 Mar 2006 19:39:44 -0000	1.43
+++ librsvg2.spec	4 Apr 2006 18:55:36 -0000	1.44
@@ -12,8 +12,8 @@
 
 Name: 	 librsvg2
 Summary: An SVG library based on cairo.
-Version: 2.14.2
-Release: 1
+Version: 2.14.3
+Release: 1.fc5.1
 
 License: 	LGPL
 Group: System Environment/Libraries
@@ -120,6 +120,9 @@
 ##%doc %{_datadir}/gtk-doc/html/rsvg
 
 %changelog
+* Tue Apr  4 2006 Matthias Clasen <mclasen at redhat.com> 2.14.3-1.fc5.1
+- Update to 2.14.3
+
 * Sun Mar 12 2006 Ray Strode <rstrode at redhat.com> 2.14.2-1
 - Update to 2.14.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/librsvg2/FC-5/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	12 Mar 2006 19:39:44 -0000	1.24
+++ sources	4 Apr 2006 18:55:36 -0000	1.25
@@ -1 +1 @@
-6e149ebcbc70471b74f9ceaa9fab16c5  librsvg-2.14.2.tar.bz2
+f926aa102ccc3ce99ddf257fcce8ebf4  librsvg-2.14.3.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr  4 18:59:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 14:59:02 -0400
Subject: rpms/librsvg2/devel librsvg2.spec,1.44,1.45 sources,1.24,1.25
Message-ID: <200604041859.k34Ix26m023907@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/librsvg2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23880

Modified Files:
	librsvg2.spec sources 
Log Message:
2.14.3



Index: librsvg2.spec
===================================================================
RCS file: /cvs/dist/rpms/librsvg2/devel/librsvg2.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- librsvg2.spec	21 Mar 2006 08:33:46 -0000	1.44
+++ librsvg2.spec	4 Apr 2006 18:59:00 -0000	1.45
@@ -12,7 +12,7 @@
 
 Name: 	 librsvg2
 Summary: An SVG library based on cairo.
-Version: 2.14.2
+Version: 2.14.3
 Release: 2
 
 License: 	LGPL
@@ -120,8 +120,8 @@
 ##%doc %{_datadir}/gtk-doc/html/rsvg
 
 %changelog
-* Tue Mar 21 2006 Caolan McNamara <caolanm at redhat.com> 2.14.2-2
-- rebuild against new libgsf
+* Tue Apr  4 2006 Matthias Clasen <mclasen at redhat.com> 2.14.3-2
+- Update to 2.14.3
 
 * Sun Mar 12 2006 Ray Strode <rstrode at redhat.com> 2.14.2-1
 - Update to 2.14.2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/librsvg2/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	12 Mar 2006 19:39:44 -0000	1.24
+++ sources	4 Apr 2006 18:59:00 -0000	1.25
@@ -1 +1 @@
-6e149ebcbc70471b74f9ceaa9fab16c5  librsvg-2.14.2.tar.bz2
+f926aa102ccc3ce99ddf257fcce8ebf4  librsvg-2.14.3.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr  4 19:21:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 15:21:34 -0400
Subject: rpms/at-spi/devel at-spi-1.7.7-miscompile.patch, 1.2,
	1.3 at-spi.spec, 1.34, 1.35
Message-ID: <200604041921.k34JLYrT005830@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/at-spi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5769

Modified Files:
	at-spi-1.7.7-miscompile.patch at-spi.spec 
Log Message:
Fix segfaults


at-spi-1.7.7-miscompile.patch:
 atk-bridge/bridge.c       |    4 ++--
 cspi/bonobo/cspi-bonobo.c |    5 ++++-
 libspi/util.c             |    2 ++
 registryd/registry-main.c |    2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

Index: at-spi-1.7.7-miscompile.patch
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi-1.7.7-miscompile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- at-spi-1.7.7-miscompile.patch	4 Apr 2006 18:24:39 -0000	1.2
+++ at-spi-1.7.7-miscompile.patch	4 Apr 2006 19:21:30 -0000	1.3
@@ -10,7 +10,7 @@
  
    reg_env = bonobo_activation_registration_env_set ( reg_env, "AT_SPI_DISPLAY", 
 --- at-spi-1.7.7/atk-bridge/bridge.c.miscompile	2006-04-04 14:11:43.000000000 -0400
-+++ at-spi-1.7.7/atk-bridge/bridge.c	2006-04-04 14:11:52.000000000 -0400
++++ at-spi-1.7.7/atk-bridge/bridge.c	2006-04-04 15:20:38.000000000 -0400
 @@ -311,7 +311,7 @@
  		canonical_display_name = g_strdup (display_env);
  		display_p = strrchr (canonical_display_name, ':');
@@ -20,6 +20,15 @@
  		{
  		    *screen_p = '\0';
  		}
+@@ -694,7 +694,7 @@
+   
+   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);
+ 
 --- at-spi-1.7.7/cspi/bonobo/cspi-bonobo.c.miscompile	2006-04-04 14:20:31.000000000 -0400
 +++ at-spi-1.7.7/cspi/bonobo/cspi-bonobo.c	2006-04-04 14:21:18.000000000 -0400
 @@ -26,6 +26,9 @@


Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- at-spi.spec	4 Apr 2006 18:24:39 -0000	1.34
+++ at-spi.spec	4 Apr 2006 19:21:30 -0000	1.35
@@ -7,7 +7,7 @@
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
 Version: 1.7.7
-Release: 4
+Release: 5
 URL: http://developer.gnome.org/projects/gap/
 Source0: %{name}-%{version}.tar.bz2
 Patch0: at-spi-1.7.7-miscompile.patch
@@ -92,8 +92,9 @@
 %{_includedir}/* 
 
 %changelog
-* Tue Apr  4 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-4
+* 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



From fedora-cvs-commits at redhat.com  Tue Apr  4 19:37:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 15:37:11 -0400
Subject: rpms/at-spi/FC-5 at-spi-1.7.7-miscompile.patch, NONE,
	1.1 at-spi.spec, 1.31, 1.32
Message-ID: <200604041937.k34JbB3m006172@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/at-spi/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6157

Modified Files:
	at-spi.spec 
Added Files:
	at-spi-1.7.7-miscompile.patch 
Log Message:
1.7.7


at-spi-1.7.7-miscompile.patch:
 atk-bridge/bridge.c       |    4 ++--
 cspi/bonobo/cspi-bonobo.c |    5 ++++-
 libspi/util.c             |    2 ++
 registryd/registry-main.c |    2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

--- NEW FILE at-spi-1.7.7-miscompile.patch ---
--- at-spi-1.7.7/registryd/registry-main.c.miscompile	2006-04-04 14:10:38.000000000 -0400
+++ at-spi-1.7.7/registryd/registry-main.c	2006-04-04 14:10:55.000000000 -0400
@@ -56,7 +56,7 @@
       display_name = g_strdup (gdk_display_get_name (gdk_display_get_default ()));
       cp = strrchr (display_name, '.');
       dp = strrchr (display_name, ':');
-      if (cp && dp && ((guint) cp > (guint) dp)) *cp = '\0';
+      if (cp && dp && (cp > dp)) *cp = '\0';
   }
 
   reg_env = bonobo_activation_registration_env_set ( reg_env, "AT_SPI_DISPLAY", 
--- at-spi-1.7.7/atk-bridge/bridge.c.miscompile	2006-04-04 14:11:43.000000000 -0400
+++ at-spi-1.7.7/atk-bridge/bridge.c	2006-04-04 15:20:38.000000000 -0400
@@ -311,7 +311,7 @@
 		canonical_display_name = g_strdup (display_env);
 		display_p = strrchr (canonical_display_name, ':');
 		screen_p = strrchr (canonical_display_name, '.');
-		if (screen_p && display_p && ((guint) screen_p > (guint) display_p))
+		if (screen_p && display_p && (screen_p > display_p))
 		{
 		    *screen_p = '\0';
 		}
@@ -694,7 +694,7 @@
   
   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);
 
--- at-spi-1.7.7/cspi/bonobo/cspi-bonobo.c.miscompile	2006-04-04 14:20:31.000000000 -0400
+++ at-spi-1.7.7/cspi/bonobo/cspi-bonobo.c	2006-04-04 14:21:18.000000000 -0400
@@ -26,6 +26,9 @@
 #include <libbonobo.h>
 #include "../cspi-lowlevel.h"
 
+gboolean
+cspi_exception_throw (CORBA_Environment *ev, char *desc_prefix);
+
 CORBA_Object
 cspi_dup_ref (CORBA_Object object)
 {
@@ -100,7 +103,7 @@
 		canonical_display_name = g_strdup (display_env);
 		display_p = strrchr (canonical_display_name, ':');
 		screen_p = strrchr (canonical_display_name, '.');
-		if (screen_p && display_p && ((guint) screen_p > (guint) display_p))
+		if (screen_p && display_p && (screen_p > display_p))
 		{
 		    *screen_p = '\0';
 		}
--- at-spi-1.7.7/libspi/util.c.miscompile	2006-04-04 13:47:50.000000000 -0400
+++ at-spi-1.7.7/libspi/util.c	2006-04-04 13:48:35.000000000 -0400
@@ -36,6 +36,8 @@
 
 static char *spi_atk_bridge_null_string = "";
 
+Accessibility_Role spi_accessible_role_from_atk_role (AtkRole role);
+
 Accessibility_Role
 spi_role_from_atk_role (AtkRole role)
 {


Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/FC-5/at-spi.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- at-spi.spec	9 Mar 2006 13:59:28 -0000	1.31
+++ at-spi.spec	4 Apr 2006 19:37:04 -0000	1.32
@@ -6,12 +6,11 @@
 
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
-Version: 1.7.6
-Release: 2
+Version: 1.7.7
+Release: 1.fc5.1
 URL: http://developer.gnome.org/projects/gap/
 Source0: %{name}-%{version}.tar.bz2
-
-Patch0: at-spi-1.7.6-x86_64-crash.patch
+Patch0: at-spi-1.7.7-miscompile.patch
 
 License: LGPL
 Group: System Environment/Libraries
@@ -52,7 +51,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .crash
+%patch -p1 -b .miscompile
 
 %build
 %configure --disable-gtk-doc
@@ -93,6 +92,13 @@
 %{_includedir}/* 
 
 %changelog
+* Tue Apr  4 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-1.fc5.1
+- 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
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 19:41:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 15:41:08 -0400
Subject: rpms/at-spi/FC-5 sources,1.21,1.22
Message-ID: <200604041941.k34Jf8Ba006352@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/at-spi/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6339

Modified Files:
	sources 
Log Message:
update sources



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/at-spi/FC-5/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	28 Feb 2006 02:33:12 -0000	1.21
+++ sources	4 Apr 2006 19:41:05 -0000	1.22
@@ -1 +1 @@
-9515f730ea7e9d00690d4181b20990a0  at-spi-1.7.6.tar.bz2
+2988cd21d9f292fd404a8c532fe2723d  at-spi-1.7.7.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr  4 19:46:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 15:46:56 -0400
Subject: rpms/dasher/devel .cvsignore, 1.11, 1.12 dasher.spec, 1.36,
	1.37 sources, 1.11, 1.12
Message-ID: <200604041946.k34JkuJg019102@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/dasher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18103

Modified Files:
	.cvsignore dasher.spec sources 
Log Message:
4.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	13 Mar 2006 21:23:00 -0000	1.11
+++ .cvsignore	4 Apr 2006 19:46:54 -0000	1.12
@@ -1 +1,2 @@
 dasher-4.0.0.tar.bz2
+dasher-4.0.2.tar.bz2


Index: dasher.spec
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- dasher.spec	13 Mar 2006 21:23:00 -0000	1.36
+++ dasher.spec	4 Apr 2006 19:46:54 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: GNOME Accessibility method
 Name: dasher
-Version: 4.0.0
-Release: 1
+Version: 4.0.2
+Release: 2
 License: GPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -20,16 +20,12 @@
 Prereq:   scrollkeeper >= 0.1.4
 Requires: gnome-speech
 
-#Patch0: dasher-3.99.2-make-compile.patch
-
 %description
 Accessibility input method
  
 %prep
 %setup -q
 
-#%patch0 -p1 -b .make-compile
-
 %build
 
 %configure
@@ -93,6 +89,9 @@
 %{_sysconfdir}/gconf/schemas/dasher.schemas
 
 %changelog
+* Tue Apr  4 2006 Matthias Clasen <mclasen at redhat.com> - 4.0.2-2
+- Update to 4.0.2
+
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 4.0.0-1
 - Update to 4.0.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	13 Mar 2006 21:23:00 -0000	1.11
+++ sources	4 Apr 2006 19:46:54 -0000	1.12
@@ -1 +1 @@
-257482ce4f98b0aa5dc01ff917eea4a6  dasher-4.0.0.tar.bz2
+47cf27594abb51ea97f3a8fdb276736d  dasher-4.0.2.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr  4 19:53:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 15:53:11 -0400
Subject: rpms/dasher/FC-5 dasher.spec,1.36,1.37 sources,1.11,1.12
Message-ID: <200604041953.k34JrBuL020841@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	dasher.spec sources 
Log Message:
4.0.2



Index: dasher.spec
===================================================================
RCS file: /cvs/dist/rpms/dasher/FC-5/dasher.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- dasher.spec	13 Mar 2006 21:23:00 -0000	1.36
+++ dasher.spec	4 Apr 2006 19:53:08 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: GNOME Accessibility method
 Name: dasher
-Version: 4.0.0
-Release: 1
+Version: 4.0.2
+Release: 1.fc5.1
 License: GPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -20,16 +20,12 @@
 Prereq:   scrollkeeper >= 0.1.4
 Requires: gnome-speech
 
-#Patch0: dasher-3.99.2-make-compile.patch
-
 %description
 Accessibility input method
  
 %prep
 %setup -q
 
-#%patch0 -p1 -b .make-compile
-
 %build
 
 %configure
@@ -93,6 +89,9 @@
 %{_sysconfdir}/gconf/schemas/dasher.schemas
 
 %changelog
+* Tue Apr  4 2006 Matthias Clasen <mclasen at redhat.com> - 4.0.2-1.fc5.1
+- Update to 4.0.2
+
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 4.0.0-1
 - Update to 4.0.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dasher/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	13 Mar 2006 21:23:00 -0000	1.11
+++ sources	4 Apr 2006 19:53:08 -0000	1.12
@@ -1 +1 @@
-257482ce4f98b0aa5dc01ff917eea4a6  dasher-4.0.0.tar.bz2
+47cf27594abb51ea97f3a8fdb276736d  dasher-4.0.2.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr  4 20:03:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 16:03:43 -0400
Subject: rpms/slang/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 slang-2.0.5.tar.bz2, 1.1, NONE
Message-ID: <200604042003.k34K3hHq021312@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/slang/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21231/devel

Modified Files:
	.cvsignore sources 
Removed Files:
	slang-2.0.5.tar.bz2 
Log Message:
fix broken tarballs in cvs



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/slang/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Sep 2004 12:29:54 -0000	1.6
+++ .cvsignore	4 Apr 2006 20:02:58 -0000	1.7
@@ -1 +1 @@
-slang-1.4.9.tar.bz2
+slang-2.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/slang/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Sep 2004 12:29:54 -0000	1.6
+++ sources	4 Apr 2006 20:03:13 -0000	1.7
@@ -1 +1 @@
-4fbb1a7f1257e065ca830deefe13d350  slang-1.4.9.tar.bz2
+def1ab03fc5cd7f8911cd72dfd45fce1  slang-2.0.5.tar.bz2


--- slang-2.0.5.tar.bz2 DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr  4 20:03:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 16:03:13 -0400
Subject: rpms/slang/FC-5 .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 slang-2.0.5.tar.bz2, 1.1, NONE
Message-ID: <200604042003.k34K3DnD021252@cvs.devel.redhat.com>

Author: notting

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

Modified Files:
	.cvsignore sources 
Removed Files:
	slang-2.0.5.tar.bz2 
Log Message:
fix broken tarballs in cvs



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/slang/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Sep 2004 12:29:54 -0000	1.6
+++ .cvsignore	4 Apr 2006 20:02:50 -0000	1.7
@@ -1 +1 @@
-slang-1.4.9.tar.bz2
+slang-2.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/slang/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Sep 2004 12:29:54 -0000	1.6
+++ sources	4 Apr 2006 20:02:57 -0000	1.7
@@ -1 +1 @@
-4fbb1a7f1257e065ca830deefe13d350  slang-1.4.9.tar.bz2
+def1ab03fc5cd7f8911cd72dfd45fce1  slang-2.0.5.tar.bz2


--- slang-2.0.5.tar.bz2 DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr  4 20:37:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 16:37:05 -0400
Subject: rpms/kernel/devel/configs config-x86-generic, 1.47,
	1.48 config-x86_64-generic, 1.37, 1.38
Message-ID: <200604042037.k34Kb5Ni004233@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-x86-generic config-x86_64-generic 
Log Message:
Map x86 kernel to 4MB




Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- config-x86-generic	4 Apr 2006 18:42:16 -0000	1.47
+++ config-x86-generic	4 Apr 2006 20:37:01 -0000	1.48
@@ -190,8 +190,8 @@
 
 #
 # various x86 specific drivers
-# 
-CONFIG_NVRAM=m
+#
+CONFIG_NVRAM=y
 CONFIG_IBM_ASM=m
 CONFIG_CRYPTO_AES_586=m
 CONFIG_CRYPTO_DEV_PADLOCK=m
@@ -271,7 +271,7 @@
 CONFIG_I2C_VOODOO3=m
 
 # CONFIG_X86_REBOOTFIXUPS is not set
-CONFIG_PHYSICAL_START=0x100000
+CONFIG_PHYSICAL_START=0x400000
 
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- config-x86_64-generic	28 Mar 2006 15:48:17 -0000	1.37
+++ config-x86_64-generic	4 Apr 2006 20:37:01 -0000	1.38
@@ -142,7 +142,7 @@
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 
-CONFIG_NVRAM=m
+CONFIG_NVRAM=y
 
 CONFIG_EDAC=y
 # CONFIG_EDAC_DEBUG is not set



From fedora-cvs-commits at redhat.com  Tue Apr  4 20:37:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 16:37:02 -0400
Subject: rpms/kernel/devel linux-2.6-defaults-phys-start.patch, NONE,
	1.1 kernel-2.6.spec, 1.2120, 1.2121
Message-ID: <200604042037.k34Kb20F004210@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-defaults-phys-start.patch 
Log Message:
Map x86 kernel to 4MB



linux-2.6-defaults-phys-start.patch:
 Kconfig |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-defaults-phys-start.patch ---

http://www.lkml.org/lkml/2006/2/23/189

--- linux-2.6.16.noarch/arch/i386/Kconfig~	2006-04-04 15:30:43.000000000 -0500
+++ linux-2.6.16.noarch/arch/i386/Kconfig	2006-04-04 15:30:55.000000000 -0500
@@ -729,7 +729,7 @@ config CRASH_DUMP
 	  Generate crash dump after being started by kexec.
 
 config PHYSICAL_START
-	hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
+	hex "Physical address where the kernel is loaded"
 
 	default "0x1000000" if CRASH_DUMP
 	default "0x100000"


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2120
retrieving revision 1.2121
diff -u -r1.2120 -r1.2121
--- kernel-2.6.spec	4 Apr 2006 18:42:17 -0000	1.2120
+++ kernel-2.6.spec	4 Apr 2006 20:36:46 -0000	1.2121
@@ -370,6 +370,7 @@
 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
 
 # SATA Bits
 Patch2200: linux-2.6-sata-promise-pata-ports.patch
@@ -963,6 +964,8 @@
 %patch2101 -p1
 # Increase timeout on firmware loader.
 %patch2102 -p1
+# Change PHYSICAL_START
+%patch2103 -p1
 
 # Enable PATA ports on Promise SATA.
 #%patch2200 -p1
@@ -1597,6 +1600,7 @@
 * Tue Apr  4 2006 Dave Jones <davej at redhat.com>
 - Reenable non-standard serial ports. (#187466)
 - Reenable snd-es18xx for x86-32 (#187733)
+- Map x86 kernel to 4MB physical address.
 
 * Mon Apr  3 2006 Dave Jones <davej at redhat.com>
 - Disable 'quiet' mode.



From fedora-cvs-commits at redhat.com  Tue Apr  4 20:37:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 16:37:45 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.242, 1.243 anaconda.spec, 1.363,
	1.364 sources, 1.362, 1.363
Message-ID: <200604042037.k34KbjMc004316@cvs.devel.redhat.com>

Author: clumens

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- .cvsignore	28 Mar 2006 21:44:40 -0000	1.242
+++ .cvsignore	4 Apr 2006 20:37:21 -0000	1.243
@@ -1 +1 @@
-anaconda-11.1.0.2.tar.bz2
+anaconda-11.1.0.3.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -r1.363 -r1.364
--- anaconda.spec	28 Mar 2006 21:44:41 -0000	1.363
+++ anaconda.spec	4 Apr 2006 20:37:21 -0000	1.364
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.2
+Version: 11.1.0.3
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -79,6 +79,13 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Apr 04 2006 Chris Lumens <clumens at redhat.com> 11.1.0.3-1
+- Fix up for rhpxl Modes changes.
+- Fix handling of video driver if there's no list of drivers available.
+- Add modes files and libuser to images.
+- Allow updates to contain entire directories that may be missing.
+- Clean up deprecation warnings.
+
 * Tue Mar 28 2006 Chris Lumens <clumens at redhat.com> 11.1.0.2-1
 - Remove reference to pythondeps.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -r1.362 -r1.363
--- sources	28 Mar 2006 21:44:41 -0000	1.362
+++ sources	4 Apr 2006 20:37:25 -0000	1.363
@@ -1 +1 @@
-f18b978f472896a63691f4dcb9e5cda2  anaconda-11.1.0.2.tar.bz2
+01e95f7580622996b7e80a868adfadf0  anaconda-11.1.0.3.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr  4 20:54:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 16:54:01 -0400
Subject: rpms/bind/devel bind-9.3.2-bz173961.patch,NONE,1.1
Message-ID: <200604042054.k34Ks1jn019250@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19236

Added Files:
	bind-9.3.2-bz173961.patch 
Log Message:
fix resolver.c ncache_adderesult segfault reported in addenda to bug 173961

bind-9.3.2-bz173961.patch:
 resolver.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bind-9.3.2-bz173961.patch ---
--- bind-9.3.2/lib/dns/resolver.c.bz173961	2005-10-13 21:38:48.000000000 -0400
+++ bind-9.3.2/lib/dns/resolver.c	2006-04-04 14:23:26.000000000 -0400
@@ -3794,7 +3794,7 @@
 			result = ISC_R_SUCCESS;
 		}
 	} else if (result == ISC_R_SUCCESS) {
-		if (NXDOMAIN(ardataset))
+	        if ((ardataset != NULL) && NXDOMAIN(ardataset))
 			*eresultp = DNS_R_NCACHENXDOMAIN;
 		else
 			*eresultp = DNS_R_NCACHENXRRSET;



From fedora-cvs-commits at redhat.com  Tue Apr  4 20:54:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 16:54:19 -0400
Subject: rpms/bind/devel bind-9.3.2-prctl_set_dumpable.patch,NONE,1.1
Message-ID: <200604042054.k34KsJK6019274@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19260

Added Files:
	bind-9.3.2-prctl_set_dumpable.patch 
Log Message:
allow named ability to generate core dumps after setuid (upstream bug #15753)

bind-9.3.2-prctl_set_dumpable.patch:
 os.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE bind-9.3.2-prctl_set_dumpable.patch ---
--- bind-9.3.2/bin/named/unix/os.c.prctl_set_dumpable	2005-05-19 21:37:19.000000000 -0400
+++ bind-9.3.2/bin/named/unix/os.c	2006-04-04 16:43:11.000000000 -0400
@@ -252,6 +252,10 @@
 	caps |= (1 << CAP_SYS_RESOURCE);
 
 	linux_setcaps(caps);
+
+	/* allow us to continue to be able to generate coredumps after setuid:
+	 */
+	prctl(PR_SET_DUMPABLE,1,0,0,0);
 }
 
 #ifdef HAVE_SYS_PRCTL_H



From fedora-cvs-commits at redhat.com  Tue Apr  4 20:55:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 16:55:51 -0400
Subject: rpms/bind/devel bind.spec,1.103,1.104
Message-ID: <200604042055.k34KtpSG019337@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19314

Modified Files:
	bind.spec 
Log Message:
- fix resolver.c ncache_adderesult segfault reported in addenda to bug 173961 
  (upstream bugs #15642, #15528 ?)
- allow named ability to generate core dumps after setuid (upstream bug #15753)



Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- bind.spec	3 Apr 2006 16:45:30 -0000	1.103
+++ bind.spec	4 Apr 2006 20:55:48 -0000	1.104
@@ -17,7 +17,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.3.2
-Release: 	18.FC6
+Release: 	20.FC6
 Epoch:   	30
 Url: 		http://www.isc.org/products/BIND/
 Buildroot: 	%{_tmppath}/%{name}-root
@@ -87,6 +87,8 @@
 Patch28: 	bind-9.3.2rc1-dbus-0.6.patch
 Patch29: 	bind-9.3.2-bz177854.patch
 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
 #
 Requires:	bind-libs = %{epoch}:%{version}-%{release}, glibc  >= 2.2
 Requires(post): bash, coreutils, sed, grep, chkconfig >= 1.3.26
@@ -313,6 +315,8 @@
 # this patch no longer required (kernel now fixed):
 # %patch29 -p1 -b .bz177854
 %patch30 -p1 -b .bz187286_fix_host_cname
+%patch31 -p1 -b .bz173961
+%patch32 -p1 -b .prctl_set_dumpable
 #
 # this must follow all dbus patches:
 %if %{SDB}
@@ -796,6 +800,11 @@
 :;
 
 %changelog
+* Tue Apr 04 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-20
+- fix resolver.c ncache_adderesult segfault reported in addenda to bug 173961 
+  (upstream bugs #15642, #15528 ?)
+- allow named ability to generate core dumps after setuid (upstream bug #15753)
+
 * Mon Apr 03 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-18
 - fix bug 187529: make bind-chroot-admin deal with subdirectories properly
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 21:40:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 17:40:58 -0400
Subject: rpms/xorg-x11-drv-ati/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 xorg-x11-drv-ati.spec, 1.15, 1.16
Message-ID: <200604042140.k34LewkL001042@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	.cvsignore sources xorg-x11-drv-ati.spec 
Log Message:
* Tue Apr  4 2006 Kristian H??gsberg <krh at redhat.com> 6.5.7.3-4.cvs20060404
- Update to CVS snapshot from 20060404.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	23 Mar 2006 00:13:44 -0000	1.8
+++ .cvsignore	4 Apr 2006 21:40:17 -0000	1.9
@@ -1 +1 @@
-xf86-video-ati-cvs20060322-1.tar.bz2
+xf86-video-ati-cvs20060404.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 Mar 2006 00:13:44 -0000	1.8
+++ sources	4 Apr 2006 21:40:17 -0000	1.9
@@ -1 +1 @@
-a07332c51b319b99b676c52b43bc19b1  xf86-video-ati-cvs20060322-1.tar.bz2
+9f4bfdb71b92184ab84012782ca90b4a  xf86-video-ati-cvs20060404.tar.bz2


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-drv-ati.spec	23 Mar 2006 00:13:44 -0000	1.15
+++ xorg-x11-drv-ati.spec	4 Apr 2006 21:40:17 -0000	1.16
@@ -1,8 +1,8 @@
-%define tarball xf86-video-ati-%{cvsdate}-1
+%define tarball xf86-video-ati-%{cvsdate}
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define cvsdate cvs20060322
+%define cvsdate cvs20060404
 
 %ifarch %{ix86} x86_64 ia64 ppc alpha
 %define with_dri	1
@@ -83,6 +83,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Apr  4 2006 Kristian H??gsberg <krh at redhat.com> 6.5.7.3-4.cvs20060404
+- Update to CVS snapshot from 20060404.
+
 * Wed Mar 22 2006 Kristian H??gsberg <krh at redhat.com> 6.5.7.3-4.cvs20060322
 - Update to CVS snapshot of 20060322.
 - Drop xorg-x11-drv-ati-6.5.7.3-radeon-metamodes-SEGV-fix.patch.



From fedora-cvs-commits at redhat.com  Tue Apr  4 21:53:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 17:53:35 -0400
Subject: rpms/squirrelmail/devel squirrelmail.spec,1.33,1.34
Message-ID: <200604042153.k34LrZeN015053@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/squirrelmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15040

Modified Files:
	squirrelmail.spec 
Log Message:
Fix Chinese and Korean too



Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- squirrelmail.spec	24 Mar 2006 13:16:13 -0000	1.33
+++ squirrelmail.spec	4 Apr 2006 21:53:33 -0000	1.34
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.6
-Release: 4.fc6
+Release: 5.fc6
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -70,7 +70,7 @@
     functions/strings.php
 
 # replace splash screen
-%if %{fedora_splash}
+%if %{fedora_splash} == 1
 cp %{SOURCE2} images/sm_logo.png
 %else
 cp %{SOURCE3} images/sm_logo.png
@@ -84,10 +84,19 @@
     -e "s/^\(\$languages\['\([^']*\)'\]\['CHARSET'].*= '\)\([^']*\)';/\1utf-8';/" \
     -e "s/^\(\$languages\['\([^']*\)'\]\['LOCALE'].*=\).*/\1 '\2.UTF-8';/" 
 
-# Hard-code Japanese to send iso-2022-jp
+# Hard-code Japanese to send iso-2022-jp, UTF-8 is unrealistic
 # Without this, 1.4.6 sends eucjp which is clearly wrong
 sed -i s/"$languages\['ja_JP'\]\['CHARSET'\] = 'utf-8';"/"$languages\['ja_JP'\]\['CHARSET'\] = 'iso-2022-jp';"/ functions/i18n.php
-
+# Hard-code Korean to euc-KR, UTF-8 is unrealistic
+# and not properly handled by squirrelmail
+sed -i s/"$languages\['ko_KR'\]\['CHARSET'\] = 'utf-8';"/"$languages\['ko_KR'\]\['CHARSET'\] = 'euc-KR';"/ functions/i18n.php
+
+# Hard-code Simplified Chinese charset, UTF-8 is unrealistic
+sed -i s/"$languages\['zh_CN'\]\['CHARSET'\] = 'utf-8';"/"$languages\['zh_CN'\]\['CHARSET'\] = 'gb2312';"/ functions/i18n.php
+sed -i s/"$languages\['zh_CN'\]\['LOCALE'\] = 'zh_CN.UTF-8';"/"$languages\['zh_CN'\]\['LOCALE'\] = 'zh_CN.GB2312';"/ functions/i18n.php
+# Hard-code Traditional Chinese charset, UTF-8 is unrealistic
+sed -i s/"$languages\['zh_TW'\]\['CHARSET'\] = 'utf-8';"/"$languages\['zh_TW'\]\['CHARSET'\] = 'big5';"/ functions/i18n.php
+sed -i s/"$languages\['zh_TW'\]\['LOCALE'\] = 'zh_TW.UTF-8';"/"$languages\['zh_TW'\]\['LOCALE'\] = 'zh_TW.BIG5';"/ functions/i18n.php
 
 cd locale_tempdir
 for LOCALE in `ls locale/` ; do
@@ -221,6 +230,9 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Tue Apr 04 2006 Warren Togami <wtogami at redhat.com> 1.4.6-5
+- Fix Chinese and Korean too
+
 * Fri Mar 24 2006 Warren Togami <wtogami at redhat.com> 1.4.6-4
 - Fix outgoing Japanese mail to iso-2022-jp for now (#185767)
 



From fedora-cvs-commits at redhat.com  Tue Apr  4 22:07:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 18:07:59 -0400
Subject: rpms/xorg-x11-server/devel .cvsignore, 1.10, 1.11 sources, 1.8,
	1.9 xorg-x11-server.spec, 1.48,
	1.49 xorg-server-0.99.3-rgb.txt-dix-config-fix.patch, 1.1,
	NONE xorg-server-1.0.1-backtrace.patch, 1.1,
	NONE xorg-server-1.0.99-composite-visibility.patch, 1.1, NONE
Message-ID: <200604042207.k34M7xbJ015260@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	.cvsignore sources xorg-x11-server.spec 
Removed Files:
	xorg-server-0.99.3-rgb.txt-dix-config-fix.patch 
	xorg-server-1.0.1-backtrace.patch 
	xorg-server-1.0.99-composite-visibility.patch 
Log Message:
* Tue Apr  4 2006 Kristian H??gsberg <krh at redhat.com> 1.0.99.2-1
- Update to 1.0.99.2 snapshot and go back to using mesa-source package.
- Drop xorg-server-1.0.99-composite-visibility.patch.
- Drop xorg-server-1.0.1-backtrace.patch.
- Drop xorg-server-0.99.3-rgb.txt-dix-config-fix.patch.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	22 Mar 2006 01:56:39 -0000	1.10
+++ .cvsignore	4 Apr 2006 22:07:57 -0000	1.11
@@ -1,4 +1 @@
-xorg-server-1.0.99.1
-MesaLib-6.5.tar.bz2
-xorg-server-1.0.99.1.tar.bz2
-MesaLib-6.5-cvs20060321.tar.bz2
+xorg-server-1.0.99.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 Mar 2006 01:56:39 -0000	1.8
+++ sources	4 Apr 2006 22:07:57 -0000	1.9
@@ -1,2 +1 @@
-660b1c6a0910d92190a6a7f0427a576d  xorg-server-1.0.99.1.tar.bz2
-0fd3d0b3f8970dbc9ab2083a611c887a  MesaLib-6.5-cvs20060321.tar.bz2
+e19e7e7e923c6a549c0d114c3f5c498c  xorg-server-1.0.99.2.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- xorg-x11-server.spec	23 Mar 2006 22:49:05 -0000	1.48
+++ xorg-x11-server.spec	4 Apr 2006 22:07:57 -0000	1.49
@@ -1,36 +1,28 @@
 %define pkgname xorg-server
 %define cvsdate cvs20060321
-%define mesalib MesaLib-6.5-cvs20060321.tar.bz2
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.0.99.1
-Release:   2
+Version:   1.0.99.2
+Release:   1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:   http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2
-Source1:   %{mesalib}
 Source100: comment-header-modefiles.txt
 
 Patch0:    xorg-x11-server-0.99.3-init-origins-fix.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=5093
 Patch1:    xorg-server-0.99.3-fbmmx-fix-for-non-SSE-cpu.patch
-# xorg-server-0.99.3-rgb.txt-dix-config-fix.patch is from post-RC2 CVS
-Patch2:    xorg-server-0.99.3-rgb.txt-dix-config-fix.patch
 Patch3:    xserver-1.0.0-parser-add-missing-headers-to-sdk.patch
 Patch4:    xorg-x11-server-1.0.1-composite-fastpath-fdo4320.patch
-Patch5:    xorg-server-1.0.1-backtrace.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=6010
 Patch6:    xserver-1.0.1-randr-sdk.patch
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=181292.  hacky patch
 Patch7:    xorg-x11-server-1.0.1-fpic-libxf86config.patch
 
-# Already in CVS as of Thu Mar 23 17:48:39 EST 2006
-Patch8:    xorg-server-1.0.99-composite-visibility.patch
-
 Patch1000:  xorg-redhat-die-ugly-pattern-die-die-die.patch
 Patch1001:  xorg-x11-server-1.0.1-Red-Hat-extramodes.patch
 
@@ -99,9 +91,8 @@
 BuildRequires: xorg-x11-font-utils >= 1.0.0-1
 # Needed at least for DRI enabled builds
 %if %{with_dri}
-BuildRequires: mesa-libGL-devel >= 6.4.1-1
-# "mesa-libGL-source >= 6.4.2-2" required for the solution for bug #176976
-# BuildRequires: mesa-source >= 6.4.2-2
+BuildRequires: mesa-libGL-devel >= 6.5-1
+BuildRequires: mesa-source >= 6.5-1
 BuildRequires: libdrm-devel >= 2.0-1
 %endif
 %description
@@ -239,19 +230,14 @@
 %setup -q -n %{pkgname}-%{version}
 %patch0 -p0 -b .init-origins-fix
 #%patch1 -p0 -b .fbmmx-fix-for-non-SSE-cpu
-#%patch2 -p0 -b .rgb.txt-dix-config-fix
 %patch3 -p0 -b .parser-add-missing-headers-to-sdk
 %patch4 -p0 -b .composite-fastpath-fdo4320
-%patch5 -p0 -b .backtrace
 %patch6 -p1 -b .randrsdk
 %patch7 -p1 -b .xf86configfpic
-%patch8 -p1 -b .composite-visibility
 
 %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
 %patch1001 -p1 -b .Red-Hat-extramodes
 
-tar xfj %{_sourcedir}/%{mesalib}
-
 %build
 #FONTDIR="${datadir}/X11/fonts"
 #DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/CID/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled"
@@ -269,7 +255,7 @@
 	--enable-lbx \
 %if %{with_dri}
 	--enable-dri \
-	--with-mesa-source=%{_builddir}/%{pkgname}-%{version}/Mesa-6.5 \
+	--with-mesa-source=%{_datadir}/mesa/source \
 	--with-dri-driver-path=%{drimoduledir} \
 %endif
 	--with-module-dir=%{moduledir} \
@@ -525,6 +511,12 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Tue Apr  4 2006 Kristian H??gsberg <krh at redhat.com> 1.0.99.2-1
+- Update to 1.0.99.2 snapshot and go back to using mesa-source package.
+- Drop xorg-server-1.0.99-composite-visibility.patch.
+- Drop xorg-server-1.0.1-backtrace.patch.
+- Drop xorg-server-0.99.3-rgb.txt-dix-config-fix.patch.
+
 * Thu Mar 23 2006 Kristian H??gsberg <krh at redhat.com>
 - Pass --with-dri-driver-path so we're sure to point it to the right path.
 


--- xorg-server-0.99.3-rgb.txt-dix-config-fix.patch DELETED ---


--- xorg-server-1.0.1-backtrace.patch DELETED ---


--- xorg-server-1.0.99-composite-visibility.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr  4 22:18:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Apr 2006 18:18:00 -0400
Subject: rpms/xorg-x11-server/devel xorg-server-1.0.99.2-spiffiffity.patch,
	NONE, 1.1 xorg-x11-server.spec, 1.49, 1.50
Message-ID: <200604042218.k34MI0d3029126@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-server-1.0.99.2-spiffiffity.patch 
Log Message:
* Tue Apr  4 2006 Kristian H??gsberg <krh at redhat.com> 1.0.99.2-1
- Update to 1.0.99.2 snapshot and go back to using mesa-source package.
- Drop xorg-server-1.0.99-composite-visibility.patch.
- Drop xorg-server-1.0.1-backtrace.patch.
- Drop xorg-server-0.99.3-rgb.txt-dix-config-fix.patch.
- Add xorg-server-1.0.99.2-spiffiffity.patch.


xorg-server-1.0.99.2-spiffiffity.patch:
 compalloc.c  |    2 ++
 compwindow.c |    4 ++++
 2 files changed, 6 insertions(+)

--- NEW FILE xorg-server-1.0.99.2-spiffiffity.patch ---
This patch add two optimizations to speed up the metacity compositing
manager (spiffiffity):

 - Don't generate damage on moves
 - Don't initialize bg=none windows by copying from the framebuffer.

krh at redhat.com, Tue Apr  4 18:10:40 EDT 2006

Index: composite/compalloc.c
===================================================================
RCS file: /cvs/xorg/xserver/xorg/composite/compalloc.c,v
retrieving revision 1.9
diff -u -p -u -r1.9 compalloc.c
--- composite/compalloc.c	13 Mar 2006 21:59:55 -0000	1.9
+++ composite/compalloc.c	30 Mar 2006 16:54:00 -0000
@@ -478,6 +478,7 @@ compNewPixmap (WindowPtr pWin, int x, in
      * 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 @@ compNewPixmap (WindowPtr pWin, int x, in
 			       w, h, 0, 0);
 	FreeScratchGC (pGC);
     }
+#endif
     return pPixmap;
 }
 
Index: composite/compwindow.c
===================================================================
RCS file: /cvs/xorg/xserver/xorg/composite/compwindow.c,v
retrieving revision 1.13
diff -u -p -u -r1.13 compwindow.c
--- composite/compwindow.c	29 Mar 2006 17:51:53 -0000	1.13
+++ composite/compwindow.c	30 Mar 2006 16:54:00 -0000
@@ -576,7 +576,9 @@ compCopyWindow (WindowPtr pWin, DDXPoint
 	REGION_TRANSLATE (prgnSrc, prgnSrc,
 			  pWin->drawable.x - ptOldOrg.x,
 			  pWin->drawable.y - ptOldOrg.y);
+#if 0
 	DamageDamageRegion (&pWin->drawable, prgnSrc);
+#endif
     }
     cs->CopyWindow = pScreen->CopyWindow;
     pScreen->CopyWindow = compCopyWindow;
@@ -655,7 +657,9 @@ compSetRedirectBorderClip (WindowPtr pWi
     /*
      * Report that as damaged so it will be redrawn
      */
+#if 0
     DamageDamageRegion (&pWin->drawable, &damage);
+#endif
     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.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- xorg-x11-server.spec	4 Apr 2006 22:07:57 -0000	1.49
+++ xorg-x11-server.spec	4 Apr 2006 22:17:58 -0000	1.50
@@ -23,6 +23,9 @@
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=181292.  hacky patch
 Patch7:    xorg-x11-server-1.0.1-fpic-libxf86config.patch
 
+# Spiffiffity feature/optimization patches.
+Patch100:  xorg-server-1.0.99.2-spiffiffity.patch
+
 Patch1000:  xorg-redhat-die-ugly-pattern-die-die-die.patch
 Patch1001:  xorg-x11-server-1.0.1-Red-Hat-extramodes.patch
 
@@ -235,6 +238,8 @@
 %patch6 -p1 -b .randrsdk
 %patch7 -p1 -b .xf86configfpic
 
+%patch100 -p0 -b .spiffiffity
+
 %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
 %patch1001 -p1 -b .Red-Hat-extramodes
 
@@ -516,6 +521,7 @@
 - Drop xorg-server-1.0.99-composite-visibility.patch.
 - Drop xorg-server-1.0.1-backtrace.patch.
 - Drop xorg-server-0.99.3-rgb.txt-dix-config-fix.patch.
+- Add xorg-server-1.0.99.2-spiffiffity.patch.
 
 * Thu Mar 23 2006 Kristian H??gsberg <krh at redhat.com>
 - Pass --with-dri-driver-path so we're sure to point it to the right path.



From fedora-cvs-commits at redhat.com  Wed Apr  5 04:29:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 00:29:56 -0400
Subject: rpms/elfutils/devel .cvsignore,1.26,1.27 sources,1.27,1.28
Message-ID: <200604050429.k354TuEW002111@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/elfutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2099

Modified Files:
	.cvsignore sources 
Log Message:
New upstream tarball for 0.120


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	13 Jan 2006 23:35:10 -0000	1.26
+++ .cvsignore	5 Apr 2006 04:29:52 -0000	1.27
@@ -1 +1 @@
-elfutils-0.119.tar.gz
+elfutils-0.120.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	13 Jan 2006 23:35:10 -0000	1.27
+++ sources	5 Apr 2006 04:29:52 -0000	1.28
@@ -1 +1 @@
-57b9e4ab3b9fb597a72badf26f7f9bdc  elfutils-0.119.tar.gz
+3f757d85af891904892b4a6dc3f9e14c  elfutils-0.120.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr  5 04:39:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 00:39:42 -0400
Subject: rpms/elfutils/devel elfutils-portability.patch,1.20,1.21
Message-ID: <200604050439.k354dgRJ002299@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/elfutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2285

Modified Files:
	elfutils-portability.patch 
Log Message:
Rediffed for 0.120

elfutils-portability.patch:
 ChangeLog            |   15 ++++++++
 Makefile.in          |    2 +
 backends/ChangeLog   |    8 ++++
 backends/Makefile.am |    6 ++-
 backends/Makefile.in |    8 ++--
 config/Makefile.in   |    2 +
 configure            |   90 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac         |   28 +++++++++++++++
 lib/ChangeLog        |    5 ++
 lib/Makefile.am      |    3 +
 lib/Makefile.in      |    6 ++-
 libasm/ChangeLog     |    5 ++
 libasm/Makefile.am   |    3 +
 libasm/Makefile.in   |    6 ++-
 libcpu/ChangeLog     |    5 ++
 libcpu/Makefile.am   |    3 +
 libcpu/Makefile.in   |    4 +-
 libdw/ChangeLog      |    5 ++
 libdw/Makefile.am    |    3 +
 libdw/Makefile.in    |    7 ++-
 libdwfl/ChangeLog    |    5 ++
 libdwfl/Makefile.am  |    3 +
 libdwfl/Makefile.in  |    6 ++-
 libebl/ChangeLog     |    5 ++
 libebl/Makefile.am   |    3 +
 libebl/Makefile.in   |    6 ++-
 libelf/ChangeLog     |    5 ++
 libelf/Makefile.am   |    6 ++-
 libelf/Makefile.in   |    8 ++--
 libelf/common.h      |    4 +-
 m4/Makefile.in       |    2 +
 src/ChangeLog        |    5 ++
 src/Makefile.am      |    3 +
 src/Makefile.in      |    6 ++-
 src/findtextrel.c    |    6 ++-
 src/strip.c          |   20 ++++++++++-
 tests/ChangeLog      |    5 ++
 tests/Makefile.am    |    5 +-
 tests/Makefile.in    |    6 ++-
 39 files changed, 284 insertions(+), 39 deletions(-)

Index: elfutils-portability.patch
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/elfutils-portability.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- elfutils-portability.patch	13 Jan 2006 23:43:23 -0000	1.20
+++ elfutils-portability.patch	5 Apr 2006 04:39:39 -0000	1.21
@@ -1,6 +1,6 @@
 --- elfutils/backends/ChangeLog
 +++ elfutils/backends/ChangeLog
-@@ -38,6 +38,11 @@
+@@ -47,6 +47,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.
-@@ -60,6 +65,9 @@
+@@ -69,6 +74,9 @@
  	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
  	(CLEANFILES): Add libebl_$(m).so.
  
@@ -24,8 +24,8 @@
  
 --- elfutils/backends/Makefile.am
 +++ elfutils/backends/Makefile.am
-@@ -13,12 +13,14 @@
- ## 3001 King Ranch Road, Ukiah, CA 95482.
+@@ -25,12 +25,14 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DOBJDIR=\"$(shell pwd)\"
 +WEXTRA = @WEXTRA@
@@ -40,7 +40,7 @@
  	     -std=gnu99
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \
  	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
-@@ -51,7 +53,7 @@ textrel_check = if readelf -d $@ | fgrep
+@@ -63,7 +65,7 @@ textrel_check = if readelf -d $@ | fgrep
  libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw)
  	$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
  		-Wl,--version-script,$(word 2,$^) \
@@ -136,7 +136,7 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/configure
 +++ elfutils/configure
-@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.119'
+@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.120'
  PACKAGE_BUGREPORT='http://bugzilla.redhat.com/bugzilla/'
  
  ac_unique_file="libelf/libelf.h"
@@ -286,7 +286,7 @@
  AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR")
 --- elfutils/lib/ChangeLog
 +++ elfutils/lib/ChangeLog
-@@ -12,6 +12,11 @@
+@@ -16,6 +16,11 @@
  	* Makefile.am (libeu_a_SOURCES): Add it.
  	* system.h: Declare crc32_file.
  
@@ -300,8 +300,8 @@
  	* Makefile.am: Use -ffunction-sections for xmalloc.c.
 --- elfutils/lib/Makefile.am
 +++ elfutils/lib/Makefile.am
-@@ -16,12 +16,13 @@
- ## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+@@ -25,12 +25,13 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
 +WEXTRA = @WEXTRA@
@@ -317,7 +317,7 @@
  noinst_LIBRARIES = libeu.a
 --- elfutils/lib/Makefile.in
 +++ elfutils/lib/Makefile.in
-@@ -106,6 +106,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -105,6 +105,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -325,7 +325,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -141,6 +142,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 +333,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -183,9 +185,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 \
@@ -344,7 +344,7 @@
 + at MUDFLAP_TRUE@	-Wunused $(WEXTRA) $($(*F)_CFLAGS)
  INCLUDES = -I$(srcdir)/../libelf -I..
  noinst_LIBRARIES = libeu.a
- libeu_a_SOURCES = xstrdup.c xstrndup.c xmalloc.c next_prime.c \
+ libeu_a_SOURCES = xstrndup.c xmalloc.c next_prime.c \
 --- elfutils/libasm/ChangeLog
 +++ elfutils/libasm/ChangeLog
 @@ -28,6 +28,11 @@
@@ -361,8 +361,8 @@
  	* Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
 --- elfutils/libasm/Makefile.am
 +++ elfutils/libasm/Makefile.am
-@@ -13,12 +13,13 @@
- ## 3001 King Ranch Road, Ukiah, CA 95482.
+@@ -25,12 +25,13 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
 +WEXTRA = @WEXTRA@
@@ -419,8 +419,8 @@
  	* Makefile (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
 --- elfutils/libcpu/Makefile.am
 +++ elfutils/libcpu/Makefile.am
-@@ -13,7 +13,8 @@
- ## 3001 King Ranch Road, Ukiah, CA 95482.
+@@ -25,7 +25,8 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
 -AM_CFLAGS = -Wall -Wshadow -Werror -Wextra -Wformat=2 -Wunused
@@ -458,7 +458,7 @@
  libcpu_i386_a_SOURCES = i386_dis.c
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -266,6 +266,11 @@
+@@ -276,6 +276,11 @@
  
  2005-05-31  Roland McGrath  <roland at redhat.com>
  
@@ -472,15 +472,15 @@
  
 --- elfutils/libdw/Makefile.am
 +++ elfutils/libdw/Makefile.am
-@@ -13,6 +13,7 @@
- ## 3001 King Ranch Road, Ukiah, CA 95482.
+@@ -25,6 +25,7 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DIS_LIBDW
 +WEXTRA = @WEXTRA@
  if MUDFLAP
  AM_CFLAGS = -fmudflap
  else
-@@ -21,7 +22,7 @@ endif
+@@ -33,7 +34,7 @@ endif
  if BUILD_STATIC
  AM_CFLAGS += -fpic
  endif
@@ -522,7 +522,7 @@
  						       $(COMPILE)))
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -259,6 +259,11 @@
+@@ -268,6 +268,11 @@
  
  2005-07-21  Roland McGrath  <roland at redhat.com>
  
@@ -536,8 +536,8 @@
  	* test2.c (main): Check sscanf result to quiet warning.
 --- elfutils/libdwfl/Makefile.am
 +++ elfutils/libdwfl/Makefile.am
-@@ -15,12 +15,13 @@
- ## 3001 King Ranch Road, Ukiah, CA 95482.
+@@ -27,12 +27,13 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
 +WEXTRA = @WEXTRA@
@@ -597,8 +597,8 @@
  	* libebl_x86_64.map: Add x86_64_core_note.
 --- elfutils/libebl/Makefile.am
 +++ elfutils/libebl/Makefile.am
-@@ -13,12 +13,13 @@
- ## 3001 King Ranch Road, Ukiah, CA 95482.
+@@ -25,12 +25,13 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DOBJDIR=\"$(shell pwd)\"
 +WEXTRA = @WEXTRA@
@@ -644,7 +644,7 @@
  
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -113,6 +113,11 @@
+@@ -130,6 +130,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.
  
@@ -658,7 +658,7 @@
  	* elf.h: Update again.
 --- elfutils/libelf/common.h
 +++ elfutils/libelf/common.h
-@@ -122,7 +122,7 @@ libelf_release_all (Elf *elf)
+@@ -155,7 +155,7 @@ libelf_release_all (Elf *elf)
    (Var) = (sizeof (Var) == 1						      \
  	   ? (unsigned char) (Var)					      \
  	   : (sizeof (Var) == 2						      \
@@ -667,7 +667,7 @@
  	      : (sizeof (Var) == 4					      \
  		 ? bswap_32 (Var)					      \
  		 : bswap_64 (Var))))
-@@ -131,7 +131,7 @@ libelf_release_all (Elf *elf)
+@@ -164,7 +164,7 @@ libelf_release_all (Elf *elf)
    (Dst) = (sizeof (Var) == 1						      \
  	   ? (unsigned char) (Var)					      \
  	   : (sizeof (Var) == 2						      \
@@ -678,15 +678,15 @@
  		 : bswap_64 (Var))))
 --- elfutils/libelf/Makefile.am
 +++ elfutils/libelf/Makefile.am
-@@ -16,6 +16,7 @@
- ## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+@@ -25,6 +25,7 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
 +WEXTRA = @WEXTRA@
  if MUDFLAP
  AM_CFLAGS = -fmudflap
  else
-@@ -24,7 +25,10 @@ endif
+@@ -33,7 +34,10 @@ endif
  if BUILD_STATIC
  AM_CFLAGS += -fpic
  endif
@@ -776,7 +776,7 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -236,6 +236,11 @@
+@@ -261,6 +261,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -790,7 +790,7 @@
  	* readelf.c (print_debug_line_section): Print section offset of each
 --- elfutils/src/findtextrel.c
 +++ elfutils/src/findtextrel.c
-@@ -476,7 +476,11 @@ ptrcompare (const void *p1, const void *
+@@ -488,7 +488,11 @@ ptrcompare (const void *p1, const void *
  
  
  static void
@@ -805,7 +805,7 @@
  {
 --- elfutils/src/Makefile.am
 +++ elfutils/src/Makefile.am
-@@ -14,6 +14,7 @@
+@@ -26,6 +26,7 @@
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H $(YYDEBUG) \
         -DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\"
@@ -813,7 +813,7 @@
  if MUDFLAP
  AM_CFLAGS = -fmudflap
  else
-@@ -21,7 +22,7 @@ AM_CFLAGS =
+@@ -33,7 +34,7 @@ AM_CFLAGS =
  endif
  AM_CFLAGS += -Wall -Wshadow -std=gnu99 $(native_ld_cflags) \
  	     $(if $($(*F)_no_Werror),,-Werror) \
@@ -857,7 +857,7 @@
  	   -I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \
 --- elfutils/src/strip.c
 +++ elfutils/src/strip.c
-@@ -40,6 +40,12 @@
+@@ -52,6 +52,12 @@
  #include <libebl.h>
  #include <system.h>
  
@@ -870,7 +870,7 @@
  
  /* Name and version of program.  */
  static void print_version (FILE *stream, struct argp_state *state);
-@@ -288,8 +294,18 @@ process_file (const char *fname)
+@@ -300,8 +306,18 @@ process_file (const char *fname)
  
        /* If we have to preserve the timestamp, we need it in the
  	 format utimes() understands.  */
@@ -889,7 +889,7 @@
      }
  
    /* Open the file.  */
-@@ -1679,7 +1695,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1691,7 +1707,7 @@ handle_elf (int fd, Elf *elf, const char
    /* If requested, preserve the timestamp.  */
    if (tvp != NULL)
      {
@@ -898,7 +898,7 @@
  	{
  	  error (0, errno, gettext ("\
  cannot set access and modification date of '%s'"),
-@@ -1736,7 +1752,7 @@ handle_ar (int fd, Elf *elf, const char 
+@@ -1748,7 +1764,7 @@ handle_ar (int fd, Elf *elf, const char 
  
    if (tvp != NULL)
      {
@@ -909,7 +909,7 @@
  cannot set access and modification date of '%s'"), fname);
 --- elfutils/tests/ChangeLog
 +++ elfutils/tests/ChangeLog
-@@ -349,6 +349,11 @@
+@@ -373,6 +373,11 @@
  	* Makefile.am (TESTS): Add run-elflint-test.sh.
  	(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
  
@@ -923,8 +923,8 @@
  	* get-files.c (main): Use correct format specifier.
 --- elfutils/tests/Makefile.am
 +++ elfutils/tests/Makefile.am
-@@ -13,12 +13,13 @@
- ## 3001 King Ranch Road, Ukiah, CA 95482.
+@@ -25,12 +25,13 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -DHAVE_CONFIG_H -D_GNU_SOURCE
 +WEXTRA = @WEXTRA@
@@ -941,7 +941,7 @@
  endif
 --- elfutils/tests/Makefile.in
 +++ elfutils/tests/Makefile.in
-@@ -283,6 +283,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -289,6 +289,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -949,7 +949,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -318,6 +319,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@
@@ -957,7 +957,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -359,10 +361,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 Apr  5 04:49:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 00:49:32 -0400
Subject: rpms/elfutils/devel elfutils-robustify.patch, 1.3, 1.4 elfutils.spec,
	1.62, 1.63
Message-ID: <200604050449.k354nW3p016180@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/elfutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16165

Modified Files:
	elfutils-robustify.patch elfutils.spec 
Log Message:
Updated for 0.120

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            |   62 +++++++++++++++++++++++-----
 libelf/elf_getarsym.c         |    3 +
 libelf/elf_getshstrndx.c      |   42 ++++++++++++++++--
 libelf/elf_newscn.c           |   16 +++++--
 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                 |   77 +++++++++++++++++++++++++---------
 src/readelf.c                 |   93 +++++++++++++++++++++++++++++-------------
 src/strip.c                   |   89 +++++++++++++++++++++++++---------------
 30 files changed, 384 insertions(+), 185 deletions(-)

Index: elfutils-robustify.patch
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/elfutils-robustify.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- elfutils-robustify.patch	31 Oct 2005 20:58:56 -0000	1.3
+++ elfutils-robustify.patch	5 Apr 2006 04:49:29 -0000	1.4
@@ -65,9 +65,9 @@
 	(check_symtab, is_rel_dyn, check_rela, check_rel, check_dynamic,
 	check_symtab_shndx, check_hash, check_versym): Robustify.
 
---- elfutils-0.116/libelf/elf32_getphdr.c
-+++ elfutils-0.116/libelf/elf32_getphdr.c
-@@ -82,6 +82,16 @@
+--- elfutils-0.120/libelf/elf32_getphdr.c
++++ elfutils-0.120/libelf/elf32_getphdr.c
+@@ -115,6 +115,16 @@ elfw2(LIBELFBITS,getphdr) (elf)
  
        if (elf->map_address != NULL)
  	{
@@ -84,9 +84,9 @@
  	  /* All the data is already mapped.  Use it.  */
  	  if (ehdr->e_ident[EI_DATA] == MY_ELFDATA
  	      && (ALLOW_UNALIGNED
---- elfutils-0.116/libelf/elf32_getshdr.c
-+++ elfutils-0.116/libelf/elf32_getshdr.c
-@@ -68,11 +68,12 @@
+--- elfutils-0.120/libelf/elf32_getshdr.c
++++ elfutils-0.120/libelf/elf32_getshdr.c
+@@ -101,11 +101,12 @@ elfw2(LIBELFBITS,getshdr) (scn)
  	goto out;
  
        size_t shnum;
@@ -101,8 +101,8 @@
  	 of entries from the ELF header.  */
        ElfW2(LIBELFBITS,Shdr) *shdr = elf->state.ELFW(elf,LIBELFBITS).shdr =
  	(ElfW2(LIBELFBITS,Shdr) *) malloc (size);
-@@ -94,6 +95,16 @@
- 		      && (ehdr->e_shoff
+@@ -128,6 +129,16 @@ elfw2(LIBELFBITS,getshdr) (scn)
+ 			   + ehdr->e_shoff)
  			  & (__alignof__ (ElfW2(LIBELFBITS,Shdr)) - 1)) != 0));
  
 +	  /* First see whether the information in the ELF header is
@@ -118,16 +118,9 @@
  	  /* Now copy the data and at the same time convert the byte
  	     order.  */
  	  if (ALLOW_UNALIGNED
---- elfutils-0.116/libelf/elf32_newphdr.c
-+++ elfutils-0.116/libelf/elf32_newphdr.c
-@@ -1,5 +1,5 @@
- /* Create new ELF program header table.
--   Copyright (C) 1999, 2000, 2002 Red Hat, Inc.
-+   Copyright (C) 1999, 2000, 2002, 2005 Red Hat, Inc.
-    Written by Ulrich Drepper <drepper at redhat.com>, 1998.
- 
-    This program is free software; you can redistribute it and/or modify
-@@ -91,6 +91,12 @@
+--- elfutils-0.120/libelf/elf32_newphdr.c
++++ elfutils-0.120/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)
      {
@@ -140,19 +133,19 @@
        /* Allocate a new program header with the appropriate number of
  	 elements.  */
        result = (ElfW2(LIBELFBITS,Phdr) *)
---- elfutils-0.116/libelf/elf32_updatefile.c
-+++ elfutils-0.116/libelf/elf32_updatefile.c
-@@ -166,6 +166,9 @@
+--- elfutils-0.120/libelf/elf32_updatefile.c
++++ elfutils-0.120/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)
      {
 +      if (unlikely (shnum > SIZE_MAX / sizeof (Elf_Scn *)))
-+	return 1;
++ 	return 1;
 +
-       ElfW2(LIBELFBITS,Shdr) *shdr_dest;
        Elf_ScnList *list = &elf->state.ELFW(elf,LIBELFBITS).scns;
        Elf_Scn **scns = (Elf_Scn **) alloca (shnum * sizeof (Elf_Scn *));
-@@ -470,6 +473,10 @@
+       char *const shdr_start = ((char *) elf->map_address + elf->start_offset
+@@ -545,6 +548,10 @@ __elfw2(LIBELFBITS,updatefile) (Elf *elf
    /* Write all the sections.  Well, only those which are modified.  */
    if (shnum > 0)
      {
@@ -163,9 +156,9 @@
        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.116/libelf/elf_begin.c
-+++ elfutils-0.116/libelf/elf_begin.c
-@@ -122,7 +122,8 @@
+--- elfutils-0.120/libelf/elf_begin.c
++++ elfutils-0.120/libelf/elf_begin.c
+@@ -155,7 +155,8 @@ get_shnum (void *map_address, unsigned c
  
        if (unlikely (result == 0) && ehdr.e32->e_shoff != 0)
  	{
@@ -175,7 +168,7 @@
  	    /* Cannot read the first section header.  */
  	    return (size_t) -1l;
  
-@@ -165,7 +166,8 @@
+@@ -198,7 +199,8 @@ get_shnum (void *map_address, unsigned c
  
        if (unlikely (result == 0) && ehdr.e64->e_shoff != 0)
  	{
@@ -185,7 +178,7 @@
  	    /* Cannot read the first section header.  */
  	    return (size_t) -1l;
  
-@@ -232,6 +234,15 @@
+@@ -265,6 +267,15 @@ file_read_elf (int fildes, void *map_add
      /* Could not determine the number of sections.  */
      return NULL;
  
@@ -201,7 +194,7 @@
    /* We can now allocate the memory.  */
    Elf *elf = allocate_elf (fildes, map_address, offset, maxsize, cmd, parent,
  			   ELF_K_ELF, scncnt * sizeof (Elf_Scn));
-@@ -265,13 +276,31 @@
+@@ -298,13 +309,31 @@ file_read_elf (int fildes, void *map_add
  	{
  	  /* We can use the mmapped memory.  */
  	  elf->state.elf32.ehdr = ehdr;
@@ -237,7 +230,7 @@
  
  	  for (size_t cnt = 0; cnt < scncnt; ++cnt)
  	    {
-@@ -340,13 +369,26 @@
+@@ -373,13 +402,26 @@ file_read_elf (int fildes, void *map_add
  	{
  	  /* We can use the mmapped memory.  */
  	  elf->state.elf64.ehdr = ehdr;
@@ -268,9 +261,9 @@
  
  	  for (size_t cnt = 0; cnt < scncnt; ++cnt)
  	    {
---- elfutils-0.116/libelf/elf_getarsym.c
-+++ elfutils-0.116/libelf/elf_getarsym.c
-@@ -146,6 +146,9 @@
+--- elfutils-0.120/libelf/elf_getarsym.c
++++ elfutils-0.120/libelf/elf_getarsym.c
+@@ -179,6 +179,9 @@ elf_getarsym (elf, ptr)
        size_t index_size = atol (tmpbuf);
  
        if (SARMAG + sizeof (struct ar_hdr) + index_size > elf->maximum_size
@@ -280,9 +273,9 @@
  	  || n * sizeof (uint32_t) > index_size)
  	{
  	  /* This index table cannot be right since it does not fit into
---- elfutils-0.116/libelf/elf_getshstrndx.c
-+++ elfutils-0.116/libelf/elf_getshstrndx.c
-@@ -92,10 +92,25 @@
+--- elfutils-0.120/libelf/elf_getshstrndx.c
++++ elfutils-0.120/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
  		  && (ALLOW_UNALIGNED
@@ -311,7 +304,7 @@
  	      else
  		{
  		  /* We avoid reading in all the section headers.  Just read
-@@ -130,10 +145,25 @@
+@@ -163,10 +178,25 @@ elf_getshstrndx (elf, dst)
  	      if (elf->map_address != NULL
  		  && elf->state.elf64.ehdr->e_ident[EI_DATA] == MY_ELFDATA
  		  && (ALLOW_UNALIGNED
@@ -340,16 +333,9 @@
  	      else
  		{
  		  /* We avoid reading in all the section headers.  Just read
---- elfutils-0.116/libelf/elf_newscn.c
-+++ elfutils-0.116/libelf/elf_newscn.c
-@@ -1,5 +1,5 @@
- /* Append new section.
--   Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005 Red Hat, Inc.
-    Written by Ulrich Drepper <drepper at redhat.com>, 1998.
- 
-    This program is free software; you can redistribute it and/or modify
-@@ -71,13 +71,21 @@
+--- elfutils-0.120/libelf/elf_newscn.c
++++ elfutils-0.120/libelf/elf_newscn.c
+@@ -104,13 +104,21 @@ elf_newscn (elf)
    else
      {
        /* We must allocate a new element.  */
@@ -375,16 +361,9 @@
        if (newp == NULL)
  	{
  	  __libelf_seterrno (ELF_E_NOMEM);
---- elfutils-0.116/libelf/gelf_getdyn.c
-+++ elfutils-0.116/libelf/gelf_getdyn.c
-@@ -1,5 +1,5 @@
- /* Get information from dynamic table at the given index.
--   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
-+   Copyright (C) 2000, 2001, 2002, 2005 Red Hat, Inc.
-    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
- 
-    This program is free software; you can redistribute it and/or modify
-@@ -60,7 +60,8 @@
+--- elfutils-0.120/libelf/gelf_getdyn.c
++++ elfutils-0.120/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
  	 data we are converting the format.  */
@@ -394,7 +373,7 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -81,7 +82,8 @@
+@@ -114,7 +115,8 @@ gelf_getdyn (data, ndx, dst)
  
        /* The data is already in the correct form.  Just make sure the
  	 index is OK.  */
@@ -404,16 +383,9 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.116/libelf/gelf_getlib.c
-+++ elfutils-0.116/libelf/gelf_getlib.c
-@@ -1,5 +1,5 @@
- /* Get library from table at the given index.
--   Copyright (C) 2004 Red Hat, Inc.
-+   Copyright (C) 2004, 2005 Red Hat, Inc.
-    Written by Ulrich Drepper <drepper at redhat.com>, 2004.
- 
-    This program is free software; you can redistribute it and/or modify
-@@ -53,7 +53,8 @@
+--- elfutils-0.120/libelf/gelf_getlib.c
++++ elfutils-0.120/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.  */
    GElf_Lib *result = NULL;
@@ -423,16 +395,9 @@
      __libelf_seterrno (ELF_E_INVALID_INDEX);
    else
      {
---- elfutils-0.116/libelf/gelf_getmove.c
-+++ elfutils-0.116/libelf/gelf_getmove.c
-@@ -1,5 +1,5 @@
- /* Get move structure at the given index.
--   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
-+   Copyright (C) 2000, 2001, 2002, 2005 Red Hat, Inc.
-    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
- 
-    This program is free software; you can redistribute it and/or modify
-@@ -50,7 +50,8 @@
+--- elfutils-0.120/libelf/gelf_getmove.c
++++ elfutils-0.120/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
       index is OK.  */
@@ -442,16 +407,9 @@
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
---- elfutils-0.116/libelf/gelf_getrela.c
-+++ elfutils-0.116/libelf/gelf_getrela.c
-@@ -1,5 +1,5 @@
- /* Get RELA relocation information at given index.
--   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
-+   Copyright (C) 2000, 2001, 2002, 2005 Red Hat, Inc.
-    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
- 
-    This program is free software; you can redistribute it and/or modify
-@@ -38,12 +38,6 @@
+--- elfutils-0.120/libelf/gelf_getrela.c
++++ elfutils-0.120/libelf/gelf_getrela.c
+@@ -71,12 +71,6 @@ gelf_getrela (data, ndx, dst)
    if (data_scn == NULL)
      return NULL;
  
@@ -464,7 +422,7 @@
    if (unlikely (data_scn->d.d_type != ELF_T_RELA))
      {
        __libelf_seterrno (ELF_E_INVALID_HANDLE);
-@@ -60,7 +54,8 @@
+@@ -93,7 +87,8 @@ gelf_getrela (data, ndx, dst)
    if (scn->elf->class == ELFCLASS32)
      {
        /* We have to convert the data.  */
@@ -474,7 +432,7 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  result = NULL;
-@@ -81,7 +76,8 @@
+@@ -114,7 +109,8 @@ gelf_getrela (data, ndx, dst)
      {
        /* Simply copy the data after we made sure we are actually getting
  	 correct data.  */
@@ -484,16 +442,9 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  result = NULL;
---- elfutils-0.116/libelf/gelf_getrel.c
-+++ elfutils-0.116/libelf/gelf_getrel.c
-@@ -1,5 +1,5 @@
- /* Get REL relocation information at given index.
--   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
-+   Copyright (C) 2000, 2001, 2002, 2005 Red Hat, Inc.
-    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
- 
-    This program is free software; you can redistribute it and/or modify
-@@ -38,12 +38,6 @@
+--- elfutils-0.120/libelf/gelf_getrel.c
++++ elfutils-0.120/libelf/gelf_getrel.c
+@@ -71,12 +71,6 @@ gelf_getrel (data, ndx, dst)
    if (data_scn == NULL)
      return NULL;
  
@@ -506,7 +457,7 @@
    if (unlikely (data_scn->d.d_type != ELF_T_REL))
      {
        __libelf_seterrno (ELF_E_INVALID_HANDLE);
-@@ -60,7 +54,8 @@
+@@ -93,7 +87,8 @@ gelf_getrel (data, ndx, dst)
    if (scn->elf->class == ELFCLASS32)
      {
        /* We have to convert the data.  */
@@ -516,7 +467,7 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  result = NULL;
-@@ -80,7 +75,8 @@
+@@ -113,7 +108,8 @@ gelf_getrel (data, ndx, dst)
      {
        /* Simply copy the data after we made sure we are actually getting
  	 correct data.  */
@@ -526,16 +477,9 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  result = NULL;
---- elfutils-0.116/libelf/gelf_getsym.c
-+++ elfutils-0.116/libelf/gelf_getsym.c
-@@ -1,5 +1,5 @@
- /* Get symbol information from symbol table at the given index.
--   Copyright (C) 1999, 2000, 2001, 2002 Red Hat, Inc.
-+   Copyright (C) 1999, 2000, 2001, 2002, 2005 Red Hat, Inc.
-    Written by Ulrich Drepper <drepper at redhat.com>, 1999.
- 
-    This program is free software; you can redistribute it and/or modify
-@@ -57,7 +57,8 @@
+--- elfutils-0.120/libelf/gelf_getsym.c
++++ elfutils-0.120/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
  	 data we are converting the format.  */
@@ -545,7 +489,7 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -86,7 +87,8 @@
+@@ -119,7 +120,8 @@ gelf_getsym (data, ndx, dst)
  
        /* The data is already in the correct form.  Just make sure the
  	 index is OK.  */
@@ -555,16 +499,9 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.116/libelf/gelf_getsyminfo.c
-+++ elfutils-0.116/libelf/gelf_getsyminfo.c
-@@ -1,5 +1,5 @@
- /* Get additional symbol information from symbol table at the given index.
--   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
-+   Copyright (C) 2000, 2001, 2002, 2005 Red Hat, Inc.
-    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
- 
-    This program is free software; you can redistribute it and/or modify
-@@ -51,7 +51,8 @@
+--- elfutils-0.120/libelf/gelf_getsyminfo.c
++++ elfutils-0.120/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
       index is OK.  */
@@ -574,17 +511,9 @@
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
---- elfutils-0.116/libelf/gelf_getsymshndx.c
-+++ elfutils-0.116/libelf/gelf_getsymshndx.c
-@@ -1,6 +1,6 @@
- /* Get symbol information and separate section index from symbol table
-    at the given index.
--   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
-+   Copyright (C) 2000, 2001, 2002, 2005 Red Hat, Inc.
-    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
- 
-    This program is free software; you can redistribute it and/or modify
-@@ -57,7 +57,9 @@
+--- elfutils-0.120/libelf/gelf_getsymshndx.c
++++ elfutils-0.120/libelf/gelf_getsymshndx.c
+@@ -90,7 +90,9 @@ gelf_getsymshndx (symdata, shndxdata, nd
       section index table.  */
    if (likely (shndxdata_scn != NULL))
      {
@@ -595,7 +524,7 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -77,7 +79,8 @@
+@@ -110,7 +112,8 @@ gelf_getsymshndx (symdata, shndxdata, nd
  	 table entries has to be adopted.  The user better has provided
  	 a buffer where we can store the information.  While copying the
  	 data we are converting the format.  */
@@ -605,7 +534,7 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -106,7 +109,8 @@
+@@ -139,7 +142,8 @@ gelf_getsymshndx (symdata, shndxdata, nd
  
        /* The data is already in the correct form.  Just make sure the
  	 index is OK.  */
@@ -615,16 +544,9 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.116/libelf/gelf_getversym.c
-+++ elfutils-0.116/libelf/gelf_getversym.c
-@@ -1,5 +1,5 @@
- /* Get symbol version information at the given index.
--   Copyright (C) 1999, 2000, 2001, 2002 Red Hat, Inc.
-+   Copyright (C) 1999, 2000, 2001, 2002, 2005 Red Hat, Inc.
-    Written by Ulrich Drepper <drepper at redhat.com>, 1999.
- 
-    This program is free software; you can redistribute it and/or modify
-@@ -59,7 +59,8 @@
+--- elfutils-0.120/libelf/gelf_getversym.c
++++ elfutils-0.120/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
       index is OK.  */
@@ -634,16 +556,9 @@
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        result = NULL;
---- elfutils-0.116/libelf/gelf_update_dyn.c
-+++ elfutils-0.116/libelf/gelf_update_dyn.c
-@@ -1,5 +1,5 @@
- /* Update information in dynamic table at the given index.
--   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
-+   Copyright (C) 2000, 2001, 2002, 2005 Red Hat, Inc.
-    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
- 
-    This program is free software; you can redistribute it and/or modify
-@@ -38,12 +38,6 @@
+--- elfutils-0.120/libelf/gelf_update_dyn.c
++++ elfutils-0.120/libelf/gelf_update_dyn.c
+@@ -71,12 +71,6 @@ gelf_update_dyn (data, ndx, src)
    if (data == NULL)
      return 0;
  
@@ -656,7 +571,7 @@
    if (unlikely (data_scn->d.d_type != ELF_T_DYN))
      {
        /* The type of the data better should match.  */
-@@ -69,7 +63,8 @@
+@@ -102,7 +96,8 @@ gelf_update_dyn (data, ndx, src)
  	}
  
        /* Check whether we have to resize the data buffer.  */
@@ -666,7 +581,7 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -83,7 +78,8 @@
+@@ -116,7 +111,8 @@ gelf_update_dyn (data, ndx, src)
    else
      {
        /* Check whether we have to resize the data buffer.  */
@@ -676,16 +591,9 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.116/libelf/gelf_update_lib.c
-+++ elfutils-0.116/libelf/gelf_update_lib.c
-@@ -1,5 +1,5 @@
- /* Update library in table at the given index.
--   Copyright (C) 2004 Red Hat, Inc.
-+   Copyright (C) 2004, 2005 Red Hat, Inc.
-    Written by Ulrich Drepper <drepper at redhat.com>, 2004.
- 
-    This program is free software; you can redistribute it and/or modify
-@@ -35,12 +35,6 @@
+--- elfutils-0.120/libelf/gelf_update_lib.c
++++ elfutils-0.120/libelf/gelf_update_lib.c
+@@ -68,12 +68,6 @@ gelf_update_lib (data, ndx, src)
    if (data == NULL)
      return 0;
  
@@ -698,7 +606,7 @@
    Elf_Data_Scn *data_scn = (Elf_Data_Scn *) data;
    if (unlikely (data_scn->d.d_type != ELF_T_LIB))
      {
-@@ -54,7 +48,8 @@
+@@ -87,7 +81,8 @@ gelf_update_lib (data, ndx, src)
  
    /* Check whether we have to resize the data buffer.  */
    int result = 0;
@@ -708,16 +616,9 @@
      __libelf_seterrno (ELF_E_INVALID_INDEX);
    else
      {
---- elfutils-0.116/libelf/gelf_update_move.c
-+++ elfutils-0.116/libelf/gelf_update_move.c
-@@ -1,5 +1,5 @@
- /* Update move structure at the given index.
--   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
-+   Copyright (C) 2000, 2001, 2002, 2005 Red Hat, Inc.
-    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
- 
-    This program is free software; you can redistribute it and/or modify
-@@ -42,7 +42,7 @@
+--- elfutils-0.120/libelf/gelf_update_move.c
++++ elfutils-0.120/libelf/gelf_update_move.c
+@@ -75,7 +75,7 @@ gelf_update_move (data, ndx, src)
    assert (sizeof (GElf_Move) == sizeof (Elf64_Move));
  
    /* Check whether we have to resize the data buffer.  */
@@ -726,16 +627,9 @@
        || unlikely ((ndx + 1) * sizeof (GElf_Move) > data_scn->d.d_size))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
---- elfutils-0.116/libelf/gelf_update_rela.c
-+++ elfutils-0.116/libelf/gelf_update_rela.c
-@@ -1,5 +1,5 @@
- /* Update RELA relocation information at given index.
--   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
-+   Copyright (C) 2000, 2001, 2002, 2005 Red Hat, Inc.
-    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
- 
-    This program is free software; you can redistribute it and/or modify
-@@ -35,12 +35,6 @@
+--- elfutils-0.120/libelf/gelf_update_rela.c
++++ elfutils-0.120/libelf/gelf_update_rela.c
+@@ -68,12 +68,6 @@ gelf_update_rela (Elf_Data *dst, int ndx
    if (dst == NULL)
      return 0;
  
@@ -748,7 +642,7 @@
    if (unlikely (data_scn->d.d_type != ELF_T_RELA))
      {
        /* The type of the data better should match.  */
-@@ -68,7 +62,8 @@
+@@ -101,7 +95,8 @@ gelf_update_rela (Elf_Data *dst, int ndx
  	}
  
        /* Check whether we have to resize the data buffer.  */
@@ -758,7 +652,7 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -84,7 +79,8 @@
+@@ -117,7 +112,8 @@ gelf_update_rela (Elf_Data *dst, int ndx
    else
      {
        /* Check whether we have to resize the data buffer.  */
@@ -768,16 +662,9 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.116/libelf/gelf_update_rel.c
-+++ elfutils-0.116/libelf/gelf_update_rel.c
-@@ -1,5 +1,5 @@
- /* Update REL relocation information at given index.
--   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
-+   Copyright (C) 2000, 2001, 2002, 2005 Red Hat, Inc.
-    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
- 
-    This program is free software; you can redistribute it and/or modify
-@@ -35,12 +35,6 @@
+--- elfutils-0.120/libelf/gelf_update_rel.c
++++ elfutils-0.120/libelf/gelf_update_rel.c
+@@ -68,12 +68,6 @@ gelf_update_rel (Elf_Data *dst, int ndx,
    if (dst == NULL)
      return 0;
  
@@ -790,7 +677,7 @@
    if (unlikely (data_scn->d.d_type != ELF_T_REL))
      {
        /* The type of the data better should match.  */
-@@ -66,7 +60,8 @@
+@@ -99,7 +93,8 @@ gelf_update_rel (Elf_Data *dst, int ndx,
  	}
  
        /* Check whether we have to resize the data buffer.  */
@@ -800,7 +687,7 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -81,7 +76,8 @@
+@@ -114,7 +109,8 @@ gelf_update_rel (Elf_Data *dst, int ndx,
    else
      {
        /* Check whether we have to resize the data buffer.  */
@@ -810,16 +697,9 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.116/libelf/gelf_update_sym.c
-+++ elfutils-0.116/libelf/gelf_update_sym.c
-@@ -1,5 +1,5 @@
- /* Update symbol information in symbol table at the given index.
--   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
-+   Copyright (C) 2000, 2001, 2002, 2005 Red Hat, Inc.
-    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
- 
-    This program is free software; you can redistribute it and/or modify
-@@ -39,12 +39,6 @@
+--- elfutils-0.120/libelf/gelf_update_sym.c
++++ elfutils-0.120/libelf/gelf_update_sym.c
+@@ -72,12 +72,6 @@ gelf_update_sym (data, ndx, src)
    if (data == NULL)
      return 0;
  
@@ -832,7 +712,7 @@
    if (unlikely (data_scn->d.d_type != ELF_T_SYM))
      {
        /* The type of the data better should match.  */
-@@ -69,7 +63,8 @@
+@@ -102,7 +96,8 @@ gelf_update_sym (data, ndx, src)
  	}
  
        /* Check whether we have to resize the data buffer.  */
@@ -842,7 +722,7 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -92,7 +87,8 @@
+@@ -125,7 +120,8 @@ gelf_update_sym (data, ndx, src)
    else
      {
        /* Check whether we have to resize the data buffer.  */
@@ -852,16 +732,9 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.116/libelf/gelf_update_syminfo.c
-+++ elfutils-0.116/libelf/gelf_update_syminfo.c
-@@ -1,5 +1,5 @@
- /* Update additional symbol information in symbol table at the given index.
--   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
-+   Copyright (C) 2000, 2001, 2002, 2005 Red Hat, Inc.
-    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
- 
-    This program is free software; you can redistribute it and/or modify
-@@ -39,12 +39,6 @@
+--- elfutils-0.120/libelf/gelf_update_syminfo.c
++++ elfutils-0.120/libelf/gelf_update_syminfo.c
+@@ -72,12 +72,6 @@ gelf_update_syminfo (data, ndx, src)
    if (data == NULL)
      return 0;
  
@@ -874,7 +747,7 @@
    if (unlikely (data_scn->d.d_type != ELF_T_SYMINFO))
      {
        /* The type of the data better should match.  */
-@@ -60,7 +54,8 @@
+@@ -93,7 +87,8 @@ gelf_update_syminfo (data, ndx, src)
    rwlock_wrlock (scn->elf->lock);
  
    /* Check whether we have to resize the data buffer.  */
@@ -884,17 +757,9 @@
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
---- elfutils-0.116/libelf/gelf_update_symshndx.c
-+++ elfutils-0.116/libelf/gelf_update_symshndx.c
-@@ -1,6 +1,6 @@
- /* Update symbol information and section index in symbol table at the
-    given index.
--   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
-+   Copyright (C) 2000, 2001, 2002, 2005 Red Hat, Inc.
-    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
- 
-    This program is free software; you can redistribute it and/or modify
-@@ -44,12 +44,6 @@
+--- elfutils-0.120/libelf/gelf_update_symshndx.c
++++ elfutils-0.120/libelf/gelf_update_symshndx.c
+@@ -77,12 +77,6 @@ gelf_update_symshndx (symdata, shndxdata
    if (symdata == NULL)
      return 0;
  
@@ -907,7 +772,7 @@
    if (unlikely (symdata_scn->d.d_type != ELF_T_SYM))
      {
        /* The type of the data better should match.  */
-@@ -95,7 +89,8 @@
+@@ -128,7 +122,8 @@ gelf_update_symshndx (symdata, shndxdata
  	}
  
        /* Check whether we have to resize the data buffer.  */
@@ -917,7 +782,7 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-@@ -118,7 +113,8 @@
+@@ -151,7 +146,8 @@ gelf_update_symshndx (symdata, shndxdata
    else
      {
        /* Check whether we have to resize the data buffer.  */
@@ -927,16 +792,9 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.116/libelf/gelf_update_versym.c
-+++ elfutils-0.116/libelf/gelf_update_versym.c
-@@ -1,5 +1,5 @@
- /* Update symbol version information.
--   Copyright (C) 2001, 2002 Red Hat, Inc.
-+   Copyright (C) 2001, 2002, 2005 Red Hat, Inc.
-    Written by Ulrich Drepper <drepper at redhat.com>, 2001.
- 
-    This program is free software; you can redistribute it and/or modify
-@@ -42,7 +42,7 @@
+--- elfutils-0.120/libelf/gelf_update_versym.c
++++ elfutils-0.120/libelf/gelf_update_versym.c
+@@ -75,7 +75,7 @@ gelf_update_versym (data, ndx, src)
    assert (sizeof (GElf_Versym) == sizeof (Elf64_Versym));
  
    /* Check whether we have to resize the data buffer.  */
@@ -945,9 +803,9 @@
        || unlikely ((ndx + 1) * sizeof (GElf_Versym) > data_scn->d.d_size))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
---- elfutils-0.116/libelf/libelfP.h
-+++ elfutils-0.116/libelf/libelfP.h
-@@ -536,4 +536,13 @@
+--- elfutils-0.120/libelf/libelfP.h
++++ elfutils-0.120/libelf/libelfP.h
+@@ -569,4 +569,13 @@ extern uint32_t __libelf_crc32 (uint32_t
    } while (0)
  #endif
  
@@ -961,9 +819,9 @@
 +#endif
 +
  #endif  /* libelfP.h */
---- elfutils-0.116/src/elflint.c
-+++ elfutils-0.116/src/elflint.c
-@@ -111,6 +111,9 @@
+--- elfutils-0.120/src/elflint.c
++++ elfutils-0.120/src/elflint.c
+@@ -123,6 +123,9 @@ static uint32_t shstrndx;
  /* Array to count references in section groups.  */
  static int *scnref;
  
@@ -973,7 +831,7 @@
  
  int
  main (int argc, char *argv[])
-@@ -300,10 +303,19 @@
+@@ -312,10 +315,19 @@ section_name (Ebl *ebl, int idx)
  {
    GElf_Shdr shdr_mem;
    GElf_Shdr *shdr;
@@ -994,7 +852,7 @@
  }
  
  
-@@ -325,10 +337,6 @@
+@@ -337,10 +349,6 @@ static const int valid_e_machine[] =
    (sizeof (valid_e_machine) / sizeof (valid_e_machine[0]))
  
  
@@ -1005,7 +863,7 @@
  static void
  check_elf_header (Ebl *ebl, GElf_Ehdr *ehdr, size_t size)
  {
-@@ -591,7 +599,8 @@
+@@ -603,7 +611,8 @@ section [%2d] '%s': symbol table cannot 
  	  }
        }
  
@@ -1015,7 +873,7 @@
      ERROR (gettext ("\
  section [%2zu] '%s': entry size is does not match ElfXX_Sym\n"),
  	   cnt, section_name (ebl, cnt));
-@@ -629,7 +638,7 @@
+@@ -641,7 +650,7 @@ section [%2d] '%s': XINDEX for zeroth en
  	       xndxscnidx, section_name (ebl, xndxscnidx));
      }
  
@@ -1024,7 +882,7 @@
      {
        sym = gelf_getsymshndx (data, xndxdata, cnt, &sym_mem, &xndx);
        if (sym == NULL)
-@@ -647,7 +656,8 @@
+@@ -659,7 +668,8 @@ section [%2d] '%s': symbol %zu: invalid 
        else
  	{
  	  name = elf_strptr (ebl->elf, shdr->sh_link, sym->st_name);
@@ -1034,7 +892,7 @@
  	}
  
        if (sym->st_shndx == SHN_XINDEX)
-@@ -958,7 +968,7 @@
+@@ -970,7 +980,7 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
        const GElf_Shdr *rcshdr = gelf_getshdr (scn, &rcshdr_mem);
        assert (rcshdr != NULL);
  
@@ -1043,7 +901,7 @@
  	{
  	  /* Found the dynamic section.  Look through it.  */
  	  Elf_Data *d = elf_getdata (scn, NULL);
-@@ -968,14 +978,17 @@
+@@ -980,14 +990,17 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
  	    {
  	      GElf_Dyn dyn_mem;
  	      GElf_Dyn *dyn = gelf_getdyn (d, cnt, &dyn_mem);
@@ -1063,7 +921,7 @@
  		    ERROR (gettext ("\
  section [%2d] '%s': DT_RELCOUNT value %d too high for this section\n"),
  			   idx, section_name (ebl, idx),
-@@ -1050,7 +1063,8 @@
+@@ -1062,7 +1075,8 @@ section [%2d] '%s': no relocations for m
  	}
      }
  
@@ -1073,7 +931,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"),
-@@ -1258,7 +1272,8 @@
+@@ -1280,7 +1294,8 @@ check_rela (Ebl *ebl, GElf_Ehdr *ehdr, G
    Elf_Data *symdata = elf_getdata (symscn, NULL);
    enum load_state state = state_undecided;
  
@@ -1083,7 +941,7 @@
      {
        GElf_Rela rela_mem;
        GElf_Rela *rela = gelf_getrela (data, cnt, &rela_mem);
-@@ -1307,7 +1322,8 @@
+@@ -1330,7 +1345,8 @@ check_rel (Ebl *ebl, GElf_Ehdr *ehdr, GE
    Elf_Data *symdata = elf_getdata (symscn, NULL);
    enum load_state state = state_undecided;
  
@@ -1093,7 +951,7 @@
      {
        GElf_Rel rel_mem;
        GElf_Rel *rel = gelf_getrel (data, cnt, &rel_mem);
-@@ -1408,7 +1424,8 @@
+@@ -1432,7 +1448,8 @@ section [%2d] '%s': referenced as string
  	   shdr->sh_link, section_name (ebl, shdr->sh_link),
  	   idx, section_name (ebl, idx));
  
@@ -1103,7 +961,7 @@
      ERROR (gettext ("\
  section [%2d] '%s': section entry size does not match ElfXX_Dyn\n"),
  	   idx, section_name (ebl, idx));
-@@ -1418,7 +1435,7 @@
+@@ -1442,7 +1459,7 @@ section [%2d] '%s': section entry size d
  	   idx, section_name (ebl, idx));
  
    bool non_null_warned = false;
@@ -1112,7 +970,7 @@
      {
        GElf_Dyn dyn_mem;
        GElf_Dyn *dyn = gelf_getdyn (data, cnt, &dyn_mem);
-@@ -1559,6 +1576,8 @@
+@@ -1633,6 +1650,8 @@ section [%2d] '%s': entry size does not 
  	   idx, section_name (ebl, idx));
  
    if (symshdr != NULL
@@ -1121,7 +979,7 @@
        && (shdr->sh_size / shdr->sh_entsize
  	  < symshdr->sh_size / symshdr->sh_entsize))
      ERROR (gettext ("\
-@@ -1585,6 +1604,12 @@
+@@ -1659,6 +1678,12 @@ section [%2d] '%s': extended section ind
      }
  
    Elf_Data *data = elf_getdata (elf_getscn (ebl->elf, idx), NULL);
@@ -1134,7 +992,7 @@
  
    if (*((Elf32_Word *) data->d_buf) != 0)
      ERROR (gettext ("symbol 0 should have zero extended section index\n"));
-@@ -1665,23 +1690,30 @@
+@@ -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));
  
@@ -1168,7 +1026,7 @@
  	  ERROR (gettext ("\
  section [%2d] '%s': hash chain reference %zu out of bounds\n"),
  		 idx, section_name (ebl, idx), cnt - 2 - nbucket);
-@@ -2023,8 +2055,9 @@
+@@ -2097,8 +2129,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.  */
@@ -1180,7 +1038,7 @@
      ERROR (gettext ("\
  section [%2d] '%s' has different number of entries than symbol table [%2d] '%s'\n"),
  	   idx, section_name (ebl, idx),
-@@ -2928,6 +2961,8 @@
+@@ -3002,6 +3035,8 @@ phdr[%d]: no note entries defined for th
      return;
  
    char *notemem = gelf_rawchunk (ebl->elf, phdr->p_offset, phdr->p_filesz);
@@ -1189,9 +1047,9 @@
  
    /* 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.116/src/readelf.c
-+++ elfutils-0.116/src/readelf.c
-@@ -946,6 +946,8 @@
+--- elfutils-0.120/src/readelf.c
++++ elfutils-0.120/src/readelf.c
+@@ -958,6 +958,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
    Elf32_Word *grpref = (Elf32_Word *) data->d_buf;
  
    GElf_Sym sym_mem;
@@ -1200,7 +1058,7 @@
    printf ((grpref[0] & GRP_COMDAT)
  	  ? ngettext ("\
  \nCOMDAT section group [%2zu] '%s' with signature '%s' contains %zu entry:\n",
-@@ -958,8 +960,8 @@
+@@ -970,8 +972,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
  		      data->d_size / sizeof (Elf32_Word) - 1),
  	  elf_ndxscn (scn),
  	  elf_strptr (ebl->elf, shstrndx, shdr->sh_name),
@@ -1211,7 +1069,7 @@
  	  ?: gettext ("<INVALID SYMBOL>"),
  	  data->d_size / sizeof (Elf32_Word) - 1);
  
-@@ -1110,7 +1112,8 @@
+@@ -1122,7 +1124,8 @@ static void
  handle_dynamic (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr)
  {
    int class = gelf_getclass (ebl->elf);
@@ -1221,7 +1079,7 @@
    Elf_Data *data;
    size_t cnt;
    size_t shstrndx;
-@@ -1125,6 +1128,11 @@
+@@ -1137,6 +1140,11 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, 
      error (EXIT_FAILURE, 0,
  	   gettext ("cannot get section header string table index"));
  
@@ -1233,7 +1091,7 @@
    printf (ngettext ("\
  \nDynamic segment contains %lu entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
  		    "\
-@@ -1134,9 +1142,7 @@
+@@ -1146,9 +1154,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, 
  	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
  	  shdr->sh_offset,
  	  (int) shdr->sh_link,
@@ -1244,7 +1102,7 @@
    fputs_unlocked (gettext ("  Type              Value\n"), stdout);
  
    for (cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt)
-@@ -1654,6 +1660,13 @@
+@@ -1666,6 +1672,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
      error (EXIT_FAILURE, 0,
  	   gettext ("cannot get section header string table index"));
  
@@ -1258,7 +1116,7 @@
    /* Now we can compute the number of entries in the section.  */
    unsigned int nsyms = data->d_size / (class == ELFCLASS32
  				       ? sizeof (Elf32_Sym)
-@@ -1664,15 +1677,12 @@
+@@ -1676,15 +1689,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
  		    nsyms),
  	  (unsigned int) elf_ndxscn (scn),
  	  elf_strptr (ebl->elf, shstrndx, shdr->sh_name), nsyms);
@@ -1275,7 +1133,7 @@
  
    fputs_unlocked (class == ELFCLASS32
  		  ? gettext ("\
-@@ -1908,7 +1918,13 @@
+@@ -1920,7 +1930,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, 
      error (EXIT_FAILURE, 0,
  	   gettext ("cannot get section header string table index"));
  
@@ -1290,7 +1148,7 @@
    printf (ngettext ("\
  \nVersion needs section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
  		    "\
-@@ -1919,9 +1935,7 @@
+@@ -1931,9 +1947,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, 
  	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
  	  shdr->sh_offset,
  	  (unsigned int) shdr->sh_link,
@@ -1301,7 +1159,7 @@
  
    unsigned int offset = 0;
    for (int cnt = shdr->sh_info; --cnt >= 0; )
-@@ -1974,8 +1988,14 @@
+@@ -1986,8 +2000,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
      error (EXIT_FAILURE, 0,
  	   gettext ("cannot get section header string table index"));
  
@@ -1317,7 +1175,7 @@
    printf (ngettext ("\
  \nVersion definition section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
  		    "\
-@@ -1987,9 +2007,7 @@
+@@ -1999,9 +2019,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
  	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
  	  shdr->sh_offset,
  	  (unsigned int) shdr->sh_link,
@@ -1328,7 +1186,7 @@
  
    unsigned int offset = 0;
    for (int cnt = shdr->sh_info; --cnt >= 0; )
-@@ -2251,8 +2269,14 @@
+@@ -2263,8 +2281,14 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
        filename = NULL;
      }
  
@@ -1344,7 +1202,7 @@
    printf (ngettext ("\
  \nVersion symbols section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'",
  		    "\
-@@ -2264,9 +2288,7 @@
+@@ -2276,9 +2300,7 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
  	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
  	  shdr->sh_offset,
  	  (unsigned int) shdr->sh_link,
@@ -1355,7 +1213,7 @@
  
    /* 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)
-@@ -2341,7 +2363,17 @@
+@@ -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];
  
@@ -1374,7 +1232,7 @@
  	  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",
  			    "\
-@@ -2354,10 +2386,7 @@
+@@ -2366,10 +2398,7 @@ handle_hash (Ebl *ebl)
  		  shdr->sh_addr,
  		  shdr->sh_offset,
  		  (unsigned int) shdr->sh_link,
@@ -1386,7 +1244,7 @@
  
  	  uint32_t *lengths = (uint32_t *) xcalloc (nbucket,
  						    sizeof (uint32_t));
-@@ -3460,6 +3489,16 @@
+@@ -3510,6 +3539,16 @@ print_debug_aranges_section (Ebl *ebl __
        return;
      }
  
@@ -1403,9 +1261,9 @@
    printf (ngettext ("\
  \nDWARF section '%s' at offset %#" PRIx64 " contains %zu entry:\n",
  		    "\
---- elfutils-0.116/src/strip.c
-+++ elfutils-0.116/src/strip.c
-@@ -400,6 +400,7 @@
+--- elfutils-0.120/src/strip.c
++++ elfutils-0.120/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;
    Elf_Data *shstrtab_data = NULL;
@@ -1413,7 +1271,7 @@
  
    /* Create the full name of the file.  */
    if (prefix != NULL)
-@@ -530,6 +531,11 @@
+@@ -542,6 +543,11 @@ handle_elf (int fd, Elf *elf, const char
        goto fail_close;
      }
  
@@ -1425,7 +1283,7 @@
    /* Storage for section information.  We leave room for two more
       entries since we unconditionally create a section header string
       table.  Maybe some weird tool created an ELF file without one.
-@@ -551,7 +557,7 @@
+@@ -563,7 +569,7 @@ handle_elf (int fd, Elf *elf, const char
      {
        /* This should always be true (i.e., there should not be any
  	 holes in the numbering).  */
@@ -1434,7 +1292,7 @@
  
        shdr_info[cnt].scn = scn;
  
-@@ -564,6 +570,7 @@
+@@ -576,6 +582,7 @@ handle_elf (int fd, Elf *elf, const char
  					shdr_info[cnt].shdr.sh_name);
        if (shdr_info[cnt].name == NULL)
  	{
@@ -1442,7 +1300,7 @@
  	  error (0, 0, gettext ("illformed file '%s'"), fname);
  	  goto fail_close;
  	}
-@@ -573,6 +580,8 @@
+@@ -585,6 +592,8 @@ handle_elf (int fd, Elf *elf, const char
  
        /* Remember the shdr.sh_link value.  */
        shdr_info[cnt].old_sh_link = shdr_info[cnt].shdr.sh_link;
@@ -1451,7 +1309,7 @@
  
        /* Sections in files other than relocatable object files which
  	 are not loaded can be freely moved by us.  In relocatable
-@@ -585,7 +594,7 @@
+@@ -597,7 +606,7 @@ handle_elf (int fd, Elf *elf, const char
  	 appropriate reference.  */
        if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_SYMTAB_SHNDX))
  	{
@@ -1460,7 +1318,7 @@
  	  shdr_info[shdr_info[cnt].shdr.sh_link].symtab_idx = cnt;
  	}
        else if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_GROUP))
-@@ -602,7 +611,12 @@
+@@ -614,7 +623,12 @@ handle_elf (int fd, Elf *elf, const char
  	  for (inner = 1;
  	       inner < shdr_info[cnt].data->d_size / sizeof (Elf32_Word);
  	       ++inner)
@@ -1474,7 +1332,7 @@
  
  	  if (inner == 1 || (inner == 2 && (grpref[0] & GRP_COMDAT) == 0))
  	    /* If the section group contains only one element and this
-@@ -613,7 +627,7 @@
+@@ -625,7 +639,7 @@ handle_elf (int fd, Elf *elf, const char
  	}
        else if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_GNU_versym))
  	{
@@ -1483,7 +1341,7 @@
  	  shdr_info[shdr_info[cnt].shdr.sh_link].version_idx = cnt;
  	}
  
-@@ -621,7 +635,7 @@
+@@ -633,7 +647,7 @@ handle_elf (int fd, Elf *elf, const char
  	 discarded right away.  */
        if ((shdr_info[cnt].shdr.sh_flags & SHF_GROUP) != 0)
  	{
@@ -1492,7 +1350,7 @@
  
  	  if (shdr_info[shdr_info[cnt].group_idx].idx == 0)
  	    {
-@@ -696,10 +710,14 @@
+@@ -708,10 +722,14 @@ 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.  */
@@ -1511,7 +1369,7 @@
  	    }
  
  	  if (shdr_info[cnt].idx == 1)
-@@ -725,7 +743,7 @@
+@@ -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)
  		    {
@@ -1520,7 +1378,7 @@
  
  		      shdr_info[shdr_info[cnt].symtab_idx].data
  			= elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn,
-@@ -765,6 +783,9 @@
+@@ -777,6 +795,9 @@ handle_elf (int fd, Elf *elf, const char
  		      else if (scnidx == SHN_XINDEX)
  			scnidx = xndx;
  
@@ -1530,7 +1388,7 @@
  		      if (shdr_info[scnidx].idx == 0)
  			{
  			  /* Mark this section as used.  */
-@@ -796,11 +817,15 @@
+@@ -808,11 +829,15 @@ handle_elf (int fd, Elf *elf, const char
  		}
  
  	      /* Handle references through sh_info.  */
@@ -1550,7 +1408,7 @@
  		}
  
  	      /* Mark the section as investigated.  */
-@@ -900,7 +925,7 @@
+@@ -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));
  
@@ -1559,7 +1417,7 @@
  
  	/* Add this name to the section header string table.  */
  	shdr_info[cnt].se = ebl_strtabadd (shst, shdr_info[cnt].name, 0);
-@@ -937,7 +962,7 @@
+@@ -949,7 +974,7 @@ handle_elf (int fd, Elf *elf, const char
  	error (EXIT_FAILURE, 0,
  	       gettext ("while create section header section: %s"),
  	       elf_errmsg (-1));
@@ -1568,7 +1426,7 @@
  
        shdr_info[cnt].data = elf_newdata (shdr_info[cnt].newscn);
        if (shdr_info[cnt].data == NULL)
-@@ -968,7 +993,7 @@
+@@ -980,7 +1005,7 @@ handle_elf (int fd, Elf *elf, const char
      }
  
    /* Index of the section header table in the shdr_info array.  */
@@ -1577,7 +1435,7 @@
  
    /* Add the section header string table section name.  */
    shdr_info[cnt].se = ebl_strtabadd (shst, ".shstrtab", 10);
-@@ -993,7 +1018,7 @@
+@@ -1005,7 +1030,7 @@ handle_elf (int fd, Elf *elf, const char
      error (EXIT_FAILURE, 0,
  	   gettext ("while create section header section: %s"),
  	   elf_errmsg (-1));
@@ -1586,7 +1444,7 @@
  
    /* Finalize the string table and fill in the correct indices in the
       section headers.  */
-@@ -1083,21 +1108,21 @@
+@@ -1095,21 +1120,21 @@ handle_elf (int fd, Elf *elf, const char
  		    shndxdata = elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn,
  					     NULL);
  
@@ -1613,7 +1471,7 @@
  		  }
  
  		shdr_info[cnt].newsymidx
-@@ -1151,7 +1176,7 @@
+@@ -1163,7 +1188,7 @@ handle_elf (int fd, Elf *elf, const char
  		      sec = shdr_info[sym->st_shndx].idx;
  		    else
  		      {
@@ -1622,7 +1480,7 @@
  
  			sec = shdr_info[xshndx].idx;
  		      }
-@@ -1172,7 +1197,7 @@
+@@ -1184,7 +1209,7 @@ handle_elf (int fd, Elf *elf, const char
  			    nxshndx = sec;
  			  }
  
@@ -1631,7 +1489,7 @@
  
  			if ((inner != destidx || nshndx != sym->st_shndx
  			     || (shndxdata != NULL && nxshndx != xshndx))
-@@ -1195,7 +1220,7 @@
+@@ -1207,7 +1232,7 @@ handle_elf (int fd, Elf *elf, const char
  		    else
  		      /* This is a section symbol for a section which has
  			 been removed.  */
@@ -1640,7 +1498,7 @@
  		  }
  
  		if (destidx != inner)
-@@ -1359,11 +1384,11 @@
+@@ -1371,11 +1396,11 @@ handle_elf (int fd, Elf *elf, const char
  		    {
  		      GElf_Sym sym_mem;
  		      GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem);
@@ -1654,7 +1512,7 @@
  		      size_t hidx = elf_hash (name) % nbucket;
  
  		      if (bucket[hidx] == 0)
-@@ -1382,8 +1407,8 @@
+@@ -1394,8 +1419,8 @@ handle_elf (int fd, Elf *elf, const char
  	      else
  		{
  		  /* Alpha and S390 64-bit use 64-bit SHT_HASH entries.  */
@@ -1665,7 +1523,7 @@
  
  		  Elf64_Xword *bucket = (Elf64_Xword *) hashd->d_buf;
  
-@@ -1416,11 +1441,11 @@
+@@ -1428,11 +1453,11 @@ handle_elf (int fd, Elf *elf, const char
  		    {
  		      GElf_Sym sym_mem;
  		      GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem);


Index: elfutils.spec
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/elfutils.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- elfutils.spec	11 Feb 2006 02:35:58 -0000	1.62
+++ elfutils.spec	5 Apr 2006 04:49:29 -0000	1.63
@@ -1,7 +1,6 @@
-%define version 0.119
-%define release 1.2.1
+%define version 0.120
+%define release 1
 
-%define gpl 0
 %if %{?_with_compat:1}%{!?_with_compat:0}
 %define compat 1
 %else
@@ -16,11 +15,7 @@
 %else
 Release: 0.%{release}.1
 %endif
-%if %{gpl}
 License: GPL
-%else
-License: OSL
-%endif
 Group: Development/Tools
 Source: elfutils-%{version}.tar.gz
 Patch1: elfutils-portability.patch
@@ -28,9 +23,6 @@
 Obsoletes: libelf libelf-devel
 Requires: elfutils-libelf = %{version}-%{release}
 Requires: elfutils-libs = %{version}-%{release}
-%if %{gpl}
-Requires: binutils >= 2.14.90.0.4-26.2
-%endif
 
 # ExcludeArch: xxx
 
@@ -57,7 +49,6 @@
 (to check for well-formed ELF files).
 
 
-%if !%{gpl}
 %package libs
 Summary: Libraries to handle compiled objects.
 Group: Development/Tools
@@ -73,16 +64,11 @@
 and machine-specific ELF handling.  These libraries are used by the programs
 in the elfutils package.  The elfutils-devel package enables building
 other programs using these libraries.
-%endif
 
 %package devel
 Summary: Development libraries to handle compiled objects.
 Group: Development/Tools
-%if %{gpl}
 License: GPL
-%else
-License: OSL
-%endif
 Requires: elfutils-libs = %{version}-%{release}
 Requires: elfutils-libelf-devel = %{version}-%{release}
 
@@ -96,9 +82,6 @@
 %package libelf
 Summary: Library to read and write ELF files.
 Group: Development/Tools
-%if %{gpl}
-License: GPL
-%endif
 Conflicts: elfutils < %{version}-%{release}
 Conflicts: elfutils > %{version}-%{release}
 Conflicts: elfutils-libs < %{version}-%{release}
@@ -117,9 +100,6 @@
 Group: Development/Tools
 Requires: elfutils-libelf = %{version}-%{release}
 Conflicts: libelf-devel
-%if %{gpl}
-License: GPL
-%endif
 
 %description libelf-devel
 The elfutils-libelf-devel package contains the libraries to create
@@ -156,11 +136,8 @@
 %makeinstall
 
 chmod +x ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/lib*.so*
-%if !%{gpl}
 chmod +x ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/elfutils/lib*.so*
-%endif
 
-%if !%{gpl}
 # XXX Nuke unpackaged files
 { cd ${RPM_BUILD_ROOT}
   rm -f .%{_bindir}/eu-ld
@@ -170,7 +147,6 @@
   rm -f .%{_libdir}/libasm.so*
   rm -f .%{_libdir}/libasm.a
 }
-%endif
 
 %check
 # XXX elflint not happy on ia64
@@ -190,9 +166,6 @@
 %files
 %defattr(-,root,root)
 %doc README TODO
-%if %{gpl}
-%doc fake-src/FULL
-%endif
 %{_bindir}/eu-addr2line
 %{_bindir}/eu-elfcmp
 %{_bindir}/eu-elflint
@@ -203,11 +176,8 @@
 %{_bindir}/eu-size
 %{_bindir}/eu-strings
 %{_bindir}/eu-strip
-%if !%{gpl}
 #%{_bindir}/eu-ld
-%endif
 
-%if !%{gpl}
 %files libs
 %defattr(-,root,root)
 %{_libdir}/libdw-%{version}.so
@@ -215,14 +185,12 @@
 %{_libdir}/libdw.so.*
 %dir %{_libdir}/elfutils
 %{_libdir}/elfutils/lib*.so
-%endif
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/dwarf.h
 %dir %{_includedir}/elfutils
 %{_includedir}/elfutils/elf-knowledge.h
-%if !%{gpl}
 %{_includedir}/elfutils/libebl.h
 %{_includedir}/elfutils/libdw.h
 %{_includedir}/elfutils/libdwfl.h
@@ -231,7 +199,6 @@
 %{_libdir}/libdw.a
 #%{_libdir}/libasm.so
 %{_libdir}/libdw.so
-%endif
 
 %files libelf
 %defattr(-,root,root)
@@ -247,6 +214,15 @@
 %{_libdir}/libelf.so
 
 %changelog
+* Tue Apr  4 2006 Roland McGrath <roland at redhat.com> - 0.120-1
+- Update to 0.120
+  - License changed to GPL, with some exceptions for using
+    the libelf, libebl, libdw, and libdwfl library interfaces.
+    Red Hat elfutils is an included package of the Open Invention Network.
+  - dwarf.h updated for DWARF 3.0 final specification.
+  - libelf: Fix corruption in ELF_C_RDWR uses (#187618).
+  - libdwfl: New function dwfl_version; fixes for offline.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.119-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Apr  5 04:59:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 00:59:15 -0400
Subject: rpms/elfutils/devel elfutils.spec,1.63,1.64
Message-ID: <200604050459.k354xFOr016291@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/elfutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16277

Modified Files:
	elfutils.spec 
Log Message:
Fix spec bogon.



Index: elfutils.spec
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/elfutils.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- elfutils.spec	5 Apr 2006 04:49:29 -0000	1.63
+++ elfutils.spec	5 Apr 2006 04:59:13 -0000	1.64
@@ -1,5 +1,5 @@
 %define version 0.120
-%define release 1
+%define release 2
 
 %if %{?_with_compat:1}%{!?_with_compat:0}
 %define compat 1
@@ -13,7 +13,7 @@
 %if !%{compat}
 Release: %{release}
 %else
-Release: 0.%{release}.1
+Release: 0.%{release}
 %endif
 License: GPL
 Group: Development/Tools
@@ -214,7 +214,7 @@
 %{_libdir}/libelf.so
 
 %changelog
-* Tue Apr  4 2006 Roland McGrath <roland at redhat.com> - 0.120-1
+* Tue Apr  4 2006 Roland McGrath <roland at redhat.com> - 0.120-2
 - Update to 0.120
   - License changed to GPL, with some exceptions for using
     the libelf, libebl, libdw, and libdwfl library interfaces.



From fedora-cvs-commits at redhat.com  Wed Apr  5 05:24:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 01:24:02 -0400
Subject: rpms/systemtap/FC-4 .cvsignore, 1.16,
	1.17 elfutils-portability.patch, 1.11, 1.12 sources, 1.17,
	1.18 systemtap.spec, 1.18, 1.19
Message-ID: <200604050524.k355O2f6030205@cvs.devel.redhat.com>

Author: roland

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

Modified Files:
	.cvsignore elfutils-portability.patch sources systemtap.spec 
Log Message:
Import 0.5.5 tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/systemtap/FC-4/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	2 Feb 2006 15:20:28 -0000	1.16
+++ .cvsignore	5 Apr 2006 05:23:59 -0000	1.17
@@ -1,3 +1,2 @@
-systemtap-0.5.4.tar.gz
-elfutils-0.119.tar.gz
-elfutils-portability.patch
+systemtap-0.5.5.tar.gz
+elfutils-0.120.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        |    5 ++
 src/Makefile.am      |    3 +
 src/Makefile.in      |    6 ++-
 src/findtextrel.c    |    6 ++-
 src/strip.c          |   20 ++++++++++-
 tests/ChangeLog      |    5 ++
 tests/Makefile.am    |    5 +-
 tests/Makefile.in    |    6 ++-
 39 files changed, 284 insertions(+), 39 deletions(-)

Index: elfutils-portability.patch
===================================================================
RCS file: /cvs/dist/rpms/systemtap/FC-4/elfutils-portability.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- elfutils-portability.patch	2 Feb 2006 15:20:28 -0000	1.11
+++ elfutils-portability.patch	5 Apr 2006 05:23:59 -0000	1.12
@@ -1,6 +1,6 @@
 --- elfutils/backends/ChangeLog
 +++ elfutils/backends/ChangeLog
-@@ -38,6 +38,11 @@
+@@ -47,6 +47,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.
-@@ -60,6 +65,9 @@
+@@ -69,6 +74,9 @@
  	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
  	(CLEANFILES): Add libebl_$(m).so.
  
@@ -24,8 +24,8 @@
  
 --- elfutils/backends/Makefile.am
 +++ elfutils/backends/Makefile.am
-@@ -13,12 +13,14 @@
- ## 3001 King Ranch Road, Ukiah, CA 95482.
+@@ -25,12 +25,14 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DOBJDIR=\"$(shell pwd)\"
 +WEXTRA = @WEXTRA@
@@ -40,7 +40,7 @@
  	     -std=gnu99
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \
  	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
-@@ -51,7 +53,7 @@ textrel_check = if readelf -d $@ | fgrep
+@@ -63,7 +65,7 @@ textrel_check = if readelf -d $@ | fgrep
  libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw)
  	$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
  		-Wl,--version-script,$(word 2,$^) \
@@ -136,7 +136,7 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/configure
 +++ elfutils/configure
-@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.119'
+@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.120'
  PACKAGE_BUGREPORT='http://bugzilla.redhat.com/bugzilla/'
  
  ac_unique_file="libelf/libelf.h"
@@ -286,7 +286,7 @@
  AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR")
 --- elfutils/lib/ChangeLog
 +++ elfutils/lib/ChangeLog
-@@ -12,6 +12,11 @@
+@@ -16,6 +16,11 @@
  	* Makefile.am (libeu_a_SOURCES): Add it.
  	* system.h: Declare crc32_file.
  
@@ -300,8 +300,8 @@
  	* Makefile.am: Use -ffunction-sections for xmalloc.c.
 --- elfutils/lib/Makefile.am
 +++ elfutils/lib/Makefile.am
-@@ -16,12 +16,13 @@
- ## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+@@ -25,12 +25,13 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
 +WEXTRA = @WEXTRA@
@@ -317,7 +317,7 @@
  noinst_LIBRARIES = libeu.a
 --- elfutils/lib/Makefile.in
 +++ elfutils/lib/Makefile.in
-@@ -106,6 +106,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -105,6 +105,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -325,7 +325,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -141,6 +142,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 +333,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -183,9 +185,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 \
@@ -344,7 +344,7 @@
 + at MUDFLAP_TRUE@	-Wunused $(WEXTRA) $($(*F)_CFLAGS)
  INCLUDES = -I$(srcdir)/../libelf -I..
  noinst_LIBRARIES = libeu.a
- libeu_a_SOURCES = xstrdup.c xstrndup.c xmalloc.c next_prime.c \
+ libeu_a_SOURCES = xstrndup.c xmalloc.c next_prime.c \
 --- elfutils/libasm/ChangeLog
 +++ elfutils/libasm/ChangeLog
 @@ -28,6 +28,11 @@
@@ -361,8 +361,8 @@
  	* Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
 --- elfutils/libasm/Makefile.am
 +++ elfutils/libasm/Makefile.am
-@@ -13,12 +13,13 @@
- ## 3001 King Ranch Road, Ukiah, CA 95482.
+@@ -25,12 +25,13 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
 +WEXTRA = @WEXTRA@
@@ -419,8 +419,8 @@
  	* Makefile (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
 --- elfutils/libcpu/Makefile.am
 +++ elfutils/libcpu/Makefile.am
-@@ -13,7 +13,8 @@
- ## 3001 King Ranch Road, Ukiah, CA 95482.
+@@ -25,7 +25,8 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
 -AM_CFLAGS = -Wall -Wshadow -Werror -Wextra -Wformat=2 -Wunused
@@ -458,7 +458,7 @@
  libcpu_i386_a_SOURCES = i386_dis.c
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -266,6 +266,11 @@
+@@ -276,6 +276,11 @@
  
  2005-05-31  Roland McGrath  <roland at redhat.com>
  
@@ -472,15 +472,15 @@
  
 --- elfutils/libdw/Makefile.am
 +++ elfutils/libdw/Makefile.am
-@@ -13,6 +13,7 @@
- ## 3001 King Ranch Road, Ukiah, CA 95482.
+@@ -25,6 +25,7 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DIS_LIBDW
 +WEXTRA = @WEXTRA@
  if MUDFLAP
  AM_CFLAGS = -fmudflap
  else
-@@ -21,7 +22,7 @@ endif
+@@ -33,7 +34,7 @@ endif
  if BUILD_STATIC
  AM_CFLAGS += -fpic
  endif
@@ -522,7 +522,7 @@
  						       $(COMPILE)))
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -259,6 +259,11 @@
+@@ -268,6 +268,11 @@
  
  2005-07-21  Roland McGrath  <roland at redhat.com>
  
@@ -536,8 +536,8 @@
  	* test2.c (main): Check sscanf result to quiet warning.
 --- elfutils/libdwfl/Makefile.am
 +++ elfutils/libdwfl/Makefile.am
-@@ -15,12 +15,13 @@
- ## 3001 King Ranch Road, Ukiah, CA 95482.
+@@ -27,12 +27,13 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
 +WEXTRA = @WEXTRA@
@@ -597,8 +597,8 @@
  	* libebl_x86_64.map: Add x86_64_core_note.
 --- elfutils/libebl/Makefile.am
 +++ elfutils/libebl/Makefile.am
-@@ -13,12 +13,13 @@
- ## 3001 King Ranch Road, Ukiah, CA 95482.
+@@ -25,12 +25,13 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DOBJDIR=\"$(shell pwd)\"
 +WEXTRA = @WEXTRA@
@@ -644,7 +644,7 @@
  
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -113,6 +113,11 @@
+@@ -130,6 +130,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.
  
@@ -658,7 +658,7 @@
  	* elf.h: Update again.
 --- elfutils/libelf/common.h
 +++ elfutils/libelf/common.h
-@@ -122,7 +122,7 @@ libelf_release_all (Elf *elf)
+@@ -155,7 +155,7 @@ libelf_release_all (Elf *elf)
    (Var) = (sizeof (Var) == 1						      \
  	   ? (unsigned char) (Var)					      \
  	   : (sizeof (Var) == 2						      \
@@ -667,7 +667,7 @@
  	      : (sizeof (Var) == 4					      \
  		 ? bswap_32 (Var)					      \
  		 : bswap_64 (Var))))
-@@ -131,7 +131,7 @@ libelf_release_all (Elf *elf)
+@@ -164,7 +164,7 @@ libelf_release_all (Elf *elf)
    (Dst) = (sizeof (Var) == 1						      \
  	   ? (unsigned char) (Var)					      \
  	   : (sizeof (Var) == 2						      \
@@ -678,15 +678,15 @@
  		 : bswap_64 (Var))))
 --- elfutils/libelf/Makefile.am
 +++ elfutils/libelf/Makefile.am
-@@ -16,6 +16,7 @@
- ## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+@@ -25,6 +25,7 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
 +WEXTRA = @WEXTRA@
  if MUDFLAP
  AM_CFLAGS = -fmudflap
  else
-@@ -24,7 +25,10 @@ endif
+@@ -33,7 +34,10 @@ endif
  if BUILD_STATIC
  AM_CFLAGS += -fpic
  endif
@@ -776,7 +776,7 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -236,6 +236,11 @@
+@@ -261,6 +261,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -790,7 +790,7 @@
  	* readelf.c (print_debug_line_section): Print section offset of each
 --- elfutils/src/findtextrel.c
 +++ elfutils/src/findtextrel.c
-@@ -476,7 +476,11 @@ ptrcompare (const void *p1, const void *
+@@ -488,7 +488,11 @@ ptrcompare (const void *p1, const void *
  
  
  static void
@@ -805,7 +805,7 @@
  {
 --- elfutils/src/Makefile.am
 +++ elfutils/src/Makefile.am
-@@ -14,6 +14,7 @@
+@@ -26,6 +26,7 @@
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H $(YYDEBUG) \
         -DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\"
@@ -813,7 +813,7 @@
  if MUDFLAP
  AM_CFLAGS = -fmudflap
  else
-@@ -21,7 +22,7 @@ AM_CFLAGS =
+@@ -33,7 +34,7 @@ AM_CFLAGS =
  endif
  AM_CFLAGS += -Wall -Wshadow -std=gnu99 $(native_ld_cflags) \
  	     $(if $($(*F)_no_Werror),,-Werror) \
@@ -857,7 +857,7 @@
  	   -I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \
 --- elfutils/src/strip.c
 +++ elfutils/src/strip.c
-@@ -40,6 +40,12 @@
+@@ -52,6 +52,12 @@
  #include <libebl.h>
  #include <system.h>
  
@@ -870,7 +870,7 @@
  
  /* Name and version of program.  */
  static void print_version (FILE *stream, struct argp_state *state);
-@@ -288,8 +294,18 @@ process_file (const char *fname)
+@@ -300,8 +306,18 @@ process_file (const char *fname)
  
        /* If we have to preserve the timestamp, we need it in the
  	 format utimes() understands.  */
@@ -889,7 +889,7 @@
      }
  
    /* Open the file.  */
-@@ -1679,7 +1695,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1691,7 +1707,7 @@ handle_elf (int fd, Elf *elf, const char
    /* If requested, preserve the timestamp.  */
    if (tvp != NULL)
      {
@@ -898,7 +898,7 @@
  	{
  	  error (0, errno, gettext ("\
  cannot set access and modification date of '%s'"),
-@@ -1736,7 +1752,7 @@ handle_ar (int fd, Elf *elf, const char 
+@@ -1748,7 +1764,7 @@ handle_ar (int fd, Elf *elf, const char 
  
    if (tvp != NULL)
      {
@@ -909,7 +909,7 @@
  cannot set access and modification date of '%s'"), fname);
 --- elfutils/tests/ChangeLog
 +++ elfutils/tests/ChangeLog
-@@ -349,6 +349,11 @@
+@@ -373,6 +373,11 @@
  	* Makefile.am (TESTS): Add run-elflint-test.sh.
  	(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
  
@@ -923,8 +923,8 @@
  	* get-files.c (main): Use correct format specifier.
 --- elfutils/tests/Makefile.am
 +++ elfutils/tests/Makefile.am
-@@ -13,12 +13,13 @@
- ## 3001 King Ranch Road, Ukiah, CA 95482.
+@@ -25,12 +25,13 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -DHAVE_CONFIG_H -D_GNU_SOURCE
 +WEXTRA = @WEXTRA@
@@ -941,7 +941,7 @@
  endif
 --- elfutils/tests/Makefile.in
 +++ elfutils/tests/Makefile.in
-@@ -283,6 +283,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -289,6 +289,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -949,7 +949,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -318,6 +319,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@
@@ -957,7 +957,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -359,10 +361,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-4/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	2 Feb 2006 15:20:28 -0000	1.17
+++ sources	5 Apr 2006 05:23:59 -0000	1.18
@@ -1,3 +1,2 @@
-f39bcf7e1c380e8eaa768e1230dc2fad  systemtap-0.5.4.tar.gz
-57b9e4ab3b9fb597a72badf26f7f9bdc  elfutils-0.119.tar.gz
-6e30f194fc5daae3bfd92385e41f64c7  elfutils-portability.patch
+998843988c2f84e46ba85bb5811da2e2  systemtap-0.5.5.tar.gz
+3f757d85af891904892b4a6dc3f9e14c  elfutils-0.120.tar.gz


Index: systemtap.spec
===================================================================
RCS file: /cvs/dist/rpms/systemtap/FC-4/systemtap.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- systemtap.spec	2 Feb 2006 15:14:17 -0000	1.18
+++ systemtap.spec	5 Apr 2006 05:23:59 -0000	1.19
@@ -1,8 +1,8 @@
 %define bundled_elfutils 1
-%define elfutils_version 0.119
+%define elfutils_version 0.120
 
 Name: systemtap
-Version: 0.5.4
+Version: 0.5.5
 Release: 1
 Summary: Instrumentation System
 Group: Development/System
@@ -100,6 +100,10 @@
 
 
 %changelog
+* Tue Apr  4 2006 Roland McGrath <roland at redhat.com> - 0.5.5-1
+- Many changes, affected PRs include: 2068, 2293, 1989, 2334,
+  1304, 2390, 2425, 953.
+
 * Wed Feb  1 2006 Frank Ch. Eigler <fche at redhat.com> - 0.5.4-1
 - PRs 1916, 2205, 2142, 2060, 1379
 



From fedora-cvs-commits at redhat.com  Wed Apr  5 05:24:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 01:24:41 -0400
Subject: rpms/systemtap/devel elfutils-portability.patch, 1.7, 1.8 sources,
	1.14, 1.15 systemtap.spec, 1.22, 1.23
Message-ID: <200604050524.k355Of0f030237@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/systemtap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30225

Modified Files:
	elfutils-portability.patch sources systemtap.spec 
Log Message:
Automatic update to 0.5.5

elfutils-portability.patch:
 ChangeLog            |   15 ++++++++
 Makefile.in          |    2 +
 backends/ChangeLog   |    8 ++++
 backends/Makefile.am |    6 ++-
 backends/Makefile.in |    8 ++--
 config/Makefile.in   |    2 +
 configure            |   90 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac         |   28 +++++++++++++++
 lib/ChangeLog        |    5 ++
 lib/Makefile.am      |    3 +
 lib/Makefile.in      |    6 ++-
 libasm/ChangeLog     |    5 ++
 libasm/Makefile.am   |    3 +
 libasm/Makefile.in   |    6 ++-
 libcpu/ChangeLog     |    5 ++
 libcpu/Makefile.am   |    3 +
 libcpu/Makefile.in   |    4 +-
 libdw/ChangeLog      |    5 ++
 libdw/Makefile.am    |    3 +
 libdw/Makefile.in    |    7 ++-
 libdwfl/ChangeLog    |    5 ++
 libdwfl/Makefile.am  |    3 +
 libdwfl/Makefile.in  |    6 ++-
 libebl/ChangeLog     |    5 ++
 libebl/Makefile.am   |    3 +
 libebl/Makefile.in   |    6 ++-
 libelf/ChangeLog     |    5 ++
 libelf/Makefile.am   |    6 ++-
 libelf/Makefile.in   |    8 ++--
 libelf/common.h      |    4 +-
 m4/Makefile.in       |    2 +
 src/ChangeLog        |    5 ++
 src/Makefile.am      |    3 +
 src/Makefile.in      |    6 ++-
 src/findtextrel.c    |    6 ++-
 src/strip.c          |   20 ++++++++++-
 tests/ChangeLog      |    5 ++
 tests/Makefile.am    |    5 +-
 tests/Makefile.in    |    6 ++-
 39 files changed, 284 insertions(+), 39 deletions(-)

Index: elfutils-portability.patch
===================================================================
RCS file: /cvs/dist/rpms/systemtap/devel/elfutils-portability.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- elfutils-portability.patch	17 Jan 2006 07:52:34 -0000	1.7
+++ elfutils-portability.patch	5 Apr 2006 05:24:28 -0000	1.8
@@ -1,6 +1,6 @@
 --- elfutils/backends/ChangeLog
 +++ elfutils/backends/ChangeLog
-@@ -38,6 +38,11 @@
+@@ -47,6 +47,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.
-@@ -60,6 +65,9 @@
+@@ -69,6 +74,9 @@
  	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
  	(CLEANFILES): Add libebl_$(m).so.
  
@@ -24,8 +24,8 @@
  
 --- elfutils/backends/Makefile.am
 +++ elfutils/backends/Makefile.am
-@@ -13,12 +13,14 @@
- ## 3001 King Ranch Road, Ukiah, CA 95482.
+@@ -25,12 +25,14 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DOBJDIR=\"$(shell pwd)\"
 +WEXTRA = @WEXTRA@
@@ -40,7 +40,7 @@
  	     -std=gnu99
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \
  	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
-@@ -51,7 +53,7 @@ textrel_check = if readelf -d $@ | fgrep
+@@ -63,7 +65,7 @@ textrel_check = if readelf -d $@ | fgrep
  libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw)
  	$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
  		-Wl,--version-script,$(word 2,$^) \
@@ -136,7 +136,7 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/configure
 +++ elfutils/configure
-@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.119'
+@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.120'
  PACKAGE_BUGREPORT='http://bugzilla.redhat.com/bugzilla/'
  
  ac_unique_file="libelf/libelf.h"
@@ -286,7 +286,7 @@
  AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR")
 --- elfutils/lib/ChangeLog
 +++ elfutils/lib/ChangeLog
-@@ -12,6 +12,11 @@
+@@ -16,6 +16,11 @@
  	* Makefile.am (libeu_a_SOURCES): Add it.
  	* system.h: Declare crc32_file.
  
@@ -300,8 +300,8 @@
  	* Makefile.am: Use -ffunction-sections for xmalloc.c.
 --- elfutils/lib/Makefile.am
 +++ elfutils/lib/Makefile.am
-@@ -16,12 +16,13 @@
- ## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+@@ -25,12 +25,13 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
 +WEXTRA = @WEXTRA@
@@ -317,7 +317,7 @@
  noinst_LIBRARIES = libeu.a
 --- elfutils/lib/Makefile.in
 +++ elfutils/lib/Makefile.in
-@@ -106,6 +106,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -105,6 +105,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -325,7 +325,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -141,6 +142,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 +333,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -183,9 +185,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 \
@@ -344,7 +344,7 @@
 + at MUDFLAP_TRUE@	-Wunused $(WEXTRA) $($(*F)_CFLAGS)
  INCLUDES = -I$(srcdir)/../libelf -I..
  noinst_LIBRARIES = libeu.a
- libeu_a_SOURCES = xstrdup.c xstrndup.c xmalloc.c next_prime.c \
+ libeu_a_SOURCES = xstrndup.c xmalloc.c next_prime.c \
 --- elfutils/libasm/ChangeLog
 +++ elfutils/libasm/ChangeLog
 @@ -28,6 +28,11 @@
@@ -361,8 +361,8 @@
  	* Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
 --- elfutils/libasm/Makefile.am
 +++ elfutils/libasm/Makefile.am
-@@ -13,12 +13,13 @@
- ## 3001 King Ranch Road, Ukiah, CA 95482.
+@@ -25,12 +25,13 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
 +WEXTRA = @WEXTRA@
@@ -419,8 +419,8 @@
  	* Makefile (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
 --- elfutils/libcpu/Makefile.am
 +++ elfutils/libcpu/Makefile.am
-@@ -13,7 +13,8 @@
- ## 3001 King Ranch Road, Ukiah, CA 95482.
+@@ -25,7 +25,8 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
 -AM_CFLAGS = -Wall -Wshadow -Werror -Wextra -Wformat=2 -Wunused
@@ -458,7 +458,7 @@
  libcpu_i386_a_SOURCES = i386_dis.c
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -266,6 +266,11 @@
+@@ -276,6 +276,11 @@
  
  2005-05-31  Roland McGrath  <roland at redhat.com>
  
@@ -472,15 +472,15 @@
  
 --- elfutils/libdw/Makefile.am
 +++ elfutils/libdw/Makefile.am
-@@ -13,6 +13,7 @@
- ## 3001 King Ranch Road, Ukiah, CA 95482.
+@@ -25,6 +25,7 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DIS_LIBDW
 +WEXTRA = @WEXTRA@
  if MUDFLAP
  AM_CFLAGS = -fmudflap
  else
-@@ -21,7 +22,7 @@ endif
+@@ -33,7 +34,7 @@ endif
  if BUILD_STATIC
  AM_CFLAGS += -fpic
  endif
@@ -522,7 +522,7 @@
  						       $(COMPILE)))
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -259,6 +259,11 @@
+@@ -268,6 +268,11 @@
  
  2005-07-21  Roland McGrath  <roland at redhat.com>
  
@@ -536,8 +536,8 @@
  	* test2.c (main): Check sscanf result to quiet warning.
 --- elfutils/libdwfl/Makefile.am
 +++ elfutils/libdwfl/Makefile.am
-@@ -15,12 +15,13 @@
- ## 3001 King Ranch Road, Ukiah, CA 95482.
+@@ -27,12 +27,13 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
 +WEXTRA = @WEXTRA@
@@ -597,8 +597,8 @@
  	* libebl_x86_64.map: Add x86_64_core_note.
 --- elfutils/libebl/Makefile.am
 +++ elfutils/libebl/Makefile.am
-@@ -13,12 +13,13 @@
- ## 3001 King Ranch Road, Ukiah, CA 95482.
+@@ -25,12 +25,13 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DOBJDIR=\"$(shell pwd)\"
 +WEXTRA = @WEXTRA@
@@ -644,7 +644,7 @@
  
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -113,6 +113,11 @@
+@@ -130,6 +130,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.
  
@@ -658,7 +658,7 @@
  	* elf.h: Update again.
 --- elfutils/libelf/common.h
 +++ elfutils/libelf/common.h
-@@ -122,7 +122,7 @@ libelf_release_all (Elf *elf)
+@@ -155,7 +155,7 @@ libelf_release_all (Elf *elf)
    (Var) = (sizeof (Var) == 1						      \
  	   ? (unsigned char) (Var)					      \
  	   : (sizeof (Var) == 2						      \
@@ -667,7 +667,7 @@
  	      : (sizeof (Var) == 4					      \
  		 ? bswap_32 (Var)					      \
  		 : bswap_64 (Var))))
-@@ -131,7 +131,7 @@ libelf_release_all (Elf *elf)
+@@ -164,7 +164,7 @@ libelf_release_all (Elf *elf)
    (Dst) = (sizeof (Var) == 1						      \
  	   ? (unsigned char) (Var)					      \
  	   : (sizeof (Var) == 2						      \
@@ -678,15 +678,15 @@
  		 : bswap_64 (Var))))
 --- elfutils/libelf/Makefile.am
 +++ elfutils/libelf/Makefile.am
-@@ -16,6 +16,7 @@
- ## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+@@ -25,6 +25,7 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
 +WEXTRA = @WEXTRA@
  if MUDFLAP
  AM_CFLAGS = -fmudflap
  else
-@@ -24,7 +25,10 @@ endif
+@@ -33,7 +34,10 @@ endif
  if BUILD_STATIC
  AM_CFLAGS += -fpic
  endif
@@ -776,7 +776,7 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -236,6 +236,11 @@
+@@ -261,6 +261,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -790,7 +790,7 @@
  	* readelf.c (print_debug_line_section): Print section offset of each
 --- elfutils/src/findtextrel.c
 +++ elfutils/src/findtextrel.c
-@@ -476,7 +476,11 @@ ptrcompare (const void *p1, const void *
+@@ -488,7 +488,11 @@ ptrcompare (const void *p1, const void *
  
  
  static void
@@ -805,7 +805,7 @@
  {
 --- elfutils/src/Makefile.am
 +++ elfutils/src/Makefile.am
-@@ -14,6 +14,7 @@
+@@ -26,6 +26,7 @@
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H $(YYDEBUG) \
         -DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\"
@@ -813,7 +813,7 @@
  if MUDFLAP
  AM_CFLAGS = -fmudflap
  else
-@@ -21,7 +22,7 @@ AM_CFLAGS =
+@@ -33,7 +34,7 @@ AM_CFLAGS =
  endif
  AM_CFLAGS += -Wall -Wshadow -std=gnu99 $(native_ld_cflags) \
  	     $(if $($(*F)_no_Werror),,-Werror) \
@@ -857,7 +857,7 @@
  	   -I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \
 --- elfutils/src/strip.c
 +++ elfutils/src/strip.c
-@@ -40,6 +40,12 @@
+@@ -52,6 +52,12 @@
  #include <libebl.h>
  #include <system.h>
  
@@ -870,7 +870,7 @@
  
  /* Name and version of program.  */
  static void print_version (FILE *stream, struct argp_state *state);
-@@ -288,8 +294,18 @@ process_file (const char *fname)
+@@ -300,8 +306,18 @@ process_file (const char *fname)
  
        /* If we have to preserve the timestamp, we need it in the
  	 format utimes() understands.  */
@@ -889,7 +889,7 @@
      }
  
    /* Open the file.  */
-@@ -1679,7 +1695,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1691,7 +1707,7 @@ handle_elf (int fd, Elf *elf, const char
    /* If requested, preserve the timestamp.  */
    if (tvp != NULL)
      {
@@ -898,7 +898,7 @@
  	{
  	  error (0, errno, gettext ("\
  cannot set access and modification date of '%s'"),
-@@ -1736,7 +1752,7 @@ handle_ar (int fd, Elf *elf, const char 
+@@ -1748,7 +1764,7 @@ handle_ar (int fd, Elf *elf, const char 
  
    if (tvp != NULL)
      {
@@ -909,7 +909,7 @@
  cannot set access and modification date of '%s'"), fname);
 --- elfutils/tests/ChangeLog
 +++ elfutils/tests/ChangeLog
-@@ -349,6 +349,11 @@
+@@ -373,6 +373,11 @@
  	* Makefile.am (TESTS): Add run-elflint-test.sh.
  	(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
  
@@ -923,8 +923,8 @@
  	* get-files.c (main): Use correct format specifier.
 --- elfutils/tests/Makefile.am
 +++ elfutils/tests/Makefile.am
-@@ -13,12 +13,13 @@
- ## 3001 King Ranch Road, Ukiah, CA 95482.
+@@ -25,12 +25,13 @@
+ ## <http://www.openinventionnetwork.com>.
  ##
  DEFS = -DHAVE_CONFIG_H -D_GNU_SOURCE
 +WEXTRA = @WEXTRA@
@@ -941,7 +941,7 @@
  endif
 --- elfutils/tests/Makefile.in
 +++ elfutils/tests/Makefile.in
-@@ -283,6 +283,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -289,6 +289,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -949,7 +949,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -318,6 +319,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@
@@ -957,7 +957,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -359,10 +361,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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	2 Feb 2006 15:59:35 -0000	1.14
+++ sources	5 Apr 2006 05:24:28 -0000	1.15
@@ -1,3 +1,2 @@
-f39bcf7e1c380e8eaa768e1230dc2fad  systemtap-0.5.4.tar.gz
-57b9e4ab3b9fb597a72badf26f7f9bdc  elfutils-0.119.tar.gz
-6e30f194fc5daae3bfd92385e41f64c7  elfutils-portability.patch
+998843988c2f84e46ba85bb5811da2e2  systemtap-0.5.5.tar.gz
+3f757d85af891904892b4a6dc3f9e14c  elfutils-0.120.tar.gz


Index: systemtap.spec
===================================================================
RCS file: /cvs/dist/rpms/systemtap/devel/systemtap.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- systemtap.spec	11 Feb 2006 05:46:58 -0000	1.22
+++ systemtap.spec	5 Apr 2006 05:24:28 -0000	1.23
@@ -1,9 +1,9 @@
 %define bundled_elfutils 0
-%define elfutils_version 0.119
+%define elfutils_version 0.120
 
 Name: systemtap
-Version: 0.5.4
-Release: 2.2
+Version: 0.5.5
+Release: 2
 Summary: Instrumentation System
 Group: Development/System
 License: GPL
@@ -100,15 +100,13 @@
 
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.5.4-2.2
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.4-2.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Thu Feb  2 2006 Frank Eigler <fche at redhat.com> - 0.5.4-2
+* Tue Apr  4 2006 Roland McGrath <roland at redhat.com> - 0.5.5-2
 - Rebuilt for devel
 
+* Tue Apr  4 2006 Roland McGrath <roland at redhat.com> - 0.5.5-1
+- Many changes, affected PRs include: 2068, 2293, 1989, 2334,
+  1304, 2390, 2425, 953.
+
 * Wed Feb  1 2006 Frank Ch. Eigler <fche at redhat.com> - 0.5.4-1
 - PRs 1916, 2205, 2142, 2060, 1379
 



From fedora-cvs-commits at redhat.com  Wed Apr  5 05:52:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 01:52:24 -0400
Subject: rpms/systemtap/FC-4 sources,1.18,1.19
Message-ID: <200604050552.k355qOM1011927@cvs.devel.redhat.com>

Author: roland

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

Modified Files:
	sources 
Log Message:
False start


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/systemtap/FC-4/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	5 Apr 2006 05:23:59 -0000	1.18
+++ sources	5 Apr 2006 05:52:22 -0000	1.19
@@ -1,2 +1,2 @@
-998843988c2f84e46ba85bb5811da2e2  systemtap-0.5.5.tar.gz
+e9e860ca21849ba743244d1c06c3788d  systemtap-0.5.5.tar.gz
 3f757d85af891904892b4a6dc3f9e14c  elfutils-0.120.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr  5 05:53:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 01:53:02 -0400
Subject: rpms/systemtap/devel sources,1.15,1.16
Message-ID: <200604050553.k355r2nl011979@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/systemtap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11965

Modified Files:
	sources 
Log Message:
False start.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/systemtap/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	5 Apr 2006 05:24:28 -0000	1.15
+++ sources	5 Apr 2006 05:53:00 -0000	1.16
@@ -1,2 +1,2 @@
-998843988c2f84e46ba85bb5811da2e2  systemtap-0.5.5.tar.gz
+e9e860ca21849ba743244d1c06c3788d  systemtap-0.5.5.tar.gz
 3f757d85af891904892b4a6dc3f9e14c  elfutils-0.120.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr  5 07:11:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 03:11:14 -0400
Subject: rpms/xsane/devel xsane.spec,1.31,1.32
Message-ID: <200604050711.k357BEMw008770@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/xsane/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8727

Modified Files:
	xsane.spec 
Log Message:
use XSANE.lang instead of xsane.lang to avoid %doc multilib regression



Index: xsane.spec
===================================================================
RCS file: /cvs/dist/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- xsane.spec	4 Apr 2006 16:02:28 -0000	1.31
+++ xsane.spec	5 Apr 2006 07:11:12 -0000	1.32
@@ -1,7 +1,7 @@
 Name: xsane
 Summary: An X Window System front-end for the SANE scanner interface.
 Version: 0.99
-Release: 3
+Release: 4
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane-install-gimp-plugin
 Patch0: xsane-0.90-htmlview.patch
@@ -65,13 +65,13 @@
 mkdir -p %{buildroot}%{_sbindir}
 install -m 0755 %SOURCE1 %{buildroot}%{_sbindir}/xsane-install-gimp-plugin
 
-%find_lang %{name}
+%find_lang %{name} XSANE.lang
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}.lang
+%files -f XSANE.lang
 %defattr(-,root,root)
 %doc xsane.[A-Z]*
 %{_bindir}/xsane
@@ -97,6 +97,9 @@
 exit 0
 
 %changelog
+* Wed Apr 05 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-4
+- use XSANE.lang instead of xsane.lang to avoid %%doc multilib regression
+
 * Tue Apr 04 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-3
 - fix medium-definitions patch to not barf on obsolete options in config file
   (#185269, by Aldy Hernandez)



From fedora-cvs-commits at redhat.com  Wed Apr  5 07:14:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 03:14:52 -0400
Subject: rpms/xsane/FC-5 xsane.spec,1.32,1.33
Message-ID: <200604050714.k357Eq22008845@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	xsane.spec 
Log Message:
use XSANE.lang instead of xsane.lang to avoid %%doc multilib regression



Index: xsane.spec
===================================================================
RCS file: /cvs/dist/rpms/xsane/FC-5/xsane.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xsane.spec	4 Apr 2006 16:44:54 -0000	1.32
+++ xsane.spec	5 Apr 2006 07:14:50 -0000	1.33
@@ -1,7 +1,7 @@
 Name: xsane
 Summary: An X Window System front-end for the SANE scanner interface.
 Version: 0.99
-Release: 2.2.fc5.3
+Release: 2.2.fc5.4
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane-install-gimp-plugin
 Patch0: xsane-0.90-htmlview.patch
@@ -65,13 +65,13 @@
 mkdir -p %{buildroot}%{_sbindir}
 install -m 0755 %SOURCE1 %{buildroot}%{_sbindir}/xsane-install-gimp-plugin
 
-%find_lang %{name}
+%find_lang %{name} XSANE.lang
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}.lang
+%files -f XSANE.lang
 %defattr(-,root,root)
 %doc xsane.[A-Z]*
 %{_bindir}/xsane
@@ -97,7 +97,10 @@
 exit 0
 
 %changelog
-* Tue Apr 04 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-2.2.fc5.3
+* Wed Apr 05 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-2.2.fc5.4
+- use XSANE.lang instead of xsane.lang to avoid %%doc multilib regression
+
+* Tue Apr 04 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-3
 - fix medium-definitions patch to not barf on obsolete options in config file
   (#185269, by Aldy Hernandez)
 



From fedora-cvs-commits at redhat.com  Wed Apr  5 08:32:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 04:32:40 -0400
Subject: rpms/sane-backends/devel sane-backends.spec,1.60,1.61
Message-ID: <200604050832.k358Weqe018506@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/sane-backends/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18493

Modified Files:
	sane-backends.spec 
Log Message:
don't use automake



Index: sane-backends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sane-backends.spec	4 Apr 2006 16:27:37 -0000	1.60
+++ sane-backends.spec	5 Apr 2006 08:32:37 -0000	1.61
@@ -15,7 +15,7 @@
 URL: http://www.sane-project.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
 BuildRequires: tetex-latex libusb-devel libieee1284-devel libjpeg-devel
-BuildRequires: automake autoconf libtool
+BuildRequires: autoconf libtool
 %if %{gphoto2_support}
 BuildRequires: gphoto2-devel
 %endif
@@ -81,7 +81,6 @@
 mv -f acinclude.m4{.new,}
 libtoolize --force --copy
 aclocal
-automake
 autoconf
 
 %build
@@ -156,7 +155,10 @@
 %{_docdir}/%{name}-%{version}/sane.ps
 
 %changelog
-* Tue Apr 04 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-8
+* Wed Apr 05 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-8
+- don't use automake
+
+* Tue Apr 04 2006 Nils Philippsen <nphilipp at redhat.com>
 - require gphoto2-devel in sane-backends-devel
 
 * Fri Mar 24 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-7



From fedora-cvs-commits at redhat.com  Wed Apr  5 08:34:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 04:34:29 -0400
Subject: rpms/sane-backends/FC-5 sane-backends.spec,1.58,1.59
Message-ID: <200604050834.k358YTA5018598@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/sane-backends/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18585

Modified Files:
	sane-backends.spec 
Log Message:
don't use automake



Index: sane-backends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/FC-5/sane-backends.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sane-backends.spec	4 Apr 2006 16:33:27 -0000	1.58
+++ sane-backends.spec	5 Apr 2006 08:34:27 -0000	1.59
@@ -15,7 +15,7 @@
 URL: http://www.sane-project.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
 BuildRequires: tetex-latex libusb-devel libieee1284-devel libjpeg-devel
-BuildRequires: automake autoconf libtool
+BuildRequires: autoconf libtool
 %if %{gphoto2_support}
 BuildRequires: gphoto2-devel
 %endif
@@ -81,7 +81,6 @@
 mv -f acinclude.m4{.new,}
 libtoolize --force --copy
 aclocal
-automake
 autoconf
 
 %build
@@ -156,7 +155,10 @@
 %{_docdir}/%{name}-%{version}/sane.ps
 
 %changelog
-* Tue Apr 04 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-5.fc5.8
+* Wed Apr 05 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-5.fc5.8
+- don't use automake
+
+* Tue Apr 04 2006 Nils Philippsen <nphilipp at redhat.com>
 - require gphoto2-devel in sane-backends-devel
 
 * Fri Mar 24 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-7



From fedora-cvs-commits at redhat.com  Wed Apr  5 09:02:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 05:02:26 -0400
Subject: rpms/net-snmp/devel net-snmp-5.3-diskio.patch, NONE,
	1.1 net-snmp-5.3-disman.patch, NONE,
	1.1 net-snmp-5.3-oid-names.patch, NONE,
	1.1 net-snmp-5.3_vendorperl.patch, NONE, 1.1 net-snmp.spec,
	1.69, 1.70
Message-ID: <200604050902.k3592Qwf032501@cvs.devel.redhat.com>

Author: rvokal

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

Modified Files:
	net-snmp.spec 
Added Files:
	net-snmp-5.3-diskio.patch net-snmp-5.3-disman.patch 
	net-snmp-5.3-oid-names.patch net-snmp-5.3_vendorperl.patch 
Log Message:
 - fix parsing of /proc/diskstats
 - fix disman monitor crash
 - fix perl vendor name
 - fix OID lookup fail



net-snmp-5.3-diskio.patch:
 diskio.c |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

--- NEW FILE net-snmp-5.3-diskio.patch ---
--- net-snmp/agent/mibgroup/ucd-snmp/diskio.c.old	2006-03-29 18:19:46.000000000 +0200
+++ net-snmp/agent/mibgroup/ucd-snmp/diskio.c	2006-03-29 17:36:01.000000000 +0200
@@ -721,8 +721,16 @@
 		head.indices = (linux_diskio *)realloc(head.indices, head.alloc*sizeof(linux_diskio));
 	    }
 	    pTemp = &head.indices[head.length];
-	    sscanf (buffer, "%d %d", &pTemp->major, &pTemp->minor);
-	    if (pTemp->minor == 0)
+	    /* we count space separator to identify type */
+	    int i=0;
+	    int space=0;
+	    char last='\0';
+	    while(buffer[i] != '\n') {
+	        if(buffer[i] == ' ' && last != ' ')
+	            space++;
+		last = buffer[i++];
+	    }
+	    if (space > 7)
 		sscanf (buffer, "%d %d %s %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu\n",
 		    &pTemp->major, &pTemp->minor, pTemp->name,
 		    &pTemp->rio, &pTemp->rmerge, &pTemp->rsect, &pTemp->ruse,
@@ -784,6 +792,7 @@
 {
     unsigned int indx;
     static unsigned long long_ret;
+    static struct counter64 c64_ret;
 
     if (getstats() == 1) {
 	return NULL;
@@ -818,7 +827,16 @@
     case DISKIO_WRITES:
       long_ret = head.indices[indx].wio;
       return (u_char *) & long_ret;
-
+    case DISKIO_NREADX:
+      *var_len = 8;
+      c64_ret.low = head.indices[indx].rsect * 512 & 0xffffffff;
+      c64_ret.high = head.indices[indx].rsect * 512 >> 32;
+      return (u_char *) & c64_ret;
+    case DISKIO_NWRITTENX:
+      *var_len = 8;
+      c64_ret.low = head.indices[indx].wsect * 512 & 0xffffffff;
+      c64_ret.high = head.indices[indx].wsect * 512 >> 32;
+      return (u_char *) & c64_ret;
     default:
 	snmp_log(LOG_ERR, "diskio.c: don't know how to handle %d request\n", vp->magic);
   }

net-snmp-5.3-disman.patch:
 mteTrigger.c |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletion(-)

--- NEW FILE net-snmp-5.3-disman.patch ---
--- net-snmp-5.3/agent/mibgroup/disman/event/mteTrigger.c.orig	2005-12-11 20:13:15.000000000 +0100
+++ net-snmp-5.3/agent/mibgroup/disman/event/mteTrigger.c	2006-04-05 10:22:24.000000000 +0200
@@ -741,6 +741,11 @@
             /*
              * Determine the value to be monitored...
              */
+            if ( !vp1->val.integer ) {  /* No value */
+                if ( vp2 )
+                    vp2 = vp2->next_variable;
+                continue;
+            }
             if (entry->flags & MTE_TRIGGER_FLAG_DELTA) {
                 if (entry->flags & MTE_TRIGGER_FLAG_DWILD) {
                     /*
@@ -873,6 +878,11 @@
             /*
              * Determine the value to be monitored...
              */
+            if ( !vp1->val.integer ) {  /* No value */
+                if ( vp2 )
+                    vp2 = vp2->next_variable;
+                continue;
+            }
             if (entry->flags & MTE_TRIGGER_FLAG_DELTA) {
                 if (entry->flags & MTE_TRIGGER_FLAG_DWILD) {
                     /*
@@ -994,7 +1004,11 @@
              *  (similar to previous delta-sample processing,
              *   but without the discontinuity marker checks)
              */
-            if (vp2->type == ASN_NULL) {
+            if (!vp2) {
+                break;   /* Run out of 'old' values */
+            }
+            if (( !vp1->val.integer ) ||
+                (vp2->type == ASN_NULL)) {
                 vp2 = vp2->next_variable;
                 continue;
             }

net-snmp-5.3-oid-names.patch:
 mib.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE net-snmp-5.3-oid-names.patch ---
Index: snmplib/mib.c
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/snmplib/mib.c,v
retrieving revision 5.89
diff -u -p -r5.89 mib.c
--- snmplib/mib.c	2 Dec 2005 10:33:57 -0000	5.89
+++ snmplib/mib.c	2 Feb 2006 14:20:38 -0000
@@ -2861,7 +2861,7 @@ int
 read_objid(const char *input, oid * output, size_t * out_len)
 {                               /* number of subid's in "output" */
 #ifndef DISABLE_MIB_LOADING
-    struct tree    *root = tree_head;
+    struct tree    *root = tree_top;
 #endif /* DISABLE_MIB_LOADING */
     char            buf[SPRINT_MAX_LEN];
     int             ret, max_out_len;
@@ -2904,7 +2904,10 @@ read_objid(const char *input, oid * outp
 #endif /* DISABLE_MIB_LOADING */
 
 #ifndef DISABLE_MIB_LOADING
-    if (root == NULL) {
+    if ((root == NULL) && (tree_head != NULL)) {
+        root = tree_head;
+    }
+    else if (root == NULL) {
         SET_SNMP_ERROR(SNMPERR_NOMIB);
         *out_len = 0;
         return 0;

net-snmp-5.3_vendorperl.patch:
 Makefile.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE net-snmp-5.3_vendorperl.patch ---
Index: Makefile.in
===================================================================
--- Makefile.in.orig
+++ Makefile.in
@@ -167,7 +167,7 @@
         fi
 
 perlinstall:
-	@(cd perl ; $(MAKE) install) ; \
+	@(cd perl ; $(MAKE) install_vendor) ; \
         if test $$? != 0 ; then \
            exit 1 ; \
         fi


Index: net-snmp.spec
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- net-snmp.spec	25 Mar 2006 10:07:13 -0000	1.69
+++ net-snmp.spec	5 Apr 2006 09:02:01 -0000	1.70
@@ -3,7 +3,7 @@
 Summary: A collection of SNMP protocol tools and libraries.
 Name: net-snmp
 Version: 5.3
-Release: 6
+Release: 7
 
 License: BSDish
 Group: System Environment/Daemons
@@ -32,6 +32,10 @@
 Patch23: net-snmp-5.3-proc_if_inet6.patch
 Patch24: net-snmp-5.3-size_t.patch
 Patch25: net-snmp-5.3-ipv6_retrans_ms.patch
+Patch26: net-snmp-5.3_vendorperl.patch
+Patch27: net-snmp-5.3-oid-names.patch
+Patch28: net-snmp-5.3-disman.patch
+Patch29: net-snmp-5.3-diskio.patch
 
 Prereq: /sbin/chkconfig
 Obsoletes: ucd-snmp
@@ -137,6 +141,10 @@
 %patch23 -p1 -b .proc_if
 %patch24 -p1 -b .size_t
 %patch25 -p1 -b .retrans_ms
+%patch26 -p0
+%patch27 -p0 -b .oid
+%patch28 -p1 -b .disman
+%patch29 -p1 -b .diskio
 
 # Do this patch with a perl hack...
 perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
@@ -319,6 +327,12 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Apr 05 2006 Radek Vok??l <rvokal at redhat.com> 5.3-7
+- fix parsing of /proc/diskstats
+- fix disman monitor crash
+- fix perl vendor name
+- fix OID lookup fail
+
 * Sat Mar 25 2006 Radek Vokal <rvokal at redhat.com> 5.3-6
 - use net.ipv6.neigh.lo.retrans_time_ms (#186546)
 



From fedora-cvs-commits at redhat.com  Wed Apr  5 10:56:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 06:56:28 -0400
Subject: rpms/mkbootdisk/devel .cvsignore, 1.8, 1.9 mkbootdisk.spec, 1.19,
	1.20 sources, 1.9, 1.10 mkbootdisk-1.5.2-hangup.patch, 1.1,
	NONE mkbootdisk-1.5.2-mantypo.patch, 1.1,
	NONE mkbootdisk-1.5.2-tmp.patch, 1.1,
	NONE mkbootdisk-x86_64.patch, 1.1, NONE
Message-ID: <200604051056.k35AuS0b023378@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/mkbootdisk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23361

Modified Files:
	.cvsignore mkbootdisk.spec sources 
Removed Files:
	mkbootdisk-1.5.2-hangup.patch mkbootdisk-1.5.2-mantypo.patch 
	mkbootdisk-1.5.2-tmp.patch mkbootdisk-x86_64.patch 
Log Message:
upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkbootdisk/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	9 Sep 2004 08:36:59 -0000	1.8
+++ .cvsignore	5 Apr 2006 10:56:26 -0000	1.9
@@ -1 +1 @@
-mkbootdisk-1.5.2.tar.gz
+mkbootdisk-1.5.3.tar.gz


Index: mkbootdisk.spec
===================================================================
RCS file: /cvs/dist/rpms/mkbootdisk/devel/mkbootdisk.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mkbootdisk.spec	7 Mar 2006 10:23:21 -0000	1.19
+++ mkbootdisk.spec	5 Apr 2006 10:56:26 -0000	1.20
@@ -1,14 +1,10 @@
 Summary: Creates a boot floppy disk for booting a system.
 Name: mkbootdisk
-Version: 1.5.2
-Release: 6
+Version:  1.5.3
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: mkbootdisk-%{version}.tar.gz
-Patch0: mkbootdisk-1.5.2-tmp.patch
-Patch1: mkbootdisk-1.5.2-hangup.patch
-Patch2: mkbootdisk-1.5.2-mantypo.patch
-Patch3: mkbootdisk-x86_64.patch
 ExclusiveOs: Linux
 BuildArch: noarch
 Requires: mkinitrd dosfstools
@@ -32,11 +28,6 @@
 %prep
 %setup -q
 
-%patch0 -p1 -b .tmp
-%patch1 -p1 -b .hangup
-%patch2 -p1 -b .mantypo
-%patch3 -p0 -b .x86_64
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make BUILDROOT=$RPM_BUILD_ROOT mandir=%{_mandir} install
@@ -50,6 +41,9 @@
 %attr(644,root,root) %{_mandir}/man8/mkbootdisk.8.gz
 
 %changelog
+* Wed Apr 05 2006 Peter Vrabec <pvrabec at redhat.com> 1.5.3-1
+- fix tail command usage (#187876)
+
 * Tue Mar 07 2006 Peter Vrabec <pvrabec at redhat.com> 1.5.2-6
 - build  as noarch
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkbootdisk/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	9 Sep 2004 08:36:59 -0000	1.9
+++ sources	5 Apr 2006 10:56:26 -0000	1.10
@@ -1 +1 @@
-7b5cc3d0d0d635e8ae13e3a1d588dd43  mkbootdisk-1.5.2.tar.gz
+6c76bccb56e47ea7dccf596ec79bd562  mkbootdisk-1.5.3.tar.gz


--- mkbootdisk-1.5.2-hangup.patch DELETED ---


--- mkbootdisk-1.5.2-mantypo.patch DELETED ---


--- mkbootdisk-1.5.2-tmp.patch DELETED ---


--- mkbootdisk-x86_64.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr  5 13:08:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 09:08:18 -0400
Subject: rpms/kdesdk/FC-5 .cvsignore, 1.30, 1.31 kdesdk.spec, 1.51,
	1.52 sources, 1.30, 1.31
Message-ID: <200604051308.k35D8IFM015296@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdesdk.spec sources 
Log Message:
update to 3.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/FC-5/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	5 Feb 2006 21:13:07 -0000	1.30
+++ .cvsignore	5 Apr 2006 13:07:59 -0000	1.31
@@ -9,3 +9,4 @@
 kdesdk-3.4.92.tar.bz2
 kdesdk-3.5.0.tar.bz2
 kdesdk-3.5.1.tar.bz2
+kdesdk-3.5.2.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/FC-5/kdesdk.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- kdesdk.spec	11 Feb 2006 03:48:37 -0000	1.51
+++ kdesdk.spec	5 Apr 2006 13:08:00 -0000	1.52
@@ -14,15 +14,14 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdesdk
-Version: 3.5.1
-Release: 1.2
+Version: 3.5.2
+Release: 0.1.fc5
 Summary: The KDE Software Development Kit (SDK)
 URL: http://www.kde.org/
 License: GPL
 Group: User Interface/Desktops
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch1: kde-libtool.patch
 Patch2: kdesdk-3.4.0-db4.patch
@@ -142,8 +141,6 @@
 export CFLAGS="$FLAGS"
 export CXXFLAGS="$FLAGS"
 
-perl -pi -e "d/kbugbuster//g" subdirs && rm -rf kbugbuster
-
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
@@ -175,14 +172,11 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-for f in cervisia catalogmanager kbabel kbabeldict kcachegrind kompare kuiviewer umbrello ; do
-   desktop-file-install \
-      --vendor "" \
-      --dir $RPM_BUILD_ROOT%{appdir} \
-      --delete-original \
-      --add-category="X-KDE-More" \
-      $RPM_BUILD_ROOT%{appdir}/$f.desktop
-done
+desktop-file-install --vendor "" --delete-original \
+  --dir $RPM_BUILD_ROOT%{appdir} \
+  --add-only-show-in KDE \
+  $RPM_BUILD_ROOT%{appdir}/kbugbuster.desktop \
+  $RPM_BUILD_ROOT%{appdir}/kuiviever.desktop
 
 # make symlinks relative
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/HTML/en/common
@@ -236,6 +230,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Apr 05 2006 Than Ngo <than at redhat.com> 3.5.2-0.1.fc5
+- update to 3.5.2
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - (none):3.5.1-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/FC-5/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	5 Feb 2006 21:13:07 -0000	1.30
+++ sources	5 Apr 2006 13:08:00 -0000	1.31
@@ -1 +1 @@
-93199b8bf5793681fdb2e5cbcfcfbd93  kdesdk-3.5.1.tar.bz2
+0047e87532930a390d7a1826fd8cdaf5  kdesdk-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr  5 13:11:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 09:11:58 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.179,
	1.180 policycoreutils.spec, 1.254, 1.255
Message-ID: <200604051311.k35DBwQk015500@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15485

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Wed Mar 29 2006 Dan Walsh <dwalsh at redhat.com> 1.30.4-2
- Fix audit2allow to not require ausearch.
- Fix man page
- Add libflashplayer to restorecond.conf


policycoreutils-rhat.patch:
 audit2allow/audit2allow      |    2 +-
 audit2allow/audit2allow.1    |    5 +++++
 restorecond/restorecond.conf |    1 +
 semanage/semanage            |    2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- policycoreutils-rhat.patch	29 Mar 2006 15:14:48 -0000	1.179
+++ policycoreutils-rhat.patch	5 Apr 2006 13:11:54 -0000	1.180
@@ -1,1070 +1,47 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30.1/audit2allow/audit2allow
---- nsapolicycoreutils/audit2allow/audit2allow	2006-03-10 09:48:04.000000000 -0500
-+++ policycoreutils-1.30.1/audit2allow/audit2allow	2006-03-29 10:08:58.000000000 -0500
-@@ -27,15 +27,14 @@
- import commands, sys, os, pwd, string, getopt, re, selinux
- 
- obj="(\{[^\}]*\}|[^ \t:]*)"
--allow_regexp="allow[ \t]+%s[ \t]*%s[ \t]*:[ \t]*%s[ \t]*%s" % (obj, obj, obj, obj)
--
-+allow_regexp="(allow|dontaudit)[ \t]+%s[ \t]*%s[ \t]*:[ \t]*%s[ \t]*%s" % (obj, obj, obj, obj)
- awk_script='/^[[:blank:]]*interface[[:blank:]]*\(/ {\n\
-         IFACEFILE=FILENAME\n\
- 	IFACENAME = gensub("^[[:blank:]]*interface[[:blank:]]*\\\\(\`?","","g",$0);\n\
- 	IFACENAME = gensub("\'?,.*$","","g",IFACENAME);\n\
- }\n\
- \n\
--/^[[:blank:]]*allow[[:blank:]]+.*;[[:blank:]]*$/ {\n\
-+/^[[:blank:]]*(allow|dontaudit)[[:blank:]]+.*;[[:blank:]]*$/ {\n\
- \n\
-   if ((length(IFACENAME) > 0) && (IFACEFILE == FILENAME)){\n\
- 		ALLOW = gensub("^[[:blank:]]*","","g",$0)\n\
-@@ -84,14 +83,13 @@
-                 m=re.match(regexp,r)
-                 if m==None:
-                     continue
--                else:
--                    val=m.groups()
-+                val=m.groups()
-                 file=os.path.basename(val[0]).split(".")[0]
-                 iface=val[1]
--                Scon=val[2].split()
--                Tcon=val[3].split()
--                Class=val[4].split()
--                Access=trans.get(val[5].split())
-+                Scon=val[3].split()
-+                Tcon=val[4].split()
-+                Class=val[5].split()
-+                Access=trans.get(val[6].split())
-                 for s in Scon:
-                     for t in Tcon:
-                         for c in Class:
-@@ -217,12 +215,15 @@
- class seruleRecords:
- 	def __init__(self, input, last_reload=0, verbose=0, te_ind=0):
- 		self.last_reload=last_reload
--		self.seRules={}
-+                self.initialize()
-+		self.load(input, te_ind)
-+		self.gen_ref_policy = False
-+
-+        def initialize(self):
-+       		self.seRules={}
- 		self.seclasses={}
- 		self.types=[]
- 		self.roles=[]
--		self.load(input, te_ind)
--		self.gen_ref_policy = False
- 
- 	def gen_reference_policy(self):
- 		self.gen_ref_policy = True
-@@ -330,7 +331,7 @@
- 			return
- 		
- 		if "load_policy" in avc and self.last_reload:
--			self.seRules={}
-+                        self.initialize()
- 
- 		if "granted" in avc:
- 			return
-@@ -395,6 +396,9 @@
- 				self.types.append(type)
- 
- 	def gen_module(self, module):
-+            if self.gen_ref_policy:
-+		return "policy_module(%s, 1.0);" % module
-+            else:
- 		return "module %s 1.0;" % module
- 
- 	def gen_requires(self):
-@@ -403,11 +407,11 @@
- 		keys=self.seclasses.keys()
- 		keys.sort()
- 		rec="\n\nrequire {\n"
--		if len(self.roles) > 0:
--			for i in self.roles:
--				rec += "\trole %s; \n" % i
--			rec += "\n" 
--
-+#		if len(self.roles) > 0:
-+#			for i in self.roles:
-+#				rec += "\trole %s; \n" % i
-+#			rec += "\n" 
-+#
- 		for i in keys:
- 			access=self.seclasses[i]
- 			if len(access) > 1:
-@@ -423,7 +427,7 @@
- 			
- 		for i in self.types:
- 			rec += "\ttype %s; \n" % i
--		rec += " };\n\n\n"
-+		rec += "};\n\n"
- 		return rec
- 	
- 	def out(self, require=0, module=""):
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.30.1/Makefile
---- nsapolicycoreutils/Makefile	2005-11-29 10:55:01.000000000 -0500
-+++ policycoreutils-1.30.1/Makefile	2006-03-28 23:03:06.000000000 -0500
-@@ -1,4 +1,4 @@
--SUBDIRS=setfiles semanage load_policy newrole run_init restorecon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand setsebool po
-+SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand setsebool po
- 
- all install relabel clean: 
- 	@for subdir in $(SUBDIRS); do \
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-1.30.1/restorecond/Makefile
---- nsapolicycoreutils/restorecond/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.30.1/restorecond/Makefile	2006-03-28 23:03:06.000000000 -0500
-@@ -0,0 +1,29 @@
-+# Installation directories.
-+PREFIX ?= ${DESTDIR}/usr
-+SBINDIR ?= $(PREFIX)/sbin
-+MANDIR = $(PREFIX)/share/man
-+INITDIR = $(DESTDIR)/etc/rc.d/init.d
-+SELINUXDIR = $(DESTDIR)/etc/selinux
-+
-+CFLAGS ?= -g -Werror -Wall -W
-+override CFLAGS += -I$(PREFIX)/include -D_FILE_OFFSET_BITS=64
-+LDLIBS += -lselinux -L$(PREFIX)/lib
-+
-+all: restorecond
-+
-+restorecond:  restorecond.o utmpwatcher.o stringslist.o
-+	$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
-+
-+install: all
-+	[ -d $(MANDIR)/man8 ] || mkdir -p $(MANDIR)/man8
-+	-mkdir -p $(SBINDIR)
-+	install -m 755 restorecond $(SBINDIR)
-+	install -m 644 restorecond.8 $(MANDIR)/man8
-+	-mkdir -p $(INITDIR)
-+	install -m 644 restorecond.init $(INITDIR)/restorecond
-+	-mkdir -p $(SELINUXDIR)
-+	install -m 600 restorecond.conf $(SELINUXDIR)/restorecond.conf
-+
-+clean:
-+	-rm -f restorecond *.o *~
-+
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-1.30.1/restorecond/restorecond.8
---- nsapolicycoreutils/restorecond/restorecond.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.30.1/restorecond/restorecond.8	2006-03-28 23:03:06.000000000 -0500
-@@ -0,0 +1,31 @@
-+.TH "restorecond" "8" "2002031409" "" ""
-+.SH "NAME"
-+restorecond \- daemon that watches for file creation and then corrects file context
-+
-+.SH "SYNOPSIS"
-+.B restorecond  [\-d]
-+.P
-+
-+.SH "DESCRIPTION"
-+This manual page describes the
-+.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 
-+the correct file context associated with the policy.
-+
-+.SH "OPTIONS"
-+.TP 
-+.B \-d
-+Turns on debugging mode.   Application will stay in the foreground and lots of
-+debugs messages start printing.
-+
-+.SH "AUTHOR"
-+This man page was written by Dan Walsh <dwalsh at redhat.com>.
-+The program was written by Dan Walsh <dwalsh at redhat.com>.
-+
-+.SH "FILES"
-+/etc/selinux/POLICYTYPE/restorconfiles.conf
-+
-+.SH "SEE ALSO"
-+.BR restorecon (8),
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30.1/restorecond/restorecond.c
---- nsapolicycoreutils/restorecond/restorecond.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.30.1/restorecond/restorecond.c	2006-03-28 23:03:06.000000000 -0500
-@@ -0,0 +1,451 @@
-+/*
-+ * restorecond
-+ *
-+ * Copyright (C) 2006 Red Hat 
-+ * see file 'COPYING' for use and warranty information
-+ *
-+ * 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
-+ *
-+ * Authors:  
-+ *   Dan Walsh <dwalsh at redhat.com>
-+ *
-+*/
-+
-+/* 
-+ * PURPOSE:
-+ * This daemon program watches for the creation of files listed in a config file
-+ * and makes sure that there security context matches the systems defaults
-+ *
-+ * USAGE:
-+ * restorecond [-d]
-+ * 
-+ * -d   Run in debug mode
-+ *
-+ * EXAMPLE USAGE:
-+ * restorecond
-+ *
-+ */
-+
-+#define _GNU_SOURCE
-+#include <sys/inotify.h>
-+#include <errno.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <signal.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <ctype.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <syslog.h>
-+#include <limits.h>
-+#include <fcntl.h>
-+
-+#include "restorecond.h"
-+#include "stringslist.h"
-+#include "utmpwatcher.h"
-+
-+extern char *dirname(char *path);
-+static int master_fd=-1;
-+static int master_wd=-1;
-+static int terminate=0;
-+
-+#include <selinux/selinux.h>
-+#include <utmp.h>
-+
-+/* size of the event structure, not counting name */
-+#define EVENT_SIZE  (sizeof (struct inotify_event))
-+/* reasonable guess as to size of 1024 events */
-+#define BUF_LEN        (1024 * (EVENT_SIZE + 16))
-+
-+static int debug_mode=0;
-+
-+static void restore(const char *filename);
-+
-+struct watchList {
-+	struct watchList *next;
-+	int  wd;
-+	char *dir;
-+	struct stringsList *files;
-+};
-+struct watchList *firstDir=NULL;
-+
-+/* Compare two contexts to see if their differences are "significant",
-+ * or whether the only difference is in the user. */
-+static int only_changed_user(const char *a, const char *b)
-+{
-+	char *rest_a, *rest_b; /* Rest of the context after the user */
-+	if (!a || !b) return 0;
-+	rest_a = strchr(a, ':');
-+	rest_b = strchr(b, ':');
-+	if (!rest_a || !rest_b) return 0;
-+	return  (strcmp(rest_a, rest_b) == 0);
-+}
-+
-+/* 
-+   A file was in a direcroty has been created. This function checks to 
-+   see if it is one that we are watching.
-+*/
-+
-+static int watch_list_find(int wd, const char *file) {
-+	struct watchList *ptr=NULL;
-+	ptr=firstDir;
-+
-+	if (debug_mode)
-+		printf("%d: File=%s\n", wd,  file);
-+	while (ptr != NULL) {
-+		if (ptr->wd == wd) {
-+			if (strings_list_find(ptr->files, file) == 0) {
-+				char *path=NULL;
-+				if (asprintf(&path, "%s/%s",ptr->dir, file) < 0)
-+					exitApp("Error allocating memory.");
-+				restore (path);
-+				free(path);
-+				return 0;
-+			} 
-+			if (debug_mode) 
-+				strings_list_print(ptr->files);
-+
-+			/* Not found in this directory */
-+			return -1;
-+		}
-+		ptr=ptr->next;
-+	}
-+	/* Did not find a directory */
-+	return -1;
-+}
-+
-+static void watch_list_free(int fd) {
-+	struct watchList *ptr=NULL;
-+	struct watchList *prev=NULL;
-+	ptr=firstDir;
-+
-+	while (ptr!=NULL) {
-+		inotify_rm_watch(fd, ptr->wd);
-+		strings_list_free(ptr->files);
-+		free(ptr->dir);
-+		prev=ptr;
-+		ptr=ptr->next;
-+		free(prev);
-+	}
-+	firstDir=NULL;
-+}
-+
-+/* 
-+   Set the file context to the default file context for this system.
-+   Same as restorecon.
-+*/
-+static void restore(const char *filename) {
-+	int retcontext=0;
-+	security_context_t scontext=NULL;
-+	security_context_t prev_context=NULL;
-+	struct stat st;
-+	int fd=-1;
-+	if (debug_mode)
-+		printf("restore %s\n", filename);
-+
-+	fd = open(filename, O_NOFOLLOW | O_RDONLY );
-+	if ( fd < 0 ) {
-+		syslog(LOG_ERR,"Unable to open file (%s) %s\n", filename,strerror(errno));
-+		return;
-+	}
-+
-+
-+	if (fstat(fd, &st)!=0) {
-+		syslog(LOG_ERR,"Unable to stat file (%s) %s\n", filename,strerror(errno));
-+		close(fd);
-+		return;
-+	}
-+
-+	if (! (st.st_mode & S_IFDIR) && st.st_nlink > 1) {
-+		syslog(LOG_ERR,"Will not restore a file with more than one hard link (%s) %s\n", filename,strerror(errno));
-+		close(fd);
-+		return;
-+	}
-+
-+	if (matchpathcon(filename, st.st_mode, &scontext) < 0) {
-+		if (errno == ENOENT)
-+			return;
-+		syslog(LOG_ERR,"matchpathcon(%s) failed %s\n", filename,strerror(errno));
-+		return;
-+	} 
-+	retcontext=fgetfilecon(fd,&prev_context);
-+	
-+	if (retcontext >= 0 || errno == ENODATA) {
-+		if (retcontext < 0) prev_context=NULL;
-+		if (retcontext < 0 || 
-+		    (strcmp(prev_context,scontext) != 0)) {
-+
-+			if (only_changed_user(scontext, prev_context) != 0) {
-+				free(scontext);
-+				free(prev_context);
-+				close(fd);
-+				return;
-+			}
-+
-+			if (fsetfilecon(fd,scontext) < 0) {
-+				syslog(LOG_ERR,"set context %s->%s failed:'%s'\n",
-+					filename, scontext, strerror(errno));
-+				if (retcontext >= 0)
-+					free(prev_context);
-+				free(scontext);
-+				close(fd);
-+				return;
-+			}
-+			syslog(LOG_WARNING,"Reset file context %s: %s->%s\n", filename, prev_context, scontext);
-+		}
-+		if (retcontext >= 0)
-+			free(prev_context);
-+	} 
-+	else {
-+		syslog(LOG_ERR,"get context on %s failed: '%s'\n",
-+			filename, strerror(errno));
-+	}
-+	free(scontext);
-+	close(fd);
-+}
-+
-+static void process_config(int fd, FILE *cfg) {
-+	char *line_buf=NULL;
-+	unsigned int len=0;
-+
-+	while (getline(&line_buf, &len, cfg)>0) {
-+		char *buffer=line_buf;
-+		while(isspace(*buffer))
-+			buffer++;
-+		if(buffer[0] == '#') continue;
-+		int l=strlen(buffer)-1;
-+		if ( l <= 0 ) continue;
-+		buffer[l]=0;
-+		if(buffer[0] == '~') 
-+			utmpwatcher_add(fd, &buffer[1]);
-+		else {
-+			watch_list_add(fd, buffer);
-+		}
-+	}
-+	free(line_buf);
-+}
-+
-+/* 
-+   Read config file ignoring Comment lines 
-+   Files specified one per line.  Files with "~" will be expanded to the logged in users
-+   homedirs.
-+*/
-+
-+static void read_config(int fd) {
-+	char *watch_file_path="/etc/selinux/restorecond.conf";
-+
-+	FILE *cfg = NULL;
-+	if (debug_mode)
-+		printf("Read Config\n");
-+
-+	watch_list_free(fd);
-+
-+	cfg=fopen(watch_file_path, "r");
-+	if (!cfg) exitApp("Error reading config file.");
-+	process_config(fd, cfg);
-+	fclose(cfg);
-+
-+	inotify_rm_watch(fd, master_wd);
-+	master_wd=inotify_add_watch (fd, watch_file_path, IN_MOVED_FROM | IN_MODIFY);
-+}
-+
-+/* 
-+   Inotify watch loop 
-+*/
-+static int watch(int fd) {
-+	char buf[BUF_LEN];
-+	int len, i = 0;
-+	len = read(fd, buf, BUF_LEN);
-+	if (len < 0) {  
-+		if (terminate == 0) {
-+			syslog(LOG_ERR, "Read error (%s)", strerror(errno));
-+			return 0; 
-+		}
-+		syslog(LOG_ERR, "terminated");
-+		return -1;
-+	} else if (!len)
-+		/* BUF_LEN too small? */
-+		return -1;
-+	while (i < len) {
-+		struct inotify_event *event;
-+		event = (struct inotify_event *) &buf[i];
-+		if (debug_mode) 
-+			printf ("wd=%d mask=%u cookie=%u len=%u\n",
-+				event->wd, event->mask,
-+				event->cookie, event->len);
-+		if (event->wd == master_wd) 
-+			read_config(fd);
-+		else {
-+			switch (utmpwatcher_handle(fd, event->wd)) {
-+			case -1: /* Message was not for utmpwatcher */
-+				if (event->len)
-+					watch_list_find (event->wd, event->name);
-+				break;
-+
-+			case 1: /* utmp has changed need to reload */
-+				read_config(fd);
-+				break;
-+
-+			default: /* No users logged in or out */
-+				break;
-+			}
-+		}
-+
-+
-+		i += EVENT_SIZE + event->len;
-+	}
-+	return 0;
-+}
-+
-+static const char *pidfile = "/var/run/restorecond.pid";
-+
-+static int write_pid_file(void)
-+{
-+	int pidfd, len;
-+	char val[16];
-+
-+	len = snprintf(val, sizeof(val), "%u\n", getpid());
-+	if (len < 0) {
-+		syslog(LOG_ERR, "Pid error (%s)", strerror(errno));
-+		pidfile = 0;
-+		return 1;
-+	}
-+	pidfd = open(pidfile, O_CREAT | O_TRUNC | O_NOFOLLOW | O_WRONLY, 0644);
-+	if (pidfd < 0) {
-+		syslog(LOG_ERR, "Unable to set pidfile (%s)",
-+			strerror(errno));
-+		pidfile = 0;
-+		return 1;
-+	}
-+	(void)write(pidfd, val, (unsigned int)len);
-+	close(pidfd);
-+	return 0;
-+}
-+
-+/*
-+ * SIGTERM handler
-+ */ 
-+static void term_handler()
-+{
-+	terminate=1;
-+	/* trigger a failure in the watch */
-+	close(master_fd);
-+}
-+
-+static void usage(char *program) {
-+	printf("%s [-d] \n", program);
-+	exit(0);
-+}
-+
-+void exitApp(const char *msg) {
-+	perror(msg);
-+	exit(-1);
-+}
-+
-+/* 
-+   Add a file to the watch list.  We are watching for file creation, so we actually
-+   put the watch on the directory and then examine all files created in that directory
-+   to see if it is one that we are watching.
-+*/
-+
-+void watch_list_add(int fd, const char *path) {
-+	struct watchList *ptr=NULL;
-+	struct watchList *prev=NULL;
-+	char *x=strdup(path);
-+	if (!x) exitApp("Out of Memory");
-+	char *dir=dirname(x);
-+	char *file=basename(path);
-+	ptr=firstDir;
-+
-+	restore(path);
-+
-+	while (ptr!=NULL) {
-+		if (strcmp(dir, ptr->dir) == 0) {
-+			strings_list_add(&ptr->files, file);
-+			free(x);
-+			return;
-+		}
-+		prev=ptr;
-+		ptr=ptr->next;
-+	}
-+	ptr=calloc(1, sizeof(struct watchList));
-+
-+	if (!ptr) exitApp("Out of Memory");
-+	ptr->wd=inotify_add_watch (fd, dir, IN_CREATE | IN_MOVED_TO );
-+
-+	ptr->dir=strdup(dir);
-+	if (!ptr->dir) exitApp("Out of Memory");
-+
-+	strings_list_add(&ptr->files, file);
-+	if (prev) 
-+		prev->next=ptr;
-+	else 
-+		firstDir=ptr;
-+
-+	if (debug_mode)
-+		printf("%d: Dir=%s, File=%s\n", ptr->wd,  ptr->dir, file);
-+
-+	free(x);
-+}
-+
-+int main(int argc, char **argv) {
-+	int opt;
-+	struct sigaction sa;
-+
-+#ifndef DEBUG
-+	/* Make sure we are root */
-+	if (getuid() != 0) {
-+		fprintf(stderr, "You must be root to run this program.\n");
-+		return 4;
-+	}
-+#endif
-+
-+	/* Register sighandlers */
-+	sa.sa_flags = 0 ;
-+	sa.sa_handler = term_handler;
-+	sigemptyset( &sa.sa_mask ) ;
-+	sigaction( SIGTERM, &sa, NULL );
-+
-+	master_fd = inotify_init ();
-+	if (master_fd < 0)
-+	        exitApp("inotify_init");
-+
-+	while ((opt = getopt(argc, argv, "d")) > 0) {
-+		switch (opt) {
-+		case 'd':
-+			debug_mode = 1;
-+			break;
-+		case '?':
-+			usage(argv[0]);
-+		}
-+	}
-+	read_config(master_fd);
-+
-+	write_pid_file();
-+
-+	if (! debug_mode)
-+		daemon(0, 0);
-+
-+	while (watch(master_fd) == 0 ) {};
-+
-+	watch_list_free(master_fd);
-+	close(master_fd);
-+	if (pidfile)
-+		unlink(pidfile);
-+
-+	return 0;
-+}
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.30.1/restorecond/restorecond.conf
---- nsapolicycoreutils/restorecond/restorecond.conf	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.30.1/restorecond/restorecond.conf	2006-03-28 23:03:06.000000000 -0500
-@@ -0,0 +1,4 @@
-+/etc/resolv.conf
-+/etc/mtab
-+/var/run/utmp
-+~/public_html
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-1.30.1/restorecond/restorecond.h
---- nsapolicycoreutils/restorecond/restorecond.h	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.30.1/restorecond/restorecond.h	2006-03-28 23:03:06.000000000 -0500
-@@ -0,0 +1,31 @@
-+/* restorecond.h -- 
-+ * Copyright 2006 Red Hat Inc., Durham, North Carolina.
-+ * All Rights Reserved.
-+ *
-+ * 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
-+ *
-+ * Authors:
-+ *   Dan Walsh <dwalsh at redhat.com>
-+ * 
-+ */
-+
-+#ifndef RESTORED_CONFIG_H
-+#define RESTORED_CONFIG_H
-+
-+void exitApp(const char *msg);
-+void watch_list_add(int inotify_fd, const char *path);
-+
-+#endif
-+
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-1.30.1/restorecond/restorecond.init
---- nsapolicycoreutils/restorecond/restorecond.init	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.30.1/restorecond/restorecond.init	2006-03-28 23:03:06.000000000 -0500
-@@ -0,0 +1,61 @@
-+#!/bin/sh
-+#
-+# restorecond:		Daemo used to maintain path file context
-+#
-+# chkconfig:	2345 10 90
-+# description:	restorecond uses inotify to look for creation of new files listed in the 
-+#               /etc/selinux/POLICYTYPE/restorefiles.conf file, and sets the correct security 
-+#               context.
-+#
-+
-+# Source function library.
-+. /etc/rc.d/init.d/functions
-+
-+start() 
-+{
-+        echo -n $"Starting restorecond: "
-+        daemon /usr/sbin/restorecond 
-+
-+	touch /var/lock/subsys/restorecond
-+        echo
-+}
-+
-+stop() 
-+{
-+        echo -n $"Shutting down restorecond: "
-+	killproc restorecond
-+
-+	rm -f  /var/lock/subsys/restorecond
-+        echo
-+}
-+restart() 
-+{
-+    stop
-+    start
-+}
-+
-+[ -f /usr/sbin/restorecond ] || exit 0
-+
-+# See how we were called.
-+case "$1" in
-+  start)
-+	start
-+        ;;
-+  stop)
-+	stop
-+        ;;
-+  status)
-+	status restorecond
-+	;;
-+  restart|reload)
-+	restart
-+	;;
-+  condrestart)
-+	[ -e /var/lock/subsys/restorecond ] && restart || :
-+	;;
-+  *)
-+        echo $"Usage: $0 {start|stop|restart|reload|condrestart}"
-+        exit 1
-+esac
-+
-+exit 0
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/stringslist.c policycoreutils-1.30.1/restorecond/stringslist.c
---- nsapolicycoreutils/restorecond/stringslist.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.30.1/restorecond/stringslist.c	2006-03-28 23:03:06.000000000 -0500
-@@ -0,0 +1,118 @@
-+/*
-+ * Copyright (C) 2006 Red Hat 
-+ * see file 'COPYING' for use and warranty information
-+ *
-+ * 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
-+ *
-+ * Authors:  
-+ *   Dan Walsh <dwalsh at redhat.com>
-+ *
-+*/
-+
-+#include <string.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include "stringslist.h"
-+#include "restorecond.h"
-+
-+/* Sorted lists */
-+void strings_list_add(struct stringsList **list, const char *string) {
-+	struct stringsList *ptr=*list;
-+	struct stringsList *prev=NULL;
-+	struct stringsList *newptr=NULL;
-+	while(ptr) {
-+		int cmp=strcmp(string, ptr->string);
-+		if (cmp < 0) break;  /* Not on list break out to add */
-+		if (cmp == 0) return; /* Already on list */
-+		prev=ptr;
-+		ptr=ptr->next;
-+	}
-+	newptr=calloc(1, sizeof(struct stringsList));
-+	if (!newptr) exitApp("Out of Memory");
-+	newptr->string=strdup(string);
-+	newptr->next = ptr;
-+	if (prev) 
-+		prev->next=newptr;
-+	else
-+		*list=newptr;
-+}
-+
-+int strings_list_find(struct stringsList *ptr, const char *string) {
-+	while (ptr) {
-+		int cmp=strcmp(string, ptr->string);
-+		if (cmp < 0) return -1;  /* Not on list break out to add */
-+		if (cmp == 0) return 0; /* Already on list */
-+		ptr=ptr->next;
-+	}
-+	return -1;
-+}
-+
-+void strings_list_free(struct stringsList *ptr) {
-+	struct stringsList *prev=NULL;
-+	while (ptr) {
-+		free(ptr->string);
-+		prev=ptr;
-+		ptr=ptr->next;
-+		free(prev);
-+	}
-+}
-+
-+int strings_list_diff(struct stringsList *from, struct stringsList *to) {
-+	while (from != NULL && to != NULL) {
-+		if (strcmp(from->string, to->string) != 0) return 1;
-+		from=from->next;
-+		to=to->next;
-+	}
-+	if (from != NULL || to != NULL) return 1;
-+	return 0;
-+}
-+
-+void strings_list_print(struct stringsList *ptr) {
-+	while (ptr) {
-+		printf("%s\n", ptr->string);
-+		ptr=ptr->next;
-+	}
-+}
-+
-+
-+#ifdef TEST
-+void exitApp(const char *msg) {
-+	perror(msg);
-+	exit(-1);
-+}
-+
-+int main(int argc, char **argv) {
-+	struct stringsList *list=NULL;
-+	struct stringsList *list1=NULL;
-+	strings_list_add(&list, "/etc/resolv.conf");
-+	strings_list_add(&list, "/etc/walsh");
-+	strings_list_add(&list, "/etc/mtab");
-+	strings_list_add(&list, "/etc/walsh");
-+	if (strings_list_diff(list, list) != 0) printf ("strings_list_diff test1 bug\n");
-+	strings_list_add(&list1, "/etc/walsh");
-+	if (strings_list_diff(list, list1) == 0) printf ("strings_list_diff test2 bug\n");
-+	strings_list_add(&list1, "/etc/walsh");
-+	strings_list_add(&list1, "/etc/resolv.conf");
-+	strings_list_add(&list1, "/etc/mtab1");
-+	if (strings_list_diff(list, list1) == 0) printf ("strings_list_diff test3 bug\n");
-+	printf ("strings list\n");
-+	strings_list_print(list);
-+	printf ("strings list1\n");
-+	strings_list_print(list1);
-+	strings_list_free(list);
-+	strings_list_free(list1);
-+}
-+#endif
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/stringslist.h policycoreutils-1.30.1/restorecond/stringslist.h
---- nsapolicycoreutils/restorecond/stringslist.h	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.30.1/restorecond/stringslist.h	2006-03-28 23:03:06.000000000 -0500
-@@ -0,0 +1,37 @@
-+/* stringslist.h -- 
-+ * Copyright 2006 Red Hat Inc., Durham, North Carolina.
-+ * All Rights Reserved.
-+ *
-+ * 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
-+ *
-+ * Authors:
-+ *   Dan Walsh <dwalsh at redhat.com>
-+ * 
-+ */
-+#ifndef STRINGSLIST_H
-+#define STRINGSLIST_H
-+
-+struct stringsList {
-+	struct stringsList *next;
-+	char *string;
-+};
-+
-+void strings_list_free(struct stringsList *list);
-+void strings_list_add(struct stringsList **list, const char *string);
-+void strings_list_print(struct stringsList *list);
-+int strings_list_find(struct stringsList *list, const char *string);
-+int strings_list_diff(struct stringsList *from, struct stringsList *to);
-+
-+#endif
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.c policycoreutils-1.30.1/restorecond/utmpwatcher.c
---- nsapolicycoreutils/restorecond/utmpwatcher.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.30.1/restorecond/utmpwatcher.c	2006-03-28 23:03:06.000000000 -0500
-@@ -0,0 +1,105 @@
-+/*
-+ * utmpwatcher.c
-+ *
-+ * Copyright (C) 2006 Red Hat 
-+ * see file 'COPYING' for use and warranty information
-+ *
-+ * 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
-+ *
-+ * Authors:  
-+ *   Dan Walsh <dwalsh at redhat.com>
-+ *
-+ *
-+*/
-+
-+#define _GNU_SOURCE
-+#include <sys/inotify.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <syslog.h>
-+
-+#include <limits.h>
-+#include <utmp.h>
-+#include <sys/types.h>
-+#include <pwd.h>
-+#include "restorecond.h"
-+#include "utmpwatcher.h"
-+#include "stringslist.h"
-+
-+static struct stringsList *utmp_ptr=NULL;
-+static int utmp_wd=-1;
-+
-+unsigned int utmpwatcher_handle(int inotify_fd, int wd) {
-+	int changed=0;
-+	struct utmp u;
-+	char *utmp_path="/var/run/utmp";
-+	struct stringsList *prev_utmp_ptr=utmp_ptr;
-+	if (wd != utmp_wd) return -1;
-+
-+	utmp_ptr=NULL;
-+	FILE *cfg=fopen(utmp_path, "r");
-+	if (!cfg) exitApp("Error reading config file.");
-+
-+	while (fread(&u, sizeof(struct utmp), 1, cfg) > 0) {
-+		if (u.ut_type == USER_PROCESS) 
-+			strings_list_add(&utmp_ptr, u.ut_user);
-+	}
-+	fclose(cfg);
-+	if (utmp_wd >= 0) 
-+		inotify_rm_watch(inotify_fd, utmp_wd);
-+
-+	utmp_wd=inotify_add_watch (inotify_fd, utmp_path, IN_MOVED_FROM | IN_MODIFY);
-+	if (prev_utmp_ptr) {
-+		changed=strings_list_diff(prev_utmp_ptr, utmp_ptr);
-+		strings_list_free(prev_utmp_ptr);
-+	}
-+	return changed;
-+}
-+
-+static void watch_file(int inotify_fd, const char *file) {
-+	struct stringsList *ptr=utmp_ptr;
-+	
-+	while(ptr) {
-+		struct passwd *pwd=getpwnam(ptr->string);
-+		if (pwd) {
-+			char *path=NULL;
-+			if (asprintf(&path, "%s%s",pwd->pw_dir, file) < 0)
-+				exitApp("Error allocating memory.");
-+			watch_list_add(inotify_fd, path);
-+			free(path);
-+		}
-+		ptr=ptr->next;
-+	}
-+}
-+
-+void utmpwatcher_add(int inotify_fd, const char *path) {
-+	if (utmp_ptr == NULL) {
-+		utmpwatcher_handle(inotify_fd, utmp_wd);
-+	}
-+	watch_file(inotify_fd, path);
-+}
-+
-+#ifdef TEST
-+int main(int argc, char **argv) {
-+	read_utmp();
-+	return 0;
-+}
-+#endif
-+
-+
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.h policycoreutils-1.30.1/restorecond/utmpwatcher.h
---- nsapolicycoreutils/restorecond/utmpwatcher.h	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.30.1/restorecond/utmpwatcher.h	2006-03-28 23:03:06.000000000 -0500
-@@ -0,0 +1,29 @@
-+/* utmpwatcher.h -- 
-+ * Copyright 2006 Red Hat Inc., Durham, North Carolina.
-+ * All Rights Reserved.
-+ *
-+ * 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
-+ *
-+ * Authors:
-+ *   Dan Walsh <dwalsh at redhat.com>
-+ * 
-+ */
-+#ifndef UTMPWATCHER_H
-+#define UTMPWATCHER_H
-+
-+unsigned int utmpwatcher_handle(int inotify_fd, int wd);
-+void utmpwatcher_add(int inotify_fd, const char *path);
-+
-+#endif
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.1/scripts/fixfiles
---- nsapolicycoreutils/scripts/fixfiles	2006-01-04 13:07:46.000000000 -0500
-+++ policycoreutils-1.30.1/scripts/fixfiles	2006-03-28 23:03:06.000000000 -0500
-@@ -124,7 +124,15 @@
-     exit $?
- fi
- if [ ! -z "$DIRS" ]; then
--    ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $1 -v $DIRS 2>&1 >> $LOGFILE
-+    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
-+	done
-+    else
-+	${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $1 -v $DIRS 2>&1 >> $LOGFILE
-+    fi
-+
-     exit $?
- fi
- LogReadOnly
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30.4/audit2allow/audit2allow
+--- nsapolicycoreutils/audit2allow/audit2allow	2006-03-29 15:35:22.000000000 -0500
++++ policycoreutils-1.30.4/audit2allow/audit2allow	2006-04-05 08:59:26.000000000 -0400
+@@ -577,7 +577,7 @@
+ 		if ref_ind:
+ 			out.gen_reference_policy()
+ 
+-		if auditlogs:
++		if auditlogs and os.path.exists("/var/log/audit/audit.log"):
+ 			input=os.popen("ausearch -m avc")
+ 			out.load(input)
+ 
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-1.30.4/audit2allow/audit2allow.1
+--- nsapolicycoreutils/audit2allow/audit2allow.1	2006-03-10 09:48:04.000000000 -0500
++++ policycoreutils-1.30.4/audit2allow/audit2allow.1	2006-04-05 09:09:05.000000000 -0400
+@@ -98,6 +98,11 @@
+ .PP
+ .SH EXAMPLE
+ .nf
++.B NOTE: These examples are for systems using the audit package.  If you do 
++.B not use the audit package,  the AVC messages will be in /var/log/messages.
++.B Please substiture /var/log/messages for /var/log/audit/audit.log in the 
++.B examples.
++.PP
+ .B Using audit2allow to generate monolithic (non-module) policy
+ $ cd /etc/selinux/$SELINUXTYPE/src/policy
+ $ cat /var/log/audit/audit.log | audit2allow >> domains/misc/local.te
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.30.4/restorecond/restorecond.conf
+--- nsapolicycoreutils/restorecond/restorecond.conf	2006-03-29 11:08:21.000000000 -0500
++++ policycoreutils-1.30.4/restorecond/restorecond.conf	2006-04-03 11:57:26.000000000 -0400
+@@ -2,3 +2,4 @@
+ /etc/mtab
+ /var/run/utmp
+ ~/public_html
++~/.mozilla/plugins/libflashplayer.so
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.30.4/semanage/semanage
+--- nsapolicycoreutils/semanage/semanage	2006-03-29 15:35:22.000000000 -0500
++++ policycoreutils-1.30.4/semanage/semanage	2006-04-01 04:54:36.000000000 -0500
+@@ -286,6 +286,8 @@
+ 		errorExit("Options Error " + error.msg)
+ 	except ValueError, error:
+ 		errorExit(error.args[0])
++	except KeyError, error:
++		errorExit("Invalid value %s" % error.args[0])
+ 	except IOError, error:
+ 		errorExit(error.args[1])
+ 	except KeyboardInterrupt, error:


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- policycoreutils.spec	29 Mar 2006 20:39:44 -0000	1.254
+++ policycoreutils.spec	5 Apr 2006 13:11:54 -0000	1.255
@@ -5,10 +5,11 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.4
-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} 
 Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff
@@ -34,6 +35,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .rhat
 
 %build
 make LOG_AUDIT_PRIV=y LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all 
@@ -105,6 +107,11 @@
 service restorecond condrestart
 
 %changelog
+* Wed Mar 29 2006 Dan Walsh <dwalsh at redhat.com> 1.30.4-2
+- Fix audit2allow to not require ausearch.
+- Fix man page
+- Add libflashplayer to restorecond.conf
+
 * Wed Mar 29 2006 Dan Walsh <dwalsh at redhat.com> 1.30.4-1
 - Update from upstream
 	* Merged audit2allow fixes for refpolicy from Dan Walsh.



From fedora-cvs-commits at redhat.com  Wed Apr  5 13:13:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 09:13:53 -0400
Subject: rpms/sound-juicer/FC-5 sound-juicer.spec, 1.44, 1.45 sources, 1.20,
	1.21
Message-ID: <200604051313.k35DDru2015596@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/sound-juicer/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15580

Modified Files:
	sound-juicer.spec sources 
Log Message:
2.14.1



Index: sound-juicer.spec
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/FC-5/sound-juicer.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sound-juicer.spec	13 Mar 2006 02:14:37 -0000	1.44
+++ sound-juicer.spec	5 Apr 2006 13:13:51 -0000	1.45
@@ -12,8 +12,8 @@
 
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
-Version:	2.14.0
-Release:	1
+Version:	2.14.1
+Release:	1.fc5.1
 License:	GPL
 Group:		Applications/Multimedia
 Source:		%{name}-%{version}.tar.bz2
@@ -102,6 +102,9 @@
 %{_datadir}/icons/hicolor/*
 
 %changelog
+* Wed Apr  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
+- Update to 2.14.1
+
 * Sun Mar 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/FC-5/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	13 Mar 2006 02:14:37 -0000	1.20
+++ sources	5 Apr 2006 13:13:51 -0000	1.21
@@ -1 +1 @@
-6cca302ece8377ac84d678078c0f6607  sound-juicer-2.14.0.tar.bz2
+d1a54d488ae8a91e2f927acddaf5ccb3  sound-juicer-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr  5 13:18:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 09:18:34 -0400
Subject: rpms/policycoreutils/FC-5 .cvsignore, 1.104,
	1.105 policycoreutils-rhat.patch, 1.170,
	1.171 policycoreutils.spec, 1.243, 1.244 sources, 1.108, 1.109
Message-ID: <200604051318.k35DIY0J029389@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore policycoreutils-rhat.patch policycoreutils.spec 
	sources 
Log Message:
* Wed Apr 5 2006 Dan Walsh <dwalsh at redhat.com> 1.30.4-2.fc5
- Bump to build in FC5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-5/.cvsignore,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- .cvsignore	22 Mar 2006 16:44:10 -0000	1.104
+++ .cvsignore	5 Apr 2006 13:18:30 -0000	1.105
@@ -93,3 +93,4 @@
 policycoreutils-1.29.23.tgz
 policycoreutils-1.29.26.tgz
 policycoreutils-1.30.1.tgz
+policycoreutils-1.30.4.tgz

policycoreutils-rhat.patch:
 audit2allow/audit2allow      |    2 +-
 audit2allow/audit2allow.1    |    5 +++++
 restorecond/restorecond.conf |    1 +
 semanage/semanage            |    2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-5/policycoreutils-rhat.patch,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- policycoreutils-rhat.patch	29 Mar 2006 20:40:59 -0000	1.170
+++ policycoreutils-rhat.patch	5 Apr 2006 13:18:30 -0000	1.171
@@ -1,1070 +1,47 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30.1/audit2allow/audit2allow
---- nsapolicycoreutils/audit2allow/audit2allow	2006-03-10 09:48:04.000000000 -0500
-+++ policycoreutils-1.30.1/audit2allow/audit2allow	2006-03-29 10:08:58.000000000 -0500
-@@ -27,15 +27,14 @@
- import commands, sys, os, pwd, string, getopt, re, selinux
- 
- obj="(\{[^\}]*\}|[^ \t:]*)"
--allow_regexp="allow[ \t]+%s[ \t]*%s[ \t]*:[ \t]*%s[ \t]*%s" % (obj, obj, obj, obj)
--
-+allow_regexp="(allow|dontaudit)[ \t]+%s[ \t]*%s[ \t]*:[ \t]*%s[ \t]*%s" % (obj, obj, obj, obj)
- awk_script='/^[[:blank:]]*interface[[:blank:]]*\(/ {\n\
-         IFACEFILE=FILENAME\n\
- 	IFACENAME = gensub("^[[:blank:]]*interface[[:blank:]]*\\\\(\`?","","g",$0);\n\
- 	IFACENAME = gensub("\'?,.*$","","g",IFACENAME);\n\
- }\n\
- \n\
--/^[[:blank:]]*allow[[:blank:]]+.*;[[:blank:]]*$/ {\n\
-+/^[[:blank:]]*(allow|dontaudit)[[:blank:]]+.*;[[:blank:]]*$/ {\n\
- \n\
-   if ((length(IFACENAME) > 0) && (IFACEFILE == FILENAME)){\n\
- 		ALLOW = gensub("^[[:blank:]]*","","g",$0)\n\
-@@ -84,14 +83,13 @@
-                 m=re.match(regexp,r)
-                 if m==None:
-                     continue
--                else:
--                    val=m.groups()
-+                val=m.groups()
-                 file=os.path.basename(val[0]).split(".")[0]
-                 iface=val[1]
--                Scon=val[2].split()
--                Tcon=val[3].split()
--                Class=val[4].split()
--                Access=trans.get(val[5].split())
-+                Scon=val[3].split()
-+                Tcon=val[4].split()
-+                Class=val[5].split()
-+                Access=trans.get(val[6].split())
-                 for s in Scon:
-                     for t in Tcon:
-                         for c in Class:
-@@ -217,12 +215,15 @@
- class seruleRecords:
- 	def __init__(self, input, last_reload=0, verbose=0, te_ind=0):
- 		self.last_reload=last_reload
--		self.seRules={}
-+                self.initialize()
-+		self.load(input, te_ind)
-+		self.gen_ref_policy = False
-+
-+        def initialize(self):
-+       		self.seRules={}
- 		self.seclasses={}
- 		self.types=[]
- 		self.roles=[]
--		self.load(input, te_ind)
--		self.gen_ref_policy = False
- 
- 	def gen_reference_policy(self):
- 		self.gen_ref_policy = True
-@@ -330,7 +331,7 @@
- 			return
- 		
- 		if "load_policy" in avc and self.last_reload:
--			self.seRules={}
-+                        self.initialize()
- 
- 		if "granted" in avc:
- 			return
-@@ -395,6 +396,9 @@
- 				self.types.append(type)
- 
- 	def gen_module(self, module):
-+            if self.gen_ref_policy:
-+		return "policy_module(%s, 1.0);" % module
-+            else:
- 		return "module %s 1.0;" % module
- 
- 	def gen_requires(self):
-@@ -403,11 +407,11 @@
- 		keys=self.seclasses.keys()
- 		keys.sort()
- 		rec="\n\nrequire {\n"
--		if len(self.roles) > 0:
--			for i in self.roles:
--				rec += "\trole %s; \n" % i
--			rec += "\n" 
--
-+#		if len(self.roles) > 0:
-+#			for i in self.roles:
-+#				rec += "\trole %s; \n" % i
-+#			rec += "\n" 
-+#
- 		for i in keys:
- 			access=self.seclasses[i]
- 			if len(access) > 1:
-@@ -423,7 +427,7 @@
- 			
- 		for i in self.types:
- 			rec += "\ttype %s; \n" % i
--		rec += " };\n\n\n"
-+		rec += "};\n\n"
- 		return rec
- 	
- 	def out(self, require=0, module=""):
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.30.1/Makefile
---- nsapolicycoreutils/Makefile	2005-11-29 10:55:01.000000000 -0500
-+++ policycoreutils-1.30.1/Makefile	2006-03-28 23:03:06.000000000 -0500
-@@ -1,4 +1,4 @@
--SUBDIRS=setfiles semanage load_policy newrole run_init restorecon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand setsebool po
-+SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand setsebool po
- 
- all install relabel clean: 
- 	@for subdir in $(SUBDIRS); do \
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-1.30.1/restorecond/Makefile
---- nsapolicycoreutils/restorecond/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.30.1/restorecond/Makefile	2006-03-28 23:03:06.000000000 -0500
-@@ -0,0 +1,29 @@
-+# Installation directories.
-+PREFIX ?= ${DESTDIR}/usr
-+SBINDIR ?= $(PREFIX)/sbin
-+MANDIR = $(PREFIX)/share/man
-+INITDIR = $(DESTDIR)/etc/rc.d/init.d
-+SELINUXDIR = $(DESTDIR)/etc/selinux
-+
-+CFLAGS ?= -g -Werror -Wall -W
-+override CFLAGS += -I$(PREFIX)/include -D_FILE_OFFSET_BITS=64
-+LDLIBS += -lselinux -L$(PREFIX)/lib
-+
-+all: restorecond
-+
-+restorecond:  restorecond.o utmpwatcher.o stringslist.o
-+	$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
-+
-+install: all
-+	[ -d $(MANDIR)/man8 ] || mkdir -p $(MANDIR)/man8
-+	-mkdir -p $(SBINDIR)
-+	install -m 755 restorecond $(SBINDIR)
-+	install -m 644 restorecond.8 $(MANDIR)/man8
-+	-mkdir -p $(INITDIR)
-+	install -m 644 restorecond.init $(INITDIR)/restorecond
-+	-mkdir -p $(SELINUXDIR)
-+	install -m 600 restorecond.conf $(SELINUXDIR)/restorecond.conf
-+
-+clean:
-+	-rm -f restorecond *.o *~
-+
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-1.30.1/restorecond/restorecond.8
---- nsapolicycoreutils/restorecond/restorecond.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.30.1/restorecond/restorecond.8	2006-03-28 23:03:06.000000000 -0500
-@@ -0,0 +1,31 @@
-+.TH "restorecond" "8" "2002031409" "" ""
-+.SH "NAME"
-+restorecond \- daemon that watches for file creation and then corrects file context
-+
-+.SH "SYNOPSIS"
-+.B restorecond  [\-d]
-+.P
-+
-+.SH "DESCRIPTION"
-+This manual page describes the
-+.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 
-+the correct file context associated with the policy.
-+
-+.SH "OPTIONS"
-+.TP 
-+.B \-d
-+Turns on debugging mode.   Application will stay in the foreground and lots of
-+debugs messages start printing.
-+
-+.SH "AUTHOR"
-+This man page was written by Dan Walsh <dwalsh at redhat.com>.
-+The program was written by Dan Walsh <dwalsh at redhat.com>.
-+
-+.SH "FILES"
-+/etc/selinux/POLICYTYPE/restorconfiles.conf
-+
-+.SH "SEE ALSO"
-+.BR restorecon (8),
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30.1/restorecond/restorecond.c
---- nsapolicycoreutils/restorecond/restorecond.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.30.1/restorecond/restorecond.c	2006-03-28 23:03:06.000000000 -0500
-@@ -0,0 +1,451 @@
-+/*
-+ * restorecond
-+ *
-+ * Copyright (C) 2006 Red Hat 
-+ * see file 'COPYING' for use and warranty information
-+ *
-+ * 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
-+ *
-+ * Authors:  
-+ *   Dan Walsh <dwalsh at redhat.com>
-+ *
-+*/
-+
-+/* 
-+ * PURPOSE:
-+ * This daemon program watches for the creation of files listed in a config file
-+ * and makes sure that there security context matches the systems defaults
-+ *
-+ * USAGE:
-+ * restorecond [-d]
-+ * 
-+ * -d   Run in debug mode
-+ *
-+ * EXAMPLE USAGE:
-+ * restorecond
-+ *
-+ */
-+
-+#define _GNU_SOURCE
-+#include <sys/inotify.h>
-+#include <errno.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <signal.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <ctype.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <syslog.h>
-+#include <limits.h>
-+#include <fcntl.h>
-+
-+#include "restorecond.h"
-+#include "stringslist.h"
-+#include "utmpwatcher.h"
-+
-+extern char *dirname(char *path);
-+static int master_fd=-1;
-+static int master_wd=-1;
-+static int terminate=0;
-+
-+#include <selinux/selinux.h>
-+#include <utmp.h>
-+
-+/* size of the event structure, not counting name */
-+#define EVENT_SIZE  (sizeof (struct inotify_event))
-+/* reasonable guess as to size of 1024 events */
-+#define BUF_LEN        (1024 * (EVENT_SIZE + 16))
-+
-+static int debug_mode=0;
-+
-+static void restore(const char *filename);
-+
-+struct watchList {
-+	struct watchList *next;
-+	int  wd;
-+	char *dir;
-+	struct stringsList *files;
-+};
-+struct watchList *firstDir=NULL;
-+
-+/* Compare two contexts to see if their differences are "significant",
-+ * or whether the only difference is in the user. */
-+static int only_changed_user(const char *a, const char *b)
-+{
-+	char *rest_a, *rest_b; /* Rest of the context after the user */
-+	if (!a || !b) return 0;
-+	rest_a = strchr(a, ':');
-+	rest_b = strchr(b, ':');
-+	if (!rest_a || !rest_b) return 0;
-+	return  (strcmp(rest_a, rest_b) == 0);
-+}
-+
-+/* 
-+   A file was in a direcroty has been created. This function checks to 
-+   see if it is one that we are watching.
-+*/
-+
-+static int watch_list_find(int wd, const char *file) {
-+	struct watchList *ptr=NULL;
-+	ptr=firstDir;
-+
-+	if (debug_mode)
-+		printf("%d: File=%s\n", wd,  file);
-+	while (ptr != NULL) {
-+		if (ptr->wd == wd) {
-+			if (strings_list_find(ptr->files, file) == 0) {
-+				char *path=NULL;
-+				if (asprintf(&path, "%s/%s",ptr->dir, file) < 0)
-+					exitApp("Error allocating memory.");
-+				restore (path);
-+				free(path);
-+				return 0;
-+			} 
-+			if (debug_mode) 
-+				strings_list_print(ptr->files);
-+
-+			/* Not found in this directory */
-+			return -1;
-+		}
-+		ptr=ptr->next;
-+	}
-+	/* Did not find a directory */
-+	return -1;
-+}
-+
-+static void watch_list_free(int fd) {
-+	struct watchList *ptr=NULL;
-+	struct watchList *prev=NULL;
-+	ptr=firstDir;
-+
-+	while (ptr!=NULL) {
-+		inotify_rm_watch(fd, ptr->wd);
-+		strings_list_free(ptr->files);
-+		free(ptr->dir);
-+		prev=ptr;
-+		ptr=ptr->next;
-+		free(prev);
-+	}
-+	firstDir=NULL;
-+}
-+
-+/* 
-+   Set the file context to the default file context for this system.
-+   Same as restorecon.
-+*/
-+static void restore(const char *filename) {
-+	int retcontext=0;
-+	security_context_t scontext=NULL;
-+	security_context_t prev_context=NULL;
-+	struct stat st;
-+	int fd=-1;
-+	if (debug_mode)
-+		printf("restore %s\n", filename);
-+
-+	fd = open(filename, O_NOFOLLOW | O_RDONLY );
-+	if ( fd < 0 ) {
-+		syslog(LOG_ERR,"Unable to open file (%s) %s\n", filename,strerror(errno));
-+		return;
-+	}
-+
-+
-+	if (fstat(fd, &st)!=0) {
-+		syslog(LOG_ERR,"Unable to stat file (%s) %s\n", filename,strerror(errno));
-+		close(fd);
-+		return;
-+	}
-+
-+	if (! (st.st_mode & S_IFDIR) && st.st_nlink > 1) {
-+		syslog(LOG_ERR,"Will not restore a file with more than one hard link (%s) %s\n", filename,strerror(errno));
-+		close(fd);
-+		return;
-+	}
-+
-+	if (matchpathcon(filename, st.st_mode, &scontext) < 0) {
-+		if (errno == ENOENT)
-+			return;
-+		syslog(LOG_ERR,"matchpathcon(%s) failed %s\n", filename,strerror(errno));
-+		return;
-+	} 
-+	retcontext=fgetfilecon(fd,&prev_context);
-+	
-+	if (retcontext >= 0 || errno == ENODATA) {
-+		if (retcontext < 0) prev_context=NULL;
-+		if (retcontext < 0 || 
-+		    (strcmp(prev_context,scontext) != 0)) {
-+
-+			if (only_changed_user(scontext, prev_context) != 0) {
-+				free(scontext);
-+				free(prev_context);
-+				close(fd);
-+				return;
-+			}
-+
-+			if (fsetfilecon(fd,scontext) < 0) {
-+				syslog(LOG_ERR,"set context %s->%s failed:'%s'\n",
-+					filename, scontext, strerror(errno));
-+				if (retcontext >= 0)
-+					free(prev_context);
-+				free(scontext);
-+				close(fd);
-+				return;
-+			}
-+			syslog(LOG_WARNING,"Reset file context %s: %s->%s\n", filename, prev_context, scontext);
-+		}
-+		if (retcontext >= 0)
-+			free(prev_context);
-+	} 
-+	else {
-+		syslog(LOG_ERR,"get context on %s failed: '%s'\n",
-+			filename, strerror(errno));
-+	}
-+	free(scontext);
-+	close(fd);
-+}
-+
-+static void process_config(int fd, FILE *cfg) {
-+	char *line_buf=NULL;
-+	unsigned int len=0;
-+
-+	while (getline(&line_buf, &len, cfg)>0) {
-+		char *buffer=line_buf;
-+		while(isspace(*buffer))
-+			buffer++;
-+		if(buffer[0] == '#') continue;
-+		int l=strlen(buffer)-1;
-+		if ( l <= 0 ) continue;
-+		buffer[l]=0;
-+		if(buffer[0] == '~') 
-+			utmpwatcher_add(fd, &buffer[1]);
-+		else {
-+			watch_list_add(fd, buffer);
-+		}
-+	}
-+	free(line_buf);
-+}
-+
-+/* 
-+   Read config file ignoring Comment lines 
-+   Files specified one per line.  Files with "~" will be expanded to the logged in users
-+   homedirs.
-+*/
-+
-+static void read_config(int fd) {
-+	char *watch_file_path="/etc/selinux/restorecond.conf";
-+
-+	FILE *cfg = NULL;
-+	if (debug_mode)
-+		printf("Read Config\n");
-+
-+	watch_list_free(fd);
-+
-+	cfg=fopen(watch_file_path, "r");
-+	if (!cfg) exitApp("Error reading config file.");
-+	process_config(fd, cfg);
-+	fclose(cfg);
-+
-+	inotify_rm_watch(fd, master_wd);
-+	master_wd=inotify_add_watch (fd, watch_file_path, IN_MOVED_FROM | IN_MODIFY);
-+}
-+
-+/* 
-+   Inotify watch loop 
-+*/
-+static int watch(int fd) {
-+	char buf[BUF_LEN];
-+	int len, i = 0;
-+	len = read(fd, buf, BUF_LEN);
-+	if (len < 0) {  
-+		if (terminate == 0) {
-+			syslog(LOG_ERR, "Read error (%s)", strerror(errno));
-+			return 0; 
-+		}
-+		syslog(LOG_ERR, "terminated");
-+		return -1;
-+	} else if (!len)
-+		/* BUF_LEN too small? */
-+		return -1;
-+	while (i < len) {
-+		struct inotify_event *event;
-+		event = (struct inotify_event *) &buf[i];
-+		if (debug_mode) 
-+			printf ("wd=%d mask=%u cookie=%u len=%u\n",
-+				event->wd, event->mask,
-+				event->cookie, event->len);
-+		if (event->wd == master_wd) 
-+			read_config(fd);
-+		else {
-+			switch (utmpwatcher_handle(fd, event->wd)) {
-+			case -1: /* Message was not for utmpwatcher */
-+				if (event->len)
-+					watch_list_find (event->wd, event->name);
-+				break;
-+
-+			case 1: /* utmp has changed need to reload */
-+				read_config(fd);
-+				break;
-+
-+			default: /* No users logged in or out */
-+				break;
-+			}
-+		}
-+
-+
-+		i += EVENT_SIZE + event->len;
-+	}
-+	return 0;
-+}
-+
-+static const char *pidfile = "/var/run/restorecond.pid";
-+
-+static int write_pid_file(void)
-+{
-+	int pidfd, len;
-+	char val[16];
-+
-+	len = snprintf(val, sizeof(val), "%u\n", getpid());
-+	if (len < 0) {
-+		syslog(LOG_ERR, "Pid error (%s)", strerror(errno));
-+		pidfile = 0;
-+		return 1;
-+	}
-+	pidfd = open(pidfile, O_CREAT | O_TRUNC | O_NOFOLLOW | O_WRONLY, 0644);
-+	if (pidfd < 0) {
-+		syslog(LOG_ERR, "Unable to set pidfile (%s)",
-+			strerror(errno));
-+		pidfile = 0;
-+		return 1;
-+	}
-+	(void)write(pidfd, val, (unsigned int)len);
-+	close(pidfd);
-+	return 0;
-+}
-+
-+/*
-+ * SIGTERM handler
-+ */ 
-+static void term_handler()
-+{
-+	terminate=1;
-+	/* trigger a failure in the watch */
-+	close(master_fd);
-+}
-+
-+static void usage(char *program) {
-+	printf("%s [-d] \n", program);
-+	exit(0);
-+}
-+
-+void exitApp(const char *msg) {
-+	perror(msg);
-+	exit(-1);
-+}
-+
-+/* 
-+   Add a file to the watch list.  We are watching for file creation, so we actually
-+   put the watch on the directory and then examine all files created in that directory
-+   to see if it is one that we are watching.
-+*/
-+
-+void watch_list_add(int fd, const char *path) {
-+	struct watchList *ptr=NULL;
-+	struct watchList *prev=NULL;
-+	char *x=strdup(path);
-+	if (!x) exitApp("Out of Memory");
-+	char *dir=dirname(x);
-+	char *file=basename(path);
-+	ptr=firstDir;
-+
-+	restore(path);
-+
-+	while (ptr!=NULL) {
-+		if (strcmp(dir, ptr->dir) == 0) {
-+			strings_list_add(&ptr->files, file);
-+			free(x);
-+			return;
-+		}
-+		prev=ptr;
-+		ptr=ptr->next;
-+	}
-+	ptr=calloc(1, sizeof(struct watchList));
-+
-+	if (!ptr) exitApp("Out of Memory");
-+	ptr->wd=inotify_add_watch (fd, dir, IN_CREATE | IN_MOVED_TO );
-+
-+	ptr->dir=strdup(dir);
-+	if (!ptr->dir) exitApp("Out of Memory");
-+
-+	strings_list_add(&ptr->files, file);
-+	if (prev) 
-+		prev->next=ptr;
-+	else 
-+		firstDir=ptr;
-+
-+	if (debug_mode)
-+		printf("%d: Dir=%s, File=%s\n", ptr->wd,  ptr->dir, file);
-+
-+	free(x);
-+}
-+
-+int main(int argc, char **argv) {
-+	int opt;
-+	struct sigaction sa;
-+
-+#ifndef DEBUG
-+	/* Make sure we are root */
-+	if (getuid() != 0) {
-+		fprintf(stderr, "You must be root to run this program.\n");
-+		return 4;
-+	}
-+#endif
-+
-+	/* Register sighandlers */
-+	sa.sa_flags = 0 ;
-+	sa.sa_handler = term_handler;
-+	sigemptyset( &sa.sa_mask ) ;
-+	sigaction( SIGTERM, &sa, NULL );
-+
-+	master_fd = inotify_init ();
-+	if (master_fd < 0)
-+	        exitApp("inotify_init");
-+
-+	while ((opt = getopt(argc, argv, "d")) > 0) {
-+		switch (opt) {
-+		case 'd':
-+			debug_mode = 1;
-+			break;
-+		case '?':
-+			usage(argv[0]);
-+		}
-+	}
-+	read_config(master_fd);
-+
-+	write_pid_file();
-+
-+	if (! debug_mode)
-+		daemon(0, 0);
-+
-+	while (watch(master_fd) == 0 ) {};
-+
-+	watch_list_free(master_fd);
-+	close(master_fd);
-+	if (pidfile)
-+		unlink(pidfile);
-+
-+	return 0;
-+}
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.30.1/restorecond/restorecond.conf
---- nsapolicycoreutils/restorecond/restorecond.conf	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.30.1/restorecond/restorecond.conf	2006-03-28 23:03:06.000000000 -0500
-@@ -0,0 +1,4 @@
-+/etc/resolv.conf
-+/etc/mtab
-+/var/run/utmp
-+~/public_html
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-1.30.1/restorecond/restorecond.h
---- nsapolicycoreutils/restorecond/restorecond.h	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.30.1/restorecond/restorecond.h	2006-03-28 23:03:06.000000000 -0500
-@@ -0,0 +1,31 @@
-+/* restorecond.h -- 
-+ * Copyright 2006 Red Hat Inc., Durham, North Carolina.
-+ * All Rights Reserved.
-+ *
-+ * 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
-+ *
-+ * Authors:
-+ *   Dan Walsh <dwalsh at redhat.com>
-+ * 
-+ */
-+
-+#ifndef RESTORED_CONFIG_H
-+#define RESTORED_CONFIG_H
-+
-+void exitApp(const char *msg);
-+void watch_list_add(int inotify_fd, const char *path);
-+
-+#endif
-+
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-1.30.1/restorecond/restorecond.init
---- nsapolicycoreutils/restorecond/restorecond.init	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.30.1/restorecond/restorecond.init	2006-03-28 23:03:06.000000000 -0500
-@@ -0,0 +1,61 @@
-+#!/bin/sh
-+#
-+# restorecond:		Daemo used to maintain path file context
-+#
-+# chkconfig:	2345 10 90
-+# description:	restorecond uses inotify to look for creation of new files listed in the 
-+#               /etc/selinux/POLICYTYPE/restorefiles.conf file, and sets the correct security 
-+#               context.
-+#
-+
-+# Source function library.
-+. /etc/rc.d/init.d/functions
-+
-+start() 
-+{
-+        echo -n $"Starting restorecond: "
-+        daemon /usr/sbin/restorecond 
-+
-+	touch /var/lock/subsys/restorecond
-+        echo
-+}
-+
-+stop() 
-+{
-+        echo -n $"Shutting down restorecond: "
-+	killproc restorecond
-+
-+	rm -f  /var/lock/subsys/restorecond
-+        echo
-+}
-+restart() 
-+{
-+    stop
-+    start
-+}
-+
-+[ -f /usr/sbin/restorecond ] || exit 0
-+
-+# See how we were called.
-+case "$1" in
-+  start)
-+	start
-+        ;;
-+  stop)
-+	stop
-+        ;;
-+  status)
-+	status restorecond
-+	;;
-+  restart|reload)
-+	restart
-+	;;
-+  condrestart)
-+	[ -e /var/lock/subsys/restorecond ] && restart || :
-+	;;
-+  *)
-+        echo $"Usage: $0 {start|stop|restart|reload|condrestart}"
-+        exit 1
-+esac
-+
-+exit 0
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/stringslist.c policycoreutils-1.30.1/restorecond/stringslist.c
---- nsapolicycoreutils/restorecond/stringslist.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.30.1/restorecond/stringslist.c	2006-03-28 23:03:06.000000000 -0500
-@@ -0,0 +1,118 @@
-+/*
-+ * Copyright (C) 2006 Red Hat 
-+ * see file 'COPYING' for use and warranty information
-+ *
-+ * 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
-+ *
-+ * Authors:  
-+ *   Dan Walsh <dwalsh at redhat.com>
-+ *
-+*/
-+
-+#include <string.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include "stringslist.h"
-+#include "restorecond.h"
-+
-+/* Sorted lists */
-+void strings_list_add(struct stringsList **list, const char *string) {
-+	struct stringsList *ptr=*list;
-+	struct stringsList *prev=NULL;
-+	struct stringsList *newptr=NULL;
-+	while(ptr) {
-+		int cmp=strcmp(string, ptr->string);
-+		if (cmp < 0) break;  /* Not on list break out to add */
-+		if (cmp == 0) return; /* Already on list */
-+		prev=ptr;
-+		ptr=ptr->next;
-+	}
-+	newptr=calloc(1, sizeof(struct stringsList));
-+	if (!newptr) exitApp("Out of Memory");
-+	newptr->string=strdup(string);
-+	newptr->next = ptr;
-+	if (prev) 
-+		prev->next=newptr;
-+	else
-+		*list=newptr;
-+}
-+
-+int strings_list_find(struct stringsList *ptr, const char *string) {
-+	while (ptr) {
-+		int cmp=strcmp(string, ptr->string);
-+		if (cmp < 0) return -1;  /* Not on list break out to add */
-+		if (cmp == 0) return 0; /* Already on list */
-+		ptr=ptr->next;
-+	}
-+	return -1;
-+}
-+
-+void strings_list_free(struct stringsList *ptr) {
-+	struct stringsList *prev=NULL;
-+	while (ptr) {
-+		free(ptr->string);
-+		prev=ptr;
-+		ptr=ptr->next;
-+		free(prev);
-+	}
-+}
-+
-+int strings_list_diff(struct stringsList *from, struct stringsList *to) {
-+	while (from != NULL && to != NULL) {
-+		if (strcmp(from->string, to->string) != 0) return 1;
-+		from=from->next;
-+		to=to->next;
-+	}
-+	if (from != NULL || to != NULL) return 1;
-+	return 0;
-+}
-+
-+void strings_list_print(struct stringsList *ptr) {
-+	while (ptr) {
-+		printf("%s\n", ptr->string);
-+		ptr=ptr->next;
-+	}
-+}
-+
-+
-+#ifdef TEST
-+void exitApp(const char *msg) {
-+	perror(msg);
-+	exit(-1);
-+}
-+
-+int main(int argc, char **argv) {
-+	struct stringsList *list=NULL;
-+	struct stringsList *list1=NULL;
-+	strings_list_add(&list, "/etc/resolv.conf");
-+	strings_list_add(&list, "/etc/walsh");
-+	strings_list_add(&list, "/etc/mtab");
-+	strings_list_add(&list, "/etc/walsh");
-+	if (strings_list_diff(list, list) != 0) printf ("strings_list_diff test1 bug\n");
-+	strings_list_add(&list1, "/etc/walsh");
-+	if (strings_list_diff(list, list1) == 0) printf ("strings_list_diff test2 bug\n");
-+	strings_list_add(&list1, "/etc/walsh");
-+	strings_list_add(&list1, "/etc/resolv.conf");
-+	strings_list_add(&list1, "/etc/mtab1");
-+	if (strings_list_diff(list, list1) == 0) printf ("strings_list_diff test3 bug\n");
-+	printf ("strings list\n");
-+	strings_list_print(list);
-+	printf ("strings list1\n");
-+	strings_list_print(list1);
-+	strings_list_free(list);
-+	strings_list_free(list1);
-+}
-+#endif
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/stringslist.h policycoreutils-1.30.1/restorecond/stringslist.h
---- nsapolicycoreutils/restorecond/stringslist.h	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.30.1/restorecond/stringslist.h	2006-03-28 23:03:06.000000000 -0500
-@@ -0,0 +1,37 @@
-+/* stringslist.h -- 
-+ * Copyright 2006 Red Hat Inc., Durham, North Carolina.
-+ * All Rights Reserved.
-+ *
-+ * 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
-+ *
-+ * Authors:
-+ *   Dan Walsh <dwalsh at redhat.com>
-+ * 
-+ */
-+#ifndef STRINGSLIST_H
-+#define STRINGSLIST_H
-+
-+struct stringsList {
-+	struct stringsList *next;
-+	char *string;
-+};
-+
-+void strings_list_free(struct stringsList *list);
-+void strings_list_add(struct stringsList **list, const char *string);
-+void strings_list_print(struct stringsList *list);
-+int strings_list_find(struct stringsList *list, const char *string);
-+int strings_list_diff(struct stringsList *from, struct stringsList *to);
-+
-+#endif
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.c policycoreutils-1.30.1/restorecond/utmpwatcher.c
---- nsapolicycoreutils/restorecond/utmpwatcher.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.30.1/restorecond/utmpwatcher.c	2006-03-28 23:03:06.000000000 -0500
-@@ -0,0 +1,105 @@
-+/*
-+ * utmpwatcher.c
-+ *
-+ * Copyright (C) 2006 Red Hat 
-+ * see file 'COPYING' for use and warranty information
-+ *
-+ * 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
-+ *
-+ * Authors:  
-+ *   Dan Walsh <dwalsh at redhat.com>
-+ *
-+ *
-+*/
-+
-+#define _GNU_SOURCE
-+#include <sys/inotify.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <syslog.h>
-+
-+#include <limits.h>
-+#include <utmp.h>
-+#include <sys/types.h>
-+#include <pwd.h>
-+#include "restorecond.h"
-+#include "utmpwatcher.h"
-+#include "stringslist.h"
-+
-+static struct stringsList *utmp_ptr=NULL;
-+static int utmp_wd=-1;
-+
-+unsigned int utmpwatcher_handle(int inotify_fd, int wd) {
-+	int changed=0;
-+	struct utmp u;
-+	char *utmp_path="/var/run/utmp";
-+	struct stringsList *prev_utmp_ptr=utmp_ptr;
-+	if (wd != utmp_wd) return -1;
-+
-+	utmp_ptr=NULL;
-+	FILE *cfg=fopen(utmp_path, "r");
-+	if (!cfg) exitApp("Error reading config file.");
-+
-+	while (fread(&u, sizeof(struct utmp), 1, cfg) > 0) {
-+		if (u.ut_type == USER_PROCESS) 
-+			strings_list_add(&utmp_ptr, u.ut_user);
-+	}
-+	fclose(cfg);
-+	if (utmp_wd >= 0) 
-+		inotify_rm_watch(inotify_fd, utmp_wd);
-+
-+	utmp_wd=inotify_add_watch (inotify_fd, utmp_path, IN_MOVED_FROM | IN_MODIFY);
-+	if (prev_utmp_ptr) {
-+		changed=strings_list_diff(prev_utmp_ptr, utmp_ptr);
-+		strings_list_free(prev_utmp_ptr);
-+	}
-+	return changed;
-+}
-+
-+static void watch_file(int inotify_fd, const char *file) {
-+	struct stringsList *ptr=utmp_ptr;
-+	
-+	while(ptr) {
-+		struct passwd *pwd=getpwnam(ptr->string);
-+		if (pwd) {
-+			char *path=NULL;
-+			if (asprintf(&path, "%s%s",pwd->pw_dir, file) < 0)
-+				exitApp("Error allocating memory.");
-+			watch_list_add(inotify_fd, path);
-+			free(path);
-+		}
-+		ptr=ptr->next;
-+	}
-+}
-+
-+void utmpwatcher_add(int inotify_fd, const char *path) {
-+	if (utmp_ptr == NULL) {
-+		utmpwatcher_handle(inotify_fd, utmp_wd);
-+	}
-+	watch_file(inotify_fd, path);
-+}
-+
-+#ifdef TEST
-+int main(int argc, char **argv) {
-+	read_utmp();
-+	return 0;
-+}
-+#endif
-+
-+
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.h policycoreutils-1.30.1/restorecond/utmpwatcher.h
---- nsapolicycoreutils/restorecond/utmpwatcher.h	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.30.1/restorecond/utmpwatcher.h	2006-03-28 23:03:06.000000000 -0500
-@@ -0,0 +1,29 @@
-+/* utmpwatcher.h -- 
-+ * Copyright 2006 Red Hat Inc., Durham, North Carolina.
-+ * All Rights Reserved.
-+ *
-+ * 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
-+ *
-+ * Authors:
-+ *   Dan Walsh <dwalsh at redhat.com>
-+ * 
-+ */
-+#ifndef UTMPWATCHER_H
-+#define UTMPWATCHER_H
-+
-+unsigned int utmpwatcher_handle(int inotify_fd, int wd);
-+void utmpwatcher_add(int inotify_fd, const char *path);
-+
-+#endif
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.1/scripts/fixfiles
---- nsapolicycoreutils/scripts/fixfiles	2006-01-04 13:07:46.000000000 -0500
-+++ policycoreutils-1.30.1/scripts/fixfiles	2006-03-28 23:03:06.000000000 -0500
-@@ -124,7 +124,15 @@
-     exit $?
- fi
- if [ ! -z "$DIRS" ]; then
--    ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $1 -v $DIRS 2>&1 >> $LOGFILE
-+    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
-+	done
-+    else
-+	${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $1 -v $DIRS 2>&1 >> $LOGFILE
-+    fi
-+
-     exit $?
- fi
- LogReadOnly
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30.4/audit2allow/audit2allow
+--- nsapolicycoreutils/audit2allow/audit2allow	2006-03-29 15:35:22.000000000 -0500
++++ policycoreutils-1.30.4/audit2allow/audit2allow	2006-04-05 08:59:26.000000000 -0400
+@@ -577,7 +577,7 @@
+ 		if ref_ind:
+ 			out.gen_reference_policy()
+ 
+-		if auditlogs:
++		if auditlogs and os.path.exists("/var/log/audit/audit.log"):
+ 			input=os.popen("ausearch -m avc")
+ 			out.load(input)
+ 
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-1.30.4/audit2allow/audit2allow.1
+--- nsapolicycoreutils/audit2allow/audit2allow.1	2006-03-10 09:48:04.000000000 -0500
++++ policycoreutils-1.30.4/audit2allow/audit2allow.1	2006-04-05 09:09:05.000000000 -0400
+@@ -98,6 +98,11 @@
+ .PP
+ .SH EXAMPLE
+ .nf
++.B NOTE: These examples are for systems using the audit package.  If you do 
++.B not use the audit package,  the AVC messages will be in /var/log/messages.
++.B Please substiture /var/log/messages for /var/log/audit/audit.log in the 
++.B examples.
++.PP
+ .B Using audit2allow to generate monolithic (non-module) policy
+ $ cd /etc/selinux/$SELINUXTYPE/src/policy
+ $ cat /var/log/audit/audit.log | audit2allow >> domains/misc/local.te
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.30.4/restorecond/restorecond.conf
+--- nsapolicycoreutils/restorecond/restorecond.conf	2006-03-29 11:08:21.000000000 -0500
++++ policycoreutils-1.30.4/restorecond/restorecond.conf	2006-04-03 11:57:26.000000000 -0400
+@@ -2,3 +2,4 @@
+ /etc/mtab
+ /var/run/utmp
+ ~/public_html
++~/.mozilla/plugins/libflashplayer.so
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.30.4/semanage/semanage
+--- nsapolicycoreutils/semanage/semanage	2006-03-29 15:35:22.000000000 -0500
++++ policycoreutils-1.30.4/semanage/semanage	2006-04-01 04:54:36.000000000 -0500
+@@ -286,6 +286,8 @@
+ 		errorExit("Options Error " + error.msg)
+ 	except ValueError, error:
+ 		errorExit(error.args[0])
++	except KeyError, error:
++		errorExit("Invalid value %s" % error.args[0])
+ 	except IOError, error:
+ 		errorExit(error.args[1])
+ 	except KeyboardInterrupt, error:


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-5/policycoreutils.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- policycoreutils.spec	29 Mar 2006 05:01:42 -0000	1.243
+++ policycoreutils.spec	5 Apr 2006 13:18:30 -0000	1.244
@@ -4,8 +4,8 @@
 %define libselinuxver 1.30-1
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.30.1
-Release: 3.fc5
+Version: 1.30.4
+Release: 2.fc5
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -107,6 +107,28 @@
 service restorecond condrestart
 
 %changelog
+* Wed Apr 5 2006 Dan Walsh <dwalsh at redhat.com> 1.30.4-2.fc5
+- Bump to build in FC5
+
+* Wed Apr 5 2006 Dan Walsh <dwalsh at redhat.com> 1.30.4-2
+- Fix audit2allow to not require ausearch.
+- Fix man page
+- Add libflashplayer to restorecond.conf
+
+* Wed Mar 29 2006 Dan Walsh <dwalsh at redhat.com> 1.30.4-1
+- Update from upstream
+	* Merged audit2allow fixes for refpolicy from Dan Walsh.
+	* Merged fixfiles patch from Dan Walsh.
+	* Merged restorecond daemon from Dan Walsh.
+	* Merged semanage non-MLS fixes from Chris PeBenito.
+	* Merged semanage and semodule man page examples from Thomas Bleher.
+
+* Tue Mar 28 2006 Dan Walsh <dwalsh at redhat.com> 1.30.1-4
+- Clean up reference policy generation in audit2allow
+
+* Tue Mar 21 2006 Dan Walsh <dwalsh at redhat.com> 1.30.1-3
+- Add IN_MOVED_TO to catch renames
+
 * Tue Mar 21 2006 Dan Walsh <dwalsh at redhat.com> 1.30.1-3.fc5
 - Add IN_MOVED_TO to catch renames
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-5/sources,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- sources	22 Mar 2006 16:44:10 -0000	1.108
+++ sources	5 Apr 2006 13:18:30 -0000	1.109
@@ -1 +1 @@
-a1f4732b7c4d047a437d489b620a2895  policycoreutils-1.30.1.tgz
+4af18b5ace84c5cb075f5160ab51f86b  policycoreutils-1.30.4.tgz



From fedora-cvs-commits at redhat.com  Wed Apr  5 13:23:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 09:23:50 -0400
Subject: rpms/sound-juicer/devel sound-juicer.spec,1.45,1.46
Message-ID: <200604051323.k35DNoLV029528@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/sound-juicer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29515

Modified Files:
	sound-juicer.spec 
Log Message:
remove patch



Index: sound-juicer.spec
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sound-juicer.spec	5 Apr 2006 13:11:03 -0000	1.45
+++ sound-juicer.spec	5 Apr 2006 13:23:47 -0000	1.46
@@ -17,7 +17,6 @@
 License:	GPL
 Group:		Applications/Multimedia
 Source:		%{name}-%{version}.tar.bz2
-Patch0:		sound-juicer-2.13.1-export-dynamic.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Requires:	libmusicbrainz >= %{libmusicbrainz_version}
 Requires:	libgnomeui >= %{libgnomeui_version}
@@ -51,7 +50,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .export-dynamic
 autoreconf
 
 %build



From fedora-cvs-commits at redhat.com  Wed Apr  5 13:25:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 09:25:26 -0400
Subject: rpms/kdesdk/FC-5 kdesdk.spec,1.52,1.53
Message-ID: <200604051325.k35DPQn0029600@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdesdk.spec 
Log Message:
typo fix



Index: kdesdk.spec
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/FC-5/kdesdk.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- kdesdk.spec	5 Apr 2006 13:08:00 -0000	1.52
+++ kdesdk.spec	5 Apr 2006 13:25:24 -0000	1.53
@@ -176,7 +176,7 @@
   --dir $RPM_BUILD_ROOT%{appdir} \
   --add-only-show-in KDE \
   $RPM_BUILD_ROOT%{appdir}/kbugbuster.desktop \
-  $RPM_BUILD_ROOT%{appdir}/kuiviever.desktop
+  $RPM_BUILD_ROOT%{appdir}/kuiviewer.desktop
 
 # make symlinks relative
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/HTML/en/common



From fedora-cvs-commits at redhat.com  Wed Apr  5 13:26:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 09:26:27 -0400
Subject: rpms/sound-juicer/FC-5 sound-juicer.spec,1.45,1.46
Message-ID: <200604051326.k35DQRhY029667@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/sound-juicer/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv29654

Modified Files:
	sound-juicer.spec 
Log Message:
remove patch



Index: sound-juicer.spec
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/FC-5/sound-juicer.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sound-juicer.spec	5 Apr 2006 13:13:51 -0000	1.45
+++ sound-juicer.spec	5 Apr 2006 13:26:25 -0000	1.46
@@ -17,7 +17,6 @@
 License:	GPL
 Group:		Applications/Multimedia
 Source:		%{name}-%{version}.tar.bz2
-Patch0:		sound-juicer-2.13.1-export-dynamic.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Requires:	libmusicbrainz >= %{libmusicbrainz_version}
 Requires:	libgnomeui >= %{libgnomeui_version}
@@ -51,7 +50,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .export-dynamic
 autoreconf
 
 %build



From fedora-cvs-commits at redhat.com  Wed Apr  5 13:26:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 09:26:43 -0400
Subject: rpms/kdesdk/devel kdesdk.spec,1.51,1.52 sources,1.30,1.31
Message-ID: <200604051326.k35DQhnQ029721@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdesdk.spec sources 
Log Message:
update to 3.5.2



Index: kdesdk.spec
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- kdesdk.spec	11 Feb 2006 03:48:37 -0000	1.51
+++ kdesdk.spec	5 Apr 2006 13:26:41 -0000	1.52
@@ -1,7 +1,7 @@
 %define debug 0
 %define final 0
 
-%define qt_version 3.3.5
+%define qt_version 3.3.6
 %define qt_epoch 1
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
@@ -14,15 +14,14 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdesdk
-Version: 3.5.1
-Release: 1.2
+Version: 3.5.2
+Release: 1
 Summary: The KDE Software Development Kit (SDK)
 URL: http://www.kde.org/
 License: GPL
 Group: User Interface/Desktops
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch1: kde-libtool.patch
 Patch2: kdesdk-3.4.0-db4.patch
@@ -142,8 +141,6 @@
 export CFLAGS="$FLAGS"
 export CXXFLAGS="$FLAGS"
 
-perl -pi -e "d/kbugbuster//g" subdirs && rm -rf kbugbuster
-
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
@@ -175,14 +172,11 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-for f in cervisia catalogmanager kbabel kbabeldict kcachegrind kompare kuiviewer umbrello ; do
-   desktop-file-install \
-      --vendor "" \
-      --dir $RPM_BUILD_ROOT%{appdir} \
-      --delete-original \
-      --add-category="X-KDE-More" \
-      $RPM_BUILD_ROOT%{appdir}/$f.desktop
-done
+desktop-file-install --vendor "" --delete-original \
+  --dir $RPM_BUILD_ROOT%{appdir} \
+  --add-only-show-in KDE \
+  $RPM_BUILD_ROOT%{appdir}/kbugbuster.desktop \
+  $RPM_BUILD_ROOT%{appdir}/kuiviewer.desktop
 
 # make symlinks relative
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/HTML/en/common
@@ -236,6 +230,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* 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
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	5 Feb 2006 21:13:07 -0000	1.30
+++ sources	5 Apr 2006 13:26:41 -0000	1.31
@@ -1 +1 @@
-93199b8bf5793681fdb2e5cbcfcfbd93  kdesdk-3.5.1.tar.bz2
+0047e87532930a390d7a1826fd8cdaf5  kdesdk-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr  5 13:11:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 09:11:05 -0400
Subject: rpms/sound-juicer/devel .cvsignore, 1.20, 1.21 sound-juicer.spec,
	1.44, 1.45 sources, 1.20, 1.21
Message-ID: <200604051311.k35DB53V015410@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/sound-juicer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15385

Modified Files:
	.cvsignore sound-juicer.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	13 Mar 2006 02:14:36 -0000	1.20
+++ .cvsignore	5 Apr 2006 13:11:03 -0000	1.21
@@ -10,3 +10,4 @@
 sound-juicer-2.13.5.tar.bz2
 sound-juicer-2.13.6.tar.bz2
 sound-juicer-2.14.0.tar.bz2
+sound-juicer-2.14.1.tar.bz2


Index: sound-juicer.spec
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sound-juicer.spec	13 Mar 2006 02:14:37 -0000	1.44
+++ sound-juicer.spec	5 Apr 2006 13:11:03 -0000	1.45
@@ -12,8 +12,8 @@
 
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
-Version:	2.14.0
-Release:	1
+Version:	2.14.1
+Release:	2
 License:	GPL
 Group:		Applications/Multimedia
 Source:		%{name}-%{version}.tar.bz2
@@ -102,6 +102,9 @@
 %{_datadir}/icons/hicolor/*
 
 %changelog
+* Wed Apr  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
+- Update to 2.14.1
+
 * Sun Mar 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	13 Mar 2006 02:14:37 -0000	1.20
+++ sources	5 Apr 2006 13:11:03 -0000	1.21
@@ -1 +1 @@
-6cca302ece8377ac84d678078c0f6607  sound-juicer-2.14.0.tar.bz2
+d1a54d488ae8a91e2f927acddaf5ccb3  sound-juicer-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr  5 13:41:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 09:41:21 -0400
Subject: rpms/sane-backends/FC-4 libusbscanner, 1.10, 1.11 sane-backends.spec,
	1.44, 1.45
Message-ID: <200604051341.k35DfLYS029953@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/sane-backends/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv29939

Modified Files:
	libusbscanner sane-backends.spec 
Log Message:
update libusbscanner to handle cold-plugged USB scanners (#144444, slightly changed patch by Michal Jaegermann)



Index: libusbscanner
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/FC-4/libusbscanner,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libusbscanner	9 Dec 2004 19:24:37 -0000	1.10
+++ libusbscanner	5 Apr 2006 13:41:19 -0000	1.11
@@ -28,6 +28,19 @@
 DEVDIR=/dev
 DEVNAME="scanner-usb-$(echo ${DEVICE#../proc/bus/usb/} | sed -e 's;/;:;g')"
 
+wait_and_add () {
+    local limit=90
+    # wait until the action can be performed but no longer
+    # than $limit seconds
+    while ! ln -snf "${DEVICE}" "${DEVDIR}/${DEVNAME}" ; do
+	    [ "$limit" = 0 ] && return
+	    sleep 1
+	    limit=$((limit - 1))
+    done
+    
+    /sbin/pam_console_apply "${DEVDIR}/${DEVNAME}"
+}
+
 if [ "${ACTION}" = "add" ] && [ -f "${DEVICE}" ]
 then
 
@@ -36,13 +49,14 @@
     # follow the symlink and set the permissions of /proc/bus/usb/BBB/DDD such
     # that "console" users will be able to use their USB scanner.
     #
-    # If the scanner is "cold plugged," this event will likely occur before
-    # the root filesystem is writeable, but no-one seems to know how to fix
-    # that.
+    # If the scanner is "cold plugged", and this event will occurred before
+    # the root filesystem was writeable, then we wait in a background
+    # until a link in ${DEVDIR} can be created.  Permissions on
+    # /proc/bus/usb/BBB/DDD will be of a "revert" type; see
+    # man 5 console.perms.  This is fine; when a device does not exist
+    # at all we do not particularly care about its permissions.
     #
-    ln -sf "${DEVICE}" "${DEVDIR}/${DEVNAME}"
-    
-    /sbin/pam_console_apply "${DEVDIR}/${DEVNAME}"
+    ( wait_and_add >/dev/null 2>&1 & )
     
     # See /etc/hotplug/usb.agent for a description of how REMOVER works.
     ln -sf "${0}" "${REMOVER}"


Index: sane-backends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/FC-4/sane-backends.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sane-backends.spec	20 Dec 2005 13:22:37 -0000	1.44
+++ sane-backends.spec	5 Apr 2006 13:41:19 -0000	1.45
@@ -4,7 +4,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.17
-Release: 0.fc4.1
+Release: 0.fc4.2
 License: GPL (programs), relaxed LGPL (libraries), and public domain (docs)
 Group: System Environment/Libraries
 Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
@@ -135,6 +135,10 @@
 %{_libdir}/sane/*.so
 
 %changelog
+* Wed Apr 05 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-0.fc4.2
+- update libusbscanner to handle cold-plugged USB scanners (#144444, slightly
+  changed patch by Michal Jaegermann)
+
 * Tue Dec 20 2005 Nils Philippsen <nphilipp at redhat.com> 1.0.17-1
 - version 1.0.17
 - reenable gphoto2 backend



From fedora-cvs-commits at redhat.com  Wed Apr  5 14:06:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 10:06:53 -0400
Subject: rpms/kdeadmin/FC-5 .cvsignore, 1.33, 1.34 kdeadmin.spec, 1.56,
	1.57 sources, 1.33, 1.34
Message-ID: <200604051406.k35E6rpR011453@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdeadmin.spec sources 
Log Message:
update to 3.5.2




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/FC-5/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	3 Feb 2006 22:55:09 -0000	1.33
+++ .cvsignore	5 Apr 2006 14:06:50 -0000	1.34
@@ -9,3 +9,4 @@
 kdeadmin-3.4.92.tar.bz2
 kdeadmin-3.5.0.tar.bz2
 kdeadmin-3.5.1.tar.bz2
+kdeadmin-3.5.2.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/FC-5/kdeadmin.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kdeadmin.spec	11 Feb 2006 03:44:39 -0000	1.56
+++ kdeadmin.spec	5 Apr 2006 14:06:50 -0000	1.57
@@ -1,9 +1,16 @@
+%define rhel 0
 %define debug 0
 %define final 0
+
 %define make_cvs 1
 
 %define ksysv 0
+%if %{rhel}
+%define kuser 0
+%else
 %define kuser 1
+%endif
+
 %define kpackage 0
 %define lilo 0
 %define kdat 1
@@ -11,10 +18,6 @@
 %define arts 1
 %define knetworkconf 1
 
-%ifnarch %{ix86}
-%define lilo 0
-%endif
-
 %define qt_version 3.3.5
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
@@ -22,8 +25,8 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.1
-Release: 1.2
+Version: 3.5.2
+Release: 0.1.fc5
 Name: kdeadmin
 Summary: Administrative tools for KDE.
 Epoch: 7
@@ -316,15 +319,8 @@
    --vendor "" \
    --dir $RPM_BUILD_ROOT%{appdir} \
    --delete-original \
-   --copy-generic-name-to-name \
-   $RPM_BUILD_ROOT%{appdir}/kcron.desktop
-                                                                                                                        
-desktop-file-install \
-   --vendor "" \
-   --dir $RPM_BUILD_ROOT%{appdir} \
-   --delete-original \
-   --add-category "X-KDE-More" \
-   $RPM_BUILD_ROOT%{appdir}/kdat.desktop
+   --add-only-show-in KDE \
+   $RPM_BUILD_ROOT%{appdir}/kuser.desktop
 
 %post -p /sbin/ldconfig
 
@@ -409,6 +405,9 @@
 %endif
 
 %changelog
+* Wed Apr 05 2006 Than Ngo <than at redhat.com> 7:3.5.2-0.1.fc5
+- update to 3.5.2
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 7:3.5.1-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/FC-5/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	3 Feb 2006 22:55:09 -0000	1.33
+++ sources	5 Apr 2006 14:06:50 -0000	1.34
@@ -1 +1 @@
-08e9bddd2b42e0783d7f79d08cdb031b  kdeadmin-3.5.1.tar.bz2
+ad1f645ed9f140a7c9ce8602cc0c88b8  kdeadmin-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr  5 14:16:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 10:16:15 -0400
Subject: rpms/kdeadmin/devel kdeadmin.spec,1.56,1.57 sources,1.33,1.34
Message-ID: <200604051416.k35EGF5R015714@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdeadmin.spec sources 
Log Message:
update to 3.5.2



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kdeadmin.spec	11 Feb 2006 03:44:39 -0000	1.56
+++ kdeadmin.spec	5 Apr 2006 14:16:12 -0000	1.57
@@ -1,9 +1,16 @@
+%define rhel 0
 %define debug 0
 %define final 0
+
 %define make_cvs 1
 
 %define ksysv 0
+%if %{rhel}
+%define kuser 0
+%else
 %define kuser 1
+%endif
+
 %define kpackage 0
 %define lilo 0
 %define kdat 1
@@ -11,19 +18,15 @@
 %define arts 1
 %define knetworkconf 1
 
-%ifnarch %{ix86}
-%define lilo 0
-%endif
-
-%define qt_version 3.3.5
+%define qt_version 3.3.6
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 %define appdir %{_datadir}/applications/kde
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.1
-Release: 1.2
+Version: 3.5.2
+Release: 1
 Name: kdeadmin
 Summary: Administrative tools for KDE.
 Epoch: 7
@@ -316,15 +319,8 @@
    --vendor "" \
    --dir $RPM_BUILD_ROOT%{appdir} \
    --delete-original \
-   --copy-generic-name-to-name \
-   $RPM_BUILD_ROOT%{appdir}/kcron.desktop
-                                                                                                                        
-desktop-file-install \
-   --vendor "" \
-   --dir $RPM_BUILD_ROOT%{appdir} \
-   --delete-original \
-   --add-category "X-KDE-More" \
-   $RPM_BUILD_ROOT%{appdir}/kdat.desktop
+   --add-only-show-in KDE \
+   $RPM_BUILD_ROOT%{appdir}/kuser.desktop
 
 %post -p /sbin/ldconfig
 
@@ -409,6 +405,9 @@
 %endif
 
 %changelog
+* Wed Apr 05 2006 Than Ngo <than at redhat.com> 7:3.5.2-1
+- update to 3.5.2
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 7:3.5.1-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	3 Feb 2006 22:55:09 -0000	1.33
+++ sources	5 Apr 2006 14:16:12 -0000	1.34
@@ -1 +1 @@
-08e9bddd2b42e0783d7f79d08cdb031b  kdeadmin-3.5.1.tar.bz2
+ad1f645ed9f140a7c9ce8602cc0c88b8  kdeadmin-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr  5 15:13:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 11:13:00 -0400
Subject: rpms/kdeartwork/devel .cvsignore, 1.29, 1.30 kdeartwork.spec, 1.46,
	1.47 sources, 1.30, 1.31
Message-ID: <200604051513.k35FD04K008051@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdeartwork.spec sources 
Log Message:
3.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	3 Feb 2006 23:21:30 -0000	1.29
+++ .cvsignore	5 Apr 2006 15:12:50 -0000	1.30
@@ -9,3 +9,4 @@
 kdeartwork-3.4.92.tar.bz2
 kdeartwork-3.5.0.tar.bz2
 kdeartwork-3.5.1.tar.bz2
+kdeartwork-3.5.2.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- kdeartwork.spec	11 Feb 2006 03:44:59 -0000	1.46
+++ kdeartwork.spec	5 Apr 2006 15:12:50 -0000	1.47
@@ -3,8 +3,8 @@
 
 %define make_cvs 1
 
-%define qt_version 3.3.5
-%define arts_version 1.5.1
+%define qt_version 3.3.6
+%define arts_version 1.5.2
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 %define qt_epoch 1
@@ -13,8 +13,8 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdeartwork
-Version: 3.5.1
-Release: 1.2
+Version: 3.5.2
+Release: 1
 Summary: Additional artwork (themes, sound themes, ...) for KDE
 URL: http://www.kde.org/
 License: GPL
@@ -156,6 +156,9 @@
 %{_datadir}/icons/*
 
 %changelog
+* 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> - 3.5.1-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	3 Feb 2006 23:21:30 -0000	1.30
+++ sources	5 Apr 2006 15:12:50 -0000	1.31
@@ -1 +1 @@
-8053bb1a1b2a5844b29f5f96328b1d96  kdeartwork-3.5.1.tar.bz2
+211801e7ab7a5e113821625b931f338c  kdeartwork-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr  5 15:14:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 11:14:11 -0400
Subject: rpms/kdeartwork/FC-5 kdeartwork.spec,1.46,1.47 sources,1.30,1.31
Message-ID: <200604051514.k35FEBRb008122@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdeartwork.spec sources 
Log Message:
update to 3.5.2



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/FC-5/kdeartwork.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- kdeartwork.spec	11 Feb 2006 03:44:59 -0000	1.46
+++ kdeartwork.spec	5 Apr 2006 15:14:09 -0000	1.47
@@ -4,7 +4,7 @@
 %define make_cvs 1
 
 %define qt_version 3.3.5
-%define arts_version 1.5.1
+%define arts_version 1.5.2
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 %define qt_epoch 1
@@ -13,8 +13,8 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdeartwork
-Version: 3.5.1
-Release: 1.2
+Version: 3.5.2
+Release: 0.1.fc5
 Summary: Additional artwork (themes, sound themes, ...) for KDE
 URL: http://www.kde.org/
 License: GPL
@@ -156,6 +156,9 @@
 %{_datadir}/icons/*
 
 %changelog
+* Wed Apr 05 2006 Than Ngo <than at redhat.com> 3.5.2-0.1.fc5
+- update to 3.5.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)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/FC-5/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	3 Feb 2006 23:21:30 -0000	1.30
+++ sources	5 Apr 2006 15:14:09 -0000	1.31
@@ -1 +1 @@
-8053bb1a1b2a5844b29f5f96328b1d96  kdeartwork-3.5.1.tar.bz2
+211801e7ab7a5e113821625b931f338c  kdeartwork-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr  5 15:14:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 11:14:58 -0400
Subject: rpms/system-config-users/devel .cvsignore, 1.31, 1.32 sources, 1.31,
	1.32 system-config-users.spec, 1.36, 1.37
Message-ID: <200604051514.k35FEwZI008206@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	.cvsignore sources system-config-users.spec 
Log Message:
rephrase some error messages to ease translation (#154204)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-users/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	27 Mar 2006 15:53:01 -0000	1.31
+++ .cvsignore	5 Apr 2006 15:14:55 -0000	1.32
@@ -1 +1 @@
-system-config-users-1.2.43.tar.bz2
+system-config-users-1.2.44.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-users/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	27 Mar 2006 15:53:01 -0000	1.31
+++ sources	5 Apr 2006 15:14:56 -0000	1.32
@@ -1 +1 @@
-b48296a3df976f1fd9dab64187ec3b2e  system-config-users-1.2.43.tar.bz2
+9441d0b7dd61ff78b32d5c4635770e0d  system-config-users-1.2.44.tar.bz2


Index: system-config-users.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-users/devel/system-config-users.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- system-config-users.spec	27 Mar 2006 15:53:01 -0000	1.36
+++ system-config-users.spec	5 Apr 2006 15:14:56 -0000	1.37
@@ -1,6 +1,6 @@
 Summary: A graphical interface for administering users and groups
 Name: system-config-users
-Version: 1.2.43
+Version: 1.2.44
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -77,6 +77,9 @@
 %attr(0644,root,root) %config (noreplace) /etc/sysconfig/system-config-users
 
 %changelog
+* Wed Apr 05 2006 Nils Philippsen <nphilipp at redhat.com> - 1.2.44
+- rephrase some error messages to ease translation (#154204)
+
 * Mon Mar 27 2006 Nils Philippsen <nphilipp at redhat.com> - 1.2.43
 - pick up translation updates
 



From fedora-cvs-commits at redhat.com  Wed Apr  5 15:37:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 11:37:44 -0400
Subject: rpms/kdebindings/FC-5 .cvsignore, 1.29, 1.30 kdebindings.spec, 1.41,
	1.42 sources, 1.29, 1.30
Message-ID: <200604051537.k35Fbixe022430@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdebindings.spec sources 
Log Message:
update to 3.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/FC-5/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	4 Feb 2006 10:44:58 -0000	1.29
+++ .cvsignore	5 Apr 2006 15:37:41 -0000	1.30
@@ -9,3 +9,4 @@
 kdebindings-3.4.92.tar.bz2
 kdebindings-3.5.0.tar.bz2
 kdebindings-3.5.1.tar.bz2
+kdebindings-3.5.2.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/FC-5/kdebindings.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- kdebindings.spec	11 Feb 2006 03:45:57 -0000	1.41
+++ kdebindings.spec	5 Apr 2006 15:37:41 -0000	1.42
@@ -1,6 +1,8 @@
 %define debug 0
 %define final 0
 
+%define appdir %{_datadir}/applications/kde
+
 ## stil need fix to build java -> disable java at the moment
 ##define support_arch %{ix86} alpha ia64 ppc
 %define support_arch none
@@ -25,8 +27,8 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.1
-Release: 1.2
+Version: 3.5.2
+Release: 0.1.fc5
 Name: kdebindings
 Summary: KDE bindings to non-C++ languages
 URL: http://www.kde.org/
@@ -49,6 +51,7 @@
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: automake
+BuildRequires: /usr/bin/desktop-file-install
 
 %if %{perl}
 BuildRequires: perl >= %{perlver}
@@ -243,6 +246,14 @@
 
 find $RPM_BUILD_ROOT -size 0 | xargs rm -f
 
+desktop-file-install \
+   --vendor "" \
+   --dir $RPM_BUILD_ROOT%{appdir} \
+   --delete-original \
+   --add-only-show-in KDE \
+   $RPM_BUILD_ROOT%{appdir}/kjscmd.desktop \
+   $RPM_BUILD_ROOT%{appdir}/embedjs.desktop
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -282,6 +293,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Apr 05 2006 Than Ngo <than at redhat.com> 3.5.2-0.1.fc5
+- update to 3.5.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)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/FC-5/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	4 Feb 2006 10:44:58 -0000	1.29
+++ sources	5 Apr 2006 15:37:41 -0000	1.30
@@ -1 +1 @@
-302f6a842b5a29701846c49a24a64039  kdebindings-3.5.1.tar.bz2
+cb26ce2e4efc35ca2c9c7a47807d679a  kdebindings-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr  5 15:39:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 11:39:44 -0400
Subject: rpms/kdebindings/devel kdebindings.spec, 1.41, 1.42 sources, 1.29,
	1.30
Message-ID: <200604051539.k35Fdi3N022523@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdebindings.spec sources 
Log Message:
update to 3.5.2




Index: kdebindings.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- kdebindings.spec	11 Feb 2006 03:45:57 -0000	1.41
+++ kdebindings.spec	5 Apr 2006 15:39:34 -0000	1.42
@@ -1,6 +1,8 @@
 %define debug 0
 %define final 0
 
+%define appdir %{_datadir}/applications/kde
+
 ## stil need fix to build java -> disable java at the moment
 ##define support_arch %{ix86} alpha ia64 ppc
 %define support_arch none
@@ -8,8 +10,8 @@
 %define mozilla_archs %{ix86} ppc s390 s390x x86_64
 
 %define mozilla_version 1.7.10
-%define qt_version 3.3.5
-%define arts_version 1.5.1
+%define qt_version 3.3.6
+%define arts_version 1.5.2
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 %define pythonver 2.4
@@ -25,8 +27,8 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.1
-Release: 1.2
+Version: 3.5.2
+Release: 1
 Name: kdebindings
 Summary: KDE bindings to non-C++ languages
 URL: http://www.kde.org/
@@ -49,6 +51,7 @@
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: automake
+BuildRequires: /usr/bin/desktop-file-install
 
 %if %{perl}
 BuildRequires: perl >= %{perlver}
@@ -243,6 +246,14 @@
 
 find $RPM_BUILD_ROOT -size 0 | xargs rm -f
 
+desktop-file-install \
+   --vendor "" \
+   --dir $RPM_BUILD_ROOT%{appdir} \
+   --delete-original \
+   --add-only-show-in KDE \
+   $RPM_BUILD_ROOT%{appdir}/kjscmd.desktop \
+   $RPM_BUILD_ROOT%{appdir}/embedjs.desktop
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -282,6 +293,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* 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> - 3.5.1-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	4 Feb 2006 10:44:58 -0000	1.29
+++ sources	5 Apr 2006 15:39:34 -0000	1.30
@@ -1 +1 @@
-302f6a842b5a29701846c49a24a64039  kdebindings-3.5.1.tar.bz2
+cb26ce2e4efc35ca2c9c7a47807d679a  kdebindings-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr  5 16:02:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 12:02:49 -0400
Subject: rpms/gcc/devel .cvsignore, 1.140, 1.141 gcc41.spec, 1.45,
	1.46 sources, 1.142, 1.143
Message-ID: <200604051602.k35G2nWW004225@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	.cvsignore gcc41.spec sources 
Log Message:
4.1.0-5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- .cvsignore	28 Mar 2006 13:28:54 -0000	1.140
+++ .cvsignore	5 Apr 2006 16:02:46 -0000	1.141
@@ -1 +1 @@
-gcc-4.1.0-20060328.tar.bz2
+gcc-4.1.0-20060405.tar.bz2


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gcc41.spec	28 Mar 2006 13:28:54 -0000	1.45
+++ gcc41.spec	5 Apr 2006 16:02:47 -0000	1.46
@@ -1,6 +1,6 @@
-%define DATE 20060328
+%define DATE 20060405
 %define gcc_version 4.1.0
-%define gcc_release 4
+%define gcc_release 5
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -403,9 +403,9 @@
 %patch11 -p0 -b .mni~
 %patch12 -p0 -b .cfaval~
 %patch13 -p0 -b .rh184446~
-%patch14 -p0 -b .pr21764~
-%patch15 -p0 -b .pr21581~
-%patch16 -p0 -E -b .pr20297-test~
+#%patch14 -p0 -b .pr21764~
+#%patch15 -p0 -b .pr21581~
+#%patch16 -p0 -E -b .pr20297-test~
 
 sed -i -e 's/4\.1\.1/4.1.0/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1423,6 +1423,16 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Wed Apr  4 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-5
+- update from gcc-4_1-branch (-r112431:112706)
+  - PRs bootstrap/26936, bootstrap/27023, classpath/25924, fortran/19303,
+	fortran/25358, fortran/26816, java/25414, java/26042, java/26858,
+	libfortran/26735, libgcj/26990, libstdc++/26777, testsuite/25741,
+	tree-optimization/18527, tree-optimization/26763,
+	tree-optimization/26830
+- merge gomp changes from trunk (-r112602:112603 and -r112618:112619)
+- temporarily revert PR c++/21764, c++/19238, c++/21581 fixes (#187399)
+
 * Tue Mar 28 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-4
 - update from gcc-4_1-branch (-r111697:112431)
   - PRs ada/25885, c/26004, fortran/17298, fortran/20935, fortran/20938,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- sources	28 Mar 2006 13:28:54 -0000	1.142
+++ sources	5 Apr 2006 16:02:47 -0000	1.143
@@ -1 +1 @@
-40cb6ec0b50a317a12929f270a0d7c02  gcc-4.1.0-20060328.tar.bz2
+2ac716d7aab984dd14038adfb230eca6  gcc-4.1.0-20060405.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr  5 16:26:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 12:26:38 -0400
Subject: rpms/kdeedu/FC-5 .cvsignore, 1.26, 1.27 kdeedu.spec, 1.44,
	1.45 sources, 1.28, 1.29
Message-ID: <200604051626.k35GQcj6018380@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdeedu.spec sources 
Log Message:
update to 3.5.2




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/FC-5/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	4 Feb 2006 22:08:37 -0000	1.26
+++ .cvsignore	5 Apr 2006 16:26:36 -0000	1.27
@@ -10,3 +10,4 @@
 kdeedu-3.4.92.tar.bz2
 kdeedu-3.5.0.tar.bz2
 kdeedu-3.5.1.tar.bz2
+kdeedu-3.5.2.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/FC-5/kdeedu.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kdeedu.spec	11 Feb 2006 03:46:13 -0000	1.44
+++ kdeedu.spec	5 Apr 2006 16:26:36 -0000	1.45
@@ -12,8 +12,8 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdeedu
-Version: 3.5.1
-Release: 1.2
+Version: 3.5.2
+Release: 0.1.fc5
 Summary: Educational/Edutainment applications for KDE
 URL: http://www.kde.org/
 License: GPL
@@ -184,6 +184,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Apr 05 2006 Than Ngo <than at redhat.com> 3.5.2-0.1.fc5
+- update to 3.5.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)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/FC-5/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	4 Feb 2006 22:08:37 -0000	1.28
+++ sources	5 Apr 2006 16:26:36 -0000	1.29
@@ -1 +1 @@
-fe31b9a2ec4e299531c6b7beeab09534  kdeedu-3.5.1.tar.bz2
+ce62d2e67579280a3e000152fb365bff  kdeedu-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr  5 16:27:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 12:27:23 -0400
Subject: rpms/kdeedu/devel .cvsignore, 1.26, 1.27 kdeedu.spec, 1.44,
	1.45 sources, 1.28, 1.29
Message-ID: <200604051627.k35GRNkO018435@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeedu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18420

Modified Files:
	.cvsignore kdeedu.spec sources 
Log Message:
update to 3.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	4 Feb 2006 22:08:37 -0000	1.26
+++ .cvsignore	5 Apr 2006 16:27:21 -0000	1.27
@@ -10,3 +10,4 @@
 kdeedu-3.4.92.tar.bz2
 kdeedu-3.5.0.tar.bz2
 kdeedu-3.5.1.tar.bz2
+kdeedu-3.5.2.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kdeedu.spec	11 Feb 2006 03:46:13 -0000	1.44
+++ kdeedu.spec	5 Apr 2006 16:27:21 -0000	1.45
@@ -4,7 +4,7 @@
 
 %define arts 1
 
-%define qt_version 3.3.5
+%define qt_version 3.3.6
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 %define qt_epoch 1
@@ -12,8 +12,8 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdeedu
-Version: 3.5.1
-Release: 1.2
+Version: 3.5.2
+Release: 1
 Summary: Educational/Edutainment applications for KDE
 URL: http://www.kde.org/
 License: GPL
@@ -184,6 +184,9 @@
 %{_libdir}/*.so
 
 %changelog
+* 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> - 3.5.1-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	4 Feb 2006 22:08:37 -0000	1.28
+++ sources	5 Apr 2006 16:27:21 -0000	1.29
@@ -1 +1 @@
-fe31b9a2ec4e299531c6b7beeab09534  kdeedu-3.5.1.tar.bz2
+ce62d2e67579280a3e000152fb365bff  kdeedu-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr  5 16:54:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 12:54:52 -0400
Subject: rpms/kdegraphics/FC-5 kdegraphics-3.5.2-kpdf-xft.patch, NONE,
	1.1 kdegraphics.spec, 1.76, 1.77 sources, 1.32,
	1.33 kdegraphics-3.5.1-kpdf-xft.patch, 1.1,
	NONE kdegraphics-3.5.1-kpdf.patch, 1.1,
	NONE post-3.5.1-kdegraphics-CVE-2006-0301.diff, 1.1, NONE
Message-ID: <200604051654.k35Gsqc8032448@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdegraphics.spec sources 
Added Files:
	kdegraphics-3.5.2-kpdf-xft.patch 
Removed Files:
	kdegraphics-3.5.1-kpdf-xft.patch kdegraphics-3.5.1-kpdf.patch 
	post-3.5.1-kdegraphics-CVE-2006-0301.diff 
Log Message:
update to 3.5.2


kdegraphics-3.5.2-kpdf-xft.patch:
 configure.in.in |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE kdegraphics-3.5.2-kpdf-xft.patch ---
--- kdegraphics-3.5.2/kpdf/configure.in.in.kpdf-xft	2006-03-17 11:11:19.000000000 +0100
+++ kdegraphics-3.5.2/kpdf/configure.in.in	2006-04-04 17:54:13.000000000 +0200
@@ -40,6 +40,9 @@
   if "$XFT_CONFIG"; then
     XFT_CFLAGS="`$XFT_CONFIG --cflags`"
     XFT_LIBS="`$XFT_CONFIG --libs`"
+  else
+    XFT_CFLAGS="`pkg-config xft --cflags 2>/dev/null`"
+    XFT_LIBS="`pkg-config xft --libs 2>/dev/null`"
   fi
   AC_SUBST(XFT_CFLAGS)
   AC_SUBST(XFT_LIBS)


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-5/kdegraphics.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- kdegraphics.spec	14 Mar 2006 13:10:48 -0000	1.76
+++ kdegraphics.spec	5 Apr 2006 16:54:50 -0000	1.77
@@ -11,12 +11,14 @@
 %define arts 1
 %define make_cvs 1
 
+%define appdir %{_datadir}/applications/kde
+
 %define no_scanner_archs s390 s390x
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.1
-Release: 4
+Version: 3.5.2
+Release: 0.1.fc5
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
@@ -30,15 +32,9 @@
 Patch1: kdegraphics-3.3.0-misc.patch
 Patch2: kdegraphics-3.3.1-xorg.patch
 Patch3: kdegraphics-3.5.1-warning.patch
-Patch4: kdegraphics-3.5.1-kpdf-xft.patch
+Patch4: kdegraphics-3.5.2-kpdf-xft.patch
 Patch5: kdegraphics-3.5.1-gphoto2-config.patch
 
-# upstream patches
-Patch50: kdegraphics-3.5.1-kpdf.patch
-
-# security patches
-Patch100: post-3.5.1-kdegraphics-CVE-2006-0301.diff
-
 %ifnarch %{no_scanner_archs}
 BuildRequires: sane-backends-devel >= 1.0.3-10
 BuildRequires: gphoto2-devel
@@ -52,8 +48,8 @@
 BuildRequires: zlib-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
-BuildRequires: libtiff-devel
 BuildRequires: imlib-devel
+BuildRequires: libtiff-devel
 BuildRequires: fribidi-devel 
 BuildRequires: libieee1284-devel
 
@@ -276,12 +272,6 @@
 %patch4 -p1 -b .kpdf-xft
 %patch5 -p1 -b .gphoto2-config
 
-# upstream patches
-%patch50 -p1 -b .kpdf
-
-# security patches
-%patch100 -p0 -b .CVE-2006-0301
-
 %if %{rhel}
   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfax\"" >kfax/configure.in.in
   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfaxview\"" >kfaxview/configure.in.in
@@ -345,9 +335,13 @@
 done
 popd
 
-if [ -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/kcmkmrml.desktop ] ; then
-  echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/kcmkmrml.desktop
-fi
+desktop-file-install \
+   --vendor "" \
+   --dir $RPM_BUILD_ROOT%{appdir} \
+   --delete-original \
+   --add-only-show-in KDE \
+   $RPM_BUILD_ROOT%{appdir}/kcmkmrml.desktop \
+   $RPM_BUILD_ROOT%{appdir}/ksnapshot.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -379,6 +373,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Tue Apr 04 2006 Than Ngo <than at redhat.com> 7:3.5.2-0.1.fc5
+- update to 3.5.2
+
 * Tue Mar 14 2006 Than Ngo <than at redhat.com> 7:3.5.1-4
 - fix build problem with gphoto2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-5/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	4 Feb 2006 23:16:53 -0000	1.32
+++ sources	5 Apr 2006 16:54:50 -0000	1.33
@@ -1 +0,0 @@
-2cd1c5348b7df46cf7f9d91e1dbfebd2  kdegraphics-3.5.1.tar.bz2


--- kdegraphics-3.5.1-kpdf-xft.patch DELETED ---


--- kdegraphics-3.5.1-kpdf.patch DELETED ---


--- post-3.5.1-kdegraphics-CVE-2006-0301.diff DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr  5 16:59:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 12:59:23 -0400
Subject: rpms/kdegraphics/FC-5 .cvsignore, 1.31, 1.32 kdegraphics.spec, 1.77,
	1.78 sources, 1.33, 1.34
Message-ID: <200604051659.k35GxNAO032758@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdegraphics.spec sources 
Log Message:
update to 3.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-5/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	4 Feb 2006 23:16:53 -0000	1.31
+++ .cvsignore	5 Apr 2006 16:59:21 -0000	1.32
@@ -10,3 +10,4 @@
 kdegraphics-3.4.92.tar.bz2
 kdegraphics-3.5.0.tar.bz2
 kdegraphics-3.5.1.tar.bz2
+kdegraphics-3.5.2.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-5/kdegraphics.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- kdegraphics.spec	5 Apr 2006 16:54:50 -0000	1.77
+++ kdegraphics.spec	5 Apr 2006 16:59:21 -0000	1.78
@@ -52,6 +52,7 @@
 BuildRequires: libtiff-devel
 BuildRequires: fribidi-devel 
 BuildRequires: libieee1284-devel
+BuildRequires: /usr/bin/desktop-file-install
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-5/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	5 Apr 2006 16:54:50 -0000	1.33
+++ sources	5 Apr 2006 16:59:21 -0000	1.34
@@ -0,0 +1 @@
+8e1816a2191ea85b889930159a5d1e46  kdegraphics-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr  5 17:23:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 13:23:32 -0400
Subject: rpms/kdegraphics/FC-5 kdegraphics.spec,1.78,1.79
Message-ID: <200604051723.k35HNWpM014441@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdegraphics.spec 
Log Message:
update to 3.5.2



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-5/kdegraphics.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- kdegraphics.spec	5 Apr 2006 16:59:21 -0000	1.78
+++ kdegraphics.spec	5 Apr 2006 17:23:30 -0000	1.79
@@ -23,7 +23,7 @@
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
 Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{rfelease}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 License: GPL
 Url: http://www.kde.org
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
@@ -52,7 +52,6 @@
 BuildRequires: libtiff-devel
 BuildRequires: fribidi-devel 
 BuildRequires: libieee1284-devel
-BuildRequires: /usr/bin/desktop-file-install
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
@@ -336,13 +335,9 @@
 done
 popd
 
-desktop-file-install \
-   --vendor "" \
-   --dir $RPM_BUILD_ROOT%{appdir} \
-   --delete-original \
-   --add-only-show-in KDE \
-   $RPM_BUILD_ROOT%{appdir}/kcmkmrml.desktop \
-   $RPM_BUILD_ROOT%{appdir}/ksnapshot.desktop
+for i in kcmkmrml ksnapshot ; do
+  [ -f $RPM_BUILD_ROOT%{appdir}/$i.desktop ] && echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{appdir}/$i.desktop
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From fedora-cvs-commits at redhat.com  Wed Apr  5 17:38:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 13:38:04 -0400
Subject: rpms/kdegraphics/devel kdegraphics-3.5.2-kpdf-xft.patch, NONE,
	1.1 kdegraphics.spec, 1.76, 1.77 sources, 1.32,
	1.33 kdegraphics-3.5.1-kpdf-xft.patch, 1.1,
	NONE kdegraphics-3.5.1-kpdf.patch, 1.1,
	NONE post-3.5.1-kdegraphics-CVE-2006-0301.diff, 1.1, NONE
Message-ID: <200604051738.k35Hc4sS014853@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdegraphics.spec sources 
Added Files:
	kdegraphics-3.5.2-kpdf-xft.patch 
Removed Files:
	kdegraphics-3.5.1-kpdf-xft.patch kdegraphics-3.5.1-kpdf.patch 
	post-3.5.1-kdegraphics-CVE-2006-0301.diff 
Log Message:
update to 3.5.2


kdegraphics-3.5.2-kpdf-xft.patch:
 configure.in.in |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE kdegraphics-3.5.2-kpdf-xft.patch ---
--- kdegraphics-3.5.2/kpdf/configure.in.in.kpdf-xft	2006-03-17 11:11:19.000000000 +0100
+++ kdegraphics-3.5.2/kpdf/configure.in.in	2006-04-04 17:54:13.000000000 +0200
@@ -40,6 +40,9 @@
   if "$XFT_CONFIG"; then
     XFT_CFLAGS="`$XFT_CONFIG --cflags`"
     XFT_LIBS="`$XFT_CONFIG --libs`"
+  else
+    XFT_CFLAGS="`pkg-config xft --cflags 2>/dev/null`"
+    XFT_LIBS="`pkg-config xft --libs 2>/dev/null`"
   fi
   AC_SUBST(XFT_CFLAGS)
   AC_SUBST(XFT_LIBS)


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- kdegraphics.spec	14 Mar 2006 13:10:48 -0000	1.76
+++ kdegraphics.spec	5 Apr 2006 17:38:01 -0000	1.77
@@ -11,17 +11,19 @@
 %define arts 1
 %define make_cvs 1
 
+%define appdir %{_datadir}/applications/kde
+
 %define no_scanner_archs s390 s390x
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.1
-Release: 4
+Version: 3.5.2
+Release: 1
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
 Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{rfelease}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 License: GPL
 Url: http://www.kde.org
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
@@ -30,15 +32,9 @@
 Patch1: kdegraphics-3.3.0-misc.patch
 Patch2: kdegraphics-3.3.1-xorg.patch
 Patch3: kdegraphics-3.5.1-warning.patch
-Patch4: kdegraphics-3.5.1-kpdf-xft.patch
+Patch4: kdegraphics-3.5.2-kpdf-xft.patch
 Patch5: kdegraphics-3.5.1-gphoto2-config.patch
 
-# upstream patches
-Patch50: kdegraphics-3.5.1-kpdf.patch
-
-# security patches
-Patch100: post-3.5.1-kdegraphics-CVE-2006-0301.diff
-
 %ifnarch %{no_scanner_archs}
 BuildRequires: sane-backends-devel >= 1.0.3-10
 BuildRequires: gphoto2-devel
@@ -276,18 +272,11 @@
 %patch4 -p1 -b .kpdf-xft
 %patch5 -p1 -b .gphoto2-config
 
-# upstream patches
-%patch50 -p1 -b .kpdf
-
-# security patches
-%patch100 -p0 -b .CVE-2006-0301
-
 %if %{rhel}
   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfax\"" >kfax/configure.in.in
   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfaxview\"" >kfaxview/configure.in.in
 %endif
 
-# disable kpovmodeler temporary. waiting for freeglut
 %if !%{kpovmodeler}
    echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kpovmodeler\"" >kpovmodeler/configure.in.in
 %endif
@@ -321,13 +310,13 @@
 %if %{final}
    --enable-final \
 %endif
-   --includedir=/usr/include/kde \
-   --with-xinerama \
+   --includedir=%{_includedir}/kde \
 %ifnarch %{no_scanner_archs}
    --with-kamera \
 %else
-   --without-kamera
+   --without-kamera \
 %endif
+   --with-xinerama
 
 make %{?_smp_mflags}
 
@@ -345,9 +334,9 @@
 done
 popd
 
-if [ -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/kcmkmrml.desktop ] ; then
-  echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/kcmkmrml.desktop
-fi
+for i in kcmkmrml ksnapshot ; do
+  [ -f $RPM_BUILD_ROOT%{appdir}/$i.desktop ] && echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{appdir}/$i.desktop
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -379,6 +368,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Wed Apr 05 2006 Than Ngo <than at redhat.com> 7:3.5.2-1
+- update to 3.5.2
+
 * Tue Mar 14 2006 Than Ngo <than at redhat.com> 7:3.5.1-4
 - fix build problem with gphoto2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	4 Feb 2006 23:16:53 -0000	1.32
+++ sources	5 Apr 2006 17:38:01 -0000	1.33
@@ -1 +1 @@
-2cd1c5348b7df46cf7f9d91e1dbfebd2  kdegraphics-3.5.1.tar.bz2
+8e1816a2191ea85b889930159a5d1e46  kdegraphics-3.5.2.tar.bz2


--- kdegraphics-3.5.1-kpdf-xft.patch DELETED ---


--- kdegraphics-3.5.1-kpdf.patch DELETED ---


--- post-3.5.1-kdegraphics-CVE-2006-0301.diff DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr  5 17:43:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 13:43:24 -0400
Subject: rpms/libsepol/devel .cvsignore, 1.92, 1.93 libsepol.spec, 1.121,
	1.122 sources, 1.93, 1.94
Message-ID: <200604051743.k35HhOWv015044@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore libsepol.spec sources 
Log Message:
* Wed Apr 5 2006 Dan Walsh <dwalsh at redhat.com> 1.12.5-1
- Upgrade to latest from NSA
	* Merged fix for leak of optional package sections from Ivan Gyurdiev.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- .cvsignore	29 Mar 2006 20:36:49 -0000	1.92
+++ .cvsignore	5 Apr 2006 17:43:10 -0000	1.93
@@ -92,3 +92,4 @@
 libsepol-1.12.2.tgz
 libsepol-1.12.3.tgz
 libsepol-1.12.4.tgz
+libsepol-1.12.5.tgz


Index: libsepol.spec
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- libsepol.spec	29 Mar 2006 20:36:49 -0000	1.121
+++ libsepol.spec	5 Apr 2006 17:43:10 -0000	1.122
@@ -1,6 +1,6 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
-Version: 1.12.4
+Version: 1.12.5
 Release: 1
 License: GPL
 Group: System Environment/Libraries
@@ -80,6 +80,10 @@
 %{_includedir}/sepol/policydb/*.h
 
 %changelog
+* Wed Apr 5 2006 Dan Walsh <dwalsh at redhat.com> 1.12.5-1
+- Upgrade to latest from NSA
+	* Merged fix for leak of optional package sections from Ivan Gyurdiev.
+
 * Wed Mar 29 2006 Dan Walsh <dwalsh at redhat.com> 1.12.4-1
 - Upgrade to latest from NSA
 	* Generalize test for bitmap overflow in ebitmap_set_bit.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/sources,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- sources	29 Mar 2006 20:36:50 -0000	1.93
+++ sources	5 Apr 2006 17:43:10 -0000	1.94
@@ -1 +1 @@
-ddadf7b00a8f64143de3085ea17336cc  libsepol-1.12.4.tgz
+606e32054d52f5df59b257d58163ad4d  libsepol-1.12.5.tgz



From fedora-cvs-commits at redhat.com  Wed Apr  5 17:46:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 13:46:43 -0400
Subject: rpms/checkpolicy/devel .cvsignore, 1.60, 1.61 checkpolicy.spec, 1.98,
	1.99 sources, 1.61, 1.62
Message-ID: <200604051746.k35HkhBG021055@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/checkpolicy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20590

Modified Files:
	.cvsignore checkpolicy.spec sources 
Log Message:
* Wed Apr 5 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.4-1
- Latest upgrade from NSA
	* Changed require_class to reject permissions that have not been
	  declared if building a base module.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/checkpolicy/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	28 Mar 2006 20:07:33 -0000	1.60
+++ .cvsignore	5 Apr 2006 17:46:40 -0000	1.61
@@ -44,3 +44,4 @@
 checkpolicy-1.30.tgz
 checkpolicy-1.30.1.tgz
 checkpolicy-1.30.3.tgz
+checkpolicy-1.30.4.tgz


Index: checkpolicy.spec
===================================================================
RCS file: /cvs/dist/rpms/checkpolicy/devel/checkpolicy.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- checkpolicy.spec	28 Mar 2006 20:07:42 -0000	1.98
+++ checkpolicy.spec	5 Apr 2006 17:46:40 -0000	1.99
@@ -1,7 +1,7 @@
-%define libsepolver 1.12.3-1
+%define libsepolver 1.12.5-1
 Summary: SELinux policy compiler
 Name: checkpolicy
-Version: 1.30.3
+Version: 1.30.4
 Release: 1
 License: GPL
 Group: Development/System
@@ -47,6 +47,11 @@
 %{_mandir}/man8/checkmodule.8.gz
 
 %changelog
+* Wed Apr 5 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.4-1
+- Latest upgrade from NSA
+	* Changed require_class to reject permissions that have not been
+	  declared if building a base module.
+
 * Tue Mar 28 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.3-1
 - Latest upgrade from NSA
 	* Fixed checkmodule to call link_modules prior to expand_module


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/checkpolicy/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	28 Mar 2006 20:07:42 -0000	1.61
+++ sources	5 Apr 2006 17:46:41 -0000	1.62
@@ -1 +1 @@
-82ccee7997d31663c842c707b4771b70  checkpolicy-1.30.3.tgz
+4a223fa5970267bee96f98f35d2f4deb  checkpolicy-1.30.4.tgz



From fedora-cvs-commits at redhat.com  Wed Apr  5 18:53:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 14:53:28 -0400
Subject: rpms/kdeutils/FC-5 .cvsignore, 1.32, 1.33 kdeutils.spec, 1.54,
	1.55 sources, 1.32, 1.33
Message-ID: <200604051853.k35IrSRZ025532@cvs.devel.redhat.com>

Author: than

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/FC-5/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	5 Feb 2006 20:45:17 -0000	1.32
+++ .cvsignore	5 Apr 2006 18:53:26 -0000	1.33
@@ -9,3 +9,4 @@
 kdeutils-3.4.92.tar.bz2
 kdeutils-3.5.0.tar.bz2
 kdeutils-3.5.1.tar.bz2
+kdeutils-3.5.2.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/FC-5/kdeutils.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kdeutils.spec	11 Feb 2006 03:48:49 -0000	1.54
+++ kdeutils.spec	5 Apr 2006 18:53:26 -0000	1.55
@@ -8,10 +8,12 @@
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 
+%define appdir %{_datadir}/applications/kde
+
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.1
-Release: 1.2
+Version: 3.5.2
+Release: 0.1.fc5
 Name: kdeutils
 Prefix: /usr
 Summary: K Desktop Environment - Utilities
@@ -283,9 +285,9 @@
 # Show only in KDE
 for i in kcalc kregexpeditor Kjots ktimer kdf kcmdf ksim KFloppy KEdit \
          KCharSelect ark kwalletmanager kwalletconfig \
-         irkick kcmlirc laptop pcmcia kvaio thinkpad ; do
-   if [ -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/$i.desktop ] ; then
-     echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/$i.desktop
+         irkick kcmlirc laptop pcmcia kvaio thinkpad kwikdisk; do
+   if [ -f $RPM_BUILD_ROOT%{appdir}/$i.desktop ] ; then
+     echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{appdir}/$i.desktop
    fi
 done
 
@@ -326,6 +328,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Wed Apr 05 2006 Than Ngo <than at redhat.com> 3.5.2-0.1.fc5
+- update to 3.5.2
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/FC-5/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	5 Feb 2006 20:45:17 -0000	1.32
+++ sources	5 Apr 2006 18:53:26 -0000	1.33
@@ -1 +1 @@
-1286c6a09b04452adfe492de2fad79bd  kdeutils-3.5.1.tar.bz2
+08c01d6ceb8fb2173463838e43f986f5  kdeutils-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr  5 18:54:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 14:54:53 -0400
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.77,1.78
Message-ID: <200604051854.k35Isr7N025596@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdegraphics.spec 
Log Message:
3.5.2



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- kdegraphics.spec	5 Apr 2006 17:38:01 -0000	1.77
+++ kdegraphics.spec	5 Apr 2006 18:54:51 -0000	1.78
@@ -359,7 +359,6 @@
 %{_datadir}/config.kcfg/*
 %{_datadir}/icons/*/*/*/*
 %{_datadir}/mimelnk/text/*
-%{_datadir}/mimelnk/image/*
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 



From fedora-cvs-commits at redhat.com  Wed Apr  5 18:56:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 14:56:02 -0400
Subject: rpms/kdegraphics/FC-5 kdegraphics.spec,1.79,1.80
Message-ID: <200604051856.k35Iu2Y3025659@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdegraphics.spec 
Log Message:
3.5.2



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-5/kdegraphics.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- kdegraphics.spec	5 Apr 2006 17:23:30 -0000	1.79
+++ kdegraphics.spec	5 Apr 2006 18:56:00 -0000	1.80
@@ -360,7 +360,6 @@
 %{_datadir}/config.kcfg/*
 %{_datadir}/icons/*/*/*/*
 %{_datadir}/mimelnk/text/*
-%{_datadir}/mimelnk/image/*
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 



From fedora-cvs-commits at redhat.com  Wed Apr  5 18:56:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 14:56:24 -0400
Subject: rpms/kernel/FC-5 linux-2.6-audit-user.patch,1.1.2.1,1.1.2.2
Message-ID: <200604051856.k35IuOEw025708@cvs.devel.redhat.com>

Author: sgrubb

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

Modified Files:
      Tag: private-lspp-14-branch
	linux-2.6-audit-user.patch 
Log Message:
minor rename of vars


linux-2.6-audit-user.patch:
 include/linux/netlink.h    |    1 +
 include/linux/selinux.h    |   16 ++++++++++++++++
 kernel/audit.c             |   22 +++++++++++++++++++---
 net/netlink/af_netlink.c   |    2 ++
 security/selinux/exports.c |   11 +++++++++++
 5 files changed, 49 insertions(+), 3 deletions(-)

Index: linux-2.6-audit-user.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/Attic/linux-2.6-audit-user.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-audit-user.patch	2 Apr 2006 21:01:46 -0000	1.1.2.1
+++ linux-2.6-audit-user.patch	5 Apr 2006 18:56:21 -0000	1.1.2.2
@@ -132,8 +132,8 @@
 +void selinux_get_task_sid(struct task_struct *tsk, u32 *sid)
 +{
 +	if (selinux_enabled) {
-+		struct task_security_struct *isec = tsk->security;
-+		*sid = isec->sid;
++		struct task_security_struct *tsec = tsk->security;
++		*sid = tsec->sid;
 +		return;
 +	}
 +	*sid = 0;



From fedora-cvs-commits at redhat.com  Wed Apr  5 18:57:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 14:57:27 -0400
Subject: rpms/kdeutils/devel kdeutils.spec,1.54,1.55 sources,1.32,1.33
Message-ID: <200604051857.k35IvR31025766@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdeutils.spec sources 
Log Message:
update to 3.5.2



Index: kdeutils.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kdeutils.spec	11 Feb 2006 03:48:49 -0000	1.54
+++ kdeutils.spec	5 Apr 2006 18:57:25 -0000	1.55
@@ -4,14 +4,16 @@
 %define arts 1
 %define redhatify 1
 
-%define qt_version 3.3.5
+%define qt_version 3.3.6
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 
+%define appdir %{_datadir}/applications/kde
+
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.1
-Release: 1.2
+Version: 3.5.2
+Release: 1
 Name: kdeutils
 Prefix: /usr
 Summary: K Desktop Environment - Utilities
@@ -283,9 +285,9 @@
 # Show only in KDE
 for i in kcalc kregexpeditor Kjots ktimer kdf kcmdf ksim KFloppy KEdit \
          KCharSelect ark kwalletmanager kwalletconfig \
-         irkick kcmlirc laptop pcmcia kvaio thinkpad ; do
-   if [ -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/$i.desktop ] ; then
-     echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/$i.desktop
+         irkick kcmlirc laptop pcmcia kvaio thinkpad kwikdisk; do
+   if [ -f $RPM_BUILD_ROOT%{appdir}/$i.desktop ] ; then
+     echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{appdir}/$i.desktop
    fi
 done
 
@@ -326,6 +328,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* 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> - 6:3.5.1-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	5 Feb 2006 20:45:17 -0000	1.32
+++ sources	5 Apr 2006 18:57:25 -0000	1.33
@@ -1 +1 @@
-1286c6a09b04452adfe492de2fad79bd  kdeutils-3.5.1.tar.bz2
+08c01d6ceb8fb2173463838e43f986f5  kdeutils-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr  5 20:41:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 16:41:20 -0400
Subject: rpms/kdegraphics/FC-5 kdegraphics.spec,1.80,1.81
Message-ID: <200604052041.k35KfKxH004423@cvs.devel.redhat.com>

Author: than

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

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



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-5/kdegraphics.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- kdegraphics.spec	5 Apr 2006 18:56:00 -0000	1.80
+++ kdegraphics.spec	5 Apr 2006 20:41:18 -0000	1.81
@@ -356,7 +356,6 @@
 %{_datadir}/applications/kde/*
 %{_datadir}/applnk/*
 %{_datadir}/apps/*
-%{_datadir}/config/*
 %{_datadir}/config.kcfg/*
 %{_datadir}/icons/*/*/*/*
 %{_datadir}/mimelnk/text/*



From fedora-cvs-commits at redhat.com  Wed Apr  5 20:42:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 16:42:39 -0400
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.78,1.79
Message-ID: <200604052042.k35KgdSH004526@cvs.devel.redhat.com>

Author: than

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

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



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- kdegraphics.spec	5 Apr 2006 18:54:51 -0000	1.78
+++ kdegraphics.spec	5 Apr 2006 20:42:36 -0000	1.79
@@ -355,7 +355,6 @@
 %{_datadir}/applications/kde/*
 %{_datadir}/applnk/*
 %{_datadir}/apps/*
-%{_datadir}/config/*
 %{_datadir}/config.kcfg/*
 %{_datadir}/icons/*/*/*/*
 %{_datadir}/mimelnk/text/*



From fedora-cvs-commits at redhat.com  Wed Apr  5 21:01:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 17:01:39 -0400
Subject: rpms/kdevelop/devel .cvsignore, 1.27, 1.28 kdevelop.spec, 1.45,
	1.46 sources, 1.29, 1.30
Message-ID: <200604052101.k35L1dWE018423@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdevelop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18364

Modified Files:
	.cvsignore kdevelop.spec sources 
Log Message:
update to 3.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	5 Feb 2006 21:21:57 -0000	1.27
+++ .cvsignore	5 Apr 2006 21:01:05 -0000	1.28
@@ -10,3 +10,4 @@
 kdevelop-3.2.92.tar.bz2
 kdevelop-3.3.0.tar.bz2
 kdevelop-3.3.1.tar.bz2
+kdevelop-3.3.2.tar.bz2


Index: kdevelop.spec
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/devel/kdevelop.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- kdevelop.spec	11 Feb 2006 03:49:01 -0000	1.45
+++ kdevelop.spec	5 Apr 2006 21:01:07 -0000	1.46
@@ -1,8 +1,8 @@
 %define debug 0
 %define final 0
 
-%define kde_version 3.5.1
-%define qt_version 3.3.5
+%define kde_version 3.5.2
+%define qt_version 3.3.6
 %define qt_epoch 1
 %define kdelibs_epoch 6
 
@@ -12,8 +12,8 @@
 
 Name: kdevelop
 Summary: Integrated Development Environment for C++/C
-Version: 3.3.1
-Release: 1.2
+Version: 3.3.2
+Release: 1
 Epoch: 9
 URL: http://www.kdevelop.org/
 Group: Development/Tools
@@ -154,6 +154,9 @@
 %{_datadir}/servicetypes/*
 
 %changelog
+* Wed Apr 05 2006 Than Ngo <than at redhat.com> 9:3.3.2-1
+- update to 3.3.2
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 9:3.3.1-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	5 Feb 2006 21:25:27 -0000	1.29
+++ sources	5 Apr 2006 21:01:21 -0000	1.30
@@ -1,2 +1,2 @@
 5777e4d2dbfc3e6c2ba9f0ed6ea457f9  c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-e5e3d3ce60a0dcafb99721f6304f87ef  kdevelop-3.3.1.tar.bz2
+494c9320a5f8681b67a3a06fa0ce18b7  kdevelop-3.3.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr  5 21:08:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 17:08:21 -0400
Subject: rpms/kdevelop/FC-5 kdevelop.spec,1.45,1.46 sources,1.29,1.30
Message-ID: <200604052108.k35L8L2l018503@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdevelop.spec sources 
Log Message:
update to 3.3.2



Index: kdevelop.spec
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/FC-5/kdevelop.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- kdevelop.spec	11 Feb 2006 03:49:01 -0000	1.45
+++ kdevelop.spec	5 Apr 2006 21:08:17 -0000	1.46
@@ -1,7 +1,7 @@
 %define debug 0
 %define final 0
 
-%define kde_version 3.5.1
+%define kde_version 3.5.2
 %define qt_version 3.3.5
 %define qt_epoch 1
 %define kdelibs_epoch 6
@@ -12,8 +12,8 @@
 
 Name: kdevelop
 Summary: Integrated Development Environment for C++/C
-Version: 3.3.1
-Release: 1.2
+Version: 3.3.2
+Release: 0.1.fc5
 Epoch: 9
 URL: http://www.kdevelop.org/
 Group: Development/Tools
@@ -154,6 +154,9 @@
 %{_datadir}/servicetypes/*
 
 %changelog
+* Wed Apr 05 2006 Than Ngo <than at redhat.com> 9:3.3.2-0.1.fc5
+- update to 3.3.2
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 9:3.3.1-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/FC-5/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	5 Feb 2006 21:25:27 -0000	1.29
+++ sources	5 Apr 2006 21:08:17 -0000	1.30
@@ -1,2 +1,2 @@
 5777e4d2dbfc3e6c2ba9f0ed6ea457f9  c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-e5e3d3ce60a0dcafb99721f6304f87ef  kdevelop-3.3.1.tar.bz2
+494c9320a5f8681b67a3a06fa0ce18b7  kdevelop-3.3.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr  5 21:19:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 17:19:18 -0400
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.79,1.80
Message-ID: <200604052119.k35LJI9r032355@cvs.devel.redhat.com>

Author: than

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

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



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- kdegraphics.spec	5 Apr 2006 20:42:36 -0000	1.79
+++ kdegraphics.spec	5 Apr 2006 21:19:16 -0000	1.80
@@ -356,6 +356,9 @@
 %{_datadir}/applnk/*
 %{_datadir}/apps/*
 %{_datadir}/config.kcfg/*
+%ifnarch %{no_scanner_archs}
+%{_datadir}/config/*
+%endif
 %{_datadir}/icons/*/*/*/*
 %{_datadir}/mimelnk/text/*
 %{_datadir}/services/*



From fedora-cvs-commits at redhat.com  Wed Apr  5 21:19:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 17:19:55 -0400
Subject: rpms/kdegraphics/FC-5 kdegraphics.spec,1.81,1.82
Message-ID: <200604052119.k35LJtGB032379@cvs.devel.redhat.com>

Author: than

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

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



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-5/kdegraphics.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- kdegraphics.spec	5 Apr 2006 20:41:18 -0000	1.81
+++ kdegraphics.spec	5 Apr 2006 21:19:53 -0000	1.82
@@ -357,6 +357,9 @@
 %{_datadir}/applnk/*
 %{_datadir}/apps/*
 %{_datadir}/config.kcfg/*
+%ifnarch %{no_scanner_archs}
+%%{_datadir}/config/*
+%%endif
 %{_datadir}/icons/*/*/*/*
 %{_datadir}/mimelnk/text/*
 %{_datadir}/services/*



From fedora-cvs-commits at redhat.com  Wed Apr  5 21:37:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 17:37:05 -0400
Subject: rpms/kdegraphics/FC-5 kdegraphics.spec,1.82,1.83
Message-ID: <200604052137.k35Lb5MI032613@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdegraphics.spec 
Log Message:
typo fix



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-5/kdegraphics.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- kdegraphics.spec	5 Apr 2006 21:19:53 -0000	1.82
+++ kdegraphics.spec	5 Apr 2006 21:37:00 -0000	1.83
@@ -358,7 +358,7 @@
 %{_datadir}/apps/*
 %{_datadir}/config.kcfg/*
 %ifnarch %{no_scanner_archs}
-%%{_datadir}/config/*
+%{_datadir}/config/*
 %%endif
 %{_datadir}/icons/*/*/*/*
 %{_datadir}/mimelnk/text/*



From fedora-cvs-commits at redhat.com  Wed Apr  5 21:45:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 17:45:14 -0400
Subject: rpms/kdewebdev/FC-5 .cvsignore, 1.12, 1.13 kdewebdev.spec, 1.28,
	1.29 sources, 1.12, 1.13
Message-ID: <200604052145.k35LjEXZ032737@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdewebdev.spec sources 
Log Message:
3.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	5 Feb 2006 21:34:07 -0000	1.12
+++ .cvsignore	5 Apr 2006 21:45:12 -0000	1.13
@@ -15,3 +15,4 @@
 kdewebdev-3.4.92.tar.bz2
 kdewebdev-3.5.0.tar.bz2
 kdewebdev-3.5.1.tar.bz2
+kdewebdev-3.5.2.tar.bz2


Index: kdewebdev.spec
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/FC-5/kdewebdev.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- kdewebdev.spec	11 Feb 2006 03:49:22 -0000	1.28
+++ kdewebdev.spec	5 Apr 2006 21:45:12 -0000	1.29
@@ -5,14 +5,14 @@
 %define arts 1
 
 %define qt_version 3.3.5
-%define kde_version 3.5.1
+%define kde_version 3.5.2
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.1
-Release: 1.2
+Version: 3.5.2
+Release: 0.1.fc5
 Summary: WEB Development package for the K Desktop Environment.
 Name: kdewebdev
 Url: http://quanta.sourceforge.net/
@@ -147,6 +147,9 @@
 %{_includedir}/*
 
 %changelog
+* Wed Apr 05 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc5
+- update to 3.5.2
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	5 Feb 2006 21:34:07 -0000	1.12
+++ sources	5 Apr 2006 21:45:12 -0000	1.13
@@ -2,4 +2,4 @@
 0cc3234c4b3df88d4115340ce05e0053  html.tar.bz2
 eea6e25a1c25af1f5a0c33e32e52c136  javascript.tar.bz2
 149607cecd4bf6783dc6e43a03b80138  php_manual_en_20030401.tar.bz2
-0faea4e8088005ae60f58b21c60b32ea  kdewebdev-3.5.1.tar.bz2
+ddd2ded8178f7c4d094d73e95075e7fb  kdewebdev-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr  5 21:46:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 17:46:16 -0400
Subject: rpms/kdewebdev/devel kdewebdev.spec,1.28,1.29 sources,1.12,1.13
Message-ID: <200604052146.k35LkGhE008279@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdewebdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7176

Modified Files:
	kdewebdev.spec sources 
Log Message:
3.5.2



Index: kdewebdev.spec
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/devel/kdewebdev.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- kdewebdev.spec	11 Feb 2006 03:49:22 -0000	1.28
+++ kdewebdev.spec	5 Apr 2006 21:46:13 -0000	1.29
@@ -4,15 +4,15 @@
 
 %define arts 1
 
-%define qt_version 3.3.5
-%define kde_version 3.5.1
+%define qt_version 3.3.6
+%define kde_version 3.5.2
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.1
-Release: 1.2
+Version: 3.5.2
+Release: 1
 Summary: WEB Development package for the K Desktop Environment.
 Name: kdewebdev
 Url: http://quanta.sourceforge.net/
@@ -147,6 +147,9 @@
 %{_includedir}/*
 
 %changelog
+* Wed Apr 05 2006 Than Ngo <than at redhat.com> 6:3.5.2-1
+- update to 3.5.2
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	5 Feb 2006 21:34:07 -0000	1.12
+++ sources	5 Apr 2006 21:46:13 -0000	1.13
@@ -2,4 +2,4 @@
 0cc3234c4b3df88d4115340ce05e0053  html.tar.bz2
 eea6e25a1c25af1f5a0c33e32e52c136  javascript.tar.bz2
 149607cecd4bf6783dc6e43a03b80138  php_manual_en_20030401.tar.bz2
-0faea4e8088005ae60f58b21c60b32ea  kdewebdev-3.5.1.tar.bz2
+ddd2ded8178f7c4d094d73e95075e7fb  kdewebdev-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr  5 22:10:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 18:10:32 -0400
Subject: rpms/kdegraphics/FC-5 kdegraphics.spec,1.83,1.84
Message-ID: <200604052210.k35MAWbx014473@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdegraphics.spec 
Log Message:
typo fix



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-5/kdegraphics.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- kdegraphics.spec	5 Apr 2006 21:37:00 -0000	1.83
+++ kdegraphics.spec	5 Apr 2006 22:10:30 -0000	1.84
@@ -359,7 +359,7 @@
 %{_datadir}/config.kcfg/*
 %ifnarch %{no_scanner_archs}
 %{_datadir}/config/*
-%%endif
+%endif
 %{_datadir}/icons/*/*/*/*
 %{_datadir}/mimelnk/text/*
 %{_datadir}/services/*



From fedora-cvs-commits at redhat.com  Wed Apr  5 23:06:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Apr 2006 19:06:08 -0400
Subject: rpms/kdenetwork/FC-5 .cvsignore, 1.36, 1.37 kdenetwork.spec, 1.71,
	1.72 sources, 1.40, 1.41
Message-ID: <200604052306.k35N684J010037@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdenetwork.spec sources 
Log Message:
3.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/FC-5/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	5 Feb 2006 19:29:54 -0000	1.36
+++ .cvsignore	5 Apr 2006 23:06:05 -0000	1.37
@@ -9,3 +9,4 @@
 kdenetwork-3.4.92.tar.bz2
 kdenetwork-3.5.0.tar.bz2
 kdenetwork-3.5.1.tar.bz2
+kdenetwork-3.5.2.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/FC-5/kdenetwork.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- kdenetwork.spec	11 Feb 2006 03:48:04 -0000	1.71
+++ kdenetwork.spec	5 Apr 2006 23:06:05 -0000	1.72
@@ -10,11 +10,13 @@
 %define kdebase_epoch 6
 %define qt_epoch 1
 
+%define appdir %{_datadir}/applications/kde
+
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdenetwork
-Version: 3.5.1
-Release: 1.2
+Version: 3.5.2
+Release: 0.1.fc5
 Summary: K Desktop Environment - Network Applications
 Epoch: 7
 Group: Applications/Internet
@@ -150,9 +152,9 @@
 popd
 
 # Show only in KDE
-for i in fileshare kcmkrfb kcmktalkd kcmwifi krfb ; do
-   if [ -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/$i.desktop ] ; then
-      echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/$i.desktop
+for i in fileshare kcmkrfb kcmktalkd kcmwifi krfb kppp kppplogview kwifimanager kget knewsticker ksirc kdict ; do
+   if [ -f $RPM_BUILD_ROOT%{appdir}/$i.desktop ] ; then
+      echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{appdir}/$i.desktop
    fi
 done
 
@@ -237,6 +239,9 @@
 %endif
 
 %changelog
+* Thu Apr 06 2006 Than Ngo <than at redhat.com> 7:3.5.2-0.1.fc5
+- update to 3.5.2
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 7:3.5.1-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/FC-5/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	5 Feb 2006 19:29:54 -0000	1.40
+++ sources	5 Apr 2006 23:06:06 -0000	1.41
@@ -1 +1 @@
-02ced8c14c80f28635056488949d56d7  kdenetwork-3.5.1.tar.bz2
+dddc6bb65ffb9e46d118781ca0f26da4  kdenetwork-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr  6 04:49:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 00:49:29 -0400
Subject: rpms/gnucash/devel .cvsignore, 1.13, 1.14 gnucash.spec, 1.28,
	1.29 sources, 1.14, 1.15
Message-ID: <200604060449.k364nTXU011400@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10926

Modified Files:
	.cvsignore gnucash.spec sources 
Log Message:
update to 1.9.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	27 Mar 2006 21:11:55 -0000	1.13
+++ .cvsignore	6 Apr 2006 04:49:23 -0000	1.14
@@ -2,3 +2,4 @@
 gnucash-docs-1.9.1.svn13429.tar.bz2
 gnucash-1.9.3.tar.gz
 gnucash-docs-1.9.3.svn13703.tar.bz2
+gnucash-1.9.4.tar.gz


Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gnucash.spec	4 Apr 2006 06:42:44 -0000	1.28
+++ gnucash.spec	6 Apr 2006 04:49:23 -0000	1.29
@@ -4,11 +4,11 @@
 
 Name: gnucash
 Summary: GnuCash is an application to keep track of your finances.
-Version: 1.9.3
+Version: 1.9.4
 %if %{buildsvn}
 Release: 1.svn%{svnrev}.1
 %else
-Release: 2
+Release: 1
 %endif
 License: GPL/GFDL
 Group: Applications/Productivity
@@ -138,6 +138,9 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Thu Apr  6 2006 Bill Nottingham <notting at redhat.com> - 1.9.4-1
+- update to 1.9.4
+
 * Tue Apr  4 2006 Bill Nottingham <notting at redhat.com> - 1.9.3-2
 - fix conflict with qof (#187267)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	27 Mar 2006 21:11:55 -0000	1.14
+++ sources	6 Apr 2006 04:49:23 -0000	1.15
@@ -1,2 +1,2 @@
-00841051fe0a68547178765148f319aa  gnucash-1.9.3.tar.gz
 c507275cde120fb23ff03aac8d81ee89  gnucash-docs-1.9.3.svn13703.tar.bz2
+47d4224f001b46d4ca81c6b9dd46bd94  gnucash-1.9.4.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr  6 04:54:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 00:54:06 -0400
Subject: rpms/gnucash/devel .cvsignore, 1.14, 1.15 gnucash.spec, 1.29,
	1.30 sources, 1.15, 1.16
Message-ID: <200604060454.k364s6vE014822@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14810

Modified Files:
	.cvsignore gnucash.spec sources 
Log Message:
fix build



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	6 Apr 2006 04:49:23 -0000	1.14
+++ .cvsignore	6 Apr 2006 04:54:01 -0000	1.15
@@ -3,3 +3,4 @@
 gnucash-1.9.3.tar.gz
 gnucash-docs-1.9.3.svn13703.tar.bz2
 gnucash-1.9.4.tar.gz
+gnucash-docs-1.9.4.svn13741.tar.bz2


Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gnucash.spec	6 Apr 2006 04:49:23 -0000	1.29
+++ gnucash.spec	6 Apr 2006 04:54:01 -0000	1.30
@@ -1,4 +1,4 @@
-%define svnrev 13703
+%define svnrev 13741
 
 %define buildsvn 0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	6 Apr 2006 04:49:23 -0000	1.15
+++ sources	6 Apr 2006 04:54:01 -0000	1.16
@@ -1,2 +1,2 @@
-c507275cde120fb23ff03aac8d81ee89  gnucash-docs-1.9.3.svn13703.tar.bz2
 47d4224f001b46d4ca81c6b9dd46bd94  gnucash-1.9.4.tar.gz
+57738a4c27ea6e68a4870357f1b9091e  gnucash-docs-1.9.4.svn13741.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr  6 08:46:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 04:46:40 -0400
Subject: rpms/alsa-utils/FC-5 alsa-utils.spec, 1.34, 1.35 alsaunmute.c, 1.6,
	1.7
Message-ID: <200604060846.k368kecU027402@cvs.devel.redhat.com>

Author: stransky

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

Modified Files:
	alsa-utils.spec alsaunmute.c 
Log Message:
fix for #187807


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/FC-5/alsa-utils.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- alsa-utils.spec	20 Feb 2006 16:53:36 -0000	1.34
+++ alsa-utils.spec	6 Apr 2006 08:46:38 -0000	1.35
@@ -3,7 +3,7 @@
 Summary: 	Advanced Linux Sound Architecture (ALSA) utilities
 Name: 		alsa-utils
 Version: 	1.0.11
-Release: 	3.rc2
+Release: 	4.rc2
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
@@ -68,6 +68,10 @@
 /usr/share/locale/*
 
 %changelog
+* Thu Apr 6 2006 Martin Stransky <stransky at redhat.com> 1.0.11-4.rc2
+- disabled "Audigy Analog/Digital Output Jack" switch 
+  for emu10k1 driver (#187807)
+
 * Mon Feb 20 2006 Martin Stransky <stransky at redhat.com> 1.0.11-3.rc2
 - removed autoreconf
 


Index: alsaunmute.c
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/FC-5/alsaunmute.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- alsaunmute.c	25 Jan 2006 09:53:26 -0000	1.6
+++ alsaunmute.c	6 Apr 2006 08:46:38 -0000	1.7
@@ -83,7 +83,8 @@
   {"SPDIF Out",		 0, 	0, 	0, 	0, 	"snd-ca0106"},
 
   // Specific config for snd-emu10k1
-  {"Audigy Analog/Digital Output Jack",	0,1,0, 	0, 	"snd-emu10k1"},
+// Removed (#187807)
+// {"Audigy Analog/Digital Output Jack",	0,1,0, 	0, 	"snd-emu10k1"},
   {"IEC958 Optical Raw", 0,	0,	0, 	0, 	"snd-emu10k1"},
   {"Tone", 		 0,	0,	0, 	0, 	"snd-emu10k1"},
 
@@ -245,7 +246,6 @@
 {
   FILE *f = fopen(PROC_MODULES,"r");
   char  tmp[100];
-  char *p_tmp;  
   int   id;
 
   if(!f)
@@ -273,7 +273,6 @@
 
 void check_data(void)
 {
-  char *p_tmp;
   int i;
 
   for (i = 0; i < sizeof(channels) / sizeof(channels[0]); i++) {



From fedora-cvs-commits at redhat.com  Thu Apr  6 08:52:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 04:52:41 -0400
Subject: rpms/alsa-utils/devel alsa-utils.spec, 1.35, 1.36 alsaunmute.c, 1.6,
	1.7
Message-ID: <200604060852.k368qfD6030479@cvs.devel.redhat.com>

Author: stransky

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

Modified Files:
	alsa-utils.spec alsaunmute.c 
Log Message:
fixed Audigi mixer switch (#187807)


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- alsa-utils.spec	24 Mar 2006 09:57:50 -0000	1.35
+++ alsa-utils.spec	6 Apr 2006 08:52:39 -0000	1.36
@@ -3,7 +3,7 @@
 Summary: 	Advanced Linux Sound Architecture (ALSA) utilities
 Name: 		alsa-utils
 Version: 	1.0.11
-Release: 	4.rc2
+Release: 	5.rc2
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
@@ -68,8 +68,9 @@
 /usr/share/locale/*
 
 %changelog
-* Fri Mar 24 2006 Martin Stransky <stransky at redhat.com> 1.0.11-4.rc2
+* Fri Mar 24 2006 Martin Stransky <stransky at redhat.com> 1.0.11-5.rc2
 - fixed rules file (#186494)
+- fixed Audigi mixer switch (#187807)
 
 * Mon Feb 20 2006 Martin Stransky <stransky at redhat.com> 1.0.11-3.rc2
 - removed autoreconf


Index: alsaunmute.c
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/alsaunmute.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- alsaunmute.c	25 Jan 2006 09:53:26 -0000	1.6
+++ alsaunmute.c	6 Apr 2006 08:52:39 -0000	1.7
@@ -83,7 +83,8 @@
   {"SPDIF Out",		 0, 	0, 	0, 	0, 	"snd-ca0106"},
 
   // Specific config for snd-emu10k1
-  {"Audigy Analog/Digital Output Jack",	0,1,0, 	0, 	"snd-emu10k1"},
+// Removed (#187807)
+// {"Audigy Analog/Digital Output Jack",	0,1,0, 	0, 	"snd-emu10k1"},
   {"IEC958 Optical Raw", 0,	0,	0, 	0, 	"snd-emu10k1"},
   {"Tone", 		 0,	0,	0, 	0, 	"snd-emu10k1"},
 
@@ -245,7 +246,6 @@
 {
   FILE *f = fopen(PROC_MODULES,"r");
   char  tmp[100];
-  char *p_tmp;  
   int   id;
 
   if(!f)
@@ -273,7 +273,6 @@
 
 void check_data(void)
 {
-  char *p_tmp;
   int i;
 
   for (i = 0; i < sizeof(channels) / sizeof(channels[0]); i++) {



From fedora-cvs-commits at redhat.com  Thu Apr  6 09:00:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 05:00:51 -0400
Subject: rpms/alsa-utils/devel alsa-utils.spec,1.36,1.37
Message-ID: <200604060900.k3690pow030556@cvs.devel.redhat.com>

Author: stransky

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

Modified Files:
	alsa-utils.spec 
Log Message:
only changelog update


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- alsa-utils.spec	6 Apr 2006 08:52:39 -0000	1.36
+++ alsa-utils.spec	6 Apr 2006 09:00:49 -0000	1.37
@@ -68,7 +68,7 @@
 /usr/share/locale/*
 
 %changelog
-* Fri Mar 24 2006 Martin Stransky <stransky at redhat.com> 1.0.11-5.rc2
+* Thu Apr 6  2006 Martin Stransky <stransky at redhat.com> 1.0.11-5.rc2
 - fixed rules file (#186494)
 - fixed Audigi mixer switch (#187807)
 



From fedora-cvs-commits at redhat.com  Thu Apr  6 09:09:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 05:09:59 -0400
Subject: rpms/kdepim/devel kdepim.spec,1.77,1.78
Message-ID: <200604060909.k3699xKO030719@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdepim.spec 
Log Message:
update to 3.5.2



Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- kdepim.spec	29 Mar 2006 14:08:20 -0000	1.77
+++ kdepim.spec	6 Apr 2006 09:09:56 -0000	1.78
@@ -6,6 +6,8 @@
 %define arts 1
 %define make_cvs 1
 
+%define appdir %{_datadir}/applications/kde
+%
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.2
@@ -158,21 +160,12 @@
 done
 popd
 
-desktop-file-install \
-   --vendor "" \
-   --delete-original \
-   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/kde \
-   --add-only-show-in="KDE" \
-   ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/konsolekalendar.desktop \
-   ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/knotes.desktop \
-%ifnarch s390 s390x
-   ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/kpilotdaemon.desktop \
-   ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/kpilot.desktop \
-%endif
-   ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/KMail.desktop \
-   ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/KNode.desktop \
-   ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/Kontact.desktop \
-   ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/KOrn.desktop
+for i in konsolekalendar knotes kpilotdaemon kpilot KMail KNode Kontact \
+   KOrn akregator kalarm groupwarewizard kpalmdoc ktnef multisynk ; do
+   if [ -f $RPM_BUILD_ROOT%{appdir}/$i.desktop ] ; then
+      echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{appdir}/$i.desktop
+   fi
+done
 
 %post -p /sbin/ldconfig
 
@@ -207,7 +200,7 @@
 %{_includedir}/kde/*
 
 %changelog
-* Wed Mar 29 2006 Than Ngo <than at redhat.com> 3.5.2-1
+* Wed Mar 29 2006 Than Ngo <than at redhat.com> 6:3.5.2-1
 - update to 3.5.2
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-1.2



From fedora-cvs-commits at redhat.com  Thu Apr  6 09:11:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 05:11:51 -0400
Subject: rpms/kdepim/devel kdepim.spec,1.78,1.79
Message-ID: <200604060911.k369Bpa9030794@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdepim.spec 
Log Message:
typo



Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- kdepim.spec	6 Apr 2006 09:09:56 -0000	1.78
+++ kdepim.spec	6 Apr 2006 09:11:49 -0000	1.79
@@ -7,7 +7,7 @@
 %define make_cvs 1
 
 %define appdir %{_datadir}/applications/kde
-%
+
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.2



From fedora-cvs-commits at redhat.com  Thu Apr  6 09:31:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 05:31:42 -0400
Subject: rpms/policycoreutils/devel policycoreutils.spec,1.255,1.256
Message-ID: <200604060931.k369VgsQ012209@cvs.devel.redhat.com>

Author: karsten

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

Modified Files:
	policycoreutils.spec 
Log Message:
- use absolute path /sbin/service


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- policycoreutils.spec	5 Apr 2006 13:11:54 -0000	1.255
+++ policycoreutils.spec	6 Apr 2006 09:31:39 -0000	1.256
@@ -5,7 +5,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.4
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -104,9 +104,12 @@
 %config(noreplace) /etc/selinux/restorecond.conf
 
 %post
-service restorecond condrestart
+/sbin/service restorecond condrestart
 
 %changelog
+* Thu Apr 06 2006 Karsten Hopp <karsten at redhat.de> 1.30.4-3
+- use absolute path /sbin/service
+
 * Wed Mar 29 2006 Dan Walsh <dwalsh at redhat.com> 1.30.4-2
 - Fix audit2allow to not require ausearch.
 - Fix man page



From fedora-cvs-commits at redhat.com  Thu Apr  6 10:19:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 06:19:25 -0400
Subject: rpms/ghostscript/devel espgs-pdfwrite.patch, NONE,
	1.1 ghostscript.spec, 1.103, 1.104
Message-ID: <200604061019.k36AJPZP007466@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7451

Modified Files:
	ghostscript.spec 
Added Files:
	espgs-pdfwrite.patch 
Log Message:
* Thu Apr  6 2006 Tim Waugh <twaugh at redhat.com> 8.15.1-8
- Fix pdfwrite (bug #187834).
- CUPS filters go in /usr/lib/cups/filter even on lib64 platforms.


espgs-pdfwrite.patch:
 gdevpdfj.c |    3 +++
 gdevpdfo.c |    5 ++++-
 gdevpdfr.c |    3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE espgs-pdfwrite.patch ---
--- espgs-8.15.1/src/gdevpdfr.c.pdfwrite	2005-08-11 20:57:14.000000000 +0100
+++ espgs-8.15.1/src/gdevpdfr.c	2006-04-06 10:20:33.000000000 +0100
@@ -309,7 +309,8 @@
 	stream_PSSD_state ss;
 	int status;
 
-	s_PSSD_init((stream_state *)&ss);
+	s_PSSD_partially_init_inline(&ss);
+	ss.from_string = true;
 	r.ptr = p;		/* skip the '(' */
 	r.limit = end - 1;
 	w.limit = buf + sizeof(buf) - 1;
--- espgs-8.15.1/src/gdevpdfj.c.pdfwrite	2005-08-11 20:57:14.000000000 +0100
+++ espgs-8.15.1/src/gdevpdfj.c	2006-04-06 10:20:33.000000000 +0100
@@ -346,6 +346,9 @@
     pbw->dev = (gx_device_psdf *)pdev;
     pbw->memory = pdev->pdf_memory;
     pbw->target = NULL; /* We don't need target with cos_write_stream. */
+
+    return 0;	/* Code below seems to break drawings */
+
     pdev->strm = pbw->strm;
     code = psdf_begin_binary((gx_device_psdf *) pdev, pbw);
     pdev->strm = save_strm;
--- espgs-8.15.1/src/gdevpdfo.c.pdfwrite	2005-08-11 20:57:14.000000000 +0100
+++ espgs-8.15.1/src/gdevpdfo.c	2006-04-06 10:20:33.000000000 +0100
@@ -1045,13 +1045,16 @@
 	const cos_value_t *v = cos_dict_find(pcd1, pcde0->key.data, pcde0->key.size);
 	int code;
 
+	if (cos_type(v->contents.object) != cos_type_dict)
+	    return false;	/* Should _never_ happen */
+
 	if (v == NULL)
 	    return false;
 	code = cos_value_equal(&pcde0->value, v, pdev);
 	if (code < 0)
 	    return code;
 	if (!code)
-		    return false;
+	    return false;
     }
     return true;
 }


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- ghostscript.spec	2 Mar 2006 14:58:45 -0000	1.103
+++ ghostscript.spec	6 Apr 2006 10:19:22 -0000	1.104
@@ -5,7 +5,7 @@
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 7
+Release: 8
 
 License: GPL
 URL: http://www.cups.org/espgs/
@@ -27,6 +27,7 @@
 Patch9: ghostscript-split-font-configuration.patch
 Patch10: ghostscript-big-cmap-post.patch
 Patch11: ghostscript-krgb.patch
+Patch12: espgs-pdfwrite.patch
 
 Requires: zlib, libpng, glib2
 Requires: urw-fonts >= 1.1, ghostscript-fonts
@@ -110,6 +111,9 @@
 # Updated KRGB patch for gdevijs.
 %patch11 -p1 -b .krgb
 
+# Fix pdfwrite (bug #187834).
+%patch12 -p1 -b .pdfwrite
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -246,7 +250,8 @@
 %{_libdir}/libgs.so
 %{_libdir}/libijs*.so*
 %{_libdir}/%{name}/%{gs_dot_ver}
-%{_libdir}/cups/filter/pstopxl
+/usr/lib/cups/filter/pstopxl
+/usr/lib/cups/filter/pstoraster
 %{_datadir}/cups/model/pxl*
 
 %files gtk
@@ -267,6 +272,10 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Apr  6 2006 Tim Waugh <twaugh at redhat.com> 8.15.1-8
+- Fix pdfwrite (bug #187834).
+- CUPS filters go in /usr/lib/cups/filter even on lib64 platforms.
+
 * Thu Mar  2 2006 Tim Waugh <twaugh at redhat.com> 8.15.1-7
 - BuildRequires: gnutls-devel
 - Updated KRGB patch for gdevijs.



From fedora-cvs-commits at redhat.com  Thu Apr  6 10:21:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 06:21:31 -0400
Subject: rpms/policycoreutils/devel policycoreutils.spec,1.256,1.257
Message-ID: <200604061021.k36ALVXq007564@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7551

Modified Files:
	policycoreutils.spec 
Log Message:
- added some missing buildrequires
- added Requires: initscripts for /sbin/service




Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- policycoreutils.spec	6 Apr 2006 09:31:39 -0000	1.256
+++ policycoreutils.spec	6 Apr 2006 10:21:29 -0000	1.257
@@ -5,15 +5,16 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.4
-Release: 3
+Release: 4
 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} 
+BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver}  libcap-devel audit-libs-devel
 Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff
 Requires: libsepol >= %{libsepolver} libsemanage >= %{libsemanagever} libselinux-python coreutils audit-libs-python >=  %{libauditver} 
+Requires: initscripts
 BuildRoot: %{_tmppath}/%{name}-buildroot
 
 %description
@@ -107,6 +108,10 @@
 /sbin/service restorecond condrestart
 
 %changelog
+* Thu Apr 06 2006 Karsten Hopp <karsten at redhat.de> 1.30.4-4
+- added some missing buildrequires
+- added Requires: initscripts for /sbin/service
+
 * Thu Apr 06 2006 Karsten Hopp <karsten at redhat.de> 1.30.4-3
 - use absolute path /sbin/service
 



From fedora-cvs-commits at redhat.com  Thu Apr  6 10:35:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 06:35:00 -0400
Subject: rpms/ghostscript/devel ghostscript.spec,1.104,1.105
Message-ID: <200604061035.k36AZ0EX007721@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7708

Modified Files:
	ghostscript.spec 
Log Message:
Fixed typo.


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- ghostscript.spec	6 Apr 2006 10:19:22 -0000	1.104
+++ ghostscript.spec	6 Apr 2006 10:34:58 -0000	1.105
@@ -251,7 +251,6 @@
 %{_libdir}/libijs*.so*
 %{_libdir}/%{name}/%{gs_dot_ver}
 /usr/lib/cups/filter/pstopxl
-/usr/lib/cups/filter/pstoraster
 %{_datadir}/cups/model/pxl*
 
 %files gtk



From fedora-cvs-commits at redhat.com  Thu Apr  6 10:44:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 06:44:18 -0400
Subject: rpms/mkbootdisk/devel mkbootdisk.spec,1.20,1.21
Message-ID: <200604061044.k36AiIYJ007859@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/mkbootdisk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7845

Modified Files:
	mkbootdisk.spec 
Log Message:
change noarch back to ExclusiveArch



Index: mkbootdisk.spec
===================================================================
RCS file: /cvs/dist/rpms/mkbootdisk/devel/mkbootdisk.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mkbootdisk.spec	5 Apr 2006 10:56:26 -0000	1.20
+++ mkbootdisk.spec	6 Apr 2006 10:44:16 -0000	1.21
@@ -1,12 +1,12 @@
 Summary: Creates a boot floppy disk for booting a system.
 Name: mkbootdisk
 Version:  1.5.3
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: mkbootdisk-%{version}.tar.gz
 ExclusiveOs: Linux
-BuildArch: noarch
+ExclusiveArch: i386 sparc x86_64
 Requires: mkinitrd dosfstools
 %ifnarch sparc
 Requires: syslinux
@@ -41,6 +41,9 @@
 %attr(644,root,root) %{_mandir}/man8/mkbootdisk.8.gz
 
 %changelog
+* Thu Apr 06 2006 Peter Vrabec <pvrabec at redhat.com> 1.5.3-2
+- change noarch back to ExclusiveArch
+
 * Wed Apr 05 2006 Peter Vrabec <pvrabec at redhat.com> 1.5.3-1
 - fix tail command usage (#187876)
 



From fedora-cvs-commits at redhat.com  Thu Apr  6 10:44:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 06:44:41 -0400
Subject: rpms/ghostscript/devel ghostscript.spec,1.105,1.106
Message-ID: <200604061044.k36Aif5N007913@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7900

Modified Files:
	ghostscript.spec 
Log Message:
Really remove pstoraster.


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- ghostscript.spec	6 Apr 2006 10:34:58 -0000	1.105
+++ ghostscript.spec	6 Apr 2006 10:44:39 -0000	1.106
@@ -215,6 +215,7 @@
 # Don't ship files that get shipped in the cups package.
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/cups
 rm -f $RPM_BUILD_ROOT%{_libdir}/cups/filter/pstoraster
+rm -f $RPM_BUILD_ROOT/usr/lib/cups/filter/pstoraster
 
 # Don't ship two copies of Resource.  Just the versioned one will do.
 rm -rf $RPM_BUILD_ROOT%{_datadir}/ghostscript/Resource



From fedora-cvs-commits at redhat.com  Thu Apr  6 10:48:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 06:48:55 -0400
Subject: rpms/kdeaddons/FC-5 .cvsignore, 1.29, 1.30 kdeaddons.spec, 1.44,
	1.45 sources, 1.30, 1.31
Message-ID: <200604061048.k36Amtw0021733@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdeaddons.spec sources 
Log Message:
update to 3.5.2




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/FC-5/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	3 Feb 2006 22:21:14 -0000	1.29
+++ .cvsignore	6 Apr 2006 10:48:52 -0000	1.30
@@ -9,3 +9,4 @@
 kdeaddons-3.4.92.tar.bz2
 kdeaddons-3.5.0.tar.bz2
 kdeaddons-3.5.1.tar.bz2
+kdeaddons-3.5.2.tar.bz2


Index: kdeaddons.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/FC-5/kdeaddons.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kdeaddons.spec	11 Feb 2006 03:44:27 -0000	1.44
+++ kdeaddons.spec	6 Apr 2006 10:48:52 -0000	1.45
@@ -4,7 +4,9 @@
 %define make_cvs 1
 
 %define qt_version 3.3.5
-%define arts_version 1.5.1
+%define arts_version 1.5.2
+%define sdl_version 1.2.0
+
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 %define arts_epoch 8
@@ -12,8 +14,8 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.1
-Release: 1.2
+Version: 3.5.2
+Release: 0.1.fc5
 Name: kdeaddons
 Summary: K Desktop Environment - Plugins
 Group: User Interface/Desktops
@@ -23,18 +25,19 @@
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch1: kde-libtool.patch
 
-Requires(post,postun): /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: arts >= %{arts_epoch}:%{arts_version}
-Requires: SDL >= 1.2.0
+Requires: SDL >= %{sdl_version}
 
 BuildPrereq: kdegames-devel
 BuildPrereq: kdemultimedia-devel
 BuildPrereq: zlib-devel
 BuildPrereq: libpng-devel
 BuildPrereq: libmng-devel
-BuildPrereq: SDL-devel >= 1.2.0
+BuildPrereq: SDL-devel >= %{sdl_version}
 BuildPrereq: perl
 BuildPrereq: arts-devel
 BuildPrereq: kdepim-devel
@@ -81,8 +84,8 @@
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 export KDEDIR=%{prefix}
-export CXXFLAGS="$RPM_OPT_FLAGS"
-export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS=%{optflags}
+export CFLAGS=%{optflags}
 
 %configure \
    --enable-new-ldflags \
@@ -113,10 +116,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 # Make symlinks relative
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
 done
@@ -127,7 +130,7 @@
 %postun -p /sbin/ldconfig
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -168,6 +171,9 @@
 %endif
 
 %changelog
+* Thu Apr 06 2006 Than Ngo <than at redhat.com> 3.5.2-0.1.fc5
+- update to 3.5.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)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/FC-5/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	3 Feb 2006 22:21:14 -0000	1.30
+++ sources	6 Apr 2006 10:48:52 -0000	1.31
@@ -1 +1 @@
-cbd2a6f65ae7338736d93b72bfdf5ae3  kdeaddons-3.5.1.tar.bz2
+affb74174c6e3eda2c0748d6c052c8ff  kdeaddons-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr  6 10:52:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 06:52:40 -0400
Subject: rpms/kdeaddons/devel kdeaddons.spec,1.44,1.45 sources,1.30,1.31
Message-ID: <200604061052.k36Aqe0f021819@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeaddons/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21804

Modified Files:
	kdeaddons.spec sources 
Log Message:
update to 3.5.2



Index: kdeaddons.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/devel/kdeaddons.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kdeaddons.spec	11 Feb 2006 03:44:27 -0000	1.44
+++ kdeaddons.spec	6 Apr 2006 10:52:38 -0000	1.45
@@ -3,8 +3,10 @@
 %define final 1
 %define make_cvs 1
 
-%define qt_version 3.3.5
-%define arts_version 1.5.1
+%define qt_version 3.3.6
+%define arts_version 1.5.2
+%define sdl_version 1.2.0
+
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 %define arts_epoch 8
@@ -12,8 +14,8 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.1
-Release: 1.2
+Version: 3.5.2
+Release: 1
 Name: kdeaddons
 Summary: K Desktop Environment - Plugins
 Group: User Interface/Desktops
@@ -23,18 +25,19 @@
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch1: kde-libtool.patch
 
-Requires(post,postun): /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: arts >= %{arts_epoch}:%{arts_version}
-Requires: SDL >= 1.2.0
+Requires: SDL >= %{sdl_version}
 
 BuildPrereq: kdegames-devel
 BuildPrereq: kdemultimedia-devel
 BuildPrereq: zlib-devel
 BuildPrereq: libpng-devel
 BuildPrereq: libmng-devel
-BuildPrereq: SDL-devel >= 1.2.0
+BuildPrereq: SDL-devel >= %{sdl_version}
 BuildPrereq: perl
 BuildPrereq: arts-devel
 BuildPrereq: kdepim-devel
@@ -81,8 +84,8 @@
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 export KDEDIR=%{prefix}
-export CXXFLAGS="$RPM_OPT_FLAGS"
-export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS=%{optflags}
+export CFLAGS=%{optflags}
 
 %configure \
    --enable-new-ldflags \
@@ -113,10 +116,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 # Make symlinks relative
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
 done
@@ -127,7 +130,7 @@
 %postun -p /sbin/ldconfig
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -168,6 +171,9 @@
 %endif
 
 %changelog
+* Thu Apr 06 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> - 3.5.1-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	3 Feb 2006 22:21:14 -0000	1.30
+++ sources	6 Apr 2006 10:52:38 -0000	1.31
@@ -1 +1 @@
-cbd2a6f65ae7338736d93b72bfdf5ae3  kdeaddons-3.5.1.tar.bz2
+affb74174c6e3eda2c0748d6c052c8ff  kdeaddons-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr  6 11:01:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 07:01:27 -0400
Subject: rpms/ghostscript/FC-5 espgs-pdfwrite.patch, NONE,
	1.1 ghostscript.spec, 1.103, 1.104
Message-ID: <200604061101.k36B1Riq021986@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	ghostscript.spec 
Added Files:
	espgs-pdfwrite.patch 
Log Message:
* Thu Apr  6 2006 Tim Waugh <twaugh at redhat.com> 8.15.1-7.1
- Fix pdfwrite (bug #187834).
- Put pstopxl in both lib and lib64 CUPS filter directories on lib64
  platforms.


espgs-pdfwrite.patch:
 gdevpdfj.c |    3 +++
 gdevpdfo.c |    5 ++++-
 gdevpdfr.c |    3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE espgs-pdfwrite.patch ---
--- espgs-8.15.1/src/gdevpdfr.c.pdfwrite	2005-08-11 20:57:14.000000000 +0100
+++ espgs-8.15.1/src/gdevpdfr.c	2006-04-06 10:20:33.000000000 +0100
@@ -309,7 +309,8 @@
 	stream_PSSD_state ss;
 	int status;
 
-	s_PSSD_init((stream_state *)&ss);
+	s_PSSD_partially_init_inline(&ss);
+	ss.from_string = true;
 	r.ptr = p;		/* skip the '(' */
 	r.limit = end - 1;
 	w.limit = buf + sizeof(buf) - 1;
--- espgs-8.15.1/src/gdevpdfj.c.pdfwrite	2005-08-11 20:57:14.000000000 +0100
+++ espgs-8.15.1/src/gdevpdfj.c	2006-04-06 10:20:33.000000000 +0100
@@ -346,6 +346,9 @@
     pbw->dev = (gx_device_psdf *)pdev;
     pbw->memory = pdev->pdf_memory;
     pbw->target = NULL; /* We don't need target with cos_write_stream. */
+
+    return 0;	/* Code below seems to break drawings */
+
     pdev->strm = pbw->strm;
     code = psdf_begin_binary((gx_device_psdf *) pdev, pbw);
     pdev->strm = save_strm;
--- espgs-8.15.1/src/gdevpdfo.c.pdfwrite	2005-08-11 20:57:14.000000000 +0100
+++ espgs-8.15.1/src/gdevpdfo.c	2006-04-06 10:20:33.000000000 +0100
@@ -1045,13 +1045,16 @@
 	const cos_value_t *v = cos_dict_find(pcd1, pcde0->key.data, pcde0->key.size);
 	int code;
 
+	if (cos_type(v->contents.object) != cos_type_dict)
+	    return false;	/* Should _never_ happen */
+
 	if (v == NULL)
 	    return false;
 	code = cos_value_equal(&pcde0->value, v, pdev);
 	if (code < 0)
 	    return code;
 	if (!code)
-		    return false;
+	    return false;
     }
     return true;
 }


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/FC-5/ghostscript.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- ghostscript.spec	2 Mar 2006 14:58:45 -0000	1.103
+++ ghostscript.spec	6 Apr 2006 11:01:24 -0000	1.104
@@ -5,7 +5,7 @@
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 7
+Release: 7.1
 
 License: GPL
 URL: http://www.cups.org/espgs/
@@ -27,6 +27,7 @@
 Patch9: ghostscript-split-font-configuration.patch
 Patch10: ghostscript-big-cmap-post.patch
 Patch11: ghostscript-krgb.patch
+Patch12: espgs-pdfwrite.patch
 
 Requires: zlib, libpng, glib2
 Requires: urw-fonts >= 1.1, ghostscript-fonts
@@ -110,6 +111,9 @@
 # Updated KRGB patch for gdevijs.
 %patch11 -p1 -b .krgb
 
+# Fix pdfwrite (bug #187834).
+%patch12 -p1 -b .pdfwrite
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -211,6 +215,21 @@
 # Don't ship files that get shipped in the cups package.
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/cups
 rm -f $RPM_BUILD_ROOT%{_libdir}/cups/filter/pstoraster
+rm -f $RPM_BUILD_ROOT/usr/lib/cups/filter/pstoraster
+%if "%_libdir" == "/usr/lib64"
+if [ -f $RPM_BUILD_ROOT/usr/lib64/cups/filter/pstopxl ] && \
+   [ ! -f $RPM_BUILD_ROOT/usr/lib/cups/filter/pstopxl ]
+then
+  mkdir -p $RPM_BUILD_ROOT/usr/lib/cups/filter
+  cp -a $RPM_BUILD_ROOT/usr/lib{64,}/cups/filter/pstopxl
+fi
+if [ -f $RPM_BUILD_ROOT/usr/lib/cups/filter/pstopxl ] && \
+   [ ! -f $RPM_BUILD_ROOT/usr/lib64/cups/filter/pstopxl ]
+then
+  mkdir -p $RPM_BUILD_ROOT/usr/lib64/cups/filter
+  cp -a $RPM_BUILD_ROOT/usr/lib{,64}/cups/filter/pstopxl
+fi
+%endif
 
 # Don't ship two copies of Resource.  Just the versioned one will do.
 rm -rf $RPM_BUILD_ROOT%{_datadir}/ghostscript/Resource
@@ -246,7 +265,10 @@
 %{_libdir}/libgs.so
 %{_libdir}/libijs*.so*
 %{_libdir}/%{name}/%{gs_dot_ver}
+%if "%_libdir" == "/usr/lib64"
 %{_libdir}/cups/filter/pstopxl
+%endif
+/usr/lib/cups/filter/pstopxl
 %{_datadir}/cups/model/pxl*
 
 %files gtk
@@ -267,6 +289,11 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Apr  6 2006 Tim Waugh <twaugh at redhat.com> 8.15.1-7.1
+- Fix pdfwrite (bug #187834).
+- Put pstopxl in both lib and lib64 CUPS filter directories on lib64
+  platforms.
+
 * Thu Mar  2 2006 Tim Waugh <twaugh at redhat.com> 8.15.1-7
 - BuildRequires: gnutls-devel
 - Updated KRGB patch for gdevijs.



From fedora-cvs-commits at redhat.com  Thu Apr  6 11:47:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 07:47:19 -0400
Subject: rpms/kdeaddons/FC-5 kdeaddons.spec,1.45,1.46
Message-ID: <200604061147.k36BlJ88017354@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdeaddons.spec 
Log Message:
typo



Index: kdeaddons.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/FC-5/kdeaddons.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- kdeaddons.spec	6 Apr 2006 10:48:52 -0000	1.45
+++ kdeaddons.spec	6 Apr 2006 11:47:17 -0000	1.46
@@ -84,8 +84,8 @@
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 export KDEDIR=%{prefix}
-export CXXFLAGS=%{optflags}
-export CFLAGS=%{optflags}
+export CXXFLAGS="%{optflags}"
+export CFLAGS="%{optflags}"
 
 %configure \
    --enable-new-ldflags \



From fedora-cvs-commits at redhat.com  Thu Apr  6 11:51:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 07:51:37 -0400
Subject: rpms/kdeaddons/devel kdeaddons.spec,1.45,1.46
Message-ID: <200604061151.k36BpbRE017519@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeaddons/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17506

Modified Files:
	kdeaddons.spec 
Log Message:
typo



Index: kdeaddons.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/devel/kdeaddons.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- kdeaddons.spec	6 Apr 2006 10:52:38 -0000	1.45
+++ kdeaddons.spec	6 Apr 2006 11:51:35 -0000	1.46
@@ -84,8 +84,8 @@
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 export KDEDIR=%{prefix}
-export CXXFLAGS=%{optflags}
-export CFLAGS=%{optflags}
+export CXXFLAGS="%{optflags}"
+export CFLAGS="%{optflags}"
 
 %configure \
    --enable-new-ldflags \



From fedora-cvs-commits at redhat.com  Thu Apr  6 12:15:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 08:15:37 -0400
Subject: rpms/tzdata/devel .cvsignore, 1.22, 1.23 sources, 1.24,
	1.25 tzdata.spec, 1.28, 1.29 tzdata2006b-srilanka.patch, 1.1, NONE
Message-ID: <200604061215.k36CFb8M018257@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/tzdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17913

Modified Files:
	.cvsignore sources tzdata.spec 
Removed Files:
	tzdata2006b-srilanka.patch 
Log Message:
Upstream 2006c.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tzdata/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	22 Mar 2006 09:45:45 -0000	1.22
+++ .cvsignore	6 Apr 2006 12:15:34 -0000	1.23
@@ -1,3 +1,3 @@
+tzcode2006c.tar.gz
+tzdata2006c.tar.gz
 tzdata-base-0.tar.bz2
-tz64code2006b.tar.gz
-tzdata2006b.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tzdata/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	22 Mar 2006 09:45:45 -0000	1.24
+++ sources	6 Apr 2006 12:15:34 -0000	1.25
@@ -1,3 +1,3 @@
+2100d0b0c6f2ad320260290e5dc7e957  tzcode2006c.tar.gz
+420d97a09c9750839afc2703f6b8276f  tzdata2006c.tar.gz
 906a4c98cc5240f416524a256b039c42  tzdata-base-0.tar.bz2
-37524ee1c072a51511a6c220f8faf95f  tz64code2006b.tar.gz
-244523d10f93f392d96da4ef11b6cdd7  tzdata2006b.tar.gz


Index: tzdata.spec
===================================================================
RCS file: /cvs/dist/rpms/tzdata/devel/tzdata.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- tzdata.spec	22 Mar 2006 09:45:45 -0000	1.28
+++ tzdata.spec	6 Apr 2006 12:15:34 -0000	1.29
@@ -1,13 +1,12 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2006b
-Release: 2
+Version: 2006c
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{version}.tar.gz
-Source2: ftp://elsie.nci.nih.gov/pub/tz64code%{version}.tar.gz
-Patch0: tzdata2006b-srilanka.patch
+Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz
 BuildRequires: gawk, glibc, glibc-common, perl
 Conflicts: glibc-common <= 2.3.2-63
 BuildArchitectures: noarch
@@ -27,7 +26,6 @@
     -e 's|@datadir@|%{_datadir}|' \
     -e 's|@install_root@|%{buildroot}|' \
   Makeconfig.in > Makeconfig
-%patch0 -p1
 
 %build
 make
@@ -50,6 +48,20 @@
 %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html
 
 %changelog
+* Thu Apr  6 2006 Petr Machata <pmachata at redhat.com> - 2006c-1
+- Upstream 2006c
+  - Time-related changes:
+    - dozens of historical and commentary changes
+    - Iran stopped observing DST
+    - Sri Lanka switches from UTC+6 to UTC+5:30
+    - America/Thule and America/Edmonton will adopt new US rules,
+      starting 2007
+    - Tunisia is adopting regular DST
+  - Code:
+    - asctime.c: Chages in format strings to silent gcc warnings
+    - removing K&R notation from function signatures
+    - few fixes across the code
+
 * Thu Mar 16 2006 Petr Machata <pmachata at redhat.com> - 2006b-2
 - Patch for Sri Lanka time zone change (#184514)
 


--- tzdata2006b-srilanka.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr  6 12:17:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 08:17:03 -0400
Subject: rpms/subversion/devel subversion.spec,1.73,1.74
Message-ID: <200604061217.k36CH30L031678@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	subversion.spec 
Log Message:
* Thu Apr  6 2006 Joe Orton <jorton at redhat.com> 1.3.1-4
- move libsvn_swig_ruby* back to subversion-ruby



Index: subversion.spec
===================================================================
RCS file: /cvs/dist/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- subversion.spec	4 Apr 2006 09:21:08 -0000	1.73
+++ subversion.spec	6 Apr 2006 12:17:01 -0000	1.74
@@ -1,12 +1,7 @@
 # set to zero to avoid running test suite
 %define make_check 1
 
-%ifarch s390
-# weird gjnih error on s390?
 %define with_java 1
-%else
-%define with_java 1
-%endif
 
 # set JDK path to build javahl; default for JPackage
 %define jdk_path /usr/lib/jvm/java
@@ -16,7 +11,7 @@
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
 Version: 1.3.1
-Release: 3
+Release: 4
 License: BSD
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -211,6 +206,7 @@
 %{_datadir}/emacs/site-lisp
 %{_datadir}/xemacs/site-packages/lisp
 %exclude %{_libdir}/libsvn_swig_perl*
+%exclude %{_libdir}/libsvn_swig_ruby*
 %exclude %{_mandir}/man*/*::*
 
 %files devel
@@ -238,8 +234,7 @@
 
 %files ruby
 %defattr(-,root,root,-)
-# This is already in the main package and that is also required:
-#%{_libdir}/libsvn_swig_ruby*
+%{_libdir}/libsvn_swig_ruby*
 %{_libdir}/site_ruby/*/svn
 %{_libdir}/site_ruby/*/*-linux/svn
 
@@ -251,6 +246,9 @@
 %endif
 
 %changelog
+* Thu Apr  6 2006 Joe Orton <jorton at redhat.com> 1.3.1-4
+- move libsvn_swig_ruby* back to subversion-ruby
+
 * Tue Apr  4 2006 Joe Orton <jorton at redhat.com> 1.3.1-3
 - update to 1.3.1
 - update to psvn.el r19138 (Stefan Reichoer)



From fedora-cvs-commits at redhat.com  Thu Apr  6 12:21:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 08:21:06 -0400
Subject: rpms/kdenetwork/devel kdenetwork.spec,1.71,1.72 sources,1.40,1.41
Message-ID: <200604061221.k36CL6LM031803@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdenetwork.spec sources 
Log Message:
3.5.2



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- kdenetwork.spec	11 Feb 2006 03:48:04 -0000	1.71
+++ kdenetwork.spec	6 Apr 2006 12:21:01 -0000	1.72
@@ -5,16 +5,18 @@
 %define make_cvs 1
 %define xmms 0
 
-%define qt_version 3.3.5
+%define qt_version 3.3.6
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 %define qt_epoch 1
 
+%define appdir %{_datadir}/applications/kde
+
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdenetwork
-Version: 3.5.1
-Release: 1.2
+Version: 3.5.2
+Release: 1
 Summary: K Desktop Environment - Network Applications
 Epoch: 7
 Group: Applications/Internet
@@ -99,7 +101,7 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-FLAGS="$RPM_OPT_FLAGS"
+FLAGS="%{optflags}"
 export CFLAGS="$FLAGS"
 export CXXFLAGS="$FLAGS -fno-use-cxa-atexit"
 export KDEDIR=%{_prefix}
@@ -134,46 +136,47 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
-mkdir -p $RPM_BUILD_ROOT/etc/pam.d
-cp %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/kppp
+mkdir -p %{buildroot}/etc/pam.d
+cp %{SOURCE1} %{buildroot}/etc/pam.d/kppp
 
 # Make symlinks relative
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/HTML/en/common
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+mkdir -p %{buildroot}%{_docdir}/HTML/en/common
+pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    [ -d $i -a -L $i/common ] && ln -nfs ../common $i
 done
 popd
 
 # Show only in KDE
-for i in fileshare kcmkrfb kcmktalkd kcmwifi krfb ; do
-   if [ -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/$i.desktop ] ; then
-      echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/$i.desktop
+for i in fileshare kcmkrfb kcmktalkd kcmwifi krfb kppp kppplogview \
+   kwifimanager kget knewsticker ksirc kdict ; do
+   if [ -f %{buildroot}%{appdir}/$i.desktop ] ; then
+      echo "OnlyShowIn=KDE;" >> %{buildroot}%{appdir}/$i.desktop
    fi
 done
 
 # Run kppp through consolehelper
-mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-mv $RPM_BUILD_ROOT%{_bindir}/kppp $RPM_BUILD_ROOT%{_sbindir}
-ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/kppp
-mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps
-cat >$RPM_BUILD_ROOT/etc/security/console.apps/kppp <<EOF
+mkdir -p %{buildroot}%{_sbindir}
+mv %{buildroot}%{_bindir}/kppp %{buildroot}%{_sbindir}
+ln -s consolehelper %{buildroot}%{_bindir}/kppp
+mkdir -p %{buildroot}/etc/security/console.apps
+cat > %{buildroot}/etc/security/console.apps/kppp <<EOF
 USER=root
 PROGRAM=%{_sbindir}/kppp
 SESSION=true
 EOF
 
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d
-cp %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d
+mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d
+cp %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d
 
 # Add lisa startup script
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
-install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/lisarc
-install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/lisa
+mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
+install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/lisarc
+install -m 0755 %{SOURCE5} %{buildroot}%{_sysconfdir}/rc.d/init.d/lisa
 
 %post
 /sbin/ldconfig
@@ -190,15 +193,15 @@
 exit 0
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%config /etc/security/console.apps/kppp
-%config /etc/pam.d/kppp
-%config %{_sysconfdir}/lisarc
+%config(noreplace) /etc/security/console.apps/kppp
+%config(noreplace) /etc/pam.d/kppp
+%config(noreplace) %{_sysconfdir}/lisarc
 %config %{_sysconfdir}/rc.d/init.d/lisa
-%config %{_sysconfdir}/xinetd.d/ktalk
+%config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
 %doc %{_docdir}/HTML/en/*
 %{_libdir}/*.so*
 %{_libdir}/*.la
@@ -237,6 +240,9 @@
 %endif
 
 %changelog
+* Thu Apr 06 2006 Than Ngo <than at redhat.com> 7:3.5.2-0.1.fc5
+- update to 3.5.2
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 7:3.5.1-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	5 Feb 2006 19:29:54 -0000	1.40
+++ sources	6 Apr 2006 12:21:02 -0000	1.41
@@ -1 +1 @@
-02ced8c14c80f28635056488949d56d7  kdenetwork-3.5.1.tar.bz2
+dddc6bb65ffb9e46d118781ca0f26da4  kdenetwork-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr  6 12:21:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 08:21:31 -0400
Subject: rpms/busybox/devel busybox-1.1.1-anaconda.patch, NONE,
	1.1 busybox-1.1.1-cve-2006-1058.patch, NONE,
	1.1 busybox-1.1.1-selinux.patch, NONE,
	1.1 busybox-1.1.1-static.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 busybox.spec, 1.32, 1.33 sources, 1.9,
	1.10 busybox-anaconda.patch, 1.8, NONE busybox-selinux.patch,
	1.7, NONE busybox-static.patch, 1.8, NONE
Message-ID: <200604061221.k36CLVZc031863@cvs.devel.redhat.com>

Author: varekova

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

Modified Files:
	.cvsignore busybox.spec sources 
Added Files:
	busybox-1.1.1-anaconda.patch busybox-1.1.1-cve-2006-1058.patch 
	busybox-1.1.1-selinux.patch busybox-1.1.1-static.patch 
Removed Files:
	busybox-anaconda.patch busybox-selinux.patch 
	busybox-static.patch 
Log Message:
- update to 1.1.1
- fix CVE-2006-1058 - BusyBox passwd command
  fails to generate password with salt (#187386)


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

--- NEW FILE busybox-1.1.1-anaconda.patch ---
--- busybox-1.1.1/util-linux/nfsmount.c.anaconda	2006-03-22 22:16:26.000000000 +0100
+++ busybox-1.1.1/util-linux/nfsmount.c	2006-04-05 13:00:33.401530040 +0200
@@ -439,7 +439,7 @@
 	intr = 0;
 	posix = 0;
 	nocto = 0;
-	nolock = 0;
+        nolock = 1;             /* anaconda disables this by default */
 	noac = 0;
 	retry = 10000;		/* 10000 minutes ~ 1 week */
 	tcp = 0;
--- busybox-1.1.1/Makefile.anaconda	2006-03-22 22:16:26.000000000 +0100
+++ busybox-1.1.1/Makefile	2006-04-05 12:49:18.196176856 +0200
@@ -196,7 +196,7 @@
 
 defconfig: scripts/config/conf
 	@./scripts/config/conf -y $(CONFIG_CONFIG_IN)
-	@$(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_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
 	@./scripts/config/conf -o $(CONFIG_CONFIG_IN)
 
 

busybox-1.1.1-cve-2006-1058.patch:
 passwd.c |   64 ++++++++++++++++++++++++---------------------------------------
 1 files changed, 25 insertions(+), 39 deletions(-)

--- NEW FILE busybox-1.1.1-cve-2006-1058.patch ---
--- busybox-1.1.1/loginutils/passwd.c.cve-2006-1058	2006-03-22 22:16:24.000000000 +0100
+++ busybox-1.1.1/loginutils/passwd.c	2006-04-03 10:56:53.418268928 +0200
@@ -21,16 +21,6 @@
 static void set_filesize_limit(int blocks);
 
 
-static int get_algo(char *a)
-{
-	int x = 1;					/* standard: MD5 */
-
-	if (strcasecmp(a, "des") == 0)
-		x = 0;
-	return x;
-}
-
-
 static int update_passwd(const struct passwd *pw, const char *crypt_pw)
 {
 	char filename[1024];
@@ -131,6 +121,12 @@
 	}
 }
 
+/*
+ * get_algo() returns:
+ * FALSE: in case of traditional MD5
+ * TRUE : in case of short SALT MD5
+ */
+#define get_algo(a) (!strcasecmp(a, "des"))
 
 int passwd_main(int argc, char **argv)
 {
@@ -287,33 +283,19 @@
 	return 0;
 }
 
-static int i64c(int i)
-{
-	if (i <= 0)
-		return ('.');
-	if (i == 1)
-		return ('/');
-	if (i >= 2 && i < 12)
-		return ('0' - 2 + i);
-	if (i >= 12 && i < 38)
-		return ('A' - 12 + i);
-	if (i >= 38 && i < 63)
-		return ('a' - 38 + i);
-	return ('z');
-}
+const unsigned char bb_base64[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJLKMNOPQRSTUVWXYZ0123456789./";
+#define bb_i64c(a) (bb_base64[((unsigned char)(a))%64])
 
-static char *crypt_make_salt(void)
+static void bb_read_random64_string(unsigned char *str, int len)
 {
-	time_t now;
-	static unsigned long x;
-	static char result[3];
-
-	time(&now);
-	x += now + getpid() + clock();
-	result[0] = i64c(((x >> 18) ^ (x >> 6)) & 077);
-	result[1] = i64c(((x >> 12) ^ x) & 077);
-	result[2] = '\0';
-	return result;
+        int i;
+        FILE *fp;
+        if(!(fp = fopen("/dev/random", "r")))
+                bb_perror_msg_and_die("open /dev/random");
+        bb_xread_all(fileno(fp), str, len);
+        for(i = 0; i < len; i++)
+                str[i] = bb_i64c(str[i]);
+        str[i] = 0;     //close the string
 }
 
 
@@ -324,6 +306,8 @@
 	char *cp;
 	char orig[200];
 	char pass[200];
+	unsigned char salt[12] = "$1$";
+
 
 	if (!amroot && crypt_passwd[0]) {
 		if (!(clear = bb_askpass(0, "Old password:"))) {
@@ -377,10 +361,12 @@
 	memset(cp, 0, strlen(cp));
 	memset(orig, 0, sizeof(orig));
 
-	if (algo == 1) {
-		cp = pw_encrypt(pass, "$1$");
-	} else
-		cp = pw_encrypt(pass, crypt_make_salt());
+        if(algo)
+                bb_read_random64_string(&salt[3], 8);
+        else
+                bb_read_random64_string(salt, 2);
+        cp = pw_encrypt(pass,salt);
+
 	memset(pass, 0, sizeof pass);
 	safe_strncpy(crypt_passwd, cp, sizeof(crypt_passwd));
 	return 0;

busybox-1.1.1-selinux.patch:
 Config.in             |    1 
 Makefile              |    4 +--
 include/applets.h     |    1 
 include/usage.h       |    9 ++++++++
 selinux/Config.in     |   16 ++++++++++++++
 selinux/Makefile      |   30 +++++++++++++++++++++++++++
 selinux/Makefile.in   |   35 +++++++++++++++++++++++++++++++
 selinux/load_policy.c |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 149 insertions(+), 2 deletions(-)

--- NEW FILE busybox-1.1.1-selinux.patch ---
--- /dev/null	2006-04-06 08:55:50.820704048 +0200
+++ busybox-1.1.1/selinux/Makefile.in	2006-04-06 12:28:37.485563704 +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-04-06 08:55:50.820704048 +0200
+++ busybox-1.1.1/selinux/Config.in	2006-04-06 12:28:37.490562944 +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-04-06 08:55:50.820704048 +0200
+++ busybox-1.1.1/selinux/Makefile	2006-04-06 12:28:37.491562792 +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-04-06 08:55:50.820704048 +0200
+++ busybox-1.1.1/selinux/load_policy.c	2006-04-06 12:28:37.491562792 +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.1.1/include/usage.h.selinux	2006-03-22 22:16:24.000000000 +0100
+++ busybox-1.1.1/include/usage.h	2006-04-06 12:28:37.493562488 +0200
@@ -2413,6 +2413,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
--- busybox-1.1.1/include/applets.h.selinux	2006-03-22 22:16:24.000000000 +0100
+++ busybox-1.1.1/include/applets.h	2006-04-06 12:28:37.494562336 +0200
@@ -163,6 +163,7 @@
 USE_SETARCH(APPLET_NOUSAGE(linux64, setarch_main, _BB_DIR_BIN, _BB_SUID_NEVER))
 USE_FEATURE_INITRD(APPLET_NOUSAGE(linuxrc, init_main, _BB_DIR_ROOT, _BB_SUID_NEVER))
 USE_LN(APPLET(ln, ln_main, _BB_DIR_BIN, _BB_SUID_NEVER))
+USE_LOAD_POLICY(APPLET(load_policy, load_policy_main, _BB_DIR_SBIN, _BB_SUID_NEVER))
 USE_LOADFONT(APPLET(loadfont, loadfont_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
 USE_LOADKMAP(APPLET(loadkmap, loadkmap_main, _BB_DIR_SBIN, _BB_SUID_NEVER))
 USE_LOGGER(APPLET(logger, logger_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
--- busybox-1.1.1/Config.in.selinux	2006-03-22 22:16:26.000000000 +0100
+++ busybox-1.1.1/Config.in	2006-04-06 12:28:37.494562336 +0200
@@ -405,3 +405,4 @@
 source procps/Config.in
 source shell/Config.in
 source sysklogd/Config.in
+source selinux/Config.in
--- busybox-1.1.1/Makefile.selinux	2006-03-22 22:16:26.000000000 +0100
+++ busybox-1.1.1/Makefile	2006-04-06 12:30:20.636882320 +0200
@@ -27,7 +27,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))
@@ -196,7 +196,7 @@
 
 defconfig: scripts/config/conf
 	@./scripts/config/conf -y $(CONFIG_CONFIG_IN)
-	@$(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)
 
 

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

--- NEW FILE busybox-1.1.1-static.patch ---
--- busybox-1.1.1/Makefile.static	2006-03-22 22:16:26.000000000 +0100
+++ busybox-1.1.1/Makefile	2006-04-05 13:40:07.889552992 +0200
@@ -196,7 +196,7 @@
 
 defconfig: scripts/config/conf
 	@./scripts/config/conf -y $(CONFIG_CONFIG_IN)
-	@$(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)
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/busybox/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	1 Sep 2005 13:12:02 -0000	1.9
+++ .cvsignore	6 Apr 2006 12:21:29 -0000	1.10
@@ -1 +1 @@
-busybox-1.01.tar.bz2
+busybox-1.1.1.tar.bz2


Index: busybox.spec
===================================================================
RCS file: /cvs/dist/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- busybox.spec	17 Feb 2006 18:54:23 -0000	1.32
+++ busybox.spec	6 Apr 2006 12:21:29 -0000	1.33
@@ -1,14 +1,15 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
-Version: 1.01
-Release: 3
+Version: 1.1.1
+Release: 1
 Epoch: 1
 License: GPL
 Group: System Environment/Shells
 Source: http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
-Patch: busybox-static.patch
-Patch1: busybox-anaconda.patch
-Patch2: busybox-selinux.patch
+Patch: busybox-1.1.1-static.patch
+Patch1: busybox-1.1.1-anaconda.patch
+Patch2: busybox-1.1.1-selinux.patch
+Patch3: busybox-1.1.1-cve-2006-1058.patch
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: libselinux-devel >= 1.27.7-2
@@ -33,11 +34,10 @@
 
 %prep
 %setup -q
-cp sysdeps/linux/defconfig .config
 #SELINUX Patch
 %patch2 -b .selinux -p1
 %patch -b .static -p1
-#%patch1 -b .anaconda -p1
+%patch3 -b .cve-2006-1058 -p1
 
 %build
 make defconfig
@@ -75,6 +75,11 @@
 /sbin/busybox.anaconda
 
 %changelog
+* Wed Apr  6 2006 Ivana Varekova <varekova at redhat.com> - 1:1.1.1-1
+- update to 1.1.1
+- fix CVE-2006-1058 - BusyBox passwd command 
+  fails to generate password with salt (#187386)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.01-2.2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/busybox/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	1 Sep 2005 13:12:02 -0000	1.9
+++ sources	6 Apr 2006 12:21:29 -0000	1.10
@@ -1 +1 @@
-f250842dae2854a38470ed16a46bba66  busybox-1.01.tar.bz2
+ff1ade47255c643b68c9113c267ce712  busybox-1.1.1.tar.bz2


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


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


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



From fedora-cvs-commits at redhat.com  Thu Apr  6 12:22:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 08:22:58 -0400
Subject: rpms/apr/devel apr-1.2.6.tar.gz.asc, NONE, 1.1 .cvsignore, 1.6,
	1.7 apr.spec, 1.48, 1.49 sources, 1.6, 1.7 upstream, 1.4, 1.5
Message-ID: <200604061222.k36CMw5h031947@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/apr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31931

Modified Files:
	.cvsignore apr.spec sources upstream 
Added Files:
	apr-1.2.6.tar.gz.asc 
Log Message:
* Thu Apr  6 2006 Joe Orton <jorton at redhat.com> 1.2.6-2
- update to 1.2.6



--- NEW FILE apr-1.2.6.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (FreeBSD)

iD8DBQBEIXHKyR242pvPzi8RAtl6AKCcRKJqZ1NqxnR02Ws6yZFi4crwgwCg8+pR
ZiF6PrOMEU0msEYnYdMuj30=
=1Hnj
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/apr/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Oct 2005 08:57:03 -0000	1.6
+++ .cvsignore	6 Apr 2006 12:22:56 -0000	1.7
@@ -1 +1,2 @@
-apr-0.9.7.tar.gz
+apr-1.2.6.tar.gz
+clog


Index: apr.spec
===================================================================
RCS file: /cvs/dist/rpms/apr/devel/apr.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- apr.spec	11 Feb 2006 01:37:13 -0000	1.48
+++ apr.spec	6 Apr 2006 12:22:56 -0000	1.49
@@ -2,21 +2,16 @@
 
 Summary: Apache Portable Runtime library
 Name: apr
-Version: 1.2.2
-Release: 7.2
+Version: 1.2.6
+Release: 2
 License: Apache Software License
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
 Source0: %{name}-%{version}.tar.gz
 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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildPrereq: autoconf, libtool, doxygen
 Conflicts: subversion < 0.20.1-2
@@ -43,14 +38,9 @@
 %prep
 %setup -q
 %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
 
 %build
 # regenerate configure script etc.
@@ -60,11 +50,6 @@
 # does not use -lrt).
 export ac_cv_search_shm_open=no
 
-# Forcibly prevent detection of pthread_mutexattr_setrobust_np,
-# which doesn't seem to work.
-export ac_cv_func_pthread_mutexattr_setrobust_np=no
-export apr_cv_setrobust_with_prio_inherit=no
-
 %configure \
         --includedir=%{_includedir}/apr-%{aprver} \
         --with-installbuilddir=%{_libdir}/apr-%{aprver}/build \
@@ -127,6 +112,9 @@
 %{_includedir}/apr-%{aprver}/*.h
 
 %changelog
+* Thu Apr  6 2006 Joe Orton <jorton at redhat.com> 1.2.6-2
+- update to 1.2.6
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.2-7.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/apr/devel/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	6 Apr 2006 12:22:56 -0000	1.7
@@ -1 +1 @@
-f96e3b04ccf86ed28a0734d7efc5bb65  apr-1.2.2.tar.gz
+d36790357acd43224000a2e493d7c701  apr-1.2.6.tar.gz


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/apr/devel/upstream,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- upstream	2 Dec 2005 09:05:07 -0000	1.4
+++ upstream	6 Apr 2006 12:22:56 -0000	1.5
@@ -1 +1 @@
-apr-1.2.2.tar.gz
+apr-1.2.6.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr  6 12:30:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 08:30:56 -0400
Subject: rpms/tzdata/FC-5 .cvsignore, 1.21, 1.22 sources, 1.23,
	1.24 tzdata.spec, 1.27, 1.28
Message-ID: <200604061230.k36CUuL3032162@cvs.devel.redhat.com>

Author: pmachata

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

Modified Files:
	.cvsignore sources tzdata.spec 
Log Message:
- Upstream 2006c



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tzdata/FC-5/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	22 Feb 2006 14:29:38 -0000	1.21
+++ .cvsignore	6 Apr 2006 12:30:53 -0000	1.22
@@ -1,3 +1,3 @@
-tzdata2006b-1-base.tar.bz2
-tzdata2006b.tar.gz
-tz64code2006b.tar.gz
+tzcode2006c.tar.gz
+tzdata2006c.tar.gz
+tzdata-base-0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tzdata/FC-5/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	22 Feb 2006 14:29:41 -0000	1.23
+++ sources	6 Apr 2006 12:30:53 -0000	1.24
@@ -1,3 +1,3 @@
-906a4c98cc5240f416524a256b039c42  tzdata2006b-1-base.tar.bz2
-244523d10f93f392d96da4ef11b6cdd7  tzdata2006b.tar.gz
-37524ee1c072a51511a6c220f8faf95f  tz64code2006b.tar.gz
+2100d0b0c6f2ad320260290e5dc7e957  tzcode2006c.tar.gz
+420d97a09c9750839afc2703f6b8276f  tzdata2006c.tar.gz
+906a4c98cc5240f416524a256b039c42  tzdata-base-0.tar.bz2


Index: tzdata.spec
===================================================================
RCS file: /cvs/dist/rpms/tzdata/FC-5/tzdata.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- tzdata.spec	22 Feb 2006 14:29:41 -0000	1.27
+++ tzdata.spec	6 Apr 2006 12:30:53 -0000	1.28
@@ -1,12 +1,12 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2006b
-Release: 1
+Version: 2006c
+Release: 1.fc5
 License: GPL
 Group: System Environment/Base
-Source0: tzdata%{version}-%{release}-base.tar.bz2
+Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{version}.tar.gz
-Source2: ftp://elsie.nci.nih.gov/pub/tz64code%{version}.tar.gz
+Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz
 BuildRequires: gawk, glibc, glibc-common, perl
 Conflicts: glibc-common <= 2.3.2-63
 BuildArchitectures: noarch
@@ -17,7 +17,7 @@
 the world.
 
 %prep
-%setup -n tzdata
+%setup -n %{name}
 mkdir %{name}%{version}
 tar xzf %{SOURCE1} -C %{name}%{version}
 mkdir tzcode%{version}
@@ -33,6 +33,8 @@
 
 %install
 make install
+
+%check
 echo ====================TESTING=========================
 make check
 echo ====================TESTING END=====================
@@ -46,6 +48,23 @@
 %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html
 
 %changelog
+* Thu Apr  6 2006 Petr Machata <pmachata at redhat.com> - 2006c-1.fc5
+- Upstream 2006c
+  - Time-related changes:
+    - dozens of historical and commentary changes
+    - Iran stopped observing DST
+    - Sri Lanka switches from UTC+6 to UTC+5:30
+    - America/Thule and America/Edmonton will adopt new US rules,
+      starting 2007
+    - Tunisia is adopting regular DST
+  - Code:
+    - asctime.c: Chages in format strings to silent gcc warnings
+    - removing K&R notation from function signatures
+    - few fixes across the code
+
+* Wed Mar 22 2006 Petr Machata <pmachata at redhat.com> - 2006b-2.fc5
+- Patch for Sri Lanka time zone change (#184514)
+
 * Thu Feb 22 2006 Petr Machata <pmachata at redhat.com> 2006b-1
 - Upstream 2006b:
   - using tz64code version, as 32 is legacy according to tzdata ML



From fedora-cvs-commits at redhat.com  Thu Apr  6 12:38:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 08:38:22 -0400
Subject: rpms/apr-util/FC-5 apr-util-1.2.6.tar.gz.asc, NONE, 1.1 .cvsignore,
	1.5, 1.6 apr-util.spec, 1.24, 1.25 sources, 1.6, 1.7 upstream,
	1.4, 1.5
Message-ID: <200604061238.k36CcMpa032368@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/apr-util/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv32325

Modified Files:
	.cvsignore apr-util.spec sources upstream 
Added Files:
	apr-util-1.2.6.tar.gz.asc 
Log Message:
* Thu Apr  6 2006 Joe Orton <jorton at redhat.com> 1.2.6-1
- update to 1.2.6
- fix LDAP issues on x86_64 (#188073)



--- NEW FILE apr-util-1.2.6.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (FreeBSD)

iD8DBQBEIXMFyR242pvPzi8RAhXmAJ943rjALAMEX7h/sHeHXpE+TepL/ACg6leM
yLqRdcIrqCnXP2a+bMw3JvY=
=7j43
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/apr-util/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Oct 2005 09:06:59 -0000	1.5
+++ .cvsignore	6 Apr 2006 12:38:20 -0000	1.6
@@ -1 +1 @@
-apr-util-0.9.7.tar.gz
+apr-util-1.2.6.tar.gz


Index: apr-util.spec
===================================================================
RCS file: /cvs/dist/rpms/apr-util/FC-5/apr-util.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- apr-util.spec	11 Feb 2006 01:37:34 -0000	1.24
+++ apr-util.spec	6 Apr 2006 12:38:20 -0000	1.25
@@ -3,8 +3,8 @@
 
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
-Version: 1.2.2
-Release: 4.2
+Version: 1.2.6
+Release: 1
 License: Apache Software License 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -45,9 +45,11 @@
 %configure --with-apr=%{_prefix} \
         --includedir=%{_includedir}/apr-%{apuver} \
         --with-ldap --without-gdbm \
+        --with-berkeley-db \
         --with-sqlite3 --with-pgsql \
         --without-sqlite2
-make %{?_smp_mflags} && make dox
+make %{?_smp_mflags} CPPFLAGS="-DLDAP_DEPRECATED"
+make dox
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -101,6 +103,10 @@
 %doc --parents html
 
 %changelog
+* Thu Apr  6 2006 Joe Orton <jorton at redhat.com> 1.2.6-1
+- update to 1.2.6
+- fix LDAP issues on x86_64 (#188073)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.2-4.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/apr-util/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Dec 2005 09:54:51 -0000	1.6
+++ sources	6 Apr 2006 12:38:20 -0000	1.7
@@ -1 +1 @@
-8b3f04dde7048946c3c94f85b4debb94  apr-util-1.2.2.tar.gz
+f8f17dd6bd17926ab2b03767f1f3a1fc  apr-util-1.2.6.tar.gz


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/apr-util/FC-5/upstream,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- upstream	2 Dec 2005 09:54:51 -0000	1.4
+++ upstream	6 Apr 2006 12:38:20 -0000	1.5
@@ -1 +1 @@
-apr-util-1.2.2.tar.gz
+apr-util-1.2.6.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr  6 12:40:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 08:40:32 -0400
Subject: rpms/tzdata/FC-4 .cvsignore, 1.16, 1.17 sources, 1.17,
	1.18 tzdata.spec, 1.19, 1.20 tzdata2006b-srilanka.patch, 1.1, NONE
Message-ID: <200604061240.k36CeWO4032488@cvs.devel.redhat.com>

Author: pmachata

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

Modified Files:
	.cvsignore sources tzdata.spec 
Removed Files:
	tzdata2006b-srilanka.patch 
Log Message:
Upstream 2006c.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tzdata/FC-4/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	22 Mar 2006 08:27:10 -0000	1.16
+++ .cvsignore	6 Apr 2006 12:40:17 -0000	1.17
@@ -1,3 +1,3 @@
+tzcode2006c.tar.gz
+tzdata2006c.tar.gz
 tzdata-base-0.tar.bz2
-tz64code2006b.tar.gz
-tzdata2006b.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tzdata/FC-4/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	22 Mar 2006 08:27:10 -0000	1.17
+++ sources	6 Apr 2006 12:40:17 -0000	1.18
@@ -1,3 +1,3 @@
+2100d0b0c6f2ad320260290e5dc7e957  tzcode2006c.tar.gz
+420d97a09c9750839afc2703f6b8276f  tzdata2006c.tar.gz
 906a4c98cc5240f416524a256b039c42  tzdata-base-0.tar.bz2
-37524ee1c072a51511a6c220f8faf95f  tz64code2006b.tar.gz
-244523d10f93f392d96da4ef11b6cdd7  tzdata2006b.tar.gz


Index: tzdata.spec
===================================================================
RCS file: /cvs/dist/rpms/tzdata/FC-4/tzdata.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- tzdata.spec	22 Mar 2006 08:27:10 -0000	1.19
+++ tzdata.spec	6 Apr 2006 12:40:17 -0000	1.20
@@ -1,13 +1,12 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2006b
-Release: 2.fc4
+Version: 2006c
+Release: 1.fc4
 License: GPL
 Group: System Environment/Base
 Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{version}.tar.gz
-Source2: ftp://elsie.nci.nih.gov/pub/tz64code%{version}.tar.gz
-Patch0: tzdata2006b-srilanka.patch
+Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz
 BuildRequires: gawk, glibc, glibc-common, perl
 Conflicts: glibc-common <= 2.3.2-63
 BuildArchitectures: noarch
@@ -27,7 +26,6 @@
     -e 's|@datadir@|%{_datadir}|' \
     -e 's|@install_root@|%{buildroot}|' \
   Makeconfig.in > Makeconfig
-%patch0 -p1
 
 %build
 make
@@ -50,6 +48,20 @@
 %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html
 
 %changelog
+* Thu Apr  6 2006 Petr Machata <pmachata at redhat.com> - 2006c-1.fc4
+- Upstream 2006c
+  - Time-related changes:
+    - dozens of historical and commentary changes
+    - Iran stopped observing DST
+    - Sri Lanka switches from UTC+6 to UTC+5:30
+    - America/Thule and America/Edmonton will adopt new US rules,
+      starting 2007
+    - Tunisia is adopting regular DST
+  - Code:
+    - asctime.c: Chages in format strings to silent gcc warnings
+    - removing K&R notation from function signatures
+    - few fixes across the code
+
 * Wed Mar 22 2006 Petr Machata <pmachata at redhat.com> - 2006a-2.fc4
 - Patch for Sri Lanka time zone change (#184514)
 - Upstream 2006b:


--- tzdata2006b-srilanka.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr  6 12:58:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 08:58:38 -0400
Subject: rpms/kde-i18n/devel kde-i18n.spec,1.56,1.57
Message-ID: <200604061258.k36Cwc5r013893@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kde-i18n.spec 
Log Message:
typo



Index: kde-i18n.spec
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/devel/kde-i18n.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kde-i18n.spec	6 Apr 2006 12:38:09 -0000	1.56
+++ kde-i18n.spec	6 Apr 2006 12:58:36 -0000	1.57
@@ -616,7 +616,7 @@
 %setup -q -n %{name}-%{version} -c
 
 for i in $(cat %{SOURCE1000}) ; do
-  tar jxf %{_sourcedir}%{name}-$i-%{version}.tar.bz2
+  tar jxf %{_sourcedir}/%{name}-$i-%{version}.tar.bz2
 done
 
 %build



From fedora-cvs-commits at redhat.com  Thu Apr  6 13:05:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 09:05:45 -0400
Subject: rpms/arts/FC-4 arts.spec,1.43,1.44 sources,1.23,1.24
Message-ID: <200604061305.k36D5j43014060@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	arts.spec sources 
Log Message:
update to 1.5.2



Index: arts.spec
===================================================================
RCS file: /cvs/dist/rpms/arts/FC-4/arts.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- arts.spec	27 Jan 2006 12:47:04 -0000	1.43
+++ arts.spec	6 Apr 2006 13:04:59 -0000	1.44
@@ -9,7 +9,7 @@
 
 %define make_cvs 1
 
-Version: 1.5.1
+Version: 1.5.2
 Release: 0.1.fc4
 Summary: aRts (analog realtime synthesizer) - the KDE sound system
 Name: arts
@@ -97,7 +97,7 @@
 
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
-FLAGS="$RPM_OPT_FLAGS"
+FLAGS="%{optflags}"
 export CXXFLAGS="$FLAGS"
 export CFLAGS="$FLAGS"
 export PATH=`pwd`:$PATH
@@ -127,20 +127,18 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 export PATH=`pwd`:$PATH
-export DESTDIR=$RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/*
+make DESTDIR=%{buildroot} install
 
 # work around for rpm bug on s390x
 %ifarch s390x
-strip $RPM_BUILD_ROOT%{_bindir}/mcopidl
+strip %{buildroot}%{_bindir}/mcopidl
 %endif
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -172,6 +170,9 @@
 %{_bindir}/artsc-config
 
 %changelog
+* Thu Apr 06 2006 Than Ngo <than at redhat.com> 1.5.2-0.1.fc4
+- update to 1.5.2
+
 * Fri Jan 27 2006 Than Ngo <than at redhat.com> 8:1.5.1-0.1.fc4
 - 1.5.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/arts/FC-4/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	27 Jan 2006 12:48:00 -0000	1.23
+++ sources	6 Apr 2006 13:05:15 -0000	1.24
@@ -1 +1 @@
-71c4996de36aa7f8726e54bb3d5bf059  arts-1.5.1.tar.bz2
+e1eb7969ea16aab2bdd9d1a9736d6af3  arts-1.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr  6 13:10:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 09:10:57 -0400
Subject: rpms/man-pages-pl/devel man-pages-pl.spec,1.19,1.20
Message-ID: <200604061310.k36DAvmb014162@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/man-pages-pl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14145

Modified Files:
	man-pages-pl.spec 
Log Message:
- remove some vim man pages provided by current vim


Index: man-pages-pl.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-pl/devel/man-pages-pl.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- man-pages-pl.spec	9 Jan 2006 15:04:41 -0000	1.19
+++ man-pages-pl.spec	6 Apr 2006 13:10:49 -0000	1.20
@@ -2,7 +2,7 @@
 Summary: Polish man pages from the Linux Documentation Project.
 Name: man-pages-pl
 Version: 0.24
-Release: 1
+Release: 2
 License: Distributable
 Group: Documentation
 Source: http://dione.ids.pl/~pborys/PTM/man-PL%{releasedate}.tar.gz
@@ -41,6 +41,7 @@
 
 rm -f $RPM_BUILD_ROOT%{_mandir}/pl/man1/newgrp.1*
 rm -f $RPM_BUILD_ROOT%{_mandir}/pl/man1/{apropos.1,chage.1,gendiff.1,gpasswd.1,man.1,mplayer.1,sg.1,whatis.1}*
+rm -f $RPM_BUILD_ROOT%{_mandir}/pl/man1/{evim,ex,rview,rvim,view,vim,vimdiff,vimtutor}.1*
 rm -f $RPM_BUILD_ROOT%{_mandir}/pl/man5/{faillog.5,shadow.5,man.config.5,qmail-*.5,dot-qmail.5}*
 rm -f $RPM_BUILD_ROOT%{_mandir}/pl/man7/qmail.7*
 rm -f $RPM_BUILD_ROOT%{_mandir}/pl/man8/{grpunconv.8,faillog.8,newusers.8,rpmcache.8,rpm2cpio.8,rpmdeps.8,rpm.8,rpmbuild.8,rpmgraph.8,pwconv.8,lastlog.8,stunnel.8,pwck.8,grpck.8,chpasswd.8,grpconv.8,adduser.8,pwunconv.8,groupadd.8,groupdel.8,groupmod.8,useradd.8,userdel.8,usermod.8,qmail}*
@@ -60,6 +61,9 @@
 %{_mandir}/pl/*
 
 %changelog
+* Thu Apr 06 2006 Karsten Hopp <karsten at redhat.de> 0.24-2
+- remove some vim man pages provided by current vim
+
 * Mon Jan  9 2006 Ivana Varekova <varekova at redat.com> 0.24-1
 - update source
 - add pidof patch (created by Marcin Garski)



From fedora-cvs-commits at redhat.com  Thu Apr  6 14:02:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 10:02:38 -0400
Subject: rpms/httpd/FC-5 httpd.spec,1.87,1.88
Message-ID: <200604061402.k36E2cQT009650@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	httpd.spec 
Log Message:
* Thu Apr  6 2006 Joe Orton <jorton at redhat.com> 2.2.0-5.2
- fix LDAP issues on 64-bit platforms (#188073)



Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/FC-5/httpd.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- httpd.spec	11 Feb 2006 03:27:40 -0000	1.87
+++ httpd.spec	6 Apr 2006 14:02:16 -0000	1.88
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.0
-Release: 5.1.2
+Release: 5.2
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -168,7 +168,8 @@
 cp $RPM_SOURCE_DIR/migration.css . # make %%doc happy
 
 CFLAGS=$RPM_OPT_FLAGS
-export CFLAGS
+CPPFLAGS="-DLDAP_DEPRECATED"
+export CFLAGS CPPFLAGS
 
 function mpmbuild()
 {
@@ -491,6 +492,9 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Thu Apr  6 2006 Joe Orton <jorton at redhat.com> 2.2.0-5.2
+- fix LDAP issues on 64-bit platforms (#188073)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - (none):2.2.0-5.1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Thu Apr  6 14:14:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 10:14:03 -0400
Subject: rpms/cups/FC-5 cups-pstops.patch,NONE,1.1 cups.spec,1.141,1.142
Message-ID: <200604061414.k36EE34l009921@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-pstops.patch 
Log Message:
* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com>
- Build requires openldap-devel.


cups-pstops.patch:
 pstops.c |   43 ++++++++++++++++++++++++++++++++-----------
 1 files changed, 32 insertions(+), 11 deletions(-)

--- NEW FILE cups-pstops.patch ---
--- cups-1.2rc1/filter/pstops.c.pstops	2006-03-23 19:33:35.000000000 +0000
+++ cups-1.2rc1/filter/pstops.c	2006-04-06 15:11:02.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: pstops.c 5326 2006-03-23 19:33:35Z mike $"
+ * "$Id: pstops.c 5369 2006-04-03 15:09:58Z mike $"
  *
  *   PostScript filter for the Common UNIX Printing System (CUPS).
  *
@@ -307,10 +307,13 @@
 
     fputs("DEBUG: Skipping PJL header...\n", stderr);
 
-    while (strstr(line, "ENTER LANGUAGE") == NULL)
+    while (strstr(line, "ENTER LANGUAGE") == NULL && strncmp(line, "%!", 2))
       if ((len = cupsFileGetLine(fp, line, sizeof(line))) == 0)
         break;
 
+    if (!strncmp(line, "%!", 2))
+      break;
+
     if ((len = cupsFileGetLine(fp, line, sizeof(line))) == 0)
       break;
   }
@@ -590,6 +593,12 @@
     {
       if (saw_bounding_box)
         fputs("ERROR: Duplicate %%BoundingBox: comment seen!\n", stderr);
+      else if (strstr(line + 14, "(atend)"))
+      {
+       /*
+        * Do nothing for now but use the default imageable area...
+	*/
+      }
       else if (sscanf(line + 14, "%d%d%d%d", doc->bounding_box + 0,
 	              doc->bounding_box + 1, doc->bounding_box + 2,
 		      doc->bounding_box + 3) != 4)
@@ -738,14 +747,26 @@
   */
 
   fprintf(stderr, "DEBUG: Before copy_prolog - %s", line);
-  copy_prolog(fp, doc, ppd, line, linelen, linesize);
+  linelen = copy_prolog(fp, doc, ppd, line, linelen, linesize);
 
  /*
   * Then the document setup section...
   */
 
   fprintf(stderr, "DEBUG: Before copy_setup - %s", line);
-  copy_setup(fp, doc, ppd, line, linelen, linesize);
+  linelen = copy_setup(fp, doc, ppd, line, linelen, linesize);
+
+ /*
+  * Copy until we see %%Page:...
+  */
+
+  while (strncmp(line, "%%Page:", 7) && strncmp(line, "%%Trailer", 9))
+  {
+    fwrite(line, 1, linelen, stdout);
+
+    if ((linelen = cupsFileGetLine(fp, line, linesize)) == 0)
+      break;
+  }
 
  /*
   * Then process pages until we have no more...
@@ -778,9 +799,9 @@
   {
     pageinfo = (pstops_page_t *)cupsArrayLast(doc->pages);
 
-    start_nup(doc, doc->number_up - 1, 0, doc->bounding_box);
+    start_nup(doc, doc->number_up, 0, doc->bounding_box);
     doc_puts(doc, "showpage\n");
-    end_nup(doc, doc->number_up - 1);
+    end_nup(doc, doc->number_up);
 
     pageinfo->length = cupsFileTell(doc->temp) - pageinfo->offset;
   }
@@ -802,9 +823,9 @@
       printf("%%%%Page: (filler) %d\n", doc->page);
     }
 
-    start_nup(doc, doc->number_up - 1, 0, doc->bounding_box);
+    start_nup(doc, doc->number_up, 0, doc->bounding_box);
     doc_puts(doc, "showpage\n");
-    end_nup(doc, doc->number_up - 1);
+    end_nup(doc, doc->number_up);
 
     pageinfo->length = cupsFileTell(doc->temp) - pageinfo->offset;
   }
@@ -1368,7 +1389,7 @@
   {
     if (level == 0 &&
         (!strncmp(line, "%%Page:", 7) ||
-	 !strncmp(line, "%%Trailer:", 10) ||
+	 !strncmp(line, "%%Trailer", 9) ||
 	 !strncmp(line, "%%EOF", 5)))
       break;
     else if (!strncmp(line, "%%BeginDocument", 15) ||
@@ -2400,7 +2421,7 @@
   while ((linelen = cupsFileGetLine(fp, line, linesize)) > 0)
   {
     if (level == 0 &&
-        (!strncmp(line, "%%Page:", 7) || !strncmp(line, "%%Trailer:", 10)))
+        (!strncmp(line, "%%Page:", 7) || !strncmp(line, "%%Trailer", 9)))
       break;
     else if (!strncmp(line, "%%BeginDocument", 15) ||
 	     !strncmp(line, "%ADO_BeginApplication", 21))
@@ -2870,5 +2891,5 @@
 
 
 /*
- * End of "$Id: pstops.c 5326 2006-03-23 19:33:35Z mike $".
+ * End of "$Id: pstops.c 5369 2006-04-03 15:09:58Z mike $".
  */


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- cups.spec	4 Apr 2006 17:23:53 -0000	1.141
+++ cups.spec	6 Apr 2006 14:14:01 -0000	1.142
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2
-Release: 0.2.%{beta}.2.6
+Release: 0.2.%{beta}.2.7
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
@@ -41,6 +41,7 @@
 Patch18: cups-language.patch
 Patch19: cups-gnome.patch
 Patch20: cups-direct-usb.patch
+Patch21: cups-pstops.patch
 Patch22: cups-dest-cache-v2.patch
 Patch24: cups-maxlogsize.patch
 Patch28: cups-no-propagate-ipp-port.patch
@@ -140,6 +141,7 @@
 %patch18 -p1 -b .language
 %patch19 -p1 -b .gnome
 %patch20 -p1 -b .direct-usb
+%patch21 -p1 -b .pstops
 %patch22 -p1 -b .dest-cache-v2
 %patch24 -p1 -b .maxlogsize
 %patch28 -p1 -b .no-propagate-ipp-port
@@ -390,8 +392,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com>
+* Thu Apr  6 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.7
 - Build requires openldap-devel.
+- Sync pstops.c with svn 5372.
 
 * Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.6
 - Tweak to allow 'usb:/dev/usb/lp0'-style URIs again (bug #186880).



From fedora-cvs-commits at redhat.com  Thu Apr  6 14:14:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 10:14:38 -0400
Subject: rpms/cups/devel cups-pstops.patch,NONE,1.1 cups.spec,1.154,1.155
Message-ID: <200604061414.k36EEcu0009986@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-pstops.patch 
Log Message:
* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com>
- Build requires openldap-devel.


cups-pstops.patch:
 pstops.c |   43 ++++++++++++++++++++++++++++++++-----------
 1 files changed, 32 insertions(+), 11 deletions(-)

--- NEW FILE cups-pstops.patch ---
--- cups-1.2rc1/filter/pstops.c.pstops	2006-03-23 19:33:35.000000000 +0000
+++ cups-1.2rc1/filter/pstops.c	2006-04-06 15:11:02.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: pstops.c 5326 2006-03-23 19:33:35Z mike $"
+ * "$Id: pstops.c 5369 2006-04-03 15:09:58Z mike $"
  *
  *   PostScript filter for the Common UNIX Printing System (CUPS).
  *
@@ -307,10 +307,13 @@
 
     fputs("DEBUG: Skipping PJL header...\n", stderr);
 
-    while (strstr(line, "ENTER LANGUAGE") == NULL)
+    while (strstr(line, "ENTER LANGUAGE") == NULL && strncmp(line, "%!", 2))
       if ((len = cupsFileGetLine(fp, line, sizeof(line))) == 0)
         break;
 
+    if (!strncmp(line, "%!", 2))
+      break;
+
     if ((len = cupsFileGetLine(fp, line, sizeof(line))) == 0)
       break;
   }
@@ -590,6 +593,12 @@
     {
       if (saw_bounding_box)
         fputs("ERROR: Duplicate %%BoundingBox: comment seen!\n", stderr);
+      else if (strstr(line + 14, "(atend)"))
+      {
+       /*
+        * Do nothing for now but use the default imageable area...
+	*/
+      }
       else if (sscanf(line + 14, "%d%d%d%d", doc->bounding_box + 0,
 	              doc->bounding_box + 1, doc->bounding_box + 2,
 		      doc->bounding_box + 3) != 4)
@@ -738,14 +747,26 @@
   */
 
   fprintf(stderr, "DEBUG: Before copy_prolog - %s", line);
-  copy_prolog(fp, doc, ppd, line, linelen, linesize);
+  linelen = copy_prolog(fp, doc, ppd, line, linelen, linesize);
 
  /*
   * Then the document setup section...
   */
 
   fprintf(stderr, "DEBUG: Before copy_setup - %s", line);
-  copy_setup(fp, doc, ppd, line, linelen, linesize);
+  linelen = copy_setup(fp, doc, ppd, line, linelen, linesize);
+
+ /*
+  * Copy until we see %%Page:...
+  */
+
+  while (strncmp(line, "%%Page:", 7) && strncmp(line, "%%Trailer", 9))
+  {
+    fwrite(line, 1, linelen, stdout);
+
+    if ((linelen = cupsFileGetLine(fp, line, linesize)) == 0)
+      break;
+  }
 
  /*
   * Then process pages until we have no more...
@@ -778,9 +799,9 @@
   {
     pageinfo = (pstops_page_t *)cupsArrayLast(doc->pages);
 
-    start_nup(doc, doc->number_up - 1, 0, doc->bounding_box);
+    start_nup(doc, doc->number_up, 0, doc->bounding_box);
     doc_puts(doc, "showpage\n");
-    end_nup(doc, doc->number_up - 1);
+    end_nup(doc, doc->number_up);
 
     pageinfo->length = cupsFileTell(doc->temp) - pageinfo->offset;
   }
@@ -802,9 +823,9 @@
       printf("%%%%Page: (filler) %d\n", doc->page);
     }
 
-    start_nup(doc, doc->number_up - 1, 0, doc->bounding_box);
+    start_nup(doc, doc->number_up, 0, doc->bounding_box);
     doc_puts(doc, "showpage\n");
-    end_nup(doc, doc->number_up - 1);
+    end_nup(doc, doc->number_up);
 
     pageinfo->length = cupsFileTell(doc->temp) - pageinfo->offset;
   }
@@ -1368,7 +1389,7 @@
   {
     if (level == 0 &&
         (!strncmp(line, "%%Page:", 7) ||
-	 !strncmp(line, "%%Trailer:", 10) ||
+	 !strncmp(line, "%%Trailer", 9) ||
 	 !strncmp(line, "%%EOF", 5)))
       break;
     else if (!strncmp(line, "%%BeginDocument", 15) ||
@@ -2400,7 +2421,7 @@
   while ((linelen = cupsFileGetLine(fp, line, linesize)) > 0)
   {
     if (level == 0 &&
-        (!strncmp(line, "%%Page:", 7) || !strncmp(line, "%%Trailer:", 10)))
+        (!strncmp(line, "%%Page:", 7) || !strncmp(line, "%%Trailer", 9)))
       break;
     else if (!strncmp(line, "%%BeginDocument", 15) ||
 	     !strncmp(line, "%ADO_BeginApplication", 21))
@@ -2870,5 +2891,5 @@
 
 
 /*
- * End of "$Id: pstops.c 5326 2006-03-23 19:33:35Z mike $".
+ * End of "$Id: pstops.c 5369 2006-04-03 15:09:58Z mike $".
  */


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- cups.spec	4 Apr 2006 17:22:59 -0000	1.154
+++ cups.spec	6 Apr 2006 14:14:33 -0000	1.155
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2
-Release: 0.2.%{beta}.6
+Release: 0.2.%{beta}.7
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
@@ -41,6 +41,7 @@
 Patch18: cups-language.patch
 Patch19: cups-gnome.patch
 Patch20: cups-direct-usb.patch
+Patch21: cups-pstops.patch
 Patch22: cups-dest-cache-v2.patch
 Patch24: cups-maxlogsize.patch
 Patch28: cups-no-propagate-ipp-port.patch
@@ -136,6 +137,7 @@
 %patch18 -p1 -b .language
 %patch19 -p1 -b .gnome
 %patch20 -p1 -b .direct-usb
+%patch21 -p1 -b .pstops
 %patch22 -p1 -b .dest-cache-v2
 %patch24 -p1 -b .maxlogsize
 %patch28 -p1 -b .no-propagate-ipp-port
@@ -386,8 +388,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com>
+* Thu Apr  6 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.7
 - Build requires openldap-devel.
+- Sync pstops.c with svn 5372.
 
 * Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.6
 - Tweak to allow 'usb:/dev/usb/lp0'-style URIs again.



From fedora-cvs-commits at redhat.com  Thu Apr  6 14:15:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 10:15:45 -0400
Subject: rpms/metacity/devel .cvsignore, 1.37, 1.38 metacity.spec, 1.65,
	1.66 sources, 1.37, 1.38
Message-ID: <200604061415.k36EFjkD010092@cvs.devel.redhat.com>

Author: sandmann

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

Modified Files:
	.cvsignore metacity.spec sources 
Log Message:
+* Thu Apr 6 2006 Soren Sandmann <sandmann at redhat.com> - 2.16.0-3
+- Bump libcm to 0.0.18.
+



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	31 Mar 2006 21:57:10 -0000	1.37
+++ .cvsignore	6 Apr 2006 14:15:43 -0000	1.38
@@ -1,2 +1,3 @@
 libcm-0.0.17.tar.gz
 metacity-2.15.0.20060331.tar.gz
+libcm-0.0.18.tar.gz


Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- metacity.spec	3 Apr 2006 15:55:46 -0000	1.65
+++ metacity.spec	6 Apr 2006 14:15:43 -0000	1.66
@@ -1,6 +1,6 @@
 %define gettext_package metacity
 
-%define libcm_version 0.0.17
+%define libcm_version 0.0.18
 %define metacity_version 2.15.0
 %define metacity_snapshot 20060331
 
@@ -138,6 +138,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Apr 6 2006 Soren Sandmann <sandmann at redhat.com> - 2.16.0-3
+- Bump libcm to 0.0.18.
+
 * Mon Apr  3 2006 Soren Sandmann <sandmann at redhat.com> - 2.15.0-2
 - Fix leftover libcm-snapshot-date, buildrequire libXcomposite-devel >= 0.3
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	31 Mar 2006 21:57:10 -0000	1.37
+++ sources	6 Apr 2006 14:15:43 -0000	1.38
@@ -1,2 +1,2 @@
-4bd27c1cf6de1bb57c4c0ad5d508cf6f  libcm-0.0.17.tar.gz
 df7434930a126a14995c9e98d9a4f736  metacity-2.15.0.20060331.tar.gz
+b6bebe5ec71cce73b9af09c91ffda5fa  libcm-0.0.18.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr  6 14:17:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 10:17:47 -0400
Subject: rpms/metacity/devel metacity.spec,1.66,1.67
Message-ID: <200604061417.k36EHlka017138@cvs.devel.redhat.com>

Author: sandmann

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

Modified Files:
	metacity.spec 
Log Message:
Forgot to bump release number

\
!




Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- metacity.spec	6 Apr 2006 14:15:43 -0000	1.66
+++ metacity.spec	6 Apr 2006 14:17:45 -0000	1.67
@@ -7,7 +7,7 @@
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 2
+Release: 3
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
 Source0: metacity-%{metacity_version}.%{metacity_snapshot}.tar.gz
 Source1: libcm-%{libcm_version}.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr  6 14:22:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 10:22:25 -0400
Subject: rpms/apr-util/devel apr-util-1.2.6-ldap.patch, NONE,
	1.1 apr-util.spec, 1.24, 1.25 sources, 1.6, 1.7 upstream, 1.4, 1.5
Message-ID: <200604061422.k36EMPF7024016@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/apr-util/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24003

Modified Files:
	apr-util.spec sources upstream 
Added Files:
	apr-util-1.2.6-ldap.patch 
Log Message:
* Thu Apr  6 2006 Joe Orton <jorton at redhat.com> 1.2.6-2
- update to 1.2.6
- define LDAP_DEPRECATED in apr_ldap.h (r391985, #188073)


apr-util-1.2.6-ldap.patch:
 apr_ldap.h.in |    6 ++++++
 1 files changed, 6 insertions(+)

--- NEW FILE apr-util-1.2.6-ldap.patch ---
Author: jorton
Date: Thu Apr  6 06:44:59 2006
New Revision: 391985

URL: http://svn.apache.org/viewcvs?rev=391985&view=rev
Log:
* include/apr_ldap.h.in: For OpenLDAP, before including <ldap.h>,
define LDAP_DEPRECATED to 1 if it is not already defined.  Fixes use
of OpenLDAP 2.3, which by default hides the ldap_init() etc
prototypes, which can have rather catastrophic effects at runtime.
(since the compiler presumes ldap_init() returns int and discards the
top half of the LDAP * pointer value on 64-bit platforms)

Modified:
    apr/apr-util/trunk/include/apr_ldap.h.in

--- apr-util-1.2.6/include/apr_ldap.h.in.ldap
+++ apr-util-1.2.6/include/apr_ldap.h.in
@@ -59,6 +59,12 @@
 #define APR_HAS_LDAP_SSL 1
 #define APR_HAS_LDAP_URL_PARSE      0
 
+#if APR_HAS_OPENLDAP_LDAPSDK && !defined(LDAP_DEPRECATED) 
+/* Ensure that the "deprecated" interfaces are still exposed
+ * with OpenLDAP >= 2.3; these were exposed by default in earlier
+ * releases. */
+#define LDAP_DEPRECATED 1
+#endif
 
 /*
  * Include the standard LDAP header files.


Index: apr-util.spec
===================================================================
RCS file: /cvs/dist/rpms/apr-util/devel/apr-util.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- apr-util.spec	11 Feb 2006 01:37:34 -0000	1.24
+++ apr-util.spec	6 Apr 2006 14:22:22 -0000	1.25
@@ -3,13 +3,14 @@
 
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
-Version: 1.2.2
-Release: 4.2
+Version: 1.2.6
+Release: 2
 License: Apache Software License 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
 Source0: %{name}-%{version}.tar.gz
 Patch0: apr-util-1.2.2-exports.patch
+Patch1: apr-util-1.2.6-ldap.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: autoconf, doxygen, apr-devel >= 1.2.0
 BuildRequires: openldap-devel, db4-devel, expat-devel
@@ -39,6 +40,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .exports
+%patch1 -p1 -b .ldap
 
 %build
 autoheader && autoconf
@@ -46,6 +48,7 @@
         --includedir=%{_includedir}/apr-%{apuver} \
         --with-ldap --without-gdbm \
         --with-sqlite3 --with-pgsql \
+        --with-berkeley-db \
         --without-sqlite2
 make %{?_smp_mflags} && make dox
 
@@ -101,6 +104,10 @@
 %doc --parents html
 
 %changelog
+* Thu Apr  6 2006 Joe Orton <jorton at redhat.com> 1.2.6-2
+- update to 1.2.6
+- define LDAP_DEPRECATED in apr_ldap.h (r391985, #188073)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.2-4.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/apr-util/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Dec 2005 09:54:51 -0000	1.6
+++ sources	6 Apr 2006 14:22:22 -0000	1.7
@@ -1 +1 @@
-8b3f04dde7048946c3c94f85b4debb94  apr-util-1.2.2.tar.gz
+f8f17dd6bd17926ab2b03767f1f3a1fc  apr-util-1.2.6.tar.gz


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/apr-util/devel/upstream,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- upstream	2 Dec 2005 09:54:51 -0000	1.4
+++ upstream	6 Apr 2006 14:22:22 -0000	1.5
@@ -1 +1 @@
-apr-util-1.2.2.tar.gz
+apr-util-1.2.6.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr  6 14:23:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 10:23:20 -0400
Subject: rpms/apr-util/devel apr-util-1.2.6.tar.gz.asc, NONE,
	1.1 apr-util-0.9.7.tar.gz.asc, 1.1,
	NONE apr-util-1.2.2.tar.gz.asc, 1.1, NONE
Message-ID: <200604061423.k36ENKnO024100@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/apr-util/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24085

Added Files:
	apr-util-1.2.6.tar.gz.asc 
Removed Files:
	apr-util-0.9.7.tar.gz.asc apr-util-1.2.2.tar.gz.asc 
Log Message:
- clean up .asc files



--- NEW FILE apr-util-1.2.6.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (FreeBSD)

iD8DBQBEIXMFyR242pvPzi8RAhXmAJ943rjALAMEX7h/sHeHXpE+TepL/ACg6leM
yLqRdcIrqCnXP2a+bMw3JvY=
=7j43
-----END PGP SIGNATURE-----


--- apr-util-0.9.7.tar.gz.asc DELETED ---


--- apr-util-1.2.2.tar.gz.asc DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr  6 14:27:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 10:27:49 -0400
Subject: rpms/net-tools/devel net-tools-1.60-netstat_stop_trim.patch, 1.1,
	1.2 net-tools.spec, 1.62, 1.63
Message-ID: <200604061427.k36ERnR2024211@cvs.devel.redhat.com>

Author: rvokal

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

Modified Files:
	net-tools-1.60-netstat_stop_trim.patch net-tools.spec 
Log Message:
- add note about -T to netstat

net-tools-1.60-netstat_stop_trim.patch:
 man/en_US/netstat.8 |    4 ++++
 netstat.c           |   27 ++++++++++++++++++++-------
 2 files changed, 24 insertions(+), 7 deletions(-)

Index: net-tools-1.60-netstat_stop_trim.patch
===================================================================
RCS file: /cvs/dist/rpms/net-tools/devel/net-tools-1.60-netstat_stop_trim.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- net-tools-1.60-netstat_stop_trim.patch	10 Feb 2006 10:27:36 -0000	1.1
+++ net-tools-1.60-netstat_stop_trim.patch	6 Apr 2006 14:27:45 -0000	1.2
@@ -78,3 +78,15 @@
  	}
  
      if(argc == optind + 1) {
+--- net-tools-1.60/netstat.c.trim2	2006-04-06 16:12:02.000000000 +0200
++++ net-tools-1.60/netstat.c	2006-04-06 16:18:09.000000000 +0200
+@@ -1737,7 +1737,8 @@
+     fprintf(stderr, _("        -a, --all, --listening     display all sockets (default: connected)\n"));
+     fprintf(stderr, _("        -o, --timers               display timers\n"));
+     fprintf(stderr, _("        -F, --fib                  display Forwarding Information Base (default)\n"));
+-    fprintf(stderr, _("        -C, --cache                display routing cache instead of FIB\n\n"));
++    fprintf(stderr, _("        -C, --cache                display routing cache instead of FIB\n"));
++    fprintf(stderr, _("        -T, --trim                 stop trimming long addresses\n"));
+     fprintf(stderr, _("        -Z, --context              display SELinux security context for sockets\n\n"));
+ 
+     fprintf(stderr, _("  <Iface>: Name of interface to monitor/list.\n"));


Index: net-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/net-tools/devel/net-tools.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- net-tools.spec	30 Mar 2006 10:45:25 -0000	1.62
+++ net-tools.spec	6 Apr 2006 14:27:45 -0000	1.63
@@ -3,7 +3,7 @@
 Summary: Basic networking tools.
 Name: net-tools
 Version: 1.60
-Release: 65
+Release: 66
 License: GPL
 Group: System Environment/Base
 Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2
@@ -231,6 +231,9 @@
 %{_sysconfdir}/rc.d/init.d/netplugd
 
 %changelog
+* Thu Apr 06 2006 Radek Vok??l <rvokal at redhat.com> - 1.60-66
+- add note about -T to netstat
+
 * Thu Mar 30 2006 Radek Vok??l <rvokal at redhat.com> - 1.60-65
 - add note to ifconfig(8) about supported format for IPv4 addresses (#176661)
 



From fedora-cvs-commits at redhat.com  Thu Apr  6 14:33:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 10:33:13 -0400
Subject: rpms/httpd/devel httpd.spec,1.87,1.88
Message-ID: <200604061433.k36EXDNL024355@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	httpd.spec 
Log Message:
* Thu Apr  6 2006 Joe Orton <jorton at redhat.com> 2.2.0-6
- rebuild to pick up apr-util LDAP interface fix (#188073)



Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- httpd.spec	11 Feb 2006 03:27:40 -0000	1.87
+++ httpd.spec	6 Apr 2006 14:32:59 -0000	1.88
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.0
-Release: 5.1.2
+Release: 6
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -491,6 +491,9 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Thu Apr  6 2006 Joe Orton <jorton at redhat.com> 2.2.0-6
+- rebuild to pick up apr-util LDAP interface fix (#188073)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - (none):2.2.0-5.1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Thu Apr  6 15:07:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 11:07:14 -0400
Subject: rpms/busybox/devel busybox-1.1.1-selinux.patch,1.1,1.2
Message-ID: <200604061507.k36F7E9p006495@cvs.devel.redhat.com>

Author: varekova

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

Modified Files:
	busybox-1.1.1-selinux.patch 
Log Message:
fix selinux patch 


busybox-1.1.1-selinux.patch:
 Config.in             |    1 
 Makefile              |    6 ++---
 include/applets.h     |    1 
 include/usage.h       |    9 ++++++++
 selinux/Config.in     |   16 ++++++++++++++
 selinux/Makefile      |   30 +++++++++++++++++++++++++++
 selinux/Makefile.in   |   35 +++++++++++++++++++++++++++++++
 selinux/load_policy.c |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 150 insertions(+), 3 deletions(-)

Index: busybox-1.1.1-selinux.patch
===================================================================
RCS file: /cvs/dist/rpms/busybox/devel/busybox-1.1.1-selinux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- busybox-1.1.1-selinux.patch	6 Apr 2006 12:21:29 -0000	1.1
+++ busybox-1.1.1-selinux.patch	6 Apr 2006 15:07:08 -0000	1.2
@@ -1,9 +1,44 @@
---- /dev/null	2006-04-06 08:55:50.820704048 +0200
-+++ busybox-1.1.1/selinux/Makefile.in	2006-04-06 12:28:37.485563704 +0200
-@@ -0,0 +1,35 @@
+--- busybox-1.1.1/Makefile.selinux	2006-03-22 22:16:26.000000000 +0100
++++ busybox-1.1.1/Makefile	2006-04-06 16:27:46.000000000 +0200
+@@ -27,7 +27,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))
+@@ -196,7 +196,7 @@
+ 
+ defconfig: scripts/config/conf
+ 	@./scripts/config/conf -y $(CONFIG_CONFIG_IN)
+-	@$(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)
+ 
+ 
+@@ -298,7 +298,7 @@
+ 	-o $@ -Wl,--start-group  \
+ 	$(APPLETS_DEFINE) $(APPLET_SRC) \
+ 	$(BUSYBOX_DEFINE) $(BUSYBOX_SRC) $(libraries-y) \
+-	$(LDBUSYBOX) $(LIBRARIES) \
++	$(LDBUSYBOX) $(LIBRARIES) -lsepol\
+ 	-Wl,--end-group
+ 
+ busybox: busybox_unstripped
+--- busybox-1.1.1/Config.in.selinux	2006-03-22 22:16:26.000000000 +0100
++++ busybox-1.1.1/Config.in	2006-04-06 16:27:38.000000000 +0200
+@@ -405,3 +405,4 @@
+ source procps/Config.in
+ source shell/Config.in
+ source sysklogd/Config.in
++source selinux/Config.in
+--- /dev/null	2006-04-05 10:16:44.607940000 +0200
++++ busybox-1.1.1/selinux/Makefile	2006-04-06 16:27:38.000000000 +0200
+@@ -0,0 +1,30 @@
 +# 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
@@ -21,23 +56,19 @@
 +# 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))
++TOPDIR:= ../
++SELINUX_DIR:=./
++include $(TOPDIR).config
++include $(TOPDIR)Rules.mak
++include Makefile.in
++all: $(libraries-y)
++-include $(TOPDIR).depend
 +
-+$(SELINUX_DIR)%.o: $(SELINUX_DIR)%.c
-+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
++clean:
++	rm -f *.o *.a $(AR_TARGET)
 +
---- /dev/null	2006-04-06 08:55:50.820704048 +0200
-+++ busybox-1.1.1/selinux/Config.in	2006-04-06 12:28:37.490562944 +0200
+--- /dev/null	2006-04-05 10:16:44.607940000 +0200
++++ busybox-1.1.1/selinux/Config.in	2006-04-06 16:27:38.000000000 +0200
 @@ -0,0 +1,16 @@
 +#
 +# For a description of the syntax of this configuration file,
@@ -55,11 +86,12 @@
 +endif
 +endmenu
 +
---- /dev/null	2006-04-06 08:55:50.820704048 +0200
-+++ busybox-1.1.1/selinux/Makefile	2006-04-06 12:28:37.491562792 +0200
-@@ -0,0 +1,30 @@
+--- /dev/null	2006-04-05 10:16:44.607940000 +0200
++++ busybox-1.1.1/selinux/Makefile.in	2006-04-06 16:27:38.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
@@ -77,19 +109,23 @@
 +# 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
++SELINUX_AR:=selinux.a
++ifndef $(SELINUX_DIR)
++SELINUX_DIR:=$(TOPDIR)selinux/
++endif
 +
-+clean:
-+	rm -f *.o *.a $(AR_TARGET)
++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-04-06 08:55:50.820704048 +0200
-+++ busybox-1.1.1/selinux/load_policy.c	2006-04-06 12:28:37.491562792 +0200
+--- /dev/null	2006-04-05 10:16:44.607940000 +0200
++++ busybox-1.1.1/selinux/load_policy.c	2006-04-06 16:27:38.000000000 +0200
 @@ -0,0 +1,55 @@
 +#include <unistd.h>
 +#include <sys/types.h>
@@ -146,8 +182,18 @@
 +	}
 +	return EXIT_SUCCESS;
 +}
+--- busybox-1.1.1/include/applets.h.selinux	2006-03-22 22:16:24.000000000 +0100
++++ busybox-1.1.1/include/applets.h	2006-04-06 16:27:38.000000000 +0200
+@@ -163,6 +163,7 @@
+ USE_SETARCH(APPLET_NOUSAGE(linux64, setarch_main, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_FEATURE_INITRD(APPLET_NOUSAGE(linuxrc, init_main, _BB_DIR_ROOT, _BB_SUID_NEVER))
+ USE_LN(APPLET(ln, ln_main, _BB_DIR_BIN, _BB_SUID_NEVER))
++USE_LOAD_POLICY(APPLET(load_policy, load_policy_main, _BB_DIR_SBIN, _BB_SUID_NEVER))
+ USE_LOADFONT(APPLET(loadfont, loadfont_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+ USE_LOADKMAP(APPLET(loadkmap, loadkmap_main, _BB_DIR_SBIN, _BB_SUID_NEVER))
+ USE_LOGGER(APPLET(logger, logger_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
 --- busybox-1.1.1/include/usage.h.selinux	2006-03-22 22:16:24.000000000 +0100
-+++ busybox-1.1.1/include/usage.h	2006-04-06 12:28:37.493562488 +0200
++++ busybox-1.1.1/include/usage.h	2006-04-06 16:27:38.000000000 +0200
 @@ -2413,6 +2413,15 @@
  #else
  #define USAGE_PS "\nOptions:"
@@ -164,40 +210,3 @@
  #if ENABLE_FEATURE_PS_WIDE
  #define USAGE_PS_WIDE(a) a
  #else
---- busybox-1.1.1/include/applets.h.selinux	2006-03-22 22:16:24.000000000 +0100
-+++ busybox-1.1.1/include/applets.h	2006-04-06 12:28:37.494562336 +0200
-@@ -163,6 +163,7 @@
- USE_SETARCH(APPLET_NOUSAGE(linux64, setarch_main, _BB_DIR_BIN, _BB_SUID_NEVER))
- USE_FEATURE_INITRD(APPLET_NOUSAGE(linuxrc, init_main, _BB_DIR_ROOT, _BB_SUID_NEVER))
- USE_LN(APPLET(ln, ln_main, _BB_DIR_BIN, _BB_SUID_NEVER))
-+USE_LOAD_POLICY(APPLET(load_policy, load_policy_main, _BB_DIR_SBIN, _BB_SUID_NEVER))
- USE_LOADFONT(APPLET(loadfont, loadfont_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
- USE_LOADKMAP(APPLET(loadkmap, loadkmap_main, _BB_DIR_SBIN, _BB_SUID_NEVER))
- USE_LOGGER(APPLET(logger, logger_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
---- busybox-1.1.1/Config.in.selinux	2006-03-22 22:16:26.000000000 +0100
-+++ busybox-1.1.1/Config.in	2006-04-06 12:28:37.494562336 +0200
-@@ -405,3 +405,4 @@
- source procps/Config.in
- source shell/Config.in
- source sysklogd/Config.in
-+source selinux/Config.in
---- busybox-1.1.1/Makefile.selinux	2006-03-22 22:16:26.000000000 +0100
-+++ busybox-1.1.1/Makefile	2006-04-06 12:30:20.636882320 +0200
-@@ -27,7 +27,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))
-@@ -196,7 +196,7 @@
- 
- defconfig: scripts/config/conf
- 	@./scripts/config/conf -y $(CONFIG_CONFIG_IN)
--	@$(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)
- 
- 



From fedora-cvs-commits at redhat.com  Thu Apr  6 16:56:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 12:56:58 -0400
Subject: rpms/gcc/devel gcc41-java-pr13212.patch, NONE,
	1.1 gcc41-objc-rh185398.patch, NONE, 1.1 gcc41-pr27057.patch,
	NONE, 1.1 .cvsignore, 1.141, 1.142 gcc41-pr20297-test.patch,
	1.2, 1.3 gcc41.spec, 1.46, 1.47 sources, 1.143, 1.144
Message-ID: <200604061656.k36Guw5d031473@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	.cvsignore gcc41-pr20297-test.patch gcc41.spec sources 
Added Files:
	gcc41-java-pr13212.patch gcc41-objc-rh185398.patch 
	gcc41-pr27057.patch 
Log Message:
4.1.0-6


gcc41-java-pr13212.patch:
 0 files changed

--- NEW FILE gcc41-java-pr13212.patch ---
2006-03-29  Bryce McKinlay  <mckinlay at redhat.com>
	
	PR libgcj/13212:
	* configure.ac: Check for pthread_getattr_np(). Remove
	GC_PTHREAD_SYM_VERSION detection.
	* include/gc.h (GC_register_my_thread, GC_unregister_my_thread,
	GC_get_thread_stack_base): New declarations.
	* pthread_support.c (GC_register_my_thread, GC_unregister_my_thread,
	GC_get_thread_stack_base): New functions.
	(GC_delete_thread): Don't try to free the first_thread.
	* misc.c (GC_init_inner): Use GC_get_thread_stack_base() if possible.
	(pthread_create_, constr): Removed.
	(pthread_create): Don't rename.
	* include/gc_ext_config.h.in: Rebuilt.
	* include/gc_pthread_redirects.h (pthread_create): Define 
	unconditionally.
	* include/gc_config.h.in: Rebuilt.
	* configure: Rebuilt.

--- libjava/boehm.cc	(revision 112312)
+++ libjava/boehm.cc	(working copy)
@@ -713,3 +713,15 @@
   // For now, always reclaim soft references.  FIXME.
   return true;
 }
+
+void
+_Jv_GCAttachThread ()
+{
+  GC_register_my_thread ();
+}
+
+void
+_Jv_GCDetachThread ()
+{
+  GC_unregister_my_thread ();
+}
--- libjava/java/lang/natThread.cc	(revision 112312)
+++ libjava/java/lang/natThread.cc	(working copy)
@@ -396,7 +396,8 @@
 }
 
 // Attach the current native thread to an existing (but unstarted) Thread 
-// object. Returns -1 on failure, 0 upon success.
+// object. Does not register thread with the garbage collector.
+// Returns -1 on failure, 0 upon success.
 jint
 _Jv_AttachCurrentThread(java::lang::Thread* thread)
 {
@@ -413,6 +414,8 @@
 java::lang::Thread*
 _Jv_AttachCurrentThread(jstring name, java::lang::ThreadGroup* group)
 {
+  // Register thread with GC before attempting any allocations.
+  _Jv_GCAttachThread ();
   java::lang::Thread *thread = _Jv_ThreadCurrent ();
   if (thread != NULL)
     return thread;
@@ -447,6 +450,7 @@
     return -1;
 
   _Jv_ThreadUnRegister ();
+  _Jv_GCDetachThread ();
   // Release the monitors.
   t->finish_ ();
 
--- libjava/include/boehm-gc.h	(revision 112312)
+++ libjava/include/boehm-gc.h	(working copy)
@@ -79,6 +79,12 @@
 
 #endif /* LIBGCJ_GC_DEBUG */
 
+void
+_Jv_GCAttachThread ();
+
+void
+_Jv_GCDetachThread ();
+
 // _Jv_AllocBytes (jsize size) should go here, too.  But clients don't
 // usually include this header.
 
--- boehm-gc/configure.ac	(revision 112312)
+++ boehm-gc/configure.ac	(working copy)
@@ -291,6 +291,13 @@
      ;;
 esac
 
+# Checks for pthreads functions
+#
+oldLIBS="$LIBS"
+LIBS="$LIBS -lpthread"
+AC_CHECK_FUNCS([pthread_getattr_np])
+LIBS="$oldLIBS"
+
 # Configuration of machine-dependent code
 #
 # We don't set NO_EXECUTE_PERMISSION by default because gcj (and
@@ -450,25 +457,6 @@
   AC_DEFINE(USE_MMAP, 1, [use MMAP instead of sbrk to get new memory])
 fi
 
-symver=
-case "$target" in
-  *-*-linux* )
-    cat > conftest.c <<EOF
-#include <pthread.h>
-void *tf (void *arg) { (void) arg; return NULL; }
-int main (void) { pthread_t th; pthread_create (&th, NULL, tf, NULL); return 0; }
-EOF
-    if $CC $CFLAGS -pthread -o conftest conftest.c > /dev/null 2>&1; then
-      symver=`readelf -s conftest 2> /dev/null | sed -n '/UND pthread_create@/{s/^.*@//;s/ .*$//;p;q}'`
-    fi
-    rm -f conftest conftest.c
-    ;;
-esac
-if test -n "$symver"; then
-  AC_DEFINE_UNQUOTED(GC_PTHREAD_SYM_VERSION, "$symver", [symbol version of pthread_create])
-fi
-
-
 if test -n "$with_cross_host" &&
    test x"$with_cross_host" != x"no"; then
   toolexecdir='$(exec_prefix)/$(target_noncanonical)'
--- boehm-gc/include/gc.h	(revision 112312)
+++ boehm-gc/include/gc.h	(working copy)
@@ -69,7 +69,6 @@
     extern "C" {
 # endif
 
-
 /* Define word and signed_word to be unsigned and signed types of the 	*/
 /* size as char * or void *.  There seems to be no way to do this	*/
 /* even semi-portably.  The following is probably no better/worse 	*/
@@ -909,6 +908,25 @@
 # if defined(PCR) || defined(GC_SOLARIS_THREADS) || \
      defined(GC_PTHREADS) || defined(GC_WIN32_THREADS)
    	/* Any flavor of threads except SRC_M3.	*/
+
+/* Register the current thread as a new thread whose stack(s) should    */
+/* be traced by the GC.  						*/
+/* If a platform does not implicitly do so, this must be called before  */
+/* a thread can allocate garbage collected memory, or assign pointers	*/
+/* to the garbage collected heap.  Once registered, a thread will be	*/
+/* stopped during garbage collections.					*/
+GC_API void GC_register_my_thread GC_PROTO((void));
+
+/* Register the current thread, with the indicated stack base, as	*/
+/* a new thread whose stack(s) should be traced by the GC.  If a 	*/
+/* platform does not implicitly do so, this must be called before a	*/
+/* thread can allocate garbage collected memory, or assign pointers	*/
+/* to the garbage collected heap.  Once registered, a thread will be	*/
+/* stopped during garbage collections.					*/
+GC_API void GC_unregister_my_thread GC_PROTO((void));
+
+GC_API GC_PTR GC_get_thread_stack_base GC_PROTO((void));
+
 /* This returns a list of objects, linked through their first		*/
 /* word.  Its use can greatly reduce lock contention problems, since	*/
 /* the allocation lock can be acquired and released many fewer times.	*/
--- boehm-gc/include/gc_ext_config.h.in	(revision 112312)
+++ boehm-gc/include/gc_ext_config.h.in	(working copy)
@@ -3,5 +3,3 @@
 is used by libjava/include/boehm-gc.h. */
 
 #undef THREAD_LOCAL_ALLOC
-
-#undef GC_PTHREAD_SYM_VERSION
--- boehm-gc/include/gc_pthread_redirects.h	(revision 112312)
+++ boehm-gc/include/gc_pthread_redirects.h	(working copy)
@@ -68,9 +68,7 @@
 # undef pthread_detach
 #endif
 
-#ifndef GC_PTHREAD_SYM_VERSION
 # define pthread_create GC_pthread_create
-#endif
 # define pthread_join GC_pthread_join
 # define pthread_detach GC_pthread_detach
 
--- boehm-gc/include/gc_config.h.in	(revision 112312)
+++ boehm-gc/include/gc_config.h.in	(working copy)
@@ -45,9 +45,6 @@
 /* support for Tru64 pthreads */
 #undef GC_OSF1_THREADS
 
-/* symbol version of pthread_create */
-#undef GC_PTHREAD_SYM_VERSION
-
 /* support for Solaris pthreads */
 #undef GC_SOLARIS_PTHREADS
 
@@ -63,6 +60,9 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
+/* Define to 1 if you have the `pthread_getattr_np' function. */
+#undef HAVE_PTHREAD_GETATTR_NP
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
--- boehm-gc/configure	(revision 112312)
+++ boehm-gc/configure	(working copy)
@@ -5759,6 +5759,119 @@
      ;;
 esac
 
+# Checks for pthreads functions
+#
+oldLIBS="$LIBS"
+LIBS="$LIBS -lpthread"
+
+for ac_func in pthread_getattr_np
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test x$gcc_no_link = xyes; then
+  { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5
+echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* 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 $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+LIBS="$oldLIBS"
+
 # Configuration of machine-dependent code
 #
 # We don't set NO_EXECUTE_PERMISSION by default because gcj (and
@@ -6627,29 +6740,6 @@
 
 fi
 
-symver=
-case "$target" in
-  *-*-linux* )
-    cat > conftest.c <<EOF
-#include <pthread.h>
-void *tf (void *arg) { (void) arg; return NULL; }
-int main (void) { pthread_t th; pthread_create (&th, NULL, tf, NULL); return 0; }
-EOF
-    if $CC $CFLAGS -pthread -o conftest conftest.c > /dev/null 2>&1; then
-      symver=`readelf -s conftest 2> /dev/null | sed -n '/UND pthread_create@/{s/^.*@//;s/ .*$//;p;q}'`
-    fi
-    rm -f conftest conftest.c
-    ;;
-esac
-if test -n "$symver"; then
-
-cat >>confdefs.h <<_ACEOF
-#define GC_PTHREAD_SYM_VERSION "$symver"
-_ACEOF
-
-fi
-
-
 if test -n "$with_cross_host" &&
    test x"$with_cross_host" != x"no"; then
   toolexecdir='$(exec_prefix)/$(target_noncanonical)'
--- boehm-gc/pthread_support.c	(revision 112312)
+++ boehm-gc/pthread_support.c	(working copy)
@@ -602,7 +602,9 @@
     } else {
         prev -> next = p -> next;
     }
-    GC_INTERNAL_FREE(p);
+
+    if (p != &first_thread)
+      GC_INTERNAL_FREE(p);
 }
 
 /* If a thread has been joined, but we have not yet		*/
@@ -1125,6 +1127,107 @@
 
 GC_bool GC_in_thread_creation = FALSE;
 
+GC_PTR GC_get_thread_stack_base()
+{  
+# ifdef HAVE_PTHREAD_GETATTR_NP
+  pthread_t my_pthread;
+  pthread_attr_t attr;
+  ptr_t stack_addr;
+  size_t stack_size;
+  
+  my_pthread = pthread_self();  
+  pthread_getattr_np (my_pthread, &attr);
+  pthread_attr_getstack (&attr, (void **) &stack_addr, &stack_size);
+  pthread_attr_destroy (&attr);
+  
+#   ifdef DEBUG_THREADS
+	GC_printf1("attached thread stack address: 0x%x\n", stack_addr);
+#   endif
+
+#   ifdef STACK_GROWS_DOWN
+      return stack_addr + stack_size;
+#   else
+      return stack_addr - stack_size;
+#   endif
+
+# else
+#   ifdef DEBUG_THREADS
+	GC_printf1("Can not determine stack base for attached thread");
+#   endif
+  return 0;
+# endif
+}
+
+void GC_register_my_thread()
+{
+  GC_thread me;
+  pthread_t my_pthread;
+
+  my_pthread = pthread_self();
+#   ifdef DEBUG_THREADS
+      GC_printf1("Attaching thread 0x%lx\n", my_pthread);
+      GC_printf1("pid = %ld\n", (long) getpid());
+#   endif
+  
+  /* Check to ensure this thread isn't attached already. */
+  LOCK();
+  me = GC_lookup_thread (my_pthread);
+  UNLOCK();
+  if (me != 0)
+    {
+#   ifdef DEBUG_THREADS
+      GC_printf1("Attempt to re-attach known thread 0x%lx\n", my_pthread);
+#   endif
+      return;
+    }
+
+  LOCK();
+  GC_in_thread_creation = TRUE;
+  me = GC_new_thread(my_pthread);
+  GC_in_thread_creation = FALSE;
+
+  me -> flags |= DETACHED;  
+
+#ifdef GC_DARWIN_THREADS
+    me -> stop_info.mach_thread = mach_thread_self();
+#else
+    me -> stack_end = GC_get_thread_stack_base();    
+    if (me -> stack_end == 0)
+      GC_abort("Can not determine stack base for attached thread");
+    
+#   ifdef STACK_GROWS_DOWN
+      me -> stop_info.stack_ptr = me -> stack_end - 0x10;
+#   else
+      me -> stop_info.stack_ptr = me -> stack_end + 0x10;
+#   endif
+#endif
+
+#   ifdef IA64
+      me -> backing_store_end = (ptr_t)
+			(GC_save_regs_in_stack() & ~(GC_page_size - 1));
+      /* This is also < 100% convincing.  We should also read this 	*/
+      /* from /proc, but the hook to do so isn't there yet.		*/
+#   endif /* IA64 */
+
+#   if defined(THREAD_LOCAL_ALLOC) && !defined(DBG_HDRS_ALL)
+        GC_init_thread_local(me);
+#   endif
+  UNLOCK();
+}
+
+void GC_unregister_my_thread()
+{
+  pthread_t my_pthread;
+
+  my_pthread = pthread_self();
+
+#   ifdef DEBUG_THREADS
+      GC_printf1("Detaching thread 0x%lx\n", my_pthread);
+#   endif
+
+  GC_thread_exit_proc (0);
+}
+
 void * GC_start_routine(void * arg)
 {
     int dummy;
@@ -1201,37 +1304,8 @@
     return(result);
 }
 
-#ifdef GC_PTHREAD_SYM_VERSION
-
-/* Force constr to execute prior to main().  */
-static void constr (void) __attribute__ ((constructor));
-
-static int
-(*pthread_create_)(pthread_t *new_thread,
-		   const pthread_attr_t *attr_in,
-		   void * (*thread_execp)(void *), void *arg);
-
-static void
-constr (void)
-{
-  /* Get a pointer to the real pthread_create.  */
-  pthread_create_ = dlvsym (RTLD_NEXT, "pthread_create",
-			    GC_PTHREAD_SYM_VERSION);
-}
-
-#define GC_PTHREAD_CREATE_NAME pthread_create
-#define GC_PTHREAD_REAL_NAME (*pthread_create_)
-
-#else
-
-#define GC_PTHREAD_CREATE_NAME WRAP_FUNC(pthread_create)
-#define GC_PTHREAD_REAL_NAME REAL_FUNC(pthread_create)
-
-#endif
-
-
 int
-GC_PTHREAD_CREATE_NAME(pthread_t *new_thread,
+WRAP_FUNC(pthread_create)(pthread_t *new_thread,
 		  const pthread_attr_t *attr,
                   void *(*start_routine)(void *), void *arg)
 {
@@ -1286,7 +1360,7 @@
 		   pthread_self());
 #   endif
 
-    result = GC_PTHREAD_REAL_NAME(new_thread, attr, GC_start_routine, si);
+    result = REAL_FUNC(pthread_create)(new_thread, attr, GC_start_routine, si);
 
 #   ifdef DEBUG_THREADS
         GC_printf1("Started thread 0x%X\n", *new_thread);
--- boehm-gc/misc.c	(revision 112312)
+++ boehm-gc/misc.c	(working copy)
@@ -674,7 +674,13 @@
 #   if !defined(THREADS) || defined(GC_PTHREADS) || defined(GC_WIN32_THREADS) \
 	|| defined(GC_SOLARIS_THREADS)
       if (GC_stackbottom == 0) {
-	GC_stackbottom = GC_get_stack_base();
+        # ifdef GC_PTHREADS
+	/* Use thread_stack_base if available, as GC could be initialized from
+	   a thread that is not the "main" thread.  */
+	GC_stackbottom = GC_get_thread_stack_base();
+	# endif
+	if (GC_stackbottom == 0)
+	  GC_stackbottom = GC_get_stack_base();
 #       if (defined(LINUX) || defined(HPUX)) && defined(IA64)
 	  GC_register_stackbottom = GC_get_register_stack_base();
 #       endif

gcc41-objc-rh185398.patch:
 objc/objc-act.c                     |   22 +++++++++++++++-------
 testsuite/objc/compile/20060406-1.m |   19 +++++++++++++++++++
 2 files changed, 34 insertions(+), 7 deletions(-)

--- NEW FILE gcc41-objc-rh185398.patch ---
2006-04-06  Jakub Jelinek  <jakub at redhat.com>

	* objc-act.c (objc_push_param): If changing type, run relayout_decl
	on the parameter.

	* objc/compile/20060406-1.m: New test.

--- gcc/objc/objc-act.c.jj	2006-03-04 08:01:27.000000000 +0100
+++ gcc/objc/objc-act.c	2006-04-06 16:56:57.000000000 +0200
@@ -1,6 +1,6 @@
 /* Implement classes and message passing for Objective C.
    Copyright (C) 1992, 1993, 1994, 1995, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
    Contributed by Steve Naroff.
 
 This file is part of GCC.
@@ -8222,21 +8222,29 @@ static GTY(()) tree objc_parmlist = NULL
 static void
 objc_push_parm (tree parm)
 {
+  tree type = TREE_TYPE (parm);
+
   /* Decay arrays and functions into pointers.  */
   if (TREE_CODE (TREE_TYPE (parm)) == ARRAY_TYPE)
-    TREE_TYPE (parm) = build_pointer_type (TREE_TYPE (TREE_TYPE (parm)));
+    TREE_TYPE (parm) = build_pointer_type (TREE_TYPE (type));
   else if (TREE_CODE (TREE_TYPE (parm)) == FUNCTION_TYPE)
-    TREE_TYPE (parm) = build_pointer_type (TREE_TYPE (parm));
+    TREE_TYPE (parm) = build_pointer_type (type);
 
   DECL_ARG_TYPE (parm)
     = lang_hooks.types.type_promotes_to (TREE_TYPE (parm));
 
+  if (type != TREE_TYPE (parm))
+    {
+      relayout_decl (parm);
+      type = TREE_TYPE (parm);
+    }
+
   /* Record constancy and volatility.  */
   c_apply_type_quals_to_decl
-  ((TYPE_READONLY (TREE_TYPE (parm)) ? TYPE_QUAL_CONST : 0)
-   | (TYPE_RESTRICT (TREE_TYPE (parm)) ? TYPE_QUAL_RESTRICT : 0)
-   | (TYPE_VOLATILE (TREE_TYPE (parm)) ? TYPE_QUAL_VOLATILE : 0), parm);
-  
+  ((TYPE_READONLY (type) ? TYPE_QUAL_CONST : 0)
+   | (TYPE_RESTRICT (type) ? TYPE_QUAL_RESTRICT : 0)
+   | (TYPE_VOLATILE (type) ? TYPE_QUAL_VOLATILE : 0), parm);
+
   objc_parmlist = chainon (objc_parmlist, parm);
 }
 
--- gcc/testsuite/objc/compile/20060406-1.m.jj	2006-04-06 17:25:59.000000000 +0200
+++ gcc/testsuite/objc/compile/20060406-1.m	2006-04-06 17:20:48.000000000 +0200
@@ -0,0 +1,21 @@
+typedef struct
+{
+  void *p;
+} *S;
+
+ at protocol O
+- (unsigned)j;
+ at end
+
+ at interface I
++ (unsigned char)T:(S<O>[2])p v:(S<O>)h;
+ at end
+
+ at implementation I
++ (unsigned char)T:(S<O>[2])p v:(S<O>)h
+{
+  p[0] = (S) 0;
+  p[1] = (S) 0;
+  return 0;
+}
+ at end

gcc41-pr27057.patch:
 dwarf2out.c                       |    3 ++-
 testsuite/g++.dg/debug/dwarf2-2.C |   17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

--- NEW FILE gcc41-pr27057.patch ---
2006-04-06  Jakub Jelinek  <jakub at redhat.com>

	PR debug/27057
	* dwarf2out.c (is_symbol_die): Return true also for namespaces.

	* g++.dg/debug/dwarf2-2.C: New test.

--- gcc/dwarf2out.c.jj	2006-02-06 16:56:27.000000000 +0100
+++ gcc/dwarf2out.c	2006-04-06 14:33:15.000000000 +0200
@@ -6228,7 +6228,8 @@ is_symbol_die (dw_die_ref c)
 {
   return (is_type_die (c)
 	  || (get_AT (c, DW_AT_declaration)
-	      && !get_AT (c, DW_AT_specification)));
+	      && !get_AT (c, DW_AT_specification))
+	  || c->die_tag == DW_TAG_namespace);
 }
 
 static char *
--- gcc/testsuite/g++.dg/debug/dwarf2-2.C.jj	2006-04-06 14:41:32.000000000 +0200
+++ gcc/testsuite/g++.dg/debug/dwarf2-2.C	2006-04-06 14:26:31.000000000 +0200
@@ -0,0 +1,17 @@
+// PR debug/27057
+// { dg-do compile }
+// { dg-options "-g -feliminate-dwarf2-dups" }
+
+namespace N
+{
+}
+
+struct A
+{
+  void foo ();
+};
+
+void A::foo ()
+{
+  using namespace N;
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- .cvsignore	5 Apr 2006 16:02:46 -0000	1.141
+++ .cvsignore	6 Apr 2006 16:56:54 -0000	1.142
@@ -1 +1 @@
-gcc-4.1.0-20060405.tar.bz2
+gcc-4.1.0-20060406.tar.bz2

gcc41-pr20297-test.patch:
 gcc.dg/visibility-11.c         |   24 ------------------------
 gcc.target/i386/visibility-1.c |   25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 24 deletions(-)

Index: gcc41-pr20297-test.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-pr20297-test.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcc41-pr20297-test.patch	29 Mar 2006 06:34:39 -0000	1.2
+++ gcc41-pr20297-test.patch	6 Apr 2006 16:56:54 -0000	1.3
@@ -1,4 +1,4 @@
-2006-03-28  Jakub Jelinek  <jakub at redhat.com>
+2006-04-06  Jakub Jelinek  <jakub at redhat.com>
 
 	PR middle-end/20297
 	* gcc.dg/visibility-11.c: Moved to...
@@ -34,12 +34,13 @@
 -}
 --- gcc/testsuite/gcc.target/i386/visibility-1.c.jj	2006-03-28 14:30:17.000000000 +0200
 +++ gcc/testsuite/gcc.target/i386/visibility-1.c	2006-03-28 14:58:48.000000000 +0200
-@@ -0,0 +1,24 @@
+@@ -0,0 +1,25 @@
 +/* PR middle-end/20297 */
 +/* The memcpy FUNCTION_DECL built in the middle-end for block moves got
 +   hidden visibility from the first push, so the call didn't use the PLT.  */
 +
-+/* { dg-do compile { target { { i?86-*-linux* x86_64-*-linux* i?86-*-*bsd* x86_64-*-*bsd* } && ilp32 } } } */
++/* { dg-do compile { target { { *-*-linux* *-*-*bsd* *-*-solaris2* *-*-elf* *-*-gnu* *-*-sysv[45]* } && ilp32 } } } */
++/* { dg-require-effective-target fpic } */
 +/* { dg-require-visibility "" } */
 +/* { dg-options "-Os -fpic" } */
 +/* { dg-final { scan-assembler "memcpy at PLT" } } */


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gcc41.spec	5 Apr 2006 16:02:47 -0000	1.46
+++ gcc41.spec	6 Apr 2006 16:56:54 -0000	1.47
@@ -1,6 +1,6 @@
-%define DATE 20060405
+%define DATE 20060406
 %define gcc_version 4.1.0
-%define gcc_release 5
+%define gcc_release 6
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -111,6 +111,9 @@
 Patch14: gcc41-pr21764.patch
 Patch15: gcc41-pr21581.patch
 Patch16: gcc41-pr20297-test.patch
+Patch17: gcc41-java-pr13212.patch
+Patch18: gcc41-objc-rh185398.patch
+Patch19: gcc41-pr27057.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -403,9 +406,12 @@
 %patch11 -p0 -b .mni~
 %patch12 -p0 -b .cfaval~
 %patch13 -p0 -b .rh184446~
-#%patch14 -p0 -b .pr21764~
+%patch14 -p0 -b .pr21764~
 #%patch15 -p0 -b .pr21581~
-#%patch16 -p0 -E -b .pr20297-test~
+%patch16 -p0 -E -b .pr20297-test~
+%patch17 -p0 -b .java-pr13212~
+%patch18 -p0 -b .objc-rh185398~
+%patch19 -p0 -b .pr27057~
 
 sed -i -e 's/4\.1\.1/4.1.0/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1423,7 +1429,19 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
-* Wed Apr  4 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-5
+* Thu Apr  6 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-6
+- update from gcc-4_1-branch (-r)
+  - PRs classpath/24752, classpath/27028, libgcj/26625, libgcj/27024,
+	tree-optimization/26996
+- reenable PR c++/19238, c++/21764 fixes, only PR c++/21581 is not
+  applied
+- better fix for Java GC vs. pthread_create (Bryce McKinlay, #,
+  PR libgcj/13212)
+- fix objc_push_parm (#185398)
+- fix ICE with -feliminate-dwarf2-dups and using namespace (#187787,
+  PR debug/27057)
+
+* Wed Apr  5 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-5
 - update from gcc-4_1-branch (-r112431:112706)
   - PRs bootstrap/26936, bootstrap/27023, classpath/25924, fortran/19303,
 	fortran/25358, fortran/26816, java/25414, java/26042, java/26858,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- sources	5 Apr 2006 16:02:47 -0000	1.143
+++ sources	6 Apr 2006 16:56:54 -0000	1.144
@@ -1 +1 @@
-2ac716d7aab984dd14038adfb230eca6  gcc-4.1.0-20060405.tar.bz2
+4a823d2ae3352d0bf18d1f25880a6ec0  gcc-4.1.0-20060406.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr  6 17:40:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 13:40:50 -0400
Subject: rpms/control-center/devel control-center.spec,1.129,1.130
Message-ID: <200604061740.k36HeoV9013214@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13199

Modified Files:
	control-center.spec 
Log Message:
- add missing build reqs (bug 188167)



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- control-center.spec	13 Mar 2006 15:19:17 -0000	1.129
+++ control-center.spec	6 Apr 2006 17:40:48 -0000	1.130
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center.
 Name: control-center
 Version: 2.14.0
-Release: 1
+Release: 2
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -81,6 +81,8 @@
 # For intltool:
 BuildRequires: perl-XML-Parser >= 2.31-16
 BuildRequires: evolution-data-server-devel
+BuildRequires: libXxf86misc-devel 
+BuildRequires: libxkbfile-devel
 
 %description
 GNOME (the GNU Network Object Model Environment) is an attractive and
@@ -229,6 +231,9 @@
 # (also its headers)
 
 %changelog
+* Thu Apr  6 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-2
+- add missing build reqs (bug 188167)
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 



From fedora-cvs-commits at redhat.com  Thu Apr  6 18:12:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 14:12:57 -0400
Subject: rpms/kernel/devel linux-2.6-debug-Wundef.patch,1.3,1.4
Message-ID: <200604061812.k36ICvnk027548@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-debug-Wundef.patch 
Log Message:
hush some warnings.


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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-debug-Wundef.patch	1 Apr 2006 05:21:45 -0000	1.3
+++ linux-2.6-debug-Wundef.patch	6 Apr 2006 18:12:53 -0000	1.4
@@ -11,7 +11,7 @@
  
  CFLAGS 		:= -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
 -	  	   -fno-strict-aliasing -fno-common
-+	  	   -fno-strict-aliasing -fno-common -Wextra -Wstrict-prototypes -Wundef -Werror-implicit-function-declaration
++	  	   -fno-strict-aliasing -fno-common -Wstrict-prototypes -Wundef -Werror-implicit-function-declaration
  AFLAGS		:= -D__ASSEMBLY__
  
  # Read KERNELRELEASE from .kernelrelease (if it exists)



From fedora-cvs-commits at redhat.com  Thu Apr  6 19:09:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 15:09:09 -0400
Subject: rpms/selinux-policy/devel booleans-targeted.conf, 1.6,
	1.7 modules-targeted.conf, 1.19, 1.20 policy-20060323.patch,
	1.9, 1.10 selinux-policy.spec, 1.167, 1.168
Message-ID: <200604061909.k36J98n1023382@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	booleans-targeted.conf modules-targeted.conf 
	policy-20060323.patch selinux-policy.spec 
Log Message:
* Mon Mar 30 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-4
- More textrel_shlib_t file path fixes
- Add ada support



Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/booleans-targeted.conf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- booleans-targeted.conf	19 Feb 2006 12:17:15 -0000	1.6
+++ booleans-targeted.conf	6 Apr 2006 19:08:54 -0000	1.7
@@ -8,7 +8,7 @@
 
 # Allow making the stack executable via mprotect.Also requires allow_execmem.
 # 
-allow_execstack = true
+allow_execstack = false
 
 # Allow ftp servers to modify public filesused for public file transfer services.
 # 


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- modules-targeted.conf	24 Mar 2006 16:44:06 -0000	1.19
+++ modules-targeted.conf	6 Apr 2006 19:08:54 -0000	1.20
@@ -1001,6 +1001,13 @@
 # 
 java = base
 
+# Layer: apps
+# Module: ada
+#
+# ada executable
+# 
+ada = base
+
 # Layer: services
 # Module: logwatch
 #

policy-20060323.patch:
 admin/rpm.te               |    1 
 apps/ada.fc                |    7 +
 apps/ada.if                |  203 +++++++++++++++++++++++++++++++++++++++++++++
 apps/ada.te                |   24 +++++
 apps/java.fc               |    1 
 apps/mono.if               |   23 +++++
 apps/mono.te               |    1 
 kernel/devices.fc          |    1 
 kernel/devices.if          |   40 ++++++++
 kernel/files.if            |   15 +++
 kernel/mls.te              |    1 
 services/apache.if         |   20 ++++
 services/automount.te      |    1 
 services/avahi.te          |    4 
 services/bluetooth.te      |    7 +
 services/cups.te           |    2 
 services/dbus.te           |    1 
 services/hal.te            |   13 ++
 services/networkmanager.te |    1 
 services/nscd.if           |   20 ++++
 services/samba.te          |    2 
 services/snmp.te           |    1 
 services/xserver.if        |   21 ++++
 system/fstools.te          |    1 
 system/getty.fc            |    1 
 system/getty.te            |    2 
 system/init.te             |    1 
 system/libraries.fc        |   26 ++++-
 system/logging.if          |   32 +++++++
 system/mount.te            |    4 
 system/unconfined.if       |   17 +--
 system/unconfined.te       |    8 -
 system/userdomain.te       |    4 
 33 files changed, 477 insertions(+), 29 deletions(-)

Index: policy-20060323.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060323.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- policy-20060323.patch	4 Apr 2006 10:07:53 -0000	1.9
+++ policy-20060323.patch	6 Apr 2006 19:08:54 -0000	1.10
@@ -9,6 +9,260 @@
  
  selinux_get_fs_mount(rpm_t)
  selinux_validate_context(rpm_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ada.fc serefpolicy-2.2.29/policy/modules/apps/ada.fc
+--- nsaserefpolicy/policy/modules/apps/ada.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.2.29/policy/modules/apps/ada.fc	2006-04-04 06:29:46.000000000 -0400
+@@ -0,0 +1,7 @@
++#
++# /usr
++#
++/usr/libexec/gcc(/.*)?/gnat1 	--	gen_context(system_u:object_r:ada_exec_t,s0)
++/usr/bin/gnatbind	--	gen_context(system_u:object_r:ada_exec_t,s0)
++/usr/bin/gnatls		--	gen_context(system_u:object_r:ada_exec_t,s0)
++/usr/bin/gnatmake	--	gen_context(system_u:object_r:ada_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ada.if serefpolicy-2.2.29/policy/modules/apps/ada.if
+--- nsaserefpolicy/policy/modules/apps/ada.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.2.29/policy/modules/apps/ada.if	2006-04-04 06:28:18.000000000 -0400
+@@ -0,0 +1,203 @@
++## <summary>Java virtual machine</summary>
++
++#######################################
++## <summary>
++##	The per user domain template for the ada module.
++## </summary>
++## <desc>
++##	<p>
++##	This template creates a derived domains which are used
++##	for ada plugins that are executed by a browser.
++##	</p>
++##	<p>
++##	This template is invoked automatically for each user, and
++##	generally does not need to be invoked directly
++##	by policy writers.
++##	</p>
++## </desc>
++## <param name="userdomain_prefix">
++##	<summary>
++##	The prefix of the user domain (e.g., user
++##	is the prefix for user_t).
++##	</summary>
++## </param>
++## <param name="user_domain">
++##	<summary>
++##	The type of the user domain.
++##	</summary>
++## </param>
++## <param name="user_role">
++##	<summary>
++##	The role associated with the user domain.
++##	</summary>
++## </param>
++#
++template(`ada_per_userdomain_template',`
++	gen_require(`
++		type ada_exec_t;
++	')
++	
++	########################################
++	#
++	# Declarations
++	#
++
++	type $1_adaplugin_t;
++	domain_type($1_adaplugin_t)
++	role $3 types $1_adaplugin_t;
++	
++	type $1_adaplugin_tmp_t;
++	files_tmp_file($1_adaplugin_tmp_t)
++
++	type $1_adaplugin_tmpfs_t;
++	files_tmpfs_file($1_adaplugin_tmpfs_t)
++	
++	########################################
++	#
++	# Local policy
++	#
++
++	allow $1_adaplugin_t self:process { signal_perms getsched setsched execmem };
++	allow $1_adaplugin_t self:fifo_file rw_file_perms;
++	allow $1_adaplugin_t self:tcp_socket create_socket_perms;
++	allow $1_adaplugin_t self:udp_socket create_socket_perms;
++	
++	allow $1_adaplugin_t $2:unix_stream_socket connectto;
++	allow $1_adaplugin_t $2:unix_stream_socket { read write };
++	userdom_write_user_tmp_sockets($1,$1_adaplugin_t)
++
++	allow $1_adaplugin_t $1_adaplugin_tmp_t:dir create_dir_perms;
++	allow $1_adaplugin_t $1_adaplugin_tmp_t:file create_file_perms;
++	files_tmp_filetrans($1_adaplugin_t,$1_adaplugin_tmp_t,{ file dir })
++
++	allow $1_adaplugin_t $1_adaplugin_tmpfs_t:dir { read getattr lock search ioctl add_name remove_name write };
++	allow $1_adaplugin_t $1_adaplugin_tmpfs_t:file { create ioctl read getattr lock write setattr append link unlink rename };
++	allow $1_adaplugin_t $1_adaplugin_tmpfs_t:lnk_file { create read getattr setattr link unlink rename };
++	allow $1_adaplugin_t $1_adaplugin_tmpfs_t:sock_file { create ioctl read getattr lock write setattr append link unlink rename };
++	allow $1_adaplugin_t $1_adaplugin_tmpfs_t:fifo_file { create ioctl read getattr lock write setattr append link unlink rename };
++	fs_tmpfs_filetrans($1_adaplugin_t,$1_adaplugin_tmpfs_t,{ dir file lnk_file sock_file fifo_file })
++
++	# cjp: rw_dir_perms here doesnt make sense
++	allow $1_adaplugin_t $1_home_t:dir rw_dir_perms;
++	allow $1_adaplugin_t $1_home_t:file rw_file_perms;
++	allow $1_adaplugin_t $1_home_t:lnk_file { getattr read };
++
++	can_exec($1_adaplugin_t, ada_exec_t)
++	
++	# The user role is authorized for this domain.
++	domain_auto_trans($1_t, ada_exec_t, $1_adaplugin_t)
++	allow $1_adaplugin_t $2:fd use;
++	# Unrestricted inheritance from the caller.
++	allow $2 $1_adaplugin_t:process { noatsecure siginh rlimitinh };
++	allow $1_adaplugin_t $2:process signull;
++	
++	kernel_read_all_sysctls($1_adaplugin_t)
++	kernel_search_vm_sysctl($1_adaplugin_t)
++	kernel_read_network_state($1_adaplugin_t)
++	kernel_read_system_state($1_adaplugin_t)
++
++	# Search bin directory under adaplugin for adaplugin executable
++	corecmd_search_bin($1_adaplugin_t)
++
++	corenet_non_ipsec_sendrecv($1_adaplugin_t)
++	corenet_tcp_sendrecv_generic_if($1_adaplugin_t)
++	corenet_udp_sendrecv_generic_if($1_adaplugin_t)
++	corenet_raw_sendrecv_generic_if($1_adaplugin_t)
++	corenet_tcp_sendrecv_all_nodes($1_adaplugin_t)
++	corenet_udp_sendrecv_all_nodes($1_adaplugin_t)
++	corenet_raw_sendrecv_all_nodes($1_adaplugin_t)
++	corenet_tcp_sendrecv_all_ports($1_adaplugin_t)
++	corenet_udp_sendrecv_all_ports($1_adaplugin_t)
++	corenet_tcp_bind_all_nodes($1_adaplugin_t)
++	corenet_udp_bind_all_nodes($1_adaplugin_t)
++	corenet_tcp_connect_all_ports($1_adaplugin_t)
++
++	dev_read_sound($1_adaplugin_t)
++	dev_write_sound($1_adaplugin_t)
++	dev_read_urand($1_adaplugin_t)
++	dev_read_rand($1_adaplugin_t)
++
++	files_read_etc_files($1_adaplugin_t)
++	files_read_usr_files($1_adaplugin_t)
++	files_search_home($1_adaplugin_t)
++	files_search_var_lib($1_adaplugin_t)
++	files_read_etc_runtime_files($1_adaplugin_t)
++	# Read global fonts and font config
++	files_read_etc_files($1_adaplugin_t)
++
++	fs_getattr_xattr_fs($1_adaplugin_t)
++	fs_dontaudit_rw_tmpfs_files($1_adaplugin_t)
++
++	libs_use_ld_so($1_adaplugin_t)
++	libs_use_shared_libs($1_adaplugin_t)
++
++	logging_send_syslog_msg($1_adaplugin_t)
++
++	miscfiles_read_localization($1_adaplugin_t)
++	# Read global fonts and font config
++	miscfiles_read_fonts($1_adaplugin_t)
++
++	sysnet_read_config($1_adaplugin_t)
++
++	userdom_dontaudit_use_user_terminals($1,$1_adaplugin_t)
++	userdom_dontaudit_setattr_user_home_content_files($1,$1_adaplugin_t)
++	userdom_dontaudit_exec_user_home_content_files($1,$1_adaplugin_t)
++	userdom_manage_user_home_content_dirs($1,$1_adaplugin_t)
++	userdom_manage_user_home_content_files($1,$1_adaplugin_t)
++	userdom_manage_user_home_content_symlinks($1,$1_adaplugin_t)
++	userdom_manage_user_home_content_pipes($1,$1_adaplugin_t)
++	userdom_manage_user_home_content_sockets($1,$1_adaplugin_t)
++	userdom_user_home_dir_filetrans_user_home_content($1,$1_adaplugin_t,{ file lnk_file sock_file fifo_file })
++
++	tunable_policy(`allow_ada_execstack',`
++		allow $1_adaplugin_t self:process execstack;
++
++		allow $1_adaplugin_t $1_adaplugin_tmp_t:file execute;
++
++		libs_legacy_use_shared_libs($1_adaplugin_t)
++		libs_legacy_use_ld_so($1_adaplugin_t)
++		libs_use_lib_files($1_adaplugin_t)
++
++		miscfiles_legacy_read_localization($1_adaplugin_t)
++	')
++
++	optional_policy(`
++		nis_use_ypbind($1_adaplugin_t)
++	')
++
++	optional_policy(`
++		nscd_socket_use($1_adaplugin_t)
++	')
++
++	optional_policy(`
++		xserver_user_client_template($1,$1_adaplugin_t,$1_adaplugin_tmpfs_t)
++	')
++')
++
++########################################
++## <summary>
++##	Execute the ada program in the ada domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`ada_domtrans',`
++	ifdef(`targeted_policy',`
++		gen_require(`
++			type ada_t, ada_exec_t;
++		')
++
++		corecmd_search_bin($1)
++		domain_auto_trans($1, ada_exec_t, ada_t)
++
++		allow $1 ada_t:fd use;
++		allow ada_t $1:fd use;
++		allow ada_t $1:fifo_file rw_file_perms;
++		allow ada_t $1:process sigchld;
++	',`
++		errprint(`Warning: $0($1) has no effect in strict policy.'__endline__)
++	')
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ada.te serefpolicy-2.2.29/policy/modules/apps/ada.te
+--- nsaserefpolicy/policy/modules/apps/ada.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.2.29/policy/modules/apps/ada.te	2006-04-04 06:28:03.000000000 -0400
+@@ -0,0 +1,24 @@
++
++policy_module(ada,1.1.0)
++
++########################################
++#
++# Declarations
++#
++
++type ada_t;
++domain_type(ada_t)
++
++type ada_exec_t;
++files_type(ada_exec_t)
++
++########################################
++#
++# Local policy
++#
++
++ifdef(`targeted_policy',`
++	allow ada_t self:process { execstack execmem };
++	unconfined_domain_noaudit(ada_t)
++	role system_r types ada_t;
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.2.29/policy/modules/apps/java.fc
+--- nsaserefpolicy/policy/modules/apps/java.fc	2006-03-23 16:46:10.000000000 -0500
++++ serefpolicy-2.2.29/policy/modules/apps/java.fc	2006-04-06 14:52:12.000000000 -0400
+@@ -4,3 +4,4 @@
+ /usr(/.*)?/bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
+ /usr/bin/gcj-dbtool	--	gen_context(system_u:object_r:java_exec_t,s0)
+ /usr/bin/gij		--	gen_context(system_u:object_r:java_exec_t,s0)
++/opt(/.*)?/bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-2.2.29/policy/modules/apps/mono.if
 --- nsaserefpolicy/policy/modules/apps/mono.if	2006-03-23 16:46:10.000000000 -0500
 +++ serefpolicy-2.2.29/policy/modules/apps/mono.if	2006-04-03 10:03:24.000000000 -0400
@@ -448,16 +702,17 @@
  libs_use_ld_so(initrc_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.29/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-03-30 10:18:07.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/system/libraries.fc	2006-04-03 14:29:38.000000000 -0400
-@@ -33,6 +33,7 @@
++++ serefpolicy-2.2.29/policy/modules/system/libraries.fc	2006-04-04 08:19:58.000000000 -0400
+@@ -33,6 +33,8 @@
  #
  /opt(/.*)?/lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
  /opt(/.*)?/lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
-+/opt/.*/jre.*/lib/i386/libdeploy.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/opt/.*/jre.*/libdeploy.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/opt/.*/jre.*/libjvm.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
  #
  # /sbin
-@@ -55,6 +56,8 @@
+@@ -55,6 +57,8 @@
  
  /usr(/.*)?/nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
@@ -466,7 +721,7 @@
  /usr/lib(64)?/pgsql/test/regress/.*\.so 	--	gen_context(system_u:object_r:shlib_t,s0)
  
  /usr/lib/win32/.*			--	gen_context(system_u:object_r:shlib_t,s0)
-@@ -62,18 +65,27 @@
+@@ -62,18 +66,27 @@
  /usr/lib(64)?/im/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
  /usr/lib(64)?/iiim/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
  
@@ -495,7 +750,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)
  
-@@ -92,6 +104,7 @@
+@@ -92,6 +105,7 @@
  /usr/lib(64)?/libstdc\+\+\.so\.2\.7\.2\.8 --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libg\+\+\.so\.2\.7\.2\.8	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libglide3\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -503,9 +758,13 @@
  /usr/lib(64)?/libdv\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/helix/plugins/oggfformat\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/helix/plugins/theorarend\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -170,10 +183,9 @@
+@@ -168,12 +182,12 @@
+ /usr/lib(64)?/libdivxencore.so.0		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
  # Java, Sun Microsystems (JPackage SRPM)
- /usr/.*/jre.*/lib/i386/libdeploy.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/usr/.*/jre.*/lib/i386/libdeploy.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/.*/jre.*/libdeploy.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/.*/jre.*/libjvm.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
 -/usr(/.*)?/Reader/intellinux/plug_ins/.*\.api -- gen_context(system_u:object_r:shlib_t,s0)
 -/usr(/.*)?/Reader/intellinux/plug_ins/AcroForm\.api -- gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -620,18 +879,31 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.29/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-03-29 09:34:53.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/system/unconfined.te	2006-04-03 12:27:56.000000000 -0400
-@@ -106,10 +106,6 @@
++++ serefpolicy-2.2.29/policy/modules/system/unconfined.te	2006-04-04 06:30:36.000000000 -0400
+@@ -94,19 +94,19 @@
+ 	')
+ 
+ 	optional_policy(`
+-		lpd_domtrans_checkpc(unconfined_t)
++		ada_domtrans(unconfined_t)
+ 	')
+ 
+ 	optional_policy(`
+-		modutils_domtrans_update_mods(unconfined_t)
++		lpd_domtrans_checkpc(unconfined_t)
+ 	')
+ 
+ 	optional_policy(`
+-		mono_domtrans(unconfined_t)
++		modutils_domtrans_update_mods(unconfined_t)
  	')
  
  	optional_policy(`
 -		netutils_domtrans_ping(unconfined_t)
--	')
--
--	optional_policy(`
- 		portmap_domtrans_helper(unconfined_t)
++		mono_domtrans(unconfined_t)
  	')
  
+ 	optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.29/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-03-28 12:58:49.000000000 -0500
 +++ serefpolicy-2.2.29/policy/modules/system/userdomain.te	2006-03-31 11:21:52.000000000 -0500


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- selinux-policy.spec	4 Apr 2006 10:07:53 -0000	1.167
+++ selinux-policy.spec	6 Apr 2006 19:08:54 -0000	1.168
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.29
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -320,6 +320,10 @@
 %endif
 
 %changelog
+* Mon Mar 30 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-4
+- More textrel_shlib_t file path fixes
+- Add ada support
+
 * Mon Mar 30 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-3
 - Get auditctl working in MLS policy
 



From fedora-cvs-commits at redhat.com  Thu Apr  6 20:37:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 16:37:29 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2121,1.2122
Message-ID: <200604062037.k36KbT2c001421@cvs.devel.redhat.com>

Author: davej

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

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



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2121
retrieving revision 1.2122
diff -u -r1.2121 -r1.2122
--- kernel-2.6.spec	4 Apr 2006 20:36:46 -0000	1.2121
+++ kernel-2.6.spec	6 Apr 2006 20:37:08 -0000	1.2122
@@ -1597,6 +1597,9 @@
 %endif
 
 %changelog
+* Thu Apr  6 2006 Dave Jones <davej at redhat.com>
+- Rebuild without a zillion warnings.
+
 * Tue Apr  4 2006 Dave Jones <davej at redhat.com>
 - Reenable non-standard serial ports. (#187466)
 - Reenable snd-es18xx for x86-32 (#187733)



From fedora-cvs-commits at redhat.com  Thu Apr  6 21:17:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 17:17:55 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.0.99.2-no-kdrive-dri.patch, NONE,
	1.1 xorg-x11-server.spec, 1.50, 1.51
Message-ID: <200604062117.k36LHt8g029645@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.0.99.2-no-kdrive-dri.patch 
Log Message:
* Thu Apr  6 2006 Adam Jackson <ajax at redhat.com> 1.0.99.2-2
- Remove LBX to match upstream policy.
- Add Xephyr server.


xorg-x11-server-1.0.99.2-no-kdrive-dri.patch:
 Makefile.am |   26 +++++++++++++-------------
 ati.h       |    1 +
 2 files changed, 14 insertions(+), 13 deletions(-)

--- NEW FILE xorg-x11-server-1.0.99.2-no-kdrive-dri.patch ---
Temporary hack to disable DRI support in Xati.  Backported from HEAD, will go
away in 1.0.99.3. - ajax

--- ./hw/kdrive/ati/ati.h.no-kdrive-dri	2006-02-16 02:17:29.000000000 -0500
+++ ./hw/kdrive/ati/ati.h	2006-04-06 16:02:28.000000000 -0400
@@ -39,6 +39,7 @@
 
 #include "kxv.h"
 
+#undef XF86DRI
 #ifdef XF86DRI
 #define USE_DRI
 #include "libdrm.h"
--- ./hw/kdrive/ati/Makefile.am.no-kdrive-dri	2006-04-06 16:20:50.000000000 -0400
+++ ./hw/kdrive/ati/Makefile.am	2006-04-06 16:21:04.000000000 -0400
@@ -1,16 +1,16 @@
-if DRI
-DRI_INCLUDES = 	-I$(top_srcdir)/dri	\
-		-I$(top_srcdir)/drm
-DRI_LIBS = 	$(top_builddir)/dri/libdri.a	\
-		$(top_builddir)/drm/libdrm.a
-DRI_SOURCES =	ati_dri.c	\
-		ati_dri.h	\
-		ati_dripriv.h	\
-		r128_common.h	\
-		r128_sarea.h	\
-		radeon_common.h	\
-		radeon_sarea.h
-endif
+#if DRI
+#DRI_INCLUDES = 	-I$(top_srcdir)/dri	\
+#		-I$(top_srcdir)/drm
+#DRI_LIBS = 	$(top_builddir)/dri/libdri.a	\
+#		$(top_builddir)/drm/libdrm.a
+#DRI_SOURCES =	ati_dri.c	\
+#		ati_dri.h	\
+#		ati_dripriv.h	\
+#		r128_common.h	\
+#		r128_sarea.h	\
+#		radeon_common.h	\
+#		radeon_sarea.h
+#endif
 
 if KDRIVEFBDEV
 FBDEV_INCLUDES =-I$(top_srcdir)/hw/kdrive/fbdev


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- xorg-x11-server.spec	4 Apr 2006 22:17:58 -0000	1.50
+++ xorg-x11-server.spec	6 Apr 2006 21:17:53 -0000	1.51
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.0.99.2
-Release:   1
+Release:   2
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -22,6 +22,8 @@
 Patch6:    xserver-1.0.1-randr-sdk.patch
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=181292.  hacky patch
 Patch7:    xorg-x11-server-1.0.1-fpic-libxf86config.patch
+# REMOVE ME FOR 1.0.99.3
+Patch8:	   xorg-x11-server-1.0.99.2-no-kdrive-dri.patch
 
 # Spiffiffity feature/optimization patches.
 Patch100:  xorg-server-1.0.99.2-spiffiffity.patch
@@ -84,8 +86,6 @@
 # libfontenc-devel needed for Xorg, but not specified by
 # upstream deps.  Build fails without it.
 BuildRequires: libfontenc-devel
-# liblbxutil-devel needed for lbx
-BuildRequires: liblbxutil-devel
 # Required for Xtst examples
 BuildRequires: libXtst-devel
 # For Xdmxconfig 
@@ -210,6 +210,27 @@
 not open any devices, but behaves otherwise as an X display.  Xvfb
 is normally used for testing servers.
 
+# ----- Xephyr -------------------------------------------------------
+
+%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
+
+%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,
+but it is an X server itself in which you can run other software.  It
+is a very useful tool for developers who wish to test their
+applications without running them on their real X server.  Unlike
+Xnest, Xephyr renders to an X image rather than relaying the
+X protocol, and therefore supports the newer X extensions like
+Render and Composite.
+
 # ----- sdk ---------------------------------------------------------
 
 %package sdk
@@ -237,6 +258,7 @@
 %patch4 -p0 -b .composite-fastpath-fdo4320
 %patch6 -p1 -b .randrsdk
 %patch7 -p1 -b .xf86configfpic
+%patch8 -p0 -b .no-kdrive-dri
 
 %patch100 -p0 -b .spiffiffity
 
@@ -248,6 +270,7 @@
 #DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/CID/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled"
 
 #	--disable-dependency-tracking \
+# also, --enable-kdrive just for Xephyr is overkill, should fix that upstream
 
 automake; autoconf
 %configure %{xservers} \
@@ -257,7 +280,8 @@
 	--enable-xtrap \
 	--enable-xcsecurity \
 	--enable-xevie \
-	--enable-lbx \
+	--enable-kdrive \
+	--enable-xephyr \
 %if %{with_dri}
 	--enable-dri \
 	--with-mesa-source=%{_datadir}/mesa/source \
@@ -315,6 +339,22 @@
     rm -f $RPM_BUILD_ROOT%{_bindir}/pcitweak
     rm -f $RPM_BUILD_ROOT%{_bindir}/cvt
 %endif
+    rm -f $RPM_BUILD_ROOT%{_bindir}/Xati
+    rm -f $RPM_BUILD_ROOT%{_bindir}/Xchips
+    rm -f $RPM_BUILD_ROOT%{_bindir}/Xepson
+    rm -f $RPM_BUILD_ROOT%{_bindir}/Xfake
+    rm -f $RPM_BUILD_ROOT%{_bindir}/Xfbdev
+    rm -f $RPM_BUILD_ROOT%{_bindir}/Xi810
+    rm -f $RPM_BUILD_ROOT%{_bindir}/Xmach64
+    rm -f $RPM_BUILD_ROOT%{_bindir}/Xmga
+    rm -f $RPM_BUILD_ROOT%{_bindir}/Xneomagic
+    rm -f $RPM_BUILD_ROOT%{_bindir}/Xnvidia
+    rm -f $RPM_BUILD_ROOT%{_bindir}/Xpm2
+    rm -f $RPM_BUILD_ROOT%{_bindir}/Xr128
+    rm -f $RPM_BUILD_ROOT%{_bindir}/Xsdl
+    rm -f $RPM_BUILD_ROOT%{_bindir}/Xsmi
+    rm -f $RPM_BUILD_ROOT%{_bindir}/Xvesa
+    rm -f $RPM_BUILD_ROOT%{_bindir}/Xvia
 }
 
 %clean
@@ -501,6 +541,15 @@
 #%dir %{_mandir}/man1x
 %{_mandir}/man1/Xvfb.1x*
 
+# ----- Xephyr -------------------------------------------------------
+
+%files Xephyr
+%defattr(-,root,root,-)
+%{_bindir}/Xephyr
+# no manpage yet
+#%dir %{_mandir}/man1x
+#%{_mandir}/man1/Xephyr.1x*
+
 # ----- sdk ---------------------------------------------------------
 
 %files sdk
@@ -516,6 +565,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Thu Apr  6 2006 Adam Jackson <ajax at redhat.com> 1.0.99.2-2
+- Remove LBX to match upstream policy.
+- Add Xephyr server.
+
 * Tue Apr  4 2006 Kristian H??gsberg <krh at redhat.com> 1.0.99.2-1
 - Update to 1.0.99.2 snapshot and go back to using mesa-source package.
 - Drop xorg-server-1.0.99-composite-visibility.patch.



From fedora-cvs-commits at redhat.com  Thu Apr  6 21:48:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 17:48:31 -0400
Subject: rpms/wireless-tools/devel .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 wireless-tools.spec, 1.31, 1.32
Message-ID: <200604062148.k36LmVtU011331@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/wireless-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11316

Modified Files:
	.cvsignore sources wireless-tools.spec 
Log Message:
* Thu Apr  6 2006 Dan Williams <dcbw at redhat.com> - 1:28-0.pre16.1
- Update to 28 pre16
- Rebuild for WE-20




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/wireless-tools/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	12 Feb 2006 17:36:51 -0000	1.14
+++ .cvsignore	6 Apr 2006 21:48:28 -0000	1.15
@@ -1 +1,2 @@
 wireless_tools.28.pre13.tar.gz
+wireless_tools.28.pre16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/wireless-tools/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	12 Feb 2006 17:36:51 -0000	1.14
+++ sources	6 Apr 2006 21:48:28 -0000	1.15
@@ -1 +1 @@
-eb2c01c2945df2682a9b3c75515fd389  wireless_tools.28.pre13.tar.gz
+abccc8bc09e1324af702b58adb6eda18  wireless_tools.28.pre16.tar.gz


Index: wireless-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/wireless-tools/devel/wireless-tools.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- wireless-tools.spec	12 Feb 2006 17:36:51 -0000	1.31
+++ wireless-tools.spec	6 Apr 2006 21:48:28 -0000	1.32
@@ -1,9 +1,11 @@
-%define preversion pre13
+%define pre_version pre16
+%define pre_release 1
 
 %define build_fc3			0
 %define build_rhel4			0
 %define build_fc4			0
-%define build_fc5			1
+%define build_fc5			0
+%define build_fc6			1
 
 %if %{build_fc3}
 %define release_extension 1.fc3
@@ -18,7 +20,11 @@
 %endif
 
 %if %{build_fc5}
-%define release_extension 5
+%define release_extension 5.fc5
+%endif
+
+%if %{build_fc6}
+%define release_extension 6
 %endif
 
 Summary: Wireless ethernet configuration tools
@@ -26,10 +32,10 @@
 License: GPL
 Name: wireless-tools
 Version: 28
-Release: 0.%{preversion}.%{release_extension}.1
+Release: 0.%{pre_version}.%{pre_release}.%{release_extension}
 Epoch: 1
 URL: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
-Source: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.%{version}.%{preversion}.tar.gz
+Source: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.%{version}.%{pre_version}.tar.gz
 Patch1: wireless-tools-28-makefile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 ExcludeArch: s390 s390x
@@ -76,6 +82,10 @@
 /%{_lib}/*.so.*
 
 %changelog
+* Thu Apr  6 2006 Dan Williams <dcbw at redhat.com> - 1:28-0.pre16.1
+- Update to 28 pre16
+- Rebuild for WE-20
+
 * Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 1:28-0.pre13.5.1
 - Update to 28 pre13
 



From fedora-cvs-commits at redhat.com  Fri Apr  7 01:33:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 21:33:13 -0400
Subject: rpms/audit/devel .cvsignore, 1.58, 1.59 audit.spec, 1.84,
	1.85 sources, 1.66, 1.67
Message-ID: <200604070133.k371XDZA012245@cvs.devel.redhat.com>

Author: sgrubb

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

Modified Files:
	.cvsignore audit.spec sources 
Log Message:
* Thu Apr 6 2006 Steve Grubb <sgrubb at redhat.com> 1.1.6-1
- New message types
- Support new rule format found in 2.6.17 and later kernels
- Add support for audit by role, clearance, type, sensitivity



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	6 Mar 2006 22:18:21 -0000	1.58
+++ .cvsignore	7 Apr 2006 01:33:11 -0000	1.59
@@ -55,3 +55,4 @@
 audit-1.1.3.tar.gz
 audit-1.1.4.tar.gz
 audit-1.1.5.tar.gz
+audit-1.1.6.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- audit.spec	6 Mar 2006 22:18:21 -0000	1.84
+++ audit.spec	7 Apr 2006 01:33:11 -0000	1.85
@@ -1,6 +1,6 @@
 Summary: User space tools for 2.6 kernel auditing.
 Name: audit
-Version: 1.1.5
+Version: 1.1.6
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -8,7 +8,7 @@
 Source0: %{name}-%{version}.tar.gz
 Patch1: audit-1.1.3-initscript-disabled.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libtool swig
+BuildRequires: libtool swig python-devel
 BuildRequires: glibc-kernheaders >= 2.4-9.1.95
 BuildRequires: automake >= 1.9
 BuildRequires: autoconf >= 2.59
@@ -77,14 +77,19 @@
 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}
 curdir=`pwd`
 cd $RPM_BUILD_ROOT/%{_libdir}
 LIBNAME=`basename \`ls $RPM_BUILD_ROOT/%{_lib}/libaudit.so.*.*.*\``
 ln -s ../../%{_lib}/$LIBNAME libaudit.so
+LIBNAME=`basename \`ls $RPM_BUILD_ROOT/%{_lib}/libauparse.so.*.*.*\``
+ln -s ../../%{_lib}/$LIBNAME libauparse.so
 cd $curdir
 # Remove these items so they don't get picked up.
 rm -f $RPM_BUILD_ROOT/%{_lib}/libaudit.so
+rm -f $RPM_BUILD_ROOT/%{_lib}/libauparse.so
 rm -f $RPM_BUILD_ROOT/%{_lib}/libaudit.la
+rm -f $RPM_BUILD_ROOT/%{_lib}/libauparse.la
 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
@@ -115,11 +120,14 @@
 %files libs
 %defattr(-,root,root)
 %attr(755,root,root) /%{_lib}/libaudit.*
+%attr(755,root,root) /%{_lib}/libauparse.*
 
 %files libs-devel
 %defattr(-,root,root)
 %{_libdir}/libaudit.a
+%{_libdir}/libauparse.a
 %{_libdir}/libaudit.so
+%{_libdir}/libauparse.so
 %{_includedir}/libaudit.h
 %{_mandir}/man3/*
 
@@ -146,6 +154,11 @@
 
 
 %changelog
+* Thu Apr 6 2006 Steve Grubb <sgrubb at redhat.com> 1.1.6-1
+- New message types
+- Support new rule format found in 2.6.17 and later kernels
+- Add support for audit by role, clearance, type, sensitivity
+
 * Wed Mar 6 2006 Steve Grubb <sgrubb at redhat.com> 1.1.5-1
 - Changed audit_log_semanage_message to take new params
 - In aureport, add class between syscall and permission in avc report


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources	6 Mar 2006 22:18:51 -0000	1.66
+++ sources	7 Apr 2006 01:33:11 -0000	1.67
@@ -1 +1 @@
-78d71a75ac2677cb77be3dc788119d2c  audit-1.1.5.tar.gz
+19d208c284d6f6ae830f1943a74bbd7f  audit-1.1.6.tar.gz



From fedora-cvs-commits at redhat.com  Fri Apr  7 02:40:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 22:40:23 -0400
Subject: rpms/tog-pegasus/devel pegasus-2.5.1-PIE.patch, NONE,
	1.1 pegasus-2.5.1-cmpi-provider-lib.patch, NONE,
	1.1 pegasus-2.5.1-enable_cql.patch, NONE,
	1.1 pegasus-2.5.1-initscript.patch, NONE,
	1.1 pegasus-2.5.1-linkflags.patch, NONE,
	1.1 pegasus-2.5.1-local-or-remote-auth.patch, NONE,
	1.1 pegasus-2.5.1-no-rpath.patch, NONE,
	1.1 pegasus-2.5.1-pam-wbem.patch, NONE,
	1.1 pegasus-2.5.1-redhat-config.patch, NONE,
	1.1 pegasus-2.5.1-warnings.patch, NONE,
	1.1 pegasus_rpm_build_env.sh, NONE, 1.1 .cvsignore, 1.3,
	1.4 sources, 1.4, 1.5 tog-pegasus.spec, 1.24, 1.25
Message-ID: <200604070240.k372eNTe008601@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8580

Modified Files:
	.cvsignore sources tog-pegasus.spec 
Added Files:
	pegasus-2.5.1-PIE.patch pegasus-2.5.1-cmpi-provider-lib.patch 
	pegasus-2.5.1-enable_cql.patch pegasus-2.5.1-initscript.patch 
	pegasus-2.5.1-linkflags.patch 
	pegasus-2.5.1-local-or-remote-auth.patch 
	pegasus-2.5.1-no-rpath.patch pegasus-2.5.1-pam-wbem.patch 
	pegasus-2.5.1-redhat-config.patch pegasus-2.5.1-warnings.patch 
	pegasus_rpm_build_env.sh 
Log Message:
upgrade to 2.5.1

pegasus-2.5.1-PIE.patch:
 Clients/cimauth/Makefile                        |    2 ++
 Clients/cimconfig/Makefile                      |    2 ++
 Clients/cimprovider/Makefile                    |    2 ++
 Clients/cimuser/Makefile                        |    2 ++
 Clients/osinfo/Makefile                         |    2 ++
 Clients/repupgrade/Makefile                     |    2 ++
 Clients/wbemexec/Makefile                       |    2 ++
 Pegasus/Compiler/cmdline/cimmof/Makefile        |    2 ++
 Pegasus/Compiler/cmdline/cimmofl/Makefile       |    2 ++
 Pegasus/ProviderManager2/ProviderAgent/Makefile |    4 ++--
 Server/Makefile                                 |    3 +++
 11 files changed, 23 insertions(+), 2 deletions(-)

--- NEW FILE pegasus-2.5.1-PIE.patch ---
--- pegasus/src/Pegasus/Compiler/cmdline/cimmof/Makefile.PIE	2006-01-30 11:17:34.000000000 -0500
+++ pegasus/src/Pegasus/Compiler/cmdline/cimmof/Makefile	2006-04-06 16:17:54.000000000 -0400
@@ -32,6 +32,8 @@
 DIR = Pegasus/Compiler/cmdline/cimmof
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE) 
+
 LOCAL_DEFINES = -DPEGASUS_CMDLINE_INTERNAL -DPEGASUS_INTERNALONLY
 
 LIBRARIES = \
--- pegasus/src/Pegasus/Compiler/cmdline/cimmofl/Makefile.PIE	2006-01-30 11:17:34.000000000 -0500
+++ pegasus/src/Pegasus/Compiler/cmdline/cimmofl/Makefile	2006-04-06 16:17:43.000000000 -0400
@@ -32,6 +32,8 @@
 DIR = Pegasus/Compiler/cmdline/cimmofl
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE) 
+
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
 
 PROGRAM = cimmofl
--- pegasus/src/Pegasus/ProviderManager2/ProviderAgent/Makefile.PIE	2006-01-30 11:18:16.000000000 -0500
+++ pegasus/src/Pegasus/ProviderManager2/ProviderAgent/Makefile	2006-04-05 21:05:58.000000000 -0400
@@ -29,11 +29,12 @@
 #//
 #//==============================================================================
 ROOT = ../../../..
-
 DIR = Pegasus/ProviderManager2/ProviderAgent
 
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
 LIBRARIES = \
     pegprovidermanager \
     pegprovider \
@@ -56,4 +57,3 @@
 tests:
 
 poststarttests:
-
--- pegasus/src/Server/Makefile.PIE	2006-01-30 11:19:33.000000000 -0500
+++ pegasus/src/Server/Makefile	2006-04-05 21:05:58.000000000 -0400
@@ -30,8 +30,11 @@
 #//==============================================================================
 ROOT = ../..
 DIR = Server
+
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
 LIBRARIES = \
     pegclient \
     pegserver \
--- pegasus/src/Clients/cimprovider/Makefile.PIE	2006-01-30 11:16:33.000000000 -0500
+++ pegasus/src/Clients/cimprovider/Makefile	2006-04-06 16:17:31.000000000 -0400
@@ -36,6 +36,8 @@
 
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE) 
+
 LIBRARIES = \
     pegcliutils \
     pegclient \
--- pegasus/src/Clients/osinfo/Makefile.PIE	2006-01-30 11:16:35.000000000 -0500
+++ pegasus/src/Clients/osinfo/Makefile	2006-04-06 16:17:14.000000000 -0400
@@ -35,6 +35,8 @@
 DIR = Clients/osinfo
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE) 
+
 LIBRARIES = \
     pegcliutils \
     peggetoopt \
--- pegasus/src/Clients/cimuser/Makefile.PIE	2006-01-30 11:16:33.000000000 -0500
+++ pegasus/src/Clients/cimuser/Makefile	2006-04-06 16:17:01.000000000 -0400
@@ -36,6 +36,8 @@
 
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE) 
+
 LIBRARIES = \
     pegcliutils \
     pegclient \
--- pegasus/src/Clients/repupgrade/Makefile.PIE	2006-01-30 11:16:36.000000000 -0500
+++ pegasus/src/Clients/repupgrade/Makefile	2006-04-06 16:16:37.000000000 -0400
@@ -36,6 +36,8 @@
 
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE) 
+
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
 
 LIBRARIES = \
--- pegasus/src/Clients/cimauth/Makefile.PIE	2006-01-30 11:16:32.000000000 -0500
+++ pegasus/src/Clients/cimauth/Makefile	2006-04-06 16:16:17.000000000 -0400
@@ -36,6 +36,8 @@
 
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE) 
+
 LIBRARIES = \
     pegcliutils \
     pegclient \
--- pegasus/src/Clients/cimconfig/Makefile.PIE	2006-01-30 11:16:32.000000000 -0500
+++ pegasus/src/Clients/cimconfig/Makefile	2006-04-06 16:15:59.000000000 -0400
@@ -36,6 +36,8 @@
 
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE) 
+
 LIBRARIES = \
     pegcliutils \
     pegclient \
--- pegasus/src/Clients/wbemexec/Makefile.PIE	2006-01-30 11:16:37.000000000 -0500
+++ pegasus/src/Clients/wbemexec/Makefile	2006-04-06 16:15:23.000000000 -0400
@@ -36,6 +36,8 @@
 
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE) 
+
 ifdef PEGASUS_HAS_SSL
   FLAGS += -DPEGASUS_HAS_SSL -DPEGASUS_SSL_RANDOMFILE
   SYS_INCLUDES += -I$(OPENSSL_HOME)/include

pegasus-2.5.1-cmpi-provider-lib.patch:
 FixedPropertyTableLinux.h |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE pegasus-2.5.1-cmpi-provider-lib.patch ---
--- pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h.cmpi_provider_lib	2006-03-14 16:06:37.000000000 -0500
+++ pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h	2006-04-05 20:06:55.000000000 -0400
@@ -65,8 +65,8 @@
     {"crlStore",             PEGASUS_SSL_SERVER_CRL},
 #endif
     {"repositoryDir",        PEGASUS_REPOSITORY_DIR},
-    {"providerDir",          PEGASUS_PROVIDER_LIB_DIR":/usr/lib/cmpi"},
-#else
+    {"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)
     {"logdir",              "/var/opt/tog-pegasus/log"},
@@ -84,8 +84,8 @@
     {"providerDir",         "/opt/tog-pegasus/providers/lib"},
 #endif
     {"messageDir",         "/opt/tog-pegasus/share/locale/ICU_Messages"},
-#endif
-#endif
+#endif /* PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS */
+#endif /*  defined(PEGASUS_USE_RELEASE_DIRS) && !defined(PEGASUS_OS_LSB) */
 #if defined(PEGASUS_USE_RELEASE_DIRS) && defined(PEGASUS_OS_LSB)
     {"traceFilePath",       "/var/opt/lsb-pegasus/cache/cimserver.trc"},
 #if !defined(PEGASUS_USE_SYSLOGS)

pegasus-2.5.1-enable_cql.patch:
 env_var_Linux.status |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

--- NEW FILE pegasus-2.5.1-enable_cql.patch ---
--- pegasus/env_var_Linux.status.enable-cql	2006-03-15 20:33:51.000000000 -0500
+++ pegasus/env_var_Linux.status	2006-04-06 15:19:35.000000000 -0400
@@ -18,7 +18,7 @@
 PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
 endif
 
-PEGASUS_DISABLE_CQL=true
+PEGASUS_ENABLE_CQL=true
 PEGASUS_DISABLE_OBJECT_NORMALIZATION=true
 PEGASUS_DISABLE_PERFINST=yes
 PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true
@@ -26,7 +26,6 @@
 PEGASUS_HAS_SSL=yes
 PEGASUS_NOASSERTS=yes
 PEGASUS_PAM_AUTHENTICATION=true
-PEGASUS_USE_PAM_STANDALONE_PROC=true
 PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true
 PEGASUS_USE_RELEASE_DIRS=true
 PEGASUS_USE_SYSLOGS=true
@@ -64,9 +63,10 @@
 PEGASUS_LOCAL_AUTH_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/localauth
 PEGASUS_TRACE_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/trace
 PEGASUS_TRACE_FILE_PATH = $(PEGASUS_VARDATA_CACHE_DIR)/trace/cimserver.trc
+PEGASUS_CONFIG_DIR = /etc/Pegasus
 PEGASUS_PLANNED_CONFIG_FILE = cimserver_planned.conf
 PEGASUS_PLANNED_CONFIG_FILE_PATH = \
-     $(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
+     $(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
 PEGASUS_CURRENT_CONFIG_FILE = cimserver_current.conf
 PEGASUS_CURRENT_CONFIG_FILE_PATH = \
      $(PEGASUS_VARDATA_DIR)/$(PEGASUS_CURRENT_CONFIG_FILE)
@@ -74,8 +74,6 @@
 PEGASUS_LOG_DIR = $(PEGASUS_VARDATA_DIR)/log
 PEGASUS_INSTALL_LOG = $(PEGASUS_LOG_DIR)/install.log
 
-PEGASUS_CONFIG_DIR = /etc/Pegasus
-
 PEGASUS_VARRUN_DIR = /var/run/tog-pegasus
 PEGASUS_CIMSERVER_START_FILE = $(PEGASUS_VARRUN_DIR)/cimserver.pid
 CIMSERVER_LOCK_FILE = $(PEGASUS_VARRUN_DIR)/cimserver_start.lock

pegasus-2.5.1-initscript.patch:
 tog-pegasus.rc |  122 ++++++++++++++++++++++++++++++---------------------------
 1 files changed, 66 insertions(+), 56 deletions(-)

--- NEW FILE pegasus-2.5.1-initscript.patch ---
--- pegasus/rpm/tog-pegasus.rc.initscript	2006-01-30 11:16:24.000000000 -0500
+++ pegasus/rpm/tog-pegasus.rc	2006-04-06 14:38:57.000000000 -0400
@@ -1,80 +1,85 @@
-#//%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.
-#//
-#//==============================================================================
-#! /bin/sh
-#//
-#//%/////////////////////////////////////////////////////////////////////////////
-
-### BEGIN INIT INFO
-# Provides: tog-pegasus
-# Required-Start: $syslog $network
-# Should-Start: $time
-# Required-Stop: $syslog
-# Default-Start:  3 5
-# Default-Stop: 0 1 2 6
-# Description:	  init script for Pegasus CIM server
-### END INIT INFO
-
-CIMSERVER_BIN=/opt/tog-pegasus/sbin/cimserver
+#!/bin/bash
+#
+# chkconfig:	- 98 1
+# description:  The Open Group Pegasus cimserver initscript
+# processname:  cimserver
+# pidfile:      /var/run/tog-pegasus/cimserver.pid
+#
+CIMSERVER_BIN=/usr/sbin/cimserver
 prog=cimserver
+LOCKFILE=/var/lock/subsys/tog-pegasus
+. /etc/rc.d/init.d/functions
 
-test -x $CIMSERVER_BIN || exit 5
+if [ ! -x $CIMSERVER_BIN ]; then
+    echo -n "tog-pegasus $1: $CIMSERVER_BIN not found or not executable.";
+    failure;
+    exit 1;
+fi;
+
+[ -e /etc/sysconfig/tog-pegasus ] && . /etc/sysconfig/tog-pegasus;
+
+PEGASUS_SSL_CONF_FILE=${PEGASUS_SSL_CONF_FILE:=/etc/Pegasus/ssl.cnf}
+PEGASUS_SSL_CERT_FILE=${PEGASUS_SSL_CERT_FILE:=/etc/Pegasus/server.pem}
+PEGASUS_SSL_KEY_FILE=${PEGASUS_SSL_KEY_FILE:=/etc/Pegasus/file.pem}
+PEGASUS_SSL_TRUSTSTORE=${PEGASUS_SSL_TRUSTSTORE:=/etc/Pegasus/client.pem}
 
-. /lib/lsb/init-functions
 RETVAL=0
 
 case "$1" in
-     start)
+     start)	
+	if [ ! -e ${PEGASUS_SSL_CONF_FILE} ] || [ ! -e ${PEGASUS_SSL_CERT_FILE} ] || 
+	   [ ! -e ${PEGASUS_SSL_KEY_FILE} ]  || [ ! -e ${PEGASUS_SSL_TRUSTSTORE} ]; then
+	   if [ -x /usr/share/Pegasus/scripts/genOpenPegasusSSLCerts ]; then
+	       echo -n "tog-pegasus: Generating cimserver SSL certificates...";
+	       /usr/share/Pegasus/scripts/genOpenPegasusSSLCerts;
+	       if [ $? -eq 0 ]; then
+		   success;
+	       else
+		   failure;
+	       fi;
+	       echo;
+	   fi;
+	fi;
 	echo -n $"Starting up CIM server: "
 	$CIMSERVER_BIN
 	RETVAL=$?
-	[ "$RETVAL" -eq 0 ] && log_success_msg $"$prog start" || log_failure_msg $"$prog start"
-	echo
+	if [ "$RETVAL" -eq 0 ]; then
+	    touch $LOCKFILE;
+	    success;
+	else
+	    failure;
+	fi;
+	echo;
 	;;
 
      stop)
 	echo -n $"Shutting down CIM server: "
 	killproc cimserver
 	RETVAL=$?
-	[ "$RETVAL" -eq 0 ] && log_success_msg $"$prog stop" || log_failure_msg $"$prog stop"
+	if [ "$RETVAL" -eq 0 ]; then
+	    rm -f $LOCKFILE;
+	    rm -f /var/run/tog-pegasus/socket/*;
+	    rm -f /var/run/tog-pegasus/cimserver.pid;
+	    success;
+	else
+	    failure;
+	fi
 	echo
 	;;
+
      status)
 	pid=`pidofproc $CIMSERVER_BIN`
 	RETVAL=$?
 	if [ "$RETVAL" -eq 0 ]; then
-		echo "CIM server is running"
+	    echo -n $"CIM server ($pid) is running";
+	    success;
 	else
-		echo "CIM server is not running"
+	    echo -n $"CIM server is not running";
+	    failure;
 	fi
+	echo
 	;;
+
      condrestart)
 	pid=`pidofproc $CIMSERVER_BIN`
 	RETVAL=$?
@@ -83,13 +88,18 @@
 	    RETVAL=$?;
 	fi;
         ;;
+
      try-restart)
-	$0 stop && $0 start
+	$0 stop && $0 start;
+	RETVAL=$?;
 	;;
+
      restart|force-reload)
-	$0 stop
-	$0 start
+	$0 stop;
+	$0 start;
+	RETVAL=$?;
 	;;
+
      reload)
 	;;
      *)

pegasus-2.5.1-linkflags.patch:
 library.mak |    4 ++++
 program.mak |    4 ++++
 2 files changed, 8 insertions(+)

--- NEW FILE pegasus-2.5.1-linkflags.patch ---
--- pegasus/mak/library.mak.linkflags	2006-01-30 11:16:23.000000000 -0500
+++ pegasus/mak/library.mak	2006-04-05 17:11:23.000000000 -0400
@@ -40,6 +40,10 @@
 
 include $(ROOT)/mak/common.mak
 
+ifdef PEGASUS_EXTRA_LIBRARY_LINK_FLAGS
+    EXTRA_LINK_FLAGS = $(PEGASUS_EXTRA_LIBRARY_LINK_FLAGS)
+endif
+
 ################################################################################
 ##
 ## Build list of object names.
--- pegasus/mak/program.mak.linkflags	2006-01-30 11:16:23.000000000 -0500
+++ pegasus/mak/program.mak	2006-04-05 17:10:37.000000000 -0400
@@ -38,6 +38,10 @@
 
 include $(ROOT)/mak/common.mak
 
+ifdef PEGASUS_EXTRA_PROGRAM_LINK_FLAGS
+    EXTRA_LINK_FLAGS = $(PEGASUS_EXTRA_PROGRAM_LINK_FLAGS)
+endif
+
 ifeq ($(OS_TYPE),windows)
 include $(ROOT)/mak/program-windows.mak
 endif

pegasus-2.5.1-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.1-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-04-05 20:35:40.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-04-05 20:40:40.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-04-05 20:35:40.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-01-30 11:18:28.000000000 -0500
+++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp	2006-04-05 20:35:40.000000000 -0400
@@ -138,7 +138,7 @@
     authInfo->setAuthenticatedUser(userName);
     authInfo->setAuthenticatedPassword(password);
 #else
-    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-04-05 20:35:40.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-04-05 20:35:40.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-04-05 20:35:40.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-04-05 20:35:40.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-04-05 20:35:40.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-02-28 21:21:37.000000000 -0500
+++ pegasus/src/Pegasus/Common/HTTPConnection.cpp	2006-04-05 20:35:40.000000000 -0400
@@ -1828,6 +1828,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-04-05 20:37:59.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-04-05 20:35:40.000000000 -0400
@@ -80,7 +80,8 @@
       ContentLanguageList contentLanguages;
       Boolean acceptLanguagesDecoded;
       Boolean contentLanguagesDecoded;
-			CIMException cimException;
+      Boolean fromRemoteHost;	       
+      CIMException cimException;
 
       void parse(
 	 String& startLine,

pegasus-2.5.1-no-rpath.patch:
 library-unix.mak |    6 +++---
 program-unix.mak |   14 ++------------
 2 files changed, 5 insertions(+), 15 deletions(-)

--- NEW FILE pegasus-2.5.1-no-rpath.patch ---
--- pegasus/mak/library-unix.mak.no-rpath	2006-01-30 11:16:23.000000000 -0500
+++ pegasus/mak/library-unix.mak	2006-04-05 19:31:23.000000000 -0400
@@ -81,14 +81,14 @@
   ifneq ($(PEGASUS_PLATFORM),DARWIN_PPC_GNU)
    ifdef PEGASUS_USE_RELEASE_DIRS
       LINK_COMMAND = $(CXX) -shared $(LINK_MACHINE_OPTIONS)
-      LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)  -Xlinker -rpath -Xlinker $(PEGASUS_DEST_LIB_DIR)
+      LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)  $(EXTRA_LINK_ARGUMENTS)
    else
       LINK_COMMAND = $(CXX) -shared $(LINK_MACHINE_OPTIONS)
-      LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)  -Xlinker -rpath -Xlinker $(LIB_DIR) $(EXTRA_LINK_ARGUMENTS)
+      LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)  $(EXTRA_LINK_ARGUMENTS)
    endif
   else
     LINK_COMMAND = $(CXX) -dynamiclib
-    LINK_ARGUMENTS = --helplib$(LIBRARY)$(LIB_SUFFIX) -ldl
+    LINK_ARGUMENTS = --helplib$(LIBRARY)$(LIB_SUFFIX) -ldl $(EXTRA_LINK_ARGUMENTS)
   endif
   ifeq ($(PEGASUS_PLATFORM), SOLARIS_SPARC_GNU)
 	LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -Xlinker -L$(LIB_DIR) $(EXTRA_LINK_ARGUMENTS)
--- pegasus/mak/program-unix.mak.no-rpath	2006-01-30 11:16:23.000000000 -0500
+++ pegasus/mak/program-unix.mak	2006-04-05 19:41:59.000000000 -0400
@@ -30,22 +30,12 @@
 #//==============================================================================
 INCLUDES = -I$(ROOT)/src $(EXTRA_INCLUDES)
 
-ifndef LINK_RPATH
-    LINK_RPATH = -Xlinker -rpath
-endif
-
 LINK_DEST_LIB = -Xlinker $(PEGASUS_DEST_LIB_DIR)
 
 LINK_LIB_DIR = -Xlinker $(LIB_DIR)
 
 LINK_ICU = -Xlinker ${ICU_INSTALL}/lib
 
-ifndef LINK_RPATH_LINK
-    LINK_RPATH_LINK = -Xlinker -rpath-link
-endif
-
-
-
 TMP_OBJECTS = $(foreach i,$(SOURCES),$(OBJ_DIR)/$i)
 
 ifeq ($(OS_TYPE),windows)
@@ -118,9 +108,9 @@
           endif
         else
           ifdef  PEGASUS_USE_RELEASE_DIRS
-	    $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_DEST_LIB) $(LINK_RPATH_LINK) $(LINK_LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
+	    $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
           else
-	    $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) 
+	    $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) 
           endif
         endif      
       else

pegasus-2.5.1-pam-wbem.patch:
 wbem |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)

--- NEW FILE pegasus-2.5.1-pam-wbem.patch ---
--- pegasus/rpm/wbem.pam-wbem	2006-01-17 14:17:43.000000000 -0500
+++ pegasus/rpm/wbem	2006-04-05 19:26:46.000000000 -0400
@@ -1,13 +1,7 @@
 #%PAM-1.0
-auth        required      $ISA/pam_env.so
-auth        sufficient    $ISA/pam_unix.so nullok
-auth        required      $ISA/pam_deny.so
-
-account     required      $ISA/pam_unix.so
-
-password    required      $ISA/pam_cracklib.so retry=3 type=
-password    sufficient    $ISA/pam_unix.so nullok use_authtok md5 shadow
-password    required      $ISA/pam_deny.so
-
-session     required      $ISA/pam_limits.so
-session     required      $ISA/pam_unix.so
+auth       include      system-auth
+account    required     pam_access.so accessfile=/etc/Pegasus/access.conf
+account    include      system-auth
+password   include      system-auth
+session    include      system-auth
+session    required     pam_loginuid.so 

pegasus-2.5.1-redhat-config.patch:
 Makefile.Release     |    6 +++---
 env_var_Linux.status |   10 ++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

--- NEW FILE pegasus-2.5.1-redhat-config.patch ---
--- pegasus/env_var_Linux.status.redhat-config	2006-03-15 20:33:51.000000000 -0500
+++ pegasus/env_var_Linux.status	2006-04-06 19:15:13.000000000 -0400
@@ -18,7 +18,7 @@
 PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
 endif
 
-PEGASUS_DISABLE_CQL=true
+PEGASUS_ENABLE_CQL=true
 PEGASUS_DISABLE_OBJECT_NORMALIZATION=true
 PEGASUS_DISABLE_PERFINST=yes
 PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true
@@ -26,7 +26,6 @@
 PEGASUS_HAS_SSL=yes
 PEGASUS_NOASSERTS=yes
 PEGASUS_PAM_AUTHENTICATION=true
-PEGASUS_USE_PAM_STANDALONE_PROC=true
 PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true
 PEGASUS_USE_RELEASE_DIRS=true
 PEGASUS_USE_SYSLOGS=true
@@ -64,18 +63,17 @@
 PEGASUS_LOCAL_AUTH_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/localauth
 PEGASUS_TRACE_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/trace
 PEGASUS_TRACE_FILE_PATH = $(PEGASUS_VARDATA_CACHE_DIR)/trace/cimserver.trc
+PEGASUS_CONFIG_DIR = /etc/Pegasus
 PEGASUS_PLANNED_CONFIG_FILE = cimserver_planned.conf
 PEGASUS_PLANNED_CONFIG_FILE_PATH = \
-     $(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
+     $(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
 PEGASUS_CURRENT_CONFIG_FILE = cimserver_current.conf
 PEGASUS_CURRENT_CONFIG_FILE_PATH = \
-     $(PEGASUS_VARDATA_DIR)/$(PEGASUS_CURRENT_CONFIG_FILE)
+     $(PEGASUS_CONFIG_DIR)/$(PEGASUS_CURRENT_CONFIG_FILE)
 
 PEGASUS_LOG_DIR = $(PEGASUS_VARDATA_DIR)/log
 PEGASUS_INSTALL_LOG = $(PEGASUS_LOG_DIR)/install.log
 
-PEGASUS_CONFIG_DIR = /etc/Pegasus
-
 PEGASUS_VARRUN_DIR = /var/run/tog-pegasus
 PEGASUS_CIMSERVER_START_FILE = $(PEGASUS_VARRUN_DIR)/cimserver.pid
 CIMSERVER_LOCK_FILE = $(PEGASUS_VARRUN_DIR)/cimserver_start.lock
--- pegasus/Makefile.Release.redhat-config	2006-01-30 11:16:16.000000000 -0500
+++ pegasus/Makefile.Release	2006-04-06 20:14:11.000000000 -0400
@@ -590,10 +590,10 @@
 	$(foreach i, $(MANAGEDSYSTEM_MOF_FILES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus/$(i);)
 
 stage_PegasusVarDataDirectoryFiles: FORCE
-	$(COPY) $(ROOT)/src/Server/cimserver_planned.conf $(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
+	$(COPY) $(ROOT)/src/Server/cimserver_planned.conf $(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
 
 setpermissions_PegasusVarDataDirectoryFiles: FORCE
-	$(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr________)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
+	$(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr________)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
 
 stage_genOpenPegasusSSLCertsFile: FORCE
 	@$(RM) $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/genOpenPegasusSSLCerts
@@ -1233,7 +1233,7 @@
 	@$(ECHO-E) "%config %attr($(Prwxr_x___),$(INSTALL_USR),$(INSTALL_GRP))"\
             "/etc/init.d/tog-pegasus" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 	@$(ECHO-E) "%config(noreplace)" \
-            "$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)" \
+            "$(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 	@$(ECHO-E) "%config(noreplace) $(PEGASUS_CONFIG_DIR)/access.conf" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)

pegasus-2.5.1-warnings.patch:
 Common/Packer.h                               |    4 ++--
 Common/ResponseHandler.cpp                    |    4 ++--
 Common/String.cpp                             |    4 ++--
 Common/StringInline.h                         |    4 ++--
 Config/ConfigManager.cpp                      |    2 +-
 ProviderManager2/CMPI/CMPIProviderManager.cpp |    6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)

--- NEW FILE pegasus-2.5.1-warnings.patch ---
--- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.cpp.warnings	2006-02-28 14:53:30.000000000 -0500
+++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.cpp	2006-04-05 19:27:27.000000000 -0400
@@ -88,7 +88,7 @@
    char **props;
    int pCount;
   public:
-   CMPIPropertyList(CIMPropertyList &propertyList) {
+    CMPIPropertyList(CIMPropertyList &propertyList) : props(0L), pCount(0) {
       if (!propertyList.isNull()) {
         Array<CIMName> p=propertyList.getPropertyNameArray();
         pCount=p.size();
@@ -2497,7 +2497,7 @@
 
     try
     {
-        indProvRecord *provRec;
+        indProvRecord *provRec = 0L;
         if (provTab.lookup (ph.GetProvider ().getName (), provRec))
         {
             provRec->enabled = true;
@@ -2587,7 +2587,7 @@
     PEG_METHOD_ENTER (TRC_PROVIDERMANAGER,
         "CMPIProviderManager::_callDisableIndications");
 
-    indProvRecord * provRec;
+    indProvRecord * provRec = 0L;
     if (provTab.lookup (ph.GetProvider ().getName (), provRec))
     {
         provRec->enabled = false;
--- pegasus/src/Pegasus/Config/ConfigManager.cpp.warnings	2006-03-14 16:06:37.000000000 -0500
+++ pegasus/src/Pegasus/Config/ConfigManager.cpp	2006-04-05 19:27:27.000000000 -0400
@@ -758,7 +758,7 @@
     //
     for (Uint32 i = 0; i < NUM_PROPERTIES; i++)
     {
-        const char* fixedValue;
+        const char* fixedValue = 0L;
 
         _properties[i].propertyOwner->initialize();
 
--- pegasus/src/Pegasus/Common/Packer.h.warnings	2006-01-30 11:17:07.000000000 -0500
+++ pegasus/src/Pegasus/Common/Packer.h	2006-04-05 19:27:27.000000000 -0400
@@ -173,12 +173,12 @@
 
 inline void Packer::packReal32(Buffer& out, Real32 x)
 {
-    packUint32(out, *((Uint32*)&x));
+    packUint32(out, (Uint32)x);
 }
 
 inline void Packer::packReal64(Buffer& out, Real64 x)
 {
-    packUint64(out, *((Uint64*)&x));
+    packUint64(out, (Uint64)x);
 }
 
 inline void Packer::packChar16(Buffer& out, Char16 x)
--- pegasus/src/Pegasus/Common/StringInline.h.warnings	2006-01-30 11:17:08.000000000 -0500
+++ pegasus/src/Pegasus/Common/StringInline.h	2006-04-05 19:30:43.000000000 -0400
@@ -102,7 +102,7 @@
 
 PEGASUS_STRING_INLINE const Char16* String::getChar16Data() const 
 { 
-    return (Char16*)_rep->data; 
+    return (Char16*)&(_rep->data[0]); 
 }
 
 PEGASUS_STRING_INLINE Char16& String::operator[](Uint32 i) 
@@ -145,7 +145,7 @@
 
 PEGASUS_STRING_INLINE Uint32 String::find(const String& s) const
 {
-    return StringFindAux(_rep, (Char16*)s._rep->data, s._rep->size);
+    return StringFindAux(_rep, (Char16*)&(s._rep->data[0]), s._rep->size);
 }
 
 PEGASUS_STRING_INLINE String& String::append(const Char16& c)
--- pegasus/src/Pegasus/Common/ResponseHandler.cpp.warnings	2006-01-30 11:17:07.000000000 -0500
+++ pegasus/src/Pegasus/Common/ResponseHandler.cpp	2006-04-05 19:27:27.000000000 -0400
@@ -79,7 +79,7 @@
 ResponseHandlerRep* _getRep(
     const ResponseHandler* object)
 {
-    ResponseHandlerRep* rep;
+    ResponseHandlerRep* rep = 0L;
     Boolean found;
 
     AutoMutex lock(repTableMutex);
@@ -91,7 +91,7 @@
 void _deleteRep(
     ResponseHandler* object)
 {
-    ResponseHandlerRep* rep;
+    ResponseHandlerRep* rep = 0L;
     Boolean found;
 
     AutoMutex lock(repTableMutex);
--- pegasus/src/Pegasus/Common/String.cpp.warnings	2006-01-30 11:17:08.000000000 -0500
+++ pegasus/src/Pegasus/Common/String.cpp	2006-04-05 19:27:27.000000000 -0400
@@ -843,7 +843,7 @@
 
 String& String::append(const String& str)
 {
-    return append((Char16*)str._rep->data, str._rep->size);
+    return append((Char16*)(&(str._rep->data[0])), str._rep->size);
 }
 
 String& String::append(const char* str, Uint32 size)
@@ -905,7 +905,7 @@
         if (n == PEG_NOT_FOUND || n > _rep->size - index)
             n = _rep->size - index;
 
-        return String((Char16*)_rep->data + index, n);
+        return String((Char16*)(_rep->data + index), n);
     }
 
     return String();


--- NEW FILE pegasus_rpm_build_env.sh ---
# pegasus_rpm_build_env.sh:
#
# Open Pegasus RPM %build + %install environment setup.
#
# Expects these variables to be set on entry:
#    RPM_ARCH      : rpmbuild architecture identifier
#    RPM_OPT_FLAGS : rpmbuild compile options
#    RPM_BUILD_DIR : rpmbuild source directory
#    RPM_BUILD_ROOT: rpmbuild build destination directory
#    RPM_ARCH_LIB  : %{_lib} : lib or lib64
#    SRCNAME       : name of pegasus source directory
#    
# compile options:
#
export PEGASUS_EXTRA_C_FLAGS="$RPM_OPT_FLAGS -Wno-unused"
export PEGASUS_EXTRA_CXX_FLAGS="$PEGASUS_EXTRA_C_FLAGS"
export PEGASUS_EXTRA_PROGRAM_LINK_FLAGS="-pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack"
export SYS_INCLUDES=-I/usr/kerberos/include
#
# build object directories:
#
SRCNAME=${SRCNAME:-pegasus}
export PEGASUS_ROOT=${RPM_BUILD_DIR}/${SRCNAME}
export PEGASUS_HOME=${RPM_BUILD_DIR}/${SRCNAME}/build
#
# build time settings:
export PEGASUS_ARCH_LIB=${RPM_ARCH_LIB:-lib}
export PEGASUS_ENVVAR_FILE=${PEGASUS_ROOT}/env_var_Linux.status
export OPENSSL_HOME=/usr
export OPENSSL_BIN=/usr/bin
export LD_LIBRARY_PATH=${PEGASUS_HOME}/lib
export PATH=${PEGASUS_HOME}/bin:${PATH}
#
# PEGASUS_PLATFORM (hardware platform) setup:
#
if [ -z "$RPM_ARCH" ]; then
    export RPM_ARCH=`/bin/uname -i`;
fi;
case ${RPM_ARCH} in
  ia64)
    export PEGASUS_PLATFORM=LINUX_IA64_GNU;
    ;;
  x86_64)
    export PEGASUS_PLATFORM=LINUX_X86_64_GNU;
    ;;
  ppc)
    export PEGASUS_PLATFORM=LINUX_PPC_GNU;
    ;;
  ppc64|pseries)
    export PEGASUS_PLATFORM=LINUX_PPC64_GNU;
    ;;
  s390)
    export PEGASUS_PLATFORM=LINUX_ZSERIES_GNU;
    export PEGASUS_EXTRA_C_FLAGS="$PEGASUS_EXTRA_C_FLAGS -fsigned-char";
    export PEGASUS_EXTRA_CXX_FLAGS="$PEGASUS_EXTRA_C_FLAGS";
    ;;
  s390x|zseries)
    export PEGASUS_PLATFORM=LINUX_ZSERIES64_GNU;
    export PEGASUS_EXTRA_C_FLAGS="$PEGASUS_EXTRA_C_FLAGS -fsigned-char";
    export PEGASUS_EXTRA_CXX_FLAGS="$PEGASUS_EXTRA_C_FLAGS";
    ;;
  i386)
    export PEGASUS_PLATFORM=LINUX_IX86_GNU
    ;;
  *)
    echo "Architecture unsupported by pegasus: $RPM_ARCH";
    exit 1;
    ;;
esac;


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Oct 2005 17:52:26 -0000	1.3
+++ .cvsignore	7 Apr 2006 02:40:20 -0000	1.4
@@ -1,2 +1,3 @@
 tog-pegasus-2.4.1.Beta-1.tar.gz
 pegasus-2.5.tar.gz
+pegasus-2.5.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Oct 2005 17:52:26 -0000	1.4
+++ sources	7 Apr 2006 02:40:20 -0000	1.5
@@ -1 +1 @@
-0b068fd576f199f8a0946e2f659acfe4  pegasus-2.5.tar.gz
+b7b392d2ff7ba9a4a3b8d7722d47314b  pegasus-2.5.1.tar.gz


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- tog-pegasus.spec	7 Mar 2006 19:02:19 -0000	1.24
+++ tog-pegasus.spec	7 Apr 2006 02:40:20 -0000	1.25
@@ -1,45 +1,81 @@
-################################################################################
+#==============================================================================
 #
 #               OpenPegasus (Red Hat release) RPM .spec file
 #
-%{?!WITH_TEST:   %define WITH_TEST        0}
-# do "rpmbuild --define 'WITH_TEST 1'" to build test RPM .
-# NOTE: Must use "rpm -[iU]vh --define 'WITH_TEST 1'" for all RPMs if test rpm
-#       is to be installed.
-#       DO NOT install test rpm for production use.
-%{?!AUTOSTART:   %define AUTOSTART        0}
-# Use "rpm -[iU]vh --define 'AUTOSTART 1'" in order to have cimserver enabled
-# (chkconfig --level=345 tog-pegasus on) after installation.
-#
-#%define		debug_package	%{nil}
-Summary: 	OpenPegasus WBEM Services for Linux
-Name:    	tog-pegasus
-Version: 	2.5
-Release:	9
-Epoch:   	2
-Group:   	Systems Management/Base
-License: 	Open Group Pegasus Open Source
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root
-URL:		http://www.openpegasus.org/
-%define srcname pegasus
-Source0: 	%{srcname}-%{version}.tar.gz
-Source1:        rpm_build_env
-Source2:        README.RedHat.Security
-Source3:        access.conf
-Source4:        genSSLcerts
-Patch0:         pegasus-2.5-redhat.patch
-Patch1:         pegasus-2.5-local-or-remote-auth.patch
-Patch2:         pegasus-2.5-make_install.patch
-Patch3:         pegasus-2.5-add_cmpi_provider_lib.patch
-Patch4:		pegasus-2.5-enable_cql.patch
-Patch5:		pegasus-2.5-bz173401.patch
-Patch6:         pegasus-2.5-syslog_h.patch
-Patch7:		pegasus-2.5-install_id.patch
-BuildRequires:    bash, sed, grep, coreutils, procps, gcc, gcc-c++, libstdc++, make, pam-devel, krb5-devel, krb5-libs, openssl-devel >= 0.9.6, e2fsprogs
-Requires:         bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam, krb5-libs, e2fsprogs, redhat-lsb, chkconfig, SysVinit, bind-utils, bind-libs, net-tools
-Requires(post):   bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam, krb5-libs, e2fsprogs, redhat-lsb, chkconfig, SysVinit, bind-utils, bind-libs, net-tools 
-Requires(pre):    bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam, krb5-libs, e2fsprogs, redhat-lsb, chkconfig, SysVinit, bind-utils, bind-libs, net-tools
-Requires(postun): bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam, krb5-libs, e2fsprogs, redhat-lsb, chkconfig, SysVinit, bind-utils, bind-libs, net-tools
+#  tog-pegasus.spec
+#
+#   Copyright (c) 2000 - 2006, 
+#     The Open Group; Hewlett-Packard Development Company, L.P.;  IBM Corp.;
+#     BMC Software;   Tivoli Systems.
+#     Licensed under the "Open Group Pegasus Open Source" license 
+#     shipped with this software.
+#
+#  Upstream tog-pegasus.spec file modified for Red Hat build -
+#  April 2006, Jason Vas Dias <jvdias at redhat.com>, Red Hat Inc.
+#
+#==============================================================================
+
+%{?!LINUX_VERSION: 		%define LINUX_VERSION  FC6}
+#
+%{?!PEGASUS_BUILD_TEST_RPM:   	%define PEGASUS_BUILD_TEST_RPM        0}
+# do "rpmbuild --define 'PEGASUS_BUILD_TEST_RPM 1'" to build test RPM.
+#
+%{?!NOCLEAN:     		%define NOCLEAN 0}
+# ^- 1: don't do %clean
+%{?!NODEBUGINFO: 		%define NODEBUGINFO 0}
+# ^- 1: don't generate debuginfo or strip binaries
+%if %{NODEBUGINFO}
+%define debug_package   %{nil}
+%endif
+%define srcname    	pegasus
+%define pegasus_gid	65
+%define pegasus_uid	66
+
+Version: 		2.5.1
+Release: 		1%{?LINUX_VERSION:.%{LINUX_VERSION}}
+Epoch:   		2
+#
+Summary:   		OpenPegasus WBEM Services for Linux
+Name:      		tog-pegasus
+Group:     		Systems Management/Base
+URL:       		http://www.openpegasus.org
+#
+License:   		Open Group Pegasus Open Source
+#
+BuildRoot: 		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+#
+Source:    		http://www.openpegasus.org/uploads/40/10123/%{srcname}-%{version}.tar.gz
+Source1:		pegasus_rpm_build_env.sh
+Source2:        	README.RedHat.Security
+#
+Patch0:			pegasus-2.5.1-initscript.patch
+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
+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
+Patch8:			pegasus-2.5.1-pam-wbem.patch
+#
+Conflicts: 		openwbem
+Provides: 		tog-pegasus-cimserver
+#
+BuildRequires:      	bash, sed, grep, coreutils, procps, gcc, gcc-c++
+BuildRequires:      	libstdc++, make, pam-devel
+BuildRequires:      	openssl-devel >= 0.9.6, e2fsprogs
+Requires:           	bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam
+Requires:          	redhat-lsb, chkconfig, SysVinit
+Requires:           	e2fsprogs, bind-utils, net-tools
+Requires(post):     	bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam
+Requires(post):    	redhat-lsb, chkconfig, SysVinit
+Requires(post):     	e2fsprogs, bind-utils, net-tools
+Requires(pre):      	bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam
+Requires(pre):     	redhat-lsb, chkconfig, SysVinit
+Requires(pre):      	e2fsprogs, bind-utils, net-tools
+Requires(postun):   	bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam
+Requires(postun):  	redhat-lsb, chkconfig, SysVinit
+Requires(postun):   	e2fsprogs, bind-utils, net-tools
 
 %description
 OpenPegasus WBEM Services for Linux enables management solutions that deliver
@@ -49,93 +85,89 @@
 sources.
 
 %package devel
-Summary:      The OpenPegasus Software Development Kit
-Group:        Systems Management/Base
-Requires:     tog-pegasus >= 2.5
+Summary: 		The OpenPegasus Software Development Kit
+Group: 			Systems Management/Base
+Requires: 		tog-pegasus >= %{version}
+Obsoletes: 		tog-pegasus-sdk
+Requires:		make, gcc, gcc-c++
+Requires(preun): 	make
 
 %description devel
-The OpenPegasus WBEM Services for Linux SDK is the developer's kit for the OpenPegasus WBEM
-Services for Linux release. It provides Linux C++ developers with the WBEM files required to
-build WBEM Clients and Providers. It also supports C provider developers via the CMPI interface.
+The OpenPegasus WBEM Services for Linux SDK is the developer's kit for the
+OpenPegasus WBEM Services for Linux release. It provides Linux C++ developers
+with the WBEM files required to build WBEM Clients and Providers. It also
+supports C provider developers via the CMPI interface.
+
+%if %{PEGASUS_BUILD_TEST_RPM}
 
-%if %{WITH_TEST}
 %package test
-Summary:      The OpenPegasus Tests
-Group:        Systems Management/Base
-Autoreq:      0
-Requires:     tog-pegasus >= 2.5
+Summary: 		The OpenPegasus Tests
+Group: 			Systems Management/Base
+Requires: 		tog-pegasus >= %{version} 
+Requires(post): 	make
+Requires(postun): 	make
 
 %description test
-The OpenPegasus WBEM tests for the OpenPegasus 2.5 Linux rpm.
+The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm.
 **********************************************************************************
 *** DO NOT INSTALL THIS RPM ON A PRODUCTION SYSTEM - THIS IS FOR TESTING ONLY. ***
 **********************************************************************************
+
 %endif
 
 %prep
-%setup -q -n %{srcname}-%{version}
-%patch0 -p1 -b .redhat
-%patch1 -p1 -b .local_or_remote_auth
-%patch2 -p1 -b .make_install
-%patch3 -p1 -b .add_cmpi_provider_lib
-%patch4 -p1 -b .enable_cql
-# %patch5 -p1 -b .bz173401
-# now fixed with openssl-0.9.8a-3+
-%patch6 -p1 -b .syslog_h
-%patch7 -p1 -b .install_id
+%setup -q -n %{srcname}
+%patch0 -p1 -b .initscript
+%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
 
 %build
-rm -rf $RPM_BUILD_ROOT
+rm -rf ${RPM_BUILD_ROOT} || :;
 export RPM_ARCH_LIB=%{_lib}
 . %SOURCE1
-make
-export LD_LIBRARY_PATH=$PEGASUS_HOME/%{_lib}
-export PATH=$PEGASUS_HOME/bin:$PATH
-make repository
-make --directory=mak -f SDKMakefile stageSDK
-%if %{WITH_TEST}
-export PEGASUS_ENVVAR_FILE=${PEGASUS_ROOT}/env_var_Linux.status
-export PEGASUS_STAGING_DIR=$RPM_BUILD_ROOT
-make --directory=$PEGASUS_ROOT -f Makefile.ReleaseTest stageTEST
-unset  PEGASUS_STAGING_DIR
+%if %{PEGASUS_BUILD_TEST_RPM}
+export PEGASUS_DISPLAYCONSUMER_DIR=/var/lib/Pegasus/log
 %endif
+make -f $PEGASUS_ROOT/Makefile.Release create_ProductVersionFile
+make -f $PEGASUS_ROOT/Makefile.Release create_CommonProductDirectoriesInclude
+make -f $PEGASUS_ROOT/Makefile.Release create_ConfigProductDirectoriesInclude
+make -f $PEGASUS_ROOT/Makefile.Release all
+make -f $PEGASUS_ROOT/Makefile.Release repository
 
 %install
-export RPM_ARCH_LIB=%{_lib}
 . %SOURCE1
-export PEGASUS_DESTDIR=$RPM_BUILD_ROOT
-export PEGASUS_ENVVAR_FILE=${PEGASUS_ROOT}/env_var_Linux.status
-export PATH=${PEGASUS_HOME}/bin:$PATH
-export LD_LIBRARY_PATH=${PEGASUS_HOME}/%{_lib}:/%{_lib}:/usr/%{_lib}
-unset  PEGASUS_STAGING_DIR
-export PEGASUS_SDK_STAGING_DIR=${PEGASUS_HOME}/stageSDK
-# why oh why did they make /usr/bin/install fail on the chown!!! :
-export INSTALL_USER=`id -un`
-export INSTALL_GROUP=`id -gn`
-#
-make install
-rm -rf $PEGASUS_HOME
-mkdir -p $RPM_BUILD_ROOT{${PEGASUS_CONFIG_DIR},${PEGASUS_VARRUN_DIR},${PEGASUS_LOG_DIR},$PEGASUS_VARDATA_DIR}
-touch $RPM_BUILD_ROOT{${PEGASUS_CONFIG_DIR}/{cimserver_{current,planned}.conf,ssl.cnf,client.pem,server.pem,file.pem,client_2048.pem,server_2048.pem,file_2048.pem},${PEGASUS_LOG_DIR}/install.log,${PEGASUS_VARRUN_DIR}/cimxml.socket}
-mkdir -p $RPM_BUILD_ROOT/var/lib/Pegasus/prev_repository
-cp -fp %SOURCE2 ${PEGASUS_ROOT}/doc
-cp -fp %SOURCE3 $RPM_BUILD_ROOT/${PEGASUS_CONFIG_DIR}/access.conf
-chmod 640 $RPM_BUILD_ROOT/${PEGASUS_CONFIG_DIR}/access.conf
-mkdir -p $RPM_BUILD_ROOT/${PEGASUS_PRODSHARE_DIR}/scripts
-cp -fp %SOURCE4 $RPM_BUILD_ROOT/${PEGASUS_PRODSHARE_DIR}/scripts
-chmod 750 $RPM_BUILD_ROOT/${PEGASUS_PRODSHARE_DIR}/scripts/genSSLcerts
-mkdir -p $R$RPM_BUILD_ROOT/usr/%{_lib}/cmpi
-#/usr/lib/rpm/brp-compress
-#exit 0
-:;
+export PEGASUS_STAGING_DIR=$RPM_BUILD_ROOT;
+%if %{PEGASUS_BUILD_TEST_RPM}
+export PEGASUS_BUILD_TEST_RPM=%{PEGASUS_BUILD_TEST_RPM};
+%endif
+make -f $PEGASUS_ROOT/Makefile.Release stage;
+cp -fp %SOURCE2 doc
+mkdir -p ${RPM_BUILD_ROOT}/etc/rc.d;
+mkdir -p ${RPM_BUILD_ROOT}/var/run/tog-pegasus/socket;
+mv ${RPM_BUILD_ROOT}/etc/init.d ${RPM_BUILD_ROOT}/etc/rc.d ||:;
+cp -fp rpm/tog-pegasus.rc ${RPM_BUILD_ROOT}/etc/rc.d/init.d/tog-pegasus;
+touch ${RPM_BUILD_ROOT}{/etc/Pegasus/{cimserver_current.conf,cimserver_planned.conf,cimserver_trust,indication_trust,crl},/var/run/tog-pegasus/{socket/cimxml.socket,cimserver.pid,cimserver_start.lock}}
+rm -rf ${RPM_BUILD_ROOT}/usr/share/doc/%{name}-2.5
+%if %{NODEBUGINFO}
+    /usr/lib/rpm/brp-compress;
+    exit 0;
+%endif
 
 %files
-%defattr(0640,root,pegasus,0750)
-%dir /etc/Pegasus
-%dir /var/lib/Pegasus
-%attr(1750,root,pegasus) /var/run/tog-pegasus
-%dir /var/log/Pegasus
-%config %attr(750,root,root) /etc/rc.d/init.d/tog-pegasus
+%defattr(0750, root, pegasus, 0750)
+/usr/%{_lib}/*
+/usr/sbin/*
+/usr/bin/*
+/usr/share/Pegasus/scripts
+%config /etc/rc.d/init.d/tog-pegasus
+%defattr(0640, root, pegasus, 0750)
+%dir   /etc/Pegasus
 %ghost %config(noreplace) /etc/Pegasus/cimserver_current.conf
 %ghost %config(noreplace) /etc/Pegasus/cimserver_planned.conf
 %config(noreplace) /etc/Pegasus/access.conf
@@ -144,101 +176,116 @@
 %ghost /etc/Pegasus/client.pem
 %ghost /etc/Pegasus/server.pem
 %ghost /etc/Pegasus/file.pem
-%ghost /etc/Pegasus/client_2048.pem
-%ghost /etc/Pegasus/server_2048.pem
-%ghost /etc/Pegasus/file_2048.pem
-%ghost /var/log/Pegasus/install.log
-%ghost /var/lib/Pegasus/prev_repository
+%ghost /etc/Pegasus/cimserver_trust
+%ghost /etc/Pegasus/indication_trust
+%ghost /etc/Pegasus/crl
+%dir /var/lib/Pegasus
 /var/lib/Pegasus/repository
 /var/lib/Pegasus/cache
-%attr(0750,root,pegasus) /usr/sbin/*
-%attr(0755,root,pegasus) /usr/bin/*
-%attr(0755,root,pegasus) /usr/%{_lib}/*.so.*
-%dir /usr/%{_lib}/Pegasus/providers
-%dir /usr/%{_lib}/cmpi
-%attr(0755,root,pegasus) /usr/%{_lib}/Pegasus/providers/*.so.*
+%dir /var/lib/Pegasus/log
+%ghost /var/lib/Pegasus/log/install.log
+%dir   %attr(1750,root,pegasus) /var/run/tog-pegasus
+%ghost /var/run/tog-pegasus/cimserver.pid
+%ghost /var/run/tog-pegasus/cimserver_start.lock
+%dir   %attr(1750,root,pegasus) /var/run/tog-pegasus/socket
+%ghost %attr(1640,root,pegasus) /var/run/tog-pegasus/socket/cimxml.socket
+/usr/share/man/man8/*
+%defattr(0644, root, pegasus, 0755)
+%dir /usr/share/Pegasus
 /usr/share/Pegasus/mof
-%dir /usr/share/Pegasus/scripts
-%attr(0755,root,pegasus) /usr/share/Pegasus/scripts/genSSLcerts
-/usr/share/man/man*/*
-%doc doc/license.txt doc/Admin_Guide_Release.pdf doc/README.RedHat.Security doc/SecurityGuidelinesForDevelopers.html doc/PegasusSSLGuidelines.htm doc/MessageQueueService.html doc/ProviderLoading.txt 
+/usr/share/man/man1/*
+%doc doc/license.txt doc/Admin_Guide_Release.pdf doc/PegasusSSLGuidelines.htm doc/SecurityGuidelinesForDevelopers.html doc/README.RedHat.Security src/Clients/repupgrade/doc/repupgrade.html 
 
 %files devel
 %defattr(0644,root,pegasus,0755)
 /usr/include/Pegasus
 /usr/share/Pegasus/samples
 /usr/share/Pegasus/html
-%attr(0755,root,pegasus) /usr/%{_lib}/*.so
-%attr(0755,root,pegasus) /usr/%{_lib}/Pegasus/providers/*.so
-
-%if %{WITH_TEST}
-
-%post test
-/etc/init.d/tog-pegasus stop
-cd /var/lib/Pegasus
-mv repository repository.bak
-mv testrepository repository
-/usr/share/Pegasus/scripts/genSSLcerts
-cd /usr/share/Pegasus/test
-make create_providerlinks
-make tests
 
+%if %{PEGASUS_BUILD_TEST_RPM}
 %files test
-%defattr(-,root,root,-)
+%defattr(0640,root,pegasus,0750)
+%dir /usr/share/Pegasus/test
+/usr/share/Pegasus/test/Makefile
 /var/lib/Pegasus/testrepository
-/usr/share/Pegasus/test
+%defattr(0750,root,pegasus,0750)
+/usr/share/Pegasus/test/bin
+/usr/share/Pegasus/test/lib
+%endif
 
+%clean
+%if !%{NOCLEAN}
+[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf $RPM_BUILD_ROOT;
+[ "${RPM_BUILD_DIR}" != "/" ] && rm -rf ${RPM_BUILD_DIR}/%{name}-%{version};
 %endif
 
 %pre
-if [ $1 -gt 1 ]; then
-   if [ -d /var/lib/Pegasus/repository/root\#PG_Internal ]; then
-      #
-      # Save the current repository to prev_repository.
-      #
-	  if [ -d /var/lib/Pegasus/prev_repository ]; then
-	     /bin/mv /var/lib/Pegasus/prev_repository /var/lib/Pegasus/prev_repository_`date '+%Y-%m-%d-%s.%N'`.rpmsave;
-	  fi
-	  /bin/mv /var/lib/Pegasus/repository /var/lib/Pegasus/prev_repository
-   fi;
-elif [ $1 -eq 1 ]; then
+if [ $1 -eq 1 ]; then
 #  first install: create the 'pegasus' user and group:
-#  By default, ONLY the "pegasus" user will be allowed to connect to cimserver over network
-   /usr/sbin/groupadd -g 65 -f -r pegasus >/dev/null 2>&1 || :;
-   /usr/sbin/useradd -u 66 -r -n -M -g pegasus -s /sbin/nologin -d /var/lib/Pegasus \
+   /usr/sbin/groupadd -g %{pegasus_gid} -f -r pegasus >/dev/null 2>&1 || :;
+   /usr/sbin/useradd -u %{pegasus_uid} -r -n -M -g pegasus -s /sbin/nologin -d /var/lib/Pegasus \
      	 		   -c "tog-pegasus OpenPegasus WBEM/CIM services" pegasus >/dev/null 2>&1 || :;
+elif [ $1 -gt 1 ]; then
+   if [ -d /var/lib/Pegasus/repository ]; then
+	if [ -d /var/lib/Pegasus/prev_repository ]; then
+	   mv /var/lib/Pegasus/prev_repository /var/lib/Pegasus/prev_repository_`date '+%Y-%m-%d-%s.%N'`.rpmsave;
+	fi;
+	mv /var/lib/Pegasus/repository /var/lib/Pegasus/prev_repository;
+   fi
 fi
+:;
 
 %post
+ldconfig;
+chkconfig --add tog-pegasus;
 if [ $1 -eq 1 ]; then
-   /sbin/ldconfig
-%if %{AUTOSTART}
-   /sbin/chkconfig --add tog-pegasus
-%endif
-   echo `date` >/var/log/Pegasus/install.log 2>&1
-elif [ $1 -gt 0 ]; then
-   /sbin/service tog-pegasus condrestart
-:;
+   echo `date` >  /var/lib/Pegasus/log/install.log 2>&1
+elif [ $1 -gt 1 ]; then	
+   echo `date` >>  /var/lib/Pegasus/log/install.log 2>&1 || :;
+   if [ -d /var/lib/Pegasus/prev_repository ]; then
+   #  The user's old repository was moved to /var/lib/Pegasus/prev_repository, which 
+   #  now must be upgraded to the new repository in /var/lib/Pegasus/repository:
+	/usr/sbin/repupgrade /var/lib/Pegasus/prev_repository /var/lib/Pegasus/repository \
+			     2>> /var/lib/Pegasus/log/install.log || :;
+        mv /var/lib/Pegasus/prev_repository /var/lib/Pegasus/prev_repository_`date '+%Y-%m-%d-%s.%N'`.rpmsave;
+   fi;
+   /sbin/service tog-pegasus condrestart >/dev/null 2>&1 || :;
 fi
+:;
 
 %preun
 if [ $1 -eq 0 ]; then
-   service tog-pegasus stop >/dev/null 2>&1
-   /sbin/chkconfig --del tog-pegasus;
+   /sbin/service tog-pegasus stop >/dev/null 2>&1 || :;
+   /sbin/chkconfig --del tog-pegasus >/dev/null 2>&1 || :;
 fi
+:;
 
 %postun
-if [ $1 -eq 0 ]; then
-#   /usr/sbin/userdel pegasus >/dev/null 2>&1 || :; 
-#   /usr/sbin/groudel pegasus >/dev/null 2>&1 || :;
+ldconfig
+
+%preun devel
+if [ $1 -eq 0 ] ; then
+   make --directory /usr/share/Pegasus/samples -s clean >/dev/null 2>&1 || :;
+fi
 :;
+
+%if %{PEGASUS_BUILD_TEST_RPM}
+
+%preun test
+if [ $1 -eq 0 ]; then
+    make --directory /usr/share/Pegasus/test -s unsetupTEST >/dev/null 2>&1 || :;
+    if [ -d /var/lib/Pegasus/testrepository ]; then
+   	mv /var/lib/Pegasus/testrepository_`date '+%Y-%m-%d-%s.%N'`.rpmsave;
+    fi;
 fi;
+:;
 
-%clean
-rm -rf $RPM_BUILD_ROOT;
-#rm -rf ${RPM_BUILD_DIR}/%{srcname}-%{version};
+%endif
 
 %changelog
+* Thu Apr 06 2006 Jason Vas Dias <jvdias at redhat.com> - 2:2.5.1-1
+- Upgrade to version 2.5.1 (including new upstream .spec file).
+
 * Tue Mar  7 2006 Bill Nottingham <notting at redhat.com> - 2:2.5-9
 - use an assigned uid/gid, do not loop over user ids looking for a free one
 



From fedora-cvs-commits at redhat.com  Fri Apr  7 02:56:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Apr 2006 22:56:50 -0400
Subject: rpms/tog-pegasus/devel tog-pegasus.spec,1.25,1.26
Message-ID: <200604070256.k372uotP022475@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22462

Modified Files:
	tog-pegasus.spec 
Log Message:
upgrade to 2.5.1


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- tog-pegasus.spec	7 Apr 2006 02:40:20 -0000	1.25
+++ tog-pegasus.spec	7 Apr 2006 02:56:48 -0000	1.26
@@ -141,6 +141,7 @@
 make -f $PEGASUS_ROOT/Makefile.Release repository
 
 %install
+export RPM_ARCH_LIB=%{_lib}
 . %SOURCE1
 export PEGASUS_STAGING_DIR=$RPM_BUILD_ROOT;
 %if %{PEGASUS_BUILD_TEST_RPM}
@@ -216,7 +217,7 @@
 %clean
 %if !%{NOCLEAN}
 [ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf $RPM_BUILD_ROOT;
-[ "${RPM_BUILD_DIR}" != "/" ] && rm -rf ${RPM_BUILD_DIR}/%{name}-%{version};
+[ "${RPM_BUILD_DIR}" != "/" ] && rm -rf ${RPM_BUILD_DIR}/%{srcname};
 %endif
 
 %pre



From fedora-cvs-commits at redhat.com  Fri Apr  7 05:33:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 01:33:55 -0400
Subject: rpms/gnome-power-manager/devel .cvsignore, 1.15,
	1.16 gnome-power-manager.spec, 1.35, 1.36 sources, 1.15, 1.16
Message-ID: <200604070533.k375XtXU027791@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27774

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
- update to 2.15.0 to get the cool new runtime analysis
  graphs.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	14 Mar 2006 19:51:52 -0000	1.15
+++ .cvsignore	7 Apr 2006 05:33:53 -0000	1.16
@@ -1 +1 @@
-gnome-power-manager-2.14.0.tar.bz2
+gnome-power-manager-2.15.0.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gnome-power-manager.spec	14 Mar 2006 19:51:52 -0000	1.35
+++ gnome-power-manager.spec	7 Apr 2006 05:33:53 -0000	1.36
@@ -4,7 +4,7 @@
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.14.0
+Version: 2.15.0
 Release: 1
 License: GPL
 Group: Applications/System
@@ -90,6 +90,14 @@
 %{_datadir}/icons/hicolor/24x24/apps/*
 
 %changelog
+* Fri Apr  7 2006 Ray Strode <rstrode at redhat.com> - 2.15.0-1
+- update to 2.15.0 to get the cool new runtime analysis
+  graphs.
+
+* Mon Mar 27 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-2
+- use blank screensaver when lid is closed instead of
+  of turning off screensaver completly (bug 186849).
+
 * Tue Mar 14 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	14 Mar 2006 19:51:52 -0000	1.15
+++ sources	7 Apr 2006 05:33:53 -0000	1.16
@@ -1 +1 @@
-d98f7e2a920e3d94dd8b65b476cd88ce  gnome-power-manager-2.14.0.tar.bz2
+9f818d810f84fa5c17403bd593e8936a  gnome-power-manager-2.15.0.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr  7 05:55:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 01:55:50 -0400
Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec,1.36,1.37
Message-ID: <200604070555.k375toMg009261@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9248

Modified Files:
	gnome-power-manager.spec 
Log Message:
- add missing icons to package list



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gnome-power-manager.spec	7 Apr 2006 05:33:53 -0000	1.36
+++ gnome-power-manager.spec	7 Apr 2006 05:55:47 -0000	1.37
@@ -87,7 +87,7 @@
 %{_datadir}/omf/gnome-power-manager/gnome-power-manager-C.omf
 %{_datadir}/gnome/autostart/*
 %{_datadir}/applications/gnome-power-preferences.desktop
-%{_datadir}/icons/hicolor/24x24/apps/*
+%{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
 * Fri Apr  7 2006 Ray Strode <rstrode at redhat.com> - 2.15.0-1



From fedora-cvs-commits at redhat.com  Fri Apr  7 06:47:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 02:47:50 -0400
Subject: rpms/gnome-libs/FC-5 gnome-libs.spec,1.45,1.46
Message-ID: <200604070647.k376lohJ006101@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-libs.spec 
Log Message:
- Add Requires: libSM-devel (bug 184125)



Index: gnome-libs.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-libs/FC-5/gnome-libs.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gnome-libs.spec	28 Feb 2006 14:36:56 -0000	1.45
+++ gnome-libs.spec	7 Apr 2006 06:47:48 -0000	1.46
@@ -11,7 +11,7 @@
 
 Name:		gnome-libs
 Version: 	1.4.1.2.90
-Release: 	49
+Release: 	49.fc5
 Epoch:		1
 Summary: The main GNOME libraries.
 License:	LGPL
@@ -118,6 +118,7 @@
 Requires:	ORBit-devel
 Requires:	imlib-devel
 Requires:	esound-devel
+Requires:	libSM-devel
 
 ## from db1
 %ifnarch ia64
@@ -351,6 +352,9 @@
 
 
 %changelog
+* Fri Apr  7 2006 Ray Strode <rstrode at redhat.de> 1.4.1.2.90-49.fc5
+- Add Requires: libSM-devel (bug 184125)
+
 * Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de> 1.4.1.2.90-49
 - Buildrequires: libXt-devel
 



From fedora-cvs-commits at redhat.com  Fri Apr  7 10:09:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 06:09:36 -0400
Subject: rpms/php/FC-5 php.spec,1.107,1.108
Message-ID: <200604071009.k37A9ao0025491@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	php.spec 
Log Message:
* Fri Apr  7 2006 Joe Orton <jorton at redhat.com> 5.1.2-5.1
- fix use of LDAP on 64-bit platforms (#181518)



Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/FC-5/php.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- php.spec	28 Feb 2006 11:13:24 -0000	1.107
+++ php.spec	7 Apr 2006 10:09:33 -0000	1.108
@@ -4,7 +4,7 @@
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
 Version: 5.1.2
-Release: 5
+Release: 5.1
 License: The PHP License
 Group: Development/Languages
 URL: http://www.php.net/
@@ -308,7 +308,8 @@
 ./buildconf --force
 
 CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-pointer-sign"
-export CFLAGS
+CPPFLAGS="-DLDAP_DEPRECATED=1"
+export CFLAGS CPPFLAGS
 
 # Install extension modules in %{_libdir}/php/modules.
 EXTENSION_DIR=%{_libdir}/php/modules; export EXTENSION_DIR
@@ -560,6 +561,9 @@
 %files pdo -f files.pdo
 
 %changelog
+* Fri Apr  7 2006 Joe Orton <jorton at redhat.com> 5.1.2-5.1
+- fix use of LDAP on 64-bit platforms (#181518)
+
 * Tue Feb 28 2006 Joe Orton <jorton at redhat.com> 5.1.2-5
 - provide php-api (#183227)
 - add provides for all builtin modules (Tim Jackson, #173804)



From fedora-cvs-commits at redhat.com  Fri Apr  7 11:28:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 07:28:06 -0400
Subject: rpms/system-config-date/FC-4
	system-config-date-1.8.2-system-auth.patch, NONE,
	1.1 .cvsignore, 1.20, 1.21 sources, 1.20,
	1.21 system-config-date.spec, 1.25, 1.26
Message-ID: <200604071128.k37BS6og002254@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/system-config-date/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv2235

Modified Files:
	.cvsignore sources system-config-date.spec 
Added Files:
	system-config-date-1.8.2-system-auth.patch 
Log Message:
backport version 1.8.2 from FC5


system-config-date-1.8.2-system-auth.patch:
 system-config-date.pam |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE system-config-date-1.8.2-system-auth.patch ---
--- system-config-date-1.8.2/system-config-date.pam.system-auth	2005-10-14 10:46:10.000000000 +0200
+++ system-config-date-1.8.2/system-config-date.pam	2006-04-07 13:25:34.000000000 +0200
@@ -1,4 +1,8 @@
 #%PAM-1.0
-auth		include		config-util
-account		include		config-util
-session		include		config-util
+auth       sufficient	pam_rootok.so
+auth       sufficient   pam_timestamp.so
+auth       required	pam_stack.so service=system-auth
+session	   required	pam_permit.so
+session    optional	pam_xauth.so
+session    optional     pam_timestamp.so
+account    required	pam_permit.so


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/FC-4/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	6 May 2005 13:54:00 -0000	1.20
+++ .cvsignore	7 Apr 2006 11:28:04 -0000	1.21
@@ -1 +1 @@
-system-config-date-1.7.18.tar.bz2
+system-config-date-1.8.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/FC-4/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	6 May 2005 13:54:00 -0000	1.20
+++ sources	7 Apr 2006 11:28:04 -0000	1.21
@@ -1 +1 @@
-d42a606518e24a45cd11ea2481f2d321  system-config-date-1.7.18.tar.bz2
+04b0e69d7d0c4d9fbffde77dfe62522b  system-config-date-1.8.2.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/FC-4/system-config-date.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- system-config-date.spec	6 May 2005 13:54:00 -0000	1.25
+++ system-config-date.spec	7 Apr 2006 11:28:04 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.7.18
-Release: 1
+Version: 1.8.2
+Release: 0.fc4.1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -9,6 +9,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
 Source0: %{name}-%{version}.tar.bz2
+Patch0: system-config-date-1.8.2-system-auth.patch
 Obsoletes: timetool
 Obsoletes: dateconfig
 Obsoletes: timeconfig
@@ -19,11 +20,15 @@
 BuildRequires: python
 Requires: ntp
 Requires: python2
+Requires: pygtk2-libglade
+Requires: gnome-python2-canvas
 Requires: usermode >= 1.36
 Requires: chkconfig
 Requires: rhpl
 Requires: newt
 Requires: htmlview
+Requires(post): hicolor-icon-theme
+Requires(postun): hicolor-icon-theme
 Conflicts: firstboot <= 1.3.26
 
 %description
@@ -33,6 +38,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .system-auth
 
 %build
 make
@@ -55,11 +61,6 @@
   gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
-%preun
-if [ -d %{_datadir}/system-config-date ] ; then
-  rm -rf %{_datadir}/system-config-date/*.pyc
-fi
-
 %postun
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -77,18 +78,17 @@
 %dir /usr/share/system-config-date
 /usr/share/system-config-date/*.py
 /usr/share/system-config-date/*.pyc
+/usr/share/system-config-date/*.pyo
 /usr/share/system-config-date/*.glade
 %dir /usr/share/system-config-date/pixmaps/
-#%dir /usr/share/firstboot/
-#%dir /usr/share/firstboot/modules
-#/usr/share/firstboot/modules/system-config-date.py
 %attr(0644,root,root) %{_mandir}/man8/system-config-date*
 %attr(0644,root,root) %{_mandir}/fr/man8/system-config-date*
 %attr(0644,root,root) %{_mandir}/ja/man8/system-config-date*
 %attr(0644,root,root) %{_datadir}/applications/system-config-date.desktop
 %attr(0644,root,root) %{_datadir}/system-config-date/pixmaps/system-config-date.png
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-date.png
-%attr(0644,root,root) %{_datadir}/system-config-date/pixmaps/map480.png
+%attr(0644,root,root) %{_datadir}/system-config-date/pixmaps/map1440.png
+%attr(0644,root,root) %{_datadir}/system-config-date/regions
 %attr(0644,root,root) %config(noreplace) /etc/security/console.apps/system-config-date
 %attr(0644,root,root) %config(noreplace) /etc/pam.d/system-config-date
 %attr(0644,root,root) %config(noreplace) /etc/security/console.apps/system-config-time
@@ -99,6 +99,114 @@
 %attr(0644,root,root) %config(noreplace) /usr/share/system-config-date/ntp.template
 
 %changelog
+* Fri Apr 07 2006 Nils Philippsen <nphilipp at redhat.com>
+- use pam system-auth on FC4
+
+* Mon Mar 06 2006 Nils Philippsen <nphilipp at redhat.com> 1.8.2
+- don't write into /tmp
+- make synchronizing with time servers configurable (#157485)
+
+* Fri Mar 03 2006 Nils Philippsen <nphilipp at redhat.com> 1.8.1
+- require hicolor-icon-theme (#182859, #182860)
+
+* Mon Jan 30 2006 Nils Philippsen <nphilipp at redhat.com> 1.8.0
+- bump minor version
+- add requirements for pygtk2-libglade, gnome-python2-canvas (#179215)
+
+* Fri Jan 20 2006 Nils Philippsen <nphilipp at redhat.com> 1.7.99.17
+- zoom out in TZ map on Escape (#178093)
+
+* Wed Jan 18 2006 Nils Philippsen <nphilipp at redhat.com> 1.7.99.16
+- don't crash when selecting a timezone (#178086, patch by Chris Lumens)
+
+* Tue Jan 17 2006 Nils Philippsen <nphilipp at redhat.com> 1.7.99.15
+- fix setting timezone from firstboot (#177779, patch by Chris Lumens)
+
+* Mon Jan 16 2006 Nils Philippsen <nphilipp at redhat.com> 1.7.99.14
+- put Etc/... timezones into "Non-geographic timezones" (#148025)
+- default to already set timezone on startup (#177815)
+
+* Tue Jan 10 2006 Nils Philippsen <nphilipp at redhat.com>
+- Add translation string for UTC-relative and other non-geographic timezones
+
+* Mon Jan 09 2006 Chris Lumens <clumens at redhat.com> 1.7.99.13-1
+- Rename mainWindow to scdMainWindow to avoid import problems in firstboot.
+
+* Wed Jan 04 2006 Nils Philippsen <nphilipp at redhat.com> 1.7.99.12
+- show actually chosen region, not just something that's in the vicinity
+
+* Fri Dec 30 2005 Nils Philippsen <nphilipp at redhat.com>
+- fix highlighted regions when leaving and entering the timeone map canvas
+- make timezone list a treeview
+- update timezone po source file
+
+* Thu Dec 15 2005 Jeremy Katz <katzj at redhat.com> - 1.7.99.11-1
+- fix timezone map to not be painfully slow
+
+* Wed Dec 14 2005 Nils Philippsen <nphilipp at redhat.com> 1.7.99.10
+- make TimezoneMap more easily subclassable (Chris Lumens), use uniform
+  paren-spacing
+
+* Thu Dec 08 2005 Nils Philippsen <nphilipp at redhat.com> 1.7.99.9
+- draw frame around highlighted region
+
+* Thu Nov 24 2005 Nils Philippsen <nphilipp at redhat.com> 1.7.99.8
+- reshow shaded map when reentering map widget from outside
+- clear status line when outside region area in zoomed mode
+
+* Thu Nov 24 2005 Nils Philippsen <nphilipp at redhat.com> 1.7.99.7
+- only select region if pointer is inside region
+- replace aa-based shading to avoid aa-related deficiencies of GnomeCanvas
+- show shaded border around zoomed in region to zoom out without selecting a
+  city
+
+* Wed Nov 23 2005 Nils Philippsen <nphilipp at redhat.com>
+- don't let cities get miraculously lost (#173944, patch by Chris Lumens)
+
+* Mon Nov 21 2005 Nils Philippsen <nphilipp at redhat.com> 1.7.99.6
+- fix zooming problems with enlarged window (#172982)
+- apply workaround by Alex Larsson to avoid hanging when clicking on Asia
+  region (#172977)
+- add Middle America region, make Antarctica regions overlapping
+
+* Thu Nov 10 2005 Nils Philippsen <nphilipp at redhat.com> 1.7.99.5
+- when choosing a region, shade off the rest of the map when hovering over a
+  region
+
+* Wed Nov 09 2005 Nils Philippsen <nphilipp at redhat.com> 1.7.99.4
+- implement simple timezone zooming
+
+* Fri Oct 21 2005 Nils Philippsen <nphilipp at redhat.com> 1.7.99.3
+- revamp pot file generation (#171330)
+
+* Fri Oct 14 2005 Nils Philippsen <nphilipp at redhat.com>
+- don't use pam_stack (#170623)
+
+* Fri Oct 07 2005 Nils Philippsen <nphilipp at redhat.com> 1.7.99.2
+- write comment about the ZONE parameter into /etc/sysconfig/clock (#123101)
+- handle comments when reading /etc/sysconfig/clock
+- consistently use spaces for indentation in timezoneBackend.py
+
+* Thu Sep 22 2005 Nils Philippsen <nphilipp at redhat.com> 1.7.99.1
+- check whether NTP server is reachable on changes (#135747)
+
+* Tue Aug 09 2005 Nils Philippsen <nphilipp at redhat.com>
+- remove workaround causing deprecation warnings for bug that doesn't exist
+  anymore (#162840)
+
+* Thu Aug 04 2005 Nils Philippsen <nphilipp at redhat.com> 1.7.99.0
+- add and edit NTP servers inline in the list
+- always display clock left-to-right (#165109)
+- try to be smart about restrict lines when changing or deleting hosts
+- include *.pyo files (#165097)
+- don't remove *.pyc files in %%preun because they're in the file list
+- don't include timetool symlink anymore
+- don't install firstboot module symlink, this is dealt with in the firstboot
+  package for quite a while
+
+* Wed Aug 03 2005 Nils Philippsen <nphilipp at redhat.com>
+- implement --help, catch unrecognized options (#164791)
+
 * Fri May 06 2005 Nils Philippsen <nphilipp at redhat.com> 1.7.18
 - make desktop file translatable (#156792)
 - avoid DeprecationWarnings



From fedora-cvs-commits at redhat.com  Fri Apr  7 11:36:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 07:36:22 -0400
Subject: rpms/system-config-date/FC-4 system-config-date.spec,1.26,1.27
Message-ID: <200604071136.k37BaMlH002464@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/system-config-date/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv2422

Modified Files:
	system-config-date.spec 
Log Message:
FC4 doesn't build *.pyo automatically



Index: system-config-date.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/FC-4/system-config-date.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- system-config-date.spec	7 Apr 2006 11:28:04 -0000	1.26
+++ system-config-date.spec	7 Apr 2006 11:36:20 -0000	1.27
@@ -78,7 +78,6 @@
 %dir /usr/share/system-config-date
 /usr/share/system-config-date/*.py
 /usr/share/system-config-date/*.pyc
-/usr/share/system-config-date/*.pyo
 /usr/share/system-config-date/*.glade
 %dir /usr/share/system-config-date/pixmaps/
 %attr(0644,root,root) %{_mandir}/man8/system-config-date*



From fedora-cvs-commits at redhat.com  Fri Apr  7 12:21:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 08:21:14 -0400
Subject: rpms/vim/devel vim-7.0-rclocation.patch, 1.1, 1.2 vim.spec, 1.103,
	1.104
Message-ID: <200604071221.k37CLEHF030365@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30351

Modified Files:
	vim-7.0-rclocation.patch vim.spec 
Log Message:
- fix vimrc filename

vim-7.0-rclocation.patch:
 os_unix.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: vim-7.0-rclocation.patch
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim-7.0-rclocation.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vim-7.0-rclocation.patch	23 Mar 2006 13:07:01 -0000	1.1
+++ vim-7.0-rclocation.patch	7 Apr 2006 12:21:10 -0000	1.2
@@ -5,11 +5,11 @@
   */
  #ifndef SYS_VIMRC_FILE
 -# define SYS_VIMRC_FILE "$VIM/vimrc"
-+# define SYS_VIMRC_FILE "/etc/vim7rc"
++# define SYS_VIMRC_FILE "/etc/vimrc"
  #endif
  #ifndef SYS_GVIMRC_FILE
 -# define SYS_GVIMRC_FILE "$VIM/gvimrc"
-+# define SYS_GVIMRC_FILE "/etc/gvim7rc"
++# define SYS_GVIMRC_FILE "/etc/gvimrc"
  #endif
  #ifndef DFLT_HELPFILE
  # define DFLT_HELPFILE	"$VIMRUNTIME/doc/help.txt"


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- vim.spec	4 Apr 2006 14:21:02 -0000	1.103
+++ vim.spec	7 Apr 2006 12:21:10 -0000	1.104
@@ -1,4 +1,4 @@
-%define CVSDATE -20060404
+%define CVSDATE -20060406
 %define WITH_SELINUX 1
 %define desktop_file 1
 %if %{desktop_file}
@@ -26,7 +26,7 @@
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 1
+Release: 2
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{CVSDATE}.tar.bz2
@@ -93,6 +93,7 @@
 Obsoletes: vim7-common
 Conflicts: man-pages-fr < 0.9.7-14
 Conflicts: man-pages-it < 0.3.0-17
+Conflicts: man-pages-pl < 0.24-2
 
 %description common
 VIM (VIsual editor iMproved) is an updated and improved version of the
@@ -502,6 +503,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Thu Apr 06 2006 Karsten Hopp <karsten at redhat.de> 7.0c.000-2
+- new snapshot
+
 * Tue Apr 04 2006 Karsten Hopp <karsten at redhat.de> 7.0c.000-1
 - vim-7.0c BETA
 



From fedora-cvs-commits at redhat.com  Fri Apr  7 12:43:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 08:43:32 -0400
Subject: rpms/vim/devel vim.spec,1.104,1.105
Message-ID: <200604071243.k37ChWOS030543@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30530

Modified Files:
	vim.spec 
Log Message:
- fix vimrc filename


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- vim.spec	7 Apr 2006 12:21:10 -0000	1.104
+++ vim.spec	7 Apr 2006 12:43:30 -0000	1.105
@@ -26,7 +26,7 @@
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 2
+Release: 3
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{CVSDATE}.tar.bz2
@@ -503,6 +503,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Fri Apr 07 2006 Karsten Hopp <karsten at redhat.de> 7.0c.000-3
+- fix vimrc filename
+
 * Thu Apr 06 2006 Karsten Hopp <karsten at redhat.de> 7.0c.000-2
 - new snapshot
 



From fedora-cvs-commits at redhat.com  Fri Apr  7 12:46:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 08:46:22 -0400
Subject: rpms/vim/devel sources,1.13,1.14
Message-ID: <200604071246.k37CkM3V006565@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6141

Modified Files:
	sources 
Log Message:
- new snapshot


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	4 Apr 2006 12:06:46 -0000	1.13
+++ sources	7 Apr 2006 12:46:20 -0000	1.14
@@ -1,4 +1,4 @@
-26b4c3234c87e9cc361bee6e02925181  vim-7.0c-20060404.tar.bz2
-3b3edf7a1573532f5ad66e7a001ce677  vim-7.0c-extra-20060404.tar.gz
-c4b45ad62766e674fbea90ce922a92e0  vim-7.0c-lang-20060404.tar.gz
+416d317643921b8d480b1062d700ec38  vim-7.0c-20060406.tar.bz2
+659061c767eeb8f33ce580b7ca53d672  vim-7.0c-extra-20060406.tar.gz
+fec870c5e12def0772d639646de0a8bd  vim-7.0c-lang-20060406.tar.gz
 1f17af2008ae94359a48be7e865b084f  cvim.zip



From fedora-cvs-commits at redhat.com  Fri Apr  7 12:47:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 08:47:48 -0400
Subject: rpms/ltrace/devel ltrace-opt_x.patch, NONE,
	1.1 ltrace-testsuite.patch, NONE, 1.1 .cvsignore, 1.6,
	1.7 ltrace.spec, 1.25, 1.26 sources, 1.6,
	1.7 ltrace-fixes.patch, 1.1, NONE ltrace-ia64.patch, 1.1,
	NONE ltrace-ppc64-2.patch, 1.1, NONE ltrace-ppc64.patch, 1.1,
	NONE ltrace-s390x.patch, 1.1,
	NONE ltrace-syscallent-update.patch, 1.1, NONE
Message-ID: <200604071247.k37ClmG2011962@cvs.devel.redhat.com>

Author: pmachata

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

Modified Files:
	.cvsignore ltrace.spec sources 
Added Files:
	ltrace-opt_x.patch ltrace-testsuite.patch 
Removed Files:
	ltrace-fixes.patch ltrace-ia64.patch ltrace-ppc64-2.patch 
	ltrace-ppc64.patch ltrace-s390x.patch 
	ltrace-syscallent-update.patch 
Log Message:
- Upstream 0.4
- svn updates:
  - opt_x patch: New structure for opt_x list elements, now with
    'found'.  Using it in options.c, elf.c.
  - testsuite patch: Automated testsuite for ltrace.
- removing old patches from cvs


ltrace-opt_x.patch:
 ChangeLog |    6 ++++++
 elf.c     |   29 ++++++++++++++++-------------
 options.c |    7 ++++---
 options.h |    8 +++++++-
 4 files changed, 33 insertions(+), 17 deletions(-)

--- NEW FILE ltrace-opt_x.patch ---
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33)
+++ ChangeLog	(revision 34)
@@ -1,3 +1,9 @@
+2006-03-13  Paul Gilliam <pgilliam at us.ibm.com>
+
+	* options.h: New structure for opt_x list elements, now with 'found'.
+	* options.c: Use new opt_x_t structure, initializing 'found' to 0.
+	* elf.c: Use new 'found' field for better error checking.
+
 2006-03-06  Ian Wienand  <ianw at ieee.org>
 
 	* Makefile.in: remove unneeded dirs from make dist; use rm
Index: options.h
===================================================================
--- options.h	(revision 32)
+++ options.h	(revision 33)
@@ -31,11 +31,17 @@ struct opt_e_t {
 	struct opt_e_t *next;
 };
 
+struct opt_x_t {
+	char *name;
+	int found;
+	struct opt_x_t *next;
+};
+
 extern struct opt_p_t *opt_p;	/* attach to process with a given pid */
 
 extern struct opt_e_t *opt_e;	/* list of function names to display */
 extern int opt_e_enable;	/* 0 if '!' is used, 1 otherwise */
 
-extern struct opt_e_t *opt_x;	/* list of functions to break at */
+extern struct opt_x_t *opt_x;	/* list of functions to break at */
 
 extern char **process_options(int argc, char **argv);
Index: elf.c
===================================================================
--- elf.c	(revision 32)
+++ elf.c	(revision 33)
@@ -351,9 +351,10 @@ struct library_symbol *read_elf(struct p
 	struct library_symbol *library_symbols = NULL;
 	struct ltelf lte[MAX_LIBRARY + 1];
 	size_t i;
-	struct opt_e_t *xptr;
+	struct opt_x_t *xptr;
 	struct library_symbol **lib_tail = NULL;
-	struct opt_e_t *main_cheat;
+	struct opt_x_t *main_cheat;
+	int exit_out = 0;
 
 	elf_version(EV_CURRENT);
 
@@ -440,22 +441,24 @@ struct library_symbol *read_elf(struct p
 				add_library_symbol(elf_plt2addr
 						   (lte, (void *)addr), name,
 						   lib_tail, 1, 0);
+				xptr->found = 1;
 				break;
 			}
 	}
 	for (xptr = opt_x; xptr; xptr = xptr->next)
-		if (xptr->name) {
-			if (strcmp(xptr->name, E_ENTRY_NAME) == 0)
-				add_library_symbol(elf_plt2addr
-						   (lte,
-						    (void *)lte->ehdr.e_entry),
-						   "_start", lib_tail, 1, 0);
-			else
-				fprintf(stderr,
-					"Warning: Couldn't get symbol \"%s\" "
-					"from \"%s\" or it's a duplicate",
-					xptr->name, proc->filename);
+		if ( ! xptr->found) {
+			char *badthing = "WARNING";
+			if (E_ENTRY_NAME && strcmp(xptr->name, E_ENTRY_NAME)) {
+				badthing = "ERROR";
+				exit_out = 1;
+			}
+			fprintf (stderr,
+				 "%s: Couldn't find symbol \"%s\" in file \"%s\"\n",
+			badthing, xptr->name, proc->filename);
 		}
+	if (exit_out) {
+		exit (1);
+	}
 
 	for (i = 0; i < library_num + 1; ++i)
 		do_close_elf(&lte[i]);
Index: options.c
===================================================================
--- options.c	(revision 32)
+++ options.c	(revision 33)
@@ -51,7 +51,7 @@ struct opt_e_t *opt_e = NULL;
 int opt_e_enable = 1;
 
 /* List of global function names given to -x: */
-struct opt_e_t *opt_x = NULL;
+struct opt_x_t *opt_x = NULL;
 
 /* Set a break on the routine named here in order to re-initialize breakpoints
    after all the PLTs have been initialzed */
@@ -323,7 +323,7 @@ char **process_options(int argc, char **
 
 		case 'x':
 			{
-				struct opt_e_t *p = opt_x;
+				struct opt_x_t *p = opt_x;
 
 				/* First, check for duplicate. */
 				while (p && strcmp(p->name, optarg)) {
@@ -334,12 +334,13 @@ char **process_options(int argc, char **
 				}
 
 				/* If not duplicate, add to list. */
-				p = malloc(sizeof(struct opt_e_t));
+				p = malloc(sizeof(struct opt_x_t));
 				if (!p) {
 					perror("ltrace: malloc");
 					exit(1);
 				}
 				p->name = optarg;
+				p->found = 0;
 				p->next = opt_x;
 				opt_x = p;
 				break;

ltrace-testsuite.patch:
 ChangeLog                                            |   58 +++
 Makefile.in                                          |   10 
 configure                                            |    2 
 configure.ac                                         |    5 
 testsuite/Makefile.in                                |   72 ++++
 testsuite/README                                     |  244 ++++++++++++++++
 testsuite/config/unix.exp                            |    1 
 testsuite/lib/compiler.c                             |   58 +++
 testsuite/lib/compiler.cc                            |   45 +++
 testsuite/lib/ltrace.exp                             |  277 +++++++++++++++++++
 testsuite/ltrace.main/Makefile.in                    |   34 ++
 testsuite/ltrace.main/main-internal-1.c              |    8 
 testsuite/ltrace.main/main-internal.c                |   19 +
 testsuite/ltrace.main/main-internal.exp              |   33 ++
 testsuite/ltrace.main/main-lib.c                     |    7 
 testsuite/ltrace.main/main.c                         |   21 +
 testsuite/ltrace.main/main.exp                       |   39 ++
 testsuite/ltrace.main/signals.c                      |   48 +++
 testsuite/ltrace.main/signals.exp                    |   39 ++
 testsuite/ltrace.main/system_calls.c                 |   68 ++++
 testsuite/ltrace.main/system_calls.exp               |   67 ++++
 testsuite/ltrace.minor/Makefile.in                   |   37 ++
 testsuite/ltrace.minor/attach-process.c              |   16 +
 testsuite/ltrace.minor/attach-process.exp            |   38 ++
 testsuite/ltrace.minor/count-record.c                |   51 +++
 testsuite/ltrace.minor/count-record.exp              |   77 +++++
 testsuite/ltrace.minor/demangle-lib.cpp              |   97 ++++++
 testsuite/ltrace.minor/demangle.cpp                  |  121 ++++++++
 testsuite/ltrace.minor/demangle.exp                  |   63 ++++
 testsuite/ltrace.minor/demangle.h                    |   36 ++
 testsuite/ltrace.minor/print-instruction-pointer.c   |   11 
 testsuite/ltrace.minor/print-instruction-pointer.exp |   42 ++
 testsuite/ltrace.minor/time-record-T.exp             |   84 +++++
 testsuite/ltrace.minor/time-record-tt.exp            |  107 +++++++
 testsuite/ltrace.minor/time-record-ttt.exp           |  112 +++++++
 testsuite/ltrace.minor/time-record.c                 |   23 +
 testsuite/ltrace.minor/trace-clone.c                 |   43 ++
 testsuite/ltrace.minor/trace-clone.exp               |   44 +++
 testsuite/ltrace.minor/trace-fork.c                  |   33 ++
 testsuite/ltrace.minor/trace-fork.exp                |   40 ++
 testsuite/ltrace.torture/Makefile.in                 |   34 ++
 testsuite/ltrace.torture/signals.c                   |   44 +++
 testsuite/ltrace.torture/signals.exp                 |   37 ++
 testsuite/run-my-tests.sh                            |   43 ++
 44 files changed, 2382 insertions(+), 6 deletions(-)

--- NEW FILE ltrace-testsuite.patch ---
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 34)
+++ Makefile.in	(revision 35)
@@ -40,7 +40,11 @@ ltrace:		sysdeps/sysdep.o $(OBJ)
 sysdeps/sysdep.o: dummy
 		$(MAKE) -C sysdeps/$(OS)
 
-clean:
+clean-deja:
+		$(RM) testrun.log testrun.sum
+		cd testsuite; make clean
+
+clean:		clean-deja
 		$(MAKE) -C sysdeps/$(OS) clean
 		rm -f ltrace $(OBJ)
 		rm -f *~ *.bak a.out core KK
@@ -48,6 +52,7 @@ clean:
 distclean:	clean
 		rm -f autogen.sh config.cache config.status config.log config.h Makefile configure.scan
 		rm -rf autom4te.cache
+		cd testsuite; make distclean
 
 realclean:	distclean
 		rm configure config.h.in
@@ -75,6 +80,9 @@ install:	ltrace
 		$(INSTALL_FILE) COPYING README TODO BUGS ChangeLog $(DESTDIR)$(docdir)
 		$(INSTALL_FILE) ltrace.1 $(DESTDIR)$(mandir)/man1
 
+check:
+		cd testsuite; $(MAKE) check
+
 dummy:
 
 .PHONY:		all clean distclean dist install dummy
Index: configure.ac
===================================================================
--- configure.ac	(revision 34)
+++ configure.ac	(revision 35)
@@ -84,4 +84,7 @@ dnl are built without LFS.  It is import
 dnl of libelf and ltrace matches.
 AC_SYS_LARGEFILE
 fi
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile testsuite/Makefile \
+	  testsuite/ltrace.main/Makefile testsuite/ltrace.minor/Makefile \
+	  testsuite/ltrace.torture/Makefile )
+
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34)
+++ ChangeLog	(revision 35)
@@ -1,3 +1,56 @@
+2006-03=13  Paul Gilliam <pgilliam at us.ibm.com>
+
+	* Makefile.in: Add targets to support testsuite, including 'check'.
+	* confiure.ac: Add testsuite Makefile's to AC_OUTPUT.
+	* testsuite: Add dejagnu base testsuite.
+	* testsuite/config/: Add
+	* testsuite/config/unix.exp: Add
+	* testsuite/lib/: Add
+	* testsuite/lib/compiler.c: Add
+	* testsuite/lib/compiler.cc: Add
+	* testsuite/lib/ltrace.exp: Add
+	* testsuite/ltrace.main/: Add
+	* testsuite/ltrace.main/main.c: Add
+	* testsuite/ltrace.main/main.exp: Add
+	* testsuite/ltrace.main/main-internal-1.c: Add
+	* testsuite/ltrace.main/main-internal.c: Add
+	* testsuite/ltrace.main/main-internal.exp: Add
+	* testsuite/ltrace.main/main-lib.c: Add
+	* testsuite/ltrace.main/Makefile.in: Add
+	* testsuite/ltrace.main/signals.c: Add
+	* testsuite/ltrace.main/signals.exp: Add
+	* testsuite/ltrace.main/system_calls.c: Add
+	* testsuite/ltrace.main/system_calls.exp: Add
+	* testsuite/ltrace.minor/: Add
+	* testsuite/ltrace.minor/attach-process.c: Add
+	* testsuite/ltrace.minor/attach-process.exp: Add
+	* testsuite/ltrace.minor/count-record.c: Add
+	* testsuite/ltrace.minor/count-record.exp: Add
+	* testsuite/ltrace.minor/demangle.cpp: Add
+	* testsuite/ltrace.minor/demangle.exp: Add
+	* testsuite/ltrace.minor/demangle.h: Add
+	* testsuite/ltrace.minor/demangle-lib.cpp: Add
+	* testsuite/ltrace.minor/Makefile.in: Add
+	* testsuite/ltrace.minor/print-instruction-pointer.c: Add
+	* testsuite/ltrace.minor/print-instruction-pointer.exp: Add
+	* testsuite/ltrace.minor/time-record.c: Add
+	* testsuite/ltrace.minor/time-record-T.exp: Add
+	* testsuite/ltrace.minor/time-record-tt.exp: Add
+	* testsuite/ltrace.minor/time-record-ttt.exp: Add
+	* testsuite/ltrace.minor/trace-clone.c: Add
+	* testsuite/ltrace.minor/trace-clone.exp: Add
+	* testsuite/ltrace.minor/trace-fork.c: Add
+	* testsuite/ltrace.minor/trace-fork.exp: Add
+	* testsuite/ltrace.torture/: Add
+	* testsuite/ltrace.torture/Makefile.in: Add
+	* testsuite/ltrace.torture/signals.c: Add
+	* testsuite/ltrace.torture/signals.exp: Add
+	* testsuite/Makefile.in: Add
+	* testsuite/README: Add
+	* testsuite/run-my-tests.sh: Add
+	* testsuite/so_test1/: Add
+	* testsuite/so_test2/: Add
+
 2006-03-13  Paul Gilliam <pgilliam at us.ibm.com>
 
 	* options.h: New structure for opt_x list elements, now with 'found'.
Index: testsuite/run-my-tests.sh
===================================================================
--- testsuite/run-my-tests.sh	(revision 0)
+++ testsuite/run-my-tests.sh	(revision 35)
@@ -0,0 +1,43 @@
+#! /bin/sh
+bitmode=""
+
+# This shell script is used to run the ltrace test suite.  It is possible to
+# run it via 'make check' using RUNTESTFLAGS.  This script just makes it easy.
+
+function usage
+{
+  echo usage: `basename $0` '-m32|-m64 [<tool> | ""] [<test.exp>]'
+}
+
+# The first argument is not optional: it must either be -m32 or -m64.  If the
+# second argument is used, it specifies the file name of the ltrace to be
+# tested.  The third argument specifies a particular test case to run.  If
+# the third argument is omitted, then all test cases are run.  If you wish to
+# use the third argument, but not the second, specify the second as "".
+
+# there is a secret argument: if the name of this script is 'test', then
+# the --verbose argument is added to RUNTESTFLAGS.
+
+if [ x"$1" == x -o x"$1" != x-m32 -a x"$1" != x-m64 ]; then
+  usage
+  exit 1
+fi
+
+flags=''
+
+if [ `basename $0` == test ]; then
+  flags="--verbose "
+fi
+
+if [ x"$2" != x ]; then
+  flags="${flags}--tool_exec=$2 "
+fi
+
+flags="${flags}CFLAGS_FOR_TARGET=$1"
+
+if [ x"$3" != x ]; then
+  flags="$flags $3"
+fi
+
+set -o xtrace
+make check RUNTESTFLAGS="$flags"

Property changes on: testsuite/run-my-tests.sh
___________________________________________________________________
Name: svn:executable
   + *

Index: testsuite/Makefile.in
===================================================================
--- testsuite/Makefile.in	(revision 0)
+++ testsuite/Makefile.in	(revision 35)
@@ -0,0 +1,72 @@
+# Copyright (C) 1992 - 2001 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
+# the Free Software Foundation; either version 1, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+
+AUTOMAKE_OPTIONS = dejagnu
+EXPECT 	= 	expect
+RUNTEST = 	runtest
+CC	=	@CC@
+
+srcdir = 	.
+RUNTESTDEFAULTFLAGS = --srcdir $(srcdir)
+
+CLEANFILES = *.log *.sum site.bak setval.tmp site.exp
+
+SUBDIRS = ltrace.main ltrace.minor ltrace.torture
+
+#all: all-recursive
+
[...2267 lines suppressed...]
+  sleep(1);
+}
+
+int 
+main ()
+{
+  pid_t pid;
+  pid = fork ();
+  
+  if (pid == -1)
+    printf("fork failed!\n");
+  else if (pid == 0)
+    child();
+  else
+    {
+      printf("My child pid is %d\n",pid);
+      wait(); 
+    }
+  return 0;
+}
Index: testsuite/ltrace.torture/signals.c
===================================================================
--- testsuite/ltrace.torture/signals.c	(revision 0)
+++ testsuite/ltrace.torture/signals.c	(revision 35)
@@ -0,0 +1,44 @@
+/* Ltrace Test : signals.c.
+   Objectives  : Verify that ltrace can trace user defined signal.
+   This file was written by Yao Qi <qiyao at cn.ibm.com>. */
+
+#include<stdio.h>
+#include<signal.h>
+#include <sys/types.h>
+
+#define LOOP	20
+
+void 
+handler(int signum,siginfo_t *info,void *act)
+{
+}
+
+int 
+main ()
+{
+  struct sigaction act;	
+  union sigval mysigval;
+  int i;
+  int sig;
+  pid_t pid;
+  
+  mysigval.sival_int=0;
+  sig = 10;
+  pid=getpid();
+  
+  sigemptyset(&act.sa_mask);
+  act.sa_sigaction=handler;
+  act.sa_flags=SA_SIGINFO;
+  
+  if(sigaction(sig,&act,NULL) < 0)
+    {
+      printf("install sigal error\n");
+    }
+  
+  for(i=0; i< LOOP; i++)
+    {
+      usleep(100);
+      sigqueue(pid,sig,mysigval);
+    }
+  return 0;
+}
Index: testsuite/ltrace.torture/Makefile.in
===================================================================
--- testsuite/ltrace.torture/Makefile.in	(revision 0)
+++ testsuite/ltrace.torture/Makefile.in	(revision 35)
@@ -0,0 +1,34 @@
+# Copyright (C) 1992 - 2001 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
+# the Free Software Foundation; either version 1, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+
+CLEANFILES = *.log *.sum site.bak setval.tmp site.exp
+
+.SUFFIXES:	
+clean:
+	-rm -f signals 
+	-rm -f *.o *.so 
+	-rm -f *.ltrace
+	-rm -f $(CLEANFILES)
+distclean: clean
+	-rm -f Makefile
+
+
+.PHONY: $(RECURSIVE_TARGETS) check  clean distclean realclean
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Index: testsuite/ltrace.torture/signals.exp
===================================================================
--- testsuite/ltrace.torture/signals.exp	(revision 0)
+++ testsuite/ltrace.torture/signals.exp	(revision 35)
@@ -0,0 +1,37 @@
+# This file was written by Yao Qi <qiyao at cn.ibm.com>.
+
+set testfile "signals"
+set srcfile ${testfile}.c
+set binfile ${testfile}
+
+
+verbose "compiling source file now....."
+# Build the shared libraries this test case needs.
+if  { [ ltrace_compile "${srcdir}/${subdir}/${testfile}.c" "${srcdir}/${subdir}/${binfile}" executable {debug} ] != "" } {
+     send_user "Testcase compile failed, so all tests in this file will automatically fail\n."
+}
+
+# Set options for ltrace.
+ltrace_options "-L"
+
+# Run PUT for ltarce.
+set exec_output [ltrace_runtest $srcdir/$subdir $srcdir/$subdir/$binfile]
+
+# Check the output of this program.
+verbose "ltrace runtest output: $exec_output\n"
+if [regexp {ELF from incompatible architecture} $exec_output] {
+	fail "32-bit ltrace can not perform on 64-bit PUTs and rebuild ltrace in 64 bit mode!"
+	return
+} elseif [ regexp {Couldn't get .hash data} $exec_output ] {
+	fail "Couldn't get .hash data!"
+	return
+}
+
+# Extract LOOP from source file.
+set fd [ open $srcdir/$subdir/$srcfile r]
+while { [gets $fd line] >= 0 } {
+         regexp {define LOOP.*([0-9]+)} $line match count
+}
+set pattern "SIGUSR1"
+ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern $count
+
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35)
+++ ChangeLog	(revision 36)
@@ -1,3 +1,8 @@
+2006-03-16  Ian Wienand  <ianw at gelato.unsw.edu.au>
+
+	* testsuite/ltrace.minor/trace-clone.c: use __clone2() for IA64
+	clone test
+
 2006-03=13  Paul Gilliam <pgilliam at us.ibm.com>
 
 	* Makefile.in: Add targets to support testsuite, including 'check'.
Index: testsuite/ltrace.minor/trace-clone.c
===================================================================
--- testsuite/ltrace.minor/trace-clone.c	(revision 35)
+++ testsuite/ltrace.minor/trace-clone.c	(revision 36)
@@ -16,12 +16,18 @@ int child ()
 
 typedef int (* myfunc)();
 
+#define STACK_SIZE 1024
+
 int main ()
 {
   pid_t pid;
-  static char stack[1024];
-  
-  if ((pid = clone((myfunc)&child, stack,CLONE_FS, NULL )) < 0)
+  static char stack[STACK_SIZE];
+#ifdef __ia64__
+  pid = __clone2((myfunc)&child, stack, STACK_SIZE, CLONE_FS, NULL);
+#else
+  pid = clone((myfunc)&child, stack,CLONE_FS, NULL );
+#endif
+  if (pid < 0)
     {
       perror("clone called failed");
       exit (1);
--- configure	2006-04-07 14:20:01.000000000 +0200
+++ configure-pm	2006-04-07 14:19:53.000000000 +0200
@@ -4195,7 +4195,7 @@
 fi
 
 fi
-          ac_config_files="$ac_config_files Makefile"
+          ac_config_files="$ac_config_files Makefile testsuite/Makefile testsuite/ltrace.minor/Makefile testsuite/ltrace.torture/Makefile testsuite/ltrace.main/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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Nov 2004 23:20:08 -0000	1.6
+++ .cvsignore	7 Apr 2006 12:47:45 -0000	1.7
@@ -1 +1 @@
-ltrace_0.3.36.orig.tar.gz
+ltrace_0.4.orig.tar.gz


Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ltrace.spec	8 Mar 2006 14:36:35 -0000	1.25
+++ ltrace.spec	7 Apr 2006 12:47:45 -0000	1.26
@@ -1,20 +1,15 @@
 Summary: Tracks runtime library calls from dynamically linked executables.
 Name: ltrace
-Version: 0.3.36
-Release: 4.3
+Version: 0.4
+Release: 1
 Source: ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_%{version}.orig.tar.gz
-Patch1: ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.3.36-2.diff.gz
-Patch2: ltrace-ppc64.patch
-Patch3: ltrace-ppc64-2.patch
-Patch4: ltrace-s390x.patch
-Patch5: ltrace-syscallent-update.patch
-Patch6: ltrace-fixes.patch
-Patch7: ltrace-ia64.patch
+Patch0: ltrace-opt_x.patch
+Patch1: ltrace-testsuite.patch
 License: GPL
 Group: Development/Debuggers
 ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 s390 s390x alpha sparc
 Prefix: %{_prefix}
-BuildRoot: /var/tmp/%{name}-root
+Buildroot: %{_tmppath}/%{name}-root
 BuildRequires: elfutils-libelf-devel
 
 %description
@@ -29,13 +24,8 @@
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+%patch0 -p0
+%patch1 -p0
 sed -i -e 's/-o root -g root//' Makefile.in
 
 %build
@@ -44,9 +34,12 @@
 make
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
-rm -f ChangeLog; mv -f debian/changelog ChangeLog
-rm -rf $RPM_BUILD_ROOT/%{_prefix}/doc
+make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} docdir=%{_docdir}/ltrace-%{version}/ install
+
+%check
+echo ====================TESTING=========================
+make check
+echo ====================TESTING END=====================
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -59,6 +52,12 @@
 %config /etc/ltrace.conf
 
 %changelog
+* Fri Apr  7 2006 Petr Machata <pmachata at redhat.com> - 0.4-1
+- Upstream 0.4
+- opt_x patch: New structure for opt_x list elements, now with
+  'found'.  Using it in options.c, elf.c.
+- testsuite patch: Automated testsuite for ltrace.
+
 * Wed Mar  1 2006 Petr Machata  <pmachata at redhat.com> - 0.3.36-4.3
 - include %{ix86} to ExclusiveArch, instead of mere i386
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	17 Nov 2004 23:20:08 -0000	1.6
+++ sources	7 Apr 2006 12:47:45 -0000	1.7
@@ -1 +1 @@
-674c9a7ddbe2a4ec10564dbb09b2261a  ltrace_0.3.36.orig.tar.gz
+8dbadad76ee360c2ed2caa915f5b1c8e  ltrace_0.4.orig.tar.gz


--- ltrace-fixes.patch DELETED ---


--- ltrace-ia64.patch DELETED ---


--- ltrace-ppc64-2.patch DELETED ---


--- ltrace-ppc64.patch DELETED ---


--- ltrace-s390x.patch DELETED ---


--- ltrace-syscallent-update.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr  7 12:48:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 08:48:40 -0400
Subject: rpms/vim/devel .cvsignore,1.13,1.14
Message-ID: <200604071248.k37Cme2k011995@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11982

Modified Files:
	.cvsignore 
Log Message:
- new snapshot


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	4 Apr 2006 12:06:46 -0000	1.13
+++ .cvsignore	7 Apr 2006 12:48:38 -0000	1.14
@@ -1,4 +1,4 @@
-vim-7.0c-20060404.tar.bz2
-vim-7.0c-extra-20060404.tar.gz
-vim-7.0c-lang-20060404.tar.gz
+vim-7.0c-20060406.tar.bz2
+vim-7.0c-extra-20060406.tar.gz
+vim-7.0c-lang-20060406.tar.gz
 cvim.zip



From fedora-cvs-commits at redhat.com  Fri Apr  7 12:57:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 08:57:57 -0400
Subject: rpms/glibc-kernheaders/FC-5 glibc-kernheaders-2.4-unistd.patch, 1.3,
	1.4 glibc-kernheaders.spec, 1.104, 1.105
Message-ID: <200604071257.k37CvvSc012124@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	glibc-kernheaders-2.4-unistd.patch glibc-kernheaders.spec 
Log Message:
fix fstatat64 on i386

glibc-kernheaders-2.4-unistd.patch:
 asm-alpha/unistd.h  |   32 ++++++++++++++++++++++++++------
 asm-i386/unistd.h   |   27 +++++++++++++++++++++++++++
 asm-ia64/unistd.h   |   17 +++++++++++++++--
 asm-ppc/unistd.h    |   24 ++++++++++++++++++++++--
 asm-ppc64/unistd.h  |   26 ++++++++++++++++++++++++--
 asm-s390/unistd.h   |   14 ++++++++++++--
 asm-s390x/unistd.h  |   15 +++++++++++++--
 asm-x86_64/unistd.h |   30 ++++++++++++++++++++++++++++--
 8 files changed, 167 insertions(+), 18 deletions(-)

Index: glibc-kernheaders-2.4-unistd.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/FC-5/glibc-kernheaders-2.4-unistd.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glibc-kernheaders-2.4-unistd.patch	23 Jan 2006 20:45:03 -0000	1.3
+++ glibc-kernheaders-2.4-unistd.patch	7 Apr 2006 12:57:54 -0000	1.4
@@ -86,7 +86,7 @@
 +#define __NR_mknodat		297
 +#define __NR_fchownat		298
 +#define __NR_futimesat		299
-+#define __NR_newfstatat		300
++#define __NR_fstatat64		300
 +#define __NR_unlinkat		301
 +#define __NR_renameat		302
 +#define __NR_linkat		303


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/FC-5/glibc-kernheaders.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- glibc-kernheaders.spec	11 Feb 2006 03:11:51 -0000	1.104
+++ glibc-kernheaders.spec	7 Apr 2006 12:57:54 -0000	1.105
@@ -1,7 +1,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 5.2
+Release: 6
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -176,6 +176,9 @@
 
 
 %changelog
+* Fri Apr 07 2006 David Woodhouse <dwmw2 at redhat.com> - 3.0-6
+- Fix fstatat64 on i386 (it's not newfstatat)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.0-5.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Apr  7 13:08:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 09:08:27 -0400
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders-2.4-unistd.patch, 1.3,
	1.4 glibc-kernheaders.spec, 1.104, 1.105
Message-ID: <200604071308.k37D8RYe012238@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	glibc-kernheaders-2.4-unistd.patch glibc-kernheaders.spec 
Log Message:
fix fstatat64 on i386

glibc-kernheaders-2.4-unistd.patch:
 asm-alpha/unistd.h  |   32 ++++++++++++++++++++++++++------
 asm-i386/unistd.h   |   27 +++++++++++++++++++++++++++
 asm-ia64/unistd.h   |   17 +++++++++++++++--
 asm-ppc/unistd.h    |   24 ++++++++++++++++++++++--
 asm-ppc64/unistd.h  |   26 ++++++++++++++++++++++++--
 asm-s390/unistd.h   |   14 ++++++++++++--
 asm-s390x/unistd.h  |   15 +++++++++++++--
 asm-x86_64/unistd.h |   30 ++++++++++++++++++++++++++++--
 8 files changed, 167 insertions(+), 18 deletions(-)

Index: glibc-kernheaders-2.4-unistd.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders-2.4-unistd.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glibc-kernheaders-2.4-unistd.patch	23 Jan 2006 20:45:03 -0000	1.3
+++ glibc-kernheaders-2.4-unistd.patch	7 Apr 2006 13:07:53 -0000	1.4
@@ -86,7 +86,7 @@
 +#define __NR_mknodat		297
 +#define __NR_fchownat		298
 +#define __NR_futimesat		299
-+#define __NR_newfstatat		300
++#define __NR_fstat64		300
 +#define __NR_unlinkat		301
 +#define __NR_renameat		302
 +#define __NR_linkat		303


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- glibc-kernheaders.spec	11 Feb 2006 03:11:51 -0000	1.104
+++ glibc-kernheaders.spec	7 Apr 2006 13:07:54 -0000	1.105
@@ -1,7 +1,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 5.2
+Release: 6%{?dist}
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -176,6 +176,9 @@
 
 
 %changelog
+* Fri Apr 07 2006 David Woodhouse <dwmw2 at redhat.com> - 3.0-6
+- Fix fstatat64 on i386 (it's not newfstatat)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.0-5.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Apr  7 13:55:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 09:55:33 -0400
Subject: rpms/cryptsetup-luks/devel .cvsignore, 1.7, 1.8 cryptsetup-luks.spec,
	1.24, 1.25 sources, 1.7, 1.8
Message-ID: <200604071355.k37DtXcc007935@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/cryptsetup-luks/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7920

Modified Files:
	.cvsignore cryptsetup-luks.spec sources 
Log Message:
update to final 1.0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cryptsetup-luks/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	27 Feb 2006 19:23:48 -0000	1.7
+++ .cvsignore	7 Apr 2006 13:55:31 -0000	1.8
@@ -1 +1 @@
-cryptsetup-luks-1.0.3-rc2.tar.bz2
+cryptsetup-luks-1.0.3.tar.bz2


Index: cryptsetup-luks.spec
===================================================================
RCS file: /cvs/dist/rpms/cryptsetup-luks/devel/cryptsetup-luks.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- cryptsetup-luks.spec	3 Apr 2006 21:14:21 -0000	1.24
+++ cryptsetup-luks.spec	7 Apr 2006 13:55:31 -0000	1.25
@@ -1,11 +1,11 @@
 Summary: A utility for setting up encrypted filesystems
 Name: cryptsetup-luks
 Version: 1.0.3
-Release: 0.rc2
+Release: 1
 License: GPL
 Group: Applications/System
 URL: http://clemens.endorphin.org/LUKS
-Source: http://clemens.endorphin.org/cryptsetup-luks-%{version}-rc2.tar.bz2
+Source: http://luks.endorphin.org/source/cryptsetup-luks-%{version}.tar.bz2
 Patch: cryptsetup-luks-1.0.1-proto.patch
 Patch2: cryptsetup-luks-1.0.1-sepol.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -65,6 +65,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Apr  7 2006 Bill Nottingham <notting at redhat.com> 1.0.3-1
+- update to final 1.0.3
+
 * Wed Feb 27 2006 Bill Nottingham <notting at redhat.com> 1.0.3-0.rc2
 - update to 1.0.3rc2, fixes bug with HAL & encrypted devices (#182658)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cryptsetup-luks/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Feb 2006 19:23:48 -0000	1.7
+++ sources	7 Apr 2006 13:55:31 -0000	1.8
@@ -1 +1 @@
-13aeff28bbf5883e1312733eb65fd53f  cryptsetup-luks-1.0.3-rc2.tar.bz2
+e134b82b4706a28ba1d73b9176d5ad0c  cryptsetup-luks-1.0.3.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr  7 13:57:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 09:57:53 -0400
Subject: rpms/cryptsetup-luks/devel cryptsetup-luks.spec,1.25,1.26
Message-ID: <200604071357.k37Dvr2I008006@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/cryptsetup-luks/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7993

Modified Files:
	cryptsetup-luks.spec 
Log Message:
fix


Index: cryptsetup-luks.spec
===================================================================
RCS file: /cvs/dist/rpms/cryptsetup-luks/devel/cryptsetup-luks.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- cryptsetup-luks.spec	7 Apr 2006 13:55:31 -0000	1.25
+++ cryptsetup-luks.spec	7 Apr 2006 13:57:51 -0000	1.26
@@ -31,7 +31,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc2
+%setup -q -n %{name}-%{version}
 %patch -p1
 %patch2 -p1
 



From fedora-cvs-commits at redhat.com  Fri Apr  7 14:51:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 10:51:49 -0400
Subject: rpms/gnucash/devel gnucash.spec,1.30,1.31
Message-ID: <200604071451.k37EpnjW004218@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4205

Modified Files:
	gnucash.spec 
Log Message:
hack in perl DateManip chcek by hand



Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gnucash.spec	6 Apr 2006 04:54:01 -0000	1.30
+++ gnucash.spec	7 Apr 2006 14:51:46 -0000	1.31
@@ -32,6 +32,8 @@
 BuildRequires: libofx-devel, aqbanking-devel, docbook-style-xsl
 BuildRequires: desktop-file-utils, scrollkeeper, texinfo, libtool-ltdl-devel
 Requires: slib >= 3a1-5
+# hack
+Requires: perl(Date::Manip)
 Prereq: /sbin/ldconfig, scrollkeeper >= 0.3.4
 %define __perl_requires  %{nil}
 Obsoletes: gnucash-backend-postgres



From fedora-cvs-commits at redhat.com  Fri Apr  7 15:12:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 11:12:09 -0400
Subject: rpms/cups/devel cups-str1532.patch,NONE,1.1 cups.spec,1.155,1.156
Message-ID: <200604071512.k37FC9iA004566@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str1532.patch 
Log Message:
- Only warn about ACLs once (STR #1532).

cups-str1532.patch:
 0 files changed

--- NEW FILE cups-str1532.patch ---
--- cups-1.2rc1/scheduler/cert.c	(revision 5380)
+++ cups-1.2rc1/scheduler/cert.c	(working copy)
@@ -107,6 +107,8 @@
 #  ifdef HAVE_MBR_UID_TO_UUID
     uuid_t		group;		/* Group ID */
 #  endif /* HAVE_MBR_UID_TO_UUID */
+    static int		acls_not_supported = 0;
+					/* Only warn once */
 #endif /* HAVE_ACL_INIT */
 
 
@@ -201,8 +203,9 @@
 
       if (acl_valid(acl))
       {
-        char *text, *textptr;
+        char *text, *textptr;		/* Temporary string */
 
+
         cupsdLogMessage(CUPSD_LOG_ERROR, "ACL did not validate: %s",
 	                strerror(errno));
         text = acl_to_text(acl, NULL);
@@ -217,9 +220,16 @@
 #  endif /* HAVE_MBR_UID_TO_UUID */
 
       if (acl_set_fd(fd, acl))
-	cupsdLogMessage(CUPSD_LOG_ERROR,
-			"Unable to set ACLs on root certificate \"%s\" - %s",
-			filename, strerror(errno));
+      {
+	if (errno != EOPNOTSUPP || !acls_not_supported)
+	  cupsdLogMessage(CUPSD_LOG_ERROR,
+			  "Unable to set ACLs on root certificate \"%s\" - %s",
+			  filename, strerror(errno));
+
+	if (errno == EOPNOTSUPP)
+	  acls_not_supported = 1;
+      }
+
       acl_free(acl);
     }
 #endif /* HAVE_ACL_INIT */


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- cups.spec	6 Apr 2006 14:14:33 -0000	1.155
+++ cups.spec	7 Apr 2006 15:12:06 -0000	1.156
@@ -43,6 +43,7 @@
 Patch20: cups-direct-usb.patch
 Patch21: cups-pstops.patch
 Patch22: cups-dest-cache-v2.patch
+Patch23: cups-str1532.patch
 Patch24: cups-maxlogsize.patch
 Patch28: cups-no-propagate-ipp-port.patch
 Patch32: cups-pid.patch
@@ -62,7 +63,7 @@
 Obsoletes: lpd lpr LPRng <= 3.8.15-3
 Provides: lpd lpr LPRng = 3.8.15-3
 
-BuildPrereq: pam-devel openssl-devel pkgconfig
+BuildPrereq: pam-devel pkgconfig
 BuildPrereq: gnutls-devel
 BuildRequires: openldap-devel
 BuildRequires: make >= 1:3.80
@@ -78,7 +79,6 @@
 Summary: Common Unix Printing System - development environment
 Group: Development/Libraries
 Requires: %{name}-libs = %{epoch}:%{version}
-Requires: openssl-devel
 
 %package libs
 Summary: Common Unix Printing System - libraries
@@ -139,6 +139,7 @@
 %patch20 -p1 -b .direct-usb
 %patch21 -p1 -b .pstops
 %patch22 -p1 -b .dest-cache-v2
+%patch23 -p1 -b .str1532
 %patch24 -p1 -b .maxlogsize
 %patch28 -p1 -b .no-propagate-ipp-port
 %patch32 -p1 -b .pid
@@ -155,11 +156,7 @@
 perl -pi -e "s,^.SILENT:,," Makedefs.in
 
 %build
-if pkg-config openssl ; then
-  export CFLAGS=`pkg-config --cflags openssl`
-  export CPPFLAGS=`pkg-config --cflags-only-I openssl`
-  export LDFLAGS=`pkg-config --libs-only-L openssl`
-fi
+export CFLAGS="-DLDAP_DEPRECATED=1"
 %configure --with-docdir=%{_docdir}/cups-%{version} \
 	--with-optim="$RPM_OPT_FLAGS $CFLAGS -fstack-protector-all"
 
@@ -388,6 +385,11 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com>
+- No longer need openssl-devel.
+- Build with LDAP_DEPRECATED=1, to pick up declarations of ldap_init() etc.
+- Only warn about ACLs once (STR #1532).
+
 * Thu Apr  6 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.7
 - Build requires openldap-devel.
 - Sync pstops.c with svn 5372.



From fedora-cvs-commits at redhat.com  Fri Apr  7 15:14:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 11:14:04 -0400
Subject: rpms/cups/FC-5 cups.spec,1.142,1.143
Message-ID: <200604071514.k37FE4Uq004640@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Log Message:
* Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com>
- No longer need openssl-devel.



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- cups.spec	6 Apr 2006 14:14:01 -0000	1.142
+++ cups.spec	7 Apr 2006 15:14:02 -0000	1.143
@@ -62,7 +62,7 @@
 Obsoletes: lpd lpr LPRng <= 3.8.15-3
 Provides: lpd lpr LPRng = 3.8.15-3
 
-BuildPrereq: pam-devel openssl-devel pkgconfig
+BuildPrereq: pam-devel pkgconfig
 BuildPrereq: gnutls-devel
 BuildRequires: openldap-devel
 BuildRequires: make >= 1:3.80
@@ -82,7 +82,6 @@
 Summary: Common Unix Printing System - development environment
 Group: Development/Libraries
 Requires: %{name}-libs = %{epoch}:%{version}
-Requires: openssl-devel
 
 %package libs
 Summary: Common Unix Printing System - libraries
@@ -159,11 +158,6 @@
 perl -pi -e "s,^.SILENT:,," Makedefs.in
 
 %build
-if pkg-config openssl ; then
-  export CFLAGS=`pkg-config --cflags openssl`
-  export CPPFLAGS=`pkg-config --cflags-only-I openssl`
-  export LDFLAGS=`pkg-config --libs-only-L openssl`
-fi
 %configure --with-docdir=%{_docdir}/cups-%{version} \
 	--with-optim="$RPM_OPT_FLAGS $CFLAGS -fstack-protector-all"
 
@@ -392,6 +386,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com>
+- No longer need openssl-devel.
+
 * Thu Apr  6 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.7
 - Build requires openldap-devel.
 - Sync pstops.c with svn 5372.



From fedora-cvs-commits at redhat.com  Fri Apr  7 15:14:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 11:14:49 -0400
Subject: rpms/cups/FC-5 cups.spec,1.143,1.144
Message-ID: <200604071514.k37FEnF9004671@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Log Message:
- Build with LDAP_DEPRECATED=1, to pick up declarations of ldap_init() etc.


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- cups.spec	7 Apr 2006 15:14:02 -0000	1.143
+++ cups.spec	7 Apr 2006 15:14:41 -0000	1.144
@@ -158,6 +158,7 @@
 perl -pi -e "s,^.SILENT:,," Makedefs.in
 
 %build
+export CFLAGS="-DLDAP_DEPRECATED=1"
 %configure --with-docdir=%{_docdir}/cups-%{version} \
 	--with-optim="$RPM_OPT_FLAGS $CFLAGS -fstack-protector-all"
 
@@ -388,6 +389,7 @@
 %changelog
 * Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com>
 - No longer need openssl-devel.
+- Build with LDAP_DEPRECATED=1, to pick up declarations of ldap_init() etc.
 
 * Thu Apr  6 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.7
 - Build requires openldap-devel.



From fedora-cvs-commits at redhat.com  Fri Apr  7 15:16:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 11:16:51 -0400
Subject: rpms/cups/FC-5 cups-str1532.patch,NONE,1.1 cups.spec,1.144,1.145
Message-ID: <200604071516.k37FGpSX006490@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str1532.patch 
Log Message:
- Only warn about ACLs once (STR #1532).

cups-str1532.patch:
 0 files changed

--- NEW FILE cups-str1532.patch ---
--- cups-1.2rc1/scheduler/cert.c	(revision 5380)
+++ cups-1.2rc1/scheduler/cert.c	(working copy)
@@ -107,6 +107,8 @@
 #  ifdef HAVE_MBR_UID_TO_UUID
     uuid_t		group;		/* Group ID */
 #  endif /* HAVE_MBR_UID_TO_UUID */
+    static int		acls_not_supported = 0;
+					/* Only warn once */
 #endif /* HAVE_ACL_INIT */
 
 
@@ -201,8 +203,9 @@
 
       if (acl_valid(acl))
       {
-        char *text, *textptr;
+        char *text, *textptr;		/* Temporary string */
 
+
         cupsdLogMessage(CUPSD_LOG_ERROR, "ACL did not validate: %s",
 	                strerror(errno));
         text = acl_to_text(acl, NULL);
@@ -217,9 +220,16 @@
 #  endif /* HAVE_MBR_UID_TO_UUID */
 
       if (acl_set_fd(fd, acl))
-	cupsdLogMessage(CUPSD_LOG_ERROR,
-			"Unable to set ACLs on root certificate \"%s\" - %s",
-			filename, strerror(errno));
+      {
+	if (errno != EOPNOTSUPP || !acls_not_supported)
+	  cupsdLogMessage(CUPSD_LOG_ERROR,
+			  "Unable to set ACLs on root certificate \"%s\" - %s",
+			  filename, strerror(errno));
+
+	if (errno == EOPNOTSUPP)
+	  acls_not_supported = 1;
+      }
+
       acl_free(acl);
     }
 #endif /* HAVE_ACL_INIT */


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- cups.spec	7 Apr 2006 15:14:41 -0000	1.144
+++ cups.spec	7 Apr 2006 15:16:46 -0000	1.145
@@ -43,6 +43,7 @@
 Patch20: cups-direct-usb.patch
 Patch21: cups-pstops.patch
 Patch22: cups-dest-cache-v2.patch
+Patch23: cups-str1532.patch
 Patch24: cups-maxlogsize.patch
 Patch28: cups-no-propagate-ipp-port.patch
 Patch32: cups-pid.patch
@@ -142,6 +143,7 @@
 %patch20 -p1 -b .direct-usb
 %patch21 -p1 -b .pstops
 %patch22 -p1 -b .dest-cache-v2
+%patch23 -p1 -b .str1532
 %patch24 -p1 -b .maxlogsize
 %patch28 -p1 -b .no-propagate-ipp-port
 %patch32 -p1 -b .pid
@@ -390,6 +392,7 @@
 * Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com>
 - No longer need openssl-devel.
 - Build with LDAP_DEPRECATED=1, to pick up declarations of ldap_init() etc.
+- Only warn about ACLs once (STR #1532).
 
 * Thu Apr  6 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.7
 - Build requires openldap-devel.



From fedora-cvs-commits at redhat.com  Fri Apr  7 15:21:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 11:21:13 -0400
Subject: rpms/cups/devel cups-str1533.patch,NONE,1.1 cups.spec,1.156,1.157
Message-ID: <200604071521.k37FL5OR018634@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str1533.patch 
Log Message:
- Fix imagetops filter (STR #1533).

cups-str1533.patch:
 0 files changed

--- NEW FILE cups-str1533.patch ---
--- cups-1.2rc1/filter/imagetops.c	(revision 5378)
+++ cups-1.2rc1/filter/imagetops.c	(working copy)
@@ -873,7 +873,7 @@
           }
 
           printf("<<"
-                 "/cupsImageType 1"
+                 "/ImageType 1"
 		 "/Width %d"
 		 "/Height %d"
 		 "/BitsPerComponent 8",
@@ -892,12 +892,12 @@
 		break;
           }
 
-          fputs("/DataSource currentfile /ASCII85Decode filter", stdout);
+          fputs("\n/DataSource currentfile/ASCII85Decode filter", stdout);
 
           if (((xc1 - xc0 + 1) / xprint) < 100.0)
             fputs("/Interpolate true", stdout);
 
-          puts("/cupsImageMatrix[1 0 0 -1 0 1]>>image");
+          puts("/ImageMatrix[1 0 0 -1 0 1]>>image");
 
           for (y = yc0, out_offset = 0; y <= yc1; y ++)
           {


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- cups.spec	7 Apr 2006 15:12:06 -0000	1.156
+++ cups.spec	7 Apr 2006 15:21:02 -0000	1.157
@@ -45,6 +45,7 @@
 Patch22: cups-dest-cache-v2.patch
 Patch23: cups-str1532.patch
 Patch24: cups-maxlogsize.patch
+Patch25: cups-str1533.patch
 Patch28: cups-no-propagate-ipp-port.patch
 Patch32: cups-pid.patch
 Patch40: cups-link.patch
@@ -141,6 +142,7 @@
 %patch22 -p1 -b .dest-cache-v2
 %patch23 -p1 -b .str1532
 %patch24 -p1 -b .maxlogsize
+%patch25 -p1 -b .str1533
 %patch28 -p1 -b .no-propagate-ipp-port
 %patch32 -p1 -b .pid
 %patch40 -p1 -b .link
@@ -389,6 +391,7 @@
 - No longer need openssl-devel.
 - Build with LDAP_DEPRECATED=1, to pick up declarations of ldap_init() etc.
 - Only warn about ACLs once (STR #1532).
+- Fix imagetops filter (STR #1533).
 
 * Thu Apr  6 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.7
 - Build requires openldap-devel.



From fedora-cvs-commits at redhat.com  Fri Apr  7 15:23:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 11:23:16 -0400
Subject: rpms/cups/FC-5 cups-str1533.patch,NONE,1.1 cups.spec,1.145,1.146
Message-ID: <200604071523.k37FNGIT018743@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str1533.patch 
Log Message:
- Fix imagetops filter (STR #1533).

cups-str1533.patch:
 0 files changed

--- NEW FILE cups-str1533.patch ---
--- cups-1.2rc1/filter/imagetops.c	(revision 5378)
+++ cups-1.2rc1/filter/imagetops.c	(working copy)
@@ -873,7 +873,7 @@
           }
 
           printf("<<"
-                 "/cupsImageType 1"
+                 "/ImageType 1"
 		 "/Width %d"
 		 "/Height %d"
 		 "/BitsPerComponent 8",
@@ -892,12 +892,12 @@
 		break;
           }
 
-          fputs("/DataSource currentfile /ASCII85Decode filter", stdout);
+          fputs("\n/DataSource currentfile/ASCII85Decode filter", stdout);
 
           if (((xc1 - xc0 + 1) / xprint) < 100.0)
             fputs("/Interpolate true", stdout);
 
-          puts("/cupsImageMatrix[1 0 0 -1 0 1]>>image");
+          puts("/ImageMatrix[1 0 0 -1 0 1]>>image");
 
           for (y = yc0, out_offset = 0; y <= yc1; y ++)
           {


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- cups.spec	7 Apr 2006 15:16:46 -0000	1.145
+++ cups.spec	7 Apr 2006 15:23:00 -0000	1.146
@@ -45,6 +45,7 @@
 Patch22: cups-dest-cache-v2.patch
 Patch23: cups-str1532.patch
 Patch24: cups-maxlogsize.patch
+Patch25: cups-str1533.patch
 Patch28: cups-no-propagate-ipp-port.patch
 Patch32: cups-pid.patch
 Patch40: cups-link.patch
@@ -145,6 +146,7 @@
 %patch22 -p1 -b .dest-cache-v2
 %patch23 -p1 -b .str1532
 %patch24 -p1 -b .maxlogsize
+%patch25 -p1 -b .str1533
 %patch28 -p1 -b .no-propagate-ipp-port
 %patch32 -p1 -b .pid
 %patch40 -p1 -b .link
@@ -393,6 +395,7 @@
 - No longer need openssl-devel.
 - Build with LDAP_DEPRECATED=1, to pick up declarations of ldap_init() etc.
 - Only warn about ACLs once (STR #1532).
+- Fix imagetops filter (STR #1533).
 
 * Thu Apr  6 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.7
 - Build requires openldap-devel.



From fedora-cvs-commits at redhat.com  Fri Apr  7 15:34:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 11:34:56 -0400
Subject: rpms/cups/devel cups-pstops.patch,1.1,1.2 cups.spec,1.157,1.158
Message-ID: <200604071534.k37FYusd019070@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups-pstops.patch cups.spec 
Log Message:
- Sync pstops.c with svn 5382.

cups-pstops.patch:
 pstops.c |  202 +++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 121 insertions(+), 81 deletions(-)

Index: cups-pstops.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-pstops.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-pstops.patch	6 Apr 2006 14:14:33 -0000	1.1
+++ cups-pstops.patch	7 Apr 2006 15:34:42 -0000	1.2
@@ -1,5 +1,5 @@
---- cups-1.2rc1/filter/pstops.c.pstops	2006-03-23 19:33:35.000000000 +0000
-+++ cups-1.2rc1/filter/pstops.c	2006-04-06 15:11:02.000000000 +0100
+--- cups-1.2rc1//home/tim/devel/pkgs/cups/devel/cups-1.2rc1/filter/pstops.c	2006-03-23 19:33:35.000000000 +0000
++++ cups-1.2rc1/filter/pstops.c	2006-04-07 16:05:46.000000000 +0100
 @@ -1,5 +1,5 @@
  /*
 - * "$Id$"
@@ -7,7 +7,15 @@
   *
   *   PostScript filter for the Common UNIX Printing System (CUPS).
   *
-@@ -307,10 +307,13 @@
+@@ -56,6 +56,7 @@
+  */
+ 
+ #include "common.h"
++#include <limits.h>
+ #include <math.h>
+ #include <cups/file.h>
+ #include <cups/array.h>
+@@ -307,10 +308,13 @@
  
      fputs("DEBUG: Skipping PJL header...\n", stderr);
  
@@ -22,7 +30,22 @@
      if ((len = cupsFileGetLine(fp, line, sizeof(line))) == 0)
        break;
    }
-@@ -590,6 +593,12 @@
+@@ -434,12 +438,10 @@
+     * See if we only print even or odd pages...
+     */
+ 
+-    if (!strcasecmp(doc->page_set, "even") &&
+-        ((page - 1) % (doc->number_up << 1)) < doc->number_up)
++    if (!strcasecmp(doc->page_set, "even") && (page & 1))
+       return (0);
+ 
+-    if (!strcasecmp(doc->page_set, "odd") &&
+-        ((page - 1) % (doc->number_up << 1)) >= doc->number_up)
++    if (!strcasecmp(doc->page_set, "odd") && !(page & 1))
+       return (0);
+   }
+ 
+@@ -590,6 +592,12 @@
      {
        if (saw_bounding_box)
          fputs("ERROR: Duplicate %%BoundingBox: comment seen!\n", stderr);
@@ -35,7 +58,7 @@
        else if (sscanf(line + 14, "%d%d%d%d", doc->bounding_box + 0,
  	              doc->bounding_box + 1, doc->bounding_box + 2,
  		      doc->bounding_box + 3) != 4)
-@@ -738,14 +747,26 @@
+@@ -738,14 +746,26 @@
    */
  
    fprintf(stderr, "DEBUG: Before copy_prolog - %s", line);
@@ -64,7 +87,12 @@
  
   /*
    * Then process pages until we have no more...
-@@ -778,9 +799,9 @@
+@@ -774,13 +794,13 @@
+   * Finish up the last page(s)...
+   */
+ 
+-  if (number && is_not_last_page(number))
++  if (number && is_not_last_page(number) && cupsArrayLast(doc->pages))
    {
      pageinfo = (pstops_page_t *)cupsArrayLast(doc->pages);
  
@@ -76,7 +104,7 @@
  
      pageinfo->length = cupsFileTell(doc->temp) - pageinfo->offset;
    }
-@@ -802,9 +823,9 @@
+@@ -802,9 +822,9 @@
        printf("%%%%Page: (filler) %d\n", doc->page);
      }
  
@@ -88,7 +116,191 @@
  
      pageinfo->length = cupsFileTell(doc->temp) - pageinfo->offset;
    }
-@@ -1368,7 +1389,7 @@
+@@ -1265,98 +1285,118 @@
+   * Copy any page setup commands...
+   */
+ 
+-  if (!strncmp(line, "%%BeginPageSetup", 16))
++  if (first_page)
+   {
+-   /*
+-    * Copy page setup commands...
+-    */
+-
+-    doc_write(doc, line, linelen);
++    doc_puts(doc, "%%BeginPageSetup\n");
+ 
+-    while ((linelen = cupsFileGetLine(fp, line, linesize)) > 0)
++    if (pageinfo->num_options > 0)
+     {
+-      if (!strncmp(line, "%%EndPageSetup", 14))
+-        break;
+-      else if (!strncmp(line, "%%Include", 9))
+-        continue;
++      int		i;		/* Looping var */
++      ppd_option_t	*option;	/* PPD option */
++      int		min_order;	/* Minimum OrderDependency value */
++      char		*doc_setup,	/* DocumentSetup commands to send */
++			*any_setup;	/* AnySetup commands to send */
+ 
+-      if (doc->number_up == 1 && !doc->fitplot)
+-	doc_write(doc, line, linelen);
+-    }
+ 
+-   /*
+-    * Skip %%EndPageSetup...
+-    */
++     /*
++      * Yes, figure out the minimum OrderDependency value...
++      */
+ 
+-    if (linelen > 0)
+-      linelen = cupsFileGetLine(fp, line, linesize);
++      if ((option = ppdFindOption(ppd, "PageRegion")) != NULL)
++	min_order = option->order;
++      else
++	min_order = 999.0f;
+ 
+-    if (pageinfo->num_options == 0)
+-      doc_puts(doc, "%%EndPageSetup\n");
+-  }
+-  else if (first_page && pageinfo->num_options > 0)
+-    doc_puts(doc, "%%BeginPageSetup\n");
++      for (i = 0; i < pageinfo->num_options; i ++)
++	if ((option = ppdFindOption(ppd, pageinfo->options[i].name)) != NULL &&
++            option->order < min_order)
++          min_order = option->order;
+ 
+-  if (first_page && pageinfo->num_options > 0)
+-  {
+-    int		i;			/* Looping var */
+-    ppd_option_t *option;		/* PPD option */
+-    int		min_order;		/* Minimum OrderDependency value */
+-    char	*doc_setup,		/* DocumentSetup commands to send */
+-		*any_setup;		/* AnySetup commands to send */
++     /*
++      * Mark and extract them...
++      */
+ 
++      cupsMarkOptions(ppd, pageinfo->num_options, pageinfo->options);
+ 
+-   /*
+-    * Yes, figure out the minimum OrderDependency value...
+-    */
++      doc_setup = ppdEmitString(ppd, PPD_ORDER_DOCUMENT, min_order);
++      any_setup = ppdEmitString(ppd, PPD_ORDER_ANY, min_order);
+ 
+-    if ((option = ppdFindOption(ppd, "PageRegion")) != NULL)
+-      min_order = option->order;
+-    else
+-      min_order = 999.0f;
++     /*
++      * Then send them out...
++      */
+ 
+-    for (i = 0; i < pageinfo->num_options; i ++)
+-      if ((option = ppdFindOption(ppd, pageinfo->options[i].name)) != NULL &&
+-          option->order < min_order)
+-        min_order = option->order;
++      if (doc_setup)
++	doc_puts(doc, doc_setup);
+ 
+-   /*
+-    * Mark and extract them...
+-    */
++      if (any_setup)
++	doc_puts(doc, any_setup);
+ 
+-    cupsMarkOptions(ppd, pageinfo->num_options, pageinfo->options);
++     /*
++      * Free the command strings...
++      */
+ 
+-    doc_setup = ppdEmitString(ppd, PPD_ORDER_DOCUMENT, min_order);
+-    any_setup = ppdEmitString(ppd, PPD_ORDER_ANY, min_order);
++      if (doc_setup)
++	free(doc_setup);
+ 
+-   /*
+-    * Then send them out...
+-    */
++      if (any_setup)
++	free(any_setup);
++    }
++  }
+ 
+-    if (doc_setup)
+-      doc_puts(doc, doc_setup);
++ /*
++  * Prep for the start of the page description...
++  */
+ 
+-    if (any_setup)
+-      doc_puts(doc, any_setup);
++  start_nup(doc, number, 1, bounding_box);
+ 
+-   /*
+-    * Free the command strings...
+-    */
++ /*
++  * Copy page setup commands as needed...
++  */
+ 
+-    if (doc_setup)
+-      free(doc_setup);
++  if (!strncmp(line, "%%BeginPageSetup", 16))
++  {
++    int	feature = 0;			/* In a Begin/EndFeature block? */
+ 
+-    if (any_setup)
+-      free(any_setup);
+ 
+-    doc_puts(doc, "%%EndPageSetup\n");
++    while ((linelen = cupsFileGetLine(fp, line, linesize)) > 0)
++    {
++      if (!strncmp(line, "%%EndPageSetup", 14))
++        break;
++      else if (!strncmp(line, "%%BeginFeature:", 15))
++      {
++        feature = 1;
++
++	if (doc->number_up > 1 || doc->fitplot)
++	  continue;
++      }
++      else if (!strncmp(line, "%%EndFeature:", 13))
++      {
++        feature = 0;
++
++	if (doc->number_up > 1 || doc->fitplot)
++	  continue;
++      }
++      else if (!strncmp(line, "%%Include", 9))
++        continue;
++
++      if (!feature || (doc->number_up == 1 && !doc->fitplot))
++	doc_write(doc, line, linelen);
++    }
++
++   /*
++    * Skip %%EndPageSetup...
++    */
++
++    if (linelen > 0)
++      linelen = cupsFileGetLine(fp, line, linesize);
+   }
+ 
+  /*
+-  * Prep for the start of the page description...
++  * Finish the PageSetup section as needed...
+   */
+ 
+-  start_nup(doc, number, 1, bounding_box);
++  if (first_page)
++    doc_puts(doc, "%%EndPageSetup\n");
+ 
+  /*
+   * Read the rest of the page description...
+@@ -1368,7 +1408,7 @@
    {
      if (level == 0 &&
          (!strncmp(line, "%%Page:", 7) ||
@@ -97,7 +309,7 @@
  	 !strncmp(line, "%%EOF", 5)))
        break;
      else if (!strncmp(line, "%%BeginDocument", 15) ||
-@@ -2400,7 +2421,7 @@
+@@ -2400,7 +2440,7 @@
    while ((linelen = cupsFileGetLine(fp, line, linesize)) > 0)
    {
      if (level == 0 &&
@@ -106,7 +318,7 @@
        break;
      else if (!strncmp(line, "%%BeginDocument", 15) ||
  	     !strncmp(line, "%ADO_BeginApplication", 21))
-@@ -2870,5 +2891,5 @@
+@@ -2870,5 +2910,5 @@
  
  
  /*


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- cups.spec	7 Apr 2006 15:21:02 -0000	1.157
+++ cups.spec	7 Apr 2006 15:34:43 -0000	1.158
@@ -392,6 +392,7 @@
 - Build with LDAP_DEPRECATED=1, to pick up declarations of ldap_init() etc.
 - Only warn about ACLs once (STR #1532).
 - Fix imagetops filter (STR #1533).
+- Sync pstops.c with svn 5382.
 
 * Thu Apr  6 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.7
 - Build requires openldap-devel.



From fedora-cvs-commits at redhat.com  Fri Apr  7 15:36:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 11:36:05 -0400
Subject: rpms/cups/FC-5 cups-pstops.patch,1.1,1.2 cups.spec,1.146,1.147
Message-ID: <200604071536.k37Fa56e019111@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups-pstops.patch cups.spec 
Log Message:
- Sync pstops.c with svn 5382.

cups-pstops.patch:
 pstops.c |  202 +++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 121 insertions(+), 81 deletions(-)

Index: cups-pstops.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-pstops.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-pstops.patch	6 Apr 2006 14:14:01 -0000	1.1
+++ cups-pstops.patch	7 Apr 2006 15:36:03 -0000	1.2
@@ -1,5 +1,5 @@
---- cups-1.2rc1/filter/pstops.c.pstops	2006-03-23 19:33:35.000000000 +0000
-+++ cups-1.2rc1/filter/pstops.c	2006-04-06 15:11:02.000000000 +0100
+--- cups-1.2rc1//home/tim/devel/pkgs/cups/devel/cups-1.2rc1/filter/pstops.c	2006-03-23 19:33:35.000000000 +0000
++++ cups-1.2rc1/filter/pstops.c	2006-04-07 16:05:46.000000000 +0100
 @@ -1,5 +1,5 @@
  /*
 - * "$Id$"
@@ -7,7 +7,15 @@
   *
   *   PostScript filter for the Common UNIX Printing System (CUPS).
   *
-@@ -307,10 +307,13 @@
+@@ -56,6 +56,7 @@
+  */
+ 
+ #include "common.h"
++#include <limits.h>
+ #include <math.h>
+ #include <cups/file.h>
+ #include <cups/array.h>
+@@ -307,10 +308,13 @@
  
      fputs("DEBUG: Skipping PJL header...\n", stderr);
  
@@ -22,7 +30,22 @@
      if ((len = cupsFileGetLine(fp, line, sizeof(line))) == 0)
        break;
    }
-@@ -590,6 +593,12 @@
+@@ -434,12 +438,10 @@
+     * See if we only print even or odd pages...
+     */
+ 
+-    if (!strcasecmp(doc->page_set, "even") &&
+-        ((page - 1) % (doc->number_up << 1)) < doc->number_up)
++    if (!strcasecmp(doc->page_set, "even") && (page & 1))
+       return (0);
+ 
+-    if (!strcasecmp(doc->page_set, "odd") &&
+-        ((page - 1) % (doc->number_up << 1)) >= doc->number_up)
++    if (!strcasecmp(doc->page_set, "odd") && !(page & 1))
+       return (0);
+   }
+ 
+@@ -590,6 +592,12 @@
      {
        if (saw_bounding_box)
          fputs("ERROR: Duplicate %%BoundingBox: comment seen!\n", stderr);
@@ -35,7 +58,7 @@
        else if (sscanf(line + 14, "%d%d%d%d", doc->bounding_box + 0,
  	              doc->bounding_box + 1, doc->bounding_box + 2,
  		      doc->bounding_box + 3) != 4)
-@@ -738,14 +747,26 @@
+@@ -738,14 +746,26 @@
    */
  
    fprintf(stderr, "DEBUG: Before copy_prolog - %s", line);
@@ -64,7 +87,12 @@
  
   /*
    * Then process pages until we have no more...
-@@ -778,9 +799,9 @@
+@@ -774,13 +794,13 @@
+   * Finish up the last page(s)...
+   */
+ 
+-  if (number && is_not_last_page(number))
++  if (number && is_not_last_page(number) && cupsArrayLast(doc->pages))
    {
      pageinfo = (pstops_page_t *)cupsArrayLast(doc->pages);
  
@@ -76,7 +104,7 @@
  
      pageinfo->length = cupsFileTell(doc->temp) - pageinfo->offset;
    }
-@@ -802,9 +823,9 @@
+@@ -802,9 +822,9 @@
        printf("%%%%Page: (filler) %d\n", doc->page);
      }
  
@@ -88,7 +116,191 @@
  
      pageinfo->length = cupsFileTell(doc->temp) - pageinfo->offset;
    }
-@@ -1368,7 +1389,7 @@
+@@ -1265,98 +1285,118 @@
+   * Copy any page setup commands...
+   */
+ 
+-  if (!strncmp(line, "%%BeginPageSetup", 16))
++  if (first_page)
+   {
+-   /*
+-    * Copy page setup commands...
+-    */
+-
+-    doc_write(doc, line, linelen);
++    doc_puts(doc, "%%BeginPageSetup\n");
+ 
+-    while ((linelen = cupsFileGetLine(fp, line, linesize)) > 0)
++    if (pageinfo->num_options > 0)
+     {
+-      if (!strncmp(line, "%%EndPageSetup", 14))
+-        break;
+-      else if (!strncmp(line, "%%Include", 9))
+-        continue;
++      int		i;		/* Looping var */
++      ppd_option_t	*option;	/* PPD option */
++      int		min_order;	/* Minimum OrderDependency value */
++      char		*doc_setup,	/* DocumentSetup commands to send */
++			*any_setup;	/* AnySetup commands to send */
+ 
+-      if (doc->number_up == 1 && !doc->fitplot)
+-	doc_write(doc, line, linelen);
+-    }
+ 
+-   /*
+-    * Skip %%EndPageSetup...
+-    */
++     /*
++      * Yes, figure out the minimum OrderDependency value...
++      */
+ 
+-    if (linelen > 0)
+-      linelen = cupsFileGetLine(fp, line, linesize);
++      if ((option = ppdFindOption(ppd, "PageRegion")) != NULL)
++	min_order = option->order;
++      else
++	min_order = 999.0f;
+ 
+-    if (pageinfo->num_options == 0)
+-      doc_puts(doc, "%%EndPageSetup\n");
+-  }
+-  else if (first_page && pageinfo->num_options > 0)
+-    doc_puts(doc, "%%BeginPageSetup\n");
++      for (i = 0; i < pageinfo->num_options; i ++)
++	if ((option = ppdFindOption(ppd, pageinfo->options[i].name)) != NULL &&
++            option->order < min_order)
++          min_order = option->order;
+ 
+-  if (first_page && pageinfo->num_options > 0)
+-  {
+-    int		i;			/* Looping var */
+-    ppd_option_t *option;		/* PPD option */
+-    int		min_order;		/* Minimum OrderDependency value */
+-    char	*doc_setup,		/* DocumentSetup commands to send */
+-		*any_setup;		/* AnySetup commands to send */
++     /*
++      * Mark and extract them...
++      */
+ 
++      cupsMarkOptions(ppd, pageinfo->num_options, pageinfo->options);
+ 
+-   /*
+-    * Yes, figure out the minimum OrderDependency value...
+-    */
++      doc_setup = ppdEmitString(ppd, PPD_ORDER_DOCUMENT, min_order);
++      any_setup = ppdEmitString(ppd, PPD_ORDER_ANY, min_order);
+ 
+-    if ((option = ppdFindOption(ppd, "PageRegion")) != NULL)
+-      min_order = option->order;
+-    else
+-      min_order = 999.0f;
++     /*
++      * Then send them out...
++      */
+ 
+-    for (i = 0; i < pageinfo->num_options; i ++)
+-      if ((option = ppdFindOption(ppd, pageinfo->options[i].name)) != NULL &&
+-          option->order < min_order)
+-        min_order = option->order;
++      if (doc_setup)
++	doc_puts(doc, doc_setup);
+ 
+-   /*
+-    * Mark and extract them...
+-    */
++      if (any_setup)
++	doc_puts(doc, any_setup);
+ 
+-    cupsMarkOptions(ppd, pageinfo->num_options, pageinfo->options);
++     /*
++      * Free the command strings...
++      */
+ 
+-    doc_setup = ppdEmitString(ppd, PPD_ORDER_DOCUMENT, min_order);
+-    any_setup = ppdEmitString(ppd, PPD_ORDER_ANY, min_order);
++      if (doc_setup)
++	free(doc_setup);
+ 
+-   /*
+-    * Then send them out...
+-    */
++      if (any_setup)
++	free(any_setup);
++    }
++  }
+ 
+-    if (doc_setup)
+-      doc_puts(doc, doc_setup);
++ /*
++  * Prep for the start of the page description...
++  */
+ 
+-    if (any_setup)
+-      doc_puts(doc, any_setup);
++  start_nup(doc, number, 1, bounding_box);
+ 
+-   /*
+-    * Free the command strings...
+-    */
++ /*
++  * Copy page setup commands as needed...
++  */
+ 
+-    if (doc_setup)
+-      free(doc_setup);
++  if (!strncmp(line, "%%BeginPageSetup", 16))
++  {
++    int	feature = 0;			/* In a Begin/EndFeature block? */
+ 
+-    if (any_setup)
+-      free(any_setup);
+ 
+-    doc_puts(doc, "%%EndPageSetup\n");
++    while ((linelen = cupsFileGetLine(fp, line, linesize)) > 0)
++    {
++      if (!strncmp(line, "%%EndPageSetup", 14))
++        break;
++      else if (!strncmp(line, "%%BeginFeature:", 15))
++      {
++        feature = 1;
++
++	if (doc->number_up > 1 || doc->fitplot)
++	  continue;
++      }
++      else if (!strncmp(line, "%%EndFeature:", 13))
++      {
++        feature = 0;
++
++	if (doc->number_up > 1 || doc->fitplot)
++	  continue;
++      }
++      else if (!strncmp(line, "%%Include", 9))
++        continue;
++
++      if (!feature || (doc->number_up == 1 && !doc->fitplot))
++	doc_write(doc, line, linelen);
++    }
++
++   /*
++    * Skip %%EndPageSetup...
++    */
++
++    if (linelen > 0)
++      linelen = cupsFileGetLine(fp, line, linesize);
+   }
+ 
+  /*
+-  * Prep for the start of the page description...
++  * Finish the PageSetup section as needed...
+   */
+ 
+-  start_nup(doc, number, 1, bounding_box);
++  if (first_page)
++    doc_puts(doc, "%%EndPageSetup\n");
+ 
+  /*
+   * Read the rest of the page description...
+@@ -1368,7 +1408,7 @@
    {
      if (level == 0 &&
          (!strncmp(line, "%%Page:", 7) ||
@@ -97,7 +309,7 @@
  	 !strncmp(line, "%%EOF", 5)))
        break;
      else if (!strncmp(line, "%%BeginDocument", 15) ||
-@@ -2400,7 +2421,7 @@
+@@ -2400,7 +2440,7 @@
    while ((linelen = cupsFileGetLine(fp, line, linesize)) > 0)
    {
      if (level == 0 &&
@@ -106,7 +318,7 @@
        break;
      else if (!strncmp(line, "%%BeginDocument", 15) ||
  	     !strncmp(line, "%ADO_BeginApplication", 21))
-@@ -2870,5 +2891,5 @@
+@@ -2870,5 +2910,5 @@
  
  
  /*


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- cups.spec	7 Apr 2006 15:23:00 -0000	1.146
+++ cups.spec	7 Apr 2006 15:36:03 -0000	1.147
@@ -396,6 +396,7 @@
 - Build with LDAP_DEPRECATED=1, to pick up declarations of ldap_init() etc.
 - Only warn about ACLs once (STR #1532).
 - Fix imagetops filter (STR #1533).
+- Sync pstops.c with svn 5382.
 
 * Thu Apr  6 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.7
 - Build requires openldap-devel.



From fedora-cvs-commits at redhat.com  Fri Apr  7 15:36:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 11:36:48 -0400
Subject: rpms/cups/FC-5 cups.spec,1.147,1.148
Message-ID: <200604071536.k37FamjW019138@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Log Message:
1:1.2-0.2.rc1.2.8


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- cups.spec	7 Apr 2006 15:36:03 -0000	1.147
+++ cups.spec	7 Apr 2006 15:36:46 -0000	1.148
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2
-Release: 0.2.%{beta}.2.7
+Release: 0.2.%{beta}.2.8
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
@@ -391,7 +391,7 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com>
+* Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.8
 - No longer need openssl-devel.
 - Build with LDAP_DEPRECATED=1, to pick up declarations of ldap_init() etc.
 - Only warn about ACLs once (STR #1532).



From fedora-cvs-commits at redhat.com  Fri Apr  7 15:37:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 11:37:36 -0400
Subject: rpms/cups/devel cups.spec,1.158,1.159
Message-ID: <200604071537.k37Fbail019196@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Log Message:
1:1.2-0.2.rc1.8


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- cups.spec	7 Apr 2006 15:34:43 -0000	1.158
+++ cups.spec	7 Apr 2006 15:37:34 -0000	1.159
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2
-Release: 0.2.%{beta}.7
+Release: 0.2.%{beta}.8
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
@@ -387,7 +387,7 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com>
+* Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.8
 - No longer need openssl-devel.
 - Build with LDAP_DEPRECATED=1, to pick up declarations of ldap_init() etc.
 - Only warn about ACLs once (STR #1532).



From fedora-cvs-commits at redhat.com  Fri Apr  7 15:37:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 11:37:57 -0400
Subject: rpms/xorg-x11-proto-devel/devel .cvsignore, 1.13, 1.14 sources, 1.12,
	1.13 xorg-x11-proto-devel.spec, 1.26, 1.27
Message-ID: <200604071537.k37FbvMi019276@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	.cvsignore sources xorg-x11-proto-devel.spec 
Log Message:
auto-import xorg-x11-proto-devel-7.0-10 on branch devel from xorg-x11-proto-devel-7.0-10.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	1 Apr 2006 21:49:42 -0000	1.13
+++ .cvsignore	7 Apr 2006 15:37:55 -0000	1.14
@@ -1,5 +1,4 @@
 bigreqsproto-1.0.2.tar.bz2
-compositeproto-0.3.tar.bz2
 damageproto-1.0.3.tar.bz2
 dmxproto-2.2.2.tar.bz2
 evieext-1.0.2.tar.bz2
@@ -14,6 +13,7 @@
 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
@@ -27,4 +27,4 @@
 xineramaproto-1.1.2.tar.bz2
 xproto-7.0.4.tar.bz2
 xproxymanagementprotocol-1.0.2.tar.bz2
-scrnsaverproto-1.1.0.tar.bz2
+compositeproto-0.3.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	1 Apr 2006 21:49:42 -0000	1.12
+++ sources	7 Apr 2006 15:37:55 -0000	1.13
@@ -1,5 +1,4 @@
 95c29d9d10bf2868996c0c47a3b9a8dc  bigreqsproto-1.0.2.tar.bz2
-85e7abb79de5b49cb83524a608744b0b  compositeproto-0.3.tar.bz2
 b3eaee9850bb23020b9ac751626c7976  damageproto-1.0.3.tar.bz2
 d80acad88411e7944b9b085463d53302  dmxproto-2.2.2.tar.bz2
 2507b5d0f4b2848147fbddd155aa6cfe  evieext-1.0.2.tar.bz2
@@ -14,6 +13,7 @@
 0ed4706564a34fc2aff724aa16d3ff00  recordproto-1.13.2.tar.bz2
 28fbe8a59ebd31f098b90ec64f3d133a  renderproto-0.9.2.tar.bz2
 b823b314e37eb19dae1f297951d2e933  resourceproto-1.0.2.tar.bz2
+5d551850e6f4acdf49a13f4eb3a5bbfa  scrnsaverproto-1.1.0.tar.bz2
 3b713239e5e6b269b31cb665563358df  trapproto-3.4.3.tar.bz2
 44292d74a9a3c94b1ecb9d77a0da83e8  videoproto-2.2.2.tar.bz2
 fde0b050901f024b19159cdacdcfbd20  xcmiscproto-1.1.2.tar.bz2
@@ -27,4 +27,4 @@
 1cc292c562962ad0ad3a253cae68c632  xineramaproto-1.1.2.tar.bz2
 9b7c807841c28289151f911fc1bea707  xproto-7.0.4.tar.bz2
 d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.tar.bz2
-5d551850e6f4acdf49a13f4eb3a5bbfa  scrnsaverproto-1.1.0.tar.bz2
+54f1fbd567f57093df054f8440a60a5e  compositeproto-0.3.1.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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xorg-x11-proto-devel.spec	1 Apr 2006 21:49:42 -0000	1.26
+++ xorg-x11-proto-devel.spec	7 Apr 2006 15:37:55 -0000	1.27
@@ -10,13 +10,13 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.0
-Release: 9
+Release: 10
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
 %define sourceurl	http://xorg.freedesktop.org/releases/individual/proto
 Source0:  %{sourceurl}/bigreqsproto-1.0.2.tar.bz2
-Source1:  %{sourceurl}/compositeproto-0.3.tar.bz2
+Source1:  %{sourceurl}/compositeproto-0.3.1.tar.bz2
 Source2:  %{sourceurl}/damageproto-1.0.3.tar.bz2
 Source3:  %{sourceurl}/dmxproto-2.2.2.tar.bz2
 Source4:  %{sourceurl}/evieext-1.0.2.tar.bz2
@@ -278,6 +278,9 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Fri Apr  7 2006 Adam Jackson <ajackson at redhat.com> 7.0-10
+- Update to compositeproto-0.3.1 to fix big-endian LP64.
+
 * Sat Apr  1 2006 Adam Jackson <ajackson at redhat.com> 7.0-9
 - Update to scrnsaverproto-1.1
 



From fedora-cvs-commits at redhat.com  Fri Apr  7 15:40:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 11:40:58 -0400
Subject: rpms/libXcomposite/devel libXcomposite.spec,1.11,1.12
Message-ID: <200604071540.k37Fewfk019420@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXcomposite/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19398/devel

Modified Files:
	libXcomposite.spec 
Log Message:
auto-import libXcomposite-0.3-2 on branch devel from libXcomposite-0.3-2.src.rpm


Index: libXcomposite.spec
===================================================================
RCS file: /cvs/dist/rpms/libXcomposite/devel/libXcomposite.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libXcomposite.spec	3 Apr 2006 15:09:10 -0000	1.11
+++ libXcomposite.spec	7 Apr 2006 15:40:51 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXcomposite runtime library
 Name: libXcomposite
 Version: 0.3
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/xcomposite.pc
 
 %changelog
+* Fri Apr  7 2006 Adam Jackson <ajackson at redhat.com> 0.3-2
+- Rebuild to pick up new compositeproto headers.
+
 * Mon Apr  3 2006 Adam Jackson <ajackson at redhat.com> - 0.3-1
 - Update to 0.3 from upstream.
 



From fedora-cvs-commits at redhat.com  Fri Apr  7 15:48:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 11:48:52 -0400
Subject: rpms/libXcomposite/devel libXcomposite.spec,1.12,1.13
Message-ID: <200604071548.k37FmqoD000911@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXcomposite/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv884/devel

Modified Files:
	libXcomposite.spec 
Log Message:
auto-import libXcomposite-0.3-3 on branch devel from libXcomposite-0.3-3.src.rpm


Index: libXcomposite.spec
===================================================================
RCS file: /cvs/dist/rpms/libXcomposite/devel/libXcomposite.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXcomposite.spec	7 Apr 2006 15:40:51 -0000	1.12
+++ libXcomposite.spec	7 Apr 2006 15:48:50 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXcomposite runtime library
 Name: libXcomposite
 Version: 0.3
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,7 +9,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-proto-devel
+BuildRequires: xorg-x11-proto-devel >= 7.0-10
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
 BuildRequires: libXfixes-devel
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/xcomposite.pc
 
 %changelog
+* Fri Apr  7 2006 Adam Jackson <ajackson at redhat.com> 0.3-3
+- Note the necessary -proto-devel version in BuildRequires.
+
 * Fri Apr  7 2006 Adam Jackson <ajackson at redhat.com> 0.3-2
 - Rebuild to pick up new compositeproto headers.
 



From fedora-cvs-commits at redhat.com  Fri Apr  7 16:34:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 12:34:34 -0400
Subject: rpms/gtkhtml3/devel gtkhtml-3.10.0-im-too-late.patch, NONE,
	1.1 gtkhtml3.spec, 1.58, 1.59
Message-ID: <200604071634.k37GYYrX015564@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/gtkhtml3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15489

Modified Files:
	gtkhtml3.spec 
Added Files:
	gtkhtml-3.10.0-im-too-late.patch 
Log Message:
* Fri Apr  7 2006 Dan Williams <dcbw at redhat.com> - 3.10.0-2
- Fix crash with IM enabled



gtkhtml-3.10.0-im-too-late.patch:
 gtkhtml.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE gtkhtml-3.10.0-im-too-late.patch ---
--- gtkhtml-3.10.0/src/gtkhtml.c.fix	2006-04-07 08:54:58.000000000 -0700
+++ gtkhtml-3.10.0/src/gtkhtml.c	2006-04-07 08:55:54.000000000 -0700
@@ -3181,10 +3181,14 @@
 	PangoAttrList *attrs;
 	gchar *preedit_string;
 	gint cursor_pos, initial_position;
-	gboolean state = html->priv->im_block_reset;
+	gboolean state;
 	gboolean pop_selection = FALSE;
 	gint deleted = 0;
 
+	g_return_if_fail (html->priv != NULL);
+
+	state = html->priv->im_block_reset;
+
 	D_IM (printf ("IM preedit changed cb [begin] cursor %d(%p) mark %d(%p) active: %d\n",
 		      html->engine->cursor ? html->engine->cursor->position : 0, html->engine->cursor,
 		      html->engine->mark ? html->engine->mark->position : 0, html->engine->mark,


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- gtkhtml3.spec	13 Mar 2006 16:54:41 -0000	1.58
+++ gtkhtml3.spec	7 Apr 2006 16:34:31 -0000	1.59
@@ -5,7 +5,7 @@
 Summary: gtkhtml library
 Name: gtkhtml3
 Version: 3.10.0
-Release: 1
+Release: 2
 License: LGPL/GPL
 Group: System Environment/Libraries
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/gtkhtml/gtkhtml-%{version}.tar.bz2
@@ -27,6 +27,7 @@
 # Patches from bugzilla.ximian.com #65670, #66206
 Patch2: gtkhtml-3.3.2-imcommit.patch
 Patch3: gtkhtml-fix-indic-navigation-129212.patch
+Patch4: gtkhtml-3.10.0-im-too-late.patch
 
 %description
 GtkHTML is a lightweight HTML rendering/printing/editing engine.  It
@@ -50,6 +51,7 @@
 
 %patch1 -p1 -b .crash
 %patch3 -p1 -b .fix-129212
+%patch4 -p1 -b .im-too-late
 
 %build
 %configure
@@ -96,6 +98,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Apr  7 2006 Dan Williams <dcbw at redhat.com> - 3.10.0-2
+- Fix crash with IM enabled
+
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 3.10.0-1
 - Update to 3.10.0
 



From fedora-cvs-commits at redhat.com  Fri Apr  7 16:58:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 12:58:49 -0400
Subject: rpms/cups/devel cups-scheduler.patch, NONE, 1.1 cups.spec, 1.159,
	1.160
Message-ID: <200604071658.k37GwnXb029561@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-scheduler.patch 
Log Message:
* Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com>
- Sync scheduler/* with svn 5383.


cups-scheduler.patch:
 cert.c          |    4 -
 client.c        |   95 ++++++++++++++++++++++++-----------------------
 conf.c          |    7 +--
 dirsvc.c        |   20 +++++++--
 env.c           |   11 ++---
 ipp.c           |   29 +++++++++++---
 job.c           |   38 ++++++++++++------
 job.h           |    6 +-
 main.c          |  113 +++++++++++++-------------------------------------------
 printers.c      |    9 +++-
 process.c       |   56 ++++++++++++++-------------
 server.c        |    5 --
 statbuf.c       |    8 ++-
 subscriptions.h |    6 --
 14 files changed, 203 insertions(+), 204 deletions(-)

--- NEW FILE cups-scheduler.patch ---
--- cups-1.2rc1/scheduler/cert.c	2006-04-07 17:56:09.000000000 +0100
+++ /tmp/tim/cups/scheduler/cert.c	2006-04-07 16:05:46.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: cert.c 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id: cert.c 5381 2006-04-07 14:39:46Z mike $"
  *
  *   Authentication certificate routines for the Common UNIX
  *   Printing System (CUPS).
@@ -426,5 +426,5 @@
 
 
 /*
- * End of "$Id: cert.c 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id: cert.c 5381 2006-04-07 14:39:46Z mike $".
  */
--- cups-1.2rc1/scheduler/client.c	2006-04-07 17:56:09.000000000 +0100
+++ /tmp/tim/cups/scheduler/client.c	2006-04-06 23:37:08.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: client.c 5335 2006-03-24 02:56:20Z mike $"
+ * "$Id: client.c 5373 2006-04-06 20:03:32Z mike $"
  *
  *   Client routines for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -957,7 +957,7 @@
       else
         snprintf(locale, sizeof(locale), "%s.%s",
 	         con->http.fields[HTTP_FIELD_ACCEPT_LANGUAGE], DefaultCharset);
-        
+
       con->language = cupsLangGet(locale);
     }
     else
@@ -2246,7 +2246,11 @@
 	    */
 
             if (!strncasecmp(buf, "Location:", 9))
+	    {
   	      cupsdSendHeader(con, HTTP_SEE_OTHER, NULL);
+	      if (httpPrintf(HTTP(con), "Content-Length: 0\r\n") < 0)
+		return (0);
+	    }
 	    else if (!strncasecmp(buf, "Status:", 7))
   	      cupsdSendError(con, atoi(buf + 7));
 	    else
@@ -2470,6 +2474,8 @@
       while (*ptr != '\0' && *ptr != ';')
         ptr ++;
     }
+    else
+      ptr ++;
   }
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2,
@@ -2612,11 +2618,13 @@
   return (1);
 
 #  elif defined(HAVE_CDSASSL)
-  OSStatus	error;			/* Error info */
-  SSLContextRef	conn;			/* New connection */
-  CFArrayRef	certificatesArray;	/* Array containing certificates */
-  int		allowExpired;		/* Allow expired certificates? */
-  int		allowAnyRoot;		/* Allow any root certificate? */
+  OSStatus		error;		/* Error info */
+  SSLContextRef		conn;		/* New connection */
+  CFArrayRef		certificatesArray;
+					/* Array containing certificates */
+  int			allowExpired;	/* Allow expired certificates? */
+  int			allowAnyRoot;	/* Allow any root certificate? */
+  cdsa_conn_ref_t	u;		/* Connection reference union */
 
 
   conn         = NULL;
@@ -2641,12 +2649,23 @@
     error = SSLSetProtocolVersion(conn, kSSLProtocol3);
 
   if (!error)
-    error = SSLSetConnection(conn, (SSLConnectionRef)con->http.fd);
+  {
+   /*
+    * Use a union to resolve warnings about int/pointer size mismatches...
+    */
+
+    u.connection = NULL;
+    u.sock       = con->http.fd;
+    error        = SSLSetConnection(conn, u.connection);
+  }
 
   if (!error)
     error = SSLSetPeerDomainName(conn, ServerName, strlen(ServerName) + 1);
 
-  /* have to do these options before setting server certs */
+ /*
+  * Have to set these options before setting server certs...
+  */
+
   if (!error && allowExpired)
     error = SSLSetAllowsExpiredCerts(conn, true);
 
@@ -2826,9 +2845,9 @@
     else
       return (NULL);
   }
-  else if (con->language != NULL)
+  else if (con->language)
     snprintf(filename, len, "%s/%s%s", DocumentRoot, con->language->language,
-            con->uri);
+             con->uri);
   else
     snprintf(filename, len, "%s%s", DocumentRoot, con->uri);
 
@@ -2840,44 +2859,30 @@
   * then fallback to the default one...
   */
 
-  if ((status = stat(filename, filestats)) != 0 && con->language != NULL)
-  {
-    /* Try removing the country code, if there is one. */
-    if (strncmp(con->uri, "/ppd/", 5) != 0 &&
-        strncmp(con->uri, "/admin/conf/", 12) != 0)
-    {
-      char *bare_lang = NULL;
-      size_t ln = strcspn (con->language->language, "_");
-      if (con->language->language[ln] == '_')
-      {
-	bare_lang = malloc (sizeof (char) * (ln + 1));
-	if (bare_lang)
-	{
-	  memcpy (bare_lang, con->language->language, ln);
-	  bare_lang[ln] = '\0';
-	  snprintf(filename, len,
-		   "%s/%s%s", DocumentRoot, bare_lang, con->uri);
-
-	  if ((ptr = strchr(filename, '?')) != NULL)
-	    *ptr = '\0';
-
-	  status = stat(filename, filestats);
-	  free (bare_lang);
-	}
-      }
-    }
-  }
-  
-  if (status != 0 && con->language != NULL)
+  if ((status = stat(filename, filestats)) != 0 && con->language &&
+      strncmp(con->uri, "/ppd/", 5) &&
+      strncmp(con->uri, "/admin/conf/", 12) &&
+      strncmp(con->uri, "/admin/log/", 11))
   {
    /*
-    * Drop the language prefix and try the current directory...
+    * Drop the country code...
     */
 
-    if (strncmp(con->uri, "/ppd/", 5) &&
-        strncmp(con->uri, "/admin/conf/", 12) &&
-        strncmp(con->uri, "/admin/log/", 11))
+    char	ll[3];			/* Short language name */
+
+
+    strlcpy(ll, con->language->language, sizeof(ll));
+    snprintf(filename, len, "%s/%s%s", DocumentRoot, ll, con->uri);
+
+    if ((ptr = strchr(filename, '?')) != NULL)
+      *ptr = '\0';
+
+    if ((status = stat(filename, filestats)) != 0)
     {
+     /*
+      * Drop the language prefix and try the root directory...
+      */
+
       snprintf(filename, len, "%s%s", DocumentRoot, con->uri);
 
       if ((ptr = strchr(filename, '?')) != NULL)
@@ -3815,5 +3820,5 @@
 
 
 /*
- * End of "$Id: client.c 5335 2006-03-24 02:56:20Z mike $".
+ * End of "$Id: client.c 5373 2006-04-06 20:03:32Z mike $".
  */
--- cups-1.2rc1/scheduler/conf.c	2006-04-07 17:56:09.000000000 +0100
+++ /tmp/tim/cups/scheduler/conf.c	2006-04-06 23:37:08.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: conf.c 5289 2006-03-14 11:54:45Z mike $"
+ * "$Id: conf.c 5373 2006-04-06 20:03:32Z mike $"
  *
  *   Configuration routines for the Common UNIX Printing System (CUPS).
  *
@@ -243,6 +243,7 @@
   if (NumBrowsers > 0)
   {
     free(Browsers);
+    Browsers = NULL;
 
     NumBrowsers = 0;
   }
@@ -281,7 +282,7 @@
   cupsdSetString(&AccessLog, CUPS_LOGDIR "/access_log");
   cupsdSetString(&ErrorLog, CUPS_LOGDIR "/error_log");
   cupsdSetString(&PageLog, CUPS_LOGDIR "/page_log");
-  cupsdSetString(&Printcap, "/etc/printcap");
+  cupsdSetString(&Printcap, CUPS_DEFAULT_PRINTCAP);
   cupsdSetString(&PrintcapGUI, "/usr/bin/glpoptions");
   cupsdSetString(&FontPath, CUPS_FONTPATH);
   cupsdSetString(&RemoteRoot, "remroot");
@@ -3251,5 +3252,5 @@
 
 
 /*
- * End of "$Id: conf.c 5289 2006-03-14 11:54:45Z mike $".
+ * End of "$Id: conf.c 5373 2006-04-06 20:03:32Z mike $".
  */
--- cups-1.2rc1/scheduler/dirsvc.c	2006-03-23 21:07:20.000000000 +0000
+++ /tmp/tim/cups/scheduler/dirsvc.c	2006-04-02 19:55:59.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: dirsvc.c 5330 2006-03-23 21:07:20Z mike $"
+ * "$Id: dirsvc.c 5349 2006-03-29 15:22:10Z mike $"
  *
  *   Directory services routines for the Common UNIX Printing System (CUPS).
  *
@@ -2471,8 +2471,20 @@
 
   dequote(location, p->location, sizeof(location));
   dequote(info, p->info, sizeof(info));
-  dequote(make_model, p->make_model ? p->make_model : "Unknown",
-          sizeof(make_model));
+
+  if (p->make_model)
+    dequote(make_model, p->make_model, sizeof(make_model));
+  else if (p->type & CUPS_PRINTER_CLASS)
+  {
+    if (p->num_printers > 0 && p->printers[0]->make_model)
+      strlcpy(make_model, p->printers[0]->make_model, sizeof(make_model));
+    else
+      strlcpy(make_model, "Local Printer Class", sizeof(make_model));
+  }
+  else if (p->raw)
+    strlcpy(make_model, "Local Raw Printer", sizeof(make_model));
+  else
+    strlcpy(make_model, "Local System V Printer", sizeof(make_model));
 
  /*
   * Send a packet to each browse address...
@@ -3116,5 +3128,5 @@
 
 
 /*
- * End of "$Id: dirsvc.c 5330 2006-03-23 21:07:20Z mike $".
+ * End of "$Id: dirsvc.c 5349 2006-03-29 15:22:10Z mike $".
  */
--- cups-1.2rc1/scheduler/env.c	2006-03-18 03:05:12.000000000 +0000
+++ /tmp/tim/cups/scheduler/env.c	2006-04-06 23:37:08.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: env.c 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id: env.c 5373 2006-04-06 20:03:32Z mike $"
  *
  *   Environment management routines for the Common UNIX Printing System (CUPS).
  *
@@ -68,11 +68,10 @@
 
 #if defined(__APPLE__)
  /*
-  * Add special voodoo magic for MacOS X 10.4 and later - this allows MacOS
-  * X programs to access their bundle resources properly...
+  * Add special voodoo magic for MacOS X - this allows MacOS X 
+  * programs to access their bundle resources properly...
   *
-  * This string is replaced in cupsdStartProcess() when we are running on
-  * versions of MacOS X prior to 10.4...
+  * This string is replaced in cupsdStartProcess()...
   */
 
   cupsdSetString(common_env, "<CFProcessPath>");
@@ -246,5 +245,5 @@
 
 
 /*
- * End of "$Id: env.c 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id: env.c 5373 2006-04-06 20:03:32Z mike $".
  */
--- cups-1.2rc1/scheduler/ipp.c	2006-03-24 01:20:03.000000000 +0000
+++ /tmp/tim/cups/scheduler/ipp.c	2006-04-07 17:10:48.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.c 5334 2006-03-24 01:20:03Z mike $"
+ * "$Id: ipp.c 5383 2006-04-07 15:36:10Z mike $"
  *
  *   IPP routines for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -1489,10 +1489,13 @@
     */
 
     cupsdSetJobHoldUntil(job, attr->values[0].string.text);
+
+    job->state->values[0].integer = IPP_JOB_HELD;
+    job->state_value              = IPP_JOB_HELD;
   }
   else if (job->attrs->request.op.operation_id == IPP_CREATE_JOB)
   {
-    job->hold_until = time(NULL) + 60;
+    job->hold_until               = time(NULL) + 60;
     job->state->values[0].integer = IPP_JOB_HELD;
     job->state_value              = IPP_JOB_HELD;
   }
@@ -6525,7 +6528,7 @@
     * Move the job to a different printer or class...
     */
 
-    cupsdMoveJob(job, dest);
+    cupsdMoveJob(job, dprinter);
   }
   else
   {
@@ -6557,7 +6560,7 @@
       * Move the job to a different printer or class...
       */
 
-      cupsdMoveJob(job, dest);
+      cupsdMoveJob(job, dprinter);
     }
   }
 
@@ -8811,11 +8814,19 @@
   cupsdStartPrinter(printer, 1);
 
   if (dtype & CUPS_PRINTER_CLASS)
+  {
     cupsdLogMessage(CUPSD_LOG_INFO, "Class \"%s\" started by \"%s\".", name,
                     get_username(con));
+    cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED, printer, NULL,
+                  "Class \"%s\" started by \"%s\".", name, get_username(con));
+  }
   else
+  {
     cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" started by \"%s\".", name,
                     get_username(con));
+    cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED, printer, NULL,
+                  "Printer \"%s\" started by \"%s\".", name, get_username(con));
+  }
 
   cupsdCheckJobs();
 
@@ -8899,11 +8910,19 @@
   cupsdStopPrinter(printer, 1);
 
   if (dtype & CUPS_PRINTER_CLASS)
+  {
     cupsdLogMessage(CUPSD_LOG_INFO, "Class \"%s\" stopped by \"%s\".", name,
                     get_username(con));
+    cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED, printer, NULL,
+                  "Class \"%s\" stopped by \"%s\".", name, get_username(con));
+  }
   else
+  {
     cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" stopped by \"%s\".", name,
                     get_username(con));
+    cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED, printer, NULL,
+                  "Printer \"%s\" stopped by \"%s\".", name, get_username(con));
+  }
 
  /*
   * Everything was ok, so return OK status...
@@ -9137,5 +9156,5 @@
 
 
 /*
- * End of "$Id: ipp.c 5334 2006-03-24 01:20:03Z mike $".
+ * End of "$Id: ipp.c 5383 2006-04-07 15:36:10Z mike $".
  */
--- cups-1.2rc1/scheduler/job.c	2006-03-18 03:05:12.000000000 +0000
+++ /tmp/tim/cups/scheduler/job.c	2006-04-07 17:10:48.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: job.c 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id: job.c 5383 2006-04-07 15:36:10Z mike $"
  *
  *   Job management routines for the Common UNIX Printing System (CUPS).
  *
@@ -386,7 +386,8 @@
 	                 "job-actual-printer-uri", NULL, printer->uri);
 	}
 
-        if (printer->state == IPP_PRINTER_IDLE ||	/* Printer is idle */
+        if ((!(printer->type & CUPS_PRINTER_REMOTE) &&	/* Printer is local */
+	     printer->state == IPP_PRINTER_IDLE) ||	/* and idle */
 	    ((printer->type & CUPS_PRINTER_REMOTE) &&	/* Printer is remote */
 	     !printer->job))				/* and not printing */
 	  start_job(job, printer);
@@ -1066,26 +1067,31 @@
  */
 
 void
-cupsdMoveJob(cupsd_job_t *job,		/* I - Job */
-             const char  *dest)		/* I - Destination */
+cupsdMoveJob(cupsd_job_t     *job,	/* I - Job */
+             cupsd_printer_t *p)	/* I - Destination printer or class */
 {
   ipp_attribute_t	*attr;		/* job-printer-uri attribute */
-  cupsd_printer_t	*p;		/* Destination printer or class */
+  const char		*olddest;	/* Old destination */
+  cupsd_printer_t	*oldp;		/* Old pointer */
 
 
  /*
-  * Find the printer...
+  * Don't move completed jobs...
   */
 
-  if ((p = cupsdFindDest(dest)) == NULL)
+  if (job->state_value > IPP_JOB_STOPPED)
     return;
 
  /*
-  * Don't move completed jobs...
+  * Get the old destination...
   */
 
-  if (job->state_value >= IPP_JOB_PROCESSING)
-    return;
+  olddest = job->dest;
+
+  if (job->printer)
+    oldp = job->printer;
+  else
+    oldp = cupsdFindDest(olddest);
 
  /*
   * Change the destination information...
@@ -1093,7 +1099,11 @@
 
   cupsdLoadJob(job);
 
-  cupsdSetString(&job->dest, dest);
+  cupsdAddEvent(CUPSD_EVENT_JOB_STOPPED, oldp, job,
+                "Job #%d moved from %s to %s.", job->id, olddest,
+		p->name);
+
+  cupsdSetString(&job->dest, p->name);
   job->dtype = p->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_REMOTE |
                           CUPS_PRINTER_IMPLICIT);
 
@@ -1101,6 +1111,10 @@
                                IPP_TAG_URI)) != NULL)
     cupsdSetString(&(attr->values[0].string.text), p->uri);
 
+  cupsdAddEvent(CUPSD_EVENT_JOB_STOPPED, p, job,
+                "Job #%d moved from %s to %s.", job->id, olddest,
+		p->name);
+
   cupsdSaveJob(job);
 }
 
@@ -3373,5 +3387,5 @@
 
 
 /*
- * End of "$Id: job.c 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id: job.c 5383 2006-04-07 15:36:10Z mike $".
  */
--- cups-1.2rc1/scheduler/job.h	2006-03-18 03:05:12.000000000 +0000
+++ /tmp/tim/cups/scheduler/job.h	2006-04-07 17:10:48.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: job.h 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id: job.h 5383 2006-04-07 15:36:10Z mike $"
  *
  *   Print job definitions for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -107,7 +107,7 @@
 extern void		cupsdHoldJob(cupsd_job_t *job);
 extern void		cupsdLoadAllJobs(void);
 extern void		cupsdLoadJob(cupsd_job_t *job);
-extern void		cupsdMoveJob(cupsd_job_t *job, const char *dest);
+extern void		cupsdMoveJob(cupsd_job_t *job, cupsd_printer_t *p);
 extern void		cupsdReleaseJob(cupsd_job_t *job);
 extern void		cupsdRestartJob(cupsd_job_t *job);
 extern void		cupsdSaveAllJobs(void);
@@ -120,5 +120,5 @@
 
 
 /*
- * End of "$Id: job.h 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id: job.h 5383 2006-04-07 15:36:10Z mike $".
  */
--- cups-1.2rc1/scheduler/main.c	2006-04-07 17:56:09.000000000 +0100
+++ /tmp/tim/cups/scheduler/main.c	2006-04-07 17:10:48.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: main.c 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id: main.c 5383 2006-04-07 15:36:10Z mike $"
  *
  *   Scheduler main loop for the Common UNIX Printing System (CUPS).
  *
@@ -113,7 +113,6 @@
   int			i;		/* Looping var */
   char			*opt;		/* Option character */
   int			fg;		/* Run in the foreground */
-  int			only_ppds;	/* Just build ppds.dat */
   int			fds;		/* Number of ready descriptors */
   fd_set		*input,		/* Input set for select() */
 			*output;	/* Output set for select() */
@@ -149,25 +148,10 @@
   */
 
   fg = 0;
-  only_ppds = 0;
 
   for (i = 1; i < argc; i ++)
     if (argv[i][0] == '-')
-      {
-	if (argv[i][1] == '-')
-	{
-	  if (!strcmp (&argv[i][2], "ppdsdat"))
-	  {
-	    fg = only_ppds = 1;
-	  }
-	  else
-	  {
-            fprintf(stderr, "cupsd: Unknown option \'%s\' - aborting!\n",
-		    &argv[i][2]);
-	    usage(1);
-	  }
-	}
-	else for (opt = argv[i] + 1; *opt != '\0'; opt ++)
+      for (opt = argv[i] + 1; *opt != '\0'; opt ++)
         switch (*opt)
 	{
 	  case 'c' : /* Configuration file */
@@ -241,7 +225,6 @@
 	      usage(1);
 	      break;
 	}
-      }
     else
     {
       _cupsLangPrintf(stderr, _("cupsd: Unknown argument \"%s\" - aborting!\n"),
@@ -262,8 +245,6 @@
     * Setup signal handlers for the parent...
     */
 
-    pid_t pid;
-
 #ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
     sigset(SIGUSR1, parent_handler);
     sigset(SIGCHLD, parent_handler);
@@ -287,7 +268,7 @@
     signal(SIGHUP, SIG_IGN);
 #endif /* HAVE_SIGSET */
 
-    if ((pid = fork()) > 0)
+    if (fork() > 0)
     {
      /*
       * OK, wait for the child to startup and send us SIGUSR1 or to crash
@@ -299,15 +280,7 @@
         sleep(1);
 
       if (parent_signal == SIGUSR1)
-      {
-        FILE *f = fopen ("/var/run/cupsd.pid", "w");
-        if (f)
-        {
-          fprintf (f, "%d\n", pid);
-          fclose (f);
-        }
         return (0);
-      }
 
       if (wait(&i) < 0)
       {
@@ -487,9 +460,6 @@
   signal(SIGTERM, sigterm_handler);
 #endif /* HAVE_SIGSET */
 
-  if (only_ppds)
-    return 0;
-
 #ifdef __sgi
  /*
   * Try to create a fake lpsched lock file if one is not already there.
@@ -1042,7 +1012,7 @@
     * accumulated.  Don't send these more than once a second...
     */
 
-    if (LastEvent && (time(NULL) - LastEventTime) > 1)
+    if (LastEvent)
     {
 #ifdef HAVE_NOTIFY_POST
       if (LastEvent & CUPSD_EVENT_PRINTER_CHANGED)
@@ -1070,10 +1040,9 @@
 #endif /* HAVE_NOTIFY_POST */
 
      /*
-      * Reset the accumulated events and notification time...
+      * Reset the accumulated events...
       */
 
-      LastEventTime = time(NULL);
       LastEvent     = CUPSD_EVENT_NONE;
     }
   }
@@ -1220,7 +1189,7 @@
 {
   if (s && *s)
   {
-    free(*s);
+    _cupsStrFree(*s);
     *s = NULL;
   }
 }
@@ -1286,10 +1255,10 @@
     return;
 
   if (*s)
-    free(*s);
+    _cupsStrFree(*s);
 
   if (v)
-    *s = strdup(v);
+    *s = _cupsStrAlloc(v);
   else
     *s = NULL;
 }
@@ -1320,13 +1289,13 @@
     vsnprintf(v, sizeof(v), f, ap);
     va_end(ap);
 
-    *s = strdup(v);
+    *s = _cupsStrAlloc(v);
   }
   else
     *s = NULL;
 
   if (olds)
-    free(olds);
+    _cupsStrFree(olds);
 }
 
 
@@ -1345,12 +1314,10 @@
 			ld_resp,	/* Launch data response */
 			ld_array,	/* Launch data array */
 			ld_sockets,	/* Launch data sockets dictionary */
-			ld_runatload,	/* Run-at-load setting */
 			tmp;		/* Launch data */
   cupsd_listener_t	*lis;		/* Listeners array */
   http_addr_t		addr;		/* Address variable */
   socklen_t		addrlen;	/* Length of address */
-  bool			runatload;	/* Run-at-load setting value */
 
 
   cupsdLogMessage(CUPSD_LOG_DEBUG, "launchd_checkin: pid=%d", (int)getpid());
@@ -1377,26 +1344,6 @@
   }
 
  /*
-  * Get the "run-at-load" setting...
-  */
-
-  if ((ld_runatload =
-           launch_data_dict_lookup(ld_resp, LAUNCH_JOBKEY_RUNATLOAD)) != NULL &&
-      launch_data_get_type(ld_runatload) == LAUNCH_DATA_BOOL)
-    runatload = launch_data_get_bool(ld_runatload);
-  else
-  {
-    errno = launch_data_get_errno(ld_resp);
-    cupsdLogMessage(CUPSD_LOG_ERROR,
-                    "launchd_checkin: Unable to find Run-at-load setting: %s",
-                    strerror(errno));
-    exit(EXIT_FAILURE);
-  }
-
-  cupsdLogMessage(CUPSD_LOG_DEBUG, "launchd_checkin: Run-at-load=%s",
-                  runatload ? "true" : "false");
-
- /*
   * Get the sockets dictionary...
   */
 
@@ -1489,18 +1436,22 @@
   {
     if (launch_data_get_type(ld_array) == LAUNCH_DATA_ARRAY)
     {
-      tmp = launch_data_array_get_index(ld_array, 0);
-
-      if (launch_data_get_type(tmp) == LAUNCH_DATA_FD)
+      if ((tmp = launch_data_array_get_index(ld_array, 0)))
       {
-        if (BrowseSocket != -1)
-	  close(BrowseSocket);
-
-	BrowseSocket = launch_data_get_fd(tmp);
-      }
-      else
-	cupsdLogMessage(CUPSD_LOG_WARN,
-	                "launchd_checkin: BrowseSocket not a fd!");
+	if (launch_data_get_type(tmp) == LAUNCH_DATA_FD)
+	{
+	  if (BrowseSocket != -1)
+	    close(BrowseSocket);
+  
+	  BrowseSocket = launch_data_get_fd(tmp);
+	}
+	else
+	  cupsdLogMessage(CUPSD_LOG_WARN,
+			  "launchd_checkin: BrowseSocket not a fd!");
+     }
+     else
+       cupsdLogMessage(CUPSD_LOG_WARN,
+		       "launchd_checkin: BrowseSockets is an empty array!");
    }
    else
      cupsdLogMessage(CUPSD_LOG_WARN,
@@ -2138,13 +2089,6 @@
     return (1);
 
  /*
-  * If we had a recent event notification, timeout in 1 second...
-  */
-
-  if (LastEvent)
-    return (1);
-
- /*
   * Otherwise, check all of the possible events that we need to wake for...
   */
 
@@ -2290,18 +2234,17 @@
 usage(int status)			/* O - Exit status */
 {
   _cupsLangPuts(status ? stderr : stdout,
-                _("Usage: cupsd [-c config-file] [-f] [-F] [-h] [-l] [--ppdsdat]\n"
+                _("Usage: cupsd [-c config-file] [-f] [-F] [-h] [-l]\n"
 		  "\n"
 		  "-c config-file      Load alternate configuration file\n"
 		  "-f                  Run in the foreground\n"
 		  "-F                  Run in the foreground but detach\n"
 		  "-h                  Show this usage message\n"
-		  "-l                  Run cupsd from launchd(8)\n"
-		  "--ppdsdat           Just build ppds.dat\n"));
+		  "-l                  Run cupsd from launchd(8)\n"));
   exit(status);
 }
 
 
 /*
- * End of "$Id: main.c 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id: main.c 5383 2006-04-07 15:36:10Z mike $".
  */
--- cups-1.2rc1/scheduler/printers.c	2006-03-23 21:07:20.000000000 +0000
+++ /tmp/tim/cups/scheduler/printers.c	2006-04-06 23:37:08.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.c 5330 2006-03-23 21:07:20Z mike $"
+ * "$Id: printers.c 5373 2006-04-06 20:03:32Z mike $"
  *
  *   Printer routines for the Common UNIX Printing System (CUPS).
  *
@@ -2271,6 +2271,11 @@
 
   if (old_state != s)
   {
+    cupsdAddEvent(CUPSD_EVENT_PRINTER_STATE_CHANGED, p, NULL,
+		  "%s \"%s\" state changed.",
+		  (p->type & CUPS_PRINTER_CLASS) ? "Class" : "Printer",
+		  p->name);
+
    /*
     * Let the browse code know this needs to be updated...
     */
@@ -3273,5 +3278,5 @@
 
 
 /*
- * End of "$Id: printers.c 5330 2006-03-23 21:07:20Z mike $".
+ * End of "$Id: printers.c 5373 2006-04-06 20:03:32Z mike $".
  */
--- cups-1.2rc1/scheduler/process.c	2006-02-09 01:00:26.000000000 +0000
+++ /tmp/tim/cups/scheduler/process.c	2006-04-06 23:37:08.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: process.c 5094 2006-02-09 01:00:26Z mike $"
+ * "$Id: process.c 5376 2006-04-06 20:32:07Z mike $"
  *
  *   Process management routines for the Common UNIX Printing System (CUPS).
  *
@@ -35,9 +35,9 @@
 
 #include "cupsd.h"
 #include <grp.h>
-#if defined(__APPLE__) && __GNUC__ < 4
+#if defined(__APPLE__)
 #  include <libgen.h>
-#endif /* __APPLE__ && __GNUC__ < 4 */ 
+#endif /* __APPLE__ */ 
 
 
 /*
@@ -128,45 +128,47 @@
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
   struct sigaction action;		/* POSIX signal handler */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-#if defined(__APPLE__) && __GNUC__ < 4
-  int		envc;			/* Number of environment variables */
+#if defined(__APPLE__)
   char		processPath[1024],	/* CFProcessPath environment variable */
 		linkpath[1024];		/* Link path for symlinks... */
   int		linkbytes;		/* Bytes for link path */
-#endif /* __APPLE__ && __GNUC__ < 4 */
+#endif /* __APPLE__ */
 
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2,
                   "cupsdStartProcess(\"%s\", %p, %p, %d, %d, %d)",
                   command, argv, envp, infd, outfd, errfd);
 
-#if defined(__APPLE__) && __GNUC__ < 4
- /*
-  * Add special voodoo magic for MacOS X 10.3 and earlier - this allows
-  * MacOS X programs to access their bundle resources properly...
-  */
-
-  if ((linkbytes = readlink(command, linkpath, sizeof(linkpath) - 1)) > 0)
+#if defined(__APPLE__)
+  if (envp)
   {
    /*
-    * Yes, this is a symlink to the actual program, nul-terminate and
-    * use it...
+    * Add special voodoo magic for MacOS X - this allows MacOS X 
+    * programs to access their bundle resources properly...
     */
 
-    linkpath[linkbytes] = '\0';
+    if ((linkbytes = readlink(command, linkpath, sizeof(linkpath) - 1)) > 0)
+    {
+     /*
+      * Yes, this is a symlink to the actual program, nul-terminate and
+      * use it...
+      */
 
-    if (linkpath[0] == '/')
-      snprintf(processPath, sizeof(processPath), "CFProcessPath=%s",
-	       linkpath);
+      linkpath[linkbytes] = '\0';
+
+      if (linkpath[0] == '/')
+	snprintf(processPath, sizeof(processPath), "CFProcessPath=%s",
+		 linkpath);
+      else
+	snprintf(processPath, sizeof(processPath), "CFProcessPath=%s/%s",
+		 dirname(command), linkpath);
+    }
     else
-      snprintf(processPath, sizeof(processPath), "CFProcessPath=%s/%s",
-	       dirname(command), linkpath);
-  }
-  else
-    snprintf(processPath, sizeof(processPath), "CFProcessPath=%s", command);
+      snprintf(processPath, sizeof(processPath), "CFProcessPath=%s", command);
 
-  envp[0] = processPath;		/* Replace <CFProcessPath> string */
-#endif	/* __APPLE__ && __GNUC__ > 3 */
+    envp[0] = processPath;		/* Replace <CFProcessPath> string */
+  }
+#endif	/* __APPLE__ */
 
  /*
   * Block signals before forking...
@@ -342,5 +344,5 @@
 
 
 /*
- * End of "$Id: process.c 5094 2006-02-09 01:00:26Z mike $".
+ * End of "$Id: process.c 5376 2006-04-06 20:32:07Z mike $".
  */
--- cups-1.2rc1/scheduler/server.c	2006-03-18 03:05:12.000000000 +0000
+++ /tmp/tim/cups/scheduler/server.c	2006-04-06 23:37:08.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: server.c 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id: server.c 5373 2006-04-06 20:03:32Z mike $"
  *
  *   Server start/stop routines for the Common UNIX Printing System (CUPS).
  *
@@ -119,7 +119,6 @@
 
   LastEvent     = CUPSD_EVENT_PRINTER_CHANGED | CUPSD_EVENT_JOB_STATE_CHANGED |
                   CUPSD_EVENT_SERVER_STARTED;
-  LastEventTime = 0;
 
   started = 1;
 }
@@ -212,5 +211,5 @@
 
 
 /*
- * End of "$Id: server.c 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id: server.c 5373 2006-04-06 20:03:32Z mike $".
  */
--- cups-1.2rc1/scheduler/statbuf.c	2006-02-04 17:39:51.000000000 +0000
+++ /tmp/tim/cups/scheduler/statbuf.c	2006-04-06 23:37:08.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: statbuf.c 5073 2006-02-04 17:39:51Z mike $"
+ * "$Id: statbuf.c 5373 2006-04-06 20:03:32Z mike $"
  *
  *   Status buffer routines for the Common UNIX Printing System (CUPS)
  *   scheduler.
@@ -317,7 +317,9 @@
   * Copy over the buffer data we've used up...
   */
 
-  _cups_strcpy(sb->buffer, lineptr);
+  if (lineptr < sb->buffer + sb->bufused)
+    _cups_strcpy(sb->buffer, lineptr);
+
   sb->bufused -= lineptr - sb->buffer;
 
   if (sb->bufused < 0)
@@ -328,5 +330,5 @@
 
 
 /*
- * End of "$Id: statbuf.c 5073 2006-02-04 17:39:51Z mike $".
+ * End of "$Id: statbuf.c 5373 2006-04-06 20:03:32Z mike $".
  */
--- cups-1.2rc1/scheduler/subscriptions.h	2006-03-18 03:05:12.000000000 +0000
+++ /tmp/tim/cups/scheduler/subscriptions.h	2006-04-06 23:37:08.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: subscriptions.h 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id: subscriptions.h 5373 2006-04-06 20:03:32Z mike $"
  *
  *   Subscription definitions for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -136,8 +136,6 @@
 VAR cupsd_event_t **Events VALUE(NULL);	/* Active events */
 
 VAR unsigned	LastEvent VALUE(0);	/* Last events processed */
-VAR time_t	LastEventTime VALUE(0);	/* Time that the last events were sent */
-
 VAR int		NotifierPipes[2] VALUE2(-1, -1);
 					/* Pipes for notifier error/debug output */
 VAR cupsd_statbuf_t *NotifierStatusBuffer VALUE(NULL);
@@ -172,5 +170,5 @@
 
 
 /*
- * End of "$Id: subscriptions.h 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id: subscriptions.h 5373 2006-04-06 20:03:32Z mike $".
  */


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- cups.spec	7 Apr 2006 15:37:34 -0000	1.159
+++ cups.spec	7 Apr 2006 16:58:46 -0000	1.160
@@ -46,6 +46,7 @@
 Patch23: cups-str1532.patch
 Patch24: cups-maxlogsize.patch
 Patch25: cups-str1533.patch
+Patch26: cups-scheduler.patch
 Patch28: cups-no-propagate-ipp-port.patch
 Patch32: cups-pid.patch
 Patch40: cups-link.patch
@@ -143,6 +144,7 @@
 %patch23 -p1 -b .str1532
 %patch24 -p1 -b .maxlogsize
 %patch25 -p1 -b .str1533
+%patch26 -p1 -b .scheduler
 %patch28 -p1 -b .no-propagate-ipp-port
 %patch32 -p1 -b .pid
 %patch40 -p1 -b .link
@@ -387,6 +389,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com>
+- Sync scheduler/* with svn 5383.
+
 * Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.8
 - No longer need openssl-devel.
 - Build with LDAP_DEPRECATED=1, to pick up declarations of ldap_init() etc.



From fedora-cvs-commits at redhat.com  Fri Apr  7 16:59:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 12:59:35 -0400
Subject: rpms/cups/devel cups.spec,1.160,1.161
Message-ID: <200604071659.k37GxZi2029603@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Log Message:
1:1.2-0.2.rc1.9


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- cups.spec	7 Apr 2006 16:58:46 -0000	1.160
+++ cups.spec	7 Apr 2006 16:59:33 -0000	1.161
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2
-Release: 0.2.%{beta}.8
+Release: 0.2.%{beta}.9
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
@@ -389,7 +389,7 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com>
+* Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.9
 - Sync scheduler/* with svn 5383.
 
 * Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.8



From fedora-cvs-commits at redhat.com  Fri Apr  7 17:07:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 13:07:03 -0400
Subject: rpms/cups/FC-5 cups-scheduler.patch,NONE,1.1 cups.spec,1.148,1.149
Message-ID: <200604071707.k37H73i4029760@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-scheduler.patch 
Log Message:
* Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.9
- Sync scheduler/* with svn 5383.


cups-scheduler.patch:
 cert.c          |    4 +-
 client.c        |   95 +++++++++++++++++++++++++++-------------------------
 conf.c          |    7 ++-
 dirsvc.c        |   20 ++++++++---
 env.c           |   11 ++----
 ipp.c           |   29 +++++++++++++---
 job.c           |   38 ++++++++++++++-------
 job.h           |    6 +--
 main.c          |  101 ++++++++++++++------------------------------------------
 printers.c      |    9 +++-
 process.c       |   56 ++++++++++++++++---------------
 server.c        |    5 +-
 statbuf.c       |    8 ++--
 subscriptions.h |    6 +--
 14 files changed, 202 insertions(+), 193 deletions(-)

--- NEW FILE cups-scheduler.patch ---
--- cups-1.2rc1/scheduler/server.c.scheduler	2006-03-18 03:05:12.000000000 +0000
+++ cups-1.2rc1/scheduler/server.c	2006-04-07 18:03:36.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: server.c 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id: server.c 5373 2006-04-06 20:03:32Z mike $"
  *
  *   Server start/stop routines for the Common UNIX Printing System (CUPS).
  *
@@ -119,7 +119,6 @@
 
   LastEvent     = CUPSD_EVENT_PRINTER_CHANGED | CUPSD_EVENT_JOB_STATE_CHANGED |
                   CUPSD_EVENT_SERVER_STARTED;
-  LastEventTime = 0;
 
   started = 1;
 }
@@ -212,5 +211,5 @@
 
 
 /*
- * End of "$Id: server.c 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id: server.c 5373 2006-04-06 20:03:32Z mike $".
  */
--- cups-1.2rc1/scheduler/env.c.scheduler	2006-03-18 03:05:12.000000000 +0000
+++ cups-1.2rc1/scheduler/env.c	2006-04-07 18:03:36.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: env.c 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id: env.c 5373 2006-04-06 20:03:32Z mike $"
  *
  *   Environment management routines for the Common UNIX Printing System (CUPS).
  *
@@ -68,11 +68,10 @@
 
 #if defined(__APPLE__)
  /*
-  * Add special voodoo magic for MacOS X 10.4 and later - this allows MacOS
-  * X programs to access their bundle resources properly...
+  * Add special voodoo magic for MacOS X - this allows MacOS X 
+  * programs to access their bundle resources properly...
   *
-  * This string is replaced in cupsdStartProcess() when we are running on
-  * versions of MacOS X prior to 10.4...
+  * This string is replaced in cupsdStartProcess()...
   */
 
   cupsdSetString(common_env, "<CFProcessPath>");
@@ -246,5 +245,5 @@
 
 
 /*
- * End of "$Id: env.c 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id: env.c 5373 2006-04-06 20:03:32Z mike $".
  */
--- cups-1.2rc1/scheduler/ipp.c.scheduler	2006-03-24 01:20:03.000000000 +0000
+++ cups-1.2rc1/scheduler/ipp.c	2006-04-07 18:03:36.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.c 5334 2006-03-24 01:20:03Z mike $"
+ * "$Id: ipp.c 5383 2006-04-07 15:36:10Z mike $"
  *
  *   IPP routines for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -1489,10 +1489,13 @@
     */
 
     cupsdSetJobHoldUntil(job, attr->values[0].string.text);
+
+    job->state->values[0].integer = IPP_JOB_HELD;
+    job->state_value              = IPP_JOB_HELD;
   }
   else if (job->attrs->request.op.operation_id == IPP_CREATE_JOB)
   {
-    job->hold_until = time(NULL) + 60;
+    job->hold_until               = time(NULL) + 60;
     job->state->values[0].integer = IPP_JOB_HELD;
     job->state_value              = IPP_JOB_HELD;
   }
@@ -6525,7 +6528,7 @@
     * Move the job to a different printer or class...
     */
 
-    cupsdMoveJob(job, dest);
+    cupsdMoveJob(job, dprinter);
   }
   else
   {
@@ -6557,7 +6560,7 @@
       * Move the job to a different printer or class...
       */
 
-      cupsdMoveJob(job, dest);
+      cupsdMoveJob(job, dprinter);
     }
   }
 
@@ -8811,11 +8814,19 @@
   cupsdStartPrinter(printer, 1);
 
   if (dtype & CUPS_PRINTER_CLASS)
+  {
     cupsdLogMessage(CUPSD_LOG_INFO, "Class \"%s\" started by \"%s\".", name,
                     get_username(con));
+    cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED, printer, NULL,
+                  "Class \"%s\" started by \"%s\".", name, get_username(con));
+  }
   else
+  {
     cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" started by \"%s\".", name,
                     get_username(con));
+    cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED, printer, NULL,
+                  "Printer \"%s\" started by \"%s\".", name, get_username(con));
+  }
 
   cupsdCheckJobs();
 
@@ -8899,11 +8910,19 @@
   cupsdStopPrinter(printer, 1);
 
   if (dtype & CUPS_PRINTER_CLASS)
+  {
     cupsdLogMessage(CUPSD_LOG_INFO, "Class \"%s\" stopped by \"%s\".", name,
                     get_username(con));
+    cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED, printer, NULL,
+                  "Class \"%s\" stopped by \"%s\".", name, get_username(con));
+  }
   else
+  {
     cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" stopped by \"%s\".", name,
                     get_username(con));
+    cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED, printer, NULL,
+                  "Printer \"%s\" stopped by \"%s\".", name, get_username(con));
+  }
 
  /*
   * Everything was ok, so return OK status...
@@ -9137,5 +9156,5 @@
 
 
 /*
- * End of "$Id: ipp.c 5334 2006-03-24 01:20:03Z mike $".
+ * End of "$Id: ipp.c 5383 2006-04-07 15:36:10Z mike $".
  */
--- cups-1.2rc1/scheduler/process.c.scheduler	2006-02-09 01:00:26.000000000 +0000
+++ cups-1.2rc1/scheduler/process.c	2006-04-07 18:03:36.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: process.c 5094 2006-02-09 01:00:26Z mike $"
+ * "$Id: process.c 5376 2006-04-06 20:32:07Z mike $"
  *
  *   Process management routines for the Common UNIX Printing System (CUPS).
  *
@@ -35,9 +35,9 @@
 
 #include "cupsd.h"
 #include <grp.h>
-#if defined(__APPLE__) && __GNUC__ < 4
+#if defined(__APPLE__)
 #  include <libgen.h>
-#endif /* __APPLE__ && __GNUC__ < 4 */ 
+#endif /* __APPLE__ */ 
 
 
 /*
@@ -128,45 +128,47 @@
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
   struct sigaction action;		/* POSIX signal handler */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-#if defined(__APPLE__) && __GNUC__ < 4
-  int		envc;			/* Number of environment variables */
+#if defined(__APPLE__)
   char		processPath[1024],	/* CFProcessPath environment variable */
 		linkpath[1024];		/* Link path for symlinks... */
   int		linkbytes;		/* Bytes for link path */
-#endif /* __APPLE__ && __GNUC__ < 4 */
+#endif /* __APPLE__ */
 
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2,
                   "cupsdStartProcess(\"%s\", %p, %p, %d, %d, %d)",
                   command, argv, envp, infd, outfd, errfd);
 
-#if defined(__APPLE__) && __GNUC__ < 4
- /*
-  * Add special voodoo magic for MacOS X 10.3 and earlier - this allows
-  * MacOS X programs to access their bundle resources properly...
-  */
-
-  if ((linkbytes = readlink(command, linkpath, sizeof(linkpath) - 1)) > 0)
+#if defined(__APPLE__)
+  if (envp)
   {
    /*
-    * Yes, this is a symlink to the actual program, nul-terminate and
-    * use it...
+    * Add special voodoo magic for MacOS X - this allows MacOS X 
+    * programs to access their bundle resources properly...
     */
 
-    linkpath[linkbytes] = '\0';
+    if ((linkbytes = readlink(command, linkpath, sizeof(linkpath) - 1)) > 0)
+    {
+     /*
+      * Yes, this is a symlink to the actual program, nul-terminate and
+      * use it...
+      */
+
+      linkpath[linkbytes] = '\0';
 
-    if (linkpath[0] == '/')
-      snprintf(processPath, sizeof(processPath), "CFProcessPath=%s",
-	       linkpath);
+      if (linkpath[0] == '/')
+	snprintf(processPath, sizeof(processPath), "CFProcessPath=%s",
+		 linkpath);
+      else
+	snprintf(processPath, sizeof(processPath), "CFProcessPath=%s/%s",
+		 dirname(command), linkpath);
+    }
     else
-      snprintf(processPath, sizeof(processPath), "CFProcessPath=%s/%s",
-	       dirname(command), linkpath);
-  }
-  else
-    snprintf(processPath, sizeof(processPath), "CFProcessPath=%s", command);
+      snprintf(processPath, sizeof(processPath), "CFProcessPath=%s", command);
 
-  envp[0] = processPath;		/* Replace <CFProcessPath> string */
-#endif	/* __APPLE__ && __GNUC__ > 3 */
+    envp[0] = processPath;		/* Replace <CFProcessPath> string */
+  }
+#endif	/* __APPLE__ */
 
  /*
   * Block signals before forking...
@@ -342,5 +344,5 @@
 
 
 /*
- * End of "$Id: process.c 5094 2006-02-09 01:00:26Z mike $".
+ * End of "$Id: process.c 5376 2006-04-06 20:32:07Z mike $".
  */
--- cups-1.2rc1/scheduler/subscriptions.h.scheduler	2006-03-18 03:05:12.000000000 +0000
+++ cups-1.2rc1/scheduler/subscriptions.h	2006-04-07 18:03:36.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: subscriptions.h 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id: subscriptions.h 5373 2006-04-06 20:03:32Z mike $"
  *
  *   Subscription definitions for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -136,8 +136,6 @@
 VAR cupsd_event_t **Events VALUE(NULL);	/* Active events */
 
 VAR unsigned	LastEvent VALUE(0);	/* Last events processed */
-VAR time_t	LastEventTime VALUE(0);	/* Time that the last events were sent */
-
 VAR int		NotifierPipes[2] VALUE2(-1, -1);
 					/* Pipes for notifier error/debug output */
 VAR cupsd_statbuf_t *NotifierStatusBuffer VALUE(NULL);
@@ -172,5 +170,5 @@
 
 
 /*
- * End of "$Id: subscriptions.h 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id: subscriptions.h 5373 2006-04-06 20:03:32Z mike $".
  */
--- cups-1.2rc1/scheduler/job.h.scheduler	2006-03-18 03:05:12.000000000 +0000
+++ cups-1.2rc1/scheduler/job.h	2006-04-07 18:03:36.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: job.h 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id: job.h 5383 2006-04-07 15:36:10Z mike $"
  *
  *   Print job definitions for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -107,7 +107,7 @@
 extern void		cupsdHoldJob(cupsd_job_t *job);
 extern void		cupsdLoadAllJobs(void);
 extern void		cupsdLoadJob(cupsd_job_t *job);
-extern void		cupsdMoveJob(cupsd_job_t *job, const char *dest);
+extern void		cupsdMoveJob(cupsd_job_t *job, cupsd_printer_t *p);
 extern void		cupsdReleaseJob(cupsd_job_t *job);
 extern void		cupsdRestartJob(cupsd_job_t *job);
 extern void		cupsdSaveAllJobs(void);
@@ -120,5 +120,5 @@
 
 
 /*
- * End of "$Id: job.h 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id: job.h 5383 2006-04-07 15:36:10Z mike $".
  */
--- cups-1.2rc1/scheduler/conf.c.scheduler	2006-04-07 18:03:35.000000000 +0100
+++ cups-1.2rc1/scheduler/conf.c	2006-04-07 18:03:36.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: conf.c 5289 2006-03-14 11:54:45Z mike $"
+ * "$Id: conf.c 5373 2006-04-06 20:03:32Z mike $"
  *
  *   Configuration routines for the Common UNIX Printing System (CUPS).
  *
@@ -243,6 +243,7 @@
   if (NumBrowsers > 0)
   {
     free(Browsers);
+    Browsers = NULL;
 
     NumBrowsers = 0;
   }
@@ -281,7 +282,7 @@
   cupsdSetString(&AccessLog, CUPS_LOGDIR "/access_log");
   cupsdSetString(&ErrorLog, CUPS_LOGDIR "/error_log");
   cupsdSetString(&PageLog, CUPS_LOGDIR "/page_log");
-  cupsdSetString(&Printcap, "/etc/printcap");
+  cupsdSetString(&Printcap, CUPS_DEFAULT_PRINTCAP);
   cupsdSetString(&PrintcapGUI, "/usr/bin/glpoptions");
   cupsdSetString(&FontPath, CUPS_FONTPATH);
   cupsdSetString(&RemoteRoot, "remroot");
@@ -3251,5 +3252,5 @@
 
 
 /*
- * End of "$Id: conf.c 5289 2006-03-14 11:54:45Z mike $".
+ * End of "$Id: conf.c 5373 2006-04-06 20:03:32Z mike $".
  */
--- cups-1.2rc1/scheduler/printers.c.scheduler	2006-03-23 21:07:20.000000000 +0000
+++ cups-1.2rc1/scheduler/printers.c	2006-04-07 18:03:36.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.c 5330 2006-03-23 21:07:20Z mike $"
+ * "$Id: printers.c 5373 2006-04-06 20:03:32Z mike $"
  *
  *   Printer routines for the Common UNIX Printing System (CUPS).
  *
@@ -2271,6 +2271,11 @@
 
   if (old_state != s)
   {
+    cupsdAddEvent(CUPSD_EVENT_PRINTER_STATE_CHANGED, p, NULL,
+		  "%s \"%s\" state changed.",
+		  (p->type & CUPS_PRINTER_CLASS) ? "Class" : "Printer",
+		  p->name);
+
    /*
     * Let the browse code know this needs to be updated...
     */
@@ -3273,5 +3278,5 @@
 
 
 /*
- * End of "$Id: printers.c 5330 2006-03-23 21:07:20Z mike $".
+ * End of "$Id: printers.c 5373 2006-04-06 20:03:32Z mike $".
  */
--- cups-1.2rc1/scheduler/main.c.scheduler	2006-04-07 18:03:35.000000000 +0100
+++ cups-1.2rc1/scheduler/main.c	2006-04-07 18:03:36.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: main.c 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id: main.c 5383 2006-04-07 15:36:10Z mike $"
  *
  *   Scheduler main loop for the Common UNIX Printing System (CUPS).
  *
@@ -113,7 +113,6 @@
   int			i;		/* Looping var */
   char			*opt;		/* Option character */
   int			fg;		/* Run in the foreground */
-  int			only_ppds;	/* Just build ppds.dat */
   int			fds;		/* Number of ready descriptors */
   fd_set		*input,		/* Input set for select() */
 			*output;	/* Output set for select() */
@@ -149,25 +148,10 @@
   */
 
   fg = 0;
-  only_ppds = 0;
 
   for (i = 1; i < argc; i ++)
     if (argv[i][0] == '-')
-      {
-	if (argv[i][1] == '-')
-	{
-	  if (!strcmp (&argv[i][2], "ppdsdat"))
-	  {
-	    fg = only_ppds = 1;
-	  }
-	  else
-	  {
-            fprintf(stderr, "cupsd: Unknown option \'%s\' - aborting!\n",
-		    &argv[i][2]);
-	    usage(1);
-	  }
-	}
-	else for (opt = argv[i] + 1; *opt != '\0'; opt ++)
+      for (opt = argv[i] + 1; *opt != '\0'; opt ++)
         switch (*opt)
 	{
 	  case 'c' : /* Configuration file */
@@ -241,7 +225,6 @@
 	      usage(1);
 	      break;
 	}
-      }
     else
     {
       _cupsLangPrintf(stderr, _("cupsd: Unknown argument \"%s\" - aborting!\n"),
@@ -477,9 +460,6 @@
   signal(SIGTERM, sigterm_handler);
 #endif /* HAVE_SIGSET */
 
-  if (only_ppds)
-    return 0;
-
 #ifdef __sgi
  /*
   * Try to create a fake lpsched lock file if one is not already there.
@@ -1032,7 +1012,7 @@
     * accumulated.  Don't send these more than once a second...
     */
 
-    if (LastEvent && (time(NULL) - LastEventTime) > 1)
+    if (LastEvent)
     {
 #ifdef HAVE_NOTIFY_POST
       if (LastEvent & CUPSD_EVENT_PRINTER_CHANGED)
@@ -1060,10 +1040,9 @@
 #endif /* HAVE_NOTIFY_POST */
 
      /*
-      * Reset the accumulated events and notification time...
+      * Reset the accumulated events...
       */
 
-      LastEventTime = time(NULL);
       LastEvent     = CUPSD_EVENT_NONE;
     }
   }
@@ -1210,7 +1189,7 @@
 {
   if (s && *s)
   {
-    free(*s);
+    _cupsStrFree(*s);
     *s = NULL;
   }
 }
@@ -1276,10 +1255,10 @@
     return;
 
   if (*s)
-    free(*s);
+    _cupsStrFree(*s);
 
   if (v)
-    *s = strdup(v);
+    *s = _cupsStrAlloc(v);
   else
     *s = NULL;
 }
@@ -1310,13 +1289,13 @@
     vsnprintf(v, sizeof(v), f, ap);
     va_end(ap);
 
-    *s = strdup(v);
+    *s = _cupsStrAlloc(v);
   }
   else
     *s = NULL;
 
   if (olds)
-    free(olds);
+    _cupsStrFree(olds);
 }
 
 
@@ -1335,12 +1314,10 @@
 			ld_resp,	/* Launch data response */
 			ld_array,	/* Launch data array */
 			ld_sockets,	/* Launch data sockets dictionary */
-			ld_runatload,	/* Run-at-load setting */
 			tmp;		/* Launch data */
   cupsd_listener_t	*lis;		/* Listeners array */
   http_addr_t		addr;		/* Address variable */
   socklen_t		addrlen;	/* Length of address */
-  bool			runatload;	/* Run-at-load setting value */
 
 
   cupsdLogMessage(CUPSD_LOG_DEBUG, "launchd_checkin: pid=%d", (int)getpid());
@@ -1367,26 +1344,6 @@
   }
 
  /*
-  * Get the "run-at-load" setting...
-  */
-
-  if ((ld_runatload =
-           launch_data_dict_lookup(ld_resp, LAUNCH_JOBKEY_RUNATLOAD)) != NULL &&
-      launch_data_get_type(ld_runatload) == LAUNCH_DATA_BOOL)
-    runatload = launch_data_get_bool(ld_runatload);
-  else
-  {
-    errno = launch_data_get_errno(ld_resp);
-    cupsdLogMessage(CUPSD_LOG_ERROR,
-                    "launchd_checkin: Unable to find Run-at-load setting: %s",
-                    strerror(errno));
-    exit(EXIT_FAILURE);
-  }
-
-  cupsdLogMessage(CUPSD_LOG_DEBUG, "launchd_checkin: Run-at-load=%s",
-                  runatload ? "true" : "false");
-
- /*
   * Get the sockets dictionary...
   */
 
@@ -1479,18 +1436,22 @@
   {
     if (launch_data_get_type(ld_array) == LAUNCH_DATA_ARRAY)
     {
-      tmp = launch_data_array_get_index(ld_array, 0);
-
-      if (launch_data_get_type(tmp) == LAUNCH_DATA_FD)
+      if ((tmp = launch_data_array_get_index(ld_array, 0)))
       {
-        if (BrowseSocket != -1)
-	  close(BrowseSocket);
-
-	BrowseSocket = launch_data_get_fd(tmp);
-      }
-      else
-	cupsdLogMessage(CUPSD_LOG_WARN,
-	                "launchd_checkin: BrowseSocket not a fd!");
+	if (launch_data_get_type(tmp) == LAUNCH_DATA_FD)
+	{
+	  if (BrowseSocket != -1)
+	    close(BrowseSocket);
+  
+	  BrowseSocket = launch_data_get_fd(tmp);
+	}
+	else
+	  cupsdLogMessage(CUPSD_LOG_WARN,
+			  "launchd_checkin: BrowseSocket not a fd!");
+     }
+     else
+       cupsdLogMessage(CUPSD_LOG_WARN,
+		       "launchd_checkin: BrowseSockets is an empty array!");
    }
    else
      cupsdLogMessage(CUPSD_LOG_WARN,
@@ -2128,13 +2089,6 @@
     return (1);
 
  /*
-  * If we had a recent event notification, timeout in 1 second...
-  */
-
-  if (LastEvent)
-    return (1);
-
- /*
   * Otherwise, check all of the possible events that we need to wake for...
   */
 
@@ -2280,18 +2234,17 @@
 usage(int status)			/* O - Exit status */
 {
   _cupsLangPuts(status ? stderr : stdout,
-                _("Usage: cupsd [-c config-file] [-f] [-F] [-h] [-l] [--ppdsdat]\n"
+                _("Usage: cupsd [-c config-file] [-f] [-F] [-h] [-l]\n"
 		  "\n"
 		  "-c config-file      Load alternate configuration file\n"
 		  "-f                  Run in the foreground\n"
 		  "-F                  Run in the foreground but detach\n"
 		  "-h                  Show this usage message\n"
-		  "-l                  Run cupsd from launchd(8)\n"
-		  "--ppdsdat           Just build ppds.dat\n"));
+		  "-l                  Run cupsd from launchd(8)\n"));
   exit(status);
 }
 
 
 /*
- * End of "$Id: main.c 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id: main.c 5383 2006-04-07 15:36:10Z mike $".
  */
--- cups-1.2rc1/scheduler/statbuf.c.scheduler	2006-02-04 17:39:51.000000000 +0000
+++ cups-1.2rc1/scheduler/statbuf.c	2006-04-07 18:03:36.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: statbuf.c 5073 2006-02-04 17:39:51Z mike $"
+ * "$Id: statbuf.c 5373 2006-04-06 20:03:32Z mike $"
  *
  *   Status buffer routines for the Common UNIX Printing System (CUPS)
  *   scheduler.
@@ -317,7 +317,9 @@
   * Copy over the buffer data we've used up...
   */
 
-  _cups_strcpy(sb->buffer, lineptr);
+  if (lineptr < sb->buffer + sb->bufused)
+    _cups_strcpy(sb->buffer, lineptr);
+
   sb->bufused -= lineptr - sb->buffer;
 
   if (sb->bufused < 0)
@@ -328,5 +330,5 @@
 
 
 /*
- * End of "$Id: statbuf.c 5073 2006-02-04 17:39:51Z mike $".
+ * End of "$Id: statbuf.c 5373 2006-04-06 20:03:32Z mike $".
  */
--- cups-1.2rc1/scheduler/cert.c.scheduler	2006-04-07 18:03:36.000000000 +0100
+++ cups-1.2rc1/scheduler/cert.c	2006-04-07 18:03:36.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: cert.c 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id: cert.c 5381 2006-04-07 14:39:46Z mike $"
  *
  *   Authentication certificate routines for the Common UNIX
  *   Printing System (CUPS).
@@ -426,5 +426,5 @@
 
 
 /*
- * End of "$Id: cert.c 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id: cert.c 5381 2006-04-07 14:39:46Z mike $".
  */
--- cups-1.2rc1/scheduler/dirsvc.c.scheduler	2006-03-23 21:07:20.000000000 +0000
+++ cups-1.2rc1/scheduler/dirsvc.c	2006-04-07 18:03:36.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: dirsvc.c 5330 2006-03-23 21:07:20Z mike $"
+ * "$Id: dirsvc.c 5349 2006-03-29 15:22:10Z mike $"
  *
  *   Directory services routines for the Common UNIX Printing System (CUPS).
  *
@@ -2471,8 +2471,20 @@
 
   dequote(location, p->location, sizeof(location));
   dequote(info, p->info, sizeof(info));
-  dequote(make_model, p->make_model ? p->make_model : "Unknown",
-          sizeof(make_model));
+
+  if (p->make_model)
+    dequote(make_model, p->make_model, sizeof(make_model));
+  else if (p->type & CUPS_PRINTER_CLASS)
+  {
+    if (p->num_printers > 0 && p->printers[0]->make_model)
+      strlcpy(make_model, p->printers[0]->make_model, sizeof(make_model));
+    else
+      strlcpy(make_model, "Local Printer Class", sizeof(make_model));
+  }
+  else if (p->raw)
+    strlcpy(make_model, "Local Raw Printer", sizeof(make_model));
+  else
+    strlcpy(make_model, "Local System V Printer", sizeof(make_model));
 
  /*
   * Send a packet to each browse address...
@@ -3116,5 +3128,5 @@
 
 
 /*
- * End of "$Id: dirsvc.c 5330 2006-03-23 21:07:20Z mike $".
+ * End of "$Id: dirsvc.c 5349 2006-03-29 15:22:10Z mike $".
  */
--- cups-1.2rc1/scheduler/job.c.scheduler	2006-03-18 03:05:12.000000000 +0000
+++ cups-1.2rc1/scheduler/job.c	2006-04-07 18:03:36.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: job.c 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id: job.c 5383 2006-04-07 15:36:10Z mike $"
  *
  *   Job management routines for the Common UNIX Printing System (CUPS).
  *
@@ -386,7 +386,8 @@
 	                 "job-actual-printer-uri", NULL, printer->uri);
 	}
 
-        if (printer->state == IPP_PRINTER_IDLE ||	/* Printer is idle */
+        if ((!(printer->type & CUPS_PRINTER_REMOTE) &&	/* Printer is local */
+	     printer->state == IPP_PRINTER_IDLE) ||	/* and idle */
 	    ((printer->type & CUPS_PRINTER_REMOTE) &&	/* Printer is remote */
 	     !printer->job))				/* and not printing */
 	  start_job(job, printer);
@@ -1066,26 +1067,31 @@
  */
 
 void
-cupsdMoveJob(cupsd_job_t *job,		/* I - Job */
-             const char  *dest)		/* I - Destination */
+cupsdMoveJob(cupsd_job_t     *job,	/* I - Job */
+             cupsd_printer_t *p)	/* I - Destination printer or class */
 {
   ipp_attribute_t	*attr;		/* job-printer-uri attribute */
-  cupsd_printer_t	*p;		/* Destination printer or class */
+  const char		*olddest;	/* Old destination */
+  cupsd_printer_t	*oldp;		/* Old pointer */
 
 
  /*
-  * Find the printer...
+  * Don't move completed jobs...
   */
 
-  if ((p = cupsdFindDest(dest)) == NULL)
+  if (job->state_value > IPP_JOB_STOPPED)
     return;
 
  /*
-  * Don't move completed jobs...
+  * Get the old destination...
   */
 
-  if (job->state_value >= IPP_JOB_PROCESSING)
-    return;
+  olddest = job->dest;
+
+  if (job->printer)
+    oldp = job->printer;
+  else
+    oldp = cupsdFindDest(olddest);
 
  /*
   * Change the destination information...
@@ -1093,7 +1099,11 @@
 
   cupsdLoadJob(job);
 
-  cupsdSetString(&job->dest, dest);
+  cupsdAddEvent(CUPSD_EVENT_JOB_STOPPED, oldp, job,
+                "Job #%d moved from %s to %s.", job->id, olddest,
+		p->name);
+
+  cupsdSetString(&job->dest, p->name);
   job->dtype = p->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_REMOTE |
                           CUPS_PRINTER_IMPLICIT);
 
@@ -1101,6 +1111,10 @@
                                IPP_TAG_URI)) != NULL)
     cupsdSetString(&(attr->values[0].string.text), p->uri);
 
+  cupsdAddEvent(CUPSD_EVENT_JOB_STOPPED, p, job,
+                "Job #%d moved from %s to %s.", job->id, olddest,
+		p->name);
+
   cupsdSaveJob(job);
 }
 
@@ -3373,5 +3387,5 @@
 
 
 /*
- * End of "$Id: job.c 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id: job.c 5383 2006-04-07 15:36:10Z mike $".
  */
--- cups-1.2rc1/scheduler/client.c.scheduler	2006-04-07 18:03:36.000000000 +0100
+++ cups-1.2rc1/scheduler/client.c	2006-04-07 18:03:36.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: client.c 5335 2006-03-24 02:56:20Z mike $"
+ * "$Id: client.c 5373 2006-04-06 20:03:32Z mike $"
  *
  *   Client routines for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -957,7 +957,7 @@
       else
         snprintf(locale, sizeof(locale), "%s.%s",
 	         con->http.fields[HTTP_FIELD_ACCEPT_LANGUAGE], DefaultCharset);
-        
+
       con->language = cupsLangGet(locale);
     }
     else
@@ -2246,7 +2246,11 @@
 	    */
 
             if (!strncasecmp(buf, "Location:", 9))
+	    {
   	      cupsdSendHeader(con, HTTP_SEE_OTHER, NULL);
+	      if (httpPrintf(HTTP(con), "Content-Length: 0\r\n") < 0)
+		return (0);
+	    }
 	    else if (!strncasecmp(buf, "Status:", 7))
   	      cupsdSendError(con, atoi(buf + 7));
 	    else
@@ -2470,6 +2474,8 @@
       while (*ptr != '\0' && *ptr != ';')
         ptr ++;
     }
+    else
+      ptr ++;
   }
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2,
@@ -2612,11 +2618,13 @@
   return (1);
 
 #  elif defined(HAVE_CDSASSL)
-  OSStatus	error;			/* Error info */
-  SSLContextRef	conn;			/* New connection */
-  CFArrayRef	certificatesArray;	/* Array containing certificates */
-  int		allowExpired;		/* Allow expired certificates? */
-  int		allowAnyRoot;		/* Allow any root certificate? */
+  OSStatus		error;		/* Error info */
+  SSLContextRef		conn;		/* New connection */
+  CFArrayRef		certificatesArray;
+					/* Array containing certificates */
+  int			allowExpired;	/* Allow expired certificates? */
+  int			allowAnyRoot;	/* Allow any root certificate? */
+  cdsa_conn_ref_t	u;		/* Connection reference union */
 
 
   conn         = NULL;
@@ -2641,12 +2649,23 @@
     error = SSLSetProtocolVersion(conn, kSSLProtocol3);
 
   if (!error)
-    error = SSLSetConnection(conn, (SSLConnectionRef)con->http.fd);
+  {
+   /*
+    * Use a union to resolve warnings about int/pointer size mismatches...
+    */
+
+    u.connection = NULL;
+    u.sock       = con->http.fd;
+    error        = SSLSetConnection(conn, u.connection);
+  }
 
   if (!error)
     error = SSLSetPeerDomainName(conn, ServerName, strlen(ServerName) + 1);
 
-  /* have to do these options before setting server certs */
+ /*
+  * Have to set these options before setting server certs...
+  */
+
   if (!error && allowExpired)
     error = SSLSetAllowsExpiredCerts(conn, true);
 
@@ -2826,9 +2845,9 @@
     else
       return (NULL);
   }
-  else if (con->language != NULL)
+  else if (con->language)
     snprintf(filename, len, "%s/%s%s", DocumentRoot, con->language->language,
-            con->uri);
+             con->uri);
   else
     snprintf(filename, len, "%s%s", DocumentRoot, con->uri);
 
@@ -2840,44 +2859,30 @@
   * then fallback to the default one...
   */
 
-  if ((status = stat(filename, filestats)) != 0 && con->language != NULL)
-  {
-    /* Try removing the country code, if there is one. */
-    if (strncmp(con->uri, "/ppd/", 5) != 0 &&
-        strncmp(con->uri, "/admin/conf/", 12) != 0)
-    {
-      char *bare_lang = NULL;
-      size_t ln = strcspn (con->language->language, "_");
-      if (con->language->language[ln] == '_')
-      {
-	bare_lang = malloc (sizeof (char) * (ln + 1));
-	if (bare_lang)
-	{
-	  memcpy (bare_lang, con->language->language, ln);
-	  bare_lang[ln] = '\0';
-	  snprintf(filename, len,
-		   "%s/%s%s", DocumentRoot, bare_lang, con->uri);
-
-	  if ((ptr = strchr(filename, '?')) != NULL)
-	    *ptr = '\0';
-
-	  status = stat(filename, filestats);
-	  free (bare_lang);
-	}
-      }
-    }
-  }
-  
-  if (status != 0 && con->language != NULL)
+  if ((status = stat(filename, filestats)) != 0 && con->language &&
+      strncmp(con->uri, "/ppd/", 5) &&
+      strncmp(con->uri, "/admin/conf/", 12) &&
+      strncmp(con->uri, "/admin/log/", 11))
   {
    /*
-    * Drop the language prefix and try the current directory...
+    * Drop the country code...
     */
 
-    if (strncmp(con->uri, "/ppd/", 5) &&
-        strncmp(con->uri, "/admin/conf/", 12) &&
-        strncmp(con->uri, "/admin/log/", 11))
+    char	ll[3];			/* Short language name */
+
+
+    strlcpy(ll, con->language->language, sizeof(ll));
+    snprintf(filename, len, "%s/%s%s", DocumentRoot, ll, con->uri);
+
+    if ((ptr = strchr(filename, '?')) != NULL)
+      *ptr = '\0';
+
+    if ((status = stat(filename, filestats)) != 0)
     {
+     /*
+      * Drop the language prefix and try the root directory...
+      */
+
       snprintf(filename, len, "%s%s", DocumentRoot, con->uri);
 
       if ((ptr = strchr(filename, '?')) != NULL)
@@ -3815,5 +3820,5 @@
 
 
 /*
- * End of "$Id: client.c 5335 2006-03-24 02:56:20Z mike $".
+ * End of "$Id: client.c 5373 2006-04-06 20:03:32Z mike $".
  */


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- cups.spec	7 Apr 2006 15:36:46 -0000	1.148
+++ cups.spec	7 Apr 2006 17:06:46 -0000	1.149
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2
-Release: 0.2.%{beta}.2.8
+Release: 0.2.%{beta}.2.9
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
@@ -46,6 +46,7 @@
 Patch23: cups-str1532.patch
 Patch24: cups-maxlogsize.patch
 Patch25: cups-str1533.patch
+Patch26: cups-scheduler.patch
 Patch28: cups-no-propagate-ipp-port.patch
 Patch32: cups-pid.patch
 Patch40: cups-link.patch
@@ -147,6 +148,7 @@
 %patch23 -p1 -b .str1532
 %patch24 -p1 -b .maxlogsize
 %patch25 -p1 -b .str1533
+%patch26 -p1 -b .scheduler
 %patch28 -p1 -b .no-propagate-ipp-port
 %patch32 -p1 -b .pid
 %patch40 -p1 -b .link
@@ -391,6 +393,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.9
+- Sync scheduler/* with svn 5383.
+
 * Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.8
 - No longer need openssl-devel.
 - Build with LDAP_DEPRECATED=1, to pick up declarations of ldap_init() etc.



From fedora-cvs-commits at redhat.com  Fri Apr  7 17:07:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 13:07:27 -0400
Subject: rpms/cups/devel cups-scheduler.patch,1.1,1.2
Message-ID: <200604071707.k37H7RYv029816@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups-scheduler.patch 
Log Message:
Fixed patch.

cups-scheduler.patch:
 cert.c          |    4 +-
 client.c        |   95 +++++++++++++++++++++++++++-------------------------
 conf.c          |    7 ++-
 dirsvc.c        |   20 ++++++++---
 env.c           |   11 ++----
 ipp.c           |   29 +++++++++++++---
 job.c           |   38 ++++++++++++++-------
 job.h           |    6 +--
 main.c          |  101 ++++++++++++++------------------------------------------
 printers.c      |    9 +++-
 process.c       |   56 ++++++++++++++++---------------
 server.c        |    5 +-
 statbuf.c       |    8 ++--
 subscriptions.h |    6 +--
 14 files changed, 202 insertions(+), 193 deletions(-)

Index: cups-scheduler.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-scheduler.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-scheduler.patch	7 Apr 2006 16:58:46 -0000	1.1
+++ cups-scheduler.patch	7 Apr 2006 17:07:23 -0000	1.2
@@ -1,260 +1,29 @@
---- cups-1.2rc1/scheduler/cert.c	2006-04-07 17:56:09.000000000 +0100
-+++ /tmp/tim/cups/scheduler/cert.c	2006-04-07 16:05:46.000000000 +0100
+--- cups-1.2rc1/scheduler/server.c.scheduler	2006-03-18 03:05:12.000000000 +0000
++++ cups-1.2rc1/scheduler/server.c	2006-04-07 18:03:36.000000000 +0100
 @@ -1,5 +1,5 @@
  /*
 - * "$Id$"
 + * "$Id$"
   *
-  *   Authentication certificate routines for the Common UNIX
-  *   Printing System (CUPS).
-@@ -426,5 +426,5 @@
- 
- 
- /*
-- * End of "$Id$".
-+ * End of "$Id$".
-  */
---- cups-1.2rc1/scheduler/client.c	2006-04-07 17:56:09.000000000 +0100
-+++ /tmp/tim/cups/scheduler/client.c	2006-04-06 23:37:08.000000000 +0100
-@@ -1,5 +1,5 @@
- /*
-- * "$Id$"
-+ * "$Id$"
-  *
-  *   Client routines for the Common UNIX Printing System (CUPS) scheduler.
-  *
-@@ -957,7 +957,7 @@
-       else
-         snprintf(locale, sizeof(locale), "%s.%s",
- 	         con->http.fields[HTTP_FIELD_ACCEPT_LANGUAGE], DefaultCharset);
--        
-+
-       con->language = cupsLangGet(locale);
-     }
-     else
-@@ -2246,7 +2246,11 @@
- 	    */
- 
-             if (!strncasecmp(buf, "Location:", 9))
-+	    {
-   	      cupsdSendHeader(con, HTTP_SEE_OTHER, NULL);
-+	      if (httpPrintf(HTTP(con), "Content-Length: 0\r\n") < 0)
-+		return (0);
-+	    }
- 	    else if (!strncasecmp(buf, "Status:", 7))
-   	      cupsdSendError(con, atoi(buf + 7));
- 	    else
-@@ -2470,6 +2474,8 @@
-       while (*ptr != '\0' && *ptr != ';')
-         ptr ++;
-     }
-+    else
-+      ptr ++;
-   }
- 
-   cupsdLogMessage(CUPSD_LOG_DEBUG2,
-@@ -2612,11 +2618,13 @@
-   return (1);
- 
- #  elif defined(HAVE_CDSASSL)
--  OSStatus	error;			/* Error info */
--  SSLContextRef	conn;			/* New connection */
--  CFArrayRef	certificatesArray;	/* Array containing certificates */
--  int		allowExpired;		/* Allow expired certificates? */
--  int		allowAnyRoot;		/* Allow any root certificate? */
-+  OSStatus		error;		/* Error info */
-+  SSLContextRef		conn;		/* New connection */
-+  CFArrayRef		certificatesArray;
-+					/* Array containing certificates */
-+  int			allowExpired;	/* Allow expired certificates? */
-+  int			allowAnyRoot;	/* Allow any root certificate? */
-+  cdsa_conn_ref_t	u;		/* Connection reference union */
- 
- 
-   conn         = NULL;
-@@ -2641,12 +2649,23 @@
-     error = SSLSetProtocolVersion(conn, kSSLProtocol3);
- 
-   if (!error)
--    error = SSLSetConnection(conn, (SSLConnectionRef)con->http.fd);
-+  {
-+   /*
-+    * Use a union to resolve warnings about int/pointer size mismatches...
-+    */
-+
-+    u.connection = NULL;
-+    u.sock       = con->http.fd;
-+    error        = SSLSetConnection(conn, u.connection);
-+  }
- 
-   if (!error)
-     error = SSLSetPeerDomainName(conn, ServerName, strlen(ServerName) + 1);
- 
--  /* have to do these options before setting server certs */
-+ /*
-+  * Have to set these options before setting server certs...
-+  */
-+
-   if (!error && allowExpired)
-     error = SSLSetAllowsExpiredCerts(conn, true);
- 
-@@ -2826,9 +2845,9 @@
-     else
-       return (NULL);
-   }
--  else if (con->language != NULL)
-+  else if (con->language)
-     snprintf(filename, len, "%s/%s%s", DocumentRoot, con->language->language,
--            con->uri);
-+             con->uri);
-   else
-     snprintf(filename, len, "%s%s", DocumentRoot, con->uri);
- 
-@@ -2840,44 +2859,30 @@
-   * then fallback to the default one...
-   */
- 
--  if ((status = stat(filename, filestats)) != 0 && con->language != NULL)
--  {
--    /* Try removing the country code, if there is one. */
--    if (strncmp(con->uri, "/ppd/", 5) != 0 &&
--        strncmp(con->uri, "/admin/conf/", 12) != 0)
--    {
--      char *bare_lang = NULL;
--      size_t ln = strcspn (con->language->language, "_");
--      if (con->language->language[ln] == '_')
--      {
--	bare_lang = malloc (sizeof (char) * (ln + 1));
--	if (bare_lang)
--	{
--	  memcpy (bare_lang, con->language->language, ln);
--	  bare_lang[ln] = '\0';
--	  snprintf(filename, len,
--		   "%s/%s%s", DocumentRoot, bare_lang, con->uri);
--
--	  if ((ptr = strchr(filename, '?')) != NULL)
--	    *ptr = '\0';
--
--	  status = stat(filename, filestats);
--	  free (bare_lang);
--	}
--      }
--    }
--  }
--  
--  if (status != 0 && con->language != NULL)
-+  if ((status = stat(filename, filestats)) != 0 && con->language &&
-+      strncmp(con->uri, "/ppd/", 5) &&
-+      strncmp(con->uri, "/admin/conf/", 12) &&
-+      strncmp(con->uri, "/admin/log/", 11))
-   {
-    /*
--    * Drop the language prefix and try the current directory...
-+    * Drop the country code...
-     */
- 
--    if (strncmp(con->uri, "/ppd/", 5) &&
--        strncmp(con->uri, "/admin/conf/", 12) &&
--        strncmp(con->uri, "/admin/log/", 11))
-+    char	ll[3];			/* Short language name */
-+
-+
-+    strlcpy(ll, con->language->language, sizeof(ll));
-+    snprintf(filename, len, "%s/%s%s", DocumentRoot, ll, con->uri);
-+
-+    if ((ptr = strchr(filename, '?')) != NULL)
-+      *ptr = '\0';
-+
-+    if ((status = stat(filename, filestats)) != 0)
-     {
-+     /*
-+      * Drop the language prefix and try the root directory...
-+      */
-+
-       snprintf(filename, len, "%s%s", DocumentRoot, con->uri);
- 
-       if ((ptr = strchr(filename, '?')) != NULL)
-@@ -3815,5 +3820,5 @@
- 
- 
- /*
-- * End of "$Id$".
-+ * End of "$Id$".
-  */
---- cups-1.2rc1/scheduler/conf.c	2006-04-07 17:56:09.000000000 +0100
-+++ /tmp/tim/cups/scheduler/conf.c	2006-04-06 23:37:08.000000000 +0100
-@@ -1,5 +1,5 @@
- /*
-- * "$Id$"
-+ * "$Id$"
-  *
-  *   Configuration routines for the Common UNIX Printing System (CUPS).
-  *
-@@ -243,6 +243,7 @@
-   if (NumBrowsers > 0)
-   {
-     free(Browsers);
-+    Browsers = NULL;
- 
-     NumBrowsers = 0;
-   }
-@@ -281,7 +282,7 @@
-   cupsdSetString(&AccessLog, CUPS_LOGDIR "/access_log");
-   cupsdSetString(&ErrorLog, CUPS_LOGDIR "/error_log");
-   cupsdSetString(&PageLog, CUPS_LOGDIR "/page_log");
--  cupsdSetString(&Printcap, "/etc/printcap");
-+  cupsdSetString(&Printcap, CUPS_DEFAULT_PRINTCAP);
-   cupsdSetString(&PrintcapGUI, "/usr/bin/glpoptions");
-   cupsdSetString(&FontPath, CUPS_FONTPATH);
-   cupsdSetString(&RemoteRoot, "remroot");
-@@ -3251,5 +3252,5 @@
- 
- 
- /*
-- * End of "$Id$".
-+ * End of "$Id$".
-  */
---- cups-1.2rc1/scheduler/dirsvc.c	2006-03-23 21:07:20.000000000 +0000
-+++ /tmp/tim/cups/scheduler/dirsvc.c	2006-04-02 19:55:59.000000000 +0100
-@@ -1,5 +1,5 @@
- /*
-- * "$Id$"
-+ * "$Id$"
-  *
-  *   Directory services routines for the Common UNIX Printing System (CUPS).
+  *   Server start/stop routines for the Common UNIX Printing System (CUPS).
   *
-@@ -2471,8 +2471,20 @@
+@@ -119,7 +119,6 @@
  
-   dequote(location, p->location, sizeof(location));
-   dequote(info, p->info, sizeof(info));
--  dequote(make_model, p->make_model ? p->make_model : "Unknown",
--          sizeof(make_model));
-+
-+  if (p->make_model)
-+    dequote(make_model, p->make_model, sizeof(make_model));
-+  else if (p->type & CUPS_PRINTER_CLASS)
-+  {
-+    if (p->num_printers > 0 && p->printers[0]->make_model)
-+      strlcpy(make_model, p->printers[0]->make_model, sizeof(make_model));
-+    else
-+      strlcpy(make_model, "Local Printer Class", sizeof(make_model));
-+  }
-+  else if (p->raw)
-+    strlcpy(make_model, "Local Raw Printer", sizeof(make_model));
-+  else
-+    strlcpy(make_model, "Local System V Printer", sizeof(make_model));
+   LastEvent     = CUPSD_EVENT_PRINTER_CHANGED | CUPSD_EVENT_JOB_STATE_CHANGED |
+                   CUPSD_EVENT_SERVER_STARTED;
+-  LastEventTime = 0;
  
-  /*
-   * Send a packet to each browse address...
-@@ -3116,5 +3128,5 @@
+   started = 1;
+ }
+@@ -212,5 +211,5 @@
  
  
  /*
 - * End of "$Id$".
 + * End of "$Id$".
   */
---- cups-1.2rc1/scheduler/env.c	2006-03-18 03:05:12.000000000 +0000
-+++ /tmp/tim/cups/scheduler/env.c	2006-04-06 23:37:08.000000000 +0100
+--- cups-1.2rc1/scheduler/env.c.scheduler	2006-03-18 03:05:12.000000000 +0000
++++ cups-1.2rc1/scheduler/env.c	2006-04-07 18:03:36.000000000 +0100
 @@ -1,5 +1,5 @@
  /*
 - * "$Id$"
@@ -284,8 +53,8 @@
 - * End of "$Id$".
 + * End of "$Id$".
   */
---- cups-1.2rc1/scheduler/ipp.c	2006-03-24 01:20:03.000000000 +0000
-+++ /tmp/tim/cups/scheduler/ipp.c	2006-04-07 17:10:48.000000000 +0100
+--- cups-1.2rc1/scheduler/ipp.c.scheduler	2006-03-24 01:20:03.000000000 +0000
++++ cups-1.2rc1/scheduler/ipp.c	2006-04-07 18:03:36.000000000 +0100
 @@ -1,5 +1,5 @@
  /*
 - * "$Id$"
@@ -373,98 +142,132 @@
 - * End of "$Id$".
 + * End of "$Id$".
   */
---- cups-1.2rc1/scheduler/job.c	2006-03-18 03:05:12.000000000 +0000
-+++ /tmp/tim/cups/scheduler/job.c	2006-04-07 17:10:48.000000000 +0100
+--- cups-1.2rc1/scheduler/process.c.scheduler	2006-02-09 01:00:26.000000000 +0000
++++ cups-1.2rc1/scheduler/process.c	2006-04-07 18:03:36.000000000 +0100
 @@ -1,5 +1,5 @@
  /*
 - * "$Id$"
 + * "$Id$"
   *
-  *   Job management routines for the Common UNIX Printing System (CUPS).
+  *   Process management routines for the Common UNIX Printing System (CUPS).
   *
-@@ -386,7 +386,8 @@
- 	                 "job-actual-printer-uri", NULL, printer->uri);
- 	}
- 
--        if (printer->state == IPP_PRINTER_IDLE ||	/* Printer is idle */
-+        if ((!(printer->type & CUPS_PRINTER_REMOTE) &&	/* Printer is local */
-+	     printer->state == IPP_PRINTER_IDLE) ||	/* and idle */
- 	    ((printer->type & CUPS_PRINTER_REMOTE) &&	/* Printer is remote */
- 	     !printer->job))				/* and not printing */
- 	  start_job(job, printer);
-@@ -1066,26 +1067,31 @@
-  */
+@@ -35,9 +35,9 @@
  
- void
--cupsdMoveJob(cupsd_job_t *job,		/* I - Job */
--             const char  *dest)		/* I - Destination */
-+cupsdMoveJob(cupsd_job_t     *job,	/* I - Job */
-+             cupsd_printer_t *p)	/* I - Destination printer or class */
- {
-   ipp_attribute_t	*attr;		/* job-printer-uri attribute */
--  cupsd_printer_t	*p;		/* Destination printer or class */
-+  const char		*olddest;	/* Old destination */
-+  cupsd_printer_t	*oldp;		/* Old pointer */
+ #include "cupsd.h"
+ #include <grp.h>
+-#if defined(__APPLE__) && __GNUC__ < 4
++#if defined(__APPLE__)
+ #  include <libgen.h>
+-#endif /* __APPLE__ && __GNUC__ < 4 */ 
++#endif /* __APPLE__ */ 
  
  
-  /*
--  * Find the printer...
-+  * Don't move completed jobs...
-   */
+ /*
+@@ -128,45 +128,47 @@
+ #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
+   struct sigaction action;		/* POSIX signal handler */
+ #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
+-#if defined(__APPLE__) && __GNUC__ < 4
+-  int		envc;			/* Number of environment variables */
++#if defined(__APPLE__)
+   char		processPath[1024],	/* CFProcessPath environment variable */
+ 		linkpath[1024];		/* Link path for symlinks... */
+   int		linkbytes;		/* Bytes for link path */
+-#endif /* __APPLE__ && __GNUC__ < 4 */
++#endif /* __APPLE__ */
  
--  if ((p = cupsdFindDest(dest)) == NULL)
-+  if (job->state_value > IPP_JOB_STOPPED)
-     return;
  
-  /*
--  * Don't move completed jobs...
-+  * Get the old destination...
-   */
+   cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                   "cupsdStartProcess(\"%s\", %p, %p, %d, %d, %d)",
+                   command, argv, envp, infd, outfd, errfd);
  
--  if (job->state_value >= IPP_JOB_PROCESSING)
--    return;
-+  olddest = job->dest;
+-#if defined(__APPLE__) && __GNUC__ < 4
+- /*
+-  * Add special voodoo magic for MacOS X 10.3 and earlier - this allows
+-  * MacOS X programs to access their bundle resources properly...
+-  */
+-
+-  if ((linkbytes = readlink(command, linkpath, sizeof(linkpath) - 1)) > 0)
++#if defined(__APPLE__)
++  if (envp)
+   {
+    /*
+-    * Yes, this is a symlink to the actual program, nul-terminate and
+-    * use it...
++    * Add special voodoo magic for MacOS X - this allows MacOS X 
++    * programs to access their bundle resources properly...
+     */
+ 
+-    linkpath[linkbytes] = '\0';
++    if ((linkbytes = readlink(command, linkpath, sizeof(linkpath) - 1)) > 0)
++    {
++     /*
++      * Yes, this is a symlink to the actual program, nul-terminate and
++      * use it...
++      */
 +
-+  if (job->printer)
-+    oldp = job->printer;
-+  else
-+    oldp = cupsdFindDest(olddest);
++      linkpath[linkbytes] = '\0';
  
-  /*
-   * Change the destination information...
-@@ -1093,7 +1099,11 @@
+-    if (linkpath[0] == '/')
+-      snprintf(processPath, sizeof(processPath), "CFProcessPath=%s",
+-	       linkpath);
++      if (linkpath[0] == '/')
++	snprintf(processPath, sizeof(processPath), "CFProcessPath=%s",
++		 linkpath);
++      else
++	snprintf(processPath, sizeof(processPath), "CFProcessPath=%s/%s",
++		 dirname(command), linkpath);
++    }
+     else
+-      snprintf(processPath, sizeof(processPath), "CFProcessPath=%s/%s",
+-	       dirname(command), linkpath);
+-  }
+-  else
+-    snprintf(processPath, sizeof(processPath), "CFProcessPath=%s", command);
++      snprintf(processPath, sizeof(processPath), "CFProcessPath=%s", command);
  
-   cupsdLoadJob(job);
+-  envp[0] = processPath;		/* Replace <CFProcessPath> string */
+-#endif	/* __APPLE__ && __GNUC__ > 3 */
++    envp[0] = processPath;		/* Replace <CFProcessPath> string */
++  }
++#endif	/* __APPLE__ */
  
--  cupsdSetString(&job->dest, dest);
-+  cupsdAddEvent(CUPSD_EVENT_JOB_STOPPED, oldp, job,
-+                "Job #%d moved from %s to %s.", job->id, olddest,
-+		p->name);
-+
-+  cupsdSetString(&job->dest, p->name);
-   job->dtype = p->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_REMOTE |
-                           CUPS_PRINTER_IMPLICIT);
+  /*
+   * Block signals before forking...
+@@ -342,5 +344,5 @@
  
-@@ -1101,6 +1111,10 @@
-                                IPP_TAG_URI)) != NULL)
-     cupsdSetString(&(attr->values[0].string.text), p->uri);
  
-+  cupsdAddEvent(CUPSD_EVENT_JOB_STOPPED, p, job,
-+                "Job #%d moved from %s to %s.", job->id, olddest,
-+		p->name);
-+
-   cupsdSaveJob(job);
- }
+ /*
+- * End of "$Id$".
++ * End of "$Id$".
+  */
+--- cups-1.2rc1/scheduler/subscriptions.h.scheduler	2006-03-18 03:05:12.000000000 +0000
++++ cups-1.2rc1/scheduler/subscriptions.h	2006-04-07 18:03:36.000000000 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * "$Id$"
++ * "$Id$"
+  *
+  *   Subscription definitions for the Common UNIX Printing System (CUPS) scheduler.
+  *
+@@ -136,8 +136,6 @@
+ VAR cupsd_event_t **Events VALUE(NULL);	/* Active events */
  
-@@ -3373,5 +3387,5 @@
+ VAR unsigned	LastEvent VALUE(0);	/* Last events processed */
+-VAR time_t	LastEventTime VALUE(0);	/* Time that the last events were sent */
+-
+ VAR int		NotifierPipes[2] VALUE2(-1, -1);
+ 					/* Pipes for notifier error/debug output */
+ VAR cupsd_statbuf_t *NotifierStatusBuffer VALUE(NULL);
+@@ -172,5 +170,5 @@
  
  
  /*
 - * End of "$Id$".
 + * End of "$Id$".
   */
---- cups-1.2rc1/scheduler/job.h	2006-03-18 03:05:12.000000000 +0000
-+++ /tmp/tim/cups/scheduler/job.h	2006-04-07 17:10:48.000000000 +0100
+--- cups-1.2rc1/scheduler/job.h.scheduler	2006-03-18 03:05:12.000000000 +0000
++++ cups-1.2rc1/scheduler/job.h	2006-04-07 18:03:36.000000000 +0100
 @@ -1,5 +1,5 @@
  /*
 - * "$Id$"
@@ -488,8 +291,69 @@
 - * End of "$Id$".
 + * End of "$Id$".
   */
---- cups-1.2rc1/scheduler/main.c	2006-04-07 17:56:09.000000000 +0100
-+++ /tmp/tim/cups/scheduler/main.c	2006-04-07 17:10:48.000000000 +0100
+--- cups-1.2rc1/scheduler/conf.c.scheduler	2006-04-07 18:03:35.000000000 +0100
++++ cups-1.2rc1/scheduler/conf.c	2006-04-07 18:03:36.000000000 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * "$Id$"
++ * "$Id$"
+  *
+  *   Configuration routines for the Common UNIX Printing System (CUPS).
+  *
+@@ -243,6 +243,7 @@
+   if (NumBrowsers > 0)
+   {
+     free(Browsers);
++    Browsers = NULL;
+ 
+     NumBrowsers = 0;
+   }
+@@ -281,7 +282,7 @@
+   cupsdSetString(&AccessLog, CUPS_LOGDIR "/access_log");
+   cupsdSetString(&ErrorLog, CUPS_LOGDIR "/error_log");
+   cupsdSetString(&PageLog, CUPS_LOGDIR "/page_log");
+-  cupsdSetString(&Printcap, "/etc/printcap");
++  cupsdSetString(&Printcap, CUPS_DEFAULT_PRINTCAP);
+   cupsdSetString(&PrintcapGUI, "/usr/bin/glpoptions");
+   cupsdSetString(&FontPath, CUPS_FONTPATH);
+   cupsdSetString(&RemoteRoot, "remroot");
+@@ -3251,5 +3252,5 @@
+ 
+ 
+ /*
+- * End of "$Id$".
++ * End of "$Id$".
+  */
+--- cups-1.2rc1/scheduler/printers.c.scheduler	2006-03-23 21:07:20.000000000 +0000
++++ cups-1.2rc1/scheduler/printers.c	2006-04-07 18:03:36.000000000 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * "$Id$"
++ * "$Id$"
+  *
+  *   Printer routines for the Common UNIX Printing System (CUPS).
+  *
+@@ -2271,6 +2271,11 @@
+ 
+   if (old_state != s)
+   {
++    cupsdAddEvent(CUPSD_EVENT_PRINTER_STATE_CHANGED, p, NULL,
++		  "%s \"%s\" state changed.",
++		  (p->type & CUPS_PRINTER_CLASS) ? "Class" : "Printer",
++		  p->name);
++
+    /*
+     * Let the browse code know this needs to be updated...
+     */
+@@ -3273,5 +3278,5 @@
+ 
+ 
+ /*
+- * End of "$Id$".
++ * End of "$Id$".
+  */
+--- cups-1.2rc1/scheduler/main.c.scheduler	2006-04-07 18:03:35.000000000 +0100
++++ cups-1.2rc1/scheduler/main.c	2006-04-07 18:03:36.000000000 +0100
 @@ -1,5 +1,5 @@
  /*
 - * "$Id$"
@@ -540,41 +404,7 @@
      else
      {
        _cupsLangPrintf(stderr, _("cupsd: Unknown argument \"%s\" - aborting!\n"),
-@@ -262,8 +245,6 @@
-     * Setup signal handlers for the parent...
-     */
- 
--    pid_t pid;
--
- #ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-     sigset(SIGUSR1, parent_handler);
-     sigset(SIGCHLD, parent_handler);
-@@ -287,7 +268,7 @@
-     signal(SIGHUP, SIG_IGN);
- #endif /* HAVE_SIGSET */
- 
--    if ((pid = fork()) > 0)
-+    if (fork() > 0)
-     {
-      /*
-       * OK, wait for the child to startup and send us SIGUSR1 or to crash
-@@ -299,15 +280,7 @@
-         sleep(1);
- 
-       if (parent_signal == SIGUSR1)
--      {
--        FILE *f = fopen ("/var/run/cupsd.pid", "w");
--        if (f)
--        {
--          fprintf (f, "%d\n", pid);
--          fclose (f);
--        }
-         return (0);
--      }
- 
-       if (wait(&i) < 0)
-       {
-@@ -487,9 +460,6 @@
+@@ -477,9 +460,6 @@
    signal(SIGTERM, sigterm_handler);
  #endif /* HAVE_SIGSET */
  
@@ -584,7 +414,7 @@
  #ifdef __sgi
   /*
    * Try to create a fake lpsched lock file if one is not already there.
-@@ -1042,7 +1012,7 @@
+@@ -1032,7 +1012,7 @@
      * accumulated.  Don't send these more than once a second...
      */
  
@@ -593,7 +423,7 @@
      {
  #ifdef HAVE_NOTIFY_POST
        if (LastEvent & CUPSD_EVENT_PRINTER_CHANGED)
-@@ -1070,10 +1040,9 @@
+@@ -1060,10 +1040,9 @@
  #endif /* HAVE_NOTIFY_POST */
  
       /*
@@ -605,7 +435,7 @@
        LastEvent     = CUPSD_EVENT_NONE;
      }
    }
-@@ -1220,7 +1189,7 @@
+@@ -1210,7 +1189,7 @@
  {
    if (s && *s)
    {
@@ -614,7 +444,7 @@
      *s = NULL;
    }
  }
-@@ -1286,10 +1255,10 @@
+@@ -1276,10 +1255,10 @@
      return;
  
    if (*s)
@@ -627,7 +457,7 @@
    else
      *s = NULL;
  }
-@@ -1320,13 +1289,13 @@
+@@ -1310,13 +1289,13 @@
      vsnprintf(v, sizeof(v), f, ap);
      va_end(ap);
  
@@ -643,7 +473,7 @@
  }
  
  
-@@ -1345,12 +1314,10 @@
+@@ -1335,12 +1314,10 @@
  			ld_resp,	/* Launch data response */
  			ld_array,	/* Launch data array */
  			ld_sockets,	/* Launch data sockets dictionary */
@@ -656,7 +486,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG, "launchd_checkin: pid=%d", (int)getpid());
-@@ -1377,26 +1344,6 @@
+@@ -1367,26 +1344,6 @@
    }
  
   /*
@@ -683,7 +513,7 @@
    * Get the sockets dictionary...
    */
  
-@@ -1489,18 +1436,22 @@
+@@ -1479,18 +1436,22 @@
    {
      if (launch_data_get_type(ld_array) == LAUNCH_DATA_ARRAY)
      {
@@ -717,7 +547,7 @@
     }
     else
       cupsdLogMessage(CUPSD_LOG_WARN,
-@@ -2138,13 +2089,6 @@
+@@ -2128,13 +2089,6 @@
      return (1);
  
   /*
@@ -731,7 +561,7 @@
    * Otherwise, check all of the possible events that we need to wake for...
    */
  
-@@ -2290,18 +2234,17 @@
+@@ -2280,18 +2234,17 @@
  usage(int status)			/* O - Exit status */
  {
    _cupsLangPuts(status ? stderr : stdout,
@@ -753,203 +583,339 @@
 - * End of "$Id$".
 + * End of "$Id$".
   */
---- cups-1.2rc1/scheduler/printers.c	2006-03-23 21:07:20.000000000 +0000
-+++ /tmp/tim/cups/scheduler/printers.c	2006-04-06 23:37:08.000000000 +0100
+--- cups-1.2rc1/scheduler/statbuf.c.scheduler	2006-02-04 17:39:51.000000000 +0000
++++ cups-1.2rc1/scheduler/statbuf.c	2006-04-07 18:03:36.000000000 +0100
 @@ -1,5 +1,5 @@
  /*
 - * "$Id$"
 + * "$Id$"
   *
-  *   Printer routines for the Common UNIX Printing System (CUPS).
-  *
-@@ -2271,6 +2271,11 @@
+  *   Status buffer routines for the Common UNIX Printing System (CUPS)
+  *   scheduler.
+@@ -317,7 +317,9 @@
+   * Copy over the buffer data we've used up...
+   */
  
-   if (old_state != s)
-   {
-+    cupsdAddEvent(CUPSD_EVENT_PRINTER_STATE_CHANGED, p, NULL,
-+		  "%s \"%s\" state changed.",
-+		  (p->type & CUPS_PRINTER_CLASS) ? "Class" : "Printer",
-+		  p->name);
+-  _cups_strcpy(sb->buffer, lineptr);
++  if (lineptr < sb->buffer + sb->bufused)
++    _cups_strcpy(sb->buffer, lineptr);
 +
-    /*
-     * Let the browse code know this needs to be updated...
-     */
-@@ -3273,5 +3278,5 @@
+   sb->bufused -= lineptr - sb->buffer;
+ 
+   if (sb->bufused < 0)
+@@ -328,5 +330,5 @@
  
  
  /*
 - * End of "$Id$".
 + * End of "$Id$".
   */
---- cups-1.2rc1/scheduler/process.c	2006-02-09 01:00:26.000000000 +0000
-+++ /tmp/tim/cups/scheduler/process.c	2006-04-06 23:37:08.000000000 +0100
+--- cups-1.2rc1/scheduler/cert.c.scheduler	2006-04-07 18:03:36.000000000 +0100
++++ cups-1.2rc1/scheduler/cert.c	2006-04-07 18:03:36.000000000 +0100
 @@ -1,5 +1,5 @@
  /*
 - * "$Id$"
 + * "$Id$"
   *
-  *   Process management routines for the Common UNIX Printing System (CUPS).
-  *
-@@ -35,9 +35,9 @@
- 
- #include "cupsd.h"
- #include <grp.h>
--#if defined(__APPLE__) && __GNUC__ < 4
-+#if defined(__APPLE__)
- #  include <libgen.h>
--#endif /* __APPLE__ && __GNUC__ < 4 */ 
-+#endif /* __APPLE__ */ 
- 
- 
- /*
-@@ -128,45 +128,47 @@
- #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-   struct sigaction action;		/* POSIX signal handler */
- #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
--#if defined(__APPLE__) && __GNUC__ < 4
--  int		envc;			/* Number of environment variables */
-+#if defined(__APPLE__)
-   char		processPath[1024],	/* CFProcessPath environment variable */
- 		linkpath[1024];		/* Link path for symlinks... */
-   int		linkbytes;		/* Bytes for link path */
--#endif /* __APPLE__ && __GNUC__ < 4 */
-+#endif /* __APPLE__ */
- 
- 
-   cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                   "cupsdStartProcess(\"%s\", %p, %p, %d, %d, %d)",
-                   command, argv, envp, infd, outfd, errfd);
- 
--#if defined(__APPLE__) && __GNUC__ < 4
-- /*
--  * Add special voodoo magic for MacOS X 10.3 and earlier - this allows
--  * MacOS X programs to access their bundle resources properly...
--  */
--
--  if ((linkbytes = readlink(command, linkpath, sizeof(linkpath) - 1)) > 0)
-+#if defined(__APPLE__)
-+  if (envp)
-   {
-    /*
--    * Yes, this is a symlink to the actual program, nul-terminate and
--    * use it...
-+    * Add special voodoo magic for MacOS X - this allows MacOS X 
-+    * programs to access their bundle resources properly...
-     */
- 
--    linkpath[linkbytes] = '\0';
-+    if ((linkbytes = readlink(command, linkpath, sizeof(linkpath) - 1)) > 0)
-+    {
-+     /*
-+      * Yes, this is a symlink to the actual program, nul-terminate and
-+      * use it...
-+      */
- 
--    if (linkpath[0] == '/')
--      snprintf(processPath, sizeof(processPath), "CFProcessPath=%s",
--	       linkpath);
-+      linkpath[linkbytes] = '\0';
-+
-+      if (linkpath[0] == '/')
-+	snprintf(processPath, sizeof(processPath), "CFProcessPath=%s",
-+		 linkpath);
-+      else
-+	snprintf(processPath, sizeof(processPath), "CFProcessPath=%s/%s",
-+		 dirname(command), linkpath);
-+    }
-     else
--      snprintf(processPath, sizeof(processPath), "CFProcessPath=%s/%s",
--	       dirname(command), linkpath);
--  }
--  else
--    snprintf(processPath, sizeof(processPath), "CFProcessPath=%s", command);
-+      snprintf(processPath, sizeof(processPath), "CFProcessPath=%s", command);
- 
--  envp[0] = processPath;		/* Replace <CFProcessPath> string */
--#endif	/* __APPLE__ && __GNUC__ > 3 */
-+    envp[0] = processPath;		/* Replace <CFProcessPath> string */
-+  }
-+#endif	/* __APPLE__ */
- 
-  /*
-   * Block signals before forking...
-@@ -342,5 +344,5 @@
+  *   Authentication certificate routines for the Common UNIX
+  *   Printing System (CUPS).
+@@ -426,5 +426,5 @@
  
  
  /*
 - * End of "$Id$".
 + * End of "$Id$".
   */
---- cups-1.2rc1/scheduler/server.c	2006-03-18 03:05:12.000000000 +0000
-+++ /tmp/tim/cups/scheduler/server.c	2006-04-06 23:37:08.000000000 +0100
+--- cups-1.2rc1/scheduler/dirsvc.c.scheduler	2006-03-23 21:07:20.000000000 +0000
++++ cups-1.2rc1/scheduler/dirsvc.c	2006-04-07 18:03:36.000000000 +0100
 @@ -1,5 +1,5 @@
  /*
 - * "$Id$"
 + * "$Id$"
   *
-  *   Server start/stop routines for the Common UNIX Printing System (CUPS).
+  *   Directory services routines for the Common UNIX Printing System (CUPS).
   *
-@@ -119,7 +119,6 @@
+@@ -2471,8 +2471,20 @@
  
-   LastEvent     = CUPSD_EVENT_PRINTER_CHANGED | CUPSD_EVENT_JOB_STATE_CHANGED |
-                   CUPSD_EVENT_SERVER_STARTED;
--  LastEventTime = 0;
+   dequote(location, p->location, sizeof(location));
+   dequote(info, p->info, sizeof(info));
+-  dequote(make_model, p->make_model ? p->make_model : "Unknown",
+-          sizeof(make_model));
++
++  if (p->make_model)
++    dequote(make_model, p->make_model, sizeof(make_model));
++  else if (p->type & CUPS_PRINTER_CLASS)
++  {
++    if (p->num_printers > 0 && p->printers[0]->make_model)
++      strlcpy(make_model, p->printers[0]->make_model, sizeof(make_model));
++    else
++      strlcpy(make_model, "Local Printer Class", sizeof(make_model));
++  }
++  else if (p->raw)
++    strlcpy(make_model, "Local Raw Printer", sizeof(make_model));
++  else
++    strlcpy(make_model, "Local System V Printer", sizeof(make_model));
  
-   started = 1;
- }
-@@ -212,5 +211,5 @@
+  /*
+   * Send a packet to each browse address...
+@@ -3116,5 +3128,5 @@
  
  
  /*
 - * End of "$Id$".
 + * End of "$Id$".
   */
---- cups-1.2rc1/scheduler/statbuf.c	2006-02-04 17:39:51.000000000 +0000
-+++ /tmp/tim/cups/scheduler/statbuf.c	2006-04-06 23:37:08.000000000 +0100
+--- cups-1.2rc1/scheduler/job.c.scheduler	2006-03-18 03:05:12.000000000 +0000
++++ cups-1.2rc1/scheduler/job.c	2006-04-07 18:03:36.000000000 +0100
 @@ -1,5 +1,5 @@
  /*
 - * "$Id$"
 + * "$Id$"
   *
-  *   Status buffer routines for the Common UNIX Printing System (CUPS)
-  *   scheduler.
-@@ -317,7 +317,9 @@
-   * Copy over the buffer data we've used up...
+  *   Job management routines for the Common UNIX Printing System (CUPS).
+  *
+@@ -386,7 +386,8 @@
+ 	                 "job-actual-printer-uri", NULL, printer->uri);
+ 	}
+ 
+-        if (printer->state == IPP_PRINTER_IDLE ||	/* Printer is idle */
++        if ((!(printer->type & CUPS_PRINTER_REMOTE) &&	/* Printer is local */
++	     printer->state == IPP_PRINTER_IDLE) ||	/* and idle */
+ 	    ((printer->type & CUPS_PRINTER_REMOTE) &&	/* Printer is remote */
+ 	     !printer->job))				/* and not printing */
+ 	  start_job(job, printer);
+@@ -1066,26 +1067,31 @@
+  */
+ 
+ void
+-cupsdMoveJob(cupsd_job_t *job,		/* I - Job */
+-             const char  *dest)		/* I - Destination */
++cupsdMoveJob(cupsd_job_t     *job,	/* I - Job */
++             cupsd_printer_t *p)	/* I - Destination printer or class */
+ {
+   ipp_attribute_t	*attr;		/* job-printer-uri attribute */
+-  cupsd_printer_t	*p;		/* Destination printer or class */
++  const char		*olddest;	/* Old destination */
++  cupsd_printer_t	*oldp;		/* Old pointer */
+ 
+ 
+  /*
+-  * Find the printer...
++  * Don't move completed jobs...
    */
  
--  _cups_strcpy(sb->buffer, lineptr);
-+  if (lineptr < sb->buffer + sb->bufused)
-+    _cups_strcpy(sb->buffer, lineptr);
+-  if ((p = cupsdFindDest(dest)) == NULL)
++  if (job->state_value > IPP_JOB_STOPPED)
+     return;
+ 
+  /*
+-  * Don't move completed jobs...
++  * Get the old destination...
+   */
+ 
+-  if (job->state_value >= IPP_JOB_PROCESSING)
+-    return;
++  olddest = job->dest;
 +
-   sb->bufused -= lineptr - sb->buffer;
++  if (job->printer)
++    oldp = job->printer;
++  else
++    oldp = cupsdFindDest(olddest);
  
-   if (sb->bufused < 0)
-@@ -328,5 +330,5 @@
+  /*
+   * Change the destination information...
+@@ -1093,7 +1099,11 @@
+ 
+   cupsdLoadJob(job);
+ 
+-  cupsdSetString(&job->dest, dest);
++  cupsdAddEvent(CUPSD_EVENT_JOB_STOPPED, oldp, job,
++                "Job #%d moved from %s to %s.", job->id, olddest,
++		p->name);
++
++  cupsdSetString(&job->dest, p->name);
+   job->dtype = p->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_REMOTE |
+                           CUPS_PRINTER_IMPLICIT);
+ 
+@@ -1101,6 +1111,10 @@
+                                IPP_TAG_URI)) != NULL)
+     cupsdSetString(&(attr->values[0].string.text), p->uri);
+ 
++  cupsdAddEvent(CUPSD_EVENT_JOB_STOPPED, p, job,
++                "Job #%d moved from %s to %s.", job->id, olddest,
++		p->name);
++
+   cupsdSaveJob(job);
+ }
+ 
+@@ -3373,5 +3387,5 @@
  
  
  /*
 - * End of "$Id$".
 + * End of "$Id$".
   */
---- cups-1.2rc1/scheduler/subscriptions.h	2006-03-18 03:05:12.000000000 +0000
-+++ /tmp/tim/cups/scheduler/subscriptions.h	2006-04-06 23:37:08.000000000 +0100
+--- cups-1.2rc1/scheduler/client.c.scheduler	2006-04-07 18:03:36.000000000 +0100
++++ cups-1.2rc1/scheduler/client.c	2006-04-07 18:03:36.000000000 +0100
 @@ -1,5 +1,5 @@
  /*
 - * "$Id$"
 + * "$Id$"
   *
-  *   Subscription definitions for the Common UNIX Printing System (CUPS) scheduler.
+  *   Client routines for the Common UNIX Printing System (CUPS) scheduler.
   *
-@@ -136,8 +136,6 @@
- VAR cupsd_event_t **Events VALUE(NULL);	/* Active events */
+@@ -957,7 +957,7 @@
+       else
+         snprintf(locale, sizeof(locale), "%s.%s",
+ 	         con->http.fields[HTTP_FIELD_ACCEPT_LANGUAGE], DefaultCharset);
+-        
++
+       con->language = cupsLangGet(locale);
+     }
+     else
+@@ -2246,7 +2246,11 @@
+ 	    */
  
- VAR unsigned	LastEvent VALUE(0);	/* Last events processed */
--VAR time_t	LastEventTime VALUE(0);	/* Time that the last events were sent */
+             if (!strncasecmp(buf, "Location:", 9))
++	    {
+   	      cupsdSendHeader(con, HTTP_SEE_OTHER, NULL);
++	      if (httpPrintf(HTTP(con), "Content-Length: 0\r\n") < 0)
++		return (0);
++	    }
+ 	    else if (!strncasecmp(buf, "Status:", 7))
+   	      cupsdSendError(con, atoi(buf + 7));
+ 	    else
+@@ -2470,6 +2474,8 @@
+       while (*ptr != '\0' && *ptr != ';')
+         ptr ++;
+     }
++    else
++      ptr ++;
+   }
+ 
+   cupsdLogMessage(CUPSD_LOG_DEBUG2,
+@@ -2612,11 +2618,13 @@
+   return (1);
+ 
+ #  elif defined(HAVE_CDSASSL)
+-  OSStatus	error;			/* Error info */
+-  SSLContextRef	conn;			/* New connection */
+-  CFArrayRef	certificatesArray;	/* Array containing certificates */
+-  int		allowExpired;		/* Allow expired certificates? */
+-  int		allowAnyRoot;		/* Allow any root certificate? */
++  OSStatus		error;		/* Error info */
++  SSLContextRef		conn;		/* New connection */
++  CFArrayRef		certificatesArray;
++					/* Array containing certificates */
++  int			allowExpired;	/* Allow expired certificates? */
++  int			allowAnyRoot;	/* Allow any root certificate? */
++  cdsa_conn_ref_t	u;		/* Connection reference union */
+ 
+ 
+   conn         = NULL;
+@@ -2641,12 +2649,23 @@
+     error = SSLSetProtocolVersion(conn, kSSLProtocol3);
+ 
+   if (!error)
+-    error = SSLSetConnection(conn, (SSLConnectionRef)con->http.fd);
++  {
++   /*
++    * Use a union to resolve warnings about int/pointer size mismatches...
++    */
++
++    u.connection = NULL;
++    u.sock       = con->http.fd;
++    error        = SSLSetConnection(conn, u.connection);
++  }
+ 
+   if (!error)
+     error = SSLSetPeerDomainName(conn, ServerName, strlen(ServerName) + 1);
+ 
+-  /* have to do these options before setting server certs */
++ /*
++  * Have to set these options before setting server certs...
++  */
++
+   if (!error && allowExpired)
+     error = SSLSetAllowsExpiredCerts(conn, true);
+ 
+@@ -2826,9 +2845,9 @@
+     else
+       return (NULL);
+   }
+-  else if (con->language != NULL)
++  else if (con->language)
+     snprintf(filename, len, "%s/%s%s", DocumentRoot, con->language->language,
+-            con->uri);
++             con->uri);
+   else
+     snprintf(filename, len, "%s%s", DocumentRoot, con->uri);
+ 
+@@ -2840,44 +2859,30 @@
+   * then fallback to the default one...
+   */
+ 
+-  if ((status = stat(filename, filestats)) != 0 && con->language != NULL)
+-  {
+-    /* Try removing the country code, if there is one. */
+-    if (strncmp(con->uri, "/ppd/", 5) != 0 &&
+-        strncmp(con->uri, "/admin/conf/", 12) != 0)
+-    {
+-      char *bare_lang = NULL;
+-      size_t ln = strcspn (con->language->language, "_");
+-      if (con->language->language[ln] == '_')
+-      {
+-	bare_lang = malloc (sizeof (char) * (ln + 1));
+-	if (bare_lang)
+-	{
+-	  memcpy (bare_lang, con->language->language, ln);
+-	  bare_lang[ln] = '\0';
+-	  snprintf(filename, len,
+-		   "%s/%s%s", DocumentRoot, bare_lang, con->uri);
 -
- VAR int		NotifierPipes[2] VALUE2(-1, -1);
- 					/* Pipes for notifier error/debug output */
- VAR cupsd_statbuf_t *NotifierStatusBuffer VALUE(NULL);
-@@ -172,5 +170,5 @@
+-	  if ((ptr = strchr(filename, '?')) != NULL)
+-	    *ptr = '\0';
+-
+-	  status = stat(filename, filestats);
+-	  free (bare_lang);
+-	}
+-      }
+-    }
+-  }
+-  
+-  if (status != 0 && con->language != NULL)
++  if ((status = stat(filename, filestats)) != 0 && con->language &&
++      strncmp(con->uri, "/ppd/", 5) &&
++      strncmp(con->uri, "/admin/conf/", 12) &&
++      strncmp(con->uri, "/admin/log/", 11))
+   {
+    /*
+-    * Drop the language prefix and try the current directory...
++    * Drop the country code...
+     */
+ 
+-    if (strncmp(con->uri, "/ppd/", 5) &&
+-        strncmp(con->uri, "/admin/conf/", 12) &&
+-        strncmp(con->uri, "/admin/log/", 11))
++    char	ll[3];			/* Short language name */
++
++
++    strlcpy(ll, con->language->language, sizeof(ll));
++    snprintf(filename, len, "%s/%s%s", DocumentRoot, ll, con->uri);
++
++    if ((ptr = strchr(filename, '?')) != NULL)
++      *ptr = '\0';
++
++    if ((status = stat(filename, filestats)) != 0)
+     {
++     /*
++      * Drop the language prefix and try the root directory...
++      */
++
+       snprintf(filename, len, "%s%s", DocumentRoot, con->uri);
+ 
+       if ((ptr = strchr(filename, '?')) != NULL)
+@@ -3815,5 +3820,5 @@
  
  
  /*



From fedora-cvs-commits at redhat.com  Fri Apr  7 17:37:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 13:37:40 -0400
Subject: rpms/cups/FC-5 cups-scheduler.patch,1.1,1.2
Message-ID: <200604071737.k37Hbe4O011741@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups-scheduler.patch 
Log Message:
Include config.h.in change.

cups-scheduler.patch:
 config.h.in               |   11 ++++-
 scheduler/cert.c          |    4 -
 scheduler/client.c        |   95 ++++++++++++++++++++++---------------------
 scheduler/conf.c          |    7 +--
 scheduler/dirsvc.c        |   20 +++++++--
 scheduler/env.c           |   11 ++---
 scheduler/ipp.c           |   29 ++++++++++---
 scheduler/job.c           |   38 +++++++++++------
 scheduler/job.h           |    6 +-
 scheduler/main.c          |  101 ++++++++++++----------------------------------
 scheduler/printers.c      |    9 +++-
 scheduler/process.c       |   56 +++++++++++++------------
 scheduler/server.c        |    5 --
 scheduler/statbuf.c       |    8 ++-
 scheduler/subscriptions.h |    6 --
 15 files changed, 211 insertions(+), 195 deletions(-)

Index: cups-scheduler.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-scheduler.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-scheduler.patch	7 Apr 2006 17:06:45 -0000	1.1
+++ cups-scheduler.patch	7 Apr 2006 17:37:27 -0000	1.2
@@ -922,3 +922,33 @@
 - * End of "$Id$".
 + * End of "$Id$".
   */
+--- cups-1.2rc1/config.h.in	2006-02-23 20:58:57.000000000 +0000
++++ cups-1.2rc1/config.h.in	2006-04-06 23:37:08.000000000 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * "$Id$"
++ * "$Id$"
+  *
+  *   Configuration file for the Common UNIX Printing System (CUPS).
+  *
+@@ -71,6 +71,13 @@
+ 
+ 
+ /*
++ * Default printcap file...
++ */
++
++#define CUPS_DEFAULT_PRINTCAP	"/etc/printcap"
++
++
++/*
+  * Maximum number of file descriptors to support.
+  */
+ 
+@@ -425,5 +432,5 @@
+ #endif /* !_CUPS_CONFIG_H_ */
+ 
+ /*
+- * End of "$Id$".
++ * End of "$Id$".
+  */



From fedora-cvs-commits at redhat.com  Fri Apr  7 17:37:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 13:37:43 -0400
Subject: rpms/cups/devel cups-scheduler.patch,1.2,1.3
Message-ID: <200604071737.k37HbhdQ011761@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups-scheduler.patch 
Log Message:
Include config.h.in change.

cups-scheduler.patch:
 config.h.in               |   11 ++++-
 scheduler/cert.c          |    4 -
 scheduler/client.c        |   95 ++++++++++++++++++++++---------------------
 scheduler/conf.c          |    7 +--
 scheduler/dirsvc.c        |   20 +++++++--
 scheduler/env.c           |   11 ++---
 scheduler/ipp.c           |   29 ++++++++++---
 scheduler/job.c           |   38 +++++++++++------
 scheduler/job.h           |    6 +-
 scheduler/main.c          |  101 ++++++++++++----------------------------------
 scheduler/printers.c      |    9 +++-
 scheduler/process.c       |   56 +++++++++++++------------
 scheduler/server.c        |    5 --
 scheduler/statbuf.c       |    8 ++-
 scheduler/subscriptions.h |    6 --
 15 files changed, 211 insertions(+), 195 deletions(-)

Index: cups-scheduler.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-scheduler.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cups-scheduler.patch	7 Apr 2006 17:07:23 -0000	1.2
+++ cups-scheduler.patch	7 Apr 2006 17:37:40 -0000	1.3
@@ -922,3 +922,33 @@
 - * End of "$Id$".
 + * End of "$Id$".
   */
+--- cups-1.2rc1/config.h.in	2006-02-23 20:58:57.000000000 +0000
++++ cups-1.2rc1/config.h.in	2006-04-06 23:37:08.000000000 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * "$Id$"
++ * "$Id$"
+  *
+  *   Configuration file for the Common UNIX Printing System (CUPS).
+  *
+@@ -71,6 +71,13 @@
+ 
+ 
+ /*
++ * Default printcap file...
++ */
++
++#define CUPS_DEFAULT_PRINTCAP	"/etc/printcap"
++
++
++/*
+  * Maximum number of file descriptors to support.
+  */
+ 
+@@ -425,5 +432,5 @@
+ #endif /* !_CUPS_CONFIG_H_ */
+ 
+ /*
+- * End of "$Id$".
++ * End of "$Id$".
+  */



From fedora-cvs-commits at redhat.com  Fri Apr  7 17:57:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 13:57:23 -0400
Subject: rpms/glib2/devel .cvsignore, 1.48, 1.49 glib2.spec, 1.82,
	1.83 sources, 1.48, 1.49
Message-ID: <200604071757.k37HvN2H025862@cvs.devel.redhat.com>

Author: mclasen

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	7 Mar 2006 20:05:26 -0000	1.48
+++ .cvsignore	7 Apr 2006 17:57:21 -0000	1.49
@@ -33,3 +33,4 @@
 glib-2.9.6.tar.bz2
 glib-2.10.0.tar.bz2
 glib-2.10.1.tar.bz2
+glib-2.10.2.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- glib2.spec	7 Mar 2006 20:05:26 -0000	1.82
+++ glib2.spec	7 Apr 2006 17:57:21 -0000	1.83
@@ -1,7 +1,7 @@
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.10.1
-Release: 1
+Version: 2.10.2
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source: glib-%{version}.tar.bz2
@@ -99,6 +99,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Apr 7 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.2-2
+- Update to 2.10.2
+
 * Tue Mar 7 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.1-1
 - Update to 2.10.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	7 Mar 2006 20:05:28 -0000	1.48
+++ sources	7 Apr 2006 17:57:21 -0000	1.49
@@ -1 +1 @@
-51df7932da118f7f27bbda82b65f0f91  glib-2.10.1.tar.bz2
+718961161ee1692c216a2d542196a04a  glib-2.10.2.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr  7 17:59:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 13:59:04 -0400
Subject: rpms/glib2/FC-5 glib2.spec,1.82,1.83 sources,1.48,1.49
Message-ID: <200604071759.k37Hx4tO026125@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	glib2.spec sources 
Log Message:
2.10.2



Index: glib2.spec
===================================================================
RCS file: /cvs/dist/rpms/glib2/FC-5/glib2.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- glib2.spec	7 Mar 2006 20:05:26 -0000	1.82
+++ glib2.spec	7 Apr 2006 17:59:02 -0000	1.83
@@ -1,7 +1,7 @@
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.10.1
-Release: 1
+Version: 2.10.2
+Release: 1.fc5.1
 License: LGPL
 Group: System Environment/Libraries
 Source: glib-%{version}.tar.bz2
@@ -99,6 +99,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Apr 7 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.2-1.fc5.1
+- Update to 2.10.2
+
 * Tue Mar 7 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.1-1
 - Update to 2.10.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glib2/FC-5/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	7 Mar 2006 20:05:28 -0000	1.48
+++ sources	7 Apr 2006 17:59:02 -0000	1.49
@@ -1 +1 @@
-51df7932da118f7f27bbda82b65f0f91  glib-2.10.1.tar.bz2
+718961161ee1692c216a2d542196a04a  glib-2.10.2.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr  7 18:03:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 14:03:43 -0400
Subject: rpms/glib2/devel glib2.spec,1.83,1.84
Message-ID: <200604071803.k37I3hPd026365@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	glib2.spec 
Log Message:
Drop a patch



Index: glib2.spec
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- glib2.spec	7 Apr 2006 17:57:21 -0000	1.83
+++ glib2.spec	7 Apr 2006 18:03:20 -0000	1.84
@@ -14,8 +14,6 @@
 Obsoletes: glib-gtkbeta
 URL: http://www.gtk.org
 
-Patch0: glib-2.10.0-test.patch
-
 %description 
 GLib is the low-level core library that forms the basis
 for projects such as GTK+ and GNOME. It provides data structure
@@ -39,7 +37,6 @@
 
 %prep
 %setup -q -n glib-%{version}
-%patch0 -p0 -b .test
 
 %build
 



From fedora-cvs-commits at redhat.com  Fri Apr  7 18:06:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 14:06:44 -0400
Subject: rpms/glib2/FC-5 glib2.spec,1.83,1.84
Message-ID: <200604071806.k37I6ifh026471@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	glib2.spec 
Log Message:
drop a patch



Index: glib2.spec
===================================================================
RCS file: /cvs/dist/rpms/glib2/FC-5/glib2.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- glib2.spec	7 Apr 2006 17:59:02 -0000	1.83
+++ glib2.spec	7 Apr 2006 18:06:42 -0000	1.84
@@ -14,8 +14,6 @@
 Obsoletes: glib-gtkbeta
 URL: http://www.gtk.org
 
-Patch0: glib-2.10.0-test.patch
-
 %description 
 GLib is the low-level core library that forms the basis
 for projects such as GTK+ and GNOME. It provides data structure
@@ -39,7 +37,6 @@
 
 %prep
 %setup -q -n glib-%{version}
-%patch0 -p0 -b .test
 
 %build
 



From fedora-cvs-commits at redhat.com  Fri Apr  7 18:16:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 14:16:55 -0400
Subject: rpms/pango/devel .cvsignore, 1.31, 1.32 pango.spec, 1.64,
	1.65 sources, 1.31, 1.32
Message-ID: <200604071816.k37IGttm008123@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8099

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
1.12.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	13 Mar 2006 05:37:10 -0000	1.31
+++ .cvsignore	7 Apr 2006 18:16:53 -0000	1.32
@@ -15,3 +15,4 @@
 pango-1.11.6.tar.bz2
 pango-1.11.99.tar.bz2
 pango-1.12.0.tar.bz2
+pango-1.12.1.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- pango.spec	13 Mar 2006 05:37:10 -0000	1.64
+++ pango.spec	7 Apr 2006 18:16:53 -0000	1.65
@@ -7,8 +7,8 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.12.0
-Release: 1
+Version: 1.12.1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.8/pango-%{version}.tar.bz2
@@ -188,6 +188,9 @@
 
 
 %changelog
+* Fri Apr  7 2006 Matthias Clasen <mclasen at redhat.com> - 1.12.1-2
+- Update to 1.12.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 1.12.0-1
 - Update to 1.12.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	13 Mar 2006 05:37:10 -0000	1.31
+++ sources	7 Apr 2006 18:16:53 -0000	1.32
@@ -1 +1 @@
-86c3e08169a18200e64a0c5ee1be7fd9  pango-1.12.0.tar.bz2
+10ddfbc43cf895639b77788ca637409c  pango-1.12.1.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr  7 18:18:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 14:18:23 -0400
Subject: rpms/kernel/devel linux-2.6-radeon-backlight.patch,1.15,1.16
Message-ID: <200604071818.k37IINRv008215@cvs.devel.redhat.com>

Author: pjones

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

Modified Files:
	linux-2.6-radeon-backlight.patch 
Log Message:
- add bsmith's laptop


linux-2.6-radeon-backlight.patch:
 radeon_base.c         |   11 +++++++
 radeon_pm.c           |   51 ++++++++++++++++++++++++++++++++
 radeon_pm_whitelist.h |   78 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 139 insertions(+), 1 deletion(-)

Index: linux-2.6-radeon-backlight.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-radeon-backlight.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- linux-2.6-radeon-backlight.patch	1 Mar 2006 19:15:24 -0000	1.15
+++ linux-2.6-radeon-backlight.patch	7 Apr 2006 18:18:20 -0000	1.16
@@ -1,6 +1,6 @@
 --- linux-2.6.15.i686/drivers/video/aty/radeon_pm_whitelist.h.backlight	2006-03-01 13:22:58.000000000 -0500
 +++ linux-2.6.15.i686/drivers/video/aty/radeon_pm_whitelist.h	2006-03-01 13:56:54.000000000 -0500
-@@ -0,0 +1,76 @@
+@@ -0,0 +1,78 @@
 +#define E(_vendor, _product, _ident, _reporter)				\
 +{	/* _reporter */							\
 +	.ident = _ident,						\
@@ -19,6 +19,8 @@
 +E("IBM", "2366JBG", "IBM ThinkPad T30", "Thomas M Steenholdt <tmus at tmus.dk>"),
 +E("IBM", "2366MU9", "IBM ThinkPad T30", "Phillip Jones <philljones at us.ibm.com>"),
 +E("IBM", "2366QU5", "IBM ThinkPad T30", "ChazeFroy <chazefroy at gmail.com>"),
++/* brads's 2366QU8 works, but dmidecode shows bogus data */
++E("IBM", "2366QU8", "IBM ThinkPad T30", "Brad Smith <brads at redhat.com>"),
 +E("IBM", "23729CU", "IBM ThinkPad T40", "George Avrunin <avrunin at math.umass.edu>"),
 +E("IBM", "237314U", "IBM ThinkPad T40", "Dmitriy Zavin <dzavin at yahoo.com>"),
 +E("IBM", "23731FG", "IBM ThinkPad T41", "Aivo Prykk <aivo.prykk at mail.ee>"),



From fedora-cvs-commits at redhat.com  Fri Apr  7 18:22:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 14:22:19 -0400
Subject: rpms/glib2/devel test.patch,NONE,1.1 glib2.spec,1.84,1.85
Message-ID: <200604071822.k37IMJjg008302@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	glib2.spec 
Added Files:
	test.patch 
Log Message:
debug


test.patch:
 threadpool-test.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE test.patch ---
--- glib-2.10.2/tests/threadpool-test.c.test	2006-04-07 14:20:58.000000000 -0400
+++ glib-2.10.2/tests/threadpool-test.c	2006-04-07 14:21:28.000000000 -0400
@@ -5,8 +5,8 @@
 
 #include <glib.h>
 
-#define DEBUG_MSG(x)  
-/* #define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n");  */
+/*#define DEBUG_MSG(x)  */
+#define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n"); 
 
 #define WAIT                5    /* seconds */
 #define MAX_THREADS         10


Index: glib2.spec
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- glib2.spec	7 Apr 2006 18:03:20 -0000	1.84
+++ glib2.spec	7 Apr 2006 18:22:16 -0000	1.85
@@ -14,6 +14,8 @@
 Obsoletes: glib-gtkbeta
 URL: http://www.gtk.org
 
+Patch0: test.patch
+
 %description 
 GLib is the low-level core library that forms the basis
 for projects such as GTK+ and GNOME. It provides data structure
@@ -37,6 +39,7 @@
 
 %prep
 %setup -q -n glib-%{version}
+%patch0 -p1 -b .test
 
 %build
 



From fedora-cvs-commits at redhat.com  Fri Apr  7 18:23:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 14:23:04 -0400
Subject: rpms/pango/FC-5 pango.spec,1.64,1.65 sources,1.31,1.32
Message-ID: <200604071823.k37IN4fE008333@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	pango.spec sources 
Log Message:
1.12.1



Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/FC-5/pango.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- pango.spec	13 Mar 2006 05:37:10 -0000	1.64
+++ pango.spec	7 Apr 2006 18:23:02 -0000	1.65
@@ -7,8 +7,8 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.12.0
-Release: 1
+Version: 1.12.1
+Release: 1.fc5.1
 License: LGPL
 Group: System Environment/Libraries
 Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.8/pango-%{version}.tar.bz2
@@ -188,6 +188,9 @@
 
 
 %changelog
+* Fri Apr  7 2006 Matthias Clasen <mclasen at redhat.com> - 1.12.1-1.fc5.1
+- Update to 1.12.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 1.12.0-1
 - Update to 1.12.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pango/FC-5/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	13 Mar 2006 05:37:10 -0000	1.31
+++ sources	7 Apr 2006 18:23:02 -0000	1.32
@@ -1 +1 @@
-86c3e08169a18200e64a0c5ee1be7fd9  pango-1.12.0.tar.bz2
+10ddfbc43cf895639b77788ca637409c  pango-1.12.1.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr  7 18:30:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 14:30:54 -0400
Subject: rpms/glib2/devel glib-2.10.2-test.patch, NONE, 1.1 glib2.spec, 1.85,
	1.86 test.patch, 1.1, NONE
Message-ID: <200604071830.k37IUsIn008563@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	glib2.spec 
Added Files:
	glib-2.10.2-test.patch 
Removed Files:
	test.patch 
Log Message:
Fix a problem with the threadpool tests


glib-2.10.2-test.patch:
 threadpool-test.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE glib-2.10.2-test.patch ---
--- glib-2.10.2/tests/threadpool-test.c.test	2006-04-07 14:20:58.000000000 -0400
+++ glib-2.10.2/tests/threadpool-test.c	2006-04-07 14:29:01.000000000 -0400
@@ -5,8 +5,8 @@
 
 #include <glib.h>
 
-#define DEBUG_MSG(x)  
-/* #define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n");  */
+#define DEBUG_MSG(x)
+/* #define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n"); */
 
 #define WAIT                5    /* seconds */
 #define MAX_THREADS         10
@@ -121,8 +121,6 @@
    DEBUG_MSG (("[unused] current threads %d",
 	       test_count_threads()));
 
-   g_assert (test_count_threads () == limit);
-
    DEBUG_MSG (("[unused] stopping unused threads"));
    
    g_thread_pool_stop_unused_threads ();


Index: glib2.spec
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- glib2.spec	7 Apr 2006 18:22:16 -0000	1.85
+++ glib2.spec	7 Apr 2006 18:30:20 -0000	1.86
@@ -14,7 +14,7 @@
 Obsoletes: glib-gtkbeta
 URL: http://www.gtk.org
 
-Patch0: test.patch
+Patch0: glib-2.10.2-test.patch
 
 %description 
 GLib is the low-level core library that forms the basis


--- test.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr  7 18:35:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 14:35:02 -0400
Subject: rpms/glib2/FC-5 glib-2.10.2-test.patch, NONE, 1.1 glib2.spec, 1.84,
	1.85
Message-ID: <200604071835.k37IZ2XA008681@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	glib2.spec 
Added Files:
	glib-2.10.2-test.patch 
Log Message:
fix an issue with the threadpool test


glib-2.10.2-test.patch:
 threadpool-test.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE glib-2.10.2-test.patch ---
--- glib-2.10.2/tests/threadpool-test.c.test	2006-04-07 14:20:58.000000000 -0400
+++ glib-2.10.2/tests/threadpool-test.c	2006-04-07 14:29:01.000000000 -0400
@@ -5,8 +5,8 @@
 
 #include <glib.h>
 
-#define DEBUG_MSG(x)  
-/* #define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n");  */
+#define DEBUG_MSG(x)
+/* #define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n"); */
 
 #define WAIT                5    /* seconds */
 #define MAX_THREADS         10
@@ -121,8 +121,6 @@
    DEBUG_MSG (("[unused] current threads %d",
 	       test_count_threads()));
 
-   g_assert (test_count_threads () == limit);
-
    DEBUG_MSG (("[unused] stopping unused threads"));
    
    g_thread_pool_stop_unused_threads ();


Index: glib2.spec
===================================================================
RCS file: /cvs/dist/rpms/glib2/FC-5/glib2.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- glib2.spec	7 Apr 2006 18:06:42 -0000	1.84
+++ glib2.spec	7 Apr 2006 18:35:00 -0000	1.85
@@ -14,6 +14,8 @@
 Obsoletes: glib-gtkbeta
 URL: http://www.gtk.org
 
+Patch0: glib-2.10.2-test.patch
+
 %description 
 GLib is the low-level core library that forms the basis
 for projects such as GTK+ and GNOME. It provides data structure
@@ -37,6 +39,7 @@
 
 %prep
 %setup -q -n glib-%{version}
+%patch0 -p1 -b .test
 
 %build
 



From fedora-cvs-commits at redhat.com  Fri Apr  7 21:06:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 17:06:48 -0400
Subject: rpms/audit/devel .cvsignore, 1.59, 1.60 audit.spec, 1.85,
	1.86 sources, 1.67, 1.68
Message-ID: <200604072106.k37L6mB5013967@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13953

Modified Files:
	.cvsignore audit.spec sources 
Log Message:
* Fri Apr 7 2006 Steve Grubb <sgrubb at redhat.com> 1.2-1
- Add support for new file system auditing kernel subsystem



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	7 Apr 2006 01:33:11 -0000	1.59
+++ .cvsignore	7 Apr 2006 21:06:04 -0000	1.60
@@ -56,3 +56,4 @@
 audit-1.1.4.tar.gz
 audit-1.1.5.tar.gz
 audit-1.1.6.tar.gz
+audit-1.2.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- audit.spec	7 Apr 2006 01:33:11 -0000	1.85
+++ audit.spec	7 Apr 2006 21:06:18 -0000	1.86
@@ -1,6 +1,6 @@
 Summary: User space tools for 2.6 kernel auditing.
 Name: audit
-Version: 1.1.6
+Version: 1.2
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -154,6 +154,9 @@
 
 
 %changelog
+* Fri Apr 7 2006 Steve Grubb <sgrubb at redhat.com> 1.2-1
+- Add support for new file system auditing kernel subsystem
+
 * Thu Apr 6 2006 Steve Grubb <sgrubb at redhat.com> 1.1.6-1
 - New message types
 - Support new rule format found in 2.6.17 and later kernels


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	7 Apr 2006 01:33:11 -0000	1.67
+++ sources	7 Apr 2006 21:06:18 -0000	1.68
@@ -1 +1 @@
-19d208c284d6f6ae830f1943a74bbd7f  audit-1.1.6.tar.gz
+65c3bc8ea4a1b6fc90e2b0321237a5ad  audit-1.2.tar.gz



From fedora-cvs-commits at redhat.com  Fri Apr  7 21:44:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 17:44:03 -0400
Subject: rpms/kdelibs/FC-4 kdelibs.spec, 1.100, 1.101 sources, 1.42,
	1.43 kdelibs-3.2.0-icon.patch, 1.1, NONE
Message-ID: <200604072144.k37Li3HK028318@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdelibs.spec sources 
Removed Files:
	kdelibs-3.2.0-icon.patch 
Log Message:
3.5.2



Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-4/kdelibs.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- kdelibs.spec	27 Jan 2006 16:53:43 -0000	1.100
+++ kdelibs.spec	7 Apr 2006 21:44:00 -0000	1.101
@@ -9,7 +9,7 @@
 %define cups_epoch 1
 
 %define qt_version 3.3.4
-%define arts_version 1.5.1
+%define arts_version 1.5.2
 %define kde_major_version 3
 
 %define qtdocdir %{_docdir}/qt-devel-%{qt_version}
@@ -21,7 +21,7 @@
 %define alsa 1
 %define arts 1
 
-Version: 3.5.1
+Version: 3.5.2
 Release: 0.1.fc4
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
@@ -34,10 +34,9 @@
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: kde.sh
 Source2: kde.csh
-Source3: kde-applications.menu
 Source4: devices.protocol
+Patch1: kdelibs-3.5.1-xdg-menu.patch
 Patch2: kdelibs-3.0.0-ndebug.patch
-Patch3: kdelibs-3.2.0-icon.patch
 Patch4: kdelibs-3.0.4-ksyscoca.patch
 Patch5: kdelibs-3.3.0-openssl.patch
 Patch7: kdelibs-3.4.0-menu.patch
@@ -63,9 +62,10 @@
 Requires: redhat-menus >= 1.4
 %endif
 
+Requires(post,postun): /sbin/ldconfig
+Requires(post,postun): desktop-file-utils
 Requires: fileutils
 Requires: shadow-utils
-Requires: /sbin/ldconfig
 Requires: dev
 Requires: xorg-x11
 
@@ -153,7 +153,7 @@
 
 %prep
 %setup -q
-
+%patch1 -p1 -b .xdg-menu
 %if %{debug} == 0
 %patch2 -p1 -b .debug
 %endif
@@ -184,7 +184,7 @@
 %endif
 
 # set some default FLAGS
-FLAGS="$RPM_OPT_FLAGS"
+FLAGS="%{optflags}"
 
 %if %{debug}
    FLAGS="-O0"
@@ -192,8 +192,8 @@
 
 # workaround for compiler bug on ia64, will be removed later
 %ifarch ia64
-export CFLAGS="$RPM_OPT_FLAGS -O0"
-export CXXFLAGS="$RPM_OPT_FLAGS -O0"
+export CFLAGS="$FLAGS -O0"
+export CXXFLAGS="$FLAGS -O0"
 %endif
 
 export CXXFLAGS="$FLAGS"
@@ -272,22 +272,21 @@
 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 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/services/
+install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/services/
 
-pushd $RPM_BUILD_ROOT%{_docdir}
-ln -sf HTML/en/kdelibs-apidocs %{name}-devel-%{kde_major_version}
+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}/etc/profile.d
+install -m 755 %{SOURCE1} %{SOURCE2} %{buildroot}/etc/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
@@ -297,45 +296,32 @@
 popd
 
 %if %{redhatify}
-	pushd $RPM_BUILD_ROOT%{_datadir}/icons/crystalsvg
-	for s in 16x16 22x22 32x32 48x48 64x64 128x128; do
-		pushd $s/apps/ || continue
-		# package icons
-		ln -sf package_wordprocessing.png redhat-office.png
-		ln -sf package_network.png redhat-internet.png
-		ln -sf package_applications.png redhat-accessories.png
-		ln -sf package_graphics.png redhat-graphics.png
-		ln -sf package_games.png redhat-games.png
-		ln -sf multimedia.png redhat-sound_video.png
-		ln -sf package_settings.png redhat-preferences.png
-		ln -sf package_development.png redhat-programming.png
-		ln -sf ../filesystems/server.png redhat-network-server.png
-		ln -sf ../filesystems/server.png redhat-server_settings.png
-		ln -sf package_utilities.png redhat-system_tools.png
-		ln -sf package_system.png redhat-system_settings.png
-		ln -sf package_utilities.png redhat-tools.png
-		# app icons
-		ln -sf kmail.png redhat-email.png
-		ln -sf konqueror.png redhat-web-browser.png
-		ln -sf kfm.png redhat-filemanager.png
-		ln -sf kfm_home.png redhat-home.png
-		ln -sf kviewshell.png redhat-logviewer.png
-		# system settings
-		ln -sf multimedia.png system-config-soundcard.png
-		popd
-	done
-	popd
-	rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/index.theme
-	rm -f $RPM_BUILD_ROOT/etc/xdg/menus/applications.menu
-	install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/xdg/menus/
-   pushd $RPM_BUILD_ROOT/etc/xdg/menus/
-   ln -s applications-merged kde-applications-merged
-   popd
-	echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/kresources.desktop
+  # link upstream icon names to the redhat ones in bluecurve
+  for s in 16x16 24x24 32x32 36x36 48x48; do
+    mkdir -p %{buildroot}%{_datadir}/icons/Bluecurve/$s/apps
+    pushd %{buildroot}%{_datadir}/icons/Bluecurve/$s/apps
+    ln -sf redhat-office.png package_wordprocessing.png
+    ln -sf redhat-accessories.png package_applications.png
+    ln -sf redhat-graphics.png package_graphics.png
+    ln -sf redhat-games.png package_games.png
+    ln -sf redhat-programming.png package_development.png
+    ln -sf redhat-system_tools.png package_utilities.png
+    ln -sf redhat-tools.png package_utilities.png
+    # app icons
+    ln -sf redhat-web-browser.png konqueror.png
+    ln -sf redhat-logviewer.png kviewshell.png
+    popd
+  done
+  pushd %{buildroot}/etc/xdg/menus/
+  mv applications.menu kde-applications.menu
+  ln -s applications-merged kde-applications-merged
+  popd
+  echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/kresources.desktop
+  rm -f %{buildroot}%{_datadir}/icons/hicolor/index.theme
 %endif
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %pre
 if [ -d /etc/skel/Desktop/Autostart ]; then
@@ -345,9 +331,21 @@
 fi
 exit 0
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/crystalsvg || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+fi
+%{_bindir}/update-desktop-database > /dev/null 2>&1 || :
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/crystalsvg || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+fi
+%{_bindir}/update-desktop-database > /dev/null 2>&1 || :
 
 %files
 %defattr(-,root,root)
@@ -383,6 +381,9 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Fri Apr 07 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc4
+- update to 3.5.2
+
 * Fri Jan 27 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.1.fc4
 - 3.5.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-4/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	27 Jan 2006 13:55:21 -0000	1.42
+++ sources	7 Apr 2006 21:44:00 -0000	1.43
@@ -1 +1 @@
-2a22193ae7c23f3759b02723dab02d30  kdelibs-3.5.1.tar.bz2
+367738696dc468859cf90d5a6e8f18a9  kdelibs-3.5.2.tar.bz2


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



From fedora-cvs-commits at redhat.com  Fri Apr  7 21:48:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 17:48:31 -0400
Subject: rpms/kdelibs/FC-4 kde-applications.menu,1.2,NONE
Message-ID: <200604072148.k37LmVK2009684@cvs.devel.redhat.com>

Author: than

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

Removed Files:
	kde-applications.menu 
Log Message:
3.5.2



--- kde-applications.menu DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr  7 21:52:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 17:52:26 -0400
Subject: rpms/cups/devel .cvsignore, 1.16, 1.17 cups.spec, 1.161,
	1.162 sources, 1.17, 1.18 cups-gnome.patch, 1.1,
	NONE cups-pstops.patch, 1.2, NONE cups-scheduler.patch, 1.3,
	NONE cups-str1515.patch, 1.1, NONE cups-str1521.patch, 1.1,
	NONE cups-str1528.patch, 1.1, NONE cups-str1532.patch, 1.1,
	NONE cups-str1533.patch, 1.1, NONE cups-string.patch, 1.1, NONE
Message-ID: <200604072152.k37LqQl4009788@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore cups.spec sources 
Removed Files:
	cups-gnome.patch cups-pstops.patch cups-scheduler.patch 
	cups-str1515.patch cups-str1521.patch cups-str1528.patch 
	cups-str1532.patch cups-str1533.patch cups-string.patch 
Log Message:
* Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.4.rc2.1
- 1.2rc2.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	27 Mar 2006 10:20:44 -0000	1.16
+++ .cvsignore	7 Apr 2006 21:52:23 -0000	1.17
@@ -7,3 +7,4 @@
 cups-1.1.23rc1-source.tar.bz2
 cups-1.1.23-source.tar.bz2
 cups-1.2rc1-source.tar.bz2
+cups-1.2rc2-source.tar.bz2


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- cups.spec	7 Apr 2006 16:59:33 -0000	1.161
+++ cups.spec	7 Apr 2006 21:52:23 -0000	1.162
@@ -1,13 +1,13 @@
 %define initdir /etc/rc.d/init.d
 %define use_alternatives 1
 %define build_as_pie 1
-%define beta rc1
+%define beta rc2
 %define cups_serverbin %{_exec_prefix}/lib/cups
 
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2
-Release: 0.2.%{beta}.9
+Release: 0.4.%{beta}.1
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
@@ -27,26 +27,17 @@
 Patch4: cups-1.1.17-backend.patch
 Patch5: cups-ext.patch
 Patch6: cups-kde.patch
-Patch7: cups-str1515.patch
 Patch8: cups-logfileperm.patch
 Patch9: cups-1.1.17-rcp.patch
 Patch10: cups-1.1.17-ppdsdat.patch
-Patch11: cups-str1528.patch
 Patch12: cups-locale.patch
 Patch13: cups-CAN-2005-0064.patch
-Patch14: cups-str1521.patch
-Patch15: cups-string.patch
 Patch16: cups-pie.patch
 Patch17: cups-1.1.19-no_rpath.patch
 Patch18: cups-language.patch
-Patch19: cups-gnome.patch
 Patch20: cups-direct-usb.patch
-Patch21: cups-pstops.patch
 Patch22: cups-dest-cache-v2.patch
-Patch23: cups-str1532.patch
 Patch24: cups-maxlogsize.patch
-Patch25: cups-str1533.patch
-Patch26: cups-scheduler.patch
 Patch28: cups-no-propagate-ipp-port.patch
 Patch32: cups-pid.patch
 Patch40: cups-link.patch
@@ -123,28 +114,19 @@
 %patch4 -p1 -b .backend
 %patch5 -p1 -b .ext
 %patch6 -p1 -b .kde
-%patch7 -p1 -b .str1515
 %patch8 -p1 -b .logfileperm
 %patch9 -p1 -b .rcp
 %patch10 -p1 -b .ppdsdat
-%patch11 -p1 -b .str1528
 %patch12 -p1 -b .locale
 %patch13 -p1 -b .CAN-2005-0064
-%patch14 -p1 -b .str1521
-%patch15 -p1 -b .string
 %if %build_as_pie
 %patch16 -p1 -b .pie
 %endif
 %patch17 -p1 -b .no_rpath
 %patch18 -p1 -b .language
-%patch19 -p1 -b .gnome
 %patch20 -p1 -b .direct-usb
-%patch21 -p1 -b .pstops
 %patch22 -p1 -b .dest-cache-v2
-%patch23 -p1 -b .str1532
 %patch24 -p1 -b .maxlogsize
-%patch25 -p1 -b .str1533
-%patch26 -p1 -b .scheduler
 %patch28 -p1 -b .no-propagate-ipp-port
 %patch32 -p1 -b .pid
 %patch40 -p1 -b .link
@@ -389,6 +371,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.4.rc2.1
+- 1.2rc2.
+
 * Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.9
 - Sync scheduler/* with svn 5383.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	27 Mar 2006 10:20:44 -0000	1.17
+++ sources	7 Apr 2006 21:52:23 -0000	1.18
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-e1cebe3393c360eb7972efa0715befa1  cups-1.2rc1-source.tar.bz2
+a16f213bfa43e85c6076d6e0d9f6db3e  cups-1.2rc2-source.tar.bz2


--- cups-gnome.patch DELETED ---


--- cups-pstops.patch DELETED ---


--- cups-scheduler.patch DELETED ---


--- cups-str1515.patch DELETED ---


--- cups-str1521.patch DELETED ---


--- cups-str1528.patch DELETED ---


--- cups-str1532.patch DELETED ---


--- cups-str1533.patch DELETED ---


--- cups-string.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr  7 21:53:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 17:53:34 -0400
Subject: rpms/kdelibs/FC-4 kdelibs-3.5.1-xdg-menu.patch,NONE,1.1
Message-ID: <200604072153.k37LrYlW009869@cvs.devel.redhat.com>

Author: than

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

Added Files:
	kdelibs-3.5.1-xdg-menu.patch 
Log Message:
3.5.2


kdelibs-3.5.1-xdg-menu.patch:
 applications.menu |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE kdelibs-3.5.1-xdg-menu.patch ---
--- kdelibs-3.5.1/kded/applications.menu.orig	2006-02-21 14:30:11.000000000 +0100
+++ kdelibs-3.5.1/kded/applications.menu	2006-02-21 14:30:16.000000000 +0100
@@ -31,12 +31,16 @@
 					<Category>Core</Category>
 					<Not><Category>KDE</Category></Not>
 				</And>
-				<!-- Don't list SUSE's YaST in here -->
-				<Category>X-SuSE-YaST</Category>
+				<Category>X-Red-Hat-Base</Category>
 			</Not>
 		</Include>
 	</Menu>
        <Menu>
+                <Name>System Settings</Name>
+                <MergeFile>system-settings.menu</MergeFile>
+       </Menu>
+
+       <Menu>
                 <Name>Development</Name>
                 <Directory>kde-development.directory</Directory>
                 <Menu>



From fedora-cvs-commits at redhat.com  Fri Apr  7 22:03:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 18:03:25 -0400
Subject: rpms/cups/FC-5 cups.spec, 1.149, 1.150 sources, 1.16,
	1.17 cups-gnome.patch, 1.1, NONE cups-pstops.patch, 1.2,
	NONE cups-scheduler.patch, 1.2, NONE cups-str1515.patch, 1.1,
	NONE cups-str1521.patch, 1.1, NONE cups-str1528.patch, 1.1,
	NONE cups-str1532.patch, 1.1, NONE cups-str1533.patch, 1.1,
	NONE cups-string.patch, 1.1, NONE
Message-ID: <200604072203.k37M3PwP010083@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec sources 
Removed Files:
	cups-gnome.patch cups-pstops.patch cups-scheduler.patch 
	cups-str1515.patch cups-str1521.patch cups-str1528.patch 
	cups-str1532.patch cups-str1533.patch cups-string.patch 
Log Message:
* Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.3.rc2.1
- 1.2rc2.



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- cups.spec	7 Apr 2006 17:06:46 -0000	1.149
+++ cups.spec	7 Apr 2006 22:03:12 -0000	1.150
@@ -1,13 +1,13 @@
 %define initdir /etc/rc.d/init.d
 %define use_alternatives 1
 %define build_as_pie 1
-%define beta rc1
+%define beta rc2
 %define cups_serverbin %{_exec_prefix}/lib/cups
 
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2
-Release: 0.2.%{beta}.2.9
+Release: 0.3.%{beta}.1
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
@@ -31,22 +31,17 @@
 Patch8: cups-logfileperm.patch
 Patch9: cups-1.1.17-rcp.patch
 Patch10: cups-1.1.17-ppdsdat.patch
-Patch11: cups-str1528.patch
 Patch12: cups-locale.patch
 Patch13: cups-CAN-2005-0064.patch
-Patch14: cups-str1521.patch
-Patch15: cups-string.patch
 Patch16: cups-pie.patch
 Patch17: cups-1.1.19-no_rpath.patch
 Patch18: cups-language.patch
 Patch19: cups-gnome.patch
 Patch20: cups-direct-usb.patch
-Patch21: cups-pstops.patch
 Patch22: cups-dest-cache-v2.patch
 Patch23: cups-str1532.patch
 Patch24: cups-maxlogsize.patch
 Patch25: cups-str1533.patch
-Patch26: cups-scheduler.patch
 Patch28: cups-no-propagate-ipp-port.patch
 Patch32: cups-pid.patch
 Patch40: cups-link.patch
@@ -127,28 +122,19 @@
 %patch4 -p1 -b .backend
 %patch5 -p1 -b .ext
 %patch6 -p1 -b .kde
-%patch7 -p1 -b .str1515
 %patch8 -p1 -b .logfileperm
 %patch9 -p1 -b .rcp
 %patch10 -p1 -b .ppdsdat
-%patch11 -p1 -b .str1528
 %patch12 -p1 -b .locale
 %patch13 -p1 -b .CAN-2005-0064
-%patch14 -p1 -b .str1521
-%patch15 -p1 -b .string
 %if %build_as_pie
 %patch16 -p1 -b .pie
 %endif
 %patch17 -p1 -b .no_rpath
 %patch18 -p1 -b .language
-%patch19 -p1 -b .gnome
 %patch20 -p1 -b .direct-usb
-%patch21 -p1 -b .pstops
 %patch22 -p1 -b .dest-cache-v2
-%patch23 -p1 -b .str1532
 %patch24 -p1 -b .maxlogsize
-%patch25 -p1 -b .str1533
-%patch26 -p1 -b .scheduler
 %patch28 -p1 -b .no-propagate-ipp-port
 %patch32 -p1 -b .pid
 %patch40 -p1 -b .link
@@ -393,6 +379,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.3.rc2.1
+- 1.2rc2.
+
 * Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.9
 - Sync scheduler/* with svn 5383.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	30 Mar 2006 15:15:36 -0000	1.16
+++ sources	7 Apr 2006 22:03:12 -0000	1.17
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-e1cebe3393c360eb7972efa0715befa1  cups-1.2rc1-source.tar.bz2
+a16f213bfa43e85c6076d6e0d9f6db3e  cups-1.2rc2-source.tar.bz2


--- cups-gnome.patch DELETED ---


--- cups-pstops.patch DELETED ---


--- cups-scheduler.patch DELETED ---


--- cups-str1515.patch DELETED ---


--- cups-str1521.patch DELETED ---


--- cups-str1528.patch DELETED ---


--- cups-str1532.patch DELETED ---


--- cups-str1533.patch DELETED ---


--- cups-string.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr  7 22:06:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 18:06:45 -0400
Subject: rpms/cups/FC-5 cups.spec,1.150,1.151
Message-ID: <200604072206.k37M6jOi010168@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Log Message:
Remove old patches.


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- cups.spec	7 Apr 2006 22:03:12 -0000	1.150
+++ cups.spec	7 Apr 2006 22:06:43 -0000	1.151
@@ -27,7 +27,6 @@
 Patch4: cups-1.1.17-backend.patch
 Patch5: cups-ext.patch
 Patch6: cups-kde.patch
-Patch7: cups-str1515.patch
 Patch8: cups-logfileperm.patch
 Patch9: cups-1.1.17-rcp.patch
 Patch10: cups-1.1.17-ppdsdat.patch
@@ -36,12 +35,9 @@
 Patch16: cups-pie.patch
 Patch17: cups-1.1.19-no_rpath.patch
 Patch18: cups-language.patch
-Patch19: cups-gnome.patch
 Patch20: cups-direct-usb.patch
 Patch22: cups-dest-cache-v2.patch
-Patch23: cups-str1532.patch
 Patch24: cups-maxlogsize.patch
-Patch25: cups-str1533.patch
 Patch28: cups-no-propagate-ipp-port.patch
 Patch32: cups-pid.patch
 Patch40: cups-link.patch



From fedora-cvs-commits at redhat.com  Fri Apr  7 22:22:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 18:22:11 -0400
Subject: rpms/cups/devel cups.spec,1.162,1.163
Message-ID: <200604072222.k37MMBd4024185@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Log Message:
* Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com>
- Build requires libacl-devel.



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- cups.spec	7 Apr 2006 21:52:23 -0000	1.162
+++ cups.spec	7 Apr 2006 22:22:09 -0000	1.163
@@ -57,7 +57,7 @@
 Provides: lpd lpr LPRng = 3.8.15-3
 
 BuildPrereq: pam-devel pkgconfig
-BuildPrereq: gnutls-devel
+BuildPrereq: gnutls-devel acl-devel
 BuildRequires: openldap-devel
 BuildRequires: make >= 1:3.80
 BuildRequires: php-devel, aspell-devel, pcre-devel
@@ -371,6 +371,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com>
+- Build requires libacl-devel.
+
 * Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.4.rc2.1
 - 1.2rc2.
 



From fedora-cvs-commits at redhat.com  Fri Apr  7 22:22:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 18:22:40 -0400
Subject: rpms/cups/FC-5 cups.spec,1.151,1.152
Message-ID: <200604072222.k37MMe13024208@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Log Message:
* Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com>
- Build requires libacl-devel.



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- cups.spec	7 Apr 2006 22:06:43 -0000	1.151
+++ cups.spec	7 Apr 2006 22:22:37 -0000	1.152
@@ -375,6 +375,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com>
+- Build requires libacl-devel.
+
 * Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.3.rc2.1
 - 1.2rc2.
 



From fedora-cvs-commits at redhat.com  Fri Apr  7 22:27:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 18:27:51 -0400
Subject: rpms/cups/FC-5 cups.spec,1.152,1.153
Message-ID: <200604072227.k37MRpj2024260@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Log Message:
- Build requires libacl-devel


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- cups.spec	7 Apr 2006 22:22:37 -0000	1.152
+++ cups.spec	7 Apr 2006 22:27:49 -0000	1.153
@@ -57,7 +57,7 @@
 Provides: lpd lpr LPRng = 3.8.15-3
 
 BuildPrereq: pam-devel pkgconfig
-BuildPrereq: gnutls-devel
+BuildPrereq: gnutls-devel libacl-devel
 BuildRequires: openldap-devel
 BuildRequires: make >= 1:3.80
 BuildRequires: php-devel, aspell-devel, pcre-devel



From fedora-cvs-commits at redhat.com  Sat Apr  8 01:32:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 21:32:58 -0400
Subject: rpms/kernel/FC-5 patch-2.6.16.2.bz2.sign, NONE, 1.1 .cvsignore,
	1.384, 1.385 kernel-2.6.spec, 1.2087, 1.2088 sources, 1.325,
	1.326 upstream, 1.298, 1.299 patch-2.6.16.1.bz2.sign, 1.1, NONE
Message-ID: <200604080132.k381Wwa4010897@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16.2.bz2.sign 
Removed Files:
	patch-2.6.16.1.bz2.sign 
Log Message:
.16.2



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

iD8DBQBENqA6yGugalF9Dw4RAq7nAJ0fk9eSFPhLzhDUDdR9zEeL2JsiRQCeNdeV
Je0O0DPWKVd7j/dKmXSRkE4=
=fnHS
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -r1.384 -r1.385
--- .cvsignore	28 Mar 2006 08:28:18 -0000	1.384
+++ .cvsignore	8 Apr 2006 01:32:54 -0000	1.385
@@ -3,4 +3,4 @@
 kernel-2.6.16
 xen-20060301.tar.bz2
 linux-2.6.16.tar.bz2
-patch-2.6.16.1.bz2
+patch-2.6.16.2.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2087
retrieving revision 1.2088
diff -u -r1.2087 -r1.2088
--- kernel-2.6.spec	4 Apr 2006 18:42:17 -0000	1.2087
+++ kernel-2.6.spec	8 Apr 2006 01:32:54 -0000	1.2088
@@ -214,7 +214,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16.1.bz2
+Patch1: patch-2.6.16.2.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1687,6 +1687,9 @@
 %endif
 
 %changelog
+* Fri Apr  7 2006 Dave Jones <davej at redhat.com>
+- 2.6.16.2
+
 * Tue Apr  4 2006 Dave Jones <davej at redhat.com>
 - Reenable non-standard serial ports. (#187466)
 - Reenable snd-es18xx for x86-32 (#187733)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -r1.325 -r1.326
--- sources	28 Mar 2006 08:28:18 -0000	1.325
+++ sources	8 Apr 2006 01:32:55 -0000	1.326
@@ -1,3 +1,3 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 cdfde609af8adcf58d7ff626599b2d90  xen-20060301.tar.bz2
-9ffe7df0263d5e4ba5007237c848c97a  patch-2.6.16.1.bz2
+b316050dcee26ce66757fb87908586ec  patch-2.6.16.2.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- upstream	28 Mar 2006 08:27:56 -0000	1.298
+++ upstream	8 Apr 2006 01:32:55 -0000	1.299
@@ -1,3 +1,3 @@
 linux-2.6.16.tar.bz2
-patch-2.6.16.1.bz2
+patch-2.6.16.2.bz2
 


--- patch-2.6.16.1.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sat Apr  8 01:42:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 21:42:02 -0400
Subject: rpms/kernel/FC-4 patch-2.6.16.2.bz2.sign, NONE, 1.1 .cvsignore,
	1.177, 1.178 kernel-2.6.spec, 1.1619, 1.1620 sources, 1.161,
	1.162 upstream, 1.102, 1.103 patch-2.6.16.1.bz2.sign, 1.1, NONE
Message-ID: <200604080142.k381g2dE011035@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16.2.bz2.sign 
Removed Files:
	patch-2.6.16.1.bz2.sign 
Log Message:
2.6.16.2



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

iD8DBQBENqA6yGugalF9Dw4RAq7nAJ0fk9eSFPhLzhDUDdR9zEeL2JsiRQCeNdeV
Je0O0DPWKVd7j/dKmXSRkE4=
=fnHS
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/.cvsignore,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- .cvsignore	28 Mar 2006 16:14:09 -0000	1.177
+++ .cvsignore	8 Apr 2006 01:41:58 -0000	1.178
@@ -2,4 +2,4 @@
 temp-*
 kernel-2.6.16
 linux-2.6.16.tar.bz2
-patch-2.6.16.1.bz2
+patch-2.6.16.2.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1619
retrieving revision 1.1620
diff -u -r1.1619 -r1.1620
--- kernel-2.6.spec	4 Apr 2006 18:42:17 -0000	1.1619
+++ kernel-2.6.spec	8 Apr 2006 01:41:58 -0000	1.1620
@@ -192,7 +192,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16.1.bz2
+Patch1: patch-2.6.16.2.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1062,6 +1062,9 @@
 %endif
 
 %changelog
+* Fri Apr  7 2006 Dave Jones <davej at redhat.com>
+- 2.6.16.2
+
 * Tue Apr  4 2006 Dave Jones <davej at redhat.com>
 - Reenable non-standard serial ports. (#187466)
 - Reenable snd-es18xx for x86-32 (#187733)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/sources,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- sources	28 Mar 2006 16:14:10 -0000	1.161
+++ sources	8 Apr 2006 01:42:00 -0000	1.162
@@ -1 +1 @@
-9ffe7df0263d5e4ba5007237c848c97a  patch-2.6.16.1.bz2
+b316050dcee26ce66757fb87908586ec  patch-2.6.16.2.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/upstream,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- upstream	28 Mar 2006 16:14:10 -0000	1.102
+++ upstream	8 Apr 2006 01:42:00 -0000	1.103
@@ -1,2 +1,2 @@
 linux-2.6.16.tar.bz2
-patch-2.6.16.1.bz2
+patch-2.6.16.2.bz2


--- patch-2.6.16.1.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sat Apr  8 02:20:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 22:20:31 -0400
Subject: rpms/gtk2/devel .cvsignore, 1.50, 1.51 gtk2.spec, 1.135,
	1.136 sources, 1.53, 1.54
Message-ID: <200604080220.k382KVKt006273@cvs.devel.redhat.com>

Author: mclasen

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	15 Mar 2006 19:16:19 -0000	1.50
+++ .cvsignore	8 Apr 2006 02:20:29 -0000	1.51
@@ -33,3 +33,4 @@
 gtk+-2.8.15.tar.bz2
 gtk+-2.8.15.tar.bz2
 gtk+-2.8.16.tar.bz2
+gtk+-2.8.17.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- gtk2.spec	15 Mar 2006 19:16:19 -0000	1.135
+++ gtk2.spec	8 Apr 2006 02:20:29 -0000	1.136
@@ -10,13 +10,13 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.8.16
+%define base_version 2.8.17
 %define bin_version 2.4.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
 Name: gtk2
 Version: %{base_version}
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -27,7 +27,7 @@
 # Backported from 2.10
 Patch1: gtk+-2.8.6-inputmethod.patch
 # Fedora patch
-Patch3: gtk+-2.8.10-set-invisible-char-to-bullet.patch
+Patch2: gtk+-2.8.10-set-invisible-char-to-bullet.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}
@@ -94,7 +94,7 @@
 
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .inputmethod
-%patch3 -p1 -b .set-invisible-char-to-bullet
+%patch2 -p1 -b .set-invisible-char-to-bullet
 
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -266,6 +266,12 @@
 %doc tmpdocs/examples
 
 %changelog
+* Fri Apr  7 2006 Matthias Clasen <mclasen at redhat.com> - 2.8.17-2
+- Update to 2.8.17
+
+* Thu Mar 30 2006 Matthias Clasen <mclasen at redhat.com> - 2.8.16-2
+- Fix a multiscreen dnd crash
+
 * Wed Mar 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.8.16-1
 - Update to 2.8.16
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	15 Mar 2006 19:16:19 -0000	1.53
+++ sources	8 Apr 2006 02:20:29 -0000	1.54
@@ -1,2 +1,2 @@
 d8c012f67a8f23fa9aa495fca5331784  update-scripts.tar.gz
-6dea9b6f546bd858401729d12bbd5919  gtk+-2.8.16.tar.bz2
+6d2deb63a5444808d2aeb7dcfffaa2f4  gtk+-2.8.17.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Apr  8 02:26:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 22:26:45 -0400
Subject: rpms/gtk2/FC-5 gtk2.spec,1.135,1.136 sources,1.53,1.54
Message-ID: <200604080226.k382QjaH006408@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gtk2.spec sources 
Log Message:
2.8.17



Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/FC-5/gtk2.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- gtk2.spec	15 Mar 2006 19:16:19 -0000	1.135
+++ gtk2.spec	8 Apr 2006 02:26:43 -0000	1.136
@@ -10,13 +10,13 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.8.16
+%define base_version 2.8.17
 %define bin_version 2.4.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
 Name: gtk2
 Version: %{base_version}
-Release: 1
+Release: 1.fc5.1
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -27,7 +27,7 @@
 # Backported from 2.10
 Patch1: gtk+-2.8.6-inputmethod.patch
 # Fedora patch
-Patch3: gtk+-2.8.10-set-invisible-char-to-bullet.patch
+Patch2: gtk+-2.8.10-set-invisible-char-to-bullet.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}
@@ -94,7 +94,7 @@
 
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .inputmethod
-%patch3 -p1 -b .set-invisible-char-to-bullet
+%patch2 -p1 -b .set-invisible-char-to-bullet
 
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -266,6 +266,12 @@
 %doc tmpdocs/examples
 
 %changelog
+* Fri Apr  7 2006 Matthias Clasen <mclasen at redhat.com> - 2.8.17-1.fc5.1
+- Update to 2.8.17
+
+* Thu Mar 30 2006 Matthias Clasen <mclasen at redhat.com> - 2.8.16-2
+- Fix a multiscreen dnd crash
+
 * Wed Mar 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.8.16-1
 - Update to 2.8.16
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk2/FC-5/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	15 Mar 2006 19:16:19 -0000	1.53
+++ sources	8 Apr 2006 02:26:43 -0000	1.54
@@ -1,2 +1,2 @@
 d8c012f67a8f23fa9aa495fca5331784  update-scripts.tar.gz
-6dea9b6f546bd858401729d12bbd5919  gtk+-2.8.16.tar.bz2
+6d2deb63a5444808d2aeb7dcfffaa2f4  gtk+-2.8.17.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Apr  8 02:49:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 22:49:11 -0400
Subject: rpms/beagle/devel beagle-0.2.4-crawl.patch, NONE, 1.1 .cvsignore,
	1.8, 1.9 beagle.spec, 1.46, 1.47 sources, 1.10,
	1.11 beagle-0.2.1-crawl.patch, 1.2, NONE
Message-ID: <200604080249.k382nBMF020351@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20334

Modified Files:
	.cvsignore beagle.spec sources 
Added Files:
	beagle-0.2.4-crawl.patch 
Removed Files:
	beagle-0.2.1-crawl.patch 
Log Message:
0.2.4


beagle-0.2.4-crawl.patch:
 Makefile.am                     |    1 -
 Makefile.in                     |    1 -
 crawl-rules/crawl-applications  |    2 +-
 crawl-rules/crawl-documentation |    2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE beagle-0.2.4-crawl.patch ---
--- beagle-0.2.4/tools/crawl-rules/crawl-applications.crawl	2006-04-07 22:44:46.000000000 -0400
+++ beagle-0.2.4/tools/crawl-rules/crawl-applications	2006-04-07 22:45:03.000000000 -0400
@@ -2,7 +2,7 @@
 
 CRAWL_INDEX_NAME="applications"
 
-CRAWL_PATHS="/usr/share/applications /usr/local/share/applications /opt/gnome/share/applications /opt/kde3/share/applications"
+CRAWL_PATHS="/usr/share/applications /usr/local/share/applications" 
 
 CRAWL_RECURSIVE="yes"
 
--- beagle-0.2.4/tools/crawl-rules/crawl-documentation.crawl	2006-04-07 22:46:17.000000000 -0400
+++ beagle-0.2.4/tools/crawl-rules/crawl-documentation	2006-04-07 22:47:01.000000000 -0400
@@ -2,7 +2,7 @@
 
 CRAWL_INDEX_NAME="documentation"
 
-CRAWL_PATHS="/usr/share/doc /usr/local/share/doc /opt/kde3/share/doc /opt/gnome/share/gnome/help"
+CRAWL_PATHS="/usr/share/doc /usr/local/share/doc /usr/share/gnome/help /usr/share/gnome/html"
 
 CRAWL_ALLOW_PATTERNS="*.xml,*.html,*.docbook"
 
--- beagle-0.2.4/tools/Makefile.in.crawl	2006-04-07 22:43:21.000000000 -0400
+++ beagle-0.2.4/tools/Makefile.in	2006-04-07 22:43:42.000000000 -0400
@@ -367,7 +367,6 @@
 CRAWL_WRAPPER = beagle-crawl-system
 CRAWL_WRAPPER_IN = $(CRAWL_WRAPPER).in
 CRAWL_RULES = \
-	$(srcdir)/crawl-rules/crawl-windows		\
 	$(srcdir)/crawl-rules/crawl-applications	\
 	$(srcdir)/crawl-rules/crawl-documentation
 
--- beagle-0.2.4/tools/Makefile.am.crawl	2006-04-07 22:43:58.000000000 -0400
+++ beagle-0.2.4/tools/Makefile.am	2006-04-07 22:44:06.000000000 -0400
@@ -34,7 +34,6 @@
 	chmod +x $(CRAWL_WRAPPER)
 
 CRAWL_RULES = \
-	$(srcdir)/crawl-rules/crawl-windows		\
 	$(srcdir)/crawl-rules/crawl-applications	\
 	$(srcdir)/crawl-rules/crawl-documentation
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	7 Mar 2006 15:48:12 -0000	1.8
+++ .cvsignore	8 Apr 2006 02:49:09 -0000	1.9
@@ -1 +1,2 @@
 beagle-0.2.2.tar.bz2
+beagle-0.2.4.tar.bz2


Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- beagle.spec	21 Mar 2006 15:37:04 -0000	1.46
+++ beagle.spec	8 Apr 2006 02:49:09 -0000	1.47
@@ -1,6 +1,6 @@
 Name:           beagle
-Version:        0.2.3
-Release:        5
+Version:        0.2.4
+Release:        2
 Summary:        The Beagle Search Infrastructure
 
 Group:          User Interface/Desktops
@@ -24,8 +24,7 @@
 BuildRequires:  librsvg2-devel >= 2.0
 Requires: sqlite >= 3.3.1
 Requires: zip unzip sed grep mono-core poppler-utils
-Patch0: beagle-0.2.3-security-fix.patch
-Patch2: beagle-0.2.1-crawl.patch
+Patch2: beagle-0.2.4-crawl.patch
 Patch3: beagle-0.2.1-spew.patch
 Patch4: beagle-0.2.2-crawl-system-cron.patch
 
@@ -61,7 +60,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .security-fix
 %patch2 -p1 -b .crawl
 %patch3 -p1 -b .spew
 %patch4 -p1 -b .crawl-system-cron
@@ -212,6 +210,10 @@
 %{_prefix}/lib/python*/site-packages/beagle.so
 
 %changelog
+* Fri Apr  7 2006 Matthias Clasen <mclasen at redhat.com> 0.2.4-2
+- Update to 0.2.4
+- Update patches
+
 * Tue Mar 21 2006 Alexander Larsson <alexl at redhat.com> 0.2.3-5
 - Rebuild fc5 update in rawhide
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	21 Mar 2006 15:37:04 -0000	1.10
+++ sources	8 Apr 2006 02:49:09 -0000	1.11
@@ -1,3 +1,3 @@
 6f0f121a9269662071eb5c260b54f86f  beagle.desktop
 777250265dc910964f5acd9da29cc64c  beagle-crawl-system.cron
-4519156a909e8371c59454cab882c616  beagle-0.2.3.tar.bz2
+bd915b5f7de56c91dae2c26121c586fa  beagle-0.2.4.tar.bz2


--- beagle-0.2.1-crawl.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sat Apr  8 03:03:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 23:03:26 -0400
Subject: rpms/beagle/devel beagle.spec,1.47,1.48
Message-ID: <200604080303.k3833QTH020513@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20500

Modified Files:
	beagle.spec 
Log Message:
0.2.4



Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- beagle.spec	8 Apr 2006 02:49:09 -0000	1.47
+++ beagle.spec	8 Apr 2006 03:03:24 -0000	1.48
@@ -2,7 +2,6 @@
 Version:        0.2.4
 Release:        2
 Summary:        The Beagle Search Infrastructure
-
 Group:          User Interface/Desktops
 License:        LGPL
 URL:            http://beagle-project.org/
@@ -13,7 +12,7 @@
 
 BuildRequires:  mono-devel mono-data mono-data-sqlite
 BuildRequires:  gtk-sharp2-gapi mono-web zip libexif-devel
-BuildRequires:  gsf-sharp
+BuildRequires:  gsf-sharp >= 0.6
 BuildRequires:  sqlite-devel > 3.3.1
 BuildRequires:  gmime-sharp >= 2.1.19
 BuildRequires:  evolution-sharp >= 0.10.2-3



From fedora-cvs-commits at redhat.com  Sat Apr  8 03:15:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 23:15:39 -0400
Subject: rpms/beagle/FC-5 beagle.spec, 1.49, 1.50 sources, 1.10,
	1.11 beagle-0.2.1-crawl.patch, 1.2, NONE
Message-ID: <200604080315.k383FdK2021592@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	beagle.spec sources 
Removed Files:
	beagle-0.2.1-crawl.patch 
Log Message:
0.2.4



Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/FC-5/beagle.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- beagle.spec	21 Mar 2006 14:40:46 -0000	1.49
+++ beagle.spec	8 Apr 2006 03:15:36 -0000	1.50
@@ -1,8 +1,7 @@
 Name:           beagle
-Version:        0.2.3
-Release:        4
+Version:        0.2.4
+Release:        1.fc5.1
 Summary:        The Beagle Search Infrastructure
-
 Group:          User Interface/Desktops
 License:        LGPL
 URL:            http://beagle-project.org/
@@ -13,7 +12,7 @@
 
 BuildRequires:  mono-devel mono-data mono-data-sqlite
 BuildRequires:  gtk-sharp2-gapi mono-web zip libexif-devel
-BuildRequires:  gsf-sharp
+BuildRequires:  gsf-sharp >= 0.6
 BuildRequires:  sqlite-devel > 3.3.1
 BuildRequires:  gmime-sharp >= 2.1.19
 BuildRequires:  evolution-sharp >= 0.10.2-3
@@ -24,8 +23,7 @@
 BuildRequires:  librsvg2-devel >= 2.0
 Requires: sqlite >= 3.3.1
 Requires: zip unzip sed grep mono-core poppler-utils
-Patch0: beagle-0.2.3-security-fix.patch
-Patch2: beagle-0.2.1-crawl.patch
+Patch2: beagle-0.2.4-crawl.patch
 Patch3: beagle-0.2.1-spew.patch
 Patch4: beagle-0.2.2-crawl-system-cron.patch
 
@@ -61,7 +59,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .security-fix
 %patch2 -p1 -b .crawl
 %patch3 -p1 -b .spew
 %patch4 -p1 -b .crawl-system-cron
@@ -212,6 +209,13 @@
 %{_prefix}/lib/python*/site-packages/beagle.so
 
 %changelog
+* Fri Apr  7 2006 Matthias Clasen <mclasen at redhat.com> 0.2.4-1.fc5.1
+- Update to 0.2.4
+- Update patches
+
+* Tue Mar 21 2006 Alexander Larsson <alexl at redhat.com> 0.2.3-5
+- Rebuild fc5 update in rawhide
+
 * Tue Mar 21 2006 Alexander Larsson <alexl at redhat.com> - 0.2.3-4
 - Remove more instances of wrapper scripts starting apps in cwd.
   Fixes bug #185981, and CVE-2006-1296


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/beagle/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	17 Mar 2006 19:10:41 -0000	1.10
+++ sources	8 Apr 2006 03:15:37 -0000	1.11
@@ -1,3 +1,3 @@
 6f0f121a9269662071eb5c260b54f86f  beagle.desktop
 777250265dc910964f5acd9da29cc64c  beagle-crawl-system.cron
-4519156a909e8371c59454cab882c616  beagle-0.2.3.tar.bz2
+bd915b5f7de56c91dae2c26121c586fa  beagle-0.2.4.tar.bz2


--- beagle-0.2.1-crawl.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sat Apr  8 03:18:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 23:18:23 -0400
Subject: rpms/beagle/FC-5 beagle-0.2.4-crawl.patch,NONE,1.1
Message-ID: <200604080318.k383INoe002091@cvs.devel.redhat.com>

Author: mclasen

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

Added Files:
	beagle-0.2.4-crawl.patch 
Log Message:
add a patch


beagle-0.2.4-crawl.patch:
 Makefile.am                     |    1 -
 Makefile.in                     |    1 -
 crawl-rules/crawl-applications  |    2 +-
 crawl-rules/crawl-documentation |    2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE beagle-0.2.4-crawl.patch ---
--- beagle-0.2.4/tools/crawl-rules/crawl-applications.crawl	2006-04-07 22:44:46.000000000 -0400
+++ beagle-0.2.4/tools/crawl-rules/crawl-applications	2006-04-07 22:45:03.000000000 -0400
@@ -2,7 +2,7 @@
 
 CRAWL_INDEX_NAME="applications"
 
-CRAWL_PATHS="/usr/share/applications /usr/local/share/applications /opt/gnome/share/applications /opt/kde3/share/applications"
+CRAWL_PATHS="/usr/share/applications /usr/local/share/applications" 
 
 CRAWL_RECURSIVE="yes"
 
--- beagle-0.2.4/tools/crawl-rules/crawl-documentation.crawl	2006-04-07 22:46:17.000000000 -0400
+++ beagle-0.2.4/tools/crawl-rules/crawl-documentation	2006-04-07 22:47:01.000000000 -0400
@@ -2,7 +2,7 @@
 
 CRAWL_INDEX_NAME="documentation"
 
-CRAWL_PATHS="/usr/share/doc /usr/local/share/doc /opt/kde3/share/doc /opt/gnome/share/gnome/help"
+CRAWL_PATHS="/usr/share/doc /usr/local/share/doc /usr/share/gnome/help /usr/share/gnome/html"
 
 CRAWL_ALLOW_PATTERNS="*.xml,*.html,*.docbook"
 
--- beagle-0.2.4/tools/Makefile.in.crawl	2006-04-07 22:43:21.000000000 -0400
+++ beagle-0.2.4/tools/Makefile.in	2006-04-07 22:43:42.000000000 -0400
@@ -367,7 +367,6 @@
 CRAWL_WRAPPER = beagle-crawl-system
 CRAWL_WRAPPER_IN = $(CRAWL_WRAPPER).in
 CRAWL_RULES = \
-	$(srcdir)/crawl-rules/crawl-windows		\
 	$(srcdir)/crawl-rules/crawl-applications	\
 	$(srcdir)/crawl-rules/crawl-documentation
 
--- beagle-0.2.4/tools/Makefile.am.crawl	2006-04-07 22:43:58.000000000 -0400
+++ beagle-0.2.4/tools/Makefile.am	2006-04-07 22:44:06.000000000 -0400
@@ -34,7 +34,6 @@
 	chmod +x $(CRAWL_WRAPPER)
 
 CRAWL_RULES = \
-	$(srcdir)/crawl-rules/crawl-windows		\
 	$(srcdir)/crawl-rules/crawl-applications	\
 	$(srcdir)/crawl-rules/crawl-documentation
 



From fedora-cvs-commits at redhat.com  Sat Apr  8 03:25:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Apr 2006 23:25:38 -0400
Subject: rpms/python/devel python-2.4.3-config.patch, NONE, 1.1 .cvsignore,
	1.13, 1.14 python.spec, 1.65, 1.66 sources, 1.13,
	1.14 python-2.4.1-config.patch, 1.2, NONE
Message-ID: <200604080325.k383PbM0002236@cvs.devel.redhat.com>

Author: misa

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

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

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

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


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


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/devel/python.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- python.spec	11 Feb 2006 05:23:02 -0000	1.65
+++ python.spec	8 Apr 2006 03:25:35 -0000	1.66
@@ -18,8 +18,8 @@
 
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
-Version: %{pybasever}.2
-Release: 3.2.1
+Version: %{pybasever}.3
+Release: 1
 License: PSF - see LICENSE
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -32,7 +32,7 @@
 Source6: http://gigue.peabody.jhu.edu/~mdboom/omi/source/shm_source/shmmodule.c
 Source7: python-2.3.4-optik.py
 
-Patch0: python-2.4.1-config.patch
+Patch0: python-2.4.3-config.patch
 Patch3: Python-2.2.1-pydocnogui.patch
 Patch7: python-2.3.4-lib64-regex.patch
 Patch8: python-2.4.1-lib64.patch
@@ -359,6 +359,9 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Thu Apr  6 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-1
+- Updated to 2.4.3
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.4.2-3.2.1
 - bump again for double-long bug on ppc(64)
 


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


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



From fedora-cvs-commits at redhat.com  Sat Apr  8 05:46:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 8 Apr 2006 01:46:10 -0400
Subject: rpms/iscsi-initiator-utils/FC-5
	open-iscsi-5.0.4.446-update-initscripts-and-docs.patch, NONE,
	1.1 iscsi-initiator-utils.spec, 1.8,
	1.9 open-iscsi-5.0.4.446-initscript.patch, 1.1, NONE
Message-ID: <200604080546.k385kAPL032597@cvs.devel.redhat.com>

Author: mchristi

Update of /cvs/dist/rpms/iscsi-initiator-utils/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31818

Modified Files:
	iscsi-initiator-utils.spec 
Added Files:
	open-iscsi-5.0.4.446-update-initscripts-and-docs.patch 
Removed Files:
	open-iscsi-5.0.4.446-initscript.patch 
Log Message:
update initscript and docs

open-iscsi-5.0.4.446-update-initscripts-and-docs.patch:
 README                 |  129 +++++++++++++++++----
 doc/iscsiadm.8         |  298 ++++++++++++++++++++++++++-----------------------
 doc/iscsid.8           |  174 ++++++++++++++--------------
 etc/initd/initd.redhat |  178 +++++++++++++++--------------
 etc/iscsid.conf        |    6 
 5 files changed, 450 insertions(+), 335 deletions(-)

--- NEW FILE open-iscsi-5.0.4.446-update-initscripts-and-docs.patch ---
diff -aurp open-iscsi-5.0.5.476/doc/iscsiadm.8 open-iscsi-5.0.5.476.work/doc/iscsiadm.8
--- open-iscsi-5.0.5.476/doc/iscsiadm.8	2006-01-23 13:42:28.000000000 -0600
+++ open-iscsi-5.0.5.476.work/doc/iscsiadm.8	2006-04-07 23:36:29.000000000 -0500
@@ -1,137 +1,161 @@
-.TH ISCSID 8 "July 2005" "" "Linux Administrator's Manual"
-.SH NAME
-iscsiadm \- Open-iSCSI Configuration Utility
-.SH SYNOPSIS
-.BI iscsiadm
-[OPTIONS]
-.SH "DESCRIPTION"
-Open-iSCSI persistent configuration is implemented as a DBM database
-available on all Linux installations.
-.p
-The database contains two tables:
-.TP
-Discovery table (discovery.db);
-.TP
-Node table (node.db).
-.PD
-.PP
-The regular place for iSCSI database files is in
-.I /var/db/iscsi/*.db
-.PP
-The iscsiadm utility is a command-line tool to manage (update, delete,
-insert, query) the persistent database.
-.PP
-The utility presents set of operations that a user can perform 
-on iSCSI nodes, sessions, connections, and discovery records.
-.PP
-Note that some of the iSCSI Node and iSCSI Discovery operations 
-do not require iSCSI daemon (iscsid) loaded.
-
-.SH OPTIONS
-.TP
-.B \-m, \-\-mode \fIop
-specify operational mode.
-.I op
-is either
-.I discovery
-or
-.I node
-.TP
-.B \-m discovery
-display all discovery records from the internal persistent discovery
-database.
-.TP
-.B \-m discovery \-\-type=\fItype\fB \-\-portal=\fIip:port\fB \-\-login
-perform
-.I type
-discovery for target portal with ip-address 
-.I ip
-and port 
-.I port
-\. Initiate Login for each discovered target if --login is specific.
-.TP
-.B \-m discovery \-\-record=\fIid\fB \-\-login
- perform discovery based on record 
-.I id
-in database.
-.TP
-.B \-m discovery \-\-record=\fIid\fB \-\-op=\fIop\fB \-\-name=\fIname\fB \-\-value=\fIvalue
-perform specific DB operation 
-.I op
-for specific discovery record with 
-.I id
-\. It could be one of:
-.I new
-, 
-.I delete
-, 
-.I update
- or 
-.I show
-\. In case of
-.I update
-, you have to provide 
-.I name
- and 
-.I value
-you wish to update
-.TP
-.B \-m node
-display all discovered nodes from internal persistent discovery
-database
-.TP
-.B \-m node \-\-record=\fIid\fB [ \-\-login | \-\-logout ]
-.TP
-.B \-m node \-\-record=\fIid\fB \-\-op=\fIop\fB [\-\-name=\fIname\fB \-\-value=\fIvalue\fB]
-perform specific DB operation 
-.I op
-for specific node with record 
-.I id
-\. It could be one of:
-.I new
-, 
-.I delete
-, 
-.I update
- or 
-.I show
-\. In case of
-.I update
-, you have to provide 
-.I name
-and 
-.I value
-you wish to update
-.TP
-.B \-m session
-display all active sessions and connections
-.TP
-.B \-m session \-\-record=[\fIid\fB[\fI:cid\fB]] [\-\-logout]
-perform operation for specific session with record
-.I id
-or display statistics if no operation specified. Operation will affect
-one connection only if
-.I \:cid
-is specified
-.TP
-.B \-d, \-\-debug \fIdebuglevel
-print debugging information
-.TP
-.B -V, --version
-display version and exit
-.TP
-.B -h, --help
-display this help and exit
-
-.SH FILES
-.TP
-/var/db/iscsi/*.db
-Open-iSCSI persistent configuration database
-
-.SH "SEE ALSO"
-.BR iscsid (8)
-.BR iscsid.conf (5)
-
-.SH AUTHORS
-Alex Aizman <itn780 at yahoo.com>
-Dmitry Yusupov <dmitry_yus at yahoo.com>
+.TH ISCSID 8 "July 2005" "" "Linux Administrator's Manual"
+.SH NAME
+iscsiadm \- Open-iSCSI Configuration Utility
+.SH SYNOPSIS
+.BI iscsiadm
+[OPTIONS]
+.SH "DESCRIPTION"
+Open-iSCSI persistent configuration is implemented as a DBM database
+available on all Linux installations.
+.p
+The database contains two tables:
+.TP
+Discovery table (discovery.db);
+.TP
+Node table (node.db).
+.PD
+.PP
+The regular place for iSCSI database files is in
+.I /var/db/iscsi/*.db
+.PP
+The iscsiadm utility is a command-line tool to manage (update, delete,
+insert, query) the persistent database.
+.PP
+The utility presents set of operations that a user can perform 
+on iSCSI nodes, sessions, connections, and discovery records.
+.PP
+Note that some of the iSCSI Node and iSCSI Discovery operations 
+do not require iSCSI daemon (iscsid) loaded.
+
+.SH OPTIONS
+.TP
+.B \-m, \-\-mode \fIop
+specify operational mode.
+.I op
+is either
+.I discovery
+or
+.I node
+.TP
+.B \-m discovery
+display all discovery records from the internal persistent discovery
+database.
+.TP
+.B \-m discovery \-\-type=\fItype\fB \-\-portal=\fIip:port\fB \-\-login
+perform
+.I type
+discovery for target portal with ip-address 
+.I ip
+and port 
+.I port
+\. Initiate Login for each discovered target if --login is specific.
+.TP
+.B \-m discovery \-\-record=\fIid\fB \-\-login
+ perform discovery based on record 
+.I id
+in database.
+.TP
+.B \-m discovery \-\-record=\fIid\fB \-\-op=\fIop\fB \-\-name=\fIname\fB \-\-value=\fIvalue
+perform specific DB operation 
+.I op
+for specific discovery record with 
+.I id
+\. It could be one of:
+.I new
+, 
+.I delete
+, 
+.I update
+ or 
+.I show
+\. In case of
+.I update
+, you have to provide 
+.I name
+ and 
+.I value
+you wish to update
+.TP
+.B \-m node
+display all discovered nodes from internal persistent discovery
+database
+.TP
+.B \-m node \-\-record=\fIid\fB
+display all parameters for given \fIid\fB.
+.TP
+.B \-m node \-\-record=\fIid\fB [\-\-login|\-l]
+login to node given by \fIid\fB.
+.TP
+.B \-m node \-\-record=\fIid\fB [\-\-logout|\-u]
+logout to node given by \fIid\fB.
+.TP
+.B \-m node \-\-record=\fIid\fB \-\-op=\fIop\fB [\-\-name=\fIname\fB \-\-value=\fIvalue\fB]
+perform specific DB operation 
+.I op
+for specific node with record 
+.I id
+\. It could be one of:
+.I new
+, 
+.I delete
+, 
+.I update
+ or 
+.I show
+\. In case of
+.I update
+, you have to provide 
+.I name
+and 
+.I value
+you wish to update
+.TP
+.B \-m session
+display all active sessions and connections
+.TP
+.B \-m session \-\-record=[\fIid\fB[\fI:cid\fB]] [\-\-logout|\-u]
+perform operation for specific session with record
+.I id
+or display statistics if no operation specified. Operation will affect
+one connection only if
+.I \:cid
+is specified
+.TP
+.B \-d, \-\-debug \fIdebuglevel
+print debugging information
+.TP
+.B -V, --version
+display version and exit
+.TP
+.B -h, --help
+display this help and exit
+
+.SH FILES
+.TP
+/etc/iscsid.conf
+The configuration file read by
+.B iscsid
+and
+.B iscsiadm
+on startup.
+.TP
+/etc/initiatorname.iscsi
+The file containing the iSCSI initiatorname
+and initiatoralias read by
+.B iscsid
+and
+.B iscsiadm
+on startup.
+.TP
+/var/db/iscsi/*.db
+Open-iSCSI persistent configuration database
+
+.SH "SEE ALSO"
+.BR iscsid (8)
+
+.SH AUTHORS
+Open-iSCSI project <http://www.open-iscsi.org/>
+.br
+Alex Aizman <itn780 at yahoo.com>
+.br
+Dmitry Yusupov <dmitry_yus at yahoo.com>
diff -aurp open-iscsi-5.0.5.476/doc/iscsid.8 open-iscsi-5.0.5.476.work/doc/iscsid.8
--- open-iscsi-5.0.5.476/doc/iscsid.8	2006-01-23 13:42:28.000000000 -0600
+++ open-iscsi-5.0.5.476.work/doc/iscsid.8	2006-04-07 23:36:29.000000000 -0500
@@ -1,86 +1,88 @@
-.TH ISCSID 8 "July 2005" "" "Linux Administrator's Manual"
-.SH NAME
-iscsid \- Open-iSCSI daemon
-.SH SYNOPSIS
-.BI iscsid
-[OPTION]
-.SH "DESCRIPTION"
-The
-.B iscsid
-implements the control path of iSCSI protocol, plus some management
-facilities. For example, the daemon could be configured to automatically 
-re-start discovery at startup, based on the contents of persistent 
-iSCSI database.
-.SH OPTIONS
-.TP
-.BI [-c|--config=]\fIconfig\-file\fP
-Read configuration from
-.I config\-file
-rather than the default
-.I /etc/iscsid.conf
-file.
-.TP
-.BI [-i|--initiatorname=]\fIiname\-file\fP
-Read initiator name from
-.I iname\-file
-rather than the default
-.I /etc/initiatorname.iscsi
-file.
-.TP
-.BI [-f|--foreground]
-run
-.B iscsid
-in the foreground.
-.TP
-.BI [-d|--debug]
-print debugging information.
-.TP
-.BI [-u|--uid=]\fIuid\fP
-run under user ID
-.I uid
-(default is the current user ID)
-.TP
-.BI [-g|--gid=]\fIgid\fP
-run under user group ID
-.I gid
-(default is the current user group ID).
-.TP
-.BI [-p|--pid=]\fIpid\-file\fP
-write process ID to
-.I pid\-file
-rather than the default
-.I /var/run/iscsid.pid
-.TP
-.BI [-h|--help]
-display this help and exit
-.TP
-.BI [-v|--version]
-display version and exit.
-
-.SH FILES
-.TP
-/etc/iscsid.conf
-The configuration file read by
-.B iscsid
-and
-.B iscsiadm
-on startup.
-.TP
-/etc/initiatorname.iscsi
-The file containing the iSCSI initiatorname
-and initiatoralias read by
-.B iscsid
-and
-.B iscsiadm
-on startup.
-.TP
-/var/db/iscsi/*.db
-Open-iSCSI persistent configuration database
-
-.SH "SEE ALSO"
-.BR iscsiadm (8)
-.BR iscsid.conf (5)
-
-.SH AUTHORS
-Alex Aizman <itn780 at yahoo.com>
-Dmitry Yusupov <dmitry_yus at yahoo.com>
+.TH ISCSID 8 "July 2005" "" "Linux Administrator's Manual"
+.SH NAME
+iscsid \- Open-iSCSI daemon
+.SH SYNOPSIS
+.BI iscsid
+[OPTION]
+.SH "DESCRIPTION"
+The
+.B iscsid
+implements the control path of iSCSI protocol, plus some management
+facilities. For example, the daemon could be configured to automatically 
+re-start discovery at startup, based on the contents of persistent 
+iSCSI database.
+.SH OPTIONS
+.TP
+.BI [-c|--config=]\fIconfig\-file\fP
+Read configuration from
+.I config\-file
+rather than the default
+.I /etc/iscsid.conf
+file.
+.TP
+.BI [-i|--initiatorname=]\fIiname\-file\fP
+Read initiator name from
+.I iname\-file
+rather than the default
+.I /etc/initiatorname.iscsi
+file.
+.TP
+.BI [-f|--foreground]
+run
+.B iscsid
+in the foreground.
+.TP
+.BI [-d|--debug]
+print debugging information.
+.TP
+.BI [-u|--uid=]\fIuid\fP
+run under user ID
+.I uid
+(default is the current user ID)
+.TP
+.BI [-g|--gid=]\fIgid\fP
+run under user group ID
+.I gid
+(default is the current user group ID).
+.TP
+.BI [-p|--pid=]\fIpid\-file\fP
+write process ID to
+.I pid\-file
+rather than the default
+.I /var/run/iscsid.pid
+.TP
+.BI [-h|--help]
+display this help and exit
+.TP
+.BI [-v|--version]
+display version and exit.
+
+.SH FILES
+.TP
+/etc/iscsid.conf
+The configuration file read by
+.B iscsid
+and
+.B iscsiadm
+on startup.
+.TP
+/etc/initiatorname.iscsi
+The file containing the iSCSI initiatorname
+and initiatoralias read by
+.B iscsid
+and
+.B iscsiadm
+on startup.
+.TP
+/var/db/iscsi/*.db
+Open-iSCSI persistent configuration database
+
+.SH "SEE ALSO"
+.BR iscsiadm (8)
+
+.SH AUTHORS
+Open-iSCSI project <http://www.open-iscsi.org/>
+.br
+Alex Aizman <itn780 at yahoo.com>
+.br
+Dmitry Yusupov <dmitry_yus at yahoo.com>
diff -aurp open-iscsi-5.0.5.476/etc/initd/initd.redhat open-iscsi-5.0.5.476.work/etc/initd/initd.redhat
--- open-iscsi-5.0.5.476/etc/initd/initd.redhat	2006-01-23 13:42:40.000000000 -0600
+++ open-iscsi-5.0.5.476.work/etc/initd/initd.redhat	2006-04-07 23:36:14.000000000 -0500
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# chkconfig: - 39 35
+# chkconfig: - 13 89
 # description: Starts and stops the iSCSI initiator
 #
 # pidfile: /var/run/iscsid.pid
@@ -8,130 +8,136 @@
 
 # Source function library.
 if [ -f /etc/init.d/functions ] ; then
-  . /etc/init.d/functions
+	. /etc/init.d/functions
 elif [ -f /etc/rc.d/init.d/functions ] ; then
-  . /etc/rc.d/init.d/functions
+	. /etc/rc.d/init.d/functions
 else
-  exit 0
+	exit 0
 fi
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin
 
 ISCSID=`which iscsid`
 ISCSIADM=`which iscsiadm`
+prog=`basename $ISCSID`
+lockdir=/var/lock/subsys
 
 if [ -z $ISCSID ] || [ -z $ISCSIADM ]
 then
-    echo "open-iscsi not installed."
-    exit 1
+	echo "open-iscsi not installed."
+	exit 1
 fi
 
 start_iscsid()
 {
-    RETVAL=0
-    modprobe -q iscsi_tcp
-    daemon $ISCSID
-    RETVAL=$?
-    TARGETS=`$ISCSIADM -m node | sed 's@\[\(.*\)\] .*@\1 at g'`
-    for rec in $TARGETS
-    do
-	STARTUP=`$ISCSIADM -m node -r $rec | grep "node.conn\[0\].startup" | cut -d' ' -f3`
-	if [ $STARTUP = "automatic" ]
-	then
-        	$ISCSIADM -m node -r $rec -l
-	fi
-    done
-    return $RETVAL
+	RETVAL=0
+	modprobe -q iscsi_tcp
+	daemon $ISCSID
+	RETVAL=$?
+	TARGETS=`$ISCSIADM -m node | sed 's@\[\(.*\)\] .*@\1 at g'`
+	for rec in $TARGETS
+	do
+		STARTUP=`$ISCSIADM -m node -r $rec | grep "node.startup" | cut -d' ' -f3`
+		if [ $STARTUP = "automatic" ]
+		then
+			$ISCSIADM -m node -r $rec -l
+		fi
+	done
+
+	return $RETVAL
 }
 
 stop_iscsid()
 {
-    RETVAL=0
-    sync
-    TARGETS=`$ISCSIADM | grep "\[*\]" | sed 's@\[\(.*\)\] .*@\1 at g'`
-    for rec in $TARGETS
-    do
-        $ISCSIADM -m node -r $rec -u
-    done
-    pkill -KILL `basename $ISCSID`
-    modprobe -r iscsi_tcp
-    RETVAL=$?
-    return $RETVAL
+	RETVAL=0
+	sync
+	TARGETS=`$ISCSIADM -m session | grep "\[*\]" | sed 's@\[\(.*\)\] .*@\1 at g'`
+	for rec in $TARGETS
+	do
+		$ISCSIADM -m node -r $rec -u
+	done
+	pkill -KILL `basename $ISCSID`
+	modprobe -r iscsi_tcp
+	RETVAL=$?
+	return $RETVAL
 }
 
 start()
 {
-    RETVAL=0
-    echo -n "Starting iSCSI initiator service: "
-    PID=`pidofproc $ISCSID`
-    if [ -z $PID ]
-    then
-        start_iscsid
-    fi
-    if [ $RETVAL == "0" ]
-    then
-        echo_success
-    else
-        echo_failure
-    fi
-    echo
-    return $RETVAL
+	RETVAL=0
+	echo -n "Starting iSCSI initiator service: "
+	PID=`pidofproc $ISCSID`
+	if [ -z $PID ]
+	then
+		start_iscsid
+	fi
+
+	if [ $RETVAL == "0" ]
+	then
+		touch $lockdir/$prog
+		success
+	else
+		failure
+	fi
+	echo
+	return $RETVAL
 }
 
 stop()
 {
-    RETVAL=0
-    echo -n "Stopping iSCSI initiator service: "
-    PID=`pidofproc $ISCSID`
-    if [ $PID ]
-    then
-        stop_iscsid
-    fi
-    if [ $RETVAL == "0" ]
-    then
-        echo_success
-    else
-        echo_failure
-    fi
-    echo
-    return $RETVAL
+	RETVAL=0
+	echo -n "Stopping iSCSI initiator service: "
+	PID=`pidofproc $ISCSID`
+	if [ $PID ]
+	then
+		stop_iscsid
+	fi
+	if [ $RETVAL == "0" ]
+	then
+		rm -f $lockdir/$prog
+		success
+	else
+		failure
+	fi
+	echo
+	return $RETVAL
 }
 
 
 restart()
 {
-    stop
-    start
+	stop
+	start
 }
 
 status()
 {
-    PID=`pidofproc $ISCSID`
-    if [ ! $PID ]
-    then
-        echo "iSCSI initiator is stopped."
-        exit 1
-    else
-        echo "iSCSI initiator is running."
-    fi
+	PID=`pidofproc $ISCSID`
+	if [ ! $PID ]
+	then
+		echo "iSCSI initiator is stopped."
+		exit 1
+	else
+		echo "iSCSI initiator is running."
+	fi
 }
 
 case "$1" in
-  start)
-        start
-        ;;
-  stop)
-        stop
-        ;;
-  restart)
-        restart
-        ;;
-  status)
-        status
-        ;;
-  *)
-        echo $"Usage: $0 {start|stop|restart|status}"
-        exit 1
+	start)
+		start
+		;;
+	stop)
+		stop
+		;;
+	restart)
+		restart
+		;;
+	status)
+		status
+		;;
+	*)
+		echo $"Usage: $0 {start|stop|restart|status}"
+		exit 1
 esac
 
 exit 0
diff -aurp open-iscsi-5.0.5.476/etc/iscsid.conf open-iscsi-5.0.5.476.work/etc/iscsid.conf
--- open-iscsi-5.0.5.476/etc/iscsid.conf	2006-01-23 13:42:40.000000000 -0600
+++ open-iscsi-5.0.5.476.work/etc/iscsid.conf	2006-04-07 23:36:01.000000000 -0500
@@ -16,9 +16,9 @@ node.session.iscsi.MaxBurstLength = 1677
 node.session.iscsi.DefaultTime2Wait = 0
 node.session.iscsi.DefaultTime2Retain = 0
 node.session.iscsi.MaxConnections = 0
-node.cnx[0].iscsi.HeaderDigest = None
-node.cnx[0].iscsi.DataDigest = None
-node.cnx[0].iscsi.MaxRecvDataSegmentLength = 65536
+node.conn[0].iscsi.HeaderDigest = None
+node.conn[0].iscsi.DataDigest = None
+node.conn[0].iscsi.MaxRecvDataSegmentLength = 65536
 #discovery.sendtargets.auth.authmethod = CHAP
 #discovery.sendtargets.auth.username = dima
 #discovery.sendtargets.auth.password = aloha
diff -aurp open-iscsi-5.0.5.476/README open-iscsi-5.0.5.476.work/README
--- open-iscsi-5.0.5.476/README	2006-01-23 13:42:40.000000000 -0600
+++ open-iscsi-5.0.5.476.work/README	2006-04-07 23:37:03.000000000 -0500
@@ -4,7 +4,7 @@
 
 =================================================================
 
-                                                February 28, 2005
+                                                April 7, 2006
 
 Contents
 ========
@@ -58,7 +58,7 @@ Open-iSCSI is partitioned into user and 
 The kernel portion of Open-iSCSI is a from-scratch code
 licensed under GPL. The kernel part implements iSCSI data path
 (that is, iSCSI Read and iSCSI Write), and consists of two
-loadable modules: iscsi_if.ko and iscsi_tcp.ko.
+loadable modules: scsi_transport_iscsi.ko and iscsi_tcp.ko.
 
 User space contains the entire control plane: configuration
 manager, iSCSI Discovery, Login and Logout processing,
@@ -81,8 +81,20 @@ kernel config. You also need to enable "
 you use header or data digests. They are the kernel options,
 CONFIG_CRYPTO and CONFIG_CRYPTO_CRC32C, respectively.
 
-Compilation of the kernel Open-iSCSI modules requires a path
-to kernel sources:
+For kernels 2.6.11-2.6.15 there are compatibility patches that must be
+applied before compiling. Standing in the root of the open-iscsi source
+directory the following command must be done in order to apply the patch
+for your kernel:
+
+patch -p1 < kernel/2.6.11-compat.patch
+patch -p1 < kernel/2.6.12-compat.patch
+patch -p1 < kernel/2.6.13-compat.patch
+patch -p1 < kernel/2.6.14-and-2.6.15-compat.patch
+
+By default the kernel source found at
+/lib/modules/`uname -a`/build
+will be used to compile the open-iscsi modules. To specify a different
+kernel to build against use:
 
 	make KSRC=<kernel-src>
 
@@ -94,6 +106,12 @@ If you choose to install the Debian pack
 please read the file /usr/share/doc/linux-iscsi/README.debian for information
 on how to build kernel modules against your specific kernel.
 
+For Red Hat/Fedora and Debian distributions open-iscsi can be installed by
+typing "make install". This will copy iscsid and iscsiadm to /usr/sbin, the
+init script to /etc/init.d, and the kernel modules: iscsi_tcp.ko
+and scsi_transport_iscsi to /lib/modules/`uname -r`/kernel/drivers/scsi/
+overwriting existing iscsi modules.
+
 4. Open-iSCSI daemon
 ====================
 
@@ -181,40 +199,40 @@ Usage: iscsiadm [OPTION]
   -h, --help              display this help and exit
 
 
-    Usage examples:
+    Usage examples (using the one-letter options):
 
     1) SendTargets iSCSI Discovery:
 
-	    ./iscsiadm -m discovery --type sendtargets --portal 192.168.1.1:3260
+	    ./iscsiadm -m discovery -t sendtargets -p 192.168.1.1:3260
 
     2) iSCSI Login:
 
-	    ./iscsiadm -m node --record 0f23e4 --login
+	    ./iscsiadm -m node -r 0f23e4 -l
 
     3) iSCSI Logout:
 
-	    ./iscsiadm -m node --record 0f23e4 --logout
+	    ./iscsiadm -m node -r 0f23e4 -u
 
     4) Changing iSCSI parameter:
 
-	    ./iscsiadm -m node --record 0f23e4 --op update \
+	    ./iscsiadm -m node -r 0f23e4 -o update \
 		    -n node.cnx[0].iscsi.MaxRecvDataSegmentLength -v 65536
 
     5) Adding custom iSCSI Node:
 
-	    ./iscsiadm -m node --op new --portal 192.168.0.1:3260
+	    ./iscsiadm -m node -o new -p 192.168.0.1:3260
 
     6) Removing iSCSI Node:
 
-	    ./iscsiadm -m node --op delete --record 0a45f8
+	    ./iscsiadm -m node -o delete -r 0a45f8
 
     7) Display iSCSI Node configuration:
 
-	    ./iscsiadm -m node --record 0a45f8
+	    ./iscsiadm -m node -r 0a45f8
 
 	or
 
-	    ./iscsiadm -m node --op show --record 0a45f8
+	    ./iscsiadm -m node -o show -r 0a45f8
 
     8) Show all node records:
 
@@ -226,11 +244,11 @@ Usage: iscsiadm [OPTION]
 
    10) Display discovery record setting:
 
-            ./iscsiadm -m discovery --record 0a45f8
+            ./iscsiadm -m discovery -r 0a45f8
 
    11) Display session statistics:
 
-            ./iscsiadm -m session --record 00:0a45f8 --stats
+            ./iscsiadm -m session -r 00:0a45f8 --stats
 
 6. Configuration
 ================
@@ -242,17 +260,52 @@ exist in which case compiled-in default 
 for newer discovered Target nodes.
 
 See the man page and the example file for the current syntax.
-(no man page yet...)
-
+The manpages for iscsid, iscsiadm are in the doc subdirectory and can be
+installed in the appropriate man page directories and need to be manually
+copied into e.g. /usr/local/share/man8.
 
 7. Getting Started
 ==================
+There are three steps needed to set up a system to use iscsi storage:
+1. automate iscsi startup using the init script.
+2. discover targets.
+3. automate target logins for future system reboots.
+
+1. automate iscsi startup using the init script
+-----------------------------------------------
+
+Red Hat or Fedora:
+-----------------
+To start open-iscsi in Red Hat/Fedora you can do:
+
+	service open-iscsi start
+
+To get open-iscsi to automatically start at run time you may have to
+run:
+	chkconfig --level <levels> open-iscsi on
+Where <levels> are the run levels.
+
+And, to automatically mount a file system during startup
+you must have the partition entry in /etc/fstab marked with the "_netdev"
+option. For example this would mount a iscsi disk sdb:
+
+	/dev/sdb /mnt/iscsi ext3 _netdev 0 0
 
-Right now there is no installation script. Just load the module with
-command:
+SUSE or Debian:
+---------------
+Otherwise, if there is a initd script for your distro in etc/initd that
+gets installed with "make install"
 
-	insmod iscsi_if.ko
-	insmod iscsi_tcp.ko
+	/etc/init.d/open-iscsi start
+
+will usually get you started.
+
+Other:
+------
+If there is no initd script, you must start the tools by hand. First load the
+iscsi modules with:
+
+	modprobe -q iscsi_tcp
 
 after that start iSCSI daemon process:
 
@@ -264,19 +317,49 @@ redirected to the current console:
 	./iscsid -d8 -f &
 
 and use configuration utility to add/remove/update Discovery records,
-iSCSI Node records or monitor active iSCSI sessions:
+iSCSI Node records or monitor active iSCSI sessions (see above or the
+iscsiadm man files).
 
 	./iscsiadm
 
 
 To login:
 
-	    ./iscsiadm -m node --record <node rec> --login
+	./iscsiadm -m node -r <node rec> -l
 
 where <node rec> is the record of a discovered or manually
 added iSCSI Target Node (for iscsiadm usage examples see
 previous sections).
 
+2. discover targets
+-------------------
+Once iscsi is up, you can perform discovery to targets using:
+iscsiadm -m discovery -t sendtargets -p 192.168.1.1:3260
+
+While discovery targets are kept in the discovery.db, they are
+usefull only for re-discovery. The discovered targets (a.k.a. nodes)
+are stored as records in the xxx.db.
+
+The discovered targets are not logged into yet. Rather than logging
+into the discovered nodes (making LUs from those nodes available as
+storage), it is better to automate the login to the nodes we need.
+
+3. automate target logins for future system reboots
+---------------------------------------------------
+Note: this may only work for Red Hat, Fedora and SUSE configurations
+
+To automate login to a node, use the following with the record ID of the
+node discovered in the discovery above:
+	iscsiadm -m node --record <record ID> --op update -n node.startup -v automatic
+
+Or to set the "node.statup" attribute to "startup" as default for
+all sessions add the following to the /etc/iscsid.conf:
+
+	node.startup = automatic
+
+To login to all the automated nodes, simply restart the iscsi service
+e.g /etc/init.d/open-iscsi restart
+
 
 8. TBD
 ======


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/FC-5/iscsi-initiator-utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- iscsi-initiator-utils.spec	11 Feb 2006 03:39:24 -0000	1.8
+++ iscsi-initiator-utils.spec	8 Apr 2006 05:46:07 -0000	1.9
@@ -1,10 +1,10 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 5.0.5.476
-Release: 0.1
+Release: 0.2
 Source0: http://people.redhat.com/mchristi/iscsi/FC5/open-iscsi/rpm/open-iscsi-%{version}.tar.bz2
-Patch0: open-iscsi-5.0.4.446-initscript.patch
-Patch1: open-iscsi-5.0.4.446-add-iscsi-iname.patch
+Patch0: open-iscsi-5.0.4.446-add-iscsi-iname.patch
+Patch1: open-iscsi-5.0.4.446-update-initscripts-and-docs.patch
 Group: System Environment/Daemons
 License: GPL
 URL: http://www.open-iscsi.org
@@ -22,8 +22,8 @@
 %prep
 %setup -q -n %{name}-%{version} -c
 cd open-iscsi-%{version}
-%patch0 -p1 -b .initscript
-%patch1 -p1 -b .add-iscsi-iname
+%patch0 -p1 -b .add-iscsi-iname
+%patch1 -p1 -b .update-initscripts-and-docs.patch
 
 %build
 cd open-iscsi-%{version}
@@ -48,6 +48,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
+if [ ! -f /etc/initiatorname.iscsi ]; then
+	echo "InitiatorName=`/sbin/iscsi-iname`" > /etc/initiatorname.iscsi
+fi
+
 /sbin/chkconfig --add iscsi
 
 %preun
@@ -55,7 +59,6 @@
     /sbin/chkconfig --del iscsi
 fi
 
-
 %files
 %defattr(-,root,root)
 %config /etc/rc.d/init.d/iscsi
@@ -66,6 +69,16 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Apr 7 2006 Mike Christie <mchristi at redhat.com>
+- From Andy Henson <andy at zexia.co.uk>:
+  Autogenerate /etc/initiatorname.iscsi during install if not already present
+- Remove code to autogenerate /etc/initiatorname.iscsi from initscript
+- From dan.y.roche at gmail.com:
+  add touch and rm lock code
+- update README
+- update default iscsid.conf. "cnx" was not supported. The correct
+  id was "conn".
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.0.5.476-0.1
 - bump again for double-long bug on ppc(64)
 


--- open-iscsi-5.0.4.446-initscript.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sat Apr  8 05:55:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 8 Apr 2006 01:55:11 -0400
Subject: rpms/iscsi-initiator-utils/FC-5
	open-iscsi-5.0.4.446-update-initscripts-and-docs.patch, 1.1, 1.2
Message-ID: <200604080555.k385tBp3006850@cvs.devel.redhat.com>

Author: mchristi

Update of /cvs/dist/rpms/iscsi-initiator-utils/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6835

Modified Files:
	open-iscsi-5.0.4.446-update-initscripts-and-docs.patch 
Log Message:
add default of automatic node start

open-iscsi-5.0.4.446-update-initscripts-and-docs.patch:
 README                 |  129 +++++++++++++++++----
 doc/iscsiadm.8         |  298 ++++++++++++++++++++++++++-----------------------
 doc/iscsid.8           |  174 ++++++++++++++--------------
 etc/initd/initd.redhat |  178 +++++++++++++++--------------
 etc/iscsid.conf        |    8 -
 5 files changed, 451 insertions(+), 336 deletions(-)

Index: open-iscsi-5.0.4.446-update-initscripts-and-docs.patch
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/FC-5/open-iscsi-5.0.4.446-update-initscripts-and-docs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- open-iscsi-5.0.4.446-update-initscripts-and-docs.patch	8 Apr 2006 05:46:07 -0000	1.1
+++ open-iscsi-5.0.4.446-update-initscripts-and-docs.patch	8 Apr 2006 05:55:07 -0000	1.2
@@ -1,6 +1,6 @@
-diff -aurp open-iscsi-5.0.5.476/doc/iscsiadm.8 open-iscsi-5.0.5.476.work/doc/iscsiadm.8
+diff -aurp open-iscsi-5.0.5.476/doc/iscsiadm.8 open-iscsi-5.0.5.476.tmp/doc/iscsiadm.8
 --- open-iscsi-5.0.5.476/doc/iscsiadm.8	2006-01-23 13:42:28.000000000 -0600
-+++ open-iscsi-5.0.5.476.work/doc/iscsiadm.8	2006-04-07 23:36:29.000000000 -0500
++++ open-iscsi-5.0.5.476.tmp/doc/iscsiadm.8	2006-04-08 00:52:35.000000000 -0500
 @@ -1,137 +1,161 @@
 -.TH ISCSID 8 "July 2005" "" "Linux Administrator's Manual"
 -.SH NAME
@@ -300,9 +300,9 @@
 +Alex Aizman <itn780 at yahoo.com>
 +.br
 +Dmitry Yusupov <dmitry_yus at yahoo.com>
-diff -aurp open-iscsi-5.0.5.476/doc/iscsid.8 open-iscsi-5.0.5.476.work/doc/iscsid.8
+diff -aurp open-iscsi-5.0.5.476/doc/iscsid.8 open-iscsi-5.0.5.476.tmp/doc/iscsid.8
 --- open-iscsi-5.0.5.476/doc/iscsid.8	2006-01-23 13:42:28.000000000 -0600
-+++ open-iscsi-5.0.5.476.work/doc/iscsid.8	2006-04-07 23:36:29.000000000 -0500
++++ open-iscsi-5.0.5.476.tmp/doc/iscsid.8	2006-04-08 00:52:35.000000000 -0500
 @@ -1,86 +1,88 @@
 -.TH ISCSID 8 "July 2005" "" "Linux Administrator's Manual"
 -.SH NAME
@@ -478,9 +478,9 @@
 +Alex Aizman <itn780 at yahoo.com>
 +.br
 +Dmitry Yusupov <dmitry_yus at yahoo.com>
-diff -aurp open-iscsi-5.0.5.476/etc/initd/initd.redhat open-iscsi-5.0.5.476.work/etc/initd/initd.redhat
+diff -aurp open-iscsi-5.0.5.476/etc/initd/initd.redhat open-iscsi-5.0.5.476.tmp/etc/initd/initd.redhat
 --- open-iscsi-5.0.5.476/etc/initd/initd.redhat	2006-01-23 13:42:40.000000000 -0600
-+++ open-iscsi-5.0.5.476.work/etc/initd/initd.redhat	2006-04-07 23:36:14.000000000 -0500
++++ open-iscsi-5.0.5.476.tmp/etc/initd/initd.redhat	2006-04-08 00:52:35.000000000 -0500
 @@ -1,6 +1,6 @@
  #!/bin/sh
  #
@@ -711,9 +711,18 @@
  esac
  
  exit 0
-diff -aurp open-iscsi-5.0.5.476/etc/iscsid.conf open-iscsi-5.0.5.476.work/etc/iscsid.conf
+diff -aurp open-iscsi-5.0.5.476/etc/iscsid.conf open-iscsi-5.0.5.476.tmp/etc/iscsid.conf
 --- open-iscsi-5.0.5.476/etc/iscsid.conf	2006-01-23 13:42:40.000000000 -0600
-+++ open-iscsi-5.0.5.476.work/etc/iscsid.conf	2006-04-07 23:36:01.000000000 -0500
++++ open-iscsi-5.0.5.476.tmp/etc/iscsid.conf	2006-04-08 00:52:53.000000000 -0500
+@@ -3,7 +3,7 @@
+ # Could be located at /etc/iscsid.conf or ~/.iscsid.conf
+ #
+ node.active_cnx = 1
+-node.startup = manual
++node.startup = automatic
+ #node.session.auth.username = dima
+ #node.session.auth.password = aloha
+ node.session.timeo.replacement_timeout = 0
 @@ -16,9 +16,9 @@ node.session.iscsi.MaxBurstLength = 1677
  node.session.iscsi.DefaultTime2Wait = 0
  node.session.iscsi.DefaultTime2Retain = 0
@@ -727,9 +736,9 @@
  #discovery.sendtargets.auth.authmethod = CHAP
  #discovery.sendtargets.auth.username = dima
  #discovery.sendtargets.auth.password = aloha
-diff -aurp open-iscsi-5.0.5.476/README open-iscsi-5.0.5.476.work/README
+diff -aurp open-iscsi-5.0.5.476/README open-iscsi-5.0.5.476.tmp/README
 --- open-iscsi-5.0.5.476/README	2006-01-23 13:42:40.000000000 -0600
-+++ open-iscsi-5.0.5.476.work/README	2006-04-07 23:37:03.000000000 -0500
++++ open-iscsi-5.0.5.476.tmp/README	2006-04-08 00:52:35.000000000 -0500
 @@ -4,7 +4,7 @@
  
  =================================================================



From fedora-cvs-commits at redhat.com  Sat Apr  8 09:57:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 8 Apr 2006 05:57:56 -0400
Subject: rpms/ghostscript/devel ghostscript.spec,1.106,1.107
Message-ID: <200604080957.k389vuEj021115@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21102

Modified Files:
	ghostscript.spec 
Log Message:
* Sat Apr  8 2006 Tim Waugh <twaugh at redhat.com>
- Build requires libtool (bug #188341).



Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- ghostscript.spec	6 Apr 2006 10:44:39 -0000	1.106
+++ ghostscript.spec	8 Apr 2006 09:57:54 -0000	1.107
@@ -38,6 +38,7 @@
 BuildRequires: libxml2-devel
 BuildRequires: libtiff-devel
 BuildRequires: cups-devel >= 1.1.13
+BuildRequires: libtool
 %{?_with_freetype:BuildRequires: freetype-devel}
 BuildRoot: %{_tmppath}/%{name}-%{gs_ver}-root
 
@@ -272,6 +273,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sat Apr  8 2006 Tim Waugh <twaugh at redhat.com>
+- Build requires libtool (bug #188341).
+
 * Thu Apr  6 2006 Tim Waugh <twaugh at redhat.com> 8.15.1-8
 - Fix pdfwrite (bug #187834).
 - CUPS filters go in /usr/lib/cups/filter even on lib64 platforms.



From fedora-cvs-commits at redhat.com  Sat Apr  8 11:59:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 8 Apr 2006 07:59:40 -0400
Subject: rpms/shadow-utils/devel shadow-4.0.15-login.defs, 1.1,
	1.2 shadow-utils.spec, 1.72, 1.73
Message-ID: <200604081159.k38Bxe2p011819@cvs.devel.redhat.com>

Author: pvrabec

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

Modified Files:
	shadow-4.0.15-login.defs shadow-utils.spec 
Log Message:
fix typo in shadow-4.0.15-login.defs (#188263)



Index: shadow-4.0.15-login.defs
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-4.0.15-login.defs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shadow-4.0.15-login.defs	3 Apr 2006 12:45:14 -0000	1.1
+++ shadow-4.0.15-login.defs	8 Apr 2006 11:59:38 -0000	1.2
@@ -40,7 +40,7 @@
 
 #
 # If useradd should create home directories for users by default
-# On RH systems, we do. This option is ORed with the -m flag on
+# On RH systems, we do. This option is overridden with the -m flag on
 # useradd command line.
 #
 CREATE_HOME	yes


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- shadow-utils.spec	4 Apr 2006 06:38:10 -0000	1.72
+++ shadow-utils.spec	8 Apr 2006 11:59:38 -0000	1.73
@@ -5,7 +5,7 @@
 Summary: Utilities for managing accounts and shadow password files.
 Name: shadow-utils
 Version: 4.0.15
-Release: 2
+Release: 3
 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
+* Sat Apr 08 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.15-3
+- fix typo in shadow-4.0.15-login.defs (#188263)
+
 * Tue Apr 04 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.15-2
 - properly notify nscd to flush its cache(#186803)
 



From fedora-cvs-commits at redhat.com  Sat Apr  8 12:04:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 8 Apr 2006 08:04:03 -0400
Subject: rpms/shadow-utils/FC-5 shadow-970616.login.defs, 1.2,
	1.3 shadow-utils.spec, 1.72, 1.73
Message-ID: <200604081204.k38C43o4011960@cvs.devel.redhat.com>

Author: pvrabec

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

Modified Files:
	shadow-970616.login.defs shadow-utils.spec 
Log Message:
fix typo in shadow-970616.login.defs (#188263)



Index: shadow-970616.login.defs
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/FC-5/shadow-970616.login.defs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- shadow-970616.login.defs	7 Mar 2006 15:24:21 -0000	1.2
+++ shadow-970616.login.defs	8 Apr 2006 12:03:43 -0000	1.3
@@ -40,11 +40,13 @@
 
 #
 # If useradd should create home directories for users by default
-# On RH systems, we do. This option is ORed with the -m flag on
+# On RH systems, we do. This option is overridden  with the -m flag on
 # useradd command line.
 #
 CREATE_HOME	yes
 
 
+# The permission mask is initialized to this value. If not specified,
+# the permission mask will be initialized to 022.
 UMASK           077
 


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/FC-5/shadow-utils.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- shadow-utils.spec	4 Apr 2006 06:42:46 -0000	1.72
+++ shadow-utils.spec	8 Apr 2006 12:03:44 -0000	1.73
@@ -202,6 +202,9 @@
 %{_mandir}/*/man8/faillog.8*
 
 %changelog
+* Sat Apr 08 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.14-7.FC5
+- fix typo in shadow-970616.login.defs (#188263)
+
 * Tue Apr 04 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.14-6.FC5
 - properly notify nscd to flush its cache(#186803)
 



From fedora-cvs-commits at redhat.com  Sat Apr  8 12:05:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 8 Apr 2006 08:05:44 -0400
Subject: rpms/shadow-utils/FC-5 shadow-utils.spec,1.73,1.74
Message-ID: <200604081205.k38C5i1l011988@cvs.devel.redhat.com>

Author: pvrabec

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

Modified Files:
	shadow-utils.spec 
Log Message:
increase release number



Index: shadow-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/FC-5/shadow-utils.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- shadow-utils.spec	8 Apr 2006 12:03:44 -0000	1.73
+++ shadow-utils.spec	8 Apr 2006 12:05:41 -0000	1.74
@@ -5,7 +5,7 @@
 Summary: Utilities for managing accounts and shadow password files.
 Name: shadow-utils
 Version: 4.0.14
-Release: 6.FC5
+Release: 7.FC5
 Epoch: 2
 URL: http://shadow.pld.org.pl/
 Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Apr  8 13:46:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 8 Apr 2006 09:46:02 -0400
Subject: rpms/python-docs/devel .cvsignore, 1.4, 1.5 python-docs.spec, 1.8,
	1.9 sources, 1.4, 1.5
Message-ID: <200604081346.k38Dk2UY026528@cvs.devel.redhat.com>

Author: misa

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

Modified Files:
	.cvsignore python-docs.spec sources 
Log Message:
Upgraded to 2.4.3


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/python-docs/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Nov 2005 13:35:35 -0000	1.4
+++ .cvsignore	8 Apr 2006 13:45:59 -0000	1.5
@@ -1,2 +1 @@
-Python-2.4.1.tar.bz2
-Python-2.4.2.tar.bz2
+Python-2.4.3.tar.bz2


Index: python-docs.spec
===================================================================
RCS file: /cvs/dist/rpms/python-docs/devel/python-docs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-docs.spec	9 Dec 2005 22:42:53 -0000	1.8
+++ python-docs.spec	8 Apr 2006 13:45:59 -0000	1.9
@@ -12,8 +12,8 @@
 
 Summary: Documentation for the Python programming language.
 Name: %{python}-docs
-Version: %{pybasever}.2
-Release: 1.1
+Version: %{pybasever}.3
+Release: 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
+* Sat Apr  8 2006 Mihai Ibanescu <misa at redhat.com> 2.4.3-1
+- updated to 2.4.3
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/python-docs/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Nov 2005 13:35:35 -0000	1.4
+++ sources	8 Apr 2006 13:45:59 -0000	1.5
@@ -1 +1 @@
-98db1465629693fc434d4dc52db93838  Python-2.4.2.tar.bz2
+141c683447d5e76be1d2bd4829574f02  Python-2.4.3.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Apr  8 18:57:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 8 Apr 2006 14:57:29 -0400
Subject: rpms/cups/FC-5 cups.spec,1.153,1.154
Message-ID: <200604081857.k38IvTrC011673@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Log Message:
* Sat Apr  8 2006 Tim Waugh <twaugh at redhat.com>
- Conflict with system-config-printer that adds 'fitplot' option.



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- cups.spec	7 Apr 2006 22:27:49 -0000	1.153
+++ cups.spec	8 Apr 2006 18:57:27 -0000	1.154
@@ -71,6 +71,7 @@
 # Other packages may be expecting different backend path.
 Conflicts: foomatic < 3.0.2-33.3
 Conflicts: hplip < 0.9.9-5.1
+Conflicts: system-config-printer < 0.6.151.3
 
 %package devel
 Summary: Common Unix Printing System - development environment
@@ -375,6 +376,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Sat Apr  8 2006 Tim Waugh <twaugh at redhat.com>
+- Conflict with system-config-printer that adds 'fitplot' option.
+
 * Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com>
 - Build requires libacl-devel.
 



From fedora-cvs-commits at redhat.com  Sat Apr  8 19:01:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 8 Apr 2006 15:01:47 -0400
Subject: rpms/system-config-printer/FC-5 .cvsignore, 1.59,
	1.60 printconf.spec, 1.64, 1.65 sources, 1.61, 1.62
Message-ID: <200604081901.k38J1lfn011760@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore printconf.spec sources 
Log Message:
* Sat Apr  8 2006 Tim Waugh <twaugh at redhat.com> 0.6.151.3-1
- 0.6.151.3:
  - Don't add default lpoptions to new queues (bug #188348).



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/FC-5/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	29 Mar 2006 16:18:43 -0000	1.59
+++ .cvsignore	8 Apr 2006 19:01:15 -0000	1.60
@@ -39,3 +39,4 @@
 printconf-0.6.151.tar.bz2
 printconf-0.6.151.1.tar.bz2
 printconf-0.6.151.2.tar.bz2
+printconf-0.6.151.3.tar.bz2


Index: printconf.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/FC-5/printconf.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- printconf.spec	29 Mar 2006 16:18:43 -0000	1.64
+++ printconf.spec	8 Apr 2006 19:01:15 -0000	1.65
@@ -1,6 +1,6 @@
 Summary: A printer configuration backend/frontend combination.
 Name: system-config-printer
-Version: 0.6.151.2
+Version: 0.6.151.3
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -174,6 +174,10 @@
 
 
 %changelog
+* Sat Apr  8 2006 Tim Waugh <twaugh at redhat.com> 0.6.151.3-1
+- 0.6.151.3:
+  - Don't add default lpoptions to new queues (bug #188348).
+
 * Wed Mar 29 2006 Tim Waugh <twaugh at redhat.com> 0.6.151.2-1
 - 0.6.151.2:
   - Prevent traceback seen in bug #163125.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/FC-5/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	29 Mar 2006 16:18:43 -0000	1.61
+++ sources	8 Apr 2006 19:01:32 -0000	1.62
@@ -1 +1 @@
-15ed8ebaa55a4458075e1d933ae84bd3  printconf-0.6.151.2.tar.bz2
+0711e2353e6f59ddcbd38b076b1773a4  printconf-0.6.151.3.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Apr  9 00:57:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 8 Apr 2006 20:57:01 -0400
Subject: rpms/gaim/devel gaim.spec,1.114,1.115
Message-ID: <200604090057.k390v1Rp016284@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16272

Modified Files:
	gaim.spec 
Log Message:
MSN block crash (#185222 Stu Tomlinson)



Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- gaim.spec	11 Feb 2006 02:47:22 -0000	1.114
+++ gaim.spec	9 Apr 2006 00:56:58 -0000	1.115
@@ -1,3 +1,5 @@
+ExclusiveArch: i386
+
 # OPTION: perl integration (FC1+)
 %define perl_integration	1
 # OPTION: krb5 for Zephyr protocol (FC1+)
@@ -13,7 +15,7 @@
 
 Name:		gaim
 Version:	1.5.0
-Release:        15.fc5.1
+Release:        16.fc6
 Epoch:		1
 License:	GPL
 Group:		Applications/Internet
@@ -69,6 +71,7 @@
 Patch180: gaim-1.5.0-aim-rate-limiting.patch
 Patch181: gaim-1.5.0-nss-detect.patch
 Patch182: gaim-1.5.0-logging-compatibility.patch
+Patch183: gaim-1.5.0-msn-block-crash.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -161,6 +164,7 @@
 %patch180 -p2
 %patch181 -p1
 %patch182 -p0
+%patch183 -p2
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}/%{version}-%{release}/g" configure
@@ -275,6 +279,9 @@
 %endif
 
 %changelog
+* Sat Apr 08 2006 Warren Togami <wtogami at redhat.com> - 1:1.5.0-16
+- MSN block crash (#185222 Stu Tomlinson)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.5.0-15.fc5.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Sun Apr  9 00:57:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 8 Apr 2006 20:57:20 -0400
Subject: rpms/gaim/devel gaim-1.5.0-msn-block-crash.patch,NONE,1.1
Message-ID: <200604090057.k390vKZC016340@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16325

Added Files:
	gaim-1.5.0-msn-block-crash.patch 
Log Message:
add patch


gaim-1.5.0-msn-block-crash.patch:
 privacy.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE gaim-1.5.0-msn-block-crash.patch ---
===================================================================
RCS file: /cvsroot/gaim/gaim/src/privacy.c,v
retrieving revision 1.16
retrieving revision 1.18
diff -u -r1.16 -r1.18
--- gaim/gaim/src/privacy.c	2005/07/17 23:36:33	1.16
+++ gaim/gaim/src/privacy.c	2006/02/07 02:49:56	1.18
@@ -85,8 +85,8 @@
 	if (l == NULL)
 		return FALSE;
 
-	account->permit = g_slist_remove(account->permit, l->data);
 	g_free(l->data);
+	account->permit = g_slist_delete_link(account->permit, l);
 
 	if (!local_only && gaim_account_is_connected(account))
 		serv_rem_permit(gaim_account_get_connection(account), who);
@@ -156,15 +156,16 @@
 	if (l == NULL)
 		return FALSE;
 
-	account->deny = g_slist_remove(account->deny, l->data);
-	g_free(l->data);
+	name = l->data;
+	account->deny = g_slist_delete_link(account->deny, l);
 
 	if (!local_only && gaim_account_is_connected(account))
-		serv_rem_deny(gaim_account_get_connection(account), who);
+		serv_rem_deny(gaim_account_get_connection(account), name);
 
 	if (privacy_ops != NULL && privacy_ops->deny_removed != NULL)
-		privacy_ops->deny_removed(account, who);
+		privacy_ops->deny_removed(account, name);
 
+	g_free(name);
 	gaim_blist_schedule_save();
 
 	return TRUE;



From fedora-cvs-commits at redhat.com  Sun Apr  9 00:58:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 8 Apr 2006 20:58:44 -0400
Subject: rpms/gaim/FC-5 gaim-1.5.0-msn-block-crash.patch, NONE, 1.1 gaim.spec,
	1.114, 1.115
Message-ID: <200604090058.k390wiGp016412@cvs.devel.redhat.com>

Author: wtogami

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

Modified Files:
	gaim.spec 
Added Files:
	gaim-1.5.0-msn-block-crash.patch 
Log Message:
MSN block crash (#185222 Stu Tomlinson)


gaim-1.5.0-msn-block-crash.patch:
 privacy.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE gaim-1.5.0-msn-block-crash.patch ---
===================================================================
RCS file: /cvsroot/gaim/gaim/src/privacy.c,v
retrieving revision 1.16
retrieving revision 1.18
diff -u -r1.16 -r1.18
--- gaim/gaim/src/privacy.c	2005/07/17 23:36:33	1.16
+++ gaim/gaim/src/privacy.c	2006/02/07 02:49:56	1.18
@@ -85,8 +85,8 @@
 	if (l == NULL)
 		return FALSE;
 
-	account->permit = g_slist_remove(account->permit, l->data);
 	g_free(l->data);
+	account->permit = g_slist_delete_link(account->permit, l);
 
 	if (!local_only && gaim_account_is_connected(account))
 		serv_rem_permit(gaim_account_get_connection(account), who);
@@ -156,15 +156,16 @@
 	if (l == NULL)
 		return FALSE;
 
-	account->deny = g_slist_remove(account->deny, l->data);
-	g_free(l->data);
+	name = l->data;
+	account->deny = g_slist_delete_link(account->deny, l);
 
 	if (!local_only && gaim_account_is_connected(account))
-		serv_rem_deny(gaim_account_get_connection(account), who);
+		serv_rem_deny(gaim_account_get_connection(account), name);
 
 	if (privacy_ops != NULL && privacy_ops->deny_removed != NULL)
-		privacy_ops->deny_removed(account, who);
+		privacy_ops->deny_removed(account, name);
 
+	g_free(name);
 	gaim_blist_schedule_save();
 
 	return TRUE;


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/FC-5/gaim.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- gaim.spec	11 Feb 2006 02:47:22 -0000	1.114
+++ gaim.spec	9 Apr 2006 00:58:42 -0000	1.115
@@ -1,3 +1,5 @@
+ExclusiveArch: i386
+
 # OPTION: perl integration (FC1+)
 %define perl_integration	1
 # OPTION: krb5 for Zephyr protocol (FC1+)
@@ -13,7 +15,7 @@
 
 Name:		gaim
 Version:	1.5.0
-Release:        15.fc5.1
+Release:        16.fc5
 Epoch:		1
 License:	GPL
 Group:		Applications/Internet
@@ -69,6 +71,7 @@
 Patch180: gaim-1.5.0-aim-rate-limiting.patch
 Patch181: gaim-1.5.0-nss-detect.patch
 Patch182: gaim-1.5.0-logging-compatibility.patch
+Patch183: gaim-1.5.0-msn-block-crash.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -161,6 +164,7 @@
 %patch180 -p2
 %patch181 -p1
 %patch182 -p0
+%patch183 -p2
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}/%{version}-%{release}/g" configure
@@ -275,6 +279,9 @@
 %endif
 
 %changelog
+* Sat Apr 08 2006 Warren Togami <wtogami at redhat.com> - 1:1.5.0-16
+- MSN block crash (#185222 Stu Tomlinson)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.5.0-15.fc5.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Sun Apr  9 00:59:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 8 Apr 2006 20:59:24 -0400
Subject: rpms/gaim/FC-5 gaim.spec,1.115,1.116
Message-ID: <200604090059.k390xOu8016479@cvs.devel.redhat.com>

Author: wtogami

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

Modified Files:
	gaim.spec 
Log Message:
remove exclusivearch



Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/FC-5/gaim.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- gaim.spec	9 Apr 2006 00:58:42 -0000	1.115
+++ gaim.spec	9 Apr 2006 00:59:21 -0000	1.116
@@ -1,5 +1,3 @@
-ExclusiveArch: i386
-
 # OPTION: perl integration (FC1+)
 %define perl_integration	1
 # OPTION: krb5 for Zephyr protocol (FC1+)



From fedora-cvs-commits at redhat.com  Sun Apr  9 01:00:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 8 Apr 2006 21:00:49 -0400
Subject: rpms/gaim/devel gaim.spec,1.115,1.116
Message-ID: <200604090100.k3910ngj016549@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16524

Modified Files:
	gaim.spec 
Log Message:
remove exclusive arch



Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- gaim.spec	9 Apr 2006 00:56:58 -0000	1.115
+++ gaim.spec	9 Apr 2006 01:00:46 -0000	1.116
@@ -1,5 +1,3 @@
-ExclusiveArch: i386
-
 # OPTION: perl integration (FC1+)
 %define perl_integration	1
 # OPTION: krb5 for Zephyr protocol (FC1+)



From fedora-cvs-commits at redhat.com  Sun Apr  9 01:26:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 8 Apr 2006 21:26:52 -0400
Subject: rpms/gaim/FC-4 gaim.spec,1.92,1.93
Message-ID: <200604090126.k391QqaF030525@cvs.devel.redhat.com>

Author: wtogami

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

Modified Files:
	gaim.spec 
Log Message:
MSN block crash (#185222 Stu Tomlinson)



Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/FC-4/gaim.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- gaim.spec	11 Nov 2005 15:46:44 -0000	1.92
+++ gaim.spec	9 Apr 2006 01:26:50 -0000	1.93
@@ -13,7 +13,7 @@
 
 Name:		gaim
 Version:	1.5.0
-Release:	9.fc4
+Release:        16.fc4
 Epoch:		1
 License:	GPL
 Group:		Applications/Internet
@@ -67,6 +67,9 @@
 Patch178: gaim-1.5.0-hacking-doc.patch
 Patch179: gaim-1.5.0-doc-creation.patch
 Patch180: gaim-1.5.0-aim-rate-limiting.patch
+Patch181: gaim-1.5.0-nss-detect.patch
+Patch182: gaim-1.5.0-logging-compatibility.patch
+Patch183: gaim-1.5.0-msn-block-crash.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -83,6 +86,7 @@
 
 BuildRequires:	mozilla-nss-devel
 BuildRequires:	gtk2-devel
+BuildRequires:  desktop-file-utils
 
 # krb5 needed for Zephyr (FC1+)
 %if %{krb_integration}
@@ -156,6 +160,9 @@
 %patch178 -p0
 %patch179 -p0
 %patch180 -p2
+%patch181 -p1
+%patch182 -p0
+%patch183 -p2
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}/%{version}-%{release}/g" configure
@@ -196,6 +203,10 @@
 # disable tcl and tk because nobody uses it
 # gnutls is buggy so use mozilla-nss on all distributions
 %configure --disable-tcl --disable-tk --enable-gnutls=no --enable-nss=yes $WITH_KRB $WITH_SILC $WITH_PERL
+
+# Abort build if NSS was not detected
+grep -q "#define HAVE_NSS 1" config.h || exit 1
+
 # patch Makefile for PIE
 patch -p1 < %{PATCH5}
 make %{?_smp_mflags}
@@ -266,6 +277,31 @@
 %endif
 
 %changelog
+* Sat Apr 08 2006 Warren Togami <wtogami at redhat.com> - 1:1.5.0-16
+- MSN block crash (#185222 Stu Tomlinson)
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.5.0-15.fc5.1
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Warren Togami <wtogami at redhat.com> 1:1.5.0-15
+- allow compat with gaim-2.x log format (rlaager)
+
+* Sat Jan 28 2006 David Malcolm <dmalcolm at redhat.com> 1:1.5.0-14
+- rebuild for new e-d-s
+
+* Fri Jan 13 2006 Warren Togami <wtogami at redhat.com> 1:1.5.0-13
+- buildreq desktop-file-utils (ivazquez #176688)
+- detect NSS in a generic way and abort on failure
+
+* Wed Dec 21 2005 Warren Togami <wtogami at redhat.com>
+- rebuild for nss-devel (#176314 nosnilmot)
+
+* Tue Dec 20 2005 Ray Strode <rstrode at redhat.com>
+- rebuilt
+
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+- rebuilt
+
 * Thu Nov 10 2005 Warren Togami <wtogami at redhat.com> - 1:1.5.0-9
 - Ensure that security opt flags are used (#165795)
 - Many bug fixes from Peter Lawler (#171350)



From fedora-cvs-commits at redhat.com  Sun Apr  9 02:49:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 8 Apr 2006 22:49:40 -0400
Subject: rpms/gaim/FC-4 gaim-1.5.0-msn-block-crash.patch,NONE,1.1
Message-ID: <200604090249.k392nea8007346@cvs.devel.redhat.com>

Author: wtogami

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

Added Files:
	gaim-1.5.0-msn-block-crash.patch 
Log Message:
add patch


gaim-1.5.0-msn-block-crash.patch:
 privacy.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE gaim-1.5.0-msn-block-crash.patch ---
===================================================================
RCS file: /cvsroot/gaim/gaim/src/privacy.c,v
retrieving revision 1.16
retrieving revision 1.18
diff -u -r1.16 -r1.18
--- gaim/gaim/src/privacy.c	2005/07/17 23:36:33	1.16
+++ gaim/gaim/src/privacy.c	2006/02/07 02:49:56	1.18
@@ -85,8 +85,8 @@
 	if (l == NULL)
 		return FALSE;
 
-	account->permit = g_slist_remove(account->permit, l->data);
 	g_free(l->data);
+	account->permit = g_slist_delete_link(account->permit, l);
 
 	if (!local_only && gaim_account_is_connected(account))
 		serv_rem_permit(gaim_account_get_connection(account), who);
@@ -156,15 +156,16 @@
 	if (l == NULL)
 		return FALSE;
 
-	account->deny = g_slist_remove(account->deny, l->data);
-	g_free(l->data);
+	name = l->data;
+	account->deny = g_slist_delete_link(account->deny, l);
 
 	if (!local_only && gaim_account_is_connected(account))
-		serv_rem_deny(gaim_account_get_connection(account), who);
+		serv_rem_deny(gaim_account_get_connection(account), name);
 
 	if (privacy_ops != NULL && privacy_ops->deny_removed != NULL)
-		privacy_ops->deny_removed(account, who);
+		privacy_ops->deny_removed(account, name);
 
+	g_free(name);
 	gaim_blist_schedule_save();
 
 	return TRUE;



From fedora-cvs-commits at redhat.com  Sun Apr  9 16:26:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 12:26:09 -0400
Subject: rpms/xorg-x11-server/FC-5 xorg-server-1.0.1-keymap-overflow.patch,
	NONE, 1.1 xorg-x11-server.spec, 1.46, 1.47
Message-ID: <200604091626.k39GQ9jI029310@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/xorg-x11-server/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv29287

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-server-1.0.1-keymap-overflow.patch 
Log Message:
- Fix small overflow that causes crash on vt switch on ppc.
  Patch by David Woodhouse (bug 187083).


xorg-server-1.0.1-keymap-overflow.patch:
 lnx_KbdMap.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xorg-server-1.0.1-keymap-overflow.patch ---
--- xorg-server-1.0.1/hw/xfree86/os-support/linux/lnx_KbdMap.c	2005-07-03 11:51:16.000000000 +0100
+++ xorg-server-1.0.1/hw/xfree86/os-support/linux/lnx_KbdMap.c	2006-04-02 17:37:10.000000000 +0100
@@ -180,7 +180,7 @@ static KeySym linux_to_x[256] = {
 /*
  * Maps the AT keycodes to Linux keycodes
  */
-static unsigned char at2lnx[NUM_KEYCODES] =
+static unsigned char at2lnx[] =
 {
 	0x01,	/* KEY_Escape */	0x02,	/* KEY_1 */
 	0x03,	/* KEY_2 */		0x04,	/* KEY_3 */


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/FC-5/xorg-x11-server.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- xorg-x11-server.spec	1 Apr 2006 18:36:49 -0000	1.46
+++ xorg-x11-server.spec	9 Apr 2006 16:26:07 -0000	1.47
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.0.1
-Release:   9
+Release:   9.fc5
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -27,6 +27,8 @@
 Patch7:    xorg-x11-server-1.0.1-fpic-libxf86config.patch
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=185084
 Patch8:    xorg-server-1.0.1-CVE-2006-0745.patch
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=187083
+Patch9:    xorg-server-1.0.1-keymap-overflow.patch
 
 # Patches taken from xserver/xorg CVS HEAD, post-1.0.1
 Patch100:  xorg-x11-server-1.0.1-fbpict-fix-rounding.patch
@@ -246,6 +248,7 @@
 %patch6 -p1 -b .randrsdk
 %patch7 -p1 -b .xf86configfpic
 %patch8 -p1 -b .CVE-2006-0745
+%patch9 -p1 -b .keymap-overflow
 
 %patch100 -p2 -b .fbpict-fix-rounding
 %patch101 -p2 -b .SEGV-on-null-interface
@@ -525,6 +528,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Sun Apr  9 2006 Ray Strode <rstrode at redhat.com> - 1.0.1-9.fc5
+- Fix small overflow that causes crash on vt switch on ppc.
+  Patch by David Woodhouse (bug 187083).
+
 * Wed Mar 15 2006 Ray Strode <rstrode at redhat.com> - 1.0.1-9
 - CVE-2006-0745 (bug 185084)
 



From fedora-cvs-commits at redhat.com  Sun Apr  9 16:53:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 12:53:51 -0400
Subject: rpms/gaim/FC-4 gaim-1.5.0-logging-compatibility.patch, NONE,
	1.1 gaim-1.5.0-nss-detect.patch, NONE, 1.1 gaim-desktop.patch,
	1.14, NONE
Message-ID: <200604091653.k39GrpvS010973@cvs.devel.redhat.com>

Author: wtogami

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

Added Files:
	gaim-1.5.0-logging-compatibility.patch 
	gaim-1.5.0-nss-detect.patch 
Removed Files:
	gaim-desktop.patch 
Log Message:
add patches


gaim-1.5.0-logging-compatibility.patch:
 log.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gaim-1.5.0-logging-compatibility.patch ---
Index: src/log.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/log.c,v
retrieving revision 1.103.2.8
diff -u -d -p -r1.103.2.8 log.c
--- src/log.c	16 Aug 2005 17:53:37 -0000	1.103.2.8
+++ src/log.c	6 Feb 2006 21:26:02 -0000
@@ -424,7 +424,7 @@ static GList *log_lister_common(GaimLogT
 
 	while ((filename = g_dir_read_name(dir))) {
 		if (gaim_str_has_suffix(filename, ext) &&
-				strlen(filename) == 17 + strlen(ext)) {
+				strlen(filename) >= 17 + strlen(ext)) {
 			GaimLog *log;
 			struct generic_logger_data *data;
 			time_t stamp = gaim_str_to_time(filename, FALSE);

gaim-1.5.0-nss-detect.patch:
 configure |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE gaim-1.5.0-nss-detect.patch ---
--- gaim-1.5.0/configure.nss	2005-12-21 05:44:07.000000000 -0500
+++ gaim-1.5.0/configure	2005-12-21 05:44:31.000000000 -0500
@@ -34009,23 +34009,23 @@
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for mozilla-nss" >&5
-echo $ECHO_N "checking for mozilla-nss... $ECHO_C" >&6
+        echo "$as_me:$LINENO: checking for nss" >&5
+echo $ECHO_N "checking for nss... $ECHO_C" >&6
 
-        if $PKG_CONFIG --exists "mozilla-nss" ; then
+        if $PKG_CONFIG --exists "nss" ; then
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
             succeeded=yes
 
             echo "$as_me:$LINENO: checking NSS_CFLAGS" >&5
 echo $ECHO_N "checking NSS_CFLAGS... $ECHO_C" >&6
-            NSS_CFLAGS=`$PKG_CONFIG --cflags "mozilla-nss"`
+            NSS_CFLAGS=`$PKG_CONFIG --cflags "nss"`
             echo "$as_me:$LINENO: result: $NSS_CFLAGS" >&5
 echo "${ECHO_T}$NSS_CFLAGS" >&6
 
             echo "$as_me:$LINENO: checking NSS_LIBS" >&5
 echo $ECHO_N "checking NSS_LIBS... $ECHO_C" >&6
-            NSS_LIBS=`$PKG_CONFIG --libs "mozilla-nss"`
+            NSS_LIBS=`$PKG_CONFIG --libs "nss"`
             echo "$as_me:$LINENO: result: $NSS_LIBS" >&5
 echo "${ECHO_T}$NSS_LIBS" >&6
         else
@@ -34033,7 +34033,7 @@
             NSS_LIBS=""
             ## If we have a custom action on failure, don't print errors, but
             ## do set a variable so people can do so.
-            NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-nss"`
+            NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nss"`
 
         fi
 
@@ -34054,7 +34054,7 @@
 
 		if test "x$have_nss" = "xyes"; then
 			mozilla_nspr="mozilla-nspr"
-			mozilla_nss="mozilla-nss"
+			mozilla_nss="nss"
 
 
 cat >>confdefs.h <<\_ACEOF


--- gaim-desktop.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sun Apr  9 17:52:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 13:52:30 -0400
Subject: rpms/gnome-power-manager/FC-5 .cvsignore, 1.15,
	1.16 gnome-power-manager.spec, 1.35, 1.36 sources, 1.15, 1.16
Message-ID: <200604091752.k39HqU8W006590@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-power-manager/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6575

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
- Update to 2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/FC-5/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	14 Mar 2006 19:51:52 -0000	1.15
+++ .cvsignore	9 Apr 2006 17:52:28 -0000	1.16
@@ -1 +1 @@
-gnome-power-manager-2.14.0.tar.bz2
+gnome-power-manager-2.14.1.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/FC-5/gnome-power-manager.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gnome-power-manager.spec	14 Mar 2006 19:51:52 -0000	1.35
+++ gnome-power-manager.spec	9 Apr 2006 17:52:28 -0000	1.36
@@ -4,7 +4,7 @@
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.14.0
+Version: 2.14.1
 Release: 1
 License: GPL
 Group: Applications/System
@@ -90,6 +90,9 @@
 %{_datadir}/icons/hicolor/24x24/apps/*
 
 %changelog
+* Sun Apr  9 2006 Ray Strode <rstrode at redhat.com> - 2.14.1-1
+- Update to 2.14.1
+
 * Tue Mar 14 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/FC-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	14 Mar 2006 19:51:52 -0000	1.15
+++ sources	9 Apr 2006 17:52:28 -0000	1.16
@@ -1 +1 @@
-d98f7e2a920e3d94dd8b65b476cd88ce  gnome-power-manager-2.14.0.tar.bz2
+c1e392128c8f619390d28d719a0b9109  gnome-power-manager-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Apr  9 18:05:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 14:05:23 -0400
Subject: rpms/gaim/FC-4 gaim.spec,1.93,1.94
Message-ID: <200604091805.k39I5NR2006779@cvs.devel.redhat.com>

Author: wtogami

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

Modified Files:
	gaim.spec 
Log Message:
disable NSS detect patch because it is FC5+
disable irrelevant archs for FC4 update



Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/FC-4/gaim.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- gaim.spec	9 Apr 2006 01:26:50 -0000	1.93
+++ gaim.spec	9 Apr 2006 18:05:01 -0000	1.94
@@ -1,3 +1,5 @@
+ExcludeArch: ppc64, s390, s390x, ia64
+
 # OPTION: perl integration (FC1+)
 %define perl_integration	1
 # OPTION: krb5 for Zephyr protocol (FC1+)
@@ -160,7 +162,7 @@
 %patch178 -p0
 %patch179 -p0
 %patch180 -p2
-%patch181 -p1
+#%patch181 -p1 only for FC5+
 %patch182 -p0
 %patch183 -p2
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 01:59:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 21:59:01 -0400
Subject: rpms/gaim/FC-4 gaim.spec,1.94,1.95
Message-ID: <200604100159.k3A1x1Bb002925@cvs.devel.redhat.com>

Author: wtogami

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

Modified Files:
	gaim.spec 
Log Message:
fix excludearchs



Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/FC-4/gaim.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- gaim.spec	9 Apr 2006 18:05:01 -0000	1.94
+++ gaim.spec	10 Apr 2006 01:58:59 -0000	1.95
@@ -1,4 +1,4 @@
-ExcludeArch: ppc64, s390, s390x, ia64
+ExcludeArch: ppc64 s390 s390x ia64
 
 # OPTION: perl integration (FC1+)
 %define perl_integration	1



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:10:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:10:35 -0400
Subject: rpms/xorg-x11-server/devel .cvsignore, 1.11, 1.12 sources, 1.9,
	1.10 xorg-x11-server.spec, 1.51,
	1.52 xorg-x11-server-1.0.1-SEGV-on-null-interface.patch, 1.1,
	NONE xorg-x11-server-1.0.1-fbpict-fix-rounding.patch, 1.1,
	NONE xorg-x11-server-1.0.99.2-no-kdrive-dri.patch, 1.1, NONE
Message-ID: <200604100310.k3A3AZnO031368@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	.cvsignore sources xorg-x11-server.spec 
Removed Files:
	xorg-x11-server-1.0.1-SEGV-on-null-interface.patch 
	xorg-x11-server-1.0.1-fbpict-fix-rounding.patch 
	xorg-x11-server-1.0.99.2-no-kdrive-dri.patch 
Log Message:
auto-import xorg-x11-server-1.0.99.901-1 on branch devel from xorg-x11-server-1.0.99.901-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	4 Apr 2006 22:07:57 -0000	1.11
+++ .cvsignore	10 Apr 2006 03:10:33 -0000	1.12
@@ -1 +1 @@
-xorg-server-1.0.99.2.tar.bz2
+xorg-server-1.0.99.901.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Apr 2006 22:07:57 -0000	1.9
+++ sources	10 Apr 2006 03:10:33 -0000	1.10
@@ -1 +1 @@
-e19e7e7e923c6a549c0d114c3f5c498c  xorg-server-1.0.99.2.tar.bz2
+9100da4b892b8f8bf741db7ac371476e  xorg-server-1.0.99.901.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- xorg-x11-server.spec	6 Apr 2006 21:17:53 -0000	1.51
+++ xorg-x11-server.spec	10 Apr 2006 03:10:33 -0000	1.52
@@ -3,8 +3,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.0.99.2
-Release:   2
+Version:   1.0.99.901
+Release:   1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -23,7 +23,7 @@
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=181292.  hacky patch
 Patch7:    xorg-x11-server-1.0.1-fpic-libxf86config.patch
 # REMOVE ME FOR 1.0.99.3
-Patch8:	   xorg-x11-server-1.0.99.2-no-kdrive-dri.patch
+#Patch8:	   xorg-x11-server-1.0.99.2-no-kdrive-dri.patch
 
 # Spiffiffity feature/optimization patches.
 Patch100:  xorg-server-1.0.99.2-spiffiffity.patch
@@ -258,7 +258,7 @@
 %patch4 -p0 -b .composite-fastpath-fdo4320
 %patch6 -p1 -b .randrsdk
 %patch7 -p1 -b .xf86configfpic
-%patch8 -p0 -b .no-kdrive-dri
+#%patch8 -p0 -b .no-kdrive-dri
 
 %patch100 -p0 -b .spiffiffity
 
@@ -565,6 +565,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Sat Apr  8 2006 Adam Jackson <ajackson at redhat.com> 1.0.99.901-1
+- Update to 7.1 RC1.
+
 * Thu Apr  6 2006 Adam Jackson <ajax at redhat.com> 1.0.99.2-2
 - Remove LBX to match upstream policy.
 - Add Xephyr server.


--- xorg-x11-server-1.0.1-SEGV-on-null-interface.patch DELETED ---


--- xorg-x11-server-1.0.1-fbpict-fix-rounding.patch DELETED ---


--- xorg-x11-server-1.0.99.2-no-kdrive-dri.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:11:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:11:55 -0400
Subject: rpms/xorg-x11-drv-acecad/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-acecad.spec, 1.8, 1.9
Message-ID: <200604100311.k3A3BtD1031463@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-acecad/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Feb 2006 09:37:25 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:11:53 -0000	1.7
@@ -1 +1 @@
-xf86-input-acecad-1.0.0.5.tar.bz2
+xf86-input-acecad-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-acecad/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Feb 2006 09:37:25 -0000	1.6
+++ sources	10 Apr 2006 03:11:53 -0000	1.7
@@ -1 +1 @@
-5e4aede1013d13f6f79dfc44b350a022  xf86-input-acecad-1.0.0.5.tar.bz2
+ce0b7bec500273ad935cbfa212b8ac8a  xf86-input-acecad-1.1.0.tar.bz2


Index: xorg-x11-drv-acecad.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-acecad/devel/xorg-x11-drv-acecad.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-acecad.spec	11 Feb 2006 06:14:25 -0000	1.8
+++ xorg-x11-drv-acecad.spec	10 Apr 2006 03:11:53 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 acecad input driver
 Name:      xorg-x11-drv-acecad
-Version: 1.0.0.5
-Release: 1.2
+Version: 1.1.0
+Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/releases/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 %description 
 X.Org X11 acecad input driver.
 
@@ -50,6 +50,9 @@
 %{_mandir}/man4/acecad.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Bump to 1.1.0 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:12:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:12:08 -0400
Subject: rpms/xorg-x11-drv-aiptek/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-aiptek.spec, 1.8, 1.9
Message-ID: <200604100312.k3A3C8tc031545@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-aiptek/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Feb 2006 09:38:06 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:12:06 -0000	1.7
@@ -1 +1 @@
-xf86-input-aiptek-1.0.0.5.tar.bz2
+xf86-input-aiptek-1.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-aiptek/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Feb 2006 09:38:06 -0000	1.6
+++ sources	10 Apr 2006 03:12:06 -0000	1.7
@@ -1 +1 @@
-96c171eb8531cc51c22c8f8568a96db5  xf86-input-aiptek-1.0.0.5.tar.bz2
+951b2b1a270f67d28e2e89fd2b9f15ae  xf86-input-aiptek-1.0.1.tar.bz2


Index: xorg-x11-drv-aiptek.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-aiptek/devel/xorg-x11-drv-aiptek.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-aiptek.spec	11 Feb 2006 06:14:51 -0000	1.8
+++ xorg-x11-drv-aiptek.spec	10 Apr 2006 03:12:06 -0000	1.9
@@ -6,20 +6,20 @@
 
 Summary:   Xorg X11 aiptek input driver
 Name:      xorg-x11-drv-aiptek
-Version: 1.0.0.5
-Release: 1.2
+Version: 1.0.1
+Release: 1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 aiptek input driver.
@@ -52,6 +52,9 @@
 %{_mandir}/man4/aiptek.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
+- Bump to 1.0.1 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:12:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:12:24 -0400
Subject: rpms/xorg-x11-drv-apm/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-apm.spec, 1.9, 1.10
Message-ID: <200604100312.k3A3CODu031625@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-apm/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:28:23 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:12:22 -0000	1.7
@@ -1 +1 @@
-xf86-video-apm-1.0.1.5.tar.bz2
+xf86-video-apm-1.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-apm/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:28:23 -0000	1.6
+++ sources	10 Apr 2006 03:12:22 -0000	1.7
@@ -1 +1 @@
-98ad4f6eeb934255bb9ff06ba459484d  xf86-video-apm-1.0.1.5.tar.bz2
+ac7e05f0dfc7e02cac0bf17b9eb89b11  xf86-video-apm-1.1.1.tar.bz2


Index: xorg-x11-drv-apm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-apm/devel/xorg-x11-drv-apm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-apm.spec	7 Feb 2006 14:22:01 -0000	1.9
+++ xorg-x11-drv-apm.spec	10 Apr 2006 03:12:22 -0000	1.10
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 apm video driver
 Name:      xorg-x11-drv-apm
-Version: 1.0.1.5
-Release: 1.1
+Version: 1.1.1
+Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   apm.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -18,9 +18,9 @@
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 apm video driver.
@@ -57,6 +57,9 @@
 %{_mandir}/man4/apm.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-1
+- Update to 1.1.1 from 7.1RC1.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:12:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:12:46 -0400
Subject: rpms/xorg-x11-drv-ark/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-ark.spec, 1.8, 1.9
Message-ID: <200604100312.k3A3Ckma031702@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ark/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:28:37 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:12:44 -0000	1.7
@@ -1 +1 @@
-xf86-video-ark-0.5.0.5.tar.bz2
+xf86-video-ark-0.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ark/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:28:37 -0000	1.6
+++ sources	10 Apr 2006 03:12:44 -0000	1.7
@@ -1 +1 @@
-474d41eea807a863c0cde045313af27f  xf86-video-ark-0.5.0.5.tar.bz2
+6921479baca8f7b156029489fd335854  xf86-video-ark-0.6.0.tar.bz2


Index: xorg-x11-drv-ark.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ark/devel/xorg-x11-drv-ark.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-ark.spec	7 Feb 2006 14:22:20 -0000	1.8
+++ xorg-x11-drv-ark.spec	10 Apr 2006 03:12:44 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 ark video driver
 Name:      xorg-x11-drv-ark
-Version:   0.5.0.5
-Release:   1.1
+Version:   0.6.0
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   ark.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -18,9 +18,9 @@
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 ark video driver.
@@ -56,6 +56,9 @@
 #%{_mandir}/man4/*.4x*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 0.6.0-1
+- Update to 0.6.0 from 7.1RC1.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.0.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:13:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:13:01 -0400
Subject: rpms/xorg-x11-drv-ati/devel .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 xorg-x11-drv-ati.spec, 1.16,
	1.17 xorg-x11-drv-ati-6.5.7.3-radeon-metamodes-SEGV-fix.patch,
	1.1, NONE
Message-ID: <200604100313.k3A3D1dW031785@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	.cvsignore sources xorg-x11-drv-ati.spec 
Removed Files:
	xorg-x11-drv-ati-6.5.7.3-radeon-metamodes-SEGV-fix.patch 
Log Message:
auto-import xorg-x11-drv-ati-6.6.0-1 on branch devel from xorg-x11-drv-ati-6.6.0-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	4 Apr 2006 21:40:17 -0000	1.9
+++ .cvsignore	10 Apr 2006 03:12:59 -0000	1.10
@@ -1 +1 @@
-xf86-video-ati-cvs20060404.tar.bz2
+xf86-video-ati-6.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Apr 2006 21:40:17 -0000	1.9
+++ sources	10 Apr 2006 03:12:59 -0000	1.10
@@ -1 +1 @@
-9f4bfdb71b92184ab84012782ca90b4a  xf86-video-ati-cvs20060404.tar.bz2
+fbf04977d41239d55387122a4de6bd16  xf86-video-ati-6.6.0.tar.bz2


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-ati.spec	4 Apr 2006 21:40:17 -0000	1.16
+++ xorg-x11-drv-ati.spec	10 Apr 2006 03:12:59 -0000	1.17
@@ -1,8 +1,8 @@
-%define tarball xf86-video-ati-%{cvsdate}
+%define tarball xf86-video-ati
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define cvsdate cvs20060404
+#%define cvsdate cvs20060404
 
 %ifarch %{ix86} x86_64 ia64 ppc alpha
 %define with_dri	1
@@ -12,14 +12,14 @@
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
-Version:   6.5.7.3
-Release:   4.%{cvsdate}
+Version:   6.6.0
+Release:   1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   ati.xinf
 Source2:   r128.xinf
 Source3:   radeon.xinf
@@ -27,19 +27,19 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk >= 1.0.99.1
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 %if %{with_dri}
 BuildRequires: mesa-libGL-devel >= 6.4-4
 BuildRequires: libdrm-devel >= 2.0-1
 %endif
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 ati video driver.
 
 %prep
-%setup -q -n %{tarball}
+%setup -q -n %{tarball}-%{version}
 
 %build
 %configure --disable-static
@@ -83,6 +83,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 6.6.0-1
+- Update to 6.6.0 from 7.1RC1.
+
 * Tue Apr  4 2006 Kristian H??gsberg <krh at redhat.com> 6.5.7.3-4.cvs20060404
 - Update to CVS snapshot from 20060404.
 


--- xorg-x11-drv-ati-6.5.7.3-radeon-metamodes-SEGV-fix.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:13:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:13:14 -0400
Subject: rpms/xorg-x11-drv-calcomp/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-calcomp.spec, 1.8, 1.9
Message-ID: <200604100313.k3A3DEG7031864@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-calcomp/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Feb 2006 09:38:34 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:13:12 -0000	1.7
@@ -1 +1 @@
-xf86-input-calcomp-1.0.0.5.tar.bz2
+xf86-input-calcomp-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-calcomp/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Feb 2006 09:38:34 -0000	1.6
+++ sources	10 Apr 2006 03:13:12 -0000	1.7
@@ -1 +1 @@
-4f44ae58177728ee9943cdd4ba92f018  xf86-input-calcomp-1.0.0.5.tar.bz2
+af13f9de2af4e1d03b2da0c037fd718a  xf86-input-calcomp-1.1.0.tar.bz2


Index: xorg-x11-drv-calcomp.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-calcomp/devel/xorg-x11-drv-calcomp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-calcomp.spec	11 Feb 2006 06:15:39 -0000	1.8
+++ xorg-x11-drv-calcomp.spec	10 Apr 2006 03:13:12 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 calcomp input driver
 Name:      xorg-x11-drv-calcomp
-Version: 1.0.0.5
-Release: 1.2
+Version: 1.1.0
+Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 calcomp input driver.
@@ -52,6 +52,9 @@
 %{_mandir}/man4/calcomp.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.-1
+- Update to 1.1.0 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:13:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:13:35 -0400
Subject: rpms/xorg-x11-drv-chips/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-chips.spec, 1.7, 1.8
Message-ID: <200604100313.k3A3DZwC031943@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-chips/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:29:06 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:13:33 -0000	1.7
@@ -1 +1 @@
-xf86-video-chips-1.0.1.3.tar.bz2
+xf86-video-chips-1.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-chips/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:29:06 -0000	1.6
+++ sources	10 Apr 2006 03:13:33 -0000	1.7
@@ -1 +1 @@
-61c5d3fcc170788a6b95473c532e55db  xf86-video-chips-1.0.1.3.tar.bz2
+3182d43439ca4cbf08ff9aa76990bba3  xf86-video-chips-1.1.1.tar.bz2


Index: xorg-x11-drv-chips.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-chips/devel/xorg-x11-drv-chips.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-chips.spec	7 Feb 2006 14:23:34 -0000	1.7
+++ xorg-x11-drv-chips.spec	10 Apr 2006 03:13:33 -0000	1.8
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 chips video driver
 Name:      xorg-x11-drv-chips
-Version: 1.0.1.3
-Release: 1.1
+Version: 1.1.1
+Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/everything/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   chips.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -18,9 +18,9 @@
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 chips video driver.
@@ -57,6 +57,9 @@
 %{_mandir}/man4/chips.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-1
+- Update to 1.1.1 from 7.1RC1.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1.3-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:13:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:13:52 -0400
Subject: rpms/xorg-x11-drv-cirrus/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-cirrus.spec, 1.8, 1.9
Message-ID: <200604100313.k3A3DqDC032025@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-cirrus/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:29:22 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:13:50 -0000	1.7
@@ -1 +1 @@
-xf86-video-cirrus-1.0.0.5.tar.bz2
+xf86-video-cirrus-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-cirrus/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:29:22 -0000	1.6
+++ sources	10 Apr 2006 03:13:50 -0000	1.7
@@ -1 +1 @@
-fba6807fb95b5f1a397429b5e3e3276e  xf86-video-cirrus-1.0.0.5.tar.bz2
+66344e315def275605dafb314ce59851  xf86-video-cirrus-1.1.0.tar.bz2


Index: xorg-x11-drv-cirrus.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-cirrus/devel/xorg-x11-drv-cirrus.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-cirrus.spec	7 Feb 2006 14:23:57 -0000	1.8
+++ xorg-x11-drv-cirrus.spec	10 Apr 2006 03:13:50 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 cirrus video driver
 Name:      xorg-x11-drv-cirrus
-Version:   1.0.0.5
-Release:   1.1
+Version:   1.1.0
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   cirrus.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -18,9 +18,9 @@
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 cirrus video driver.
@@ -59,6 +59,9 @@
 %{_mandir}/man4/cirrus.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 from 7.1RC1.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:14:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:14:05 -0400
Subject: rpms/xorg-x11-drv-citron/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 xorg-x11-drv-citron.spec, 1.9, 1.10
Message-ID: <200604100314.k3A3E5hg032102@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-citron/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Mar 2006 03:04:27 -0000	1.7
+++ .cvsignore	10 Apr 2006 03:14:03 -0000	1.8
@@ -1,2 +1 @@
-xf86-input-citron-2.1.1.5.tar.bz2
-xf86-input-citron-2.1.5.tar.bz2
+xf86-input-citron-2.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-citron/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Mar 2006 03:04:41 -0000	1.7
+++ sources	10 Apr 2006 03:14:03 -0000	1.8
@@ -1 +1 @@
-4a41237ebabaa115fa46a374dfd77e95  xf86-input-citron-2.1.5.tar.bz2
+1fe53cd055a69650f3c2e02377ec728c  xf86-input-citron-2.2.0.tar.bz2


Index: xorg-x11-drv-citron.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-citron/devel/xorg-x11-drv-citron.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-citron.spec	2 Mar 2006 03:01:40 -0000	1.9
+++ xorg-x11-drv-citron.spec	10 Apr 2006 03:14:03 -0000	1.10
@@ -6,7 +6,7 @@
 
 Summary:   Xorg X11 citron input driver
 Name:      xorg-x11-drv-citron
-Version:   2.1.5
+Version:   2.2.0
 Release:   1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 citron input driver.
@@ -52,6 +52,9 @@
 %{_mandir}/man4/citron.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 2.2.0-1
+- Update to 2.2.0 from 7.1RC1.
+
 * Wed Mar 01 2006 Mike A. Harris <mharris at redhat.com> 2.1.5-1
 - Updated to new upstream citron 2.1.5 driver.
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:14:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:14:18 -0400
Subject: rpms/xorg-x11-drv-cyrix/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-cyrix.spec, 1.7, 1.8
Message-ID: <200604100314.k3A3EILj032181@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-cyrix/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:29:36 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:14:16 -0000	1.7
@@ -1 +1 @@
-xf86-video-cyrix-1.0.0.5.tar.bz2
+xf86-video-cyrix-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-cyrix/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:29:36 -0000	1.6
+++ sources	10 Apr 2006 03:14:16 -0000	1.7
@@ -1 +1 @@
-edfe947eef0d1d18b66372b3ae5cfad0  xf86-video-cyrix-1.0.0.5.tar.bz2
+02ed7d5215610a3463a0307b30bb5425  xf86-video-cyrix-1.1.0.tar.bz2


Index: xorg-x11-drv-cyrix.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-cyrix/devel/xorg-x11-drv-cyrix.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-cyrix.spec	7 Feb 2006 14:24:22 -0000	1.7
+++ xorg-x11-drv-cyrix.spec	10 Apr 2006 03:14:16 -0000	1.8
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 cyrix video driver
 Name:      xorg-x11-drv-cyrix
-Version:   1.0.0.5
-Release:   1.1
+Version:   1.1.0
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   cyrix.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -18,9 +18,9 @@
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 cyrix video driver.
@@ -57,6 +57,9 @@
 %{_mandir}/man4/cyrix.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 from 7.1RC1.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:14:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:14:43 -0400
Subject: rpms/xorg-x11-drv-digitaledge/devel .cvsignore, 1.6, 1.7 sources,
	1.6, 1.7 xorg-x11-drv-digitaledge.spec, 1.8, 1.9
Message-ID: <200604100314.k3A3Eh29032260@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-digitaledge/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Feb 2006 09:39:22 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:14:41 -0000	1.7
@@ -1 +1 @@
-xf86-input-digitaledge-1.0.1.3.tar.bz2
+xf86-input-digitaledge-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-digitaledge/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Feb 2006 09:39:22 -0000	1.6
+++ sources	10 Apr 2006 03:14:41 -0000	1.7
@@ -1 +1 @@
-5fd6fff3d2c415a100b5677842b04bc2  xf86-input-digitaledge-1.0.1.3.tar.bz2
+53461c34cc0712aacab92b820b9fcb84  xf86-input-digitaledge-1.1.0.tar.bz2


Index: xorg-x11-drv-digitaledge.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-digitaledge/devel/xorg-x11-drv-digitaledge.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-digitaledge.spec	11 Feb 2006 06:16:12 -0000	1.8
+++ xorg-x11-drv-digitaledge.spec	10 Apr 2006 03:14:41 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 digitaledge input driver
 Name:      xorg-x11-drv-digitaledge
-Version: 1.0.1.3
-Release: 1.2
+Version: 1.1.0
+Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 digitaledge input driver.
@@ -52,6 +52,9 @@
 #%{_mandir}/man4/*.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1.3-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:15:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:15:00 -0400
Subject: rpms/xorg-x11-drv-dmc/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-dmc.spec, 1.8, 1.9
Message-ID: <200604100315.k3A3F02O032341@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-dmc/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Feb 2006 09:39:47 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:14:58 -0000	1.7
@@ -1 +1 @@
-xf86-input-dmc-1.0.0.5.tar.bz2
+xf86-input-dmc-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-dmc/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Feb 2006 09:39:47 -0000	1.6
+++ sources	10 Apr 2006 03:14:58 -0000	1.7
@@ -1 +1 @@
-28ae73cf0f9ff90fd000fc7507d0745e  xf86-input-dmc-1.0.0.5.tar.bz2
+e1bcbdefcb839173de79aeb3cd038b77  xf86-input-dmc-1.1.0.tar.bz2


Index: xorg-x11-drv-dmc.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-dmc/devel/xorg-x11-drv-dmc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-dmc.spec	11 Feb 2006 06:16:26 -0000	1.8
+++ xorg-x11-drv-dmc.spec	10 Apr 2006 03:14:58 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 dmc input driver
 Name:      xorg-x11-drv-dmc
-Version: 1.0.0.5
-Release: 1.2
+Version: 1.1.0
+Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 dmc input driver.
@@ -52,6 +52,9 @@
 %{_mandir}/man4/dmc.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:15:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:15:14 -0400
Subject: rpms/xorg-x11-drv-dummy/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-dummy.spec, 1.8, 1.9
Message-ID: <200604100315.k3A3FEuV032443@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-dummy/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:29:49 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:15:11 -0000	1.7
@@ -1 +1 @@
-xf86-video-dummy-0.1.0.5.tar.bz2
+xf86-video-dummy-0.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-dummy/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:29:49 -0000	1.6
+++ sources	10 Apr 2006 03:15:11 -0000	1.7
@@ -1 +1 @@
-d0f573e3dfc844b6c8ed658ce892a194  xf86-video-dummy-0.1.0.5.tar.bz2
+22b7cc20a33443cbd218bd2521850cfe  xf86-video-dummy-0.2.0.tar.bz2


Index: xorg-x11-drv-dummy.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-dummy/devel/xorg-x11-drv-dummy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-dummy.spec	11 Feb 2006 06:16:40 -0000	1.8
+++ xorg-x11-drv-dummy.spec	10 Apr 2006 03:15:11 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 dummy video driver
 Name:      xorg-x11-drv-dummy
-Version:   0.1.0.5
-Release:   1.2
+Version:   0.2.0
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 dummy video driver.
@@ -52,6 +52,9 @@
 #%{_mandir}/man4/dummy.4x*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 0.2.0-1
+- Update to 0.2.0 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.1.0.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:15:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:15:37 -0400
Subject: rpms/xorg-x11-drv-dynapro/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-dynapro.spec, 1.8, 1.9
Message-ID: <200604100315.k3A3Fbuk032539@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-dynapro/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Feb 2006 09:41:22 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:15:35 -0000	1.7
@@ -1 +1 @@
-xf86-input-dynapro-1.0.0.5.tar.bz2
+xf86-input-dynapro-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-dynapro/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Feb 2006 09:41:22 -0000	1.6
+++ sources	10 Apr 2006 03:15:35 -0000	1.7
@@ -1 +1 @@
-e035a3b8561860236e32012ab26dda15  xf86-input-dynapro-1.0.0.5.tar.bz2
+1683178d09dfc604dde9ea2aab950a28  xf86-input-dynapro-1.1.0.tar.bz2


Index: xorg-x11-drv-dynapro.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-dynapro/devel/xorg-x11-drv-dynapro.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-dynapro.spec	11 Feb 2006 06:16:57 -0000	1.8
+++ xorg-x11-drv-dynapro.spec	10 Apr 2006 03:15:35 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 dynapro input driver
 Name:      xorg-x11-drv-dynapro
-Version: 1.0.0.5
-Release: 1.2
+Version: 1.1.0
+Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 dynapro input driver.
@@ -52,6 +52,9 @@
 %{_mandir}/man4/dynapro.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:15:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:15:58 -0400
Subject: rpms/xorg-x11-drv-elo2300/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-elo2300.spec, 1.8, 1.9
Message-ID: <200604100315.k3A3FscY001457@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-elo2300/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Feb 2006 09:42:12 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:15:51 -0000	1.7
@@ -1 +1 @@
-xf86-input-elo2300-1.0.0.5.tar.bz2
+xf86-input-elo2300-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-elo2300/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Feb 2006 09:42:12 -0000	1.6
+++ sources	10 Apr 2006 03:15:51 -0000	1.7
@@ -1 +1 @@
-664af07018e07207358a73b4e93e7a91  xf86-input-elo2300-1.0.0.5.tar.bz2
+43885769d6f741272dda162e82902b0d  xf86-input-elo2300-1.1.0.tar.bz2


Index: xorg-x11-drv-elo2300.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-elo2300/devel/xorg-x11-drv-elo2300.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-elo2300.spec	11 Feb 2006 06:17:10 -0000	1.8
+++ xorg-x11-drv-elo2300.spec	10 Apr 2006 03:15:51 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 elo2300 input driver
 Name:      xorg-x11-drv-elo2300
-Version: 1.0.0.5
-Release: 1.2
+Version: 1.1.0
+Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 elo2300 input driver.
@@ -52,6 +52,9 @@
 #%{_mandir}/man4/elo2300.4x*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Bump to 1.1.0 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:16:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:16:23 -0400
Subject: rpms/xorg-x11-drv-elographics/devel .cvsignore, 1.6, 1.7 sources,
	1.6, 1.7 xorg-x11-drv-elographics.spec, 1.8, 1.9
Message-ID: <200604100316.k3A3GNDw006096@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-elographics/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Feb 2006 09:42:59 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:16:14 -0000	1.7
@@ -1 +1 @@
-xf86-input-elographics-1.0.0.5.tar.bz2
+xf86-input-elographics-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-elographics/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Feb 2006 09:42:59 -0000	1.6
+++ sources	10 Apr 2006 03:16:14 -0000	1.7
@@ -1 +1 @@
-5eeec9c02f62cc7bb966109ea7c87f34  xf86-input-elographics-1.0.0.5.tar.bz2
+ecb2bf1f800d4f5f4c295f2a0e6b1de7  xf86-input-elographics-1.1.0.tar.bz2


Index: xorg-x11-drv-elographics.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-elographics/devel/xorg-x11-drv-elographics.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-elographics.spec	11 Feb 2006 06:17:26 -0000	1.8
+++ xorg-x11-drv-elographics.spec	10 Apr 2006 03:16:14 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 elographics input driver
 Name:      xorg-x11-drv-elographics
-Version: 1.0.0.5
-Release: 1.2
+Version: 1.1.0
+Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 elographics input driver.
@@ -52,6 +52,9 @@
 %{_mandir}/man4/elographics.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 from 7.1RC1
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:16:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:16:54 -0400
Subject: rpms/xorg-x11-drv-evdev/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-evdev.spec, 1.8, 1.9
Message-ID: <200604100316.k3A3Gs2O009143@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-evdev/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Feb 2006 09:43:29 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:16:52 -0000	1.7
@@ -1 +1 @@
-xf86-input-evdev-1.0.0.5.tar.bz2
+xf86-input-evdev-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-evdev/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Feb 2006 09:43:29 -0000	1.6
+++ sources	10 Apr 2006 03:16:52 -0000	1.7
@@ -1 +1 @@
-70a3b3e8416e3fd536c8894511f13a67  xf86-input-evdev-1.0.0.5.tar.bz2
+227cf66bcfea90982ee0b947d2475d1d  xf86-input-evdev-1.1.0.tar.bz2


Index: xorg-x11-drv-evdev.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-evdev/devel/xorg-x11-drv-evdev.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-evdev.spec	11 Feb 2006 06:17:40 -0000	1.8
+++ xorg-x11-drv-evdev.spec	10 Apr 2006 03:16:52 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 evdev input driver
 Name:      xorg-x11-drv-evdev
-Version: 1.0.0.5
-Release: 1.2
+Version: 1.1.0
+Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 evdev input driver.
@@ -49,9 +49,12 @@
 %dir %{driverdir}
 %{driverdir}/evdev_drv.so
 #%dir %{_mandir}/man4x
-#%{_mandir}/man4/*.4*
+%{_mandir}/man4/evdev.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:17:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:17:24 -0400
Subject: rpms/xorg-x11-drv-fbdev/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-fbdev.spec, 1.8, 1.9
Message-ID: <200604100317.k3A3HORh014231@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-fbdev/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:30:16 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:17:22 -0000	1.7
@@ -1 +1 @@
-xf86-video-fbdev-0.1.0.5.tar.bz2
+xf86-video-fbdev-0.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-fbdev/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:30:16 -0000	1.6
+++ sources	10 Apr 2006 03:17:22 -0000	1.7
@@ -1 +1 @@
-cb02495cfdb84b8c4f4dbbd0702890eb  xf86-video-fbdev-0.1.0.5.tar.bz2
+4f31813c9fdf87f4d7a564fbb6444604  xf86-video-fbdev-0.2.0.tar.bz2


Index: xorg-x11-drv-fbdev.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-fbdev/devel/xorg-x11-drv-fbdev.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-fbdev.spec	11 Feb 2006 06:17:54 -0000	1.8
+++ xorg-x11-drv-fbdev.spec	10 Apr 2006 03:17:22 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 fbdev video driver
 Name:      xorg-x11-drv-fbdev
-Version:   0.1.0.5
-Release:   1.2
+Version:   0.2.0
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 fbdev video driver.
@@ -52,6 +52,9 @@
 %{_mandir}/man4/fbdev.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 0.2.0-1
+- Update to 0.2.0 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.1.0.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:17:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:17:45 -0400
Subject: rpms/xorg-x11-drv-fpit/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-fpit.spec, 1.8, 1.9
Message-ID: <200604100317.k3A3HjPZ014312@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-fpit/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Feb 2006 09:43:55 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:17:43 -0000	1.7
@@ -1 +1 @@
-xf86-input-fpit-1.0.0.5.tar.bz2
+xf86-input-fpit-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-fpit/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Feb 2006 09:43:56 -0000	1.6
+++ sources	10 Apr 2006 03:17:43 -0000	1.7
@@ -1 +1 @@
-1f75120f61948dd0773a3b479d176348  xf86-input-fpit-1.0.0.5.tar.bz2
+a31066a2076d18619ceaea67f6d89698  xf86-input-fpit-1.1.0.tar.bz2


Index: xorg-x11-drv-fpit.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-fpit/devel/xorg-x11-drv-fpit.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-fpit.spec	11 Feb 2006 06:18:04 -0000	1.8
+++ xorg-x11-drv-fpit.spec	10 Apr 2006 03:17:43 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 fpit input driver
 Name:      xorg-x11-drv-fpit
-Version: 1.0.0.5
-Release: 1.2
+Version: 1.1.0
+Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 fpit input driver.
@@ -52,6 +52,9 @@
 %{_mandir}/man4/fpit.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Updatte to 1.1.0 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:17:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:17:58 -0400
Subject: rpms/xorg-x11-drv-glint/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-glint.spec, 1.8, 1.9
Message-ID: <200604100317.k3A3Hw94014390@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-glint/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:31:03 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:17:56 -0000	1.7
@@ -1 +1 @@
-xf86-video-glint-1.0.1.3.tar.bz2
+xf86-video-glint-1.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-glint/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:31:03 -0000	1.6
+++ sources	10 Apr 2006 03:17:56 -0000	1.7
@@ -1 +1 @@
-f819ae656c217929c46f2ac994aac4b2  xf86-video-glint-1.0.1.3.tar.bz2
+2cf49f701024a145bd25aff9da11d479  xf86-video-glint-1.1.1.tar.bz2


Index: xorg-x11-drv-glint.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-glint/devel/xorg-x11-drv-glint.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-glint.spec	22 Feb 2006 23:38:23 -0000	1.8
+++ xorg-x11-drv-glint.spec	10 Apr 2006 03:17:56 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 glint video driver
 Name:      xorg-x11-drv-glint
-Version:   1.0.1.3
-Release:   2
+Version:   1.1.1
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   glint.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -18,9 +18,9 @@
 ExclusiveArch: %{ix86} alpha
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 glint video driver.
@@ -57,6 +57,9 @@
 %{_mandir}/man4/glint.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-1
+- Update to 1.1.1 from 7.1RC1.
+
 * Wed Feb 22 2006 Mike A. Harris <mharris at redhat.com> 1.0.1.3-2
 - Install glint.xinf, which was inadvertently left out of packaging (#182502)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:18:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:18:18 -0400
Subject: rpms/xorg-x11-drv-hyperpen/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-hyperpen.spec, 1.8, 1.9
Message-ID: <200604100318.k3A3IIUh014469@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-hyperpen/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Feb 2006 09:44:19 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:18:16 -0000	1.7
@@ -1 +1 @@
-xf86-input-hyperpen-1.0.0.5.tar.bz2
+xf86-input-hyperpen-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-hyperpen/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Feb 2006 09:44:19 -0000	1.6
+++ sources	10 Apr 2006 03:18:16 -0000	1.7
@@ -1 +1 @@
-578d0720c274973292f5b9adea5959bf  xf86-input-hyperpen-1.0.0.5.tar.bz2
+1dfccb75069e61e0c6f990b47eb58c40  xf86-input-hyperpen-1.1.0.tar.bz2


Index: xorg-x11-drv-hyperpen.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-hyperpen/devel/xorg-x11-drv-hyperpen.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-hyperpen.spec	11 Feb 2006 06:18:22 -0000	1.8
+++ xorg-x11-drv-hyperpen.spec	10 Apr 2006 03:18:16 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 hyperpen input driver
 Name:      xorg-x11-drv-hyperpen
-Version: 1.0.0.5
-Release: 1.2
+Version: 1.1.0
+Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 hyperpen input driver.
@@ -52,6 +52,9 @@
 #%{_mandir}/man4/*.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:18:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:18:32 -0400
Subject: rpms/xorg-x11-drv-i128/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-i128.spec, 1.7, 1.8
Message-ID: <200604100318.k3A3IWmn014552@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i128/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:32:13 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:18:30 -0000	1.7
@@ -1 +1 @@
-xf86-video-i128-1.1.0.5.tar.bz2
+xf86-video-i128-1.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i128/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:32:13 -0000	1.6
+++ sources	10 Apr 2006 03:18:30 -0000	1.7
@@ -1 +1 @@
-6e0d3e09fc99d6f0a0e969613ddf58cc  xf86-video-i128-1.1.0.5.tar.bz2
+96931eb44f4b2abe283856e08cbd64ef  xf86-video-i128-1.2.0.tar.bz2


Index: xorg-x11-drv-i128.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i128/devel/xorg-x11-drv-i128.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-i128.spec	7 Feb 2006 14:26:29 -0000	1.7
+++ xorg-x11-drv-i128.spec	10 Apr 2006 03:18:30 -0000	1.8
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 i128 video driver
 Name:      xorg-x11-drv-i128
-Version:   1.1.0.5
-Release:   1.1
+Version:   1.2.0
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   i128.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -18,9 +18,9 @@
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 i128 video driver.
@@ -57,6 +57,9 @@
 %{_mandir}/man4/i128.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-1
+- Update to 1.2.0 from 7.1RC1.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.0.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:18:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:18:45 -0400
Subject: rpms/xorg-x11-drv-i740/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-i740.spec, 1.8, 1.9
Message-ID: <200604100318.k3A3IjRx014633@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i740/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:33:05 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:18:43 -0000	1.7
@@ -1 +1 @@
-xf86-video-i740-1.0.0.5.tar.bz2
+xf86-video-i740-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i740/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:33:05 -0000	1.6
+++ sources	10 Apr 2006 03:18:43 -0000	1.7
@@ -1 +1 @@
-f8d150297da26db8011b3e3ba86667b0  xf86-video-i740-1.0.0.5.tar.bz2
+57302e225060a7286ae1a970c87a589b  xf86-video-i740-1.1.0.tar.bz2


Index: xorg-x11-drv-i740.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i740/devel/xorg-x11-drv-i740.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-i740.spec	22 Feb 2006 23:38:56 -0000	1.8
+++ xorg-x11-drv-i740.spec	10 Apr 2006 03:18:43 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 i740 video driver
 Name:      xorg-x11-drv-i740
-Version:   1.0.0.5
-Release:   2
+Version:   1.1.0
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   i740.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -18,9 +18,9 @@
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 i740 video driver.
@@ -57,6 +57,9 @@
 %{_mandir}/man4/i740.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 from 7.1RC1.
+
 * Wed Feb 22 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-2
 - Install i740.xinf, which was inadvertently left out of packaging (#182503)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:19:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:19:12 -0400
Subject: rpms/xorg-x11-drv-i810/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 xorg-x11-drv-i810.spec, 1.12, 1.13 more-libcunwrap.patch,
	1.1, NONE
Message-ID: <200604100319.k3A3JCkX014714@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	.cvsignore sources xorg-x11-drv-i810.spec 
Removed Files:
	more-libcunwrap.patch 
Log Message:
auto-import xorg-x11-drv-i810-1.6.0-1 on branch devel from xorg-x11-drv-i810-1.6.0-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	23 Mar 2006 00:23:58 -0000	1.7
+++ .cvsignore	10 Apr 2006 03:19:10 -0000	1.8
@@ -1 +1 @@
-xf86-video-i810-cvs20060322.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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Mar 2006 00:23:58 -0000	1.7
+++ sources	10 Apr 2006 03:19:10 -0000	1.8
@@ -1 +1 @@
-66c0253452e4925720b68ea2d5d6f02e  xf86-video-i810-cvs20060322.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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-i810.spec	4 Apr 2006 18:42:34 -0000	1.12
+++ xorg-x11-drv-i810.spec	10 Apr 2006 03:19:10 -0000	1.13
@@ -1,15 +1,15 @@
-%define tarball xf86-video-i810-%{cvsdate}
+%define tarball xf86-video-i810
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define cvsdate cvs20060322
+#%define cvsdate cvs20060322
 
 Summary:   Xorg X11 i810 video driver
 Name:      xorg-x11-drv-i810
-Version:   1.4.1.3
-Release:   4.%{cvsdate}.1
+Version:   1.6.0
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   i810.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -18,12 +18,12 @@
 ExclusiveArch: %{ix86} x86_64 ia64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 BuildRequires: libXvMC-devel
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
-Patch0: more-libcunwrap.patch
+#Patch0: more-libcunwrap.patch
 
 %description 
 X.Org X11 i810 video driver.
@@ -37,9 +37,9 @@
 X.Org X11 i810 video driver XvMC development package.
 
 %prep
-%setup -q -n %{tarball}
+%setup -q -n %{tarball}-%{version}
 
-%patch0 -p1 -b .more-libcunwrap
+#%patch0 -p1 -b .more-libcunwrap
 
 %build
 %configure --disable-static
@@ -78,6 +78,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-1
+- Update to 1.6.0 from 7.1RC1.
+
 * Tue Apr  4 2006 Kristian H??gsberg <krh at redhat.com> 1.4.1.3-4.cvs20060322.1
 - Add patch to add missing #include's, specifically assert.h.
 


--- more-libcunwrap.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:19:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:19:29 -0400
Subject: rpms/xorg-x11-drv-jamstudio/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-jamstudio.spec, 1.8, 1.9
Message-ID: <200604100319.k3A3JTaP014794@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-jamstudio/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Feb 2006 09:45:05 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:19:27 -0000	1.7
@@ -1 +1 @@
-xf86-input-jamstudio-1.0.0.5.tar.bz2
+xf86-input-jamstudio-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-jamstudio/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Feb 2006 09:45:05 -0000	1.6
+++ sources	10 Apr 2006 03:19:27 -0000	1.7
@@ -1 +1 @@
-4ea7a20133f637750f72a34b8f7b1b21  xf86-input-jamstudio-1.0.0.5.tar.bz2
+a32e36a24545791a3408cdc5563b6523  xf86-input-jamstudio-1.1.0.tar.bz2


Index: xorg-x11-drv-jamstudio.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-jamstudio/devel/xorg-x11-drv-jamstudio.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-jamstudio.spec	11 Feb 2006 06:18:32 -0000	1.8
+++ xorg-x11-drv-jamstudio.spec	10 Apr 2006 03:19:27 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 jamstudio input driver
 Name:      xorg-x11-drv-jamstudio
-Version: 1.0.0.5
-Release: 1.2
+Version: 1.1.0
+Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 jamstudio input driver.
@@ -54,6 +54,9 @@
 %{_mandir}/man4/js_x.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:19:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:19:42 -0400
Subject: rpms/xorg-x11-drv-joystick/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-joystick.spec, 1.8, 1.9
Message-ID: <200604100319.k3A3JgPP014872@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-joystick/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Feb 2006 09:45:31 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:19:40 -0000	1.7
@@ -1 +1 @@
-xf86-input-joystick-1.0.0.5.tar.bz2
+xf86-input-joystick-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-joystick/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Feb 2006 09:45:31 -0000	1.6
+++ sources	10 Apr 2006 03:19:40 -0000	1.7
@@ -1 +1 @@
-4dd96fe292f775d6f289c09fd8e8faf6  xf86-input-joystick-1.0.0.5.tar.bz2
+e0025215542c7a11c5a7f9548631dbd7  xf86-input-joystick-1.1.0.tar.bz2


Index: xorg-x11-drv-joystick.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-joystick/devel/xorg-x11-drv-joystick.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-joystick.spec	11 Feb 2006 06:18:42 -0000	1.8
+++ xorg-x11-drv-joystick.spec	10 Apr 2006 03:19:40 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 joystick input driver
 Name:      xorg-x11-drv-joystick
-Version: 1.0.0.5
-Release: 1.2
+Version: 1.1.0
+Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 joystick input driver.
@@ -52,6 +52,9 @@
 #%{_mandir}/man4/.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:19:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:19:57 -0400
Subject: rpms/xorg-x11-drv-keyboard/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-keyboard.spec, 1.8, 1.9
Message-ID: <200604100319.k3A3Jv5Q014949@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-keyboard/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Feb 2006 09:46:52 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:19:55 -0000	1.7
@@ -1 +1 @@
-xf86-input-keyboard-1.0.1.3.tar.bz2
+xf86-input-keyboard-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-keyboard/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Feb 2006 09:46:52 -0000	1.6
+++ sources	10 Apr 2006 03:19:55 -0000	1.7
@@ -1 +1 @@
-b501e354c7f160d09ea1ca8f5db9404b  xf86-input-keyboard-1.0.1.3.tar.bz2
+38d5eec3f6d070112986f74a4d522541  xf86-input-keyboard-1.1.0.tar.bz2


Index: xorg-x11-drv-keyboard.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-keyboard/devel/xorg-x11-drv-keyboard.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-keyboard.spec	11 Feb 2006 06:19:08 -0000	1.8
+++ xorg-x11-drv-keyboard.spec	10 Apr 2006 03:19:55 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 keyboard input driver
 Name:      xorg-x11-drv-keyboard
-Version: 1.0.1.3
-Release: 1.2
+Version: 1.1.0
+Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 keyboard input driver.
@@ -54,6 +54,9 @@
 %{_mandir}/man4/keyboard.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1.3-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:20:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:20:31 -0400
Subject: rpms/xorg-x11-drv-magellan/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-magellan.spec, 1.8, 1.9
Message-ID: <200604100320.k3A3KVPb015030@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-magellan/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Feb 2006 09:48:39 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:20:26 -0000	1.7
@@ -1 +1 @@
-xf86-input-magellan-1.0.0.5.tar.bz2
+xf86-input-magellan-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-magellan/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Feb 2006 09:48:39 -0000	1.6
+++ sources	10 Apr 2006 03:20:26 -0000	1.7
@@ -1 +1 @@
-5f46f47c130f5c756167caf4c975cc73  xf86-input-magellan-1.0.0.5.tar.bz2
+0d6a81aa864ac790d9a8b517ca7016ad  xf86-input-magellan-1.1.0.tar.bz2


Index: xorg-x11-drv-magellan.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-magellan/devel/xorg-x11-drv-magellan.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-magellan.spec	11 Feb 2006 06:19:19 -0000	1.8
+++ xorg-x11-drv-magellan.spec	10 Apr 2006 03:20:26 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 magellan input driver
 Name:      xorg-x11-drv-magellan
-Version: 1.0.0.5
-Release: 1.2
+Version: 1.1.0
+Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 magellan input driver.
@@ -52,6 +52,9 @@
 #%{_mandir}/man4/magellan.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:22:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:22:08 -0400
Subject: rpms/xorg-x11-drv-mga/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-mga.spec, 1.8, 1.9
Message-ID: <200604100322.k3A3M8Ox015139@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mga/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:35:00 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:22:06 -0000	1.7
@@ -1 +1 @@
-xf86-video-mga-1.2.1.3.tar.bz2
+xf86-video-mga-1.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mga/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:35:00 -0000	1.6
+++ sources	10 Apr 2006 03:22:06 -0000	1.7
@@ -1 +1 @@
-9895de01c57354c7aa80907dc05b7e66  xf86-video-mga-1.2.1.3.tar.bz2
+ba373233a7d13084d14046a17b02e248  xf86-video-mga-1.4.1.tar.bz2


Index: xorg-x11-drv-mga.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mga/devel/xorg-x11-drv-mga.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-mga.spec	11 Feb 2006 06:19:50 -0000	1.8
+++ xorg-x11-drv-mga.spec	10 Apr 2006 03:22:06 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 mga video driver
 Name:      xorg-x11-drv-mga
-Version:   1.2.1.3
-Release:   1.2
+Version:   1.4.1
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   mga.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -18,9 +18,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 mga video driver.
@@ -61,6 +61,9 @@
 %{_mandir}/man4/mga.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.4.1-1
+- Update to 1.4.1 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.1.3-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:22:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:22:20 -0400
Subject: rpms/xorg-x11-drv-microtouch/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-microtouch.spec, 1.8, 1.9
Message-ID: <200604100322.k3A3MKNx015216@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-microtouch/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Feb 2006 09:49:29 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:22:17 -0000	1.7
@@ -1 +1 @@
-xf86-input-microtouch-1.0.0.5.tar.bz2
+xf86-input-microtouch-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-microtouch/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Feb 2006 09:49:29 -0000	1.6
+++ sources	10 Apr 2006 03:22:17 -0000	1.7
@@ -1 +1 @@
-53ef317435ca278ea1fff0902f93d74b  xf86-input-microtouch-1.0.0.5.tar.bz2
+7b3cc0330d70e7e4e07914fcb325b331  xf86-input-microtouch-1.1.0.tar.bz2


Index: xorg-x11-drv-microtouch.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-microtouch/devel/xorg-x11-drv-microtouch.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-microtouch.spec	11 Feb 2006 06:20:25 -0000	1.8
+++ xorg-x11-drv-microtouch.spec	10 Apr 2006 03:22:17 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 microtouch input driver
 Name:      xorg-x11-drv-microtouch
-Version: 1.0.0.5
-Release: 1.2
+Version: 1.1.0
+Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 microtouch input driver.
@@ -52,6 +52,9 @@
 %{_mandir}/man4/microtouch.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:22:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:22:32 -0400
Subject: rpms/xorg-x11-drv-mouse/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 xorg-x11-drv-mouse.spec, 1.10, 1.11
Message-ID: <200604100322.k3A3MWEW015296@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mouse/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Mar 2006 03:09:35 -0000	1.7
+++ .cvsignore	10 Apr 2006 03:22:29 -0000	1.8
@@ -1,2 +1 @@
-xf86-input-mouse-1.0.3.1.tar.bz2
-xf86-input-mouse-1.0.4.tar.bz2
+xf86-input-mouse-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mouse/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Mar 2006 03:09:35 -0000	1.7
+++ sources	10 Apr 2006 03:22:29 -0000	1.8
@@ -1 +1 @@
-3e3289f99cb3ce6beccf42f6f413ac21  xf86-input-mouse-1.0.4.tar.bz2
+7004e6901eeb624759dfe271e88ecb0a  xf86-input-mouse-1.1.0.tar.bz2


Index: xorg-x11-drv-mouse.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mouse/devel/xorg-x11-drv-mouse.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-mouse.spec	2 Mar 2006 03:09:35 -0000	1.10
+++ xorg-x11-drv-mouse.spec	10 Apr 2006 03:22:29 -0000	1.11
@@ -6,7 +6,7 @@
 
 Summary:   Xorg X11 mouse input driver
 Name:      xorg-x11-drv-mouse
-Version:   1.0.4
+Version:   1.1.0
 Release:   1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk >= 0.99.3
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires: xorg-x11-server-Xorg >= 0.99.3
+Requires: xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 mouse input driver.
@@ -54,6 +54,9 @@
 %{_mandir}/man4/mouse-driver.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 from 7.1RC1.
+
 * Wed Mar 01 2006 Mike A. Harris <mharris at redhat.com> 1.0.4-1
 - Updated to new upstream driver version mouse-1.0.4.
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:22:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:22:50 -0400
Subject: rpms/xorg-x11-drv-mutouch/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-mutouch.spec, 1.8, 1.9
Message-ID: <200604100322.k3A3MogI015374@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mutouch/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Feb 2006 09:50:36 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:22:47 -0000	1.7
@@ -1 +1 @@
-xf86-input-mutouch-1.0.0.5.tar.bz2
+xf86-input-mutouch-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mutouch/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Feb 2006 09:50:36 -0000	1.6
+++ sources	10 Apr 2006 03:22:47 -0000	1.7
@@ -1 +1 @@
-eab7395f4a507ddd1bf5bf9f9e5a78a6  xf86-input-mutouch-1.0.0.5.tar.bz2
+98ae915c67cabf0e6d40a425dbdbe10b  xf86-input-mutouch-1.1.0.tar.bz2


Index: xorg-x11-drv-mutouch.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mutouch/devel/xorg-x11-drv-mutouch.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-mutouch.spec	11 Feb 2006 06:20:59 -0000	1.8
+++ xorg-x11-drv-mutouch.spec	10 Apr 2006 03:22:47 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 mutouch input driver
 Name:      xorg-x11-drv-mutouch
-Version: 1.0.0.5
-Release: 1.2
+Version: 1.1.0
+Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 %description 
 X.Org X11 mutouch input driver.
 
@@ -51,6 +51,9 @@
 %{_mandir}/man4/mutouch.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:23:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:23:02 -0400
Subject: rpms/xorg-x11-drv-neomagic/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-neomagic.spec, 1.7, 1.8
Message-ID: <200604100323.k3A3N26l015453@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-neomagic/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:35:31 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:23:00 -0000	1.7
@@ -1 +1 @@
-xf86-video-neomagic-1.0.0.5.tar.bz2
+xf86-video-neomagic-1.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-neomagic/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:35:31 -0000	1.6
+++ sources	10 Apr 2006 03:23:00 -0000	1.7
@@ -1 +1 @@
-d2d44f1f2eb5c239a779a9dd0e983a2a  xf86-video-neomagic-1.0.0.5.tar.bz2
+7a3d3d6e60b9686d955c45d9ebbd5c1b  xf86-video-neomagic-1.1.1.tar.bz2


Index: xorg-x11-drv-neomagic.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-neomagic/devel/xorg-x11-drv-neomagic.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-neomagic.spec	7 Feb 2006 14:28:35 -0000	1.7
+++ xorg-x11-drv-neomagic.spec	10 Apr 2006 03:23:00 -0000	1.8
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 neomagic video driver
 Name:      xorg-x11-drv-neomagic
-Version:   1.0.0.5
-Release:   1.1
+Version:   1.1.1
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   neomagic.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -18,9 +18,9 @@
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 neomagic video driver.
@@ -57,6 +57,9 @@
 %{_mandir}/man4/neomagic.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-1
+- Update to 1.1.1 from 7.1RC1.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:23:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:23:14 -0400
Subject: rpms/xorg-x11-drv-nsc/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-nsc.spec, 1.8, 1.9
Message-ID: <200604100323.k3A3NE9w015531@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nsc/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:36:08 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:23:12 -0000	1.7
@@ -1 +1 @@
-xf86-video-nsc-2.7.6.5.tar.bz2
+xf86-video-nsc-2.8.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nsc/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:36:08 -0000	1.6
+++ sources	10 Apr 2006 03:23:12 -0000	1.7
@@ -1 +1 @@
-ae4357182de369dbc1e60f287179c9c3  xf86-video-nsc-2.7.6.5.tar.bz2
+5e4cb211a02ed89e0672273f9cc8bf39  xf86-video-nsc-2.8.1.tar.bz2


Index: xorg-x11-drv-nsc.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nsc/devel/xorg-x11-drv-nsc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-nsc.spec	7 Feb 2006 14:28:45 -0000	1.8
+++ xorg-x11-drv-nsc.spec	10 Apr 2006 03:23:12 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 nsc video driver
 Name:      xorg-x11-drv-nsc
-Version:   2.7.6.5
-Release:   2.1
+Version:   2.8.1
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   nsc.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -18,9 +18,9 @@
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 nsc video driver.
@@ -57,6 +57,9 @@
 %{_mandir}/man4/nsc.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 2.8.1-1
+- Update to 2.8.1 from 7.1RC1.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.7.6.5-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:23:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:23:27 -0400
Subject: rpms/xorg-x11-drv-nv/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-nv.spec, 1.11,
	1.12 nv-1.0.1.5-updateto-cvs20050209.patch, 1.1, NONE
Message-ID: <200604100323.k3A3NR4G015612@cvs.devel.redhat.com>

Author: ajackson

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

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.1.1-1 on branch devel from xorg-x11-drv-nv-1.1.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/.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	10 Apr 2006 03:23:25 -0000	1.7
@@ -1 +1 @@
-xf86-video-nv-1.0.1.5.tar.bz2
+xf86-video-nv-1.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/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	10 Apr 2006 03:23:25 -0000	1.7
@@ -1 +1 @@
-4ba5f719e5a62dabe485f0c5a564d7eb  xf86-video-nv-1.0.1.5.tar.bz2
+029366b6252340efe11d340fbf60afb8  xf86-video-nv-1.1.1.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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-nv.spec	11 Feb 2006 06:21:09 -0000	1.11
+++ xorg-x11-drv-nv.spec	10 Apr 2006 03:23:25 -0000	1.12
@@ -6,12 +6,11 @@
 
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
-Version:   1.0.1.5
-Release:   3.1
+Version:   1.1.1
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.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)
@@ -19,16 +18,15 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 nv video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p2 -b .updateto-cvs20050209
 
 %build
 %configure --disable-static
@@ -60,6 +58,9 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-1
+- Update to 1.1.1 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1.5-3.1
 - bump again for double-long bug on ppc(64)
 


--- nv-1.0.1.5-updateto-cvs20050209.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:23:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:23:39 -0400
Subject: rpms/xorg-x11-drv-palmax/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-palmax.spec, 1.8, 1.9
Message-ID: <200604100323.k3A3NdVI015695@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-palmax/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Feb 2006 09:51:23 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:23:36 -0000	1.7
@@ -1 +1 @@
-xf86-input-palmax-1.0.0.5.tar.bz2
+xf86-input-palmax-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-palmax/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Feb 2006 09:51:23 -0000	1.6
+++ sources	10 Apr 2006 03:23:36 -0000	1.7
@@ -1 +1 @@
-87bc39528fd3a63a989ba853f681ef6a  xf86-input-palmax-1.0.0.5.tar.bz2
+0959dbf7972dfb95f56e4bd3f56447cf  xf86-input-palmax-1.1.0.tar.bz2


Index: xorg-x11-drv-palmax.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-palmax/devel/xorg-x11-drv-palmax.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-palmax.spec	11 Feb 2006 06:21:21 -0000	1.8
+++ xorg-x11-drv-palmax.spec	10 Apr 2006 03:23:36 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 palmax input driver
 Name:      xorg-x11-drv-palmax
-Version: 1.0.0.5
-Release: 1.2
+Version: 1.1.0
+Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 palmax input driver.
@@ -52,6 +52,9 @@
 %{_mandir}/man4/palmax.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:23:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:23:51 -0400
Subject: rpms/xorg-x11-drv-penmount/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-penmount.spec, 1.8, 1.9
Message-ID: <200604100323.k3A3NpvC015773@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-penmount/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Feb 2006 09:52:01 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:23:48 -0000	1.7
@@ -1 +1 @@
-xf86-input-penmount-1.0.0.5.tar.bz2
+xf86-input-penmount-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-penmount/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Feb 2006 09:52:01 -0000	1.6
+++ sources	10 Apr 2006 03:23:48 -0000	1.7
@@ -1 +1 @@
-d381dddde517ea47f9e313d004ffc3e5  xf86-input-penmount-1.0.0.5.tar.bz2
+aa0552fb893fd29868d6adc7b7a5d61b  xf86-input-penmount-1.1.0.tar.bz2


Index: xorg-x11-drv-penmount.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-penmount/devel/xorg-x11-drv-penmount.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-penmount.spec	11 Feb 2006 06:21:31 -0000	1.8
+++ xorg-x11-drv-penmount.spec	10 Apr 2006 03:23:48 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 penmount input driver
 Name:      xorg-x11-drv-penmount
-Version: 1.0.0.5
-Release: 1.2
+Version: 1.1.0
+Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires: xorg-x11-server-Xorg
+Requires: xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 penmount input driver.
@@ -53,6 +53,9 @@
 %{_mandir}/man4/penmount.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:24:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:24:03 -0400
Subject: rpms/xorg-x11-drv-rendition/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-rendition.spec, 1.7, 1.8
Message-ID: <200604100324.k3A3O3je015854@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-rendition/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:37:06 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:24:01 -0000	1.7
@@ -1 +1 @@
-xf86-video-rendition-4.0.1.3.tar.bz2
+xf86-video-rendition-4.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-rendition/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:37:06 -0000	1.6
+++ sources	10 Apr 2006 03:24:01 -0000	1.7
@@ -1 +1 @@
-b69d578591f3ece72e844a5bb22674f7  xf86-video-rendition-4.0.1.3.tar.bz2
+6864a3348f66bac9533b35ee2110c6e2  xf86-video-rendition-4.1.0.tar.bz2


Index: xorg-x11-drv-rendition.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-rendition/devel/xorg-x11-drv-rendition.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-rendition.spec	7 Feb 2006 14:29:27 -0000	1.7
+++ xorg-x11-drv-rendition.spec	10 Apr 2006 03:24:01 -0000	1.8
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 rendition video driver
 Name:      xorg-x11-drv-rendition
-Version:   4.0.1.3
-Release:   1.1
+Version:   4.1.0
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   rendition.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -18,9 +18,9 @@
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 rendition video driver.
@@ -57,6 +57,9 @@
 %{_mandir}/man4/rendition.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 4.1.0-1
+- Update to 4.1.0 from 7.1RC1.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.0.1.3-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:24:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:24:22 -0400
Subject: rpms/xorg-x11-drv-s3/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-s3.spec, 1.10, 1.11
Message-ID: <200604100324.k3A3OM8v015930@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-s3/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:37:20 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:24:20 -0000	1.7
@@ -1 +1 @@
-xf86-video-s3-0.3.5.5.tar.bz2
+xf86-video-s3-0.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-s3/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:37:20 -0000	1.6
+++ sources	10 Apr 2006 03:24:20 -0000	1.7
@@ -1 +1 @@
-fa2c90793e895c0b144445e998661aa4  xf86-video-s3-0.3.5.5.tar.bz2
+dfe47d46af2b53e43b38e2b8c730dad1  xf86-video-s3-0.4.1.tar.bz2


Index: xorg-x11-drv-s3.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-s3/devel/xorg-x11-drv-s3.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-s3.spec	22 Feb 2006 23:40:02 -0000	1.10
+++ xorg-x11-drv-s3.spec	10 Apr 2006 03:24:20 -0000	1.11
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 s3 video driver
 Name:      xorg-x11-drv-s3
-Version:   0.3.5.5
-Release:   2
+Version:   0.4.1
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   s3.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -18,9 +18,9 @@
 ExclusiveArch: %{ix86} x86_64 ppc
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 s3 video driver.
@@ -57,6 +57,9 @@
 #%{_mandir}/man4/s3.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 0.4.1-1
+- Update to 0.4.1 from 7.1RC1.
+
 * Wed Feb 22 2006 Mike A. Harris <mharris at redhat.com> 0.3.5.5-2
 - Install s3.xinf, which was inadvertently left out of packaging (#182505)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:24:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:24:34 -0400
Subject: rpms/xorg-x11-drv-s3virge/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-s3virge.spec, 1.8, 1.9
Message-ID: <200604100324.k3A3OY0V016011@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-s3virge/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:37:36 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:24:32 -0000	1.7
@@ -1 +1 @@
-xf86-video-s3virge-1.8.6.5.tar.bz2
+xf86-video-s3virge-1.9.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-s3virge/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:37:36 -0000	1.6
+++ sources	10 Apr 2006 03:24:32 -0000	1.7
@@ -1 +1 @@
-5ac819a238e90e3f07d77928d8a600cc  xf86-video-s3virge-1.8.6.5.tar.bz2
+a91c73285ef67ee7cd9e2da28acb6cc4  xf86-video-s3virge-1.9.1.tar.bz2


Index: xorg-x11-drv-s3virge.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-s3virge/devel/xorg-x11-drv-s3virge.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-s3virge.spec	11 Feb 2006 06:21:57 -0000	1.8
+++ xorg-x11-drv-s3virge.spec	10 Apr 2006 03:24:32 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 s3virge video driver
 Name:      xorg-x11-drv-s3virge
-Version:   1.8.6.5
-Release:   1.2
+Version:   1.9.1
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   s3virge.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -18,9 +18,9 @@
 ExclusiveArch: %{ix86} x86_64 ppc
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 s3virge video driver.
@@ -57,6 +57,9 @@
 %{_mandir}/man4/s3virge.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.9.1-1
+- Update to 1.9.1 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.8.6.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:24:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:24:47 -0400
Subject: rpms/xorg-x11-drv-savage/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-savage.spec, 1.9, 1.10
Message-ID: <200604100324.k3A3Olhx016090@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-savage/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:37:58 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:24:45 -0000	1.7
@@ -1 +1 @@
-xf86-video-savage-2.0.2.3.tar.bz2
+xf86-video-savage-2.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-savage/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:37:58 -0000	1.6
+++ sources	10 Apr 2006 03:24:45 -0000	1.7
@@ -1 +1 @@
-28ec4e07bda55ab8b35b4735405ac5a3  xf86-video-savage-2.0.2.3.tar.bz2
+6e2c7da49d311f3e9fbf12e5ba527222  xf86-video-savage-2.1.1.tar.bz2


Index: xorg-x11-drv-savage.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-savage/devel/xorg-x11-drv-savage.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-savage.spec	11 Feb 2006 06:22:07 -0000	1.9
+++ xorg-x11-drv-savage.spec	10 Apr 2006 03:24:45 -0000	1.10
@@ -12,10 +12,10 @@
 
 Summary:   Xorg X11 savage video driver
 Name:      xorg-x11-drv-savage
-Version:   2.0.2.3
-Release:   1.2
+Version:   2.1.1
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   savage.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -24,12 +24,12 @@
 ExclusiveArch: %{ix86} x86_64 ppc
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 %if %{with_dri}
 BuildRequires: mesa-libGL-devel >= 6.4-4
 %endif
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 savage video driver.
@@ -66,6 +66,9 @@
 %{_mandir}/man4/savage.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 2.1.1-1
+- Update to 2.1.1 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0.2.3-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:24:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:24:59 -0400
Subject: rpms/xorg-x11-drv-siliconmotion/devel .cvsignore, 1.6, 1.7 sources,
	1.6, 1.7 xorg-x11-drv-siliconmotion.spec, 1.7, 1.8
Message-ID: <200604100324.k3A3OxnR016169@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-siliconmotion/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:38:14 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:24:57 -0000	1.7
@@ -1 +1 @@
-xf86-video-siliconmotion-1.3.1.5.tar.bz2
+xf86-video-siliconmotion-1.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-siliconmotion/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:38:14 -0000	1.6
+++ sources	10 Apr 2006 03:24:57 -0000	1.7
@@ -1 +1 @@
-b9db248697e37352f60dfa2305bd696d  xf86-video-siliconmotion-1.3.1.5.tar.bz2
+5f160ab051b16b51cd511829bc8b8cc9  xf86-video-siliconmotion-1.4.1.tar.bz2


Index: xorg-x11-drv-siliconmotion.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-siliconmotion/devel/xorg-x11-drv-siliconmotion.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-siliconmotion.spec	7 Feb 2006 14:30:25 -0000	1.7
+++ xorg-x11-drv-siliconmotion.spec	10 Apr 2006 03:24:57 -0000	1.8
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 siliconmotion video driver
 Name:      xorg-x11-drv-siliconmotion
-Version: 1.3.1.5
-Release: 1.1
+Version: 1.4.1
+Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   siliconmotion.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -18,9 +18,9 @@
 ExclusiveArch: %{ix86} x86_64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 siliconmotion video driver.
@@ -57,6 +57,9 @@
 %{_mandir}/man4/siliconmotion.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.4.1-1
+- Update to 1.4.1 from 7.1RC1.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.1.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:25:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:25:12 -0400
Subject: rpms/xorg-x11-drv-sis/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-sis.spec, 1.9, 1.10
Message-ID: <200604100325.k3A3PCiV016251@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-sis/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:38:30 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:25:10 -0000	1.7
@@ -1 +1 @@
-xf86-video-sis-0.8.1.3.tar.bz2
+xf86-video-sis-0.9.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-sis/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:38:30 -0000	1.6
+++ sources	10 Apr 2006 03:25:10 -0000	1.7
@@ -1 +1 @@
-f239adbee34db5340a2e634fe9134c1f  xf86-video-sis-0.8.1.3.tar.bz2
+ada663e2c0ba297b052175675027d700  xf86-video-sis-0.9.1.tar.bz2


Index: xorg-x11-drv-sis.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-sis/devel/xorg-x11-drv-sis.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-sis.spec	11 Feb 2006 06:22:18 -0000	1.9
+++ xorg-x11-drv-sis.spec	10 Apr 2006 03:25:10 -0000	1.10
@@ -8,10 +8,10 @@
 
 Summary:   Xorg X11 sis video driver
 Name:      xorg-x11-drv-sis
-Version:   0.8.1.3
-Release:   1.2
+Version:   0.9.1
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   sis.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -20,13 +20,13 @@
 ExclusiveArch: %{ix86} x86_64 ppc
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 %if %{with_dri}
 BuildRequires: mesa-libGL-devel >= 6.4-4
 #BuildRequires: libdrm-devel
 %endif
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 sis video driver.
@@ -63,6 +63,9 @@
 %{_mandir}/man4/sis.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 0.9.1-1
+- Update to 0.9.1 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.8.1.3-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:25:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:25:24 -0400
Subject: rpms/xorg-x11-drv-spaceorb/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-spaceorb.spec, 1.8, 1.9
Message-ID: <200604100325.k3A3POEV016331@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-spaceorb/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Feb 2006 09:52:32 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:25:21 -0000	1.7
@@ -1 +1 @@
-xf86-input-spaceorb-1.0.0.5.tar.bz2
+xf86-input-spaceorb-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-spaceorb/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Feb 2006 09:52:32 -0000	1.6
+++ sources	10 Apr 2006 03:25:21 -0000	1.7
@@ -1 +1 @@
-961ede9c4087a6d5666a89d5713623a3  xf86-input-spaceorb-1.0.0.5.tar.bz2
+294810ca9e93c4096458c6a0f2fb5679  xf86-input-spaceorb-1.1.0.tar.bz2


Index: xorg-x11-drv-spaceorb.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-spaceorb/devel/xorg-x11-drv-spaceorb.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-spaceorb.spec	11 Feb 2006 06:22:41 -0000	1.8
+++ xorg-x11-drv-spaceorb.spec	10 Apr 2006 03:25:21 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 spaceorb input driver
 Name:      xorg-x11-drv-spaceorb
-Version: 1.0.0.5
-Release: 1.2
+Version: 1.1.0
+Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 spaceorb input driver.
@@ -52,6 +52,9 @@
 #%{_mandir}/man4/*.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:25:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:25:36 -0400
Subject: rpms/xorg-x11-drv-summa/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-summa.spec, 1.8, 1.9
Message-ID: <200604100325.k3A3PafW016413@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-summa/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Feb 2006 09:53:03 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:25:33 -0000	1.7
@@ -1 +1 @@
-xf86-input-summa-1.0.0.5.tar.bz2
+xf86-input-summa-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-summa/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Feb 2006 09:53:03 -0000	1.6
+++ sources	10 Apr 2006 03:25:33 -0000	1.7
@@ -1 +1 @@
-e30250970921db16880b1af9e1381de5  xf86-input-summa-1.0.0.5.tar.bz2
+b37a432fd87bb9f46d011622d6fce6b3  xf86-input-summa-1.1.0.tar.bz2


Index: xorg-x11-drv-summa.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-summa/devel/xorg-x11-drv-summa.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-summa.spec	11 Feb 2006 06:22:52 -0000	1.8
+++ xorg-x11-drv-summa.spec	10 Apr 2006 03:25:33 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 summa input driver
 Name:      xorg-x11-drv-summa
-Version: 1.0.0.5
-Release: 1.2
+Version: 1.1.0
+Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 summa input driver.
@@ -52,6 +52,9 @@
 #%{_mandir}/man4/*.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:25:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:25:49 -0400
Subject: rpms/xorg-x11-drv-tdfx/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-tdfx.spec, 1.9, 1.10
Message-ID: <200604100325.k3A3PnBf016494@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-tdfx/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:39:04 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:25:47 -0000	1.7
@@ -1 +1 @@
-xf86-video-tdfx-1.1.1.3.tar.bz2
+xf86-video-tdfx-1.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-tdfx/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:39:04 -0000	1.6
+++ sources	10 Apr 2006 03:25:47 -0000	1.7
@@ -1 +1 @@
-e193816d45960d62937deb99d1b9986a  xf86-video-tdfx-1.1.1.3.tar.bz2
+7513cf373d4ddbbf93651d9ae29ac7f3  xf86-video-tdfx-1.2.1.tar.bz2


Index: xorg-x11-drv-tdfx.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-tdfx/devel/xorg-x11-drv-tdfx.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-tdfx.spec	11 Feb 2006 06:55:53 -0000	1.9
+++ xorg-x11-drv-tdfx.spec	10 Apr 2006 03:25:47 -0000	1.10
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 tdfx video driver
 Name:      xorg-x11-drv-tdfx
-Version:   1.1.1.3
-Release:   1.3
+Version:   1.2.1
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   tdfx.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -18,9 +18,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 tdfx video driver.
@@ -57,6 +57,9 @@
 %{_mandir}/man4/tdfx.4*
 
 %changelog
+* Sun Apr  9 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.1.1.3-1.3
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:26:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:26:01 -0400
Subject: rpms/xorg-x11-drv-tek4957/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xorg-x11-drv-tek4957.spec, 1.5, 1.6
Message-ID: <200604100326.k3A3Q1xF016584@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-tek4957/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Nov 2005 00:18:29 -0000	1.3
+++ .cvsignore	10 Apr 2006 03:25:58 -0000	1.4
@@ -1 +1 @@
-xf86-input-tek4957-1.0.0.1.tar.bz2
+xf86-input-tek4957-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-tek4957/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Nov 2005 00:18:29 -0000	1.3
+++ sources	10 Apr 2006 03:25:58 -0000	1.4
@@ -1 +1 @@
-26ff3791fe084ce9ef20e6228fda0ed8  xf86-input-tek4957-1.0.0.1.tar.bz2
+be8a4bd474ad6c85b93f66dd6fcfa6ee  xf86-input-tek4957-1.1.0.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-tek4957.spec	11 Feb 2006 06:23:05 -0000	1.5
+++ xorg-x11-drv-tek4957.spec	10 Apr 2006 03:25:58 -0000	1.6
@@ -10,13 +10,10 @@
 
 Summary:   Xorg X11 tek4957 input driver
 Name:      xorg-x11-drv-tek4957
-Version: 1.0.0.1
-Release: 1.2
+Version: 1.1.0
+Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,9 +33,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 %description 
 X.Org X11 tek4957 input driver.
 
@@ -76,11 +73,14 @@
 # product.  Ditto for the manpages.
 %{driverdir}/*.so
 # NOTE: Uncomment these if someone ever writes manpages for this driver
-%dir %{_mandir}
-%dir %{_mandir}/man4x
-%{_mandir}/man4x/*.4x*
+#%dir %{_mandir}
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/tek4957.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.1-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:26:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:26:23 -0400
Subject: rpms/xorg-x11-drv-trident/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-trident.spec, 1.8, 1.9
Message-ID: <200604100326.k3A3QN73016668@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-trident/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:39:20 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:26:21 -0000	1.7
@@ -1 +1 @@
-xf86-video-trident-1.0.1.2.tar.bz2
+xf86-video-trident-1.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-trident/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:39:20 -0000	1.6
+++ sources	10 Apr 2006 03:26:21 -0000	1.7
@@ -1 +1 @@
-c1ace6bcc9946a474df7d2af5b75b5d9  xf86-video-trident-1.0.1.2.tar.bz2
+0723f8bcb2aa32c30f808e9da01fc0a0  xf86-video-trident-1.2.1.tar.bz2


Index: xorg-x11-drv-trident.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-trident/devel/xorg-x11-drv-trident.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-trident.spec	11 Feb 2006 06:23:17 -0000	1.8
+++ xorg-x11-drv-trident.spec	10 Apr 2006 03:26:21 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 trident video driver
 Name:      xorg-x11-drv-trident
-Version:   1.0.1.2
-Release:   1.2
+Version:   1.2.1
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   trident.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -18,9 +18,9 @@
 ExclusiveArch: %{ix86} x86_64 ppc
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 trident video driver.
@@ -57,6 +57,9 @@
 %{_mandir}/man4/trident.4*
 
 %changelog
+* Sun Apr  9 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
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:26:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:26:35 -0400
Subject: rpms/xorg-x11-drv-tseng/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-tseng.spec, 1.7, 1.8
Message-ID: <200604100326.k3A3QZOM016749@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-tseng/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:39:34 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:26:33 -0000	1.7
@@ -1 +1 @@
-xf86-video-tseng-1.0.0.5.tar.bz2
+xf86-video-tseng-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-tseng/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:39:34 -0000	1.6
+++ sources	10 Apr 2006 03:26:33 -0000	1.7
@@ -1 +1 @@
-de41dc67999ee49903d40d5d67f652c9  xf86-video-tseng-1.0.0.5.tar.bz2
+03d5ffb2fcc1cb325f3d67489dd78e59  xf86-video-tseng-1.1.0.tar.bz2


Index: xorg-x11-drv-tseng.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-tseng/devel/xorg-x11-drv-tseng.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-tseng.spec	7 Feb 2006 14:33:43 -0000	1.7
+++ xorg-x11-drv-tseng.spec	10 Apr 2006 03:26:33 -0000	1.8
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 tseng video driver
 Name:      xorg-x11-drv-tseng
-Version:   1.0.0.5
-Release:   1.1
+Version:   1.1.0
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   tseng.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -18,9 +18,9 @@
 ExclusiveArch: %{ix86} alpha
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 tseng video driver.
@@ -57,6 +57,9 @@
 %{_mandir}/man4/tseng.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 from 7.1RC1.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:26:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:26:47 -0400
Subject: rpms/xorg-x11-drv-ur98/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-ur98.spec, 1.7, 1.8
Message-ID: <200604100326.k3A3Ql33016828@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ur98/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Feb 2006 09:53:53 -0000	1.5
+++ .cvsignore	10 Apr 2006 03:26:44 -0000	1.6
@@ -1 +1 @@
-xf86-input-ur98-1.0.0.5.tar.bz2
+xf86-input-ur98-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ur98/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Feb 2006 09:53:53 -0000	1.5
+++ sources	10 Apr 2006 03:26:44 -0000	1.6
@@ -1 +1 @@
-7cdfe15fdd8e04e3d440b7fdd96bf811  xf86-input-ur98-1.0.0.5.tar.bz2
+3cf8928411458baaa9e726e51772c550  xf86-input-ur98-1.1.0.tar.bz2


Index: xorg-x11-drv-ur98.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ur98/devel/xorg-x11-drv-ur98.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-ur98.spec	11 Feb 2006 06:23:27 -0000	1.7
+++ xorg-x11-drv-ur98.spec	10 Apr 2006 03:26:44 -0000	1.8
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 ur98 input driver
 Name:      xorg-x11-drv-ur98
-Version: 1.0.0.5
-Release: 1.2
+Version: 1.1.0
+Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 ur98 input driver.
@@ -52,6 +52,9 @@
 %{_mandir}/man4/ur98.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:26:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:26:59 -0400
Subject: rpms/xorg-x11-drv-v4l/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-v4l.spec, 1.6, 1.7
Message-ID: <200604100326.k3A3QxYE016908@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-v4l/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Feb 2006 13:39:47 -0000	1.5
+++ .cvsignore	10 Apr 2006 03:26:56 -0000	1.6
@@ -1 +1 @@
-xf86-video-v4l-0.0.1.5.tar.bz2
+xf86-video-v4l-0.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-v4l/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Feb 2006 13:39:47 -0000	1.5
+++ sources	10 Apr 2006 03:26:56 -0000	1.6
@@ -1 +1 @@
-bcf73093c563f1ec0f8eeb3a4f649677  xf86-video-v4l-0.0.1.5.tar.bz2
+69339c38eba2cebc357d67e7a755d734  xf86-video-v4l-0.1.1.tar.bz2


Index: xorg-x11-drv-v4l.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-v4l/devel/xorg-x11-drv-v4l.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-v4l.spec	7 Feb 2006 14:34:25 -0000	1.6
+++ xorg-x11-drv-v4l.spec	10 Apr 2006 03:26:56 -0000	1.7
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 v4l video driver
 Name:      xorg-x11-drv-v4l
-Version:   0.0.1.5
-Release:   1.1
+Version:   0.1.1
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 v4l video driver.
@@ -52,6 +52,9 @@
 %{_mandir}/man4/v4l.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 0.1.1-1
+- Update to 0.1.1 from 7.1RC1.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.0.1.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:27:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:27:11 -0400
Subject: rpms/xorg-x11-drv-vesa/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-vesa.spec, 1.8, 1.9
Message-ID: <200604100327.k3A3RBp8016986@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-vesa/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:40:20 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:27:08 -0000	1.7
@@ -1 +1 @@
-xf86-video-vesa-1.0.1.3.tar.bz2
+xf86-video-vesa-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-vesa/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:40:20 -0000	1.6
+++ sources	10 Apr 2006 03:27:08 -0000	1.7
@@ -1 +1 @@
-38e8bc1a630a4b83cb602bfd2fe90b7c  xf86-video-vesa-1.0.1.3.tar.bz2
+eafa73d8b9dab84797523ce1b5ae1bad  xf86-video-vesa-1.1.0.tar.bz2


Index: xorg-x11-drv-vesa.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-vesa/devel/xorg-x11-drv-vesa.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-vesa.spec	11 Feb 2006 06:23:40 -0000	1.8
+++ xorg-x11-drv-vesa.spec	10 Apr 2006 03:27:08 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 vesa video driver
 Name:      xorg-x11-drv-vesa
-Version:   1.0.1.3
-Release:   1.2
+Version:   1.1.0
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 vesa video driver.
@@ -52,6 +52,9 @@
 %{_mandir}/man4/vesa.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1.3-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:27:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:27:23 -0400
Subject: rpms/xorg-x11-drv-vga/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-vga.spec, 1.9, 1.10
Message-ID: <200604100327.k3A3RNjf017066@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-vga/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:40:38 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:27:21 -0000	1.7
@@ -1 +1 @@
-xf86-video-vga-4.0.0.5.tar.bz2
+xf86-video-vga-4.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-vga/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:40:38 -0000	1.6
+++ sources	10 Apr 2006 03:27:21 -0000	1.7
@@ -1 +1 @@
-6800ea6f26be1b975365a31c8b353bcd  xf86-video-vga-4.0.0.5.tar.bz2
+b93e5fe9757db779a75cd3ce97b9613d  xf86-video-vga-4.1.0.tar.bz2


Index: xorg-x11-drv-vga.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-vga/devel/xorg-x11-drv-vga.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-vga.spec	24 Feb 2006 18:46:05 -0000	1.9
+++ xorg-x11-drv-vga.spec	10 Apr 2006 03:27:21 -0000	1.10
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 vga video driver
 Name:      xorg-x11-drv-vga
-Version:   4.0.0.5
-Release:   2
+Version:   4.1.0
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   vga.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -18,9 +18,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 vga video driver.
@@ -57,6 +57,9 @@
 %{_mandir}/man4/vga.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 4.1.0-1
+- Update to 4.1.0 from 7.1RC1.
+
 * Fri Feb 24 2006 Mike A. Harris <mharris at redhat.com> 4.0.0.5-2
 - Added vga.xinf videoaliases file for ancient hardware (#182953)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:27:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:27:35 -0400
Subject: rpms/xorg-x11-drv-via/devel .cvsignore, 1.7, 1.8 sources, 1.6,
	1.7 xorg-x11-drv-via.spec, 1.11, 1.12
Message-ID: <200604100327.k3A3RZBZ017145@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-via/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Feb 2006 13:40:52 -0000	1.7
+++ .cvsignore	10 Apr 2006 03:27:33 -0000	1.8
@@ -1 +1 @@
-xf86-video-via-0.1.33.2.tar.bz2
+xf86-video-via-0.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-via/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:40:52 -0000	1.6
+++ sources	10 Apr 2006 03:27:33 -0000	1.7
@@ -1 +1 @@
-b003e299f15e3f62850c40e941afe0ec  xf86-video-via-0.1.33.2.tar.bz2
+7c92846dcf363204f7530fa0fa621e43  xf86-video-via-0.2.1.tar.bz2


Index: xorg-x11-drv-via.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-via/devel/xorg-x11-drv-via.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-via.spec	22 Feb 2006 23:40:16 -0000	1.11
+++ xorg-x11-drv-via.spec	10 Apr 2006 03:27:33 -0000	1.12
@@ -8,26 +8,26 @@
 
 Summary:   Xorg X11 via video driver
 Name:      xorg-x11-drv-via
-Version:   0.1.33.2
-Release:   2
+Version:   0.2.1
+Release:   1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   via.xinf
 
 ExclusiveArch: %{ix86} x86_64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 %if %{with_xvmc}
 BuildRequires: libXvMC-devel
 %endif
 BuildRequires: libdrm-devel >= 2.0-1
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 via video driver.
@@ -87,6 +87,9 @@
 %endif
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 0.2.1-1
+- Update to 0.2.1 from 7.1RC1.
+
 * Wed Feb 22 2006 Mike A. Harris <mharris at redhat.com> 0.1.33.2-2
 - Install via.xinf, which was inadvertently left out of packaging (#182506)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:27:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:27:47 -0400
Subject: rpms/xorg-x11-drv-vmmouse/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xorg-x11-drv-vmmouse.spec, 1.4, 1.5
Message-ID: <200604100327.k3A3Rle3017225@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-vmmouse/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Mar 2006 00:01:55 -0000	1.3
+++ .cvsignore	10 Apr 2006 03:27:45 -0000	1.4
@@ -1 +1 @@
-xf86-input-vmmouse-12.3.2.0.tar.bz2
+xf86-input-vmmouse-12.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-vmmouse/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Mar 2006 00:01:55 -0000	1.3
+++ sources	10 Apr 2006 03:27:45 -0000	1.4
@@ -1 +1 @@
-097700a71e4ba61dfbbc784678eeb589  xf86-input-vmmouse-12.3.2.0.tar.bz2
+313e403e56702f6c38d1a5c830b60dc2  xf86-input-vmmouse-12.4.0.tar.bz2


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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xorg-x11-drv-vmmouse.spec	30 Mar 2006 00:54:05 -0000	1.4
+++ xorg-x11-drv-vmmouse.spec	10 Apr 2006 03:27:45 -0000	1.5
@@ -6,8 +6,8 @@
 
 Summary:   Xorg X11 vmmouse input driver
 Name:      xorg-x11-drv-vmmouse
-Version:   12.3.2.0
-Release:   4
+Version:   12.4.0
+Release:   1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk >= 0.99.3
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires: xorg-x11-server-Xorg >= 0.99.3
+Requires: xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 vmmouse input driver.
@@ -51,6 +51,9 @@
 %{_mandir}/man4/vmmouse.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 12.4.0-1
+- Update to 12.4.0 from 7.1RC1.
+
 * Wed Mar 29 2006 Adam Jackson <ajackson at redhat.com> 12.3.2.0-4
 - Don't build on ia64, as per comments in the source.
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:27:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:27:59 -0400
Subject: rpms/xorg-x11-drv-vmware/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-vmware.spec, 1.7, 1.8
Message-ID: <200604100327.k3A3RxY5017312@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-vmware/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:41:09 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:27:57 -0000	1.7
@@ -1 +1 @@
-xf86-video-vmware-10.11.1.3.tar.bz2
+xf86-video-vmware-10.13.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-vmware/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:41:09 -0000	1.6
+++ sources	10 Apr 2006 03:27:57 -0000	1.7
@@ -1 +1 @@
-539b77e045a1767fdb64eee7c21d05d1  xf86-video-vmware-10.11.1.3.tar.bz2
+0b8951d07af049b22c90a5a185c897c2  xf86-video-vmware-10.13.0.tar.bz2


Index: xorg-x11-drv-vmware.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-vmware/devel/xorg-x11-drv-vmware.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-vmware.spec	7 Feb 2006 14:35:40 -0000	1.7
+++ xorg-x11-drv-vmware.spec	10 Apr 2006 03:27:57 -0000	1.8
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 vmware video driver
 Name:      xorg-x11-drv-vmware
-Version:   10.11.1.3
-Release:   1.1
+Version:   10.13.0
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   vmware.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -18,9 +18,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 vmware video driver.
@@ -57,6 +57,9 @@
 %{_mandir}/man4/vmware.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 10.13.0-1
+- Update to 10.13.0 from 7.1RC1.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 10.11.1.3-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:28:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:28:12 -0400
Subject: rpms/xorg-x11-drv-void/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-void.spec, 1.8, 1.9
Message-ID: <200604100328.k3A3SCnU017394@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-void/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Feb 2006 09:54:51 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:28:08 -0000	1.7
@@ -1 +1 @@
-xf86-input-void-1.0.0.5.tar.bz2
+xf86-input-void-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-void/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Feb 2006 09:54:51 -0000	1.6
+++ sources	10 Apr 2006 03:28:08 -0000	1.7
@@ -1 +1 @@
-bfa5e6c582638837efd6b4fc7d77d35b  xf86-input-void-1.0.0.5.tar.bz2
+ea72a92d43b95f413347df96d6a73933  xf86-input-void-1.1.0.tar.bz2


Index: xorg-x11-drv-void.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-void/devel/xorg-x11-drv-void.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-void.spec	11 Feb 2006 06:24:17 -0000	1.8
+++ xorg-x11-drv-void.spec	10 Apr 2006 03:28:08 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 void input driver
 Name:      xorg-x11-drv-void
-Version: 1.0.0.5
-Release: 1.2
+Version: 1.1.0
+Release: 1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,9 +17,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 void input driver.
@@ -53,6 +53,9 @@
 %{_mandir}/man4/void.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 03:28:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Apr 2006 23:28:28 -0400
Subject: rpms/xorg-x11-drv-voodoo/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-voodoo.spec, 1.8, 1.9
Message-ID: <200604100328.k3A3SS6L017502@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-voodoo/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:41:23 -0000	1.6
+++ .cvsignore	10 Apr 2006 03:28:26 -0000	1.7
@@ -1 +1 @@
-xf86-video-voodoo-1.0.0.5.tar.bz2
+xf86-video-voodoo-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-voodoo/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:41:23 -0000	1.6
+++ sources	10 Apr 2006 03:28:26 -0000	1.7
@@ -1 +1 @@
-2c5e21f7f7b564a69fd343f329b2b899  xf86-video-voodoo-1.0.0.5.tar.bz2
+798c9bf902eff5ea70f047e7e056317b  xf86-video-voodoo-1.1.0.tar.bz2


Index: xorg-x11-drv-voodoo.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-voodoo/devel/xorg-x11-drv-voodoo.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-voodoo.spec	11 Feb 2006 06:24:30 -0000	1.8
+++ xorg-x11-drv-voodoo.spec	10 Apr 2006 03:28:26 -0000	1.9
@@ -6,10 +6,10 @@
 
 Summary:   Xorg X11 voodoo video driver
 Name:      xorg-x11-drv-voodoo
-Version:   1.0.0.5
-Release:   1.2
+Version:   1.1.0
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   voodoo.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -18,9 +18,9 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
 %description 
 X.Org X11 voodoo video driver.
@@ -57,6 +57,9 @@
 %{_mandir}/man4/voodoo.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 04:54:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 00:54:30 -0400
Subject: rpms/xorg-x11-drv-evdev/devel xorg-x11-drv-evdev.spec,1.9,1.10
Message-ID: <200604100454.k3A4sTOv027702@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-drv-evdev.spec 
Log Message:
- Disable on ia64 until build issues are sorted.



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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-evdev.spec	10 Apr 2006 03:16:52 -0000	1.9
+++ xorg-x11-drv-evdev.spec	10 Apr 2006 04:54:23 -0000	1.10
@@ -7,14 +7,15 @@
 Summary:   Xorg X11 evdev input driver
 Name:      xorg-x11-drv-evdev
 Version: 1.1.0
-Release: 1
+Release: 2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
+# ia64 disabled momentarily
+ExclusiveArch: %{ix86} x86_64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
@@ -52,6 +53,9 @@
 %{_mandir}/man4/evdev.4*
 
 %changelog
+* Mon Apr 10 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-2
+- Disable on ia64 until build issues are sorted.
+
 * 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  Mon Apr 10 08:32:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 04:32:50 -0400
Subject: rpms/jpilot/devel jpilot-0.99.8-memory.patch, NONE,
	1.1 jpilot-0.99.8-sync.patch, NONE, 1.1 jpilot.spec, 1.33, 1.34
Message-ID: <200604100832.k3A8Wox5029504@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/jpilot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29472

Modified Files:
	jpilot.spec 
Added Files:
	jpilot-0.99.8-memory.patch jpilot-0.99.8-sync.patch 
Log Message:
- add upstream memory patch (#188425)
- add upstream sync patch


jpilot-0.99.8-memory.patch:
 utils.c |    3 ---
 1 files changed, 3 deletions(-)

--- NEW FILE jpilot-0.99.8-memory.patch ---
--- jpilot-0.99.8/utils.c.mem	2005-10-28 03:17:40.000000000 +0200
+++ jpilot-0.99.8/utils.c	2006-04-10 09:21:48.000000000 +0200
@@ -2042,9 +2042,6 @@
       fwrite(RecordBuffer->data, header.rec_len, 1, pc_in);
 #endif /* PILOT_LINK_0_12 */
       jp_logf(JP_LOG_DEBUG, "record deleted\n");
-#ifdef PILOT_LINK_0_12
-      pi_buffer_free(RecordBuffer);
-#endif /* PILOT_LINK_0_12 */
       fclose(pc_in);
 #ifdef PILOT_LINK_0_12
       pi_buffer_free(RecordBuffer);

jpilot-0.99.8-sync.patch:
 jpilot-sync.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE jpilot-0.99.8-sync.patch ---
--- jpilot-0.99.8/jpilot-sync.c.sync	2005-01-28 17:54:13.000000000 +0100
+++ jpilot-0.99.8/jpilot-sync.c	2006-04-10 10:03:46.000000000 +0200
@@ -44,6 +44,7 @@
 pid_t glob_child_pid;
 GtkWidget *glob_dialog;
 pid_t glob_child_pid;
+GtkTooltips *glob_tooltips;
 
 unsigned char skip_plugins;
 


Index: jpilot.spec
===================================================================
RCS file: /cvs/dist/rpms/jpilot/devel/jpilot.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- jpilot.spec	29 Mar 2006 21:24:32 -0000	1.33
+++ jpilot.spec	10 Apr 2006 08:32:47 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: Jpilot pilot desktop software
 Name: jpilot
 Version: 0.99.8
-Release: 4
+Release: 5
 License: GPL
 Group: Applications/Productivity
 URL: http://jpilot.org
@@ -15,6 +15,8 @@
 Patch2: jpilot-0.99.8-curday.patch
 Patch3: jpilot-0.99.8-overfl.patch
 Patch4: jpilot-0.99.8-sf.patch
+Patch5: jpilot-0.99.8-memory.patch
+Patch6: jpilot-0.99.8-sync.patch
 
 BuildPrereq: gtk2-devel >= 2.0.3
 BuildPrereq: pilot-link-devel
@@ -34,6 +36,8 @@
 %patch2 -p1 -b .curday
 %patch3 -p1 -b .overfl
 %patch4 -p1 -b .sf
+%patch5 -p1 -b .mem
+%patch6 -p1 -b .sync
 
 %build
 %configure \
@@ -81,6 +85,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Mon Apr 10 2006 Ivana Varekova <varekova at redhat.com> 0.99.8-5
+- add upstream memory patch (#188425)
+- add upstream sync patch
+
 * Wed Mar 29 2006 Than Ngo <than at redhat.com> 0.99.8-4 
 - rebuilt against pilot-link-0.11.8
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 08:53:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 04:53:24 -0400
Subject: rpms/joe/devel joe-3.3-polish.patch,NONE,1.1 joe.spec,1.28,1.29
Message-ID: <200604100853.k3A8rOpW011108@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/joe/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11041

Modified Files:
	joe.spec 
Added Files:
	joe-3.3-polish.patch 
Log Message:
- fix problem with Polish characters - bug 188235


joe-3.3-polish.patch:
 joerc.in |   11 +----------
 1 files changed, 1 insertion(+), 10 deletions(-)

--- NEW FILE joe-3.3-polish.patch ---
--- joe-3.3/joerc.in	2006-04-07 23:13:59.000000000 +0200
+++ joe-3.3/joerc.in.pom	2006-04-08 19:48:45.000000000 +0200
@@ -1033,7 +1033,7 @@
 
  Keys:
 
- Use ^@ through ^_ , ^# and ^? for Ctrl chars
+ Use ^@ through ^_ and ^? for Ctrl chars
  Use SP for space
  Use a TO b to generate a range of characters
  Use MDOWN, MDRAG, MUP, M2DOWN, M2DRAG, M2UP, M3DOWN, M3DRAG, M3UP for mouse
@@ -1104,11 +1104,9 @@
 pgdn		.kN		Screen down
 pgdn		^V
 pgdn		^[ [ 6 ~
-pgdn      ^# S
 pgup		.kP		Screen up
 pgup		^U
 pgup		^[ [ 5 ~
-pgup      ^# T
 play		^K 0 TO 9	Execute macro
 prevw		^K P		Goto previous window
 prevw		^K ^P
@@ -1183,13 +1181,11 @@
 home			^[ [ H			Xterm, Konsole, SCO
 home			^[ O H			gnome-terminal
 home			^[ [ 7 ~		RxVT
-home			^# SP A		Amiga
 
 eol			^[ [ 4 ~		Putty, Linux, Cygwin, ssh
 eol			^[ [ F			Xterm, Konsole, SCO
 eol			^[ O F			gnome-terminal
 eol			^[ [ 8 ~		RxVT
-eol			^# SP @		Amiga
 
 rtarw,ltarw,begin_marking,rtarw,toggle_marking	^[ [ 1 ; 5 C    Mark right Xterm
 rtarw,ltarw,begin_marking,rtarw,toggle_marking	^[ [ 5 C        Mark right Gnome-terminal
@@ -1326,7 +1322,6 @@
 bof		^K u
  bol		.kh		Goto beginning of line
  bol		^A
- bol      ^# SP A
 home		.kh
 home		^A
 center		^K A		Center line
@@ -1343,7 +1338,6 @@
 dnarw		^N
 dnarw		^[ O B
 dnarw		^[ [ B
-dnarw		^# B
 edit		^K E		Edit a file
 edit		^K ^E
 edit		^K e
@@ -1382,7 +1376,6 @@
 ltarw		^B
 ltarw		^[ O D
 ltarw		^[ [ D
-ltarw          ^# D
 macros		^[ d		Dump keyboard macros
 macros		^[ ^D
 markb		^K B		Set beginning of marked block
@@ -1407,7 +1400,6 @@
 rtarw		^F
 rtarw		^[ O C
 rtarw		^[ [ C
-rtarw          ^# C
 run		^K !		Run a shell command
 save		^K D		Save file
 save		^K S
@@ -1427,7 +1419,6 @@
 tomatch		^G		Goto matching parenthasis
 undo		^_		Undo changes
 uparw		.ku		Go up
-uparw		^# A
 uparw		^P
 uparw		^[ O A
 uparw		^[ [ A


Index: joe.spec
===================================================================
RCS file: /cvs/dist/rpms/joe/devel/joe.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- joe.spec	1 Mar 2006 11:59:44 -0000	1.28
+++ joe.spec	10 Apr 2006 08:53:22 -0000	1.29
@@ -3,7 +3,7 @@
 Summary: An easy to use, modeless text editor.
 Name: joe
 Version: 3.3
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/Editors
 Source: http://prdownloads.sourceforge.net/joe-editor/joe-%{version}.tar.gz
@@ -15,6 +15,7 @@
 Patch2: joe-3.1-selinux.patch
 Patch4: joe-3.1-ret.patch
 Patch5: joe-3.3-head.patch
+Patch6: joe-3.3-polish.patch
 
 %description
 Joe is a powerful, easy to use, modeless text editor.
@@ -27,6 +28,7 @@
 %patch2 -p1 -b .selinux
 %patch4 -p1 -b .ret
 %patch5 -p1 -b .head
+%patch6 -p1 -b .pol
 
 %build
 %configure
@@ -56,6 +58,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 10 2006 Ivana Varekova <varekova at redhat.com> 3.3-3
+- fix problem with Polish characters - bug 188235
+
 * Wed Mar  1 2006 Ivana Varekova <varekova at redhat.com> 3.3-2
 - add forgotten header files - bug 183455
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 10:34:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 06:34:25 -0400
Subject: rpms/ghostscript/devel ghostscript.spec,1.107,1.108
Message-ID: <200604101034.k3AAYPT1021207@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21193

Modified Files:
	ghostscript.spec 
Log Message:
* Mon Apr 10 2006 Tim Waugh <twaugh at redhat.com> 8.15.1-9
- Add %{_datadir}/fonts/japanese to font path (bug #188448).



Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- ghostscript.spec	8 Apr 2006 09:57:54 -0000	1.107
+++ ghostscript.spec	10 Apr 2006 10:34:23 -0000	1.108
@@ -5,7 +5,7 @@
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 8
+Release: 9
 
 License: GPL
 URL: http://www.cups.org/espgs/
@@ -129,6 +129,7 @@
 	%{_datadir}/fonts/default/Type1 \
 	%{_datadir}/fonts/default/amspsfnt/pfb \
 	%{_datadir}/fonts/default/cmpsfont/pfb \
+	%{_datadir}/fonts/japanese \
 	%{_sysconfdir}/%{name}
 do
   FONTPATH="$FONTPATH${FONTPATH:+:}$path"
@@ -273,6 +274,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Apr 10 2006 Tim Waugh <twaugh at redhat.com> 8.15.1-9
+- Add %%{_datadir}/fonts/japanese to font path (bug #188448).
+
 * Sat Apr  8 2006 Tim Waugh <twaugh at redhat.com>
 - Build requires libtool (bug #188341).
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 10:39:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 06:39:08 -0400
Subject: rpms/ghostscript/devel ghostscript.spec,1.108,1.109
Message-ID: <200604101039.k3AAd8DZ021286@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21274

Modified Files:
	ghostscript.spec 
Log Message:
- Spec file cleanups (bug #188066).


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- ghostscript.spec	10 Apr 2006 10:34:23 -0000	1.108
+++ ghostscript.spec	10 Apr 2006 10:39:03 -0000	1.109
@@ -29,10 +29,9 @@
 Patch11: ghostscript-krgb.patch
 Patch12: espgs-pdfwrite.patch
 
-Requires: zlib, libpng, glib2
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: libjpeg-devel, libXt-devel
-BuildRequires: zlib, zlib-devel, libpng, libpng-devel, unzip, gtk2-devel
+BuildRequires: zlib-devel, libpng-devel, unzip, gtk2-devel
 BuildRequires: glib2-devel, gnutls-devel
 # Omni requires libxml
 BuildRequires: libxml2-devel
@@ -181,7 +180,7 @@
 %makeinstall
 cd ..
 
-ln -sf gs.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/ghostscript.1.gz
+echo ".so man1/gs.1" > $RPM_BUILD_ROOT/%{_mandir}/man1/ghostscript.1
 ln -sf gs $RPM_BUILD_ROOT/usr/bin/ghostscript
 
 # Rename an original FAPIcidfmap to FAPIcidfmap.GS
@@ -237,6 +236,10 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 %files -f rpm.sharelist
 %defattr(-,root,root)
 %dir /etc/ghostscript
@@ -269,13 +272,10 @@
 %{_bindir}/ijs-config
 %{_libdir}/libijs.*a
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
 %changelog
 * Mon Apr 10 2006 Tim Waugh <twaugh at redhat.com> 8.15.1-9
 - Add %%{_datadir}/fonts/japanese to font path (bug #188448).
+- Spec file cleanups (bug #188066).
 
 * Sat Apr  8 2006 Tim Waugh <twaugh at redhat.com>
 - Build requires libtool (bug #188341).



From fedora-cvs-commits at redhat.com  Mon Apr 10 10:41:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 06:41:02 -0400
Subject: rpms/ghostscript/FC-5 ghostscript.spec,1.104,1.105
Message-ID: <200604101041.k3AAf2ZY021362@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	ghostscript.spec 
Log Message:
* Mon Apr 10 2006 Tim Waugh <twaugh at redhat.com> 8.15.1-7.2
- Add %{_datadir}/fonts/japanese to font path (bug #188448).



Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/FC-5/ghostscript.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- ghostscript.spec	6 Apr 2006 11:01:24 -0000	1.104
+++ ghostscript.spec	10 Apr 2006 10:40:57 -0000	1.105
@@ -5,7 +5,7 @@
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 7.1
+Release: 7.2
 
 License: GPL
 URL: http://www.cups.org/espgs/
@@ -128,6 +128,7 @@
 	%{_datadir}/fonts/default/Type1 \
 	%{_datadir}/fonts/default/amspsfnt/pfb \
 	%{_datadir}/fonts/default/cmpsfont/pfb \
+	%{_datadir}/fonts/japanese \
 	%{_sysconfdir}/%{name}
 do
   FONTPATH="$FONTPATH${FONTPATH:+:}$path"
@@ -289,6 +290,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Apr 10 2006 Tim Waugh <twaugh at redhat.com> 8.15.1-7.2
+- Add %%{_datadir}/fonts/japanese to font path (bug #188448).
+
 * Thu Apr  6 2006 Tim Waugh <twaugh at redhat.com> 8.15.1-7.1
 - Fix pdfwrite (bug #187834).
 - Put pstopxl in both lib and lib64 CUPS filter directories on lib64



From fedora-cvs-commits at redhat.com  Mon Apr 10 12:15:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 08:15:10 -0400
Subject: rpms/selinux-policy/devel selinux-policy.spec,1.168,1.169
Message-ID: <200604101215.k3ACFAoL031400@cvs.devel.redhat.com>

Author: rcoker

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

Modified Files:
	selinux-policy.spec 
Log Message:
Change file contexts and several minor policy changes.



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- selinux-policy.spec	6 Apr 2006 19:08:54 -0000	1.168
+++ selinux-policy.spec	10 Apr 2006 12:15:07 -0000	1.169
@@ -16,11 +16,13 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.29
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
-patch: policy-20060323.patch
+patch1: policy-20060323.patch
+patch2: file_contexts.patch
+patch3: policy-200604.patch
 Source1: modules-targeted.conf
 Source2: booleans-targeted.conf
 Source3: Makefile.devel
@@ -148,7 +150,9 @@
 
 %prep 
 %setup -q -n serefpolicy-%{version}
-%patch -p1 
+%patch1 -p1 
+%patch2 -p1 
+%patch3 -p1 
 
 %install
 # Build targeted policy
@@ -320,6 +324,26 @@
 %endif
 
 %changelog
+* Mon Apr 10 2006 Russell Coker <rcoker at redhat.com> 2.2.29-5
+- Fixed mailman with Postfix #183928
+- Allowed semanage to create file_context files.
+- Allowed amanda_t to access inetd_t TCP sockets and allowed amanda_recover_t
+  to bind to reserved ports.  #149030
+- Don't allow devpts_t to be associated with tmp_t.
+- Allow hald_t to stat all mountpoints.
+- Added boolean samba_share_nfs to allow smbd_t full access to NFS mounts.
+  #169947
+- Make mount run in mount_t domain from unconfined_t to prevent mislabeling of
+  /etc/mtab.
+- Changed the file_contexts to not have a regex before the first ^/[a-z]/
+  whenever possible, makes restorecon slightly faster.
+- Correct the label of /etc/named.caching-nameserver.conf
+- Now label /usr/src/kernels/.+/lib(/.*)? as usr_t instead of
+  /usr/src(/.*)?/lib(/.*)? - I don't think we need anything else under /usr/src
+  hit by this.
+- Granted xen access to /boot, allowed mounting on xend_var_lib_t, and allowed
+  xenstored_t rw access to the xen device node.
+
 * Mon Mar 30 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-4
 - More textrel_shlib_t file path fixes
 - Add ada support



From fedora-cvs-commits at redhat.com  Mon Apr 10 12:16:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 08:16:14 -0400
Subject: rpms/selinux-policy/devel file_contexts.patch, NONE,
	1.1 policy-200604.patch, NONE, 1.1
Message-ID: <200604101216.k3ACGEsW004646@cvs.devel.redhat.com>

Author: rcoker

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

Added Files:
	file_contexts.patch policy-200604.patch 
Log Message:
Optimise file contexts slightly for performance and fix several policy bugs.


file_contexts.patch:
 admin/su.fc            |    2 +-
 apps/java.fc           |    2 +-
 kernel/corecommands.fc |   18 ++++++++++--------
 kernel/devices.fc      |    3 ++-
 kernel/files.fc        |   35 +++++++++++++++++++++++------------
 services/kerberos.fc   |    4 ++--
 services/tftp.fc       |    3 ++-
 system/authlogin.fc    |    3 ++-
 system/daemontools.fc  |    3 ++-
 system/libraries.fc    |   39 ++++++++++++++++++++++-----------------
 system/miscfiles.fc    |    2 +-
 system/modutils.fc     |    6 ++++--
 12 files changed, 72 insertions(+), 48 deletions(-)

--- NEW FILE file_contexts.patch ---
diff -ru serefpolicy-2.2.29.orig/policy/modules/admin/su.fc serefpolicy-2.2.29.fc/policy/modules/admin/su.fc
--- serefpolicy-2.2.29.orig/policy/modules/admin/su.fc	2006-04-01 03:11:34.000000000 +1100
+++ serefpolicy-2.2.29.fc/policy/modules/admin/su.fc	2006-04-10 20:53:28.000000000 +1000
@@ -1,5 +1,5 @@
 
 /bin/su			--	gen_context(system_u:object_r:su_exec_t,s0)
 
-/usr(/local)?/bin/ksu	--	gen_context(system_u:object_r:su_exec_t,s0)
+/usr/(local/)?bin/ksu	--	gen_context(system_u:object_r:su_exec_t,s0)
 /usr/bin/kdesu		--	gen_context(system_u:object_r:su_exec_t,s0)
diff -ru serefpolicy-2.2.29.orig/policy/modules/apps/java.fc serefpolicy-2.2.29.fc/policy/modules/apps/java.fc
--- serefpolicy-2.2.29.orig/policy/modules/apps/java.fc	2006-04-10 20:52:58.000000000 +1000
+++ serefpolicy-2.2.29.fc/policy/modules/apps/java.fc	2006-04-10 20:53:28.000000000 +1000
@@ -1,7 +1,7 @@
 #
 # /usr
 #
-/usr(/.*)?/bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
+/usr/(.*/)?bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
 /usr/bin/gcj-dbtool	--	gen_context(system_u:object_r:java_exec_t,s0)
 /usr/bin/gij		--	gen_context(system_u:object_r:java_exec_t,s0)
 /opt(/.*)?/bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
diff -ru serefpolicy-2.2.29.orig/policy/modules/kernel/corecommands.fc serefpolicy-2.2.29.fc/policy/modules/kernel/corecommands.fc
--- serefpolicy-2.2.29.orig/policy/modules/kernel/corecommands.fc	2006-04-01 03:11:34.000000000 +1100
+++ serefpolicy-2.2.29.fc/policy/modules/kernel/corecommands.fc	2006-04-10 20:53:28.000000000 +1000
@@ -2,7 +2,8 @@
 #
 # /bin
 #
-/bin(/.*)?				gen_context(system_u:object_r:bin_t,s0)
+/bin				-d	gen_context(system_u:object_r:bin_t,s0)
+/bin/.*					gen_context(system_u:object_r:bin_t,s0)
 /bin/d?ash			--	gen_context(system_u:object_r:shell_exec_t,s0)
 /bin/bash			--	gen_context(system_u:object_r:shell_exec_t,s0)
 /bin/bash2			--	gen_context(system_u:object_r:shell_exec_t,s0)
@@ -86,27 +87,28 @@
 #
 # /sbin
 #
-/sbin(/.*)?				gen_context(system_u:object_r:sbin_t,s0)
+/sbin				-d	gen_context(system_u:object_r:sbin_t,s0)
+/sbin/.*				gen_context(system_u:object_r:sbin_t,s0)
 /sbin/mkfs\.cramfs		--	gen_context(system_u:object_r:sbin_t,s0)
 /sbin/insmod_ksymoops_clean	--	gen_context(system_u:object_r:sbin_t,s0)
 
 #
 # /opt
 #
-/opt(/.*)?/bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
+/opt/(.*/)?bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
 
-/opt(/.*)?/libexec(/.*)?		gen_context(system_u:object_r:bin_t,s0)
+/opt/(.*/)?libexec(/.*)?		gen_context(system_u:object_r:bin_t,s0)
 
-/opt(/.*)?/sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
+/opt/(.*/)?sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
 
 #
 # /usr
 #
-/usr(/.*)?/Bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
+/usr/(.*/)?Bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
 
-/usr(/.*)?/bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
+/usr/(.*/)?bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
 
-/usr(/.*)?/sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
+/usr/(.*/)?sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
 
 /usr/lib/ccache/bin(/.*)?		gen_context(system_u:object_r:bin_t,s0)
 /usr/lib/pgsql/test/regress/.*\.sh --	gen_context(system_u:object_r:bin_t,s0)
diff -ru serefpolicy-2.2.29.orig/policy/modules/kernel/devices.fc serefpolicy-2.2.29.fc/policy/modules/kernel/devices.fc
--- serefpolicy-2.2.29.orig/policy/modules/kernel/devices.fc	2006-04-10 20:52:58.000000000 +1000
+++ serefpolicy-2.2.29.fc/policy/modules/kernel/devices.fc	2006-04-10 20:53:29.000000000 +1000
@@ -1,5 +1,6 @@
 
-/dev(/.*)?			gen_context(system_u:object_r:device_t,s0)
+/dev			-d	gen_context(system_u:object_r:device_t,s0)
+/dev/.*				gen_context(system_u:object_r:device_t,s0)
 
 /dev/.*mouse.*		-c	gen_context(system_u:object_r:mouse_device_t,s0)
 /dev/adsp		-c	gen_context(system_u:object_r:sound_device_t,s0)
diff -ru serefpolicy-2.2.29.orig/policy/modules/kernel/files.fc serefpolicy-2.2.29.fc/policy/modules/kernel/files.fc
--- serefpolicy-2.2.29.orig/policy/modules/kernel/files.fc	2006-04-01 03:11:34.000000000 +1100
+++ serefpolicy-2.2.29.fc/policy/modules/kernel/files.fc	2006-04-10 20:53:29.000000000 +1000
@@ -25,7 +25,8 @@
 #
 # /boot
 #
-/boot(/.*)?			gen_context(system_u:object_r:boot_t,s0)
+/boot			-d	gen_context(system_u:object_r:boot_t,s0)
+/boot/.*			gen_context(system_u:object_r:boot_t,s0)
 /boot/\.journal			<<none>>
 /boot/lost\+found	-d	gen_context(system_u:object_r:lost_found_t,s15:c0.c255)
 /boot/lost\+found/.*		<<none>>
@@ -36,13 +37,15 @@
 #
 
 ifdef(`distro_redhat',`
-/emul(/.*)?			gen_context(system_u:object_r:usr_t,s0)
+/emul			-d	gen_context(system_u:object_r:usr_t,s0)
+/emul/.*			gen_context(system_u:object_r:usr_t,s0)
 ')
 
 #
 # /etc
 #
-/etc(/.*)?			gen_context(system_u:object_r:etc_t,s0)
+/etc			-d	gen_context(system_u:object_r:etc_t,s0)
+/etc/.*				gen_context(system_u:object_r:etc_t,s0)
 /etc/\.fstab\.hal\..+	--	gen_context(system_u:object_r:etc_runtime_t,s0)
 /etc/asound\.state	--	gen_context(system_u:object_r:etc_runtime_t,s0)
 /etc/blkid(/.*)?		gen_context(system_u:object_r:etc_runtime_t,s0)
@@ -104,7 +107,8 @@
 #
 # /lib(64)?
 #
-/lib(64)?/modules(/.*)?		gen_context(system_u:object_r:modules_object_t,s0)
+/lib/modules(/.*)?		gen_context(system_u:object_r:modules_object_t,s0)
+/lib64/modules(/.*)?		gen_context(system_u:object_r:modules_object_t,s0)
 
 #
 # /lost+found
@@ -139,29 +143,34 @@
 #
 # /opt
 #
-/opt(/.*)?			gen_context(system_u:object_r:usr_t,s0)
+/opt			-d	gen_context(system_u:object_r:usr_t,s0)
+/opt/.*				gen_context(system_u:object_r:usr_t,s0)
 
-/opt(/.*)?/var/lib(64)?(/.*)?	gen_context(system_u:object_r:var_lib_t,s0)
+/opt/(.*/)?var/lib(64)?(/.*)?	gen_context(system_u:object_r:var_lib_t,s0)
 
 #
 # /proc
 #
-/proc(/.*)?                     <<none>>
+/proc			-d	<<none>>
+/proc/.*			<<none>>
 
 #
 # /selinux
 #
-/selinux(/.*)?                  <<none>>
+/selinux		-d	<<none>>
+/selinux/.*			<<none>>
 
 #
 # /srv
 #
-/srv(/.*)?			gen_context(system_u:object_r:var_t,s0)
+/srv			-d	gen_context(system_u:object_r:var_t,s0)
+/srv/.*				gen_context(system_u:object_r:var_t,s0)
 
 #
 # /sys
 #
-/sys(/.*)?                      <<none>>
+/sys			-d	<<none>>
+/sys/.*				<<none>>
 
 #
 # /tmp
@@ -176,7 +185,8 @@
 #
 # /usr
 #
-/usr(/.*)?			gen_context(system_u:object_r:usr_t,s0)
+/usr			-d	gen_context(system_u:object_r:usr_t,s0)
+/usr/.*				gen_context(system_u:object_r:usr_t,s0)
 /usr/\.journal			<<none>>
 
 /usr/doc(/.*)?/lib(/.*)?		gen_context(system_u:object_r:usr_t,s0)
@@ -208,7 +218,8 @@
 #
 # /var
 #
-/var(/.*)?			gen_context(system_u:object_r:var_t,s0)
+/var			-d	gen_context(system_u:object_r:var_t,s0)
+/var/.*				gen_context(system_u:object_r:var_t,s0)
 /var/\.journal			<<none>>
 
 /var/db/.*\.db		--	gen_context(system_u:object_r:etc_t,s0)
diff -ru serefpolicy-2.2.29.orig/policy/modules/services/kerberos.fc serefpolicy-2.2.29.fc/policy/modules/services/kerberos.fc
--- serefpolicy-2.2.29.orig/policy/modules/services/kerberos.fc	2006-04-01 03:11:34.000000000 +1100
+++ serefpolicy-2.2.29.fc/policy/modules/services/kerberos.fc	2006-04-10 20:53:29.000000000 +1000
@@ -5,8 +5,8 @@
 /etc/krb5kdc/kadm5.keytab 	--	gen_context(system_u:object_r:krb5_keytab_t,s0)
 /etc/krb5kdc/principal.*		gen_context(system_u:object_r:krb5kdc_principal_t,s0)
 
-/usr(/local)?(/kerberos)?/sbin/krb5kdc -- gen_context(system_u:object_r:krb5kdc_exec_t,s0)
-/usr(/local)?(/kerberos)?/sbin/kadmind -- gen_context(system_u:object_r:kadmind_exec_t,s0)
+/usr/(local/)?(kerberos/)?sbin/krb5kdc -- gen_context(system_u:object_r:krb5kdc_exec_t,s0)
+/usr/(local/)?(kerberos/)?sbin/kadmind -- gen_context(system_u:object_r:kadmind_exec_t,s0)
 
 /usr/local/var/krb5kdc(/.*)?		gen_context(system_u:object_r:krb5kdc_conf_t,s0)
 /usr/local/var/krb5kdc/principal.*	gen_context(system_u:object_r:krb5kdc_principal_t,s0)
diff -ru serefpolicy-2.2.29.orig/policy/modules/services/tftp.fc serefpolicy-2.2.29.fc/policy/modules/services/tftp.fc
--- serefpolicy-2.2.29.orig/policy/modules/services/tftp.fc	2006-04-01 03:11:34.000000000 +1100
+++ serefpolicy-2.2.29.fc/policy/modules/services/tftp.fc	2006-04-10 20:53:29.000000000 +1000
@@ -2,4 +2,5 @@
 /usr/sbin/atftpd	--	gen_context(system_u:object_r:tftpd_exec_t,s0)
 /usr/sbin/in\.tftpd	--	gen_context(system_u:object_r:tftpd_exec_t,s0)
 
-/tftpboot(/.*)?			gen_context(system_u:object_r:tftpdir_t,s0)
+/tftpboot		-d	gen_context(system_u:object_r:tftpdir_t,s0)
+/tftpboot/.*			gen_context(system_u:object_r:tftpdir_t,s0)
diff -ru serefpolicy-2.2.29.orig/policy/modules/system/authlogin.fc serefpolicy-2.2.29.fc/policy/modules/system/authlogin.fc
--- serefpolicy-2.2.29.orig/policy/modules/system/authlogin.fc	2006-04-01 03:11:34.000000000 +1100
+++ serefpolicy-2.2.29.fc/policy/modules/system/authlogin.fc	2006-04-10 20:53:29.000000000 +1000
@@ -7,7 +7,8 @@
 /etc/passwd\.lock	--	gen_context(system_u:object_r:shadow_t,s0)
 /etc/shadow.*		--	gen_context(system_u:object_r:shadow_t,s0)
 
-/lib(64)?/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:pam_exec_t,s0)
+/lib/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:pam_exec_t,s0)
+/lib64/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:pam_exec_t,s0)
 
 /sbin/pam_console_apply	 --	gen_context(system_u:object_r:pam_console_exec_t,s0)
 /sbin/pam_timestamp_check --	gen_context(system_u:object_r:pam_exec_t,s0)
diff -ru serefpolicy-2.2.29.orig/policy/modules/system/daemontools.fc serefpolicy-2.2.29.fc/policy/modules/system/daemontools.fc
--- serefpolicy-2.2.29.orig/policy/modules/system/daemontools.fc	2006-04-01 03:11:34.000000000 +1100
+++ serefpolicy-2.2.29.fc/policy/modules/system/daemontools.fc	2006-04-10 20:53:29.000000000 +1000
@@ -2,7 +2,8 @@
 # /service
 #
 
-/service(/.*)?			gen_context(system_u:object_r:svc_svc_t,s0)
+/service		-d	gen_context(system_u:object_r:svc_svc_t,s0)
+/service/.*			gen_context(system_u:object_r:svc_svc_t,s0)
 
 #
 # /usr
diff -ru serefpolicy-2.2.29.orig/policy/modules/system/libraries.fc serefpolicy-2.2.29.fc/policy/modules/system/libraries.fc
--- serefpolicy-2.2.29.orig/policy/modules/system/libraries.fc	2006-04-10 20:52:58.000000000 +1000
+++ serefpolicy-2.2.29.fc/policy/modules/system/libraries.fc	2006-04-10 20:53:29.000000000 +1000
@@ -24,15 +24,20 @@
 #
 # /lib(64)?
 #
-/lib(64)?(/.*)?					gen_context(system_u:object_r:lib_t,s0)
-/lib(64)?/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
-/lib(64)?(/.*)?/ld-[^/]*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:ld_so_t,s0)
+/lib					-d	gen_context(system_u:object_r:lib_t,s0)
+/lib/.*						gen_context(system_u:object_r:lib_t,s0)
+/lib64					-d	gen_context(system_u:object_r:lib_t,s0)
+/lib64/.*					gen_context(system_u:object_r:lib_t,s0)
+/lib/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
+/lib64/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
+/lib/(.*/)?ld-[^/]*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:ld_so_t,s0)
+/lib64/(.*/)?ld-[^/]*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:ld_so_t,s0)
 
 #
 # /opt
 #
-/opt(/.*)?/lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
-/opt(/.*)?/lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
+/opt/(.*/)?lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
+/opt/(.*/)?lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
 /opt/.*/jre.*/libdeploy.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /opt/.*/jre.*/libjvm.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 
@@ -44,18 +49,18 @@
 #
 # /usr
 #
-/usr(/.*)?/HelixPlayer/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+/usr/(.*/)?HelixPlayer/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 
-/usr(/.*)?/java/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-/usr(/.*)?/java/.*\.jar			--	gen_context(system_u:object_r:shlib_t,s0)
-/usr(/.*)?/java/.*\.jsa			--	gen_context(system_u:object_r:shlib_t,s0)
+/usr/(.*/)?java/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+/usr/(.*/)?java/.*\.jar			--	gen_context(system_u:object_r:shlib_t,s0)
+/usr/(.*/)?java/.*\.jsa			--	gen_context(system_u:object_r:shlib_t,s0)
 
-/usr(/.*)?/lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
-/usr(/.*)?/lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
+/usr/(.*/)?lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
+/usr/(.*/)?lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
 
-/usr(/.*)?/lib(64)?(/.*)?/ld-[^/]*\.so(\.[^/]*)* gen_context(system_u:object_r:ld_so_t,s0)
+/usr/(.*/)?lib(64)?(/.*)?/ld-[^/]*\.so(\.[^/]*)* gen_context(system_u:object_r:ld_so_t,s0)
 
-/usr(/.*)?/nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+/usr/(.*/)?nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 
 /usr(/.*)?/lib(64)?(/.*)?/nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 
@@ -130,7 +135,7 @@
 /usr/lib(64)?/.*/program/libsvx680li\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?/.*/program/libcomphelp4gcc3\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?/.*/program/libsoffice\.so  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-/usr(/.*)?/pcsc/drivers(/.*)?/lib(cm2020|cm4000|SCR24x)\.so(\.[^/]*)*  		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+/usr/(.*/)?pcsc/drivers(/.*)?/lib(cm2020|cm4000|SCR24x)\.so(\.[^/]*)*  		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 
 /usr/lib(64)?/firefox.*\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?/mozilla.*\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -185,9 +190,9 @@
 /usr/.*/jre.*/libdeploy.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/.*/jre.*/libjvm.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 
-/usr(/.*)?/intellinux/nppdf\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0)
-/usr(/.*)?/intellinux/lib/\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0)
-/usr(/.*)?/intellinux/plug_ins/.*\.api -- gen_context(system_u:object_r:texrel_shlib_t,s0)
+/usr/(.*/)?intellinux/nppdf\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0)
+/usr/(.*/)?intellinux/lib/\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0)
+/usr/(.*/)?intellinux/plug_ins/.*\.api -- gen_context(system_u:object_r:texrel_shlib_t,s0)
 ') dnl end distro_redhat
 
 ifdef(`distro_suse',`
diff -ru serefpolicy-2.2.29.orig/policy/modules/system/miscfiles.fc serefpolicy-2.2.29.fc/policy/modules/system/miscfiles.fc
--- serefpolicy-2.2.29.orig/policy/modules/system/miscfiles.fc	2006-04-01 03:11:34.000000000 +1100
+++ serefpolicy-2.2.29.fc/policy/modules/system/miscfiles.fc	2006-04-10 20:53:29.000000000 +1000
@@ -7,7 +7,7 @@
 #
 # /opt
 #
-/opt(/.*)?/man(/.*)?		gen_context(system_u:object_r:man_t,s0)
+/opt/(.*/)?man(/.*)?		gen_context(system_u:object_r:man_t,s0)
 
 #
 # /srv
diff -ru serefpolicy-2.2.29.orig/policy/modules/system/modutils.fc serefpolicy-2.2.29.fc/policy/modules/system/modutils.fc
--- serefpolicy-2.2.29.orig/policy/modules/system/modutils.fc	2006-04-01 03:11:34.000000000 +1100
+++ serefpolicy-2.2.29.fc/policy/modules/system/modutils.fc	2006-04-10 20:53:29.000000000 +1000
@@ -2,9 +2,11 @@
 /etc/modules\.conf.*	--	gen_context(system_u:object_r:modules_conf_t,s0)
 /etc/modprobe\.conf.*	--	gen_context(system_u:object_r:modules_conf_t,s0)
 
-/lib(64)?/modules/[^/]+/modules\..+ -- gen_context(system_u:object_r:modules_dep_t,s0)
+/lib/modules/[^/]+/modules\..+ -- gen_context(system_u:object_r:modules_dep_t,s0)
+/lib64/modules/[^/]+/modules\..+ -- gen_context(system_u:object_r:modules_dep_t,s0)
 
-/lib(64)?/modules/modprobe\.conf -- gen_context(system_u:object_r:modules_conf_t,s0)
+/lib/modules/modprobe\.conf -- gen_context(system_u:object_r:modules_conf_t,s0)
+/lib64/modules/modprobe\.conf -- gen_context(system_u:object_r:modules_conf_t,s0)
 
 /sbin/depmod.*		--	gen_context(system_u:object_r:depmod_exec_t,s0)
 /sbin/generate-modprobe\.conf -- gen_context(system_u:object_r:update_modules_exec_t,s0)

policy-200604.patch:
 mcs                           |    6 +++++-
 modules/admin/amanda.te       |    5 ++++-
 modules/kernel/devices.if     |    4 ++--
 modules/kernel/files.fc       |    2 +-
 modules/kernel/files.if       |   32 ++++++++++++--------------------
 modules/kernel/mcs.te         |    4 ++++
 modules/kernel/terminal.te    |    1 -
 modules/services/bind.fc      |    1 +
 modules/services/hal.te       |    1 +
 modules/services/mailman.if   |   38 ++++++++++++++++++++++++++++++++++++++
 modules/services/postfix.te   |    3 +++
 modules/services/samba.te     |    7 +++++++
 modules/system/init.te        |    5 -----
 modules/system/selinuxutil.if |    4 ++--
 modules/system/unconfined.te  |    2 ++
 modules/system/xen.te         |    5 +++++
 16 files changed, 87 insertions(+), 33 deletions(-)

--- NEW FILE policy-200604.patch ---
diff -ru serefpolicy-2.2.29.fc/policy/mcs serefpolicy-2.2.29/policy/mcs
--- serefpolicy-2.2.29.fc/policy/mcs	2006-04-01 03:11:34.000000000 +1100
+++ serefpolicy-2.2.29/policy/mcs	2006-04-10 20:54:22.000000000 +1000
@@ -134,14 +134,18 @@
 # the high range of the file.  We use the high range of the process so
 # that processes can always simply run at s0.
 #
-# Only files are constrained by MCS at this stage.
+# Note that getattr on files is always permitted.
 #
 mlsconstrain file { write setattr append unlink link rename ioctl lock execute relabelfrom }
 	( h1 dom h2 );
 
+# New filesystem object labels must be dominated by the relabeling subject
+# clearance, also the objects are single-level.
 mlsconstrain file { create relabelto }
 	(( h1 dom h2 ) and ( l2 eq h2 ));
 
+# At this time we do not restrict "ps" type operations via MCS.  This
+# will probably change in future.
 mlsconstrain file { read }
 	(( h1 dom h2 ) or ( t2 == domain ) or ( t1 == mlsfileread ));
 
diff -ru serefpolicy-2.2.29.fc/policy/modules/admin/amanda.te serefpolicy-2.2.29/policy/modules/admin/amanda.te
--- serefpolicy-2.2.29.fc/policy/modules/admin/amanda.te	2006-04-01 03:11:34.000000000 +1100
+++ serefpolicy-2.2.29/policy/modules/admin/amanda.te	2006-04-10 20:54:22.000000000 +1000
@@ -9,6 +9,7 @@
 type amanda_t;
 type amanda_inetd_exec_t;
 inetd_udp_service_domain(amanda_t,amanda_inetd_exec_t)
+inetd_tcp_service_domain(amanda_t,amanda_inetd_exec_t)
 role system_r types amanda_t;
 
 type amanda_exec_t;
@@ -183,13 +184,15 @@
 
 optional_policy(`
 	nscd_socket_use(amanda_t)
+	nscd_socket_use(amanda_recover_t)
 ')
 
 ########################################
 #
 # Amanda recover local policy
 
-allow amanda_recover_t self:capability { fowner fsetid kill setgid setuid chown dac_override net_bind_service };
+allow amanda_recover_t self:capability { fowner fsetid kill setgid setuid chown dac_override };
+corenet_tcp_bind_reserved_port(amanda_recover_t)
 allow amanda_recover_t self:process { sigkill sigstop signal };
 allow amanda_recover_t self:fifo_file { getattr ioctl read write };
 allow amanda_recover_t self:unix_stream_socket { connect create read write };
diff -ru serefpolicy-2.2.29.fc/policy/modules/kernel/devices.if serefpolicy-2.2.29/policy/modules/kernel/devices.if
--- serefpolicy-2.2.29.fc/policy/modules/kernel/devices.if	2006-04-10 20:52:58.000000000 +1000
+++ serefpolicy-2.2.29/policy/modules/kernel/devices.if	2006-04-10 21:58:00.000000000 +1000
@@ -2702,7 +2702,7 @@
 	')
 
 	allow $1 device_t:dir r_dir_perms;
-	allow $1 xen_device_t:chr_file r_file_perms;
+	allow $1 xen_device_t:chr_file rw_file_perms;
 ')
 
 ########################################
@@ -2721,7 +2721,7 @@
 	')
 
 	allow $1 device_t:dir r_dir_perms;
-	allow $1 xen_device_t:chr_file r_file_perms;
+	allow $1 xen_device_t:chr_file manage_file_perms;
 ')
 
 ########################################
diff -ru serefpolicy-2.2.29.fc/policy/modules/kernel/files.fc serefpolicy-2.2.29/policy/modules/kernel/files.fc
--- serefpolicy-2.2.29.fc/policy/modules/kernel/files.fc	2006-04-10 20:53:29.000000000 +1000
+++ serefpolicy-2.2.29/policy/modules/kernel/files.fc	2006-04-10 20:54:22.000000000 +1000
@@ -210,7 +210,7 @@
 /usr/share(/.*)?/lib(64)?(/.*)?	gen_context(system_u:object_r:usr_t,s0)
 
 /usr/src(/.*)?			gen_context(system_u:object_r:src_t,s0)
-/usr/src(/.*)?/lib(/.*)?		gen_context(system_u:object_r:usr_t,s0)
+/usr/src/kernels/.+/lib(/.*)?		gen_context(system_u:object_r:usr_t,s0)
 
 /usr/tmp			-d	gen_context(system_u:object_r:tmp_t,s0-s15:c0.c255)
 /usr/tmp/.*			<<none>>
diff -ru serefpolicy-2.2.29.fc/policy/modules/kernel/files.if serefpolicy-2.2.29/policy/modules/kernel/files.if
--- serefpolicy-2.2.29.fc/policy/modules/kernel/files.if	2006-04-10 20:52:58.000000000 +1000
+++ serefpolicy-2.2.29/policy/modules/kernel/files.if	2006-04-10 20:54:22.000000000 +1000
@@ -930,6 +930,18 @@
 
 ########################################
 #
+# files_stat_all_mountpoints(domain)
+#
+interface(`files_stat_all_mountpoints',`
+	gen_require(`
+		attribute mountpoint;
+	')
+
+	allow $1 mountpoint:dir { getattr };
+')
+
+########################################
+#
 # files_list_root(domain)
 #
 interface(`files_list_root',`
@@ -1192,26 +1204,6 @@
 
 ########################################
 ## <summary>
-##	Read and write symbolic links
-##	in the /boot directory.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`files_rw_boot_symlinks',`
-	gen_require(`
-		type boot_t;
-	')
-
-	allow $1 boot_t:dir r_dir_perms;
-	allow $1 boot_t:lnk_file rw_file_perms;
-')
-
-########################################
-## <summary>
 ##	Create, read, write, and delete symbolic links
 ##	in the /boot directory.
 ## </summary>
diff -ru serefpolicy-2.2.29.fc/policy/modules/kernel/mcs.te serefpolicy-2.2.29/policy/modules/kernel/mcs.te
--- serefpolicy-2.2.29.fc/policy/modules/kernel/mcs.te	2006-04-01 03:11:34.000000000 +1100
+++ serefpolicy-2.2.29/policy/modules/kernel/mcs.te	2006-04-10 20:54:22.000000000 +1000
@@ -32,6 +32,10 @@
 type xdm_exec_t;
 
 ifdef(`enable_mcs',`
+# The eventual plan is to have a range_transition to s0 for the daemon by
+# default and have the daemons which need to run with all categories be
+# exceptions.  But while range_transitions have to be in the base module
+# this is not possible.
 range_transition getty_t login_exec_t s0 - s0:c0.c255;
 range_transition init_t xdm_exec_t s0 - s0:c0.c255;
 range_transition initrc_t crond_exec_t s0 - s0:c0.c255;
diff -ru serefpolicy-2.2.29.fc/policy/modules/kernel/terminal.te serefpolicy-2.2.29/policy/modules/kernel/terminal.te
--- serefpolicy-2.2.29.fc/policy/modules/kernel/terminal.te	2006-04-01 03:11:34.000000000 +1100
+++ serefpolicy-2.2.29/policy/modules/kernel/terminal.te	2006-04-10 20:54:22.000000000 +1000
@@ -28,7 +28,6 @@
 type devpts_t;
 files_mountpoint(devpts_t)
 fs_associate_tmpfs(devpts_t)
-files_associate_tmp(devpts_t)
 fs_type(devpts_t)
 fs_use_trans devpts gen_context(system_u:object_r:devpts_t,s0);
 
diff -ru serefpolicy-2.2.29.fc/policy/modules/services/bind.fc serefpolicy-2.2.29/policy/modules/services/bind.fc
--- serefpolicy-2.2.29.fc/policy/modules/services/bind.fc	2006-04-01 03:11:34.000000000 +1100
+++ serefpolicy-2.2.29/policy/modules/services/bind.fc	2006-04-10 20:54:22.000000000 +1000
@@ -29,6 +29,7 @@
 
 ifdef(`distro_redhat',`
 /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)
 /var/named/data(/.*)?		gen_context(system_u:object_r:named_cache_t,s0)
diff -ru serefpolicy-2.2.29.fc/policy/modules/services/hal.te serefpolicy-2.2.29/policy/modules/services/hal.te
--- serefpolicy-2.2.29.fc/policy/modules/services/hal.te	2006-04-10 20:52:58.000000000 +1000
+++ serefpolicy-2.2.29/policy/modules/services/hal.te	2006-04-10 20:54:22.000000000 +1000
@@ -103,6 +103,7 @@
 fs_getattr_all_fs(hald_t)
 fs_search_all(hald_t)
 fs_list_auto_mountpoints(hald_t)
+files_stat_all_mountpoints(hald_t)
 
 mls_file_read_up(hald_t)
 
diff -ru serefpolicy-2.2.29.fc/policy/modules/services/mailman.if serefpolicy-2.2.29/policy/modules/services/mailman.if
--- serefpolicy-2.2.29.fc/policy/modules/services/mailman.if	2006-04-01 03:11:34.000000000 +1100
+++ serefpolicy-2.2.29/policy/modules/services/mailman.if	2006-04-10 20:54:22.000000000 +1000
@@ -200,6 +200,44 @@
 
 #######################################
 ## <summary>
+##	Allow domain to to create mailman data files and write the directory
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`mailman_create_data_file',`
+	gen_require(`
+		type mailman_data_t;
+	')
+
+	allow $1 mailman_data_t:dir rw_dir_perms;
+	allow $1 mailman_data_t:file create_file_perms;
+')
+
+#######################################
+## <summary>
+##	Allow domain to to read mailman data files
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`mailman_read_data_file',`
+	gen_require(`
+		type mailman_data_t;
+	')
+
+	allow $1 mailman_data_t:dir search_dir_perms;
+	allow $1 mailman_data_t:file read_file_perms;
+')
+
+#######################################
+## <summary>
 ##	List the contents of mailman data directories.
 ## </summary>
 ## <param name="domain">
diff -ru serefpolicy-2.2.29.fc/policy/modules/services/postfix.te serefpolicy-2.2.29/policy/modules/services/postfix.te
--- serefpolicy-2.2.29.fc/policy/modules/services/postfix.te	2006-04-01 03:11:34.000000000 +1100
+++ serefpolicy-2.2.29/policy/modules/services/postfix.te	2006-04-10 20:54:22.000000000 +1000
@@ -408,6 +408,9 @@
 
 optional_policy(`
 	mailman_domtrans_queue(postfix_pipe_t)
+#	for postalias
+	mailman_create_data_file(postfix_master_t)
+	mailman_read_data_file(postfix_local_t)
 ')
 
 ########################################
diff -ru serefpolicy-2.2.29.fc/policy/modules/services/samba.te serefpolicy-2.2.29/policy/modules/services/samba.te
--- serefpolicy-2.2.29.fc/policy/modules/services/samba.te	2006-04-10 20:52:58.000000000 +1000
+++ serefpolicy-2.2.29/policy/modules/services/samba.te	2006-04-10 20:54:22.000000000 +1000
@@ -337,6 +337,13 @@
 ')
 allow smbd_t mtrr_device_t:file getattr;
 
+# Support Samba sharing of NFS mount points
+bool samba_share_nfs false;
+if (samba_share_nfs) {
+fs_manage_nfs_dirs(smbd_t)
+fs_manage_nfs_files(smbd_t)
+}
+
 ########################################
 #
 # nmbd Local policy
diff -ru serefpolicy-2.2.29.fc/policy/modules/system/init.te serefpolicy-2.2.29/policy/modules/system/init.te
--- serefpolicy-2.2.29.fc/policy/modules/system/init.te	2006-04-10 20:52:58.000000000 +1000
+++ serefpolicy-2.2.29/policy/modules/system/init.te	2006-04-10 20:54:22.000000000 +1000
@@ -426,11 +426,6 @@
 
 	selinux_set_enforce_mode(initrc_t)
 
-	# Create and read /boot/kernel.h and /boot/System.map.
-	# Redhat systems typically create this file at boot time.
-	bootloader_create_runtime_file(initrc_t)
-	files_rw_boot_symlinks(initrc_t)
-
 	# These seem to be from the initrd
 	# during device initialization:
 	dev_create_generic_dirs(initrc_t)
diff -ru serefpolicy-2.2.29.fc/policy/modules/system/selinuxutil.if serefpolicy-2.2.29/policy/modules/system/selinuxutil.if
--- serefpolicy-2.2.29.fc/policy/modules/system/selinuxutil.if	2006-04-01 03:11:34.000000000 +1100
+++ serefpolicy-2.2.29/policy/modules/system/selinuxutil.if	2006-04-10 20:54:22.000000000 +1000
@@ -697,8 +697,8 @@
 
 	files_search_etc($1)
 	allow $1 selinux_config_t:dir search;
-	allow $1 file_context_t:dir r_dir_perms;
-	allow $1 file_context_t:file rw_file_perms;
+	allow $1 file_context_t:dir rw_dir_perms;
+	allow $1 file_context_t:file create_file_perms;
 	allow $1 file_context_t:lnk_file { getattr read };
 ')
 
diff -ru serefpolicy-2.2.29.fc/policy/modules/system/unconfined.te serefpolicy-2.2.29/policy/modules/system/unconfined.te
--- serefpolicy-2.2.29.fc/policy/modules/system/unconfined.te	2006-04-10 20:52:58.000000000 +1000
+++ serefpolicy-2.2.29/policy/modules/system/unconfined.te	2006-04-10 20:54:22.000000000 +1000
@@ -24,6 +24,8 @@
 
 logging_send_syslog_msg(unconfined_t)
 
+mount_domtrans(unconfined_t)
+
 ifdef(`targeted_policy',`
 	allow unconfined_t self:system syslog_read;
 	dontaudit unconfined_t self:capability sys_module;
diff -ru serefpolicy-2.2.29.fc/policy/modules/system/xen.te serefpolicy-2.2.29/policy/modules/system/xen.te
--- serefpolicy-2.2.29.fc/policy/modules/system/xen.te	2006-04-01 03:11:34.000000000 +1100
+++ serefpolicy-2.2.29/policy/modules/system/xen.te	2006-04-10 21:58:19.000000000 +1000
@@ -19,6 +19,8 @@
 # var/lib files
 type xend_var_lib_t;
 files_type(xend_var_lib_t)
+# for mounting an NFS store
+files_mountpoint(xend_var_lib_t)
 
 # log files
 type xend_var_log_t;
@@ -67,6 +69,8 @@
 allow xend_t self:tcp_socket create_stream_socket_perms;
 allow xend_t self:packet_socket create_socket_perms;
 
+files_read_kernel_symbol_table(xend_t)
+
 # pid file
 allow xend_t xend_var_run_t:file manage_file_perms;
 allow xend_t xend_var_run_t:sock_file manage_file_perms;
@@ -210,6 +214,7 @@
 dev_filetrans_xen(xenstored_t)
 
 term_dontaudit_use_generic_ptys(xenstored_t)
+dev_rw_xen(xenstored_t)
 
 init_use_fds(xenstored_t)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 13:18:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 09:18:54 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.657,
	1.658 workspace.atkbridge.patch, 1.10,
	1.11 openoffice.org-2.0.2.ooo63583.sd.accessibility.patch, 1.2, NONE
Message-ID: <200604101318.k3ADIsc8008518@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec workspace.atkbridge.patch 
Removed Files:
	openoffice.org-2.0.2.ooo63583.sd.accessibility.patch 
Log Message:
rh#188053# more a11y fixes


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.657
retrieving revision 1.658
diff -u -r1.657 -r1.658
--- openoffice.org.spec	29 Mar 2006 10:47:42 -0000	1.657
+++ openoffice.org.spec	10 Apr 2006 13:18:50 -0000	1.658
@@ -1,6 +1,6 @@
 %define oootag OOB680
 %define ooomilestone 5
-%define rh_rpm_release 7
+%define rh_rpm_release 8
 
 %define build_fc6 1
 %define build_rhel4 0
@@ -13,20 +13,24 @@
 %if %{build_rhel4}
 %define forcegcc4 1
 %define rh_rpm_extension 0
+%define internallibwpd 1
 %define internalxmlsec 1
 %define internalicu 1
 %define internalagg 1
 %define internaljavabits 1
 %define gnomeprintui 0
+%define obsoleteold 0
 %endif
 %if %{build_fc6}
 %define forcegcc4 0
 %define rh_rpm_extension 3
+%define internallibwpd 0
 %define internalxmlsec 0
 %define internalicu 0
 %define internalagg 0
 %define internaljavabits 0
 %define gnomeprintui 1
+%define obsoleteold 1
 %endif
 
 %if %{forcegcc4}
@@ -43,6 +47,12 @@
 
 %define includingexternals 0
 
+%if %{internallibwpd}
+%define libwpdflags --without-system-libwpd
+%define includingexternals 1
+%else
+%define libwpdflags --with-system-libwpd
+%endif
 %if %{internalxmlsec}
 %define xmlsecflags --without-system-xmlsec
 %define includingexternals 1
@@ -50,7 +60,7 @@
 %define xmlsecflags --with-system-xmlsec
 %endif
 %if %{internaljavabits}
-%define javabitsflags --without-system-hsqldb --without-system-beanshell --without-system-db --without-system-xml-apis --without-system-xerces --without-system-xalan
+%define javabitsflags --without-system-hsqldb --without-system-beanshell --with-system-db --without-system-xml-apis --without-system-xerces --without-system-xalan
 %define includingexternals 1
 %else
 %define javabitsflags --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan
@@ -73,7 +83,11 @@
 %define stlflags --without-stlport4
 %endif
 
-%define extraflags %{javabitsflags} %{xmlsecflags} %{icuflags} %{aggflags} %{stlflags}
+%if %{build_rhel4}
+%define extraflags %{javabitsflags} %{xmlsecflags} %{libwpdflags} %{icuflags} %{aggflags} %{stlflags} --with-ant-home=$MY_ANT_HOME
+%else
+%define extraflags %{javabitsflags} %{xmlsecflags} %{libwpdflags} %{icuflags} %{aggflags} %{stlflags}
+%endif
 
 %if %{includingexternals}
 # Disable internal dependency generator while we include libxmlsec1 and
@@ -91,7 +105,11 @@
 
 ExclusiveArch:  %{ix86} ppc
 Summary:        OpenOffice.org comprehensive office suite.
+%if %{obsoleteold}
 Name:           openoffice.org
+%else
+Name:           openoffice.org2
+%endif
 Version:        2.0.2
 Release: 	%{ooomilestone}.%{rh_rpm_release}.%{rh_rpm_extension}
 Epoch:		1
@@ -111,24 +129,38 @@
 Source9:	Tigert-templates.tar.gz
 Source10:	documentation.openoffice.org-templates.tar.gz
 Source11:	redhat-templates.tar.gz
+%if %{build_rhel4}
+Source12:       apache-ant-1.6.5-bin.tar.bz2
+Source13:       Archive-Zip-1.13.tar.gz
+%endif
+%if ! %{build_rhel4}
+BuildRequires:  ant, perl-Archive-Zip
+%endif
 BuildRequires:	tcsh, perl, sed, zip, bzip2, unzip, tar, findutils, prelink
-BuildRequires:	autoconf, make >= 3.79.1, ant, flex, bison, perl-Compress-Zlib
-BuildRequires:	gcc >= 3.4.3, gcc-c++ >= 3.4.3, binutils, perl-Archive-Zip
+BuildRequires:	autoconf, make >= 3.79.1, flex, bison, perl-Compress-Zlib
+BuildRequires:	gcc >= 3.4.3, gcc-c++ >= 3.4.3, binutils
 BuildRequires:	%{gccjava} >= 4.0.2, %{libgcjdevel} >= 4.0.2
 BuildRequires:	java-1.4.2-gcj-compat-devel, zlib-devel, freetype-devel
 BuildRequires:	gtk2-devel >= 2.4.8, gnome-vfs2-devel, cups-devel, curl-devel
 BuildRequires:	boost-devel >= 1.31.0, python-devel, expat-devel, libxml2-devel
 BuildRequires:	openldap-devel, neon-devel >= 0.24, libidn-devel, pam-devel
-BuildRequires:	libwpd-devel >= 0.8.0, sane-backends-devel, libjpeg-devel
+BuildRequires:	sane-backends-devel, libjpeg-devel
 BuildRequires:	desktop-file-utils >= 0.9, evolution-data-server-devel
-BuildRequires:	libxslt-devel, unixODBC-devel, db4-devel, libICE-devel
-BuildRequires:	libXaw-devel, libXt-devel, mozilla-devel
+BuildRequires:	libxslt-devel, unixODBC-devel, db4-devel, mozilla-devel
+%if ! %{build_rhel4}
+BuildRequires:	libXaw-devel, libXt-devel, libICE-devel
+%endif
+%if ! %{internallibwpd}
+BuildRequires:  libwpd-devel >= 0.8.0
+%endif
 %if ! %{internalxmlsec}
 BuildRequires:	xmlsec1-nss-devel >= 1.2.8-2
 %endif
 %if ! %{internaljavabits}
 BuildRequires:	db4-java >= 4.3.28-3, hsqldb >= 1.80.1, bsh >= 1.3.0, xalan-j2
 BuildRequires:	xerces-j2
+%else
+BuildRequires:	db4-java >= 4.2.0
 %endif
 %if ! %{internalicu}
 BuildRequires:  icu >= 3.4, libicu-devel >= 3.4
@@ -177,7 +209,10 @@
 Patch34: openoffice.org-2.0.2.ooo62030.solenv._version.patch
 Patch35: openoffice.org-2.0.2.oooXXXXX.config_office.noppds.patch
 Patch36: openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch
-Patch37: openoffice.org-2.0.2.ooo63583.sd.accessibility.patch
+%if %{build_rhel4}
+Patch37: openoffice.org-1.9.74.ArchiveZip.patch
+Patch38: openoffice.org-2.0.1.gij4ant.patch
+%endif
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -202,7 +237,9 @@
 %package core
 Summary: core modules for %{name}
 Group: Applications/Productivity
+%if ! %{build_rhel4}
 Requires: bitstream-vera-fonts
+%endif
 # Ensure we have 32-bit theme libs in 64-bit multilib environments.
 # We need at least 32-bit redhat-artwork and 32-bit gtk2-engines, but
 # rpm doesn't "do the right thing" if only the packages are Required.
@@ -212,6 +249,7 @@
 Requires: hsqldb >= 1.80.1, bsh >= 1.3.0, xalan-j2, xerces-j2
 %endif
 PreReq: desktop-file-utils >= 0.9, gtk2 >= 2.4.8
+%if %{obsoleteold}
 Obsoletes: openoffice.org
 Obsoletes: openoffice.org-libs
 Obsoletes: openoffice.org-i18n
@@ -220,6 +258,8 @@
 Obsoletes: openoffice.org-langpack-tn
 Obsoletes: openoffice.org-langpack-ts
 Obsoletes: openoffice.org-langpack-kn_IN
+Obsoletes: openoffice.org2-core
+%endif
 
 %description core
 core libraries and support files for %{name}
@@ -229,6 +269,9 @@
 Group: Development/Libraries
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: python
+%if %{obsoleteold}
+Obsoletes: openoffice.org2-pyuno
+%endif
 
 %description pyuno
 Cool python bindings for the %{name} UNO component model. Allows scripts both
@@ -239,6 +282,9 @@
 Summary: database frontend for %{name}
 Group: Development/Libraries
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
+Obsoletes: openoffice.org2-base
+%endif
 
 %description base
 Gui database frontend for %{name}. Allows creation and management of databases
@@ -247,9 +293,14 @@
 %package writer
 Summary: writer module for %{name}
 Group: Applications/Productivity
+%if %{obsoleteold}
 Obsoletes: openoffice.org
+Obsoletes: openoffice.org2-writer
+%endif
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if ! %{internallibwpd}
 Requires: libwpd >= 0.8.0
+%endif
 
 %description writer
 wordprocessor application of %{name}
@@ -257,7 +308,10 @@
 %package emailmerge
 Summary: email mail merge component for %{name}
 Group: Applications/Productivity
+%if %{obsoleteold}
 Obsoletes: openoffice.org
+Obsoletes: openoffice.org2-emailmerge
+%endif
 Requires: %{name}-writer = %{epoch}:%{version}-%{release}
 Requires: %{name}-pyuno = %{epoch}:%{version}-%{release}
 
@@ -266,7 +320,10 @@
 
 %package calc
 Summary: calc module for %{name}
+%if %{obsoleteold}
 Obsoletes: openoffice.org
+Obsoletes: openoffice.org2-calc
+%endif
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 
@@ -276,7 +333,10 @@
 %package draw
 Summary: draw module for %{name}
 Group: Applications/Productivity
+%if %{obsoleteold}
 Obsoletes: openoffice.org
+Obsoletes: openoffice.org2-draw
+%endif
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 
 %description draw
@@ -285,7 +345,10 @@
 %package impress
 Summary: impress module for %{name}
 Group: Applications/Productivity
+%if %{obsoleteold}
 Obsoletes: openoffice.org
+Obsoletes: openoffice.org2-impress
+%endif
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 
 %description impress
@@ -294,7 +357,10 @@
 %package math
 Summary: math module for %{name}
 Group: Applications/Productivity
+%if %{obsoleteold}
 Obsoletes: openoffice.org
+Obsoletes: openoffice.org2-math
+%endif
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 
 %description math 
@@ -304,6 +370,9 @@
 Summary: extra graphicfilter module for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
+Obsoletes: openoffice.org2-graphicfilter
+%endif
 
 %description graphicfilter
 graphicfilter module for %{name}, provides additional svg and flash export filters.
@@ -312,6 +381,9 @@
 Summary: extra xsltfilter module for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
+Obsoletes: openoffice.org2-graphicfilter
+%endif
 
 %description xsltfilter
 xsltfilter module for %{name}, provides additional docbook and xhtml export transforms. Install this to enable docbook export.
@@ -320,6 +392,9 @@
 Summary: extra javafilter module for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
+Obsoletes: openoffice.org2-javafilter
+%endif
 
 %description javafilter
 javafilter module for %{name}, provides additional aportisdoc, pocket excel and pocket word import filters.
@@ -328,6 +403,9 @@
 Summary: testtools for %{name}
 Group: Development/Libraries
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
+Obsoletes: openoffice.org2-testtools
+%endif
 
 %description testtools
 QA tools for %{name}, enables automated testing
@@ -336,8 +414,11 @@
 Summary: Afrikaans language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-af
+Obsoletes: openoffice.org2-langpack-af_ZA
+%endif
 
 %description langpack-af_ZA
 Provides additional afrikaans translations for %{name}
@@ -345,9 +426,14 @@
 %package langpack-ar
 Summary: Arabic language pack for %{name}
 Group: Applications/Productivity
+%if ! %{build_rhel4}
 Requires: fonts-arabic
+%endif
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-ar
+%endif
 
 %description langpack-ar
 Provides additional arabic translations for %{name}
@@ -356,8 +442,11 @@
 Summary: Bulgarian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-bg
+Obsoletes: openoffice.org2-langpack-bg_BG
+%endif
 
 %description langpack-bg_BG
 Provides additional bulgarian translations for %{name}
@@ -366,9 +455,16 @@
 Summary: Bengali language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{build_rhel4}
+Requires: ttfonts-indic
+%else
 Requires: fonts-bengali
+%endif
+%if %{obsoleteold}
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-bn_IN
+Obsoletes: openoffice.org2-langpack-bn
+%endif
 
 %description langpack-bn
 Provides additional bengali translations for %{name}
@@ -377,8 +473,11 @@
 Summary: Catalan language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-ca
+Obsoletes: openoffice.org2-langpack-ca_ES
+%endif
 
 %description langpack-ca_ES
 Provides additional catalan translations for %{name}
@@ -387,8 +486,11 @@
 Summary: Czech language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-cs
+Obsoletes: openoffice.org2-langpack-cs_CZ
+%endif
 
 %description langpack-cs_CZ
 Provides additional czech translations for %{name}
@@ -397,8 +499,11 @@
 Summary: Welsh language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-cy
+Obsoletes: openoffice.org2-langpack-cy_GB
+%endif
 
 %description langpack-cy_GB
 Provides additional welsh translations for %{name}
@@ -407,8 +512,11 @@
 Summary: Danish language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-da
+Obsoletes: openoffice.org2-langpack-da_DK
+%endif
 
 %description langpack-da_DK
 Provides additional danish translations for %{name}
@@ -417,7 +525,10 @@
 Summary: German language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-de
+%endif
 
 %description langpack-de
 Provides additional german translations for %{name}
@@ -426,8 +537,11 @@
 Summary: Greek language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-el
+Obsoletes: openoffice.org2-langpack-el_GR
+%endif
 
 %description langpack-el_GR
 Provides additional greek translations for %{name}
@@ -436,7 +550,10 @@
 Summary: Spanish language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-es
+%endif
 
 %description langpack-es
 Provides additional spanish translations for %{name}
@@ -445,8 +562,11 @@
 Summary: Estonian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-langpack-et
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-et_EE
+%endif
 
 %description langpack-et_EE
 Provides additional estonian translations for %{name}
@@ -455,8 +575,11 @@
 Summary: Basque language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-langpack-eu
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-eu_ES
+%endif
 
 %description langpack-eu_ES
 Provides additional basque translations for %{name}
@@ -465,8 +588,11 @@
 Summary: Finish language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-langpack-fi
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-fi_FI
+%endif
 
 %description langpack-fi_FI
 Provides additional finish translations for %{name}
@@ -475,7 +601,10 @@
 Summary: French language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-fr
+%endif
 
 %description langpack-fr
 Provides additional french translations for %{name}
@@ -484,6 +613,9 @@
 Summary: Irish language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
+Obsoletes: openoffice.org2-langpack-ga_IE
+%endif
 
 %description langpack-ga_IE
 Provides additional irish translations for %{name}
@@ -492,8 +624,11 @@
 Summary: Galician language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-langpack-gl
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-gl_ES
+%endif
 
 %description langpack-gl_ES
 Provides additional galician translations for %{name}
@@ -502,8 +637,15 @@
 Summary: Gujarati language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{build_rhel4}
+Requires: ttfonts-indic
+%else
 Requires: fonts-gujarati
+%endif
+%if %{obsoleteold}
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-gu_IN
+%endif
 
 %description langpack-gu_IN
 Provides additional gujarati translations for %{name}
@@ -512,8 +654,15 @@
 Summary: Punjabi language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{build_rhel4}
+Requires: ttfonts-indic
+%else
 Requires: fonts-punjabi
+%endif
+%if %{obsoleteold}
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-pa_IN
+%endif
 
 %description langpack-pa_IN
 Provides additional punjabi translations for %{name}
@@ -522,9 +671,14 @@
 Summary: Hebrew language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if ! %{build_rhel4}
 Requires: fonts-hebrew
+%endif
+%if %{obsoleteold}
 Obsoletes: openoffice.org-langpack-he
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-he_IL
+%endif
 
 %description langpack-he_IL
 Provides additional hebrew translations for %{name}
@@ -533,9 +687,16 @@
 Summary: Hindi language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{build_rhel4}
+Requires: ttfonts-indic
+%else
 Requires: fonts-hindi
+%endif
+%if %{obsoleteold}
 Obsoletes: openoffice.org-langpack-hi-IN
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-hi_IN
+%endif
 
 %description langpack-hi_IN
 Provides additional hindi translations for %{name}
@@ -544,8 +705,11 @@
 Summary: Hungarian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-langpack-hu
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-hu_HU
+%endif
 
 %description langpack-hu_HU
 Provides additional hungarian translations for %{name}
@@ -554,8 +718,11 @@
 Summary: Croatian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-langpack-hr
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-hr_HR
+%endif
 
 %description langpack-hr_HR
 Provides additional croatian translations for %{name}
@@ -564,7 +731,10 @@
 Summary: Italian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-it
+%endif
 
 %description langpack-it
 Provides additional italian translations for %{name}
@@ -573,9 +743,16 @@
 Summary: Japanese language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{build_rhel4}
+Requires: ttfonts-ja
+%else
 Requires: fonts-japanese
+%endif
+%if %{obsoleteold}
 Obsoletes: openoffice.org-langpack-ja
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-ja_JP
+%endif
 
 %description langpack-ja_JP
 Provides additional japanese translations for %{name}
@@ -584,9 +761,14 @@
 Summary: Korean language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if ! %{build_rhel4}
 Requires: fonts-korean
+%endif
+%if %{obsoleteold}
 Obsoletes: openoffice.org-langpack-ko
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-ko_KR
+%endif
 
 %description langpack-ko_KR
 Provides additional korean translations for %{name}
@@ -595,8 +777,11 @@
 Summary: Lithuanian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-langpack-lt
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-lt_LT
+%endif
 
 %description langpack-lt_LT
 Provides additional lithuanian translations for %{name}
@@ -605,8 +790,11 @@
 Summary: Malay language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-langpack-ms
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-ms_MY
+%endif
 
 %description langpack-ms_MY
 Provides additional malay translations for %{name}
@@ -615,8 +803,11 @@
 Summary: Bokmal language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-langpack-nb
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-nb_NO
+%endif
 
 %description langpack-nb_NO
 Provides additional bokmal translations for %{name}
@@ -625,7 +816,10 @@
 Summary: Dutch language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-nl
+%endif
 
 %description langpack-nl
 Provides additional dutch translations for %{name}
@@ -634,8 +828,11 @@
 Summary: Nynorsk language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-langpack-nn
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-nn_NO
+%endif
 
 %description langpack-nn_NO
 Provides additional nynorsk translations for %{name}
@@ -644,8 +841,11 @@
 Summary: Polish language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-langpack-pl
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-pl_PL
+%endif
 
 %description langpack-pl_PL
 Provides additional polish translations for %{name}
@@ -654,8 +854,11 @@
 Summary: Portuguese language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-langpack-pt
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-pt_PT
+%endif
 
 %description langpack-pt_PT
 Provides additional portuguese translations for %{name}
@@ -664,8 +867,11 @@
 Summary: Brazilian Portuguese language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-langpack-pt-BR
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-pt_BR
+%endif
 
 %description langpack-pt_BR
 Provides additional brazilian portuguese translations for %{name}
@@ -675,7 +881,10 @@
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: urw-fonts
+%if %{obsoleteold}
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-ru
+%endif
 
 %description langpack-ru
 Provides additional russian translations for %{name}
@@ -684,8 +893,11 @@
 Summary: Slovak language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-langpack-sk
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-sk_SK
+%endif
 
 %description langpack-sk_SK
 Provides additional slovak translations for %{name}
@@ -694,8 +906,11 @@
 Summary: Slovenian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-langpack-sl
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-sl_SI
+%endif
 
 %description langpack-sl_SI
 Provides additional slovenian translations for %{name}
@@ -704,6 +919,9 @@
 Summary: Serbian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
+Obsoletes: openoffice.org2-langpack-sr_CS
+%endif
 
 %description langpack-sr_CS
 Provides additional serbian translations for %{name}
@@ -712,7 +930,10 @@
 Summary: Swedish language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-sv
+%endif
 
 %description langpack-sv
 Provides additional swedish translations for %{name}
@@ -721,8 +942,15 @@
 Summary: Tamil language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{build_rhel4}
+Requires:  ttfonts-indic
+%else
 Requires:  fonts-tamil
+%endif
+%if %{obsoleteold}
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-ta_IN
+%endif
 
 %description langpack-ta_IN
 Provides additional tamil translations for %{name}
@@ -731,8 +959,11 @@
 Summary: Thai language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-langpack-th
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-th_TH
+%endif
 
 %description langpack-th_TH
 Provides additional thai translations for %{name}
@@ -741,8 +972,11 @@
 Summary: Turkish language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-langpack-tr
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-tr
+%endif
 
 %description langpack-tr_TR
 Provides additional turkish translations for %{name}
@@ -751,9 +985,16 @@
 Summary: Simplified Chinese language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{build_rhel4}
+Requires: ttfonts-zh_CN
+%else
 Requires: fonts-chinese
+%endif
+%if %{obsoleteold}
 Obsoletes: openoffice.org-langpack-zh-CN
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-zh_CN
+%endif
 
 %description langpack-zh_CN
 Provides additional simplified chinese translations for %{name}
@@ -762,9 +1003,16 @@
 Summary: Traditional Chinese language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{build_rhel4}
+Requires: ttfonts-zh_CN
+%else
 Requires: fonts-chinese
+%endif
+%if %{obsoleteold}
 Obsoletes: openoffice.org-langpack-zh-TW
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-zh_TW
+%endif
 
 %description langpack-zh_TW
 Provides additional traditional chinese translations for %{name}
@@ -773,8 +1021,11 @@
 Summary: Zulu language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
 Obsoletes: openoffice.org-langpack-zu
 Obsoletes: openoffice.org-i18n
+Obsoletes: openoffice.org2-langpack-zu_ZA
+%endif
 
 %description langpack-zu_ZA
 Provides additional zulu translations for %{name}
@@ -813,7 +1064,9 @@
 %patch23 -p1 -b .workspace.atkbridge.patch
 %patch24 -p0 -b .workspace.jaxpapi.patch
 %patch25 -p1 -b .workspace.systemjava.patch
+%ifnarch ppc
 %patch26 -p1 -b .workspace.targetedaot.patch
+%endif
 %patch27 -p1 -b .ooo58663.vcl.missingglyph.patch
 %patch28 -p1 -b .ooo58606.sw.pre-edit.patch
 %patch29 -p1 -b .ooo59675.sysui.rtfmimetype.patch
@@ -824,7 +1077,15 @@
 %patch34 -p1 -b .ooo62030.solenv._version.patch
 %patch35 -p1 -b .oooXXXXX.config_office.noppds.patch
 %patch36 -p1 -b .ooo63155.sfx2.badscript.patch
-%patch37 -p1 -b .ooo63583.sd.accessibility.patch
+
+%if %{build_rhel4}
+%patch37 -p1 -b .rhXXXXXX.config_office.archivezip.patch
+tar xjf %{SOURCE12}
+%patch38 -p0 -b .gij4ant.patch
+cd solenv/bin
+tar xzf %{SOURCE13} Archive-Zip-1.13/lib
+cd ../..
+%endif
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -860,6 +1121,9 @@
         fi
     fi
 fi
+%if %{build_rhel4}
+export MY_ANT_HOME=`pwd`/apache-ant-1.6.5
+%endif
 cd config_office
 autoconf
 %if %{forcegcc4}
@@ -1118,6 +1382,17 @@
 echo exec %{instdir}/program/soffice -base \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/oobase
 chmod a+x $RPM_BUILD_ROOT/%{_bindir}/oobase
 
+%if ! %{obsoleteold}
+mv $RPM_BUILD_ROOT/%{_bindir}/ooffice $RPM_BUILD_ROOT/%{_bindir}/ooffice2
+mv $RPM_BUILD_ROOT/%{_bindir}/ooviewdoc $RPM_BUILD_ROOT/%{_bindir}/ooviewdoc2
+mv $RPM_BUILD_ROOT/%{_bindir}/oowriter $RPM_BUILD_ROOT/%{_bindir}/oowriter2
+mv $RPM_BUILD_ROOT/%{_bindir}/oocalc $RPM_BUILD_ROOT/%{_bindir}/oocalc2
+mv $RPM_BUILD_ROOT/%{_bindir}/oodraw $RPM_BUILD_ROOT/%{_bindir}/oodraw2
+mv $RPM_BUILD_ROOT/%{_bindir}/oomath $RPM_BUILD_ROOT/%{_bindir}/oomath2
+mv $RPM_BUILD_ROOT/%{_bindir}/ooimpress $RPM_BUILD_ROOT/%{_bindir}/ooimpress2
+mv $RPM_BUILD_ROOT/%{_bindir}/oobase $RPM_BUILD_ROOT/%{_bindir}/oobase2
+%endif
+
 chmod u+w $RPM_BUILD_ROOT/%{instdir}/share/xdg/*.desktop
 echo "StartupNotify=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/base.desktop
 echo "StartupNotify=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/calc.desktop
@@ -2784,8 +3059,13 @@
 #launchers
 %{_bindir}/openoffice.org-1.9
 %{_bindir}/openoffice.org-2.0
+%if %{obsoleteold}
 %{_bindir}/ooffice
 %{_bindir}/ooviewdoc
+%else
+%{_bindir}/ooffice2
+%{_bindir}/ooviewdoc2
+%endif
 #gnome integration
 %{instdir}/program/gconfbe1.uno.so
 %{instdir}/program/gnome-set-default-application
@@ -2812,8 +3092,6 @@
 %{instdir}/program/classes/xalan.jar
 %{instdir}/program/classes/xercesImpl.jar
 %{instdir}/program/classes/xml-apis.jar
-%{instdir}/program/libdb-*.so
-%{instdir}/program/libdb_*.so
 %endif
 
 %post core
@@ -2862,7 +3140,11 @@
 %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Misc/fcfg_database_others.xcu
 %dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types
 %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_database_types.xcu
+%if %{obsoleteold}
 %{_bindir}/oobase
+%else
+%{_bindir}/oobase2
+%endif
 %dir %{_datadir}/applications
 %{_datadir}/applications/openoffice.org-*-base.desktop
 %dir %{_datadir}/mimelnk
@@ -2930,7 +3212,11 @@
 %dir %{_datadir}/mimelnk
 %dir %{_datadir}/mimelnk/application
 %{_datadir}/mimelnk/application/*spreadsheet*
+%if %{obsoleteold}
 %{_bindir}/oocalc
+%else
+%{_bindir}/oocalc2
+%endif
 
 %post calc
 update-desktop-database -q %{_datadir}/applications
@@ -2979,7 +3265,11 @@
 %dir %{_datadir}/mimelnk
 %dir %{_datadir}/mimelnk/application
 %{_datadir}/mimelnk/application/*drawing*
+%if %{obsoleteold}
 %{_bindir}/oodraw
+%else
+%{_bindir}/oodraw2
+%endif
 
 %post draw
 update-desktop-database -q %{_datadir}/applications
@@ -3058,7 +3348,11 @@
 %{_datadir}/mimelnk/application/*master*
 %{_datadir}/mimelnk/application/*text*
 %{_datadir}/mimelnk/application/*web*
+%if %{obsoleteold}
 %{_bindir}/oowriter
+%else
+%{_bindir}/oowriter2
+%endif
 
 %post writer
 update-desktop-database -q %{_datadir}/applications
@@ -3113,7 +3407,11 @@
 %dir %{_datadir}/mimelnk
 %dir %{_datadir}/mimelnk/application
 %{_datadir}/mimelnk/application/*presentation*
+%if %{obsoleteold}
 %{_bindir}/ooimpress
+%else
+%{_bindir}/ooimpress2
+%endif
 
 %post impress
 update-desktop-database -q %{_datadir}/applications
@@ -3166,7 +3464,11 @@
 %dir %{_datadir}/mimelnk
 %dir %{_datadir}/mimelnk/application
 %{_datadir}/mimelnk/application/*formula*
+%if %{obsoleteold}
 %{_bindir}/oomath
+%else
+%{_bindir}/oomath2
+%endif
 
 %post math
 update-desktop-database -q %{_datadir}/applications
@@ -3268,6 +3570,10 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Mon Apr 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.8
+- rh#188053# more a11y fixes
+- ooo#63583# committed to workspace.atkbridge
+
 * Wed Mar 29 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.7
 - rh#186747# TTF conts converted to Type 1 in print to file ps
 

workspace.atkbridge.patch:
 graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx    |    4 
 graphics/svx/source/accessibility/AccessibleContextBase.cxx         |    1 
 graphics/svx/source/accessibility/AccessibleControlShape.cxx        |    1 
 graphics/svx/source/accessibility/AccessibleEditableTextPara.cxx    |    1 
 graphics/svx/source/accessibility/AccessibleFrameSelector.cxx       |    3 
 graphics/svx/source/accessibility/AccessibleImageBullet.cxx         |    1 
 graphics/svx/source/accessibility/ChildrenManagerImpl.cxx           |   47 
 graphics/svx/source/accessibility/GraphCtlAccessibleContext.cxx     |    1 
 graphics/svx/source/accessibility/charmapacc.cxx                    |    8 
 graphics/svx/source/accessibility/svxrectctaccessiblecontext.cxx    |    2 
 gsl/fpicker/source/unx/gnome/FPentry.cxx                            |    3 
 gsl/toolkit/source/awt/accessiblemenubasecomponent.cxx              |   15 
 gsl/toolkit/source/awt/accessiblemenucomponent.cxx                  |    3 
 gsl/toolkit/source/awt/accessiblemenuitemcomponent.cxx              |    3 
 gsl/toolkit/source/awt/vclxaccessiblecomponent.cxx                  |   10 
 gsl/toolkit/source/awt/vclxaccessiblelistitem.cxx                   |    1 
 gsl/toolkit/source/awt/vclxaccessiblemenuitem.cxx                   |    8 
 gsl/toolkit/source/awt/vclxaccessiblestatusbaritem.cxx              |    1 
 gsl/toolkit/source/awt/vclxaccessibletabpage.cxx                    |    1 
 gsl/toolkit/source/awt/vclxaccessibletoolboxitem.cxx                |   19 
 gsl/toolkit/source/awt/vclxwindow.cxx                               |   80 
 gsl/vcl/inc/menu.hxx                                                |    3 
 gsl/vcl/inc/svapp.hxx                                               |    2 
 gsl/vcl/prj/build.lst                                               |    3 
 gsl/vcl/source/app/svapp.cxx                                        |   14 
 gsl/vcl/source/window/menu.cxx                                      |   35 
 gsl/vcl/unx/gtk/a11y/TODO                                           |   49 
 gsl/vcl/unx/gtk/a11y/atkaction.cxx                                  |  283 +++
 gsl/vcl/unx/gtk/a11y/atkbridge.cxx                                  |  109 +
 gsl/vcl/unx/gtk/a11y/atkcomponent.cxx                               |  387 ++++
 gsl/vcl/unx/gtk/a11y/atkeditabletext.cxx                            |  207 ++
 gsl/vcl/unx/gtk/a11y/atkfactory.cxx                                 |  174 ++
 gsl/vcl/unx/gtk/a11y/atkfactory.hxx                                 |   49 
 gsl/vcl/unx/gtk/a11y/atkhypertext.cxx                               |  296 +++
 gsl/vcl/unx/gtk/a11y/atkimage.cxx                                   |  143 +
 gsl/vcl/unx/gtk/a11y/atklistener.cxx                                |  474 +++++
 gsl/vcl/unx/gtk/a11y/atklistener.hxx                                |   92 +
 gsl/vcl/unx/gtk/a11y/atkselection.cxx                               |  200 ++
 gsl/vcl/unx/gtk/a11y/atktable.cxx                                   |  726 ++++++++
 gsl/vcl/unx/gtk/a11y/atktext.cxx                                    |  547 ++++++
 gsl/vcl/unx/gtk/a11y/atktextattributes.cxx                          |  572 ++++++
 gsl/vcl/unx/gtk/a11y/atktextattributes.hxx                          |   60 
 gsl/vcl/unx/gtk/a11y/atkutil.cxx                                    |  626 +++++++
 gsl/vcl/unx/gtk/a11y/atkutil.hxx                                    |   45 
 gsl/vcl/unx/gtk/a11y/atkvalue.cxx                                   |  152 +
 gsl/vcl/unx/gtk/a11y/atkwindow.cxx                                  |  149 +
 gsl/vcl/unx/gtk/a11y/atkwindow.hxx                                  |   45 
 gsl/vcl/unx/gtk/a11y/atkwrapper.cxx                                 |  820 ++++++++++
 gsl/vcl/unx/gtk/a11y/atkwrapper.hxx                                 |  125 +
 gsl/vcl/unx/gtk/a11y/makefile.mk                                    |  102 +
 gsl/vcl/unx/gtk/app/gtkinst.cxx                                     |   42 
 gsl/vcl/unx/gtk/window/gtkframe.cxx                                 |  142 +
 gsl/vcl/unx/inc/plugins/gtk/atkbridge.hxx                           |   45 
 gsl/vcl/unx/inc/plugins/gtk/gtkframe.hxx                            |   16 
 gsl/vcl/util/makefile.mk                                            |    2 
 util/comphelper/source/misc/accessiblewrapper.cxx                   |    6 
 util/svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx |    1 
 util/svtools/source/Accessibility/accessiblelistboxentry.cxx        |    1 
 util/svtools/source/Accessibility/accessibletabbar.cxx              |    9 
 util/svtools/source/Accessibility/accessibletabbarpage.cxx          |   21 
 util/svtools/source/Accessibility/accessibletabbarpagelist.cxx      |   31 
 util/svtools/source/Accessibility/accessibletablistboxtable.cxx     |   19 
 util/svtools/source/brwbox/brwbox3.cxx                              |    3 
 util/svtools/source/contnr/svtabbx.cxx                              |    3 
 util/svtools/source/control/valueacc.cxx                            |    2 
 util/svtools/source/edit/textwindowaccessibility.cxx                |    2 
 66 files changed, 6911 insertions(+), 136 deletions(-)

Index: workspace.atkbridge.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.atkbridge.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- workspace.atkbridge.patch	27 Mar 2006 19:07:01 -0000	1.10
+++ workspace.atkbridge.patch	10 Apr 2006 13:18:50 -0000	1.11
@@ -211,7 +211,7 @@
  MenuBarWindow::MenuBarWindow( Window* pParent ) :
 Index: gsl/vcl/unx/gtk/a11y/TODO
 diff -u /dev/null gsl/vcl/unx/gtk/a11y/TODO:1.1.2.6
---- /dev/null	Thu Mar 23 06:49:08 2006
+--- /dev/null	Mon Apr 10 05:20:26 2006
 +++ gsl/vcl/unx/gtk/a11y/TODO	Tue May 31 07:08:21 2005
 @@ -0,0 +1,49 @@
 +cws 'atkbridge'
@@ -264,10 +264,10 @@
 +	+ HyperLink 'link_activated', HyperText 'link_selected' (?)
 +	+ tooltips create new toplevels with broken roles.
 Index: gsl/vcl/unx/gtk/a11y/atkaction.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkaction.cxx:1.1.2.7
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkaction.cxx	Wed Feb 15 02:59:20 2006
-@@ -0,0 +1,287 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkaction.cxx:1.1.2.8
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkaction.cxx	Fri Mar 31 04:19:38 2006
+@@ -0,0 +1,283 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -385,8 +385,7 @@
 +}
 +
 +static G_CONST_RETURN gchar *
-+action_wrapper_get_description (AtkAction *action,
-+                                gint       i)
++action_wrapper_get_description (AtkAction *, gint)
 +{
 +    // GAIL implement this only for cells
 +    g_warning( "Not implemented: get_description()" );
@@ -394,8 +393,7 @@
 +}
 +
 +static G_CONST_RETURN gchar *
-+action_wrapper_get_localized_name (AtkAction *action,
-+                                   gint       i)
++action_wrapper_get_localized_name (AtkAction *, gint)
 +{
 +    // GAIL doesn't implement this as well
 +    g_warning( "Not implemented: get_localized_name()" );
@@ -533,9 +531,7 @@
 +}
 +
 +static gboolean
-+action_wrapper_set_description (AtkAction   *action,
-+                                gint         i,
-+                                const gchar *desc)
++action_wrapper_set_description (AtkAction *, gint, const gchar *)
 +{
 +    return FALSE;
 +}
@@ -549,17 +545,17 @@
 +
 +  iface->do_action = action_wrapper_do_action;
 +  iface->get_n_actions = action_wrapper_get_n_actions;
-+//  iface->get_description = action_wrapper_get_description;
++  iface->get_description = action_wrapper_get_description;
 +  iface->get_keybinding = action_wrapper_get_keybinding;
 +  iface->get_name = action_wrapper_get_name;
-+//  iface->get_localized_name = action_wrapper_get_localized_name;
++  iface->get_localized_name = action_wrapper_get_localized_name;
 +  iface->set_description = action_wrapper_set_description;
 +}
 Index: gsl/vcl/unx/gtk/a11y/atkbridge.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkbridge.cxx:1.1.2.2
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkbridge.cxx	Wed Feb 15 02:59:21 2006
-@@ -0,0 +1,56 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkbridge.cxx:1.1.2.4
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkbridge.cxx	Fri Mar 31 04:19:39 2006
+@@ -0,0 +1,109 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -602,8 +598,61 @@
 +#include "atkutil.hxx"
 +#include "atkwindow.hxx"
 +
++#include <stdio.h>
++
++#if ! ( defined AIX || defined HPUX ) // these have no dl* functions
++#include <dlfcn.h>
++#endif
++
 +void InitAtkBridge(void)
 +{
++    unsigned int major, minor, micro;
++    
++    /* check gail minimum version requirements */
++    if( sscanf( atk_get_toolkit_version(), "%u.%u.%u", &major, &minor, &micro) < 3 )
++    {
++        g_warning( "unable to parse gail version number" );
++        return;
++    }
++    
++    if( ( (major << 16) | (minor << 8) | micro ) < ( (1 << 16) | 8 << 8 | 6 ) )
++    {
++        g_warning( "libgail >= 1.8.6 required for accessibility support" );
++        return;
++    }
++
++    /* get at-spi version by checking the libspi.so version number  */
++    
++#if ! ( defined AIX || defined HPUX ) // these have no dl* functions
++    
++    /* libspi should be mapped by loading libatk-bridge.so already */
++    void * sym = dlsym( RTLD_DEFAULT, "spi_accessible_new" );
++    g_return_if_fail( sym != NULL );
++    
++    Dl_info dl_info;
++    int ret = dladdr( sym, &dl_info );
++    g_return_if_fail( ret != 0 );
++    
++    const char * cp = strrchr(dl_info.dli_fname, '/');
++    if( cp != NULL )
++        ++cp;
++    else
++        cp = dl_info.dli_fname;
++    
++    if( sscanf( cp, "libspi.so.%u.%u.%u", &major, &minor, &micro) < 3 )
++    {
++        g_warning( "unable to parse at-spi version number: %s", cp );
++        return;
++    }
++
++    if( ( (major << 16) | (minor << 8) | micro ) < ( 10 << 8 | 6 ) )
++    {
++        g_warning( "at-spi >= 1.7 required for accessibility support" );
++        return;
++    }
++    
++#endif // ! ( defined AIX || defined HPUX )
++    
 +    /* Initialize the AtkUtilityWrapper class */
 +    g_type_class_unref( g_type_class_ref( OOO_TYPE_ATK_UTIL ) );
 +    
@@ -617,10 +666,10 @@
 +}
 +
 Index: gsl/vcl/unx/gtk/a11y/atkcomponent.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkcomponent.cxx:1.1.2.8
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkcomponent.cxx	Wed Feb 15 02:58:57 2006
-@@ -0,0 +1,397 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkcomponent.cxx:1.1.2.9
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkcomponent.cxx	Fri Mar 31 04:19:39 2006
+@@ -0,0 +1,387 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -693,7 +742,7 @@
 +{
 +    awt::Point aOrigin( 0, 0 );
 +    if( t == ATK_XY_SCREEN )
-+        awt::Point aOrigin = pComponent->getLocationOnScreen();
++        aOrigin = pComponent->getLocationOnScreen();
 +
 +#ifdef ENABLE_TRACING
 +    fprintf(stderr, "coordinates ( %u, %u ) translated to: ( %u, %u )\n", 
@@ -871,12 +920,7 @@
 +/*****************************************************************************/
 +
 +static gboolean
-+component_wrapper_set_extents (AtkComponent   *component,
-+                     gint           x,
-+                     gint           y,
-+                     gint           width,
-+                     gint           height,
-+                     AtkCoordType   coord_type)
++component_wrapper_set_extents (AtkComponent *, gint, gint, gint, gint, AtkCoordType)
 +{
 +    g_warning( "AtkComponent::set_extents unimplementable" );
 +    return FALSE;
@@ -885,10 +929,7 @@
 +/*****************************************************************************/
 +
 +static gboolean
-+component_wrapper_set_position (AtkComponent   *component,
-+                      gint           x,
-+                      gint           y,
-+                      AtkCoordType   coord_type)
++component_wrapper_set_position (AtkComponent *, gint, gint, AtkCoordType)
 +{
 +    g_warning( "AtkComponent::set_position unimplementable" );
 +    return FALSE;
@@ -897,9 +938,7 @@
 +/*****************************************************************************/
 +
 +static gboolean
-+component_wrapper_set_size (AtkComponent   *component,
-+                  gint           width,
-+                  gint           height)
++component_wrapper_set_size (AtkComponent *, gint, gint)
 +{
 +    g_warning( "AtkComponent::set_size unimplementable" );
 +    return FALSE;
@@ -948,7 +987,7 @@
 +/*****************************************************************************/
 +
 +static gint
-+component_wrapper_get_mdi_zorder (AtkComponent   *component)
++component_wrapper_get_mdi_zorder (AtkComponent   *)
 +{
 +    // only needed for ATK_LAYER_MDI (not used) or ATK_LAYER_WINDOW (inherited from GAIL)
 +    return G_MININT;
@@ -970,7 +1009,7 @@
 +    signal_id = g_signal_lookup( "focus-event", ATK_TYPE_OBJECT );
 +
 +    ret = g_signal_handler_find( component, match_type, signal_id, 0, NULL,
-+                                 (gpointer) handler, NULL);
++                                 (gpointer) &handler, NULL);
 +    if (!ret)
 +    {
 +        return g_signal_connect_closure_by_id (component,
@@ -1020,7 +1059,7 @@
 +}
 Index: gsl/vcl/unx/gtk/a11y/atkeditabletext.cxx
 diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkeditabletext.cxx:1.1.2.7
---- /dev/null	Thu Mar 23 06:49:08 2006
+--- /dev/null	Mon Apr 10 05:20:26 2006
 +++ gsl/vcl/unx/gtk/a11y/atkeditabletext.cxx	Wed Feb 15 02:59:21 2006
 @@ -0,0 +1,207 @@
 +/*************************************************************************
@@ -1231,10 +1270,10 @@
 +  iface->set_run_attributes = editable_text_wrapper_set_run_attributes;
 +}
 Index: gsl/vcl/unx/gtk/a11y/atkfactory.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkfactory.cxx:1.1.2.10
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkfactory.cxx	Thu Mar 23 06:45:26 2006
-@@ -0,0 +1,168 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkfactory.cxx:1.1.2.12
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkfactory.cxx	Fri Mar 31 04:19:39 2006
+@@ -0,0 +1,174 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -1285,7 +1324,7 @@
 + */
 + 
 +static AtkStateSet *
-+noop_wrapper_ref_state_set( AtkObject *pObject )
++noop_wrapper_ref_state_set( AtkObject * )
 +{
 +    AtkStateSet *state_set = atk_state_set_new();
 +    atk_state_set_add_state( state_set, ATK_STATE_DEFUNCT );
@@ -1317,6 +1356,7 @@
 +            sizeof (AtkObjectWrapper),
 +            0,
 +            (GInstanceInitFunc) NULL,
++            NULL
 +        } ;
 +        
 +        type = g_type_register_static (ATK_TYPE_OBJECT, "OOoAtkNoOpObj", &typeInfo, (GTypeFlags)0) ;
@@ -1361,7 +1401,12 @@
 +    GtkSalFrame* pFrame = GtkSalFrame::getFromWindow( GTK_WINDOW( parent_widget ) );
 +    g_return_val_if_fail( pFrame != NULL, NULL );
 +    
-+    AtkObject* parent_accessible = (AtkObject *) g_object_get_data(G_OBJECT( parent_widget ), "Accessible");
++    /* HACK: if the parent gtk window has an accessible already assigned, use 
++     * this one to avoid endless recursion (see atkwindow.cxx).
++     */
++    AtkObject* parent_accessible = (AtkObject *) g_object_get_data(G_OBJECT( parent_widget ),
++        "ooo:tooltip-accessible");
++    
 +    if( ! parent_accessible )
 +        parent_accessible = gtk_widget_get_accessible(parent_widget);
 +    
@@ -1401,11 +1446,11 @@
 +  return t;                                 
 +}
 +
-+}; // extern C
++} // extern C
 +
 Index: gsl/vcl/unx/gtk/a11y/atkfactory.hxx
 diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkfactory.hxx:1.1.2.1
---- /dev/null	Thu Mar 23 06:49:08 2006
+--- /dev/null	Mon Apr 10 05:20:26 2006
 +++ gsl/vcl/unx/gtk/a11y/atkfactory.hxx	Thu Jan  5 06:06:31 2006
 @@ -0,0 +1,49 @@
 +/*************************************************************************
@@ -1458,10 +1503,10 @@
 +
 +#endif
 Index: gsl/vcl/unx/gtk/a11y/atkhypertext.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkhypertext.cxx:1.1.2.9
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkhypertext.cxx	Tue Mar  7 00:49:02 2006
-@@ -0,0 +1,295 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkhypertext.cxx:1.1.2.10
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkhypertext.cxx	Fri Mar 31 04:19:39 2006
+@@ -0,0 +1,296 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -1602,14 +1647,15 @@
 +    }
 +    return 0;
 +}
++
 +static guint
-+hyper_link_link_state( AtkHyperlink *pLink )
++hyper_link_link_state( AtkHyperlink * )
 +{
 +    g_warning( "FIXME: hyper_link_link_state unimplemented" );
 +    return 0;
 +}
 +static gboolean
-+hyper_link_is_selected_link( AtkHyperlink *pLink )
++hyper_link_is_selected_link( AtkHyperlink * )
 +{
 +    g_warning( "FIXME: hyper_link_is_selected_link unimplemented" );
 +    return FALSE;
@@ -1758,10 +1804,10 @@
 +  iface->get_link_index = hypertext_get_link_index;
 +}
 Index: gsl/vcl/unx/gtk/a11y/atkimage.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkimage.cxx:1.1.2.4
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkimage.cxx	Wed Feb 15 02:59:23 2006
-@@ -0,0 +1,144 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkimage.cxx:1.1.2.5
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkimage.cxx	Fri Mar 31 04:19:39 2006
+@@ -0,0 +1,143 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -1887,8 +1933,7 @@
 +}
 +
 +static gboolean
-+image_set_image_description( AtkImage    *image,
-+                                  const gchar *description )
++image_set_image_description( AtkImage *, const gchar * )
 +{
 +    g_warning ("FIXME: no set image description");
 +    return FALSE;
@@ -1907,9 +1952,9 @@
 +  iface->get_image_size = image_get_image_size;
 +}
 Index: gsl/vcl/unx/gtk/a11y/atklistener.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atklistener.cxx:1.1.2.17
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atklistener.cxx	Wed Mar  1 04:00:16 2006
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atklistener.cxx:1.1.2.20
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atklistener.cxx	Fri Mar 31 06:09:17 2006
 @@ -0,0 +1,474 @@
 +/*************************************************************************
 + *
@@ -1989,7 +2034,7 @@
 +/*****************************************************************************/
 +
 +// XEventListener implementation
-+void AtkListener::disposing( const lang::EventObject& aEvent ) throw (uno::RuntimeException)
++void AtkListener::disposing( const lang::EventObject& ) throw (uno::RuntimeException)
 +{
 +    if( mpAccessible )
 +    {
@@ -2154,8 +2199,6 @@
 +// XAccessibleEventListener
 +void AtkListener::notifyEvent( const accessibility::AccessibleEventObject& aEvent ) throw( uno::RuntimeException )
 +{
-+    AtkPropertyValues aValues = { NULL };
-+
 +    if( !mpAccessible )
 +        return;
 +    
@@ -2209,9 +2252,10 @@
 +            atk_object_notify_state_change( mpAccessible, eRealState, bState );
 +            break;
 +        }
-+        
++
 +        case accessibility::AccessibleEventId::BOUNDRECT_CHANGED:
 +        
++#ifdef HAS_ATKRECTANGLE
 +            if( ATK_IS_COMPONENT( mpAccessible ) )
 +            {
 +                AtkRectangle rect;
@@ -2227,6 +2271,7 @@
 +            }
 +            else
 +                g_warning( "bounds_changed event for object not implementing AtkComponent\n");
++#endif
 +            
 +            break;
 +        
@@ -2381,13 +2426,13 @@
 +            break;
 +
 +    default:
-+            g_warning( "Unknown event notification" );
++            g_warning( "Unknown event notification %d", aEvent.EventId );
 +            break;
 +    }
 +}
 Index: gsl/vcl/unx/gtk/a11y/atklistener.hxx
 diff -u /dev/null gsl/vcl/unx/gtk/a11y/atklistener.hxx:1.1.2.7
---- /dev/null	Thu Mar 23 06:49:08 2006
+--- /dev/null	Mon Apr 10 05:20:26 2006
 +++ gsl/vcl/unx/gtk/a11y/atklistener.hxx	Wed Feb 15 02:59:24 2006
 @@ -0,0 +1,92 @@
 +/*************************************************************************
@@ -2484,7 +2529,7 @@
 +
 Index: gsl/vcl/unx/gtk/a11y/atkselection.cxx
 diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkselection.cxx:1.1.2.6
---- /dev/null	Thu Mar 23 06:49:08 2006
+--- /dev/null	Mon Apr 10 05:20:26 2006
 +++ gsl/vcl/unx/gtk/a11y/atkselection.cxx	Wed Feb 15 02:59:24 2006
 @@ -0,0 +1,200 @@
 +/*************************************************************************
@@ -2688,10 +2733,10 @@
 +  iface->select_all_selection = selection_select_all_selection;
 +}
 Index: gsl/vcl/unx/gtk/a11y/atktable.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktable.cxx:1.1.2.7
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atktable.cxx	Wed Feb 15 02:58:28 2006
-@@ -0,0 +1,737 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktable.cxx:1.1.2.8
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atktable.cxx	Fri Mar 31 04:19:39 2006
+@@ -0,0 +1,726 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -3146,7 +3191,7 @@
 +        if( pTable )
 +        {
 +    // FIXME: Summary ??
-+            AtkObject* summary;
++//            AtkObject* summary;
 +            return atk_object_wrapper_conditional_ref( pTable->getAccessibleSummary() );
 +        }
 +    }
@@ -3302,19 +3347,16 @@
 +/*****************************************************************************/
 +
 +static gboolean
-+table_wrapper_add_row_selection( AtkTable      *table,
-+                                 gint          row )
++table_wrapper_add_row_selection( AtkTable *, gint )
 +{
 +    g_warning( "FIXME: no simple analogue for add_row_selection" );
 +    return 0;
 +}
 +
-+
 +/*****************************************************************************/
 +
 +static gboolean
-+table_wrapper_remove_row_selection( AtkTable      *table,
-+                                    gint          row )
++table_wrapper_remove_row_selection( AtkTable *, gint )
 +{
 +    g_warning( "FIXME: no simple analogue for remove_row_selection" );
 +    return 0;
@@ -3323,37 +3365,32 @@
 +/*****************************************************************************/
 +
 +static gboolean
-+table_wrapper_add_column_table( AtkTable      *table,
-+                                gint          column )
++table_wrapper_add_column_selection( AtkTable *, gint )
 +{
-+    g_warning( "FIXME: no simple analogue for add_column_table" );
++    g_warning( "FIXME: no simple analogue for add_column_selection" );
 +    return 0;
 +}
 +
 +/*****************************************************************************/
 +
 +static gboolean
-+table_wrapper_remove_column_table( AtkTable      *table,
-+                                   gint          column)
++table_wrapper_remove_column_selection( AtkTable *, gint )
 +{
-+    g_warning( "FIXME: no simple analogue for remove_column_table" );
++    g_warning( "FIXME: no simple analogue for remove_column_selection" );
 +    return 0;
 +}
 +
 +/*****************************************************************************/
 +
 +static void
-+table_wrapper_set_caption( AtkTable  *table,
-+                           AtkObject *caption )
++table_wrapper_set_caption( AtkTable *, AtkObject * )
 +{ // meaningless helper
 +}
 +
 +/*****************************************************************************/
 +
 +static void
-+table_wrapper_set_column_description( AtkTable    *table,
-+                                      gint         column,
-+                                      const gchar *description )
++table_wrapper_set_column_description( AtkTable *, gint, const gchar * )
 +{ // meaningless helper
 +}
 +
@@ -3361,9 +3398,7 @@
 +/*****************************************************************************/
 +
 +static void
-+table_wrapper_set_column_header( AtkTable      *table,
-+                                 gint          column,
-+                                 AtkObject     *header )
++table_wrapper_set_column_header( AtkTable *, gint, AtkObject * )
 +{ // meaningless helper
 +}
 +
@@ -3371,26 +3406,21 @@
 +/*****************************************************************************/
 +
 +static void
-+table_wrapper_set_row_description( AtkTable      *table,
-+                                   gint          row,
-+                                   const gchar   *description )
++table_wrapper_set_row_description( AtkTable *, gint, const gchar * )
 +{ // meaningless helper
 +}
 +
 +/*****************************************************************************/
 +
 +static void
-+table_wrapper_set_row_header( AtkTable      *table,
-+                              gint          row,
-+                              AtkObject     *header )
++table_wrapper_set_row_header( AtkTable *, gint, AtkObject * )
 +{ // meaningless helper
 +}
 +
 +/*****************************************************************************/
 +
 +static void
-+table_wrapper_set_summary( AtkTable      *table,
-+                           AtkObject     *accessible )
++table_wrapper_set_summary( AtkTable *, AtkObject * )
 +{ // meaningless helper
 +}
 +
@@ -3414,6 +3444,10 @@
 +  iface->get_selected_rows = table_wrapper_get_selected_rows;
 +  iface->add_row_selection = table_wrapper_add_row_selection;
 +  iface->remove_row_selection = table_wrapper_remove_row_selection;
++  iface->add_column_selection = table_wrapper_add_column_selection;
++  iface->remove_column_selection = table_wrapper_remove_column_selection;
++  iface->get_selected_columns = table_wrapper_get_selected_columns;
++  iface->is_column_selected = table_wrapper_is_column_selected;
 +  iface->get_column_extent_at = table_wrapper_get_column_extent_at;
 +  iface->get_row_extent_at = table_wrapper_get_row_extent_at;
 +  iface->get_row_header = table_wrapper_get_row_header;
@@ -3430,9 +3464,9 @@
 +  iface->set_column_description = table_wrapper_set_column_description;
 +}
 Index: gsl/vcl/unx/gtk/a11y/atktext.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktext.cxx:1.1.2.12
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atktext.cxx	Wed Feb 15 02:59:25 2006
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktext.cxx:1.1.2.13
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atktext.cxx	Fri Mar 31 04:19:40 2006
 @@ -0,0 +1,547 @@
 +/*************************************************************************
 + *
@@ -3768,7 +3802,7 @@
 +}
 +
 +static AtkAttributeSet *
-+text_wrapper_get_default_attributes( AtkText *text )
++text_wrapper_get_default_attributes( AtkText * )
 +{
 +    // currently there is no way to determine the default values. Maybe getCharacterAttributes
 +    // should return default and direct values ??
@@ -3947,7 +3981,7 @@
 +    try {
 +        accessibility::XAccessibleText* pText = getText( text );
 +        if( pText )
-+            return pText->setSelection( 0, 0 ); // ?
++            return pText->setSelection( start_offset, end_offset );
 +    }
 +    catch(const uno::Exception& e) {
 +        g_warning( "Exception in setSelection()" );
@@ -3982,9 +4016,9 @@
 +  iface->get_offset_at_point = text_wrapper_get_offset_at_point;
 +}
 Index: gsl/vcl/unx/gtk/a11y/atktextattributes.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktextattributes.cxx:1.1.2.2
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atktextattributes.cxx	Tue Feb 14 04:42:40 2006
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktextattributes.cxx:1.1.2.3
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atktextattributes.cxx	Fri Mar 31 04:19:40 2006
 @@ -0,0 +1,572 @@
 +/*************************************************************************
 + *
@@ -4045,13 +4079,13 @@
 +/*****************************************************************************/
 +
 +static gchar* 
-+NullString(const uno::Any& rAny)
++NullString(const uno::Any&)
 +{
 +    return NULL;
 +}
 +
 +static bool 
-+InvalidValue( uno::Any& rAny, const gchar * value )
++InvalidValue( uno::Any&, const gchar * )
 +{
 +    return false;
 +}
@@ -4081,7 +4115,7 @@
 +static gchar*
 +Long2String(const uno::Any& rAny)
 +{
-+    return g_strdup_printf( "%d", rAny.get<sal_Int32>() );
++    return g_strdup_printf( "%ld", rAny.get<sal_Int32>() );
 +}
 +
 +static bool 
@@ -4089,7 +4123,7 @@
 +{
 +    sal_Int32 lval;
 +    
-+    if( 1 != sscanf( value, "%d", &lval ) )
++    if( 1 != sscanf( value, "%ld", &lval ) )
 +        return false;
 +    
 +    rAny = uno::makeAny( lval );
@@ -4103,7 +4137,7 @@
 +{
 +    sal_Int32 nColor = rAny.get<sal_Int32>();
 +    
-+    if( nColor != 0xFFFFFFFF ) // AUTOMATIC
++    if( nColor != -1 ) // AUTOMATIC
 +    {
 +        sal_uInt8 blue  = nColor & 0xFF;
 +        sal_uInt8 green = (nColor >> 8) & 0xFF;
@@ -4118,9 +4152,9 @@
 +static bool 
 +String2Color( uno::Any& rAny, const gchar * value )
 +{
-+    sal_uInt8 red, green, blue;
++    int red, green, blue;
 +    
-+    if( 3 != sscanf( value, "%u,%u,%u", &red, &green, &blue ) )
++    if( 3 != sscanf( value, "%d,%d,%d", &red, &green, &blue ) )
 +        return false;
 +    
 +    sal_Int32 nColor = (sal_Int32) blue | ( (sal_Int32) green << 8 ) | ( ( sal_Int32 ) red << 16 );
@@ -4364,7 +4398,7 @@
 +MarginHeight2Pixel(const uno::Any& rAny)
 +{
 +    Size aMargin = LogicToPixel( 0, rAny.get<sal_Int32>() );
-+    return g_strdup_printf( "%d",  aMargin.getHeight() );
++    return g_strdup_printf( "%ld",  aMargin.getHeight() );
 +}
 +
 +static bool 
@@ -4372,7 +4406,7 @@
 +{
 +    sal_Int32 nHeight;
 +    
-+    if( 1 != sscanf( value, "%d", &nHeight ) )
++    if( 1 != sscanf( value, "%ld", &nHeight ) )
 +        return false;
 +    
 +    Size aMargin = PixelToLogic( 0, nHeight );
@@ -4384,7 +4418,7 @@
 +MarginWidth2Pixel(const uno::Any& rAny)
 +{
 +    Size aMargin = LogicToPixel( rAny.get<sal_Int32>(), 0 );
-+    return g_strdup_printf( "%d",  aMargin.getWidth() );
++    return g_strdup_printf( "%ld",  aMargin.getWidth() );
 +}
 +
 +static bool 
@@ -4392,7 +4426,7 @@
 +{
 +    sal_Int32 nWidth;
 +    
-+    if( 1 != sscanf( value, "%d", &nWidth ) )
++    if( 1 != sscanf( value, "%ld", &nWidth ) )
 +        return false;
 +    
 +    Size aMargin = PixelToLogic( nWidth, 0 );
@@ -4560,7 +4594,7 @@
 +
 Index: gsl/vcl/unx/gtk/a11y/atktextattributes.hxx
 diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktextattributes.hxx:1.1.2.1
---- /dev/null	Thu Mar 23 06:49:08 2006
+--- /dev/null	Mon Apr 10 05:20:26 2006
 +++ gsl/vcl/unx/gtk/a11y/atktextattributes.hxx	Thu Dec 22 00:24:30 2005
 @@ -0,0 +1,60 @@
 +/*************************************************************************
@@ -4624,10 +4658,10 @@
 +
 +#endif
 Index: gsl/vcl/unx/gtk/a11y/atkutil.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkutil.cxx:1.1.2.14
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkutil.cxx	Fri Mar  3 03:07:09 2006
-@@ -0,0 +1,625 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkutil.cxx:1.1.2.15
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkutil.cxx	Fri Mar 31 04:19:40 2006
+@@ -0,0 +1,626 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -4975,7 +5009,7 @@
 +/*****************************************************************************/
 +
 +void DocumentFocusListener::detachRecursive(
-+    const uno::Reference< accessibility::XAccessible >& xAccessible, 
++    const uno::Reference< accessibility::XAccessible >&, 
 +    const uno::Reference< accessibility::XAccessibleContext >& xContext,
 +    const uno::Reference< accessibility::XAccessibleStateSet >& xStateSet 
 +) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
@@ -5104,7 +5138,7 @@
 +
 +/*****************************************************************************/
 +
-+long WindowEventHandler(void * not_used, ::VclSimpleEvent const * pEvent)
++long WindowEventHandler(void *, ::VclSimpleEvent const * pEvent)
 +{
 +    switch (pEvent->GetId())
 +    {
@@ -5198,7 +5232,7 @@
 + */
 +
 +static void
-+ooo_atk_util_class_init (AtkUtilClass *klass)
++ooo_atk_util_class_init (AtkUtilClass *)
 +{
 +    AtkUtilClass *atk_class;
 +    gpointer data;
@@ -5245,6 +5279,7 @@
 +            type_query.instance_size,
 +            0,
 +            (GInstanceInitFunc) NULL,
++            NULL
 +        } ;
 +        
 +        type = g_type_register_static (parent_type, "OOoUtil", &typeInfo, (GTypeFlags)0) ;
@@ -5255,7 +5290,7 @@
 +
 Index: gsl/vcl/unx/gtk/a11y/atkutil.hxx
 diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkutil.hxx:1.1.2.4
---- /dev/null	Thu Mar 23 06:49:08 2006
+--- /dev/null	Mon Apr 10 05:20:26 2006
 +++ gsl/vcl/unx/gtk/a11y/atkutil.hxx	Thu Jan  5 06:06:32 2006
 @@ -0,0 +1,45 @@
 +/*************************************************************************
@@ -5305,7 +5340,7 @@
 +#endif
 Index: gsl/vcl/unx/gtk/a11y/atkvalue.cxx
 diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkvalue.cxx:1.1.2.4
---- /dev/null	Thu Mar 23 06:49:08 2006
+--- /dev/null	Mon Apr 10 05:20:26 2006
 +++ gsl/vcl/unx/gtk/a11y/atkvalue.cxx	Wed Feb 15 02:59:25 2006
 @@ -0,0 +1,152 @@
 +/*************************************************************************
@@ -5461,10 +5496,10 @@
 +  iface->set_current_value = value_wrapper_set_current_value;
 +}
 Index: gsl/vcl/unx/gtk/a11y/atkwindow.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwindow.cxx:1.1.2.4
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkwindow.cxx	Thu Mar 23 06:45:26 2006
-@@ -0,0 +1,145 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwindow.cxx:1.1.2.6
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkwindow.cxx	Fri Mar 31 04:19:40 2006
+@@ -0,0 +1,149 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -5519,9 +5554,12 @@
 +    
 +    if( obj->role == ATK_ROLE_TOOL_TIP )
 +    {
-+        // Avoid endless loop when get_name this is called from 
-+        // gail_window_new () context
-+        g_object_set_data( G_OBJECT( data ), "Accessible", obj );
++        /* HACK: Avoid endless loop when get_name is called from 
++         * gail_window_new() context, which leads to the code path
++         * showing up in wrapper_factory_create_accessible with no 
++         * accessible assigned to the GtkWindow yet.
++         */
++        g_object_set_data( G_OBJECT( data ), "ooo:tooltip-accessible", obj );
 +    }
 +}
 +
@@ -5603,6 +5641,7 @@
 +            type_query.instance_size,
 +            0,
 +            (GInstanceInitFunc) NULL,
++            NULL
 +        } ;
 +        
 +        type = g_type_register_static (parent_type, "OOoWindowAtkObject", &typeInfo, (GTypeFlags)0) ;
@@ -5612,7 +5651,7 @@
 +}
 Index: gsl/vcl/unx/gtk/a11y/atkwindow.hxx
 diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwindow.hxx:1.1.2.1
---- /dev/null	Thu Mar 23 06:49:08 2006
+--- /dev/null	Mon Apr 10 05:20:26 2006
 +++ gsl/vcl/unx/gtk/a11y/atkwindow.hxx	Thu Jan  5 06:06:34 2006
 @@ -0,0 +1,45 @@
 +/*************************************************************************
@@ -5661,10 +5700,10 @@
 +
 +#endif
 Index: gsl/vcl/unx/gtk/a11y/atkwrapper.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwrapper.cxx:1.1.2.21
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkwrapper.cxx	Wed Feb 15 02:58:57 2006
-@@ -0,0 +1,819 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwrapper.cxx:1.1.2.22
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkwrapper.cxx	Fri Mar 31 04:19:40 2006
+@@ -0,0 +1,820 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -5812,14 +5851,17 @@
 +    return type;
 +}
 +
++
 +AtkStateType mapAtkState( sal_Int16 nState )
 +{
++    AtkStateType type = ATK_STATE_INVALID;
++
 +    // A perfect / complete mapping ...
 +    switch( nState )
 +    {
 +#define MAP_DIRECT( a ) \
-+    case accessibility::AccessibleStateType::a: \
-+        return ATK_STATE_##a; break
++        case accessibility::AccessibleStateType::a: \
++            type = ATK_STATE_##a; break
 +
 +        MAP_DIRECT( INVALID );
 +        MAP_DIRECT( ACTIVE );
@@ -5852,21 +5894,24 @@
 +        MAP_DIRECT( VISIBLE );
 +        // a spelling error ...
 +        case accessibility::AccessibleStateType::DEFUNC:
-+            return ATK_STATE_DEFUNCT; break;
++            type = ATK_STATE_DEFUNCT; break;
 +        case accessibility::AccessibleStateType::MULTI_SELECTABLE:
-+            return ATK_STATE_MULTISELECTABLE; break;
++            type = ATK_STATE_MULTISELECTABLE; break;
 +    default:
-+        return ATK_STATE_INVALID;
 +        break;
 +    }
++
++    return type;
 +}
 +
 +static AtkRole mapToAtkRole( sal_Int16 nRole )
 +{
++    AtkRole role = ATK_ROLE_UNKNOWN;
++
 +    switch( nRole )
 +    {
 +#define MAP(a,b) \
-+        case a: return b; break
++        case a: role = b; break
 +            
 +        MAP( ::accessibility::AccessibleRole::UNKNOWN, ATK_ROLE_UNKNOWN );
 +        MAP( ::accessibility::AccessibleRole::ALERT, ATK_ROLE_ALERT );
@@ -5937,6 +5982,8 @@
 +        MAP( ::accessibility::AccessibleRole::VIEW_PORT, ATK_ROLE_VIEWPORT );
 +        MAP( ::accessibility::AccessibleRole::WINDOW, ATK_ROLE_WINDOW );
 +#undef MAP
++        default:
++            break;
 +    }
 +/* Roles unimplemented by OO.o / a11y:
 +  ATK_ROLE_INVALID,      ATK_ROLE_ACCEL_LABEL,    ATK_ROLE_ANIMATION,
@@ -5946,15 +5993,9 @@
 +  ATK_ROLE_TERMINAL,            ATK_ROLE_TREE_TABLE,       ATK_ROLE_RULER,
 +  ATK_ROLE_APPLICATION,         ATK_ROLE_AUTOCOMPLETE,     ATK_ROLE_EDITBAR */
 +
-+    return ATK_ROLE_UNKNOWN;
++    return role;
 +}
 +
-+static gchar *
-+mapToGChar( rtl::OUString aString )
-+{
-+    rtl::OString aUtf8 = rtl::OUStringToOString( aString, RTL_TEXTENCODING_UTF8 );
-+    return g_strdup( aUtf8 );
-+}
 +
 +static accessibility::XAccessibleContext*
 +        getContext( AtkObject* obj ) throw (uno::RuntimeException)
@@ -6112,11 +6153,11 @@
 +                sal_uInt32 nTargetCount = aRelation.TargetSet.getLength();
 +                AtkObject **pTargets = (AtkObject **) alloca( nTargetCount * sizeof(AtkObject *) );
 +            
-+                for( sal_uInt32 n = 0; n < nTargetCount; n++ )
++                for( sal_uInt32 i = 0; i < nTargetCount; i++ )
 +                {
 +                    uno::Reference< accessibility::XAccessible > xAccessible(
-+                            aRelation.TargetSet[n], uno::UNO_QUERY );
-+                    pTargets[n] = atk_object_wrapper_ref( xAccessible );
++                            aRelation.TargetSet[i], uno::UNO_QUERY );
++                    pTargets[i] = atk_object_wrapper_ref( xAccessible );
 +                }
 +        
 +                AtkRelation *pRel = atk_relation_new
@@ -6147,13 +6188,11 @@
 +            uno::Reference< accessibility::XAccessibleStateSet > xStateSet = 
 +                pContext->getAccessibleStateSet();
 +
-+            uno::Sequence< sal_Int16 > aStates;
-+            
 +            if( xStateSet.is() )
 +            {
 +                uno::Sequence< sal_Int16 > aStates = xStateSet->getStates();
 +            
-+                for( sal_uInt32 n = 0; n < aStates.getLength(); n++ )
++                for( sal_Int32 n = 0; n < aStates.getLength(); n++ )
 +                    atk_state_set_add_state( pSet, mapAtkState( aStates[n] ) );
 +
 +                // We need to emulate FOCUS state for menus, menu-items etc.
@@ -6218,7 +6257,7 @@
 +
 +static void
 +atk_object_wrapper_init (AtkObjectWrapper      *wrapper,
-+                         AtkObjectWrapperClass *klass)
++                         AtkObjectWrapperClass)
 +{
 +   wrapper->mpAction = NULL;
 +   wrapper->mpComponent = NULL;
@@ -6251,6 +6290,7 @@
 +        sizeof (AtkObjectWrapper),
 +        0,
 +        (GInstanceInitFunc) atk_object_wrapper_init,
++        NULL
 +      } ;
 +      type = g_type_register_static (ATK_TYPE_OBJECT,
 +                                     "OOoAtkObj",
@@ -6361,17 +6401,17 @@
 +            sizeof( AtkObjectWrapperClass ),
 +            NULL, NULL, NULL, NULL, NULL,
 +            sizeof( AtkObjectWrapper ),
-+            0, NULL
++            0, NULL, NULL
 +        } ;
 +        nType = g_type_register_static( ATK_TYPE_OBJECT_WRAPPER,
 +                                        aTypeName, &aTypeInfo, (GTypeFlags)0 ) ;
 +
-+        for( int i = 0; i < aTypeTableSize; i++ )
-+            if( bTypes[i] )
++        for( int j = 0; j < aTypeTableSize; j++ )
++            if( bTypes[j] )
 +            {
 +                GInterfaceInfo aIfaceInfo = { NULL, NULL, NULL };
-+                aIfaceInfo.interface_init = aTypeTable[i].aInit;
-+                g_type_add_interface_static (nType, aTypeTable[i].aGetGIfaceType(),
++                aIfaceInfo.interface_init = aTypeTable[j].aInit;
++                g_type_add_interface_static (nType, aTypeTable[j].aGetGIfaceType(),
 +                                             &aIfaceInfo);
 +            }
 +    }
@@ -6485,9 +6525,9 @@
 +    RELEASE( wrapper->mpValue )
 +}
 Index: gsl/vcl/unx/gtk/a11y/atkwrapper.hxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwrapper.hxx:1.1.2.8
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkwrapper.hxx	Wed Feb 15 02:59:26 2006
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwrapper.hxx:1.1.2.9
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkwrapper.hxx	Fri Mar 31 04:19:40 2006
 @@ -0,0 +1,125 @@
 +/*************************************************************************
 + *
@@ -6598,7 +6638,7 @@
 +void                   textIfaceInit(AtkTextIface *iface);
 +void                   valueIfaceInit(AtkValueIface *iface);
 +
-+}; // extern "C"
++} // extern "C"
 +
 +#define ATK_TYPE_OBJECT_WRAPPER atk_object_wrapper_get_type()
 +#define ATK_OBJECT_WRAPPER(obj) \
@@ -6615,10 +6655,10 @@
 +
 +#endif /* __ATK_WRAPPER_HXX__ */
 Index: gsl/vcl/unx/gtk/a11y/makefile.mk
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/makefile.mk:1.1.2.12
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/makefile.mk	Thu Feb 16 22:09:46 2006
-@@ -0,0 +1,96 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/makefile.mk:1.1.2.13
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/makefile.mk	Fri Mar 31 06:09:18 2006
+@@ -0,0 +1,102 @@
 +#*************************************************************************
 +#
 +#   OpenOffice.org - a multi-platform office productivity suite
@@ -6685,6 +6725,12 @@
 +
 +CFLAGS+=-DVERSION=\"$(UPD)$(LAST_MINOR)\"
 +
++ATKVERSION:=$(shell $(PKGCONFIG) --modversion atk | $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk)
++
++.IF $(ATKVERSION) >= "000100070000"
++CFLAGS+=-DHAS_ATKRECTANGLE
++.ENDIF
++
 +LIB1TARGET=$(SLB)$/$(TARGET).lib
 +LIB1OBJFILES=\
 +	$(SLO)$/atkaction.obj \
@@ -6790,9 +6836,9 @@
          return pInstance;
      }
 Index: gsl/vcl/unx/gtk/window/gtkframe.cxx
-diff -u gsl/vcl/unx/gtk/window/gtkframe.cxx:1.42 gsl/vcl/unx/gtk/window/gtkframe.cxx:1.28.6.19
---- gsl/vcl/unx/gtk/window/gtkframe.cxx:1.42	Wed Jan 25 03:40:22 2006
-+++ gsl/vcl/unx/gtk/window/gtkframe.cxx	Fri Feb 17 03:10:57 2006
+diff -u gsl/vcl/unx/gtk/window/gtkframe.cxx:1.43 gsl/vcl/unx/gtk/window/gtkframe.cxx:1.28.6.20
+--- gsl/vcl/unx/gtk/window/gtkframe.cxx:1.43	Wed Mar 22 02:40:30 2006
++++ gsl/vcl/unx/gtk/window/gtkframe.cxx	Tue Mar 28 03:34:26 2006
 @@ -45,6 +45,7 @@
  #include <floatwin.hxx>
  #include <salprn.h>
@@ -6986,7 +7032,7 @@
      m_aForeignParentWindow = None;
 Index: gsl/vcl/unx/inc/plugins/gtk/atkbridge.hxx
 diff -u /dev/null gsl/vcl/unx/inc/plugins/gtk/atkbridge.hxx:1.1.2.3
---- /dev/null	Thu Mar 23 06:49:08 2006
+--- /dev/null	Mon Apr 10 05:20:28 2006
 +++ gsl/vcl/unx/inc/plugins/gtk/atkbridge.hxx	Thu Jan 12 05:57:32 2006
 @@ -0,0 +1,45 @@
 +/*************************************************************************
@@ -7453,6 +7499,74 @@
          }
          catch( const uno::Exception& ) {}
      }
+Index: graphics/svx/source/accessibility/ChildrenManagerImpl.cxx
+diff -u graphics/svx/source/accessibility/ChildrenManagerImpl.cxx:1.33 graphics/svx/source/accessibility/ChildrenManagerImpl.cxx:1.33.172.1
+--- graphics/svx/source/accessibility/ChildrenManagerImpl.cxx:1.33	Thu Sep  8 13:20:26 2005
++++ graphics/svx/source/accessibility/ChildrenManagerImpl.cxx	Thu Mar 30 00:27:45 2006
+@@ -537,34 +537,45 @@
+ 
+ void ChildrenManagerImpl::ClearAccessibleShapeList (void)
+ {
++    // Copy the list of (visible) shapes to local lists and clear the
++    // originals.
++    ChildDescriptorListType aLocalVisibleChildren;
++    aLocalVisibleChildren.swap(maVisibleChildren);
++    AccessibleShapeList aLocalAccessibleShapes;
++    aLocalAccessibleShapes.swap(maAccessibleShapes);
++
++    // Tell the listeners that all children are gone.
++    mrContext.CommitChange (
++        AccessibleEventId::INVALIDATE_ALL_CHILDREN,
++        uno::Any(),
++        uno::Any());
++
++    // There are no accessible shapes left so the index assigned to new
++    // accessible shapes can be reset.
++    mnNewNameIndex = 1;
++    
++    // Now the objects in the local lists can be safely disposed without
++    // having problems with callers that want to update their child lists.
++    
+     // Clear the list of visible accessible objects.  Objects not created on
+     // demand for XShapes are treated below.
+-    ChildDescriptorListType::iterator I,aEnd = maVisibleChildren.end();
+-    for (I=maVisibleChildren.begin(); I != aEnd; ++I)
++    ChildDescriptorListType::iterator I,aEnd = aLocalVisibleChildren.end();
++    for (I=aLocalVisibleChildren.begin(); I != aEnd; ++I)
+         if ( I->mxAccessibleShape.is() && I->mxShape.is() )
+-            I->disposeAccessibleObject(mrContext);
+-
+-    maVisibleChildren.clear ();
+-
++        {
++            ::comphelper::disposeComponent(I->mxAccessibleShape);
++            I->mxAccessibleShape = NULL;
++        }            
+ 
+     // Dispose all objects in the accessible shape list.
+-    AccessibleShapeList::iterator J,aEnd2 = maAccessibleShapes.end();
+-    for (J=maAccessibleShapes.begin(); J != aEnd2; ++J)
++    AccessibleShapeList::iterator J,aEnd2 = aLocalAccessibleShapes.end();
++    for (J=aLocalAccessibleShapes.begin(); J != aEnd2; ++J)
+         if (J->is())
+         {
+-            mrContext.CommitChange (
+-                AccessibleEventId::CHILD, 
+-                uno::Any(),
+-                uno::makeAny (*J));
+-
+             // Dispose the object.
+ 			::comphelper::disposeComponent(*J);
++            *J = NULL;
+         }
+-    maAccessibleShapes.clear ();
+-
+-    // Now that no accessible shapes remain we can reset the index assigned
+-    // to new accessible shapes.
+-    mnNewNameIndex = 1;
+ }
+ 
+ 
 Index: graphics/svx/source/accessibility/GraphCtlAccessibleContext.cxx
 diff -u graphics/svx/source/accessibility/GraphCtlAccessibleContext.cxx:1.18 graphics/svx/source/accessibility/GraphCtlAccessibleContext.cxx:1.18.168.1
 --- graphics/svx/source/accessibility/GraphCtlAccessibleContext.cxx:1.18	Thu Sep  8 13:21:42 2005
@@ -7762,3 +7876,25 @@
               << ::css::accessibility::AccessibleStateType::FOCUSABLE)
            | (static_cast< ::sal_Int64 >(1)
               << ::css::accessibility::AccessibleStateType::MULTI_LINE);
+Index: graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+diff -u graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx:1.21 graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx:1.21.14.1
+--- graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx:1.21	Tue Mar 21 09:31:22 2006
++++ graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx	Thu Mar 30 00:45:28 2006
+@@ -110,7 +110,7 @@
+     pWindow->SetUseDropScroll (false);
+     // Change the winbits so that the active window accepts the focus.
+     pWindow->SetStyle ((pWindow->GetStyle() & ~WB_DIALOGCONTROL) | WB_TABSTOP);
+-    pWindow->Show();
++    pWindow->Hide();
+ 
+ 
+ 	SetPool( &GetDoc()->GetPool() );
+@@ -266,6 +266,8 @@
+         CreateView());
+     DBG_ASSERT (mpSlideSorterView.get()!=NULL,
+         "Can not create view for slide browser"); 
++
++    mpView = mpSlideSorterView.get();
+ 
+     mpSlideSorterController 
+         = ::std::auto_ptr<controller::SlideSorterController>(


--- openoffice.org-2.0.2.ooo63583.sd.accessibility.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 10 13:24:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 09:24:10 -0400
Subject: rpms/libvirt/devel .cvsignore, 1.5, 1.6 libvirt.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <200604101324.k3ADO9ee008626@cvs.devel.redhat.com>

Author: veillard

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	28 Feb 2006 14:25:55 -0000	1.5
+++ .cvsignore	10 Apr 2006 13:24:07 -0000	1.6
@@ -2,3 +2,4 @@
 libvirt-0.0.4.tar.gz
 libvirt-0.0.5.tar.gz
 libvirt-0.0.6.tar.gz
+libvirt-0.1.0.tar.gz


Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libvirt.spec	28 Feb 2006 14:25:55 -0000	1.6
+++ libvirt.spec	10 Apr 2006 13:24:07 -0000	1.7
@@ -1,6 +1,6 @@
 Summary: Library providing an API to use the Xen virtualization
 Name: libvirt
-Version: 0.0.6
+Version: 0.1.0
 Release: 1
 License: LGPL
 Group: Development/Libraries
@@ -10,7 +10,9 @@
 BuildRequires: xen python python-devel
 Requires: xen
 Requires: libxml2
+Requires: readline
 BuildRequires: libxml2-devel
+BuildRequires: readline-devel
 Obsoletes: libvir
 ExclusiveArch: i386 x86_64
 
@@ -70,6 +72,7 @@
 %defattr(-, root, root)
 
 %doc AUTHORS ChangeLog NEWS README COPYING.LIB TODO
+%doc %{_mandir}/man1/virsh.1*
 %{_bindir}/virsh
 %{_libdir}/lib*.so.*
 
@@ -99,6 +102,13 @@
 %doc python/libvirtclass.txt
 
 %changelog
+* Mon Apr 10 2006 Daniel Veillard <veillard at redhat.com> 0.1.0-1
+- various fixes
+- new APIs: for Node information and Reboot
+- virsh improvements and extensions
+- documentation updates and man page
+- enhancement and fixes of the XML description format
+
 * Tue Feb 28 2006 Daniel Veillard <veillard at redhat.com> 0.0.6-1
 - added error handling APIs
 - small bug fixes


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Feb 2006 14:25:55 -0000	1.5
+++ sources	10 Apr 2006 13:24:07 -0000	1.6
@@ -1 +1 @@
-51c4cd8255d8a639437959b934a2a5ac  libvirt-0.0.6.tar.gz
+bebb6a89c592d3e2ba19594de7341b81  libvirt-0.1.0.tar.gz



From fedora-cvs-commits at redhat.com  Mon Apr 10 13:25:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 09:25:34 -0400
Subject: rpms/openoffice.org/FC-5 openoffice.org.spec, 1.651,
	1.652 workspace.atkbridge.patch, 1.12, 1.13
Message-ID: <200604101325.k3ADPYSq008711@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec workspace.atkbridge.patch 
Log Message:
mirror a11y fixes to fc5


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.651
retrieving revision 1.652
diff -u -r1.651 -r1.652
--- openoffice.org.spec	29 Mar 2006 10:49:34 -0000	1.651
+++ openoffice.org.spec	10 Apr 2006 13:25:30 -0000	1.652
@@ -1,6 +1,6 @@
 %define oootag OOB680
 %define ooomilestone 5
-%define rh_rpm_release 7
+%define rh_rpm_release 8
 
 %define build_fc5 1
 
@@ -159,7 +159,6 @@
 Patch34: openoffice.org-2.0.2.ooo62030.solenv._version.patch
 Patch35: openoffice.org-2.0.2.oooXXXXX.config_office.noppds.patch
 Patch36: openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch
-Patch37: openoffice.org-2.0.2.ooo63583.sd.accessibility.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -805,7 +804,6 @@
 %patch34 -p1 -b .ooo62030.solenv._version.patch
 %patch35 -p1 -b .oooXXXXX.config_office.noppds.patch
 %patch36 -p1 -b .ooo63155.sfx2.badscript.patch
-%patch37 -p1 -b .ooo63583.sd.accessibility.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -3245,6 +3243,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Mon Apr 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.8
+- rh#188053# a11y fixes
+
 * Wed Mar 29 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.7
 - ooo#59997# replacement opens___.ttf updated
 - drop integrated openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch

workspace.atkbridge.patch:
 graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx    |    4 
 graphics/svx/source/accessibility/AccessibleContextBase.cxx         |    1 
 graphics/svx/source/accessibility/AccessibleControlShape.cxx        |    1 
 graphics/svx/source/accessibility/AccessibleEditableTextPara.cxx    |    1 
 graphics/svx/source/accessibility/AccessibleFrameSelector.cxx       |    3 
 graphics/svx/source/accessibility/AccessibleImageBullet.cxx         |    1 
 graphics/svx/source/accessibility/ChildrenManagerImpl.cxx           |   47 
 graphics/svx/source/accessibility/GraphCtlAccessibleContext.cxx     |    1 
 graphics/svx/source/accessibility/charmapacc.cxx                    |    8 
 graphics/svx/source/accessibility/svxrectctaccessiblecontext.cxx    |    2 
 gsl/fpicker/source/unx/gnome/FPentry.cxx                            |    3 
 gsl/toolkit/source/awt/accessiblemenubasecomponent.cxx              |   15 
 gsl/toolkit/source/awt/accessiblemenucomponent.cxx                  |    3 
 gsl/toolkit/source/awt/accessiblemenuitemcomponent.cxx              |    3 
 gsl/toolkit/source/awt/vclxaccessiblecomponent.cxx                  |   10 
 gsl/toolkit/source/awt/vclxaccessiblelistitem.cxx                   |    1 
 gsl/toolkit/source/awt/vclxaccessiblemenuitem.cxx                   |    8 
 gsl/toolkit/source/awt/vclxaccessiblestatusbaritem.cxx              |    1 
 gsl/toolkit/source/awt/vclxaccessibletabpage.cxx                    |    1 
 gsl/toolkit/source/awt/vclxaccessibletoolboxitem.cxx                |   19 
 gsl/toolkit/source/awt/vclxwindow.cxx                               |   80 
 gsl/vcl/inc/menu.hxx                                                |    3 
 gsl/vcl/inc/svapp.hxx                                               |    2 
 gsl/vcl/prj/build.lst                                               |    3 
 gsl/vcl/source/app/svapp.cxx                                        |   14 
 gsl/vcl/source/window/menu.cxx                                      |   35 
 gsl/vcl/unx/gtk/a11y/TODO                                           |   49 
 gsl/vcl/unx/gtk/a11y/atkaction.cxx                                  |  283 +++
 gsl/vcl/unx/gtk/a11y/atkbridge.cxx                                  |  109 +
 gsl/vcl/unx/gtk/a11y/atkcomponent.cxx                               |  387 ++++
 gsl/vcl/unx/gtk/a11y/atkeditabletext.cxx                            |  207 ++
 gsl/vcl/unx/gtk/a11y/atkfactory.cxx                                 |  174 ++
 gsl/vcl/unx/gtk/a11y/atkfactory.hxx                                 |   49 
 gsl/vcl/unx/gtk/a11y/atkhypertext.cxx                               |  296 +++
 gsl/vcl/unx/gtk/a11y/atkimage.cxx                                   |  143 +
 gsl/vcl/unx/gtk/a11y/atklistener.cxx                                |  474 +++++
 gsl/vcl/unx/gtk/a11y/atklistener.hxx                                |   92 +
 gsl/vcl/unx/gtk/a11y/atkselection.cxx                               |  200 ++
 gsl/vcl/unx/gtk/a11y/atktable.cxx                                   |  726 ++++++++
 gsl/vcl/unx/gtk/a11y/atktext.cxx                                    |  547 ++++++
 gsl/vcl/unx/gtk/a11y/atktextattributes.cxx                          |  572 ++++++
 gsl/vcl/unx/gtk/a11y/atktextattributes.hxx                          |   60 
 gsl/vcl/unx/gtk/a11y/atkutil.cxx                                    |  626 +++++++
 gsl/vcl/unx/gtk/a11y/atkutil.hxx                                    |   45 
 gsl/vcl/unx/gtk/a11y/atkvalue.cxx                                   |  152 +
 gsl/vcl/unx/gtk/a11y/atkwindow.cxx                                  |  149 +
 gsl/vcl/unx/gtk/a11y/atkwindow.hxx                                  |   45 
 gsl/vcl/unx/gtk/a11y/atkwrapper.cxx                                 |  820 ++++++++++
 gsl/vcl/unx/gtk/a11y/atkwrapper.hxx                                 |  125 +
 gsl/vcl/unx/gtk/a11y/makefile.mk                                    |  102 +
 gsl/vcl/unx/gtk/app/gtkinst.cxx                                     |   42 
 gsl/vcl/unx/gtk/window/gtkframe.cxx                                 |  142 +
 gsl/vcl/unx/inc/plugins/gtk/atkbridge.hxx                           |   45 
 gsl/vcl/unx/inc/plugins/gtk/gtkframe.hxx                            |   16 
 gsl/vcl/util/makefile.mk                                            |    2 
 util/comphelper/source/misc/accessiblewrapper.cxx                   |    6 
 util/svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx |    1 
 util/svtools/source/Accessibility/accessiblelistboxentry.cxx        |    1 
 util/svtools/source/Accessibility/accessibletabbar.cxx              |    9 
 util/svtools/source/Accessibility/accessibletabbarpage.cxx          |   21 
 util/svtools/source/Accessibility/accessibletabbarpagelist.cxx      |   31 
 util/svtools/source/Accessibility/accessibletablistboxtable.cxx     |   19 
 util/svtools/source/brwbox/brwbox3.cxx                              |    3 
 util/svtools/source/contnr/svtabbx.cxx                              |    3 
 util/svtools/source/control/valueacc.cxx                            |    2 
 util/svtools/source/edit/textwindowaccessibility.cxx                |    2 
 66 files changed, 6911 insertions(+), 136 deletions(-)

Index: workspace.atkbridge.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/workspace.atkbridge.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- workspace.atkbridge.patch	27 Mar 2006 19:08:19 -0000	1.12
+++ workspace.atkbridge.patch	10 Apr 2006 13:25:30 -0000	1.13
@@ -211,7 +211,7 @@
  MenuBarWindow::MenuBarWindow( Window* pParent ) :
 Index: gsl/vcl/unx/gtk/a11y/TODO
 diff -u /dev/null gsl/vcl/unx/gtk/a11y/TODO:1.1.2.6
---- /dev/null	Thu Mar 23 06:49:08 2006
+--- /dev/null	Mon Apr 10 05:20:26 2006
 +++ gsl/vcl/unx/gtk/a11y/TODO	Tue May 31 07:08:21 2005
 @@ -0,0 +1,49 @@
 +cws 'atkbridge'
@@ -264,10 +264,10 @@
 +	+ HyperLink 'link_activated', HyperText 'link_selected' (?)
 +	+ tooltips create new toplevels with broken roles.
 Index: gsl/vcl/unx/gtk/a11y/atkaction.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkaction.cxx:1.1.2.7
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkaction.cxx	Wed Feb 15 02:59:20 2006
-@@ -0,0 +1,287 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkaction.cxx:1.1.2.8
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkaction.cxx	Fri Mar 31 04:19:38 2006
+@@ -0,0 +1,283 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -385,8 +385,7 @@
 +}
 +
 +static G_CONST_RETURN gchar *
-+action_wrapper_get_description (AtkAction *action,
-+                                gint       i)
++action_wrapper_get_description (AtkAction *, gint)
 +{
 +    // GAIL implement this only for cells
 +    g_warning( "Not implemented: get_description()" );
@@ -394,8 +393,7 @@
 +}
 +
 +static G_CONST_RETURN gchar *
-+action_wrapper_get_localized_name (AtkAction *action,
-+                                   gint       i)
++action_wrapper_get_localized_name (AtkAction *, gint)
 +{
 +    // GAIL doesn't implement this as well
 +    g_warning( "Not implemented: get_localized_name()" );
@@ -533,9 +531,7 @@
 +}
 +
 +static gboolean
-+action_wrapper_set_description (AtkAction   *action,
-+                                gint         i,
-+                                const gchar *desc)
++action_wrapper_set_description (AtkAction *, gint, const gchar *)
 +{
 +    return FALSE;
 +}
@@ -549,17 +545,17 @@
 +
 +  iface->do_action = action_wrapper_do_action;
 +  iface->get_n_actions = action_wrapper_get_n_actions;
-+//  iface->get_description = action_wrapper_get_description;
++  iface->get_description = action_wrapper_get_description;
 +  iface->get_keybinding = action_wrapper_get_keybinding;
 +  iface->get_name = action_wrapper_get_name;
-+//  iface->get_localized_name = action_wrapper_get_localized_name;
++  iface->get_localized_name = action_wrapper_get_localized_name;
 +  iface->set_description = action_wrapper_set_description;
 +}
 Index: gsl/vcl/unx/gtk/a11y/atkbridge.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkbridge.cxx:1.1.2.2
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkbridge.cxx	Wed Feb 15 02:59:21 2006
-@@ -0,0 +1,56 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkbridge.cxx:1.1.2.4
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkbridge.cxx	Fri Mar 31 04:19:39 2006
+@@ -0,0 +1,109 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -602,8 +598,61 @@
 +#include "atkutil.hxx"
 +#include "atkwindow.hxx"
 +
++#include <stdio.h>
++
++#if ! ( defined AIX || defined HPUX ) // these have no dl* functions
++#include <dlfcn.h>
++#endif
++
 +void InitAtkBridge(void)
 +{
++    unsigned int major, minor, micro;
++    
++    /* check gail minimum version requirements */
++    if( sscanf( atk_get_toolkit_version(), "%u.%u.%u", &major, &minor, &micro) < 3 )
++    {
++        g_warning( "unable to parse gail version number" );
++        return;
++    }
++    
++    if( ( (major << 16) | (minor << 8) | micro ) < ( (1 << 16) | 8 << 8 | 6 ) )
++    {
++        g_warning( "libgail >= 1.8.6 required for accessibility support" );
++        return;
++    }
++
++    /* get at-spi version by checking the libspi.so version number  */
++    
++#if ! ( defined AIX || defined HPUX ) // these have no dl* functions
++    
++    /* libspi should be mapped by loading libatk-bridge.so already */
++    void * sym = dlsym( RTLD_DEFAULT, "spi_accessible_new" );
++    g_return_if_fail( sym != NULL );
++    
++    Dl_info dl_info;
++    int ret = dladdr( sym, &dl_info );
++    g_return_if_fail( ret != 0 );
++    
++    const char * cp = strrchr(dl_info.dli_fname, '/');
++    if( cp != NULL )
++        ++cp;
++    else
++        cp = dl_info.dli_fname;
++    
++    if( sscanf( cp, "libspi.so.%u.%u.%u", &major, &minor, &micro) < 3 )
++    {
++        g_warning( "unable to parse at-spi version number: %s", cp );
++        return;
++    }
++
++    if( ( (major << 16) | (minor << 8) | micro ) < ( 10 << 8 | 6 ) )
++    {
++        g_warning( "at-spi >= 1.7 required for accessibility support" );
++        return;
++    }
++    
++#endif // ! ( defined AIX || defined HPUX )
++    
 +    /* Initialize the AtkUtilityWrapper class */
 +    g_type_class_unref( g_type_class_ref( OOO_TYPE_ATK_UTIL ) );
 +    
@@ -617,10 +666,10 @@
 +}
 +
 Index: gsl/vcl/unx/gtk/a11y/atkcomponent.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkcomponent.cxx:1.1.2.8
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkcomponent.cxx	Wed Feb 15 02:58:57 2006
-@@ -0,0 +1,397 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkcomponent.cxx:1.1.2.9
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkcomponent.cxx	Fri Mar 31 04:19:39 2006
+@@ -0,0 +1,387 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -693,7 +742,7 @@
 +{
 +    awt::Point aOrigin( 0, 0 );
 +    if( t == ATK_XY_SCREEN )
-+        awt::Point aOrigin = pComponent->getLocationOnScreen();
++        aOrigin = pComponent->getLocationOnScreen();
 +
 +#ifdef ENABLE_TRACING
 +    fprintf(stderr, "coordinates ( %u, %u ) translated to: ( %u, %u )\n", 
@@ -871,12 +920,7 @@
 +/*****************************************************************************/
 +
 +static gboolean
-+component_wrapper_set_extents (AtkComponent   *component,
-+                     gint           x,
-+                     gint           y,
-+                     gint           width,
-+                     gint           height,
-+                     AtkCoordType   coord_type)
++component_wrapper_set_extents (AtkComponent *, gint, gint, gint, gint, AtkCoordType)
 +{
 +    g_warning( "AtkComponent::set_extents unimplementable" );
 +    return FALSE;
@@ -885,10 +929,7 @@
 +/*****************************************************************************/
 +
 +static gboolean
-+component_wrapper_set_position (AtkComponent   *component,
-+                      gint           x,
-+                      gint           y,
-+                      AtkCoordType   coord_type)
++component_wrapper_set_position (AtkComponent *, gint, gint, AtkCoordType)
 +{
 +    g_warning( "AtkComponent::set_position unimplementable" );
 +    return FALSE;
@@ -897,9 +938,7 @@
 +/*****************************************************************************/
 +
 +static gboolean
-+component_wrapper_set_size (AtkComponent   *component,
-+                  gint           width,
-+                  gint           height)
++component_wrapper_set_size (AtkComponent *, gint, gint)
 +{
 +    g_warning( "AtkComponent::set_size unimplementable" );
 +    return FALSE;
@@ -948,7 +987,7 @@
 +/*****************************************************************************/
 +
 +static gint
-+component_wrapper_get_mdi_zorder (AtkComponent   *component)
++component_wrapper_get_mdi_zorder (AtkComponent   *)
 +{
 +    // only needed for ATK_LAYER_MDI (not used) or ATK_LAYER_WINDOW (inherited from GAIL)
 +    return G_MININT;
@@ -970,7 +1009,7 @@
 +    signal_id = g_signal_lookup( "focus-event", ATK_TYPE_OBJECT );
 +
 +    ret = g_signal_handler_find( component, match_type, signal_id, 0, NULL,
-+                                 (gpointer) handler, NULL);
++                                 (gpointer) &handler, NULL);
 +    if (!ret)
 +    {
 +        return g_signal_connect_closure_by_id (component,
@@ -1020,7 +1059,7 @@
 +}
 Index: gsl/vcl/unx/gtk/a11y/atkeditabletext.cxx
 diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkeditabletext.cxx:1.1.2.7
---- /dev/null	Thu Mar 23 06:49:08 2006
+--- /dev/null	Mon Apr 10 05:20:26 2006
 +++ gsl/vcl/unx/gtk/a11y/atkeditabletext.cxx	Wed Feb 15 02:59:21 2006
 @@ -0,0 +1,207 @@
 +/*************************************************************************
@@ -1231,10 +1270,10 @@
 +  iface->set_run_attributes = editable_text_wrapper_set_run_attributes;
 +}
 Index: gsl/vcl/unx/gtk/a11y/atkfactory.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkfactory.cxx:1.1.2.10
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkfactory.cxx	Thu Mar 23 06:45:26 2006
-@@ -0,0 +1,168 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkfactory.cxx:1.1.2.12
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkfactory.cxx	Fri Mar 31 04:19:39 2006
+@@ -0,0 +1,174 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -1285,7 +1324,7 @@
 + */
 + 
 +static AtkStateSet *
-+noop_wrapper_ref_state_set( AtkObject *pObject )
++noop_wrapper_ref_state_set( AtkObject * )
 +{
 +    AtkStateSet *state_set = atk_state_set_new();
 +    atk_state_set_add_state( state_set, ATK_STATE_DEFUNCT );
@@ -1317,6 +1356,7 @@
 +            sizeof (AtkObjectWrapper),
 +            0,
 +            (GInstanceInitFunc) NULL,
++            NULL
 +        } ;
 +        
 +        type = g_type_register_static (ATK_TYPE_OBJECT, "OOoAtkNoOpObj", &typeInfo, (GTypeFlags)0) ;
@@ -1361,7 +1401,12 @@
 +    GtkSalFrame* pFrame = GtkSalFrame::getFromWindow( GTK_WINDOW( parent_widget ) );
 +    g_return_val_if_fail( pFrame != NULL, NULL );
 +    
-+    AtkObject* parent_accessible = (AtkObject *) g_object_get_data(G_OBJECT( parent_widget ), "Accessible");
++    /* HACK: if the parent gtk window has an accessible already assigned, use 
++     * this one to avoid endless recursion (see atkwindow.cxx).
++     */
++    AtkObject* parent_accessible = (AtkObject *) g_object_get_data(G_OBJECT( parent_widget ),
++        "ooo:tooltip-accessible");
++    
 +    if( ! parent_accessible )
 +        parent_accessible = gtk_widget_get_accessible(parent_widget);
 +    
@@ -1401,11 +1446,11 @@
 +  return t;                                 
 +}
 +
-+}; // extern C
++} // extern C
 +
 Index: gsl/vcl/unx/gtk/a11y/atkfactory.hxx
 diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkfactory.hxx:1.1.2.1
---- /dev/null	Thu Mar 23 06:49:08 2006
+--- /dev/null	Mon Apr 10 05:20:26 2006
 +++ gsl/vcl/unx/gtk/a11y/atkfactory.hxx	Thu Jan  5 06:06:31 2006
 @@ -0,0 +1,49 @@
 +/*************************************************************************
@@ -1458,10 +1503,10 @@
 +
 +#endif
 Index: gsl/vcl/unx/gtk/a11y/atkhypertext.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkhypertext.cxx:1.1.2.9
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkhypertext.cxx	Tue Mar  7 00:49:02 2006
-@@ -0,0 +1,295 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkhypertext.cxx:1.1.2.10
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkhypertext.cxx	Fri Mar 31 04:19:39 2006
+@@ -0,0 +1,296 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -1602,14 +1647,15 @@
 +    }
 +    return 0;
 +}
++
 +static guint
-+hyper_link_link_state( AtkHyperlink *pLink )
++hyper_link_link_state( AtkHyperlink * )
 +{
 +    g_warning( "FIXME: hyper_link_link_state unimplemented" );
 +    return 0;
 +}
 +static gboolean
-+hyper_link_is_selected_link( AtkHyperlink *pLink )
++hyper_link_is_selected_link( AtkHyperlink * )
 +{
 +    g_warning( "FIXME: hyper_link_is_selected_link unimplemented" );
 +    return FALSE;
@@ -1758,10 +1804,10 @@
 +  iface->get_link_index = hypertext_get_link_index;
 +}
 Index: gsl/vcl/unx/gtk/a11y/atkimage.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkimage.cxx:1.1.2.4
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkimage.cxx	Wed Feb 15 02:59:23 2006
-@@ -0,0 +1,144 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkimage.cxx:1.1.2.5
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkimage.cxx	Fri Mar 31 04:19:39 2006
+@@ -0,0 +1,143 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -1887,8 +1933,7 @@
 +}
 +
 +static gboolean
-+image_set_image_description( AtkImage    *image,
-+                                  const gchar *description )
++image_set_image_description( AtkImage *, const gchar * )
 +{
 +    g_warning ("FIXME: no set image description");
 +    return FALSE;
@@ -1907,9 +1952,9 @@
 +  iface->get_image_size = image_get_image_size;
 +}
 Index: gsl/vcl/unx/gtk/a11y/atklistener.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atklistener.cxx:1.1.2.17
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atklistener.cxx	Wed Mar  1 04:00:16 2006
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atklistener.cxx:1.1.2.20
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atklistener.cxx	Fri Mar 31 06:09:17 2006
 @@ -0,0 +1,474 @@
 +/*************************************************************************
 + *
@@ -1989,7 +2034,7 @@
 +/*****************************************************************************/
 +
 +// XEventListener implementation
-+void AtkListener::disposing( const lang::EventObject& aEvent ) throw (uno::RuntimeException)
++void AtkListener::disposing( const lang::EventObject& ) throw (uno::RuntimeException)
 +{
 +    if( mpAccessible )
 +    {
@@ -2154,8 +2199,6 @@
 +// XAccessibleEventListener
 +void AtkListener::notifyEvent( const accessibility::AccessibleEventObject& aEvent ) throw( uno::RuntimeException )
 +{
-+    AtkPropertyValues aValues = { NULL };
-+
 +    if( !mpAccessible )
 +        return;
 +    
@@ -2209,9 +2252,10 @@
 +            atk_object_notify_state_change( mpAccessible, eRealState, bState );
 +            break;
 +        }
-+        
++
 +        case accessibility::AccessibleEventId::BOUNDRECT_CHANGED:
 +        
++#ifdef HAS_ATKRECTANGLE
 +            if( ATK_IS_COMPONENT( mpAccessible ) )
 +            {
 +                AtkRectangle rect;
@@ -2227,6 +2271,7 @@
 +            }
 +            else
 +                g_warning( "bounds_changed event for object not implementing AtkComponent\n");
++#endif
 +            
 +            break;
 +        
@@ -2381,13 +2426,13 @@
 +            break;
 +
 +    default:
-+            g_warning( "Unknown event notification" );
++            g_warning( "Unknown event notification %d", aEvent.EventId );
 +            break;
 +    }
 +}
 Index: gsl/vcl/unx/gtk/a11y/atklistener.hxx
 diff -u /dev/null gsl/vcl/unx/gtk/a11y/atklistener.hxx:1.1.2.7
---- /dev/null	Thu Mar 23 06:49:08 2006
+--- /dev/null	Mon Apr 10 05:20:26 2006
 +++ gsl/vcl/unx/gtk/a11y/atklistener.hxx	Wed Feb 15 02:59:24 2006
 @@ -0,0 +1,92 @@
 +/*************************************************************************
@@ -2484,7 +2529,7 @@
 +
 Index: gsl/vcl/unx/gtk/a11y/atkselection.cxx
 diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkselection.cxx:1.1.2.6
---- /dev/null	Thu Mar 23 06:49:08 2006
+--- /dev/null	Mon Apr 10 05:20:26 2006
 +++ gsl/vcl/unx/gtk/a11y/atkselection.cxx	Wed Feb 15 02:59:24 2006
 @@ -0,0 +1,200 @@
 +/*************************************************************************
@@ -2688,10 +2733,10 @@
 +  iface->select_all_selection = selection_select_all_selection;
 +}
 Index: gsl/vcl/unx/gtk/a11y/atktable.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktable.cxx:1.1.2.7
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atktable.cxx	Wed Feb 15 02:58:28 2006
-@@ -0,0 +1,737 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktable.cxx:1.1.2.8
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atktable.cxx	Fri Mar 31 04:19:39 2006
+@@ -0,0 +1,726 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -3146,7 +3191,7 @@
 +        if( pTable )
 +        {
 +    // FIXME: Summary ??
-+            AtkObject* summary;
++//            AtkObject* summary;
 +            return atk_object_wrapper_conditional_ref( pTable->getAccessibleSummary() );
 +        }
 +    }
@@ -3302,19 +3347,16 @@
 +/*****************************************************************************/
 +
 +static gboolean
-+table_wrapper_add_row_selection( AtkTable      *table,
-+                                 gint          row )
++table_wrapper_add_row_selection( AtkTable *, gint )
 +{
 +    g_warning( "FIXME: no simple analogue for add_row_selection" );
 +    return 0;
 +}
 +
-+
 +/*****************************************************************************/
 +
 +static gboolean
-+table_wrapper_remove_row_selection( AtkTable      *table,
-+                                    gint          row )
++table_wrapper_remove_row_selection( AtkTable *, gint )
 +{
 +    g_warning( "FIXME: no simple analogue for remove_row_selection" );
 +    return 0;
@@ -3323,37 +3365,32 @@
 +/*****************************************************************************/
 +
 +static gboolean
-+table_wrapper_add_column_table( AtkTable      *table,
-+                                gint          column )
++table_wrapper_add_column_selection( AtkTable *, gint )
 +{
-+    g_warning( "FIXME: no simple analogue for add_column_table" );
++    g_warning( "FIXME: no simple analogue for add_column_selection" );
 +    return 0;
 +}
 +
 +/*****************************************************************************/
 +
 +static gboolean
-+table_wrapper_remove_column_table( AtkTable      *table,
-+                                   gint          column)
++table_wrapper_remove_column_selection( AtkTable *, gint )
 +{
-+    g_warning( "FIXME: no simple analogue for remove_column_table" );
++    g_warning( "FIXME: no simple analogue for remove_column_selection" );
 +    return 0;
 +}
 +
 +/*****************************************************************************/
 +
 +static void
-+table_wrapper_set_caption( AtkTable  *table,
-+                           AtkObject *caption )
++table_wrapper_set_caption( AtkTable *, AtkObject * )
 +{ // meaningless helper
 +}
 +
 +/*****************************************************************************/
 +
 +static void
-+table_wrapper_set_column_description( AtkTable    *table,
-+                                      gint         column,
-+                                      const gchar *description )
++table_wrapper_set_column_description( AtkTable *, gint, const gchar * )
 +{ // meaningless helper
 +}
 +
@@ -3361,9 +3398,7 @@
 +/*****************************************************************************/
 +
 +static void
-+table_wrapper_set_column_header( AtkTable      *table,
-+                                 gint          column,
-+                                 AtkObject     *header )
++table_wrapper_set_column_header( AtkTable *, gint, AtkObject * )
 +{ // meaningless helper
 +}
 +
@@ -3371,26 +3406,21 @@
 +/*****************************************************************************/
 +
 +static void
-+table_wrapper_set_row_description( AtkTable      *table,
-+                                   gint          row,
-+                                   const gchar   *description )
++table_wrapper_set_row_description( AtkTable *, gint, const gchar * )
 +{ // meaningless helper
 +}
 +
 +/*****************************************************************************/
 +
 +static void
-+table_wrapper_set_row_header( AtkTable      *table,
-+                              gint          row,
-+                              AtkObject     *header )
++table_wrapper_set_row_header( AtkTable *, gint, AtkObject * )
 +{ // meaningless helper
 +}
 +
 +/*****************************************************************************/
 +
 +static void
-+table_wrapper_set_summary( AtkTable      *table,
-+                           AtkObject     *accessible )
++table_wrapper_set_summary( AtkTable *, AtkObject * )
 +{ // meaningless helper
 +}
 +
@@ -3414,6 +3444,10 @@
 +  iface->get_selected_rows = table_wrapper_get_selected_rows;
 +  iface->add_row_selection = table_wrapper_add_row_selection;
 +  iface->remove_row_selection = table_wrapper_remove_row_selection;
++  iface->add_column_selection = table_wrapper_add_column_selection;
++  iface->remove_column_selection = table_wrapper_remove_column_selection;
++  iface->get_selected_columns = table_wrapper_get_selected_columns;
++  iface->is_column_selected = table_wrapper_is_column_selected;
 +  iface->get_column_extent_at = table_wrapper_get_column_extent_at;
 +  iface->get_row_extent_at = table_wrapper_get_row_extent_at;
 +  iface->get_row_header = table_wrapper_get_row_header;
@@ -3430,9 +3464,9 @@
 +  iface->set_column_description = table_wrapper_set_column_description;
 +}
 Index: gsl/vcl/unx/gtk/a11y/atktext.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktext.cxx:1.1.2.12
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atktext.cxx	Wed Feb 15 02:59:25 2006
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktext.cxx:1.1.2.13
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atktext.cxx	Fri Mar 31 04:19:40 2006
 @@ -0,0 +1,547 @@
 +/*************************************************************************
 + *
@@ -3768,7 +3802,7 @@
 +}
 +
 +static AtkAttributeSet *
-+text_wrapper_get_default_attributes( AtkText *text )
++text_wrapper_get_default_attributes( AtkText * )
 +{
 +    // currently there is no way to determine the default values. Maybe getCharacterAttributes
 +    // should return default and direct values ??
@@ -3947,7 +3981,7 @@
 +    try {
 +        accessibility::XAccessibleText* pText = getText( text );
 +        if( pText )
-+            return pText->setSelection( 0, 0 ); // ?
++            return pText->setSelection( start_offset, end_offset );
 +    }
 +    catch(const uno::Exception& e) {
 +        g_warning( "Exception in setSelection()" );
@@ -3982,9 +4016,9 @@
 +  iface->get_offset_at_point = text_wrapper_get_offset_at_point;
 +}
 Index: gsl/vcl/unx/gtk/a11y/atktextattributes.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktextattributes.cxx:1.1.2.2
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atktextattributes.cxx	Tue Feb 14 04:42:40 2006
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktextattributes.cxx:1.1.2.3
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atktextattributes.cxx	Fri Mar 31 04:19:40 2006
 @@ -0,0 +1,572 @@
 +/*************************************************************************
 + *
@@ -4045,13 +4079,13 @@
 +/*****************************************************************************/
 +
 +static gchar* 
-+NullString(const uno::Any& rAny)
++NullString(const uno::Any&)
 +{
 +    return NULL;
 +}
 +
 +static bool 
-+InvalidValue( uno::Any& rAny, const gchar * value )
++InvalidValue( uno::Any&, const gchar * )
 +{
 +    return false;
 +}
@@ -4081,7 +4115,7 @@
 +static gchar*
 +Long2String(const uno::Any& rAny)
 +{
-+    return g_strdup_printf( "%d", rAny.get<sal_Int32>() );
++    return g_strdup_printf( "%ld", rAny.get<sal_Int32>() );
 +}
 +
 +static bool 
@@ -4089,7 +4123,7 @@
 +{
 +    sal_Int32 lval;
 +    
-+    if( 1 != sscanf( value, "%d", &lval ) )
++    if( 1 != sscanf( value, "%ld", &lval ) )
 +        return false;
 +    
 +    rAny = uno::makeAny( lval );
@@ -4103,7 +4137,7 @@
 +{
 +    sal_Int32 nColor = rAny.get<sal_Int32>();
 +    
-+    if( nColor != 0xFFFFFFFF ) // AUTOMATIC
++    if( nColor != -1 ) // AUTOMATIC
 +    {
 +        sal_uInt8 blue  = nColor & 0xFF;
 +        sal_uInt8 green = (nColor >> 8) & 0xFF;
@@ -4118,9 +4152,9 @@
 +static bool 
 +String2Color( uno::Any& rAny, const gchar * value )
 +{
-+    sal_uInt8 red, green, blue;
++    int red, green, blue;
 +    
-+    if( 3 != sscanf( value, "%u,%u,%u", &red, &green, &blue ) )
++    if( 3 != sscanf( value, "%d,%d,%d", &red, &green, &blue ) )
 +        return false;
 +    
 +    sal_Int32 nColor = (sal_Int32) blue | ( (sal_Int32) green << 8 ) | ( ( sal_Int32 ) red << 16 );
@@ -4364,7 +4398,7 @@
 +MarginHeight2Pixel(const uno::Any& rAny)
 +{
 +    Size aMargin = LogicToPixel( 0, rAny.get<sal_Int32>() );
-+    return g_strdup_printf( "%d",  aMargin.getHeight() );
++    return g_strdup_printf( "%ld",  aMargin.getHeight() );
 +}
 +
 +static bool 
@@ -4372,7 +4406,7 @@
 +{
 +    sal_Int32 nHeight;
 +    
-+    if( 1 != sscanf( value, "%d", &nHeight ) )
++    if( 1 != sscanf( value, "%ld", &nHeight ) )
 +        return false;
 +    
 +    Size aMargin = PixelToLogic( 0, nHeight );
@@ -4384,7 +4418,7 @@
 +MarginWidth2Pixel(const uno::Any& rAny)
 +{
 +    Size aMargin = LogicToPixel( rAny.get<sal_Int32>(), 0 );
-+    return g_strdup_printf( "%d",  aMargin.getWidth() );
++    return g_strdup_printf( "%ld",  aMargin.getWidth() );
 +}
 +
 +static bool 
@@ -4392,7 +4426,7 @@
 +{
 +    sal_Int32 nWidth;
 +    
-+    if( 1 != sscanf( value, "%d", &nWidth ) )
++    if( 1 != sscanf( value, "%ld", &nWidth ) )
 +        return false;
 +    
 +    Size aMargin = PixelToLogic( nWidth, 0 );
@@ -4560,7 +4594,7 @@
 +
 Index: gsl/vcl/unx/gtk/a11y/atktextattributes.hxx
 diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktextattributes.hxx:1.1.2.1
---- /dev/null	Thu Mar 23 06:49:08 2006
+--- /dev/null	Mon Apr 10 05:20:26 2006
 +++ gsl/vcl/unx/gtk/a11y/atktextattributes.hxx	Thu Dec 22 00:24:30 2005
 @@ -0,0 +1,60 @@
 +/*************************************************************************
@@ -4624,10 +4658,10 @@
 +
 +#endif
 Index: gsl/vcl/unx/gtk/a11y/atkutil.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkutil.cxx:1.1.2.14
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkutil.cxx	Fri Mar  3 03:07:09 2006
-@@ -0,0 +1,625 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkutil.cxx:1.1.2.15
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkutil.cxx	Fri Mar 31 04:19:40 2006
+@@ -0,0 +1,626 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -4975,7 +5009,7 @@
 +/*****************************************************************************/
 +
 +void DocumentFocusListener::detachRecursive(
-+    const uno::Reference< accessibility::XAccessible >& xAccessible, 
++    const uno::Reference< accessibility::XAccessible >&, 
 +    const uno::Reference< accessibility::XAccessibleContext >& xContext,
 +    const uno::Reference< accessibility::XAccessibleStateSet >& xStateSet 
 +) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
@@ -5104,7 +5138,7 @@
 +
 +/*****************************************************************************/
 +
-+long WindowEventHandler(void * not_used, ::VclSimpleEvent const * pEvent)
++long WindowEventHandler(void *, ::VclSimpleEvent const * pEvent)
 +{
 +    switch (pEvent->GetId())
 +    {
@@ -5198,7 +5232,7 @@
 + */
 +
 +static void
-+ooo_atk_util_class_init (AtkUtilClass *klass)
++ooo_atk_util_class_init (AtkUtilClass *)
 +{
 +    AtkUtilClass *atk_class;
 +    gpointer data;
@@ -5245,6 +5279,7 @@
 +            type_query.instance_size,
 +            0,
 +            (GInstanceInitFunc) NULL,
++            NULL
 +        } ;
 +        
 +        type = g_type_register_static (parent_type, "OOoUtil", &typeInfo, (GTypeFlags)0) ;
@@ -5255,7 +5290,7 @@
 +
 Index: gsl/vcl/unx/gtk/a11y/atkutil.hxx
 diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkutil.hxx:1.1.2.4
---- /dev/null	Thu Mar 23 06:49:08 2006
+--- /dev/null	Mon Apr 10 05:20:26 2006
 +++ gsl/vcl/unx/gtk/a11y/atkutil.hxx	Thu Jan  5 06:06:32 2006
 @@ -0,0 +1,45 @@
 +/*************************************************************************
@@ -5305,7 +5340,7 @@
 +#endif
 Index: gsl/vcl/unx/gtk/a11y/atkvalue.cxx
 diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkvalue.cxx:1.1.2.4
---- /dev/null	Thu Mar 23 06:49:08 2006
+--- /dev/null	Mon Apr 10 05:20:26 2006
 +++ gsl/vcl/unx/gtk/a11y/atkvalue.cxx	Wed Feb 15 02:59:25 2006
 @@ -0,0 +1,152 @@
 +/*************************************************************************
@@ -5461,10 +5496,10 @@
 +  iface->set_current_value = value_wrapper_set_current_value;
 +}
 Index: gsl/vcl/unx/gtk/a11y/atkwindow.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwindow.cxx:1.1.2.4
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkwindow.cxx	Thu Mar 23 06:45:26 2006
-@@ -0,0 +1,145 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwindow.cxx:1.1.2.6
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkwindow.cxx	Fri Mar 31 04:19:40 2006
+@@ -0,0 +1,149 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -5519,9 +5554,12 @@
 +    
 +    if( obj->role == ATK_ROLE_TOOL_TIP )
 +    {
-+        // Avoid endless loop when get_name this is called from 
-+        // gail_window_new () context
-+        g_object_set_data( G_OBJECT( data ), "Accessible", obj );
++        /* HACK: Avoid endless loop when get_name is called from 
++         * gail_window_new() context, which leads to the code path
++         * showing up in wrapper_factory_create_accessible with no 
++         * accessible assigned to the GtkWindow yet.
++         */
++        g_object_set_data( G_OBJECT( data ), "ooo:tooltip-accessible", obj );
 +    }
 +}
 +
@@ -5603,6 +5641,7 @@
 +            type_query.instance_size,
 +            0,
 +            (GInstanceInitFunc) NULL,
++            NULL
 +        } ;
 +        
 +        type = g_type_register_static (parent_type, "OOoWindowAtkObject", &typeInfo, (GTypeFlags)0) ;
@@ -5612,7 +5651,7 @@
 +}
 Index: gsl/vcl/unx/gtk/a11y/atkwindow.hxx
 diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwindow.hxx:1.1.2.1
---- /dev/null	Thu Mar 23 06:49:08 2006
+--- /dev/null	Mon Apr 10 05:20:26 2006
 +++ gsl/vcl/unx/gtk/a11y/atkwindow.hxx	Thu Jan  5 06:06:34 2006
 @@ -0,0 +1,45 @@
 +/*************************************************************************
@@ -5661,10 +5700,10 @@
 +
 +#endif
 Index: gsl/vcl/unx/gtk/a11y/atkwrapper.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwrapper.cxx:1.1.2.21
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkwrapper.cxx	Wed Feb 15 02:58:57 2006
-@@ -0,0 +1,819 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwrapper.cxx:1.1.2.22
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkwrapper.cxx	Fri Mar 31 04:19:40 2006
+@@ -0,0 +1,820 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -5812,14 +5851,17 @@
 +    return type;
 +}
 +
++
 +AtkStateType mapAtkState( sal_Int16 nState )
 +{
++    AtkStateType type = ATK_STATE_INVALID;
++
 +    // A perfect / complete mapping ...
 +    switch( nState )
 +    {
 +#define MAP_DIRECT( a ) \
-+    case accessibility::AccessibleStateType::a: \
-+        return ATK_STATE_##a; break
++        case accessibility::AccessibleStateType::a: \
++            type = ATK_STATE_##a; break
 +
 +        MAP_DIRECT( INVALID );
 +        MAP_DIRECT( ACTIVE );
@@ -5852,21 +5894,24 @@
 +        MAP_DIRECT( VISIBLE );
 +        // a spelling error ...
 +        case accessibility::AccessibleStateType::DEFUNC:
-+            return ATK_STATE_DEFUNCT; break;
++            type = ATK_STATE_DEFUNCT; break;
 +        case accessibility::AccessibleStateType::MULTI_SELECTABLE:
-+            return ATK_STATE_MULTISELECTABLE; break;
++            type = ATK_STATE_MULTISELECTABLE; break;
 +    default:
-+        return ATK_STATE_INVALID;
 +        break;
 +    }
++
++    return type;
 +}
 +
 +static AtkRole mapToAtkRole( sal_Int16 nRole )
 +{
++    AtkRole role = ATK_ROLE_UNKNOWN;
++
 +    switch( nRole )
 +    {
 +#define MAP(a,b) \
-+        case a: return b; break
++        case a: role = b; break
 +            
 +        MAP( ::accessibility::AccessibleRole::UNKNOWN, ATK_ROLE_UNKNOWN );
 +        MAP( ::accessibility::AccessibleRole::ALERT, ATK_ROLE_ALERT );
@@ -5937,6 +5982,8 @@
 +        MAP( ::accessibility::AccessibleRole::VIEW_PORT, ATK_ROLE_VIEWPORT );
 +        MAP( ::accessibility::AccessibleRole::WINDOW, ATK_ROLE_WINDOW );
 +#undef MAP
++        default:
++            break;
 +    }
 +/* Roles unimplemented by OO.o / a11y:
 +  ATK_ROLE_INVALID,      ATK_ROLE_ACCEL_LABEL,    ATK_ROLE_ANIMATION,
@@ -5946,15 +5993,9 @@
 +  ATK_ROLE_TERMINAL,            ATK_ROLE_TREE_TABLE,       ATK_ROLE_RULER,
 +  ATK_ROLE_APPLICATION,         ATK_ROLE_AUTOCOMPLETE,     ATK_ROLE_EDITBAR */
 +
-+    return ATK_ROLE_UNKNOWN;
++    return role;
 +}
 +
-+static gchar *
-+mapToGChar( rtl::OUString aString )
-+{
-+    rtl::OString aUtf8 = rtl::OUStringToOString( aString, RTL_TEXTENCODING_UTF8 );
-+    return g_strdup( aUtf8 );
-+}
 +
 +static accessibility::XAccessibleContext*
 +        getContext( AtkObject* obj ) throw (uno::RuntimeException)
@@ -6112,11 +6153,11 @@
 +                sal_uInt32 nTargetCount = aRelation.TargetSet.getLength();
 +                AtkObject **pTargets = (AtkObject **) alloca( nTargetCount * sizeof(AtkObject *) );
 +            
-+                for( sal_uInt32 n = 0; n < nTargetCount; n++ )
++                for( sal_uInt32 i = 0; i < nTargetCount; i++ )
 +                {
 +                    uno::Reference< accessibility::XAccessible > xAccessible(
-+                            aRelation.TargetSet[n], uno::UNO_QUERY );
-+                    pTargets[n] = atk_object_wrapper_ref( xAccessible );
++                            aRelation.TargetSet[i], uno::UNO_QUERY );
++                    pTargets[i] = atk_object_wrapper_ref( xAccessible );
 +                }
 +        
 +                AtkRelation *pRel = atk_relation_new
@@ -6147,13 +6188,11 @@
 +            uno::Reference< accessibility::XAccessibleStateSet > xStateSet = 
 +                pContext->getAccessibleStateSet();
 +
-+            uno::Sequence< sal_Int16 > aStates;
-+            
 +            if( xStateSet.is() )
 +            {
 +                uno::Sequence< sal_Int16 > aStates = xStateSet->getStates();
 +            
-+                for( sal_uInt32 n = 0; n < aStates.getLength(); n++ )
++                for( sal_Int32 n = 0; n < aStates.getLength(); n++ )
 +                    atk_state_set_add_state( pSet, mapAtkState( aStates[n] ) );
 +
 +                // We need to emulate FOCUS state for menus, menu-items etc.
@@ -6218,7 +6257,7 @@
 +
 +static void
 +atk_object_wrapper_init (AtkObjectWrapper      *wrapper,
-+                         AtkObjectWrapperClass *klass)
++                         AtkObjectWrapperClass)
 +{
 +   wrapper->mpAction = NULL;
 +   wrapper->mpComponent = NULL;
@@ -6251,6 +6290,7 @@
 +        sizeof (AtkObjectWrapper),
 +        0,
 +        (GInstanceInitFunc) atk_object_wrapper_init,
++        NULL
 +      } ;
 +      type = g_type_register_static (ATK_TYPE_OBJECT,
 +                                     "OOoAtkObj",
@@ -6361,17 +6401,17 @@
 +            sizeof( AtkObjectWrapperClass ),
 +            NULL, NULL, NULL, NULL, NULL,
 +            sizeof( AtkObjectWrapper ),
-+            0, NULL
++            0, NULL, NULL
 +        } ;
 +        nType = g_type_register_static( ATK_TYPE_OBJECT_WRAPPER,
 +                                        aTypeName, &aTypeInfo, (GTypeFlags)0 ) ;
 +
-+        for( int i = 0; i < aTypeTableSize; i++ )
-+            if( bTypes[i] )
++        for( int j = 0; j < aTypeTableSize; j++ )
++            if( bTypes[j] )
 +            {
 +                GInterfaceInfo aIfaceInfo = { NULL, NULL, NULL };
-+                aIfaceInfo.interface_init = aTypeTable[i].aInit;
-+                g_type_add_interface_static (nType, aTypeTable[i].aGetGIfaceType(),
++                aIfaceInfo.interface_init = aTypeTable[j].aInit;
++                g_type_add_interface_static (nType, aTypeTable[j].aGetGIfaceType(),
 +                                             &aIfaceInfo);
 +            }
 +    }
@@ -6485,9 +6525,9 @@
 +    RELEASE( wrapper->mpValue )
 +}
 Index: gsl/vcl/unx/gtk/a11y/atkwrapper.hxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwrapper.hxx:1.1.2.8
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkwrapper.hxx	Wed Feb 15 02:59:26 2006
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwrapper.hxx:1.1.2.9
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkwrapper.hxx	Fri Mar 31 04:19:40 2006
 @@ -0,0 +1,125 @@
 +/*************************************************************************
 + *
@@ -6598,7 +6638,7 @@
 +void                   textIfaceInit(AtkTextIface *iface);
 +void                   valueIfaceInit(AtkValueIface *iface);
 +
-+}; // extern "C"
++} // extern "C"
 +
 +#define ATK_TYPE_OBJECT_WRAPPER atk_object_wrapper_get_type()
 +#define ATK_OBJECT_WRAPPER(obj) \
@@ -6615,10 +6655,10 @@
 +
 +#endif /* __ATK_WRAPPER_HXX__ */
 Index: gsl/vcl/unx/gtk/a11y/makefile.mk
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/makefile.mk:1.1.2.12
---- /dev/null	Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/makefile.mk	Thu Feb 16 22:09:46 2006
-@@ -0,0 +1,96 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/makefile.mk:1.1.2.13
+--- /dev/null	Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/makefile.mk	Fri Mar 31 06:09:18 2006
+@@ -0,0 +1,102 @@
 +#*************************************************************************
 +#
 +#   OpenOffice.org - a multi-platform office productivity suite
@@ -6685,6 +6725,12 @@
 +
 +CFLAGS+=-DVERSION=\"$(UPD)$(LAST_MINOR)\"
 +
++ATKVERSION:=$(shell $(PKGCONFIG) --modversion atk | $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk)
++
++.IF $(ATKVERSION) >= "000100070000"
++CFLAGS+=-DHAS_ATKRECTANGLE
++.ENDIF
++
 +LIB1TARGET=$(SLB)$/$(TARGET).lib
 +LIB1OBJFILES=\
 +	$(SLO)$/atkaction.obj \
@@ -6790,9 +6836,9 @@
          return pInstance;
      }
 Index: gsl/vcl/unx/gtk/window/gtkframe.cxx
-diff -u gsl/vcl/unx/gtk/window/gtkframe.cxx:1.42 gsl/vcl/unx/gtk/window/gtkframe.cxx:1.28.6.19
---- gsl/vcl/unx/gtk/window/gtkframe.cxx:1.42	Wed Jan 25 03:40:22 2006
-+++ gsl/vcl/unx/gtk/window/gtkframe.cxx	Fri Feb 17 03:10:57 2006
+diff -u gsl/vcl/unx/gtk/window/gtkframe.cxx:1.43 gsl/vcl/unx/gtk/window/gtkframe.cxx:1.28.6.20
+--- gsl/vcl/unx/gtk/window/gtkframe.cxx:1.43	Wed Mar 22 02:40:30 2006
++++ gsl/vcl/unx/gtk/window/gtkframe.cxx	Tue Mar 28 03:34:26 2006
 @@ -45,6 +45,7 @@
  #include <floatwin.hxx>
  #include <salprn.h>
@@ -6986,7 +7032,7 @@
      m_aForeignParentWindow = None;
 Index: gsl/vcl/unx/inc/plugins/gtk/atkbridge.hxx
 diff -u /dev/null gsl/vcl/unx/inc/plugins/gtk/atkbridge.hxx:1.1.2.3
---- /dev/null	Thu Mar 23 06:49:08 2006
+--- /dev/null	Mon Apr 10 05:20:28 2006
 +++ gsl/vcl/unx/inc/plugins/gtk/atkbridge.hxx	Thu Jan 12 05:57:32 2006
 @@ -0,0 +1,45 @@
 +/*************************************************************************
@@ -7453,6 +7499,74 @@
          }
          catch( const uno::Exception& ) {}
      }
+Index: graphics/svx/source/accessibility/ChildrenManagerImpl.cxx
+diff -u graphics/svx/source/accessibility/ChildrenManagerImpl.cxx:1.33 graphics/svx/source/accessibility/ChildrenManagerImpl.cxx:1.33.172.1
+--- graphics/svx/source/accessibility/ChildrenManagerImpl.cxx:1.33	Thu Sep  8 13:20:26 2005
++++ graphics/svx/source/accessibility/ChildrenManagerImpl.cxx	Thu Mar 30 00:27:45 2006
+@@ -537,34 +537,45 @@
+ 
+ void ChildrenManagerImpl::ClearAccessibleShapeList (void)
+ {
++    // Copy the list of (visible) shapes to local lists and clear the
++    // originals.
++    ChildDescriptorListType aLocalVisibleChildren;
++    aLocalVisibleChildren.swap(maVisibleChildren);
++    AccessibleShapeList aLocalAccessibleShapes;
++    aLocalAccessibleShapes.swap(maAccessibleShapes);
++
++    // Tell the listeners that all children are gone.
++    mrContext.CommitChange (
++        AccessibleEventId::INVALIDATE_ALL_CHILDREN,
++        uno::Any(),
++        uno::Any());
++
++    // There are no accessible shapes left so the index assigned to new
++    // accessible shapes can be reset.
++    mnNewNameIndex = 1;
++    
++    // Now the objects in the local lists can be safely disposed without
++    // having problems with callers that want to update their child lists.
++    
+     // Clear the list of visible accessible objects.  Objects not created on
+     // demand for XShapes are treated below.
+-    ChildDescriptorListType::iterator I,aEnd = maVisibleChildren.end();
+-    for (I=maVisibleChildren.begin(); I != aEnd; ++I)
++    ChildDescriptorListType::iterator I,aEnd = aLocalVisibleChildren.end();
++    for (I=aLocalVisibleChildren.begin(); I != aEnd; ++I)
+         if ( I->mxAccessibleShape.is() && I->mxShape.is() )
+-            I->disposeAccessibleObject(mrContext);
+-
+-    maVisibleChildren.clear ();
+-
++        {
++            ::comphelper::disposeComponent(I->mxAccessibleShape);
++            I->mxAccessibleShape = NULL;
++        }            
+ 
+     // Dispose all objects in the accessible shape list.
+-    AccessibleShapeList::iterator J,aEnd2 = maAccessibleShapes.end();
+-    for (J=maAccessibleShapes.begin(); J != aEnd2; ++J)
++    AccessibleShapeList::iterator J,aEnd2 = aLocalAccessibleShapes.end();
++    for (J=aLocalAccessibleShapes.begin(); J != aEnd2; ++J)
+         if (J->is())
+         {
+-            mrContext.CommitChange (
+-                AccessibleEventId::CHILD, 
+-                uno::Any(),
+-                uno::makeAny (*J));
+-
+             // Dispose the object.
+ 			::comphelper::disposeComponent(*J);
++            *J = NULL;
+         }
+-    maAccessibleShapes.clear ();
+-
+-    // Now that no accessible shapes remain we can reset the index assigned
+-    // to new accessible shapes.
+-    mnNewNameIndex = 1;
+ }
+ 
+ 
 Index: graphics/svx/source/accessibility/GraphCtlAccessibleContext.cxx
 diff -u graphics/svx/source/accessibility/GraphCtlAccessibleContext.cxx:1.18 graphics/svx/source/accessibility/GraphCtlAccessibleContext.cxx:1.18.168.1
 --- graphics/svx/source/accessibility/GraphCtlAccessibleContext.cxx:1.18	Thu Sep  8 13:21:42 2005
@@ -7762,3 +7876,25 @@
               << ::css::accessibility::AccessibleStateType::FOCUSABLE)
            | (static_cast< ::sal_Int64 >(1)
               << ::css::accessibility::AccessibleStateType::MULTI_LINE);
+Index: graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+diff -u graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx:1.21 graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx:1.21.14.1
+--- graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx:1.21	Tue Mar 21 09:31:22 2006
++++ graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx	Thu Mar 30 00:45:28 2006
+@@ -110,7 +110,7 @@
+     pWindow->SetUseDropScroll (false);
+     // Change the winbits so that the active window accepts the focus.
+     pWindow->SetStyle ((pWindow->GetStyle() & ~WB_DIALOGCONTROL) | WB_TABSTOP);
+-    pWindow->Show();
++    pWindow->Hide();
+ 
+ 
+ 	SetPool( &GetDoc()->GetPool() );
+@@ -266,6 +266,8 @@
+         CreateView());
+     DBG_ASSERT (mpSlideSorterView.get()!=NULL,
+         "Can not create view for slide browser"); 
++
++    mpView = mpSlideSorterView.get();
+ 
+     mpSlideSorterController 
+         = ::std::auto_ptr<controller::SlideSorterController>(



From fedora-cvs-commits at redhat.com  Mon Apr 10 13:27:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 09:27:51 -0400
Subject: rpms/yelp/FC-5 .cvsignore, 1.25, 1.26 sources, 1.25, 1.26 yelp.spec,
	1.55, 1.56
Message-ID: <200604101327.k3ADRpcC008759@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore sources yelp.spec 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/yelp/FC-5/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	13 Mar 2006 05:32:40 -0000	1.25
+++ .cvsignore	10 Apr 2006 13:27:49 -0000	1.26
@@ -14,3 +14,4 @@
 yelp-2.13.5.tar.bz2
 yelp-2.13.6.tar.bz2
 yelp-2.14.0.tar.bz2
+yelp-2.14.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/yelp/FC-5/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	13 Mar 2006 05:32:41 -0000	1.25
+++ sources	10 Apr 2006 13:27:49 -0000	1.26
@@ -1 +1 @@
-eef25315bfe8162dd7bcc2aabf31bcf8  yelp-2.14.0.tar.bz2
+3d569f8e9372bc88c7f9fca6a94388a9  yelp-2.14.1.tar.bz2


Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/FC-5/yelp.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- yelp.spec	13 Mar 2006 05:32:41 -0000	1.55
+++ yelp.spec	10 Apr 2006 13:27:49 -0000	1.56
@@ -12,8 +12,8 @@
 
 Summary: A system documentation reader from the Gnome project. 
 Name: yelp
-Version: 2.14.0
-Release: 1
+Version: 2.14.1
+Release: 1.fc5.1
 Source: %{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
 Patch1: yelp-2.12.1-fedora-docs.patch
@@ -117,6 +117,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 13:44:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 09:44:07 -0400
Subject: rpms/yelp/devel sources,1.25,1.26 yelp.spec,1.55,1.56
Message-ID: <200604101344.k3ADi7EC008977@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/yelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8964

Modified Files:
	sources yelp.spec 
Log Message:
2.14.1



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	13 Mar 2006 05:32:41 -0000	1.25
+++ sources	10 Apr 2006 13:44:04 -0000	1.26
@@ -1 +1 @@
-eef25315bfe8162dd7bcc2aabf31bcf8  yelp-2.14.0.tar.bz2
+3d569f8e9372bc88c7f9fca6a94388a9  yelp-2.14.1.tar.bz2


Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- yelp.spec	13 Mar 2006 05:32:41 -0000	1.55
+++ yelp.spec	10 Apr 2006 13:44:05 -0000	1.56
@@ -12,8 +12,8 @@
 
 Summary: A system documentation reader from the Gnome project. 
 Name: yelp
-Version: 2.14.0
-Release: 1
+Version: 2.14.1
+Release: 2
 Source: %{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
 Patch1: yelp-2.12.1-fedora-docs.patch
@@ -117,6 +117,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 13:49:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 09:49:22 -0400
Subject: rpms/gtk-doc/devel .cvsignore, 1.9, 1.10 gtk-doc.spec, 1.16,
	1.17 sources, 1.9, 1.10
Message-ID: <200604101349.k3ADnMw0022953@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk-doc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22938

Modified Files:
	.cvsignore gtk-doc.spec sources 
Log Message:
1.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtk-doc/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	6 Jul 2005 04:15:47 -0000	1.9
+++ .cvsignore	10 Apr 2006 13:49:20 -0000	1.10
@@ -1,3 +1,4 @@
 gtk-doc-1.2.tar.bz2
 gtk-doc-1.3.tar.bz2
 gtk-doc-1.4.tar.bz2
+gtk-doc-1.6.tar.bz2


Index: gtk-doc.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk-doc/devel/gtk-doc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gtk-doc.spec	9 Dec 2005 22:40:50 -0000	1.16
+++ gtk-doc.spec	10 Apr 2006 13:49:20 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: API documentation generation tool for GTK+ and GNOME
 Name: gtk-doc
-Version: 1.4
-Release: 1.1
+Version: 1.6
+Release: 1
 License: LGPL
 Group: Development/Tools
 Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.4/gtk-doc-1.4.tar.bz2 
@@ -50,6 +50,9 @@
 %{_datadir}/pkgconfig/gtk-doc.pc
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> 1.6-1
+- Update to 1.6
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk-doc/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	6 Jul 2005 04:15:48 -0000	1.9
+++ sources	10 Apr 2006 13:49:20 -0000	1.10
@@ -1 +1 @@
-44d1cdce88c2eb4ccb962998ad0c0d1a  gtk-doc-1.4.tar.bz2
+09c7a89efff2e0bbaba02a12bff58dfd  gtk-doc-1.6.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 13:50:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 09:50:59 -0400
Subject: rpms/gtk-doc/devel gtk-doc.spec,1.17,1.18
Message-ID: <200604101350.k3ADoxFk023040@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk-doc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23018

Modified Files:
	gtk-doc.spec 
Log Message:
bump rev



Index: gtk-doc.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk-doc/devel/gtk-doc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gtk-doc.spec	10 Apr 2006 13:49:20 -0000	1.17
+++ gtk-doc.spec	10 Apr 2006 13:50:56 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: API documentation generation tool for GTK+ and GNOME
 Name: gtk-doc
 Version: 1.6
-Release: 1
+Release: 2
 License: LGPL
 Group: Development/Tools
 Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.4/gtk-doc-1.4.tar.bz2 
@@ -50,7 +50,7 @@
 %{_datadir}/pkgconfig/gtk-doc.pc
 
 %changelog
-* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> 1.6-1
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> 1.6-2
 - Update to 1.6
 
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>



From fedora-cvs-commits at redhat.com  Mon Apr 10 14:04:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 10:04:44 -0400
Subject: rpms/gtk-doc/FC-5 gtk-doc.spec,1.16,1.17 sources,1.9,1.10
Message-ID: <200604101404.k3AE4iwU023344@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk-doc/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23328

Modified Files:
	gtk-doc.spec sources 
Log Message:
1.6



Index: gtk-doc.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk-doc/FC-5/gtk-doc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gtk-doc.spec	9 Dec 2005 22:40:50 -0000	1.16
+++ gtk-doc.spec	10 Apr 2006 14:04:41 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: API documentation generation tool for GTK+ and GNOME
 Name: gtk-doc
-Version: 1.4
-Release: 1.1
+Version: 1.6
+Release: 1.fc5.1
 License: LGPL
 Group: Development/Tools
 Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.4/gtk-doc-1.4.tar.bz2 
@@ -50,6 +50,9 @@
 %{_datadir}/pkgconfig/gtk-doc.pc
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> 1.6-1.fc5.1
+- Update to 1.6
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk-doc/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	6 Jul 2005 04:15:48 -0000	1.9
+++ sources	10 Apr 2006 14:04:41 -0000	1.10
@@ -1 +1 @@
-44d1cdce88c2eb4ccb962998ad0c0d1a  gtk-doc-1.4.tar.bz2
+09c7a89efff2e0bbaba02a12bff58dfd  gtk-doc-1.6.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 14:07:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 10:07:53 -0400
Subject: rpms/gtk-doc/devel gtk-doc.spec,1.18,1.19
Message-ID: <200604101407.k3AE7r51023449@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk-doc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23436

Modified Files:
	gtk-doc.spec 
Log Message:
update sources



Index: gtk-doc.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk-doc/devel/gtk-doc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gtk-doc.spec	10 Apr 2006 13:50:56 -0000	1.18
+++ gtk-doc.spec	10 Apr 2006 14:07:51 -0000	1.19
@@ -4,7 +4,7 @@
 Release: 2
 License: LGPL
 Group: Development/Tools
-Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.4/gtk-doc-1.4.tar.bz2 
+Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.6/gtk-doc-1.6.tar.bz2 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.gtk.org/gtk-doc



From fedora-cvs-commits at redhat.com  Mon Apr 10 14:09:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 10:09:06 -0400
Subject: rpms/gtk-doc/FC-5 gtk-doc.spec,1.17,1.18
Message-ID: <200604101409.k3AE96mU023524@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk-doc/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23508

Modified Files:
	gtk-doc.spec 
Log Message:
update sources



Index: gtk-doc.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk-doc/FC-5/gtk-doc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gtk-doc.spec	10 Apr 2006 14:04:41 -0000	1.17
+++ gtk-doc.spec	10 Apr 2006 14:09:04 -0000	1.18
@@ -4,7 +4,7 @@
 Release: 1.fc5.1
 License: LGPL
 Group: Development/Tools
-Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.4/gtk-doc-1.4.tar.bz2 
+Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.6/gtk-doc-1.6.tar.bz2 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.gtk.org/gtk-doc



From fedora-cvs-commits at redhat.com  Mon Apr 10 14:21:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 10:21:55 -0400
Subject: rpms/gtk-doc/devel gtk-doc.spec,1.19,1.20
Message-ID: <200604101421.k3AELtCK005105@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk-doc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5094

Modified Files:
	gtk-doc.spec 
Log Message:
fix file lists



Index: gtk-doc.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk-doc/devel/gtk-doc.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gtk-doc.spec	10 Apr 2006 14:07:51 -0000	1.19
+++ gtk-doc.spec	10 Apr 2006 14:21:40 -0000	1.20
@@ -26,7 +26,7 @@
 mv doc/README doc/README.docs
 
 %build
-%configure --enable-public-id
+%configure --enable-public-id --disable-scrollkeeper
 make
 
 %install
@@ -34,8 +34,7 @@
 
 %makeinstall
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pkgconfig/
-mv $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gtk-doc.pc $RPM_BUILD_ROOT%{_datadir}/pkgconfig
+rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,6 +47,8 @@
 %{_datadir}/gtk-doc/
 %{_datadir}/sgml/gtk-doc/
 %{_datadir}/pkgconfig/gtk-doc.pc
+%{_datadir}/gnome/help/gtk-doc-manual/
+%{_datadir}/omf/gtk-doc/
 
 %changelog
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> 1.6-2



From fedora-cvs-commits at redhat.com  Mon Apr 10 14:24:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 10:24:14 -0400
Subject: rpms/gtk-doc/FC-5 gtk-doc.spec,1.18,1.19
Message-ID: <200604101424.k3AEOExF005233@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk-doc/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5217

Modified Files:
	gtk-doc.spec 
Log Message:
fix file lists



Index: gtk-doc.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk-doc/FC-5/gtk-doc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gtk-doc.spec	10 Apr 2006 14:09:04 -0000	1.18
+++ gtk-doc.spec	10 Apr 2006 14:24:12 -0000	1.19
@@ -26,7 +26,7 @@
 mv doc/README doc/README.docs
 
 %build
-%configure --enable-public-id
+%configure --enable-public-id --disable-scrollkeeper
 make
 
 %install
@@ -34,8 +34,7 @@
 
 %makeinstall
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pkgconfig/
-mv $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gtk-doc.pc $RPM_BUILD_ROOT%{_datadir}/pkgconfig
+rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,6 +47,8 @@
 %{_datadir}/gtk-doc/
 %{_datadir}/sgml/gtk-doc/
 %{_datadir}/pkgconfig/gtk-doc.pc
+%{_datadir}/gnome/help/gtk-doc-manual/
+%{_datadir}/omf/gtk-doc/
 
 %changelog
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> 1.6-1.fc5.1



From fedora-cvs-commits at redhat.com  Mon Apr 10 14:28:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 10:28:08 -0400
Subject: rpms/gnome-terminal/FC-5 .cvsignore, 1.24, 1.25 gnome-terminal.spec,
	1.37, 1.38 sources, 1.24, 1.25
Message-ID: <200604101428.k3AES802005397@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-terminal.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/FC-5/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	13 Mar 2006 05:29:47 -0000	1.24
+++ .cvsignore	10 Apr 2006 14:28:06 -0000	1.25
@@ -9,3 +9,4 @@
 gnome-terminal-2.13.92.tar.bz2
 gnome-terminal-2.13.93.tar.bz2
 gnome-terminal-2.14.0.tar.bz2
+gnome-terminal-2.14.1.tar.bz2


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/FC-5/gnome-terminal.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gnome-terminal.spec	13 Mar 2006 05:29:47 -0000	1.37
+++ gnome-terminal.spec	10 Apr 2006 14:28:06 -0000	1.38
@@ -12,8 +12,8 @@
 
 Summary: GNOME Terminal
 Name: gnome-terminal
-Version: 2.14.0
-Release: 1
+Version: 2.14.1
+Release: 1.fc5.1
 URL: http://www.gnome.org/
 Source0: gnome-terminal-%{version}.tar.bz2
 Source1: ne.po
@@ -101,6 +101,9 @@
 %{_libdir}/bonobo
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/FC-5/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	13 Mar 2006 05:29:47 -0000	1.24
+++ sources	10 Apr 2006 14:28:06 -0000	1.25
@@ -1 +1 @@
-a05bac2c9d7b3860f137193c98d3d9a8  gnome-terminal-2.14.0.tar.bz2
+7abe60db5359c88392d2b4f0d5587ef5  gnome-terminal-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 14:29:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 10:29:10 -0400
Subject: rpms/gnome-terminal/devel gnome-terminal.spec, 1.37, 1.38 sources,
	1.24, 1.25
Message-ID: <200604101429.k3AETAtU005485@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-terminal.spec sources 
Log Message:
2.14.1



Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gnome-terminal.spec	13 Mar 2006 05:29:47 -0000	1.37
+++ gnome-terminal.spec	10 Apr 2006 14:29:08 -0000	1.38
@@ -12,8 +12,8 @@
 
 Summary: GNOME Terminal
 Name: gnome-terminal
-Version: 2.14.0
-Release: 1
+Version: 2.14.1
+Release: 2
 URL: http://www.gnome.org/
 Source0: gnome-terminal-%{version}.tar.bz2
 Source1: ne.po
@@ -101,6 +101,9 @@
 %{_libdir}/bonobo
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	13 Mar 2006 05:29:47 -0000	1.24
+++ sources	10 Apr 2006 14:29:08 -0000	1.25
@@ -1 +1 @@
-a05bac2c9d7b3860f137193c98d3d9a8  gnome-terminal-2.14.0.tar.bz2
+7abe60db5359c88392d2b4f0d5587ef5  gnome-terminal-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 14:39:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 10:39:36 -0400
Subject: rpms/gnome-user-docs/devel .cvsignore, 1.13,
	1.14 gnome-user-docs.spec, 1.19, 1.20 sources, 1.13, 1.14
Message-ID: <200604101439.k3AEdaho005652@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-user-docs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5640

Modified Files:
	.cvsignore gnome-user-docs.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-docs/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	13 Mar 2006 13:15:56 -0000	1.13
+++ .cvsignore	10 Apr 2006 14:39:34 -0000	1.14
@@ -4,3 +4,4 @@
 gnome-user-docs-2.13.1.tar.bz2
 gnome-user-docs-2.13.1.1.tar.bz2
 gnome-user-docs-2.14.0.tar.bz2
+gnome-user-docs-2.14.1.tar.bz2


Index: gnome-user-docs.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-docs/devel/gnome-user-docs.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gnome-user-docs.spec	13 Mar 2006 13:15:56 -0000	1.19
+++ gnome-user-docs.spec	10 Apr 2006 14:39:34 -0000	1.20
@@ -1,7 +1,7 @@
 Summary:        GNOME User Documentation
 Name:           gnome-user-docs
-Version:        2.14.0
-Release:	1 
+Version:        2.14.1
+Release:	2 
 License:        FDL
 Source:         gnome-user-docs-%{version}.tar.bz2
 Group:          Documentation
@@ -47,6 +47,9 @@
 %{_datadir}/omf
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> 2.14.1-2
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-docs/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	13 Mar 2006 13:15:56 -0000	1.13
+++ sources	10 Apr 2006 14:39:34 -0000	1.14
@@ -1 +1 @@
-1b258d00f4b9ed0cae9e6c9ea06c55b8  gnome-user-docs-2.14.0.tar.bz2
+ff144dba5a50b24bf7b94ecd4fc2d61c  gnome-user-docs-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 14:40:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 10:40:59 -0400
Subject: rpms/gnome-user-docs/FC-5 gnome-user-docs.spec, 1.19, 1.20 sources,
	1.13, 1.14
Message-ID: <200604101440.k3AEexuq005742@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-user-docs/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5728

Modified Files:
	gnome-user-docs.spec sources 
Log Message:
2.14.1



Index: gnome-user-docs.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-docs/FC-5/gnome-user-docs.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gnome-user-docs.spec	13 Mar 2006 13:15:56 -0000	1.19
+++ gnome-user-docs.spec	10 Apr 2006 14:40:46 -0000	1.20
@@ -1,7 +1,7 @@
 Summary:        GNOME User Documentation
 Name:           gnome-user-docs
-Version:        2.14.0
-Release:	1 
+Version:        2.14.1
+Release:	1.fc5.1
 License:        FDL
 Source:         gnome-user-docs-%{version}.tar.bz2
 Group:          Documentation
@@ -47,6 +47,9 @@
 %{_datadir}/omf
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> 2.14.1-1.fc5.1
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-docs/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	13 Mar 2006 13:15:56 -0000	1.13
+++ sources	10 Apr 2006 14:40:46 -0000	1.14
@@ -1 +1 @@
-1b258d00f4b9ed0cae9e6c9ea06c55b8  gnome-user-docs-2.14.0.tar.bz2
+ff144dba5a50b24bf7b94ecd4fc2d61c  gnome-user-docs-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 14:49:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 10:49:46 -0400
Subject: rpms/gnome-games/devel .cvsignore, 1.35, 1.36 gnome-games.spec, 1.69,
	1.70 sources, 1.38, 1.39
Message-ID: <200604101449.k3AEnkw2019743@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	13 Mar 2006 13:29:03 -0000	1.35
+++ .cvsignore	10 Apr 2006 14:49:43 -0000	1.36
@@ -5,3 +5,4 @@
 gnome-games-2.13.7.tar.bz2
 gnome-games-2.13.8.tar.bz2
 gnome-games-2.14.0.tar.bz2
+gnome-games-2.14.1.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- gnome-games.spec	13 Mar 2006 13:29:03 -0000	1.69
+++ gnome-games.spec	10 Apr 2006 14:49:43 -0000	1.70
@@ -10,8 +10,8 @@
 
 Summary: GNOME games.
 Name: gnome-games
-Version: 2.14.0
-Release: 1 
+Version: 2.14.1
+Release: 2
 Epoch: 1
 License: LGPL
 Group: Amusements/Games
@@ -177,6 +177,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	13 Mar 2006 13:29:03 -0000	1.38
+++ sources	10 Apr 2006 14:49:43 -0000	1.39
@@ -1,2 +1,2 @@
 19b2d6dbca182fb426a0bd86d322a2ac  gnome-games-extra-data-no-windows-2.12.0.tar.bz2
-8d5508722b621c8a4f3a397a2709b7a0  gnome-games-2.14.0.tar.bz2
+9893da6c2f8eecdbc596cec9a017a8b2  gnome-games-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 14:51:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 10:51:54 -0400
Subject: rpms/gnome-games/FC-5 gnome-games.spec,1.69,1.70 sources,1.38,1.39
Message-ID: <200604101451.k3AEpsVE019850@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-games.spec sources 
Log Message:
2.14.1



Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/FC-5/gnome-games.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- gnome-games.spec	13 Mar 2006 13:29:03 -0000	1.69
+++ gnome-games.spec	10 Apr 2006 14:51:52 -0000	1.70
@@ -10,8 +10,8 @@
 
 Summary: GNOME games.
 Name: gnome-games
-Version: 2.14.0
-Release: 1 
+Version: 2.14.1
+Release: 1.fc5.1
 Epoch: 1
 License: LGPL
 Group: Amusements/Games
@@ -177,6 +177,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/FC-5/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	13 Mar 2006 13:29:03 -0000	1.38
+++ sources	10 Apr 2006 14:51:52 -0000	1.39
@@ -1,2 +1,2 @@
 19b2d6dbca182fb426a0bd86d322a2ac  gnome-games-extra-data-no-windows-2.12.0.tar.bz2
-8d5508722b621c8a4f3a397a2709b7a0  gnome-games-2.14.0.tar.bz2
+9893da6c2f8eecdbc596cec9a017a8b2  gnome-games-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 15:38:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 11:38:41 -0400
Subject: rpms/keyutils/FC-5 - New directory
Message-ID: <200604101538.k3AFcfD3001703@cvs.devel.redhat.com>

Author: dhowells

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

Log Message:
Directory /cvs/dist/rpms/keyutils/FC-5 added to the repository




From fedora-cvs-commits at redhat.com  Mon Apr 10 16:11:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 12:11:12 -0400
Subject: rpms/xorg-x11-drv-sisusb/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-sisusb.spec, 1.8, 1.9
Message-ID: <200604101611.k3AGBCUx016127@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-sisusb/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:38:50 -0000	1.6
+++ .cvsignore	10 Apr 2006 16:10:57 -0000	1.7
@@ -1 +1 @@
-xf86-video-sisusb-0.7.1.3.tar.bz2
+xf86-video-sisusb-0.8.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-sisusb/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:38:50 -0000	1.6
+++ sources	10 Apr 2006 16:10:57 -0000	1.7
@@ -1 +1 @@
-c78b9c140ea318790b77c7b53c193735  xf86-video-sisusb-0.7.1.3.tar.bz2
+cbd669507e4aa35e468905f09b546333  xf86-video-sisusb-0.8.1.tar.bz2


Index: xorg-x11-drv-sisusb.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-sisusb/devel/xorg-x11-drv-sisusb.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-sisusb.spec	11 Feb 2006 06:22:29 -0000	1.8
+++ xorg-x11-drv-sisusb.spec	10 Apr 2006 16:10:57 -0000	1.9
@@ -10,12 +10,10 @@
 
 Summary:   Xorg X11 sisusb video driver
 Name:      xorg-x11-drv-sisusb
-Version: 0.7.1.3
-Release: 1.2
+Version: 0.8.1
+Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 #Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -83,6 +81,9 @@
 %{_mandir}/man4/*.4*
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 0.8.1-1
+- Update to 0.8.1 from 7.1RC1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.7.1.3-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 16:13:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 12:13:45 -0400
Subject: rpms/tftp/devel tftp-hpa-0.39-tzfix.patch, NONE, 1.1 tftp.spec, 1.31,
	1.32
Message-ID: <200604101613.k3AGDjWi016216@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/tftp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16200

Modified Files:
	tftp.spec 
Added Files:
	tftp-hpa-0.39-tzfix.patch 
Log Message:
- show localtime instead of GMT (#172274)

tftp-hpa-0.39-tzfix.patch:
 tftpd.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE tftp-hpa-0.39-tzfix.patch ---
--- tftp-hpa-0.39/tftpd/tftpd.c.old	2004-09-15 00:38:46.000000000 +0200
+++ tftp-hpa-0.39/tftpd/tftpd.c	2006-04-10 17:26:31.000000000 +0200
@@ -286,7 +286,14 @@
   char *rewrite_file = NULL;
 #endif
   u_short tp_opcode;
-
+  time_t my_time = 0;
+  struct tm* p_tm;
+  char envtz[10];
+  my_time = time(NULL);
+  p_tm = localtime(&my_time);
+  snprintf(envtz, sizeof(envtz) - 1, "UTC%+d", (p_tm->tm_gmtoff * -1)/3600);
+  setenv("TZ", envtz, 0);
+  
   /* basename() is way too much of a pain from a portability standpoint */
 
   p = strrchr(argv[0], '/');


Index: tftp.spec
===================================================================
RCS file: /cvs/dist/rpms/tftp/devel/tftp.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- tftp.spec	22 Mar 2006 11:04:02 -0000	1.31
+++ tftp.spec	10 Apr 2006 16:13:43 -0000	1.32
@@ -3,12 +3,13 @@
 Summary: The client for the Trivial File Transfer Protocol (TFTP).
 Name: tftp
 Version: %{tftp_hpa_version}
-Release: 2
+Release: 3
 License: BSD
 Group: Applications/Internet
 Source0: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{tftp_hpa_version}.tar.gz
 Patch0: tftp-0.40-remap.patch
 Patch1: tftp-hpa-0.42-sigjmp.patch
+Patch2: tftp-hpa-0.39-tzfix.patch
 BuildPreReq: tcp_wrappers
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -36,6 +37,7 @@
 %setup -q -n tftp-hpa-%{version} 
 %patch0 -p1 -b .zero
 %patch1 -p1 -b .sigjmp
+%patch2 -p1 -b .tzfix
 
 %build
 
@@ -78,6 +80,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Mon Apr 10 2006 Radek Vok??l <rvokal at redhat.com> 0.42-3
+- show localtime instead of GMT (#172274)
+
 * Wed Mar 22 2006 Radek Vok??l <rvokal at redhat.com> 0.42-2
 - fix double free error when hitting ^C (#186201)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 16:17:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 12:17:37 -0400
Subject: rpms/gtksourceview/devel .cvsignore, 1.20, 1.21 gtksourceview.spec,
	1.29, 1.30 sources, 1.19, 1.20
Message-ID: <200604101617.k3AGHbov030176@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtksourceview/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24757

Modified Files:
	.cvsignore gtksourceview.spec sources 
Log Message:
1.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtksourceview/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	12 Mar 2006 18:06:09 -0000	1.20
+++ .cvsignore	10 Apr 2006 16:17:34 -0000	1.21
@@ -1 +1,2 @@
 gtksourceview-1.6.0.tar.bz2
+gtksourceview-1.6.1.tar.bz2


Index: gtksourceview.spec
===================================================================
RCS file: /cvs/dist/rpms/gtksourceview/devel/gtksourceview.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gtksourceview.spec	12 Mar 2006 18:06:10 -0000	1.29
+++ gtksourceview.spec	10 Apr 2006 16:17:35 -0000	1.30
@@ -3,7 +3,7 @@
 
 Summary: A library for viewing source files
 Name: gtksourceview
-Version: 1.6.0
+Version: 1.6.1
 Release: 1 
 License: LGPL
 Group: System Environment/Libraries
@@ -71,6 +71,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 1.6.1-2
+- Update to 1.6.1
+
 * Sun Mar 12 2006 Ray Strode <rstrode at redhat.com> - 1.6.0-1
 - update to 1.6.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtksourceview/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	12 Mar 2006 18:06:10 -0000	1.19
+++ sources	10 Apr 2006 16:17:35 -0000	1.20
@@ -1 +1 @@
-f3403c0f8c5f924b022534b0d93d8e0f  gtksourceview-1.6.0.tar.bz2
+f8ca3a1a746477b2b46de7ebea276db5  gtksourceview-1.6.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 16:18:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 12:18:19 -0400
Subject: rpms/gtksourceview/devel gtksourceview.spec,1.30,1.31
Message-ID: <200604101618.k3AGIJY7030217@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtksourceview/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30203

Modified Files:
	gtksourceview.spec 
Log Message:
bump rev



Index: gtksourceview.spec
===================================================================
RCS file: /cvs/dist/rpms/gtksourceview/devel/gtksourceview.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gtksourceview.spec	10 Apr 2006 16:17:35 -0000	1.30
+++ gtksourceview.spec	10 Apr 2006 16:18:08 -0000	1.31
@@ -4,7 +4,7 @@
 Summary: A library for viewing source files
 Name: gtksourceview
 Version: 1.6.1
-Release: 1 
+Release: 2 
 License: LGPL
 Group: System Environment/Libraries
 URL: http://gtksourceview.sourceforge.net/ 



From fedora-cvs-commits at redhat.com  Mon Apr 10 16:19:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 12:19:56 -0400
Subject: rpms/gtksourceview/FC-5 gtksourceview.spec, 1.29, 1.30 sources, 1.19,
	1.20
Message-ID: <200604101619.k3AGJuQR030293@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gtksourceview.spec sources 
Log Message:
1.6.1



Index: gtksourceview.spec
===================================================================
RCS file: /cvs/dist/rpms/gtksourceview/FC-5/gtksourceview.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gtksourceview.spec	12 Mar 2006 18:06:10 -0000	1.29
+++ gtksourceview.spec	10 Apr 2006 16:19:54 -0000	1.30
@@ -3,8 +3,8 @@
 
 Summary: A library for viewing source files
 Name: gtksourceview
-Version: 1.6.0
-Release: 1 
+Version: 1.6.1
+Release: 1.fc5.1
 License: LGPL
 Group: System Environment/Libraries
 URL: http://gtksourceview.sourceforge.net/ 
@@ -71,6 +71,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 1.6.1-1.fc5.1
+- Update to 1.6.1
+
 * Sun Mar 12 2006 Ray Strode <rstrode at redhat.com> - 1.6.0-1
 - update to 1.6.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtksourceview/FC-5/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	12 Mar 2006 18:06:10 -0000	1.19
+++ sources	10 Apr 2006 16:19:54 -0000	1.20
@@ -1 +1 @@
-f3403c0f8c5f924b022534b0d93d8e0f  gtksourceview-1.6.0.tar.bz2
+f8ca3a1a746477b2b46de7ebea276db5  gtksourceview-1.6.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 16:27:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 12:27:31 -0400
Subject: rpms/sound-juicer/devel .cvsignore, 1.21, 1.22 sound-juicer.spec,
	1.46, 1.47 sources, 1.21, 1.22
Message-ID: <200604101627.k3AGRVSV030520@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/sound-juicer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30509

Modified Files:
	.cvsignore sound-juicer.spec sources 
Log Message:
2.14.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	5 Apr 2006 13:11:03 -0000	1.21
+++ .cvsignore	10 Apr 2006 16:27:29 -0000	1.22
@@ -11,3 +11,4 @@
 sound-juicer-2.13.6.tar.bz2
 sound-juicer-2.14.0.tar.bz2
 sound-juicer-2.14.1.tar.bz2
+sound-juicer-2.14.2.tar.bz2


Index: sound-juicer.spec
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sound-juicer.spec	5 Apr 2006 13:23:47 -0000	1.46
+++ sound-juicer.spec	10 Apr 2006 16:27:29 -0000	1.47
@@ -12,7 +12,7 @@
 
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
-Version:	2.14.1
+Version:	2.14.2
 Release:	2
 License:	GPL
 Group:		Applications/Multimedia
@@ -100,6 +100,9 @@
 %{_datadir}/icons/hicolor/*
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-2
+- Update to 2.14.2
+
 * Wed Apr  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
 - Update to 2.14.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	5 Apr 2006 13:11:03 -0000	1.21
+++ sources	10 Apr 2006 16:27:29 -0000	1.22
@@ -1 +1 @@
-d1a54d488ae8a91e2f927acddaf5ccb3  sound-juicer-2.14.1.tar.bz2
+b7f849eecc18cd8e534bd305742aaa19  sound-juicer-2.14.2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 16:32:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 12:32:48 -0400
Subject: rpms/sound-juicer/FC-5 sound-juicer.spec, 1.46, 1.47 sources, 1.21,
	1.22
Message-ID: <200604101632.k3AGWmww030706@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/sound-juicer/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv30686

Modified Files:
	sound-juicer.spec sources 
Log Message:
2.14.2



Index: sound-juicer.spec
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/FC-5/sound-juicer.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sound-juicer.spec	5 Apr 2006 13:26:25 -0000	1.46
+++ sound-juicer.spec	10 Apr 2006 16:32:46 -0000	1.47
@@ -12,7 +12,7 @@
 
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
-Version:	2.14.1
+Version:	2.14.2
 Release:	1.fc5.1
 License:	GPL
 Group:		Applications/Multimedia
@@ -100,7 +100,10 @@
 %{_datadir}/icons/hicolor/*
 
 %changelog
-* Wed Apr  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1.fc5.1
+- Update to 2.14.2
+
+* Wed Apr  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
 - Update to 2.14.1
 
 * Sun Mar 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/FC-5/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	5 Apr 2006 13:13:51 -0000	1.21
+++ sources	10 Apr 2006 16:32:46 -0000	1.22
@@ -1 +1 @@
-d1a54d488ae8a91e2f927acddaf5ccb3  sound-juicer-2.14.1.tar.bz2
+b7f849eecc18cd8e534bd305742aaa19  sound-juicer-2.14.2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 16:52:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 12:52:40 -0400
Subject: rpms/sound-juicer/devel sound-juicer.spec,1.47,1.48
Message-ID: <200604101652.k3AGqese012334@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/sound-juicer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12316

Modified Files:
	sound-juicer.spec 
Log Message:
try again without autoreconf



Index: sound-juicer.spec
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sound-juicer.spec	10 Apr 2006 16:27:29 -0000	1.47
+++ sound-juicer.spec	10 Apr 2006 16:52:37 -0000	1.48
@@ -50,7 +50,6 @@
 
 %prep
 %setup -q
-autoreconf
 
 %build
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 17:06:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 13:06:37 -0400
Subject: rpms/libwnck/devel .cvsignore, 1.31, 1.32 libwnck.spec, 1.44,
	1.45 sources, 1.31, 1.32
Message-ID: <200604101706.k3AH6bk3012748@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libwnck/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12733

Modified Files:
	.cvsignore libwnck.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	13 Mar 2006 21:16:12 -0000	1.31
+++ .cvsignore	10 Apr 2006 17:06:07 -0000	1.32
@@ -1 +1,2 @@
 libwnck-2.14.0.tar.bz2
+libwnck-2.14.1.tar.bz2


Index: libwnck.spec
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- libwnck.spec	13 Mar 2006 21:16:12 -0000	1.44
+++ libwnck.spec	10 Apr 2006 17:06:09 -0000	1.45
@@ -5,8 +5,8 @@
 
 Summary: Window Navigator Construction Kit
 Name: libwnck
-Version: 2.14.0
-Release: 1
+Version: 2.14.1
+Release: 2
 URL: http://ftp.gnome.org/pub/GNOME/sources/libwnck/
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -87,6 +87,9 @@
 %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	13 Mar 2006 21:16:12 -0000	1.31
+++ sources	10 Apr 2006 17:06:24 -0000	1.32
@@ -1 +1 @@
-fd592a8cef2a8ae7712a09cb10e48ed1  libwnck-2.14.0.tar.bz2
+7049a33a2cb8c65433c742bd04de6407  libwnck-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 17:11:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 13:11:49 -0400
Subject: rpms/libwnck/FC-5 libwnck.spec,1.44,1.45 sources,1.31,1.32
Message-ID: <200604101711.k3AHBnjK012961@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	libwnck.spec sources 
Log Message:
2.14.1



Index: libwnck.spec
===================================================================
RCS file: /cvs/dist/rpms/libwnck/FC-5/libwnck.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- libwnck.spec	13 Mar 2006 21:16:12 -0000	1.44
+++ libwnck.spec	10 Apr 2006 17:11:45 -0000	1.45
@@ -5,8 +5,8 @@
 
 Summary: Window Navigator Construction Kit
 Name: libwnck
-Version: 2.14.0
-Release: 1
+Version: 2.14.1
+Release: 1.fc5.1
 URL: http://ftp.gnome.org/pub/GNOME/sources/libwnck/
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -87,6 +87,9 @@
 %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libwnck/FC-5/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	13 Mar 2006 21:16:12 -0000	1.31
+++ sources	10 Apr 2006 17:11:45 -0000	1.32
@@ -1 +1 @@
-fd592a8cef2a8ae7712a09cb10e48ed1  libwnck-2.14.0.tar.bz2
+7049a33a2cb8c65433c742bd04de6407  libwnck-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 17:15:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 13:15:56 -0400
Subject: rpms/gnome-system-monitor/devel .cvsignore, 1.26,
	1.27 gnome-system-monitor.spec, 1.44, 1.45 sources, 1.26, 1.27
Message-ID: <200604101715.k3AHFuTO016258@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-system-monitor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15075

Modified Files:
	.cvsignore gnome-system-monitor.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	13 Mar 2006 14:59:09 -0000	1.26
+++ .cvsignore	10 Apr 2006 17:15:53 -0000	1.27
@@ -8,3 +8,4 @@
 gnome-system-monitor-2.13.90.tar.bz2
 gnome-system-monitor-2.13.92.tar.bz2
 gnome-system-monitor-2.14.0.tar.bz2
+gnome-system-monitor-2.14.1.tar.bz2


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gnome-system-monitor.spec	13 Mar 2006 14:59:09 -0000	1.44
+++ gnome-system-monitor.spec	10 Apr 2006 17:15:53 -0000	1.45
@@ -10,8 +10,8 @@
 
 Summary: Simple process monitor
 Name: gnome-system-monitor
-Version: 2.14.0
-Release: 1
+Version: 2.14.1
+Release: 2
 License: GPL
 Group: Applications/System
 Source: http://download.gnome.org/GNOME/pre-gnome2/sources/gnome-system-monitor/gnome-system-monitor-%{version}.tar.bz2
@@ -80,6 +80,9 @@
 %{_datadir}/omf
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> 2.14.1-2
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	13 Mar 2006 14:59:09 -0000	1.26
+++ sources	10 Apr 2006 17:15:53 -0000	1.27
@@ -1 +1 @@
-4d718e9dff62bb69fcb9d405a1022426  gnome-system-monitor-2.14.0.tar.bz2
+5d9265d712665eaa1a341ad493c284b2  gnome-system-monitor-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 17:19:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 13:19:27 -0400
Subject: rpms/gnome-system-monitor/FC-5 gnome-system-monitor.spec, 1.44,
	1.45 sources, 1.26, 1.27
Message-ID: <200604101719.k3AHJRPU027142@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-system-monitor/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27129

Modified Files:
	gnome-system-monitor.spec sources 
Log Message:
2.14.1



Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/FC-5/gnome-system-monitor.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gnome-system-monitor.spec	13 Mar 2006 14:59:09 -0000	1.44
+++ gnome-system-monitor.spec	10 Apr 2006 17:19:22 -0000	1.45
@@ -10,8 +10,8 @@
 
 Summary: Simple process monitor
 Name: gnome-system-monitor
-Version: 2.14.0
-Release: 1
+Version: 2.14.1
+Release: 1.fc5.1
 License: GPL
 Group: Applications/System
 Source: http://download.gnome.org/GNOME/pre-gnome2/sources/gnome-system-monitor/gnome-system-monitor-%{version}.tar.bz2
@@ -80,6 +80,9 @@
 %{_datadir}/omf
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> 2.14.1-1.fc5.1
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/FC-5/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	13 Mar 2006 14:59:09 -0000	1.26
+++ sources	10 Apr 2006 17:19:22 -0000	1.27
@@ -1 +1 @@
-4d718e9dff62bb69fcb9d405a1022426  gnome-system-monitor-2.14.0.tar.bz2
+5d9265d712665eaa1a341ad493c284b2  gnome-system-monitor-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 17:22:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 13:22:36 -0400
Subject: rpms/libgtop2/devel .cvsignore, 1.24, 1.25 libgtop2.spec, 1.32,
	1.33 sources, 1.24, 1.25
Message-ID: <200604101722.k3AHMaxh027258@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgtop2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27243

Modified Files:
	.cvsignore libgtop2.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgtop2/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	13 Mar 2006 14:53:33 -0000	1.24
+++ .cvsignore	10 Apr 2006 17:22:33 -0000	1.25
@@ -16,3 +16,4 @@
 libgtop-2.13.3.tar.bz2
 libgtop-2.13.92.tar.bz2
 libgtop-2.14.0.tar.bz2
+libgtop-2.14.1.tar.bz2


Index: libgtop2.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtop2/devel/libgtop2.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libgtop2.spec	13 Mar 2006 14:53:33 -0000	1.32
+++ libgtop2.spec	10 Apr 2006 17:22:33 -0000	1.33
@@ -6,8 +6,8 @@
 
 Name:		libgtop2
 Summary:        libgtop library (version 2)
-Version: 	2.14.0
-Release: 	1
+Version: 	2.14.1
+Release: 	2
 License: 	GPL
 URL:            ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/2.0
 Group:          System Environment/Libraries
@@ -83,6 +83,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgtop2/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	13 Mar 2006 14:53:33 -0000	1.24
+++ sources	10 Apr 2006 17:22:33 -0000	1.25
@@ -1 +1 @@
-bc7360262d1c195ba4e7e373843a8c6d  libgtop-2.14.0.tar.bz2
+59cc661ae518fcae158517cc029b2add  libgtop-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 17:25:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 13:25:14 -0400
Subject: rpms/libgtop2/FC-5 libgtop2.spec,1.32,1.33 sources,1.24,1.25
Message-ID: <200604101725.k3AHPEWS027362@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	libgtop2.spec sources 
Log Message:
2.14.1



Index: libgtop2.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtop2/FC-5/libgtop2.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libgtop2.spec	13 Mar 2006 14:53:33 -0000	1.32
+++ libgtop2.spec	10 Apr 2006 17:25:11 -0000	1.33
@@ -6,8 +6,8 @@
 
 Name:		libgtop2
 Summary:        libgtop library (version 2)
-Version: 	2.14.0
-Release: 	1
+Version: 	2.14.1
+Release: 	1.fc5.1
 License: 	GPL
 URL:            ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/2.0
 Group:          System Environment/Libraries
@@ -83,6 +83,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgtop2/FC-5/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	13 Mar 2006 14:53:33 -0000	1.24
+++ sources	10 Apr 2006 17:25:11 -0000	1.25
@@ -1 +1 @@
-bc7360262d1c195ba4e7e373843a8c6d  libgtop-2.14.0.tar.bz2
+59cc661ae518fcae158517cc029b2add  libgtop-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 17:40:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 13:40:03 -0400
Subject: rpms/gnome-session/devel .cvsignore, 1.21, 1.22 gnome-session.spec,
	1.65, 1.66 sources, 1.21, 1.22
Message-ID: <200604101740.k3AHe3b1027645@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-session.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	13 Mar 2006 21:22:14 -0000	1.21
+++ .cvsignore	10 Apr 2006 17:39:59 -0000	1.22
@@ -1,2 +1,3 @@
 gnome-session-2.13.92.tar.bz2
 gnome-session-2.14.0.tar.bz2
+gnome-session-2.14.1.tar.bz2


Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- gnome-session.spec	14 Mar 2006 02:03:02 -0000	1.65
+++ gnome-session.spec	10 Apr 2006 17:39:59 -0000	1.66
@@ -13,8 +13,8 @@
 
 Summary: GNOME session manager
 Name: gnome-session
-Version: 2.14.0
-Release: 1
+Version: 2.14.1
+Release: 2
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -164,6 +164,9 @@
 %{_datadir}/gnome/autostart
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	13 Mar 2006 21:22:14 -0000	1.21
+++ sources	10 Apr 2006 17:39:59 -0000	1.22
@@ -1 +1 @@
-def891553bda47cd660be80cf09fe0ee  gnome-session-2.14.0.tar.bz2
+0b7a0fa918f7d0565d6487d06fa4489d  gnome-session-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 17:42:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 13:42:23 -0400
Subject: rpms/gnome-session/FC-5 gnome-session.spec, 1.65, 1.66 sources, 1.21,
	1.22
Message-ID: <200604101742.k3AHgNHc027779@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-session.spec sources 
Log Message:
2.14.1



Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/FC-5/gnome-session.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- gnome-session.spec	14 Mar 2006 02:03:02 -0000	1.65
+++ gnome-session.spec	10 Apr 2006 17:42:21 -0000	1.66
@@ -13,8 +13,8 @@
 
 Summary: GNOME session manager
 Name: gnome-session
-Version: 2.14.0
-Release: 1
+Version: 2.14.1
+Release: 1.fc5.1
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -164,6 +164,9 @@
 %{_datadir}/gnome/autostart
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/FC-5/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	13 Mar 2006 21:22:14 -0000	1.21
+++ sources	10 Apr 2006 17:42:21 -0000	1.22
@@ -1 +1 @@
-def891553bda47cd660be80cf09fe0ee  gnome-session-2.14.0.tar.bz2
+0b7a0fa918f7d0565d6487d06fa4489d  gnome-session-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 17:44:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 13:44:58 -0400
Subject: rpms/gnome-desktop/devel .cvsignore, 1.28, 1.29 gnome-desktop.spec,
	1.52, 1.53 sources, 1.28, 1.29
Message-ID: <200604101744.k3AHiwAh027922@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	14 Mar 2006 20:26:13 -0000	1.28
+++ .cvsignore	10 Apr 2006 17:44:56 -0000	1.29
@@ -1 +1,2 @@
 gnome-desktop-2.14.0.tar.bz2
+gnome-desktop-2.14.1.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gnome-desktop.spec	14 Mar 2006 20:26:13 -0000	1.52
+++ gnome-desktop.spec	10 Apr 2006 17:44:56 -0000	1.53
@@ -11,8 +11,8 @@
 
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc.
 Name: gnome-desktop
-Version: 2.14.0
-Release: 1
+Version: 2.14.1
+Release: 2
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-desktop/%{name}-%{version}.tar.bz2
 Source1: %{name}-2.8.0-extrapo.tar.bz2
@@ -134,6 +134,9 @@
 #%{_datadir}/gtk-doc
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
+- Update to 2.14.1
+
 * Tue Mar 14 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	14 Mar 2006 20:26:13 -0000	1.28
+++ sources	10 Apr 2006 17:44:56 -0000	1.29
@@ -1 +1 @@
-b8daad3194f8d5d48546a9b4d4585503  gnome-desktop-2.14.0.tar.bz2
+e9d1ff5f8d140f171500c54226ff3e06  gnome-desktop-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 17:46:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 13:46:16 -0400
Subject: rpms/gnome-desktop/FC-5 gnome-desktop.spec, 1.52, 1.53 sources, 1.28,
	1.29
Message-ID: <200604101746.k3AHkGHF002369@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-desktop.spec sources 
Log Message:
2.14.1



Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/FC-5/gnome-desktop.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gnome-desktop.spec	14 Mar 2006 20:26:13 -0000	1.52
+++ gnome-desktop.spec	10 Apr 2006 17:46:14 -0000	1.53
@@ -11,8 +11,8 @@
 
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc.
 Name: gnome-desktop
-Version: 2.14.0
-Release: 1
+Version: 2.14.1
+Release: 1.fc5.1
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-desktop/%{name}-%{version}.tar.bz2
 Source1: %{name}-2.8.0-extrapo.tar.bz2
@@ -134,6 +134,9 @@
 #%{_datadir}/gtk-doc
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
+- Update to 2.14.1
+
 * Tue Mar 14 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/FC-5/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	14 Mar 2006 20:26:13 -0000	1.28
+++ sources	10 Apr 2006 17:46:14 -0000	1.29
@@ -1 +1 @@
-b8daad3194f8d5d48546a9b4d4585503  gnome-desktop-2.14.0.tar.bz2
+e9d1ff5f8d140f171500c54226ff3e06  gnome-desktop-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 17:50:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 13:50:43 -0400
Subject: rpms/gnome-desktop/devel gnome-desktop.spec,1.53,1.54
Message-ID: <200604101750.k3AHohhU009613@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-desktop.spec 
Log Message:
2.14.1



Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gnome-desktop.spec	10 Apr 2006 17:44:56 -0000	1.53
+++ gnome-desktop.spec	10 Apr 2006 17:50:40 -0000	1.54
@@ -131,7 +131,7 @@
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
-#%{_datadir}/gtk-doc
+%{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2



From fedora-cvs-commits at redhat.com  Mon Apr 10 17:51:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 13:51:50 -0400
Subject: rpms/gnome-desktop/FC-5 gnome-desktop.spec,1.53,1.54
Message-ID: <200604101751.k3AHpoEe009776@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-desktop.spec 
Log Message:
fix file lists



Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/FC-5/gnome-desktop.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gnome-desktop.spec	10 Apr 2006 17:46:14 -0000	1.53
+++ gnome-desktop.spec	10 Apr 2006 17:51:48 -0000	1.54
@@ -131,7 +131,7 @@
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
-#%{_datadir}/gtk-doc
+%{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1



From fedora-cvs-commits at redhat.com  Mon Apr 10 17:53:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 13:53:34 -0400
Subject: rpms/gnome-panel/devel .cvsignore, 1.40, 1.41 gnome-panel.spec,
	1.118, 1.119 sources, 1.40, 1.41
Message-ID: <200604101753.k3AHrYlD009911@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-panel.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	13 Mar 2006 20:49:10 -0000	1.40
+++ .cvsignore	10 Apr 2006 17:53:32 -0000	1.41
@@ -1 +1,2 @@
 gnome-panel-2.14.0.tar.bz2
+gnome-panel-2.14.1.tar.bz2


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- gnome-panel.spec	13 Mar 2006 20:49:10 -0000	1.118
+++ gnome-panel.spec	10 Apr 2006 17:53:32 -0000	1.119
@@ -19,8 +19,8 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.14.0
-Release: 1
+Version: 2.14.1
+Release: 2
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -221,6 +221,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-1
 - update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	13 Mar 2006 20:49:10 -0000	1.40
+++ sources	10 Apr 2006 17:53:32 -0000	1.41
@@ -1 +1 @@
-85a2815aefd7d3c3acf93c588149b75b  gnome-panel-2.14.0.tar.bz2
+1f5bc59c7c49cf90a797d892ab3ea05f  gnome-panel-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 17:55:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 13:55:03 -0400
Subject: rpms/gnome-panel/FC-5 gnome-panel.spec, 1.118, 1.119 sources, 1.40,
	1.41
Message-ID: <200604101755.k3AHt3dM010022@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-panel.spec sources 
Log Message:
2.14.1



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/FC-5/gnome-panel.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- gnome-panel.spec	13 Mar 2006 20:49:10 -0000	1.118
+++ gnome-panel.spec	10 Apr 2006 17:54:59 -0000	1.119
@@ -19,8 +19,8 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.14.0
-Release: 1
+Version: 2.14.1
+Release: 1.fc5.1
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -221,6 +221,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-1
 - update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/FC-5/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	13 Mar 2006 20:49:10 -0000	1.40
+++ sources	10 Apr 2006 17:54:59 -0000	1.41
@@ -1 +1 @@
-85a2815aefd7d3c3acf93c588149b75b  gnome-panel-2.14.0.tar.bz2
+1f5bc59c7c49cf90a797d892ab3ea05f  gnome-panel-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 18:02:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 14:02:19 -0400
Subject: rpms/xorg-x11-drv-evdev/devel evdev-1.1.0-ia64-build-fix.patch, NONE,
	1.1 xorg-x11-drv-evdev.spec, 1.10, 1.11
Message-ID: <200604101802.k3AI2Ju9010292@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-drv-evdev.spec 
Added Files:
	evdev-1.1.0-ia64-build-fix.patch 
Log Message:
auto-import xorg-x11-drv-evdev-1.1.0-3 on branch devel from xorg-x11-drv-evdev-1.1.0-3.src.rpm

evdev-1.1.0-ia64-build-fix.patch:
 evdev.h |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE evdev-1.1.0-ia64-build-fix.patch ---
--- src/evdev.h.ia64-build-fix	2006-04-10 13:53:55.000000000 -0400
+++ src/evdev.h	2006-04-10 13:54:28.000000000 -0400
@@ -68,13 +68,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#define BITS_PER_LONG		(sizeof(long) * 8)
-#define NBITS(x)		((((x)-1)/BITS_PER_LONG)+1)
-#define OFF(x) 			((x)%BITS_PER_LONG)
-#define LONG(x)			((x)/BITS_PER_LONG)
-#define BIT(x)			(1UL<<((x)%BITS_PER_LONG))
-#define test_bit(bit, array)    ((array[LONG(bit)] >> OFF(bit)) & 1)
-
 /* 2.4 compatibility */
 #ifndef EVIOCGSW
 
@@ -101,6 +94,13 @@
 #endif
 /* end compat */
 
+#define BITS_PER_LONG		(sizeof(long) * 8)
+#define NBITS(x)		((((x)-1)/BITS_PER_LONG)+1)
+#define OFF(x) 			((x)%BITS_PER_LONG)
+#define LONG(x)			((x)/BITS_PER_LONG)
+#define BIT(x)			(1UL<<((x)%BITS_PER_LONG))
+#define test_bit(bit, array)    ((array[LONG(bit)] >> OFF(bit)) & 1)
+
 #include <X11/extensions/XKB.h>
 #include <X11/extensions/XKBstr.h>
 


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-evdev.spec	10 Apr 2006 04:54:23 -0000	1.10
+++ xorg-x11-drv-evdev.spec	10 Apr 2006 18:02:16 -0000	1.11
@@ -7,26 +7,28 @@
 Summary:   Xorg X11 evdev input driver
 Name:      xorg-x11-drv-evdev
 Version: 1.1.0
-Release: 2
+Release: 3
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# ia64 disabled momentarily
-ExclusiveArch: %{ix86} x86_64 ppc alpha sparc sparc64
+ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
 Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
+Patch0: evdev-1.1.0-ia64-build-fix.patch
+
 %description 
 X.Org X11 evdev input driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p0 -b .ia64-build-fix
 
 %build
 %configure --disable-static
@@ -53,6 +55,9 @@
 %{_mandir}/man4/evdev.4*
 
 %changelog
+* Mon Apr 10 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-3
+- Work around header pollution on ia64, re-add to arch list.
+
 * Mon Apr 10 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-2
 - Disable on ia64 until build issues are sorted.
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 18:04:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 14:04:27 -0400
Subject: rpms/gnome-applets/devel .cvsignore, 1.37, 1.38 gnome-applets.spec,
	1.129, 1.130 sources, 1.38, 1.39
Message-ID: <200604101804.k3AI4R3M010372@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-applets.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	12 Mar 2006 17:59:31 -0000	1.37
+++ .cvsignore	10 Apr 2006 18:04:12 -0000	1.38
@@ -1,2 +1,3 @@
 gnome-applets-2.9.3.1-modemlights.tar.bz2
 gnome-applets-2.14.0.tar.bz2
+gnome-applets-2.14.1.tar.bz2


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- gnome-applets.spec	28 Mar 2006 23:33:57 -0000	1.129
+++ gnome-applets.spec	10 Apr 2006 18:04:12 -0000	1.130
@@ -17,8 +17,8 @@
 
 Summary:        Small applications for the GNOME panel.
 Name:     	gnome-applets
-Version: 	2.14.0
-Release:  	3
+Version: 	2.14.1
+Release:  	2
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -199,6 +199,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
+- Update to 2.14.1
+
 * Tue Mar 28 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-3
 - apply patch
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	12 Mar 2006 17:59:31 -0000	1.38
+++ sources	10 Apr 2006 18:04:12 -0000	1.39
@@ -1,2 +1,2 @@
 ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2
-0c7789d642003f38c86d02a3384d3350  gnome-applets-2.14.0.tar.bz2
+1b5e834450812a6a3e7ab00652587ef4  gnome-applets-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 18:11:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 14:11:57 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.102, 1.103 sources, 1.115,
	1.116 mkinitrd.spec, 1.115, 1.116
Message-ID: <200604101811.k3AIBvR9010587@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10572

Modified Files:
	.cvsignore sources mkinitrd.spec 
Log Message:
- update to .34-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- .cvsignore	30 Mar 2006 23:19:43 -0000	1.102
+++ .cvsignore	10 Apr 2006 18:11:50 -0000	1.103
@@ -1 +1 @@
-mkinitrd-5.0.33.tar.bz2
+mkinitrd-5.0.34.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- sources	30 Mar 2006 23:19:43 -0000	1.115
+++ sources	10 Apr 2006 18:11:50 -0000	1.116
@@ -1 +1 @@
-379ebd6b5e6b799b3621a225be5df82b  mkinitrd-5.0.33.tar.bz2
+1417d8a5aea4ec1b8a227706d4859890  mkinitrd-5.0.34.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- mkinitrd.spec	30 Mar 2006 23:19:43 -0000	1.115
+++ mkinitrd.spec	10 Apr 2006 18:11:52 -0000	1.116
@@ -1,6 +1,6 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.0.33
+Version: 5.0.34
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -63,6 +63,10 @@
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
 
 %changelog
+* Mon Apr 10 2006 Peter Jones <pjones at redhat.com> - 5.0.34-1
+- fix "!" handling for sysfs paths in mkblkdevs
+- fix argument checking for mknodCommand
+
 * Thu Mar 30 2006 Peter Jones <pjones at redhat.com> - 5.0.33-1
 - fix unbalanced pushd in mkinitrd (patch from Pete Zaitcev, bz# 185822)
 - add "cond" command for simple conditionals (bz# 182938)



From fedora-cvs-commits at redhat.com  Mon Apr 10 18:12:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 14:12:43 -0400
Subject: rpms/xorg-x11-drv-nv/devel xorg-x11-drv-nv.spec,1.12,1.13
Message-ID: <200604101812.k3AIChYH010631@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-drv-nv.spec 
Log Message:
auto-import xorg-x11-drv-nv-1.1.1-2 on branch devel from xorg-x11-drv-nv-1.1.1-2.src.rpm


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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-nv.spec	10 Apr 2006 03:23:25 -0000	1.12
+++ xorg-x11-drv-nv.spec	10 Apr 2006 18:12:41 -0000	1.13
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   1.1.1
-Release:   1
+Release:   2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   nv.xinf
@@ -58,6 +58,9 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Mon Apr 10 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-2
+- Bump to appease beehive.
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-1
 - Update to 1.1.1 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 18:14:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 14:14:05 -0400
Subject: rpms/gnome-panel/FC-5
	gnome-panel-2.14.1-remove-duplicate-entry.patch, NONE,
	1.1 gnome-panel.spec, 1.119,
	1.120 gnome-panel-2.14.0-remove-duplicate-entry.patch, 1.1, NONE
Message-ID: <200604101814.k3AIE5eu010758@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.14.1-remove-duplicate-entry.patch 
Removed Files:
	gnome-panel-2.14.0-remove-duplicate-entry.patch 
Log Message:
Update patches


gnome-panel-2.14.1-remove-duplicate-entry.patch:
 ka.po |    4 ----
 lt.po |    3 ---
 2 files changed, 7 deletions(-)

--- NEW FILE gnome-panel-2.14.1-remove-duplicate-entry.patch ---
--- gnome-panel-2.14.1/po/lt.po.remove-duplicate-entry	2006-03-02 17:46:52.000000000 -0500
+++ gnome-panel-2.14.1/po/lt.po	2006-04-10 14:11:13.000000000 -0400
@@ -2848,6 +2848,3 @@
 #: ../libpanel-applet/panel-test-applets.glade.h:5
 msgid "_Prefs Dir:"
 msgstr "_Nustatym?? aplankas:"
-
-msgid "System"
-msgstr "Sistema"
--- gnome-panel-2.14.1/po/ka.po.remove-duplicate-entry	2006-04-10 14:12:29.000000000 -0400
+++ gnome-panel-2.14.1/po/ka.po	2006-04-10 14:12:36.000000000 -0400
@@ -2819,7 +2819,3 @@
 #: ../libpanel-applet/panel-test-applets.glade.h:5
 msgid "_Prefs Dir:"
 msgstr "_???????????????????????? ?????????:"
-
-msgid "System"
-msgstr "?????????????????????"
-


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/FC-5/gnome-panel.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- gnome-panel.spec	10 Apr 2006 17:54:59 -0000	1.119
+++ gnome-panel.spec	10 Apr 2006 18:14:02 -0000	1.120
@@ -73,7 +73,7 @@
 Patch7: gnome-panel-2.14.0-gpm-integration.patch
 Patch8: gnome-panel-2.13.90-use-beagle.patch
 Patch9: gnome-panel-2.13.91-ignore-unknown-options.patch
-Patch10: gnome-panel-2.14.0-remove-duplicate-entry.patch
+Patch10: gnome-panel-2.14.1-remove-duplicate-entry.patch
 
 Conflicts: gnome-power-manager < 2.13.5.0.20060207-1
 
@@ -223,6 +223,7 @@
 %changelog
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
 - Update to 2.14.1
+- Update patches
 
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-1
 - update to 2.14.0


--- gnome-panel-2.14.0-remove-duplicate-entry.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 10 18:18:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 14:18:37 -0400
Subject: rpms/gnome-panel/devel
	gnome-panel-2.14.1-remove-duplicate-entry.patch, NONE,
	1.1 gnome-panel.spec, 1.119,
	1.120 gnome-panel-2.14.0-remove-duplicate-entry.patch, 1.1, NONE
Message-ID: <200604101818.k3AIIbHL024871@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.14.1-remove-duplicate-entry.patch 
Removed Files:
	gnome-panel-2.14.0-remove-duplicate-entry.patch 
Log Message:
Update patch


gnome-panel-2.14.1-remove-duplicate-entry.patch:
 ka.po |    4 ----
 lt.po |    3 ---
 2 files changed, 7 deletions(-)

--- NEW FILE gnome-panel-2.14.1-remove-duplicate-entry.patch ---
--- gnome-panel-2.14.1/po/lt.po.remove-duplicate-entry	2006-03-02 17:46:52.000000000 -0500
+++ gnome-panel-2.14.1/po/lt.po	2006-04-10 14:11:13.000000000 -0400
@@ -2848,6 +2848,3 @@
 #: ../libpanel-applet/panel-test-applets.glade.h:5
 msgid "_Prefs Dir:"
 msgstr "_Nustatym?? aplankas:"
-
-msgid "System"
-msgstr "Sistema"
--- gnome-panel-2.14.1/po/ka.po.remove-duplicate-entry	2006-04-10 14:12:29.000000000 -0400
+++ gnome-panel-2.14.1/po/ka.po	2006-04-10 14:12:36.000000000 -0400
@@ -2819,7 +2819,3 @@
 #: ../libpanel-applet/panel-test-applets.glade.h:5
 msgid "_Prefs Dir:"
 msgstr "_???????????????????????? ?????????:"
-
-msgid "System"
-msgstr "?????????????????????"
-


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- gnome-panel.spec	10 Apr 2006 17:53:32 -0000	1.119
+++ gnome-panel.spec	10 Apr 2006 18:18:35 -0000	1.120
@@ -73,7 +73,7 @@
 Patch7: gnome-panel-2.14.0-gpm-integration.patch
 Patch8: gnome-panel-2.13.90-use-beagle.patch
 Patch9: gnome-panel-2.13.91-ignore-unknown-options.patch
-Patch10: gnome-panel-2.14.0-remove-duplicate-entry.patch
+Patch10: gnome-panel-2.14.1-remove-duplicate-entry.patch
 
 Conflicts: gnome-power-manager < 2.13.5.0.20060207-1
 
@@ -223,6 +223,7 @@
 %changelog
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
 - Update to 2.14.1
+- Update patches
 
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-1
 - update to 2.14.0


--- gnome-panel-2.14.0-remove-duplicate-entry.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 10 18:26:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 14:26:26 -0400
Subject: rpms/linuxwacom/devel linuxwacom-0.7.2-delibcwrap.patch, NONE,
	1.1 linuxwacom.spec, 1.28, 1.29
Message-ID: <200604101826.k3AIQQr4025081@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/linuxwacom/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25053/devel

Modified Files:
	linuxwacom.spec 
Added Files:
	linuxwacom-0.7.2-delibcwrap.patch 
Log Message:
auto-import linuxwacom-0.7.2-2 on branch devel from linuxwacom-0.7.2-2.src.rpm

linuxwacom-0.7.2-delibcwrap.patch:
 xf86Wacom.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE linuxwacom-0.7.2-delibcwrap.patch ---
--- ./src/xf86Wacom.h.delibcwrap	2006-04-10 14:23:28.000000000 -0400
+++ ./src/xf86Wacom.h	2006-04-10 14:24:13.000000000 -0400
@@ -64,16 +64,16 @@
  * XFree86 V4.x Headers
  ****************************************************************************/
 
-#ifndef XFree86LOADER
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include <unistd.h>
 #include <errno.h>
-#endif
 
 #include <misc.h>
 #include <xf86.h>
 #define NEED_XF86_TYPES
 #if !defined(DGUX)
-#include <xf86_ansic.h>
 #include <xisb.h>
 #endif
 #include <xf86_OSproc.h>


Index: linuxwacom.spec
===================================================================
RCS file: /cvs/dist/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- linuxwacom.spec	11 Feb 2006 04:24:37 -0000	1.28
+++ linuxwacom.spec	10 Apr 2006 18:26:23 -0000	1.29
@@ -5,7 +5,7 @@
 Name:		linuxwacom
 Version:	0.7.2
 Epoch:		0
-Release:	1.2
+Release:	2
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -15,10 +15,11 @@
 Source1:	10-wacom.rules
 Patch2:		linuxwacom-fsp.patch
 Patch3:		linuxwacom-0.7.2-modular-sdk.patch
+Patch4:		linuxwacom-0.7.2-delibcwrap.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
-BuildRequires:	libX11-devel, libXi-devel, xorg-x11-server-sdk, ncurses-devel
-Requires:	Xserver, udev >= 030-21
+BuildRequires:	libX11-devel, libXi-devel, xorg-x11-server-sdk >= 1.0.99.901, ncurses-devel
+Requires:	xorg-x11-server-Xorg >= 1.0.99.901, udev >= 030-21
 ExclusiveArch:  %{ix86} x86_64 alpha ia64 ppc sparc sparc64
 
 %description 
@@ -41,6 +42,7 @@
 
 %patch2 -p1 -b .fsp
 %patch3 -p0 -b .modular-sdk
+%patch4 -p0 -b .delibcwrap
 
 %build
 libtoolize --copy --force
@@ -97,6 +99,9 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Mon Apr 10 2006 Adam Jackson <ajackson at redhat.com> 0:0.7.2-2
+- Delibcwrap and otherwise rebuild for 7.1RC1 ABI changes.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:0.7.2-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 18:28:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 14:28:36 -0400
Subject: rpms/linuxwacom/devel linuxwacom.spec,1.29,1.30
Message-ID: <200604101828.k3AISZTj025152@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/linuxwacom/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25130/devel

Modified Files:
	linuxwacom.spec 
Log Message:
auto-import linuxwacom-0.7.2-3 on branch devel from linuxwacom-0.7.2-3.src.rpm


Index: linuxwacom.spec
===================================================================
RCS file: /cvs/dist/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- linuxwacom.spec	10 Apr 2006 18:26:23 -0000	1.29
+++ linuxwacom.spec	10 Apr 2006 18:28:17 -0000	1.30
@@ -5,7 +5,7 @@
 Name:		linuxwacom
 Version:	0.7.2
 Epoch:		0
-Release:	2
+Release:	3
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -99,7 +99,7 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
-* Mon Apr 10 2006 Adam Jackson <ajackson at redhat.com> 0:0.7.2-2
+* Mon Apr 10 2006 Adam Jackson <ajackson at redhat.com> 0:0.7.2-3
 - Delibcwrap and otherwise rebuild for 7.1RC1 ABI changes.
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:0.7.2-1.2



From fedora-cvs-commits at redhat.com  Mon Apr 10 18:41:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 14:41:34 -0400
Subject: rpms/kernel/devel/configs config-x86_64-generic,1.38,1.39
Message-ID: <200604101841.k3AIfYl9025468@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-x86_64-generic 
Log Message:
rc1-git2



Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- config-x86_64-generic	4 Apr 2006 20:37:01 -0000	1.38
+++ config-x86_64-generic	10 Apr 2006 18:41:28 -0000	1.39
@@ -79,6 +79,7 @@
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_IBM=m
 CONFIG_ACPI_IBM_DOCK=y
+CONFIG_ACPI_HOTPLUG_MEMORY=m
 
 CONFIG_HOTPLUG_PCI=y
 # CONFIG_HOTPLUG_PCI_FAKE is not set



From fedora-cvs-commits at redhat.com  Mon Apr 10 18:41:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 14:41:34 -0400
Subject: rpms/kernel/devel patch-2.6.17-rc1-git2.bz2.sign, NONE,
	1.1 .cvsignore, 1.402, 1.403 kernel-2.6.spec, 1.2122,
	1.2123 linux-2.6-compile-fixes.patch, 1.65, 1.66 sources,
	1.343, 1.344 upstream, 1.316, 1.317
Message-ID: <200604101841.k3AIfYqd025470@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch 
	sources upstream 
Added Files:
	patch-2.6.17-rc1-git2.bz2.sign 
Log Message:
rc1-git2



--- NEW FILE patch-2.6.17-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

iD8DBQBEOgMoyGugalF9Dw4RAvX+AJ40uXr7SNqrjR3b7tLknC1onpGSNwCeJx3L
fvH7AxaNo98jYnoiI6KIFzM=
=IeHW
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -r1.402 -r1.403
--- .cvsignore	3 Apr 2006 04:16:49 -0000	1.402
+++ .cvsignore	10 Apr 2006 18:41:27 -0000	1.403
@@ -4,3 +4,4 @@
 linux-2.6.16.tar.bz2
 xen-20060320.tar.bz2
 patch-2.6.17-rc1.bz2
+patch-2.6.17-rc1-git2.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2122
retrieving revision 1.2123
diff -u -r1.2122 -r1.2123
--- kernel-2.6.spec	6 Apr 2006 20:37:08 -0000	1.2122
+++ kernel-2.6.spec	10 Apr 2006 18:41:27 -0000	1.2123
@@ -218,6 +218,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.17-rc1.bz2
+Patch2: patch-2.6.17-rc1-git2.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -688,6 +689,7 @@
 
 # Update to latest upstream.
 %patch1 -p1
+%patch2 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -1597,6 +1599,9 @@
 %endif
 
 %changelog
+* Mon Apr 10 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc1-git2
+
 * Thu Apr  6 2006 Dave Jones <davej at redhat.com>
 - Rebuild without a zillion warnings.
 

linux-2.6-compile-fixes.patch:
 atomic.h |    2 ++
 1 files changed, 2 insertions(+)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- linux-2.6-compile-fixes.patch	3 Apr 2006 04:33:32 -0000	1.65
+++ linux-2.6-compile-fixes.patch	10 Apr 2006 18:41:28 -0000	1.66
@@ -13,23 +13,3 @@
  /*
   *  include/asm-s390/atomic.h
   *
---- linux-2.6.16.noarch/security/selinux/xfrm.c~	2006-04-02 23:27:07.000000000 -0500
-+++ linux-2.6.16.noarch/security/selinux/xfrm.c	2006-04-02 23:27:40.000000000 -0500
-@@ -281,7 +281,7 @@ u32 selinux_socket_getpeer_dgram(struct 
- 		int i;
- 
- 		for (i = sp->len-1; i >= 0; i--) {
--			struct xfrm_state *x = sp->x[i].xvec;
-+			struct xfrm_state *x = sp->xvec[i];
- 			if (selinux_authorizable_xfrm(x)) {
- 				struct xfrm_sec_ctx *ctx = x->security;
- 				return ctx->ctx_sid;
-@@ -314,7 +314,7 @@ int selinux_xfrm_sock_rcv_skb(u32 isec_s
- 		 *  Only need to verify the existence of an authorizable sp.
- 		 */
- 		for (i = 0; i < sp->len; i++) {
--			struct xfrm_state *x = sp->x[i].xvec;
-+			struct xfrm_state *x = sp->xvec[i];
- 
- 			if (x && selinux_authorizable_xfrm(x))
- 				goto accept;


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -r1.343 -r1.344
--- sources	3 Apr 2006 04:16:54 -0000	1.343
+++ sources	10 Apr 2006 18:41:28 -0000	1.344
@@ -1,3 +1,4 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 8c70806f9075ebc0087f7ce1b8911700  xen-20060320.tar.bz2
 ee1b5bf019ec60a34ef7bf1b2a0c1291  patch-2.6.17-rc1.bz2
+2a6127bd3deeb154f68eeae92ecaf410  patch-2.6.17-rc1-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -r1.316 -r1.317
--- upstream	3 Apr 2006 04:16:54 -0000	1.316
+++ upstream	10 Apr 2006 18:41:28 -0000	1.317
@@ -1,2 +1,3 @@
 linux-2.6.16.tar.bz2
 patch-2.6.17-rc1.bz2
+patch-2.6.17-rc1-git2.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 18:44:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 14:44:26 -0400
Subject: rpms/synaptics/devel synaptics-0.14.4-delibcwrap.patch, NONE,
	1.1 .cvsignore, 1.8, 1.9 synaptics.spec, 1.18,
	1.19 synaptics-0.13.5-makefile-sdk64.patch, 1.1, NONE
Message-ID: <200604101844.k3AIiQrI025568@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/synaptics/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25539/devel

Modified Files:
	.cvsignore synaptics.spec 
Added Files:
	synaptics-0.14.4-delibcwrap.patch 
Removed Files:
	synaptics-0.13.5-makefile-sdk64.patch 
Log Message:
auto-import synaptics-0.14.4-5 on branch devel from synaptics-0.14.4-5.src.rpm

synaptics-0.14.4-delibcwrap.patch:
 synaptics.c |   43 +++++++++++++++++++++----------------------
 synaptics.h |   12 ++++++++++++
 2 files changed, 33 insertions(+), 22 deletions(-)

--- NEW FILE synaptics-0.14.4-delibcwrap.patch ---
--- ./synaptics.c.delibcwrap	2005-11-05 15:59:23.000000000 -0500
+++ ./synaptics.c	2006-04-10 14:44:03.000000000 -0400
@@ -60,7 +60,6 @@
 #include <misc.h>
 #include <xf86.h>
 #define NEED_XF86_TYPES
-#include <xf86_ansic.h>
 #include <xf86_OSproc.h>
 #include <xf86Xinput.h>
 #include "mipointer.h"
@@ -220,14 +219,14 @@
 	return TRUE;			    /* Already allocated */
 
     if (priv->shm_config) {
-	if ((shmid = xf86shmget(SHM_SYNAPTICS, 0, 0)) != -1)
-	    xf86shmctl(shmid, XF86IPC_RMID, NULL);
-	if ((shmid = xf86shmget(SHM_SYNAPTICS, sizeof(SynapticsSHM),
-				0777 | XF86IPC_CREAT)) == -1) {
+	if ((shmid = shmget(SHM_SYNAPTICS, 0, 0)) != -1)
+	    shmctl(shmid, IPC_RMID, NULL);
+	if ((shmid = shmget(SHM_SYNAPTICS, sizeof(SynapticsSHM),
+				0777 | IPC_CREAT)) == -1) {
 	    xf86Msg(X_ERROR, "%s error shmget\n", local->name);
 	    return FALSE;
 	}
-	if ((priv->synpara = (SynapticsSHM*)xf86shmat(shmid, NULL, 0)) == NULL) {
+	if ((priv->synpara = (SynapticsSHM*)shmat(shmid, NULL, 0)) == NULL) {
 	    xf86Msg(X_ERROR, "%s error shmat\n", local->name);
 	    return FALSE;
 	}
@@ -253,8 +252,8 @@
 	return;
 
     if (priv->shm_config) {
-	if ((shmid = xf86shmget(SHM_SYNAPTICS, 0, 0)) != -1)
-	    xf86shmctl(shmid, XF86IPC_RMID, NULL);
+	if ((shmid = shmget(SHM_SYNAPTICS, 0, 0)) != -1)
+	    shmctl(shmid, IPC_RMID, NULL);
     } else {
 	xfree(priv->synpara);
     }
@@ -386,19 +385,19 @@
     pars->palm_min_z         = xf86SetIntOption(local->options, "PalmMinZ", 200);
 
     str_par = xf86FindOptionValue(local->options, "MinSpeed");
-    if ((!str_par) || (xf86sscanf(str_par, "%lf", &pars->min_speed) != 1))
+    if ((!str_par) || (sscanf(str_par, "%lf", &pars->min_speed) != 1))
 	pars->min_speed=0.09;
     str_par = xf86FindOptionValue(local->options, "MaxSpeed");
-    if ((!str_par) || (xf86sscanf(str_par, "%lf", &pars->max_speed) != 1))
+    if ((!str_par) || (sscanf(str_par, "%lf", &pars->max_speed) != 1))
 	pars->max_speed=0.18;
     str_par = xf86FindOptionValue(local->options, "AccelFactor");
-    if ((!str_par) || (xf86sscanf(str_par, "%lf", &pars->accl) != 1))
+    if ((!str_par) || (sscanf(str_par, "%lf", &pars->accl) != 1))
 	pars->accl=0.0015;
     str_par = xf86FindOptionValue(local->options, "CircScrollDelta");
-    if ((!str_par) || (xf86sscanf(str_par, "%lf", &pars->scroll_dist_circ) != 1))
+    if ((!str_par) || (sscanf(str_par, "%lf", &pars->scroll_dist_circ) != 1))
 	pars->scroll_dist_circ = 0.1;
     str_par = xf86FindOptionValue(local->options, "CoastingSpeed");
-    if ((!str_par) || (xf86sscanf(str_par, "%lf", &pars->coasting_speed) != 1))
+    if ((!str_par) || (sscanf(str_par, "%lf", &pars->coasting_speed) != 1))
 	pars->coasting_speed = 0.0;
 
     if (pars->circular_trigger < 0 || pars->circular_trigger > 8) {
@@ -426,8 +425,8 @@
     priv->fifofd = -1;
     if (repeater) {
 	/* create repeater fifo */
-	if ((xf86mknod(repeater, 666, XF86_S_IFIFO) != 0) &&
-	    (xf86errno != xf86_EEXIST)) {
+	if ((mknod(repeater, 666, S_IFIFO) != 0) &&
+	    (errno != EEXIST)) {
 	    xf86Msg(X_ERROR, "%s can't create repeater fifo\n", local->name);
 	} else {
 	    /* open the repeater fifo */
@@ -436,7 +435,7 @@
 		xf86Msg(X_ERROR, "%s repeater device open failed\n", local->name);
 	    }
 	}
-	xf86free(repeater);
+	free(repeater);
     }
 
     if (!QueryHardware(local)) {
@@ -623,7 +622,7 @@
 static int
 move_distance(int dx, int dy)
 {
-    return xf86sqrt((dx * dx) + (dy * dy));
+    return sqrt((dx * dx) + (dy * dy));
 }
 
 /*
@@ -658,14 +657,14 @@
     double xCenter = (priv->synpara->left_edge + priv->synpara->right_edge) / 2.0;
     double yCenter = (priv->synpara->top_edge + priv->synpara->bottom_edge) / 2.0;
 
-    return xf86atan2(-(y - yCenter), x - xCenter);
+    return atan2(-(y - yCenter), x - xCenter);
 }
 
 /* return angle difference */
 static double
 diffa(double a1, double a2)
 {
-    double da = xf86fmod(a2 - a1, 2 * M_PI);
+    double da = fmod(a2 - a1, 2 * M_PI);
     if (da < 0)
 	da += 2 * M_PI;
     if (da > M_PI)
@@ -773,7 +772,7 @@
 	int c;
 	while ((c = XisbRead(priv->comm.buffer)) >= 0) {
 	    unsigned char u = (unsigned char)c;
-	    xf86write(priv->fifofd, &u, 1);
+	    write(priv->fifofd, &u, 1);
 	    if (++count >= 3)
 		break;
 	}
@@ -1250,10 +1249,10 @@
 
 	    /* save the fraction, report the integer part */
 	    tmpf = dx * speed + x_edge_speed * dtime + priv->frac_x;
-	    priv->frac_x = xf86modf(tmpf, &integral);
+	    priv->frac_x = modf(tmpf, &integral);
 	    dx = integral;
 	    tmpf = dy * speed + y_edge_speed * dtime + priv->frac_y;
-	    priv->frac_y = xf86modf(tmpf, &integral);
+	    priv->frac_y = modf(tmpf, &integral);
 	    dy = integral;
 	}
 
--- ./synaptics.h.delibcwrap	2006-04-10 14:43:27.000000000 -0400
+++ ./synaptics.h	2006-04-10 14:43:41.000000000 -0400
@@ -1,6 +1,18 @@
 #ifndef	_SYNAPTICS_H_
 #define _SYNAPTICS_H_
 
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <math.h>
+#include <stdlib.h>
+
 #include <X11/Xdefs.h>
 
 /******************************************************************************


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/synaptics/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	7 Nov 2005 23:36:47 -0000	1.8
+++ .cvsignore	10 Apr 2006 18:44:23 -0000	1.9
@@ -1,6 +1 @@
-synaptics-0.13.5.tar.bz2
-synaptics-0.14.0.tar.bz2
-synaptics-0.14.1.tar.bz2
-synaptics-0.14.2.tar.bz2
-synaptics-0.14.3.tar.bz2
 synaptics-0.14.4.tar.bz2


Index: synaptics.spec
===================================================================
RCS file: /cvs/dist/rpms/synaptics/devel/synaptics.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- synaptics.spec	11 Feb 2006 05:45:53 -0000	1.18
+++ synaptics.spec	10 Apr 2006 18:44:23 -0000	1.19
@@ -3,7 +3,7 @@
 Name:           synaptics
 Version:        0.14.4
 Epoch:		0
-Release: 4.2.1
+Release:	5
 Summary:        Synaptics Touchpad Driver
 
 Group:          User Interface/X Hardware Support
@@ -11,11 +11,12 @@
 URL:            http://w1.894.telia.com/~u89404340/touchpad/
 Source0:        http://w1.894.telia.com/~u89404340/touchpad/files/synaptics-0.14.4.tar.bz2
 Patch0: synaptics-0.14.4-modularx.patch
+Patch1: synaptics-0.14.4-delibcwrap.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}
 BuildRequires:	pkgconfig
-BuildRequires:	xorg-x11-server-sdk
+BuildRequires:	xorg-x11-server-sdk >= 1.0.99.901
 BuildRequires:  libX11-devel, libXi-devel
-Requires:       Xserver
+Requires:       xorg-x11-server-Xorg >= 1.0.99.901
 ExclusiveArch:	i386 x86_64 ppc
 
 %description
@@ -42,6 +43,7 @@
 %prep
 %setup -q 
 %patch0 -p1 -b .modx
+%patch1 -p1 -b .delibcwrap
 # remove included XFree86 headers
 rm -rf Xincludes
 
@@ -68,6 +70,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Mon Apr 10 2006 Adam Jackson <ajackson at redhat.com 0:0.14.4-5
+- Delibcwrap and rebuild for 7.1RC1 ABI.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:0.14.4-4.2.1
 - bump again for double-long bug on ppc(64)
 


--- synaptics-0.13.5-makefile-sdk64.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 10 18:57:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 14:57:15 -0400
Subject: rpms/libdrm/devel libdrm.spec,1.11,1.12
Message-ID: <200604101857.k3AIvFlD007186@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/libdrm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7175

Modified Files:
	libdrm.spec 
Log Message:
Bump for fc5 build.


Index: libdrm.spec
===================================================================
RCS file: /cvs/dist/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libdrm.spec	30 Mar 2006 18:22:13 -0000	1.11
+++ libdrm.spec	10 Apr 2006 18:57:13 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: libdrm Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.0.1
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -86,6 +86,9 @@
 %{_libdir}/pkgconfig/libdrm.pc
 
 %changelog
+* Mon Apr 10 2006 Kristian H??gsberg <krh at redhat.com> 2.0.1-2
+- Bump for fc5 build.
+
 * Thu Mar 30 2006 Adam Jackson <ajackson at redhat.com> - 2.0.1-1
 - Bump to libdrm 2.0.1 from upstream.
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 19:08:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 15:08:30 -0400
Subject: rpms/initscripts/devel .cvsignore, 1.98, 1.99 initscripts.spec,
	1.112, 1.113 sources, 1.107, 1.108
Message-ID: <200604101908.k3AJ8UEE007629@cvs.devel.redhat.com>

Author: notting

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- .cvsignore	14 Mar 2006 22:55:45 -0000	1.98
+++ .cvsignore	10 Apr 2006 19:08:27 -0000	1.99
@@ -1 +1 @@
-initscripts-8.31.1.tar.bz2
+initscripts-8.32.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- initscripts.spec	14 Mar 2006 22:55:45 -0000	1.112
+++ initscripts.spec	10 Apr 2006 19:08:27 -0000	1.113
@@ -1,6 +1,6 @@
 Summary: The inittab file and the /etc/init.d scripts.
 Name: initscripts
-Version: 8.31.1
+Version: 8.32
 License: GPL
 Group: System Environment/Base
 Release: 1
@@ -189,6 +189,7 @@
 /sbin/getkey
 %attr(2755,root,root) /sbin/netreport
 /sbin/initlog
+/lib/udev/rename_device
 /sbin/service
 /sbin/ppp-watch
 %{_mandir}/man*/*
@@ -208,6 +209,19 @@
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Mon Apr 10 2006 Bill Nottingham <notting at redhat.com> 8.32-1
+- netfs: fix redirect (#187505)
+- rc.sysinit add forcequotacheck (#168118, <mitr at redhat.com>)
+- functions/pidof: various fixes (#182623, others <mitr at redhat.com>)
+- add support for DHCP on bridges (#125259, <mitr at redhat.com>,
+  anders at kaseorg.com>)
+- rc.sysinit: use pidof, not killall (#185429, <pjones at redhat.com>)
+- ppp fixes (#129195, #163950, #92023, <mitr at redhat.com>, <avi at argo.co.il>)
+- ifup/ifdown: unset $WINDOW (#174336, <mitr at redhat.com>)
+
+* Fri Mar 17 2006 Bill Nottingham <notting at redhat.com> 8.31.2-1
+- add udev helper to rename network devices on device creation
+
 * Tue Mar 14 2006 Bill Nottingham <notting at redhat.com> 8.31.1-1
 - fix context of /dev/pts (#185436)
 - translation updates


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/sources,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- sources	14 Mar 2006 22:55:45 -0000	1.107
+++ sources	10 Apr 2006 19:08:27 -0000	1.108
@@ -1 +1 @@
-fc2a0f9a94bac45f96764ae1a8eef7cd  initscripts-8.31.1.tar.bz2
+cc632f40d7335957e9d5f151dec36f77  initscripts-8.32.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 19:14:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 15:14:09 -0400
Subject: rpms/kernel/devel Makefile.config, 1.36, 1.37 kernel-2.6.spec,
	1.2123, 1.2124
Message-ID: <200604101914.k3AJE9wk007777@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	Makefile.config kernel-2.6.spec 
Log Message:
Bye kernel-i686-smp
Hello kernel-PAE




Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Makefile.config	7 Mar 2006 19:38:26 -0000	1.36
+++ Makefile.config	10 Apr 2006 19:14:06 -0000	1.37
@@ -5,7 +5,7 @@
 CFG		= kernel-$(VERSION)
 
 CONFIGFILES	= \
-	$(CFG)-i686.config $(CFG)-i686-smp.config $(CFG)-i686-kdump.config \
+	$(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 \
@@ -69,34 +69,34 @@
 temp-x86_64-xen-generic: configs/config-xen-x86_64 temp-x86_64-xen-generic-tmp
 	perl scripts/merge.pl $^ > $@
 
-kernel-$(VERSION)-i686.config: configs/config-i686 temp-x86-generic 
+kernel-$(VERSION)-i686.config: configs/config-i686 temp-x86-generic
 	perl scripts/merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-i686-smp.config: configs/config-i686-smp temp-x86-generic 
+kernel-$(VERSION)-i686-PAE.config: configs/config-i686-PAE temp-x86-generic
 	perl scripts/merge.pl $^ i386 > $@
 
 kernel-$(VERSION)-i686-kdump.config: configs/config-i686-kdump temp-x86-generic
 	perl scripts/merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-i586.config: configs/config-i586 temp-x86-generic 
+kernel-$(VERSION)-i586.config: configs/config-i586 temp-x86-generic
 	perl scripts/merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-x86_64.config: configs/config-x86_64 temp-x86_64-generic 
+kernel-$(VERSION)-x86_64.config: configs/config-x86_64 temp-x86_64-generic
 	perl scripts/merge.pl $^ x86_64 > $@
 
-kernel-$(VERSION)-x86_64-kdump.config: configs/config-x86_64-kdump temp-x86_64-generic 
+kernel-$(VERSION)-x86_64-kdump.config: configs/config-x86_64-kdump temp-x86_64-generic
 	perl scripts/merge.pl $^ x86_64 > $@
 
-kernel-$(VERSION)-sparc-smp.config: configs/config-sparc-smp temp-sparc-generic 
+kernel-$(VERSION)-sparc-smp.config: configs/config-sparc-smp temp-sparc-generic
 	perl scripts/merge.pl $^ sparc > $@
 
-kernel-$(VERSION)-sparc.config: configs/config-sparc temp-sparc-generic 
+kernel-$(VERSION)-sparc.config: configs/config-sparc temp-sparc-generic
 	perl scripts/merge.pl $^ sparc > $@
 
-kernel-$(VERSION)-sparc64-smp.config: configs/config-sparc64-smp temp-sparc64-generic 
+kernel-$(VERSION)-sparc64-smp.config: configs/config-sparc64-smp temp-sparc64-generic
 	perl scripts/merge.pl $^ sparc64 > $@
 
-kernel-$(VERSION)-sparc64.config: configs/config-sparc64 temp-sparc-generic 
+kernel-$(VERSION)-sparc64.config: configs/config-sparc64 temp-sparc-generic
 	perl scripts/merge.pl $^ sparc64 > $@
 
 kernel-$(VERSION)-ppc64.config: configs/config-powerpc64 temp-powerpc64-generic


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2123
retrieving revision 1.2124
diff -u -r1.2123 -r1.2124
--- kernel-2.6.spec	10 Apr 2006 18:41:27 -0000	1.2123
+++ kernel-2.6.spec	10 Apr 2006 19:14:07 -0000	1.2124
@@ -4,7 +4,8 @@
 # These are the kernels that are built IF the architecture allows it.
 
 %define buildup 1
-%define buildsmp 1
+%define buildsmp 0
+%define buildpae 0
 # Whether to apply the Xen patches, leave this enabled.
 %define includexen 0
 # Whether to build the Xen kernels, disable if you want.
@@ -40,7 +41,6 @@
 %ifarch noarch
 %define builddoc 1
 %define buildup 0
-%define buildsmp 0
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-*.config
 %endif
 
@@ -57,25 +57,20 @@
 
 # Second, per-architecture exclusions (ifarch)
 
-%ifarch i586
-%define buildsmp 0
-%endif
-
 %ifarch %{all_x86}
+%define buildpae 1
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-i?86*.config
 %define image_install_path boot
 %define signmodules 1
 %endif
 
 %ifarch x86_64
-%define buildsmp 0
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-x86_64*.config
 %define image_install_path boot
 %define signmodules 1
 %endif
 
 %ifarch ppc64
-%define buildsmp 0
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc64*.config
 %define image_install_path boot
 %define signmodules 1
@@ -84,7 +79,6 @@
 %endif
 
 %ifarch ppc64iseries
-%define buildsmp 0
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc64*.config
 %define image_install_path boot
 %define signmodules 1
@@ -93,23 +87,21 @@
 %endif
 
 %ifarch s390
-%define buildsmp 0
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-s390*.config
 %define image_install_path boot
 %endif
 
 %ifarch s390x
-%define buildsmp 0
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-s390x.config
 %define image_install_path boot
 %endif
 
 %ifarch sparc
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-sparc.config
-%define buildsmp 0
 %endif
 
 %ifarch sparc64
+%define buildsmp 1
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-sparc64*.config
 %endif
 
@@ -118,11 +110,11 @@
 %define image_install_path boot
 %define make_target vmlinux
 %define kernel_image vmlinux
+%define buildsmp 1
 %endif
 
 %ifarch ia64
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ia64.config
-%define buildsmp 0
 %define image_install_path boot/efi/EFI/redhat
 %define signmodules 1
 %endif
@@ -193,7 +185,7 @@
 
 Source20: kernel-%{kversion}-i586.config
 Source21: kernel-%{kversion}-i686.config
-Source22: kernel-%{kversion}-i686-smp.config
+Source22: kernel-%{kversion}-i686-PAE.config
 Source23: kernel-%{kversion}-x86_64.config
 Source24: kernel-%{kversion}-ppc64.config
 Source25: kernel-%{kversion}-ppc64iseries.config
@@ -440,6 +432,41 @@
 options that can be passed to Linux kernel modules at load time.
 
 
+%package PAE
+Summary: The Linux kernel compiled for PAE capable machines.
+
+Group: System Environment/Kernel
+Provides: kernel = %{version}
+Provides: kernel-drm = 4.3.0
+Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}PAE
+Prereq: %{kernel_prereq}
+Conflicts: %{kernel_dot_org_conflicts}
+Conflicts: %{package_conflicts}
+Obsoletes: kernel-smp < 2.6.17
+# 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 PAE
+This package includes a version of the Linux kernel with support for up to
+64GB of high memory. It requires a CPU with Physical Address Extensions (PAE).
+The non-PAE kernel can only address up to 4GB of memory.
+Install the kernel-PAE package if your machine has more than 4GB of memory.
+
+%package smp-devel
+Summary: Development package for building kernel modules to match the SMP kernel.
+Group: System Environment/Kernel
+Provides: kernel-smp-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}smp
+Provides: kernel-devel = %{rpmversion}-%{release}smp
+AutoReqProv: no
+Prereq: /usr/bin/find
+
+%description smp-devel
+This package provides kernel headers and makefiles sufficient to build modules
+against the SMP kernel package.
+
 %package smp
 Summary: The Linux kernel compiled for SMP machines.
 
@@ -1253,6 +1280,10 @@
 BuildKernel %make_target %kernel_image
 %endif
 
+%if %{buildpae}
+BuildKernel %make_target %kernel_image PAE
+%endif
+
 %if %{buildsmp}
 BuildKernel %make_target %kernel_image smp
 %endif
@@ -1601,6 +1632,8 @@
 %changelog
 * Mon Apr 10 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc1-git2
+- Enable SMP on all x86 kernels.
+  SMP_ALTERNATIVES disables the spinlocks etc at runtime.
 
 * Thu Apr  6 2006 Dave Jones <davej at redhat.com>
 - Rebuild without a zillion warnings.



From fedora-cvs-commits at redhat.com  Mon Apr 10 19:14:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 15:14:09 -0400
Subject: rpms/kernel/devel/configs config-i686-PAE, NONE, 1.1 config-i586,
	1.8, 1.9 config-i686, 1.2, 1.3 config-x86-generic, 1.48,
	1.49 config-i686-smp, 1.2, NONE
Message-ID: <200604101914.k3AJE9Xs007788@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-i586 config-i686 config-x86-generic 
Added Files:
	config-i686-PAE 
Removed Files:
	config-i686-smp 
Log Message:
Bye kernel-i686-smp
Hello kernel-PAE




--- NEW FILE config-i686-PAE ---
CONFIG_M686=y
# CONFIG_NOHIGHMEM is not set
# CONFIG_HIGHMEM4G is not set
CONFIG_HIGHMEM64G=y



Index: config-i586
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-i586,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- config-i586	8 Mar 2006 23:55:07 -0000	1.8
+++ config-i586	10 Apr 2006 19:14:07 -0000	1.9
@@ -54,3 +54,5 @@
 # CONFIG_AGP_SWORKS is not set
 # CONFIG_AGP_VIA is not set
 
+# CONFIG_X86_UP_APIC is not set
+


Index: config-i686
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-i686,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-i686	16 Nov 2005 05:13:42 -0000	1.2
+++ config-i686	10 Apr 2006 19:14:07 -0000	1.3
@@ -1,5 +1,4 @@
 CONFIG_M686=y
-# CONFIG_SMP is not set
 # CONFIG_NOHIGHMEM is not set
 CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- config-x86-generic	4 Apr 2006 20:37:01 -0000	1.48
+++ config-x86-generic	10 Apr 2006 19:14:07 -0000	1.49
@@ -3,14 +3,17 @@
 #
 # Processor type and features
 #
-CONFIG_X86_PC=y
+#
+# Enable summit and co via the generic arch
+#
+# CONFIG_X86_PC is not set
+CONFIG_X86_GENERICARCH=y
 # CONFIG_X86_ELAN is not set
 # CONFIG_X86_VOYAGER is not set
 # CONFIG_X86_NUMAQ is not set
 # CONFIG_X86_SUMMIT is not set
 # CONFIG_X86_BIGSMP is not set
 # CONFIG_X86_VISWS is not set
-# CONFIG_X86_GENERICARCH is not set
 # CONFIG_X86_ES7000 is not set
 # CONFIG_M386 is not set
 # CONFIG_M486 is not set
@@ -31,6 +34,8 @@
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MCYRIXIII is not set
 # CONFIG_MVIAC3_2 is not set
+CONFIG_SMP=y
+CONFIG_NR_CPUS=32
 CONFIG_X86_GENERIC=y
 CONFIG_X86_CMPXCHG=y
 CONFIG_X86_XADD=y
@@ -49,7 +54,6 @@
 CONFIG_HPET_EMULATE_RTC=y
 # CONFIG_HPET_RTC_IRQ is not set
 # CONFIG_HPET_MMAP is not set
-CONFIG_NR_CPUS=8
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_TSC=y
@@ -64,16 +68,10 @@
 CONFIG_X86_CPUID=m
 CONFIG_EDD=m
 # CONFIG_NUMA is not set
-# CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
 CONFIG_HIGHMEM=y
 CONFIG_HIGHPTE=y
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
-CONFIG_X86_UP_APIC=y
-CONFIG_X86_UP_APIC_DEFAULT_OFF=y
-CONFIG_X86_UP_IOAPIC=y
 CONFIG_X86_PM_TIMER=y
 
 CONFIG_EFI=y
@@ -292,3 +290,4 @@
 
 CONFIG_SND_ES18XX=m
 
+


--- config-i686-smp DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 10 19:18:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 15:18:19 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2124,1.2125
Message-ID: <200604101918.k3AJIJvX021723@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
missing bits



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2124
retrieving revision 1.2125
diff -u -r1.2124 -r1.2125
--- kernel-2.6.spec	10 Apr 2006 19:14:07 -0000	1.2124
+++ kernel-2.6.spec	10 Apr 2006 19:18:17 -0000	1.2125
@@ -454,18 +454,18 @@
 The non-PAE kernel can only address up to 4GB of memory.
 Install the kernel-PAE package if your machine has more than 4GB of memory.
 
-%package smp-devel
-Summary: Development package for building kernel modules to match the SMP kernel.
+%package PAE-devel
+Summary: Development package for building kernel modules to match the PAE kernel.
 Group: System Environment/Kernel
-Provides: kernel-smp-devel-%{_target_cpu} = %{rpmversion}-%{release}
-Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}smp
-Provides: kernel-devel = %{rpmversion}-%{release}smp
+Provides: kernel-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}PAE
+Provides: kernel-devel = %{rpmversion}-%{release}PAE
 AutoReqProv: no
 Prereq: /usr/bin/find
 
-%description smp-devel
+%description PAE-devel
 This package provides kernel headers and makefiles sufficient to build modules
-against the SMP kernel package.
+against the PAE kernel package.
 
 %package smp
 Summary: The Linux kernel compiled for SMP machines.
@@ -1498,6 +1498,25 @@
 %verify(not mtime) /usr/src/kernels/%{KVERREL}-%{_target_cpu}
 %endif
 
+%if %{buildpae}
+%files PAE
+%defattr(-,root,root)
+/%{image_install_path}/vmlinuz-%{KVERREL}PAE
+/boot/System.map-%{KVERREL}PAE
+/boot/config-%{KVERREL}PAE
+%dir /lib/modules/%{KVERREL}PAE
+/lib/modules/%{KVERREL}PAE/kernel
+/lib/modules/%{KVERREL}PAE/build
+/lib/modules/%{KVERREL}PAE/source
+/lib/modules/%{KVERREL}PAE/extra
+/lib/modules/%{KVERREL}PAE/updates
+
+%files PAE-devel
+%defattr(-,root,root)
+%verify(not mtime) /usr/src/kernels/%{KVERREL}-PAE-%{_target_cpu}
+/usr/src/kernels/%{KVERREL}PAE-%{_target_cpu}
+%endif
+
 %if %{buildsmp}
 %files smp
 %defattr(-,root,root)



From fedora-cvs-commits at redhat.com  Mon Apr 10 19:21:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 15:21:21 -0400
Subject: rpms/kernel/devel linux-2.6-proc-self-maps-fix.patch, NONE,
	1.1 kernel-2.6.spec, 1.2125, 1.2126
Message-ID: <200604101921.k3AJLLhO021797@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-proc-self-maps-fix.patch 
Log Message:
Al's /proc/self/maps setuid fix


linux-2.6-proc-self-maps-fix.patch:
 fs/proc/base.c          |   20 ++++++++++++++++++++
 fs/proc/internal.h      |    2 ++
 fs/proc/task_mmu.c      |    3 +--
 include/linux/proc_fs.h |    0 
 include/linux/ptrace.h  |    1 +
 kernel/ptrace.c         |    4 ++--
 6 files changed, 26 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-proc-self-maps-fix.patch ---

https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=165351

diff --git a/fs/proc/base.c b/fs/proc/base.c
index a3a3eec..3f262cd 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -408,6 +408,26 @@ static int proc_task_root_link(struct in
 	 (task->state == TASK_STOPPED || task->state == TASK_TRACED) && \
 	 security_ptrace(current,task) == 0))
 
+struct mm_struct *mm_for_maps(struct task_struct *task)
+{
+	struct mm_struct *mm = get_task_mm(task);
+	if (!mm)
+		return NULL;
+	down_read(&mm->mmap_sem);
+	task_lock(task);
+	if (task->mm != mm)
+		goto out;
+	if (task->mm != current->mm && !__ptrace_may_attach(task))
+		goto out;
+	task_unlock(task);
+	return mm;
+out:
+	task_unlock(task);
+	up_read(&mm->mmap_sem);
+	mmput(mm);
+	return NULL;
+}
+
 static int proc_pid_environ(struct task_struct *task, char * buffer)
 {
 	int res = 0;
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index 0502f17..cd172ce 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -16,6 +16,8 @@ struct vmalloc_info {
 	unsigned long	largest_chunk;
 };
 
+extern struct mm_struct *mm_for_maps(struct task_struct *);
+
 #ifdef CONFIG_MMU
 #define VMALLOC_TOTAL (VMALLOC_END - VMALLOC_START)
 extern void get_vmalloc_info(struct vmalloc_info *vmi);
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 91b7c15..3777557 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -311,12 +311,11 @@ static void *m_start(struct seq_file *m,
 	if (last_addr == -1UL)
 		return NULL;
 
-	mm = get_task_mm(task);
+	mm = mm_for_maps(task);
 	if (!mm)
 		return NULL;
 
 	tail_vma = get_gate_vma(task);
-	down_read(&mm->mmap_sem);
 
 	/* Start with last addr hint */
 	if (last_addr && (vma = find_vma(mm, last_addr))) {
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
index 0d36750..578c28e 100644
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -94,6 +94,7 @@ extern void __ptrace_link(struct task_st
 extern void __ptrace_unlink(struct task_struct *child);
 extern void ptrace_untrace(struct task_struct *child);
 extern int ptrace_may_attach(struct task_struct *task);
+extern int __ptrace_may_attach(struct task_struct *task);
 
 static inline void ptrace_link(struct task_struct *child,
 			       struct task_struct *new_parent)
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 0eeb7e6..443f77e 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -121,7 +121,7 @@ int ptrace_check_attach(struct task_stru
 	return ret;
 }
 
-static int may_attach(struct task_struct *task)
+int __ptrace_may_attach(struct task_struct *task)
 {
 	if (!task->mm)
 		return -EPERM;
@@ -143,7 +143,7 @@ int ptrace_may_attach(struct task_struct
 {
 	int err;
 	task_lock(task);
-	err = may_attach(task);
+	err = __ptrace_may_attach(task);
 	task_unlock(task);
 	return !err;
 }



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2125
retrieving revision 1.2126
diff -u -r1.2125 -r1.2126
--- kernel-2.6.spec	10 Apr 2006 19:18:17 -0000	1.2125
+++ kernel-2.6.spec	10 Apr 2006 19:21:19 -0000	1.2126
@@ -340,6 +340,7 @@
 Patch1690: linux-2.6-smsc-ircc2-pnp.patch
 Patch1700: linux-2.6-w1-hush-debug.patch
 Patch1710: linux-2.6-sched-up-migration-cost.patch
+Patch1720: linux-2.6-proc-self-maps-fix.patch
 Patch1740: linux-2.6-softlockup-disable.patch
 Patch1760: linux-2.6-suspend-slab-warnings.patch
 Patch1770: linux-2.6-optimise-spinlock-debug.patch
@@ -960,6 +961,8 @@
 %patch1700 -p1
 # Only print migration info on SMP
 %patch1710 -p1
+# setuid /proc/self/maps fix.
+%patch1720 -p1
 # Add a safety net to softlockup so that it doesn't prevent installs.
 %patch1740 -p1
 # Fix up kmalloc whilst atomic warning during resume.
@@ -1653,6 +1656,7 @@
 - 2.6.16rc1-git2
 - Enable SMP on all x86 kernels.
   SMP_ALTERNATIVES disables the spinlocks etc at runtime.
+- setuid /proc/self/maps fix (#165351)
 
 * Thu Apr  6 2006 Dave Jones <davej at redhat.com>
 - Rebuild without a zillion warnings.



From fedora-cvs-commits at redhat.com  Mon Apr 10 19:37:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 15:37:50 -0400
Subject: rpms/kernel/devel linux-2.6-proc-self-maps-fix.patch,1.1,1.2
Message-ID: <200604101937.k3AJbofx022208@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-proc-self-maps-fix.patch 
Log Message:
build fix


linux-2.6-proc-self-maps-fix.patch:
 b/fs/proc/base.c                    |   20 ++++++++++++++++++++
 b/fs/proc/internal.h                |    2 ++
 b/fs/proc/task_mmu.c                |    3 +--
 b/include/linux/proc_fs.h           |    0 
 b/include/linux/ptrace.h            |    1 +
 b/kernel/ptrace.c                   |    4 ++--
 linux-2.6.16.noarch/kernel/ptrace.c |    2 +-
 7 files changed, 27 insertions(+), 5 deletions(-)

Index: linux-2.6-proc-self-maps-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-proc-self-maps-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-proc-self-maps-fix.patch	10 Apr 2006 19:21:19 -0000	1.1
+++ linux-2.6-proc-self-maps-fix.patch	10 Apr 2006 19:37:46 -0000	1.2
@@ -99,3 +99,14 @@
  	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;
+ 



From fedora-cvs-commits at redhat.com  Mon Apr 10 19:52:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 15:52:15 -0400
Subject: rpms/amanda/devel amanda-2.5.0-overflow.patch, NONE,
	1.1 amanda-2.5.0-pie.patch, NONE, 1.1 .cvsignore, 1.10,
	1.11 amanda.spec, 1.28, 1.29 amandahosts, 1.1, 1.2 sources,
	1.10, 1.11
Message-ID: <200604101952.k3AJqFhl004009@cvs.devel.redhat.com>

Author: fenlason

Update of /cvs/dist/rpms/amanda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3992

Modified Files:
	.cvsignore amanda.spec amandahosts sources 
Added Files:
	amanda-2.5.0-overflow.patch amanda-2.5.0-pie.patch 
Log Message:
2.5.0 with tape-spanning goodness.


amanda-2.5.0-overflow.patch:
 driver.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE amanda-2.5.0-overflow.patch ---
diff -u -r --show-c-function --exclude-from=amanda.diff amanda-2.5.0.orig/server-src/driver.c amanda-2.5.0.new.overflow/server-src/driver.c
--- amanda-2.5.0.orig/server-src/driver.c	2006-03-28 16:10:05.000000000 -0500
+++ amanda-2.5.0/server-src/driver.c	2006-04-03 10:42:32.000000000 -0400
@@ -1466,7 +1466,7 @@ handle_chunker_result(cookie)
 		chunker_cmd( chunker, CONTINUE, dp );
 	    } else { /* !h[++activehd] - must allocate more space */
 		sched(dp)->act_size = sched(dp)->est_size; /* not quite true */
-		sched(dp)->est_size = sched(dp)->act_size * 21 / 20; /* +5% */
+		sched(dp)->est_size = (sched(dp)->act_size/20) * 21; /* +5% */
 		sched(dp)->est_size = am_round(sched(dp)->est_size, DISK_BLOCK_KB);
 		h = find_diskspace( sched(dp)->est_size - sched(dp)->act_size,
 				    &dummy,

amanda-2.5.0-pie.patch:
 amanda-2.4.4p1.pie/configure.in      |   46 +++++++++++++++++++++++++++++++++++
 amanda-2.5.0/changer-src/Makefile.am |    4 +++
 amanda-2.5.0/client-src/Makefile.am  |   21 +++++++++++++++
 amanda-2.5.0/restore-src/Makefile.am |    7 +++++
 amanda-2.5.0/server-src/Makefile.am  |   37 ++++++++++++++++++++++++++++
 amanda-2.5.0/tape-src/Makefile.am    |    7 +++++
 config/compile                       |    1 
 7 files changed, 123 insertions(+)

--- NEW FILE amanda-2.5.0-pie.patch ---
diff -u -r amanda-2.4.4p1.old/configure.in amanda-2.4.4p1/configure.in
--- amanda-2.4.4p1.old/configure.in	2003-06-27 10:19:53.000000000 -0400
+++ amanda-2.4.4p1.pie/configure.in	2003-07-08 23:54:13.000000000 -0400
@@ -2469,6 +2469,52 @@
 AC_REPLACE_FUNCS(strcasecmp)
 ICE_CHECK_DECL(strcasecmp,string.h strings.h)
 
+AC_MSG_CHECKING([for Position Independent Executable support])
+save_CFLAGS="$CFLAGS"
+save_LDFLAGS="$LDFLAGS"
+CFLAGS="$CFLAGS -fpie"
+LDFLAGS="$LDFLAGS -pie"
+AC_TRY_RUN(
+	[
+int foo () __attribute__((visibility ("hidden")));
+int foo () { return 0; }
+int main () { return foo (); }
+	],
+	[
+		ac_cv_pie_support=yes
+	],
+	[
+		ac_cv_pie_support=no
+	],
+	[
+		ac_cv_pie_support=no
+	]
+)
+CFLAGS="$save_CFLAGS"
+LDFLAGS="$save_LDFLAGS"
+AC_MSG_RESULT($ac_cv_pie_support)
+if test $ac_cv_pie_support = no; then
+  AC_DEFINE(hidden,,
+	    [Define as `__attribute__((visibility ("hidden")))' if the C compiler supports it,
+	     or to nothing if it is not supported.])
+  PIE_LDFLAGS=
+  PIE_SED_CMD=
+  COMPILE_PIE=
+  EXIT0_IF_NO_PIE='exit 0'
+else
+  AC_DEFINE_UNQUOTED(hidden, __attribute__((visibility ("hidden"))))
+  PIE_LDFLAGS="-pie -L.pie/ -Lopenbsd-compat/.pie/"
+changequote(<<, >>)dnl
+  PIE_SED_CMD='s_[ 	]\([^ 	]\)_ .pie/\1_g'
+changequote([, ])dnl
+  COMPILE_PIE=' && mkdir -p .pie && $(COMPILE) -c -fpie -o .pie/$@ \`test -f '"'"'$<'"'"' || echo '"'"'$(srcdir)/'"'"'\`$<'
+  EXIT0_IF_NO_PIE=:
+fi
+AC_SUBST(PIE_LDFLAGS)
+AC_SUBST(PIE_SED_CMD)
+AC_SUBST(COMPILE_PIE)
+AC_SUBST(EXIT0_IF_NO_PIE)
+
 dnl disk device prefixes
 AC_MSG_CHECKING(disk device prefixes)
 dnl Use df to find the mount point for the root filesystem.  Use
--- amanda-2.4.4p1.orig/config/compile	1969-12-31 19:00:00.000000000 -0500
+++ amanda-2.4.4p1.pie/config/compile	2003-07-16 16:57:18.000000000 -0400
@@ -0,0 +1 @@
+# Dummy compile for configure
--- amanda-2.5.0/server-src/Makefile.am.pie	2006-02-14 06:51:24.000000000 -0500
+++ amanda-2.5.0/server-src/Makefile.am	2006-04-07 15:27:09.000000000 -0400
@@ -12,11 +12,48 @@
 			amgetconf	amlabel		amtape		\
 			amreport
 
+amadmin_CFLAGS = -fPIE $(AM_CFLAGS)
+amadmin_LDFLAGS = -pie $(AM_LDFLAGS)
+amcheck_CFLAGS = -fPIE $(AM_CFLAGS)
+amcheck_LDFLAGS = -pie $(AM_LDFLAGS)
+amflush_CFLAGS = -fPIE $(AM_CFLAGS)
+amflush_LDFLAGS = -pie $(AM_LDFLAGS)
+amgetconf_CFLAGS = -fPIE $(AM_CFLAGS)
+amgetconf_LDFLAGS = -pie $(AM_LDFLAGS)
+amlabel_CFLAGS = -fPIE $(AM_CFLAGS)
+amlabel_LDFLAGS = -pie $(AM_LDFLAGS)
+amreport_CFLAGS = -fPIE $(AM_CFLAGS)
+amreport_LDFLAGS = -pie $(AM_LDFLAGS)
+amtape_CFLAGS = -fPIE $(AM_CFLAGS)
+amtape_LDFLAGS = -pie $(AM_LDFLAGS)
+
 libexec_PROGRAMS =	amindexd	amlogroll	amtrmidx	\
 			amtrmlog	driver		dumper		\
 			planner		taper		amcleanupdisk	\
 			chunker
 
+
+taper_CFLAGS = -fPIE $(AM_CFLAGS)
+taper_LDFLAGS = -pie $(AM_LDFLAGS)
+driver_CFLAGS = -fPIE $(AM_CFLAGS)
+driver_LDFLAGS = -pie $(AM_LDFLAGS)
+chunker_CFLAGS = -fPIE $(AM_CFLAGS)
+chunker_LDFLAGS = -pie $(AM_LDFLAGS)
+amtrmlog_CFLAGS = -fPIE $(AM_CFLAGS)
+amtrmlog_LDFLAGS = -pie $(AM_LDFLAGS)
+amtrmidx_CFLAGS = -fPIE $(AM_CFLAGS)
+amtrmidx_LDFLAGS = -pie $(AM_LDFLAGS)
+amlogroll_CFLAGS = -fPIE $(AM_CFLAGS)
+amlogroll_LDFLAGS = -pie $(AM_LDFLAGS)
+amcleanupdisk_CFLAGS = -fPIE $(AM_CFLAGS)
+amcleanupdisk_LDFLAGS = -pie $(AM_LDFLAGS)
+amindexd_CFLAGS = -fPIE $(AM_CFLAGS)
+amindexd_LDFLAGS = -pie $(AM_LDFLAGS)
+dumper_CFLAGS = -fPIE $(AM_CFLAGS)
+dumper_LDFLAGS = -pie $(AM_LDFLAGS)
+planner_CFLAGS = -fPIE $(AM_CFLAGS)
+planner_LDFLAGS = -pie $(AM_LDFLAGS)
+
 sbin_SCRIPTS =		amcheckdb	amcleanup	amdump		\
 			amoverview	amrmtape	amtoc		\
 			amverify	amverifyrun	amstatus	\
--- amanda-2.5.0/changer-src/Makefile.am.pie	2006-04-07 15:28:32.000000000 -0400
+++ amanda-2.5.0/changer-src/Makefile.am	2006-04-07 15:30:09.000000000 -0400
@@ -9,10 +9,14 @@
 
 if WANT_CHIO_SCSI
 CHIO_SCSI = chg-scsi-chio
+chg_scsi_chio_CFLAGS = -fPIE $(AM_CFLAGS)
+chg_scsi_chio_LDFLAGS = -pie $(AM_LDFLAGS)
 endif
 
 if WANT_CHG_SCSI
 CHG_SCSI = chg-scsi
+chg_scsi_CFLAGS = -fPIE $(AM_CFLAGS)
+chg_scsi_LDFLAGS = -pie $(AM_LDFLAGS)
 endif
 
 libexec_PROGRAMS =	$(CHG_SCSI)
--- amanda-2.5.0/client-src/Makefile.am.pie	2006-02-14 06:51:20.000000000 -0500
+++ amanda-2.5.0/client-src/Makefile.am	2006-04-07 15:33:17.000000000 -0400
@@ -8,6 +8,27 @@
 
 libexec_PROGRAMS =	amandad noop calcsize killpgrp rundump runtar selfcheck sendbackup sendsize versionsuffix
 
+calcsize_CFLAGS = -fPIE $(AM_CFLAGS)
+calcsize_LDFLAGS = -pie $(AM_LDFLAGS)
+killpgrp_CFLAGS = -fPIE $(AM_CFLAGS)
+killpgrp_LDFLAGS = -pie $(AM_LDFLAGS)
+rundump_CFLAGS = -fPIE $(AM_CFLAGS)
+rundump_LDFLAGS = -pie $(AM_LDFLAGS)
+runtar_CFLAGS = -fPIE $(AM_CFLAGS)
+runtar_LDFLAGS = -pie $(AM_LDFLAGS)
+amandad_CFLAGS = -fPIE $(AM_CFLAGS)
+amandad_LDFLAGS = -pie $(AM_LDFLAGS)
+noop_CFLAGS = -fPIE $(AM_CFLAGS)
+noop_LDFLAGS = -pie $(AM_LDFLAGS)
+selfcheck_CFLAGS = -fPIE $(AM_CFLAGS)
+selfcheck_LDFLAGS = -pie $(AM_LDFLAGS)
+sendbackup_CFLAGS = -fPIE $(AM_CFLAGS)
+sendbackup_LDFLAGS = -pie $(AM_LDFLAGS)
+sendsize_CFLAGS = -fPIE $(AM_CFLAGS)
+sendsize_LDFLAGS = -pie $(AM_LDFLAGS)
+versionsuffix_CFLAGS = -fPIE $(AM_CFLAGS)
+versionsuffix_LDFLAGS = -pie $(AM_LDFLAGS)
+
 sbin_SCRIPTS =		@CLIENT_SCRIPTS_OPT@
 
 libexec_SCRIPTS =	patch-system
--- amanda-2.5.0/restore-src/Makefile.am.pie	2006-02-14 06:51:23.000000000 -0500
+++ amanda-2.5.0/restore-src/Makefile.am	2006-04-07 15:35:48.000000000 -0400
@@ -32,6 +32,13 @@
                    ../tape-src/libamtape.$(LIB_EXTENSION) \
                   ../server-src/libamserver.$(LIB_EXTENSION)
 
+amidxtaped_CFLAGS = -fPIE $(AM_CFLAGS)
+amidxtaped_LDFLAGS = -pie $(AM_LDFLAGS)
+amrestore_CFLAGS = -fPIE $(AM_CFLAGS)
+amrestore_LDFLAGS = -pie $(AM_LDFLAGS)
+amfetchdump_CFLAGS = -fPIE $(AM_CFLAGS)
+amfetchdump_LDFLAGS = -pie $(AM_LDFLAGS)
+
 noinst_HEADERS = restore.h
 
 install-exec-hook:
--- amanda-2.5.0/tape-src/Makefile.am.pie	2006-02-14 06:51:24.000000000 -0500
+++ amanda-2.5.0/tape-src/Makefile.am	2006-04-07 15:34:46.000000000 -0400
@@ -8,6 +8,13 @@
 
 sbin_PROGRAMS=          ammt amdd amtapetype
 
+amdd_CFLAGS = -fPIE $(AM_CFLAGS)
+amdd_LDFLAGS = -pie $(AM_LDFLAGS)
+ammt_CFLAGS = -fPIE $(AM_CFLAGS)
+ammt_LDFLAGS = -pie $(AM_LDFLAGS)
+amtapetype_CFLAGS = -fPIE $(AM_CFLAGS)
+amtapetype_LDFLAGS = -pie $(AM_LDFLAGS)
+
 libamtape_la_SOURCES = 	output-file.c \
 			output-null.c \
 			output-rait.c \


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/amanda/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	4 Nov 2005 18:24:15 -0000	1.10
+++ .cvsignore	10 Apr 2006 19:52:13 -0000	1.11
@@ -1 +1 @@
-amanda-2.4.5p1.tar.gz
+amanda-2.5.0.tar.gz


Index: amanda.spec
===================================================================
RCS file: /cvs/dist/rpms/amanda/devel/amanda.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- amanda.spec	11 Feb 2006 01:35:10 -0000	1.28
+++ amanda.spec	10 Apr 2006 19:52:13 -0000	1.29
@@ -1,6 +1,6 @@
 %define	_libexecdir	%{_libdir}/amanda
 %{!?defconfig:%define defconfig DailySet1}
-%{!?indexserver:%define indexserver localhost}
+%{!?indexserver:%define indexserver amandahost}
 %{!?tapeserver:%define tapeserver %{indexserver}}
 %{!?amanda_user:%define amanda_user amanda}
 %{!?amanda_group:%define amanda_group disk}
@@ -10,26 +10,26 @@
 
 Summary: A network-capable tape backup solution.
 Name: amanda
-Version: 2.4.5p1
-Release: 3.2
+Version: 2.5.0
+Release: 2
 Source: http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1: amanda.crontab
 # Source2: __README_QUICKSETUP__
-#Source3: amanda.conf
 Source4: disklist
 Source5: amanda-xinetd
 Source6: amandaidx-xinetd
 Source7: amidxtape-xinetd
 Source8: amandahosts
 Patch0: amanda-2.4.2-bug18322.patch
-Patch1: amanda-2.4.4p2-pie.patch
+Patch1: amanda-2.5.0-pie.patch
+Patch2: amanda-2.5.0-overflow.patch
 License: BSD
 Group: Applications/System
 URL: http://www.amanda.org
 Prereq: fileutils grep initscripts
 BuildRequires: dump gnuplot cups samba-client tar grep fileutils
-BuildRequires: libtool automake autoconf gcc-c++ /usr/bin/Mail
-Requires: tar
+BuildRequires: libtool automake autoconf gcc-c++ readline-devel
+Requires: tar /usr/bin/Mail
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description 
@@ -49,7 +49,7 @@
 Summary: The client component of the AMANDA tape backup system.
 Group: Applications/System
 Prereq: fileutils grep /sbin/service xinetd
-Requires: amanda = %{version}
+Requires(pre): amanda = %{version}
 
 %description client
 The Amanda-client package should be installed on any machine that will
@@ -62,7 +62,7 @@
 Group: Applications/System
 Requires: gnuplot
 Prereq: fileutils grep /sbin/service xinetd
-Requires: amanda = %{version}
+Requires(pre): amanda = %{version}
 
 %description server
 The amanda-server package should be installed on the AMANDA server,
@@ -74,7 +74,7 @@
 %package devel
 Summary: Libraries and documentation of the AMANDA tape backup system.
 Group: Development/Libraries
-Requires: amanda = %{version}
+Requires(pre): amanda = %{version}
 
 %description devel
 The amanda-devel package should be installed on any machine that will
@@ -84,6 +84,7 @@
 %setup -q
 %patch0 -p1 -b .bug18322
 %patch1 -p1 -b .pie
+%patch2 -p1 -b .overflow
 libtoolize --copy --force
 aclocal
 automake
@@ -94,17 +95,20 @@
 export SED=sed
 
 %configure --enable-shared \
+	--disable-static \
 	--disable-dependency-tracking \
 	--with-index-server=%{indexserver} \
 	--with-tape-server=%{tapeserver} \
 	--with-config=%{defconfig} \
 	--with-gnutar-listdir=%{_localstatedir}/amanda/gnutar-lists \
 	--with-smbclient=%{_bindir}/smbclient \
+	--with-dumperdir=%{_libdir}/amanda/dumperdir \
 	--with-amandahosts \
 	--with-user=%amanda_user \
 	--with-group=%amanda_group \
 	--with-tmpdir=/var/log/amanda \
-	--with-gnutar=/bin/tar
+	--with-gnutar=/bin/tar \
+	--with-ssh-security
 	
 make %{?_smp_mflags}
 (cd common-src; make security)
@@ -126,25 +130,27 @@
 chmod 644 $RPM_BUILD_ROOT/etc/xinetd.d/amidxtape
 mkdir -p $RPM_BUILD_ROOT/var/log/amanda
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/amanda
-install -m 660 %SOURCE8 $RPM_BUILD_ROOT%{_localstatedir}/amanda/.amandahosts
+install -m 600 %SOURCE8 $RPM_BUILD_ROOT%{_localstatedir}/amanda/.amandahosts
 
 mkdir -p examples
 cp example/* examples
 rm -f examples/Makefile*
 rm -f examples/config.site
 
-cp common-src/security ${RPM_BUILD_ROOT}%{_sbindir}
+#cp common-src/security ${RPM_BUILD_ROOT}%{_sbindir}
 pushd tape-src/.libs
 install -m 755 amtapetype $RPM_BUILD_ROOT/%{_sbindir}
 popd
 
 # cp ${RPM_SOURCE_DIR}/__README_QUICKSETUP__ docs/
+rm -r ${RPM_BUILD_ROOT}%{_libdir}/amanda/dumperdir
+rmdir --ignore-fail-on-non-empty ${RPM_BUILD_ROOT}%{_libdir}/amanda
 
 pushd ${RPM_BUILD_ROOT}
   mkdir -p .%{_sysconfdir}/amanda/%defconfig
   cp ${RPM_SOURCE_DIR}/amanda.crontab .%{_sysconfdir}/amanda/crontab.sample
-#  cp ${RPM_SOURCE_DIR}/amanda.conf .%{_sysconfdir}/amanda/%defconfig
-cp ${RPM_BUILD_DIR}/%{name}-%{version}/examples/amanda.conf .%{_sysconfdir}/amanda/%{defconfig}
+  cp ${RPM_SOURCE_DIR}/disklist .%{_sysconfdir}/amanda/%defconfig
+  cp ${RPM_BUILD_DIR}/%{name}-%{version}/examples/amanda.conf .%{_sysconfdir}/amanda/%{defconfig}
   cp ${RPM_SOURCE_DIR}/disklist .%{_sysconfdir}/amanda/%defconfig
   touch .%{_sysconfdir}/amandates
 
@@ -159,7 +165,9 @@
 
   chmod 755 .%{_libdir}/libam*
 popd
+cp examples/amanda.conf $RPM_BUILD_ROOT%{_sysconfdir}/amanda/%{defconfig}
 rm -rf $RPM_BUILD_ROOT/usr/share/amanda
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
 
 %clean 
 rm -rf ${RPM_BUILD_ROOT}
@@ -192,11 +200,13 @@
 
 %files
 %defattr(-,root,root)
-%{_libdir}/libamanda*.so
-%{_libdir}/libamtape*.so
+%{_libdir}/libamanda-*.so
+%{_libdir}/libamtape-*.so
+%{_libdir}/libamserver-*.so
+%{_libdir}/librestore-*.so
 %attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amrestore
 %{_mandir}/man8/amrestore.8*
-%attr(660,%amanda_user,%amanda_group)  %config(noreplace) %{_localstatedir}/amanda/.amandahosts
+%attr(600,%amanda_user,%amanda_group)  %config(noreplace) %{_localstatedir}/amanda/.amandahosts
 
 %attr(02700,%amanda_user,%amanda_group) %dir /var/log/amanda
 %attr(-,%amanda_user,%amanda_group)	%dir %{_localstatedir}/amanda/
@@ -208,7 +218,6 @@
 %files server
 %defattr(-,root,root)
 %doc examples COPYRIGHT* NEWS README
-%{_libdir}/libamserver*.so
 %config(noreplace) /etc/xinetd.d/amandaidx
 %config(noreplace) /etc/xinetd.d/amidxtape
 %attr(-,%amanda_user,%amanda_group)    %dir %{_libexecdir}/
@@ -221,6 +230,11 @@
 %attr(4750,root,%amanda_group)	%{_libexecdir}/dumper
 %attr(4750,root,%amanda_group)	%{_libexecdir}/planner
 %attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/taper
+%attr(-,%amanda_user,%amanda_group)     %{_libexecdir}/chunker
+#%attr(-,%amanda_user,%amanda_group)    %dir %{_libdir}/amanda
+#%attr(-,%amanda_user,%amanda_group)    %dir %{_libdir}/amanda/dumperdir
+#%attr(-,%amanda_user,%amanda_group)    %{_libdir}/amanda/dumperdir/generic-dumper
+#%attr(-,%amanda_user,%amanda_group)    %{_libdir}/amanda/dumperdir/gnutar
 %attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/amcleanupdisk
 %attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/chg-chio
 %attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/chg-chs
@@ -241,8 +255,10 @@
 %attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/amplot.g
 %attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/amplot.gp
 
+%attr(-,%amanda_user,%amanda_group)    %{_sbindir}/amaespipe
 %attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amadmin
 %attr(4750,root,%amanda_group)	%{_sbindir}/amcheck
+%attr(-,%amanda_user,%amanda_group)    %{_sbindir}/amcrypt
 %attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amflush
 %attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amgetconf
 %attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amlabel
@@ -271,10 +287,12 @@
 %attr(-,%amanda_user,%amanda_group)	%config(noreplace) %{_sysconfdir}/amanda/%defconfig/disklist
 
 %{_mandir}/man8/amadmin.8*
+%{_mandir}/man8/amaespipe.8*
 %{_mandir}/man8/amanda.8*
 %{_mandir}/man8/amcheck.8*
 %{_mandir}/man8/amcheckdb.8*
 %{_mandir}/man8/amcleanup.8*
+%{_mandir}/man8/amcrypt.8*
 %{_mandir}/man8/amdd.8*
 %{_mandir}/man8/amdump.8*
 %{_mandir}/man8/amflush.8*
@@ -294,34 +312,56 @@
 
 %files client
 					%defattr(-,root,root)
-					%config /etc/xinetd.d/amanda
-					%{_libdir}/libamclient*.so
+					%config(noreplace) /etc/xinetd.d/amanda
+					%{_libdir}/libamclient-*.so
 %attr(-,%amanda_user,%amanda_group)	%dir %{_libexecdir}/
+%attr(-,%amanda_user,%amanda_group)     %{_libexecdir}/noop
 %attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/amandad
 %attr(4750,root,%amanda_group)		%{_libexecdir}/calcsize
 %attr(4750,root,%amanda_group)		%{_libexecdir}/killpgrp
 %attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/patch-system
 %attr(4750,root,%amanda_group)		%{_libexecdir}/rundump
 %attr(4750,root,%amanda_group)		%{_libexecdir}/runtar
-%attr(4750,root,%amanda_group)		%{_libexecdir}/amqde
 %attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/selfcheck
 %attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/sendbackup
 %attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/sendsize
 %attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/versionsuffix
+%attr(-,%amanda_user,%amanda_group)    %{_sbindir}/amfetchdump
+                                       %{_mandir}/man8/amfetchdump.8*
 %attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amrecover
 					%{_mandir}/man8/amrecover.8*
-%attr(-,%amanda_user,%amanda_group)	%{_sbindir}/security
 %attr(-,%amanda_user,%amanda_group)	%{_localstatedir}/amanda/gnutar-lists/
 
 %files devel
 %defattr(-,root,root)
-%{_libdir}/libamanda.a
-%{_libdir}/libamtape.a
-%{_libdir}/libamclient.a
-%{_libdir}/libamserver.a
-%{_libdir}/*.la
+%{_libdir}/libamanda.so
+%{_libdir}/libamtape.so
+%{_libdir}/libamclient.so
+%{_libdir}/libamserver.so
+%{_libdir}/librestore.so
 
 %changelog
+* Fri Apr 7 2006 Jay Fenlason <fenlason at redhat.com> 2.5.0-2
+- New upstream release: 2.5.0, with new features
+- Do not include our own amanda.conf anymore, use the one from the
+  tarball.
+- Remove the static libraries.
+- Update the -pie patch
+- Turn on the new -with-ssh-security option.
+- Change the mode of ~amanda/.amandahosts to 600, since 2.5.0 requires
+  it.
+- actually use the defconfig macro it this spec file.
+- Change the name of the index server to "amandahost" from localhost.
+  Users should ensure that "amandahost.their-domain" points to their
+  Amanda server.
+- Change amandahosts likewise.
+- Add dependency on /usr/bin/Mail
+- Ensure unversioned .so files are only in the -devel rpm.
+- Remove DUMPER_DIR and the files in it, as nothing seems to actually
+  use them.
+- Include the -overflow patch from Jean-Louis Martineau
+  <martineau at zmanda.com>
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.4.5p1-3.2
 - bump again for double-long bug on ppc(64)
 


Index: amandahosts
===================================================================
RCS file: /cvs/dist/rpms/amanda/devel/amandahosts,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amandahosts	9 Sep 2004 02:55:59 -0000	1.1
+++ amandahosts	10 Apr 2006 19:52:13 -0000	1.2
@@ -1,2 +1,2 @@
-localhost amanda
-localhost.localdomain amanda
+amandahost amanda
+amandahost.localdomain amanda


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/amanda/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	4 Nov 2005 18:24:15 -0000	1.10
+++ sources	10 Apr 2006 19:52:13 -0000	1.11
@@ -1 +1 @@
-8fd967a6f63c4a91f0a38f56e2339ec8  amanda-2.4.5p1.tar.gz
+a720dafd60ff215dd97aa3271d7e0051  amanda-2.5.0.tar.gz



From fedora-cvs-commits at redhat.com  Mon Apr 10 20:06:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 16:06:12 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2126,1.2127
Message-ID: <200604102006.k3AK6Bia004220@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
no pae for 586



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2126
retrieving revision 1.2127
diff -u -r1.2126 -r1.2127
--- kernel-2.6.spec	10 Apr 2006 19:21:19 -0000	1.2126
+++ kernel-2.6.spec	10 Apr 2006 20:06:08 -0000	1.2127
@@ -58,12 +58,15 @@
 # Second, per-architecture exclusions (ifarch)
 
 %ifarch %{all_x86}
-%define buildpae 1
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-i?86*.config
 %define image_install_path boot
 %define signmodules 1
 %endif
 
+%ifarch i686
+%define buildpae 1
+%endif
+
 %ifarch x86_64
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-x86_64*.config
 %define image_install_path boot



From fedora-cvs-commits at redhat.com  Mon Apr 10 20:34:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 16:34:26 -0400
Subject: rpms/amanda/devel amanda-2.4.4p2-pie.patch,1.2,NONE
Message-ID: <200604102034.k3AKYQ8Q018625@cvs.devel.redhat.com>

Author: fenlason

Update of /cvs/dist/rpms/amanda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18612

Removed Files:
	amanda-2.4.4p2-pie.patch 
Log Message:
Forgot to delete obsolete patch.



--- amanda-2.4.4p2-pie.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 10 20:58:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 16:58:04 -0400
Subject: rpms/gnome-applets/devel gnome-applets-2.14.1-cpufreq.patch, NONE,
	1.1 gnome-applets.spec, 1.130,
	1.131 gnome-applets-2.11.1-cpufreq.patch, 1.2, NONE
Message-ID: <200604102058.k3AKw4Tv032757@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-applets.spec 
Added Files:
	gnome-applets-2.14.1-cpufreq.patch 
Removed Files:
	gnome-applets-2.11.1-cpufreq.patch 
Log Message:
update patches


gnome-applets-2.14.1-cpufreq.patch:
 cpufreq-applet.c |    2 ++
 cpufreq-popup.c  |    8 +-------
 2 files changed, 3 insertions(+), 7 deletions(-)

--- NEW FILE gnome-applets-2.14.1-cpufreq.patch ---
--- gnome-applets-2.14.1/cpufreq/src/cpufreq-applet.c.cpufreq	2006-04-10 15:12:40.000000000 -0400
+++ gnome-applets-2.14.1/cpufreq/src/cpufreq-applet.c	2006-04-10 15:12:53.000000000 -0400
@@ -272,6 +272,8 @@
         if (!path)
                 return FALSE;
 
+	return TRUE;
+
         if (geteuid () == 0)
                 return TRUE;
 
--- gnome-applets-2.14.1/cpufreq/src/cpufreq-popup.c.cpufreq	2006-04-10 15:13:54.000000000 -0400
+++ gnome-applets-2.14.1/cpufreq/src/cpufreq-popup.c	2006-04-10 15:14:41.000000000 -0400
@@ -142,17 +142,11 @@
 cpufreq_popup_set_governor (GtkWidget *widget, gpointer gdata)
 {
 	gchar *governor;
-	gchar *path = NULL;
 	gchar *command;
 
 	governor = (gchar *) gdata;
 
-	path = g_find_program_in_path ("cpufreq-selector");
-
-	if (!path)
-		return;
-
-	command = g_strdup_printf ("%s -g %s", path, governor);
+	command = g_strdup_printf ("/usr/bin/cpufreq-selector -g %s", path, governor);
 
 	g_spawn_command_line_async (command, NULL); /* TODO: error */
 


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- gnome-applets.spec	10 Apr 2006 18:04:12 -0000	1.130
+++ gnome-applets.spec	10 Apr 2006 20:58:02 -0000	1.131
@@ -27,10 +27,9 @@
 Patch0:		gnome-applets-2.10.1-use-old-modemlights.patch
 Patch2:		gnome-applets-2.10.1-use-builtin-apm.patch
 Patch3:		gnome-applets-2.3.6-ppp-command.patch
-Patch4:		gnome-applets-2.11.1-cpufreq.patch
+Patch4:		gnome-applets-2.14.1-cpufreq.patch
 Patch5:	        gnome-applets-2.13.4-warning.patch
 Patch6:	        gnome-applets-2.13.90-stock-ticker.patch
-Patch8:	        gnome-applets-2.13.90-mixer-crash.patch
 Patch9:	        gnome-applets-2.14.0-gswitchit-export-dynamic.patch
 
 URL:		http://www.gnome.org/
@@ -89,7 +88,6 @@
 %patch4 -p1 -b .cpufreq
 %patch5 -p1 -b .warning
 %patch6 -p1 -b .stock-ticker
-%patch8 -p1 -b .mixer-crash
 %patch9 -p1 -b .gswitchit-export-dynamic
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
@@ -201,6 +199,7 @@
 %changelog
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
 - Update to 2.14.1
+- Update patches
 
 * Tue Mar 28 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-3
 - apply patch


--- gnome-applets-2.11.1-cpufreq.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 10 21:05:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 17:05:37 -0400
Subject: rpms/gnome-applets/FC-5 gnome-applets-2.14.1-cpufreq.patch, NONE,
	1.1 gnome-applets.spec, 1.129,
	1.130 gnome-applets-2.11.1-cpufreq.patch, 1.2, NONE
Message-ID: <200604102105.k3AL5bBA000559@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-applets.spec 
Added Files:
	gnome-applets-2.14.1-cpufreq.patch 
Removed Files:
	gnome-applets-2.11.1-cpufreq.patch 
Log Message:
update patches


gnome-applets-2.14.1-cpufreq.patch:
 cpufreq-applet.c |    2 ++
 cpufreq-popup.c  |    8 +-------
 2 files changed, 3 insertions(+), 7 deletions(-)

--- NEW FILE gnome-applets-2.14.1-cpufreq.patch ---
--- gnome-applets-2.14.1/cpufreq/src/cpufreq-applet.c.cpufreq	2006-04-10 15:12:40.000000000 -0400
+++ gnome-applets-2.14.1/cpufreq/src/cpufreq-applet.c	2006-04-10 15:12:53.000000000 -0400
@@ -272,6 +272,8 @@
         if (!path)
                 return FALSE;
 
+	return TRUE;
+
         if (geteuid () == 0)
                 return TRUE;
 
--- gnome-applets-2.14.1/cpufreq/src/cpufreq-popup.c.cpufreq	2006-04-10 15:13:54.000000000 -0400
+++ gnome-applets-2.14.1/cpufreq/src/cpufreq-popup.c	2006-04-10 15:14:41.000000000 -0400
@@ -142,17 +142,11 @@
 cpufreq_popup_set_governor (GtkWidget *widget, gpointer gdata)
 {
 	gchar *governor;
-	gchar *path = NULL;
 	gchar *command;
 
 	governor = (gchar *) gdata;
 
-	path = g_find_program_in_path ("cpufreq-selector");
-
-	if (!path)
-		return;
-
-	command = g_strdup_printf ("%s -g %s", path, governor);
+	command = g_strdup_printf ("/usr/bin/cpufreq-selector -g %s", path, governor);
 
 	g_spawn_command_line_async (command, NULL); /* TODO: error */
 


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/FC-5/gnome-applets.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- gnome-applets.spec	28 Mar 2006 23:20:33 -0000	1.129
+++ gnome-applets.spec	10 Apr 2006 21:05:28 -0000	1.130
@@ -17,8 +17,8 @@
 
 Summary:        Small applications for the GNOME panel.
 Name:     	gnome-applets
-Version: 	2.14.0
-Release:  	1.fc5
+Version: 	2.14.1
+Release:  	1.fc5.1
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -27,10 +27,9 @@
 Patch0:		gnome-applets-2.10.1-use-old-modemlights.patch
 Patch2:		gnome-applets-2.10.1-use-builtin-apm.patch
 Patch3:		gnome-applets-2.3.6-ppp-command.patch
-Patch4:		gnome-applets-2.11.1-cpufreq.patch
+Patch4:		gnome-applets-2.14.1-cpufreq.patch
 Patch5:	        gnome-applets-2.13.4-warning.patch
 Patch6:	        gnome-applets-2.13.90-stock-ticker.patch
-Patch8:	        gnome-applets-2.13.90-mixer-crash.patch
 Patch9:	        gnome-applets-2.14.0-gswitchit-export-dynamic.patch
 
 URL:		http://www.gnome.org/
@@ -89,7 +88,6 @@
 %patch4 -p1 -b .cpufreq
 %patch5 -p1 -b .warning
 %patch6 -p1 -b .stock-ticker
-%patch8 -p1 -b .mixer-crash
 %patch9 -p1 -b .gswitchit-export-dynamic
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
@@ -199,7 +197,14 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
-* Tue Mar 28 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-1.fc5
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
+- Update to 2.14.1
+- Update patches
+
+* Tue Mar 28 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-3
+- apply patch
+
+ * Tue Mar 28 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-2
 - export symbols in gswitchit applet so applet plugins 
   work (bug 187168)
 


--- gnome-applets-2.11.1-cpufreq.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 10 21:10:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 17:10:53 -0400
Subject: rpms/selinux-policy/devel modules-targeted.conf, 1.20,
	1.21 policy-20060323.patch, 1.10, 1.11 selinux-policy.spec,
	1.169, 1.170
Message-ID: <200604102110.k3ALArX3000782@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	modules-targeted.conf policy-20060323.patch 
	selinux-policy.spec 
Log Message:
* Mon Apr 10 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-6
- Allow secadm_t ability to relabel all files
- Allow ftp to search xferlog_t directories
- Allow mysql to communicate with ldap
- Allow rsync to bind to rsync_port_t



Index: modules-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- modules-targeted.conf	6 Apr 2006 19:08:54 -0000	1.20
+++ modules-targeted.conf	10 Apr 2006 21:10:33 -0000	1.21
@@ -75,6 +75,13 @@
 # 
 selinux = base
 
+# Layer: admin
+# Module: prelink
+#
+# Manage temporary directory sizes and file ages
+# 
+prelink = base
+
 # Layer: system
 # Module: files
 # Required in base
@@ -135,6 +142,13 @@
 # 
 kudzu = base
 
+# Layer: kernel
+# Module: bootloader
+#
+# Policy for the kernel modules, kernel image, and bootloader.
+# 
+bootloader = base
+
 # Layer: admin
 # Module: updfstab
 #
@@ -150,6 +164,13 @@
 netutils = base
 
 # Layer: admin
+# Module: alsa
+#
+# Ainit ALSA configuration tool
+# 
+alsa = off
+
+# Layer: admin
 # Module: vpn
 #
 # Virtual Private Networking client
@@ -270,13 +291,6 @@
 webalizer = base
 
 # Layer: kernel
-# Module: bootloader
-#
-# Policy for the kernel modules, kernel image, and bootloader.
-# 
-bootloader = base
-
-# Layer: kernel
 # Module: storage
 #
 # Policy controlling access to storage devices

policy-20060323.patch:
 admin/rpm.te               |    1 
 apps/ada.fc                |    7 +
 apps/ada.if                |  203 +++++++++++++++++++++++++++++++++++++++++++++
 apps/ada.te                |   24 +++++
 apps/java.fc               |    1 
 apps/mono.if               |   23 +++++
 apps/mono.te               |    1 
 kernel/devices.fc          |    1 
 kernel/devices.if          |   40 ++++++++
 kernel/files.if            |   15 +++
 kernel/mls.te              |    1 
 services/apache.if         |   20 ++++
 services/automount.te      |    1 
 services/avahi.te          |    4 
 services/bluetooth.te      |    7 +
 services/cups.te           |    2 
 services/dbus.te           |    1 
 services/ftp.te            |    1 
 services/hal.te            |   13 ++
 services/mysql.te          |    1 
 services/networkmanager.te |    1 
 services/nscd.if           |   20 ++++
 services/rsync.te          |    4 
 services/samba.te          |    2 
 services/snmp.te           |    1 
 services/xserver.if        |   21 ++++
 system/fstools.te          |    1 
 system/getty.fc            |    1 
 system/getty.te            |    2 
 system/init.te             |    1 
 system/libraries.fc        |   26 ++++-
 system/logging.if          |   32 +++++++
 system/mount.te            |    4 
 system/unconfined.if       |   17 +--
 system/unconfined.te       |    8 -
 system/userdomain.te       |    6 -
 36 files changed, 485 insertions(+), 29 deletions(-)

Index: policy-20060323.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060323.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- policy-20060323.patch	6 Apr 2006 19:08:54 -0000	1.10
+++ policy-20060323.patch	10 Apr 2006 21:10:33 -0000	1.11
@@ -518,6 +518,17 @@
  
  seutil_read_config(system_dbusd_t)
  seutil_read_default_contexts(system_dbusd_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.2.29/policy/modules/services/ftp.te
+--- nsaserefpolicy/policy/modules/services/ftp.te	2006-03-30 10:59:02.000000000 -0500
++++ serefpolicy-2.2.29/policy/modules/services/ftp.te	2006-04-08 10:26:14.000000000 -0400
+@@ -62,6 +62,7 @@
+ files_pid_filetrans(ftpd_t,ftpd_var_run_t,file)
+ 
+ # Create and modify /var/log/xferlog.
++allow ftpd_t xferlog_t:dir search_dir_perms;
+ allow ftpd_t xferlog_t:file create_file_perms;
+ logging_log_filetrans(ftpd_t,xferlog_t,file)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.29/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2006-03-30 10:59:02.000000000 -0500
 +++ serefpolicy-2.2.29/policy/modules/services/hal.te	2006-04-03 17:43:25.000000000 -0400
@@ -569,6 +580,17 @@
  ')
  
  optional_policy(`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-2.2.29/policy/modules/services/mysql.te
+--- nsaserefpolicy/policy/modules/services/mysql.te	2006-03-24 11:09:13.000000000 -0500
++++ serefpolicy-2.2.29/policy/modules/services/mysql.te	2006-04-08 11:18:50.000000000 -0400
+@@ -104,6 +104,7 @@
+ 
+ miscfiles_read_localization(mysqld_t)
+ 
++sysnet_use_ldap(mysqld_t)
+ sysnet_read_config(mysqld_t)
+ 
+ userdom_dontaudit_use_unpriv_user_fds(mysqld_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.29/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2006-03-24 11:09:15.000000000 -0500
 +++ serefpolicy-2.2.29/policy/modules/services/networkmanager.te	2006-04-03 12:24:37.000000000 -0400
@@ -607,6 +629,34 @@
 +	allow $1 nscd_t:process signal;
 +')
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-2.2.29/policy/modules/services/rsync.te
+--- nsaserefpolicy/policy/modules/services/rsync.te	2006-03-24 11:09:14.000000000 -0500
++++ serefpolicy-2.2.29/policy/modules/services/rsync.te	2006-04-08 10:31:40.000000000 -0400
+@@ -50,6 +50,8 @@
+ allow rsync_t rsync_var_run_t:dir rw_dir_perms;
+ files_pid_filetrans(rsync_t,rsync_var_run_t,file)
+ 
++init_dontaudit_use_fds(rsync_t)
++
+ kernel_read_kernel_sysctls(rsync_t)
+ kernel_read_system_state(rsync_t)
+ kernel_read_network_state(rsync_t)
+@@ -65,6 +67,7 @@
+ corenet_non_ipsec_sendrecv(rsync_t)
+ corenet_tcp_bind_all_nodes(rsync_t)
+ corenet_udp_bind_all_nodes(rsync_t)
++corenet_tcp_bind_rsync_port(rsync_t)
+ 
+ dev_read_urand(rsync_t)
+ 
+@@ -77,6 +80,7 @@
+ libs_use_shared_libs(rsync_t)
+ 
+ logging_send_syslog_msg(rsync_t)
++logging_dontaudit_search_logs(rsync_t)
+ 
+ miscfiles_read_localization(rsync_t)
+ miscfiles_read_public_files(rsync_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.29/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2006-03-24 11:09:15.000000000 -0500
 +++ serefpolicy-2.2.29/policy/modules/services/samba.te	2006-04-03 14:24:40.000000000 -0400
@@ -906,14 +956,16 @@
  	optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.29/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-03-28 12:58:49.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/system/userdomain.te	2006-03-31 11:21:52.000000000 -0500
-@@ -179,10 +179,10 @@
++++ serefpolicy-2.2.29/policy/modules/system/userdomain.te	2006-04-10 16:46:24.000000000 -0400
+@@ -179,10 +179,12 @@
  		mls_file_downgrade(secadm_t)
  		init_exec(secadm_t)
  		logging_read_audit_log(secadm_t)
 -		logging_domtrans_auditctl(secadm_t)
 +		logging_run_auditctl(secadm_t,secadm_r,admin_terminal)
  		userdom_dontaudit_append_staff_home_content_files(secadm_t)
++		auth_relabel_all_files_except_shadow(secadm_t)
++		auth_relabel_shadow(secadm_t)
  	', `
 -		logging_domtrans_auditctl(sysadm_t)
 +		logging_run_auditctl(sysadm_t,sysadm_r,admin_terminal)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- selinux-policy.spec	10 Apr 2006 12:15:07 -0000	1.169
+++ selinux-policy.spec	10 Apr 2006 21:10:33 -0000	1.170
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.29
-Release: 5
+Release: 6
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -324,6 +324,12 @@
 %endif
 
 %changelog
+* Mon Apr 10 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-6
+- Allow secadm_t ability to relabel all files
+- Allow ftp to search xferlog_t directories
+- Allow mysql to communicate with ldap
+- Allow rsync to bind to rsync_port_t
+
 * Mon Apr 10 2006 Russell Coker <rcoker at redhat.com> 2.2.29-5
 - Fixed mailman with Postfix #183928
 - Allowed semanage to create file_context files.



From fedora-cvs-commits at redhat.com  Mon Apr 10 21:17:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 17:17:57 -0400
Subject: rpms/gnome-applets/devel gnome-applets-2.14.1-cpufreq.patch, 1.1,
	1.2
Message-ID: <200604102117.k3ALHvpa014789@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-applets-2.14.1-cpufreq.patch 
Log Message:
fix patch


gnome-applets-2.14.1-cpufreq.patch:
 cpufreq-applet.c |    2 ++
 cpufreq-popup.c  |    9 +--------
 2 files changed, 3 insertions(+), 8 deletions(-)

Index: gnome-applets-2.14.1-cpufreq.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets-2.14.1-cpufreq.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-applets-2.14.1-cpufreq.patch	10 Apr 2006 20:58:02 -0000	1.1
+++ gnome-applets-2.14.1-cpufreq.patch	10 Apr 2006 21:17:53 -0000	1.2
@@ -1,5 +1,5 @@
---- gnome-applets-2.14.1/cpufreq/src/cpufreq-applet.c.cpufreq	2006-04-10 15:12:40.000000000 -0400
-+++ gnome-applets-2.14.1/cpufreq/src/cpufreq-applet.c	2006-04-10 15:12:53.000000000 -0400
+--- gnome-applets-2.14.1/cpufreq/src/cpufreq-applet.c.cpufreq	2005-12-12 06:43:27.000000000 -0500
++++ gnome-applets-2.14.1/cpufreq/src/cpufreq-applet.c	2006-04-10 17:15:54.000000000 -0400
 @@ -272,6 +272,8 @@
          if (!path)
                  return FALSE;
@@ -9,9 +9,9 @@
          if (geteuid () == 0)
                  return TRUE;
  
---- gnome-applets-2.14.1/cpufreq/src/cpufreq-popup.c.cpufreq	2006-04-10 15:13:54.000000000 -0400
-+++ gnome-applets-2.14.1/cpufreq/src/cpufreq-popup.c	2006-04-10 15:14:41.000000000 -0400
-@@ -142,17 +142,11 @@
+--- gnome-applets-2.14.1/cpufreq/src/cpufreq-popup.c.cpufreq	2006-04-10 04:12:48.000000000 -0400
++++ gnome-applets-2.14.1/cpufreq/src/cpufreq-popup.c	2006-04-10 17:17:26.000000000 -0400
+@@ -142,22 +142,15 @@
  cpufreq_popup_set_governor (GtkWidget *widget, gpointer gdata)
  {
  	gchar *governor;
@@ -26,7 +26,12 @@
 -		return;
 -
 -	command = g_strdup_printf ("%s -g %s", path, governor);
-+	command = g_strdup_printf ("/usr/bin/cpufreq-selector -g %s", path, governor);
++	command = g_strdup_printf ("/usr/bin/cpufreq-selector -g %s", governor);
  
  	g_spawn_command_line_async (command, NULL); /* TODO: error */
  
+ 	g_free (command);
+-	g_free (path);
+ }
+ 
+ static void



From fedora-cvs-commits at redhat.com  Mon Apr 10 21:31:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 17:31:14 -0400
Subject: rpms/gcc/devel gcc41-gomp-static.patch, NONE,
	1.1 gcc41-pr22375.patch, NONE, 1.1 gcc41-pr24685.patch, NONE,
	1.1 gcc41-rh183212.patch, NONE, 1.1 .cvsignore, 1.142,
	1.143 gcc41.spec, 1.47, 1.48 sources, 1.144,
	1.145 gcc41-pr27057.patch, 1.1, NONE
Message-ID: <200604102131.k3ALVEvI015011@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	.cvsignore gcc41.spec sources 
Added Files:
	gcc41-gomp-static.patch gcc41-pr22375.patch 
	gcc41-pr24685.patch gcc41-rh183212.patch 
Removed Files:
	gcc41-pr27057.patch 
Log Message:
4.1.0-7


gcc41-gomp-static.patch:
 gcc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gcc41-gomp-static.patch ---
Hi!

As reported in http://www.openmp.org/pipermail/omp/2006/000435.html
-static -fopenmp doesn't work, as -lgomp -lrt (in Linux case) comes
before the user objects.  Say gcc -static -fopenmp -v -o a a.c results in:
/usr/libexec/gcc/x86_64-redhat-linux/4.1.0/collect2 -m elf_x86_64 -static \
-o a /usr/lib/gcc/x86_64-redhat-linux/4.1.0/../../../../lib64/crt1.o \
/usr/lib/gcc/x86_64-redhat-linux/4.1.0/../../../../lib64/crti.o \
/usr/lib/gcc/x86_64-redhat-linux/4.1.0/crtbeginT.o -lgomp -lrt \
-L/usr/lib/gcc/x86_64-redhat-linux/4.1.0 -L/usr/lib/gcc/x86_64-redhat-linux/4.1.0 \
-L/usr/lib/gcc/x86_64-redhat-linux/4.1.0/../../../../lib64 -L/lib/../lib64 \
-L/usr/lib/../lib64 /tmp/cckutU0e.o --start-group -lgcc -lgcc_eh -lpthread \
-lc --end-group /usr/lib/gcc/x86_64-redhat-linux/4.1.0/crtend.o \
/usr/lib/gcc/x86_64-redhat-linux/4.1.0/../../../../lib64/crtn.o
(that's on redhat/gcc-4_1-branch, but trunk behaves exactly the same).
The following patch moves %(link_gomp) later into LINK_COMMAND_SPEC,
so in the above example -lgomp -lrt comes in between /tmp/cckutU0e.o
and --start-group.  Ok for trunk?

2006-04-10  Jakub Jelinek  <jakub at redhat.com>

	* gcc.c (LINK_COMMAND_SPEC): Move link_gomp after %o.

--- gcc/gcc.c.jj	2006-01-31 13:52:32.000000000 +0100
+++ gcc/gcc.c	2006-04-10 13:36:15.000000000 +0200
@@ -698,8 +698,8 @@ proper position among the other output f
 %{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\
     %(linker) %l " LINK_PIE_SPEC "%X %{o*} %{A} %{d} %{e*} %{m} %{N} %{n} %{r}\
     %{s} %{t} %{u*} %{x} %{z} %{Z} %{!A:%{!nostdlib:%{!nostartfiles:%S}}}\
-    %{static:} %{L*} %(mfwrap) %{fopenmp:%:include(libgomp.spec)%(link_gomp)}\
-    %(link_libgcc) %o %(mflib)\
+    %{static:} %{L*} %(mfwrap) %(link_libgcc) %o\
+    %{fopenmp:%:include(libgomp.spec)%(link_gomp)} %(mflib)\
     %{fprofile-arcs|fprofile-generate|coverage:-lgcov}\
     %{!nostdlib:%{!nodefaultlibs:%(link_ssp) %(link_gcc_c_sequence)}}\
     %{!A:%{!nostdlib:%{!nostartfiles:%E}}} %{T*} }}}}}}"

	Jakub

gcc41-pr22375.patch:
 0 files changed

--- NEW FILE gcc41-pr22375.patch ---
2006-03-30  Roger Sayle  <roger at eyesopen.com>

	PR middle-end/22375
	* trans.c (gfc_trans_runtime_check): Promote the arguments of
	__builtin_expect to the correct types, and the result back to
	boolean_type_node.

--- gcc/fortran/trans.c	(revision 112546)
+++ gcc/fortran/trans.c	(revision 112547)
@@ -375,9 +375,11 @@ gfc_trans_runtime_check (tree cond, tree
   else
     {
       /* Tell the compiler that this isn't likely.  */
+      cond = fold_convert (long_integer_type_node, cond);
       tmp = gfc_chainon_list (NULL_TREE, cond);
-      tmp = gfc_chainon_list (tmp, integer_zero_node);
+      tmp = gfc_chainon_list (tmp, build_int_cst (long_integer_type_node, 0));
       cond = gfc_build_function_call (built_in_decls[BUILT_IN_EXPECT], tmp);
+      cond = fold_convert (boolean_type_node, cond);
 
       tmp = build3_v (COND_EXPR, cond, body, build_empty_stmt ());
       gfc_add_expr_to_block (pblock, tmp);

gcc41-pr24685.patch:
 write.c |   38 ++++++++++++++++++++++++--------------
 1 files changed, 24 insertions(+), 14 deletions(-)

--- NEW FILE gcc41-pr24685.patch ---
2006-04-07  Jakub Jelinek  <jakub at redhat.com>

	PR libgfortran/24685
	* io/write.c (MIN_FIELD_WIDTH, STR, STR1): Define.
	(output_float): Increase buffer sizes for IEEE quad and IBM extended
	long double.
	(write_real): Output REAL(16) as 1PG43.34E4 rather than 1PG40.31E4.

--- libgfortran/io/write.c.jj	2006-02-14 10:55:02.000000000 -0500
+++ libgfortran/io/write.c	2006-04-07 09:12:46.000000000 -0400
@@ -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.
    Contributed by Andy Vaught
    Namelist output contibuted by Paul Thomas
 
@@ -376,8 +376,15 @@ calculate_G_format (st_parameter_dt *dtp
 static void
 output_float (st_parameter_dt *dtp, const fnode *f, GFC_REAL_LARGEST value)
 {
+#if defined(HAVE_GFC_REAL_16) && __LDBL_DIG__ > 18
+# define MIN_FIELD_WIDTH 46
+#else
+# define MIN_FIELD_WIDTH 31
+#endif
+#define STR(x) STR1(x)
+#define STR1(x) #x
   /* This must be large enough to accurately hold any value.  */
-  char buffer[32];
+  char buffer[MIN_FIELD_WIDTH+1];
   char *out;
   char *digits;
   int e;
@@ -413,8 +420,8 @@ output_float (st_parameter_dt *dtp, cons
     internal_error (&dtp->common, "Unspecified precision");
 
   /* Use sprintf to print the number in the format +D.DDDDe+ddd
-     For an N digit exponent, this gives us (32-6)-N digits after the
-     decimal point, plus another one before the decimal point.  */
+     For an N digit exponent, this gives us (MIN_FIELD_WIDTH-5)-N digits
+     after the decimal point, plus another one before the decimal point.  */
   sign = calculate_sign (dtp, value < 0.0);
   if (value < 0)
     value = -value;
@@ -439,7 +446,7 @@ output_float (st_parameter_dt *dtp, cons
       || ((ft == FMT_D || ft == FMT_E) && dtp->u.p.scale_factor != 0))
     {
       /* Always convert at full precision to avoid double rounding.  */
-      ndigits = 27 - edigits;
+      ndigits = MIN_FIELD_WIDTH - 4 - edigits;
     }
   else
     {
@@ -449,8 +456,8 @@ output_float (st_parameter_dt *dtp, cons
 	ndigits = d + 1;
       else
 	ndigits = d;
-      if (ndigits > 27 - edigits)
-	ndigits = 27 - edigits;
+      if (ndigits > MIN_FIELD_WIDTH - 4 - edigits)
+	ndigits = MIN_FIELD_WIDTH - 4 - edigits;
     }
 
   /* #   The result will always contain a decimal point, even if no
@@ -460,7 +467,7 @@ output_float (st_parameter_dt *dtp, cons
    *
    * +   A sign (+ or -) always be placed before a number
    *
-   * 31  minimum field width
+   * MIN_FIELD_WIDTH  minimum field width
    *
    * *   (ndigits-1) is used as the precision
    *
@@ -469,8 +476,8 @@ output_float (st_parameter_dt *dtp, cons
    *   equal to the precision. The exponent always contains at least two
    *   digits; if the value is zero, the exponent is 00.
    */
-  sprintf (buffer, "%+-#31.*" GFC_REAL_LARGEST_FORMAT "e",
-           ndigits - 1, value);
+  sprintf (buffer, "%+-#" STR(MIN_FIELD_WIDTH) ".*"
+	   GFC_REAL_LARGEST_FORMAT "e", ndigits - 1, value);
 
   /* Check the resulting string has punctuation in the correct places.  */
   if (buffer[2] != '.' || buffer[ndigits + 2] != 'e')
@@ -777,7 +784,7 @@ output_float (st_parameter_dt *dtp, cons
 	  edigits--;
 	}
 #if HAVE_SNPRINTF
-      snprintf (buffer, 32, "%+0*d", edigits, e);
+      snprintf (buffer, sizeof (buffer), "%+0*d", edigits, e);
 #else
       sprintf (buffer, "%+0*d", edigits, e);
 #endif
@@ -790,6 +797,9 @@ output_float (st_parameter_dt *dtp, cons
       memset( out , ' ' , nblanks );
       dtp->u.p.no_leading_blank = 0;
     }
+#undef STR
+#undef STR1
+#undef MIN_FIELD_WIDTH
 }
 
 
@@ -1352,7 +1362,7 @@ write_character (st_parameter_dt *dtp, c
 
 /* Output a real number with default format.
    This is 1PG14.7E2 for REAL(4), 1PG23.15E3 for REAL(8),
-   1PG24.15E4 for REAL(10) and 1PG40.31E4 for REAL(16).  */
+   1PG28.19E4 for REAL(10) and 1PG43.34E4 for REAL(16).  */
 
 static void
 write_real (st_parameter_dt *dtp, const char *source, int length)
@@ -1379,8 +1389,8 @@ write_real (st_parameter_dt *dtp, const 
       f.u.real.e = 4;
       break;
     case 16:
-      f.u.real.w = 40;
-      f.u.real.d = 31;
+      f.u.real.w = 43;
+      f.u.real.d = 34;
       f.u.real.e = 4;
       break;
     default:

gcc41-rh183212.patch:
 StackTraceElement.java |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gcc41-rh183212.patch ---
2006-04-08  Mark Wielaard  <mark at klomp.org>

	PR 27081
	* java/lang/StackTraceElement.java (toString): Don't add space
	between type and source indicator.

--- libjava/classpath/java/lang/StackTraceElement.java	26 Nov 2005 22:21:26 -0000	1.8
+++ libjava/classpath/java/lang/StackTraceElement.java	8 Apr 2006 11:02:12 -0000	1.9
@@ -211,7 +211,7 @@
       }
     if (methodName != null)
       sb.append(methodName);
-    sb.append(" (");
+    sb.append("(");
     if (fileName != null)
       sb.append(fileName);
     else


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- .cvsignore	6 Apr 2006 16:56:54 -0000	1.142
+++ .cvsignore	10 Apr 2006 21:30:11 -0000	1.143
@@ -1 +1 @@
-gcc-4.1.0-20060406.tar.bz2
+gcc-4.1.0-20060410.tar.bz2


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- gcc41.spec	6 Apr 2006 16:56:54 -0000	1.47
+++ gcc41.spec	10 Apr 2006 21:30:22 -0000	1.48
@@ -1,6 +1,6 @@
-%define DATE 20060406
+%define DATE 20060410
 %define gcc_version 4.1.0
-%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
@@ -113,7 +113,10 @@
 Patch16: gcc41-pr20297-test.patch
 Patch17: gcc41-java-pr13212.patch
 Patch18: gcc41-objc-rh185398.patch
-Patch19: gcc41-pr27057.patch
+Patch19: gcc41-gomp-static.patch
+Patch20: gcc41-pr22375.patch
+Patch21: gcc41-pr24685.patch
+Patch22: gcc41-rh183212.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -411,7 +414,10 @@
 %patch16 -p0 -E -b .pr20297-test~
 %patch17 -p0 -b .java-pr13212~
 %patch18 -p0 -b .objc-rh185398~
-%patch19 -p0 -b .pr27057~
+%patch19 -p0 -b .gomp-static~
+%patch20 -p0 -b .pr22375~
+%patch21 -p0 -b .pr24685~
+%patch22 -p0 -b .rh183212~
 
 sed -i -e 's/4\.1\.1/4.1.0/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1429,13 +1435,24 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Mon Apr 10 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-7
+- update from gcc-4_1-branch (-r112727:112825)
+  - PRs fortran/19101, fortran/25031, fortran/26779, fortran/26891,
+	fortran/26976, target/26508, tree-optimization/26919
+- fix libgfortran printing of REAL*16 for IEEE quad and IBM extended formats
+  (PR libgfortran/24685)
+- fix Fortran -fbounds-check (Roger Sayle, #188409, PR middle-end/22375)
+- fix Java StackTraceElement.toString() (Mark Wielaard, #183212,
+  PR classpath/27081)
+- fix -fopenmp -static
+
 * Thu Apr  6 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-6
-- update from gcc-4_1-branch (-r)
+- update from gcc-4_1-branch (-r112706:112727)
   - PRs classpath/24752, classpath/27028, libgcj/26625, libgcj/27024,
 	tree-optimization/26996
 - reenable PR c++/19238, c++/21764 fixes, only PR c++/21581 is not
   applied
-- better fix for Java GC vs. pthread_create (Bryce McKinlay, #,
+- better fix for Java GC vs. pthread_create (Bryce McKinlay, #182263,
   PR libgcj/13212)
 - fix objc_push_parm (#185398)
 - fix ICE with -feliminate-dwarf2-dups and using namespace (#187787,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- sources	6 Apr 2006 16:56:54 -0000	1.144
+++ sources	10 Apr 2006 21:30:22 -0000	1.145
@@ -1 +1 @@
-4a823d2ae3352d0bf18d1f25880a6ec0  gcc-4.1.0-20060406.tar.bz2
+56f6a8fc0e1e97ff5f73df39ec08726b  gcc-4.1.0-20060410.tar.bz2


--- gcc41-pr27057.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 10 21:40:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 17:40:15 -0400
Subject: rpms/gnome-applets/FC-5 gnome-applets-2.14.1-cpufreq.patch,1.1,1.2
Message-ID: <200604102140.k3ALeFnD015176@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-applets-2.14.1-cpufreq.patch 
Log Message:
fix patch


gnome-applets-2.14.1-cpufreq.patch:
 cpufreq-applet.c |    2 ++
 cpufreq-popup.c  |    9 +--------
 2 files changed, 3 insertions(+), 8 deletions(-)

Index: gnome-applets-2.14.1-cpufreq.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/FC-5/gnome-applets-2.14.1-cpufreq.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-applets-2.14.1-cpufreq.patch	10 Apr 2006 21:05:28 -0000	1.1
+++ gnome-applets-2.14.1-cpufreq.patch	10 Apr 2006 21:39:48 -0000	1.2
@@ -1,5 +1,5 @@
---- gnome-applets-2.14.1/cpufreq/src/cpufreq-applet.c.cpufreq	2006-04-10 15:12:40.000000000 -0400
-+++ gnome-applets-2.14.1/cpufreq/src/cpufreq-applet.c	2006-04-10 15:12:53.000000000 -0400
+--- gnome-applets-2.14.1/cpufreq/src/cpufreq-applet.c.cpufreq	2005-12-12 06:43:27.000000000 -0500
++++ gnome-applets-2.14.1/cpufreq/src/cpufreq-applet.c	2006-04-10 17:15:54.000000000 -0400
 @@ -272,6 +272,8 @@
          if (!path)
                  return FALSE;
@@ -9,9 +9,9 @@
          if (geteuid () == 0)
                  return TRUE;
  
---- gnome-applets-2.14.1/cpufreq/src/cpufreq-popup.c.cpufreq	2006-04-10 15:13:54.000000000 -0400
-+++ gnome-applets-2.14.1/cpufreq/src/cpufreq-popup.c	2006-04-10 15:14:41.000000000 -0400
-@@ -142,17 +142,11 @@
+--- gnome-applets-2.14.1/cpufreq/src/cpufreq-popup.c.cpufreq	2006-04-10 04:12:48.000000000 -0400
++++ gnome-applets-2.14.1/cpufreq/src/cpufreq-popup.c	2006-04-10 17:17:26.000000000 -0400
+@@ -142,22 +142,15 @@
  cpufreq_popup_set_governor (GtkWidget *widget, gpointer gdata)
  {
  	gchar *governor;
@@ -26,7 +26,12 @@
 -		return;
 -
 -	command = g_strdup_printf ("%s -g %s", path, governor);
-+	command = g_strdup_printf ("/usr/bin/cpufreq-selector -g %s", path, governor);
++	command = g_strdup_printf ("/usr/bin/cpufreq-selector -g %s", governor);
  
  	g_spawn_command_line_async (command, NULL); /* TODO: error */
  
+ 	g_free (command);
+-	g_free (path);
+ }
+ 
+ static void



From fedora-cvs-commits at redhat.com  Mon Apr 10 21:46:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 17:46:27 -0400
Subject: rpms/gedit/devel .cvsignore, 1.38, 1.39 gedit.spec, 1.78,
	1.79 sources, 1.40, 1.41
Message-ID: <200604102146.k3ALkR7D018969@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17030

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.14.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	16 Mar 2006 16:08:04 -0000	1.38
+++ .cvsignore	10 Apr 2006 21:46:24 -0000	1.39
@@ -13,3 +13,4 @@
 gedit-2.13.92.tar.bz2
 gedit-2.14.0.tar.bz2
 gedit-2.14.1.tar.bz2
+gedit-2.14.2.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- gedit.spec	16 Mar 2006 16:08:04 -0000	1.78
+++ gedit.spec	10 Apr 2006 21:46:24 -0000	1.79
@@ -16,8 +16,8 @@
 
 Summary:	gEdit is a small but powerful text editor for GNOME.
 Name:		gedit
-Version: 	2.14.1
-Release: 	1	
+Version: 	2.14.2
+Release: 	2	
 Epoch:		1
 License:	GPL
 Group:		Applications/Editors
@@ -158,6 +158,9 @@
 %{_libdir}/pkgconfig/gedit-2.14.pc
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> 2.14.2-2
+- Update to 2.14.2
+
 * Thu Mar 16 2006 Matthias Clasen <mclasen at redhat.com> 2.14.1-1
 - Update to 2.14.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	16 Mar 2006 16:08:04 -0000	1.40
+++ sources	10 Apr 2006 21:46:24 -0000	1.41
@@ -1 +1 @@
-b51974a4bcaad0b14644c9f5a22f13f2  gedit-2.14.1.tar.bz2
+35d146a924fd426d448048e8db383334  gedit-2.14.2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 21:48:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 17:48:14 -0400
Subject: rpms/gnome-applets/FC-5 sources,1.38,1.39
Message-ID: <200604102148.k3ALmER6029316@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	sources 
Log Message:
update



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/FC-5/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	12 Mar 2006 17:59:31 -0000	1.38
+++ sources	10 Apr 2006 21:48:12 -0000	1.39
@@ -1,2 +1,2 @@
 ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2
-0c7789d642003f38c86d02a3384d3350  gnome-applets-2.14.0.tar.bz2
+1b5e834450812a6a3e7ab00652587ef4  gnome-applets-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 21:51:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 17:51:59 -0400
Subject: rpms/mesa/devel mesa-6.5-noexecstack.patch, NONE, 1.1 mesa.spec,
	1.54, 1.55
Message-ID: <200604102151.k3ALpxcp029421@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	mesa.spec 
Added Files:
	mesa-6.5-noexecstack.patch 
Log Message:
* Mon Apr 10 2006 Kristian H??gsberg <krh at redhat.com> 6.5-3
- Add mesa-6.5-noexecstack.patch to prevent assembly files from making
  libGL.so have executable stack.


mesa-6.5-noexecstack.patch:
 drivers/dri/r200/r200_vtxtmp_x86.S     |    4 ++++
 drivers/dri/radeon/radeon_vtxtmp_x86.S |    4 ++++
 tnl/t_vtx_x86_gcc.S                    |    4 ++++
 x86-64/glapi_x86-64.S                  |    4 ++++
 x86-64/xform4.S                        |    4 ++++
 x86/3dnow_normal.S                     |    4 ++++
 x86/3dnow_xform1.S                     |    4 ++++
 x86/3dnow_xform2.S                     |    4 ++++
 x86/3dnow_xform3.S                     |    4 ++++
 x86/3dnow_xform4.S                     |    4 ++++
 x86/common_x86_asm.S                   |    4 ++++
 x86/glapi_x86.S                        |    4 ++++
 x86/mmx_blend.S                        |    4 ++++
 x86/read_rgba_span_x86.S               |    4 ++++
 x86/sse_normal.S                       |    4 ++++
 x86/sse_xform1.S                       |    4 ++++
 x86/sse_xform2.S                       |    4 ++++
 x86/sse_xform3.S                       |    4 ++++
 x86/sse_xform4.S                       |    4 ++++
 x86/x86_cliptest.S                     |    4 ++++
 x86/x86_xform2.S                       |    4 ++++
 x86/x86_xform3.S                       |    4 ++++
 x86/x86_xform4.S                       |    4 ++++
 23 files changed, 92 insertions(+)

--- NEW FILE mesa-6.5-noexecstack.patch ---
Index: src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S,v
retrieving revision 1.5
diff -u -p -r1.5 r200_vtxtmp_x86.S
--- src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S	2 Jun 2004 22:09:11 -0000	1.5
+++ src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S	10 Apr 2006 21:48:16 -0000
@@ -493,3 +493,7 @@ GLOBL( _sse_MultiTexCoord2f_2 )
 	ret
 GLOBL( _sse_MultiTexCoord2f_2_end )
 #endif
+
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/drivers/dri/radeon/radeon_vtxtmp_x86.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/radeon/radeon_vtxtmp_x86.S,v
retrieving revision 1.3
diff -u -p -r1.3 radeon_vtxtmp_x86.S
--- src/mesa/drivers/dri/radeon/radeon_vtxtmp_x86.S	13 Oct 2005 14:30:20 -0000	1.3
+++ src/mesa/drivers/dri/radeon/radeon_vtxtmp_x86.S	10 Apr 2006 21:48:16 -0000
@@ -492,3 +492,7 @@ GLOBL( _sse_MultiTexCoord2f_2 )
 	ret
 GLOBL( _sse_MultiTexCoord2f_2_end )
 #endif
+
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/tnl/t_vtx_x86_gcc.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/tnl/t_vtx_x86_gcc.S,v
retrieving revision 1.13
diff -u -p -r1.13 t_vtx_x86_gcc.S
--- src/mesa/tnl/t_vtx_x86_gcc.S	17 Sep 2004 05:10:33 -0000	1.13
+++ src/mesa/tnl/t_vtx_x86_gcc.S	10 Apr 2006 21:48:19 -0000
@@ -555,3 +555,7 @@ GLOBL( _tnl_x86_dispatch_vertexattribfv 
 	ret	$8		/* return */
 GLOBL( _tnl_x86_dispatch_vertexattribfv_end )
 #endif /* defined (STDCALL_API) */
+
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/3dnow_normal.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/3dnow_normal.S,v
retrieving revision 1.9
diff -u -p -r1.9 3dnow_normal.S
--- src/mesa/x86/3dnow_normal.S	4 Jan 2005 14:33:47 -0000	1.9
+++ src/mesa/x86/3dnow_normal.S	10 Apr 2006 21:48:20 -0000
@@ -846,3 +846,7 @@ LLBL (G3R_end):
     RET
 
 #endif
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/3dnow_xform1.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/3dnow_xform1.S,v
retrieving revision 1.3
diff -u -p -r1.3 3dnow_xform1.S
--- src/mesa/x86/3dnow_xform1.S	4 Jan 2005 14:33:47 -0000	1.3
+++ src/mesa/x86/3dnow_xform1.S	10 Apr 2006 21:48:20 -0000
@@ -431,3 +431,7 @@ LLBL( G3TP3R_3 ):
     RET
 
 #endif
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/3dnow_xform2.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/3dnow_xform2.S,v
retrieving revision 1.3
diff -u -p -r1.3 3dnow_xform2.S
--- src/mesa/x86/3dnow_xform2.S	4 Jan 2005 14:33:47 -0000	1.3
+++ src/mesa/x86/3dnow_xform2.S	10 Apr 2006 21:48:20 -0000
@@ -471,3 +471,7 @@ LLBL( G3TPIR_4 ):
     POP_L     ( ESI )
     RET
 #endif
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/3dnow_xform3.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/3dnow_xform3.S,v
retrieving revision 1.4
diff -u -p -r1.4 3dnow_xform3.S
--- src/mesa/x86/3dnow_xform3.S	4 Jan 2005 14:33:47 -0000	1.4
+++ src/mesa/x86/3dnow_xform3.S	10 Apr 2006 21:48:20 -0000
@@ -555,3 +555,7 @@ LLBL( G3TPIR_2 ):
     POP_L     ( ESI )
     RET
 #endif
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/3dnow_xform4.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/3dnow_xform4.S,v
retrieving revision 1.4
diff -u -p -r1.4 3dnow_xform4.S
--- src/mesa/x86/3dnow_xform4.S	4 Jan 2005 14:33:47 -0000	1.4
+++ src/mesa/x86/3dnow_xform4.S	10 Apr 2006 21:48:20 -0000
@@ -564,3 +564,7 @@ LLBL( G3TPIR_2 ):
     POP_L     ( ESI )
     RET
 #endif
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/common_x86_asm.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/common_x86_asm.S,v
retrieving revision 1.19
diff -u -p -r1.19 common_x86_asm.S
--- src/mesa/x86/common_x86_asm.S	4 Jan 2005 14:33:47 -0000	1.19
+++ src/mesa/x86/common_x86_asm.S	10 Apr 2006 21:48:20 -0000
@@ -213,3 +213,7 @@ GLNAME( _mesa_test_os_sse_exception_supp
 
 #endif
 
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/glapi_x86.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/glapi_x86.S,v
retrieving revision 1.59
diff -u -p -r1.59 glapi_x86.S
--- src/mesa/x86/glapi_x86.S	1 Mar 2006 02:07:50 -0000	1.59
+++ src/mesa/x86/glapi_x86.S	10 Apr 2006 21:48:21 -0000
@@ -1156,3 +1156,7 @@ GLNAME(gl_dispatch_functions_end):
 	.long	2,4,20    /* Minimum kernel version w/TLS */
 3:	.p2align 2        /* pad out section */
 #endif /* GLX_USE_TLS */
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/mmx_blend.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/mmx_blend.S,v
retrieving revision 1.18
diff -u -p -r1.18 mmx_blend.S
--- src/mesa/x86/mmx_blend.S	26 Apr 2004 10:10:25 -0000	1.18
+++ src/mesa/x86/mmx_blend.S	10 Apr 2006 21:48:21 -0000
@@ -364,3 +364,7 @@ TWO(MOVQ       ( MM1, REGIND(rgba) ))
 #include "mmx_blendtmp.h"
 
 #endif
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/read_rgba_span_x86.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/read_rgba_span_x86.S,v
retrieving revision 1.5
diff -u -p -r1.5 read_rgba_span_x86.S
--- src/mesa/x86/read_rgba_span_x86.S	30 Jun 2005 11:42:56 -0000	1.5
+++ src/mesa/x86/read_rgba_span_x86.S	10 Apr 2006 21:48:21 -0000
@@ -687,3 +687,7 @@ _generic_read_RGBA_span_RGB565_MMX:
 #endif
 	ret
 #endif /* !defined(__DJGPP__) && !defined(__MINGW32__) */
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/sse_normal.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/sse_normal.S,v
retrieving revision 1.5
diff -u -p -r1.5 sse_normal.S
--- src/mesa/x86/sse_normal.S	4 Jan 2005 14:33:47 -0000	1.5
+++ src/mesa/x86/sse_normal.S	10 Apr 2006 21:48:21 -0000
@@ -255,3 +255,7 @@ LLBL(K_G3TNNRR_finish):
 	RET
 #undef FRAME_OFFSET
 #endif
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/sse_xform1.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/sse_xform1.S,v
retrieving revision 1.3
diff -u -p -r1.3 sse_xform1.S
--- src/mesa/x86/sse_xform1.S	4 Jan 2005 14:33:47 -0000	1.3
+++ src/mesa/x86/sse_xform1.S	10 Apr 2006 21:48:22 -0000
@@ -440,3 +440,7 @@ LLBL(K_GTP13P3DR_finish):
 	RET
 #undef FRAME_OFFSET
 #endif
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/sse_xform2.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/sse_xform2.S,v
retrieving revision 1.3
diff -u -p -r1.3 sse_xform2.S
--- src/mesa/x86/sse_xform2.S	4 Jan 2005 14:33:47 -0000	1.3
+++ src/mesa/x86/sse_xform2.S	10 Apr 2006 21:48:22 -0000
@@ -459,3 +459,7 @@ LLBL(K_GTP23P3DR_finish):
 	RET
 #undef FRAME_OFFSET
 #endif
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/sse_xform3.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/sse_xform3.S,v
retrieving revision 1.3
diff -u -p -r1.3 sse_xform3.S
--- src/mesa/x86/sse_xform3.S	4 Jan 2005 14:33:47 -0000	1.3
+++ src/mesa/x86/sse_xform3.S	10 Apr 2006 21:48:22 -0000
@@ -505,3 +505,7 @@ LLBL(K_GTP3P3DR_finish):
 	RET
 #undef FRAME_OFFSET
 #endif
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/sse_xform4.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/sse_xform4.S,v
retrieving revision 1.3
diff -u -p -r1.3 sse_xform4.S
--- src/mesa/x86/sse_xform4.S	4 Jan 2005 14:33:47 -0000	1.3
+++ src/mesa/x86/sse_xform4.S	10 Apr 2006 21:48:22 -0000
@@ -229,3 +229,7 @@ LLBL( sse_identity_done ):
 	POP_L( ESI )
 	RET
 #endif
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/x86_cliptest.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/x86_cliptest.S,v
retrieving revision 1.11
diff -u -p -r1.11 x86_cliptest.S
--- src/mesa/x86/x86_cliptest.S	4 Jan 2005 14:33:47 -0000	1.11
+++ src/mesa/x86/x86_cliptest.S	10 Apr 2006 21:48:22 -0000
@@ -401,3 +401,7 @@ LLBL(ctp4_np_finish):
 	POP_L( ESI )
 
 	RET
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/x86_xform2.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/x86_xform2.S,v
retrieving revision 1.3
diff -u -p -r1.3 x86_xform2.S
--- src/mesa/x86/x86_xform2.S	4 Jan 2005 14:33:47 -0000	1.3
+++ src/mesa/x86/x86_xform2.S	10 Apr 2006 21:48:22 -0000
@@ -568,3 +568,7 @@ LLBL(x86_p2_ir_done):
 	POP_L( ESI )
 	RET
 #undef FRAME_OFFSET
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/x86_xform3.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/x86_xform3.S,v
retrieving revision 1.3
diff -u -p -r1.3 x86_xform3.S
--- src/mesa/x86/x86_xform3.S	4 Jan 2005 14:33:47 -0000	1.3
+++ src/mesa/x86/x86_xform3.S	10 Apr 2006 21:48:22 -0000
@@ -638,3 +638,7 @@ LLBL(x86_p3_ir_done):
 	POP_L( EDI )
 	POP_L( ESI )
 	RET
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/x86_xform4.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/x86_xform4.S,v
retrieving revision 1.3
diff -u -p -r1.3 x86_xform4.S
--- src/mesa/x86/x86_xform4.S	4 Jan 2005 14:33:47 -0000	1.3
+++ src/mesa/x86/x86_xform4.S	10 Apr 2006 21:48:23 -0000
@@ -671,3 +671,7 @@ LLBL(x86_p4_ir_done):
 	POP_L( EDI )
 	POP_L( ESI )
 	RET
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86-64/glapi_x86-64.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86-64/glapi_x86-64.S,v
retrieving revision 1.8
diff -u -p -r1.8 glapi_x86-64.S
--- src/mesa/x86-64/glapi_x86-64.S	1 Mar 2006 02:07:50 -0000	1.8
+++ src/mesa/x86-64/glapi_x86-64.S	10 Apr 2006 21:48:26 -0000
@@ -31127,3 +31127,7 @@ GL_PREFIX(BlitFramebufferEXT):
 	.long	2,4,20    /* Minimum kernel version w/TLS */
 3:	.p2align 2        /* pad out section */
 #endif /* GLX_USE_TLS */
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86-64/xform4.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86-64/xform4.S,v
retrieving revision 1.1
diff -u -p -r1.1 xform4.S
--- src/mesa/x86-64/xform4.S	7 May 2005 16:59:59 -0000	1.1
+++ src/mesa/x86-64/xform4.S	10 Apr 2006 21:48:27 -0000
@@ -456,3 +456,7 @@ p4_2d_done:
 	ret
 			
 #endif
+	
+#ifdef __ELF__
+	.section .note.GNU-stack,"",%progbits
+#endif


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- mesa.spec	10 Apr 2006 19:05:07 -0000	1.54
+++ mesa.spec	10 Apr 2006 21:51:56 -0000	1.55
@@ -53,7 +53,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -73,6 +73,7 @@
 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
 
 # General patches from upstream go here:
 
@@ -239,6 +240,7 @@
 %patch4 -p0 -b .libGLw-enable-motif-support
 %endif
 %patch5 -p0 -b .drop-static-inline
+%patch6 -p0 -b .noexecstack
 
 # According to Adam, this patch makes metacity's compositing
 # manager noticeably faster, but also may be a little too big of
@@ -430,6 +432,10 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Mon Apr 10 2006 Kristian H??gsberg <krh at redhat.com> 6.5-3
+- Add mesa-6.5-noexecstack.patch to prevent assembly files from making
+  libGL.so have executable stack.
+
 * Mon Apr 10 2006 Kristian H??gsberg <krh at redhat.com> 6.5-2
 - Bump for fc5 build.
 - Bump libdrm requires to 2.0.1.



From fedora-cvs-commits at redhat.com  Mon Apr 10 22:02:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 18:02:54 -0400
Subject: rpms/gedit/FC-5 gedit.spec,1.78,1.79 sources,1.40,1.41
Message-ID: <200604102202.k3AM2smQ029632@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gedit.spec sources 
Log Message:
2.14.2



Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/FC-5/gedit.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- gedit.spec	16 Mar 2006 16:08:04 -0000	1.78
+++ gedit.spec	10 Apr 2006 22:02:47 -0000	1.79
@@ -16,8 +16,8 @@
 
 Summary:	gEdit is a small but powerful text editor for GNOME.
 Name:		gedit
-Version: 	2.14.1
-Release: 	1	
+Version: 	2.14.2
+Release: 	1.fc5.1
 Epoch:		1
 License:	GPL
 Group:		Applications/Editors
@@ -158,6 +158,9 @@
 %{_libdir}/pkgconfig/gedit-2.14.pc
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> 2.14.2-1.fc5.1
+- Update to 2.14.2
+
 * Thu Mar 16 2006 Matthias Clasen <mclasen at redhat.com> 2.14.1-1
 - Update to 2.14.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gedit/FC-5/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	16 Mar 2006 16:08:04 -0000	1.40
+++ sources	10 Apr 2006 22:02:51 -0000	1.41
@@ -1 +1 @@
-b51974a4bcaad0b14644c9f5a22f13f2  gedit-2.14.1.tar.bz2
+35d146a924fd426d448048e8db383334  gedit-2.14.2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 22:08:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 18:08:42 -0400
Subject: rpms/libXcomposite/devel libXcomposite.spec,1.13,1.14
Message-ID: <200604102208.k3AM8g5W029763@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/libXcomposite/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29750

Modified Files:
	libXcomposite.spec 
Log Message:
* Mon Apr 10 2006 Kristian H??gsberg <krh at redhat.com> 0.3-4
- Bump for build in fc5-bling.



Index: libXcomposite.spec
===================================================================
RCS file: /cvs/dist/rpms/libXcomposite/devel/libXcomposite.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXcomposite.spec	7 Apr 2006 15:48:50 -0000	1.13
+++ libXcomposite.spec	10 Apr 2006 22:08:40 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXcomposite runtime library
 Name: libXcomposite
 Version: 0.3
-Release: 3
+Release: 4
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/xcomposite.pc
 
 %changelog
+* Mon Apr 10 2006 Kristian H??gsberg <krh at redhat.com> 0.3-4
+- Bump for build in fc5-bling.
+
 * Fri Apr  7 2006 Adam Jackson <ajackson at redhat.com> 0.3-3
 - Note the necessary -proto-devel version in BuildRequires.
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 22:22:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 18:22:32 -0400
Subject: rpms/kernel/devel linux-2.6-audit-git.patch, NONE,
	1.1.16.1 kernel-2.6.spec, 1.2127, 1.2127.2.1
Message-ID: <200604102222.k3AMMWcN011329@cvs.devel.redhat.com>

Author: sgrubb

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

Modified Files:
      Tag: private-lspp-17-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-lspp-17-branch
	linux-2.6-audit-git.patch 
Log Message:
* Mon Apr 10 2006 Steve Grubb <sgrubb at redhat.com>
- lspp.17



linux-2.6-audit-git.patch:
 arch/i386/kernel/ptrace.c      |    7 
 arch/i386/kernel/vm86.c        |    2 
 arch/ia64/kernel/ptrace.c      |    4 
 arch/mips/kernel/ptrace.c      |    4 
 arch/powerpc/kernel/ptrace.c   |    5 
 arch/s390/kernel/ptrace.c      |    5 
 arch/sparc64/kernel/ptrace.c   |    5 
 arch/um/kernel/ptrace.c        |    6 
 arch/x86_64/kernel/ptrace.c    |    6 
 fs/Kconfig                     |   24 -
 fs/Makefile                    |    1 
 fs/inotify.c                   |  966 +++++++++++------------------------------
 fs/inotify_user.c              |  708 ++++++++++++++++++++++++++++++
 include/linux/audit.h          |   23 
 include/linux/fsnotify.h       |   29 -
 include/linux/inotify.h        |   85 +++
 include/linux/netlink.h        |    1 
 include/linux/sched.h          |    2 
 include/linux/security.h       |   16 
 include/linux/selinux.h        |  177 +++++++
 init/Kconfig                   |    3 
 ipc/msg.c                      |   11 
 ipc/sem.c                      |   11 
 ipc/shm.c                      |   19 
 ipc/util.c                     |    7 
 kernel/audit.c                 |  179 +++++--
 kernel/audit.h                 |   32 +
 kernel/auditfilter.c           |  946 +++++++++++++++++++++++++++++++++++++---
 kernel/auditsc.c               |  330 +++++++-------
 kernel/exit.c                  |    3 
 kernel/fork.c                  |    2 
 kernel/sysctl.c                |    4 
 kernel/user.c                  |    2 
 net/netlink/af_netlink.c       |    2 
 net/socket.c                   |    2 
 security/dummy.c               |    6 
 security/selinux/Makefile      |    2 
 security/selinux/avc.c         |   13 
 security/selinux/exports.c     |   74 +++
 security/selinux/hooks.c       |    8 
 security/selinux/ss/mls.c      |   30 +
 security/selinux/ss/mls.h      |    4 
 security/selinux/ss/services.c |  235 +++++++++
 43 files changed, 2931 insertions(+), 1070 deletions(-)

--- NEW FILE linux-2.6-audit-git.patch ---
diff --git a/arch/i386/kernel/ptrace.c b/arch/i386/kernel/ptrace.c
index 506462e..fd7eaf7 100644
--- a/arch/i386/kernel/ptrace.c
+++ b/arch/i386/kernel/ptrace.c
@@ -671,7 +671,7 @@ int do_syscall_trace(struct pt_regs *reg
 
 	if (unlikely(current->audit_context)) {
 		if (entryexit)
-			audit_syscall_exit(current, AUDITSC_RESULT(regs->eax),
+			audit_syscall_exit(AUDITSC_RESULT(regs->eax),
 						regs->eax);
 		/* Debug traps, when using PTRACE_SINGLESTEP, must be sent only
 		 * on the syscall exit path. Normally, when TIF_SYSCALL_AUDIT is
@@ -720,14 +720,13 @@ int do_syscall_trace(struct pt_regs *reg
 	ret = is_sysemu;
 out:
 	if (unlikely(current->audit_context) && !entryexit)
-		audit_syscall_entry(current, AUDIT_ARCH_I386, regs->orig_eax,
+		audit_syscall_entry(AUDIT_ARCH_I386, regs->orig_eax,
 				    regs->ebx, regs->ecx, regs->edx, regs->esi);
 	if (ret == 0)
 		return 0;
 
 	regs->orig_eax = -1; /* force skip of syscall restarting */
 	if (unlikely(current->audit_context))
-		audit_syscall_exit(current, AUDITSC_RESULT(regs->eax),
-				regs->eax);
+		audit_syscall_exit(AUDITSC_RESULT(regs->eax), regs->eax);
 	return 1;
 }
diff --git a/arch/i386/kernel/vm86.c b/arch/i386/kernel/vm86.c
index aee14fa..00e0118 100644
--- a/arch/i386/kernel/vm86.c
+++ b/arch/i386/kernel/vm86.c
@@ -312,7 +312,7 @@ static void do_sys_vm86(struct kernel_vm
 
 	/*call audit_syscall_exit since we do not exit via the normal paths */
 	if (unlikely(current->audit_context))
-		audit_syscall_exit(current, AUDITSC_RESULT(eax), eax);
+		audit_syscall_exit(AUDITSC_RESULT(eax), eax);
 
 	__asm__ __volatile__(
 		"movl %0,%%esp\n\t"
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c
index 9887c87..e61e15e 100644
--- a/arch/ia64/kernel/ptrace.c
+++ b/arch/ia64/kernel/ptrace.c
@@ -1644,7 +1644,7 @@ syscall_trace_enter (long arg0, long arg
 			arch = AUDIT_ARCH_IA64;
 		}
 
-		audit_syscall_entry(current, arch, syscall, arg0, arg1, arg2, arg3);
+		audit_syscall_entry(arch, syscall, arg0, arg1, arg2, arg3);
 	}
 
 }
@@ -1662,7 +1662,7 @@ syscall_trace_leave (long arg0, long arg
 
 		if (success != AUDITSC_SUCCESS)
 			result = -result;
-		audit_syscall_exit(current, success, result);
+		audit_syscall_exit(success, result);
 	}
 
 	if (test_thread_flag(TIF_SYSCALL_TRACE)
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
index f838b36..26ab8a9 100644
--- a/arch/mips/kernel/ptrace.c
+++ b/arch/mips/kernel/ptrace.c
@@ -469,7 +469,7 @@ static inline int audit_arch(void)
 asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit)
 {
 	if (unlikely(current->audit_context) && entryexit)
-		audit_syscall_exit(current, AUDITSC_RESULT(regs->regs[2]),
+		audit_syscall_exit(AUDITSC_RESULT(regs->regs[2]),
 		                   regs->regs[2]);
 
 	if (!(current->ptrace & PT_PTRACED))
@@ -493,7 +493,7 @@ asmlinkage void do_syscall_trace(struct 
 	}
  out:
 	if (unlikely(current->audit_context) && !entryexit)
-		audit_syscall_entry(current, audit_arch(), regs->regs[2],
+		audit_syscall_entry(audit_arch(), regs->regs[2],
 				    regs->regs[4], regs->regs[5],
 				    regs->regs[6], regs->regs[7]);
 }
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index bcb8357..4a677d1 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -538,7 +538,7 @@ void do_syscall_trace_enter(struct pt_re
 		do_syscall_trace();
 
 	if (unlikely(current->audit_context))
-		audit_syscall_entry(current,
+		audit_syscall_entry(
 #ifdef CONFIG_PPC32
 				    AUDIT_ARCH_PPC,
 #else
@@ -556,8 +556,7 @@ void do_syscall_trace_leave(struct pt_re
 #endif
 
 	if (unlikely(current->audit_context))
-		audit_syscall_exit(current,
-				   (regs->ccr&0x1000)?AUDITSC_FAILURE:AUDITSC_SUCCESS,
+		audit_syscall_exit((regs->ccr&0x1000)?AUDITSC_FAILURE:AUDITSC_SUCCESS,
 				   regs->result);
 
 	if ((test_thread_flag(TIF_SYSCALL_TRACE)
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index 37dfe33..8f36504 100644
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -734,7 +734,7 @@ asmlinkage void
 syscall_trace(struct pt_regs *regs, int entryexit)
 {
 	if (unlikely(current->audit_context) && entryexit)
-		audit_syscall_exit(current, AUDITSC_RESULT(regs->gprs[2]), regs->gprs[2]);
+		audit_syscall_exit(AUDITSC_RESULT(regs->gprs[2]), regs->gprs[2]);
 
 	if (!test_thread_flag(TIF_SYSCALL_TRACE))
 		goto out;
@@ -761,8 +761,7 @@ syscall_trace(struct pt_regs *regs, int 
 	}
  out:
 	if (unlikely(current->audit_context) && !entryexit)
-		audit_syscall_entry(current, 
-				    test_thread_flag(TIF_31BIT)?AUDIT_ARCH_S390:AUDIT_ARCH_S390X,
+		audit_syscall_entry(test_thread_flag(TIF_31BIT)?AUDIT_ARCH_S390:AUDIT_ARCH_S390X,
 				    regs->gprs[2], regs->orig_gpr2, regs->gprs[3],
 				    regs->gprs[4], regs->gprs[5]);
 }
diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c
index 49e6ded..d31975e 100644
--- a/arch/sparc64/kernel/ptrace.c
+++ b/arch/sparc64/kernel/ptrace.c
@@ -653,7 +653,7 @@ asmlinkage void syscall_trace(struct pt_
 		if (unlikely(tstate & (TSTATE_XCARRY | TSTATE_ICARRY)))
 			result = AUDITSC_FAILURE;
 
-		audit_syscall_exit(current, result, regs->u_regs[UREG_I0]);
+		audit_syscall_exit(result, regs->u_regs[UREG_I0]);
 	}
 
 	if (!(current->ptrace & PT_PTRACED))
@@ -677,8 +677,7 @@ asmlinkage void syscall_trace(struct pt_
 
 out:
 	if (unlikely(current->audit_context) && !syscall_exit_p)
-		audit_syscall_entry(current,
-				    (test_thread_flag(TIF_32BIT) ?
+		audit_syscall_entry((test_thread_flag(TIF_32BIT) ?
 				     AUDIT_ARCH_SPARC :
 				     AUDIT_ARCH_SPARC64),
 				    regs->u_regs[UREG_G1],
diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c
index 60d2eda..9a77fb3 100644
--- a/arch/um/kernel/ptrace.c
+++ b/arch/um/kernel/ptrace.c
@@ -275,15 +275,13 @@ void syscall_trace(union uml_pt_regs *re
 
 	if (unlikely(current->audit_context)) {
 		if (!entryexit)
-			audit_syscall_entry(current,
-                                            HOST_AUDIT_ARCH,
+			audit_syscall_entry(HOST_AUDIT_ARCH,
 					    UPT_SYSCALL_NR(regs),
 					    UPT_SYSCALL_ARG1(regs),
 					    UPT_SYSCALL_ARG2(regs),
 					    UPT_SYSCALL_ARG3(regs),
 					    UPT_SYSCALL_ARG4(regs));
-		else audit_syscall_exit(current,
-                                        AUDITSC_RESULT(UPT_SYSCALL_RET(regs)),
+		else audit_syscall_exit(AUDITSC_RESULT(UPT_SYSCALL_RET(regs)),
                                         UPT_SYSCALL_RET(regs));
 	}
 
diff --git a/arch/x86_64/kernel/ptrace.c b/arch/x86_64/kernel/ptrace.c
index d44b2c1..5ef7aae 100644
--- a/arch/x86_64/kernel/ptrace.c
+++ b/arch/x86_64/kernel/ptrace.c
@@ -605,12 +605,12 @@ asmlinkage void syscall_trace_enter(stru
 
 	if (unlikely(current->audit_context)) {
 		if (test_thread_flag(TIF_IA32)) {
-			audit_syscall_entry(current, AUDIT_ARCH_I386,
+			audit_syscall_entry(AUDIT_ARCH_I386,
 					    regs->orig_rax,
 					    regs->rbx, regs->rcx,
 					    regs->rdx, regs->rsi);
 		} else {
-			audit_syscall_entry(current, AUDIT_ARCH_X86_64,
+			audit_syscall_entry(AUDIT_ARCH_X86_64,
 					    regs->orig_rax,
 					    regs->rdi, regs->rsi,
 					    regs->rdx, regs->r10);
@@ -621,7 +621,7 @@ asmlinkage void syscall_trace_enter(stru
 asmlinkage void syscall_trace_leave(struct pt_regs *regs)
[...5249 lines suppressed...]
+		/* only 'equals' and 'not equals' fit user, role, and type */
+		if (op != AUDIT_EQUAL && op != AUDIT_NOT_EQUAL)
+			return -EINVAL;
+		break;
+	case AUDIT_SE_SEN:
+	case AUDIT_SE_CLR:
+		/* we do not allow a range, indicated by the presense of '-' */
+		if (strchr(rulestr, '-'))
+			return -EINVAL;
+		break;
+	default:
+		/* only the above fields are valid */
+		return -EINVAL;
+	}
+
+	tmprule = kzalloc(sizeof(struct selinux_audit_rule), GFP_KERNEL);
+	if (!tmprule)
+		return -ENOMEM;
+
+	context_init(&tmprule->au_ctxt);
+
+	POLICY_RDLOCK;
+
+	tmprule->au_seqno = latest_granting;
+
+	switch (field) {
+	case AUDIT_SE_USER:
+		userdatum = hashtab_search(policydb.p_users.table, rulestr);
+		if (!userdatum)
+			rc = -EINVAL;
+		else
+			tmprule->au_ctxt.user = userdatum->value;
+		break;
+	case AUDIT_SE_ROLE:
+		roledatum = hashtab_search(policydb.p_roles.table, rulestr);
+		if (!roledatum)
+			rc = -EINVAL;
+		else
+			tmprule->au_ctxt.role = roledatum->value;
+		break;
+	case AUDIT_SE_TYPE:
+		typedatum = hashtab_search(policydb.p_types.table, rulestr);
+		if (!typedatum)
+			rc = -EINVAL;
+		else
+			tmprule->au_ctxt.type = typedatum->value;
+		break;
+	case AUDIT_SE_SEN:
+	case AUDIT_SE_CLR:
+		rc = mls_from_string(rulestr, &tmprule->au_ctxt, GFP_ATOMIC);
+		break;
+	}
+
+	POLICY_RDUNLOCK;
+
+	if (rc) {
+		selinux_audit_rule_free(tmprule);
+		tmprule = NULL;
+	}
+
+	*rule = tmprule;
+
+	return rc;
+}
+
+int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op,
+                             struct selinux_audit_rule *rule,
+                             struct audit_context *actx)
+{
+	struct context *ctxt;
+	struct mls_level *level;
+	int match = 0;
+
+	if (!rule) {
+		audit_log(actx, GFP_ATOMIC, AUDIT_SELINUX_ERR,
+		          "selinux_audit_rule_match: missing rule\n");
+		return -ENOENT;
+	}
+
+	POLICY_RDLOCK;
+
+	if (rule->au_seqno < latest_granting) {
+		audit_log(actx, GFP_ATOMIC, AUDIT_SELINUX_ERR,
+		          "selinux_audit_rule_match: stale rule\n");
+		match = -ESTALE;
+		goto out;
+	}
+
+	ctxt = sidtab_search(&sidtab, ctxid);
+	if (!ctxt) {
+		audit_log(actx, GFP_ATOMIC, AUDIT_SELINUX_ERR,
+		          "selinux_audit_rule_match: unrecognized SID %d\n",
+		          ctxid);
+		match = -ENOENT;
+		goto out;
+	}
+
+	/* a field/op pair that is not caught here will simply fall through
+	   without a match */
+	switch (field) {
+	case AUDIT_SE_USER:
+		switch (op) {
+		case AUDIT_EQUAL:
+			match = (ctxt->user == rule->au_ctxt.user);
+			break;
+		case AUDIT_NOT_EQUAL:
+			match = (ctxt->user != rule->au_ctxt.user);
+			break;
+		}
+		break;
+	case AUDIT_SE_ROLE:
+		switch (op) {
+		case AUDIT_EQUAL:
+			match = (ctxt->role == rule->au_ctxt.role);
+			break;
+		case AUDIT_NOT_EQUAL:
+			match = (ctxt->role != rule->au_ctxt.role);
+			break;
+		}
+		break;
+	case AUDIT_SE_TYPE:
+		switch (op) {
+		case AUDIT_EQUAL:
+			match = (ctxt->type == rule->au_ctxt.type);
+			break;
+		case AUDIT_NOT_EQUAL:
+			match = (ctxt->type != rule->au_ctxt.type);
+			break;
+		}
+		break;
+	case AUDIT_SE_SEN:
+	case AUDIT_SE_CLR:
+		level = (op == AUDIT_SE_SEN ?
+		         &ctxt->range.level[0] : &ctxt->range.level[1]);
+		switch (op) {
+		case AUDIT_EQUAL:
+			match = mls_level_eq(&rule->au_ctxt.range.level[0],
+			                     level);
+			break;
+		case AUDIT_NOT_EQUAL:
+			match = !mls_level_eq(&rule->au_ctxt.range.level[0],
+			                      level);
+			break;
+		case AUDIT_LESS_THAN:
+			match = (mls_level_dom(&rule->au_ctxt.range.level[0],
+			                       level) &&
+			         !mls_level_eq(&rule->au_ctxt.range.level[0],
+			                       level));
+			break;
+		case AUDIT_LESS_THAN_OR_EQUAL:
+			match = mls_level_dom(&rule->au_ctxt.range.level[0],
+			                      level);
+			break;
+		case AUDIT_GREATER_THAN:
+			match = (mls_level_dom(level,
+			                      &rule->au_ctxt.range.level[0]) &&
+			         !mls_level_eq(level,
+			                       &rule->au_ctxt.range.level[0]));
+			break;
+		case AUDIT_GREATER_THAN_OR_EQUAL:
+			match = mls_level_dom(level,
+			                      &rule->au_ctxt.range.level[0]);
+			break;
+		}
+	}
+
+out:
+	POLICY_RDUNLOCK;
+	return match;
+}
+
+static int (*aurule_callback)(void) = NULL;
+
+static int aurule_avc_callback(u32 event, u32 ssid, u32 tsid,
+                               u16 class, u32 perms, u32 *retained)
+{
+	int err = 0;
+
+	if (event == AVC_CALLBACK_RESET && aurule_callback)
+		err = aurule_callback();
+	return err;
+}
+
+static int __init aurule_init(void)
+{
+	int err;
+
+	err = avc_add_callback(aurule_avc_callback, AVC_CALLBACK_RESET,
+	                       SECSID_NULL, SECSID_NULL, SECCLASS_NULL, 0);
+	if (err)
+		panic("avc_add_callback() failed, error %d\n", err);
+
+	return err;
+}
+__initcall(aurule_init);
+
+void selinux_audit_set_callback(int (*callback)(void))
+{
+	aurule_callback = callback;
+}


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2127
retrieving revision 1.2127.2.1
diff -u -r1.2127 -r1.2127.2.1
--- kernel-2.6.spec	10 Apr 2006 20:06:08 -0000	1.2127
+++ kernel-2.6.spec	10 Apr 2006 22:22:22 -0000	1.2127.2.1
@@ -9,10 +9,10 @@
 # Whether to apply the Xen patches, leave this enabled.
 %define includexen 0
 # Whether to build the Xen kernels, disable if you want.
-%define buildxen 1
+%define buildxen 0
 %define buildxenPAE 0
 %define builddoc 0
-%define buildkdump 1
+%define buildkdump 0
 
 # Versions of various parts
 
@@ -25,7 +25,7 @@
 %define sublevel 16
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
+%define rhbsys  .lspp.17
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC6%{rhbsys}
 %define signmodules 0
 %define make_target bzImage
@@ -396,6 +396,9 @@
 # Xen hypervisor patches
 Patch20000: xen-sched-sedf.patch
 
+# Audit & lspp patches
+Patch20100: linux-2.6-audit-git.patch
+
 
 # END OF PATCH DEFINITIONS
 
@@ -1036,6 +1039,9 @@
 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
 %patch10001 -p1
 
+# Audit patches
+%patch20100 -p1
+
 
 # END OF PATCH APPLICATIONS
 
@@ -1050,6 +1056,7 @@
 for i in *.config
 do
   mv $i .config
+  echo "CONFIG_INOTIFY_USER=y" >> .config
   Arch=`head -1 .config | cut -b 3-`
 %if %{includexen}
   make ARCH=$Arch nonint_oldconfig > /dev/null
@@ -1655,6 +1662,9 @@
 %endif
 
 %changelog
+* Mon Apr 10 2006 Steve Grubb <sgrubb at redhat.com>
+- lspp.17
+
 * Mon Apr 10 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc1-git2
 - Enable SMP on all x86 kernels.



From fedora-cvs-commits at redhat.com  Mon Apr 10 22:25:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 18:25:39 -0400
Subject: rpms/gnome-screensaver/devel .cvsignore, 1.17,
	1.18 gnome-screensaver.spec, 1.65, 1.66 sources, 1.19, 1.20
Message-ID: <200604102225.k3AMPd7I011461@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-screensaver.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	13 Mar 2006 15:12:54 -0000	1.17
+++ .cvsignore	10 Apr 2006 22:25:37 -0000	1.18
@@ -8,3 +8,4 @@
 gnome-screensaver-2.13.91.tar.bz2
 gnome-screensaver-2.13.92.tar.bz2
 gnome-screensaver-2.14.0.tar.bz2
+gnome-screensaver-2.14.1.tar.bz2


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- gnome-screensaver.spec	4 Apr 2006 05:11:04 -0000	1.65
+++ gnome-screensaver.spec	10 Apr 2006 22:25:37 -0000	1.66
@@ -13,8 +13,8 @@
 
 Summary: GNOME Screensaver
 Name: gnome-screensaver
-Version: 2.14.0
-Release: 4
+Version: 2.14.1
+Release: 2
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -166,6 +166,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> 2.14.1-2
+- Update to 2.14.1
+
 * Tue Apr  4 2006 Ray Strode <rstrode at redhat.com> 2.14.0-4
 - don't ignore idle timers after long suspend
   (bug 183668)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	13 Mar 2006 15:12:54 -0000	1.19
+++ sources	10 Apr 2006 22:25:37 -0000	1.20
@@ -1,2 +1,2 @@
 661b1551a16e6aa948248b2443bad117  fedoralogo-floaters-lock-dialog.tar.gz
-290883980efaecd1b3ec275339672932  gnome-screensaver-2.14.0.tar.bz2
+59181612c8a5c8be7f0a392baba5245d  gnome-screensaver-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 22:25:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 18:25:43 -0400
Subject: rpms/xorg-x11-proto-devel/devel xorg-x11-proto-devel.spec, 1.27,
	1.28
Message-ID: <200604102225.k3AMPhPn011475@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	xorg-x11-proto-devel.spec 
Log Message:
* Mon Apr 10 2006 Kristian H??gsberg <krh at redhat.com> 7.0-11
- Bump and build in fc5-bling.



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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xorg-x11-proto-devel.spec	7 Apr 2006 15:37:55 -0000	1.27
+++ xorg-x11-proto-devel.spec	10 Apr 2006 22:25:39 -0000	1.28
@@ -10,7 +10,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.0
-Release: 10
+Release: 11
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
@@ -278,6 +278,9 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Mon Apr 10 2006 Kristian H??gsberg <krh at redhat.com> 7.0-11
+- Bump and build in fc5-bling.
+
 * Fri Apr  7 2006 Adam Jackson <ajackson at redhat.com> 7.0-10
 - Update to compositeproto-0.3.1 to fix big-endian LP64.
 



From fedora-cvs-commits at redhat.com  Mon Apr 10 22:28:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 18:28:49 -0400
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.66,1.67
Message-ID: <200604102228.k3AMSnrW011597@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-screensaver.spec 
Log Message:
2.14.1



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- gnome-screensaver.spec	10 Apr 2006 22:25:37 -0000	1.66
+++ gnome-screensaver.spec	10 Apr 2006 22:28:47 -0000	1.67
@@ -28,7 +28,6 @@
 Patch1: gnome-screensaver-0.0.23-use-floaters-by-default.patch
 Patch2: gnome-screensaver-2.13.91-shrink-em.patch
 Patch3: gnome-screensaver-2.14.0-pass-krb-environment.patch
-Patch4: gnome-screensaver-2.14.0-fix-timeout.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.gnome.org
@@ -66,7 +65,6 @@
 %patch1 -p1 -b .use-floaters-by-default
 %patch2 -p1 -b .shrink-em
 %patch3 -p1 -b .pass-krb-environment
-%patch4 -p1 -b .fix-timeout
 
 %build
 intltoolize --force
@@ -168,6 +166,7 @@
 %changelog
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> 2.14.1-2
 - Update to 2.14.1
+- Drop upstreamed patch
 
 * Tue Apr  4 2006 Ray Strode <rstrode at redhat.com> 2.14.0-4
 - don't ignore idle timers after long suspend



From fedora-cvs-commits at redhat.com  Mon Apr 10 22:35:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 18:35:16 -0400
Subject: rpms/gnome-screensaver/FC-5 gnome-screensaver.spec, 1.64,
	1.65 sources, 1.19, 1.20
Message-ID: <200604102235.k3AMZGDW011739@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-screensaver.spec sources 
Log Message:
2.14.1



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/FC-5/gnome-screensaver.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- gnome-screensaver.spec	4 Apr 2006 14:06:22 -0000	1.64
+++ gnome-screensaver.spec	10 Apr 2006 22:35:14 -0000	1.65
@@ -13,7 +13,7 @@
 
 Summary: GNOME Screensaver
 Name: gnome-screensaver
-Version: 2.14.0
+Version: 2.14.1
 Release: 1.fc5.1
 License: GPL
 Group: Amusement/Graphics
@@ -28,8 +28,6 @@
 Patch1: gnome-screensaver-0.0.23-use-floaters-by-default.patch
 Patch2: gnome-screensaver-2.13.91-shrink-em.patch
 Patch3: gnome-screensaver-2.14.0-pass-krb-environment.patch
-Patch4: gnome-screensaver-2.14.0-fix-timeout.patch
-Patch5: gnome-screensaver-2.14.0-detect-more-user-events.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.gnome.org
@@ -67,8 +65,6 @@
 %patch1 -p1 -b .use-floaters-by-default
 %patch2 -p1 -b .shrink-em
 %patch3 -p1 -b .pass-krb-environment
-%patch4 -p1 -b .timeout
-%patch5 -p1 -b .detect-more-user-events
 
 %build
 intltoolize --force
@@ -168,17 +164,22 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
-* Thu Mar 30 2006 Ray Strode <rstrode at redhat.com> 2.14.0-1.fc5.1
-- Don't unconditionally activate every timeout period regardless
-  of user activity after long suspends (bug 183668)
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> 2.14.1-1.fc5.1
+- Update to 2.14.1
+- Drop upstreamed patch
+
+* Tue Apr  4 2006 Ray Strode <rstrode at redhat.com> 2.14.0-4
+- don't ignore idle timers after long suspend
+  (bug 183668)
 
-- Detect scroll wheel events when pointer isn't moved 
-  (upstream bug 335831)
-
-* Thu Mar 30 2006 Ray Strode <rstrode at redhat.com> 2.14.0-1.fc5
+* Thu Mar 30 2006 Ray Strode <rstrode at redhat.com> 2.14.0-3
 - refresh kerberos credentials when unlocking screen 
   (bug 187341)
 
+* Sat Mar 25 2006 Ray Strode <rstrode at redhat.com> 2.14.0-2
+- Add missing "c" to the word "Screensaver" in summary
+  (bug 186711).
+
 * Mon Mar 13 2006 Matthias Clasen  <mclasen at redhat.com> 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/FC-5/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	13 Mar 2006 15:12:54 -0000	1.19
+++ sources	10 Apr 2006 22:35:14 -0000	1.20
@@ -1,2 +1,2 @@
 661b1551a16e6aa948248b2443bad117  fedoralogo-floaters-lock-dialog.tar.gz
-290883980efaecd1b3ec275339672932  gnome-screensaver-2.14.0.tar.bz2
+59181612c8a5c8be7f0a392baba5245d  gnome-screensaver-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 23:07:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 19:07:04 -0400
Subject: rpms/gnopernicus/devel .cvsignore, 1.29, 1.30 gnopernicus.spec, 1.40,
	1.41 sources, 1.30, 1.31
Message-ID: <200604102307.k3AN73fE026132@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnopernicus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26118

Modified Files:
	.cvsignore gnopernicus.spec sources 
Log Message:
1.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnopernicus/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	13 Feb 2006 17:17:55 -0000	1.29
+++ .cvsignore	10 Apr 2006 23:07:01 -0000	1.30
@@ -18,3 +18,4 @@
 gnopernicus-1.0.0.tar.bz2
 gnopernicus-1.0.1.tar.bz2
 gnopernicus-1.0.2.tar.bz2
+gnopernicus-1.0.4.tar.bz2


Index: gnopernicus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnopernicus/devel/gnopernicus.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gnopernicus.spec	13 Feb 2006 17:17:55 -0000	1.40
+++ gnopernicus.spec	10 Apr 2006 23:07:01 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: GNOME screen reader
 Name: gnopernicus
-Version: 1.0.2
-Release: 1
+Version: 1.0.4
+Release: 2
 License: LGPL
 Group: Desktop/Accessibility
 URL: http://www.baum.ro/gnopernicus.html
@@ -100,6 +100,9 @@
 %{_includedir}/gnopernicus-1.0
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.4-2
+- Update to 1.0.4
+
 * Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.2-1
 - Update to 1.0.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnopernicus/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	13 Feb 2006 17:30:15 -0000	1.30
+++ sources	10 Apr 2006 23:07:01 -0000	1.31
@@ -1 +1 @@
-676a64e2cf145823ac764dc8d964dc21  gnopernicus-1.0.2.tar.bz2
+4e798c6d08e6096702d316b702801d1d  gnopernicus-1.0.4.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 23:15:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 19:15:26 -0400
Subject: rpms/gnopernicus/FC-5 gnopernicus.spec,1.40,1.41 sources,1.30,1.31
Message-ID: <200604102315.k3ANFQGW026275@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnopernicus.spec sources 
Log Message:
new version



Index: gnopernicus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnopernicus/FC-5/gnopernicus.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gnopernicus.spec	13 Feb 2006 17:17:55 -0000	1.40
+++ gnopernicus.spec	10 Apr 2006 23:15:24 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: GNOME screen reader
 Name: gnopernicus
-Version: 1.0.2
-Release: 1
+Version: 1.0.4
+Release: 1.fc5.1
 License: LGPL
 Group: Desktop/Accessibility
 URL: http://www.baum.ro/gnopernicus.html
@@ -100,6 +100,9 @@
 %{_includedir}/gnopernicus-1.0
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.4-1.fc5.1
+- Update to 1.0.4
+
 * Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.2-1
 - Update to 1.0.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnopernicus/FC-5/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	13 Feb 2006 17:30:15 -0000	1.30
+++ sources	10 Apr 2006 23:15:24 -0000	1.31
@@ -1 +1 @@
-676a64e2cf145823ac764dc8d964dc21  gnopernicus-1.0.2.tar.bz2
+4e798c6d08e6096702d316b702801d1d  gnopernicus-1.0.4.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 23:21:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 19:21:06 -0400
Subject: rpms/nautilus-cd-burner/devel .cvsignore, 1.30,
	1.31 nautilus-cd-burner.spec, 1.53, 1.54 sources, 1.30, 1.31
Message-ID: <200604102321.k3ANL6bH007852@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus-cd-burner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7827

Modified Files:
	.cvsignore nautilus-cd-burner.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	13 Mar 2006 21:46:29 -0000	1.30
+++ .cvsignore	10 Apr 2006 23:21:03 -0000	1.31
@@ -1 +1,2 @@
 nautilus-cd-burner-2.14.0.1.tar.bz2
+nautilus-cd-burner-2.14.1.tar.bz2


Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- nautilus-cd-burner.spec	13 Mar 2006 21:46:29 -0000	1.53
+++ nautilus-cd-burner.spec	10 Apr 2006 23:21:03 -0000	1.54
@@ -1,7 +1,7 @@
 Summary: Easy to use CD burning for Gnome
 Name: nautilus-cd-burner
-Version: 2.14.0.1
-Release: 1
+Version: 2.14.1
+Release: 2
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL/GPL
 Group: User Interface/Desktops
@@ -102,6 +102,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 2.14.0.1-1
 - Update to 2.14.0.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	13 Mar 2006 21:46:29 -0000	1.30
+++ sources	10 Apr 2006 23:21:03 -0000	1.31
@@ -1 +1 @@
-f04a32baed530c3f6181f86cd79fd59e  nautilus-cd-burner-2.14.0.1.tar.bz2
+093b21536b6a6670742dfadafecd032c  nautilus-cd-burner-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 23:22:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 19:22:09 -0400
Subject: rpms/nautilus-cd-burner/FC-5 nautilus-cd-burner.spec, 1.53,
	1.54 sources, 1.30, 1.31
Message-ID: <200604102322.k3ANM9NV007947@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus-cd-burner/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7932

Modified Files:
	nautilus-cd-burner.spec sources 
Log Message:
2.14.1



Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/FC-5/nautilus-cd-burner.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- nautilus-cd-burner.spec	13 Mar 2006 21:46:29 -0000	1.53
+++ nautilus-cd-burner.spec	10 Apr 2006 23:22:07 -0000	1.54
@@ -1,7 +1,7 @@
 Summary: Easy to use CD burning for Gnome
 Name: nautilus-cd-burner
-Version: 2.14.0.1
-Release: 1
+Version: 2.14.1
+Release: 1.fc5.1
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL/GPL
 Group: User Interface/Desktops
@@ -102,6 +102,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 2.14.0.1-1
 - Update to 2.14.0.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/FC-5/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	13 Mar 2006 21:46:29 -0000	1.30
+++ sources	10 Apr 2006 23:22:07 -0000	1.31
@@ -1 +1 @@
-f04a32baed530c3f6181f86cd79fd59e  nautilus-cd-burner-2.14.0.1.tar.bz2
+093b21536b6a6670742dfadafecd032c  nautilus-cd-burner-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 23:25:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 19:25:11 -0400
Subject: rpms/control-center/devel .cvsignore, 1.38, 1.39 control-center.spec,
	1.130, 1.131 sources, 1.41, 1.42
Message-ID: <200604102325.k3ANPBKK008073@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8058

Modified Files:
	.cvsignore control-center.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	13 Mar 2006 15:19:17 -0000	1.38
+++ .cvsignore	10 Apr 2006 23:25:07 -0000	1.39
@@ -11,3 +11,4 @@
 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


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- control-center.spec	6 Apr 2006 17:40:48 -0000	1.130
+++ control-center.spec	10 Apr 2006 23:25:09 -0000	1.131
@@ -20,7 +20,7 @@
 
 Summary: GNOME Control Center.
 Name: control-center
-Version: 2.14.0
+Version: 2.14.1
 Release: 2
 Epoch: 1
 License: GPL/LGPL
@@ -231,6 +231,9 @@
 # (also its headers)
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
+- Update to 2.14.1
+
 * Thu Apr  6 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-2
 - add missing build reqs (bug 188167)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	13 Mar 2006 15:19:17 -0000	1.41
+++ sources	10 Apr 2006 23:25:09 -0000	1.42
@@ -1,2 +1,2 @@
 e8f57ec1852d08d421016732b605a615  control-center-2.12.3.tar.bz2
-90195a0b42b94d80b0959c32162a10e3  control-center-2.14.0.tar.bz2
+d673df12692ee08b9fc3d69739f8779e  control-center-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 23:27:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 19:27:07 -0400
Subject: rpms/control-center/devel control-center.spec,1.131,1.132
Message-ID: <200604102327.k3ANR7ku008144@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8130

Modified Files:
	control-center.spec 
Log Message:
2.14.1



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- control-center.spec	10 Apr 2006 23:25:09 -0000	1.131
+++ control-center.spec	10 Apr 2006 23:27:03 -0000	1.132
@@ -25,7 +25,7 @@
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
-Source: ftp://ftp.gnome.org/pub/GNOME/sources/control-center/2.13/control-center-%{version}.tar.bz2
+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



From fedora-cvs-commits at redhat.com  Mon Apr 10 23:29:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 19:29:07 -0400
Subject: rpms/control-center/FC-5 control-center.spec, 1.129, 1.130 sources,
	1.41, 1.42
Message-ID: <200604102329.k3ANT7rq008260@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8246

Modified Files:
	control-center.spec sources 
Log Message:
2.14.1



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/FC-5/control-center.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- control-center.spec	13 Mar 2006 15:19:17 -0000	1.129
+++ control-center.spec	10 Apr 2006 23:29:05 -0000	1.130
@@ -20,12 +20,12 @@
 
 Summary: GNOME Control Center.
 Name: control-center
-Version: 2.14.0
-Release: 1
+Version: 2.14.1
+Release: 1.fc5.1
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
-Source: ftp://ftp.gnome.org/pub/GNOME/sources/control-center/2.13/control-center-%{version}.tar.bz2
+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
@@ -81,6 +81,8 @@
 # For intltool:
 BuildRequires: perl-XML-Parser >= 2.31-16
 BuildRequires: evolution-data-server-devel
+BuildRequires: libXxf86misc-devel 
+BuildRequires: libxkbfile-devel
 
 %description
 GNOME (the GNU Network Object Model Environment) is an attractive and
@@ -229,6 +231,12 @@
 # (also its headers)
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
+- Update to 2.14.1
+
+* Thu Apr  6 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-2
+- add missing build reqs (bug 188167)
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/control-center/FC-5/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	13 Mar 2006 15:19:17 -0000	1.41
+++ sources	10 Apr 2006 23:29:05 -0000	1.42
@@ -1,2 +1,2 @@
 e8f57ec1852d08d421016732b605a615  control-center-2.12.3.tar.bz2
-90195a0b42b94d80b0959c32162a10e3  control-center-2.14.0.tar.bz2
+d673df12692ee08b9fc3d69739f8779e  control-center-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 23:39:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 19:39:16 -0400
Subject: rpms/control-center/devel control-center-2.13.5-fedora-apps.patch,
	1.3, 1.4 control-center-2.13.90-fedora-apps.patch, 1.2, 1.3
Message-ID: <200604102339.k3ANdGmF008431@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8416

Modified Files:
	control-center-2.13.5-fedora-apps.patch 
	control-center-2.13.90-fedora-apps.patch 
Log Message:
fix patches


control-center-2.13.5-fedora-apps.patch:
 gnome-default-applications.xml.in |  111 ++++++++------------------------------
 1 files changed, 24 insertions(+), 87 deletions(-)

Index: control-center-2.13.5-fedora-apps.patch
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center-2.13.5-fedora-apps.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- control-center-2.13.5-fedora-apps.patch	30 Jan 2006 19:25:15 -0000	1.3
+++ control-center-2.13.5-fedora-apps.patch	10 Apr 2006 23:39:12 -0000	1.4
@@ -107,14 +107,14 @@
 -      <_name>Thunderbird</_name>
 +      <_name>Thunderbird Mail</_name>
        <executable>thunderbird</executable>
-       <command>thunderbird -mail %s</command>
+       <command>thunderbird -compose %s</command>
        <icon-name>thunderbird</icon-name>
        <run-in-terminal>false</run-in-terminal>
      </mail-reader>
      <mail-reader>
 -      <_name>Mozilla Thunderbird</_name>
 -      <executable>mozilla-thunderbird</executable>
--      <command>mozilla-thunderbird -mail %s</command>
+-      <command>mozilla-thunderbird -compose %s</command>
 -      <icon-name>thunderbird</icon-name>
 -      <run-in-terminal>false</run-in-terminal>
 -    </mail-reader>

control-center-2.13.90-fedora-apps.patch:
 gnome-default-applications.xml.in |  111 ++++++++------------------------------
 1 files changed, 24 insertions(+), 87 deletions(-)

Index: control-center-2.13.90-fedora-apps.patch
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center-2.13.90-fedora-apps.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- control-center-2.13.90-fedora-apps.patch	13 Mar 2006 20:22:34 -0000	1.2
+++ control-center-2.13.90-fedora-apps.patch	10 Apr 2006 23:39:12 -0000	1.3
@@ -107,14 +107,14 @@
 -      <_name>Thunderbird</_name>
 +      <_name>Thunderbird Mail</_name>
        <executable>thunderbird</executable>
-       <command>thunderbird mailto:%s</command>
+       <command>thunderbird -compose %s</command>
        <icon-name>thunderbird</icon-name>
        <run-in-terminal>false</run-in-terminal>
      </mail-reader>
      <mail-reader>
 -      <_name>Mozilla Thunderbird</_name>
 -      <executable>mozilla-thunderbird</executable>
--      <command>mozilla-thunderbird mailto:%s</command>
+-      <command>mozilla-thunderbird -compose %s</command>
 -      <icon-name>thunderbird</icon-name>
 -      <run-in-terminal>false</run-in-terminal>
 -    </mail-reader>



From fedora-cvs-commits at redhat.com  Mon Apr 10 23:46:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 19:46:40 -0400
Subject: rpms/control-center/FC-5 control-center-2.13.90-fedora-apps.patch,
	1.2, 1.3
Message-ID: <200604102346.k3ANkeXN020919@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19469

Modified Files:
	control-center-2.13.90-fedora-apps.patch 
Log Message:
Update patch


control-center-2.13.90-fedora-apps.patch:
 gnome-default-applications.xml.in |  111 ++++++++------------------------------
 1 files changed, 24 insertions(+), 87 deletions(-)

Index: control-center-2.13.90-fedora-apps.patch
===================================================================
RCS file: /cvs/dist/rpms/control-center/FC-5/control-center-2.13.90-fedora-apps.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- control-center-2.13.90-fedora-apps.patch	13 Mar 2006 20:22:34 -0000	1.2
+++ control-center-2.13.90-fedora-apps.patch	10 Apr 2006 23:46:38 -0000	1.3
@@ -107,14 +107,14 @@
 -      <_name>Thunderbird</_name>
 +      <_name>Thunderbird Mail</_name>
        <executable>thunderbird</executable>
-       <command>thunderbird mailto:%s</command>
+       <command>thunderbird -compose %s</command>
        <icon-name>thunderbird</icon-name>
        <run-in-terminal>false</run-in-terminal>
      </mail-reader>
      <mail-reader>
 -      <_name>Mozilla Thunderbird</_name>
 -      <executable>mozilla-thunderbird</executable>
--      <command>mozilla-thunderbird mailto:%s</command>
+-      <command>mozilla-thunderbird -compose %s</command>
 -      <icon-name>thunderbird</icon-name>
 -      <run-in-terminal>false</run-in-terminal>
 -    </mail-reader>



From fedora-cvs-commits at redhat.com  Mon Apr 10 23:48:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 19:48:54 -0400
Subject: rpms/gtkhtml3/devel .cvsignore, 1.33, 1.34 gtkhtml3.spec, 1.59,
	1.60 sources, 1.33, 1.34
Message-ID: <200604102348.k3ANmsiR022585@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtkhtml3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22568

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Log Message:
3.10.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/.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	10 Apr 2006 23:48:52 -0000	1.34
@@ -1 +1,2 @@
 gtkhtml-3.10.0.tar.bz2
+gtkhtml-3.10.1.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- gtkhtml3.spec	7 Apr 2006 16:34:31 -0000	1.59
+++ gtkhtml3.spec	10 Apr 2006 23:48:52 -0000	1.60
@@ -4,7 +4,7 @@
 
 Summary: gtkhtml library
 Name: gtkhtml3
-Version: 3.10.0
+Version: 3.10.1
 Release: 2
 License: LGPL/GPL
 Group: System Environment/Libraries
@@ -98,6 +98,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 3.10.1-2
+- Update to 3.10.1
+
 * Fri Apr  7 2006 Dan Williams <dcbw at redhat.com> - 3.10.0-2
 - Fix crash with IM enabled
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	13 Mar 2006 16:54:42 -0000	1.33
+++ sources	10 Apr 2006 23:48:52 -0000	1.34
@@ -1 +1 @@
-1d564a2d9a7a4911c8d1b50868acef81  gtkhtml-3.10.0.tar.bz2
+f2b7ff386dae9fcc3b01c4116564722d  gtkhtml-3.10.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 10 23:54:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 19:54:25 -0400
Subject: rpms/control-center/devel control-center.spec,1.132,1.133
Message-ID: <200604102354.k3ANsP2C022648@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22635

Modified Files:
	control-center.spec 
Log Message:
update file lists



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- control-center.spec	10 Apr 2006 23:27:03 -0000	1.132
+++ control-center.spec	10 Apr 2006 23:54:23 -0000	1.133
@@ -217,6 +217,7 @@
 %{_datadir}/idl
 %{_datadir}/omf/control-center
 %{_datadir}/gnome-default-applications/*
+%{_datadir}/desktop-directories/*
 %{_bindir}/*
 %{_libexecdir}/*
 %{_libdir}/bonobo/*



From fedora-cvs-commits at redhat.com  Mon Apr 10 23:55:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 19:55:06 -0400
Subject: rpms/control-center/FC-5 control-center.spec,1.130,1.131
Message-ID: <200604102355.k3ANt6ju022723@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22710

Modified Files:
	control-center.spec 
Log Message:
fix file lists



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/FC-5/control-center.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- control-center.spec	10 Apr 2006 23:29:05 -0000	1.130
+++ control-center.spec	10 Apr 2006 23:55:04 -0000	1.131
@@ -217,6 +217,7 @@
 %{_datadir}/idl
 %{_datadir}/omf/control-center
 %{_datadir}/gnome-default-applications/*
+%{_datadir}/desktop-directories/*
 %{_bindir}/*
 %{_libexecdir}/*
 %{_libdir}/bonobo/*



From fedora-cvs-commits at redhat.com  Tue Apr 11 00:25:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 20:25:17 -0400
Subject: rpms/kernel/devel patch-2.6.17-rc1-git3.bz2.sign, NONE,
	1.1 .cvsignore, 1.403, 1.404 kernel-2.6.spec, 1.2127,
	1.2128 sources, 1.344, 1.345 upstream, 1.317,
	1.318 patch-2.6.17-rc1-git2.bz2.sign, 1.1, NONE
Message-ID: <200604110025.k3B0PHbm004472@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17-rc1-git3.bz2.sign 
Removed Files:
	patch-2.6.17-rc1-git2.bz2.sign 
Log Message:
git3



--- NEW FILE patch-2.6.17-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

iD8DBQBEOquryGugalF9Dw4RAjD2AJ0T7xqQS4aJHJzH0Gej8+G5X5X/sACfXdsW
sYcWAsD/43jQ4mhS986SYaQ=
=TaNl
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -r1.403 -r1.404
--- .cvsignore	10 Apr 2006 18:41:27 -0000	1.403
+++ .cvsignore	11 Apr 2006 00:25:14 -0000	1.404
@@ -4,4 +4,4 @@
 linux-2.6.16.tar.bz2
 xen-20060320.tar.bz2
 patch-2.6.17-rc1.bz2
-patch-2.6.17-rc1-git2.bz2
+patch-2.6.17-rc1-git3.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2127
retrieving revision 1.2128
diff -u -r1.2127 -r1.2128
--- kernel-2.6.spec	10 Apr 2006 20:06:08 -0000	1.2127
+++ kernel-2.6.spec	11 Apr 2006 00:25:14 -0000	1.2128
@@ -213,7 +213,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.17-rc1.bz2
-Patch2: patch-2.6.17-rc1-git2.bz2
+Patch2: patch-2.6.17-rc1-git3.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1656,7 +1656,7 @@
 
 %changelog
 * Mon Apr 10 2006 Dave Jones <davej at redhat.com>
-- 2.6.16rc1-git2
+- 2.6.16rc1-git2 & git3
 - Enable SMP on all x86 kernels.
   SMP_ALTERNATIVES disables the spinlocks etc at runtime.
 - setuid /proc/self/maps fix (#165351)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- sources	10 Apr 2006 18:41:28 -0000	1.344
+++ sources	11 Apr 2006 00:25:14 -0000	1.345
@@ -1,4 +1,4 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 8c70806f9075ebc0087f7ce1b8911700  xen-20060320.tar.bz2
 ee1b5bf019ec60a34ef7bf1b2a0c1291  patch-2.6.17-rc1.bz2
-2a6127bd3deeb154f68eeae92ecaf410  patch-2.6.17-rc1-git2.bz2
+33a1f95f8b4dbad15a69b2628cf16d09  patch-2.6.17-rc1-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -r1.317 -r1.318
--- upstream	10 Apr 2006 18:41:28 -0000	1.317
+++ upstream	11 Apr 2006 00:25:14 -0000	1.318
@@ -1,3 +1,3 @@
 linux-2.6.16.tar.bz2
 patch-2.6.17-rc1.bz2
-patch-2.6.17-rc1-git2.bz2
+patch-2.6.17-rc1-git3.bz2


--- patch-2.6.17-rc1-git2.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 11 00:37:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 20:37:20 -0400
Subject: rpms/gtkhtml3/devel gtkhtml-fix-indic-navigation-129212.patch, 1.1,
	1.2 gtkhtml3.spec, 1.60, 1.61
Message-ID: <200604110037.k3B0bJ92004675@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtkhtml3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4662

Modified Files:
	gtkhtml-fix-indic-navigation-129212.patch gtkhtml3.spec 
Log Message:
3.10.1


gtkhtml-fix-indic-navigation-129212.patch:
 gtkhtml-3.10.1/src/htmlcursor.c     |   34 +++----
 src/htmlengine-edit-cut-and-paste.c |   13 +-
 src/htmlobject.c                    |   29 ++++--
 src/htmlobject.h                    |   15 ++-
 src/htmltext.c                      |  167 ++++++++++++++++++++++++++++++++++++
 5 files changed, 225 insertions(+), 33 deletions(-)

Index: gtkhtml-fix-indic-navigation-129212.patch
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml-fix-indic-navigation-129212.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtkhtml-fix-indic-navigation-129212.patch	27 Jul 2005 00:50:19 -0000	1.1
+++ gtkhtml-fix-indic-navigation-129212.patch	11 Apr 2006 00:37:15 -0000	1.2
@@ -1,150 +1,3 @@
---- orig/src/htmlcursor.c
-+++ mod/src/htmlcursor.c
-@@ -203,12 +203,12 @@
- 
- 
- static gboolean
--forward (HTMLCursor *cursor)
-+forward (HTMLCursor *cursor, HTMLEngine *engine)
- {
- 	gboolean retval;
- 
- 	retval = TRUE;
--	if (!html_object_cursor_forward (cursor->object, cursor)) {
-+	if (!html_object_cursor_forward (cursor->object, cursor, engine)) {
- 		HTMLObject *next;
- 
- 		next = html_object_next_cursor (cursor->object, &cursor->offset);
-@@ -237,7 +237,7 @@
- 		html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
- 
- 	cursor->have_target_x = FALSE;
--	retval = forward (cursor);
-+	retval = forward (cursor, engine);
- 
- 	debug_location (cursor);
- 
-@@ -245,12 +245,12 @@
- }
- 
- static gboolean
--backward (HTMLCursor *cursor)
-+backward (HTMLCursor *cursor, HTMLEngine *engine)
- {
- 	gboolean retval;
- 
- 	retval = TRUE;
--	if (!html_object_cursor_backward (cursor->object, cursor)) {
-+	if (!html_object_cursor_backward (cursor->object, cursor, engine)) {
- 		HTMLObject *prev;
- 
- 		prev = html_object_prev_cursor (cursor->object, &cursor->offset);
-@@ -280,7 +280,7 @@
- 		html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
- 
- 	cursor->have_target_x = FALSE;
--	retval = backward (cursor);
-+	retval = backward (cursor, engine);
- 
- 	debug_location (cursor);
- 
-@@ -340,7 +340,7 @@
- 		prev_x = x;
- 		prev_y = y;
- 
--		if (! backward (cursor))
-+		if (! backward (cursor, engine))
- 			return FALSE;
- 
- 		html_object_get_cursor_base (cursor->object,
-@@ -562,14 +562,14 @@
- 
- 	html_cursor_copy (&original, cursor);
- 
--	while (forward (cursor)) {
-+	while (forward (cursor, engine)) {
- 		if (cursor->object == object && cursor->offset == offset)
- 			return TRUE;
- 	}
- 
- 	html_cursor_copy (cursor, &original);
- 
--	while (backward (cursor)) {
-+	while (backward (cursor, engine)) {
- 		if (cursor->object == object && cursor->offset == offset)
- 			return TRUE;
- 	}
-@@ -593,7 +593,7 @@
- 	if (engine->need_spell_check)
- 		html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
- 
--	while (backward (cursor))
-+	while (backward (cursor, engine))
- 		;
- }
- 
-@@ -610,7 +610,7 @@
- 	if (engine->need_spell_check)
- 		html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
- 
--	while (forward (cursor))
-+	while (forward (cursor, engine))
- 		;
- }
- 
-@@ -646,12 +646,12 @@
- 
- 	if (cursor->position < position) {
- 		while (cursor->position < position) {
--			if (! forward (cursor))
-+			if (! forward (cursor, engine))
- 				break;
- 		}
- 	} else if (cursor->position > position) {
- 		while (cursor->position > position) {
--			if (! backward (cursor))
-+			if (! backward (cursor, engine))
- 				break;
- 		}
- 	}
-@@ -755,7 +755,7 @@
- 	while (1) {
- 		if (!cursor->offset) {
- 			copy = html_cursor_dup (cursor);
--			if (backward (cursor)) {
-+			if (backward (cursor, engine)) {
- 				new_level = html_object_get_parent_level (cursor->object);
- 				if (new_level < level
- 				    || (new_level == level && flow != cursor->object->parent)) {
-@@ -767,7 +767,7 @@
- 				break;
- 		}
- 			else
--				if (!backward (cursor))
-+				if (!backward (cursor, engine))
- 					break;
- 		rv = TRUE;
- 	}
-@@ -794,7 +794,7 @@
- 	while (1) {
- 		if (cursor->offset == html_object_get_length (cursor->object)) {
- 			copy = html_cursor_dup (cursor);
--			if (forward (cursor)) {
-+			if (forward (cursor, engine)) {
- 				new_level = html_object_get_parent_level (cursor->object);
- 				if (new_level < level
- 				    || (new_level == level && flow != cursor->object->parent)) {
-@@ -806,7 +806,7 @@
- 				break;
- 		}
- 			else
--				if (!forward (cursor))
-+				if (!forward (cursor, engine))
- 					break;
- 		rv = TRUE;
- 	}
-
-
 --- orig/src/htmlengine-edit-cut-and-paste.c
 +++ mod/src/htmlengine-edit-cut-and-paste.c
 @@ -1445,14 +1445,15 @@
@@ -501,3 +354,148 @@
 +	object_class->backspace = html_text_backspace;
   	object_class->get_right_edge_offset = html_text_get_right_edge_offset;
  	object_class->get_left_edge_offset = html_text_get_left_edge_offset;
+--- gtkhtml-3.10.1/src/htmlcursor.c.fix-indic-navigation	2006-04-10 20:31:00.000000000 -0400
++++ gtkhtml-3.10.1/src/htmlcursor.c	2006-04-10 20:34:57.000000000 -0400
+@@ -203,12 +203,12 @@
+ 
+ 
+ static gboolean
+-forward (HTMLCursor *cursor)
++forward (HTMLCursor *cursor, HTMLEngine *engine)
+ {
+ 	gboolean retval;
+ 
+ 	retval = TRUE;
+-	if (!html_object_cursor_forward (cursor->object, cursor)) {
++	if (!html_object_cursor_forward (cursor->object, cursor, engine)) {
+ 		HTMLObject *next;
+ 
+ 		next = html_object_next_cursor (cursor->object, &cursor->offset);
+@@ -237,7 +237,7 @@
+ 		html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
+ 
+ 	cursor->have_target_x = FALSE;
+-	retval = forward (cursor);
++	retval = forward (cursor, engine);
+ 
+ 	debug_location (cursor);
+ 
+@@ -245,12 +245,12 @@
+ }
+ 
+ static gboolean
+-backward (HTMLCursor *cursor)
++backward (HTMLCursor *cursor, HTMLEngine *engine)
+ {
+ 	gboolean retval;
+ 
+ 	retval = TRUE;
+-	if (!html_object_cursor_backward (cursor->object, cursor)) {
++	if (!html_object_cursor_backward (cursor->object, cursor, engine)) {
+ 		HTMLObject *prev;
+ 
+ 		prev = html_object_prev_cursor (cursor->object, &cursor->offset);
+@@ -280,7 +280,7 @@
+ 		html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
+ 
+ 	cursor->have_target_x = FALSE;
+-	retval = backward (cursor);
++	retval = backward (cursor, engine);
+ 
+ 	debug_location (cursor);
+ 
+@@ -337,7 +337,7 @@
+ 		prev_x = x;
+ 		prev_y = y;
+ 
+-		if (! backward (cursor))
++		if (! backward (cursor, engine))
+ 			return FALSE;
+ 
+ 		html_object_get_cursor_base (cursor->object,
+@@ -556,14 +556,14 @@
+ 
+ 	html_cursor_copy (&original, cursor);
+ 
+-	while (forward (cursor)) {
++	while (forward (cursor, engine)) {
+ 		if (cursor->object == object && cursor->offset == offset)
+ 			return TRUE;
+ 	}
+ 
+ 	html_cursor_copy (cursor, &original);
+ 
+-	while (backward (cursor)) {
++	while (backward (cursor, engine)) {
+ 		if (cursor->object == object && cursor->offset == offset)
+ 			return TRUE;
+ 	}
+@@ -587,7 +587,7 @@
+ 	if (engine->need_spell_check)
+ 		html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
+ 
+-	while (backward (cursor))
++	while (backward (cursor, engine))
+ 		;
+ }
+ 
+@@ -604,7 +604,7 @@
+ 	if (engine->need_spell_check)
+ 		html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
+ 
+-	while (forward (cursor))
++	while (forward (cursor, engine))
+ 		;
+ }
+ 
+@@ -640,12 +640,12 @@
+ 
+ 	if (cursor->position < position) {
+ 		while (cursor->position < position) {
+-			if (! forward (cursor))
++			if (! forward (cursor, engine))
+ 				break;
+ 		}
+ 	} else if (cursor->position > position) {
+ 		while (cursor->position > position) {
+-			if (! backward (cursor))
++			if (! backward (cursor, engine))
+ 				break;
+ 		}
+ 	}
+@@ -749,7 +749,7 @@
+ 	while (1) {
+ 		if (!cursor->offset) {
+ 			html_cursor_copy (&copy, cursor);
+-			if (backward (cursor)) {
++			if (backward (cursor, engine)) {
+ 				new_level = html_object_get_parent_level (cursor->object);
+ 				if (new_level < level
+ 				    || (new_level == level && flow != cursor->object->parent)) {
+@@ -760,7 +760,7 @@
+ 				break;
+ 		}
+ 			else
+-				if (!backward (cursor))
++				if (!backward (cursor, engine))
+ 					break;
+ 		rv = TRUE;
+ 	}
+@@ -787,7 +787,7 @@
+ 	while (1) {
+ 		if (cursor->offset == html_object_get_length (cursor->object)) {
+ 			html_cursor_copy (&copy, cursor);
+-			if (forward (cursor)) {
++			if (forward (cursor, engine)) {
+ 				new_level = html_object_get_parent_level (cursor->object);
+ 				if (new_level < level
+ 				    || (new_level == level && flow != cursor->object->parent)) {
+@@ -798,7 +798,7 @@
+ 				break;
+ 		}
+ 			else
+-				if (!forward (cursor))
++				if (!forward (cursor, engine))
+ 					break;
+ 		rv = TRUE;
+ 	}


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- gtkhtml3.spec	10 Apr 2006 23:48:52 -0000	1.60
+++ gtkhtml3.spec	11 Apr 2006 00:37:15 -0000	1.61
@@ -100,6 +100,7 @@
 %changelog
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 3.10.1-2
 - Update to 3.10.1
+- Update patches
 
 * Fri Apr  7 2006 Dan Williams <dcbw at redhat.com> - 3.10.0-2
 - Fix crash with IM enabled



From fedora-cvs-commits at redhat.com  Tue Apr 11 00:41:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 20:41:47 -0400
Subject: rpms/gtkhtml3/FC-5 gtkhtml-fix-indic-navigation-129212.patch, 1.1,
	1.2 gtkhtml3.spec, 1.58, 1.59 sources, 1.33, 1.34
Message-ID: <200604110041.k3B0flq7004811@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gtkhtml-fix-indic-navigation-129212.patch gtkhtml3.spec 
	sources 
Log Message:
3.10.1


gtkhtml-fix-indic-navigation-129212.patch:
 gtkhtml-3.10.1/src/htmlcursor.c     |   34 +++----
 src/htmlengine-edit-cut-and-paste.c |   13 +-
 src/htmlobject.c                    |   29 ++++--
 src/htmlobject.h                    |   15 ++-
 src/htmltext.c                      |  167 ++++++++++++++++++++++++++++++++++++
 5 files changed, 225 insertions(+), 33 deletions(-)

Index: gtkhtml-fix-indic-navigation-129212.patch
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/FC-5/gtkhtml-fix-indic-navigation-129212.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtkhtml-fix-indic-navigation-129212.patch	27 Jul 2005 00:50:19 -0000	1.1
+++ gtkhtml-fix-indic-navigation-129212.patch	11 Apr 2006 00:41:44 -0000	1.2
@@ -1,150 +1,3 @@
---- orig/src/htmlcursor.c
-+++ mod/src/htmlcursor.c
-@@ -203,12 +203,12 @@
- 
- 
- static gboolean
--forward (HTMLCursor *cursor)
-+forward (HTMLCursor *cursor, HTMLEngine *engine)
- {
- 	gboolean retval;
- 
- 	retval = TRUE;
--	if (!html_object_cursor_forward (cursor->object, cursor)) {
-+	if (!html_object_cursor_forward (cursor->object, cursor, engine)) {
- 		HTMLObject *next;
- 
- 		next = html_object_next_cursor (cursor->object, &cursor->offset);
-@@ -237,7 +237,7 @@
- 		html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
- 
- 	cursor->have_target_x = FALSE;
--	retval = forward (cursor);
-+	retval = forward (cursor, engine);
- 
- 	debug_location (cursor);
- 
-@@ -245,12 +245,12 @@
- }
- 
- static gboolean
--backward (HTMLCursor *cursor)
-+backward (HTMLCursor *cursor, HTMLEngine *engine)
- {
- 	gboolean retval;
- 
- 	retval = TRUE;
--	if (!html_object_cursor_backward (cursor->object, cursor)) {
-+	if (!html_object_cursor_backward (cursor->object, cursor, engine)) {
- 		HTMLObject *prev;
- 
- 		prev = html_object_prev_cursor (cursor->object, &cursor->offset);
-@@ -280,7 +280,7 @@
- 		html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
- 
- 	cursor->have_target_x = FALSE;
--	retval = backward (cursor);
-+	retval = backward (cursor, engine);
- 
- 	debug_location (cursor);
- 
-@@ -340,7 +340,7 @@
- 		prev_x = x;
- 		prev_y = y;
- 
--		if (! backward (cursor))
-+		if (! backward (cursor, engine))
- 			return FALSE;
- 
- 		html_object_get_cursor_base (cursor->object,
-@@ -562,14 +562,14 @@
- 
- 	html_cursor_copy (&original, cursor);
- 
--	while (forward (cursor)) {
-+	while (forward (cursor, engine)) {
- 		if (cursor->object == object && cursor->offset == offset)
- 			return TRUE;
- 	}
- 
- 	html_cursor_copy (cursor, &original);
- 
--	while (backward (cursor)) {
-+	while (backward (cursor, engine)) {
- 		if (cursor->object == object && cursor->offset == offset)
- 			return TRUE;
- 	}
-@@ -593,7 +593,7 @@
- 	if (engine->need_spell_check)
- 		html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
- 
--	while (backward (cursor))
-+	while (backward (cursor, engine))
- 		;
- }
- 
-@@ -610,7 +610,7 @@
- 	if (engine->need_spell_check)
- 		html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
- 
--	while (forward (cursor))
-+	while (forward (cursor, engine))
- 		;
- }
- 
-@@ -646,12 +646,12 @@
- 
- 	if (cursor->position < position) {
- 		while (cursor->position < position) {
--			if (! forward (cursor))
-+			if (! forward (cursor, engine))
- 				break;
- 		}
- 	} else if (cursor->position > position) {
- 		while (cursor->position > position) {
--			if (! backward (cursor))
-+			if (! backward (cursor, engine))
- 				break;
- 		}
- 	}
-@@ -755,7 +755,7 @@
- 	while (1) {
- 		if (!cursor->offset) {
- 			copy = html_cursor_dup (cursor);
--			if (backward (cursor)) {
-+			if (backward (cursor, engine)) {
- 				new_level = html_object_get_parent_level (cursor->object);
- 				if (new_level < level
- 				    || (new_level == level && flow != cursor->object->parent)) {
-@@ -767,7 +767,7 @@
- 				break;
- 		}
- 			else
--				if (!backward (cursor))
-+				if (!backward (cursor, engine))
- 					break;
- 		rv = TRUE;
- 	}
-@@ -794,7 +794,7 @@
- 	while (1) {
- 		if (cursor->offset == html_object_get_length (cursor->object)) {
- 			copy = html_cursor_dup (cursor);
--			if (forward (cursor)) {
-+			if (forward (cursor, engine)) {
- 				new_level = html_object_get_parent_level (cursor->object);
- 				if (new_level < level
- 				    || (new_level == level && flow != cursor->object->parent)) {
-@@ -806,7 +806,7 @@
- 				break;
- 		}
- 			else
--				if (!forward (cursor))
-+				if (!forward (cursor, engine))
- 					break;
- 		rv = TRUE;
- 	}
-
-
 --- orig/src/htmlengine-edit-cut-and-paste.c
 +++ mod/src/htmlengine-edit-cut-and-paste.c
 @@ -1445,14 +1445,15 @@
@@ -501,3 +354,148 @@
 +	object_class->backspace = html_text_backspace;
   	object_class->get_right_edge_offset = html_text_get_right_edge_offset;
  	object_class->get_left_edge_offset = html_text_get_left_edge_offset;
+--- gtkhtml-3.10.1/src/htmlcursor.c.fix-indic-navigation	2006-04-10 20:31:00.000000000 -0400
++++ gtkhtml-3.10.1/src/htmlcursor.c	2006-04-10 20:34:57.000000000 -0400
+@@ -203,12 +203,12 @@
+ 
+ 
+ static gboolean
+-forward (HTMLCursor *cursor)
++forward (HTMLCursor *cursor, HTMLEngine *engine)
+ {
+ 	gboolean retval;
+ 
+ 	retval = TRUE;
+-	if (!html_object_cursor_forward (cursor->object, cursor)) {
++	if (!html_object_cursor_forward (cursor->object, cursor, engine)) {
+ 		HTMLObject *next;
+ 
+ 		next = html_object_next_cursor (cursor->object, &cursor->offset);
+@@ -237,7 +237,7 @@
+ 		html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
+ 
+ 	cursor->have_target_x = FALSE;
+-	retval = forward (cursor);
++	retval = forward (cursor, engine);
+ 
+ 	debug_location (cursor);
+ 
+@@ -245,12 +245,12 @@
+ }
+ 
+ static gboolean
+-backward (HTMLCursor *cursor)
++backward (HTMLCursor *cursor, HTMLEngine *engine)
+ {
+ 	gboolean retval;
+ 
+ 	retval = TRUE;
+-	if (!html_object_cursor_backward (cursor->object, cursor)) {
++	if (!html_object_cursor_backward (cursor->object, cursor, engine)) {
+ 		HTMLObject *prev;
+ 
+ 		prev = html_object_prev_cursor (cursor->object, &cursor->offset);
+@@ -280,7 +280,7 @@
+ 		html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
+ 
+ 	cursor->have_target_x = FALSE;
+-	retval = backward (cursor);
++	retval = backward (cursor, engine);
+ 
+ 	debug_location (cursor);
+ 
+@@ -337,7 +337,7 @@
+ 		prev_x = x;
+ 		prev_y = y;
+ 
+-		if (! backward (cursor))
++		if (! backward (cursor, engine))
+ 			return FALSE;
+ 
+ 		html_object_get_cursor_base (cursor->object,
+@@ -556,14 +556,14 @@
+ 
+ 	html_cursor_copy (&original, cursor);
+ 
+-	while (forward (cursor)) {
++	while (forward (cursor, engine)) {
+ 		if (cursor->object == object && cursor->offset == offset)
+ 			return TRUE;
+ 	}
+ 
+ 	html_cursor_copy (cursor, &original);
+ 
+-	while (backward (cursor)) {
++	while (backward (cursor, engine)) {
+ 		if (cursor->object == object && cursor->offset == offset)
+ 			return TRUE;
+ 	}
+@@ -587,7 +587,7 @@
+ 	if (engine->need_spell_check)
+ 		html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
+ 
+-	while (backward (cursor))
++	while (backward (cursor, engine))
+ 		;
+ }
+ 
+@@ -604,7 +604,7 @@
+ 	if (engine->need_spell_check)
+ 		html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
+ 
+-	while (forward (cursor))
++	while (forward (cursor, engine))
+ 		;
+ }
+ 
+@@ -640,12 +640,12 @@
+ 
+ 	if (cursor->position < position) {
+ 		while (cursor->position < position) {
+-			if (! forward (cursor))
++			if (! forward (cursor, engine))
+ 				break;
+ 		}
+ 	} else if (cursor->position > position) {
+ 		while (cursor->position > position) {
+-			if (! backward (cursor))
++			if (! backward (cursor, engine))
+ 				break;
+ 		}
+ 	}
+@@ -749,7 +749,7 @@
+ 	while (1) {
+ 		if (!cursor->offset) {
+ 			html_cursor_copy (&copy, cursor);
+-			if (backward (cursor)) {
++			if (backward (cursor, engine)) {
+ 				new_level = html_object_get_parent_level (cursor->object);
+ 				if (new_level < level
+ 				    || (new_level == level && flow != cursor->object->parent)) {
+@@ -760,7 +760,7 @@
+ 				break;
+ 		}
+ 			else
+-				if (!backward (cursor))
++				if (!backward (cursor, engine))
+ 					break;
+ 		rv = TRUE;
+ 	}
+@@ -787,7 +787,7 @@
+ 	while (1) {
+ 		if (cursor->offset == html_object_get_length (cursor->object)) {
+ 			html_cursor_copy (&copy, cursor);
+-			if (forward (cursor)) {
++			if (forward (cursor, engine)) {
+ 				new_level = html_object_get_parent_level (cursor->object);
+ 				if (new_level < level
+ 				    || (new_level == level && flow != cursor->object->parent)) {
+@@ -798,7 +798,7 @@
+ 				break;
+ 		}
+ 			else
+-				if (!forward (cursor))
++				if (!forward (cursor, engine))
+ 					break;
+ 		rv = TRUE;
+ 	}


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/FC-5/gtkhtml3.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- gtkhtml3.spec	13 Mar 2006 16:54:41 -0000	1.58
+++ gtkhtml3.spec	11 Apr 2006 00:41:44 -0000	1.59
@@ -4,8 +4,8 @@
 
 Summary: gtkhtml library
 Name: gtkhtml3
-Version: 3.10.0
-Release: 1
+Version: 3.10.1
+Release: 1.fc5.1
 License: LGPL/GPL
 Group: System Environment/Libraries
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/gtkhtml/gtkhtml-%{version}.tar.bz2
@@ -27,6 +27,7 @@
 # Patches from bugzilla.ximian.com #65670, #66206
 Patch2: gtkhtml-3.3.2-imcommit.patch
 Patch3: gtkhtml-fix-indic-navigation-129212.patch
+Patch4: gtkhtml-3.10.0-im-too-late.patch
 
 %description
 GtkHTML is a lightweight HTML rendering/printing/editing engine.  It
@@ -50,6 +51,7 @@
 
 %patch1 -p1 -b .crash
 %patch3 -p1 -b .fix-129212
+%patch4 -p1 -b .im-too-late
 
 %build
 %configure
@@ -96,6 +98,13 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 3.10.1-1.fc5.1
+- Update to 3.10.1
+- Update patches
+
+* Fri Apr  7 2006 Dan Williams <dcbw at redhat.com> - 3.10.0-2
+- Fix crash with IM enabled
+
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 3.10.0-1
 - Update to 3.10.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/FC-5/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	13 Mar 2006 16:54:42 -0000	1.33
+++ sources	11 Apr 2006 00:41:44 -0000	1.34
@@ -1 +1 @@
-1d564a2d9a7a4911c8d1b50868acef81  gtkhtml-3.10.0.tar.bz2
+f2b7ff386dae9fcc3b01c4116564722d  gtkhtml-3.10.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 00:54:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 20:54:03 -0400
Subject: rpms/gtkhtml3/FC-5 gtkhtml-3.10.0-im-too-late.patch,NONE,1.1
Message-ID: <200604110054.k3B0s3rl018813@cvs.devel.redhat.com>

Author: mclasen

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

Added Files:
	gtkhtml-3.10.0-im-too-late.patch 
Log Message:
add patch from rawhide


gtkhtml-3.10.0-im-too-late.patch:
 gtkhtml.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE gtkhtml-3.10.0-im-too-late.patch ---
--- gtkhtml-3.10.0/src/gtkhtml.c.fix	2006-04-07 08:54:58.000000000 -0700
+++ gtkhtml-3.10.0/src/gtkhtml.c	2006-04-07 08:55:54.000000000 -0700
@@ -3181,10 +3181,14 @@
 	PangoAttrList *attrs;
 	gchar *preedit_string;
 	gint cursor_pos, initial_position;
-	gboolean state = html->priv->im_block_reset;
+	gboolean state;
 	gboolean pop_selection = FALSE;
 	gint deleted = 0;
 
+	g_return_if_fail (html->priv != NULL);
+
+	state = html->priv->im_block_reset;
+
 	D_IM (printf ("IM preedit changed cb [begin] cursor %d(%p) mark %d(%p) active: %d\n",
 		      html->engine->cursor ? html->engine->cursor->position : 0, html->engine->cursor,
 		      html->engine->mark ? html->engine->mark->position : 0, html->engine->mark,



From fedora-cvs-commits at redhat.com  Tue Apr 11 00:59:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 20:59:36 -0400
Subject: rpms/evolution-data-server/devel .cvsignore, 1.41,
	1.42 evolution-data-server.spec, 1.87, 1.88 sources, 1.41, 1.42
Message-ID: <200604110059.k3B0xaUf018905@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Log Message:
1.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	13 Mar 2006 17:14:05 -0000	1.41
+++ .cvsignore	11 Apr 2006 00:59:34 -0000	1.42
@@ -1 +1,2 @@
 evolution-data-server-1.6.0.tar.bz2
+evolution-data-server-1.6.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.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- evolution-data-server.spec	13 Mar 2006 17:14:05 -0000	1.87
+++ evolution-data-server.spec	11 Apr 2006 00:59:34 -0000	1.88
@@ -24,8 +24,8 @@
 
 Summary: Backend data server for evolution
 Name: evolution-data-server
-Version: 1.6.0
-Release: 1
+Version: 1.6.1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
@@ -321,6 +321,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 1.8.1-2
+- Update to 1.6.1
+
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 1.6.0-1
 - 1.6.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	13 Mar 2006 17:14:05 -0000	1.41
+++ sources	11 Apr 2006 00:59:34 -0000	1.42
@@ -1 +1 @@
-1d775148a4f88559cb375924b9f7b79f  evolution-data-server-1.6.0.tar.bz2
+d4def6cad1dc3508b8df55e7e794db49  evolution-data-server-1.6.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 01:12:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 21:12:50 -0400
Subject: rpms/evolution-data-server/FC-5 evolution-data-server.spec, 1.87,
	1.88 sources, 1.41, 1.42
Message-ID: <200604110112.k3B1CofQ019097@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	evolution-data-server.spec sources 
Log Message:
1.6.1



Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/FC-5/evolution-data-server.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- evolution-data-server.spec	13 Mar 2006 17:14:05 -0000	1.87
+++ evolution-data-server.spec	11 Apr 2006 01:12:47 -0000	1.88
@@ -24,8 +24,8 @@
 
 Summary: Backend data server for evolution
 Name: evolution-data-server
-Version: 1.6.0
-Release: 1
+Version: 1.6.1
+Release: 1.fc5.1
 License: LGPL
 Group: System Environment/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
@@ -321,6 +321,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 1.6.1-1.fc5.1
+- Update to 1.6.1
+
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 1.6.0-1
 - 1.6.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/FC-5/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	13 Mar 2006 17:14:05 -0000	1.41
+++ sources	11 Apr 2006 01:12:47 -0000	1.42
@@ -1 +1 @@
-1d775148a4f88559cb375924b9f7b79f  evolution-data-server-1.6.0.tar.bz2
+d4def6cad1dc3508b8df55e7e794db49  evolution-data-server-1.6.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 01:35:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 21:35:29 -0400
Subject: rpms/evolution-connector/devel .cvsignore, 1.29,
	1.30 evolution-connector.spec, 1.55, 1.56 sources, 1.29, 1.30
Message-ID: <200604110135.k3B1ZTIh000711@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore evolution-connector.spec sources 
Log Message:
1.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	13 Mar 2006 17:09:15 -0000	1.29
+++ .cvsignore	11 Apr 2006 01:35:25 -0000	1.30
@@ -1 +1,2 @@
 evolution-exchange-2.6.0.tar.bz2
+evolution-exchange-2.6.1.tar.bz2


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- evolution-connector.spec	13 Mar 2006 17:09:15 -0000	1.55
+++ evolution-connector.spec	11 Apr 2006 01:35:25 -0000	1.56
@@ -6,8 +6,8 @@
 %define plibdir %(pkg-config evolution-shell-%{evo_major} --variable=privlibdir 2>/dev/null)
 
 Name: evolution-connector
-Version: 2.6.0
-Release: 1
+Version: 2.6.1
+Release: 2
 License: GPL
 Group: Applications/Productivity
 URL:  http://ftp.gnome.org/pub/gnome/sources/evolution-exchange/2.4/
@@ -96,6 +96,9 @@
 %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.6.1-2
+- Update to 2.6.1
+
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 2.6.0-1
 - 2.6.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	13 Mar 2006 17:09:16 -0000	1.29
+++ sources	11 Apr 2006 01:35:25 -0000	1.30
@@ -1 +1 @@
-f83177e571fdac31e6d32904a46a2029  evolution-exchange-2.6.0.tar.bz2
+027cc03c5d8f95f4eb26603781e49816  evolution-exchange-2.6.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 01:40:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 21:40:31 -0400
Subject: rpms/evolution-connector/FC-5 evolution-connector.spec, 1.55,
	1.56 sources, 1.29, 1.30
Message-ID: <200604110140.k3B1eVcW000812@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	evolution-connector.spec sources 
Log Message:
2.6.1



Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/FC-5/evolution-connector.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- evolution-connector.spec	13 Mar 2006 17:09:15 -0000	1.55
+++ evolution-connector.spec	11 Apr 2006 01:40:29 -0000	1.56
@@ -6,8 +6,8 @@
 %define plibdir %(pkg-config evolution-shell-%{evo_major} --variable=privlibdir 2>/dev/null)
 
 Name: evolution-connector
-Version: 2.6.0
-Release: 1
+Version: 2.6.1
+Release: 1.fc5.1
 License: GPL
 Group: Applications/Productivity
 URL:  http://ftp.gnome.org/pub/gnome/sources/evolution-exchange/2.4/
@@ -96,6 +96,9 @@
 %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.6.1-1.fc5.1
+- Update to 2.6.1
+
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 2.6.0-1
 - 2.6.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/FC-5/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	13 Mar 2006 17:09:16 -0000	1.29
+++ sources	11 Apr 2006 01:40:29 -0000	1.30
@@ -1 +1 @@
-f83177e571fdac31e6d32904a46a2029  evolution-exchange-2.6.0.tar.bz2
+027cc03c5d8f95f4eb26603781e49816  evolution-exchange-2.6.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 01:58:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 21:58:17 -0400
Subject: rpms/evolution-connector/devel
	evolution-connector-2.6.1-generated-autotool.patch, NONE,
	1.1 evolution-connector.spec, 1.56,
	1.57 ximian-connector-2.1.4-generated-autotool.patch, 1.13, NONE
Message-ID: <200604110158.k3B1wHjq014979@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	evolution-connector.spec 
Added Files:
	evolution-connector-2.6.1-generated-autotool.patch 
Removed Files:
	ximian-connector-2.1.4-generated-autotool.patch 
Log Message:
update patches


evolution-connector-2.6.1-generated-autotool.patch:
 acinclude.m4   |   22 ++
 aclocal.m4     |  389 ++++++++++++++++-------------------------------
 autom4te.cache |only
 configure      |  465 +++++++++++++++++++++++++--------------------------------
 4 files changed, 363 insertions(+), 513 deletions(-)

--- NEW FILE evolution-connector-2.6.1-generated-autotool.patch ---
diff -u -r evolution-exchange-2.6.1-pristine/acinclude.m4 evolution-exchange-2.6.1/acinclude.m4
--- evolution-exchange-2.6.1-pristine/acinclude.m4	2004-08-13 14:16:45.000000000 -0400
+++ evolution-exchange-2.6.1/acinclude.m4	2006-04-10 21:53:05.000000000 -0400
@@ -34,6 +34,18 @@
 	AC_ARG_WITH(openldap,     [  --with-openldap=[no/yes/PREFIX]      Enable LDAP support in evolution])
 	AC_ARG_WITH(static-ldap,  [  --with-static-ldap=[no/yes]          Link LDAP support statically into evolution ])
 	AC_CACHE_CHECK([for OpenLDAP], ac_cv_with_openldap, ac_cv_with_openldap="${with_openldap:=$default}")
+
+	AC_MSG_CHECKING(for multilib subdirectory)
+	if test "$GCC" = "yes" ; then
+		multilibsubdir=`$CC -print-multi-os-directory 2> /dev/null`
+	fi
+	multilibsubdir=${multilibsubdir:-.}
+	AC_MSG_RESULT($multilibsubdir)
+	AC_MSG_CHECKING(for lib subdirectory)
+	libsubdir=`echo lib/${multilibsubdir} | sed -re 's,lib/../([[^/]]*),\1,g'`
+	libsubdir=${libsubdir:-lib}
+	AC_MSG_RESULT($libsubdir)
+
 	case $ac_cv_with_openldap in
 	no|"")
 		with_openldap=no
@@ -44,7 +56,7 @@
 	*)
 		with_openldap=$ac_cv_with_openldap
 		LDAP_CFLAGS="-I$ac_cv_with_openldap/include"
-		LDAP_LDFLAGS="-L$ac_cv_with_openldap/lib"
+		LDAP_LDFLAGS="-L$ac_cv_with_openldap/$libsubdir"
 		;;
 	esac
 
@@ -80,20 +92,20 @@
 		AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")
 		AC_CHECK_LIB(lber, ber_get_tag, [
 			if test "$with_static_ldap" = "yes"; then
-				LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"
+				LDAP_LIBS="$with_openldap/$libsubdir/liblber.a $LDAP_LIBS"
 
 				# libldap might depend on OpenSSL... We need to pull
 				# in the dependency libs explicitly here since we're
 				# not using libtool for the configure test.
-				if test -f $with_openldap/lib/libldap.la; then
-					LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
+				if test -f $with_openldap/$libsubdir/libldap.la; then
+					LDAP_LIBS="`. $with_openldap/$libsubdir/libldap.la; echo $dependency_libs` $LDAP_LIBS"
 				fi
 			else
 				LDAP_LIBS="-llber $LDAP_LIBS"
 			fi
 			AC_CHECK_LIB(ldap, ldap_open, [
 					if test $with_static_ldap = "yes"; then
-						LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS"
+						LDAP_LIBS="$with_openldap/$libsubdir/libldap.a $LDAP_LIBS"
 					else
 						LDAP_LIBS="-lldap $LDAP_LIBS"
 					fi],
diff -u -r evolution-exchange-2.6.1-pristine/aclocal.m4 evolution-exchange-2.6.1/aclocal.m4
--- evolution-exchange-2.6.1-pristine/aclocal.m4	2006-04-10 08:35:13.000000000 -0400
+++ evolution-exchange-2.6.1/aclocal.m4	2006-04-10 21:54:19.000000000 -0400
@@ -47,6 +47,18 @@
 	AC_ARG_WITH(openldap,     [  --with-openldap=[no/yes/PREFIX]      Enable LDAP support in evolution])
 	AC_ARG_WITH(static-ldap,  [  --with-static-ldap=[no/yes]          Link LDAP support statically into evolution ])
 	AC_CACHE_CHECK([for OpenLDAP], ac_cv_with_openldap, ac_cv_with_openldap="${with_openldap:=$default}")
+
+	AC_MSG_CHECKING(for multilib subdirectory)
+	if test "$GCC" = "yes" ; then
+		multilibsubdir=`$CC -print-multi-os-directory 2> /dev/null`
+	fi
+	multilibsubdir=${multilibsubdir:-.}
+	AC_MSG_RESULT($multilibsubdir)
+	AC_MSG_CHECKING(for lib subdirectory)
+	libsubdir=`echo lib/${multilibsubdir} | sed -re 's,lib/../([[^/]]*),\1,g'`
+	libsubdir=${libsubdir:-lib}
+	AC_MSG_RESULT($libsubdir)
+
 	case $ac_cv_with_openldap in
 	no|"")
 		with_openldap=no
@@ -57,7 +69,7 @@
 	*)
 		with_openldap=$ac_cv_with_openldap
 		LDAP_CFLAGS="-I$ac_cv_with_openldap/include"
-		LDAP_LDFLAGS="-L$ac_cv_with_openldap/lib"
+		LDAP_LDFLAGS="-L$ac_cv_with_openldap/$libsubdir"
 		;;
 	esac
 
@@ -93,20 +105,20 @@
 		AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")
 		AC_CHECK_LIB(lber, ber_get_tag, [
 			if test "$with_static_ldap" = "yes"; then
-				LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"
+				LDAP_LIBS="$with_openldap/$libsubdir/liblber.a $LDAP_LIBS"
 
 				# libldap might depend on OpenSSL... We need to pull
 				# in the dependency libs explicitly here since we're
 				# not using libtool for the configure test.
-				if test -f $with_openldap/lib/libldap.la; then
-					LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
+				if test -f $with_openldap/$libsubdir/libldap.la; then
+					LDAP_LIBS="`. $with_openldap/$libsubdir/libldap.la; echo $dependency_libs` $LDAP_LIBS"
 				fi
 			else
 				LDAP_LIBS="-llber $LDAP_LIBS"
 			fi
 			AC_CHECK_LIB(ldap, ldap_open, [
 					if test $with_static_ldap = "yes"; then
-						LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS"
+						LDAP_LIBS="$with_openldap/$libsubdir/libldap.a $LDAP_LIBS"
 					else
 						LDAP_LIBS="-lldap $LDAP_LIBS"
 					fi],
@@ -7475,52 +7487,30 @@
 
 AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
 
-# isc-posix.m4 serial 2 (gettext-0.11.2)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-# This file is not needed with autoconf-2.53 and newer.  Remove it in 2005.
-
-# This test replaces the one in autoconf.
-# Currently this macro should have the same name as the autoconf macro
-# because gettext's gettext.m4 (distributed in the automake package)
-# still uses it.  Otherwise, the use in gettext.m4 makes autoheader
-# give these diagnostics:
-#   configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
-#   configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
-
-undefine([AC_ISC_POSIX])
-
-AC_DEFUN([AC_ISC_POSIX],
-  [
-    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
-    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
-  ]
-)
-
 
 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
 # serial 2 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. '{ printf "%d", $[1] * 100 + $[2]; }'`
-    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { printf $[2]; }'  < ${ac_aux_dir}/intltool-update.in`
-    changequote({{,}})
-    INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split(${{2}}, VERSION, "."); printf "%d\n", VERSION[1] * 100 + VERSION[2];}' < ${ac_aux_dir}/intltool-update.in`
-    changequote([,])
-
-    if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT"; then
-	AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-    else
-	AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found. Your intltool is too old.  You need intltool $1 or later.])
-	exit 1
-    fi
+    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 100 + $ 2; }'`
+    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] * 100 + VERSION[2];}' ${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 $< [$]@' 
@@ -7540,6 +7530,7 @@
     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)
@@ -7558,16 +7549,12 @@
 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.
-
-INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
-INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
-INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
-
-AC_SUBST(INTLTOOL_EXTRACT)
-AC_SUBST(INTLTOOL_MERGE)
-AC_SUBST(INTLTOOL_UPDATE)
+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
@@ -7590,76 +7577,93 @@
 AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
 AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
 
-# Remove file type tags (using []) from po/POTFILES.
-
-ifdef([AC_DIVERSION_ICMDS],[
-  AC_DIVERT_PUSH(AC_DIVERSION_ICMDS)
-     [mv -f po/POTFILES po/POTFILES.tmp
-      sed -e '/[[]encoding.*]/d' -e 's/[[].*] *//' < po/POTFILES.tmp > po/POTFILES
-      rm -f po/POTFILES.tmp
-     ]dnl
-  AC_DIVERT_POP()
-],[
-  ifdef([AC_CONFIG_COMMANDS_PRE],[
-    AC_CONFIG_COMMANDS_PRE([
-       [mv -f po/POTFILES po/POTFILES.tmp
-        sed -e '/[[]encoding.*]/d' -e 's/[[].*] *//' < po/POTFILES.tmp > po/POTFILES
-        rm -f po/POTFILES.tmp
-       ]dnl
-    ])
-  ])
-])
+IT_PO_SUBDIR([po])
 
-# Manually sed perl in so people don't have to put the intltool scripts in AC_OUTPUT.
+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], [
 
-intltool_edit="-e 's#@INTLTOOL_EXTRACT@#`pwd`/intltool-extract#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'"
-
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-extract.in \
-  > intltool-extract.out
-if cmp -s intltool-extract intltool-extract.out 2>/dev/null; then
-  rm -f intltool-extract.out
-else
-  mv -f intltool-extract.out intltool-extract
-fi
-chmod ugo+x intltool-extract
-chmod u+w intltool-extract
+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
 
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-merge.in \
-  > intltool-merge.out
-if cmp -s intltool-merge intltool-merge.out 2>/dev/null; then
-  rm -f intltool-merge.out
-else
-  mv -f intltool-merge.out intltool-merge
-fi
-chmod ugo+x intltool-merge
-chmod u+w intltool-merge
+],
+[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}'])
 
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-update.in \
-  > intltool-update.out
-if cmp -s intltool-update intltool-update.out 2>/dev/null; then
-  rm -f intltool-update.out
-else
-  mv -f intltool-update.out intltool-update
-fi
-chmod ugo+x intltool-update
-chmod u+w intltool-update
+])
 
-], INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir=${ac_aux_dir}
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' ICONV='${INTLTOOL_ICONV}'
-MSGFMT='${INTLTOOL_MSGFMT}' MSGMERGE='${INTLTOOL_MSGMERGE}'
-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
-AC_DEFUN([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL($@)])
+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
+# A hint is needed for aclocal from Automake <= 1.9.4:
+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
 
 
 # Copyright (C) 1995-2002 Free Software Foundation, Inc.
@@ -8003,6 +8007,18 @@
      fi
    fi
 
+   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+   dnl Try to locate is.
+   MKINSTALLDIRS=
+   if test -n "$ac_aux_dir"; then
+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+   fi
+   if test -z "$MKINSTALLDIRS"; then
+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+   fi
+   AC_SUBST(MKINSTALLDIRS)
+
    dnl Generate list of files to be processed by xgettext which will
    dnl be included in po/Makefile.
    test -d po || mkdir po
@@ -8049,148 +8065,6 @@
 AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
 ])dnl
 
-dnl GNOME_COMPILE_WARNINGS
-dnl Turn on many useful compiler warnings
-dnl For now, only works on GCC
-AC_DEFUN([GNOME_COMPILE_WARNINGS],[
-    dnl ******************************
-    dnl More compiler warnings
-    dnl ******************************
-
-    AC_ARG_ENABLE(compile-warnings, 
-                  AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
-                                 [Turn on compiler warnings]),,
-                  [enable_compile_warnings="m4_default([$1],[yes])"])
-
-    warnCFLAGS=
-    if test "x$GCC" != xyes; then
-	enable_compile_warnings=no
-    fi
-
-    warning_flags=
-    realsave_CFLAGS="$CFLAGS"
-
-    case "$enable_compile_warnings" in
-    no)
-	warning_flags=
-	;;
-    minimum)
-	warning_flags="-Wall"
-	;;
-    yes)
-	warning_flags="-Wall -Wmissing-prototypes"
-	;;
-    maximum|error)
-	warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
-	CFLAGS="$warning_flags $CFLAGS"
-	for option in -Wno-sign-compare; do
-		SAVE_CFLAGS="$CFLAGS"
-		CFLAGS="$CFLAGS $option"
-		AC_MSG_CHECKING([whether gcc understands $option])
-		AC_TRY_COMPILE([], [],
-			has_option=yes,
-			has_option=no,)
-		CFLAGS="$SAVE_CFLAGS"
-		AC_MSG_RESULT($has_option)
-		if test $has_option = yes; then
-		  warning_flags="$warning_flags $option"
-		fi
-		unset has_option
-		unset SAVE_CFLAGS
-	done
-	unset option
-	if test "$enable_compile_warnings" = "error" ; then
-	    warning_flags="$warning_flags -Werror"
-	fi
-	;;
-    *)
-	AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
-	;;
-    esac
-    CFLAGS="$realsave_CFLAGS"
-    AC_MSG_CHECKING(what warning flags to pass to the C compiler)
-    AC_MSG_RESULT($warning_flags)
-
-    AC_ARG_ENABLE(iso-c,
-                  AC_HELP_STRING([--enable-iso-c],
-                                 [Try to warn if code is not ISO C ]),,
-                  [enable_iso_c=no])
-
-    AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
-    complCFLAGS=
-    if test "x$enable_iso_c" != "xno"; then
-	if test "x$GCC" = "xyes"; then
-	case " $CFLAGS " in
-	    *[\ \	]-ansi[\ \	]*) ;;
-	    *) complCFLAGS="$complCFLAGS -ansi" ;;
-	esac
-	case " $CFLAGS " in
-	    *[\ \	]-pedantic[\ \	]*) ;;
-	    *) complCFLAGS="$complCFLAGS -pedantic" ;;
-	esac
-	fi
-    fi
-    AC_MSG_RESULT($complCFLAGS)
-
-    WARN_CFLAGS="$warning_flags $complCFLAGS"
-    AC_SUBST(WARN_CFLAGS)
-])
-
-dnl For C++, do basically the same thing.
-
-AC_DEFUN([GNOME_CXX_WARNINGS],[
-  AC_ARG_ENABLE(cxx-warnings,
-                AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
-                               [Turn on compiler warnings.]),,
-                [enable_cxx_warnings="m4_default([$1],[minimum])"])
-
-  AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
-  warnCXXFLAGS=
-  if test "x$GCC" != xyes; then
-    enable_compile_warnings=no
-  fi
-  if test "x$enable_cxx_warnings" != "xno"; then
-    if test "x$GCC" = "xyes"; then
-      case " $CXXFLAGS " in
-      *[\ \	]-Wall[\ \	]*) ;;
-      *) warnCXXFLAGS="-Wall -Wno-unused" ;;
-      esac
-
-      ## -W is not all that useful.  And it cannot be controlled
-      ## with individual -Wno-xxx flags, unlike -Wall
-      if test "x$enable_cxx_warnings" = "xyes"; then
-	warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
-      fi
-    fi
-  fi
-  AC_MSG_RESULT($warnCXXFLAGS)
-
-   AC_ARG_ENABLE(iso-cxx,
-                 AC_HELP_STRING([--enable-iso-cxx],
-                                [Try to warn if code is not ISO C++ ]),,
-                 [enable_iso_cxx=no])
-
-   AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
-   complCXXFLAGS=
-   if test "x$enable_iso_cxx" != "xno"; then
-     if test "x$GCC" = "xyes"; then
-      case " $CXXFLAGS " in
-      *[\ \	]-ansi[\ \	]*) ;;
-      *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
-      esac
-
-      case " $CXXFLAGS " in
-      *[\ \	]-pedantic[\ \	]*) ;;
-      *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
-      esac
-     fi
-   fi
-  AC_MSG_RESULT($complCXXFLAGS)
-
-  WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-  AC_SUBST(WARN_CXXFLAGS)
-])
-
 # Configure paths for GLIB
 # Owen Taylor     1997-2001
 
@@ -8455,11 +8329,20 @@
   AC_MSG_CHECKING(for ORBit - version >= $min_orbit_version)
   no_orbit=""
   if test "$ORBIT_CONFIG" = "no" ; then
-    no_orbit=yes
+    if test "$PKG_CONFIG" = "no" ; then
+      no_orbit=yes
+    else
+      ORBIT_CFLAGS=`$PKG_CONFIG --cflags ORBit-2.0`
+      ORBIT_LIBS=`$PKG_CONFIG --libs ORBit-2.0`
+    fi
   else
     ORBIT_CFLAGS=`$ORBIT_CONFIG $orbit_config_args --cflags`
     ORBIT_LIBS=`$ORBIT_CONFIG $orbit_config_args --libs`
+  fi
+
+  if test "x$no_orbit" = x ; then
     ORBIT_VERSION=`$PKG_CONFIG --modversion ORBit-2.0`
+
     orbit_config_major_version=`echo $ORBIT_VERSION | \
 	   sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
     orbit_config_minor_version=`echo $ORBIT_VERSION | \
Only in evolution-exchange-2.6.1: autom4te.cache
diff -u -r evolution-exchange-2.6.1-pristine/configure evolution-exchange-2.6.1/configure
--- evolution-exchange-2.6.1-pristine/configure	2006-04-10 08:35:18.000000000 -0400
+++ evolution-exchange-2.6.1/configure	2006-04-10 21:54:26.000000000 -0400
@@ -465,7 +465,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot EVOLUTION_VERSION BASE_VERSION API_VERSION EDS_BASE_VERSION MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT 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 CPP EGREP LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastd!
 epCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB GETTEXT_PACKAGE localedir NO_UNDEFINED SOCKET_LIBS WARN_CFLAGS PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS ORBIT_CONFIG ORBIT_IDL ORBIT_CFLAGS ORBIT_LIBS GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE C!
 ONNECTOR_DATADIR EVOLUTION_idldir EVOLUTION_IDL_INCLUDES EVOLU!
 TION_pri
vlibdir EVOLUTION_privlibexecdir EVOLUTION_privdatadir EVOLUTION_imagesdir CAMEL_providerdir ac_pt_PKG_CONFIG ADDRESSBOOK_CFLAGS ADDRESSBOOK_LIBS CALENDAR_CFLAGS CALENDAR_LIBS CAMEL_CFLAGS CAMEL_LIBS MAIL_CFLAGS MAIL_LIBS SOUP_CFLAGS SOUP_LIBS EXCHANGE_STORAGE_CFLAGS EXCHANGE_STORAGE_LIBS LIBEXCHANGE_CFLAGS LIBEXCHANGE_LIBS PTHREAD_LIB LDAP_CFLAGS LDAP_LIBS ENABLE_LDAP_TRUE ENABLE_LDAP_FALSE HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot EVOLUTION_VERSION BASE_VERSION API_VERSION EDS_BASE_VERSION MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT 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 CPP EGREP LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastd!
 epCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS GETTEXT_PACKAGE localedir NO_UNDEFINED SOCKET_LIBS PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS ORBIT_CONFIG ORBIT_IDL ORBIT_CFLAGS ORBIT_LIBS GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF!
 _SCHEMAS_INSTALL_FALSE CONNECTOR_DATADIR EVOLUTION_idldir EVOL!
 UTION_ID
L_INCLUDES EVOLUTION_privlibdir EVOLUTION_privlibexecdir EVOLUTION_privdatadir EVOLUTION_imagesdir CAMEL_providerdir ac_pt_PKG_CONFIG ADDRESSBOOK_CFLAGS ADDRESSBOOK_LIBS CALENDAR_CFLAGS CALENDAR_LIBS CAMEL_CFLAGS CAMEL_LIBS MAIL_CFLAGS MAIL_LIBS SOUP_CFLAGS SOUP_LIBS EXCHANGE_STORAGE_CFLAGS EXCHANGE_STORAGE_LIBS LIBEXCHANGE_CFLAGS LIBEXCHANGE_LIBS PTHREAD_LIB LDAP_CFLAGS LDAP_LIBS ENABLE_LDAP_TRUE ENABLE_LDAP_FALSE HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1098,9 +1098,6 @@
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-compile-warnings=[no/minimum/yes/maximum/error]
-                          Turn on compiler warnings
-  --enable-iso-c          Try to warn if code is not ISO C
   --disable-glibtest      do not try to compile and run a test GLIB program
   --disable-orbittest       Do not try to compile and run a test ORBIT program
   --disable-schemas-install	Disable the schemas installation
@@ -3199,14 +3196,13 @@
 
 
 
-
-        echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
-echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6
-if test "${ac_cv_lib_cposix_strerror+set}" = set; then
+echo "$as_me:$LINENO: checking for library containing strerror" >&5
+echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
+if test "${ac_cv_search_strerror+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcposix  $LIBS"
+  ac_func_search_save_LIBS=$LIBS
+ac_cv_search_strerror=no
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3251,24 +3247,80 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_cposix_strerror=yes
+  ac_cv_search_strerror="none required"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_cposix_strerror=no
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+if test "$ac_cv_search_strerror" = no; then
+  for ac_lib in cposix; do
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+    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 strerror ();
+int
+main ()
+{
+strerror ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_search_strerror="-l$ac_lib"
+break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
-echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6
-if test $ac_cv_lib_cposix_strerror = yes; then
-  LIBS="$LIBS -lcposix"
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+  done
 fi
+LIBS=$ac_func_search_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
+echo "${ECHO_T}$ac_cv_search_strerror" >&6
+if test "$ac_cv_search_strerror" != no; then
+  test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
 
-
+fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -5230,7 +5282,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5233 "configure"' > conftest.$ac_ext
+  echo '#line 5285 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6421,7 +6473,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:6424:" \
+echo "$as_me:6476:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -7484,11 +7536,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7487: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7539: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7491: \$? = $ac_status" >&5
+   echo "$as_me:7543: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7752,11 +7804,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7755: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7807: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7759: \$? = $ac_status" >&5
+   echo "$as_me:7811: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7856,11 +7908,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7859: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7911: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7863: \$? = $ac_status" >&5
+   echo "$as_me:7915: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9325,7 +9377,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 9328 "configure"' > conftest.$ac_ext
+    echo '#line 9380 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -10222,7 +10274,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10225 "configure"
+#line 10277 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10322,7 +10374,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10325 "configure"
+#line 10377 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12662,11 +12714,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12665: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12717: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12669: \$? = $ac_status" >&5
+   echo "$as_me:12721: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -12766,11 +12818,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12769: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12821: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12773: \$? = $ac_status" >&5
+   echo "$as_me:12825: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13302,7 +13354,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 13305 "configure"' > conftest.$ac_ext
+    echo '#line 13357 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -14357,11 +14409,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14360: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14412: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14364: \$? = $ac_status" >&5
+   echo "$as_me:14416: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14461,11 +14513,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14464: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14516: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14468: \$? = $ac_status" >&5
+   echo "$as_me:14520: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15910,7 +15962,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 15913 "configure"' > conftest.$ac_ext
+    echo '#line 15965 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -16685,11 +16737,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16688: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16740: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16692: \$? = $ac_status" >&5
+   echo "$as_me:16744: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16953,11 +17005,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16956: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17008: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16960: \$? = $ac_status" >&5
+   echo "$as_me:17012: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -17057,11 +17109,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17060: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17112: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17064: \$? = $ac_status" >&5
+   echo "$as_me:17116: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18526,7 +18578,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 18529 "configure"' > conftest.$ac_ext
+    echo '#line 18581 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -19749,25 +19801,30 @@
 ALL_LINGUAS="ar az bg bn ca cs cy da de dz el en_CA en_GB es et fa fi fr gl gu hi hu id it ja ko ku lt mk ms nb ne nl nn no pa pl pt pt_BR ro ru rw sk sq sr sr at Latn sv ta th tr uk vi xh zh_CN zh_HK zh_TW"
 
 
+case "$am__api_version" in
+    1.01234)
+	{ { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
+echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
+   { (exit 1); exit 1; }; }
+    ;;
+    *)
+    ;;
+esac
 
 if test -n ""; then
     echo "$as_me:$LINENO: checking for intltool >= " >&5
 echo $ECHO_N "checking for intltool >= ... $ECHO_C" >&6
 
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo  | awk -F. '{ printf "%d", $1 * 100 + $2; }'`
-    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { printf $2; }'  < ${ac_aux_dir}/intltool-update.in`
-
-    INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($2, VERSION, "."); printf "%d\n", VERSION[1] * 100 + VERSION[2];}' < ${ac_aux_dir}/intltool-update.in`
-
+    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo  | awk -F. '{ print $ 1 * 100 + $ 2; }'`
+    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] * 100 + VERSION[2];}' ${ac_aux_dir}/intltool-update.in`
 
-    if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT"; then
-	echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
+    echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
 echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6
-    else
-	echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found. Your intltool is too old.  You need intltool  or later." >&5
-echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found. Your intltool is too old.  You need intltool  or later." >&6
-	exit 1
-    fi
+    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+	{ { echo "$as_me:$LINENO: error: Your intltool is too old.  You need intltool  or later." >&5
+echo "$as_me: error: Your intltool is too old.  You need intltool  or later." >&2;}
+   { (exit 1); exit 1; }; }
 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 $< $@'
@@ -19787,6 +19844,7 @@
     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 $< $@'
 
 
 
@@ -19806,14 +19864,13 @@
 
 
 
-# Use the tools built into the package, not the ones that are installed.
 
+# Use the tools built into the package, not the ones that are installed.
 INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
-INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
-INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
-
 
+INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
 
+INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
 
 
 # Extract the first word of "perl", so it can be a program name with args.
@@ -20039,16 +20096,9 @@
 fi
 
 
-# Remove file type tags (using []) from po/POTFILES.
 
 
 
-
-
-
-
-# Manually sed perl in so people don't have to put the intltool scripts in AC_OUTPUT.
-
           ac_config_commands="$ac_config_commands intltool"
 
 
@@ -21598,6 +21648,15 @@
      fi
    fi
 
+            MKINSTALLDIRS=
+   if test -n "$ac_aux_dir"; then
+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+   fi
+   if test -z "$MKINSTALLDIRS"; then
+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+   fi
+
+
          test -d po || mkdir po
    if test "x$srcdir" != "x."; then
      if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
@@ -21644,142 +21703,7 @@
 
 
 
-
-
-    # Check whether --enable-compile-warnings or --disable-compile-warnings was given.
-if test "${enable_compile_warnings+set}" = set; then
-  enableval="$enable_compile_warnings"
-
-else
-  enable_compile_warnings="maximum"
-fi;
-
-    warnCFLAGS=
-    if test "x$GCC" != xyes; then
-	enable_compile_warnings=no
-    fi
-
-    warning_flags=
-    realsave_CFLAGS="$CFLAGS"
-
-    case "$enable_compile_warnings" in
-    no)
-	warning_flags=
-	;;
-    minimum)
-	warning_flags="-Wall"
-	;;
-    yes)
-	warning_flags="-Wall -Wmissing-prototypes"
-	;;
-    maximum|error)
-	warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
-	CFLAGS="$warning_flags $CFLAGS"
-	for option in -Wno-sign-compare; do
-		SAVE_CFLAGS="$CFLAGS"
-		CFLAGS="$CFLAGS $option"
-		echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
-echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6
-		cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  has_option=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-has_option=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-		CFLAGS="$SAVE_CFLAGS"
-		echo "$as_me:$LINENO: result: $has_option" >&5
-echo "${ECHO_T}$has_option" >&6
-		if test $has_option = yes; then
-		  warning_flags="$warning_flags $option"
-		fi
-		unset has_option
-		unset SAVE_CFLAGS
-	done
-	unset option
-	if test "$enable_compile_warnings" = "error" ; then
-	    warning_flags="$warning_flags -Werror"
-	fi
-	;;
-    *)
-	{ { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
-echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
-   { (exit 1); exit 1; }; }
-	;;
-    esac
-    CFLAGS="$realsave_CFLAGS"
-    echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
-echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6
-    echo "$as_me:$LINENO: result: $warning_flags" >&5
-echo "${ECHO_T}$warning_flags" >&6
-
-    # Check whether --enable-iso-c or --disable-iso-c was given.
-if test "${enable_iso_c+set}" = set; then
-  enableval="$enable_iso_c"
-
-else
-  enable_iso_c=no
-fi;
-
-    echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
-echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6
-    complCFLAGS=
-    if test "x$enable_iso_c" != "xno"; then
-	if test "x$GCC" = "xyes"; then
-	case " $CFLAGS " in
-	    *\ \	-ansi\ \	*) ;;
-	    *) complCFLAGS="$complCFLAGS -ansi" ;;
-	esac
-	case " $CFLAGS " in
-	    *\ \	-pedantic\ \	*) ;;
-	    *) complCFLAGS="$complCFLAGS -pedantic" ;;
-	esac
-	fi
-    fi
-    echo "$as_me:$LINENO: result: $complCFLAGS" >&5
-echo "${ECHO_T}$complCFLAGS" >&6
-
-    WARN_CFLAGS="$warning_flags $complCFLAGS"
-
-
+GNOME_COMPILE_WARNINGS(maximum)
 CFLAGS="$CFLAGS $WARN_CFLAGS"
 case $CFLAGS in
 *-Wall*)
@@ -22268,11 +22192,20 @@
 echo $ECHO_N "checking for ORBit - version >= $min_orbit_version... $ECHO_C" >&6
   no_orbit=""
   if test "$ORBIT_CONFIG" = "no" ; then
-    no_orbit=yes
+    if test "$PKG_CONFIG" = "no" ; then
+      no_orbit=yes
+    else
+      ORBIT_CFLAGS=`$PKG_CONFIG --cflags ORBit-2.0`
+      ORBIT_LIBS=`$PKG_CONFIG --libs ORBit-2.0`
+    fi
   else
     ORBIT_CFLAGS=`$ORBIT_CONFIG $orbit_config_args --cflags`
     ORBIT_LIBS=`$ORBIT_CONFIG $orbit_config_args --libs`
+  fi
+
+  if test "x$no_orbit" = x ; then
     ORBIT_VERSION=`$PKG_CONFIG --modversion ORBit-2.0`
+
     orbit_config_major_version=`echo $ORBIT_VERSION | \
 	   sed -e 's,[^0-9.],,g' -e 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
     orbit_config_minor_version=`echo $ORBIT_VERSION | \
@@ -23947,6 +23880,22 @@
 fi
 echo "$as_me:$LINENO: result: $ac_cv_with_openldap" >&5
 echo "${ECHO_T}$ac_cv_with_openldap" >&6
+
+	echo "$as_me:$LINENO: checking for multilib subdirectory" >&5
+echo $ECHO_N "checking for multilib subdirectory... $ECHO_C" >&6
+	if test "$GCC" = "yes" ; then
+		multilibsubdir=`$CC -print-multi-os-directory 2> /dev/null`
+	fi
+	multilibsubdir=${multilibsubdir:-.}
+	echo "$as_me:$LINENO: result: $multilibsubdir" >&5
+echo "${ECHO_T}$multilibsubdir" >&6
+	echo "$as_me:$LINENO: checking for lib subdirectory" >&5
+echo $ECHO_N "checking for lib subdirectory... $ECHO_C" >&6
+	libsubdir=`echo lib/${multilibsubdir} | sed -re 's,lib/../([^/]*),\1,g'`
+	libsubdir=${libsubdir:-lib}
+	echo "$as_me:$LINENO: result: $libsubdir" >&5
+echo "${ECHO_T}$libsubdir" >&6
+
 	case $ac_cv_with_openldap in
 	no|"")
 		with_openldap=no
@@ -23957,7 +23906,7 @@
 	*)
 		with_openldap=$ac_cv_with_openldap
 		LDAP_CFLAGS="-I$ac_cv_with_openldap/include"
-		LDAP_LDFLAGS="-L$ac_cv_with_openldap/lib"
+		LDAP_LDFLAGS="-L$ac_cv_with_openldap/$libsubdir"
 		;;
 	esac
 
@@ -24288,13 +24237,13 @@
 if test $ac_cv_lib_lber_ber_get_tag = yes; then
 
 			if test "$with_static_ldap" = "yes"; then
-				LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"
+				LDAP_LIBS="$with_openldap/$libsubdir/liblber.a $LDAP_LIBS"
 
 				# libldap might depend on OpenSSL... We need to pull
 				# in the dependency libs explicitly here since we're
 				# not using libtool for the configure test.
-				if test -f $with_openldap/lib/libldap.la; then
-					LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
+				if test -f $with_openldap/$libsubdir/libldap.la; then
+					LDAP_LIBS="`. $with_openldap/$libsubdir/libldap.la; echo $dependency_libs` $LDAP_LIBS"
 				fi
 			else
 				LDAP_LIBS="-llber $LDAP_LIBS"
@@ -24366,7 +24315,7 @@
 if test $ac_cv_lib_ldap_ldap_open = yes; then
 
 					if test $with_static_ldap = "yes"; then
-						LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS"
+						LDAP_LIBS="$with_openldap/$libsubdir/libldap.a $LDAP_LIBS"
 					else
 						LDAP_LIBS="-lldap $LDAP_LIBS"
 					fi
@@ -24778,9 +24727,8 @@
    { (exit 1); exit 1; }; }
 fi
 
-       mv -f po/POTFILES po/POTFILES.tmp
-        sed -e '/[[]encoding.*]/d' -e 's/[[].*] *//' < po/POTFILES.tmp > po/POTFILES
-        rm -f po/POTFILES.tmp
+            ac_config_commands="$ac_config_commands po/stamp-it"
+
 
 if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
@@ -25251,10 +25199,11 @@
 #
 
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir=${ac_aux_dir}
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' ICONV='${INTLTOOL_ICONV}'
-MSGFMT='${INTLTOOL_MSGFMT}' MSGMERGE='${INTLTOOL_MSGMERGE}'
-XGETTEXT='${INTLTOOL_XGETTEXT}'
+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}'
 
 
 _ACEOF
@@ -25280,6 +25229,7 @@
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "intltool" ) CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+  "po/stamp-it" ) CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -25452,6 +25402,7 @@
 s, at INTLTOOL_CAVES_RULE@,$INTLTOOL_CAVES_RULE,;t t
 s, at INTLTOOL_SCHEMAS_RULE@,$INTLTOOL_SCHEMAS_RULE,;t t
 s, at INTLTOOL_THEME_RULE@,$INTLTOOL_THEME_RULE,;t t
+s, at INTLTOOL_SERVICE_RULE@,$INTLTOOL_SERVICE_RULE,;t t
 s, at INTLTOOL_EXTRACT@,$INTLTOOL_EXTRACT,;t t
 s, at INTLTOOL_MERGE@,$INTLTOOL_MERGE,;t t
 s, at INTLTOOL_UPDATE@,$INTLTOOL_UPDATE,;t t
@@ -25474,11 +25425,11 @@
 s, at PO_IN_DATADIR_FALSE@,$PO_IN_DATADIR_FALSE,;t t
 s, at POFILES@,$POFILES,;t t
 s, at POSUB@,$POSUB,;t t
+s, at MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
 s, at GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
 s, at localedir@,$localedir,;t t
 s, at NO_UNDEFINED@,$NO_UNDEFINED,;t t
 s, at SOCKET_LIBS@,$SOCKET_LIBS,;t t
-s, at WARN_CFLAGS@,$WARN_CFLAGS,;t t
 s, at PKG_CONFIG@,$PKG_CONFIG,;t t
 s, at GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
 s, at GLIB_LIBS@,$GLIB_LIBS,;t t
@@ -26219,47 +26170,51 @@
  ;;
     intltool )
 
-intltool_edit="-e 's#@INTLTOOL_EXTRACT@#`pwd`/intltool-extract#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'"
-
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-extract.in \
-  > intltool-extract.out
-if cmp -s intltool-extract intltool-extract.out 2>/dev/null; then
-  rm -f intltool-extract.out
-else
-  mv -f intltool-extract.out intltool-extract
-fi
-chmod ugo+x intltool-extract
-chmod u+w intltool-extract
-
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-merge.in \
-  > intltool-merge.out
-if cmp -s intltool-merge intltool-merge.out 2>/dev/null; then
-  rm -f intltool-merge.out
-else
-  mv -f intltool-merge.out intltool-merge
-fi
-chmod ugo+x intltool-merge
-chmod u+w intltool-merge
-
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-update.in \
-  > intltool-update.out
-if cmp -s intltool-update intltool-update.out 2>/dev/null; then
-  rm -f intltool-update.out
-else
-  mv -f intltool-update.out intltool-update
-fi
-chmod ugo+x intltool-update
-chmod u+w intltool-update
+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
 
  ;;
     default-1 ) case "$CONFIG_FILES" in *po/Makefile.in*)
         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
       esac ;;
+    po/stamp-it )
+    rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
+    >"po/stamp-it.tmp"
+    sed '/^#/d
+	 s/^[[].*] *//
+	 /^[ 	]*$/d
+	'"s|^|	$ac_top_srcdir/|" \
+      "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
+
+    if test ! -f "po/Makefile"; then
+      { { echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5
+echo "$as_me: error: po/Makefile is not ready." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    mv "po/Makefile" "po/Makefile.tmp"
+    sed '/^POTFILES =/,/[^\\]$/ {
+		/^POTFILES =/!d
+		r po/POTFILES
+	  }
+	 ' "po/Makefile.tmp" >"po/Makefile"
+    rm -f "po/Makefile.tmp"
+    mv "po/stamp-it.tmp" "po/stamp-it"
+   ;;
   esac
 done
 _ACEOF


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- evolution-connector.spec	11 Apr 2006 01:35:25 -0000	1.56
+++ evolution-connector.spec	11 Apr 2006 01:58:14 -0000	1.57
@@ -22,7 +22,7 @@
 # Patch generated against a pristine source tree after applying the
 # above patches and then rerunning the autotools.  This patch will contain
 # all of the above patches, together with patches to the generated files
-Patch200: ximian-connector-2.1.4-generated-autotool.patch
+Patch200: evolution-connector-2.6.1-generated-autotool.patch
 
 # Other patches:
 Patch300: evolution-exchange-2.5.3-fix-marshaller.patch


--- ximian-connector-2.1.4-generated-autotool.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 11 02:29:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 22:29:24 -0400
Subject: rpms/metacity/FC-5 metacity-2.13.144-bling.patch, 1.2,
	1.3 metacity.spec, 1.63, 1.64
Message-ID: <200604110229.k3B2TOux029300@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	metacity-2.13.144-bling.patch metacity.spec 
Log Message:
- Fix from Elijah Newren for crash when minimizing 
  decorationless windows, 
  http://bugzilla.gnome.org/show_bug.cgi?id=337954


metacity-2.13.144-bling.patch:
 Makefile.am         |    4 
 c-screen.c          |  520 +++++++++++++++++++
 c-screen.h          |   40 +
 compositor.c        | 1360 ++++++++++++----------------------------------------
 display.c           |  103 +++
 errors.c            |   40 +
 errors.h            |    8 
 metacity.schemas.in |   14 
 prefs.c             |   46 +
 prefs.h             |    4 
 screen.c            |  117 +++-
 spring-model.c      |  410 +++++++++++++++
 spring-model.h      |   31 +
 window.c            |   64 +-
 14 files changed, 1653 insertions(+), 1108 deletions(-)

Index: metacity-2.13.144-bling.patch
===================================================================
RCS file: /cvs/dist/rpms/metacity/FC-5/metacity-2.13.144-bling.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metacity-2.13.144-bling.patch	13 Mar 2006 23:48:36 -0000	1.2
+++ metacity-2.13.144-bling.patch	11 Apr 2006 02:29:21 -0000	1.3
@@ -38,13 +38,6 @@
                                  gboolean     last_request_was_roundtrip);
 --- metacity-2.13.144/src/window.c.bling	2006-03-06 23:10:00.000000000 -0500
 +++ metacity-2.13.144/src/window.c	2006-03-06 23:18:42.000000000 -0500
-@@ -1319,6 +1320,7 @@ finish_minimize (gpointer data)
-   meta_window_hide (window);
-   if (window->has_focus)
-     {
-+	g_print ("focusing something other than %lx\n", window->frame->xwindow);
-       meta_workspace_focus_default_window
- 	(window->screen->active_workspace,
  	 window,
 @@ -6670,22 +6672,23 @@ update_move (MetaWindow  *window,
    int new_x, new_y;


Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/FC-5/metacity.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- metacity.spec	13 Mar 2006 23:48:36 -0000	1.63
+++ metacity.spec	11 Apr 2006 02:29:21 -0000	1.64
@@ -7,7 +7,7 @@
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 1
+Release: 1.fc5.1
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
 Source0: metacity-%{metacity_version}.tar.bz2
 Source1: libcm-%{libcm_version}.0.%{libcm_snapshot_date}.tar.bz2
@@ -142,6 +142,11 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-1.fc5.1
+- Fix from Elijah Newren for crash when minimizing 
+  decorationless windows, 
+  http://bugzilla.gnome.org/show_bug.cgi?id=337954
+
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-1
 - update to 2.14.0
 



From fedora-cvs-commits at redhat.com  Tue Apr 11 02:29:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 22:29:34 -0400
Subject: rpms/tog-pegasus/devel RedHat.OpenPegasus.Makefile,NONE,1.1
Message-ID: <200604110229.k3B2TYXq029351@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29317

Added Files:
	RedHat.OpenPegasus.Makefile 
Log Message:
top level makefile, enabling use of "make -j", and providing "install" target.


--- NEW FILE RedHat.OpenPegasus.Makefile ---
# RedHat.OpenPegasus.Makefile
#
#            Red Hat OpenPegasus distribution Makefile
#
#   Makefile to build only the binary objects actually shipped by the
#   default upstream linux build, that will work with 'make -j $ncpus' .
#   Generated by a script from the installed upstream package.
#
#   Jason Vas Dias <jvdias at redhat.com> Red Hat, Inc. April 2006
#
SRCNAME ?= pegasus
RPM_BUILD_DIR ?= $(shell cd ..;pwd)
RPM_ARCH ?= $(shell uname -i)
RPM_OPT_FLAGS ?= $(shell rpm -q rpm --qf '%{OPTFLAGS}')
ifndef PEGASUS_PLATFORM
  ifeq ($(RPM_ARCH),ia64)
    export PEGASUS_PLATFORM := LINUX_IA64_GNU
  else
    ifeq ($(RPM_ARCH),x86_64)
      export PEGASUS_PLATFORM := LINUX_X86_64_GNU
    else
      ifeq ($(RPM_ARCH),ppc)
	export PEGASUS_PLATFORM := LINUX_PPC_GNU
      else
        ifeq ($(RPM_ARCH), ppc64)
          export PEGASUS_PLATFORM := LINUX_PPC64_GNU
        else
          ifeq ($(RPM_ARCH), s390)
            export PEGASUS_PLATFORM := LINUX_ZSERIES_GNU
          else
            ifeq ($(RPM_ARCH), s390x)
              export PEGASUS_PLATFORM := LINUX_ZSERIES64_GNU
            else
              export PEGASUS_PLATFORM := LINUX_IX86_GNU
            endif
          endif
        endif
      endif
    endif
  endif
endif
ifndef RPM_ARCH_LIB
  ifeq ($(RPM_ARCH),x86_64)
    export RPM_ARCH_LIB := lib64
  else
    ifeq ($(RPM_ARCH),ppc64)
      export RPM_ARCH_LIB := lib64
    else
      ifeq ($(RPM_ARCH),s390x)
        export RPM_ARCH_LIB := lib64
      else
        export RPM_ARCH_LIB := lib
      endif
    endif
  endif
endif
export PEGASUS_ROOT ?= $(RPM_BUILD_DIR)/$(SRCNAME)
export PEGASUS_HOME ?= $(PEGASUS_ROOT)/build
export PEGASUS_ARCH_LIB ?= $(RPM_ARCH_LIB)
export PEGASUS_ENVVAR_FILE ?= $(PEGASUS_ROOT)/env_var_Linux.status
export PEGASUS_EXTRA_C_FLAGS ?= $(RPM_OPT_FLAGS) -Wno-unused
export PEGASUS_EXTRA_CXX_FLAGS ?= $(PEGASUS_EXTRA_C_FLAGS)
export PEGASUS_EXTRA_PROGRAM_LINK_FLAGS ?= -pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack
export OPENSSL_HOME ?= /usr
export OPENSSL_BIN  ?= /usr/bin
export SYS_INCLUDES ?= -I/usr/kerberos/include
export LD_LIBRARY_PATH ?= $(PEGASUS_HOME)/lib
B = $(PEGASUS_HOME)
R = $(PEGASUS_ROOT)
SBINS=$(B)/bin/cimserver $(B)/bin/cimprovagt
UBINS=$(B)/bin/cimmof $(B)/bin/cimmofl $(B)/bin/cimprovider $(B)/bin/osinfo $(B)/bin/wbemexec $(B)/bin/cimauth $(B)/bin/cimconfig $(B)/bin/cimuser $(B)/bin/repupgrade
BINARIES=$(SBINS) $(UBINS)
PROVIDERS=$(B)/lib/Pegasus/providers/libComputerSystemProvider.so.1 $(B)/lib/Pegasus/providers/libOSProvider.so.1 $(B)/lib/Pegasus/providers/libProcessProvider.so.1
LIBRARIES=$(B)/lib/libCIMQueryCapabilitiesProvider.so.1 $(B)/lib/libCIMxmlIndicationHandler.so.1 $(B)/lib/libCMPIProviderManager.so.1 $(B)/lib/libCertificateProvider.so.1 $(B)/lib/libConfigSettingProvider.so.1 $(B)/lib/libDefaultProviderManager.so.1 $(B)/lib/libNamespaceProvider.so.1 $(B)/lib/libProviderRegistrationProvider.so.1 $(B)/lib/libUserAuthProvider.so.1 $(B)/lib/libcmpiCppImpl.so.1 $(B)/lib/libpegauthentication.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegcompiler.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/libpegexportclient.so.1 $(B)/lib/libpegexportserver.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpeghandlerservice.so.1 $(B)/lib/libpegindicationservice.so.1 $(B)/lib/libpeglistener.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libp!
 egserver.so.1 $(B)/lib/libpegservice.so.1 $(B)/lib/libpeguser.so.1 $(B)/lib/libpegwql.so.1

all: setup $(BINARIES) $(LIBRARIES) $(PROVIDERS)

setup:
	$(MAKE) -f Makefile.Release create_ProductVersionFile
	$(MAKE) -f Makefile.Release create_CommonProductDirectoriesInclude
	$(MAKE) -f Makefile.Release create_ConfigProductDirectoriesInclude
	touch setup

$(B)/bin/cimserver: $(B)/lib/libpegclient.so.1 $(B)/lib/libpegserver.so.1 $(B)/lib/libpeguser.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libNamespaceProvider.so.1 $(B)/lib/libpegindicationservice.so.1 $(B)/lib/libpeghandlerservice.so.1 $(B)/lib/libConfigSettingProvider.so.1 $(B)/lib/libDefaultProviderManager.so.1 $(B)/lib/libProviderRegistrationProvider.so.1 $(B)/lib/libpegauthentication.so.1 $(B)/lib/libUserAuthProvider.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libCIMQueryCapabilitiesProvider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegexportserver.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegservice.so.1 $(B)/lib/libCertificateProvider.so.1 $(B)/lib/Pegasus/providers/libComputerSystemProvider.so.1 $(B)/lib/Pegasus/providers/libOSProvider.so.1 $(B)/lib/Pegasus/providers/libProcessProvider.so.1
	$(MAKE) -C $(R)/src/Server

$(B)/bin/cimprovagt: $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/Pegasus/providers/libComputerSystemProvider.so.1 $(B)/lib/Pegasus/providers/libOSProvider.so.1 $(B)/lib/Pegasus/providers/libProcessProvider.so.1
	$(MAKE) -C src/Pegasus/ProviderManager2/ProviderAgent

$(B)/bin/cimauth: $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Clients/cimauth

$(B)/bin/cimconfig: $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Clients/cimconfig

$(B)/bin/cimuser: $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Clients/cimuser

$(B)/bin/repupgrade: $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1
	$(MAKE) -C $(R)/src/Clients/repupgrade

$(B)/bin/cimmof: $(B)/lib/libpegcompiler.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Compiler/cmdline/cimmof

$(B)/bin/cimmofl: $(B)/bin/cimmof
	$(MAKE) -C $(R)/src/Pegasus/Compiler/cmdline/cimmofl

$(B)/bin/cimprovider: $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Clients/cimprovider

$(B)/bin/osinfo: $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Clients/osinfo

$(B)/bin/wbemexec: $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Clients/wbemexec

$(B)/lib/Pegasus/providers/libComputerSystemProvider.so.1: $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Providers/ManagedSystem/ComputerSystem

$(B)/lib/Pegasus/providers/libOSProvider.so.1: $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Providers/ManagedSystem/OperatingSystem

$(B)/lib/Pegasus/providers/libProcessProvider.so.1: $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Providers/ManagedSystem/Process

$(B)/lib/libCIMQueryCapabilitiesProvider.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Pegasus/ControlProviders/QueryCapabilitiesProvider

$(B)/lib/libCIMxmlIndicationHandler.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegexportclient.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegclient.so.1
	$(MAKE) -C $(R)/src/Pegasus/Handler/CIMxmlIndicationHandler

$(B)/lib/libCMPIProviderManager.so.1: $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegrepository.so.1
	$(MAKE) -C $(R)/src/Pegasus/ProviderManager2/CMPI

$(B)/lib/libCertificateProvider.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Pegasus/ControlProviders/CertificateProvider

$(B)/lib/libConfigSettingProvider.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Pegasus/ControlProviders/ConfigSettingProvider

$(B)/lib/libDefaultProviderManager.so.1: $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegrepository.so.1
	$(MAKE) -C $(R)/src/Pegasus/ProviderManager2/Default

$(B)/lib/libNamespaceProvider.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Pegasus/ControlProviders/NamespaceProvider

$(B)/lib/libProviderRegistrationProvider.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Pegasus/ControlProviders/ProviderRegistrationProvider

$(B)/lib/libUserAuthProvider.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpeguser.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Pegasus/ControlProviders/UserAuthProvider

$(B)/lib/libcmpiCppImpl.so.1:
	$(MAKE) -C $(R)/src/Pegasus/Provider/CMPI

$(B)/lib/libpegauthentication.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpeguser.so.1 $(B)/lib/libpegconfig.so.1
	$(MAKE) -C $(R)/src/Pegasus/Security/Authentication

$(B)/lib/libpegclient.so.1: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Client

$(B)/lib/libpegcliutils.so.1: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Clients/cliutils

$(B)/lib/libpegcommon.so.1:
	$(MAKE) -C $(R)/src/Pegasus/Common

$(B)/lib/libpegcompiler.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegconfig.so.1
	$(MAKE) -C $(R)/src/Pegasus/Compiler

$(B)/lib/libpegconfig.so.1: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Config

$(B)/lib/libpegcql.so.1: $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/CQL

$(B)/lib/libpegexportclient.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegclient.so.1
	$(MAKE) -C $(R)/src/Pegasus/ExportClient

$(B)/lib/libpegexportserver.so.1: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/ExportServer

$(B)/lib/libpeggetoopt.so.1: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/getoopt

$(B)/lib/libpeghandlerservice.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegquerycommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/HandlerService

$(B)/lib/libpegindicationservice.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Pegasus/IndicationService

$(B)/lib/libpeglistener.so.1: $(B)/lib/libpegexportserver.so.1 $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Listener

$(B)/lib/libpegprm.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Pegasus/Server/ProviderRegistrationManager

$(B)/lib/libpegprovider.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Pegasus/Provider

$(B)/lib/libpegprovidermanager.so.1: $(B)/lib/libpegprm.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Pegasus/ProviderManager2

$(B)/lib/libpegquerycommon.so.1: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Query/QueryCommon

$(B)/lib/libpegqueryexpression.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Pegasus/Query/QueryExpression

$(B)/lib/libpegrepository.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegconfig.so.1
	$(MAKE) -C $(R)/src/Pegasus/Repository

$(B)/lib/libpegserver.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegexportserver.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpeguser.so.1 $(B)/lib/libpegauthentication.so.1 $(B)/lib/libpeghandlerservice.so.1 $(B)/lib/libpegindicationservice.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libDefaultProviderManager.so.1 $(B)/lib/libConfigSettingProvider.so.1 $(B)/lib/libUserAuthProvider.so.1 $(B)/lib/libProviderRegistrationProvider.so.1 $(B)/lib/libNamespaceProvider.so.1 $(B)/lib/libCIMQueryCapabilitiesProvider.so.1 $(B)/lib/libCertificateProvider.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Pegasus/Server

$(B)/lib/libpegservice.so.1: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Service

$(B)/lib/libpeguser.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegconfig.so.1
	$(MAKE) -C $(R)/src/Pegasus/Security/UserManager

$(B)/lib/libpegwql.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/WQL

#
# install target :
#
# 
install ?= /usr/bin/install
prefix  ?=
export prefix  := $(prefix:/usr=)
D       := $(prefix)
sysconfdir ?= /etc
export sysconfdir := $(subst $(prefix),,$(sysconfdir))
etc     := $(sysconfdir)
bindir  ?= /usr/bin
export bindir  := $(subst $(prefix),,$(bindir))
bin     := $(bindir)
sbindir ?= /usr/sbin
export sbindir := $(subst $(prefix),,$(sbindir))
sbin    := $(sbindir)
libdir  ?= /usr/$(RPM_ARCH_LIB)
export libdir  := $(subst $(prefix),,$(libdir))
lib     := $(libdir)
datadir ?= /usr/share
export datadir  := $(subst $(prefix),,$(datadir))
share	:= $(datadir)
includedir ?= /usr/include
export includedir := $(subst $(prefix),,$(includedir))
inc := $(includedir)
localstatedir ?= /var
export localstatedir := $(subst $(prefix),,$(localstatedir))
var := $(localstatedir)
mandir  ?= /usr/share/man
export mandir  := $(subst $(prefix),,$(mandir))
root_user ?= root
pegasus_user ?= pegasus
SYSDIRS  = $(D) $(D)/$(etc) $(D)/$(etc)/rc.d/init.d $(D)/$(etc)/pam.d \
	   $(D)/$(var) $(D)/$(lib) $(D)/$(bin)/ $(D)/$(sbin) \
	   $(D)/$(inc) $(D)/$(mandir)/man8 $(D)/$(mandir)/man1
ROOTDIRS = $(D)/$(etc)/Pegasus \
	   $(D)/$(var)/run/tog-pegasus $(D)/$(var)/run/tog-pegasus/socket \
	   $(D)/$(var)/lib/Pegasus $(D)/$(var)/lib/Pegasus/repository \
	   $(D)/$(var)/lib/Pegasus/cache \
	   $(D)/$(var)/lib/Pegasus/cache/localauth \
	   $(D)/$(var)/lib/Pegasus/log \
	   $(D)/$(lib)/Pegasus $(D)/$(lib)/Pegasus/providers \
	   $(D)/$(share)/Pegasus/scripts
PEGDIRS =  $(D)/$(share)/Pegasus \
	   $(D)/$(share)/Pegasus/mof/CIM29 \
	   $(D)/$(share)/Pegasus/mof/Pegasus
MAN8S	=  $(wildcard $(R)/rpm/manLinux/man8.Z/*.8)
MAN1S   =  $(wildcard $(R)/rpm/manLinux/man1.Z/*.1)
CIMSCHEMA= $(wildcard $(R)/Schemas/CIM29/*)
CIMMOF=$(addprefix $(D)$(share)/Pegasus/mof/CIM29/,$(notdir $(CIMSCHEMA)))
PEGSCHEMA= $(R)/Schemas/Pegasus/Internal/VER20/PG_SSLCertificate20.mof \
           $(R)/Schemas/Pegasus/ManagedSystem/VER20/PG_OperatingSystem20R.mof \
           $(R)/Schemas/Pegasus/InterOp/VER20/PG_InterOpSchema20.mof \
           $(R)/Schemas/Pegasus/ManagedSystem/VER20/PG_ComputerSystem20R.mof \
           $(R)/Schemas/Pegasus/Internal/VER20/PG_User20.mof \
           $(R)/Schemas/Pegasus/ManagedSystem/VER20/PG_UnixProcess20.mof \
           $(R)/Schemas/Pegasus/ManagedSystem/VER20/PG_ManagedSystemSchema20.mof \
           $(R)/Schemas/Pegasus/Internal/VER20/PG_ConfigSetting20.mof \
           $(R)/Schemas/Pegasus/InterOp/VER20/PG_ProviderModule20.mof \
           $(R)/Schemas/Pegasus/ManagedSystem/VER20/PG_OperatingSystem20.mof \
           $(R)/Schemas/Pegasus/Internal/VER20/PG_Authorization20.mof \
           $(R)/Schemas/Pegasus/Internal/VER20/PG_InternalSchema20.mof \
           $(R)/Schemas/Pegasus/Internal/VER20/PG_ShutdownService20.mof \
           $(R)/Schemas/Pegasus/ManagedSystem/VER20/PG_ComputerSystem20.mof \
           $(R)/Schemas/Pegasus/ManagedSystem/VER20/PG_UnixProcess20R.mof \
           $(R)/Schemas/Pegasus/ManagedSystem/VER20/PG_ManagedSystemSchema20R.mof \
           $(R)/Schemas/Pegasus/Internal/VER20/PG_SSLCertificateRevocationList20.mof \
           $(R)/Schemas/Pegasus/InterOp/VER20/PG_Events20.mof
PEGMOF=$(addprefix $(D)$(share)/Pegasus/mof/Pegasus/,$(notdir $(CIMSCHEMA)))
LINKED_LIBS=$(D)/$(lib)/libpegclient.so.1 $(D)/$(lib)/libpegcommon.so.1 $(D)/$(lib)/libpegprovider.so.1 $(D)/$(lib)/libDefaultProviderManager.so.1 $(D)/$(lib)/libCIMxmlIndicationHandler.so.1 $(D)/$(lib)/libCMPIProviderManager.so.1 $(D)/$(lib)/Pegasus/providers/libComputerSystemProvider.so.1 $(D)/$(lib)/Pegasus/providers/libOSProvider.so.1 $(D)/$(lib)/Pegasus/providers/libProcessProvider.so.1
export PEGASUS_STAGING_DIR := $(D)

install: dirs config libs lib_links bins mans mof SDK ghost_files repository

$(SYSDIRS):
	/bin/mkdir -p $@

$(ROOTDIRS):
	/bin/mkdir -p $@;
	/bin/chown $(root_user):$(pegasus_user) $@ >/dev/null 2>&1;
	/bin/chmod 0750 $@;

$(PEGDIRS):
	/bin/mkdir -p $@;
	/bin/chown $(root_user):$(pegasus_user) $@ >/dev/null 2>&1 || :;
	/bin/chmod 0755 $@

dirs:	$(SYSDIRS) $(ROOTDIRS) $(PEGDIRS)

$(D)/$(etc)/rc.d/init.d/tog-pegasus:  $(R)/rpm/tog-pegasus.rc
	$(install) -m 0750 -o $(root_user) -g $(pegasus_user) -p $< $@

$(D)/$(etc)/Pegasus/access.conf: $(R)/rpm/access.conf
	$(install) -m 0640 -o $(root_user) -g $(pegasus_user) -p $< $@

$(D)/$(etc)/pam.d/wbem:  $(R)/rpm/wbem
	$(install) -m 0640 -o $(root_user) -g $(pegasus_user) -p $< $@

$(D)/$(share)/Pegasus/scripts/init_repository:  $(R)/installs/scripts/init_repository
	$(install) -m 0640 -o $(root_user) -g $(pegasus_user) -p $< $@

$(D)/$(share)/Pegasus/scripts/settogpath:  $(R)/installs/scripts/settogpath
	$(install) -m 0640 -o $(root_user) -g $(pegasus_user) -p $< $@

$(D)/$(share)/Pegasus/scripts/genOpenPegasusSSLCerts:  $(R)/rpm/genOpenPegasusSSLCerts
	$(install) -m 0640 -o $(root_user) -g $(pegasus_user) -p $< $@

config: $(D)/$(etc)/rc.d/init.d/tog-pegasus  $(D)/$(etc)/Pegasus/access.conf $(D)/$(etc)/pam.d/wbem $(D)/$(share)/Pegasus/scripts/genOpenPegasusSSLCerts $(D)/$(share)/Pegasus/scripts/init_repository $(D)/$(share)/Pegasus/scripts/settogpath 

$(D)/$(lib)/Pegasus/providers/%:
	$(install) -m 0755 -o $(root_user) -g $(pegasus_user) -p $(B)/lib/$(patsubst Pegasus/providers/%,%,$*) $@

$(D)/$(lib)/%:
	$(install) -m 0755 -o $(root_user) -g $(pegasus_user) -p $(B)/lib/$* $@

libs: $(LIBRARIES) $(patsubst $(B)/lib/%,$(D)/$(lib)/%,$(LIBRARIES) $(PROVIDERS))

$(patsubst %.so.1,%.so,$(LINKED_LIBS)):
	/bin/ln -sf $(patsubst %,%.1,$(notdir $@)) $(patsubst %.so.1,%.so,$@)

lib_links: libs $(patsubst %.so.1,%.so,$(LINKED_LIBS))

$(patsubst $(B)/bin/%,$(D)/$(sbin)/%,$(SBINS)):
	$(install) -m 0750 -o $(root_user) -g $(pegasus_user) -p $(patsubst $(D)/$(sbin)/%,$(B)/bin/%, $@) $@

$(patsubst $(B)/bin/%,$(D)/$(bin)/%,$(UBINS)):
	$(install) -m 0755 -o $(root_user) -g $(pegasus_user) -p $(patsubst $(D)/$(bin)/%,$(B)/bin/%, $@) $@

bins:   $(SBINS) $(UBINS) $(patsubst $(B)/bin/%,$(D)/$(sbin)/%,$(SBINS)) $(patsubst $(B)/bin/%,$(D)/$(bin)/%,$(UBINS))

$(D)/$(mandir)/man8/%.8:
	$(install) -m 0644 -o $(root_user) -g $(root_user) -p $(R)/rpm/manLinux/man8.Z/$*.8 $@

$(D)/$(mandir)/man1/%.1:
	$(install) -m 0644 -o $(root_user) -g $(root_user) -p $(R)/rpm/manLinux/man1.Z/$*.1 $@

mans:	$(subst $(R)/rpm/manLinux/man8.Z,$(D)/$(mandir)/man8,$(MAN8S)) $(subst $(R)/rpm/manLinux/man1.Z,$(D)/$(mandir)/man1,$(MAN1S))

mof: 	$(CIMSCHEMA) $(PEGSCHEMA)
	$(install) -m 0644 -o $(root_user) -g $(root_user) -p $(CIMSCHEMA) $(D)/$(share)/Pegasus/mof/CIM29
	$(install) -m 0644 -o $(root_user) -g $(root_user) -p $(PEGSCHEMA) $(D)/$(share)/Pegasus/mof/Pegasus

SDK:
	/bin/mkdir -p $(PEGASUS_STAGING_DIR)/usr/share/doc/tog-pegasus-2.5/
	$(MAKE) -f $(R)/mak/SDKMakefile stageSDK
	/bin/rm -rf $(PEGASUS_STAGING_DIR)/usr/share/doc/tog-pegasus-2.5/
	touch SDK

ghost_files:
	touch $(D){/etc/Pegasus/{cimserver_current.conf,cimserver_planned.conf,cimserver_trust,indication_trust,crl,ssl.cnf,client.pem,server.pem,file.pem,},/var/{run/tog-pegasus/{cimxml.socket,cimserver.pid,cimserver_start.lock},lib/Pegasus/log/install.log}}

repository:
	PATH=$(B)/bin:$$PATH LD_LIBRARY_PATH=$(B)/lib $(MAKE) -C Schemas/Pegasus repository REPOSITORY_DIR=$(D)/$(var)/lib/Pegasus

# test package :

TESTLIBS:=$(B)/lib/libFamilyProvider.so.1 $(B)/lib/libIndicationStressTestConsumer.so.1 $(B)/lib/libIndicationStressTestProvider.so.1 $(B)/lib/libSampleInstanceProvider.so.1 $(B)/lib/libSampleMethodProvider.so.1
TESTBINS:=$(B)/bin/TestAbstract $(B)/bin/TestArray $(B)/bin/TestBase64 $(B)/bin/TestClassDecl $(B)/bin/TestDateTime $(B)/bin/TestFlavor $(B)/bin/TestFormatter $(B)/bin/TestHashTable $(B)/bin/TestInstanceDecl $(B)/bin/TestLogger $(B)/bin/TestMethod $(B)/bin/TestObject $(B)/bin/TestOperationContext $(B)/bin/TestParamValue $(B)/bin/TestParameter $(B)/bin/TestProperty $(B)/bin/TestQualifier $(B)/bin/TestQualifierDecl $(B)/bin/TestQualifierList $(B)/bin/TestQueue $(B)/bin/TestReference $(B)/bin/TestResolve $(B)/bin/TestResponseHandler $(B)/bin/TestScope $(B)/bin/TestStack $(B)/bin/TestStopwatch $(B)/bin/TestStrToInstName $(B)/bin/TestString $(B)/bin/TestTimeValue $(B)/bin/TestToMof $(B)/bin/TestValidateClass $(B)/bin/TestValue $(B)/bin/TracerTest $(B)/bin/TestIPC $(B)/bin/TestClient $(B)/bin/OSTestClient $(B)/bin/TestPegClientInvokeMethod2 $(B)/bin/TestIndicationStressTest

$(B)/lib/libFamilyProvider.so.1: $(B)/lib/libpegcommon.so.1
	$(MAKE)	-C $(R)/src/Providers/TestProviders/FamilyProvider

$(B)/lib/libIndicationStressTestConsumer.so.1: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Providers/TestProviders/IndicationStressTestProvider/testconsumer

$(B)/lib/libIndicationStressTestProvider.so.1: $(B)/lib/libpegcommon.so.1
	$(MAKE)	-C $(R)/src/Providers/TestProviders/IndicationStressTestProvider

$(B)/lib/libSampleInstanceProvider.so.1: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Providers/sample/InstanceProvider

$(B)/lib/libSampleMethodProvider.so.1: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Providers/sample/MethodProvider

$(B)/bin/TestAbstract: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Abstract

$(B)/bin/TestArray: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Array

$(B)/bin/TestBase64: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Base64

$(B)/bin/TestClassDecl: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/ClassDecl

$(B)/bin/TestDateTime: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/DateTime

$(B)/bin/TestFlavor: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Flavor

$(B)/bin/TestFormatter: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Formatter

$(B)/bin/TestHashTable: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/HashTable

$(B)/bin/TestInstanceDecl: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/InstanceDecl

$(B)/bin/TestLogger: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Logger

$(B)/bin/TestMethod: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Method

$(B)/bin/TestObject: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Object

$(B)/bin/TestOperationContext: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/OperationContext

$(B)/bin/TestParamValue: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/ParamValue

$(B)/bin/TestParameter: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Parameter

$(B)/bin/TestProperty: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Property

$(B)/bin/TestQualifier: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Qualifier

$(B)/bin/TestQualifierDecl: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/QualifierDecl

$(B)/bin/TestQualifierList: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/QualifierList

$(B)/bin/TestQueue: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Queue

$(B)/bin/TestReference: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Reference

$(B)/bin/TestResolve: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Resolve

$(B)/bin/TestScope: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Scope

$(B)/bin/TestStack: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Stack

$(B)/bin/TestStopwatch: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Stopwatch

$(B)/bin/TestStrToInstName: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/StrToInstName

$(B)/bin/TestString: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/String

$(B)/bin/TestTimeValue: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/TimeValue

$(B)/bin/TestToMof: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/ToMof

$(B)/bin/TestValidateClass: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/ValidateClass

$(B)/bin/TestValue: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Value

$(B)/bin/TestTracer: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Tracer

$(B)/bin/TestIPC: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/IPC

$(B)/bin/TestResponseHandler: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Pegasus/ProviderManager2/Default/tests/ResponseHandler

$(B)/bin/TracerTest: $(B)/lib/libpegcommon.so.1 
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Tracer

$(B)/bin/TestClient: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegclient.so.1
	$(MAKE) -C $(R)/src/Clients/TestClient

$(B)/bin/OSTestClient: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegclient.so.1
	$(MAKE) -C $(R)/src/Providers/ManagedSystem/OperatingSystem/tests/OSTestClient

$(B)/bin/TestPegClientInvokeMethod2: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegclient.so.1
	$(MAKE) -C $(R)/src/Pegasus/Client/tests/InvokeMethod2

$(B)/bin/TestIndicationStressTest: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpeglistener.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegexportserver.so.1
	$(MAKE) -C $(R)/src/Providers/TestProviders/IndicationStressTestProvider/testclient

tests:  $(TESTLIBS) $(TESTBINS)

install_tests: tests test_dirs test_lib test_bin test_mak test_makefile test_repository

TESTDIRS = $(D)/$(share)/Pegasus/test \
	   $(D)/$(share)/Pegasus/test/bin \
	   $(D)/$(share)/Pegasus/test/lib \
	   $(D)/$(share)/Pegasus/test/mak

$(TESTDIRS):
	/bin/mkdir -p $@;
	/bin/chown $(root_user):$(pegasus_user) $@ >/dev/null 2>&1 || :;
	/bin/chmod 0755 $@

test_dirs: $(TESTDIRS)

$(patsubst $(B)/lib/%,$(D)/$(share)/Pegasus/test/lib/%,$(TESTLIBS)):
	$(install) -m 0755 -o $(root_user) -g $(pegasus_user) -p $(patsubst $(D)/$(share)/Pegasus/test/lib/%,$(B)/lib/%,$@) $@

test_lib: $(TESTLIBS) $(patsubst $(B)/lib/%,$(D)/$(share)/Pegasus/test/lib/%,$(TESTLIBS))

$(patsubst $(B)/bin/%,$(D)/$(share)/Pegasus/test/bin/%,$(TESTBINS)):
	$(install) -m 0755 -o $(root_user) -g $(pegasus_user) -p $(patsubst $(D)/$(share)/Pegasus/test/bin/%,$(B)/bin/%,$@) $@

test_bin: $(TESTBINS) $(patsubst $(B)/bin/%,$(D)/$(share)/Pegasus/test/bin/%,$(TESTBINS))

test_mak:
	$(MAKE) --directory=$(R) -f Makefile.ReleaseTest -s stage_makfiles

test_makefile:
	$(MAKE) --directory=$(R) -f Makefile.ReleaseTest -s create_Makefile

test_repository:
	LD_LIBRARY_PATH=$(B)/lib PATH=$(B)/bin:$$PATH $(MAKE) --directory=$(R) -f Makefile.ReleaseTest -s create_repository




From fedora-cvs-commits at redhat.com  Tue Apr 11 02:30:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 22:30:48 -0400
Subject: rpms/tog-pegasus/devel pegasus-2.5.1-fix_zseries_flags.patch, NONE,
	1.1
Message-ID: <200604110230.k3B2UmIi029404@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29371

Added Files:
	pegasus-2.5.1-fix_zseries_flags.patch 
Log Message:
fix FLAGS= setting for zSeries

pegasus-2.5.1-fix_zseries_flags.patch:
 platform_LINUX_ZSERIES64_GNU.mak |    2 +-
 platform_LINUX_ZSERIES_GNU.mak   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE pegasus-2.5.1-fix_zseries_flags.patch ---
--- pegasus/mak/platform_LINUX_ZSERIES64_GNU.mak.fix_zseries_flags	2006-01-30 11:16:23.000000000 -0500
+++ pegasus/mak/platform_LINUX_ZSERIES64_GNU.mak	2006-04-10 20:10:04.000000000 -0400
@@ -35,4 +35,4 @@
 
 ARCHITECTURE = zseries
 
-FLAGS = -fsigned-char
+FLAGS += -fsigned-char
--- pegasus/mak/platform_LINUX_ZSERIES_GNU.mak.fix_zseries_flags	2006-01-30 11:16:23.000000000 -0500
+++ pegasus/mak/platform_LINUX_ZSERIES_GNU.mak	2006-04-10 20:09:41.000000000 -0400
@@ -35,4 +35,4 @@
 
 ARCHITECTURE = zseries
 
-FLAGS = -fsigned-char
+FLAGS += -fsigned-char



From fedora-cvs-commits at redhat.com  Tue Apr 11 02:31:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 22:31:09 -0400
Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.88,
	1.89
Message-ID: <200604110231.k3B2V9lK029448@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	evolution-data-server.spec 
Log Message:
fix a multilib conflict



Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- evolution-data-server.spec	11 Apr 2006 00:59:34 -0000	1.88
+++ evolution-data-server.spec	11 Apr 2006 02:31:00 -0000	1.89
@@ -11,11 +11,7 @@
 %define eds_base_version 1.6
 %define eds_api_version 1.2
 
-%ifarch s390x ia64
 %define use_gtk_doc 0
-%else
-%define use_gtk_doc 1
-%endif
 
 %define support_imap4_provider 0
 
@@ -25,7 +21,7 @@
 Summary: Backend data server for evolution
 Name: evolution-data-server
 Version: 1.6.1
-Release: 2
+Release: 3
 License: LGPL
 Group: System Environment/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
@@ -321,7 +317,10 @@
 
 
 %changelog
-* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 1.8.1-2
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 1.6.1-3
+- Avoid a multilib conflict
+
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 1.6.1-2
 - Update to 1.6.1
 
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 1.6.0-1



From fedora-cvs-commits at redhat.com  Tue Apr 11 02:31:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 22:31:32 -0400
Subject: rpms/tog-pegasus/devel pegasus-2.5.1-fix_tests.patch, NONE,
	1.1 pegasus-2.5.1-no-rpath.patch, 1.1,
	1.2 pegasus-2.5.1-redhat-config.patch, 1.1,
	1.2 tog-pegasus.spec, 1.26, 1.27
Message-ID: <200604110231.k3B2VWJx029475@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29457

Modified Files:
	pegasus-2.5.1-no-rpath.patch pegasus-2.5.1-redhat-config.patch 
	tog-pegasus.spec 
Added Files:
	pegasus-2.5.1-fix_tests.patch 
Log Message:
Upgrade to 2.5.1

pegasus-2.5.1-fix_tests.patch:
 Makefile.ReleaseTest |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE pegasus-2.5.1-fix_tests.patch ---
--- pegasus/Makefile.ReleaseTest.fix-tests	2006-02-28 17:23:55.000000000 -0500
+++ pegasus/Makefile.ReleaseTest	2006-04-10 22:17:27.000000000 -0400
@@ -165,7 +165,7 @@
 
 createMakefile_providerlinks:
 	@$(ECHO-E) "create_providerlinks:" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
-	@$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(ECHO-E) "\t@$(MAKE) createlink OBJECT=$(PEGASUS_TEST_DIR)/$(PEGASUS_ARCH_LIB)/$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile ;)
+	@$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(ECHO-E) "\t@$(MAKE) createlink OBJECT=$(PEGASUS_TEST_DIR)/lib/$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile ;)
 	@$(ECHO-E) "" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
 	@$(ECHO-E) "remove_providerlinks:" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
 	@$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(ECHO-E) "\trm -f $(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile ;)
@@ -189,8 +189,10 @@
 	@$(ECHO-E) "tests:" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
 	@$(ECHO-E) "\t@$(MAKE) -i cimstop" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
 	@$(ECHO-E) "\t@$(MAKE) prestarttests" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
-	@$(ECHO-E) "\t@$(MAKE) runTestSuite CIMSERVER_CONFIG_OPTIONS=\"$(TESTSUITE_CONFIG_1)\" TESTSUITE_CMDS=\"$(TESTSUITE_CMDS_1)\"" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
-	@$(ECHO-E) "\t@$(MAKE) runTestSuite CIMSERVER_CONFIG_OPTIONS=\"$(TESTSUITE_CONFIG_2)\" TESTSUITE_CMDS=\"$(TESTSUITE_CMDS_2)\"" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
+	@$(ECHO-E) "\t@$(MAKE) setupTEST" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
+	@$(ECHO-E) "\t@$(MAKE) runTestSuite CIMSERVER_CONFIG_OPTIONS=\"$(TESTSUITE_CONFIG_1)\" TESTSUITE_CMDS=\"$(TESTSUITE_CMDS_1)\" || { $(MAKE) unsetupTEST; exit 1; }" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
+	@$(ECHO-E) "\t@$(MAKE) runTestSuite CIMSERVER_CONFIG_OPTIONS=\"$(TESTSUITE_CONFIG_2)\" TESTSUITE_CMDS=\"$(TESTSUITE_CMDS_2)\" || { $(MAKE) unsetupTEST; exit 1; }" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
+	@$(ECHO-E) "\t@$(MAKE) unsetupTEST" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
 	@$(ECHO-E) "" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
 
 createMakefile_setupTEST:

pegasus-2.5.1-no-rpath.patch:
 mak/library-unix.mak                                      |    6 +++---
 mak/program-unix.mak                                      |   14 ++------------
 src/Pegasus/Common/Makefile                               |    3 +--
 src/Pegasus/ControlProviders/CertificateProvider/Makefile |    3 +--
 4 files changed, 7 insertions(+), 19 deletions(-)

Index: pegasus-2.5.1-no-rpath.patch
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/pegasus-2.5.1-no-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pegasus-2.5.1-no-rpath.patch	7 Apr 2006 02:40:20 -0000	1.1
+++ pegasus-2.5.1-no-rpath.patch	11 Apr 2006 02:31:28 -0000	1.2
@@ -1,5 +1,5 @@
 --- pegasus/mak/library-unix.mak.no-rpath	2006-01-30 11:16:23.000000000 -0500
-+++ pegasus/mak/library-unix.mak	2006-04-05 19:31:23.000000000 -0400
++++ pegasus/mak/library-unix.mak	2006-04-08 18:28:43.000000000 -0400
 @@ -81,14 +81,14 @@
    ifneq ($(PEGASUS_PLATFORM),DARWIN_PPC_GNU)
     ifdef PEGASUS_USE_RELEASE_DIRS
@@ -19,7 +19,7 @@
    ifeq ($(PEGASUS_PLATFORM), SOLARIS_SPARC_GNU)
  	LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -Xlinker -L$(LIB_DIR) $(EXTRA_LINK_ARGUMENTS)
 --- pegasus/mak/program-unix.mak.no-rpath	2006-01-30 11:16:23.000000000 -0500
-+++ pegasus/mak/program-unix.mak	2006-04-05 19:41:59.000000000 -0400
++++ pegasus/mak/program-unix.mak	2006-04-08 18:28:43.000000000 -0400
 @@ -30,22 +30,12 @@
  #//==============================================================================
  INCLUDES = -I$(ROOT)/src $(EXTRA_INCLUDES)
@@ -55,3 +55,27 @@
            endif
          endif      
        else
+--- pegasus/src/Pegasus/ControlProviders/CertificateProvider/Makefile.no-rpath	2006-01-30 11:17:40.000000000 -0500
++++ pegasus/src/Pegasus/ControlProviders/CertificateProvider/Makefile	2006-04-09 02:19:33.000000000 -0400
+@@ -58,8 +58,7 @@
+ ifeq ($(OS),linux)
+   EXTRA_LIBRARIES += -lcrypt
+   ifdef PEGASUS_HAS_SSL
+-    EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto
+-    EXTRA_LINK_ARGUMENTS =  -Xlinker -rpath -Xlinker $(OPENSSL_HOME)/lib
++    EXTRA_LIBRARIES += -lssl -lcrypto
+   endif
+ endif
+ 
+--- pegasus/src/Pegasus/Common/Makefile.no-rpath	2006-01-30 11:17:05.000000000 -0500
++++ pegasus/src/Pegasus/Common/Makefile	2006-04-09 02:23:54.000000000 -0400
+@@ -185,8 +185,7 @@
+ ifeq ($(OS),linux)
+   EXTRA_LIBRARIES += -lcrypt
+   ifdef PEGASUS_HAS_SSL
+-    EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto
+-    EXTRA_LINK_ARGUMENTS =  -Xlinker -rpath -Xlinker $(OPENSSL_HOME)/lib
++    EXTRA_LIBRARIES += -lssl -lcrypto
+   endif
+ endif
+ 

pegasus-2.5.1-redhat-config.patch:
 Makefile.Release     |    6 +++---
 env_var_Linux.status |   12 +++++-------
 2 files changed, 8 insertions(+), 10 deletions(-)

Index: pegasus-2.5.1-redhat-config.patch
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/pegasus-2.5.1-redhat-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pegasus-2.5.1-redhat-config.patch	7 Apr 2006 02:40:20 -0000	1.1
+++ pegasus-2.5.1-redhat-config.patch	11 Apr 2006 02:31:28 -0000	1.2
@@ -1,5 +1,5 @@
 --- pegasus/env_var_Linux.status.redhat-config	2006-03-15 20:33:51.000000000 -0500
-+++ pegasus/env_var_Linux.status	2006-04-06 19:15:13.000000000 -0400
++++ pegasus/env_var_Linux.status	2006-04-10 14:29:52.000000000 -0400
 @@ -18,7 +18,7 @@
  PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
  endif
@@ -17,7 +17,7 @@
  PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true
  PEGASUS_USE_RELEASE_DIRS=true
  PEGASUS_USE_SYSLOGS=true
-@@ -64,18 +63,17 @@
+@@ -64,22 +63,21 @@
  PEGASUS_LOCAL_AUTH_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/localauth
  PEGASUS_TRACE_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/trace
  PEGASUS_TRACE_FILE_PATH = $(PEGASUS_VARDATA_CACHE_DIR)/trace/cimserver.trc
@@ -39,8 +39,13 @@
  PEGASUS_VARRUN_DIR = /var/run/tog-pegasus
  PEGASUS_CIMSERVER_START_FILE = $(PEGASUS_VARRUN_DIR)/cimserver.pid
  CIMSERVER_LOCK_FILE = $(PEGASUS_VARRUN_DIR)/cimserver_start.lock
+-PEGASUS_LOCAL_DOMAIN_SOCKET_DIR = $(PEGASUS_VARRUN_DIR)/socket
++PEGASUS_LOCAL_DOMAIN_SOCKET_DIR = $(PEGASUS_VARRUN_DIR)
+ PEGASUS_LOCAL_DOMAIN_SOCKET_PATH = \
+      $(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)/cimxml.socket
+ 
 --- pegasus/Makefile.Release.redhat-config	2006-01-30 11:16:16.000000000 -0500
-+++ pegasus/Makefile.Release	2006-04-06 20:14:11.000000000 -0400
++++ pegasus/Makefile.Release	2006-04-08 18:28:43.000000000 -0400
 @@ -590,10 +590,10 @@
  	$(foreach i, $(MANAGEDSYSTEM_MOF_FILES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus/$(i);)
  


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- tog-pegasus.spec	7 Apr 2006 02:56:48 -0000	1.26
+++ tog-pegasus.spec	11 Apr 2006 02:31:28 -0000	1.27
@@ -1,19 +1,18 @@
-#==============================================================================
+#
 #
 #               OpenPegasus (Red Hat release) RPM .spec file
 #
 #  tog-pegasus.spec
 #
 #   Copyright (c) 2000 - 2006, 
-#     The Open Group; Hewlett-Packard Development Company, L.P.;  IBM Corp.;
-#     BMC Software;   Tivoli Systems.
+#     The Open Group; Hewlett-Packard Development Company, L.P.;
+#     IBM Corp.;  BMC Software; Tivoli Systems.
 #     Licensed under the "Open Group Pegasus Open Source" license 
 #     shipped with this software.
 #
 #  Upstream tog-pegasus.spec file modified for Red Hat build -
 #  April 2006, Jason Vas Dias <jvdias at redhat.com>, Red Hat Inc.
 #
-#==============================================================================
 
 %{?!LINUX_VERSION: 		%define LINUX_VERSION  FC6}
 #
@@ -45,8 +44,9 @@
 BuildRoot: 		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #
 Source:    		http://www.openpegasus.org/uploads/40/10123/%{srcname}-%{version}.tar.gz
-Source1:		pegasus_rpm_build_env.sh
+Source1:		RedHat.OpenPegasus.Makefile
 Source2:        	README.RedHat.Security
+Source3:		genOpenPegasusSSLCerts
 #
 Patch0:			pegasus-2.5.1-initscript.patch
 Patch1:			pegasus-2.5.1-no-rpath.patch
@@ -57,6 +57,9 @@
 Patch6:			pegasus-2.5.1-cmpi-provider-lib.patch
 Patch7:			pegasus-2.5.1-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
 #
 Conflicts: 		openwbem
 Provides: 		tog-pegasus-cimserver
@@ -103,16 +106,10 @@
 %package test
 Summary: 		The OpenPegasus Tests
 Group: 			Systems Management/Base
-Requires: 		tog-pegasus >= %{version} 
-Requires(post): 	make
-Requires(postun): 	make
+Requires: 		tog-pegasus >= %{version}, make
 
 %description test
 The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm.
-**********************************************************************************
-*** DO NOT INSTALL THIS RPM ON A PRODUCTION SYSTEM - THIS IS FOR TESTING ONLY. ***
-**********************************************************************************
-
 %endif
 
 %prep
@@ -126,39 +123,31 @@
 %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
 
 %build
 rm -rf ${RPM_BUILD_ROOT} || :;
+cp -fp %SOURCE1 .;
+cp -fp %SOURCE2 doc
+cp -fp %SOURCE3 rpm
 export RPM_ARCH_LIB=%{_lib}
-. %SOURCE1
+make %{?_smp_mflags} -f RedHat.OpenPegasus.Makefile;
 %if %{PEGASUS_BUILD_TEST_RPM}
-export PEGASUS_DISPLAYCONSUMER_DIR=/var/lib/Pegasus/log
+    make %{?_smp_mflags} -f RedHat.OpenPegasus.Makefile tests;
 %endif
-make -f $PEGASUS_ROOT/Makefile.Release create_ProductVersionFile
-make -f $PEGASUS_ROOT/Makefile.Release create_CommonProductDirectoriesInclude
-make -f $PEGASUS_ROOT/Makefile.Release create_ConfigProductDirectoriesInclude
-make -f $PEGASUS_ROOT/Makefile.Release all
-make -f $PEGASUS_ROOT/Makefile.Release repository
 
 %install
-export RPM_ARCH_LIB=%{_lib}
-. %SOURCE1
-export PEGASUS_STAGING_DIR=$RPM_BUILD_ROOT;
+make -f RedHat.OpenPegasus.Makefile install prefix=$RPM_BUILD_ROOT libdir=%{_libdir} root_user=%(%{__id_u} -n) pegasus_user=%(%{__id_u} -n)
 %if %{PEGASUS_BUILD_TEST_RPM}
-export PEGASUS_BUILD_TEST_RPM=%{PEGASUS_BUILD_TEST_RPM};
+    make -f RedHat.OpenPegasus.Makefile install_tests prefix=$RPM_BUILD_ROOT root_user=%(%{__id_u} -n) pegasus_user=%(%{__id_u} -n)    
 %endif
-make -f $PEGASUS_ROOT/Makefile.Release stage;
-cp -fp %SOURCE2 doc
-mkdir -p ${RPM_BUILD_ROOT}/etc/rc.d;
-mkdir -p ${RPM_BUILD_ROOT}/var/run/tog-pegasus/socket;
-mv ${RPM_BUILD_ROOT}/etc/init.d ${RPM_BUILD_ROOT}/etc/rc.d ||:;
-cp -fp rpm/tog-pegasus.rc ${RPM_BUILD_ROOT}/etc/rc.d/init.d/tog-pegasus;
-touch ${RPM_BUILD_ROOT}{/etc/Pegasus/{cimserver_current.conf,cimserver_planned.conf,cimserver_trust,indication_trust,crl},/var/run/tog-pegasus/{socket/cimxml.socket,cimserver.pid,cimserver_start.lock}}
-rm -rf ${RPM_BUILD_ROOT}/usr/share/doc/%{name}-2.5
 %if %{NODEBUGINFO}
     /usr/lib/rpm/brp-compress;
     exit 0;
 %endif
+:;
 
 %files
 %defattr(0750, root, pegasus, 0750)
@@ -188,8 +177,7 @@
 %dir   %attr(1750,root,pegasus) /var/run/tog-pegasus
 %ghost /var/run/tog-pegasus/cimserver.pid
 %ghost /var/run/tog-pegasus/cimserver_start.lock
-%dir   %attr(1750,root,pegasus) /var/run/tog-pegasus/socket
-%ghost %attr(1640,root,pegasus) /var/run/tog-pegasus/socket/cimxml.socket
+%ghost %attr(1640,root,pegasus) /var/run/tog-pegasus/cimxml.socket
 /usr/share/man/man8/*
 %defattr(0644, root, pegasus, 0755)
 %dir /usr/share/Pegasus
@@ -205,11 +193,12 @@
 
 %if %{PEGASUS_BUILD_TEST_RPM}
 %files test
-%defattr(0640,root,pegasus,0750)
+%defattr(0644,root,pegasus,0755)
 %dir /usr/share/Pegasus/test
 /usr/share/Pegasus/test/Makefile
+/usr/share/Pegasus/test/mak
 /var/lib/Pegasus/testrepository
-%defattr(0750,root,pegasus,0750)
+%defattr(0750,root,pegasus,0755)
 /usr/share/Pegasus/test/bin
 /usr/share/Pegasus/test/lib
 %endif
@@ -270,19 +259,6 @@
 fi
 :;
 
-%if %{PEGASUS_BUILD_TEST_RPM}
-
-%preun test
-if [ $1 -eq 0 ]; then
-    make --directory /usr/share/Pegasus/test -s unsetupTEST >/dev/null 2>&1 || :;
-    if [ -d /var/lib/Pegasus/testrepository ]; then
-   	mv /var/lib/Pegasus/testrepository_`date '+%Y-%m-%d-%s.%N'`.rpmsave;
-    fi;
-fi;
-:;
-
-%endif
-
 %changelog
 * Thu Apr 06 2006 Jason Vas Dias <jvdias at redhat.com> - 2:2.5.1-1
 - Upgrade to version 2.5.1 (including new upstream .spec file).



From fedora-cvs-commits at redhat.com  Tue Apr 11 02:33:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 22:33:27 -0400
Subject: rpms/evolution-data-server/FC-5 evolution-data-server.spec, 1.88,
	1.89
Message-ID: <200604110233.k3B2XQP5029629@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	evolution-data-server.spec 
Log Message:
fix a multilib conflict



Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/FC-5/evolution-data-server.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- evolution-data-server.spec	11 Apr 2006 01:12:47 -0000	1.88
+++ evolution-data-server.spec	11 Apr 2006 02:33:24 -0000	1.89
@@ -11,11 +11,7 @@
 %define eds_base_version 1.6
 %define eds_api_version 1.2
 
-%ifarch s390x ia64
 %define use_gtk_doc 0
-%else
-%define use_gtk_doc 1
-%endif
 
 %define support_imap4_provider 0
 
@@ -321,6 +317,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 1.6.1-1.fc5.2
+- Fix a multilib conflict
+
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 1.6.1-1.fc5.1
 - Update to 1.6.1
 



From fedora-cvs-commits at redhat.com  Tue Apr 11 02:34:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 22:34:23 -0400
Subject: rpms/evolution-data-server/FC-5 evolution-data-server.spec, 1.89,
	1.90
Message-ID: <200604110234.k3B2YNve029680@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	evolution-data-server.spec 
Log Message:
bump rev



Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/FC-5/evolution-data-server.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- evolution-data-server.spec	11 Apr 2006 02:33:24 -0000	1.89
+++ evolution-data-server.spec	11 Apr 2006 02:34:20 -0000	1.90
@@ -21,7 +21,7 @@
 Summary: Backend data server for evolution
 Name: evolution-data-server
 Version: 1.6.1
-Release: 1.fc5.1
+Release: 1.fc5.2
 License: LGPL
 Group: System Environment/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 02:35:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 22:35:36 -0400
Subject: rpms/tog-pegasus/devel pegasus-2.5.1-parallel_make.patch,NONE,1.1
Message-ID: <200604110235.k3B2ZanC029796@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29771

Added Files:
	pegasus-2.5.1-parallel_make.patch 
Log Message:
fix parallel make: add object dependency on $(OBJ_DIR)/target

pegasus-2.5.1-parallel_make.patch:
 objects-unix.mak |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE pegasus-2.5.1-parallel_make.patch ---
--- pegasus/mak/objects-unix.mak.parallel_make	2006-01-30 11:16:23.000000000 -0500
+++ pegasus/mak/objects-unix.mak	2006-04-10 16:58:30.000000000 -0400
@@ -50,7 +50,7 @@
 
 
 ifeq ($(_NO_TMP_O), yes)
-$(OBJ_DIR)/%.o: %.cpp $(ERROR)
+$(OBJ_DIR)/%.o: $(OBJ_DIR)/target %.cpp $(ERROR)
 	$(CXX) -c -o $@ $(FLAGS) $(EXTRA_CXX_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.cpp
 	@ $(TOUCH) $@
 	@ $(ECHO)
@@ -64,7 +64,7 @@
 endif
 
 ifeq ($(_NO_TMP_O), yes)
-$(OBJ_DIR)/%.o: %.c $(ERROR)
+$(OBJ_DIR)/%.o: $(OBJ_DIR)/target %.c $(ERROR)
 	$(CC) -c -o $@ $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.c
 	@ $(TOUCH) $@
 	@ $(ECHO)
@@ -78,7 +78,7 @@
 endif
 
 ifeq ($(_NO_TMP_O), yes)
-$(OBJ_DIR)/%.o: %.s $(ERROR)
+$(OBJ_DIR)/%.o: $(OBJ_DIR)/target  %.s $(ERROR)
 	$(CC) -c -o $@ $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.s
 	@ $(TOUCH) $@
 	@ $(ECHO)



From fedora-cvs-commits at redhat.com  Tue Apr 11 02:47:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 22:47:10 -0400
Subject: rpms/evolution-connector/devel
	evolution-connector-2.6.1-generated-autotool.patch, 1.1, 1.2
Message-ID: <200604110247.k3B2lA21011616@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	evolution-connector-2.6.1-generated-autotool.patch 
Log Message:
fix up


evolution-connector-2.6.1-generated-autotool.patch:
 acinclude.m4   |   22 ++
 aclocal.m4     |  389 ++++++++++++++++-------------------------------
 autom4te.cache |only
 configure      |  465 +++++++++++++++++++++++++--------------------------------
 4 files changed, 363 insertions(+), 513 deletions(-)

Index: evolution-connector-2.6.1-generated-autotool.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector-2.6.1-generated-autotool.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-connector-2.6.1-generated-autotool.patch	11 Apr 2006 01:58:14 -0000	1.1
+++ evolution-connector-2.6.1-generated-autotool.patch	11 Apr 2006 02:47:06 -0000	1.2
@@ -1137,7 +1137,7 @@
 -    WARN_CFLAGS="$warning_flags $complCFLAGS"
 -
 -
-+GNOME_COMPILE_WARNINGS(maximum)
++
  CFLAGS="$CFLAGS $WARN_CFLAGS"
  case $CFLAGS in
  *-Wall*)



From fedora-cvs-commits at redhat.com  Tue Apr 11 02:51:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 22:51:18 -0400
Subject: rpms/evolution-connector/devel
	evolution-connector-2.6.1-generated-autotool.patch, 1.2, 1.3
Message-ID: <200604110251.k3B2pImq011743@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	evolution-connector-2.6.1-generated-autotool.patch 
Log Message:
another attempt


evolution-connector-2.6.1-generated-autotool.patch:
 acinclude.m4   |   22 ++
 aclocal.m4     |  389 ++++++++++++++++-------------------------------
 autom4te.cache |only
 configure      |  465 +++++++++++++++++++++++++--------------------------------
 4 files changed, 363 insertions(+), 513 deletions(-)

Index: evolution-connector-2.6.1-generated-autotool.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector-2.6.1-generated-autotool.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- evolution-connector-2.6.1-generated-autotool.patch	11 Apr 2006 02:47:06 -0000	1.2
+++ evolution-connector-2.6.1-generated-autotool.patch	11 Apr 2006 02:51:16 -0000	1.3
@@ -1137,7 +1137,7 @@
 -    WARN_CFLAGS="$warning_flags $complCFLAGS"
 -
 -
-+
++WARN_CFLAGS=
  CFLAGS="$CFLAGS $WARN_CFLAGS"
  case $CFLAGS in
  *-Wall*)



From fedora-cvs-commits at redhat.com  Tue Apr 11 02:52:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 22:52:51 -0400
Subject: rpms/evolution/devel .cvsignore, 1.46, 1.47 evolution.spec, 1.137,
	1.138 sources, 1.46, 1.47
Message-ID: <200604110252.k3B2qpAn011788@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore evolution.spec sources 
Log Message:
2.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	13 Mar 2006 17:45:46 -0000	1.46
+++ .cvsignore	11 Apr 2006 02:52:49 -0000	1.47
@@ -1 +1,2 @@
 evolution-2.6.0.tar.bz2
+evolution-2.6.1.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- evolution.spec	30 Mar 2006 15:23:37 -0000	1.137
+++ evolution.spec	11 Apr 2006 02:52:49 -0000	1.138
@@ -38,7 +38,7 @@
 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
 
 Name: evolution
-Version: 2.6.0
+Version: 2.6.1
 Release: 2
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -635,6 +635,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.6.1-2
+- Update to 2.6.1
+
 * Thu Mar 30 2006 Caolan McNamara <caolanm at redhat.com> - 2.6.0-2
 - rebuild against reverted pilot-link
 - disable evolution-2.5.4-fix-conduits.patch for reversion to pilot-link 0.11.8


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	13 Mar 2006 17:45:46 -0000	1.46
+++ sources	11 Apr 2006 02:52:49 -0000	1.47
@@ -1 +1 @@
-5c98650b2ccf3581e7cf5af3927b95d1  evolution-2.6.0.tar.bz2
+6ca70a86e6d8e8b3824e58f28a362065  evolution-2.6.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 02:59:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 22:59:40 -0400
Subject: rpms/evolution-connector/devel
	evolution-connector-2.6.1-generated-autotool.patch, 1.3, 1.4
Message-ID: <200604110259.k3B2xetc011935@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	evolution-connector-2.6.1-generated-autotool.patch 
Log Message:
another try


evolution-connector-2.6.1-generated-autotool.patch:
 acinclude.m4   |   22 ++
 aclocal.m4     |  389 ++++++++++++++++-------------------------------
 autom4te.cache |only
 configure      |  464 +++++++++++++++++++++++++--------------------------------
 4 files changed, 363 insertions(+), 512 deletions(-)

Index: evolution-connector-2.6.1-generated-autotool.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector-2.6.1-generated-autotool.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- evolution-connector-2.6.1-generated-autotool.patch	11 Apr 2006 02:51:16 -0000	1.3
+++ evolution-connector-2.6.1-generated-autotool.patch	11 Apr 2006 02:59:37 -0000	1.4
@@ -1265,7 +1265,7 @@
  s, at INTLTOOL_EXTRACT@,$INTLTOOL_EXTRACT,;t t
  s, at INTLTOOL_MERGE@,$INTLTOOL_MERGE,;t t
  s, at INTLTOOL_UPDATE@,$INTLTOOL_UPDATE,;t t
-@@ -25474,11 +25425,11 @@
+@@ -25474,6 +25425,7 @@
  s, at PO_IN_DATADIR_FALSE@,$PO_IN_DATADIR_FALSE,;t t
  s, at POFILES@,$POFILES,;t t
  s, at POSUB@,$POSUB,;t t
@@ -1273,11 +1273,6 @@
  s, at GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
  s, at localedir@,$localedir,;t t
  s, at NO_UNDEFINED@,$NO_UNDEFINED,;t t
- s, at SOCKET_LIBS@,$SOCKET_LIBS,;t t
--s, at WARN_CFLAGS@,$WARN_CFLAGS,;t t
- s, at PKG_CONFIG@,$PKG_CONFIG,;t t
- s, at GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
- s, at GLIB_LIBS@,$GLIB_LIBS,;t t
 @@ -26219,47 +26170,51 @@
   ;;
      intltool )



From fedora-cvs-commits at redhat.com  Tue Apr 11 03:07:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 23:07:24 -0400
Subject: rpms/evolution/FC-5 evolution.spec,1.134,1.135 sources,1.46,1.47
Message-ID: <200604110307.k3B37Onp012148@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	evolution.spec sources 
Log Message:
2.6.1



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/evolution.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- evolution.spec	14 Mar 2006 06:57:34 -0000	1.134
+++ evolution.spec	11 Apr 2006 03:07:22 -0000	1.135
@@ -11,7 +11,7 @@
 %define gnomevfs2_version 2.4
 %define last_libgal2_version 2:2.5.3-2
 
-%define pilot_link_version 0.12.0
+%define pilot_link_version 2:0.11.8
 %define gnome_pilot_version 2.0.13
 
 %define ldap_support 1
@@ -38,8 +38,8 @@
 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
 
 Name: evolution
-Version: 2.6.0
-Release: 1
+Version: 2.6.1
+Release: 1.fc5.1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -88,7 +88,7 @@
 #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
+# Patch800: 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
@@ -238,7 +238,7 @@
 
 #patch700 -p1 -b .filechooser
 
-%patch800 -p1 -b .fix-conduits
+# %patch800 -p1 -b .fix-conduits
 %patch802 -p1 -b .fix-conduit-dir
 %patch803 -p1 -b .no-gnome-common
 %patch804 -p1 -b .fix-missing-declarations
@@ -635,6 +635,13 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.6.1-1.fc5.1
+- Update to 2.6.1
+
+* Thu Mar 30 2006 Caolan McNamara <caolanm at redhat.com> - 2.6.0-2
+- rebuild against reverted pilot-link
+- disable evolution-2.5.4-fix-conduits.patch for reversion to pilot-link 0.11.8
+
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 2.6.0-1
 - 2.6.0
 - turn on the "error on missing prototypes" check thing


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	13 Mar 2006 17:45:46 -0000	1.46
+++ sources	11 Apr 2006 03:07:22 -0000	1.47
@@ -1 +1 @@
-5c98650b2ccf3581e7cf5af3927b95d1  evolution-2.6.0.tar.bz2
+6ca70a86e6d8e8b3824e58f28a362065  evolution-2.6.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 03:10:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 23:10:03 -0400
Subject: rpms/libsoup/devel .cvsignore, 1.16, 1.17 libsoup.spec, 1.32,
	1.33 sources, 1.16, 1.17
Message-ID: <200604110310.k3B3A32b012264@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libsoup/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12245

Modified Files:
	.cvsignore libsoup.spec sources 
Log Message:
2.2.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsoup/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	4 Mar 2006 05:47:27 -0000	1.16
+++ .cvsignore	11 Apr 2006 03:10:00 -0000	1.17
@@ -1,2 +1,3 @@
 libsoup-2.2.7.tar.bz2
 libsoup-2.2.91.tar.bz2
+libsoup-2.2.92.tar.bz2


Index: libsoup.spec
===================================================================
RCS file: /cvs/dist/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libsoup.spec	4 Mar 2006 06:08:12 -0000	1.32
+++ libsoup.spec	11 Apr 2006 03:10:01 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Soup, an HTTP library implementation
 Name: libsoup
-Version: 2.2.91
-Release: 1 
+Version: 2.2.92
+Release: 2 
 License: LGPL
 Group: Development/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/libsoup/2.2/%{name}-%{version}.tar.bz2
@@ -66,6 +66,9 @@
 %{_datadir}/gtk-doc/html/libsoup
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.2.92-2
+- Update to 2.2.92
+
 * Sat Mar  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.2.91-1
 - Update to 2.2.91
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsoup/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	4 Mar 2006 05:47:27 -0000	1.16
+++ sources	11 Apr 2006 03:10:01 -0000	1.17
@@ -1 +1 @@
-61541fd6df42b718e84eab8c654a6c25  libsoup-2.2.91.tar.bz2
+44803c568d80f0adf3141fa23998ca74  libsoup-2.2.92.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 03:14:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 23:14:58 -0400
Subject: rpms/evolution-connector/FC-5
	evolution-connector-2.6.1-generated-autotool.patch, NONE,
	1.1 ximian-connector-2.1.4-generated-autotool.patch, 1.13, NONE
Message-ID: <200604110314.k3B3Ew6i012406@cvs.devel.redhat.com>

Author: mclasen

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

Added Files:
	evolution-connector-2.6.1-generated-autotool.patch 
Removed Files:
	ximian-connector-2.1.4-generated-autotool.patch 
Log Message:
update patch


evolution-connector-2.6.1-generated-autotool.patch:
 acinclude.m4   |   22 ++
 aclocal.m4     |  389 ++++++++++++++++-------------------------------
 autom4te.cache |only
 configure      |  464 +++++++++++++++++++++++++--------------------------------
 4 files changed, 363 insertions(+), 512 deletions(-)

--- NEW FILE evolution-connector-2.6.1-generated-autotool.patch ---
diff -u -r evolution-exchange-2.6.1-pristine/acinclude.m4 evolution-exchange-2.6.1/acinclude.m4
--- evolution-exchange-2.6.1-pristine/acinclude.m4	2004-08-13 14:16:45.000000000 -0400
+++ evolution-exchange-2.6.1/acinclude.m4	2006-04-10 21:53:05.000000000 -0400
@@ -34,6 +34,18 @@
 	AC_ARG_WITH(openldap,     [  --with-openldap=[no/yes/PREFIX]      Enable LDAP support in evolution])
 	AC_ARG_WITH(static-ldap,  [  --with-static-ldap=[no/yes]          Link LDAP support statically into evolution ])
 	AC_CACHE_CHECK([for OpenLDAP], ac_cv_with_openldap, ac_cv_with_openldap="${with_openldap:=$default}")
+
+	AC_MSG_CHECKING(for multilib subdirectory)
+	if test "$GCC" = "yes" ; then
+		multilibsubdir=`$CC -print-multi-os-directory 2> /dev/null`
+	fi
+	multilibsubdir=${multilibsubdir:-.}
+	AC_MSG_RESULT($multilibsubdir)
+	AC_MSG_CHECKING(for lib subdirectory)
+	libsubdir=`echo lib/${multilibsubdir} | sed -re 's,lib/../([[^/]]*),\1,g'`
+	libsubdir=${libsubdir:-lib}
+	AC_MSG_RESULT($libsubdir)
+
 	case $ac_cv_with_openldap in
 	no|"")
 		with_openldap=no
@@ -44,7 +56,7 @@
 	*)
 		with_openldap=$ac_cv_with_openldap
 		LDAP_CFLAGS="-I$ac_cv_with_openldap/include"
-		LDAP_LDFLAGS="-L$ac_cv_with_openldap/lib"
+		LDAP_LDFLAGS="-L$ac_cv_with_openldap/$libsubdir"
 		;;
 	esac
 
@@ -80,20 +92,20 @@
 		AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")
 		AC_CHECK_LIB(lber, ber_get_tag, [
 			if test "$with_static_ldap" = "yes"; then
-				LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"
+				LDAP_LIBS="$with_openldap/$libsubdir/liblber.a $LDAP_LIBS"
 
 				# libldap might depend on OpenSSL... We need to pull
 				# in the dependency libs explicitly here since we're
 				# not using libtool for the configure test.
-				if test -f $with_openldap/lib/libldap.la; then
-					LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
+				if test -f $with_openldap/$libsubdir/libldap.la; then
+					LDAP_LIBS="`. $with_openldap/$libsubdir/libldap.la; echo $dependency_libs` $LDAP_LIBS"
 				fi
 			else
 				LDAP_LIBS="-llber $LDAP_LIBS"
 			fi
 			AC_CHECK_LIB(ldap, ldap_open, [
 					if test $with_static_ldap = "yes"; then
-						LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS"
+						LDAP_LIBS="$with_openldap/$libsubdir/libldap.a $LDAP_LIBS"
 					else
 						LDAP_LIBS="-lldap $LDAP_LIBS"
 					fi],
diff -u -r evolution-exchange-2.6.1-pristine/aclocal.m4 evolution-exchange-2.6.1/aclocal.m4
--- evolution-exchange-2.6.1-pristine/aclocal.m4	2006-04-10 08:35:13.000000000 -0400
+++ evolution-exchange-2.6.1/aclocal.m4	2006-04-10 21:54:19.000000000 -0400
@@ -47,6 +47,18 @@
 	AC_ARG_WITH(openldap,     [  --with-openldap=[no/yes/PREFIX]      Enable LDAP support in evolution])
 	AC_ARG_WITH(static-ldap,  [  --with-static-ldap=[no/yes]          Link LDAP support statically into evolution ])
 	AC_CACHE_CHECK([for OpenLDAP], ac_cv_with_openldap, ac_cv_with_openldap="${with_openldap:=$default}")
+
+	AC_MSG_CHECKING(for multilib subdirectory)
+	if test "$GCC" = "yes" ; then
+		multilibsubdir=`$CC -print-multi-os-directory 2> /dev/null`
+	fi
+	multilibsubdir=${multilibsubdir:-.}
+	AC_MSG_RESULT($multilibsubdir)
+	AC_MSG_CHECKING(for lib subdirectory)
+	libsubdir=`echo lib/${multilibsubdir} | sed -re 's,lib/../([[^/]]*),\1,g'`
+	libsubdir=${libsubdir:-lib}
+	AC_MSG_RESULT($libsubdir)
+
 	case $ac_cv_with_openldap in
 	no|"")
 		with_openldap=no
@@ -57,7 +69,7 @@
 	*)
 		with_openldap=$ac_cv_with_openldap
 		LDAP_CFLAGS="-I$ac_cv_with_openldap/include"
-		LDAP_LDFLAGS="-L$ac_cv_with_openldap/lib"
+		LDAP_LDFLAGS="-L$ac_cv_with_openldap/$libsubdir"
 		;;
 	esac
 
@@ -93,20 +105,20 @@
 		AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")
 		AC_CHECK_LIB(lber, ber_get_tag, [
 			if test "$with_static_ldap" = "yes"; then
-				LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"
+				LDAP_LIBS="$with_openldap/$libsubdir/liblber.a $LDAP_LIBS"
 
 				# libldap might depend on OpenSSL... We need to pull
 				# in the dependency libs explicitly here since we're
 				# not using libtool for the configure test.
-				if test -f $with_openldap/lib/libldap.la; then
-					LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
+				if test -f $with_openldap/$libsubdir/libldap.la; then
+					LDAP_LIBS="`. $with_openldap/$libsubdir/libldap.la; echo $dependency_libs` $LDAP_LIBS"
 				fi
 			else
 				LDAP_LIBS="-llber $LDAP_LIBS"
 			fi
 			AC_CHECK_LIB(ldap, ldap_open, [
 					if test $with_static_ldap = "yes"; then
-						LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS"
+						LDAP_LIBS="$with_openldap/$libsubdir/libldap.a $LDAP_LIBS"
 					else
 						LDAP_LIBS="-lldap $LDAP_LIBS"
 					fi],
@@ -7475,52 +7487,30 @@
 
 AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
 
-# isc-posix.m4 serial 2 (gettext-0.11.2)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-# This file is not needed with autoconf-2.53 and newer.  Remove it in 2005.
-
-# This test replaces the one in autoconf.
-# Currently this macro should have the same name as the autoconf macro
-# because gettext's gettext.m4 (distributed in the automake package)
-# still uses it.  Otherwise, the use in gettext.m4 makes autoheader
-# give these diagnostics:
-#   configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
-#   configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
-
-undefine([AC_ISC_POSIX])
-
-AC_DEFUN([AC_ISC_POSIX],
-  [
-    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
-    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
-  ]
-)
-
 
 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
 # serial 2 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. '{ printf "%d", $[1] * 100 + $[2]; }'`
-    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { printf $[2]; }'  < ${ac_aux_dir}/intltool-update.in`
-    changequote({{,}})
-    INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split(${{2}}, VERSION, "."); printf "%d\n", VERSION[1] * 100 + VERSION[2];}' < ${ac_aux_dir}/intltool-update.in`
-    changequote([,])
-
-    if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT"; then
-	AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-    else
-	AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found. Your intltool is too old.  You need intltool $1 or later.])
-	exit 1
-    fi
+    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 100 + $ 2; }'`
+    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] * 100 + VERSION[2];}' ${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 $< [$]@' 
@@ -7540,6 +7530,7 @@
     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)
@@ -7558,16 +7549,12 @@
 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.
-
-INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
-INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
-INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
-
-AC_SUBST(INTLTOOL_EXTRACT)
-AC_SUBST(INTLTOOL_MERGE)
-AC_SUBST(INTLTOOL_UPDATE)
+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
@@ -7590,76 +7577,93 @@
 AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
 AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
 
-# Remove file type tags (using []) from po/POTFILES.
-
-ifdef([AC_DIVERSION_ICMDS],[
-  AC_DIVERT_PUSH(AC_DIVERSION_ICMDS)
-     [mv -f po/POTFILES po/POTFILES.tmp
-      sed -e '/[[]encoding.*]/d' -e 's/[[].*] *//' < po/POTFILES.tmp > po/POTFILES
-      rm -f po/POTFILES.tmp
-     ]dnl
-  AC_DIVERT_POP()
-],[
-  ifdef([AC_CONFIG_COMMANDS_PRE],[
-    AC_CONFIG_COMMANDS_PRE([
-       [mv -f po/POTFILES po/POTFILES.tmp
-        sed -e '/[[]encoding.*]/d' -e 's/[[].*] *//' < po/POTFILES.tmp > po/POTFILES
-        rm -f po/POTFILES.tmp
-       ]dnl
-    ])
-  ])
-])
+IT_PO_SUBDIR([po])
 
-# Manually sed perl in so people don't have to put the intltool scripts in AC_OUTPUT.
+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], [
 
-intltool_edit="-e 's#@INTLTOOL_EXTRACT@#`pwd`/intltool-extract#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'"
-
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-extract.in \
-  > intltool-extract.out
-if cmp -s intltool-extract intltool-extract.out 2>/dev/null; then
-  rm -f intltool-extract.out
-else
-  mv -f intltool-extract.out intltool-extract
-fi
-chmod ugo+x intltool-extract
-chmod u+w intltool-extract
+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
 
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-merge.in \
-  > intltool-merge.out
-if cmp -s intltool-merge intltool-merge.out 2>/dev/null; then
-  rm -f intltool-merge.out
-else
-  mv -f intltool-merge.out intltool-merge
-fi
-chmod ugo+x intltool-merge
-chmod u+w intltool-merge
+],
+[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}'])
 
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-update.in \
-  > intltool-update.out
-if cmp -s intltool-update intltool-update.out 2>/dev/null; then
-  rm -f intltool-update.out
-else
-  mv -f intltool-update.out intltool-update
-fi
-chmod ugo+x intltool-update
-chmod u+w intltool-update
+])
 
-], INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir=${ac_aux_dir}
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' ICONV='${INTLTOOL_ICONV}'
-MSGFMT='${INTLTOOL_MSGFMT}' MSGMERGE='${INTLTOOL_MSGMERGE}'
-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
-AC_DEFUN([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL($@)])
+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
+# A hint is needed for aclocal from Automake <= 1.9.4:
+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
 
 
 # Copyright (C) 1995-2002 Free Software Foundation, Inc.
@@ -8003,6 +8007,18 @@
      fi
    fi
 
+   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+   dnl Try to locate is.
+   MKINSTALLDIRS=
+   if test -n "$ac_aux_dir"; then
+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+   fi
+   if test -z "$MKINSTALLDIRS"; then
+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+   fi
+   AC_SUBST(MKINSTALLDIRS)
+
    dnl Generate list of files to be processed by xgettext which will
    dnl be included in po/Makefile.
    test -d po || mkdir po
@@ -8049,148 +8065,6 @@
 AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
 ])dnl
 
-dnl GNOME_COMPILE_WARNINGS
-dnl Turn on many useful compiler warnings
-dnl For now, only works on GCC
-AC_DEFUN([GNOME_COMPILE_WARNINGS],[
-    dnl ******************************
-    dnl More compiler warnings
-    dnl ******************************
-
-    AC_ARG_ENABLE(compile-warnings, 
-                  AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
-                                 [Turn on compiler warnings]),,
-                  [enable_compile_warnings="m4_default([$1],[yes])"])
-
-    warnCFLAGS=
-    if test "x$GCC" != xyes; then
-	enable_compile_warnings=no
-    fi
-
-    warning_flags=
-    realsave_CFLAGS="$CFLAGS"
-
-    case "$enable_compile_warnings" in
-    no)
-	warning_flags=
-	;;
-    minimum)
-	warning_flags="-Wall"
-	;;
-    yes)
-	warning_flags="-Wall -Wmissing-prototypes"
-	;;
-    maximum|error)
-	warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
-	CFLAGS="$warning_flags $CFLAGS"
-	for option in -Wno-sign-compare; do
-		SAVE_CFLAGS="$CFLAGS"
-		CFLAGS="$CFLAGS $option"
-		AC_MSG_CHECKING([whether gcc understands $option])
-		AC_TRY_COMPILE([], [],
-			has_option=yes,
-			has_option=no,)
-		CFLAGS="$SAVE_CFLAGS"
-		AC_MSG_RESULT($has_option)
-		if test $has_option = yes; then
-		  warning_flags="$warning_flags $option"
-		fi
-		unset has_option
-		unset SAVE_CFLAGS
-	done
-	unset option
-	if test "$enable_compile_warnings" = "error" ; then
-	    warning_flags="$warning_flags -Werror"
-	fi
-	;;
-    *)
-	AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
-	;;
-    esac
-    CFLAGS="$realsave_CFLAGS"
-    AC_MSG_CHECKING(what warning flags to pass to the C compiler)
-    AC_MSG_RESULT($warning_flags)
-
-    AC_ARG_ENABLE(iso-c,
-                  AC_HELP_STRING([--enable-iso-c],
-                                 [Try to warn if code is not ISO C ]),,
-                  [enable_iso_c=no])
-
-    AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
-    complCFLAGS=
-    if test "x$enable_iso_c" != "xno"; then
-	if test "x$GCC" = "xyes"; then
-	case " $CFLAGS " in
-	    *[\ \	]-ansi[\ \	]*) ;;
-	    *) complCFLAGS="$complCFLAGS -ansi" ;;
-	esac
-	case " $CFLAGS " in
-	    *[\ \	]-pedantic[\ \	]*) ;;
-	    *) complCFLAGS="$complCFLAGS -pedantic" ;;
-	esac
-	fi
-    fi
-    AC_MSG_RESULT($complCFLAGS)
-
-    WARN_CFLAGS="$warning_flags $complCFLAGS"
-    AC_SUBST(WARN_CFLAGS)
-])
-
-dnl For C++, do basically the same thing.
-
-AC_DEFUN([GNOME_CXX_WARNINGS],[
-  AC_ARG_ENABLE(cxx-warnings,
-                AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
-                               [Turn on compiler warnings.]),,
-                [enable_cxx_warnings="m4_default([$1],[minimum])"])
-
-  AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
-  warnCXXFLAGS=
-  if test "x$GCC" != xyes; then
-    enable_compile_warnings=no
-  fi
-  if test "x$enable_cxx_warnings" != "xno"; then
-    if test "x$GCC" = "xyes"; then
-      case " $CXXFLAGS " in
-      *[\ \	]-Wall[\ \	]*) ;;
-      *) warnCXXFLAGS="-Wall -Wno-unused" ;;
-      esac
-
-      ## -W is not all that useful.  And it cannot be controlled
-      ## with individual -Wno-xxx flags, unlike -Wall
-      if test "x$enable_cxx_warnings" = "xyes"; then
-	warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
-      fi
-    fi
-  fi
-  AC_MSG_RESULT($warnCXXFLAGS)
-
-   AC_ARG_ENABLE(iso-cxx,
-                 AC_HELP_STRING([--enable-iso-cxx],
-                                [Try to warn if code is not ISO C++ ]),,
-                 [enable_iso_cxx=no])
-
-   AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
-   complCXXFLAGS=
-   if test "x$enable_iso_cxx" != "xno"; then
-     if test "x$GCC" = "xyes"; then
-      case " $CXXFLAGS " in
-      *[\ \	]-ansi[\ \	]*) ;;
-      *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
-      esac
-
-      case " $CXXFLAGS " in
-      *[\ \	]-pedantic[\ \	]*) ;;
-      *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
-      esac
-     fi
-   fi
-  AC_MSG_RESULT($complCXXFLAGS)
-
-  WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-  AC_SUBST(WARN_CXXFLAGS)
-])
-
 # Configure paths for GLIB
 # Owen Taylor     1997-2001
 
@@ -8455,11 +8329,20 @@
   AC_MSG_CHECKING(for ORBit - version >= $min_orbit_version)
   no_orbit=""
   if test "$ORBIT_CONFIG" = "no" ; then
-    no_orbit=yes
+    if test "$PKG_CONFIG" = "no" ; then
+      no_orbit=yes
+    else
+      ORBIT_CFLAGS=`$PKG_CONFIG --cflags ORBit-2.0`
+      ORBIT_LIBS=`$PKG_CONFIG --libs ORBit-2.0`
+    fi
   else
     ORBIT_CFLAGS=`$ORBIT_CONFIG $orbit_config_args --cflags`
     ORBIT_LIBS=`$ORBIT_CONFIG $orbit_config_args --libs`
+  fi
+
+  if test "x$no_orbit" = x ; then
     ORBIT_VERSION=`$PKG_CONFIG --modversion ORBit-2.0`
+
     orbit_config_major_version=`echo $ORBIT_VERSION | \
 	   sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
     orbit_config_minor_version=`echo $ORBIT_VERSION | \
Only in evolution-exchange-2.6.1: autom4te.cache
diff -u -r evolution-exchange-2.6.1-pristine/configure evolution-exchange-2.6.1/configure
--- evolution-exchange-2.6.1-pristine/configure	2006-04-10 08:35:18.000000000 -0400
+++ evolution-exchange-2.6.1/configure	2006-04-10 21:54:26.000000000 -0400
@@ -465,7 +465,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot EVOLUTION_VERSION BASE_VERSION API_VERSION EDS_BASE_VERSION MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT 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 CPP EGREP LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastd!
 epCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB GETTEXT_PACKAGE localedir NO_UNDEFINED SOCKET_LIBS WARN_CFLAGS PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS ORBIT_CONFIG ORBIT_IDL ORBIT_CFLAGS ORBIT_LIBS GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE C!
 ONNECTOR_DATADIR EVOLUTION_idldir EVOLUTION_IDL_INCLUDES EVOLU!
 TION_pri
vlibdir EVOLUTION_privlibexecdir EVOLUTION_privdatadir EVOLUTION_imagesdir CAMEL_providerdir ac_pt_PKG_CONFIG ADDRESSBOOK_CFLAGS ADDRESSBOOK_LIBS CALENDAR_CFLAGS CALENDAR_LIBS CAMEL_CFLAGS CAMEL_LIBS MAIL_CFLAGS MAIL_LIBS SOUP_CFLAGS SOUP_LIBS EXCHANGE_STORAGE_CFLAGS EXCHANGE_STORAGE_LIBS LIBEXCHANGE_CFLAGS LIBEXCHANGE_LIBS PTHREAD_LIB LDAP_CFLAGS LDAP_LIBS ENABLE_LDAP_TRUE ENABLE_LDAP_FALSE HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot EVOLUTION_VERSION BASE_VERSION API_VERSION EDS_BASE_VERSION MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT 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 CPP EGREP LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastd!
 epCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS GETTEXT_PACKAGE localedir NO_UNDEFINED SOCKET_LIBS PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS ORBIT_CONFIG ORBIT_IDL ORBIT_CFLAGS ORBIT_LIBS GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF!
 _SCHEMAS_INSTALL_FALSE CONNECTOR_DATADIR EVOLUTION_idldir EVOL!
 UTION_ID
L_INCLUDES EVOLUTION_privlibdir EVOLUTION_privlibexecdir EVOLUTION_privdatadir EVOLUTION_imagesdir CAMEL_providerdir ac_pt_PKG_CONFIG ADDRESSBOOK_CFLAGS ADDRESSBOOK_LIBS CALENDAR_CFLAGS CALENDAR_LIBS CAMEL_CFLAGS CAMEL_LIBS MAIL_CFLAGS MAIL_LIBS SOUP_CFLAGS SOUP_LIBS EXCHANGE_STORAGE_CFLAGS EXCHANGE_STORAGE_LIBS LIBEXCHANGE_CFLAGS LIBEXCHANGE_LIBS PTHREAD_LIB LDAP_CFLAGS LDAP_LIBS ENABLE_LDAP_TRUE ENABLE_LDAP_FALSE HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1098,9 +1098,6 @@
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-compile-warnings=[no/minimum/yes/maximum/error]
-                          Turn on compiler warnings
-  --enable-iso-c          Try to warn if code is not ISO C
   --disable-glibtest      do not try to compile and run a test GLIB program
   --disable-orbittest       Do not try to compile and run a test ORBIT program
   --disable-schemas-install	Disable the schemas installation
@@ -3199,14 +3196,13 @@
 
 
 
-
-        echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
-echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6
-if test "${ac_cv_lib_cposix_strerror+set}" = set; then
+echo "$as_me:$LINENO: checking for library containing strerror" >&5
+echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
+if test "${ac_cv_search_strerror+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcposix  $LIBS"
+  ac_func_search_save_LIBS=$LIBS
+ac_cv_search_strerror=no
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3251,24 +3247,80 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_cposix_strerror=yes
+  ac_cv_search_strerror="none required"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_cposix_strerror=no
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+if test "$ac_cv_search_strerror" = no; then
+  for ac_lib in cposix; do
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+    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 strerror ();
+int
+main ()
+{
+strerror ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_search_strerror="-l$ac_lib"
+break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
-echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6
-if test $ac_cv_lib_cposix_strerror = yes; then
-  LIBS="$LIBS -lcposix"
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+  done
 fi
+LIBS=$ac_func_search_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
+echo "${ECHO_T}$ac_cv_search_strerror" >&6
+if test "$ac_cv_search_strerror" != no; then
+  test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
 
-
+fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -5230,7 +5282,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5233 "configure"' > conftest.$ac_ext
+  echo '#line 5285 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6421,7 +6473,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:6424:" \
+echo "$as_me:6476:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -7484,11 +7536,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7487: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7539: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7491: \$? = $ac_status" >&5
+   echo "$as_me:7543: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7752,11 +7804,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7755: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7807: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7759: \$? = $ac_status" >&5
+   echo "$as_me:7811: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7856,11 +7908,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7859: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7911: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7863: \$? = $ac_status" >&5
+   echo "$as_me:7915: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9325,7 +9377,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 9328 "configure"' > conftest.$ac_ext
+    echo '#line 9380 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -10222,7 +10274,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10225 "configure"
+#line 10277 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10322,7 +10374,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10325 "configure"
+#line 10377 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12662,11 +12714,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12665: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12717: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12669: \$? = $ac_status" >&5
+   echo "$as_me:12721: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -12766,11 +12818,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12769: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12821: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12773: \$? = $ac_status" >&5
+   echo "$as_me:12825: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13302,7 +13354,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 13305 "configure"' > conftest.$ac_ext
+    echo '#line 13357 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -14357,11 +14409,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14360: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14412: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14364: \$? = $ac_status" >&5
+   echo "$as_me:14416: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14461,11 +14513,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14464: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14516: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14468: \$? = $ac_status" >&5
+   echo "$as_me:14520: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15910,7 +15962,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 15913 "configure"' > conftest.$ac_ext
+    echo '#line 15965 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -16685,11 +16737,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16688: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16740: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16692: \$? = $ac_status" >&5
+   echo "$as_me:16744: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16953,11 +17005,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16956: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17008: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16960: \$? = $ac_status" >&5
+   echo "$as_me:17012: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -17057,11 +17109,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17060: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17112: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17064: \$? = $ac_status" >&5
+   echo "$as_me:17116: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18526,7 +18578,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 18529 "configure"' > conftest.$ac_ext
+    echo '#line 18581 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -19749,25 +19801,30 @@
 ALL_LINGUAS="ar az bg bn ca cs cy da de dz el en_CA en_GB es et fa fi fr gl gu hi hu id it ja ko ku lt mk ms nb ne nl nn no pa pl pt pt_BR ro ru rw sk sq sr sr at Latn sv ta th tr uk vi xh zh_CN zh_HK zh_TW"
 
 
+case "$am__api_version" in
+    1.01234)
+	{ { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
+echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
+   { (exit 1); exit 1; }; }
+    ;;
+    *)
+    ;;
+esac
 
 if test -n ""; then
     echo "$as_me:$LINENO: checking for intltool >= " >&5
 echo $ECHO_N "checking for intltool >= ... $ECHO_C" >&6
 
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo  | awk -F. '{ printf "%d", $1 * 100 + $2; }'`
-    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { printf $2; }'  < ${ac_aux_dir}/intltool-update.in`
-
-    INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($2, VERSION, "."); printf "%d\n", VERSION[1] * 100 + VERSION[2];}' < ${ac_aux_dir}/intltool-update.in`
-
+    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo  | awk -F. '{ print $ 1 * 100 + $ 2; }'`
+    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] * 100 + VERSION[2];}' ${ac_aux_dir}/intltool-update.in`
 
-    if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT"; then
-	echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
+    echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
 echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6
-    else
-	echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found. Your intltool is too old.  You need intltool  or later." >&5
-echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found. Your intltool is too old.  You need intltool  or later." >&6
-	exit 1
-    fi
+    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+	{ { echo "$as_me:$LINENO: error: Your intltool is too old.  You need intltool  or later." >&5
+echo "$as_me: error: Your intltool is too old.  You need intltool  or later." >&2;}
+   { (exit 1); exit 1; }; }
 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 $< $@'
@@ -19787,6 +19844,7 @@
     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 $< $@'
 
 
 
@@ -19806,14 +19864,13 @@
 
 
 
-# Use the tools built into the package, not the ones that are installed.
 
+# Use the tools built into the package, not the ones that are installed.
 INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
-INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
-INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
-
 
+INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
 
+INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
 
 
 # Extract the first word of "perl", so it can be a program name with args.
@@ -20039,16 +20096,9 @@
 fi
 
 
-# Remove file type tags (using []) from po/POTFILES.
 
 
 
-
-
-
-
-# Manually sed perl in so people don't have to put the intltool scripts in AC_OUTPUT.
-
           ac_config_commands="$ac_config_commands intltool"
 
 
@@ -21598,6 +21648,15 @@
      fi
    fi
 
+            MKINSTALLDIRS=
+   if test -n "$ac_aux_dir"; then
+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+   fi
+   if test -z "$MKINSTALLDIRS"; then
+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+   fi
+
+
          test -d po || mkdir po
    if test "x$srcdir" != "x."; then
      if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
@@ -21644,142 +21703,7 @@
 
 
 
-
-
-    # Check whether --enable-compile-warnings or --disable-compile-warnings was given.
-if test "${enable_compile_warnings+set}" = set; then
-  enableval="$enable_compile_warnings"
-
-else
-  enable_compile_warnings="maximum"
-fi;
-
-    warnCFLAGS=
-    if test "x$GCC" != xyes; then
-	enable_compile_warnings=no
-    fi
-
-    warning_flags=
-    realsave_CFLAGS="$CFLAGS"
-
-    case "$enable_compile_warnings" in
-    no)
-	warning_flags=
-	;;
-    minimum)
-	warning_flags="-Wall"
-	;;
-    yes)
-	warning_flags="-Wall -Wmissing-prototypes"
-	;;
-    maximum|error)
-	warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
-	CFLAGS="$warning_flags $CFLAGS"
-	for option in -Wno-sign-compare; do
-		SAVE_CFLAGS="$CFLAGS"
-		CFLAGS="$CFLAGS $option"
-		echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
-echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6
-		cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  has_option=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-has_option=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-		CFLAGS="$SAVE_CFLAGS"
-		echo "$as_me:$LINENO: result: $has_option" >&5
-echo "${ECHO_T}$has_option" >&6
-		if test $has_option = yes; then
-		  warning_flags="$warning_flags $option"
-		fi
-		unset has_option
-		unset SAVE_CFLAGS
-	done
-	unset option
-	if test "$enable_compile_warnings" = "error" ; then
-	    warning_flags="$warning_flags -Werror"
-	fi
-	;;
-    *)
-	{ { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
-echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
-   { (exit 1); exit 1; }; }
-	;;
-    esac
-    CFLAGS="$realsave_CFLAGS"
-    echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
-echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6
-    echo "$as_me:$LINENO: result: $warning_flags" >&5
-echo "${ECHO_T}$warning_flags" >&6
-
-    # Check whether --enable-iso-c or --disable-iso-c was given.
-if test "${enable_iso_c+set}" = set; then
-  enableval="$enable_iso_c"
-
-else
-  enable_iso_c=no
-fi;
-
-    echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
-echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6
-    complCFLAGS=
-    if test "x$enable_iso_c" != "xno"; then
-	if test "x$GCC" = "xyes"; then
-	case " $CFLAGS " in
-	    *\ \	-ansi\ \	*) ;;
-	    *) complCFLAGS="$complCFLAGS -ansi" ;;
-	esac
-	case " $CFLAGS " in
-	    *\ \	-pedantic\ \	*) ;;
-	    *) complCFLAGS="$complCFLAGS -pedantic" ;;
-	esac
-	fi
-    fi
-    echo "$as_me:$LINENO: result: $complCFLAGS" >&5
-echo "${ECHO_T}$complCFLAGS" >&6
-
-    WARN_CFLAGS="$warning_flags $complCFLAGS"
-
-
+WARN_CFLAGS=
 CFLAGS="$CFLAGS $WARN_CFLAGS"
 case $CFLAGS in
 *-Wall*)
@@ -22268,11 +22192,20 @@
 echo $ECHO_N "checking for ORBit - version >= $min_orbit_version... $ECHO_C" >&6
   no_orbit=""
   if test "$ORBIT_CONFIG" = "no" ; then
-    no_orbit=yes
+    if test "$PKG_CONFIG" = "no" ; then
+      no_orbit=yes
+    else
+      ORBIT_CFLAGS=`$PKG_CONFIG --cflags ORBit-2.0`
+      ORBIT_LIBS=`$PKG_CONFIG --libs ORBit-2.0`
+    fi
   else
     ORBIT_CFLAGS=`$ORBIT_CONFIG $orbit_config_args --cflags`
     ORBIT_LIBS=`$ORBIT_CONFIG $orbit_config_args --libs`
+  fi
+
+  if test "x$no_orbit" = x ; then
     ORBIT_VERSION=`$PKG_CONFIG --modversion ORBit-2.0`
+
     orbit_config_major_version=`echo $ORBIT_VERSION | \
 	   sed -e 's,[^0-9.],,g' -e 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
     orbit_config_minor_version=`echo $ORBIT_VERSION | \
@@ -23947,6 +23880,22 @@
 fi
 echo "$as_me:$LINENO: result: $ac_cv_with_openldap" >&5
 echo "${ECHO_T}$ac_cv_with_openldap" >&6
+
+	echo "$as_me:$LINENO: checking for multilib subdirectory" >&5
+echo $ECHO_N "checking for multilib subdirectory... $ECHO_C" >&6
+	if test "$GCC" = "yes" ; then
+		multilibsubdir=`$CC -print-multi-os-directory 2> /dev/null`
+	fi
+	multilibsubdir=${multilibsubdir:-.}
+	echo "$as_me:$LINENO: result: $multilibsubdir" >&5
+echo "${ECHO_T}$multilibsubdir" >&6
+	echo "$as_me:$LINENO: checking for lib subdirectory" >&5
+echo $ECHO_N "checking for lib subdirectory... $ECHO_C" >&6
+	libsubdir=`echo lib/${multilibsubdir} | sed -re 's,lib/../([^/]*),\1,g'`
+	libsubdir=${libsubdir:-lib}
+	echo "$as_me:$LINENO: result: $libsubdir" >&5
+echo "${ECHO_T}$libsubdir" >&6
+
 	case $ac_cv_with_openldap in
 	no|"")
 		with_openldap=no
@@ -23957,7 +23906,7 @@
 	*)
 		with_openldap=$ac_cv_with_openldap
 		LDAP_CFLAGS="-I$ac_cv_with_openldap/include"
-		LDAP_LDFLAGS="-L$ac_cv_with_openldap/lib"
+		LDAP_LDFLAGS="-L$ac_cv_with_openldap/$libsubdir"
 		;;
 	esac
 
@@ -24288,13 +24237,13 @@
 if test $ac_cv_lib_lber_ber_get_tag = yes; then
 
 			if test "$with_static_ldap" = "yes"; then
-				LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"
+				LDAP_LIBS="$with_openldap/$libsubdir/liblber.a $LDAP_LIBS"
 
 				# libldap might depend on OpenSSL... We need to pull
 				# in the dependency libs explicitly here since we're
 				# not using libtool for the configure test.
-				if test -f $with_openldap/lib/libldap.la; then
-					LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
+				if test -f $with_openldap/$libsubdir/libldap.la; then
+					LDAP_LIBS="`. $with_openldap/$libsubdir/libldap.la; echo $dependency_libs` $LDAP_LIBS"
 				fi
 			else
 				LDAP_LIBS="-llber $LDAP_LIBS"
@@ -24366,7 +24315,7 @@
 if test $ac_cv_lib_ldap_ldap_open = yes; then
 
 					if test $with_static_ldap = "yes"; then
-						LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS"
+						LDAP_LIBS="$with_openldap/$libsubdir/libldap.a $LDAP_LIBS"
 					else
 						LDAP_LIBS="-lldap $LDAP_LIBS"
 					fi
@@ -24778,9 +24727,8 @@
    { (exit 1); exit 1; }; }
 fi
 
-       mv -f po/POTFILES po/POTFILES.tmp
-        sed -e '/[[]encoding.*]/d' -e 's/[[].*] *//' < po/POTFILES.tmp > po/POTFILES
-        rm -f po/POTFILES.tmp
+            ac_config_commands="$ac_config_commands po/stamp-it"
+
 
 if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
@@ -25251,10 +25199,11 @@
 #
 
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir=${ac_aux_dir}
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' ICONV='${INTLTOOL_ICONV}'
-MSGFMT='${INTLTOOL_MSGFMT}' MSGMERGE='${INTLTOOL_MSGMERGE}'
-XGETTEXT='${INTLTOOL_XGETTEXT}'
+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}'
 
 
 _ACEOF
@@ -25280,6 +25229,7 @@
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "intltool" ) CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+  "po/stamp-it" ) CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -25452,6 +25402,7 @@
 s, at INTLTOOL_CAVES_RULE@,$INTLTOOL_CAVES_RULE,;t t
 s, at INTLTOOL_SCHEMAS_RULE@,$INTLTOOL_SCHEMAS_RULE,;t t
 s, at INTLTOOL_THEME_RULE@,$INTLTOOL_THEME_RULE,;t t
+s, at INTLTOOL_SERVICE_RULE@,$INTLTOOL_SERVICE_RULE,;t t
 s, at INTLTOOL_EXTRACT@,$INTLTOOL_EXTRACT,;t t
 s, at INTLTOOL_MERGE@,$INTLTOOL_MERGE,;t t
 s, at INTLTOOL_UPDATE@,$INTLTOOL_UPDATE,;t t
@@ -25474,6 +25425,7 @@
 s, at PO_IN_DATADIR_FALSE@,$PO_IN_DATADIR_FALSE,;t t
 s, at POFILES@,$POFILES,;t t
 s, at POSUB@,$POSUB,;t t
+s, at MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
 s, at GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
 s, at localedir@,$localedir,;t t
 s, at NO_UNDEFINED@,$NO_UNDEFINED,;t t
@@ -26219,47 +26170,51 @@
  ;;
     intltool )
 
-intltool_edit="-e 's#@INTLTOOL_EXTRACT@#`pwd`/intltool-extract#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'"
-
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-extract.in \
-  > intltool-extract.out
-if cmp -s intltool-extract intltool-extract.out 2>/dev/null; then
-  rm -f intltool-extract.out
-else
-  mv -f intltool-extract.out intltool-extract
-fi
-chmod ugo+x intltool-extract
-chmod u+w intltool-extract
-
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-merge.in \
-  > intltool-merge.out
-if cmp -s intltool-merge intltool-merge.out 2>/dev/null; then
-  rm -f intltool-merge.out
-else
-  mv -f intltool-merge.out intltool-merge
-fi
-chmod ugo+x intltool-merge
-chmod u+w intltool-merge
-
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-update.in \
-  > intltool-update.out
-if cmp -s intltool-update intltool-update.out 2>/dev/null; then
-  rm -f intltool-update.out
-else
-  mv -f intltool-update.out intltool-update
-fi
-chmod ugo+x intltool-update
-chmod u+w intltool-update
+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
 
  ;;
     default-1 ) case "$CONFIG_FILES" in *po/Makefile.in*)
         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
       esac ;;
+    po/stamp-it )
+    rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
+    >"po/stamp-it.tmp"
+    sed '/^#/d
+	 s/^[[].*] *//
+	 /^[ 	]*$/d
+	'"s|^|	$ac_top_srcdir/|" \
+      "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
+
+    if test ! -f "po/Makefile"; then
+      { { echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5
+echo "$as_me: error: po/Makefile is not ready." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    mv "po/Makefile" "po/Makefile.tmp"
+    sed '/^POTFILES =/,/[^\\]$/ {
+		/^POTFILES =/!d
+		r po/POTFILES
+	  }
+	 ' "po/Makefile.tmp" >"po/Makefile"
+    rm -f "po/Makefile.tmp"
+    mv "po/stamp-it.tmp" "po/stamp-it"
+   ;;
   esac
 done
 _ACEOF


--- ximian-connector-2.1.4-generated-autotool.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 11 03:16:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 23:16:35 -0400
Subject: rpms/libsoup/FC-5 libsoup.spec,1.32,1.33 sources,1.16,1.17
Message-ID: <200604110316.k3B3GZKk021134@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	libsoup.spec sources 
Log Message:
2.2.92



Index: libsoup.spec
===================================================================
RCS file: /cvs/dist/rpms/libsoup/FC-5/libsoup.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libsoup.spec	4 Mar 2006 06:08:12 -0000	1.32
+++ libsoup.spec	11 Apr 2006 03:16:32 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Soup, an HTTP library implementation
 Name: libsoup
-Version: 2.2.91
-Release: 1 
+Version: 2.2.92
+Release: 1.fc5.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
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.2.92-1.fc5.1
+- Update to 2.2.92
+
 * Sat Mar  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.2.91-1
 - Update to 2.2.91
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsoup/FC-5/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	4 Mar 2006 05:47:27 -0000	1.16
+++ sources	11 Apr 2006 03:16:32 -0000	1.17
@@ -1 +1 @@
-61541fd6df42b718e84eab8c654a6c25  libsoup-2.2.91.tar.bz2
+44803c568d80f0adf3141fa23998ca74  libsoup-2.2.92.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 03:22:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 23:22:19 -0400
Subject: rpms/metacity/FC-5 .cvsignore, 1.36, 1.37 metacity.spec, 1.64,
	1.65 sources, 1.36, 1.37
Message-ID: <200604110322.k3B3MJ4K026549@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore metacity.spec sources 
Log Message:
2.14.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/metacity/FC-5/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	13 Mar 2006 23:55:02 -0000	1.36
+++ .cvsignore	11 Apr 2006 03:22:16 -0000	1.37
@@ -1,2 +1,3 @@
 libcm-0.0.16.0.2006.03.06.tar.bz2
 metacity-2.14.0.tar.bz2
+metacity-2.14.2.tar.bz2


Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/FC-5/metacity.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- metacity.spec	11 Apr 2006 02:29:21 -0000	1.64
+++ metacity.spec	11 Apr 2006 03:22:16 -0000	1.65
@@ -2,7 +2,7 @@
 
 %define libcm_version 0.0.16
 %define libcm_snapshot_date 2006.03.06
-%define metacity_version 2.14.0
+%define metacity_version 2.14.2
 
 Summary: Metacity window manager
 Name: metacity
@@ -142,6 +142,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1.fc5.1
+- Update to 2.14.2
+
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-1.fc5.1
 - Fix from Elijah Newren for crash when minimizing 
   decorationless windows, 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/metacity/FC-5/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	13 Mar 2006 23:55:02 -0000	1.36
+++ sources	11 Apr 2006 03:22:16 -0000	1.37
@@ -1,2 +1,2 @@
 eba1b4b6d6a18eb4fc28e35045b63b0e  libcm-0.0.16.0.2006.03.06.tar.bz2
-2480951fb0636d3fc6a78ab8a54f355d  metacity-2.14.0.tar.bz2
+8540978df1e82befbded9ae38afc315d  metacity-2.14.2.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 03:29:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 23:29:02 -0400
Subject: rpms/evolution-connector/FC-5 evolution-connector.spec,1.56,1.57
Message-ID: <200604110329.k3B3T2Wd026613@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	evolution-connector.spec 
Log Message:
grr



Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/FC-5/evolution-connector.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- evolution-connector.spec	11 Apr 2006 01:40:29 -0000	1.56
+++ evolution-connector.spec	11 Apr 2006 03:29:00 -0000	1.57
@@ -22,7 +22,7 @@
 # Patch generated against a pristine source tree after applying the
 # above patches and then rerunning the autotools.  This patch will contain
 # all of the above patches, together with patches to the generated files
-Patch200: ximian-connector-2.1.4-generated-autotool.patch
+Patch200: evolution-connector-2.6.1-generated-autotool.patch
 
 # Other patches:
 Patch300: evolution-exchange-2.5.3-fix-marshaller.patch



From fedora-cvs-commits at redhat.com  Tue Apr 11 03:44:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 23:44:55 -0400
Subject: rpms/epiphany/devel .cvsignore, 1.37, 1.38 epiphany.spec, 1.92,
	1.93 sources, 1.37, 1.38
Message-ID: <200604110344.k3B3itu4026999@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26983

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	12 Mar 2006 19:48:33 -0000	1.37
+++ .cvsignore	11 Apr 2006 03:44:53 -0000	1.38
@@ -1 +1,2 @@
 epiphany-2.14.0.tar.bz2
+epiphany-2.14.1.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- epiphany.spec	12 Mar 2006 20:00:38 -0000	1.92
+++ epiphany.spec	11 Apr 2006 03:44:53 -0000	1.93
@@ -9,8 +9,8 @@
 
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
-Version: 2.14.0
-Release: 1
+Version: 2.14.1
+Release: 2
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -134,6 +134,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
+- Update to 2.14.1
+
 * Sun Mar 12 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	12 Mar 2006 19:48:33 -0000	1.37
+++ sources	11 Apr 2006 03:44:53 -0000	1.38
@@ -1 +1 @@
-6a4b91205aa610e4b3f11bfdd86aad12  epiphany-2.14.0.tar.bz2
+69f9760646b736d953f24442e0e38f7b  epiphany-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 03:48:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Apr 2006 23:48:00 -0400
Subject: rpms/epiphany/FC-5 epiphany.spec,1.92,1.93 sources,1.37,1.38
Message-ID: <200604110348.k3B3m0Ui008495@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	epiphany.spec sources 
Log Message:
2.14.1



Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/FC-5/epiphany.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- epiphany.spec	12 Mar 2006 20:00:38 -0000	1.92
+++ epiphany.spec	11 Apr 2006 03:47:58 -0000	1.93
@@ -9,8 +9,8 @@
 
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
-Version: 2.14.0
-Release: 1
+Version: 2.14.1
+Release: 1.fc5.1
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -134,6 +134,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
+- Update to 2.14.1
+
 * Sun Mar 12 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/epiphany/FC-5/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	12 Mar 2006 19:48:33 -0000	1.37
+++ sources	11 Apr 2006 03:47:58 -0000	1.38
@@ -1 +1 @@
-6a4b91205aa610e4b3f11bfdd86aad12  epiphany-2.14.0.tar.bz2
+69f9760646b736d953f24442e0e38f7b  epiphany-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 04:09:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 00:09:34 -0400
Subject: rpms/file-roller/devel .cvsignore, 1.34, 1.35 file-roller.spec, 1.52,
	1.53 sources, 1.35, 1.36
Message-ID: <200604110409.k3B49YX9019973@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/file-roller/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19932

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	13 Mar 2006 21:09:03 -0000	1.34
+++ .cvsignore	11 Apr 2006 04:09:31 -0000	1.35
@@ -20,3 +20,4 @@
 file-roller-2.13.91.tar.bz2
 file-roller-2.13.92.tar.bz2
 file-roller-2.14.0.tar.bz2
+file-roller-2.14.1.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- file-roller.spec	13 Mar 2006 21:09:03 -0000	1.52
+++ file-roller.spec	11 Apr 2006 04:09:31 -0000	1.53
@@ -10,8 +10,8 @@
 
 Summary:	File Roller is a tool for viewing and creating archives.
 Name:		file-roller
-Version:	2.14.0
-Release: 	1
+Version:	2.14.1
+Release: 	2
 
 License:	GPL
 Group:		Applications/Archiving
@@ -107,6 +107,9 @@
 %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	13 Mar 2006 21:09:03 -0000	1.35
+++ sources	11 Apr 2006 04:09:31 -0000	1.36
@@ -1 +1 @@
-500a12d54a6c1211a92982171d30db16  file-roller-2.14.0.tar.bz2
+31f994e5874e8f96c33cbe39d9e7a7e9  file-roller-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 04:13:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 00:13:38 -0400
Subject: rpms/file-roller/FC-5 file-roller.spec,1.52,1.53 sources,1.35,1.36
Message-ID: <200604110413.k3B4Dc3g020816@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/file-roller/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20727

Modified Files:
	file-roller.spec sources 
Log Message:
2.14.1



Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/FC-5/file-roller.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- file-roller.spec	13 Mar 2006 21:09:03 -0000	1.52
+++ file-roller.spec	11 Apr 2006 04:13:32 -0000	1.53
@@ -10,8 +10,8 @@
 
 Summary:	File Roller is a tool for viewing and creating archives.
 Name:		file-roller
-Version:	2.14.0
-Release: 	1
+Version:	2.14.1
+Release: 	1.fc5.1
 
 License:	GPL
 Group:		Applications/Archiving
@@ -107,6 +107,9 @@
 %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/file-roller/FC-5/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	13 Mar 2006 21:09:03 -0000	1.35
+++ sources	11 Apr 2006 04:13:32 -0000	1.36
@@ -1 +1 @@
-500a12d54a6c1211a92982171d30db16  file-roller-2.14.0.tar.bz2
+31f994e5874e8f96c33cbe39d9e7a7e9  file-roller-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 04:17:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 00:17:10 -0400
Subject: rpms/eog/devel .cvsignore, 1.28, 1.29 eog.spec, 1.45, 1.46 sources,
	1.28, 1.29
Message-ID: <200604110417.k3B4HAdf026599@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/eog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26153

Modified Files:
	.cvsignore eog.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	13 Mar 2006 21:16:29 -0000	1.28
+++ .cvsignore	11 Apr 2006 04:17:02 -0000	1.29
@@ -15,3 +15,4 @@
 eog-2.13.91.tar.bz2
 eog-2.13.92.tar.bz2
 eog-2.14.0.tar.bz2
+eog-2.14.1.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/eog.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- eog.spec	13 Mar 2006 21:16:29 -0000	1.45
+++ eog.spec	11 Apr 2006 04:17:02 -0000	1.46
@@ -12,8 +12,8 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.14.0
-Release: 1
+Version: 2.14.1
+Release: 2
 URL: http://www.gnome.org
 Source: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/eog/%{name}-%{version}.tar.bz2
 License: GPL 
@@ -98,6 +98,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	13 Mar 2006 21:16:29 -0000	1.28
+++ sources	11 Apr 2006 04:17:02 -0000	1.29
@@ -1 +1 @@
-8e73c94511aeacdc79039fac238bb6b2  eog-2.14.0.tar.bz2
+c77fbfa3a1e77cb7ed140567ebdfab12  eog-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 04:20:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 00:20:32 -0400
Subject: rpms/file-roller/devel file-roller.spec,1.53,1.54
Message-ID: <200604110420.k3B4KWwB003482@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/file-roller/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3431

Modified Files:
	file-roller.spec 
Log Message:
fix file lists



Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- file-roller.spec	11 Apr 2006 04:09:31 -0000	1.53
+++ file-roller.spec	11 Apr 2006 04:20:15 -0000	1.54
@@ -100,7 +100,6 @@
 %{_bindir}/*
 %{_datadir}/file-roller
 %{_datadir}/gnome
-%{_datadir}/pixmaps/*
 %{_datadir}/omf
 %{_datadir}/applications
 %{_sysconfdir}/gconf/schemas



From fedora-cvs-commits at redhat.com  Tue Apr 11 04:21:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 00:21:05 -0400
Subject: rpms/eog/FC-5 eog.spec,1.45,1.46 sources,1.28,1.29
Message-ID: <200604110421.k3B4L5SB003649@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	eog.spec sources 
Log Message:
2.14.1



Index: eog.spec
===================================================================
RCS file: /cvs/dist/rpms/eog/FC-5/eog.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- eog.spec	13 Mar 2006 21:16:29 -0000	1.45
+++ eog.spec	11 Apr 2006 04:21:03 -0000	1.46
@@ -12,8 +12,8 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.14.0
-Release: 1
+Version: 2.14.1
+Release: 1.fc5.1
 URL: http://www.gnome.org
 Source: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/eog/%{name}-%{version}.tar.bz2
 License: GPL 
@@ -98,6 +98,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eog/FC-5/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	13 Mar 2006 21:16:29 -0000	1.28
+++ sources	11 Apr 2006 04:21:03 -0000	1.29
@@ -1 +1 @@
-8e73c94511aeacdc79039fac238bb6b2  eog-2.14.0.tar.bz2
+c77fbfa3a1e77cb7ed140567ebdfab12  eog-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 04:22:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 00:22:36 -0400
Subject: rpms/file-roller/FC-5 file-roller.spec,1.53,1.54
Message-ID: <200604110422.k3B4MavG004035@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/file-roller/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3987

Modified Files:
	file-roller.spec 
Log Message:
fix file lists



Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/FC-5/file-roller.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- file-roller.spec	11 Apr 2006 04:13:32 -0000	1.53
+++ file-roller.spec	11 Apr 2006 04:22:33 -0000	1.54
@@ -100,7 +100,6 @@
 %{_bindir}/*
 %{_datadir}/file-roller
 %{_datadir}/gnome
-%{_datadir}/pixmaps/*
 %{_datadir}/omf
 %{_datadir}/applications
 %{_sysconfdir}/gconf/schemas



From fedora-cvs-commits at redhat.com  Tue Apr 11 04:25:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 00:25:10 -0400
Subject: rpms/libgnome/devel .cvsignore, 1.23, 1.24 libgnome.spec, 1.55,
	1.56 sources, 1.23, 1.24
Message-ID: <200604110425.k3B4PA8Y004577@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnome/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4539

Modified Files:
	.cvsignore libgnome.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	13 Mar 2006 14:27:14 -0000	1.23
+++ .cvsignore	11 Apr 2006 04:25:01 -0000	1.24
@@ -6,3 +6,4 @@
 libgnome-2.13.7.tar.bz2
 libgnome-2.13.90.tar.bz2
 libgnome-2.14.0.tar.bz2
+libgnome-2.14.1.tar.bz2


Index: libgnome.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- libgnome.spec	13 Mar 2006 14:27:14 -0000	1.55
+++ libgnome.spec	11 Apr 2006 04:25:01 -0000	1.56
@@ -11,8 +11,8 @@
 
 Summary: GNOME base library
 Name: libgnome
-Version: 2.14.0
-Release: 1
+Version: 2.14.1
+Release: 2
 URL: ftp://ftp.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -156,6 +156,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Tue Apr 11 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	13 Mar 2006 14:27:14 -0000	1.23
+++ sources	11 Apr 2006 04:25:03 -0000	1.24
@@ -1 +1 @@
-f46745d1924a099fe4aaf868216db203  libgnome-2.14.0.tar.bz2
+bf53815df10db62bbf00defd4100b8d8  libgnome-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 04:28:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 00:28:19 -0400
Subject: rpms/file-roller/devel file-roller.spec,1.54,1.55
Message-ID: <200604110428.k3B4SJlU005190@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/file-roller/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5148

Modified Files:
	file-roller.spec 
Log Message:
fix more



Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- file-roller.spec	11 Apr 2006 04:20:15 -0000	1.54
+++ file-roller.spec	11 Apr 2006 04:28:17 -0000	1.55
@@ -89,10 +89,18 @@
 for S in $SCHEMAS; do
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
 done
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
 
 %postun
 update-desktop-database %{_datadir}/applications
 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
 
 %files -f %{name}.lang
 %defattr(-, root, root)
@@ -102,6 +110,7 @@
 %{_datadir}/gnome
 %{_datadir}/omf
 %{_datadir}/applications
+%{_datadir}/icons/hicolor/48x48/apps
 %{_sysconfdir}/gconf/schemas
 %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so
 



From fedora-cvs-commits at redhat.com  Tue Apr 11 04:31:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 00:31:55 -0400
Subject: rpms/libgnome/FC-5 libgnome.spec,1.55,1.56 sources,1.23,1.24
Message-ID: <200604110431.k3B4Vt3d005860@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	libgnome.spec sources 
Log Message:
2.14.1



Index: libgnome.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome/FC-5/libgnome.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- libgnome.spec	13 Mar 2006 14:27:14 -0000	1.55
+++ libgnome.spec	11 Apr 2006 04:31:41 -0000	1.56
@@ -11,8 +11,8 @@
 
 Summary: GNOME base library
 Name: libgnome
-Version: 2.14.0
-Release: 1
+Version: 2.14.1
+Release: 1.fc5.1
 URL: ftp://ftp.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -156,6 +156,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Tue Apr 11 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgnome/FC-5/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	13 Mar 2006 14:27:14 -0000	1.23
+++ sources	11 Apr 2006 04:31:49 -0000	1.24
@@ -1 +1 @@
-f46745d1924a099fe4aaf868216db203  libgnome-2.14.0.tar.bz2
+bf53815df10db62bbf00defd4100b8d8  libgnome-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 04:33:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 00:33:01 -0400
Subject: rpms/file-roller/FC-5 file-roller.spec,1.54,1.55
Message-ID: <200604110433.k3B4X1wo006023@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/file-roller/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5950

Modified Files:
	file-roller.spec 
Log Message:
fix more



Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/FC-5/file-roller.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- file-roller.spec	11 Apr 2006 04:22:33 -0000	1.54
+++ file-roller.spec	11 Apr 2006 04:32:56 -0000	1.55
@@ -89,10 +89,18 @@
 for S in $SCHEMAS; do
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
 done
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
 
 %postun
 update-desktop-database %{_datadir}/applications
 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
 
 %files -f %{name}.lang
 %defattr(-, root, root)
@@ -102,6 +110,7 @@
 %{_datadir}/gnome
 %{_datadir}/omf
 %{_datadir}/applications
+%{_datadir}/icons/hicolor/48x48/apps
 %{_sysconfdir}/gconf/schemas
 %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so
 



From fedora-cvs-commits at redhat.com  Tue Apr 11 04:35:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 00:35:43 -0400
Subject: rpms/libgnomeui/devel .cvsignore, 1.23, 1.24 libgnomeui.spec, 1.38,
	1.39 sources, 1.23, 1.24
Message-ID: <200604110435.k3B4Zh04006472@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnomeui/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6431

Modified Files:
	.cvsignore libgnomeui.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	13 Mar 2006 14:40:14 -0000	1.23
+++ .cvsignore	11 Apr 2006 04:35:41 -0000	1.24
@@ -5,3 +5,4 @@
 libgnomeui-2.13.3.tar.bz2
 libgnomeui-2.13.90.tar.bz2
 libgnomeui-2.14.0.tar.bz2
+libgnomeui-2.14.1.tar.bz2


Index: libgnomeui.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/devel/libgnomeui.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- libgnomeui.spec	13 Mar 2006 14:40:14 -0000	1.38
+++ libgnomeui.spec	11 Apr 2006 04:35:41 -0000	1.39
@@ -17,8 +17,8 @@
 
 Summary: GNOME base GUI library
 Name: libgnomeui
-Version: 2.14.0
-Release: 1
+Version: 2.14.1
+Release: 2
 URL: ftp://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -160,6 +160,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Tue Apr 11 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	13 Mar 2006 14:40:14 -0000	1.23
+++ sources	11 Apr 2006 04:35:41 -0000	1.24
@@ -1 +1 @@
-9bf9a8696c3eba9477eeeed29297e801  libgnomeui-2.14.0.tar.bz2
+ff6b6c25de0e7e39c79998621cdec048  libgnomeui-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 04:37:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 00:37:53 -0400
Subject: rpms/file-roller/devel file-roller.spec,1.55,1.56
Message-ID: <200604110437.k3B4brno006915@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/file-roller/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6878

Modified Files:
	file-roller.spec 
Log Message:
more fix



Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- file-roller.spec	11 Apr 2006 04:28:17 -0000	1.55
+++ file-roller.spec	11 Apr 2006 04:37:50 -0000	1.56
@@ -76,6 +76,8 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/*.a
 
+rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
+
 %find_lang %{name}
 
 %clean



From fedora-cvs-commits at redhat.com  Tue Apr 11 04:38:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 00:38:50 -0400
Subject: rpms/libgnomeui/FC-5 libgnomeui.spec,1.38,1.39 sources,1.23,1.24
Message-ID: <200604110438.k3B4cok5007032@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	libgnomeui.spec sources 
Log Message:
2.14.1



Index: libgnomeui.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/FC-5/libgnomeui.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- libgnomeui.spec	13 Mar 2006 14:40:14 -0000	1.38
+++ libgnomeui.spec	11 Apr 2006 04:38:47 -0000	1.39
@@ -17,8 +17,8 @@
 
 Summary: GNOME base GUI library
 Name: libgnomeui
-Version: 2.14.0
-Release: 1
+Version: 2.14.1
+Release: 1.fc5.1
 URL: ftp://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -160,6 +160,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Tue Apr 11 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/FC-5/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	13 Mar 2006 14:40:14 -0000	1.23
+++ sources	11 Apr 2006 04:38:47 -0000	1.24
@@ -1 +1 @@
-9bf9a8696c3eba9477eeeed29297e801  libgnomeui-2.14.0.tar.bz2
+ff6b6c25de0e7e39c79998621cdec048  libgnomeui-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 04:46:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 00:46:50 -0400
Subject: rpms/eel2/devel .cvsignore, 1.32, 1.33 eel2.spec, 1.42, 1.43 sources,
	1.32, 1.33
Message-ID: <200604110446.k3B4koZY012132@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/eel2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11542

Modified Files:
	.cvsignore eel2.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	13 Mar 2006 13:55:44 -0000	1.32
+++ .cvsignore	11 Apr 2006 04:46:44 -0000	1.33
@@ -16,3 +16,4 @@
 eel-2.13.91.tar.bz2
 eel-2.13.92.tar.bz2
 eel-2.14.0.tar.bz2
+eel-2.14.1.tar.bz2


Index: eel2.spec
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- eel2.spec	13 Mar 2006 14:34:23 -0000	1.42
+++ eel2.spec	11 Apr 2006 04:46:44 -0000	1.43
@@ -15,8 +15,8 @@
 
 Name:		eel2
 Summary:        Eazel Extensions Library.
-Version: 	2.14.0
-Release: 	1
+Version: 	2.14.1
+Release: 	2
 License: 	LGPL
 Group: System Environment/Libraries
 Source: 	eel-%{version}.tar.bz2
@@ -105,6 +105,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Tue Apr 11 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 - Drop upstreamed patch


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	13 Mar 2006 13:55:44 -0000	1.32
+++ sources	11 Apr 2006 04:46:44 -0000	1.33
@@ -1 +1 @@
-e819471388655e7c73b2f8096d7e135f  eel-2.14.0.tar.bz2
+7002f4f99317ed11da8b9db15b7e4a2b  eel-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 04:49:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 00:49:53 -0400
Subject: rpms/eel2/FC-5 eel2.spec,1.42,1.43 sources,1.32,1.33
Message-ID: <200604110449.k3B4nrax022981@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	eel2.spec sources 
Log Message:
2.14.1



Index: eel2.spec
===================================================================
RCS file: /cvs/dist/rpms/eel2/FC-5/eel2.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- eel2.spec	13 Mar 2006 14:34:23 -0000	1.42
+++ eel2.spec	11 Apr 2006 04:49:49 -0000	1.43
@@ -15,8 +15,8 @@
 
 Name:		eel2
 Summary:        Eazel Extensions Library.
-Version: 	2.14.0
-Release: 	1
+Version: 	2.14.1
+Release: 	1.fc5.1
 License: 	LGPL
 Group: System Environment/Libraries
 Source: 	eel-%{version}.tar.bz2
@@ -105,6 +105,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Tue Apr 11 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 - Drop upstreamed patch


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eel2/FC-5/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	13 Mar 2006 13:55:44 -0000	1.32
+++ sources	11 Apr 2006 04:49:50 -0000	1.33
@@ -1 +1 @@
-e819471388655e7c73b2f8096d7e135f  eel-2.14.0.tar.bz2
+7002f4f99317ed11da8b9db15b7e4a2b  eel-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 04:51:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 00:51:35 -0400
Subject: rpms/file-roller/FC-5 file-roller.spec,1.55,1.56
Message-ID: <200604110451.k3B4pZNe023335@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/file-roller/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23075

Modified Files:
	file-roller.spec 
Log Message:
another try



Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/FC-5/file-roller.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- file-roller.spec	11 Apr 2006 04:32:56 -0000	1.55
+++ file-roller.spec	11 Apr 2006 04:51:32 -0000	1.56
@@ -76,6 +76,8 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/*.a
 
+rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
+
 %find_lang %{name}
 
 %clean



From fedora-cvs-commits at redhat.com  Tue Apr 11 04:57:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 00:57:39 -0400
Subject: rpms/nautilus/devel .cvsignore, 1.37, 1.38 nautilus.spec, 1.97,
	1.98 sources, 1.40, 1.41
Message-ID: <200604110457.k3B4vdOQ024758@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24717

Modified Files:
	.cvsignore nautilus.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	13 Mar 2006 14:04:44 -0000	1.37
+++ .cvsignore	11 Apr 2006 04:57:36 -0000	1.38
@@ -16,3 +16,4 @@
 nautilus-2.13.91.tar.bz2
 nautilus-2.13.92.tar.bz2
 nautilus-2.14.0.tar.bz2
+nautilus-2.14.1.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- nautilus.spec	13 Mar 2006 14:04:44 -0000	1.97
+++ nautilus.spec	11 Apr 2006 04:57:36 -0000	1.98
@@ -17,8 +17,8 @@
 
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME.
-Version: 	2.14.0
-Release:	1
+Version: 	2.14.1
+Release:	2
 License: 	GPL
 Group:          User Interface/Desktops
 Source: 	ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2
@@ -175,6 +175,9 @@
 %{_includedir}/nautilus
 
 %changelog
+* Tue Apr 11 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	13 Mar 2006 14:04:44 -0000	1.40
+++ sources	11 Apr 2006 04:57:36 -0000	1.41
@@ -1 +1 @@
-27eb19e3be7cf103ba1fa9f3123c5d13  nautilus-2.14.0.tar.bz2
+d8bad8b9141bc823c612abb7d460b725  nautilus-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 04:58:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 00:58:44 -0400
Subject: rpms/nautilus/FC-5 nautilus.spec,1.97,1.98 sources,1.40,1.41
Message-ID: <200604110458.k3B4wivu025075@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	nautilus.spec sources 
Log Message:
2.14.1



Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/FC-5/nautilus.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- nautilus.spec	13 Mar 2006 14:04:44 -0000	1.97
+++ nautilus.spec	11 Apr 2006 04:58:40 -0000	1.98
@@ -17,8 +17,8 @@
 
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME.
-Version: 	2.14.0
-Release:	1
+Version: 	2.14.1
+Release:	1.fc5.1
 License: 	GPL
 Group:          User Interface/Desktops
 Source: 	ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2
@@ -175,6 +175,9 @@
 %{_includedir}/nautilus
 
 %changelog
+* Tue Apr 11 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nautilus/FC-5/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	13 Mar 2006 14:04:44 -0000	1.40
+++ sources	11 Apr 2006 04:58:40 -0000	1.41
@@ -1 +1 @@
-27eb19e3be7cf103ba1fa9f3123c5d13  nautilus-2.14.0.tar.bz2
+d8bad8b9141bc823c612abb7d460b725  nautilus-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 05:03:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 01:03:24 -0400
Subject: rpms/nautilus/FC-5 nautilus.spec,1.98,1.99
Message-ID: <200604110503.k3B53OdT025813@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	nautilus.spec 
Log Message:
bump eel req



Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/FC-5/nautilus.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- nautilus.spec	11 Apr 2006 04:58:40 -0000	1.98
+++ nautilus.spec	11 Apr 2006 05:03:19 -0000	1.99
@@ -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.13.4
+%define eel2_version 2.14.1
 %define gnome_icon_theme_version 1.1.5
 %define libxml2_version 2.4.20
 %define gail_version 0.17-2



From fedora-cvs-commits at redhat.com  Tue Apr 11 05:03:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 01:03:33 -0400
Subject: rpms/gnome-user-docs/devel .cvsignore, 1.14,
	1.15 gnome-user-docs.spec, 1.20, 1.21 sources, 1.14, 1.15
Message-ID: <200604110503.k3B53X0O025852@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-user-docs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25685

Modified Files:
	.cvsignore gnome-user-docs.spec sources 
Log Message:
2.14.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-docs/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	10 Apr 2006 14:39:34 -0000	1.14
+++ .cvsignore	11 Apr 2006 05:03:29 -0000	1.15
@@ -5,3 +5,4 @@
 gnome-user-docs-2.13.1.1.tar.bz2
 gnome-user-docs-2.14.0.tar.bz2
 gnome-user-docs-2.14.1.tar.bz2
+gnome-user-docs-2.14.2.tar.bz2


Index: gnome-user-docs.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-docs/devel/gnome-user-docs.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gnome-user-docs.spec	10 Apr 2006 14:39:34 -0000	1.20
+++ gnome-user-docs.spec	11 Apr 2006 05:03:30 -0000	1.21
@@ -1,6 +1,6 @@
 Summary:        GNOME User Documentation
 Name:           gnome-user-docs
-Version:        2.14.1
+Version:        2.14.2
 Release:	2 
 License:        FDL
 Source:         gnome-user-docs-%{version}.tar.bz2
@@ -47,6 +47,9 @@
 %{_datadir}/omf
 
 %changelog
+* Tue Apr 11 2006 Matthias Clasen <mclasen at redhat.com> 2.14.2-2
+- Update to 2.14.2
+
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> 2.14.1-2
 - Update to 2.14.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-docs/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	10 Apr 2006 14:39:34 -0000	1.14
+++ sources	11 Apr 2006 05:03:30 -0000	1.15
@@ -1 +1 @@
-ff144dba5a50b24bf7b94ecd4fc2d61c  gnome-user-docs-2.14.1.tar.bz2
+4f5a7114ccf9e4e31137da50b7333570  gnome-user-docs-2.14.2.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 05:04:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 01:04:55 -0400
Subject: rpms/nautilus/devel nautilus.spec,1.98,1.99
Message-ID: <200604110504.k3B54t30026070@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26004

Modified Files:
	nautilus.spec 
Log Message:
bump eel req



Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- nautilus.spec	11 Apr 2006 04:57:36 -0000	1.98
+++ nautilus.spec	11 Apr 2006 05:04:52 -0000	1.99
@@ -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.13.4
+%define eel2_version 2.14.1
 %define gnome_icon_theme_version 1.1.5
 %define libxml2_version 2.4.20
 %define gail_version 0.17-2



From fedora-cvs-commits at redhat.com  Tue Apr 11 05:08:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 01:08:19 -0400
Subject: rpms/gnome-user-docs/FC-5 gnome-user-docs.spec, 1.20, 1.21 sources,
	1.14, 1.15
Message-ID: <200604110508.k3B58JWv026560@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-user-docs/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26311

Modified Files:
	gnome-user-docs.spec sources 
Log Message:
2.14.2



Index: gnome-user-docs.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-docs/FC-5/gnome-user-docs.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gnome-user-docs.spec	10 Apr 2006 14:40:46 -0000	1.20
+++ gnome-user-docs.spec	11 Apr 2006 05:08:16 -0000	1.21
@@ -1,6 +1,6 @@
 Summary:        GNOME User Documentation
 Name:           gnome-user-docs
-Version:        2.14.1
+Version:        2.14.2
 Release:	1.fc5.1
 License:        FDL
 Source:         gnome-user-docs-%{version}.tar.bz2
@@ -47,7 +47,10 @@
 %{_datadir}/omf
 
 %changelog
-* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> 2.14.1-1.fc5.1
+* Tue Apr 11 2006 Matthias Clasen <mclasen at redhat.com> 2.14.2-1.fc5.1
+- Update to 2.14.2
+
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> 2.14.1-2
 - Update to 2.14.1
 
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-docs/FC-5/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	10 Apr 2006 14:40:46 -0000	1.14
+++ sources	11 Apr 2006 05:08:16 -0000	1.15
@@ -1 +1 @@
-ff144dba5a50b24bf7b94ecd4fc2d61c  gnome-user-docs-2.14.1.tar.bz2
+4f5a7114ccf9e4e31137da50b7333570  gnome-user-docs-2.14.2.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 09:43:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 05:43:08 -0400
Subject: rpms/kdebase/FC-4 kdebase-3.5.1-konsole-fonts.patch, NONE,
	1.1 kdebase-3.5.1-xdg.patch, NONE,
	1.1 kdebase-3.5.2-startkde.patch, NONE, 1.1 kdebase.spec,
	1.118, 1.119 sources, 1.60, 1.61 kdebase-3.4.0-xdg.patch, 1.1,
	NONE kdebase-3.5.1-startkde.patch, 1.1, NONE
Message-ID: <200604110943.k3B9h8p7031804@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdebase.spec sources 
Added Files:
	kdebase-3.5.1-konsole-fonts.patch kdebase-3.5.1-xdg.patch 
	kdebase-3.5.2-startkde.patch 
Removed Files:
	kdebase-3.4.0-xdg.patch kdebase-3.5.1-startkde.patch 
Log Message:
update to 3.5.2


kdebase-3.5.1-konsole-fonts.patch:
 Makefile.am |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebase-3.5.1-konsole-fonts.patch ---
--- kdebase-3.5.1/konsole/Makefile.am.orig	2006-02-21 19:52:27.000000000 +0100
+++ kdebase-3.5.1/konsole/Makefile.am	2006-02-21 19:52:32.000000000 +0100
@@ -1,4 +1,4 @@
-SUBDIRS = konsole other doc fonts
+SUBDIRS = konsole other doc
 
 xdg_apps_DATA = konsole.desktop konsolesu.desktop
 

kdebase-3.5.1-xdg.patch:
 kdebase-3.4.0/applnk/kde-essential.menu |    1 +
 kdebase-3.5.1/applnk/kde-settings.menu  |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE kdebase-3.5.1-xdg.patch ---
--- kdebase-3.4.0/applnk/kde-essential.menu.tn	2005-04-25 16:18:40.000000000 +0200
+++ kdebase-3.4.0/applnk/kde-essential.menu	2005-04-25 16:18:58.000000000 +0200
@@ -2,6 +2,7 @@
   "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
 
 <Menu>
+	<Name>Applications</Name>
         <!-- The following menus are hidden by default -->
 	<Menu>
 		<Name>Settings</Name>
--- kdebase-3.5.1/applnk/kde-settings.menu.orig	2006-02-21 16:30:54.000000000 +0100
+++ kdebase-3.5.1/applnk/kde-settings.menu	2006-02-21 16:31:45.000000000 +0100
@@ -29,6 +29,7 @@
 		<Directory>kde-settings-looknfeel.directory</Directory>
 		<Include>
 			<Category>X-KDE-settings-looknfeel</Category>
+			<Category>X-KDE-LookNFeel</Category>
 		</Include>
 	</Menu>
 	<Menu>

kdebase-3.5.2-startkde.patch:
 startkde |   66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 58 insertions(+), 8 deletions(-)

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


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-4/kdebase.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- kdebase.spec	17 Feb 2006 11:50:59 -0000	1.118
+++ kdebase.spec	11 Apr 2006 09:43:02 -0000	1.119
@@ -10,8 +10,8 @@
 %define gdmsession KDE
 
 %define qt_version 3.3.4
-%define arts_version 1.5.1
-%define kde_version 3.5.1
+%define arts_version 1.5.2
+%define kde_version 3.5.2
 
 %define make_cvs 1
 %define arts 1
@@ -20,8 +20,8 @@
 
 Summary: K Desktop Environment - core files
 Name: kdebase
-Version: 3.5.1
-Release: 0.3.fc4
+Version: 3.5.2
+Release: 0.1.fc4
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -38,7 +38,7 @@
 Source7: mailsettings.cc
 
 Patch0: kde-libtool.patch
-Patch1: kdebase-3.5.1-startkde.patch
+Patch1: kdebase-3.5.2-startkde.patch
 Patch2: kdebase-3.3.92-vroot.patch
 Patch3: kdebase-3.x-shortcuts.patch
 Patch4: kdebase-3.2.0-keymap.patch
@@ -48,13 +48,10 @@
 Patch8: kdebase-3.2.92-logo.patch
 Patch9: kdebase-3.2.2-konsole-setInputMethodEnabled-20040525.diff
 Patch10: kdebase-3.4.2-kdesktop-konsole.patch
-Patch11: kdebase-3.4.0-xdg.patch
+Patch11: kdebase-3.5.1-xdg.patch
 Patch12: kdebase-3.5.1-pam.patch
 Patch13: kdebase-3.5.1-kdm-readme.patch
-Patch14: kdebase-3.5.1-kwin-systray.patch
-
-# upstream patches
-Patch100: kdebase-3.5.1-keyboardlayout.patch
+Patch14: kdebase-3.5.1-konsole-fonts.patch
 
 Requires: kdelibs >= 6:%{version}
 Requires: libxml2 >= 2.6.5
@@ -133,10 +130,7 @@
 %patch11 -p1 -b .xdg
 %patch12 -p1 -b .pam
 %patch13 -p1 -b .kdm-readme
-%patch14 -p1 -b .systray
-
-# upstream patches
-%patch100 -p1 -b .keyboardlayout
+%patch14 -p1 -b .konsole-fonts
 
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
@@ -409,6 +403,9 @@
 %{_includedir}/kde/ksplash/*
 
 %changelog
+* Tue Apr 11 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc4
+- update to 3.5.2
+
 * Fri Feb 17 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.3.fc4
 - Systray icons not docked sometimes, apply patch to fix this issue #180314
 - kscreensaver/kdm/kcheckpass use a separate PAM config file


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-4/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	17 Feb 2006 11:50:59 -0000	1.60
+++ sources	11 Apr 2006 09:43:02 -0000	1.61
@@ -1,2 +1,2 @@
-484c7b3895ce4f95173f4789571eb1cc  kdebase-3.5.1.tar.bz2
 a53556b00f950797b9b32848cace66c9  kde-redhat-config-3.5-fc5-0.2.tar.bz2
+c5685e1be34e033286aa1f37002a0552  kdebase-3.5.2.tar.bz2


--- kdebase-3.4.0-xdg.patch DELETED ---


--- kdebase-3.5.1-startkde.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 11 09:46:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 05:46:09 -0400
Subject: rpms/ncpfs/devel ncpfs-2.2.6-align.patch, NONE, 1.1 ncpfs.spec, 1.25,
	1.26
Message-ID: <200604110946.k3B9k9oO031897@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/ncpfs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31882

Modified Files:
	ncpfs.spec 
Added Files:
	ncpfs-2.2.6-align.patch 
Log Message:
fix for #186683 - ncpmount needs downgrade to work properly

ncpfs-2.2.6-align.patch:
 ndslib.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ncpfs-2.2.6-align.patch ---
--- ncpfs-2.2.6/lib/ndslib.c.olddd	2005-01-27 18:35:59.000000000 +0100
+++ ncpfs-2.2.6/lib/ndslib.c	2006-04-11 11:35:15.000000000 +0200
@@ -957,7 +957,7 @@
 	NWDSCCODE err;
 	int n1, n3;
 	u_int16_t n3a;
-	char rpb_b[DEFAULT_MESSAGE_LEN];
+	char rpb_b[DEFAULT_MESSAGE_LEN] __attribute__ ((aligned (4)));
 	Buf_T rpb;
     	size_t k1tl;
     


Index: ncpfs.spec
===================================================================
RCS file: /cvs/dist/rpms/ncpfs/devel/ncpfs.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ncpfs.spec	11 Feb 2006 04:42:58 -0000	1.25
+++ ncpfs.spec	11 Apr 2006 09:46:07 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Utilities for the ncpfs filesystem, a NetWare client for Linux.
 Name: ncpfs
 Version: 2.2.6
-Release: 1.2.1
+Release: 2
 License: GPL
 Source: http://ftp.cvut.cz/ncpfs/ncpfs-%{version}.tar.gz
 Patch: ncpfs-2.2.3-fix.patch
@@ -10,6 +10,7 @@
 Patch5: ncpfs-2.2.6-getuid.patch
 Patch6: ncpfs-2.2.4-gcc4.patch
 Patch7: ncpfs-2.2.6-ldconfig.patch
+Patch8: ncpfs-2.2.6-align.patch
 Group: Applications/System
 Requires: ipxutils
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -45,6 +46,7 @@
 %patch5 -p1 -b .getuid
 %patch6 -p1 -b .gcc4
 %patch7 -p1 -b .ld
+%patch8 -p1 -b .align
 
 %build
 %ifarch s390 s390x
@@ -116,6 +118,10 @@
 %{_mandir}/man8/ipx*
 
 %changelog
+* Tue Apr 11 2006 Martin Stransky <stransky at redhat.com> - 2.2.6-2
+- fix for #186683 - ncpmount needs downgrade to work properly,
+  rpb_b[] needs to be aligned to 4 bytes with -fstack-protector enabled
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.2.6-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Apr 11 09:47:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 05:47:08 -0400
Subject: rpms/ncpfs/devel ncpfs.spec,1.26,1.27
Message-ID: <200604110947.k3B9l8lx003194@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/ncpfs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2693

Modified Files:
	ncpfs.spec 
Log Message:
release up


Index: ncpfs.spec
===================================================================
RCS file: /cvs/dist/rpms/ncpfs/devel/ncpfs.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ncpfs.spec	11 Apr 2006 09:46:07 -0000	1.26
+++ ncpfs.spec	11 Apr 2006 09:47:05 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Utilities for the ncpfs filesystem, a NetWare client for Linux.
 Name: ncpfs
 Version: 2.2.6
-Release: 2
+Release: 3
 License: GPL
 Source: http://ftp.cvut.cz/ncpfs/ncpfs-%{version}.tar.gz
 Patch: ncpfs-2.2.3-fix.patch
@@ -118,7 +118,7 @@
 %{_mandir}/man8/ipx*
 
 %changelog
-* Tue Apr 11 2006 Martin Stransky <stransky at redhat.com> - 2.2.6-2
+* Tue Apr 11 2006 Martin Stransky <stransky at redhat.com> - 2.2.6-3
 - fix for #186683 - ncpmount needs downgrade to work properly,
   rpb_b[] needs to be aligned to 4 bytes with -fstack-protector enabled
 



From fedora-cvs-commits at redhat.com  Tue Apr 11 09:55:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 05:55:53 -0400
Subject: rpms/vim/devel vim.spec,1.105,1.106
Message-ID: <200604110955.k3B9trIJ013504@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13491

Modified Files:
	vim.spec 
Log Message:
- vim-7.0d BETA


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- vim.spec	7 Apr 2006 12:43:30 -0000	1.105
+++ vim.spec	11 Apr 2006 09:55:50 -0000	1.106
@@ -1,4 +1,4 @@
-%define CVSDATE -20060406
+%define CVSDATE -20060410
 %define WITH_SELINUX 1
 %define desktop_file 1
 %if %{desktop_file}
@@ -19,19 +19,20 @@
 %define withcvim 0
 
 
-%define baseversion 7.0c
-%define vimdir vim70c
-%define patchlevel 000
+%define baseversion 7.0
+%define beta d
+%define vimdir vim70d
+%define patchlevel 001
 
 Summary: The VIM editor.
 Name: vim
-Version: %{baseversion}.%{patchlevel}
-Release: 3
+Version: %{baseversion}.%{beta}%{patchlevel}
+Release: 1
 License: freeware
 Group: Applications/Editors
-Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{CVSDATE}.tar.bz2
-Source1: ftp://ftp.vim.org/pub/vim/extra/vim-%{baseversion}-lang%{CVSDATE}.tar.gz
-Source2: ftp://ftp.vim.org/pub/vim/extra/vim-%{baseversion}-extra%{CVSDATE}.tar.gz
+Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{CVSDATE}.tar.bz2
+Source1: ftp://ftp.vim.org/pub/vim/extra/vim-%{baseversion}%{?beta}-lang%{CVSDATE}.tar.gz
+Source2: ftp://ftp.vim.org/pub/vim/extra/vim-%{baseversion}%{?beta}-extra%{CVSDATE}.tar.gz
 Source3: gvim.desktop
 Source4: vimrc
 #Source5: ftp://ftp.vim.org/pub/vim/patches/README.patches
@@ -503,6 +504,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Apr 11 2006 Karsten Hopp <karsten at redhat.de> 7.0.d001-1
+- vim-7.0d BETA
+
 * Fri Apr 07 2006 Karsten Hopp <karsten at redhat.de> 7.0c.000-3
 - fix vimrc filename
 



From fedora-cvs-commits at redhat.com  Tue Apr 11 09:56:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 05:56:11 -0400
Subject: rpms/vim/devel sources,1.14,1.15
Message-ID: <200604110956.k3B9uBjA013530@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13516

Modified Files:
	sources 
Log Message:
- vim-7.0d BETA


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	7 Apr 2006 12:46:20 -0000	1.14
+++ sources	11 Apr 2006 09:56:09 -0000	1.15
@@ -1,4 +1,4 @@
-416d317643921b8d480b1062d700ec38  vim-7.0c-20060406.tar.bz2
-659061c767eeb8f33ce580b7ca53d672  vim-7.0c-extra-20060406.tar.gz
-fec870c5e12def0772d639646de0a8bd  vim-7.0c-lang-20060406.tar.gz
+2cc3c386ce52049f47f100369cdc828f  vim-7.0d-20060410.tar.bz2
+42fedc22f0a8e76516a7de7b787e20ee  vim-7.0d-extra-20060410.tar.gz
+78d433a2c60088f5106ac1c6c8963ca0  vim-7.0d-lang-20060410.tar.gz
 1f17af2008ae94359a48be7e865b084f  cvim.zip



From fedora-cvs-commits at redhat.com  Tue Apr 11 09:56:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 05:56:20 -0400
Subject: rpms/vim/devel .cvsignore,1.14,1.15
Message-ID: <200604110956.k3B9uKrW013551@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13538

Modified Files:
	.cvsignore 
Log Message:
- vim-7.0d BETA


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	7 Apr 2006 12:48:38 -0000	1.14
+++ .cvsignore	11 Apr 2006 09:56:18 -0000	1.15
@@ -1,4 +1,4 @@
-vim-7.0c-20060406.tar.bz2
-vim-7.0c-extra-20060406.tar.gz
-vim-7.0c-lang-20060406.tar.gz
+vim-7.0d-20060410.tar.bz2
+vim-7.0d-extra-20060410.tar.gz
+vim-7.0d-lang-20060410.tar.gz
 cvim.zip



From fedora-cvs-commits at redhat.com  Tue Apr 11 10:13:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 06:13:38 -0400
Subject: rpms/kdelibs/FC-4 kdelibs.spec,1.101,1.102
Message-ID: <200604111013.k3BADcau013720@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdelibs.spec 
Log Message:
update to 3.5.2



Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-4/kdelibs.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- kdelibs.spec	7 Apr 2006 21:44:00 -0000	1.101
+++ kdelibs.spec	11 Apr 2006 10:13:35 -0000	1.102
@@ -190,12 +190,6 @@
    FLAGS="-O0"
 %endif
 
-# workaround for compiler bug on ia64, will be removed later
-%ifarch ia64
-export CFLAGS="$FLAGS -O0"
-export CXXFLAGS="$FLAGS -O0"
-%endif
-
 export CXXFLAGS="$FLAGS"
 export CFLAGS="$FLAGS"
 export QTLIB=$QTDIR/lib
@@ -268,7 +262,7 @@
    perl -pi -e 's,^pic_flag=" -fPIC -DPIC",pic_flag=" -fpic",g' libtool
 %endif
 
-make %{?_smp_mflags}
+make #%{?_smp_mflags}
 make apidox
 
 %install



From fedora-cvs-commits at redhat.com  Tue Apr 11 12:34:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 08:34:58 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.121.rh127576.gnomeprintui.patch, 1.11,
	1.12 openoffice.org.spec, 1.658, 1.659
Message-ID: <200604111234.k3BCYwKa019230@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.121.rh127576.gnomeprintui.patch 
	openoffice.org.spec 
Log Message:
give this a whirl

openoffice.org-1.9.121.rh127576.gnomeprintui.patch:
 configuration/ppds/SGENPRT.PS                |    0 
 configuration/psprint.conf                   |    0 
 inc/jobset.hxx                               |    0 
 inc/print.hxx                                |    0 
 psprint/source/printer/cupsmgr.cxx           |   13 
 psprint_config/configuration/ppds/SGENPRT.PS |    3 
 psprint_config/configuration/psprint.conf    |    2 
 source/dialogs/makefile.mk                   |    0 
 source/dialogs/printdlg.cxx                  |    0 
 source/gdi/jobset.cxx                        |    0 
 source/printer/cupsmgr.cxx                   |    0 
 svtools/source/dialogs/makefile.mk           |    4 
 svtools/source/dialogs/printdlg.cxx          |  525 ++++++++++++++++++++++++++-
 svtools/util/makefile.mk                     |    8 
 util/makefile.mk                             |    0 
 vcl/inc/jobset.hxx                           |    1 
 vcl/inc/print.hxx                            |    1 
 vcl/source/gdi/jobset.cxx                    |  194 +++++++++
 18 files changed, 746 insertions(+), 5 deletions(-)

Index: openoffice.org-1.9.121.rh127576.gnomeprintui.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.121.rh127576.gnomeprintui.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openoffice.org-1.9.121.rh127576.gnomeprintui.patch	29 Mar 2006 10:45:00 -0000	1.11
+++ openoffice.org-1.9.121.rh127576.gnomeprintui.patch	11 Apr 2006 12:34:53 -0000	1.12
@@ -5,6 +5,16 @@
 diff -u -p -u -r1.12 cupsmgr.cxx
 --- openoffice.org.orig/psprint/source/printer/cupsmgr.cxx	6 Jun 2005 16:07:42 -0000	1.12
 +++ openoffice.org/psprint/source/printer/cupsmgr.cxx	25 Jul 2005 15:02:37 -0000
+@@ -406,6 +406,9 @@
+ 
+ void CUPSManager::runDests()
+ {
++	if( m_nDests && m_pDests )
++		m_pCUPSWrapper->cupsFreeDests( m_nDests, (cups_dest_t*)m_pDests );
++
+ #if OSL_DEBUG_LEVEL > 1
+     fprintf( stderr, "starting cupsGetDests\n" );
+ #endif
 @@ -475,9 +487,10 @@ void CUPSManager::initialize()
  
      // clear old stuff
@@ -28,6 +38,16 @@
  }
  
  #ifdef ENABLE_CUPS
+@@ -867,6 +870,9 @@
+ 
+     if( bChanged )
++    {
++		runDests();
+         initialize();
++    }
+ 
+     return bChanged;
+ }
 Index: inc/print.hxx
 ===================================================================
 RCS file: /cvs/gsl/vcl/inc/print.hxx,v
@@ -528,7 +548,7 @@
  short PrintDialog::Execute()
  {
  	if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
-@@ -647,6 +832,343 @@ short PrintDialog::Execute()
+@@ -647,6 +832,345 @@ short PrintDialog::Execute()
  	ImplInitControls();
  	ImplModifyControlHdl( NULL );
  
@@ -726,6 +746,8 @@
 +				OUString sOldPrinterName(pPrinter->GetName());
 +				if (sNewPrinterName != sOldPrinterName)
 +				{
++					psp::PrinterInfoManager& rMgr = psp::PrinterInfoManager::get();
++					rMgr.checkPrintersChanged();
 +					USHORT nCount = Printer::GetQueueCount();
 +					USHORT i = 0;
 +					for (i = 0; i < nCount; ++i)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.658
retrieving revision 1.659
diff -u -r1.658 -r1.659
--- openoffice.org.spec	10 Apr 2006 13:18:50 -0000	1.658
+++ openoffice.org.spec	11 Apr 2006 12:34:53 -0000	1.659
@@ -1,6 +1,6 @@
 %define oootag OOB680
 %define ooomilestone 5
-%define rh_rpm_release 8
+%define rh_rpm_release 8.cmc
 
 %define build_fc6 1
 %define build_rhel4 0
@@ -3570,6 +3570,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Tue Apr 11 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.9
+- rh#187939# not detecting changes to CUPS printers during execution
+
 * Mon Apr 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.8
 - rh#188053# more a11y fixes
 - ooo#63583# committed to workspace.atkbridge



From fedora-cvs-commits at redhat.com  Tue Apr 11 12:37:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 08:37:24 -0400
Subject: rpms/gdk-pixbuf/devel gdk-pixbuf.spec,1.38,1.39
Message-ID: <200604111237.k3BCbO8S019297@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gdk-pixbuf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19283

Modified Files:
	gdk-pixbuf.spec 
Log Message:
Rebuild without gnome support



Index: gdk-pixbuf.spec
===================================================================
RCS file: /cvs/dist/rpms/gdk-pixbuf/devel/gdk-pixbuf.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gdk-pixbuf.spec	28 Feb 2006 10:17:40 -0000	1.38
+++ gdk-pixbuf.spec	11 Apr 2006 12:37:21 -0000	1.39
@@ -1,6 +1,6 @@
 Name: gdk-pixbuf
 Version: 0.22.0
-Release: 22
+Release: 23
 Epoch: 1
 Summary: An image loading library used with GNOME.
 License: LGPL
@@ -20,7 +20,7 @@
 # Define for building without gnome support
 # Fedora needs gnome support, RHEL not
 #
-%define build_gnome 1
+%define build_gnome 0
 
 Patch2: gdk-pixbuf-0.18.0-gmodulehack.patch
 # Quote in configure.in appropriately for recent libtool
@@ -198,6 +198,9 @@
 %{_datadir}/gnome/html/*
 
 %changelog
+* Tue Apr 11 2006 Matthias Clasen <mclasen at redhat.com> 0.22.0-23
+- Build without gnome support, since Gnome 1 is on the way out
+
 * Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de> 0.22.0-22
 - BuildRequires: libXt-devel
 



From fedora-cvs-commits at redhat.com  Tue Apr 11 13:01:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 09:01:45 -0400
Subject: rpms/kernel/devel patch-2.6.17-rc1-git4.bz2.sign, NONE,
	1.1 .cvsignore, 1.404, 1.405 kernel-2.6.spec, 1.2128,
	1.2129 sources, 1.345, 1.346 upstream, 1.318,
	1.319 patch-2.6.17-rc1-git3.bz2.sign, 1.1, NONE
Message-ID: <200604111301.k3BD1jKa001121@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17-rc1-git4.bz2.sign 
Removed Files:
	patch-2.6.17-rc1-git3.bz2.sign 
Log Message:
git4



--- NEW FILE patch-2.6.17-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

iD8DBQBEO1SoyGugalF9Dw4RAlsRAKCJ47Fd0aytrgu/LFElr0a/scAuHACfY9WH
n0iUlH+PqxCE+yCBcE8ysoU=
=cJPS
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -r1.404 -r1.405
--- .cvsignore	11 Apr 2006 00:25:14 -0000	1.404
+++ .cvsignore	11 Apr 2006 13:01:39 -0000	1.405
@@ -5,3 +5,4 @@
 xen-20060320.tar.bz2
 patch-2.6.17-rc1.bz2
 patch-2.6.17-rc1-git3.bz2
+patch-2.6.17-rc1-git4.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2128
retrieving revision 1.2129
diff -u -r1.2128 -r1.2129
--- kernel-2.6.spec	11 Apr 2006 00:25:14 -0000	1.2128
+++ kernel-2.6.spec	11 Apr 2006 13:01:41 -0000	1.2129
@@ -213,7 +213,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.17-rc1.bz2
-Patch2: patch-2.6.17-rc1-git3.bz2
+Patch2: patch-2.6.17-rc1-git4.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1655,8 +1655,11 @@
 %endif
 
 %changelog
+* Tue Apr 11 2006 Dave Jones <davej at redhat.com>
+- 2.6.17rc1-git4
+
 * Mon Apr 10 2006 Dave Jones <davej at redhat.com>
-- 2.6.16rc1-git2 & git3
+- 2.6.17rc1-git2 & git3
 - Enable SMP on all x86 kernels.
   SMP_ALTERNATIVES disables the spinlocks etc at runtime.
 - setuid /proc/self/maps fix (#165351)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -r1.345 -r1.346
--- sources	11 Apr 2006 00:25:14 -0000	1.345
+++ sources	11 Apr 2006 13:01:42 -0000	1.346
@@ -2,3 +2,4 @@
 8c70806f9075ebc0087f7ce1b8911700  xen-20060320.tar.bz2
 ee1b5bf019ec60a34ef7bf1b2a0c1291  patch-2.6.17-rc1.bz2
 33a1f95f8b4dbad15a69b2628cf16d09  patch-2.6.17-rc1-git3.bz2
+8ae04240509d86bf520010c497f359e2  patch-2.6.17-rc1-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -r1.318 -r1.319
--- upstream	11 Apr 2006 00:25:14 -0000	1.318
+++ upstream	11 Apr 2006 13:01:42 -0000	1.319
@@ -1,3 +1,3 @@
 linux-2.6.16.tar.bz2
 patch-2.6.17-rc1.bz2
-patch-2.6.17-rc1-git3.bz2
+patch-2.6.17-rc1-git4.bz2


--- patch-2.6.17-rc1-git3.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 11 13:02:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 09:02:12 -0400
Subject: rpms/gnome-pilot/FC-5 gnome-pilot.spec,1.36,1.37
Message-ID: <200604111302.k3BD2CqK001147@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	gnome-pilot.spec 
Log Message:
rebuilt against pilot-link-0.11.8




Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/FC-5/gnome-pilot.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gnome-pilot.spec	11 Mar 2006 07:55:13 -0000	1.36
+++ gnome-pilot.spec	11 Apr 2006 13:01:46 -0000	1.37
@@ -1,8 +1,8 @@
-%define pilot_link_version 1:0.12.0-0.pre2.0
+%define pilot_link_version 2:0.11.8
 Summary: GNOME pilot programs
 Name: gnome-pilot
 Version: 2.0.13
-Release: 7.fc5.4
+Release: 7.fc5.5
 License: LGPL
 Group: Applications/Communications
 Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-pilot/2.0/%{name}-%{version}.tar.bz2
@@ -13,16 +13,16 @@
 Patch9: gnome-pilot-2.0.12-defines.patch
 
 # This patch has been regenerated by Mark G Adams:
+# patches for pilot-link-0.12
 Patch11: gnome-pilot-2.0.12-port-to-pilot-link-0.12.patch
+Patch12: gnome-pilot-2.0.13-include-pi-error.patch
+Patch13: rh-161799-attach-116013-backup_conduit_update.diff
 
 # Various patches by Mark G Adams filed in GNOME and RH Bugzilla:
 Patch16: gb-309077-attach-48373-fix-xml-properties-leak.patch
 Patch17: gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch
-Patch18: rh-161799-attach-116013-backup_conduit_update.diff
 Patch19: rh-161799-attach-116014-conduits_64bit.diff
 
-Patch20: gnome-pilot-2.0.13-include-pi-error.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: pilot-link >= %{pilot_link_version}
 Prereq: scrollkeeper
@@ -61,15 +61,18 @@
 %patch7 -p1 -b .move-conduits-code
 %patch8 -p1 -b .move-conduits-autotools
 %patch9 -p1 -b .defines
+
+# patches for pilot-link-0.12
+%if 0
 %patch11 -p0 -b .port-to-pilot-link-0.12
+%patch12 -p1 -b .include-pi-error
+%patch13 -p0 -b .backup_conduit_update
+%endif
 
 %patch16 -p0 -b .fix-xml-properties-leak
 %patch17 -p0 -b .backup-conduit-valgrind-fixes
-%patch18 -p0 -b .backup_conduit_update
 %patch19 -p0 -b .conduits_64bit
 
-%patch20 -p1 -b .include-pi-error
-
 %build
 autoreconf -i
 %configure
@@ -149,6 +152,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Apr 11 2006 Than Ngo <than at redhat.com> 2.0.13-7.fc5.5
+- rebuilt against pilot-link-0.11.8
+
 * Sat Mar 11 2006 Bill Nottingham <notting at redhat.com> 2.0.13-7.fc5.4
 - fix pilot-link-version vs pilot_link_version macro/dep confusion
 



From fedora-cvs-commits at redhat.com  Tue Apr 11 13:10:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 09:10:22 -0400
Subject: rpms/gnome-utils/FC-5 .cvsignore, 1.44, 1.45 gnome-utils.spec, 1.104,
	1.105 sources, 1.47, 1.48
Message-ID: <200604111310.k3BDAMjN001429@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-utils.spec sources 
Log Message:
zenity 2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/FC-5/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	13 Mar 2006 21:12:19 -0000	1.44
+++ .cvsignore	11 Apr 2006 13:10:19 -0000	1.45
@@ -16,3 +16,4 @@
 gucharmap-1.6.0.tar.bz2
 gcalctool-5.7.32.tar.gz
 zenity-2.14.0.tar.bz2
+zenity-2.14.1.tar.bz2


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/FC-5/gnome-utils.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- gnome-utils.spec	13 Mar 2006 21:24:00 -0000	1.104
+++ gnome-utils.spec	11 Apr 2006 13:10:19 -0000	1.105
@@ -14,14 +14,14 @@
 
 %define gcalctool_version 5.7.32
 %define gucharmap_version 1.6.0
-%define zenity_version 2.14.0
+%define zenity_version 2.14.1
 
 %define dbus_version 0.60
 
 Summary: GNOME utility programs.
 Name: gnome-utils
 Version: 2.14.0
-Release: 3
+Release: 4
 Epoch: 1
 License: GPL
 Group: Applications/System
@@ -227,6 +227,9 @@
 %{_sysconfdir}/pam.d/gnome-system-log
 
 %changelog
+* Tue Apr 11 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-4
+- Update to zenity 2.14.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-3
 - Update to zenity 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/FC-5/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	13 Mar 2006 21:12:19 -0000	1.47
+++ sources	11 Apr 2006 13:10:19 -0000	1.48
@@ -1,4 +1,4 @@
 d1d16ff6bfc1f6ddc110d18ec4dfdbfa  gnome-utils-2.14.0.tar.bz2
 8af03f350c988d1565922b10776bc725  gucharmap-1.6.0.tar.bz2
 c4d4234f6951389027399e9c596a8abe  gcalctool-5.7.32.tar.gz
-872f0f25a3c41b9a4e89cb3be9518e11  zenity-2.14.0.tar.bz2
+2445b652a93581436164cb6ad5e9c36b  zenity-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 13:15:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 09:15:02 -0400
Subject: rpms/gdm/devel .cvsignore, 1.24, 1.25 gdm.spec, 1.142, 1.143 sources,
	1.26, 1.27
Message-ID: <200604111315.k3BDF2hq001598@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1568

Modified Files:
	.cvsignore gdm.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	13 Mar 2006 23:11:59 -0000	1.24
+++ .cvsignore	11 Apr 2006 13:15:00 -0000	1.25
@@ -1 +1,2 @@
 gdm-2.14.0.tar.bz2
+gdm-2.14.1.tar.bz2


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- gdm.spec	13 Mar 2006 23:11:59 -0000	1.142
+++ gdm.spec	11 Apr 2006 13:15:00 -0000	1.143
@@ -14,8 +14,8 @@
 
 Summary: The GNOME Display Manager.
 Name: gdm
-Version: 2.14.0
-Release: 1
+Version: 2.14.1
+Release: 2
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -308,6 +308,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Tue Apr 11 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.14.1-2
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 1:2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	13 Mar 2006 23:11:59 -0000	1.26
+++ sources	11 Apr 2006 13:15:00 -0000	1.27
@@ -1 +1 @@
-1f82485c4e8cd8ca2f1523a91a624eff  gdm-2.14.0.tar.bz2
+5bafb764f36d7caf5d2217de0b6ceba5  gdm-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 13:28:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 09:28:08 -0400
Subject: rpms/gdm/devel gdm-2.14.1-change-defaults.patch, NONE, 1.1 gdm.spec,
	1.143, 1.144 gdm-2.13.0.9-change-defaults.patch, 1.1, NONE
Message-ID: <200604111328.k3BDS879015657@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15640

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.14.1-change-defaults.patch 
Removed Files:
	gdm-2.13.0.9-change-defaults.patch 
Log Message:
2.14.1


gdm-2.14.1-change-defaults.patch:
 gdm.conf.in |   51 +++++++++++++++++++++++++++++----------------------
 1 files changed, 29 insertions(+), 22 deletions(-)

--- NEW FILE gdm-2.14.1-change-defaults.patch ---
--- gdm-2.14.1/config/gdm.conf.in.change-defaults	2006-04-11 09:18:56.000000000 -0400
+++ gdm-2.14.1/config/gdm.conf.in	2006-04-11 09:26:11.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=@EXPANDED_LIBEXECDIR@/gdmgreeter
 
 # The greeter for xdmcp logins, usually you want a less graphically intensive
 # greeter here so it's better to leave this with gdmlogin
@@ -78,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.
@@ -286,7 +283,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.
@@ -307,7 +304,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
@@ -331,7 +328,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.
@@ -357,7 +354,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
@@ -404,8 +401,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
@@ -420,7 +418,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
@@ -440,7 +438,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
@@ -581,3 +579,12 @@
 # Run the chooser instead of the greeter.  When the user chooses a machine they
 # will get this same server but run with "-terminate -query hostname".
 chooser=true
+
+
+# Experimental build of Xorg with accelerated indirect rendering
+# support
+[server-aiglx]
+name=Accelerated Indirect Rendering server
+command=/usr/bin/Xair @X_CONFIG_OPTIONS@
+flexible=false
+


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- gdm.spec	11 Apr 2006 13:15:00 -0000	1.143
+++ gdm.spec	11 Apr 2006 13:28:05 -0000	1.144
@@ -25,7 +25,7 @@
 Source2: gdm-early-login.init
 Source3: zzz-bootup-complete.init
 
-Patch1: gdm-2.13.0.9-change-defaults.patch
+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
@@ -103,10 +103,10 @@
 ##%patch6 -p1 -b .wait-for-bootup
 %patch7 -p1 -b .clean-up-xsession-errors
 %patch8 -p1 -b .merge-resources
-#%patch9 -p1 -b .boot-throbber
+##%patch9 -p1 -b .boot-throbber
 %patch10 -p1 -b .dont-malloc-in-signal-handlers
-#%patch11 -p1 -b .xdmcp
-#%patch12 -p1 -b .process-all-messages
+##%patch11 -p1 -b .xdmcp
+##%patch12 -p1 -b .process-all-messages
 %patch13 -p1 -b .hide-throbber
 %patch15 -p1 -b .audit-login
 %patch16 -p1 -b .modularx


--- gdm-2.13.0.9-change-defaults.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 11 13:34:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 09:34:11 -0400
Subject: rpms/setools/devel apol.png, NONE, 1.1 seaudit.png, NONE,
	1.1 sediffx.png, NONE, 1.1 apol.desktop, 1.4,
	1.5 seaudit.desktop, 1.4, 1.5 sediffx.desktop, 1.3,
	1.4 setools.spec, 1.52, 1.53
Message-ID: <200604111334.k3BDYBPP015838@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15821

Modified Files:
	apol.desktop seaudit.desktop sediffx.desktop setools.spec 
Added Files:
	apol.png seaudit.png sediffx.png 
Log Message:



Index: apol.desktop
===================================================================
RCS file: /cvs/dist/rpms/setools/devel/apol.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- apol.desktop	21 Mar 2006 18:40:55 -0000	1.4
+++ apol.desktop	11 Apr 2006 13:34:08 -0000	1.5
@@ -2,7 +2,7 @@
 Name=SELinux Policy Analysis
 GenericName=SELinux Policy Analysis Tool 
 Comment=This tool can examine, search, and relate policy components and policy rules 
-#Icon=/usr/share/pixmaps/apol.xpm
+Icon=apol.png
 Exec=/usr/bin/apol
 Type=Application
 Terminal=false


Index: seaudit.desktop
===================================================================
RCS file: /cvs/dist/rpms/setools/devel/seaudit.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- seaudit.desktop	21 Mar 2006 18:40:55 -0000	1.4
+++ seaudit.desktop	11 Apr 2006 13:34:08 -0000	1.5
@@ -2,7 +2,7 @@
 Name=SELinux Audit Log Analysis
 GenericName=SELinux Audit Log Analysis Tool
 Comment=The tool parses syslog files and extracts all policy , AVC and change of boolean messages. 
-#Icon=/usr/share/pixmaps/seaudit.xpm
+Icon=seaudit.png
 Exec=/usr/bin/seaudit
 Type=Application
 Terminal=false


Index: sediffx.desktop
===================================================================
RCS file: /cvs/dist/rpms/setools/devel/sediffx.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sediffx.desktop	21 Mar 2006 18:40:55 -0000	1.3
+++ sediffx.desktop	11 Apr 2006 13:34:08 -0000	1.4
@@ -9,3 +9,4 @@
 Categories=Application;SystemSetup;X-Red-Hat-Base;
 X-Desktop-File-Install-Version=0.2
 StartupNotify=true
+Icon=sediffx.png


Index: setools.spec
===================================================================
RCS file: /cvs/dist/rpms/setools/devel/setools.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- setools.spec	21 Mar 2006 18:40:55 -0000	1.52
+++ setools.spec	11 Apr 2006 13:34:08 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: SELinux tools for managing policy
 Name: setools
 Version: 2.3
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 URL:	http://www.tresys.com/
@@ -11,6 +11,9 @@
 Source5: apol.desktop
 Source7: seaudit.desktop
 Source9: sediffx.desktop
+Source10: seaudit.png
+Source11: apol.png
+Source12: sediffx.png
 
 Prefix: %{_prefix}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -83,7 +86,7 @@
 
 %build
 make clean
-make LIBDIR=%{_libdir} all 
+make INSTALL_HELPDIR=/usr/share/doc/setools-%{version} LIBDIR=%{_libdir} all
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -93,6 +96,8 @@
 mkdir -p $RPM_BUILD_ROOT%{_includedir}/selinux/apol
 mkdir -p $RPM_BUILD_ROOT/usr/share/doc/setools-%{version}
 mkdir -p $RPM_BUILD_ROOT/usr/share/tcl8.4
+mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps
+	
 make DESTDIR="${RPM_BUILD_ROOT}" INSTALL_HELPDIR=$RPM_BUILD_ROOT/usr/share/doc/setools-%{version} LIBDIR=%{_libdir} install install-bwidget
 rm -f ${RPM_BUILD_ROOT}/usr/bin/findcon
 rm -f ${RPM_BUILD_ROOT}/usr/bin/replcon
@@ -110,6 +115,10 @@
 install -m 664 %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/applications/apol.desktop
 install -m 664 %{SOURCE7} ${RPM_BUILD_ROOT}%{_datadir}/applications/seaudit.desktop
 install -m 664 %{SOURCE9} ${RPM_BUILD_ROOT}%{_datadir}/applications/sediffx.desktop
+install -m 664 %{SOURCE10} ${RPM_BUILD_ROOT}/usr/share/pixmaps/seaudit.png
+install -m 664 %{SOURCE11} ${RPM_BUILD_ROOT}/usr/share/pixmaps/apol.png
+install -m 664 %{SOURCE12} ${RPM_BUILD_ROOT}/usr/share/pixmaps/sediffx.png
+
 cd $RPM_BUILD_ROOT/%{_bindir}/
 ln -sf consolehelper seaudit
 
@@ -168,6 +177,9 @@
 %{_mandir}/man1/sediffx.1.gz
 %{_mandir}/man8/seaudit.8.gz
 %{_mandir}/man8/seaudit-report.8.gz
+%attr(0644,root,root) /usr/share/pixmaps/seaudit.png
+%attr(0644,root,root) /usr/share/pixmaps/apol.png
+%attr(0644,root,root) /usr/share/pixmaps/sediffx.png
 
 %package devel
 Summary: Development environment for SETools
@@ -220,6 +232,11 @@
 %{_libdir}/libsefs.so.1.2.1
 
 %changelog
+
+* Mon Apr 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3-3
+- Fix help
+- Add icons
+
 * Tue Mar 21 2006 Dan Walsh <dwalsh at redhat.com> 2.3-2
 - Remove console apps for sediff, sediffx and apol
 



From fedora-cvs-commits at redhat.com  Tue Apr 11 13:38:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 09:38:41 -0400
Subject: rpms/setools/FC-5 apol.png, NONE, 1.1 seaudit.png, NONE,
	1.1 sediffx.png, NONE, 1.1 apol.desktop, 1.3,
	1.4 seaudit.desktop, 1.3, 1.4 sediffx.desktop, 1.2,
	1.3 setools-rhat.patch, 1.20, 1.21 setools.spec, 1.51, 1.52
Message-ID: <200604111338.k3BDcf29015965@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	apol.desktop seaudit.desktop sediffx.desktop 
	setools-rhat.patch setools.spec 
Added Files:
	apol.png seaudit.png sediffx.png 
Log Message:



Index: apol.desktop
===================================================================
RCS file: /cvs/dist/rpms/setools/FC-5/apol.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apol.desktop	14 Dec 2005 14:47:13 -0000	1.3
+++ apol.desktop	11 Apr 2006 13:38:37 -0000	1.4
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=APOL
+Name=SELinux Policy Analysis
 GenericName=SELinux Policy Analysis Tool 
 Comment=This tool can examine, search, and relate policy components and policy rules 
-#Icon=/usr/share/pixmaps/apol.xpm
+Icon=apol.png
 Exec=/usr/bin/apol
 Type=Application
 Terminal=false


Index: seaudit.desktop
===================================================================
RCS file: /cvs/dist/rpms/setools/FC-5/seaudit.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- seaudit.desktop	14 Dec 2005 14:47:13 -0000	1.3
+++ seaudit.desktop	11 Apr 2006 13:38:37 -0000	1.4
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=seaudit
+Name=SELinux Audit Log Analysis
 GenericName=SELinux Audit Log Analysis Tool
 Comment=The tool parses syslog files and extracts all policy , AVC and change of boolean messages. 
-#Icon=/usr/share/pixmaps/seaudit.xpm
+Icon=seaudit.png
 Exec=/usr/bin/seaudit
 Type=Application
 Terminal=false


Index: sediffx.desktop
===================================================================
RCS file: /cvs/dist/rpms/setools/FC-5/sediffx.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sediffx.desktop	14 Dec 2005 14:47:13 -0000	1.2
+++ sediffx.desktop	11 Apr 2006 13:38:37 -0000	1.3
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Name=sediffx
-GenericName=SELinux Policy Difference too
+Name=SELinux Policy Difference
+GenericName=SELinux Policy Difference tool
 Comment=This tool allows you to compare two policy files
 Exec=/usr/bin/sediffx
 Type=Application
@@ -9,3 +9,4 @@
 Categories=Application;SystemSetup;X-Red-Hat-Base;
 X-Desktop-File-Install-Version=0.2
 StartupNotify=true
+Icon=sediffx.png

setools-rhat.patch:
 Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: setools-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/setools/FC-5/setools-rhat.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- setools-rhat.patch	31 Jan 2006 21:25:24 -0000	1.20
+++ setools-rhat.patch	11 Apr 2006 13:38:37 -0000	1.21
@@ -1,14 +1,3 @@
---- setools-2.3/apol/Makefile.rhat	2006-01-23 10:58:42.000000000 -0500
-+++ setools-2.3/apol/Makefile	2006-01-31 16:15:53.000000000 -0500
-@@ -85,7 +85,7 @@
- 	$(MAKE) -C .. libsefs
- 
- install: apol apol.tcl
--	install -m 755 apol $(BINDIR)
-+	install -m 755 apol $(SBINDIR)
- 	@if [ -n $(INSTALL_LIBDIR) ]; then \
- 		for file in $(TCL-FILES); do \
- 			if [ -f $(INSTALL_LIBDIR)/$$file ]; then \
 --- setools-2.3/Makefile.rhat	2006-01-23 10:58:42.000000000 -0500
 +++ setools-2.3/Makefile	2006-01-31 16:18:43.000000000 -0500
 @@ -12,7 +12,7 @@
@@ -29,15 +18,3 @@
  # all apps that have a te/fc file need to be listed here
  POLICYINSTALLDIRS 	= 
  # Help files here
---- setools-2.3/sediff/Makefile.rhat	2006-01-23 10:58:42.000000000 -0500
-+++ setools-2.3/sediff/Makefile	2006-01-31 16:15:53.000000000 -0500
-@@ -22,7 +22,8 @@
- 	install -m 644 ../man/sediff.1 $(MANDIR)/man1
- 
- install: all
--	install -m 755 sediff sediffx $(BINDIR);
-+	install -m 755 sediff $(BINDIR);
-+	install -m 755 sediffx $(SBINDIR);
- 	install -m 644 $(GLADE_FILES) $(INSTALL_LIBDIR)
- 	install -m 644 sediff_help.txt $(INSTALL_HELPDIR)
- 


Index: setools.spec
===================================================================
RCS file: /cvs/dist/rpms/setools/FC-5/setools.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- setools.spec	11 Feb 2006 05:41:11 -0000	1.51
+++ setools.spec	11 Apr 2006 13:38:37 -0000	1.52
@@ -1,18 +1,19 @@
 Summary: SELinux tools for managing policy
 Name: setools
 Version: 2.3
-Release: 1.2
+Release: 3.FC5
 License: GPL
 Group: System Environment/Base
 URL:	http://www.tresys.com/
 Source: http://www.tresys.com/Downloads/selinux-tools/setools-%{version}.tar.bz2
 Source1: setools.pam
-Source2: apol.console
 Source4: seaudit.console
 Source5: apol.desktop
 Source7: seaudit.desktop
-Source8: sediffx.console
 Source9: sediffx.desktop
+Source10: seaudit.png
+Source11: apol.png
+Source12: sediffx.png
 
 Prefix: %{_prefix}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -85,7 +86,7 @@
 
 %build
 make clean
-make LIBDIR=%{_libdir} all 
+make INSTALL_HELPDIR=/usr/share/doc/setools-%{version} LIBDIR=%{_libdir} all
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -95,6 +96,8 @@
 mkdir -p $RPM_BUILD_ROOT%{_includedir}/selinux/apol
 mkdir -p $RPM_BUILD_ROOT/usr/share/doc/setools-%{version}
 mkdir -p $RPM_BUILD_ROOT/usr/share/tcl8.4
+mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps
+	
 make DESTDIR="${RPM_BUILD_ROOT}" INSTALL_HELPDIR=$RPM_BUILD_ROOT/usr/share/doc/setools-%{version} LIBDIR=%{_libdir} install install-bwidget
 rm -f ${RPM_BUILD_ROOT}/usr/bin/findcon
 rm -f ${RPM_BUILD_ROOT}/usr/bin/replcon
@@ -105,21 +108,19 @@
 rm -f ${RPM_BUILD_ROOT}/usr/share/man/man1/replcon.1
 rm -f ${RPM_BUILD_ROOT}/usr/share/man/man1/findcon.1
 install -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d
-install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/apol
 install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/seaudit
-install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/sediffx
 install -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps
-install -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/apol
 install -m 644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/seaudit
-install -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/sediffx
 install -d -m 755 ${RPM_BUILD_ROOT}%{_datadir}/applications
 install -m 664 %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/applications/apol.desktop
 install -m 664 %{SOURCE7} ${RPM_BUILD_ROOT}%{_datadir}/applications/seaudit.desktop
 install -m 664 %{SOURCE9} ${RPM_BUILD_ROOT}%{_datadir}/applications/sediffx.desktop
+install -m 664 %{SOURCE10} ${RPM_BUILD_ROOT}/usr/share/pixmaps/seaudit.png
+install -m 664 %{SOURCE11} ${RPM_BUILD_ROOT}/usr/share/pixmaps/apol.png
+install -m 664 %{SOURCE12} ${RPM_BUILD_ROOT}/usr/share/pixmaps/sediffx.png
+
 cd $RPM_BUILD_ROOT/%{_bindir}/
-ln -sf consolehelper apol 
 ln -sf consolehelper seaudit
-ln -sf consolehelper sediffx
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -129,9 +130,7 @@
 %dir /usr/share/tcl8.4/BWidget-1.7.0
 /usr/share/tcl8.4/BWidget-1.7.0/*
 %{_bindir}/apol
-%{_sbindir}/apol
 %{_bindir}/sediffx
-%{_sbindir}/sediffx
 %{_bindir}/awish
 %{_bindir}/seaudit
 %{_sbindir}/seaudit
@@ -139,12 +138,8 @@
 %{_datadir}/applications/apol.desktop
 %{_datadir}/applications/seaudit.desktop
 %{_datadir}/applications/sediffx.desktop
-%config(noreplace) %{_sysconfdir}/pam.d/apol
 %config(noreplace) %{_sysconfdir}/pam.d/seaudit
-%config(noreplace) %{_sysconfdir}/pam.d/sediffx
-%config(noreplace) %{_sysconfdir}/security/console.apps/apol
 %config(noreplace) %{_sysconfdir}/security/console.apps/seaudit
-%config(noreplace) %{_sysconfdir}/security/console.apps/sediffx
 /usr/share/doc/setools-%{version}/apol*
 /usr/share/doc/setools-%{version}/seaudit_help.txt
 /usr/share/doc/setools-%{version}/types_relation_help.txt
@@ -182,6 +177,9 @@
 %{_mandir}/man1/sediffx.1.gz
 %{_mandir}/man8/seaudit.8.gz
 %{_mandir}/man8/seaudit-report.8.gz
+%attr(0644,root,root) /usr/share/pixmaps/seaudit.png
+%attr(0644,root,root) /usr/share/pixmaps/apol.png
+%attr(0644,root,root) /usr/share/pixmaps/sediffx.png
 
 %package devel
 Summary: Development environment for SETools
@@ -234,6 +232,17 @@
 %{_libdir}/libsefs.so.1.2.1
 
 %changelog
+
+* Tue Apr 11 2006 Dan Walsh <dwalsh at redhat.com> 2.3-3.FC5
+- Bump for FC5
+
+* Mon Apr 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3-3
+- Fix help
+- Add icons
+
+* Tue Mar 21 2006 Dan Walsh <dwalsh at redhat.com> 2.3-2
+- Remove console apps for sediff, sediffx and apol
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.3-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Apr 11 13:44:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 09:44:59 -0400
Subject: rpms/autofs/FC-5 autofs.spec,1.76,1.77
Message-ID: <200604111344.k3BDixLo016129@cvs.devel.redhat.com>

Author: ikent

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

Modified Files:
	autofs.spec 
Log Message:
* Tue Apr 11 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-19
- Add patch to allow customization of arguments to the
  autofs-ldap-auto-master program (bz #187525).
- Add patch to escap "#" characters in exports from auto.net
  program mount (bz#178304).



Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/FC-5/autofs.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- autofs.spec	11 Feb 2006 02:01:31 -0000	1.76
+++ autofs.spec	11 Apr 2006 13:44:57 -0000	1.77
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 4.1.4
-%define release 16.2.2
+%define release 19
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -35,6 +35,8 @@
 Patch22: autofs-4.1.4-yp_order-order-type.patch
 Patch23: autofs-4.1.4-ldap-depricated.patch
 Patch24: autofs-4.1.4-underscore_to_dot.patch
+Patch25: autofs-4.1.3-ldap-auto-master.patch
+Patch26: autofs-4.1.4-auto_net-escape-hash.patch
 
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl
@@ -98,7 +100,8 @@
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
-
+%patch25 -p1
+%patch26 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -152,6 +155,12 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Tue Apr 11 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-19
+- Add patch to allow customization of arguments to the
+  autofs-ldap-auto-master program (bz #187525).
+- Add patch to escap "#" characters in exports from auto.net
+  program mount (bz#178304).
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:4.1.4-16.2.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Apr 11 13:46:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 09:46:27 -0400
Subject: rpms/autofs/devel autofs-4.1.3-ldap-auto-master.patch, NONE,
	1.1 autofs-4.1.4-auto_net-escape-hash.patch, NONE,
	1.1 autofs.spec, 1.76, 1.77
Message-ID: <200604111346.k3BDkRFP017656@cvs.devel.redhat.com>

Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-4.1.3-ldap-auto-master.patch 
	autofs-4.1.4-auto_net-escape-hash.patch 
Log Message:
* Tue Apr 11 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-18
- Add patch to allow customization of arguments to the
  autofs-ldap-auto-master program (bz #187525).
- Add patch to escap "#" characters in exports from auto.net
  program mount (bz#178304).


autofs-4.1.3-ldap-auto-master.patch:
 redhat/autofs.sysconfig |    4 ++++
 samples/rc.autofs.in    |    3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE autofs-4.1.3-ldap-auto-master.patch ---
diff -Nurp autofs-4.1.4.orig/redhat/autofs.sysconfig autofs-4.1.4/redhat/autofs.sysconfig
--- autofs-4.1.4.orig/redhat/autofs.sysconfig	2005-01-17 09:53:17.000000000 -0500
+++ autofs-4.1.4/redhat/autofs.sysconfig	2006-04-11 07:17:34.000000000 -0400
@@ -19,3 +19,7 @@ DISABLE_DIRECT=1
 # this value.
 DAEMON_EXIT_WAIT=10
 
+# LDAPAUTOMASTER contains command line arguments for the
+# /usr/lib/autofs/autofs-ldap-auto-master program
+# Run the program with --help to see available options
+LDAPAUTOMASTER=""
diff -Nurp autofs-4.1.4.orig/samples/rc.autofs.in autofs-4.1.4/samples/rc.autofs.in
--- autofs-4.1.4.orig/samples/rc.autofs.in	2006-04-11 07:05:00.000000000 -0400
+++ autofs-4.1.4/samples/rc.autofs.in	2006-04-11 07:15:03.000000000 -0400
@@ -85,6 +85,7 @@ if [ "$system" = "redhat" ]; then
 	DISABLE_DIRECT=1
 	DAEMON_EXIT_WAIT=20
 	ONE_AUTO_MASTER=0
+	LDAPAUTOMASTER=""
 
 	[ -f /etc/sysconfig/autofs ] && . /etc/sysconfig/autofs
 
@@ -165,7 +166,7 @@ function getnismounts()
 function getldapmounts()
 {
     if [ -x @@autofslibdir@@/autofs-ldap-auto-master ]; then
-        @@autofslibdir@@/autofs-ldap-auto-master 2> /dev/null
+        @@autofslibdir@@/autofs-ldap-auto-master $LDAPAUTOMASTER 2> /dev/null
     fi
 }
 

autofs-4.1.4-auto_net-escape-hash.patch:
 auto.net |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE autofs-4.1.4-auto_net-escape-hash.patch ---
diff -Nurp autofs-4.1.4.orig/samples/auto.net autofs-4.1.4/samples/auto.net
--- autofs-4.1.4.orig/samples/auto.net	2006-04-11 09:24:17.000000000 -0400
+++ autofs-4.1.4/samples/auto.net	2006-04-11 09:27:24.000000000 -0400
@@ -42,4 +42,4 @@ $SHOWMOUNT | LC_ALL=C sort -k 1 | \
 	BEGIN	{ ORS=""; first=1 }
 		{ if (first) { print opts; first=0 }; print " \\\n\t" $1, key ":" $1 }
 	END	{ if (!first) print "\n"; else exit 1 }
-	'
+	' | sed 's/#/\\#/g'


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- autofs.spec	11 Feb 2006 02:01:31 -0000	1.76
+++ autofs.spec	11 Apr 2006 13:46:25 -0000	1.77
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 4.1.4
-%define release 16.2.2
+%define release 18
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -35,6 +35,8 @@
 Patch22: autofs-4.1.4-yp_order-order-type.patch
 Patch23: autofs-4.1.4-ldap-depricated.patch
 Patch24: autofs-4.1.4-underscore_to_dot.patch
+Patch25: autofs-4.1.3-ldap-auto-master.patch
+Patch26: autofs-4.1.4-auto_net-escape-hash.patch
 
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl
@@ -98,7 +100,8 @@
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
-
+%patch25 -p1
+%patch26 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -152,6 +155,12 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Tue Apr 11 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-18
+- Add patch to allow customization of arguments to the
+  autofs-ldap-auto-master program (bz #187525).
+- Add patch to escap "#" characters in exports from auto.net
+  program mount (bz#178304).
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:4.1.4-16.2.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Apr 11 13:47:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 09:47:22 -0400
Subject: rpms/autofs/FC-4 autofs-4.1.3-ldap-auto-master.patch, NONE,
	1.1 autofs-4.1.4-auto_net-escape-hash.patch, NONE,
	1.1 autofs-4.1.4-underscore_to_dot.patch, NONE,
	1.1 autofs.spec, 1.66, 1.67
Message-ID: <200604111347.k3BDlMuU025466@cvs.devel.redhat.com>

Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-4.1.3-ldap-auto-master.patch 
	autofs-4.1.4-auto_net-escape-hash.patch 
	autofs-4.1.4-underscore_to_dot.patch 
Log Message:
* Tue Apr 11 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-17
- Add patch to allow customization of arguments to the
  autofs-ldap-auto-master program (bz #187525).
- Add more general patch to translate "_" to "." in map
  names. (bz #147765)
- Add patch to escap "#" characters in exports from auto.net
  program mount (bz#178304).


autofs-4.1.3-ldap-auto-master.patch:
 redhat/autofs.sysconfig |    4 ++++
 samples/rc.autofs.in    |    3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE autofs-4.1.3-ldap-auto-master.patch ---
diff -Nurp autofs-4.1.4.orig/redhat/autofs.sysconfig autofs-4.1.4/redhat/autofs.sysconfig
--- autofs-4.1.4.orig/redhat/autofs.sysconfig	2005-01-17 09:53:17.000000000 -0500
+++ autofs-4.1.4/redhat/autofs.sysconfig	2006-04-11 07:17:34.000000000 -0400
@@ -19,3 +19,7 @@ DISABLE_DIRECT=1
 # this value.
 DAEMON_EXIT_WAIT=10
 
+# LDAPAUTOMASTER contains command line arguments for the
+# /usr/lib/autofs/autofs-ldap-auto-master program
+# Run the program with --help to see available options
+LDAPAUTOMASTER=""
diff -Nurp autofs-4.1.4.orig/samples/rc.autofs.in autofs-4.1.4/samples/rc.autofs.in
--- autofs-4.1.4.orig/samples/rc.autofs.in	2006-04-11 07:05:00.000000000 -0400
+++ autofs-4.1.4/samples/rc.autofs.in	2006-04-11 07:15:03.000000000 -0400
@@ -85,6 +85,7 @@ if [ "$system" = "redhat" ]; then
 	DISABLE_DIRECT=1
 	DAEMON_EXIT_WAIT=20
 	ONE_AUTO_MASTER=0
+	LDAPAUTOMASTER=""
 
 	[ -f /etc/sysconfig/autofs ] && . /etc/sysconfig/autofs
 
@@ -165,7 +166,7 @@ function getnismounts()
 function getldapmounts()
 {
     if [ -x @@autofslibdir@@/autofs-ldap-auto-master ]; then
-        @@autofslibdir@@/autofs-ldap-auto-master 2> /dev/null
+        @@autofslibdir@@/autofs-ldap-auto-master $LDAPAUTOMASTER 2> /dev/null
     fi
 }
 

autofs-4.1.4-auto_net-escape-hash.patch:
 auto.net |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE autofs-4.1.4-auto_net-escape-hash.patch ---
diff -Nurp autofs-4.1.4.orig/samples/auto.net autofs-4.1.4/samples/auto.net
--- autofs-4.1.4.orig/samples/auto.net	2006-04-11 09:24:17.000000000 -0400
+++ autofs-4.1.4/samples/auto.net	2006-04-11 09:27:24.000000000 -0400
@@ -42,4 +42,4 @@ $SHOWMOUNT | LC_ALL=C sort -k 1 | \
 	BEGIN	{ ORS=""; first=1 }
 		{ if (first) { print opts; first=0 }; print " \\\n\t" $1, key ":" $1 }
 	END	{ if (!first) print "\n"; else exit 1 }
-	'
+	' | sed 's/#/\\#/g'

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

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


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/FC-4/autofs.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- autofs.spec	3 Feb 2006 11:25:30 -0000	1.66
+++ autofs.spec	11 Apr 2006 13:47:20 -0000	1.67
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 4.1.4
-%define release 15.1
+%define release 17
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -34,6 +34,9 @@
 Patch21: autofs-4.1.4-sockopt-len-type.patch
 Patch22: autofs-4.1.4-yp_order-order-type.patch
 Patch23: autofs-4.1.4-ldap-depricated.patch
+Patch24: autofs-4.1.4-underscore_to_dot.patch
+Patch25: autofs-4.1.3-ldap-auto-master.patch
+Patch26: autofs-4.1.4-auto_net-escape-hash.patch
 
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl
@@ -96,6 +99,9 @@
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -149,6 +155,14 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Tue Apr 11 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-17
+- Add patch to allow customization of arguments to the
+  autofs-ldap-auto-master program (bz #187525).
+- Add more general patch to translate "_" to "." in map
+  names. (bz #147765)
+- Add patch to escap "#" characters in exports from auto.net
+  program mount (bz#178304).
+
 * Fri Feb 3 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-15.1
 - Add patch to use LDAP_DEPRICATED compile option. (bz #173833)
 



From fedora-cvs-commits at redhat.com  Tue Apr 11 13:58:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 09:58:01 -0400
Subject: rpms/gdm/FC-5 gdm-2.14.1-change-defaults.patch, NONE, 1.1 gdm.spec,
	1.142, 1.143 sources, 1.26,
	1.27 gdm-2.13.0.9-change-defaults.patch, 1.1, NONE
Message-ID: <200604111358.k3BDw137030425@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gdm.spec sources 
Added Files:
	gdm-2.14.1-change-defaults.patch 
Removed Files:
	gdm-2.13.0.9-change-defaults.patch 
Log Message:
2.14.1


gdm-2.14.1-change-defaults.patch:
 gdm.conf.in |   51 +++++++++++++++++++++++++++++----------------------
 1 files changed, 29 insertions(+), 22 deletions(-)

--- NEW FILE gdm-2.14.1-change-defaults.patch ---
--- gdm-2.14.1/config/gdm.conf.in.change-defaults	2006-04-11 09:18:56.000000000 -0400
+++ gdm-2.14.1/config/gdm.conf.in	2006-04-11 09:26:11.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=@EXPANDED_LIBEXECDIR@/gdmgreeter
 
 # The greeter for xdmcp logins, usually you want a less graphically intensive
 # greeter here so it's better to leave this with gdmlogin
@@ -78,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.
@@ -286,7 +283,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.
@@ -307,7 +304,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
@@ -331,7 +328,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.
@@ -357,7 +354,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
@@ -404,8 +401,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
@@ -420,7 +418,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
@@ -440,7 +438,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
@@ -581,3 +579,12 @@
 # Run the chooser instead of the greeter.  When the user chooses a machine they
 # will get this same server but run with "-terminate -query hostname".
 chooser=true
+
+
+# Experimental build of Xorg with accelerated indirect rendering
+# support
+[server-aiglx]
+name=Accelerated Indirect Rendering server
+command=/usr/bin/Xair @X_CONFIG_OPTIONS@
+flexible=false
+


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/FC-5/gdm.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- gdm.spec	13 Mar 2006 23:11:59 -0000	1.142
+++ gdm.spec	11 Apr 2006 13:57:59 -0000	1.143
@@ -14,8 +14,8 @@
 
 Summary: The GNOME Display Manager.
 Name: gdm
-Version: 2.14.0
-Release: 1
+Version: 2.14.1
+Release: 1.fc5.1
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -25,7 +25,7 @@
 Source2: gdm-early-login.init
 Source3: zzz-bootup-complete.init
 
-Patch1: gdm-2.13.0.9-change-defaults.patch
+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
@@ -103,10 +103,10 @@
 ##%patch6 -p1 -b .wait-for-bootup
 %patch7 -p1 -b .clean-up-xsession-errors
 %patch8 -p1 -b .merge-resources
-#%patch9 -p1 -b .boot-throbber
+##%patch9 -p1 -b .boot-throbber
 %patch10 -p1 -b .dont-malloc-in-signal-handlers
-#%patch11 -p1 -b .xdmcp
-#%patch12 -p1 -b .process-all-messages
+##%patch11 -p1 -b .xdmcp
+##%patch12 -p1 -b .process-all-messages
 %patch13 -p1 -b .hide-throbber
 %patch15 -p1 -b .audit-login
 %patch16 -p1 -b .modularx
@@ -308,6 +308,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Tue Apr 11 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.14.1-1.fc5.1
+- Update to 2.14.1
+
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 1:2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gdm/FC-5/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	13 Mar 2006 23:11:59 -0000	1.26
+++ sources	11 Apr 2006 13:57:59 -0000	1.27
@@ -1 +1 @@
-1f82485c4e8cd8ca2f1523a91a624eff  gdm-2.14.0.tar.bz2
+5bafb764f36d7caf5d2217de0b6ceba5  gdm-2.14.1.tar.bz2


--- gdm-2.13.0.9-change-defaults.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 11 14:19:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 10:19:03 -0400
Subject: rpms/kdeaccessibility/FC-4 kdeaccessibility.spec, 1.7, 1.8 sources,
	1.6, 1.7
Message-ID: <200604111419.k3BEJ3Pf012317@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdeaccessibility.spec sources 
Log Message:
update to 3.5.2



Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/FC-4/kdeaccessibility.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kdeaccessibility.spec	1 Feb 2006 16:22:05 -0000	1.7
+++ kdeaccessibility.spec	11 Apr 2006 14:18:51 -0000	1.8
@@ -4,7 +4,7 @@
 
 %define qt_version 3.3.4
 
-Version: 3.5.1
+Version: 3.5.2
 Release: 0.1.fc4
 Epoch: 1
 Summary: K Desktop Environment - Accessibility
@@ -68,24 +68,24 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
-rm -rf $RPM_BUILD_ROOT%{_includedir}
+rm -rf %{buildroot}%{_includedir}
 
 # Make symlinks relative
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    if [ -d $i -a -L $i/common ]; then
-      rm -f $RPM_BUILD_ROOT%{_docdir}/HTML/en/$i/common
-      ln -sf ../common $RPM_BUILD_ROOT%{_docdir}/HTML/en/$i
+      rm -f %{buildroot}%{_docdir}/HTML/en/$i/common
+      ln -sf ../common %{buildroot}%{_docdir}/HTML/en/$i
    fi
 done
 popd
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Than Ngo <than at redhat.com> 1:3.5.2-0.1.fc4
+- update to 3.5.2
+
 * Wed Feb 01 2006 Than Ngo <than at redhat.com> 1:3.5.1-0.1.fc4
 - 3.5.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Feb 2006 16:22:05 -0000	1.6
+++ sources	11 Apr 2006 14:18:51 -0000	1.7
@@ -1 +1 @@
-cc0773103053a6800b3d35e6021b6719  kdeaccessibility-3.5.1.tar.bz2
+bcfd51875aa2a168fbc97055a576a33c  kdeaccessibility-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 14:26:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 10:26:46 -0400
Subject: rpms/kdeaddons/FC-4 kdeaddons.spec,1.39,1.40
Message-ID: <200604111426.k3BEQkdo012467@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdeaddons.spec 
Log Message:
update to 3.5.2



Index: kdeaddons.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/FC-4/kdeaddons.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- kdeaddons.spec	2 Feb 2006 11:38:21 -0000	1.39
+++ kdeaddons.spec	11 Apr 2006 14:26:44 -0000	1.40
@@ -4,12 +4,12 @@
 %define make_cvs 1
 
 %define qt_version 3.3.4
-%define arts_version 1.5.1
+%define arts_version 1.5.2
 %define arts 1
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.1
+Version: 3.5.2
 Release: 0.1.fc4
 Name: kdeaddons
 Summary: K Desktop Environment - Plugins
@@ -79,8 +79,8 @@
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 export KDEDIR=%{prefix}
-export CXXFLAGS="$RPM_OPT_FLAGS"
-export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="%{optflags}"
+export CFLAGS="%{optflags}"
 
 %configure \
    --enable-new-ldflags \
@@ -108,12 +108,12 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 # Make symlinks relative
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
 done
@@ -124,7 +124,7 @@
 %postun -p /sbin/ldconfig
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -165,6 +165,9 @@
 %endif
 
 %changelog
+* Tue Apr 11 2006 Than Ngo <than at redhat.com> 3.5.2-0.1.fc4
+- update to 3.5.2 
+
 * Thu Feb 02 2006 Than Ngo <than at redhat.com> 3.5.1-0.1.fc4
 - 3.5.1
 



From fedora-cvs-commits at redhat.com  Tue Apr 11 14:27:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 10:27:55 -0400
Subject: rpms/kdeaddons/FC-4 sources,1.28,1.29
Message-ID: <200604111427.k3BERth8012490@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	sources 
Log Message:
update to 3.5.2



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/FC-4/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	2 Feb 2006 11:38:21 -0000	1.28
+++ sources	11 Apr 2006 14:27:52 -0000	1.29
@@ -1 +1 @@
-cbd2a6f65ae7338736d93b72bfdf5ae3  kdeaddons-3.5.1.tar.bz2
+affb74174c6e3eda2c0748d6c052c8ff  kdeaddons-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 14:45:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 10:45:21 -0400
Subject: rpms/kdeartwork/FC-4 kdeartwork.spec,1.36,1.37 sources,1.26,1.27
Message-ID: <200604111445.k3BEjLZr012798@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdeartwork.spec sources 
Log Message:
3.5.2



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/FC-4/kdeartwork.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- kdeartwork.spec	2 Feb 2006 11:10:13 -0000	1.36
+++ kdeartwork.spec	11 Apr 2006 14:45:19 -0000	1.37
@@ -4,13 +4,13 @@
 %define make_cvs 1
 
 %define qt_version 3.3.4
-%define arts_version 1.5.1
+%define arts_version 1.5.2
 %define arts 1
 
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdeartwork
-Version: 3.5.1
+Version: 3.5.2
 Release: 0.1.fc4
 Summary: Additional artwork (themes, sound themes, ...) for KDE
 URL: http://www.kde.org/
@@ -60,8 +60,8 @@
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 export PATH=`pwd`:$PATH
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS -fno-use-cxa-atexit"
+export CFLAGS="%{optflags}"
+export CXXFLAGS="%{optflags}"
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
@@ -89,23 +89,23 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR="$RPM_BUILD_ROOT"
+make install DESTDIR=%{buildroot}
 
-mv $RPM_BUILD_ROOT%{_datadir}/icons/Locolor $RPM_BUILD_ROOT%{_datadir}/icons/locolor
+mv %{buildroot}%{_datadir}/icons/Locolor %{buildroot}%{_datadir}/icons/locolor
 
 #fix file conflict with other kde packages
-rm -f $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/kig.png \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/kspaceduel.png \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/lskat.png \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/ktux.png \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/ktimemon.png \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/kspreadcalc.png \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/gvim* \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/kbabel.png \
-      $RPM_BUILD_ROOT%{_datadir}/wallpapers/gear-flowers* \
-      $RPM_BUILD_ROOT%{_datadir}/wallpapers/fulmine.jpg*
+rm -f %{buildroot}%{_datadir}/icons/locolor/*/apps/kig.png \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/kspaceduel.png \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/lskat.png \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/ktux.png \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/ktimemon.png \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/kspreadcalc.png \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/gvim* \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/kbabel.png \
+      %{buildroot}%{_datadir}/wallpapers/gear-flowers* \
+      %{buildroot}%{_datadir}/wallpapers/fulmine.jpg*
 
 %post -p /sbin/ldconfig
 
@@ -128,7 +128,7 @@
 done
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -153,6 +153,9 @@
 %{_datadir}/icons/*
 
 %changelog
+* Tue Apr 11 2006 Than Ngo <than at redhat.com> 3.5.2-0.1.fc4
+- update to 3.5.2
+
 * Thu Feb 02 2006 Than Ngo <than at redhat.com> 3.5.1-0.1.fc4
 - 3.5.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/FC-4/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	2 Feb 2006 11:10:13 -0000	1.26
+++ sources	11 Apr 2006 14:45:19 -0000	1.27
@@ -1 +1 @@
-8053bb1a1b2a5844b29f5f96328b1d96  kdeartwork-3.5.1.tar.bz2
+211801e7ab7a5e113821625b931f338c  kdeartwork-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 14:52:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 10:52:44 -0400
Subject: rpms/kdebindings/FC-4 kdebindings.spec,1.37,1.38 sources,1.27,1.28
Message-ID: <200604111452.k3BEqZ9v026931@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdebindings.spec sources 
Log Message:
update to 3.5.2



Index: kdebindings.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/FC-4/kdebindings.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- kdebindings.spec	1 Feb 2006 23:29:46 -0000	1.37
+++ kdebindings.spec	11 Apr 2006 14:52:30 -0000	1.38
@@ -2,6 +2,8 @@
 %define final 0
 %define disable_gcc_check_and_hidden_visibility 1
 
+%define appdir %{_datadir}/applications/kde
+
 ## stil need fix to build java -> disable java at the moment
 ##define support_arch %{ix86} alpha ia64 ppc
 %define support_arch none
@@ -10,7 +12,7 @@
 
 %define mozilla_version 1.6.0
 %define qt_version 3.3.4
-%define arts_version 1.5.1
+%define arts_version 1.5.2
 %define pythonver 2.4
 %define perlver 5.8
 %define perlepoch 3
@@ -22,7 +24,7 @@
 %define ruby 1
 %define pyqt 0
 
-Version: 3.5.1
+Version: 3.5.2
 Release: 0.1.fc4
 Name: kdebindings
 Summary: KDE bindings to non-C++ languages
@@ -46,6 +48,7 @@
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: automake
+BuildRequires: /usr/bin/desktop-file-install
 
 %if %{perl}
 BuildRequires: perl >= %{perlver}
@@ -177,14 +180,8 @@
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
 
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
-
-# workaround for ia64, need to be fixed later
-%ifarch ia64
-export CFLAGS="$RPM_OPT_FLAGS -O0"
-export CXXFLAGS="$RPM_OPT_FLAGS -O0"
-%endif
+export CFLAGS="%{optflags}"
+export CXXFLAGS="%{optflags}"
 
 %ifarch %{support_arch}
 export CFLAGS="$CFLAGS `mozilla-config --cflags`"
@@ -229,20 +226,28 @@
 make #%{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
-if [ -d "$RPM_BUILD_ROOT%{_prefix}/doc" ]; then
-   mkdir -p $RPM_BUILD_ROOT%{_docdir}
-   mv -f $RPM_BUILD_ROOT%{_prefix}/doc/* $RPM_BUILD_ROOT%{_docdir}
-   rm -rf $RPM_BUILD_ROOT%{_prefix}/doc
+if [ -d "%{buildroot}%{_prefix}/doc" ]; then
+   mkdir -p %{buildroot}%{_docdir}
+   mv -f %{buildroot}%{_prefix}/doc/* %{buildroot}%{_docdir}
+   rm -rf %{buildroot}%{_prefix}/doc
 fi
 
-find $RPM_BUILD_ROOT -size 0 | xargs rm -f
+find %{buildroot} -size 0 | xargs rm -f
+
+desktop-file-install \
+   --vendor "" \
+   --dir %{buildroot}%{appdir} \
+   --delete-original \
+   --add-only-show-in KDE \
+   %{buildroot}%{appdir}/kjscmd.desktop \
+   %{buildroot}%{appdir}/embedjs.desktop
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -280,6 +285,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Tue Apr 11 2006 Than Ngo <than at redhat.com> 3.5.2-0.1.fc4
+- update to 3.5.2
+
 * Thu Feb 02 2006 Than Ngo <than at redhat.com> 3.5.1-0.1.fc4
 - 3.5.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/FC-4/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	1 Feb 2006 23:29:46 -0000	1.27
+++ sources	11 Apr 2006 14:52:31 -0000	1.28
@@ -1 +1 @@
-302f6a842b5a29701846c49a24a64039  kdebindings-3.5.1.tar.bz2
+cb26ce2e4efc35ca2c9c7a47807d679a  kdebindings-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 15:48:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 11:48:20 -0400
Subject: rpms/gnome-doc-utils/devel gnome-doc-utils.spec,1.20,1.21
Message-ID: <200604111548.k3BFmK0B023208@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-doc-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23177

Modified Files:
	gnome-doc-utils.spec 
Log Message:
Add a missing requires



Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gnome-doc-utils.spec	12 Mar 2006 19:52:51 -0000	1.20
+++ gnome-doc-utils.spec	11 Apr 2006 15:48:16 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Documentation utilities for the GNOME project
 Name: gnome-doc-utils
 Version: 0.6.0
-Release: 1
+Release: 2
 License: LGPL
 Group: Development/Tools
 URL: http://www.gnome.org/
@@ -12,6 +12,7 @@
 BuildPrereq: libxslt-devel >= 1.1.8
 Requires: libxml2 >= 2.6.12
 Requires: libxslt >= 1.1.8
+Requires: libxml2-python
 
 
 %description
@@ -53,6 +54,9 @@
 %{_datadir}/gnome-doc-utils
 
 %changelog
+* Tue Apr 11 2006 Matthias Clasen <mclasen at redhat.com> - 0.6.0-2
+- Add a missing Requires
+
 * Sun Mar 12 2006 Ray Strode <rstrode at redhat.com> - 0.6.0-1
 - Update to 0.6.0
 



From fedora-cvs-commits at redhat.com  Tue Apr 11 15:48:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 11:48:20 -0400
Subject: rpms/postfix/devel .cvsignore, 1.17, 1.18 postfix.spec, 1.38,
	1.39 sources, 1.17, 1.18
Message-ID: <200604111548.k3BFmKZI023212@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/postfix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23172

Modified Files:
	.cvsignore postfix.spec sources 
Log Message:
[tw]
- new version 2.2.10
- added option LDAP_DEPRECATED to support deprecated ldap functions for now
- fixed build without pflogsumm support (#188470)




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/postfix/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	24 Jan 2006 15:49:14 -0000	1.17
+++ .cvsignore	11 Apr 2006 15:48:16 -0000	1.18
@@ -1,2 +1,2 @@
 pflogsumm-1.1.0.tar.gz
-postfix-2.2.8.tar.gz
+postfix-2.2.10.tar.gz


Index: postfix.spec
===================================================================
RCS file: /cvs/dist/rpms/postfix/devel/postfix.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- postfix.spec	11 Feb 2006 05:13:38 -0000	1.38
+++ postfix.spec	11 Apr 2006 15:48:17 -0000	1.39
@@ -42,8 +42,8 @@
 
 Name: postfix
 Summary: Postfix Mail Transport Agent
-Version: 2.2.8
-Release: 1.2
+Version: 2.2.10
+Release: 1
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -62,8 +62,10 @@
 
 # Sources 50-99 are upstream [patch] contributions
 
+%if %{PFLOGSUMM}
 # Postfix Log Entry Summarizer: http://jimsun.linxnet.com/postfix_contrib.html
 Source53: http://jimsun.linxnet.com/downloads/pflogsumm-%{pflogsumm_ver}.tar.gz
+%endif
 
 # Sources >= 100 are config files
 
@@ -165,7 +167,7 @@
 %endif
 
 %if %{LDAP}
-  CCARGS="${CCARGS} -DHAS_LDAP"
+  CCARGS="${CCARGS} -DHAS_LDAP -DLDAP_DEPRECATED=1"
   AUXLIBS="${AUXLIBS} -L%{_libdir} -lldap -llber"
 %endif
 %if %{PCRE}
@@ -467,6 +469,11 @@
 
 
 %changelog
+* Tue Apr 11 2006 Thomas Woerner <twoerner at redhat.com> 2:2.2.10-1
+- new version 2.2.10
+- added option LDAP_DEPRECATED to support deprecated ldap functions for now
+- fixed build without pflogsumm support (#188470)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2:2.2.8-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/postfix/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	24 Jan 2006 15:49:14 -0000	1.17
+++ sources	11 Apr 2006 15:48:17 -0000	1.18
@@ -1,2 +1,2 @@
 1f78fcaf2a36ec3520ecff286a45251a  pflogsumm-1.1.0.tar.gz
-971bf94de3e8433c8965c27b42d56b9a  postfix-2.2.8.tar.gz
+440a4702182a79ac2f51e8974fb742c9  postfix-2.2.10.tar.gz



From fedora-cvs-commits at redhat.com  Tue Apr 11 16:11:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 12:11:26 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.121.rh127576.gnomeprintui.patch, 1.12, 1.13
Message-ID: <200604111611.k3BGBQI5023626@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.121.rh127576.gnomeprintui.patch 
Log Message:
rh#187939# rescan for printers

openoffice.org-1.9.121.rh127576.gnomeprintui.patch:
 configuration/ppds/SGENPRT.PS                |    0 
 configuration/psprint.conf                   |    0 
 inc/jobset.hxx                               |    0 
 inc/print.hxx                                |    0 
 psprint/source/printer/cupsmgr.cxx           |   13 
 psprint_config/configuration/ppds/SGENPRT.PS |    3 
 psprint_config/configuration/psprint.conf    |    2 
 source/dialogs/makefile.mk                   |    0 
 source/dialogs/printdlg.cxx                  |    0 
 source/gdi/jobset.cxx                        |    0 
 source/printer/cupsmgr.cxx                   |    0 
 svtools/source/dialogs/makefile.mk           |    4 
 svtools/source/dialogs/printdlg.cxx          |  525 ++++++++++++++++++++++++++-
 svtools/util/makefile.mk                     |    8 
 util/makefile.mk                             |    0 
 vcl/inc/jobset.hxx                           |    1 
 vcl/inc/print.hxx                            |    1 
 vcl/source/gdi/jobset.cxx                    |  194 +++++++++
 18 files changed, 746 insertions(+), 5 deletions(-)

Index: openoffice.org-1.9.121.rh127576.gnomeprintui.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.121.rh127576.gnomeprintui.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- openoffice.org-1.9.121.rh127576.gnomeprintui.patch	11 Apr 2006 12:34:53 -0000	1.12
+++ openoffice.org-1.9.121.rh127576.gnomeprintui.patch	11 Apr 2006 16:11:19 -0000	1.13
@@ -42,7 +42,7 @@
  
      if( bChanged )
 +    {
-+		runDests();
++		if (!m_aDestThread) m_aDestThread = osl_createThread( runDestThread, this );
          initialize();
 +    }
  



From fedora-cvs-commits at redhat.com  Tue Apr 11 16:50:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 12:50:33 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.121.rh127576.gnomeprintui.patch, 1.13, 1.14
Message-ID: <200604111650.k3BGoX6x019449@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.121.rh127576.gnomeprintui.patch 
Log Message:
that's just not going to fly, make it safe

openoffice.org-1.9.121.rh127576.gnomeprintui.patch:
 configuration/ppds/SGENPRT.PS                |    0 
 configuration/psprint.conf                   |    0 
 inc/jobset.hxx                               |    0 
 inc/print.hxx                                |    0 
 psprint/source/printer/cupsmgr.cxx           |   19 
 psprint/source/printer/makefile.mk           |    2 
 psprint/util/makefile.mk                     |    4 
 psprint_config/configuration/ppds/SGENPRT.PS |    3 
 psprint_config/configuration/psprint.conf    |    2 
 source/dialogs/makefile.mk                   |    0 
 source/dialogs/printdlg.cxx                  |    0 
 source/gdi/jobset.cxx                        |    0 
 source/printer/cupsmgr.cxx                   |    0 
 svtools/source/dialogs/makefile.mk           |    4 
 svtools/source/dialogs/printdlg.cxx          |  525 ++++++++++++++++++++++++++-
 svtools/util/makefile.mk                     |    8 
 util/makefile.mk                             |    0 
 vcl/inc/jobset.hxx                           |    1 
 vcl/inc/print.hxx                            |    1 
 vcl/source/gdi/jobset.cxx                    |  194 +++++++++
 20 files changed, 758 insertions(+), 5 deletions(-)

Index: openoffice.org-1.9.121.rh127576.gnomeprintui.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.121.rh127576.gnomeprintui.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- openoffice.org-1.9.121.rh127576.gnomeprintui.patch	11 Apr 2006 16:11:19 -0000	1.13
+++ openoffice.org-1.9.121.rh127576.gnomeprintui.patch	11 Apr 2006 16:50:29 -0000	1.14
@@ -5,16 +5,32 @@
 diff -u -p -u -r1.12 cupsmgr.cxx
 --- openoffice.org.orig/psprint/source/printer/cupsmgr.cxx	6 Jun 2005 16:07:42 -0000	1.12
 +++ openoffice.org/psprint/source/printer/cupsmgr.cxx	25 Jul 2005 15:02:37 -0000
-@@ -406,6 +406,9 @@
+@@ -52,6 +52,16 @@
  
- void CUPSManager::runDests()
- {
-+	if( m_nDests && m_pDests )
-+		m_pCUPSWrapper->cupsFreeDests( m_nDests, (cups_dest_t*)m_pDests );
+ #include <algorithm>
+ 
++#define WE_ARE_LIBGNOMEPRINT_INTERNALS
++#include <libgnomeprint/private/gpa-utils.h>
++#include <libgnomeprint/gnome-print-config.h>
++#include <libgnomeprint/gnome-print.h>
++#include <libgnomeprint/private/gpa-printer.h>
++#include <libgnomeprint/private/gpa-key.h>
++#include <libgnomeprint/private/gpa-node.h>
++#include <libgnomeprint/private/gpa-state.h>
++#include <libgnomeprint/private/gpa-root.h>
 +
+ namespace psp
+ {
+ class CUPSWrapper
+@@ -409,6 +419,8 @@
  #if OSL_DEBUG_LEVEL > 1
      fprintf( stderr, "starting cupsGetDests\n" );
  #endif
++    if (!gpa_initialized())
++    	gpa_init();
+     int nDests = 0;
+     cups_dest_t* pDests = NULL;
+     nDests = m_pCUPSWrapper->cupsGetDests( &pDests );
 @@ -475,9 +487,10 @@ void CUPSManager::initialize()
  
      // clear old stuff
@@ -38,16 +54,6 @@
  }
  
  #ifdef ENABLE_CUPS
-@@ -867,6 +870,9 @@
- 
-     if( bChanged )
-+    {
-+		if (!m_aDestThread) m_aDestThread = osl_createThread( runDestThread, this );
-         initialize();
-+    }
- 
-     return bChanged;
- }
 Index: inc/print.hxx
 ===================================================================
 RCS file: /cvs/gsl/vcl/inc/print.hxx,v
@@ -554,6 +560,7 @@
  
 +#if 1
 +	static GPAList *pKnownPrinters;
++	gulong id = 0;
 +	if (!pKnownPrinters)
 +	{
 +		if (!gpa_initialized())
@@ -746,8 +753,6 @@
 +				OUString sOldPrinterName(pPrinter->GetName());
 +				if (sNewPrinterName != sOldPrinterName)
 +				{
-+					psp::PrinterInfoManager& rMgr = psp::PrinterInfoManager::get();
-+					rMgr.checkPrintersChanged();
 +					USHORT nCount = Printer::GetQueueCount();
 +					USHORT i = 0;
 +					for (i = 0; i < nCount; ++i)
@@ -817,6 +822,7 @@
 +	}
 +
 +	gtk_widget_destroy( pDialog );
++	if (id) g_signal_handler_disconnect (GPA_NODE(pKnownPrinters), id);
 +	g_object_unref (pConfig);
 +	g_object_unref (pJob);
 +
@@ -947,3 +953,23 @@
  
  *% --- For None Color or old PostScript(R) printers use following lines ---
  *% *ColorDevice: False
+--- openoffice.org.orig/psprint/util/makefile.mk	2006-04-10 16:10:36.000000000 +0100
++++ openoffice.org/psprint/util/makefile.mk	2006-04-11 17:31:45.000000000 +0100
+@@ -89,5 +89,9 @@
+ 
+ # --- Targets ------------------------------------------------------------
+ 
++PKGCONFIG_MODULES=libgnomeprint-2.2
++.INCLUDE: pkg_config.mk
++
++SHL1STDLIBS+=$(PKGCONFIG_LIBS)
+ 
+ .INCLUDE :	target.mk
+--- openoffice.org.orig/psprint/source/printer/makefile.mk	2006-04-10 16:10:35.000000000 +0100
++++ openoffice.org/psprint/source/printer/makefile.mk	2006-04-11 17:30:25.000000000 +0100
+@@ -75,3 +75,5 @@
+ 
+ $(SLO)$/cupsmgr.obj : $(INCCOM)$/rtsname.hxx
+ 
++PKGCONFIG_MODULES=libgnomeprint-2.2
++.INCLUDE: pkg_config.mk



From fedora-cvs-commits at redhat.com  Tue Apr 11 16:52:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 12:52:01 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.659,1.660
Message-ID: <200604111652.k3BGq1Xq019498@cvs.devel.redhat.com>

Author: caolanm

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

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


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.659
retrieving revision 1.660
diff -u -r1.659 -r1.660
--- openoffice.org.spec	11 Apr 2006 12:34:53 -0000	1.659
+++ openoffice.org.spec	11 Apr 2006 16:51:59 -0000	1.660
@@ -1,6 +1,6 @@
 %define oootag OOB680
 %define ooomilestone 5
-%define rh_rpm_release 8.cmc
+%define rh_rpm_release 8.cmc2
 
 %define build_fc6 1
 %define build_rhel4 0



From fedora-cvs-commits at redhat.com  Tue Apr 11 17:06:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 13:06:59 -0400
Subject: rpms/cups/devel pdftops.conf,NONE,1.1 cups.spec,1.163,1.164
Message-ID: <200604111706.k3BH6xaI019684@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	pdftops.conf 
Log Message:
* Tue Apr 11 2006 Tim Waugh <twaugh at redhat.com>
- Ship a /etc/cups/pdftops.conf file (bug #188583).



--- NEW FILE pdftops.conf ---
include /usr/share/xpdf/japanese/add-to-xpdfrc
include /usr/share/xpdf/korean/add-to-xpdfrc
include /usr/share/xpdf/chinese-simplified/add-to-xpdfrc
include /usr/share/xpdf/chinese-traditional/add-to-xpdfrc


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- cups.spec	7 Apr 2006 22:22:09 -0000	1.163
+++ cups.spec	11 Apr 2006 17:06:44 -0000	1.164
@@ -21,6 +21,7 @@
 Source10: ncp.backend
 Source11: cups.conf
 Source12: cups.cron
+Source13: pdftops.conf
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
@@ -57,7 +58,7 @@
 Provides: lpd lpr LPRng = 3.8.15-3
 
 BuildPrereq: pam-devel pkgconfig
-BuildPrereq: gnutls-devel acl-devel
+BuildPrereq: gnutls-devel libacl-devel
 BuildRequires: openldap-devel
 BuildRequires: make >= 1:3.80
 BuildRequires: php-devel, aspell-devel, pcre-devel
@@ -183,6 +184,7 @@
 install -c -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cups
 install -c -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{cups_serverbin}/backend/ncp
 install -c -m 755 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/cups
+install -c -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/cups/pdftops.conf
 ln -s ../doc/%{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
 # Deal with users trying to access the admin tool at
 # /usr/share/doc/cups-%{version}/index.html rather than the
@@ -295,6 +297,7 @@
 %attr(0640,root,nobody) /etc/cups/cupsd.conf.default
 %config(noreplace) %attr(0644,root,nobody) /etc/cups/client.conf
 %config(noreplace) %attr(0600,root,nobody) /etc/cups/printers.conf
+%config(noreplace) %attr(0644,root,nobody) /etc/cups/pdftops.conf
 /etc/cups/interfaces
 %config(noreplace) /etc/cups/mime.types
 %config(noreplace) /etc/cups/mime.convs
@@ -371,6 +374,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Apr 11 2006 Tim Waugh <twaugh at redhat.com>
+- Ship a /etc/cups/pdftops.conf file (bug #188583).
+
 * Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com>
 - Build requires libacl-devel.
 



From fedora-cvs-commits at redhat.com  Tue Apr 11 17:09:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 13:09:22 -0400
Subject: rpms/cups/FC-5 pdftops.conf,NONE,1.1 cups.spec,1.154,1.155
Message-ID: <200604111709.k3BH9MV4019748@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	pdftops.conf 
Log Message:
* Tue Apr 11 2006 Tim Waugh <twaugh at redhat.com>
- Ship a /etc/cups/pdftops.conf file (bug #188583).



--- NEW FILE pdftops.conf ---
include /usr/share/xpdf/japanese/add-to-xpdfrc
include /usr/share/xpdf/korean/add-to-xpdfrc
include /usr/share/xpdf/chinese-simplified/add-to-xpdfrc
include /usr/share/xpdf/chinese-traditional/add-to-xpdfrc


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- cups.spec	8 Apr 2006 18:57:27 -0000	1.154
+++ cups.spec	11 Apr 2006 17:09:20 -0000	1.155
@@ -21,6 +21,7 @@
 Source10: ncp.backend
 Source11: cups.conf
 Source12: cups.cron
+Source13: pdftops.conf
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
@@ -188,6 +189,7 @@
 install -c -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cups
 install -c -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{cups_serverbin}/backend/ncp
 install -c -m 755 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/cups
+install -c -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/cups/pdftops.conf
 ln -s ../doc/%{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
 # Deal with users trying to access the admin tool at
 # /usr/share/doc/cups-%{version}/index.html rather than the
@@ -300,6 +302,7 @@
 %attr(0640,root,nobody) /etc/cups/cupsd.conf.default
 %config(noreplace) %attr(0644,root,nobody) /etc/cups/client.conf
 %config(noreplace) %attr(0600,root,nobody) /etc/cups/printers.conf
+%config(noreplace) %attr(0644,root,nobody) /etc/cups/pdftops.conf
 /etc/cups/interfaces
 %config(noreplace) /etc/cups/mime.types
 %config(noreplace) /etc/cups/mime.convs
@@ -376,6 +379,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Apr 11 2006 Tim Waugh <twaugh at redhat.com>
+- Ship a /etc/cups/pdftops.conf file (bug #188583).
+
 * Sat Apr  8 2006 Tim Waugh <twaugh at redhat.com>
 - Conflict with system-config-printer that adds 'fitplot' option.
 



From fedora-cvs-commits at redhat.com  Tue Apr 11 18:25:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 14:25:50 -0400
Subject: rpms/libselinux/devel .cvsignore, 1.102, 1.103 libselinux-rhat.patch,
	1.75, 1.76 libselinux.spec, 1.183, 1.184 sources, 1.104, 1.105
Message-ID: <200604111825.k3BIPoCv029830@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore libselinux-rhat.patch libselinux.spec sources 
Log Message:
* Mon Mar 27 2006 Dan Walsh <dwalsh at redhat.com> 1.30.1-1
	* Merged Makefile PYLIBVER definition patch from Dan Walsh.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- .cvsignore	17 Mar 2006 17:20:57 -0000	1.102
+++ .cvsignore	11 Apr 2006 18:25:46 -0000	1.103
@@ -77,3 +77,4 @@
 libselinux-1.29.7.tgz
 libselinux-1.29.8.tgz
 libselinux-1.30.tgz
+libselinux-1.30.1.tgz

libselinux-rhat.patch:
 selinuxswig.i |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- libselinux-rhat.patch	17 Mar 2006 17:20:57 -0000	1.75
+++ libselinux-rhat.patch	11 Apr 2006 18:25:46 -0000	1.76
@@ -1,11 +1,22 @@
---- libselinux-1.29.7/src/Makefile~	2006-01-20 10:37:52.000000000 -0500
-+++ libselinux-1.29.7/src/Makefile	2006-03-16 17:22:52.000000000 -0500
-@@ -3,7 +3,7 @@
- LIBDIR ?= $(PREFIX)/lib
- SHLIBDIR ?= $(DESTDIR)/lib
- INCLUDEDIR ?= $(PREFIX)/include
--PYLIBVER ?= python2.4
-+PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]')
- PYINC ?= /usr/include/$(PYLIBVER)
- PYLIB ?= /usr/lib/$(PYLIBVER)
- PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER)
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-1.30.1/src/selinuxswig.i
+--- nsalibselinux/src/selinuxswig.i	2006-01-04 10:37:35.000000000 -0500
++++ libselinux-1.30.1/src/selinuxswig.i	2006-04-11 14:23:41.000000000 -0400
+@@ -29,8 +29,9 @@
+ 	$1 = &temp;
+ }
+ %typemap(argout) security_context_t * {
+-	$result = t_output_helper($result, PyString_FromString(*$1));
++	$result = SWIG_Python_AppendOutput($result, PyString_FromString(*$1));
+ }
++%typedef unsigned mode_t;
+ 
+ extern int is_selinux_enabled(void);
+ extern int is_selinux_mls_enabled(void);
+@@ -114,6 +115,6 @@
+ }
+ 
+ %typemap(argout) char ** {
+-	$result = t_output_helper($result, PyString_FromString(*$1));
++	$result = SWIG_Python_AppendOutput($result, PyString_FromString(*$1));
+ }
+ extern int getseuserbyname(const char *linuxuser, char **seuser, char **level);


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- libselinux.spec	17 Mar 2006 18:33:18 -0000	1.183
+++ libselinux.spec	11 Apr 2006 18:25:46 -0000	1.184
@@ -2,7 +2,7 @@
 %define libsetransver 0.1.20-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 1.30
+Version: 1.30.1
 Release: 1
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
@@ -111,6 +111,9 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Mon Mar 27 2006 Dan Walsh <dwalsh at redhat.com> 1.30.1-1
+	* Merged Makefile PYLIBVER definition patch from Dan Walsh.
+
 * Fri Mar 10 2006 Dan Walsh <dwalsh at redhat.com> 1.30-1
 - Make some fixes so it will build on RHEL4
 - Upgrade to latest from NSA


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/sources,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- sources	17 Mar 2006 17:20:57 -0000	1.104
+++ sources	11 Apr 2006 18:25:46 -0000	1.105
@@ -1 +1 @@
-b0834c79eac17c87c690542b0874cc53  libselinux-1.30.tgz
+16536badc245a1dd8d01539f63ced6c2  libselinux-1.30.1.tgz



From fedora-cvs-commits at redhat.com  Tue Apr 11 19:03:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 15:03:50 -0400
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.76,
	1.77 libselinux.spec, 1.184, 1.185
Message-ID: <200604111903.k3BJ3oP5011834@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Mon Mar 27 2006 Dan Walsh <dwalsh at redhat.com> 1.30.1-2
- Fix python bindings for matchpathcon
- Fix booleans man page


libselinux-rhat.patch:
 man/man8/booleans.8 |   18 ++++++------------
 src/selinuxswig.i   |    5 +++--
 2 files changed, 9 insertions(+), 14 deletions(-)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- libselinux-rhat.patch	11 Apr 2006 18:25:46 -0000	1.76
+++ libselinux-rhat.patch	11 Apr 2006 19:02:54 -0000	1.77
@@ -1,6 +1,48 @@
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/booleans.8 libselinux-1.30.1/man/man8/booleans.8
+--- nsalibselinux/man/man8/booleans.8	2004-11-02 11:44:38.000000000 -0500
++++ libselinux-1.30.1/man/man8/booleans.8	2006-04-11 15:01:19.000000000 -0400
+@@ -17,17 +17,10 @@
+ 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.  The
+ .B system-config-securitylevel
+ tool provides an interface for altering
+-the settings in this file.  The
++the settings of booleans.  The
+ .B load_policy(8)
+ program will preserve
+ current boolean settings upon a policy reload by default, or can
+@@ -41,8 +34,11 @@
+ .B setsebool(8)
+ utility or the
+ .B togglesebool
+-utility.  These utilities only change the
++utility.  These utilities change the
+ current boolean value and do not affect the boot-time settings.
++You can use 
++.B setsebool -P 
++to permanantly change the setting of a boolean.
+ 
+ .SH AUTHOR	
+ This manual page was written by Dan Walsh <dwalsh at redhat.com>.
+@@ -51,5 +47,3 @@
+ .SH "SEE ALSO"
+ getsebool(8), setsebool(8), selinux(8), togglesebool(8)
+ 
+-.SH FILES
+-/etc/selinux/SELINUXTYPE/booleans, /etc/selinux/config
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-1.30.1/src/selinuxswig.i
 --- nsalibselinux/src/selinuxswig.i	2006-01-04 10:37:35.000000000 -0500
-+++ libselinux-1.30.1/src/selinuxswig.i	2006-04-11 14:23:41.000000000 -0400
++++ libselinux-1.30.1/src/selinuxswig.i	2006-04-11 14:55:35.000000000 -0400
 @@ -29,8 +29,9 @@
  	$1 = &temp;
  }


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- libselinux.spec	11 Apr 2006 18:25:46 -0000	1.184
+++ libselinux.spec	11 Apr 2006 19:03:13 -0000	1.185
@@ -3,7 +3,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 1.30.1
-Release: 1
+Release: 2
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -111,6 +111,10 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Mon Mar 27 2006 Dan Walsh <dwalsh at redhat.com> 1.30.1-2
+- Fix python bindings for matchpathcon
+- Fix booleans man page
+
 * Mon Mar 27 2006 Dan Walsh <dwalsh at redhat.com> 1.30.1-1
 	* Merged Makefile PYLIBVER definition patch from Dan Walsh.
 



From fedora-cvs-commits at redhat.com  Tue Apr 11 19:39:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 15:39:46 -0400
Subject: rpms/tog-pegasus/devel pegasus-2.5.1-AutoPtr-Core.patch,NONE,1.1
Message-ID: <200604111939.k3BJdkYw026352@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26333

Added Files:
	pegasus-2.5.1-AutoPtr-Core.patch 
Log Message:
fix cimprovagt core dump on free(0)

pegasus-2.5.1-AutoPtr-Core.patch:
 AutoPtr.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE pegasus-2.5.1-AutoPtr-Core.patch ---
--- pegasus/src/Pegasus/Common/AutoPtr.h.AutoPtr-Core	2006-01-30 11:16:46.000000000 -0500
+++ pegasus/src/Pegasus/Common/AutoPtr.h	2006-04-11 15:01:43.000000000 -0400
@@ -200,7 +200,8 @@
     {
         if (p != _ptr)
         {
-            delete _ptr;
+	    if ( _ptr != 0 )
+		delete _ptr;
             _ptr = p;
         }
     }



From fedora-cvs-commits at redhat.com  Tue Apr 11 19:40:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 15:40:59 -0400
Subject: rpms/tog-pegasus/devel pegasus-2.5.1-initscript.patch,1.1,1.2
Message-ID: <200604111940.k3BJexkQ026493@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26476

Modified Files:
	pegasus-2.5.1-initscript.patch 
Log Message:
add support for /etc/sysconfig/tog-pegasus

pegasus-2.5.1-initscript.patch:
 tog-pegasus.rc |  124 ++++++++++++++++++++++++++++++---------------------------
 1 files changed, 67 insertions(+), 57 deletions(-)

Index: pegasus-2.5.1-initscript.patch
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/pegasus-2.5.1-initscript.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pegasus-2.5.1-initscript.patch	7 Apr 2006 02:40:20 -0000	1.1
+++ pegasus-2.5.1-initscript.patch	11 Apr 2006 19:40:55 -0000	1.2
@@ -1,5 +1,5 @@
 --- pegasus/rpm/tog-pegasus.rc.initscript	2006-01-30 11:16:24.000000000 -0500
-+++ pegasus/rpm/tog-pegasus.rc	2006-04-06 14:38:57.000000000 -0400
++++ pegasus/rpm/tog-pegasus.rc	2006-04-11 13:57:31.000000000 -0400
 @@ -1,80 +1,85 @@
 -#//%2006////////////////////////////////////////////////////////////////////////
 -#//
@@ -92,7 +92,8 @@
 +	   fi;
 +	fi;
  	echo -n $"Starting up CIM server: "
- 	$CIMSERVER_BIN
+-	$CIMSERVER_BIN
++	$CIMSERVER_BIN ${CIMSERVER_OPTIONS}
  	RETVAL=$?
 -	[ "$RETVAL" -eq 0 ] && log_success_msg $"$prog start" || log_failure_msg $"$prog start"
 -	echo



From fedora-cvs-commits at redhat.com  Tue Apr 11 19:45:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 15:45:03 -0400
Subject: rpms/tog-pegasus/devel pegasus-2.5.1-redhat-config.patch,1.2,1.3
Message-ID: <200604111945.k3BJj3ZH026575@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26551

Modified Files:
	pegasus-2.5.1-redhat-config.patch 
Log Message:
disable PEGASUS_DEFAULT_ENABLE_OOP

pegasus-2.5.1-redhat-config.patch:
 Makefile.Release     |    6 +++---
 env_var_Linux.status |   15 ++++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

Index: pegasus-2.5.1-redhat-config.patch
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/pegasus-2.5.1-redhat-config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pegasus-2.5.1-redhat-config.patch	11 Apr 2006 02:31:28 -0000	1.2
+++ pegasus-2.5.1-redhat-config.patch	11 Apr 2006 19:45:01 -0000	1.3
@@ -1,23 +1,26 @@
 --- pegasus/env_var_Linux.status.redhat-config	2006-03-15 20:33:51.000000000 -0500
-+++ pegasus/env_var_Linux.status	2006-04-10 14:29:52.000000000 -0400
-@@ -18,7 +18,7 @@
++++ pegasus/env_var_Linux.status	2006-04-11 15:42:44.000000000 -0400
+@@ -18,7 +18,9 @@
  PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
  endif
  
 -PEGASUS_DISABLE_CQL=true
 +PEGASUS_ENABLE_CQL=true
++PEGASUS_DEFAULT_ENABLE_OOP = false
++
  PEGASUS_DISABLE_OBJECT_NORMALIZATION=true
  PEGASUS_DISABLE_PERFINST=yes
  PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true
-@@ -26,7 +26,6 @@
+@@ -26,7 +28,7 @@
  PEGASUS_HAS_SSL=yes
  PEGASUS_NOASSERTS=yes
  PEGASUS_PAM_AUTHENTICATION=true
 -PEGASUS_USE_PAM_STANDALONE_PROC=true
++PEGASUS_USE_PAM_STANDALONE_PROC=false
  PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true
  PEGASUS_USE_RELEASE_DIRS=true
  PEGASUS_USE_SYSLOGS=true
-@@ -64,22 +63,21 @@
+@@ -64,22 +66,21 @@
  PEGASUS_LOCAL_AUTH_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/localauth
  PEGASUS_TRACE_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/trace
  PEGASUS_TRACE_FILE_PATH = $(PEGASUS_VARDATA_CACHE_DIR)/trace/cimserver.trc
@@ -45,7 +48,7 @@
       $(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)/cimxml.socket
  
 --- pegasus/Makefile.Release.redhat-config	2006-01-30 11:16:16.000000000 -0500
-+++ pegasus/Makefile.Release	2006-04-08 18:28:43.000000000 -0400
++++ pegasus/Makefile.Release	2006-04-11 15:07:25.000000000 -0400
 @@ -590,10 +590,10 @@
  	$(foreach i, $(MANAGEDSYSTEM_MOF_FILES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus/$(i);)
  



From fedora-cvs-commits at redhat.com  Tue Apr 11 19:46:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 15:46:19 -0400
Subject: rpms/tog-pegasus/devel RedHat.OpenPegasus.Makefile, 1.1,
	1.2 tog-pegasus.spec, 1.27, 1.28
Message-ID: <200604111946.k3BJkJ3N000864@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv366

Modified Files:
	RedHat.OpenPegasus.Makefile tog-pegasus.spec 
Log Message:
v 2.5.1


Index: RedHat.OpenPegasus.Makefile
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/RedHat.OpenPegasus.Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RedHat.OpenPegasus.Makefile	11 Apr 2006 02:29:32 -0000	1.1
+++ RedHat.OpenPegasus.Makefile	11 Apr 2006 19:46:17 -0000	1.2
@@ -67,8 +67,8 @@
 export LD_LIBRARY_PATH ?= $(PEGASUS_HOME)/lib
 B = $(PEGASUS_HOME)
 R = $(PEGASUS_ROOT)
-SBINS=$(B)/bin/cimserver $(B)/bin/cimprovagt
-UBINS=$(B)/bin/cimmof $(B)/bin/cimmofl $(B)/bin/cimprovider $(B)/bin/osinfo $(B)/bin/wbemexec $(B)/bin/cimauth $(B)/bin/cimconfig $(B)/bin/cimuser $(B)/bin/repupgrade
+SBINS=$(B)/bin/cimserver $(B)/bin/cimprovagt  $(B)/bin/cimauth $(B)/bin/cimconfig $(B)/bin/cimuser $(B)/bin/repupgrade
+UBINS=$(B)/bin/cimmof $(B)/bin/cimmofl $(B)/bin/cimprovider $(B)/bin/osinfo $(B)/bin/wbemexec
 BINARIES=$(SBINS) $(UBINS)
 PROVIDERS=$(B)/lib/Pegasus/providers/libComputerSystemProvider.so.1 $(B)/lib/Pegasus/providers/libOSProvider.so.1 $(B)/lib/Pegasus/providers/libProcessProvider.so.1
 LIBRARIES=$(B)/lib/libCIMQueryCapabilitiesProvider.so.1 $(B)/lib/libCIMxmlIndicationHandler.so.1 $(B)/lib/libCMPIProviderManager.so.1 $(B)/lib/libCertificateProvider.so.1 $(B)/lib/libConfigSettingProvider.so.1 $(B)/lib/libDefaultProviderManager.so.1 $(B)/lib/libNamespaceProvider.so.1 $(B)/lib/libProviderRegistrationProvider.so.1 $(B)/lib/libUserAuthProvider.so.1 $(B)/lib/libcmpiCppImpl.so.1 $(B)/lib/libpegauthentication.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegcompiler.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/libpegexportclient.so.1 $(B)/lib/libpegexportserver.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpeghandlerservice.so.1 $(B)/lib/libpegindicationservice.so.1 $(B)/lib/libpeglistener.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/lib!
 pegserver.so.1 $(B)/lib/libpegservice.so.1 $(B)/lib/libpeguser.so.1 $(B)/lib/libpegwql.so.1
@@ -261,10 +261,16 @@
 ROOTDIRS = $(D)/$(etc)/Pegasus \
 	   $(D)/$(var)/run/tog-pegasus $(D)/$(var)/run/tog-pegasus/socket \
 	   $(D)/$(var)/lib/Pegasus $(D)/$(var)/lib/Pegasus/repository \
+	   $(D)/$(var)/lib/Pegasus/repository/root/classes \
+	   $(D)/$(var)/lib/Pegasus/repository/root/instances \
+	   $(D)/$(var)/lib/Pegasus/repository/root/qualifiers \
 	   $(D)/$(var)/lib/Pegasus/cache \
 	   $(D)/$(var)/lib/Pegasus/cache/localauth \
+	   $(D)/$(var)/lib/Pegasus/cache/trace \
 	   $(D)/$(var)/lib/Pegasus/log \
-	   $(D)/$(lib)/Pegasus $(D)/$(lib)/Pegasus/providers \
+	   $(D)/$(lib)/Pegasus \
+	   $(D)/$(lib)/Pegasus/providers \
+	   $(D)/$(lib)/cmpi \
 	   $(D)/$(share)/Pegasus/scripts
 PEGDIRS =  $(D)/$(share)/Pegasus \
 	   $(D)/$(share)/Pegasus/mof/CIM29 \
@@ -372,7 +378,7 @@
 	touch SDK
 
 ghost_files:
-	touch $(D){/etc/Pegasus/{cimserver_current.conf,cimserver_planned.conf,cimserver_trust,indication_trust,crl,ssl.cnf,client.pem,server.pem,file.pem,},/var/{run/tog-pegasus/{cimxml.socket,cimserver.pid,cimserver_start.lock},lib/Pegasus/log/install.log}}
+	touch $(D){/etc/Pegasus/{cimserver_current.conf,cimserver_planned.conf,cimserver_trust,indication_trust,crl,ssl.cnf,client.pem,server.pem,file.pem,},/var/{run/tog-pegasus/{cimxml.socket,cimserver.pid,cimserver_start.lock},lib/Pegasus/{log/install.log,cache/trace/cimserver.trc}}}
 
 repository:
 	PATH=$(B)/bin:$$PATH LD_LIBRARY_PATH=$(B)/lib $(MAKE) -C Schemas/Pegasus repository REPOSITORY_DIR=$(D)/$(var)/lib/Pegasus


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- tog-pegasus.spec	11 Apr 2006 02:31:28 -0000	1.27
+++ tog-pegasus.spec	11 Apr 2006 19:46:17 -0000	1.28
@@ -60,6 +60,7 @@
 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
 #
 Conflicts: 		openwbem
 Provides: 		tog-pegasus-cimserver
@@ -126,6 +127,7 @@
 %patch9 -p1 -b .parallel-make
 %patch10 -p1 -b .fix-zseries-flags
 %patch11 -p1 -b .fix-tests
+%patch12 -p1 -b .AutoPtr-Core
 
 %build
 rm -rf ${RPM_BUILD_ROOT} || :;
@@ -174,6 +176,7 @@
 /var/lib/Pegasus/cache
 %dir /var/lib/Pegasus/log
 %ghost /var/lib/Pegasus/log/install.log
+%ghost /var/lib/Pegasus/cache/trace/cimserver.trc
 %dir   %attr(1750,root,pegasus) /var/run/tog-pegasus
 %ghost /var/run/tog-pegasus/cimserver.pid
 %ghost /var/run/tog-pegasus/cimserver_start.lock



From fedora-cvs-commits at redhat.com  Tue Apr 11 19:49:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 15:49:25 -0400
Subject: rpms/tog-pegasus/devel genOpenPegasusSSLCerts,NONE,1.1
Message-ID: <200604111949.k3BJnPDq008192@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8175

Added Files:
	genOpenPegasusSSLCerts 
Log Message:
v2.5.1 genSSLCerts


--- NEW FILE genOpenPegasusSSLCerts ---
#!/bin/bash
#
PEGASUS_PEM_DIR=/etc/Pegasus
PEGASUS_CONFIG_DIR=/etc/Pegasus
PEGASUS_INSTALL_LOG=/var/lib/Pegasus/log/install.log
PEGASUS_SSL_CERT_FILE=server.pem
PEGASUS_SSL_KEY_FILE=file.pem
PEGASUS_SSL_TRUSTSTORE=client.pem
#
#  Set up OpenSSL certificates for the tog-pegasus cimserver
#
#  Creates a default ssl.cnf file.
#  Generates a self-signed certificate for use by the cimserver.
#
cnfChanged=0;
if [ ! -e $PEGASUS_CONFIG_DIR/ssl.cnf ]; then
    mkdir -p ${PEGASUS_INSTALL_LOG%/*}
    mkdir -p $PEGASUS_CONFIG_DIR
    echo "[ req ]" > $PEGASUS_CONFIG_DIR/ssl.cnf
    echo "distinguished_name     = req_distinguished_name"  >> \
            $PEGASUS_CONFIG_DIR/ssl.cnf
    echo "prompt                 = no"  >> $PEGASUS_CONFIG_DIR/ssl.cnf
    echo "[ req_distinguished_name ]" >> $PEGASUS_CONFIG_DIR/ssl.cnf
    echo "C                      = UK" >> $PEGASUS_CONFIG_DIR/ssl.cnf
    echo "ST                     = Berkshire" >> $PEGASUS_CONFIG_DIR/ssl.cnf
    echo "L                      = Reading" >> $PEGASUS_CONFIG_DIR/ssl.cnf
    echo "O                      = The Open Group" >> \
            $PEGASUS_CONFIG_DIR/ssl.cnf
    echo "OU                     = The OpenPegasus Project" >> \
            $PEGASUS_CONFIG_DIR/ssl.cnf
    DN=`hostname`;
    if [ -z "$DN" ] || [ "$DN" = "(none)" ]; then
            DN='localhost.localdomain';
    fi;
    FQDN=`{ host -W1 $DN 2>/dev/null || echo "$DN has address "; } |\
            grep 'has address' | head -1 | sed 's/\ .*$//'`;
    if [ -z "$FQDN" ] ; then
        FQDN="$DN";
    fi;
    # cannot use 'hostname --fqdn' because this can hang indefinitely
    echo "CN                     = $FQDN"  >> $PEGASUS_CONFIG_DIR/ssl.cnf
    chmod 400 $PEGASUS_CONFIG_DIR/ssl.cnf
    chown root $PEGASUS_CONFIG_DIR/ssl.cnf
    chgrp root $PEGASUS_CONFIG_DIR/ssl.cnf
    cnfChanged=1;
fi
if [ $cnfChanged -eq 1 ] || \
         [ ! -e $PEGASUS_PEM_DIR/$PEGASUS_SSL_CERT_FILE ] || \
         [ ! -e $PEGASUS_PEM_DIR/$PEGASUS_SSL_KEY_FILE ]; then
    /usr/bin/openssl req -x509 -days 3650 -newkey rsa:2048 \
         -nodes -config $PEGASUS_CONFIG_DIR/ssl.cnf   \
         -keyout $PEGASUS_PEM_DIR/key.pem \
         -out $PEGASUS_PEM_DIR/cert.pem 2>>$PEGASUS_INSTALL_LOG
    chmod 700 $PEGASUS_PEM_DIR/*.pem
    cp -fp $PEGASUS_PEM_DIR/cert.pem \
        $PEGASUS_PEM_DIR/$PEGASUS_SSL_CERT_FILE
    cp -fp $PEGASUS_PEM_DIR/key.pem \
        $PEGASUS_PEM_DIR/$PEGASUS_SSL_KEY_FILE
    chmod 400 $PEGASUS_PEM_DIR/$PEGASUS_SSL_KEY_FILE
    chmod 444 $PEGASUS_PEM_DIR/$PEGASUS_SSL_CERT_FILE 
    rm -f $PEGASUS_PEM_DIR/key.pem $PEGASUS_PEM_DIR/cert.pem
fi;
if [ ! -e $PEGASUS_PEM_DIR/$PEGASUS_SSL_TRUSTSTORE ]; then
    cp -fp $PEGASUS_PEM_DIR/$PEGASUS_SSL_CERT_FILE \
        $PEGASUS_PEM_DIR/$PEGASUS_SSL_TRUSTSTORE
    chmod 444 $PEGASUS_PEM_DIR/$PEGASUS_SSL_TRUSTSTORE;
fi;



From fedora-cvs-commits at redhat.com  Tue Apr 11 19:57:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 15:57:58 -0400
Subject: rpms/tog-pegasus/devel pegasus-2.5.1-redhat-config.patch,1.3,1.4
Message-ID: <200604111957.k3BJvwLh008271@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8256

Modified Files:
	pegasus-2.5.1-redhat-config.patch 
Log Message:
disable PEGASUS_USE_PAM_STANDALONE

pegasus-2.5.1-redhat-config.patch:
 Makefile.Release     |    6 +++---
 env_var_Linux.status |   14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

Index: pegasus-2.5.1-redhat-config.patch
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/pegasus-2.5.1-redhat-config.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pegasus-2.5.1-redhat-config.patch	11 Apr 2006 19:45:01 -0000	1.3
+++ pegasus-2.5.1-redhat-config.patch	11 Apr 2006 19:57:55 -0000	1.4
@@ -1,5 +1,5 @@
 --- pegasus/env_var_Linux.status.redhat-config	2006-03-15 20:33:51.000000000 -0500
-+++ pegasus/env_var_Linux.status	2006-04-11 15:42:44.000000000 -0400
++++ pegasus/env_var_Linux.status	2006-04-11 15:56:29.000000000 -0400
 @@ -18,7 +18,9 @@
  PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
  endif
@@ -11,16 +11,15 @@
  PEGASUS_DISABLE_OBJECT_NORMALIZATION=true
  PEGASUS_DISABLE_PERFINST=yes
  PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true
-@@ -26,7 +28,7 @@
+@@ -26,7 +28,6 @@
  PEGASUS_HAS_SSL=yes
  PEGASUS_NOASSERTS=yes
  PEGASUS_PAM_AUTHENTICATION=true
 -PEGASUS_USE_PAM_STANDALONE_PROC=true
-+PEGASUS_USE_PAM_STANDALONE_PROC=false
  PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true
  PEGASUS_USE_RELEASE_DIRS=true
  PEGASUS_USE_SYSLOGS=true
-@@ -64,22 +66,21 @@
+@@ -64,22 +65,21 @@
  PEGASUS_LOCAL_AUTH_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/localauth
  PEGASUS_TRACE_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/trace
  PEGASUS_TRACE_FILE_PATH = $(PEGASUS_VARDATA_CACHE_DIR)/trace/cimserver.trc
@@ -48,7 +47,7 @@
       $(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)/cimxml.socket
  
 --- pegasus/Makefile.Release.redhat-config	2006-01-30 11:16:16.000000000 -0500
-+++ pegasus/Makefile.Release	2006-04-11 15:07:25.000000000 -0400
++++ pegasus/Makefile.Release	2006-04-11 15:47:08.000000000 -0400
 @@ -590,10 +590,10 @@
  	$(foreach i, $(MANAGEDSYSTEM_MOF_FILES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus/$(i);)
  



From fedora-cvs-commits at redhat.com  Tue Apr 11 20:18:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 16:18:08 -0400
Subject: rpms/synaptics/devel synaptics-0.14.4-modularx.patch, 1.3,
	1.4 synaptics.spec, 1.19, 1.20
Message-ID: <200604112018.k3BKI8ED022375@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/synaptics/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22361

Modified Files:
	synaptics-0.14.4-modularx.patch synaptics.spec 
Log Message:
* Tue Apr 11 2006 Kristian H??gsberg <krh at redhat.com> 0:0.14.4-6
- Build as a shared object.


synaptics-0.14.4-modularx.patch:
 Makefile |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

Index: synaptics-0.14.4-modularx.patch
===================================================================
RCS file: /cvs/dist/rpms/synaptics/devel/synaptics-0.14.4-modularx.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- synaptics-0.14.4-modularx.patch	18 Nov 2005 21:02:34 -0000	1.3
+++ synaptics-0.14.4-modularx.patch	11 Apr 2006 20:18:05 -0000	1.4
@@ -1,5 +1,5 @@
 --- synaptics-0.14.4/Makefile.modx	2005-11-06 10:29:18.000000000 -0500
-+++ synaptics-0.14.4/Makefile	2005-11-18 15:58:44.000000000 -0500
++++ synaptics-0.14.4/Makefile	2006-04-11 16:16:00.000000000 -0400
 @@ -7,7 +7,7 @@
  # Define the TOP variable to build using include files from a local source tree.
  #TOP = /usr/src/redhat/BUILD/XFree86-4.3.0/xc
@@ -22,21 +22,59 @@
  else
    SERVERSRC = $(TOP)/programs/Xserver
    ALLINCLUDES = -I. \
-@@ -80,7 +80,7 @@
+@@ -60,16 +60,15 @@
  
- all:: synaptics_drv.o synclient syndaemon
+ check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)
+ 
+-CCOPTIONS := -pedantic -Wall -Wpointer-arith
++CCOPTIONS := -pedantic -Wall -Wpointer-arith -fPIC
+ CCOPTIONS += $(call check_gcc,-fno-merge-constants,)
+-CCOPTIONS += $(call check_gcc,-fno-pic,)
+ CDEBUGFLAGS = -O2
+ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)"
+ CFLAGSCLIENT = $(CDEBUGFLAGS) $(CCOPTIONS) -DVERSION="\"$(VERSION)\""  -DVERSION_ID="$(VERSION_ID)" -I$(X_INCLUDES_ROOT)/include
+ 
+ CC = gcc
+ 
+-LDCOMBINEFLAGS = -r
++LDCOMBINEFLAGS = -shared -fPIC
+ 
+ SRCS = synaptics.c ps2comm.c eventcomm.c psmcomm.c alpscomm.c
+ OBJS = synaptics.o ps2comm.o eventcomm.o psmcomm.o alpscomm.o
+@@ -78,9 +77,9 @@
+ 	$(RM) $@
+ 	$(CC) -c $(CFLAGS) $(_NOOP_) $*.c
+ 
+-all:: synaptics_drv.o synclient syndaemon
++all:: synaptics_drv.so synclient syndaemon
  
 -install: $(BINDIR)/synclient $(BINDIR)/syndaemon $(INSTALLED_X)/$(LIBDIR)/modules/input/synaptics_drv.o install-man
-+install: $(BINDIR)/synclient $(BINDIR)/syndaemon $(INSTALLED_X)/$(LIBDIR)/xorg/modules/input/synaptics_drv.o install-man
++install: $(BINDIR)/synclient $(BINDIR)/syndaemon $(INSTALLED_X)/$(LIBDIR)/xorg/modules/input/synaptics_drv.so install-man
  
  install-man: $(MANDIR)/man1/synclient.1 $(MANDIR)/man1/syndaemon.1 $(MANDIR)/man5/synaptics.5
  
-@@ -99,7 +99,7 @@
+@@ -99,12 +98,12 @@
  $(BINDIR)/syndaemon : syndaemon
  	install -D $< $@
  
 -$(INSTALLED_X)/$(LIBDIR)/modules/input/synaptics_drv.o : synaptics_drv.o
-+$(INSTALLED_X)/$(LIBDIR)/xorg/modules/input/synaptics_drv.o : synaptics_drv.o
++$(INSTALLED_X)/$(LIBDIR)/xorg/modules/input/synaptics_drv.so : synaptics_drv.so
  	install --mode=0644 -D $< $@
  
- synaptics_drv.o: $(OBJS)
+-synaptics_drv.o: $(OBJS)
++synaptics_drv.so: $(OBJS)
+ 	$(RM) $@
+-	$(LD) $(LDCOMBINEFLAGS)  $(OBJS) -o $@
++	$(CC) $(LDCOMBINEFLAGS)  $(OBJS) -o $@
+ 
+ synclient.o	: synclient.c
+ 	$(CC) $(CFLAGSCLIENT) -c -o $@ $<
+@@ -133,7 +132,7 @@
+ 	etags -o TAGS *.c *.h
+ 
+ uninstall::
+-	$(RM) $(BINDIR)/synclient $(BINDIR)/syndaemon $(INSTALLED_X)/lib/modules/input/synaptics_drv.o $(MANDIR)/man1/synclient.1 $(MANDIR)/man1/syndaemon.1 $(MANDIR)/man5/synaptics.5
++	$(RM) $(BINDIR)/synclient $(BINDIR)/syndaemon $(INSTALLED_X)/lib/modules/input/synaptics_drv.so $(MANDIR)/man1/synclient.1 $(MANDIR)/man1/syndaemon.1 $(MANDIR)/man5/synaptics.5
+ 
+ distribution : synaptics-$(VERSION).tar.bz2
+ 


Index: synaptics.spec
===================================================================
RCS file: /cvs/dist/rpms/synaptics/devel/synaptics.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- synaptics.spec	10 Apr 2006 18:44:23 -0000	1.19
+++ synaptics.spec	11 Apr 2006 20:18:05 -0000	1.20
@@ -3,7 +3,7 @@
 Name:           synaptics
 Version:        0.14.4
 Epoch:		0
-Release:	5
+Release:	6
 Summary:        Synaptics Touchpad Driver
 
 Group:          User Interface/X Hardware Support
@@ -48,7 +48,7 @@
 rm -rf Xincludes
 
 %build
-make ARCH=%{_arch} synaptics_drv.o synclient syndaemon
+make ARCH=%{_arch} synaptics_drv.so synclient syndaemon
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -70,6 +70,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Tue Apr 11 2006 Kristian H??gsberg <krh at redhat.com> 0:0.14.4-6
+- Build as a shared object.
+
 * Mon Apr 10 2006 Adam Jackson <ajackson at redhat.com 0:0.14.4-5
 - Delibcwrap and rebuild for 7.1RC1 ABI.
 



From fedora-cvs-commits at redhat.com  Tue Apr 11 20:41:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 16:41:11 -0400
Subject: rpms/tog-pegasus/FC-5 RedHat.OpenPegasus.Makefile, NONE,
	1.1 genOpenPegasusSSLCerts, NONE,
	1.1 pegasus-2.5.1-AutoPtr-Core.patch, NONE,
	1.1 pegasus-2.5.1-PIE.patch, NONE,
	1.1 pegasus-2.5.1-cmpi-provider-lib.patch, NONE,
	1.1 pegasus-2.5.1-enable_cql.patch, NONE,
	1.1 pegasus-2.5.1-fix_tests.patch, NONE,
	1.1 pegasus-2.5.1-fix_zseries_flags.patch, NONE,
	1.1 pegasus-2.5.1-initscript.patch, NONE,
	1.1 pegasus-2.5.1-linkflags.patch, NONE,
	1.1 pegasus-2.5.1-local-or-remote-auth.patch, NONE,
	1.1 pegasus-2.5.1-no-rpath.patch, NONE,
	1.1 pegasus-2.5.1-pam-wbem.patch, NONE,
	1.1 pegasus-2.5.1-parallel_make.patch, NONE,
	1.1 pegasus-2.5.1-redhat-config.patch, NONE,
	1.1 pegasus-2.5.1-warnings.patch, NONE, 1.1 sources, 1.4,
	1.5 tog-pegasus.spec, 1.24, 1.25
Message-ID: <200604112041.k3BKfBDg022959@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22947

Modified Files:
	sources tog-pegasus.spec 
Added Files:
	RedHat.OpenPegasus.Makefile genOpenPegasusSSLCerts 
	pegasus-2.5.1-AutoPtr-Core.patch pegasus-2.5.1-PIE.patch 
	pegasus-2.5.1-cmpi-provider-lib.patch 
	pegasus-2.5.1-enable_cql.patch pegasus-2.5.1-fix_tests.patch 
	pegasus-2.5.1-fix_zseries_flags.patch 
	pegasus-2.5.1-initscript.patch pegasus-2.5.1-linkflags.patch 
	pegasus-2.5.1-local-or-remote-auth.patch 
	pegasus-2.5.1-no-rpath.patch pegasus-2.5.1-pam-wbem.patch 
	pegasus-2.5.1-parallel_make.patch 
	pegasus-2.5.1-redhat-config.patch pegasus-2.5.1-warnings.patch 
Log Message:
Upgrade to upstream version 2.5.1


--- NEW FILE RedHat.OpenPegasus.Makefile ---
# RedHat.OpenPegasus.Makefile
#
#            Red Hat OpenPegasus distribution Makefile
#
#   Makefile to build only the binary objects actually shipped by the
#   default upstream linux build, that will work with 'make -j $ncpus' .
#   Generated by a script from the installed upstream package.
#
#   Jason Vas Dias <jvdias at redhat.com> Red Hat, Inc. April 2006
#
SRCNAME ?= pegasus
RPM_BUILD_DIR ?= $(shell cd ..;pwd)
RPM_ARCH ?= $(shell uname -i)
RPM_OPT_FLAGS ?= $(shell rpm -q rpm --qf '%{OPTFLAGS}')
ifndef PEGASUS_PLATFORM
  ifeq ($(RPM_ARCH),ia64)
    export PEGASUS_PLATFORM := LINUX_IA64_GNU
  else
    ifeq ($(RPM_ARCH),x86_64)
      export PEGASUS_PLATFORM := LINUX_X86_64_GNU
    else
      ifeq ($(RPM_ARCH),ppc)
	export PEGASUS_PLATFORM := LINUX_PPC_GNU
      else
        ifeq ($(RPM_ARCH), ppc64)
          export PEGASUS_PLATFORM := LINUX_PPC64_GNU
        else
          ifeq ($(RPM_ARCH), s390)
            export PEGASUS_PLATFORM := LINUX_ZSERIES_GNU
          else
            ifeq ($(RPM_ARCH), s390x)
              export PEGASUS_PLATFORM := LINUX_ZSERIES64_GNU
            else
              export PEGASUS_PLATFORM := LINUX_IX86_GNU
            endif
          endif
        endif
      endif
    endif
  endif
endif
ifndef RPM_ARCH_LIB
  ifeq ($(RPM_ARCH),x86_64)
    export RPM_ARCH_LIB := lib64
  else
    ifeq ($(RPM_ARCH),ppc64)
      export RPM_ARCH_LIB := lib64
    else
      ifeq ($(RPM_ARCH),s390x)
        export RPM_ARCH_LIB := lib64
      else
        export RPM_ARCH_LIB := lib
      endif
    endif
  endif
endif
export PEGASUS_ROOT ?= $(RPM_BUILD_DIR)/$(SRCNAME)
export PEGASUS_HOME ?= $(PEGASUS_ROOT)/build
export PEGASUS_ARCH_LIB ?= $(RPM_ARCH_LIB)
export PEGASUS_ENVVAR_FILE ?= $(PEGASUS_ROOT)/env_var_Linux.status
export PEGASUS_EXTRA_C_FLAGS ?= $(RPM_OPT_FLAGS) -Wno-unused
export PEGASUS_EXTRA_CXX_FLAGS ?= $(PEGASUS_EXTRA_C_FLAGS)
export PEGASUS_EXTRA_PROGRAM_LINK_FLAGS ?= -pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack
export OPENSSL_HOME ?= /usr
export OPENSSL_BIN  ?= /usr/bin
export SYS_INCLUDES ?= -I/usr/kerberos/include
export LD_LIBRARY_PATH ?= $(PEGASUS_HOME)/lib
B = $(PEGASUS_HOME)
R = $(PEGASUS_ROOT)
SBINS=$(B)/bin/cimserver $(B)/bin/cimprovagt  $(B)/bin/cimauth $(B)/bin/cimconfig $(B)/bin/cimuser $(B)/bin/repupgrade
UBINS=$(B)/bin/cimmof $(B)/bin/cimmofl $(B)/bin/cimprovider $(B)/bin/osinfo $(B)/bin/wbemexec
BINARIES=$(SBINS) $(UBINS)
PROVIDERS=$(B)/lib/Pegasus/providers/libComputerSystemProvider.so.1 $(B)/lib/Pegasus/providers/libOSProvider.so.1 $(B)/lib/Pegasus/providers/libProcessProvider.so.1
LIBRARIES=$(B)/lib/libCIMQueryCapabilitiesProvider.so.1 $(B)/lib/libCIMxmlIndicationHandler.so.1 $(B)/lib/libCMPIProviderManager.so.1 $(B)/lib/libCertificateProvider.so.1 $(B)/lib/libConfigSettingProvider.so.1 $(B)/lib/libDefaultProviderManager.so.1 $(B)/lib/libNamespaceProvider.so.1 $(B)/lib/libProviderRegistrationProvider.so.1 $(B)/lib/libUserAuthProvider.so.1 $(B)/lib/libcmpiCppImpl.so.1 $(B)/lib/libpegauthentication.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegcompiler.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/libpegexportclient.so.1 $(B)/lib/libpegexportserver.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpeghandlerservice.so.1 $(B)/lib/libpegindicationservice.so.1 $(B)/lib/libpeglistener.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libp!
 egserver.so.1 $(B)/lib/libpegservice.so.1 $(B)/lib/libpeguser.so.1 $(B)/lib/libpegwql.so.1

all: setup $(BINARIES) $(LIBRARIES) $(PROVIDERS)

setup:
	$(MAKE) -f Makefile.Release create_ProductVersionFile
	$(MAKE) -f Makefile.Release create_CommonProductDirectoriesInclude
	$(MAKE) -f Makefile.Release create_ConfigProductDirectoriesInclude
	touch setup

$(B)/bin/cimserver: $(B)/lib/libpegclient.so.1 $(B)/lib/libpegserver.so.1 $(B)/lib/libpeguser.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libNamespaceProvider.so.1 $(B)/lib/libpegindicationservice.so.1 $(B)/lib/libpeghandlerservice.so.1 $(B)/lib/libConfigSettingProvider.so.1 $(B)/lib/libDefaultProviderManager.so.1 $(B)/lib/libProviderRegistrationProvider.so.1 $(B)/lib/libpegauthentication.so.1 $(B)/lib/libUserAuthProvider.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libCIMQueryCapabilitiesProvider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegexportserver.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegservice.so.1 $(B)/lib/libCertificateProvider.so.1 $(B)/lib/Pegasus/providers/libComputerSystemProvider.so.1 $(B)/lib/Pegasus/providers/libOSProvider.so.1 $(B)/lib/Pegasus/providers/libProcessProvider.so.1
	$(MAKE) -C $(R)/src/Server

$(B)/bin/cimprovagt: $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/Pegasus/providers/libComputerSystemProvider.so.1 $(B)/lib/Pegasus/providers/libOSProvider.so.1 $(B)/lib/Pegasus/providers/libProcessProvider.so.1
	$(MAKE) -C src/Pegasus/ProviderManager2/ProviderAgent

$(B)/bin/cimauth: $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Clients/cimauth

$(B)/bin/cimconfig: $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Clients/cimconfig

$(B)/bin/cimuser: $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Clients/cimuser

$(B)/bin/repupgrade: $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1
	$(MAKE) -C $(R)/src/Clients/repupgrade

$(B)/bin/cimmof: $(B)/lib/libpegcompiler.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Compiler/cmdline/cimmof

$(B)/bin/cimmofl: $(B)/bin/cimmof
	$(MAKE) -C $(R)/src/Pegasus/Compiler/cmdline/cimmofl

$(B)/bin/cimprovider: $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Clients/cimprovider

$(B)/bin/osinfo: $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Clients/osinfo

$(B)/bin/wbemexec: $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Clients/wbemexec

$(B)/lib/Pegasus/providers/libComputerSystemProvider.so.1: $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Providers/ManagedSystem/ComputerSystem

$(B)/lib/Pegasus/providers/libOSProvider.so.1: $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Providers/ManagedSystem/OperatingSystem

$(B)/lib/Pegasus/providers/libProcessProvider.so.1: $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Providers/ManagedSystem/Process

$(B)/lib/libCIMQueryCapabilitiesProvider.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Pegasus/ControlProviders/QueryCapabilitiesProvider

$(B)/lib/libCIMxmlIndicationHandler.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegexportclient.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegclient.so.1
	$(MAKE) -C $(R)/src/Pegasus/Handler/CIMxmlIndicationHandler

$(B)/lib/libCMPIProviderManager.so.1: $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegrepository.so.1
	$(MAKE) -C $(R)/src/Pegasus/ProviderManager2/CMPI

$(B)/lib/libCertificateProvider.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Pegasus/ControlProviders/CertificateProvider

$(B)/lib/libConfigSettingProvider.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Pegasus/ControlProviders/ConfigSettingProvider

$(B)/lib/libDefaultProviderManager.so.1: $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegrepository.so.1
	$(MAKE) -C $(R)/src/Pegasus/ProviderManager2/Default

$(B)/lib/libNamespaceProvider.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Pegasus/ControlProviders/NamespaceProvider

$(B)/lib/libProviderRegistrationProvider.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Pegasus/ControlProviders/ProviderRegistrationProvider

$(B)/lib/libUserAuthProvider.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpeguser.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Pegasus/ControlProviders/UserAuthProvider

$(B)/lib/libcmpiCppImpl.so.1:
	$(MAKE) -C $(R)/src/Pegasus/Provider/CMPI

$(B)/lib/libpegauthentication.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpeguser.so.1 $(B)/lib/libpegconfig.so.1
	$(MAKE) -C $(R)/src/Pegasus/Security/Authentication

$(B)/lib/libpegclient.so.1: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Client

$(B)/lib/libpegcliutils.so.1: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Clients/cliutils

$(B)/lib/libpegcommon.so.1:
	$(MAKE) -C $(R)/src/Pegasus/Common

$(B)/lib/libpegcompiler.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegconfig.so.1
	$(MAKE) -C $(R)/src/Pegasus/Compiler

$(B)/lib/libpegconfig.so.1: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Config

$(B)/lib/libpegcql.so.1: $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/CQL

$(B)/lib/libpegexportclient.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegclient.so.1
	$(MAKE) -C $(R)/src/Pegasus/ExportClient

$(B)/lib/libpegexportserver.so.1: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/ExportServer

$(B)/lib/libpeggetoopt.so.1: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/getoopt

$(B)/lib/libpeghandlerservice.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegquerycommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/HandlerService

$(B)/lib/libpegindicationservice.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Pegasus/IndicationService

$(B)/lib/libpeglistener.so.1: $(B)/lib/libpegexportserver.so.1 $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Listener

$(B)/lib/libpegprm.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Pegasus/Server/ProviderRegistrationManager

$(B)/lib/libpegprovider.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Pegasus/Provider

$(B)/lib/libpegprovidermanager.so.1: $(B)/lib/libpegprm.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Pegasus/ProviderManager2

$(B)/lib/libpegquerycommon.so.1: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Query/QueryCommon

$(B)/lib/libpegqueryexpression.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Pegasus/Query/QueryExpression

$(B)/lib/libpegrepository.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegconfig.so.1
	$(MAKE) -C $(R)/src/Pegasus/Repository

$(B)/lib/libpegserver.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegexportserver.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpeguser.so.1 $(B)/lib/libpegauthentication.so.1 $(B)/lib/libpeghandlerservice.so.1 $(B)/lib/libpegindicationservice.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libDefaultProviderManager.so.1 $(B)/lib/libConfigSettingProvider.so.1 $(B)/lib/libUserAuthProvider.so.1 $(B)/lib/libProviderRegistrationProvider.so.1 $(B)/lib/libNamespaceProvider.so.1 $(B)/lib/libCIMQueryCapabilitiesProvider.so.1 $(B)/lib/libCertificateProvider.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Pegasus/Server

$(B)/lib/libpegservice.so.1: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Service

$(B)/lib/libpeguser.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegconfig.so.1
	$(MAKE) -C $(R)/src/Pegasus/Security/UserManager

$(B)/lib/libpegwql.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/WQL

#
# install target :
#
# 
install ?= /usr/bin/install
prefix  ?=
export prefix  := $(prefix:/usr=)
D       := $(prefix)
sysconfdir ?= /etc
export sysconfdir := $(subst $(prefix),,$(sysconfdir))
etc     := $(sysconfdir)
bindir  ?= /usr/bin
export bindir  := $(subst $(prefix),,$(bindir))
bin     := $(bindir)
sbindir ?= /usr/sbin
export sbindir := $(subst $(prefix),,$(sbindir))
sbin    := $(sbindir)
libdir  ?= /usr/$(RPM_ARCH_LIB)
export libdir  := $(subst $(prefix),,$(libdir))
lib     := $(libdir)
datadir ?= /usr/share
export datadir  := $(subst $(prefix),,$(datadir))
share	:= $(datadir)
includedir ?= /usr/include
export includedir := $(subst $(prefix),,$(includedir))
inc := $(includedir)
localstatedir ?= /var
export localstatedir := $(subst $(prefix),,$(localstatedir))
var := $(localstatedir)
mandir  ?= /usr/share/man
export mandir  := $(subst $(prefix),,$(mandir))
root_user ?= root
pegasus_user ?= pegasus
SYSDIRS  = $(D) $(D)/$(etc) $(D)/$(etc)/rc.d/init.d $(D)/$(etc)/pam.d \
	   $(D)/$(var) $(D)/$(lib) $(D)/$(bin)/ $(D)/$(sbin) \
	   $(D)/$(inc) $(D)/$(mandir)/man8 $(D)/$(mandir)/man1
ROOTDIRS = $(D)/$(etc)/Pegasus \
	   $(D)/$(var)/run/tog-pegasus $(D)/$(var)/run/tog-pegasus/socket \
	   $(D)/$(var)/lib/Pegasus $(D)/$(var)/lib/Pegasus/repository \
	   $(D)/$(var)/lib/Pegasus/repository/root/classes \
	   $(D)/$(var)/lib/Pegasus/repository/root/instances \
	   $(D)/$(var)/lib/Pegasus/repository/root/qualifiers \
	   $(D)/$(var)/lib/Pegasus/cache \
	   $(D)/$(var)/lib/Pegasus/cache/localauth \
	   $(D)/$(var)/lib/Pegasus/cache/trace \
	   $(D)/$(var)/lib/Pegasus/log \
	   $(D)/$(lib)/Pegasus \
	   $(D)/$(lib)/Pegasus/providers \
	   $(D)/$(lib)/cmpi \
	   $(D)/$(share)/Pegasus/scripts
PEGDIRS =  $(D)/$(share)/Pegasus \
	   $(D)/$(share)/Pegasus/mof/CIM29 \
	   $(D)/$(share)/Pegasus/mof/Pegasus
MAN8S	=  $(wildcard $(R)/rpm/manLinux/man8.Z/*.8)
MAN1S   =  $(wildcard $(R)/rpm/manLinux/man1.Z/*.1)
CIMSCHEMA= $(wildcard $(R)/Schemas/CIM29/*)
CIMMOF=$(addprefix $(D)$(share)/Pegasus/mof/CIM29/,$(notdir $(CIMSCHEMA)))
PEGSCHEMA= $(R)/Schemas/Pegasus/Internal/VER20/PG_SSLCertificate20.mof \
           $(R)/Schemas/Pegasus/ManagedSystem/VER20/PG_OperatingSystem20R.mof \
           $(R)/Schemas/Pegasus/InterOp/VER20/PG_InterOpSchema20.mof \
           $(R)/Schemas/Pegasus/ManagedSystem/VER20/PG_ComputerSystem20R.mof \
           $(R)/Schemas/Pegasus/Internal/VER20/PG_User20.mof \
           $(R)/Schemas/Pegasus/ManagedSystem/VER20/PG_UnixProcess20.mof \
           $(R)/Schemas/Pegasus/ManagedSystem/VER20/PG_ManagedSystemSchema20.mof \
           $(R)/Schemas/Pegasus/Internal/VER20/PG_ConfigSetting20.mof \
           $(R)/Schemas/Pegasus/InterOp/VER20/PG_ProviderModule20.mof \
           $(R)/Schemas/Pegasus/ManagedSystem/VER20/PG_OperatingSystem20.mof \
           $(R)/Schemas/Pegasus/Internal/VER20/PG_Authorization20.mof \
           $(R)/Schemas/Pegasus/Internal/VER20/PG_InternalSchema20.mof \
           $(R)/Schemas/Pegasus/Internal/VER20/PG_ShutdownService20.mof \
           $(R)/Schemas/Pegasus/ManagedSystem/VER20/PG_ComputerSystem20.mof \
           $(R)/Schemas/Pegasus/ManagedSystem/VER20/PG_UnixProcess20R.mof \
           $(R)/Schemas/Pegasus/ManagedSystem/VER20/PG_ManagedSystemSchema20R.mof \
           $(R)/Schemas/Pegasus/Internal/VER20/PG_SSLCertificateRevocationList20.mof \
           $(R)/Schemas/Pegasus/InterOp/VER20/PG_Events20.mof
PEGMOF=$(addprefix $(D)$(share)/Pegasus/mof/Pegasus/,$(notdir $(CIMSCHEMA)))
LINKED_LIBS=$(D)/$(lib)/libpegclient.so.1 $(D)/$(lib)/libpegcommon.so.1 $(D)/$(lib)/libpegprovider.so.1 $(D)/$(lib)/libDefaultProviderManager.so.1 $(D)/$(lib)/libCIMxmlIndicationHandler.so.1 $(D)/$(lib)/libCMPIProviderManager.so.1 $(D)/$(lib)/Pegasus/providers/libComputerSystemProvider.so.1 $(D)/$(lib)/Pegasus/providers/libOSProvider.so.1 $(D)/$(lib)/Pegasus/providers/libProcessProvider.so.1
export PEGASUS_STAGING_DIR := $(D)

install: dirs config libs lib_links bins mans mof SDK ghost_files repository

$(SYSDIRS):
	/bin/mkdir -p $@

$(ROOTDIRS):
	/bin/mkdir -p $@;
	/bin/chown $(root_user):$(pegasus_user) $@ >/dev/null 2>&1;
	/bin/chmod 0750 $@;

$(PEGDIRS):
	/bin/mkdir -p $@;
	/bin/chown $(root_user):$(pegasus_user) $@ >/dev/null 2>&1 || :;
	/bin/chmod 0755 $@

dirs:	$(SYSDIRS) $(ROOTDIRS) $(PEGDIRS)

$(D)/$(etc)/rc.d/init.d/tog-pegasus:  $(R)/rpm/tog-pegasus.rc
	$(install) -m 0750 -o $(root_user) -g $(pegasus_user) -p $< $@

$(D)/$(etc)/Pegasus/access.conf: $(R)/rpm/access.conf
	$(install) -m 0640 -o $(root_user) -g $(pegasus_user) -p $< $@

$(D)/$(etc)/pam.d/wbem:  $(R)/rpm/wbem
	$(install) -m 0640 -o $(root_user) -g $(pegasus_user) -p $< $@

$(D)/$(share)/Pegasus/scripts/init_repository:  $(R)/installs/scripts/init_repository
	$(install) -m 0640 -o $(root_user) -g $(pegasus_user) -p $< $@

$(D)/$(share)/Pegasus/scripts/settogpath:  $(R)/installs/scripts/settogpath
	$(install) -m 0640 -o $(root_user) -g $(pegasus_user) -p $< $@

$(D)/$(share)/Pegasus/scripts/genOpenPegasusSSLCerts:  $(R)/rpm/genOpenPegasusSSLCerts
	$(install) -m 0640 -o $(root_user) -g $(pegasus_user) -p $< $@

config: $(D)/$(etc)/rc.d/init.d/tog-pegasus  $(D)/$(etc)/Pegasus/access.conf $(D)/$(etc)/pam.d/wbem $(D)/$(share)/Pegasus/scripts/genOpenPegasusSSLCerts $(D)/$(share)/Pegasus/scripts/init_repository $(D)/$(share)/Pegasus/scripts/settogpath 

$(D)/$(lib)/Pegasus/providers/%:
	$(install) -m 0755 -o $(root_user) -g $(pegasus_user) -p $(B)/lib/$(patsubst Pegasus/providers/%,%,$*) $@

$(D)/$(lib)/%:
	$(install) -m 0755 -o $(root_user) -g $(pegasus_user) -p $(B)/lib/$* $@

libs: $(LIBRARIES) $(patsubst $(B)/lib/%,$(D)/$(lib)/%,$(LIBRARIES) $(PROVIDERS))

$(patsubst %.so.1,%.so,$(LINKED_LIBS)):
	/bin/ln -sf $(patsubst %,%.1,$(notdir $@)) $(patsubst %.so.1,%.so,$@)

lib_links: libs $(patsubst %.so.1,%.so,$(LINKED_LIBS))

$(patsubst $(B)/bin/%,$(D)/$(sbin)/%,$(SBINS)):
	$(install) -m 0750 -o $(root_user) -g $(pegasus_user) -p $(patsubst $(D)/$(sbin)/%,$(B)/bin/%, $@) $@

$(patsubst $(B)/bin/%,$(D)/$(bin)/%,$(UBINS)):
	$(install) -m 0755 -o $(root_user) -g $(pegasus_user) -p $(patsubst $(D)/$(bin)/%,$(B)/bin/%, $@) $@

bins:   $(SBINS) $(UBINS) $(patsubst $(B)/bin/%,$(D)/$(sbin)/%,$(SBINS)) $(patsubst $(B)/bin/%,$(D)/$(bin)/%,$(UBINS))

$(D)/$(mandir)/man8/%.8:
	$(install) -m 0644 -o $(root_user) -g $(root_user) -p $(R)/rpm/manLinux/man8.Z/$*.8 $@

$(D)/$(mandir)/man1/%.1:
	$(install) -m 0644 -o $(root_user) -g $(root_user) -p $(R)/rpm/manLinux/man1.Z/$*.1 $@

mans:	$(subst $(R)/rpm/manLinux/man8.Z,$(D)/$(mandir)/man8,$(MAN8S)) $(subst $(R)/rpm/manLinux/man1.Z,$(D)/$(mandir)/man1,$(MAN1S))

mof: 	$(CIMSCHEMA) $(PEGSCHEMA)
	$(install) -m 0644 -o $(root_user) -g $(root_user) -p $(CIMSCHEMA) $(D)/$(share)/Pegasus/mof/CIM29
	$(install) -m 0644 -o $(root_user) -g $(root_user) -p $(PEGSCHEMA) $(D)/$(share)/Pegasus/mof/Pegasus

SDK:
	/bin/mkdir -p $(PEGASUS_STAGING_DIR)/usr/share/doc/tog-pegasus-2.5/
	$(MAKE) -f $(R)/mak/SDKMakefile stageSDK
	/bin/rm -rf $(PEGASUS_STAGING_DIR)/usr/share/doc/tog-pegasus-2.5/
	touch SDK

ghost_files:
	touch $(D){/etc/Pegasus/{cimserver_current.conf,cimserver_planned.conf,cimserver_trust,indication_trust,crl,ssl.cnf,client.pem,server.pem,file.pem,},/var/{run/tog-pegasus/{cimxml.socket,cimserver.pid,cimserver_start.lock},lib/Pegasus/{log/install.log,cache/trace/cimserver.trc}}}

repository:
	PATH=$(B)/bin:$$PATH LD_LIBRARY_PATH=$(B)/lib $(MAKE) -C Schemas/Pegasus repository REPOSITORY_DIR=$(D)/$(var)/lib/Pegasus

# test package :

TESTLIBS:=$(B)/lib/libFamilyProvider.so.1 $(B)/lib/libIndicationStressTestConsumer.so.1 $(B)/lib/libIndicationStressTestProvider.so.1 $(B)/lib/libSampleInstanceProvider.so.1 $(B)/lib/libSampleMethodProvider.so.1
TESTBINS:=$(B)/bin/TestAbstract $(B)/bin/TestArray $(B)/bin/TestBase64 $(B)/bin/TestClassDecl $(B)/bin/TestDateTime $(B)/bin/TestFlavor $(B)/bin/TestFormatter $(B)/bin/TestHashTable $(B)/bin/TestInstanceDecl $(B)/bin/TestLogger $(B)/bin/TestMethod $(B)/bin/TestObject $(B)/bin/TestOperationContext $(B)/bin/TestParamValue $(B)/bin/TestParameter $(B)/bin/TestProperty $(B)/bin/TestQualifier $(B)/bin/TestQualifierDecl $(B)/bin/TestQualifierList $(B)/bin/TestQueue $(B)/bin/TestReference $(B)/bin/TestResolve $(B)/bin/TestResponseHandler $(B)/bin/TestScope $(B)/bin/TestStack $(B)/bin/TestStopwatch $(B)/bin/TestStrToInstName $(B)/bin/TestString $(B)/bin/TestTimeValue $(B)/bin/TestToMof $(B)/bin/TestValidateClass $(B)/bin/TestValue $(B)/bin/TracerTest $(B)/bin/TestIPC $(B)/bin/TestClient $(B)/bin/OSTestClient $(B)/bin/TestPegClientInvokeMethod2 $(B)/bin/TestIndicationStressTest

$(B)/lib/libFamilyProvider.so.1: $(B)/lib/libpegcommon.so.1
	$(MAKE)	-C $(R)/src/Providers/TestProviders/FamilyProvider

$(B)/lib/libIndicationStressTestConsumer.so.1: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Providers/TestProviders/IndicationStressTestProvider/testconsumer

$(B)/lib/libIndicationStressTestProvider.so.1: $(B)/lib/libpegcommon.so.1
	$(MAKE)	-C $(R)/src/Providers/TestProviders/IndicationStressTestProvider

$(B)/lib/libSampleInstanceProvider.so.1: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Providers/sample/InstanceProvider

$(B)/lib/libSampleMethodProvider.so.1: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Providers/sample/MethodProvider

$(B)/bin/TestAbstract: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Abstract

$(B)/bin/TestArray: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Array

$(B)/bin/TestBase64: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Base64

$(B)/bin/TestClassDecl: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/ClassDecl

$(B)/bin/TestDateTime: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/DateTime

$(B)/bin/TestFlavor: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Flavor

$(B)/bin/TestFormatter: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Formatter

$(B)/bin/TestHashTable: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/HashTable

$(B)/bin/TestInstanceDecl: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/InstanceDecl

$(B)/bin/TestLogger: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Logger

$(B)/bin/TestMethod: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Method

$(B)/bin/TestObject: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Object

$(B)/bin/TestOperationContext: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/OperationContext

$(B)/bin/TestParamValue: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/ParamValue

$(B)/bin/TestParameter: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Parameter

$(B)/bin/TestProperty: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Property

$(B)/bin/TestQualifier: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Qualifier

$(B)/bin/TestQualifierDecl: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/QualifierDecl

$(B)/bin/TestQualifierList: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/QualifierList

$(B)/bin/TestQueue: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Queue

$(B)/bin/TestReference: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Reference

$(B)/bin/TestResolve: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Resolve

$(B)/bin/TestScope: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Scope

$(B)/bin/TestStack: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Stack

$(B)/bin/TestStopwatch: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Stopwatch

$(B)/bin/TestStrToInstName: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/StrToInstName

$(B)/bin/TestString: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/String

$(B)/bin/TestTimeValue: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/TimeValue

$(B)/bin/TestToMof: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/ToMof

$(B)/bin/TestValidateClass: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/ValidateClass

$(B)/bin/TestValue: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Value

$(B)/bin/TestTracer: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Tracer

$(B)/bin/TestIPC: $(B)/lib/libpegcommon.so.1
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/IPC

$(B)/bin/TestResponseHandler: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegcql.so.1
	$(MAKE) -C $(R)/src/Pegasus/ProviderManager2/Default/tests/ResponseHandler

$(B)/bin/TracerTest: $(B)/lib/libpegcommon.so.1 
	$(MAKE) -C $(R)/src/Pegasus/Common/tests/Tracer

$(B)/bin/TestClient: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegclient.so.1
	$(MAKE) -C $(R)/src/Clients/TestClient

$(B)/bin/OSTestClient: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegclient.so.1
	$(MAKE) -C $(R)/src/Providers/ManagedSystem/OperatingSystem/tests/OSTestClient

$(B)/bin/TestPegClientInvokeMethod2: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegclient.so.1
	$(MAKE) -C $(R)/src/Pegasus/Client/tests/InvokeMethod2

$(B)/bin/TestIndicationStressTest: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpeglistener.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegexportserver.so.1
	$(MAKE) -C $(R)/src/Providers/TestProviders/IndicationStressTestProvider/testclient

tests:  $(TESTLIBS) $(TESTBINS)

install_tests: tests test_dirs test_lib test_bin test_mak test_makefile test_repository

TESTDIRS = $(D)/$(share)/Pegasus/test \
	   $(D)/$(share)/Pegasus/test/bin \
	   $(D)/$(share)/Pegasus/test/lib \
	   $(D)/$(share)/Pegasus/test/mak

$(TESTDIRS):
	/bin/mkdir -p $@;
	/bin/chown $(root_user):$(pegasus_user) $@ >/dev/null 2>&1 || :;
	/bin/chmod 0755 $@

test_dirs: $(TESTDIRS)

$(patsubst $(B)/lib/%,$(D)/$(share)/Pegasus/test/lib/%,$(TESTLIBS)):
	$(install) -m 0755 -o $(root_user) -g $(pegasus_user) -p $(patsubst $(D)/$(share)/Pegasus/test/lib/%,$(B)/lib/%,$@) $@

test_lib: $(TESTLIBS) $(patsubst $(B)/lib/%,$(D)/$(share)/Pegasus/test/lib/%,$(TESTLIBS))

$(patsubst $(B)/bin/%,$(D)/$(share)/Pegasus/test/bin/%,$(TESTBINS)):
	$(install) -m 0755 -o $(root_user) -g $(pegasus_user) -p $(patsubst $(D)/$(share)/Pegasus/test/bin/%,$(B)/bin/%,$@) $@

test_bin: $(TESTBINS) $(patsubst $(B)/bin/%,$(D)/$(share)/Pegasus/test/bin/%,$(TESTBINS))

test_mak:
	$(MAKE) --directory=$(R) -f Makefile.ReleaseTest -s stage_makfiles

test_makefile:
	$(MAKE) --directory=$(R) -f Makefile.ReleaseTest -s create_Makefile

test_repository:
	LD_LIBRARY_PATH=$(B)/lib PATH=$(B)/bin:$$PATH $(MAKE) --directory=$(R) -f Makefile.ReleaseTest -s create_repository



--- NEW FILE genOpenPegasusSSLCerts ---
#!/bin/bash
#
PEGASUS_PEM_DIR=/etc/Pegasus
PEGASUS_CONFIG_DIR=/etc/Pegasus
PEGASUS_INSTALL_LOG=/var/lib/Pegasus/log/install.log
PEGASUS_SSL_CERT_FILE=server.pem
PEGASUS_SSL_KEY_FILE=file.pem
PEGASUS_SSL_TRUSTSTORE=client.pem
#
#  Set up OpenSSL certificates for the tog-pegasus cimserver
#
#  Creates a default ssl.cnf file.
#  Generates a self-signed certificate for use by the cimserver.
#
cnfChanged=0;
if [ ! -e $PEGASUS_CONFIG_DIR/ssl.cnf ]; then
    mkdir -p ${PEGASUS_INSTALL_LOG%/*}
    mkdir -p $PEGASUS_CONFIG_DIR
    echo "[ req ]" > $PEGASUS_CONFIG_DIR/ssl.cnf
    echo "distinguished_name     = req_distinguished_name"  >> \
            $PEGASUS_CONFIG_DIR/ssl.cnf
    echo "prompt                 = no"  >> $PEGASUS_CONFIG_DIR/ssl.cnf
    echo "[ req_distinguished_name ]" >> $PEGASUS_CONFIG_DIR/ssl.cnf
    echo "C                      = UK" >> $PEGASUS_CONFIG_DIR/ssl.cnf
    echo "ST                     = Berkshire" >> $PEGASUS_CONFIG_DIR/ssl.cnf
    echo "L                      = Reading" >> $PEGASUS_CONFIG_DIR/ssl.cnf
    echo "O                      = The Open Group" >> \
            $PEGASUS_CONFIG_DIR/ssl.cnf
    echo "OU                     = The OpenPegasus Project" >> \
            $PEGASUS_CONFIG_DIR/ssl.cnf
    DN=`hostname`;
    if [ -z "$DN" ] || [ "$DN" = "(none)" ]; then
            DN='localhost.localdomain';
    fi;
    FQDN=`{ host -W1 $DN 2>/dev/null || echo "$DN has address "; } |\
            grep 'has address' | head -1 | sed 's/\ .*$//'`;
    if [ -z "$FQDN" ] ; then
        FQDN="$DN";
    fi;
    # cannot use 'hostname --fqdn' because this can hang indefinitely
    echo "CN                     = $FQDN"  >> $PEGASUS_CONFIG_DIR/ssl.cnf
    chmod 400 $PEGASUS_CONFIG_DIR/ssl.cnf
    chown root $PEGASUS_CONFIG_DIR/ssl.cnf
    chgrp root $PEGASUS_CONFIG_DIR/ssl.cnf
    cnfChanged=1;
fi
if [ $cnfChanged -eq 1 ] || \
         [ ! -e $PEGASUS_PEM_DIR/$PEGASUS_SSL_CERT_FILE ] || \
         [ ! -e $PEGASUS_PEM_DIR/$PEGASUS_SSL_KEY_FILE ]; then
    /usr/bin/openssl req -x509 -days 3650 -newkey rsa:2048 \
         -nodes -config $PEGASUS_CONFIG_DIR/ssl.cnf   \
         -keyout $PEGASUS_PEM_DIR/key.pem \
         -out $PEGASUS_PEM_DIR/cert.pem 2>>$PEGASUS_INSTALL_LOG
    chmod 700 $PEGASUS_PEM_DIR/*.pem
    cp -fp $PEGASUS_PEM_DIR/cert.pem \
        $PEGASUS_PEM_DIR/$PEGASUS_SSL_CERT_FILE
    cp -fp $PEGASUS_PEM_DIR/key.pem \
        $PEGASUS_PEM_DIR/$PEGASUS_SSL_KEY_FILE
    chmod 400 $PEGASUS_PEM_DIR/$PEGASUS_SSL_KEY_FILE
    chmod 444 $PEGASUS_PEM_DIR/$PEGASUS_SSL_CERT_FILE 
    rm -f $PEGASUS_PEM_DIR/key.pem $PEGASUS_PEM_DIR/cert.pem
fi;
if [ ! -e $PEGASUS_PEM_DIR/$PEGASUS_SSL_TRUSTSTORE ]; then
    cp -fp $PEGASUS_PEM_DIR/$PEGASUS_SSL_CERT_FILE \
        $PEGASUS_PEM_DIR/$PEGASUS_SSL_TRUSTSTORE
    chmod 444 $PEGASUS_PEM_DIR/$PEGASUS_SSL_TRUSTSTORE;
fi;

pegasus-2.5.1-AutoPtr-Core.patch:
 AutoPtr.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE pegasus-2.5.1-AutoPtr-Core.patch ---
--- pegasus/src/Pegasus/Common/AutoPtr.h.AutoPtr-Core	2006-01-30 11:16:46.000000000 -0500
+++ pegasus/src/Pegasus/Common/AutoPtr.h	2006-04-11 15:01:43.000000000 -0400
@@ -200,7 +200,8 @@
     {
         if (p != _ptr)
         {
-            delete _ptr;
+	    if ( _ptr != 0 )
+		delete _ptr;
             _ptr = p;
         }
     }

pegasus-2.5.1-PIE.patch:
 Clients/cimauth/Makefile                        |    2 ++
 Clients/cimconfig/Makefile                      |    2 ++
 Clients/cimprovider/Makefile                    |    2 ++
 Clients/cimuser/Makefile                        |    2 ++
 Clients/osinfo/Makefile                         |    2 ++
 Clients/repupgrade/Makefile                     |    2 ++
 Clients/wbemexec/Makefile                       |    2 ++
 Pegasus/Compiler/cmdline/cimmof/Makefile        |    2 ++
 Pegasus/Compiler/cmdline/cimmofl/Makefile       |    2 ++
 Pegasus/ProviderManager2/ProviderAgent/Makefile |    4 ++--
 Server/Makefile                                 |    3 +++
 11 files changed, 23 insertions(+), 2 deletions(-)

--- NEW FILE pegasus-2.5.1-PIE.patch ---
--- pegasus/src/Pegasus/Compiler/cmdline/cimmof/Makefile.PIE	2006-01-30 11:17:34.000000000 -0500
+++ pegasus/src/Pegasus/Compiler/cmdline/cimmof/Makefile	2006-04-06 16:17:54.000000000 -0400
@@ -32,6 +32,8 @@
 DIR = Pegasus/Compiler/cmdline/cimmof
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE) 
+
 LOCAL_DEFINES = -DPEGASUS_CMDLINE_INTERNAL -DPEGASUS_INTERNALONLY
 
 LIBRARIES = \
--- pegasus/src/Pegasus/Compiler/cmdline/cimmofl/Makefile.PIE	2006-01-30 11:17:34.000000000 -0500
+++ pegasus/src/Pegasus/Compiler/cmdline/cimmofl/Makefile	2006-04-06 16:17:43.000000000 -0400
@@ -32,6 +32,8 @@
 DIR = Pegasus/Compiler/cmdline/cimmofl
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE) 
+
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
 
 PROGRAM = cimmofl
--- pegasus/src/Pegasus/ProviderManager2/ProviderAgent/Makefile.PIE	2006-01-30 11:18:16.000000000 -0500
+++ pegasus/src/Pegasus/ProviderManager2/ProviderAgent/Makefile	2006-04-05 21:05:58.000000000 -0400
@@ -29,11 +29,12 @@
 #//
 #//==============================================================================
 ROOT = ../../../..
-
 DIR = Pegasus/ProviderManager2/ProviderAgent
 
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
 LIBRARIES = \
     pegprovidermanager \
     pegprovider \
@@ -56,4 +57,3 @@
 tests:
 
 poststarttests:
-
--- pegasus/src/Server/Makefile.PIE	2006-01-30 11:19:33.000000000 -0500
+++ pegasus/src/Server/Makefile	2006-04-05 21:05:58.000000000 -0400
@@ -30,8 +30,11 @@
 #//==============================================================================
 ROOT = ../..
 DIR = Server
+
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
 LIBRARIES = \
     pegclient \
     pegserver \
--- pegasus/src/Clients/cimprovider/Makefile.PIE	2006-01-30 11:16:33.000000000 -0500
+++ pegasus/src/Clients/cimprovider/Makefile	2006-04-06 16:17:31.000000000 -0400
@@ -36,6 +36,8 @@
 
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE) 
+
 LIBRARIES = \
     pegcliutils \
     pegclient \
--- pegasus/src/Clients/osinfo/Makefile.PIE	2006-01-30 11:16:35.000000000 -0500
+++ pegasus/src/Clients/osinfo/Makefile	2006-04-06 16:17:14.000000000 -0400
@@ -35,6 +35,8 @@
 DIR = Clients/osinfo
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE) 
+
 LIBRARIES = \
     pegcliutils \
     peggetoopt \
--- pegasus/src/Clients/cimuser/Makefile.PIE	2006-01-30 11:16:33.000000000 -0500
+++ pegasus/src/Clients/cimuser/Makefile	2006-04-06 16:17:01.000000000 -0400
@@ -36,6 +36,8 @@
 
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE) 
+
 LIBRARIES = \
     pegcliutils \
     pegclient \
--- pegasus/src/Clients/repupgrade/Makefile.PIE	2006-01-30 11:16:36.000000000 -0500
+++ pegasus/src/Clients/repupgrade/Makefile	2006-04-06 16:16:37.000000000 -0400
@@ -36,6 +36,8 @@
 
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE) 
+
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
 
 LIBRARIES = \
--- pegasus/src/Clients/cimauth/Makefile.PIE	2006-01-30 11:16:32.000000000 -0500
+++ pegasus/src/Clients/cimauth/Makefile	2006-04-06 16:16:17.000000000 -0400
@@ -36,6 +36,8 @@
 
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE) 
+
 LIBRARIES = \
     pegcliutils \
     pegclient \
--- pegasus/src/Clients/cimconfig/Makefile.PIE	2006-01-30 11:16:32.000000000 -0500
+++ pegasus/src/Clients/cimconfig/Makefile	2006-04-06 16:15:59.000000000 -0400
@@ -36,6 +36,8 @@
 
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE) 
+
 LIBRARIES = \
     pegcliutils \
     pegclient \
--- pegasus/src/Clients/wbemexec/Makefile.PIE	2006-01-30 11:16:37.000000000 -0500
+++ pegasus/src/Clients/wbemexec/Makefile	2006-04-06 16:15:23.000000000 -0400
@@ -36,6 +36,8 @@
 
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE) 
+
 ifdef PEGASUS_HAS_SSL
   FLAGS += -DPEGASUS_HAS_SSL -DPEGASUS_SSL_RANDOMFILE
   SYS_INCLUDES += -I$(OPENSSL_HOME)/include

pegasus-2.5.1-cmpi-provider-lib.patch:
 FixedPropertyTableLinux.h |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE pegasus-2.5.1-cmpi-provider-lib.patch ---
--- pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h.cmpi_provider_lib	2006-03-14 16:06:37.000000000 -0500
+++ pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h	2006-04-05 20:06:55.000000000 -0400
@@ -65,8 +65,8 @@
     {"crlStore",             PEGASUS_SSL_SERVER_CRL},
 #endif
     {"repositoryDir",        PEGASUS_REPOSITORY_DIR},
-    {"providerDir",          PEGASUS_PROVIDER_LIB_DIR":/usr/lib/cmpi"},
-#else
+    {"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)
     {"logdir",              "/var/opt/tog-pegasus/log"},
@@ -84,8 +84,8 @@
     {"providerDir",         "/opt/tog-pegasus/providers/lib"},
 #endif
     {"messageDir",         "/opt/tog-pegasus/share/locale/ICU_Messages"},
-#endif
-#endif
+#endif /* PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS */
+#endif /*  defined(PEGASUS_USE_RELEASE_DIRS) && !defined(PEGASUS_OS_LSB) */
 #if defined(PEGASUS_USE_RELEASE_DIRS) && defined(PEGASUS_OS_LSB)
     {"traceFilePath",       "/var/opt/lsb-pegasus/cache/cimserver.trc"},
 #if !defined(PEGASUS_USE_SYSLOGS)

pegasus-2.5.1-enable_cql.patch:
 env_var_Linux.status |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

--- NEW FILE pegasus-2.5.1-enable_cql.patch ---
--- pegasus/env_var_Linux.status.enable-cql	2006-03-15 20:33:51.000000000 -0500
+++ pegasus/env_var_Linux.status	2006-04-06 15:19:35.000000000 -0400
@@ -18,7 +18,7 @@
 PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
 endif
 
-PEGASUS_DISABLE_CQL=true
+PEGASUS_ENABLE_CQL=true
 PEGASUS_DISABLE_OBJECT_NORMALIZATION=true
 PEGASUS_DISABLE_PERFINST=yes
 PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true
@@ -26,7 +26,6 @@
 PEGASUS_HAS_SSL=yes
 PEGASUS_NOASSERTS=yes
 PEGASUS_PAM_AUTHENTICATION=true
-PEGASUS_USE_PAM_STANDALONE_PROC=true
 PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true
 PEGASUS_USE_RELEASE_DIRS=true
 PEGASUS_USE_SYSLOGS=true
@@ -64,9 +63,10 @@
 PEGASUS_LOCAL_AUTH_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/localauth
 PEGASUS_TRACE_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/trace
 PEGASUS_TRACE_FILE_PATH = $(PEGASUS_VARDATA_CACHE_DIR)/trace/cimserver.trc
+PEGASUS_CONFIG_DIR = /etc/Pegasus
 PEGASUS_PLANNED_CONFIG_FILE = cimserver_planned.conf
 PEGASUS_PLANNED_CONFIG_FILE_PATH = \
-     $(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
+     $(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
 PEGASUS_CURRENT_CONFIG_FILE = cimserver_current.conf
 PEGASUS_CURRENT_CONFIG_FILE_PATH = \
      $(PEGASUS_VARDATA_DIR)/$(PEGASUS_CURRENT_CONFIG_FILE)
@@ -74,8 +74,6 @@
 PEGASUS_LOG_DIR = $(PEGASUS_VARDATA_DIR)/log
 PEGASUS_INSTALL_LOG = $(PEGASUS_LOG_DIR)/install.log
 
-PEGASUS_CONFIG_DIR = /etc/Pegasus
-
 PEGASUS_VARRUN_DIR = /var/run/tog-pegasus
 PEGASUS_CIMSERVER_START_FILE = $(PEGASUS_VARRUN_DIR)/cimserver.pid
 CIMSERVER_LOCK_FILE = $(PEGASUS_VARRUN_DIR)/cimserver_start.lock

pegasus-2.5.1-fix_tests.patch:
 Makefile.ReleaseTest |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE pegasus-2.5.1-fix_tests.patch ---
--- pegasus/Makefile.ReleaseTest.fix-tests	2006-02-28 17:23:55.000000000 -0500
+++ pegasus/Makefile.ReleaseTest	2006-04-10 22:17:27.000000000 -0400
@@ -165,7 +165,7 @@
 
 createMakefile_providerlinks:
 	@$(ECHO-E) "create_providerlinks:" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
-	@$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(ECHO-E) "\t@$(MAKE) createlink OBJECT=$(PEGASUS_TEST_DIR)/$(PEGASUS_ARCH_LIB)/$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile ;)
+	@$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(ECHO-E) "\t@$(MAKE) createlink OBJECT=$(PEGASUS_TEST_DIR)/lib/$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile ;)
 	@$(ECHO-E) "" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
 	@$(ECHO-E) "remove_providerlinks:" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
 	@$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(ECHO-E) "\trm -f $(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile ;)
@@ -189,8 +189,10 @@
 	@$(ECHO-E) "tests:" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
 	@$(ECHO-E) "\t@$(MAKE) -i cimstop" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
 	@$(ECHO-E) "\t@$(MAKE) prestarttests" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
-	@$(ECHO-E) "\t@$(MAKE) runTestSuite CIMSERVER_CONFIG_OPTIONS=\"$(TESTSUITE_CONFIG_1)\" TESTSUITE_CMDS=\"$(TESTSUITE_CMDS_1)\"" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
-	@$(ECHO-E) "\t@$(MAKE) runTestSuite CIMSERVER_CONFIG_OPTIONS=\"$(TESTSUITE_CONFIG_2)\" TESTSUITE_CMDS=\"$(TESTSUITE_CMDS_2)\"" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
+	@$(ECHO-E) "\t@$(MAKE) setupTEST" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
+	@$(ECHO-E) "\t@$(MAKE) runTestSuite CIMSERVER_CONFIG_OPTIONS=\"$(TESTSUITE_CONFIG_1)\" TESTSUITE_CMDS=\"$(TESTSUITE_CMDS_1)\" || { $(MAKE) unsetupTEST; exit 1; }" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
+	@$(ECHO-E) "\t@$(MAKE) runTestSuite CIMSERVER_CONFIG_OPTIONS=\"$(TESTSUITE_CONFIG_2)\" TESTSUITE_CMDS=\"$(TESTSUITE_CMDS_2)\" || { $(MAKE) unsetupTEST; exit 1; }" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
+	@$(ECHO-E) "\t@$(MAKE) unsetupTEST" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
 	@$(ECHO-E) "" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
 
 createMakefile_setupTEST:

pegasus-2.5.1-fix_zseries_flags.patch:
 platform_LINUX_ZSERIES64_GNU.mak |    2 +-
 platform_LINUX_ZSERIES_GNU.mak   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE pegasus-2.5.1-fix_zseries_flags.patch ---
--- pegasus/mak/platform_LINUX_ZSERIES64_GNU.mak.fix_zseries_flags	2006-01-30 11:16:23.000000000 -0500
+++ pegasus/mak/platform_LINUX_ZSERIES64_GNU.mak	2006-04-10 20:10:04.000000000 -0400
@@ -35,4 +35,4 @@
 
 ARCHITECTURE = zseries
 
-FLAGS = -fsigned-char
+FLAGS += -fsigned-char
--- pegasus/mak/platform_LINUX_ZSERIES_GNU.mak.fix_zseries_flags	2006-01-30 11:16:23.000000000 -0500
+++ pegasus/mak/platform_LINUX_ZSERIES_GNU.mak	2006-04-10 20:09:41.000000000 -0400
@@ -35,4 +35,4 @@
 
 ARCHITECTURE = zseries
 
-FLAGS = -fsigned-char
+FLAGS += -fsigned-char

pegasus-2.5.1-initscript.patch:
 tog-pegasus.rc |  124 ++++++++++++++++++++++++++++++---------------------------
 1 files changed, 67 insertions(+), 57 deletions(-)

--- NEW FILE pegasus-2.5.1-initscript.patch ---
--- pegasus/rpm/tog-pegasus.rc.initscript	2006-01-30 11:16:24.000000000 -0500
+++ pegasus/rpm/tog-pegasus.rc	2006-04-11 13:57:31.000000000 -0400
@@ -1,80 +1,85 @@
-#//%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.
-#//
-#//==============================================================================
-#! /bin/sh
-#//
-#//%/////////////////////////////////////////////////////////////////////////////
-
-### BEGIN INIT INFO
-# Provides: tog-pegasus
-# Required-Start: $syslog $network
-# Should-Start: $time
-# Required-Stop: $syslog
-# Default-Start:  3 5
-# Default-Stop: 0 1 2 6
-# Description:	  init script for Pegasus CIM server
-### END INIT INFO
-
-CIMSERVER_BIN=/opt/tog-pegasus/sbin/cimserver
+#!/bin/bash
+#
+# chkconfig:	- 98 1
+# description:  The Open Group Pegasus cimserver initscript
+# processname:  cimserver
+# pidfile:      /var/run/tog-pegasus/cimserver.pid
+#
+CIMSERVER_BIN=/usr/sbin/cimserver
 prog=cimserver
+LOCKFILE=/var/lock/subsys/tog-pegasus
+. /etc/rc.d/init.d/functions
 
-test -x $CIMSERVER_BIN || exit 5
+if [ ! -x $CIMSERVER_BIN ]; then
+    echo -n "tog-pegasus $1: $CIMSERVER_BIN not found or not executable.";
+    failure;
+    exit 1;
+fi;
+
+[ -e /etc/sysconfig/tog-pegasus ] && . /etc/sysconfig/tog-pegasus;
+
+PEGASUS_SSL_CONF_FILE=${PEGASUS_SSL_CONF_FILE:=/etc/Pegasus/ssl.cnf}
+PEGASUS_SSL_CERT_FILE=${PEGASUS_SSL_CERT_FILE:=/etc/Pegasus/server.pem}
+PEGASUS_SSL_KEY_FILE=${PEGASUS_SSL_KEY_FILE:=/etc/Pegasus/file.pem}
+PEGASUS_SSL_TRUSTSTORE=${PEGASUS_SSL_TRUSTSTORE:=/etc/Pegasus/client.pem}
 
-. /lib/lsb/init-functions
 RETVAL=0
 
 case "$1" in
-     start)
+     start)	
+	if [ ! -e ${PEGASUS_SSL_CONF_FILE} ] || [ ! -e ${PEGASUS_SSL_CERT_FILE} ] || 
+	   [ ! -e ${PEGASUS_SSL_KEY_FILE} ]  || [ ! -e ${PEGASUS_SSL_TRUSTSTORE} ]; then
+	   if [ -x /usr/share/Pegasus/scripts/genOpenPegasusSSLCerts ]; then
+	       echo -n "tog-pegasus: Generating cimserver SSL certificates...";
+	       /usr/share/Pegasus/scripts/genOpenPegasusSSLCerts;
+	       if [ $? -eq 0 ]; then
+		   success;
+	       else
+		   failure;
+	       fi;
+	       echo;
+	   fi;
+	fi;
 	echo -n $"Starting up CIM server: "
-	$CIMSERVER_BIN
+	$CIMSERVER_BIN ${CIMSERVER_OPTIONS}
 	RETVAL=$?
-	[ "$RETVAL" -eq 0 ] && log_success_msg $"$prog start" || log_failure_msg $"$prog start"
-	echo
+	if [ "$RETVAL" -eq 0 ]; then
+	    touch $LOCKFILE;
+	    success;
+	else
+	    failure;
+	fi;
+	echo;
 	;;
 
      stop)
 	echo -n $"Shutting down CIM server: "
 	killproc cimserver
 	RETVAL=$?
-	[ "$RETVAL" -eq 0 ] && log_success_msg $"$prog stop" || log_failure_msg $"$prog stop"
+	if [ "$RETVAL" -eq 0 ]; then
+	    rm -f $LOCKFILE;
+	    rm -f /var/run/tog-pegasus/socket/*;
+	    rm -f /var/run/tog-pegasus/cimserver.pid;
+	    success;
+	else
+	    failure;
+	fi
 	echo
 	;;
+
      status)
 	pid=`pidofproc $CIMSERVER_BIN`
 	RETVAL=$?
 	if [ "$RETVAL" -eq 0 ]; then
-		echo "CIM server is running"
+	    echo -n $"CIM server ($pid) is running";
+	    success;
 	else
-		echo "CIM server is not running"
+	    echo -n $"CIM server is not running";
+	    failure;
 	fi
+	echo
 	;;
+
      condrestart)
 	pid=`pidofproc $CIMSERVER_BIN`
 	RETVAL=$?
@@ -83,13 +88,18 @@
 	    RETVAL=$?;
 	fi;
         ;;
+
      try-restart)
-	$0 stop && $0 start
+	$0 stop && $0 start;
+	RETVAL=$?;
 	;;
+
      restart|force-reload)
-	$0 stop
-	$0 start
+	$0 stop;
+	$0 start;
+	RETVAL=$?;
 	;;
+
      reload)
 	;;
      *)

pegasus-2.5.1-linkflags.patch:
 library.mak |    4 ++++
 program.mak |    4 ++++
 2 files changed, 8 insertions(+)

--- NEW FILE pegasus-2.5.1-linkflags.patch ---
--- pegasus/mak/library.mak.linkflags	2006-01-30 11:16:23.000000000 -0500
+++ pegasus/mak/library.mak	2006-04-05 17:11:23.000000000 -0400
@@ -40,6 +40,10 @@
 
 include $(ROOT)/mak/common.mak
 
+ifdef PEGASUS_EXTRA_LIBRARY_LINK_FLAGS
+    EXTRA_LINK_FLAGS = $(PEGASUS_EXTRA_LIBRARY_LINK_FLAGS)
+endif
+
 ################################################################################
 ##
 ## Build list of object names.
--- pegasus/mak/program.mak.linkflags	2006-01-30 11:16:23.000000000 -0500
+++ pegasus/mak/program.mak	2006-04-05 17:10:37.000000000 -0400
@@ -38,6 +38,10 @@
 
 include $(ROOT)/mak/common.mak
 
+ifdef PEGASUS_EXTRA_PROGRAM_LINK_FLAGS
+    EXTRA_LINK_FLAGS = $(PEGASUS_EXTRA_PROGRAM_LINK_FLAGS)
+endif
+
 ifeq ($(OS_TYPE),windows)
 include $(ROOT)/mak/program-windows.mak
 endif

pegasus-2.5.1-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.1-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-04-05 20:35:40.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-04-05 20:40:40.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-04-05 20:35:40.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-01-30 11:18:28.000000000 -0500
+++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp	2006-04-05 20:35:40.000000000 -0400
@@ -138,7 +138,7 @@
     authInfo->setAuthenticatedUser(userName);
     authInfo->setAuthenticatedPassword(password);
 #else
-    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-04-05 20:35:40.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-04-05 20:35:40.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-04-05 20:35:40.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-04-05 20:35:40.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-04-05 20:35:40.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-02-28 21:21:37.000000000 -0500
+++ pegasus/src/Pegasus/Common/HTTPConnection.cpp	2006-04-05 20:35:40.000000000 -0400
@@ -1828,6 +1828,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-04-05 20:37:59.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-04-05 20:35:40.000000000 -0400
@@ -80,7 +80,8 @@
       ContentLanguageList contentLanguages;
       Boolean acceptLanguagesDecoded;
       Boolean contentLanguagesDecoded;
-			CIMException cimException;
+      Boolean fromRemoteHost;	       
+      CIMException cimException;
 
       void parse(
 	 String& startLine,

pegasus-2.5.1-no-rpath.patch:
 mak/library-unix.mak                                      |    6 +++---
 mak/program-unix.mak                                      |   14 ++------------
 src/Pegasus/Common/Makefile                               |    3 +--
 src/Pegasus/ControlProviders/CertificateProvider/Makefile |    3 +--
 4 files changed, 7 insertions(+), 19 deletions(-)

--- NEW FILE pegasus-2.5.1-no-rpath.patch ---
--- pegasus/mak/library-unix.mak.no-rpath	2006-01-30 11:16:23.000000000 -0500
+++ pegasus/mak/library-unix.mak	2006-04-08 18:28:43.000000000 -0400
@@ -81,14 +81,14 @@
   ifneq ($(PEGASUS_PLATFORM),DARWIN_PPC_GNU)
    ifdef PEGASUS_USE_RELEASE_DIRS
       LINK_COMMAND = $(CXX) -shared $(LINK_MACHINE_OPTIONS)
-      LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)  -Xlinker -rpath -Xlinker $(PEGASUS_DEST_LIB_DIR)
+      LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)  $(EXTRA_LINK_ARGUMENTS)
    else
       LINK_COMMAND = $(CXX) -shared $(LINK_MACHINE_OPTIONS)
-      LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)  -Xlinker -rpath -Xlinker $(LIB_DIR) $(EXTRA_LINK_ARGUMENTS)
+      LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)  $(EXTRA_LINK_ARGUMENTS)
    endif
   else
     LINK_COMMAND = $(CXX) -dynamiclib
-    LINK_ARGUMENTS = --helplib$(LIBRARY)$(LIB_SUFFIX) -ldl
+    LINK_ARGUMENTS = --helplib$(LIBRARY)$(LIB_SUFFIX) -ldl $(EXTRA_LINK_ARGUMENTS)
   endif
   ifeq ($(PEGASUS_PLATFORM), SOLARIS_SPARC_GNU)
 	LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -Xlinker -L$(LIB_DIR) $(EXTRA_LINK_ARGUMENTS)
--- pegasus/mak/program-unix.mak.no-rpath	2006-01-30 11:16:23.000000000 -0500
+++ pegasus/mak/program-unix.mak	2006-04-08 18:28:43.000000000 -0400
@@ -30,22 +30,12 @@
 #//==============================================================================
 INCLUDES = -I$(ROOT)/src $(EXTRA_INCLUDES)
 
-ifndef LINK_RPATH
-    LINK_RPATH = -Xlinker -rpath
-endif
-
 LINK_DEST_LIB = -Xlinker $(PEGASUS_DEST_LIB_DIR)
 
 LINK_LIB_DIR = -Xlinker $(LIB_DIR)
 
 LINK_ICU = -Xlinker ${ICU_INSTALL}/lib
 
-ifndef LINK_RPATH_LINK
-    LINK_RPATH_LINK = -Xlinker -rpath-link
-endif
-
-
-
 TMP_OBJECTS = $(foreach i,$(SOURCES),$(OBJ_DIR)/$i)
 
 ifeq ($(OS_TYPE),windows)
@@ -118,9 +108,9 @@
           endif
         else
           ifdef  PEGASUS_USE_RELEASE_DIRS
-	    $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_DEST_LIB) $(LINK_RPATH_LINK) $(LINK_LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
+	    $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
           else
-	    $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) 
+	    $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) 
           endif
         endif      
       else
--- pegasus/src/Pegasus/ControlProviders/CertificateProvider/Makefile.no-rpath	2006-01-30 11:17:40.000000000 -0500
+++ pegasus/src/Pegasus/ControlProviders/CertificateProvider/Makefile	2006-04-09 02:19:33.000000000 -0400
@@ -58,8 +58,7 @@
 ifeq ($(OS),linux)
   EXTRA_LIBRARIES += -lcrypt
   ifdef PEGASUS_HAS_SSL
-    EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto
-    EXTRA_LINK_ARGUMENTS =  -Xlinker -rpath -Xlinker $(OPENSSL_HOME)/lib
+    EXTRA_LIBRARIES += -lssl -lcrypto
   endif
 endif
 
--- pegasus/src/Pegasus/Common/Makefile.no-rpath	2006-01-30 11:17:05.000000000 -0500
+++ pegasus/src/Pegasus/Common/Makefile	2006-04-09 02:23:54.000000000 -0400
@@ -185,8 +185,7 @@
 ifeq ($(OS),linux)
   EXTRA_LIBRARIES += -lcrypt
   ifdef PEGASUS_HAS_SSL
-    EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto
-    EXTRA_LINK_ARGUMENTS =  -Xlinker -rpath -Xlinker $(OPENSSL_HOME)/lib
+    EXTRA_LIBRARIES += -lssl -lcrypto
   endif
 endif
 

pegasus-2.5.1-pam-wbem.patch:
 wbem |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)

--- NEW FILE pegasus-2.5.1-pam-wbem.patch ---
--- pegasus/rpm/wbem.pam-wbem	2006-01-17 14:17:43.000000000 -0500
+++ pegasus/rpm/wbem	2006-04-05 19:26:46.000000000 -0400
@@ -1,13 +1,7 @@
 #%PAM-1.0
-auth        required      $ISA/pam_env.so
-auth        sufficient    $ISA/pam_unix.so nullok
-auth        required      $ISA/pam_deny.so
-
-account     required      $ISA/pam_unix.so
-
-password    required      $ISA/pam_cracklib.so retry=3 type=
-password    sufficient    $ISA/pam_unix.so nullok use_authtok md5 shadow
-password    required      $ISA/pam_deny.so
-
-session     required      $ISA/pam_limits.so
-session     required      $ISA/pam_unix.so
+auth       include      system-auth
+account    required     pam_access.so accessfile=/etc/Pegasus/access.conf
+account    include      system-auth
+password   include      system-auth
+session    include      system-auth
+session    required     pam_loginuid.so 

pegasus-2.5.1-parallel_make.patch:
 objects-unix.mak |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE pegasus-2.5.1-parallel_make.patch ---
--- pegasus/mak/objects-unix.mak.parallel_make	2006-01-30 11:16:23.000000000 -0500
+++ pegasus/mak/objects-unix.mak	2006-04-10 16:58:30.000000000 -0400
@@ -50,7 +50,7 @@
 
 
 ifeq ($(_NO_TMP_O), yes)
-$(OBJ_DIR)/%.o: %.cpp $(ERROR)
+$(OBJ_DIR)/%.o: $(OBJ_DIR)/target %.cpp $(ERROR)
 	$(CXX) -c -o $@ $(FLAGS) $(EXTRA_CXX_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.cpp
 	@ $(TOUCH) $@
 	@ $(ECHO)
@@ -64,7 +64,7 @@
 endif
 
 ifeq ($(_NO_TMP_O), yes)
-$(OBJ_DIR)/%.o: %.c $(ERROR)
+$(OBJ_DIR)/%.o: $(OBJ_DIR)/target %.c $(ERROR)
 	$(CC) -c -o $@ $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.c
 	@ $(TOUCH) $@
 	@ $(ECHO)
@@ -78,7 +78,7 @@
 endif
 
 ifeq ($(_NO_TMP_O), yes)
-$(OBJ_DIR)/%.o: %.s $(ERROR)
+$(OBJ_DIR)/%.o: $(OBJ_DIR)/target  %.s $(ERROR)
 	$(CC) -c -o $@ $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.s
 	@ $(TOUCH) $@
 	@ $(ECHO)

pegasus-2.5.1-redhat-config.patch:
 Makefile.Release     |    6 +++---
 env_var_Linux.status |   14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE pegasus-2.5.1-redhat-config.patch ---
--- pegasus/env_var_Linux.status.redhat-config	2006-03-15 20:33:51.000000000 -0500
+++ pegasus/env_var_Linux.status	2006-04-11 15:56:29.000000000 -0400
@@ -18,7 +18,9 @@
 PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
 endif
 
-PEGASUS_DISABLE_CQL=true
+PEGASUS_ENABLE_CQL=true
+PEGASUS_DEFAULT_ENABLE_OOP = false
+
 PEGASUS_DISABLE_OBJECT_NORMALIZATION=true
 PEGASUS_DISABLE_PERFINST=yes
 PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true
@@ -26,7 +28,6 @@
 PEGASUS_HAS_SSL=yes
 PEGASUS_NOASSERTS=yes
 PEGASUS_PAM_AUTHENTICATION=true
-PEGASUS_USE_PAM_STANDALONE_PROC=true
 PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true
 PEGASUS_USE_RELEASE_DIRS=true
 PEGASUS_USE_SYSLOGS=true
@@ -64,22 +65,21 @@
 PEGASUS_LOCAL_AUTH_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/localauth
 PEGASUS_TRACE_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/trace
 PEGASUS_TRACE_FILE_PATH = $(PEGASUS_VARDATA_CACHE_DIR)/trace/cimserver.trc
+PEGASUS_CONFIG_DIR = /etc/Pegasus
 PEGASUS_PLANNED_CONFIG_FILE = cimserver_planned.conf
 PEGASUS_PLANNED_CONFIG_FILE_PATH = \
-     $(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
+     $(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
 PEGASUS_CURRENT_CONFIG_FILE = cimserver_current.conf
 PEGASUS_CURRENT_CONFIG_FILE_PATH = \
-     $(PEGASUS_VARDATA_DIR)/$(PEGASUS_CURRENT_CONFIG_FILE)
+     $(PEGASUS_CONFIG_DIR)/$(PEGASUS_CURRENT_CONFIG_FILE)
 
 PEGASUS_LOG_DIR = $(PEGASUS_VARDATA_DIR)/log
 PEGASUS_INSTALL_LOG = $(PEGASUS_LOG_DIR)/install.log
 
-PEGASUS_CONFIG_DIR = /etc/Pegasus
-
 PEGASUS_VARRUN_DIR = /var/run/tog-pegasus
 PEGASUS_CIMSERVER_START_FILE = $(PEGASUS_VARRUN_DIR)/cimserver.pid
 CIMSERVER_LOCK_FILE = $(PEGASUS_VARRUN_DIR)/cimserver_start.lock
-PEGASUS_LOCAL_DOMAIN_SOCKET_DIR = $(PEGASUS_VARRUN_DIR)/socket
+PEGASUS_LOCAL_DOMAIN_SOCKET_DIR = $(PEGASUS_VARRUN_DIR)
 PEGASUS_LOCAL_DOMAIN_SOCKET_PATH = \
      $(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)/cimxml.socket
 
--- pegasus/Makefile.Release.redhat-config	2006-01-30 11:16:16.000000000 -0500
+++ pegasus/Makefile.Release	2006-04-11 15:47:08.000000000 -0400
@@ -590,10 +590,10 @@
 	$(foreach i, $(MANAGEDSYSTEM_MOF_FILES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus/$(i);)
 
 stage_PegasusVarDataDirectoryFiles: FORCE
-	$(COPY) $(ROOT)/src/Server/cimserver_planned.conf $(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
+	$(COPY) $(ROOT)/src/Server/cimserver_planned.conf $(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
 
 setpermissions_PegasusVarDataDirectoryFiles: FORCE
-	$(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr________)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
+	$(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr________)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
 
 stage_genOpenPegasusSSLCertsFile: FORCE
 	@$(RM) $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/genOpenPegasusSSLCerts
@@ -1233,7 +1233,7 @@
 	@$(ECHO-E) "%config %attr($(Prwxr_x___),$(INSTALL_USR),$(INSTALL_GRP))"\
             "/etc/init.d/tog-pegasus" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 	@$(ECHO-E) "%config(noreplace)" \
-            "$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)" \
+            "$(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 	@$(ECHO-E) "%config(noreplace) $(PEGASUS_CONFIG_DIR)/access.conf" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)

pegasus-2.5.1-warnings.patch:
 Common/Packer.h                               |    4 ++--
 Common/ResponseHandler.cpp                    |    4 ++--
 Common/String.cpp                             |    4 ++--
 Common/StringInline.h                         |    4 ++--
 Config/ConfigManager.cpp                      |    2 +-
 ProviderManager2/CMPI/CMPIProviderManager.cpp |    6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)

--- NEW FILE pegasus-2.5.1-warnings.patch ---
--- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.cpp.warnings	2006-02-28 14:53:30.000000000 -0500
+++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.cpp	2006-04-05 19:27:27.000000000 -0400
@@ -88,7 +88,7 @@
    char **props;
    int pCount;
   public:
-   CMPIPropertyList(CIMPropertyList &propertyList) {
+    CMPIPropertyList(CIMPropertyList &propertyList) : props(0L), pCount(0) {
       if (!propertyList.isNull()) {
         Array<CIMName> p=propertyList.getPropertyNameArray();
         pCount=p.size();
@@ -2497,7 +2497,7 @@
 
     try
     {
-        indProvRecord *provRec;
+        indProvRecord *provRec = 0L;
         if (provTab.lookup (ph.GetProvider ().getName (), provRec))
         {
             provRec->enabled = true;
@@ -2587,7 +2587,7 @@
     PEG_METHOD_ENTER (TRC_PROVIDERMANAGER,
         "CMPIProviderManager::_callDisableIndications");
 
-    indProvRecord * provRec;
+    indProvRecord * provRec = 0L;
     if (provTab.lookup (ph.GetProvider ().getName (), provRec))
     {
         provRec->enabled = false;
--- pegasus/src/Pegasus/Config/ConfigManager.cpp.warnings	2006-03-14 16:06:37.000000000 -0500
+++ pegasus/src/Pegasus/Config/ConfigManager.cpp	2006-04-05 19:27:27.000000000 -0400
@@ -758,7 +758,7 @@
     //
     for (Uint32 i = 0; i < NUM_PROPERTIES; i++)
     {
-        const char* fixedValue;
+        const char* fixedValue = 0L;
 
         _properties[i].propertyOwner->initialize();
 
--- pegasus/src/Pegasus/Common/Packer.h.warnings	2006-01-30 11:17:07.000000000 -0500
+++ pegasus/src/Pegasus/Common/Packer.h	2006-04-05 19:27:27.000000000 -0400
@@ -173,12 +173,12 @@
 
 inline void Packer::packReal32(Buffer& out, Real32 x)
 {
-    packUint32(out, *((Uint32*)&x));
+    packUint32(out, (Uint32)x);
 }
 
 inline void Packer::packReal64(Buffer& out, Real64 x)
 {
-    packUint64(out, *((Uint64*)&x));
+    packUint64(out, (Uint64)x);
 }
 
 inline void Packer::packChar16(Buffer& out, Char16 x)
--- pegasus/src/Pegasus/Common/StringInline.h.warnings	2006-01-30 11:17:08.000000000 -0500
+++ pegasus/src/Pegasus/Common/StringInline.h	2006-04-05 19:30:43.000000000 -0400
@@ -102,7 +102,7 @@
 
 PEGASUS_STRING_INLINE const Char16* String::getChar16Data() const 
 { 
-    return (Char16*)_rep->data; 
+    return (Char16*)&(_rep->data[0]); 
 }
 
 PEGASUS_STRING_INLINE Char16& String::operator[](Uint32 i) 
@@ -145,7 +145,7 @@
 
 PEGASUS_STRING_INLINE Uint32 String::find(const String& s) const
 {
-    return StringFindAux(_rep, (Char16*)s._rep->data, s._rep->size);
+    return StringFindAux(_rep, (Char16*)&(s._rep->data[0]), s._rep->size);
 }
 
 PEGASUS_STRING_INLINE String& String::append(const Char16& c)
--- pegasus/src/Pegasus/Common/ResponseHandler.cpp.warnings	2006-01-30 11:17:07.000000000 -0500
+++ pegasus/src/Pegasus/Common/ResponseHandler.cpp	2006-04-05 19:27:27.000000000 -0400
@@ -79,7 +79,7 @@
 ResponseHandlerRep* _getRep(
     const ResponseHandler* object)
 {
-    ResponseHandlerRep* rep;
+    ResponseHandlerRep* rep = 0L;
     Boolean found;
 
     AutoMutex lock(repTableMutex);
@@ -91,7 +91,7 @@
 void _deleteRep(
     ResponseHandler* object)
 {
-    ResponseHandlerRep* rep;
+    ResponseHandlerRep* rep = 0L;
     Boolean found;
 
     AutoMutex lock(repTableMutex);
--- pegasus/src/Pegasus/Common/String.cpp.warnings	2006-01-30 11:17:08.000000000 -0500
+++ pegasus/src/Pegasus/Common/String.cpp	2006-04-05 19:27:27.000000000 -0400
@@ -843,7 +843,7 @@
 
 String& String::append(const String& str)
 {
-    return append((Char16*)str._rep->data, str._rep->size);
+    return append((Char16*)(&(str._rep->data[0])), str._rep->size);
 }
 
 String& String::append(const char* str, Uint32 size)
@@ -905,7 +905,7 @@
         if (n == PEG_NOT_FOUND || n > _rep->size - index)
             n = _rep->size - index;
 
-        return String((Char16*)_rep->data + index, n);
+        return String((Char16*)(_rep->data + index), n);
     }
 
     return String();


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Oct 2005 17:52:26 -0000	1.4
+++ sources	11 Apr 2006 20:40:59 -0000	1.5
@@ -1 +1 @@
-0b068fd576f199f8a0946e2f659acfe4  pegasus-2.5.tar.gz
+b7b392d2ff7ba9a4a3b8d7722d47314b  pegasus-2.5.1.tar.gz


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/FC-5/tog-pegasus.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- tog-pegasus.spec	7 Mar 2006 19:02:19 -0000	1.24
+++ tog-pegasus.spec	11 Apr 2006 20:40:59 -0000	1.25
@@ -1,45 +1,85 @@
-################################################################################
+#
 #
 #               OpenPegasus (Red Hat release) RPM .spec file
 #
-%{?!WITH_TEST:   %define WITH_TEST        0}
-# do "rpmbuild --define 'WITH_TEST 1'" to build test RPM .
-# NOTE: Must use "rpm -[iU]vh --define 'WITH_TEST 1'" for all RPMs if test rpm
-#       is to be installed.
-#       DO NOT install test rpm for production use.
-%{?!AUTOSTART:   %define AUTOSTART        0}
-# Use "rpm -[iU]vh --define 'AUTOSTART 1'" in order to have cimserver enabled
-# (chkconfig --level=345 tog-pegasus on) after installation.
-#
-#%define		debug_package	%{nil}
-Summary: 	OpenPegasus WBEM Services for Linux
-Name:    	tog-pegasus
-Version: 	2.5
-Release:	9
-Epoch:   	2
-Group:   	Systems Management/Base
-License: 	Open Group Pegasus Open Source
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root
-URL:		http://www.openpegasus.org/
-%define srcname pegasus
-Source0: 	%{srcname}-%{version}.tar.gz
-Source1:        rpm_build_env
-Source2:        README.RedHat.Security
-Source3:        access.conf
-Source4:        genSSLcerts
-Patch0:         pegasus-2.5-redhat.patch
-Patch1:         pegasus-2.5-local-or-remote-auth.patch
-Patch2:         pegasus-2.5-make_install.patch
-Patch3:         pegasus-2.5-add_cmpi_provider_lib.patch
-Patch4:		pegasus-2.5-enable_cql.patch
-Patch5:		pegasus-2.5-bz173401.patch
-Patch6:         pegasus-2.5-syslog_h.patch
-Patch7:		pegasus-2.5-install_id.patch
-BuildRequires:    bash, sed, grep, coreutils, procps, gcc, gcc-c++, libstdc++, make, pam-devel, krb5-devel, krb5-libs, openssl-devel >= 0.9.6, e2fsprogs
-Requires:         bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam, krb5-libs, e2fsprogs, redhat-lsb, chkconfig, SysVinit, bind-utils, bind-libs, net-tools
-Requires(post):   bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam, krb5-libs, e2fsprogs, redhat-lsb, chkconfig, SysVinit, bind-utils, bind-libs, net-tools 
-Requires(pre):    bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam, krb5-libs, e2fsprogs, redhat-lsb, chkconfig, SysVinit, bind-utils, bind-libs, net-tools
-Requires(postun): bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam, krb5-libs, e2fsprogs, redhat-lsb, chkconfig, SysVinit, bind-utils, bind-libs, net-tools
+#  tog-pegasus.spec
+#
+#   Copyright (c) 2000 - 2006, 
+#     The Open Group; Hewlett-Packard Development Company, L.P.;
+#     IBM Corp.;  BMC Software; Tivoli Systems.
+#     Licensed under the "Open Group Pegasus Open Source" license 
+#     shipped with this software.
+#
+#  Upstream tog-pegasus.spec file modified for Red Hat build -
+#  April 2006, Jason Vas Dias <jvdias at redhat.com>, Red Hat Inc.
+#
+
+%{?!LINUX_VERSION: 		%define LINUX_VERSION  FC5}
+#
+%{?!PEGASUS_BUILD_TEST_RPM:   	%define PEGASUS_BUILD_TEST_RPM        0}
+# do "rpmbuild --define 'PEGASUS_BUILD_TEST_RPM 1'" to build test RPM.
+#
+%{?!NOCLEAN:     		%define NOCLEAN 0}
+# ^- 1: don't do %clean
+%{?!NODEBUGINFO: 		%define NODEBUGINFO 0}
+# ^- 1: don't generate debuginfo or strip binaries
+%if %{NODEBUGINFO}
+%define debug_package   %{nil}
+%endif
+%define srcname    	pegasus
+%define pegasus_gid	65
+%define pegasus_uid	66
+
+Version: 		2.5.1
+Release: 		1%{?LINUX_VERSION:.%{LINUX_VERSION}}
+Epoch:   		2
+#
+Summary:   		OpenPegasus WBEM Services for Linux
+Name:      		tog-pegasus
+Group:     		Systems Management/Base
+URL:       		http://www.openpegasus.org
+#
+License:   		Open Group Pegasus Open Source
+#
+BuildRoot: 		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+#
+Source:    		http://www.openpegasus.org/uploads/40/10123/%{srcname}-%{version}.tar.gz
+Source1:		RedHat.OpenPegasus.Makefile
+Source2:        	README.RedHat.Security
+Source3:		genOpenPegasusSSLCerts
+#
+Patch0:			pegasus-2.5.1-initscript.patch
+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
+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
+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
+#
+Conflicts: 		openwbem
+Provides: 		tog-pegasus-cimserver
+#
+BuildRequires:      	bash, sed, grep, coreutils, procps, gcc, gcc-c++
+BuildRequires:      	libstdc++, make, pam-devel
+BuildRequires:      	openssl-devel >= 0.9.6, e2fsprogs
+Requires:           	bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam
+Requires:          	redhat-lsb, chkconfig, SysVinit
+Requires:           	e2fsprogs, bind-utils, net-tools
+Requires(post):     	bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam
+Requires(post):    	redhat-lsb, chkconfig, SysVinit
+Requires(post):     	e2fsprogs, bind-utils, net-tools
+Requires(pre):      	bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam
+Requires(pre):     	redhat-lsb, chkconfig, SysVinit
+Requires(pre):      	e2fsprogs, bind-utils, net-tools
+Requires(postun):   	bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam
+Requires(postun):  	redhat-lsb, chkconfig, SysVinit
+Requires(postun):   	e2fsprogs, bind-utils, net-tools
 
 %description
 OpenPegasus WBEM Services for Linux enables management solutions that deliver
@@ -49,93 +89,77 @@
 sources.
 
 %package devel
-Summary:      The OpenPegasus Software Development Kit
-Group:        Systems Management/Base
-Requires:     tog-pegasus >= 2.5
+Summary: 		The OpenPegasus Software Development Kit
+Group: 			Systems Management/Base
+Requires: 		tog-pegasus >= %{version}
+Obsoletes: 		tog-pegasus-sdk
+Requires:		make, gcc, gcc-c++
+Requires(preun): 	make
 
 %description devel
-The OpenPegasus WBEM Services for Linux SDK is the developer's kit for the OpenPegasus WBEM
-Services for Linux release. It provides Linux C++ developers with the WBEM files required to
-build WBEM Clients and Providers. It also supports C provider developers via the CMPI interface.
+The OpenPegasus WBEM Services for Linux SDK is the developer's kit for the
+OpenPegasus WBEM Services for Linux release. It provides Linux C++ developers
+with the WBEM files required to build WBEM Clients and Providers. It also
+supports C provider developers via the CMPI interface.
+
+%if %{PEGASUS_BUILD_TEST_RPM}
 
-%if %{WITH_TEST}
 %package test
-Summary:      The OpenPegasus Tests
-Group:        Systems Management/Base
-Autoreq:      0
-Requires:     tog-pegasus >= 2.5
+Summary: 		The OpenPegasus Tests
+Group: 			Systems Management/Base
+Requires: 		tog-pegasus >= %{version}, make
 
 %description test
-The OpenPegasus WBEM tests for the OpenPegasus 2.5 Linux rpm.
-**********************************************************************************
-*** DO NOT INSTALL THIS RPM ON A PRODUCTION SYSTEM - THIS IS FOR TESTING ONLY. ***
-**********************************************************************************
+The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm.
 %endif
 
 %prep
-%setup -q -n %{srcname}-%{version}
-%patch0 -p1 -b .redhat
-%patch1 -p1 -b .local_or_remote_auth
-%patch2 -p1 -b .make_install
-%patch3 -p1 -b .add_cmpi_provider_lib
-%patch4 -p1 -b .enable_cql
-# %patch5 -p1 -b .bz173401
-# now fixed with openssl-0.9.8a-3+
-%patch6 -p1 -b .syslog_h
-%patch7 -p1 -b .install_id
+%setup -q -n %{srcname}
+%patch0 -p1 -b .initscript
+%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
 
 %build
-rm -rf $RPM_BUILD_ROOT
+rm -rf ${RPM_BUILD_ROOT} || :;
+cp -fp %SOURCE1 .;
+cp -fp %SOURCE2 doc
+cp -fp %SOURCE3 rpm
 export RPM_ARCH_LIB=%{_lib}
-. %SOURCE1
-make
-export LD_LIBRARY_PATH=$PEGASUS_HOME/%{_lib}
-export PATH=$PEGASUS_HOME/bin:$PATH
-make repository
-make --directory=mak -f SDKMakefile stageSDK
-%if %{WITH_TEST}
-export PEGASUS_ENVVAR_FILE=${PEGASUS_ROOT}/env_var_Linux.status
-export PEGASUS_STAGING_DIR=$RPM_BUILD_ROOT
-make --directory=$PEGASUS_ROOT -f Makefile.ReleaseTest stageTEST
-unset  PEGASUS_STAGING_DIR
+make %{?_smp_mflags} -f RedHat.OpenPegasus.Makefile;
+%if %{PEGASUS_BUILD_TEST_RPM}
+    make %{?_smp_mflags} -f RedHat.OpenPegasus.Makefile tests;
 %endif
 
 %install
-export RPM_ARCH_LIB=%{_lib}
-. %SOURCE1
-export PEGASUS_DESTDIR=$RPM_BUILD_ROOT
-export PEGASUS_ENVVAR_FILE=${PEGASUS_ROOT}/env_var_Linux.status
-export PATH=${PEGASUS_HOME}/bin:$PATH
-export LD_LIBRARY_PATH=${PEGASUS_HOME}/%{_lib}:/%{_lib}:/usr/%{_lib}
-unset  PEGASUS_STAGING_DIR
-export PEGASUS_SDK_STAGING_DIR=${PEGASUS_HOME}/stageSDK
-# why oh why did they make /usr/bin/install fail on the chown!!! :
-export INSTALL_USER=`id -un`
-export INSTALL_GROUP=`id -gn`
-#
-make install
-rm -rf $PEGASUS_HOME
-mkdir -p $RPM_BUILD_ROOT{${PEGASUS_CONFIG_DIR},${PEGASUS_VARRUN_DIR},${PEGASUS_LOG_DIR},$PEGASUS_VARDATA_DIR}
-touch $RPM_BUILD_ROOT{${PEGASUS_CONFIG_DIR}/{cimserver_{current,planned}.conf,ssl.cnf,client.pem,server.pem,file.pem,client_2048.pem,server_2048.pem,file_2048.pem},${PEGASUS_LOG_DIR}/install.log,${PEGASUS_VARRUN_DIR}/cimxml.socket}
-mkdir -p $RPM_BUILD_ROOT/var/lib/Pegasus/prev_repository
-cp -fp %SOURCE2 ${PEGASUS_ROOT}/doc
-cp -fp %SOURCE3 $RPM_BUILD_ROOT/${PEGASUS_CONFIG_DIR}/access.conf
-chmod 640 $RPM_BUILD_ROOT/${PEGASUS_CONFIG_DIR}/access.conf
-mkdir -p $RPM_BUILD_ROOT/${PEGASUS_PRODSHARE_DIR}/scripts
-cp -fp %SOURCE4 $RPM_BUILD_ROOT/${PEGASUS_PRODSHARE_DIR}/scripts
-chmod 750 $RPM_BUILD_ROOT/${PEGASUS_PRODSHARE_DIR}/scripts/genSSLcerts
-mkdir -p $R$RPM_BUILD_ROOT/usr/%{_lib}/cmpi
-#/usr/lib/rpm/brp-compress
-#exit 0
+make -f RedHat.OpenPegasus.Makefile install prefix=$RPM_BUILD_ROOT libdir=%{_libdir} root_user=%(%{__id_u} -n) pegasus_user=%(%{__id_u} -n)
+%if %{PEGASUS_BUILD_TEST_RPM}
+    make -f RedHat.OpenPegasus.Makefile install_tests prefix=$RPM_BUILD_ROOT root_user=%(%{__id_u} -n) pegasus_user=%(%{__id_u} -n)    
+%endif
+%if %{NODEBUGINFO}
+    /usr/lib/rpm/brp-compress;
+    exit 0;
+%endif
 :;
 
 %files
-%defattr(0640,root,pegasus,0750)
-%dir /etc/Pegasus
-%dir /var/lib/Pegasus
-%attr(1750,root,pegasus) /var/run/tog-pegasus
-%dir /var/log/Pegasus
-%config %attr(750,root,root) /etc/rc.d/init.d/tog-pegasus
+%defattr(0750, root, pegasus, 0750)
+/usr/%{_lib}/*
+/usr/sbin/*
+/usr/bin/*
+/usr/share/Pegasus/scripts
+%config /etc/rc.d/init.d/tog-pegasus
+%defattr(0640, root, pegasus, 0750)
+%dir   /etc/Pegasus
 %ghost %config(noreplace) /etc/Pegasus/cimserver_current.conf
 %ghost %config(noreplace) /etc/Pegasus/cimserver_planned.conf
 %config(noreplace) /etc/Pegasus/access.conf
@@ -144,101 +168,104 @@
 %ghost /etc/Pegasus/client.pem
 %ghost /etc/Pegasus/server.pem
 %ghost /etc/Pegasus/file.pem
-%ghost /etc/Pegasus/client_2048.pem
-%ghost /etc/Pegasus/server_2048.pem
-%ghost /etc/Pegasus/file_2048.pem
-%ghost /var/log/Pegasus/install.log
-%ghost /var/lib/Pegasus/prev_repository
+%ghost /etc/Pegasus/cimserver_trust
+%ghost /etc/Pegasus/indication_trust
+%ghost /etc/Pegasus/crl
+%dir /var/lib/Pegasus
 /var/lib/Pegasus/repository
 /var/lib/Pegasus/cache
-%attr(0750,root,pegasus) /usr/sbin/*
-%attr(0755,root,pegasus) /usr/bin/*
-%attr(0755,root,pegasus) /usr/%{_lib}/*.so.*
-%dir /usr/%{_lib}/Pegasus/providers
-%dir /usr/%{_lib}/cmpi
-%attr(0755,root,pegasus) /usr/%{_lib}/Pegasus/providers/*.so.*
+%dir /var/lib/Pegasus/log
+%ghost /var/lib/Pegasus/log/install.log
+%ghost /var/lib/Pegasus/cache/trace/cimserver.trc
+%dir   %attr(1750,root,pegasus) /var/run/tog-pegasus
+%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
-%dir /usr/share/Pegasus/scripts
-%attr(0755,root,pegasus) /usr/share/Pegasus/scripts/genSSLcerts
-/usr/share/man/man*/*
-%doc doc/license.txt doc/Admin_Guide_Release.pdf doc/README.RedHat.Security doc/SecurityGuidelinesForDevelopers.html doc/PegasusSSLGuidelines.htm doc/MessageQueueService.html doc/ProviderLoading.txt 
+/usr/share/man/man1/*
+%doc doc/license.txt doc/Admin_Guide_Release.pdf doc/PegasusSSLGuidelines.htm doc/SecurityGuidelinesForDevelopers.html doc/README.RedHat.Security src/Clients/repupgrade/doc/repupgrade.html 
 
 %files devel
 %defattr(0644,root,pegasus,0755)
 /usr/include/Pegasus
 /usr/share/Pegasus/samples
 /usr/share/Pegasus/html
-%attr(0755,root,pegasus) /usr/%{_lib}/*.so
-%attr(0755,root,pegasus) /usr/%{_lib}/Pegasus/providers/*.so
-
-%if %{WITH_TEST}
-
-%post test
-/etc/init.d/tog-pegasus stop
-cd /var/lib/Pegasus
-mv repository repository.bak
-mv testrepository repository
-/usr/share/Pegasus/scripts/genSSLcerts
-cd /usr/share/Pegasus/test
-make create_providerlinks
-make tests
 
+%if %{PEGASUS_BUILD_TEST_RPM}
 %files test
-%defattr(-,root,root,-)
+%defattr(0644,root,pegasus,0755)
+%dir /usr/share/Pegasus/test
+/usr/share/Pegasus/test/Makefile
+/usr/share/Pegasus/test/mak
 /var/lib/Pegasus/testrepository
-/usr/share/Pegasus/test
+%defattr(0750,root,pegasus,0755)
+/usr/share/Pegasus/test/bin
+/usr/share/Pegasus/test/lib
+%endif
 
+%clean
+%if !%{NOCLEAN}
+[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf $RPM_BUILD_ROOT;
+[ "${RPM_BUILD_DIR}" != "/" ] && rm -rf ${RPM_BUILD_DIR}/%{srcname};
 %endif
 
 %pre
-if [ $1 -gt 1 ]; then
-   if [ -d /var/lib/Pegasus/repository/root\#PG_Internal ]; then
-      #
-      # Save the current repository to prev_repository.
-      #
-	  if [ -d /var/lib/Pegasus/prev_repository ]; then
-	     /bin/mv /var/lib/Pegasus/prev_repository /var/lib/Pegasus/prev_repository_`date '+%Y-%m-%d-%s.%N'`.rpmsave;
-	  fi
-	  /bin/mv /var/lib/Pegasus/repository /var/lib/Pegasus/prev_repository
-   fi;
-elif [ $1 -eq 1 ]; then
+if [ $1 -eq 1 ]; then
 #  first install: create the 'pegasus' user and group:
-#  By default, ONLY the "pegasus" user will be allowed to connect to cimserver over network
-   /usr/sbin/groupadd -g 65 -f -r pegasus >/dev/null 2>&1 || :;
-   /usr/sbin/useradd -u 66 -r -n -M -g pegasus -s /sbin/nologin -d /var/lib/Pegasus \
+   /usr/sbin/groupadd -g %{pegasus_gid} -f -r pegasus >/dev/null 2>&1 || :;
+   /usr/sbin/useradd -u %{pegasus_uid} -r -n -M -g pegasus -s /sbin/nologin -d /var/lib/Pegasus \
      	 		   -c "tog-pegasus OpenPegasus WBEM/CIM services" pegasus >/dev/null 2>&1 || :;
+elif [ $1 -gt 1 ]; then
+   if [ -d /var/lib/Pegasus/repository ]; then
+	if [ -d /var/lib/Pegasus/prev_repository ]; then
+	   mv /var/lib/Pegasus/prev_repository /var/lib/Pegasus/prev_repository_`date '+%Y-%m-%d-%s.%N'`.rpmsave;
+	fi;
+	mv /var/lib/Pegasus/repository /var/lib/Pegasus/prev_repository;
+   fi
 fi
+:;
 
 %post
+ldconfig;
+chkconfig --add tog-pegasus;
 if [ $1 -eq 1 ]; then
-   /sbin/ldconfig
-%if %{AUTOSTART}
-   /sbin/chkconfig --add tog-pegasus
-%endif
-   echo `date` >/var/log/Pegasus/install.log 2>&1
-elif [ $1 -gt 0 ]; then
-   /sbin/service tog-pegasus condrestart
-:;
+   echo `date` >  /var/lib/Pegasus/log/install.log 2>&1
+elif [ $1 -gt 1 ]; then	
+   echo `date` >>  /var/lib/Pegasus/log/install.log 2>&1 || :;
+   if [ -d /var/lib/Pegasus/prev_repository ]; then
+   #  The user's old repository was moved to /var/lib/Pegasus/prev_repository, which 
+   #  now must be upgraded to the new repository in /var/lib/Pegasus/repository:
+	/usr/sbin/repupgrade /var/lib/Pegasus/prev_repository /var/lib/Pegasus/repository \
+			     2>> /var/lib/Pegasus/log/install.log || :;
+        mv /var/lib/Pegasus/prev_repository /var/lib/Pegasus/prev_repository_`date '+%Y-%m-%d-%s.%N'`.rpmsave;
+   fi;
+   /sbin/service tog-pegasus condrestart >/dev/null 2>&1 || :;
 fi
+:;
 
 %preun
 if [ $1 -eq 0 ]; then
-   service tog-pegasus stop >/dev/null 2>&1
-   /sbin/chkconfig --del tog-pegasus;
+   /sbin/service tog-pegasus stop >/dev/null 2>&1 || :;
+   /sbin/chkconfig --del tog-pegasus >/dev/null 2>&1 || :;
 fi
+:;
 
 %postun
-if [ $1 -eq 0 ]; then
-#   /usr/sbin/userdel pegasus >/dev/null 2>&1 || :; 
-#   /usr/sbin/groudel pegasus >/dev/null 2>&1 || :;
-:;
-fi;
+ldconfig
 
-%clean
-rm -rf $RPM_BUILD_ROOT;
-#rm -rf ${RPM_BUILD_DIR}/%{srcname}-%{version};
+%preun devel
+if [ $1 -eq 0 ] ; then
+   make --directory /usr/share/Pegasus/samples -s clean >/dev/null 2>&1 || :;
+fi
+:;
 
 %changelog
+* Thu Apr 06 2006 Jason Vas Dias <jvdias at redhat.com> - 2:2.5.1-1
+- Upgrade to version 2.5.1 (including new upstream .spec file).
+
 * Tue Mar  7 2006 Bill Nottingham <notting at redhat.com> - 2:2.5-9
 - use an assigned uid/gid, do not loop over user ids looking for a free one
 



From fedora-cvs-commits at redhat.com  Tue Apr 11 20:42:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 16:42:05 -0400
Subject: rpms/tog-pegasus/FC-5 .cvsignore,1.3,1.4
Message-ID: <200604112042.k3BKg5LU023057@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23044

Modified Files:
	.cvsignore 
Log Message:
Upgrade to upstream version 2.5.1


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Oct 2005 17:52:26 -0000	1.3
+++ .cvsignore	11 Apr 2006 20:42:03 -0000	1.4
@@ -1,2 +1,3 @@
 tog-pegasus-2.4.1.Beta-1.tar.gz
 pegasus-2.5.tar.gz
+pegasus-2.5.1.tar.gz



From fedora-cvs-commits at redhat.com  Tue Apr 11 20:47:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 16:47:23 -0400
Subject: rpms/gdm/devel gdmthemetester.in,NONE,1.1 gdm.spec,1.144,1.145
Message-ID: <200604112047.k3BKlNNM004592@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4569

Modified Files:
	gdm.spec 
Added Files:
	gdmthemetester.in 
Log Message:
- Add gdmthemetester.in to the mix (upstream bug 338079)



--- NEW FILE gdmthemetester.in ---
#!/bin/sh

gdmwhich () {
  COMMAND="$1"
  OUTPUT=
  IFS=:
  for dir in $PATH
  do
    if test -x "$dir/$COMMAND" ; then
      if test "x$OUTPUT" = "x" ; then
        OUTPUT="$dir/$COMMAND"
      fi
    fi
  done
  IFS=$OLD_IFS
  echo "$OUTPUT"
}

echo
echo "GDM Theme Tester"
echo
echo "Be sure to test all the environments:"
echo " console, console-timed, flexi, remote-flexi, xdmcp"
echo "Also be sure to test using caps lock"
echo

XNEST=`gdmwhich Xnest`
GDMXNEST=`gdmwhich gdmXnest`
GDMGREETER="@libexecdir@/gdmgreeter"

if [ x$XNEST = x ]; then
	echo "ERROR: Xnest not found"
        echo ""
	exit 1
fi

if [ x$GDMXNEST = x ]; then
	echo "ERROR: gdmXnest not found"
        echo ""
	exit 1
fi

if [ x$GDMGREETER = x ]; then
	echo "ERROR: gdmgreeter not found"
        echo ""
	exit 1
fi

USAGE="
Usage: $0 <environment> <theme>
<environment> is one of: console, console-timed, flexi, remote-flexi, xdmcp
<theme> is either the path of the theme or the name of an installed theme

If you set the environment variable XNESTSIZE to <width>x<height> (e.g. 800x600)
you can test the greeter at that resolution
"
if [ "$#" != 2 ]; then
	echo "$USAGE"
	exit 1
fi

GDM_THEME="$2"
DOING_GDM_DEVELOPMENT=yes
GDM_PARENT_DISPLAY="$DISPLAY"
export GDM_THEME DOING_GDM_DEVELOPMENT GDM_PARENT_DISPLAY

case $1 in
console)
	GDM_IS_LOCAL=yes
	export GDM_IS_LOCAL
	;;
console-timed)
	GDM_IS_LOCAL=yes
	GDM_FAKE_TIMED=yes
	export GDM_IS_LOCAL GDM_FAKE_TIMED
	;;
flexi)
	GDM_IS_LOCAL=yes
	GDM_FLEXI_SERVER=yes
	export GDM_IS_LOCAL GDM_FLEXI_SERVER
	;;
remote-flexi)
	GDM_FLEXI_SERVER=yes
	export GDM_FLEXI_SERVER
	;;
xdmcp)
	;;
*)
	echo "$USAGE"
	exit 1
	;;
esac

if [ "x$XNESTSIZE" = x ] ; then
  eval `gdmXnest -b`
else
  eval `gdmXnest -b -o "-geometry $XNESTSIZE"`
fi
export DISPLAY

if [ "x$GDM_PARENT_DISPLAY" = "x$DISPLAY" ]; then
	echo "ERROR: Can't start the Xnest server"
	exit 1
fi

# This may not be necessary
sleep 1

@libexecdir@/gdmgreeter



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- gdm.spec	11 Apr 2006 13:28:05 -0000	1.144
+++ gdm.spec	11 Apr 2006 20:47:21 -0000	1.145
@@ -15,7 +15,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.14.1
-Release: 2
+Release: 3
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -24,6 +24,7 @@
 Source1: gdm-allow-login.init
 Source2: gdm-early-login.init
 Source3: zzz-bootup-complete.init
+Source4: gdmthemetester.in
 
 Patch1: gdm-2.14.1-change-defaults.patch
 Patch2: gdm-2.8.0.2-add-pam-timestamp-module.patch
@@ -115,6 +116,15 @@
 %patch19 -p1 -b .add-gnome-cflags
 %patch22 -p1 -b .pam_stack
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=338079
+if [ -f gui/greeter/gdmthemetester.in ]
+then
+  echo "gdmthemetester.in is back. Get rid of Source4" 1>&2
+  exit
+fi
+
+cp -f %{SOURCE4} gui/greeter
+
 # fix the time format for ja
 perl -pi -e "s|^msgstr \"%a %b %d, %H:%M\"|msgstr \"%m/%d \(%a\) %H:%M\"|; s|^msgstr \"%a %b %d, %I:%M %p\"|msgstr \"%m/%d \(%a\) %p %I:%M\"|" po/ja.po
 
@@ -308,6 +318,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Tue Apr 11 2006 Ray Strode <rstrode at redhat.com> - 1:2.14.1-3
+- Add gdmthemetester.in to the mix (upstream bug 338079)
+
 * Tue Apr 11 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.14.1-2
 - Update to 2.14.1
 



From fedora-cvs-commits at redhat.com  Tue Apr 11 20:52:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 16:52:35 -0400
Subject: rpms/squirrelmail/FC-5 squirrelmail.spec,1.33,1.34
Message-ID: <200604112052.k3BKqYVn004821@cvs.devel.redhat.com>

Author: wtogami

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

Modified Files:
	squirrelmail.spec 
Log Message:
Fix Chinese and Korean too



Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/FC-5/squirrelmail.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- squirrelmail.spec	24 Mar 2006 13:17:30 -0000	1.33
+++ squirrelmail.spec	11 Apr 2006 20:52:32 -0000	1.34
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.6
-Release: 4.fc5
+Release: 5.fc5
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -70,7 +70,7 @@
     functions/strings.php
 
 # replace splash screen
-%if %{fedora_splash}
+%if %{fedora_splash} == 1
 cp %{SOURCE2} images/sm_logo.png
 %else
 cp %{SOURCE3} images/sm_logo.png
@@ -84,10 +84,19 @@
     -e "s/^\(\$languages\['\([^']*\)'\]\['CHARSET'].*= '\)\([^']*\)';/\1utf-8';/" \
     -e "s/^\(\$languages\['\([^']*\)'\]\['LOCALE'].*=\).*/\1 '\2.UTF-8';/" 
 
-# Hard-code Japanese to send iso-2022-jp
+# Hard-code Japanese to send iso-2022-jp, UTF-8 is unrealistic
 # Without this, 1.4.6 sends eucjp which is clearly wrong
 sed -i s/"$languages\['ja_JP'\]\['CHARSET'\] = 'utf-8';"/"$languages\['ja_JP'\]\['CHARSET'\] = 'iso-2022-jp';"/ functions/i18n.php
-
+# Hard-code Korean to euc-KR, UTF-8 is unrealistic
+# and not properly handled by squirrelmail
+sed -i s/"$languages\['ko_KR'\]\['CHARSET'\] = 'utf-8';"/"$languages\['ko_KR'\]\['CHARSET'\] = 'euc-KR';"/ functions/i18n.php
+
+# Hard-code Simplified Chinese charset, UTF-8 is unrealistic
+sed -i s/"$languages\['zh_CN'\]\['CHARSET'\] = 'utf-8';"/"$languages\['zh_CN'\]\['CHARSET'\] = 'gb2312';"/ functions/i18n.php
+sed -i s/"$languages\['zh_CN'\]\['LOCALE'\] = 'zh_CN.UTF-8';"/"$languages\['zh_CN'\]\['LOCALE'\] = 'zh_CN.GB2312';"/ functions/i18n.php
+# Hard-code Traditional Chinese charset, UTF-8 is unrealistic
+sed -i s/"$languages\['zh_TW'\]\['CHARSET'\] = 'utf-8';"/"$languages\['zh_TW'\]\['CHARSET'\] = 'big5';"/ functions/i18n.php
+sed -i s/"$languages\['zh_TW'\]\['LOCALE'\] = 'zh_TW.UTF-8';"/"$languages\['zh_TW'\]\['LOCALE'\] = 'zh_TW.BIG5';"/ functions/i18n.php
 
 cd locale_tempdir
 for LOCALE in `ls locale/` ; do
@@ -221,6 +230,9 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Tue Apr 04 2006 Warren Togami <wtogami at redhat.com> 1.4.6-5
+- Fix Chinese and Korean too
+
 * Fri Mar 24 2006 Warren Togami <wtogami at redhat.com> 1.4.6-4
 - Fix outgoing Japanese mail to iso-2022-jp for now (#185767)
 



From fedora-cvs-commits at redhat.com  Tue Apr 11 20:53:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 16:53:22 -0400
Subject: rpms/squirrelmail/FC-4 squirrelmail.spec,1.24,1.25
Message-ID: <200604112053.k3BKrL0v004901@cvs.devel.redhat.com>

Author: wtogami

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

Modified Files:
	squirrelmail.spec 
Log Message:
Fix Chinese and Korean too



Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/FC-4/squirrelmail.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- squirrelmail.spec	24 Mar 2006 13:18:20 -0000	1.24
+++ squirrelmail.spec	11 Apr 2006 20:53:17 -0000	1.25
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.6
-Release: 4.fc4
+Release: 5.fc4
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -70,7 +70,7 @@
     functions/strings.php
 
 # replace splash screen
-%if %{fedora_splash}
+%if %{fedora_splash} == 1
 cp %{SOURCE2} images/sm_logo.png
 %else
 cp %{SOURCE3} images/sm_logo.png
@@ -84,10 +84,19 @@
     -e "s/^\(\$languages\['\([^']*\)'\]\['CHARSET'].*= '\)\([^']*\)';/\1utf-8';/" \
     -e "s/^\(\$languages\['\([^']*\)'\]\['LOCALE'].*=\).*/\1 '\2.UTF-8';/" 
 
-# Hard-code Japanese to send iso-2022-jp
+# Hard-code Japanese to send iso-2022-jp, UTF-8 is unrealistic
 # Without this, 1.4.6 sends eucjp which is clearly wrong
 sed -i s/"$languages\['ja_JP'\]\['CHARSET'\] = 'utf-8';"/"$languages\['ja_JP'\]\['CHARSET'\] = 'iso-2022-jp';"/ functions/i18n.php
-
+# Hard-code Korean to euc-KR, UTF-8 is unrealistic
+# and not properly handled by squirrelmail
+sed -i s/"$languages\['ko_KR'\]\['CHARSET'\] = 'utf-8';"/"$languages\['ko_KR'\]\['CHARSET'\] = 'euc-KR';"/ functions/i18n.php
+
+# Hard-code Simplified Chinese charset, UTF-8 is unrealistic
+sed -i s/"$languages\['zh_CN'\]\['CHARSET'\] = 'utf-8';"/"$languages\['zh_CN'\]\['CHARSET'\] = 'gb2312';"/ functions/i18n.php
+sed -i s/"$languages\['zh_CN'\]\['LOCALE'\] = 'zh_CN.UTF-8';"/"$languages\['zh_CN'\]\['LOCALE'\] = 'zh_CN.GB2312';"/ functions/i18n.php
+# Hard-code Traditional Chinese charset, UTF-8 is unrealistic
+sed -i s/"$languages\['zh_TW'\]\['CHARSET'\] = 'utf-8';"/"$languages\['zh_TW'\]\['CHARSET'\] = 'big5';"/ functions/i18n.php
+sed -i s/"$languages\['zh_TW'\]\['LOCALE'\] = 'zh_TW.UTF-8';"/"$languages\['zh_TW'\]\['LOCALE'\] = 'zh_TW.BIG5';"/ functions/i18n.php
 
 cd locale_tempdir
 for LOCALE in `ls locale/` ; do
@@ -221,6 +230,9 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Tue Apr 04 2006 Warren Togami <wtogami at redhat.com> 1.4.6-5
+- Fix Chinese and Korean too
+
 * Fri Mar 24 2006 Warren Togami <wtogami at redhat.com> 1.4.6-4
 - Fix outgoing Japanese mail to iso-2022-jp for now (#185767)
 



From fedora-cvs-commits at redhat.com  Tue Apr 11 20:53:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 16:53:24 -0400
Subject: rpms/kdepim/FC-4 kdepim.spec,1.56,1.57 sources,1.29,1.30
Message-ID: <200604112053.k3BKrOlm004924@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdepim.spec sources 
Log Message:
update to 3.5.2



Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-4/kdepim.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kdepim.spec	1 Feb 2006 14:53:39 -0000	1.56
+++ kdepim.spec	11 Apr 2006 20:53:21 -0000	1.57
@@ -2,17 +2,19 @@
 %define final 0
 
 %define qt_version 1:3.3.4
-%define arts_version 8:1.5.1
+%define arts_version 8:1.5.2
 
 %define arts 1
 %define make_cvs 1
 %define disable_gcc_check_and_hidden_visibility 1
-
-Version: 3.5.1
+%
+%define appdir %{_datadir}/applications/kde
+%
+Version: 3.5.2
 Release: 0.1.fc4
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
-Prefix: /usr
+Prefix: %{_prefix}
 Epoch: 6
 Group: Applications/Productivity
 License: GPL
@@ -110,10 +112,6 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-FLAGS="$RPM_OPT_FLAGS"
-export KDEDIR=%{prefix}
-export CFLAGS="$FLAGS "
-export CXXFLAGS="$FLAGS "
 
 cp -f %{SOURCE2} %{SOURCE3} %{SOURCE4} kandy/src
 
@@ -139,45 +137,36 @@
    --enable-final \
 %endif
    --with-qt-libraries=$QTDIR/lib \
-   --includedir=%{prefix}/include/kde
+   --includedir=%{_includedir}/kde
 
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 
 # Make symlinks relative
-mkdir -p $RPM_BUILD_ROOT%{prefix}/share/doc/HTML/en/common
-pushd $RPM_BUILD_ROOT%{prefix}/share/doc/HTML/en
+mkdir -p %{buildroot}%{_docdir}/HTML/en/common
+pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    [ -d $i -a -L $i/common ] && (cd $i && ln -nfs ../common . && cd ..)
 done
 popd
 
-desktop-file-install \
-   --vendor "" \
-   --delete-original \
-   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/kde \
-   --add-only-show-in="KDE" \
-   ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/konsolekalendar.desktop \
-   ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/knotes.desktop \
-%ifnarch s390 s390x
-   ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/kpilotdaemon.desktop \
-   ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/kpilot.desktop \
-%endif
-   ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/KMail.desktop \
-   ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/KNode.desktop \
-   ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/Kontact.desktop \
-   ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/KOrn.desktop
+for i in konsolekalendar knotes kpilotdaemon kpilot KMail KNode Kontact \
+   KOrn akregator kalarm groupwarewizard kpalmdoc ktnef multisynk ; do
+   if [ -f %{buildroot}%{appdir}/$i.desktop ] ; then
+      echo "OnlyShowIn=KDE;" >> %{buildroot}%{appdir}/$i.desktop
+   fi
+done
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -205,6 +194,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Tue Apr 11 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc4 
+- update to 3.5.2
+
 * Wed Feb 01 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.1.fc4
 - 3.5.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-4/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	1 Feb 2006 14:53:39 -0000	1.29
+++ sources	11 Apr 2006 20:53:21 -0000	1.30
@@ -1 +1 @@
-8e87c9cbe1f0c0f983f94d804a5bc8f9  kdepim-3.5.1.tar.bz2
+ac6b3b503e27a65a7b883c1e0a57262e  kdepim-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 20:53:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 16:53:58 -0400
Subject: rpms/kdepim/FC-4 kdepim.spec,1.57,1.58
Message-ID: <200604112053.k3BKrviw005009@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdepim.spec 
Log Message:
typo fix



Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-4/kdepim.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kdepim.spec	11 Apr 2006 20:53:21 -0000	1.57
+++ kdepim.spec	11 Apr 2006 20:53:55 -0000	1.58
@@ -7,9 +7,9 @@
 %define arts 1
 %define make_cvs 1
 %define disable_gcc_check_and_hidden_visibility 1
-%
+
 %define appdir %{_datadir}/applications/kde
-%
+
 Version: 3.5.2
 Release: 0.1.fc4
 Name: kdepim



From fedora-cvs-commits at redhat.com  Tue Apr 11 21:00:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 17:00:01 -0400
Subject: rpms/selinux-policy/devel policy-20060411.patch, NONE,
	1.1 .cvsignore, 1.53, 1.54 file_contexts.patch, 1.1,
	1.2 policy-20060323.patch, 1.11, 1.12 selinux-policy.spec,
	1.170, 1.171 sources, 1.57, 1.58
Message-ID: <200604112100.k3BL01HU005523@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore file_contexts.patch policy-20060323.patch 
	selinux-policy.spec sources 
Added Files:
	policy-20060411.patch 
Log Message:
* Mon Apr 10 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-6
- Allow secadm_t ability to relabel all files
- Allow ftp to search xferlog_t directories
- Allow mysql to communicate with ldap
- Allow rsync to bind to rsync_port_t


policy-20060411.patch:
 rpc.te   |    4 ++--
 samba.if |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE policy-20060411.patch ---
--- serefpolicy-2.2.30/policy/modules/services/rpc.te~	2006-04-11 06:35:47.000000000 -0400
+++ serefpolicy-2.2.30/policy/modules/services/rpc.te	2006-04-11 11:21:31.000000000 -0400
@@ -110,13 +110,13 @@
 portmap_udp_chat(nfsd_t)
 
 tunable_policy(`nfs_export_all_rw',`
-	auth_read_all_dirs_except_shadow(nfsd_t) 
 	fs_read_noxattr_fs_files(nfsd_t) 
+	auth_manage_all_files_except_shadow(nfsd_t)
 ')
 
 tunable_policy(`nfs_export_all_ro',`
-	auth_read_all_dirs_except_shadow(nfsd_t) 
 	fs_read_noxattr_fs_files(nfsd_t) 
+	auth_read_all_files_except_shadow(nfsd_t)
 ')
 
 ########################################
--- serefpolicy-2.2.30/policy/modules/services/samba.if~	2006-04-11 06:35:48.000000000 -0400
+++ serefpolicy-2.2.30/policy/modules/services/samba.if	2006-04-11 11:07:50.000000000 -0400
@@ -33,6 +33,7 @@
 	')
 
 	tunable_policy(`samba_enable_home_dirs',`
+		userdom_manage_user_home_content_dirs($1,smbd_t)
 		userdom_manage_user_home_content_files($1,smbd_t)
 		userdom_manage_user_home_content_symlinks($1,smbd_t)
 		userdom_manage_user_home_content_sockets($1,smbd_t)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	31 Mar 2006 20:57:44 -0000	1.53
+++ .cvsignore	11 Apr 2006 20:59:57 -0000	1.54
@@ -54,3 +54,4 @@
 serefpolicy-2.2.27.tgz
 serefpolicy-2.2.28.tgz
 serefpolicy-2.2.29.tgz
+serefpolicy-2.2.30.tgz

file_contexts.patch:
 admin/su.fc            |    2 +-
 apps/java.fc           |    2 +-
 kernel/corecommands.fc |   18 ++++++++++--------
 kernel/devices.fc      |    3 ++-
 kernel/files.fc        |   35 +++++++++++++++++++++++------------
 services/kerberos.fc   |    4 ++--
 services/tftp.fc       |    3 ++-
 system/authlogin.fc    |    3 ++-
 system/daemontools.fc  |    3 ++-
 system/libraries.fc    |   43 ++++++++++++++++++++++++-------------------
 system/miscfiles.fc    |    2 +-
 system/modutils.fc     |    6 ++++--
 12 files changed, 74 insertions(+), 50 deletions(-)

Index: file_contexts.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/file_contexts.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- file_contexts.patch	10 Apr 2006 12:16:11 -0000	1.1
+++ file_contexts.patch	11 Apr 2006 20:59:57 -0000	1.2
@@ -1,16 +1,5 @@
-diff -ru serefpolicy-2.2.29.orig/policy/modules/admin/su.fc serefpolicy-2.2.29.fc/policy/modules/admin/su.fc
---- serefpolicy-2.2.29.orig/policy/modules/admin/su.fc	2006-04-01 03:11:34.000000000 +1100
-+++ serefpolicy-2.2.29.fc/policy/modules/admin/su.fc	2006-04-10 20:53:28.000000000 +1000
-@@ -1,5 +1,5 @@
- 
- /bin/su			--	gen_context(system_u:object_r:su_exec_t,s0)
- 
--/usr(/local)?/bin/ksu	--	gen_context(system_u:object_r:su_exec_t,s0)
-+/usr/(local/)?bin/ksu	--	gen_context(system_u:object_r:su_exec_t,s0)
- /usr/bin/kdesu		--	gen_context(system_u:object_r:su_exec_t,s0)
-diff -ru serefpolicy-2.2.29.orig/policy/modules/apps/java.fc serefpolicy-2.2.29.fc/policy/modules/apps/java.fc
---- serefpolicy-2.2.29.orig/policy/modules/apps/java.fc	2006-04-10 20:52:58.000000000 +1000
-+++ serefpolicy-2.2.29.fc/policy/modules/apps/java.fc	2006-04-10 20:53:28.000000000 +1000
+--- serefpolicy-2.2.30/policy/modules/apps/java.fc.fcon	2006-04-11 07:32:30.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/apps/java.fc	2006-04-11 07:32:30.000000000 -0400
 @@ -1,7 +1,7 @@
  #
  # /usr
@@ -20,58 +9,156 @@
  /usr/bin/gcj-dbtool	--	gen_context(system_u:object_r:java_exec_t,s0)
  /usr/bin/gij		--	gen_context(system_u:object_r:java_exec_t,s0)
  /opt(/.*)?/bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
-diff -ru serefpolicy-2.2.29.orig/policy/modules/kernel/corecommands.fc serefpolicy-2.2.29.fc/policy/modules/kernel/corecommands.fc
---- serefpolicy-2.2.29.orig/policy/modules/kernel/corecommands.fc	2006-04-01 03:11:34.000000000 +1100
-+++ serefpolicy-2.2.29.fc/policy/modules/kernel/corecommands.fc	2006-04-10 20:53:28.000000000 +1000
-@@ -2,7 +2,8 @@
+--- serefpolicy-2.2.30/policy/modules/system/libraries.fc.fcon	2006-04-11 07:32:30.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/system/libraries.fc	2006-04-11 07:32:36.000000000 -0400
+@@ -24,15 +24,20 @@
  #
- # /bin
+ # /lib(64)?
  #
--/bin(/.*)?				gen_context(system_u:object_r:bin_t,s0)
-+/bin				-d	gen_context(system_u:object_r:bin_t,s0)
-+/bin/.*					gen_context(system_u:object_r:bin_t,s0)
- /bin/d?ash			--	gen_context(system_u:object_r:shell_exec_t,s0)
- /bin/bash			--	gen_context(system_u:object_r:shell_exec_t,s0)
- /bin/bash2			--	gen_context(system_u:object_r:shell_exec_t,s0)
-@@ -86,27 +87,28 @@
+-/lib(64)?(/.*)?					gen_context(system_u:object_r:lib_t,s0)
+-/lib(64)?/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
+-/lib(64)?(/.*)?/ld-[^/]*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:ld_so_t,s0)
++/lib					-d	gen_context(system_u:object_r:lib_t,s0)
++/lib/.*						gen_context(system_u:object_r:lib_t,s0)
++/lib64					-d	gen_context(system_u:object_r:lib_t,s0)
++/lib64/.*					gen_context(system_u:object_r:lib_t,s0)
++/lib/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
++/lib64/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
++/lib/(.*/)?ld-[^/]*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:ld_so_t,s0)
++/lib64/(.*/)?ld-[^/]*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:ld_so_t,s0)
+ 
  #
- # /sbin
+ # /opt
  #
--/sbin(/.*)?				gen_context(system_u:object_r:sbin_t,s0)
-+/sbin				-d	gen_context(system_u:object_r:sbin_t,s0)
-+/sbin/.*				gen_context(system_u:object_r:sbin_t,s0)
- /sbin/mkfs\.cramfs		--	gen_context(system_u:object_r:sbin_t,s0)
- /sbin/insmod_ksymoops_clean	--	gen_context(system_u:object_r:sbin_t,s0)
+-/opt(/.*)?/lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
+-/opt(/.*)?/lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
++/opt/(.*/)?lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
++/opt/(.*/)?lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
+ /opt/.*/jre.*/libdeploy.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /opt/.*/jre.*/libjvm.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
+@@ -44,18 +49,18 @@
  #
- # /opt
+ # /usr
  #
--/opt(/.*)?/bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
-+/opt/(.*/)?bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
+-/usr(/.*)?/HelixPlayer/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/(.*/)?HelixPlayer/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
--/opt(/.*)?/libexec(/.*)?		gen_context(system_u:object_r:bin_t,s0)
-+/opt/(.*/)?libexec(/.*)?		gen_context(system_u:object_r:bin_t,s0)
+-/usr(/.*)?/java/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/usr(/.*)?/java/.*\.jar			--	gen_context(system_u:object_r:shlib_t,s0)
+-/usr(/.*)?/java/.*\.jsa			--	gen_context(system_u:object_r:shlib_t,s0)
++/usr/(.*/)?java/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/(.*/)?java/.*\.jar			--	gen_context(system_u:object_r:shlib_t,s0)
++/usr/(.*/)?java/.*\.jsa			--	gen_context(system_u:object_r:shlib_t,s0)
  
--/opt(/.*)?/sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
-+/opt/(.*/)?sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
+-/usr(/.*)?/lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
+-/usr(/.*)?/lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
++/usr/(.*/)?lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
++/usr/(.*/)?lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
+ 
+-/usr(/.*)?/lib(64)?(/.*)?/ld-[^/]*\.so(\.[^/]*)* gen_context(system_u:object_r:ld_so_t,s0)
++/usr/(.*/)?lib(64)?(/.*)?/ld-[^/]*\.so(\.[^/]*)* gen_context(system_u:object_r:ld_so_t,s0)
+ 
+-/usr(/.*)?/nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/(.*/)?nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+ /usr/lib(64)?/pgsql/test/regress/.*\.so	--	gen_context(system_u:object_r:shlib_t,s0)
+ 
+@@ -64,7 +69,7 @@
+ /usr/lib(64)?/im/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
+ /usr/lib(64)?/iiim/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
+ 
+-/usr(/.*)?/lib(64)?(/.*)?/nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/(.*/)?lib(64)?(/.*)?/nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libsipphoneapi\.so.*	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
+ /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libGLU\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -126,7 +131,7 @@
+ /usr/lib(64)?/.*/program/libsvx680li\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/.*/program/libcomphelp4gcc3\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/.*/program/libsoffice\.so  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/usr(/.*)?/pcsc/drivers(/.*)?/lib(cm2020|cm4000|SCR24x)\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/(.*/)?pcsc/drivers(/.*)?/lib(cm2020|cm4000|SCR24x)\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+ /usr/lib(64)?/firefox.*\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/mozilla.*\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -184,10 +189,10 @@
+ /usr/.*/jre.*/libdeploy.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/.*/jre.*/libjvm.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+-/usr(/.*)?/intellinux/nppdf\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0)
+-/usr(/.*)?/intellinux/lib/\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0)
+-/usr(/.*)?/intellinux/plug_ins/.*\.api -- gen_context(system_u:object_r:texrel_shlib_t,s0)
+-/usr(/.*)?/intellinux/SPPlugins/ADMPlugin\.apl -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/(.*/)?intellinux/nppdf\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0)
++/usr/(.*/)?intellinux/lib/\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0)
++/usr/(.*/)?intellinux/plug_ins/.*\.api -- gen_context(system_u:object_r:texrel_shlib_t,s0)
++/usr/(.*/)?intellinux/SPPlugins/ADMPlugin\.apl -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+ ') dnl end distro_redhat
+ 
+--- serefpolicy-2.2.30/policy/modules/system/daemontools.fc.fcon	2006-04-11 06:35:47.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/system/daemontools.fc	2006-04-11 07:32:30.000000000 -0400
+@@ -2,7 +2,8 @@
+ # /service
+ #
+ 
+-/service(/.*)?			gen_context(system_u:object_r:svc_svc_t,s0)
++/service		-d	gen_context(system_u:object_r:svc_svc_t,s0)
++/service/.*			gen_context(system_u:object_r:svc_svc_t,s0)
  
  #
  # /usr
+--- serefpolicy-2.2.30/policy/modules/system/authlogin.fc.fcon	2006-04-11 06:35:47.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/system/authlogin.fc	2006-04-11 07:32:30.000000000 -0400
+@@ -7,7 +7,8 @@
+ /etc/passwd\.lock	--	gen_context(system_u:object_r:shadow_t,s0)
+ /etc/shadow.*		--	gen_context(system_u:object_r:shadow_t,s0)
+ 
+-/lib(64)?/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:pam_exec_t,s0)
++/lib/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:pam_exec_t,s0)
++/lib64/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:pam_exec_t,s0)
+ 
+ /sbin/pam_console_apply	 --	gen_context(system_u:object_r:pam_console_exec_t,s0)
+ /sbin/pam_timestamp_check --	gen_context(system_u:object_r:pam_exec_t,s0)
+--- serefpolicy-2.2.30/policy/modules/system/modutils.fc.fcon	2006-04-11 06:35:47.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/system/modutils.fc	2006-04-11 07:32:30.000000000 -0400
+@@ -2,9 +2,11 @@
+ /etc/modules\.conf.*	--	gen_context(system_u:object_r:modules_conf_t,s0)
+ /etc/modprobe\.conf.*	--	gen_context(system_u:object_r:modules_conf_t,s0)
+ 
+-/lib(64)?/modules/[^/]+/modules\..+ -- gen_context(system_u:object_r:modules_dep_t,s0)
++/lib/modules/[^/]+/modules\..+ -- gen_context(system_u:object_r:modules_dep_t,s0)
++/lib64/modules/[^/]+/modules\..+ -- gen_context(system_u:object_r:modules_dep_t,s0)
+ 
+-/lib(64)?/modules/modprobe\.conf -- gen_context(system_u:object_r:modules_conf_t,s0)
++/lib/modules/modprobe\.conf -- gen_context(system_u:object_r:modules_conf_t,s0)
++/lib64/modules/modprobe\.conf -- gen_context(system_u:object_r:modules_conf_t,s0)
+ 
+ /sbin/depmod.*		--	gen_context(system_u:object_r:depmod_exec_t,s0)
+ /sbin/generate-modprobe\.conf -- gen_context(system_u:object_r:update_modules_exec_t,s0)
+--- serefpolicy-2.2.30/policy/modules/system/miscfiles.fc.fcon	2006-04-11 06:35:47.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/system/miscfiles.fc	2006-04-11 07:32:30.000000000 -0400
+@@ -7,7 +7,7 @@
  #
--/usr(/.*)?/Bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
-+/usr/(.*/)?Bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
+ # /opt
+ #
+-/opt(/.*)?/man(/.*)?		gen_context(system_u:object_r:man_t,s0)
++/opt/(.*/)?man(/.*)?		gen_context(system_u:object_r:man_t,s0)
  
--/usr(/.*)?/bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
-+/usr/(.*/)?bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
+ #
+ # /srv
+--- serefpolicy-2.2.30/policy/modules/admin/su.fc.fcon	2006-04-11 06:35:47.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/admin/su.fc	2006-04-11 07:32:30.000000000 -0400
+@@ -1,5 +1,5 @@
  
--/usr(/.*)?/sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
-+/usr/(.*/)?sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
+ /bin/su			--	gen_context(system_u:object_r:su_exec_t,s0)
  
- /usr/lib/ccache/bin(/.*)?		gen_context(system_u:object_r:bin_t,s0)
- /usr/lib/pgsql/test/regress/.*\.sh --	gen_context(system_u:object_r:bin_t,s0)
-diff -ru serefpolicy-2.2.29.orig/policy/modules/kernel/devices.fc serefpolicy-2.2.29.fc/policy/modules/kernel/devices.fc
---- serefpolicy-2.2.29.orig/policy/modules/kernel/devices.fc	2006-04-10 20:52:58.000000000 +1000
-+++ serefpolicy-2.2.29.fc/policy/modules/kernel/devices.fc	2006-04-10 20:53:29.000000000 +1000
+-/usr(/local)?/bin/ksu	--	gen_context(system_u:object_r:su_exec_t,s0)
++/usr/(local/)?bin/ksu	--	gen_context(system_u:object_r:su_exec_t,s0)
+ /usr/bin/kdesu		--	gen_context(system_u:object_r:su_exec_t,s0)
+--- serefpolicy-2.2.30/policy/modules/kernel/devices.fc.fcon	2006-04-11 07:32:30.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/kernel/devices.fc	2006-04-11 07:32:30.000000000 -0400
 @@ -1,5 +1,6 @@
  
 -/dev(/.*)?			gen_context(system_u:object_r:device_t,s0)
@@ -80,9 +167,8 @@
  
  /dev/.*mouse.*		-c	gen_context(system_u:object_r:mouse_device_t,s0)
  /dev/adsp		-c	gen_context(system_u:object_r:sound_device_t,s0)
-diff -ru serefpolicy-2.2.29.orig/policy/modules/kernel/files.fc serefpolicy-2.2.29.fc/policy/modules/kernel/files.fc
---- serefpolicy-2.2.29.orig/policy/modules/kernel/files.fc	2006-04-01 03:11:34.000000000 +1100
-+++ serefpolicy-2.2.29.fc/policy/modules/kernel/files.fc	2006-04-10 20:53:29.000000000 +1000
+--- serefpolicy-2.2.30/policy/modules/kernel/files.fc.fcon	2006-04-11 06:35:47.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/kernel/files.fc	2006-04-11 07:32:30.000000000 -0400
 @@ -25,7 +25,8 @@
  #
  # /boot
@@ -182,160 +268,73 @@
  /var/\.journal			<<none>>
  
  /var/db/.*\.db		--	gen_context(system_u:object_r:etc_t,s0)
-diff -ru serefpolicy-2.2.29.orig/policy/modules/services/kerberos.fc serefpolicy-2.2.29.fc/policy/modules/services/kerberos.fc
---- serefpolicy-2.2.29.orig/policy/modules/services/kerberos.fc	2006-04-01 03:11:34.000000000 +1100
-+++ serefpolicy-2.2.29.fc/policy/modules/services/kerberos.fc	2006-04-10 20:53:29.000000000 +1000
-@@ -5,8 +5,8 @@
- /etc/krb5kdc/kadm5.keytab 	--	gen_context(system_u:object_r:krb5_keytab_t,s0)
- /etc/krb5kdc/principal.*		gen_context(system_u:object_r:krb5kdc_principal_t,s0)
- 
--/usr(/local)?(/kerberos)?/sbin/krb5kdc -- gen_context(system_u:object_r:krb5kdc_exec_t,s0)
--/usr(/local)?(/kerberos)?/sbin/kadmind -- gen_context(system_u:object_r:kadmind_exec_t,s0)
-+/usr/(local/)?(kerberos/)?sbin/krb5kdc -- gen_context(system_u:object_r:krb5kdc_exec_t,s0)
-+/usr/(local/)?(kerberos/)?sbin/kadmind -- gen_context(system_u:object_r:kadmind_exec_t,s0)
- 
- /usr/local/var/krb5kdc(/.*)?		gen_context(system_u:object_r:krb5kdc_conf_t,s0)
- /usr/local/var/krb5kdc/principal.*	gen_context(system_u:object_r:krb5kdc_principal_t,s0)
-diff -ru serefpolicy-2.2.29.orig/policy/modules/services/tftp.fc serefpolicy-2.2.29.fc/policy/modules/services/tftp.fc
---- serefpolicy-2.2.29.orig/policy/modules/services/tftp.fc	2006-04-01 03:11:34.000000000 +1100
-+++ serefpolicy-2.2.29.fc/policy/modules/services/tftp.fc	2006-04-10 20:53:29.000000000 +1000
-@@ -2,4 +2,5 @@
- /usr/sbin/atftpd	--	gen_context(system_u:object_r:tftpd_exec_t,s0)
- /usr/sbin/in\.tftpd	--	gen_context(system_u:object_r:tftpd_exec_t,s0)
- 
--/tftpboot(/.*)?			gen_context(system_u:object_r:tftpdir_t,s0)
-+/tftpboot		-d	gen_context(system_u:object_r:tftpdir_t,s0)
-+/tftpboot/.*			gen_context(system_u:object_r:tftpdir_t,s0)
-diff -ru serefpolicy-2.2.29.orig/policy/modules/system/authlogin.fc serefpolicy-2.2.29.fc/policy/modules/system/authlogin.fc
---- serefpolicy-2.2.29.orig/policy/modules/system/authlogin.fc	2006-04-01 03:11:34.000000000 +1100
-+++ serefpolicy-2.2.29.fc/policy/modules/system/authlogin.fc	2006-04-10 20:53:29.000000000 +1000
-@@ -7,7 +7,8 @@
- /etc/passwd\.lock	--	gen_context(system_u:object_r:shadow_t,s0)
- /etc/shadow.*		--	gen_context(system_u:object_r:shadow_t,s0)
- 
--/lib(64)?/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:pam_exec_t,s0)
-+/lib/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:pam_exec_t,s0)
-+/lib64/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:pam_exec_t,s0)
- 
- /sbin/pam_console_apply	 --	gen_context(system_u:object_r:pam_console_exec_t,s0)
- /sbin/pam_timestamp_check --	gen_context(system_u:object_r:pam_exec_t,s0)
-diff -ru serefpolicy-2.2.29.orig/policy/modules/system/daemontools.fc serefpolicy-2.2.29.fc/policy/modules/system/daemontools.fc
---- serefpolicy-2.2.29.orig/policy/modules/system/daemontools.fc	2006-04-01 03:11:34.000000000 +1100
-+++ serefpolicy-2.2.29.fc/policy/modules/system/daemontools.fc	2006-04-10 20:53:29.000000000 +1000
+--- serefpolicy-2.2.30/policy/modules/kernel/corecommands.fc.fcon	2006-04-11 06:35:47.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/kernel/corecommands.fc	2006-04-11 07:32:30.000000000 -0400
 @@ -2,7 +2,8 @@
- # /service
  #
- 
--/service(/.*)?			gen_context(system_u:object_r:svc_svc_t,s0)
-+/service		-d	gen_context(system_u:object_r:svc_svc_t,s0)
-+/service/.*			gen_context(system_u:object_r:svc_svc_t,s0)
- 
+ # /bin
  #
- # /usr
-diff -ru serefpolicy-2.2.29.orig/policy/modules/system/libraries.fc serefpolicy-2.2.29.fc/policy/modules/system/libraries.fc
---- serefpolicy-2.2.29.orig/policy/modules/system/libraries.fc	2006-04-10 20:52:58.000000000 +1000
-+++ serefpolicy-2.2.29.fc/policy/modules/system/libraries.fc	2006-04-10 20:53:29.000000000 +1000
-@@ -24,15 +24,20 @@
+-/bin(/.*)?				gen_context(system_u:object_r:bin_t,s0)
++/bin				-d	gen_context(system_u:object_r:bin_t,s0)
++/bin/.*					gen_context(system_u:object_r:bin_t,s0)
+ /bin/d?ash			--	gen_context(system_u:object_r:shell_exec_t,s0)
+ /bin/bash			--	gen_context(system_u:object_r:shell_exec_t,s0)
+ /bin/bash2			--	gen_context(system_u:object_r:shell_exec_t,s0)
+@@ -86,27 +87,28 @@
  #
- # /lib(64)?
+ # /sbin
  #
--/lib(64)?(/.*)?					gen_context(system_u:object_r:lib_t,s0)
--/lib(64)?/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
--/lib(64)?(/.*)?/ld-[^/]*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:ld_so_t,s0)
-+/lib					-d	gen_context(system_u:object_r:lib_t,s0)
-+/lib/.*						gen_context(system_u:object_r:lib_t,s0)
-+/lib64					-d	gen_context(system_u:object_r:lib_t,s0)
-+/lib64/.*					gen_context(system_u:object_r:lib_t,s0)
-+/lib/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
-+/lib64/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
-+/lib/(.*/)?ld-[^/]*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:ld_so_t,s0)
-+/lib64/(.*/)?ld-[^/]*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:ld_so_t,s0)
+-/sbin(/.*)?				gen_context(system_u:object_r:sbin_t,s0)
++/sbin				-d	gen_context(system_u:object_r:sbin_t,s0)
++/sbin/.*				gen_context(system_u:object_r:sbin_t,s0)
+ /sbin/mkfs\.cramfs		--	gen_context(system_u:object_r:sbin_t,s0)
+ /sbin/insmod_ksymoops_clean	--	gen_context(system_u:object_r:sbin_t,s0)
  
  #
  # /opt
  #
--/opt(/.*)?/lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
--/opt(/.*)?/lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
-+/opt/(.*/)?lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
-+/opt/(.*/)?lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
- /opt/.*/jre.*/libdeploy.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /opt/.*/jre.*/libjvm.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/opt(/.*)?/bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
++/opt/(.*/)?bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
+ 
+-/opt(/.*)?/libexec(/.*)?		gen_context(system_u:object_r:bin_t,s0)
++/opt/(.*/)?libexec(/.*)?		gen_context(system_u:object_r:bin_t,s0)
+ 
+-/opt(/.*)?/sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
++/opt/(.*/)?sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
  
-@@ -44,18 +49,18 @@
  #
  # /usr
  #
--/usr(/.*)?/HelixPlayer/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/(.*/)?HelixPlayer/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
--/usr(/.*)?/java/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
--/usr(/.*)?/java/.*\.jar			--	gen_context(system_u:object_r:shlib_t,s0)
--/usr(/.*)?/java/.*\.jsa			--	gen_context(system_u:object_r:shlib_t,s0)
-+/usr/(.*/)?java/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/(.*/)?java/.*\.jar			--	gen_context(system_u:object_r:shlib_t,s0)
-+/usr/(.*/)?java/.*\.jsa			--	gen_context(system_u:object_r:shlib_t,s0)
- 
--/usr(/.*)?/lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
--/usr(/.*)?/lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
-+/usr/(.*/)?lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
-+/usr/(.*/)?lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
- 
--/usr(/.*)?/lib(64)?(/.*)?/ld-[^/]*\.so(\.[^/]*)* gen_context(system_u:object_r:ld_so_t,s0)
-+/usr/(.*/)?lib(64)?(/.*)?/ld-[^/]*\.so(\.[^/]*)* gen_context(system_u:object_r:ld_so_t,s0)
- 
--/usr(/.*)?/nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/(.*/)?nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
- /usr(/.*)?/lib(64)?(/.*)?/nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
-@@ -130,7 +135,7 @@
- /usr/lib(64)?/.*/program/libsvx680li\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/.*/program/libcomphelp4gcc3\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/.*/program/libsoffice\.so  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
--/usr(/.*)?/pcsc/drivers(/.*)?/lib(cm2020|cm4000|SCR24x)\.so(\.[^/]*)*  		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/(.*/)?pcsc/drivers(/.*)?/lib(cm2020|cm4000|SCR24x)\.so(\.[^/]*)*  		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
- /usr/lib(64)?/firefox.*\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/mozilla.*\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -185,9 +190,9 @@
- /usr/.*/jre.*/libdeploy.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/.*/jre.*/libjvm.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/usr(/.*)?/Bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
++/usr/(.*/)?Bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
  
--/usr(/.*)?/intellinux/nppdf\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0)
--/usr(/.*)?/intellinux/lib/\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0)
--/usr(/.*)?/intellinux/plug_ins/.*\.api -- gen_context(system_u:object_r:texrel_shlib_t,s0)
-+/usr/(.*/)?intellinux/nppdf\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0)
-+/usr/(.*/)?intellinux/lib/\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0)
-+/usr/(.*/)?intellinux/plug_ins/.*\.api -- gen_context(system_u:object_r:texrel_shlib_t,s0)
- ') dnl end distro_redhat
+-/usr(/.*)?/bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
++/usr/(.*/)?bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
  
- ifdef(`distro_suse',`
-diff -ru serefpolicy-2.2.29.orig/policy/modules/system/miscfiles.fc serefpolicy-2.2.29.fc/policy/modules/system/miscfiles.fc
---- serefpolicy-2.2.29.orig/policy/modules/system/miscfiles.fc	2006-04-01 03:11:34.000000000 +1100
-+++ serefpolicy-2.2.29.fc/policy/modules/system/miscfiles.fc	2006-04-10 20:53:29.000000000 +1000
-@@ -7,7 +7,7 @@
- #
- # /opt
- #
--/opt(/.*)?/man(/.*)?		gen_context(system_u:object_r:man_t,s0)
-+/opt/(.*/)?man(/.*)?		gen_context(system_u:object_r:man_t,s0)
+-/usr(/.*)?/sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
++/usr/(.*/)?sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
  
- #
- # /srv
-diff -ru serefpolicy-2.2.29.orig/policy/modules/system/modutils.fc serefpolicy-2.2.29.fc/policy/modules/system/modutils.fc
---- serefpolicy-2.2.29.orig/policy/modules/system/modutils.fc	2006-04-01 03:11:34.000000000 +1100
-+++ serefpolicy-2.2.29.fc/policy/modules/system/modutils.fc	2006-04-10 20:53:29.000000000 +1000
-@@ -2,9 +2,11 @@
- /etc/modules\.conf.*	--	gen_context(system_u:object_r:modules_conf_t,s0)
- /etc/modprobe\.conf.*	--	gen_context(system_u:object_r:modules_conf_t,s0)
+ /usr/lib/ccache/bin(/.*)?		gen_context(system_u:object_r:bin_t,s0)
+ /usr/lib/pgsql/test/regress/.*\.sh --	gen_context(system_u:object_r:bin_t,s0)
+--- serefpolicy-2.2.30/policy/modules/services/kerberos.fc.fcon	2006-04-11 06:35:48.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/services/kerberos.fc	2006-04-11 07:32:30.000000000 -0400
+@@ -5,8 +5,8 @@
+ /etc/krb5kdc/kadm5.keytab 	--	gen_context(system_u:object_r:krb5_keytab_t,s0)
+ /etc/krb5kdc/principal.*		gen_context(system_u:object_r:krb5kdc_principal_t,s0)
  
--/lib(64)?/modules/[^/]+/modules\..+ -- gen_context(system_u:object_r:modules_dep_t,s0)
-+/lib/modules/[^/]+/modules\..+ -- gen_context(system_u:object_r:modules_dep_t,s0)
-+/lib64/modules/[^/]+/modules\..+ -- gen_context(system_u:object_r:modules_dep_t,s0)
+-/usr(/local)?(/kerberos)?/sbin/krb5kdc -- gen_context(system_u:object_r:krb5kdc_exec_t,s0)
+-/usr(/local)?(/kerberos)?/sbin/kadmind -- gen_context(system_u:object_r:kadmind_exec_t,s0)
++/usr/(local/)?(kerberos/)?sbin/krb5kdc -- gen_context(system_u:object_r:krb5kdc_exec_t,s0)
++/usr/(local/)?(kerberos/)?sbin/kadmind -- gen_context(system_u:object_r:kadmind_exec_t,s0)
  
--/lib(64)?/modules/modprobe\.conf -- gen_context(system_u:object_r:modules_conf_t,s0)
-+/lib/modules/modprobe\.conf -- gen_context(system_u:object_r:modules_conf_t,s0)
-+/lib64/modules/modprobe\.conf -- gen_context(system_u:object_r:modules_conf_t,s0)
+ /usr/local/var/krb5kdc(/.*)?		gen_context(system_u:object_r:krb5kdc_conf_t,s0)
+ /usr/local/var/krb5kdc/principal.*	gen_context(system_u:object_r:krb5kdc_principal_t,s0)
+--- serefpolicy-2.2.30/policy/modules/services/tftp.fc.fcon	2006-04-11 06:35:48.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/services/tftp.fc	2006-04-11 07:32:30.000000000 -0400
+@@ -2,4 +2,5 @@
+ /usr/sbin/atftpd	--	gen_context(system_u:object_r:tftpd_exec_t,s0)
+ /usr/sbin/in\.tftpd	--	gen_context(system_u:object_r:tftpd_exec_t,s0)
  
- /sbin/depmod.*		--	gen_context(system_u:object_r:depmod_exec_t,s0)
- /sbin/generate-modprobe\.conf -- gen_context(system_u:object_r:update_modules_exec_t,s0)
+-/tftpboot(/.*)?			gen_context(system_u:object_r:tftpdir_t,s0)
++/tftpboot		-d	gen_context(system_u:object_r:tftpdir_t,s0)
++/tftpboot/.*			gen_context(system_u:object_r:tftpdir_t,s0)

policy-20060323.patch:
 admin/rpm.te               |    1 +
 apps/ada.fc                |    7 +++++++
 apps/ada.if                |   29 +++++++++++++++++++++++++++++
 apps/ada.te                |   24 ++++++++++++++++++++++++
 apps/java.fc               |    1 +
 apps/mono.if               |   23 +++++++++++++++++++++++
 kernel/devices.fc          |    1 +
 kernel/devices.if          |   40 ++++++++++++++++++++++++++++++++++++++++
 kernel/files.if            |   15 +++++++++++++++
 kernel/mls.te              |    1 +
 services/apache.if         |   20 ++++++++++++++++++++
 services/automount.te      |    1 +
 services/avahi.te          |    4 ++++
 services/bluetooth.te      |    7 +++++--
 services/cups.te           |    2 +-
 services/dbus.te           |    1 +
 services/ftp.te            |    1 +
 services/gpm.te            |    3 +--
 services/hal.te            |   13 ++++++++++++-
 services/mysql.te          |    1 +
 services/networkmanager.te |    1 +
 services/nscd.if           |   20 ++++++++++++++++++++
 services/rsync.te          |    4 ++++
 services/samba.te          |    2 ++
 services/snmp.te           |    1 +
 services/xserver.if        |   21 +++++++++++++++++++++
 system/fstools.te          |    1 +
 system/getty.fc            |    1 +
 system/getty.te            |    2 ++
 system/init.te             |    1 +
 system/libraries.fc        |   32 ++++++++++++++++++++++----------
 system/mount.te            |    4 +++-
 system/unconfined.if       |   10 ++++++----
 system/unconfined.te       |    4 ++--
 system/userdomain.te       |    5 +++--
 35 files changed, 279 insertions(+), 25 deletions(-)

Index: policy-20060323.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060323.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- policy-20060323.patch	10 Apr 2006 21:10:33 -0000	1.11
+++ policy-20060323.patch	11 Apr 2006 20:59:57 -0000	1.12
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.2.29/policy/modules/admin/rpm.te
---- nsaserefpolicy/policy/modules/admin/rpm.te	2006-03-30 10:59:02.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/admin/rpm.te	2006-04-03 16:38:39.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.2.30/policy/modules/admin/rpm.te
+--- nsaserefpolicy/policy/modules/admin/rpm.te	2006-04-04 18:06:37.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/admin/rpm.te	2006-04-11 07:05:00.000000000 -0400
 @@ -117,6 +117,7 @@
  mls_file_read_up(rpm_t)
  mls_file_write_down(rpm_t)
@@ -9,9 +9,9 @@
  
  selinux_get_fs_mount(rpm_t)
  selinux_validate_context(rpm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ada.fc serefpolicy-2.2.29/policy/modules/apps/ada.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ada.fc serefpolicy-2.2.30/policy/modules/apps/ada.fc
 --- nsaserefpolicy/policy/modules/apps/ada.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/apps/ada.fc	2006-04-04 06:29:46.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/apps/ada.fc	2006-04-11 07:05:00.000000000 -0400
 @@ -0,0 +1,7 @@
 +#
 +# /usr
@@ -20,186 +20,12 @@
 +/usr/bin/gnatbind	--	gen_context(system_u:object_r:ada_exec_t,s0)
 +/usr/bin/gnatls		--	gen_context(system_u:object_r:ada_exec_t,s0)
 +/usr/bin/gnatmake	--	gen_context(system_u:object_r:ada_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ada.if serefpolicy-2.2.29/policy/modules/apps/ada.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ada.if serefpolicy-2.2.30/policy/modules/apps/ada.if
 --- nsaserefpolicy/policy/modules/apps/ada.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/apps/ada.if	2006-04-04 06:28:18.000000000 -0400
-@@ -0,0 +1,203 @@
++++ serefpolicy-2.2.30/policy/modules/apps/ada.if	2006-04-11 07:05:43.000000000 -0400
+@@ -0,0 +1,29 @@
 +## <summary>Java virtual machine</summary>
 +
-+#######################################
-+## <summary>
-+##	The per user domain template for the ada module.
-+## </summary>
-+## <desc>
-+##	<p>
-+##	This template creates a derived domains which are used
-+##	for ada plugins that are executed by a browser.
-+##	</p>
-+##	<p>
-+##	This template is invoked automatically for each user, and
-+##	generally does not need to be invoked directly
-+##	by policy writers.
-+##	</p>
-+## </desc>
-+## <param name="userdomain_prefix">
-+##	<summary>
-+##	The prefix of the user domain (e.g., user
-+##	is the prefix for user_t).
-+##	</summary>
-+## </param>
-+## <param name="user_domain">
-+##	<summary>
-+##	The type of the user domain.
-+##	</summary>
-+## </param>
-+## <param name="user_role">
-+##	<summary>
-+##	The role associated with the user domain.
-+##	</summary>
-+## </param>
-+#
-+template(`ada_per_userdomain_template',`
-+	gen_require(`
-+		type ada_exec_t;
-+	')
-+	
-+	########################################
-+	#
-+	# Declarations
-+	#
-+
-+	type $1_adaplugin_t;
-+	domain_type($1_adaplugin_t)
-+	role $3 types $1_adaplugin_t;
-+	
-+	type $1_adaplugin_tmp_t;
-+	files_tmp_file($1_adaplugin_tmp_t)
-+
-+	type $1_adaplugin_tmpfs_t;
-+	files_tmpfs_file($1_adaplugin_tmpfs_t)
-+	
-+	########################################
-+	#
-+	# Local policy
-+	#
-+
-+	allow $1_adaplugin_t self:process { signal_perms getsched setsched execmem };
-+	allow $1_adaplugin_t self:fifo_file rw_file_perms;
-+	allow $1_adaplugin_t self:tcp_socket create_socket_perms;
-+	allow $1_adaplugin_t self:udp_socket create_socket_perms;
-+	
-+	allow $1_adaplugin_t $2:unix_stream_socket connectto;
-+	allow $1_adaplugin_t $2:unix_stream_socket { read write };
-+	userdom_write_user_tmp_sockets($1,$1_adaplugin_t)
-+
-+	allow $1_adaplugin_t $1_adaplugin_tmp_t:dir create_dir_perms;
-+	allow $1_adaplugin_t $1_adaplugin_tmp_t:file create_file_perms;
-+	files_tmp_filetrans($1_adaplugin_t,$1_adaplugin_tmp_t,{ file dir })
-+
-+	allow $1_adaplugin_t $1_adaplugin_tmpfs_t:dir { read getattr lock search ioctl add_name remove_name write };
-+	allow $1_adaplugin_t $1_adaplugin_tmpfs_t:file { create ioctl read getattr lock write setattr append link unlink rename };
-+	allow $1_adaplugin_t $1_adaplugin_tmpfs_t:lnk_file { create read getattr setattr link unlink rename };
-+	allow $1_adaplugin_t $1_adaplugin_tmpfs_t:sock_file { create ioctl read getattr lock write setattr append link unlink rename };
-+	allow $1_adaplugin_t $1_adaplugin_tmpfs_t:fifo_file { create ioctl read getattr lock write setattr append link unlink rename };
-+	fs_tmpfs_filetrans($1_adaplugin_t,$1_adaplugin_tmpfs_t,{ dir file lnk_file sock_file fifo_file })
-+
-+	# cjp: rw_dir_perms here doesnt make sense
-+	allow $1_adaplugin_t $1_home_t:dir rw_dir_perms;
-+	allow $1_adaplugin_t $1_home_t:file rw_file_perms;
-+	allow $1_adaplugin_t $1_home_t:lnk_file { getattr read };
-+
-+	can_exec($1_adaplugin_t, ada_exec_t)
-+	
-+	# The user role is authorized for this domain.
-+	domain_auto_trans($1_t, ada_exec_t, $1_adaplugin_t)
-+	allow $1_adaplugin_t $2:fd use;
-+	# Unrestricted inheritance from the caller.
-+	allow $2 $1_adaplugin_t:process { noatsecure siginh rlimitinh };
-+	allow $1_adaplugin_t $2:process signull;
-+	
-+	kernel_read_all_sysctls($1_adaplugin_t)
-+	kernel_search_vm_sysctl($1_adaplugin_t)
-+	kernel_read_network_state($1_adaplugin_t)
-+	kernel_read_system_state($1_adaplugin_t)
-+
-+	# Search bin directory under adaplugin for adaplugin executable
-+	corecmd_search_bin($1_adaplugin_t)
-+
-+	corenet_non_ipsec_sendrecv($1_adaplugin_t)
-+	corenet_tcp_sendrecv_generic_if($1_adaplugin_t)
-+	corenet_udp_sendrecv_generic_if($1_adaplugin_t)
-+	corenet_raw_sendrecv_generic_if($1_adaplugin_t)
-+	corenet_tcp_sendrecv_all_nodes($1_adaplugin_t)
-+	corenet_udp_sendrecv_all_nodes($1_adaplugin_t)
-+	corenet_raw_sendrecv_all_nodes($1_adaplugin_t)
-+	corenet_tcp_sendrecv_all_ports($1_adaplugin_t)
-+	corenet_udp_sendrecv_all_ports($1_adaplugin_t)
-+	corenet_tcp_bind_all_nodes($1_adaplugin_t)
-+	corenet_udp_bind_all_nodes($1_adaplugin_t)
-+	corenet_tcp_connect_all_ports($1_adaplugin_t)
-+
-+	dev_read_sound($1_adaplugin_t)
-+	dev_write_sound($1_adaplugin_t)
-+	dev_read_urand($1_adaplugin_t)
-+	dev_read_rand($1_adaplugin_t)
-+
-+	files_read_etc_files($1_adaplugin_t)
-+	files_read_usr_files($1_adaplugin_t)
-+	files_search_home($1_adaplugin_t)
-+	files_search_var_lib($1_adaplugin_t)
-+	files_read_etc_runtime_files($1_adaplugin_t)
-+	# Read global fonts and font config
-+	files_read_etc_files($1_adaplugin_t)
-+
-+	fs_getattr_xattr_fs($1_adaplugin_t)
-+	fs_dontaudit_rw_tmpfs_files($1_adaplugin_t)
-+
-+	libs_use_ld_so($1_adaplugin_t)
-+	libs_use_shared_libs($1_adaplugin_t)
-+
-+	logging_send_syslog_msg($1_adaplugin_t)
-+
-+	miscfiles_read_localization($1_adaplugin_t)
-+	# Read global fonts and font config
-+	miscfiles_read_fonts($1_adaplugin_t)
-+
-+	sysnet_read_config($1_adaplugin_t)
-+
-+	userdom_dontaudit_use_user_terminals($1,$1_adaplugin_t)
-+	userdom_dontaudit_setattr_user_home_content_files($1,$1_adaplugin_t)
-+	userdom_dontaudit_exec_user_home_content_files($1,$1_adaplugin_t)
-+	userdom_manage_user_home_content_dirs($1,$1_adaplugin_t)
-+	userdom_manage_user_home_content_files($1,$1_adaplugin_t)
-+	userdom_manage_user_home_content_symlinks($1,$1_adaplugin_t)
-+	userdom_manage_user_home_content_pipes($1,$1_adaplugin_t)
-+	userdom_manage_user_home_content_sockets($1,$1_adaplugin_t)
-+	userdom_user_home_dir_filetrans_user_home_content($1,$1_adaplugin_t,{ file lnk_file sock_file fifo_file })
-+
-+	tunable_policy(`allow_ada_execstack',`
-+		allow $1_adaplugin_t self:process execstack;
-+
-+		allow $1_adaplugin_t $1_adaplugin_tmp_t:file execute;
-+
-+		libs_legacy_use_shared_libs($1_adaplugin_t)
-+		libs_legacy_use_ld_so($1_adaplugin_t)
-+		libs_use_lib_files($1_adaplugin_t)
-+
-+		miscfiles_legacy_read_localization($1_adaplugin_t)
-+	')
-+
-+	optional_policy(`
-+		nis_use_ypbind($1_adaplugin_t)
-+	')
-+
-+	optional_policy(`
-+		nscd_socket_use($1_adaplugin_t)
-+	')
-+
-+	optional_policy(`
-+		xserver_user_client_template($1,$1_adaplugin_t,$1_adaplugin_tmpfs_t)
-+	')
-+')
-+
 +########################################
 +## <summary>
 +##	Execute the ada program in the ada domain.
@@ -227,9 +53,9 @@
 +		errprint(`Warning: $0($1) has no effect in strict policy.'__endline__)
 +	')
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ada.te serefpolicy-2.2.29/policy/modules/apps/ada.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ada.te serefpolicy-2.2.30/policy/modules/apps/ada.te
 --- nsaserefpolicy/policy/modules/apps/ada.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/apps/ada.te	2006-04-04 06:28:03.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/apps/ada.te	2006-04-11 07:05:00.000000000 -0400
 @@ -0,0 +1,24 @@
 +
 +policy_module(ada,1.1.0)
@@ -255,17 +81,17 @@
 +	unconfined_domain_noaudit(ada_t)
 +	role system_r types ada_t;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.2.29/policy/modules/apps/java.fc
---- nsaserefpolicy/policy/modules/apps/java.fc	2006-03-23 16:46:10.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/apps/java.fc	2006-04-06 14:52:12.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.2.30/policy/modules/apps/java.fc
+--- nsaserefpolicy/policy/modules/apps/java.fc	2006-02-20 11:33:04.000000000 -0500
++++ serefpolicy-2.2.30/policy/modules/apps/java.fc	2006-04-11 07:05:00.000000000 -0400
 @@ -4,3 +4,4 @@
  /usr(/.*)?/bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
  /usr/bin/gcj-dbtool	--	gen_context(system_u:object_r:java_exec_t,s0)
  /usr/bin/gij		--	gen_context(system_u:object_r:java_exec_t,s0)
 +/opt(/.*)?/bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-2.2.29/policy/modules/apps/mono.if
---- nsaserefpolicy/policy/modules/apps/mono.if	2006-03-23 16:46:10.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/apps/mono.if	2006-04-03 10:03:24.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-2.2.30/policy/modules/apps/mono.if
+--- nsaserefpolicy/policy/modules/apps/mono.if	2006-02-10 17:05:18.000000000 -0500
++++ serefpolicy-2.2.30/policy/modules/apps/mono.if	2006-04-11 07:05:00.000000000 -0400
 @@ -23,3 +23,26 @@
  	allow mono_t $1:fifo_file rw_file_perms;
  	allow mono_t $1:process sigchld;
@@ -293,17 +119,9 @@
 +	allow mono_t $1:dbus send_msg;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.2.29/policy/modules/apps/mono.te
---- nsaserefpolicy/policy/modules/apps/mono.te	2006-03-23 16:46:10.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/apps/mono.te	2006-04-03 12:28:33.000000000 -0400
-@@ -22,3 +22,4 @@
- 	unconfined_domain_noaudit(mono_t)
- 	role system_r types mono_t;
- ')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.29/policy/modules/kernel/devices.fc
---- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-03-23 16:45:31.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/kernel/devices.fc	2006-03-31 11:49:27.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.30/policy/modules/kernel/devices.fc
+--- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-03-23 14:33:29.000000000 -0500
++++ serefpolicy-2.2.30/policy/modules/kernel/devices.fc	2006-04-11 07:05:00.000000000 -0400
 @@ -59,6 +59,7 @@
  ')
  /dev/vbi.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
@@ -312,9 +130,9 @@
  /dev/vttuner		-c	gen_context(system_u:object_r:v4l_device_t,s0)
  /dev/vtx.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
  /dev/winradio.		-c	gen_context(system_u:object_r:v4l_device_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.29/policy/modules/kernel/devices.if
---- nsaserefpolicy/policy/modules/kernel/devices.if	2006-03-30 10:03:20.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/kernel/devices.if	2006-04-03 11:31:23.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.30/policy/modules/kernel/devices.if
+--- nsaserefpolicy/policy/modules/kernel/devices.if	2006-04-10 17:05:09.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/kernel/devices.if	2006-04-11 07:08:48.000000000 -0400
 @@ -2439,6 +2439,26 @@
  
  ########################################
@@ -342,9 +160,9 @@
  ##	Associate a file to a usbfs filesystem.
  ## </summary>
  ## <param name="file_type">
-@@ -2860,3 +2880,23 @@
- 	allow $1 self:capability sys_rawio;
- 	typeattribute $1 memory_raw_write, memory_raw_read;
+@@ -2855,3 +2875,23 @@
+ 
+ 	typeattribute $1 devices_unconfined_type;
  ')
 +
 +########################################
@@ -366,10 +184,10 @@
 +	dontaudit $1 device_node:dir_file_class_set getattr;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.29/policy/modules/kernel/files.if
---- nsaserefpolicy/policy/modules/kernel/files.if	2006-03-30 10:04:15.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/kernel/files.if	2006-04-03 17:43:29.000000000 -0400
-@@ -1643,6 +1643,21 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.30/policy/modules/kernel/files.if
+--- nsaserefpolicy/policy/modules/kernel/files.if	2006-04-10 17:05:10.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/kernel/files.if	2006-04-11 07:05:00.000000000 -0400
+@@ -1661,6 +1661,21 @@
  ')
  
  ########################################
@@ -391,9 +209,9 @@
  ## <summary>
  ##	Read files in /etc that are dynamically
  ##	created on boot, such as mtab.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.29/policy/modules/kernel/mls.te
---- nsaserefpolicy/policy/modules/kernel/mls.te	2006-03-23 16:45:31.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/kernel/mls.te	2006-04-03 16:29:39.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.30/policy/modules/kernel/mls.te
+--- nsaserefpolicy/policy/modules/kernel/mls.te	2006-03-07 10:31:09.000000000 -0500
++++ serefpolicy-2.2.30/policy/modules/kernel/mls.te	2006-04-11 07:05:00.000000000 -0400
 @@ -60,6 +60,7 @@
  
  ifdef(`enable_mls',`
@@ -402,9 +220,9 @@
  range_transition kernel_t init_exec_t s0 - s15:c0.c255;
  range_transition kernel_t lvm_exec_t s0 - s15:c0.c255;
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.29/policy/modules/services/apache.if
---- nsaserefpolicy/policy/modules/services/apache.if	2006-03-24 11:09:14.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/services/apache.if	2006-04-03 13:02:08.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.30/policy/modules/services/apache.if
+--- nsaserefpolicy/policy/modules/services/apache.if	2006-04-06 14:05:25.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/services/apache.if	2006-04-11 07:05:00.000000000 -0400
 @@ -197,6 +197,26 @@
  		allow httpd_$1_script_t self:lnk_file read;
  	')
@@ -432,9 +250,9 @@
  	tunable_policy(`httpd_enable_cgi && httpd_can_network_connect',`
  		allow httpd_$1_script_t self:tcp_socket create_stream_socket_perms;
  		allow httpd_$1_script_t self:udp_socket create_socket_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.29/policy/modules/services/automount.te
---- nsaserefpolicy/policy/modules/services/automount.te	2006-03-24 11:09:13.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/services/automount.te	2006-03-31 11:21:52.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.30/policy/modules/services/automount.te
+--- nsaserefpolicy/policy/modules/services/automount.te	2006-03-24 11:15:50.000000000 -0500
++++ serefpolicy-2.2.30/policy/modules/services/automount.te	2006-04-11 07:05:00.000000000 -0400
 @@ -123,6 +123,7 @@
  logging_search_logs(automount_t)
  
@@ -443,9 +261,9 @@
  
  # Run mount in the mount_t domain.
  mount_domtrans(automount_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.2.29/policy/modules/services/avahi.te
---- nsaserefpolicy/policy/modules/services/avahi.te	2006-03-24 11:09:13.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/services/avahi.te	2006-04-03 10:04:43.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.2.30/policy/modules/services/avahi.te
+--- nsaserefpolicy/policy/modules/services/avahi.te	2006-03-24 11:15:50.000000000 -0500
++++ serefpolicy-2.2.30/policy/modules/services/avahi.te	2006-04-11 07:05:00.000000000 -0400
 @@ -92,6 +92,10 @@
  	dbus_system_bus_client_template(avahi,avahi_t)
  	dbus_connect_system_bus(avahi_t)
@@ -457,9 +275,9 @@
  ')
  
  optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.29/policy/modules/services/bluetooth.te
---- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-03-30 10:59:02.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/services/bluetooth.te	2006-04-03 10:50:10.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.30/policy/modules/services/bluetooth.te
+--- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-04-04 18:06:38.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/services/bluetooth.te	2006-04-11 07:05:00.000000000 -0400
 @@ -41,7 +41,7 @@
  # Bluetooth services local policy
  #
@@ -495,9 +313,9 @@
  ')
  
  optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.29/policy/modules/services/cups.te
---- nsaserefpolicy/policy/modules/services/cups.te	2006-03-30 10:59:02.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/services/cups.te	2006-04-03 17:42:39.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.30/policy/modules/services/cups.te
+--- nsaserefpolicy/policy/modules/services/cups.te	2006-04-04 18:06:38.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/services/cups.te	2006-04-11 07:05:00.000000000 -0400
 @@ -110,7 +110,7 @@
  files_tmp_filetrans(cupsd_t, cupsd_tmp_t, { file dir fifo_file })
  
@@ -507,9 +325,9 @@
  allow cupsd_t cupsd_var_run_t:sock_file create_file_perms;
  files_pid_filetrans(cupsd_t,cupsd_var_run_t,file)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-2.2.29/policy/modules/services/dbus.te
---- nsaserefpolicy/policy/modules/services/dbus.te	2006-03-24 11:09:14.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/services/dbus.te	2006-03-31 11:21:52.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-2.2.30/policy/modules/services/dbus.te
+--- nsaserefpolicy/policy/modules/services/dbus.te	2006-03-24 11:15:50.000000000 -0500
++++ serefpolicy-2.2.30/policy/modules/services/dbus.te	2006-04-11 07:05:00.000000000 -0400
 @@ -102,6 +102,7 @@
  logging_send_syslog_msg(system_dbusd_t)
  
@@ -518,9 +336,9 @@
  
  seutil_read_config(system_dbusd_t)
  seutil_read_default_contexts(system_dbusd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.2.29/policy/modules/services/ftp.te
---- nsaserefpolicy/policy/modules/services/ftp.te	2006-03-30 10:59:02.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/services/ftp.te	2006-04-08 10:26:14.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.2.30/policy/modules/services/ftp.te
+--- nsaserefpolicy/policy/modules/services/ftp.te	2006-04-04 18:06:38.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/services/ftp.te	2006-04-11 07:05:00.000000000 -0400
 @@ -62,6 +62,7 @@
  files_pid_filetrans(ftpd_t,ftpd_var_run_t,file)
  
@@ -529,9 +347,22 @@
  allow ftpd_t xferlog_t:file create_file_perms;
  logging_log_filetrans(ftpd_t,xferlog_t,file)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.29/policy/modules/services/hal.te
---- nsaserefpolicy/policy/modules/services/hal.te	2006-03-30 10:59:02.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/services/hal.te	2006-04-03 17:43:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpm.te serefpolicy-2.2.30/policy/modules/services/gpm.te
+--- nsaserefpolicy/policy/modules/services/gpm.te	2006-04-04 18:06:38.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/services/gpm.te	2006-04-11 07:05:00.000000000 -0400
+@@ -54,8 +54,7 @@
+ 
+ dev_read_sysfs(gpm_t)
+ # Access the mouse.
+-# cjp: why write?
+-dev_rw_input_dev(event_device_t)
++dev_rw_input_dev(gpm_t)
+ dev_rw_mouse(gpm_t)
+ 
+ fs_getattr_all_fs(gpm_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.30/policy/modules/services/hal.te
+--- nsaserefpolicy/policy/modules/services/hal.te	2006-04-04 18:06:38.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/services/hal.te	2006-04-11 07:05:00.000000000 -0400
 @@ -22,7 +22,7 @@
  #
  
@@ -580,9 +411,9 @@
  ')
  
  optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-2.2.29/policy/modules/services/mysql.te
---- nsaserefpolicy/policy/modules/services/mysql.te	2006-03-24 11:09:13.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/services/mysql.te	2006-04-08 11:18:50.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-2.2.30/policy/modules/services/mysql.te
+--- nsaserefpolicy/policy/modules/services/mysql.te	2006-03-24 11:15:50.000000000 -0500
++++ serefpolicy-2.2.30/policy/modules/services/mysql.te	2006-04-11 07:05:00.000000000 -0400
 @@ -104,6 +104,7 @@
  
  miscfiles_read_localization(mysqld_t)
@@ -591,9 +422,9 @@
  sysnet_read_config(mysqld_t)
  
  userdom_dontaudit_use_unpriv_user_fds(mysqld_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.29/policy/modules/services/networkmanager.te
---- nsaserefpolicy/policy/modules/services/networkmanager.te	2006-03-24 11:09:15.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/services/networkmanager.te	2006-04-03 12:24:37.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.30/policy/modules/services/networkmanager.te
+--- nsaserefpolicy/policy/modules/services/networkmanager.te	2006-03-24 11:15:50.000000000 -0500
++++ serefpolicy-2.2.30/policy/modules/services/networkmanager.te	2006-04-11 07:05:00.000000000 -0400
 @@ -155,6 +155,7 @@
  
  optional_policy(`
@@ -602,9 +433,9 @@
  ')
  
  optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.2.29/policy/modules/services/nscd.if
---- nsaserefpolicy/policy/modules/services/nscd.if	2006-03-23 16:46:11.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/services/nscd.if	2006-04-03 12:24:28.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.2.30/policy/modules/services/nscd.if
+--- nsaserefpolicy/policy/modules/services/nscd.if	2006-03-23 14:33:30.000000000 -0500
++++ serefpolicy-2.2.30/policy/modules/services/nscd.if	2006-04-11 07:05:00.000000000 -0400
 @@ -126,3 +126,23 @@
  
  	allow $1 nscd_t:nscd *;
@@ -629,9 +460,9 @@
 +	allow $1 nscd_t:process signal;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-2.2.29/policy/modules/services/rsync.te
---- nsaserefpolicy/policy/modules/services/rsync.te	2006-03-24 11:09:14.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/services/rsync.te	2006-04-08 10:31:40.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-2.2.30/policy/modules/services/rsync.te
+--- nsaserefpolicy/policy/modules/services/rsync.te	2006-03-24 11:15:50.000000000 -0500
++++ serefpolicy-2.2.30/policy/modules/services/rsync.te	2006-04-11 07:05:00.000000000 -0400
 @@ -50,6 +50,8 @@
  allow rsync_t rsync_var_run_t:dir rw_dir_perms;
  files_pid_filetrans(rsync_t,rsync_var_run_t,file)
@@ -657,9 +488,9 @@
  
  miscfiles_read_localization(rsync_t)
  miscfiles_read_public_files(rsync_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.29/policy/modules/services/samba.te
---- nsaserefpolicy/policy/modules/services/samba.te	2006-03-24 11:09:15.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/services/samba.te	2006-04-03 14:24:40.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.30/policy/modules/services/samba.te
+--- nsaserefpolicy/policy/modules/services/samba.te	2006-04-04 18:06:38.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/services/samba.te	2006-04-11 07:05:00.000000000 -0400
 @@ -105,6 +105,8 @@
  allow samba_net_t samba_net_tmp_t:file create_file_perms;
  files_tmp_filetrans(samba_net_t, samba_net_tmp_t, { file dir })
@@ -669,9 +500,9 @@
  allow samba_net_t samba_var_t:dir rw_dir_perms;
  allow samba_net_t samba_var_t:lnk_file create_lnk_perms;
  allow samba_net_t samba_var_t:file create_lnk_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-2.2.29/policy/modules/services/snmp.te
---- nsaserefpolicy/policy/modules/services/snmp.te	2006-03-24 11:09:13.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/services/snmp.te	2006-04-03 13:11:33.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-2.2.30/policy/modules/services/snmp.te
+--- nsaserefpolicy/policy/modules/services/snmp.te	2006-04-04 18:06:38.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/services/snmp.te	2006-04-11 07:05:00.000000000 -0400
 @@ -49,6 +49,7 @@
  allow snmpd_t snmpd_var_run_t:dir rw_dir_perms;
  files_pid_filetrans(snmpd_t,snmpd_var_run_t,file)
@@ -680,10 +511,10 @@
  kernel_read_kernel_sysctls(snmpd_t)
  kernel_read_net_sysctls(snmpd_t)
  kernel_read_proc_symlinks(snmpd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.29/policy/modules/services/xserver.if
---- nsaserefpolicy/policy/modules/services/xserver.if	2006-03-30 10:16:43.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/services/xserver.if	2006-04-03 10:43:12.000000000 -0400
-@@ -1015,3 +1015,24 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.30/policy/modules/services/xserver.if
+--- nsaserefpolicy/policy/modules/services/xserver.if	2006-04-06 15:31:54.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/services/xserver.if	2006-04-11 07:05:00.000000000 -0400
+@@ -1070,3 +1070,24 @@
  
  	dontaudit $1 xdm_xserver_t:tcp_socket { read write };
  ')
@@ -708,9 +539,9 @@
 +	allow $1 xdm_xserver_tmp_t:sock_file { read write };
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.29/policy/modules/system/fstools.te
---- nsaserefpolicy/policy/modules/system/fstools.te	2006-03-30 10:59:03.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/system/fstools.te	2006-03-31 11:21:52.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.30/policy/modules/system/fstools.te
+--- nsaserefpolicy/policy/modules/system/fstools.te	2006-04-04 18:06:38.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/system/fstools.te	2006-04-11 07:05:00.000000000 -0400
 @@ -77,6 +77,7 @@
  dev_getattr_usbfs_dirs(fsadm_t)
  # Access to /dev/mapper/control
@@ -719,17 +550,17 @@
  
  fs_search_auto_mountpoints(fsadm_t)
  fs_getattr_xattr_fs(fsadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.fc serefpolicy-2.2.29/policy/modules/system/getty.fc
---- nsaserefpolicy/policy/modules/system/getty.fc	2006-03-23 16:46:11.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/system/getty.fc	2006-04-03 12:51:51.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.fc serefpolicy-2.2.30/policy/modules/system/getty.fc
+--- nsaserefpolicy/policy/modules/system/getty.fc	2005-10-06 17:29:17.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/system/getty.fc	2006-04-11 07:05:00.000000000 -0400
 @@ -6,3 +6,4 @@
  /var/log/mgetty\.log.*	--	gen_context(system_u:object_r:getty_log_t,s0)
  
  /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)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-2.2.29/policy/modules/system/getty.te
---- nsaserefpolicy/policy/modules/system/getty.te	2006-03-29 10:50:04.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/system/getty.te	2006-04-03 12:52:46.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-2.2.30/policy/modules/system/getty.te
+--- nsaserefpolicy/policy/modules/system/getty.te	2006-03-29 11:23:41.000000000 -0500
++++ serefpolicy-2.2.30/policy/modules/system/getty.te	2006-04-11 07:05:00.000000000 -0400
 @@ -104,6 +104,8 @@
  
  miscfiles_read_localization(getty_t)
@@ -739,10 +570,10 @@
  ifdef(`targeted_policy',`
  	term_dontaudit_use_unallocated_ttys(getty_t)
  	term_dontaudit_use_generic_ptys(getty_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.29/policy/modules/system/init.te
---- nsaserefpolicy/policy/modules/system/init.te	2006-03-30 10:13:28.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/system/init.te	2006-03-31 11:21:52.000000000 -0500
-@@ -353,6 +353,7 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.30/policy/modules/system/init.te
+--- nsaserefpolicy/policy/modules/system/init.te	2006-04-06 15:32:43.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/system/init.te	2006-04-11 07:05:00.000000000 -0400
+@@ -352,6 +352,7 @@
  files_mounton_isid_type_dirs(initrc_t)
  files_list_default(initrc_t)
  files_mounton_default(initrc_t)
@@ -750,9 +581,9 @@
  
  libs_rw_ld_so_cache(initrc_t)
  libs_use_ld_so(initrc_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.29/policy/modules/system/libraries.fc
---- nsaserefpolicy/policy/modules/system/libraries.fc	2006-03-30 10:18:07.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/system/libraries.fc	2006-04-04 08:19:58.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.30/policy/modules/system/libraries.fc
+--- nsaserefpolicy/policy/modules/system/libraries.fc	2006-04-05 11:35:09.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/system/libraries.fc	2006-04-11 07:20:26.000000000 -0400
 @@ -33,6 +33,8 @@
  #
  /opt(/.*)?/lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
@@ -762,28 +593,26 @@
  
  #
  # /sbin
-@@ -55,6 +57,8 @@
+@@ -55,14 +57,16 @@
  
  /usr(/.*)?/nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
-+/usr(/.*)?/lib(64)?(/.*)?/nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+
- /usr/lib(64)?/pgsql/test/regress/.*\.so 	--	gen_context(system_u:object_r:shlib_t,s0)
+-/usr/lib(64)?/pgsql/test/regress/.*\.so --	gen_context(system_u:object_r:shlib_t,s0)
++/usr/lib(64)?/pgsql/test/regress/.*\.so	--	gen_context(system_u:object_r:shlib_t,s0)
  
  /usr/lib/win32/.*			--	gen_context(system_u:object_r:shlib_t,s0)
-@@ -62,18 +66,27 @@
+ 
  /usr/lib(64)?/im/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
  /usr/lib(64)?/iiim/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
  
+-/usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr(/.*)?/lib(64)?(/.*)?/nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/libsipphoneapi\.so.*	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
-+
- /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libGLU\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?(/.*)?/libnvidia.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?(/.*)?/nvidia_drv.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
-+/usr/lib(64)?/vmware/lib(/.*)?/libgdk-x11-.*\.so.*  -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-+
+@@ -70,10 +74,15 @@
  /usr/(local/)?lib/wine/.*\.so  		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/(local/)?lib/libfame-.*\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/local/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
@@ -800,7 +629,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)
  
-@@ -92,6 +105,7 @@
+@@ -92,6 +101,7 @@
  /usr/lib(64)?/libstdc\+\+\.so\.2\.7\.2\.8 --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libg\+\+\.so\.2\.7\.2\.8	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libglide3\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -808,66 +637,35 @@
  /usr/lib(64)?/libdv\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/helix/plugins/oggfformat\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/helix/plugins/theorarend\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -168,12 +182,12 @@
- /usr/lib(64)?/libdivxencore.so.0		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -167,16 +177,18 @@
+ /usr/lib(64)?/libdivxdecore.so.0	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libdivxencore.so.0	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+-# vmware
+-/usr/lib/vmware/lib/libgdk-x11-2.0.so.0/libgdk-x11-2.0.so.0 -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++# vmware 
++/usr/lib(64)?/vmware/lib(/.*)?/libgdk-x11-.*\.so.*  -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  
  # Java, Sun Microsystems (JPackage SRPM)
 -/usr/.*/jre.*/lib/i386/libdeploy.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/.*/jre.*/libdeploy.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/.*/jre.*/libjvm.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++
++/usr(/.*)?/intellinux/nppdf\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0)
++/usr(/.*)?/intellinux/lib/\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0)
++/usr(/.*)?/intellinux/plug_ins/.*\.api -- gen_context(system_u:object_r:texrel_shlib_t,s0)
++/usr(/.*)?/intellinux/SPPlugins/ADMPlugin\.apl -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  
 -/usr(/.*)?/Reader/intellinux/plug_ins/.*\.api -- gen_context(system_u:object_r:shlib_t,s0)
 -/usr(/.*)?/Reader/intellinux/plug_ins/AcroForm\.api -- gen_context(system_u:object_r:textrel_shlib_t,s0)
 -/usr(/.*)?/Reader/intellinux/plug_ins/EScript\.api -- gen_context(system_u:object_r:textrel_shlib_t,s0)
 -/usr(/.*)?/Reader/intellinux/SPPlugins/ADMPlugin\.apl -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr(/.*)?/intellinux/nppdf\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0)
-+/usr(/.*)?/intellinux/lib/\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0)
-+/usr(/.*)?/intellinux/plug_ins/.*\.api -- gen_context(system_u:object_r:texrel_shlib_t,s0)
  ') dnl end distro_redhat
  
  ifdef(`distro_suse',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.2.29/policy/modules/system/logging.if
---- nsaserefpolicy/policy/modules/system/logging.if	2006-03-23 16:46:11.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/system/logging.if	2006-03-31 11:21:52.000000000 -0500
-@@ -368,3 +368,35 @@
- 	allow $1 var_log_t:dir rw_dir_perms;
- 	allow $1 var_log_t:file create_file_perms;
- ')
-+
-+########################################
-+## <summary>
-+##	Execute auditctl in the auditctl domain, and
-+##	allow the specified role the auditctl domain.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	The type of the process performing this action.
-+##	</summary>
-+## </param>
-+## <param name="role">
-+##	<summary>
-+##	The role to be allowed the auditctl domain.
-+##	</summary>
-+## </param>
-+## <param name="terminal">
-+##	<summary>
-+##	The type of the terminal allow the auditctl domain to use.
-+##	</summary>
-+## </param>
-+#
-+interface(`logging_run_auditctl',`
-+	gen_require(`
-+		type auditctl_t;
-+	')
-+
-+	logging_domtrans_auditctl($1)
-+	role $2 types auditctl_t;
-+	allow auditctl_t $3:chr_file rw_term_perms;
-+')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.29/policy/modules/system/mount.te
---- nsaserefpolicy/policy/modules/system/mount.te	2006-03-30 10:59:03.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/system/mount.te	2006-03-31 15:12:44.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.30/policy/modules/system/mount.te
+--- nsaserefpolicy/policy/modules/system/mount.te	2006-04-04 18:06:38.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/system/mount.te	2006-04-11 07:05:00.000000000 -0400
 @@ -19,7 +19,8 @@
  # mount local policy
  #
@@ -886,9 +684,9 @@
  fs_mount_all_fs(mount_t)
  fs_unmount_all_fs(mount_t)
  fs_remount_all_fs(mount_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.29/policy/modules/system/unconfined.if
---- nsaserefpolicy/policy/modules/system/unconfined.if	2006-03-29 09:34:53.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/system/unconfined.if	2006-04-03 11:09:45.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.30/policy/modules/system/unconfined.if
+--- nsaserefpolicy/policy/modules/system/unconfined.if	2006-04-10 17:05:11.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/system/unconfined.if	2006-04-11 07:05:00.000000000 -0400
 @@ -55,7 +55,7 @@
  	tunable_policy(`allow_execmem && allow_execstack',`
  		# Allow making the stack executable via mprotect.
@@ -898,22 +696,15 @@
  	', `
  		# These are fairly common but seem to be harmless
  		# caused by using shared libraries built with old tool chains
-@@ -89,14 +89,6 @@
+@@ -88,6 +88,7 @@
+ 	optional_policy(`
  		storage_unconfined($1)
  	')
- 
--	ifdef(`TODO',`
--	if (allow_execmod) {
--		ifdef(`targeted_policy', `', `
--			# Allow text relocations on system shared libraries, e.g. libGL.
--			allow $1 home_type:file execmod;
--		')
--	}
--	') dnl end TODO
++
  ')
  
  ########################################
-@@ -118,9 +110,10 @@
+@@ -109,9 +110,10 @@
  		auditallow $1 self:process execheap;
  	')
  
@@ -927,25 +718,15 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.29/policy/modules/system/unconfined.te
---- nsaserefpolicy/policy/modules/system/unconfined.te	2006-03-29 09:34:53.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/system/unconfined.te	2006-04-04 06:30:36.000000000 -0400
-@@ -94,19 +94,19 @@
- 	')
- 
- 	optional_policy(`
--		lpd_domtrans_checkpc(unconfined_t)
-+		ada_domtrans(unconfined_t)
- 	')
- 
- 	optional_policy(`
--		modutils_domtrans_update_mods(unconfined_t)
-+		lpd_domtrans_checkpc(unconfined_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.30/policy/modules/system/unconfined.te
+--- nsaserefpolicy/policy/modules/system/unconfined.te	2006-04-10 17:05:11.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/system/unconfined.te	2006-04-11 07:23:35.000000000 -0400
+@@ -102,11 +102,11 @@
  	')
  
  	optional_policy(`
 -		mono_domtrans(unconfined_t)
-+		modutils_domtrans_update_mods(unconfined_t)
++		ada_domtrans(unconfined_t)
  	')
  
  	optional_policy(`
@@ -954,21 +735,20 @@
  	')
  
  	optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.29/policy/modules/system/userdomain.te
---- nsaserefpolicy/policy/modules/system/userdomain.te	2006-03-28 12:58:49.000000000 -0500
-+++ serefpolicy-2.2.29/policy/modules/system/userdomain.te	2006-04-10 16:46:24.000000000 -0400
-@@ -179,10 +179,12 @@
- 		mls_file_downgrade(secadm_t)
- 		init_exec(secadm_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.30/policy/modules/system/userdomain.te
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2006-04-05 17:08:56.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/system/userdomain.te	2006-04-11 07:05:00.000000000 -0400
+@@ -181,10 +181,11 @@
  		logging_read_audit_log(secadm_t)
--		logging_domtrans_auditctl(secadm_t)
-+		logging_run_auditctl(secadm_t,secadm_r,admin_terminal)
+ 		logging_run_auditctl(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
  		userdom_dontaudit_append_staff_home_content_files(secadm_t)
 +		auth_relabel_all_files_except_shadow(secadm_t)
 +		auth_relabel_shadow(secadm_t)
  	', `
 -		logging_domtrans_auditctl(sysadm_t)
-+		logging_run_auditctl(sysadm_t,sysadm_r,admin_terminal)
- 		logging_read_audit_log(sysadm_t)
+-		logging_read_audit_log(sysadm_t)
+ 		logging_run_auditctl(sysadm_t,sysadm_r,admin_terminal)
++		logging_read_audit_log(sysadm_t)
  	')
  
+ 	tunable_policy(`allow_ptrace',`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- selinux-policy.spec	10 Apr 2006 21:10:33 -0000	1.170
+++ selinux-policy.spec	11 Apr 2006 20:59:57 -0000	1.171
@@ -15,14 +15,15 @@
 %define CHECKPOLICYVER 1.30.1-2
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.29
-Release: 6
+Version: 2.2.30
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
 patch1: policy-20060323.patch
 patch2: file_contexts.patch
 patch3: policy-200604.patch
+patch4: policy-20060411.patch
 Source1: modules-targeted.conf
 Source2: booleans-targeted.conf
 Source3: Makefile.devel
@@ -150,9 +151,10 @@
 
 %prep 
 %setup -q -n serefpolicy-%{version}
-%patch1 -p1 
-%patch2 -p1 
+%patch1 -p1
+%patch2 -p1
 %patch3 -p1 
+%patch4 -p1 
 
 %install
 # Build targeted policy


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	31 Mar 2006 20:57:44 -0000	1.57
+++ sources	11 Apr 2006 20:59:57 -0000	1.58
@@ -1 +1 @@
-a2106965fe20d1d3d41e0d4e05c2effb  serefpolicy-2.2.29.tgz
+98fa24fd09b92b958155d3f0354e42e5  serefpolicy-2.2.30.tgz



From fedora-cvs-commits at redhat.com  Tue Apr 11 21:05:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 17:05:16 -0400
Subject: rpms/gdm/FC-5 gdmthemetester.in,NONE,1.1 gdm.spec,1.143,1.144
Message-ID: <200604112105.k3BL5G0K005760@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gdm.spec 
Added Files:
	gdmthemetester.in 
Log Message:
- Update to 2.14.1
- fixes CVE-2006-1057 (bug 188303)



--- NEW FILE gdmthemetester.in ---
#!/bin/sh

gdmwhich () {
  COMMAND="$1"
  OUTPUT=
  IFS=:
  for dir in $PATH
  do
    if test -x "$dir/$COMMAND" ; then
      if test "x$OUTPUT" = "x" ; then
        OUTPUT="$dir/$COMMAND"
      fi
    fi
  done
  IFS=$OLD_IFS
  echo "$OUTPUT"
}

echo
echo "GDM Theme Tester"
echo
echo "Be sure to test all the environments:"
echo " console, console-timed, flexi, remote-flexi, xdmcp"
echo "Also be sure to test using caps lock"
echo

XNEST=`gdmwhich Xnest`
GDMXNEST=`gdmwhich gdmXnest`
GDMGREETER="@libexecdir@/gdmgreeter"

if [ x$XNEST = x ]; then
	echo "ERROR: Xnest not found"
        echo ""
	exit 1
fi

if [ x$GDMXNEST = x ]; then
	echo "ERROR: gdmXnest not found"
        echo ""
	exit 1
fi

if [ x$GDMGREETER = x ]; then
	echo "ERROR: gdmgreeter not found"
        echo ""
	exit 1
fi

USAGE="
Usage: $0 <environment> <theme>
<environment> is one of: console, console-timed, flexi, remote-flexi, xdmcp
<theme> is either the path of the theme or the name of an installed theme

If you set the environment variable XNESTSIZE to <width>x<height> (e.g. 800x600)
you can test the greeter at that resolution
"
if [ "$#" != 2 ]; then
	echo "$USAGE"
	exit 1
fi

GDM_THEME="$2"
DOING_GDM_DEVELOPMENT=yes
GDM_PARENT_DISPLAY="$DISPLAY"
export GDM_THEME DOING_GDM_DEVELOPMENT GDM_PARENT_DISPLAY

case $1 in
console)
	GDM_IS_LOCAL=yes
	export GDM_IS_LOCAL
	;;
console-timed)
	GDM_IS_LOCAL=yes
	GDM_FAKE_TIMED=yes
	export GDM_IS_LOCAL GDM_FAKE_TIMED
	;;
flexi)
	GDM_IS_LOCAL=yes
	GDM_FLEXI_SERVER=yes
	export GDM_IS_LOCAL GDM_FLEXI_SERVER
	;;
remote-flexi)
	GDM_FLEXI_SERVER=yes
	export GDM_FLEXI_SERVER
	;;
xdmcp)
	;;
*)
	echo "$USAGE"
	exit 1
	;;
esac

if [ "x$XNESTSIZE" = x ] ; then
  eval `gdmXnest -b`
else
  eval `gdmXnest -b -o "-geometry $XNESTSIZE"`
fi
export DISPLAY

if [ "x$GDM_PARENT_DISPLAY" = "x$DISPLAY" ]; then
	echo "ERROR: Can't start the Xnest server"
	exit 1
fi

# This may not be necessary
sleep 1

@libexecdir@/gdmgreeter



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/FC-5/gdm.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- gdm.spec	11 Apr 2006 13:57:59 -0000	1.143
+++ gdm.spec	11 Apr 2006 21:05:01 -0000	1.144
@@ -24,6 +24,7 @@
 Source1: gdm-allow-login.init
 Source2: gdm-early-login.init
 Source3: zzz-bootup-complete.init
+Source4: gdmthemetester.in
 
 Patch1: gdm-2.14.1-change-defaults.patch
 Patch2: gdm-2.8.0.2-add-pam-timestamp-module.patch
@@ -115,6 +116,15 @@
 %patch19 -p1 -b .add-gnome-cflags
 %patch22 -p1 -b .pam_stack
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=338079
+if [ -f gui/greeter/gdmthemetester.in ]
+then
+  echo "gdmthemetester.in is back. Get rid of Source4" 1>&2
+  exit
+fi
+
+cp -f %{SOURCE4} gui/greeter
+
 # fix the time format for ja
 perl -pi -e "s|^msgstr \"%a %b %d, %H:%M\"|msgstr \"%m/%d \(%a\) %H:%M\"|; s|^msgstr \"%a %b %d, %I:%M %p\"|msgstr \"%m/%d \(%a\) %p %I:%M\"|" po/ja.po
 
@@ -308,8 +318,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
-* Tue Apr 11 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.14.1-1.fc5.1
+* Tue Apr 11 2006 Ray Strode <rstrode at redhat.com> - 1:2.14.1-1.fc5.1
 - Update to 2.14.1
+- fixes CVE-2006-1057 (bug 188303)
 
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 1:2.14.0-1
 - Update to 2.14.0



From fedora-cvs-commits at redhat.com  Tue Apr 11 21:13:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 17:13:48 -0400
Subject: rpms/kdemultimedia/FC-4 kdemultimedia.spec, 1.47, 1.48 sources, 1.30,
	1.31
Message-ID: <200604112113.k3BLDm0G006027@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdemultimedia.spec sources 
Log Message:
update to 3.5.2



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/FC-4/kdemultimedia.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- kdemultimedia.spec	22 Feb 2006 16:55:29 -0000	1.47
+++ kdemultimedia.spec	11 Apr 2006 21:13:46 -0000	1.48
@@ -26,8 +26,8 @@
 %define patch_name -patched
 %endif
 
-Version: 3.5.1
-Release: 0.2.fc4
+Version: 3.5.2
+Release: 0.1.fc4
 Epoch: 6
 Name: kdemultimedia
 Prefix: /usr
@@ -106,11 +106,6 @@
 %patch2 -p1 -b .config
 %patch3 -p1 -b .xdg
 
-# remove aktion, we don't ship xanim (license problems)
-%if %{redhatify}
-   rm -rf doc/aktion aktion
-%endif
-
 perl -pi -e "s/-fomit-frame-pointer//g" admin/acinclude.m4.in
 perl -pi -e "s,examples,,g" kmid/Make*
 
@@ -120,27 +115,15 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-FLAGS="$RPM_OPT_FLAGS -DNDEBUG"
-export KDEDIR=%{prefix}
-export PATH=%{prefix}/bin:$PATH
-export CFLAGS="$FLAGS"
-export CXXFLAGS="$FLAGS -fno-use-cxa-atexit"
-
-%if %{arts}
-export CFLAGS="$CFLAGS `artsc-config --cflags`"
-export CXXFLAGS="$CXXFLAGS `artsc-config --cflags`"
-export CPPFLAGS="$CPPFLAGS `artsc-config --cflags`"
-export LDFLAGS="$LDFLAGS `artsc-config --libs`"
-%endif
 
-%configure  \
+%configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --with-qt-libraries=$QTDIR/lib \
    --disable-motif \
    --with-motif-includes=none \
    --with-motif-libraries=none \
-   --with-extra-includes=/usr/include/cdda \
+   --with-extra-includes=%{_includedir}/cdda \
 %if %{debug} == 0
    --disable-debug \
    --without-debug \
@@ -173,27 +156,27 @@
 make $SMP_MFLAGS -C kaudiocreator
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
-make -C kaudiocreator DESTDIR=$RPM_BUILD_ROOT install
+make install DESTDIR=%{buildroot}
+make -C kaudiocreator DESTDIR=%{buildroot} install
 
 %if %{redhatify}
-  for f in $RPM_BUILD_ROOT%{appdir}/*.desktop ; do
-    if [ -f $RPM_BUILD_ROOT%{appdir}/*.desktop ] ; then
+  for f in %{buildroot}%{appdir}/*.desktop ; do
+    if [ -f %{buildroot}%{appdir}/*.desktop ] ; then
       echo "OnlyShowIn=KDE;" >> $f
     fi
   done
 %endif
 
 %if ! %{juk}
-  rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/juk
+  rm -rf %{buildroot}%{_docdir}/HTML/en/juk
 %endif
 
 # don't make these world-writeable
-chmod go-w $RPM_BUILD_ROOT/%{_datadir}/apps/kscd/*
+chmod go-w %{buildroot}%{_datadir}/apps/kscd/*
 
-cd $RPM_BUILD_ROOT/%{_docdir}/HTML/en
+cd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    rm -f $i/common
    ln -sf ../common $i
@@ -204,7 +187,7 @@
 %postun -p /sbin/ldconfig
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -214,6 +197,7 @@
 %doc %{_docdir}/HTML/en/juk
 %endif
 %doc %{_docdir}/HTML/en/kaboodle
+%doc %{_docdir}/HTML/en/kaudiocreator
 %doc %{_docdir}/HTML/en/kdemultimedia-patched-apidocs
 %doc %{_docdir}/HTML/en/kioslave
 %doc %{_docdir}/HTML/en/kmid
@@ -241,6 +225,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Tue Apr 11 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc4 
+- update to 3.5.2
+
 * Wed Feb 22 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.2.fc4
 - add missing protocol audiocd #176637
 - remove useless rpm macro #180009


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/FC-4/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	1 Feb 2006 20:28:33 -0000	1.30
+++ sources	11 Apr 2006 21:13:46 -0000	1.31
@@ -1 +1 @@
-31630864143d052b8f4342da0fa098fd  kdemultimedia-3.5.1-patched.tar.bz2
+54f9947051ee5cf50c81a5ea382943f1  kdemultimedia-3.5.2-patched.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 11 21:18:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 17:18:28 -0400
Subject: rpms/mesa/devel mesa-6.5-force-r300.patch, NONE, 1.1 mesa.spec, 1.55,
	1.56 mesa-6.4.1-texture-from-drawable.patch, 1.3, NONE
Message-ID: <200604112118.k3BLISMC020081@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	mesa.spec 
Added Files:
	mesa-6.5-force-r300.patch 
Removed Files:
	mesa-6.4.1-texture-from-drawable.patch 
Log Message:
auto-import mesa-6.5-4 on branch devel from mesa-6.5-4.src.rpm

mesa-6.5-force-r300.patch:
 radeon_screen.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mesa-6.5-force-r300.patch ---
--- ./src/mesa/drivers/dri/r300/radeon_screen.c.force-r300	2006-04-11 17:08:36.000000000 -0400
+++ ./src/mesa/drivers/dri/r300/radeon_screen.c	2006-04-11 17:09:20.000000000 -0400
@@ -639,7 +639,7 @@
    }
    if (screen->chip_family == CHIP_FAMILY_R350 || 
        screen->chip_family == CHIP_FAMILY_R300) {
-	   if (getenv("R300_FORCE_R300") == NULL) {
+	   if (0 && getenv("R300_FORCE_R300") == NULL) {
 		   fprintf(stderr, "Radeon 9500/9700/9800 cards are not currently stable.\n");
 		   fprintf(stderr, "More details can be found at https://bugs.freedesktop.org/show_bug.cgi?id=6318\n");
 		   return NULL;


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- mesa.spec	10 Apr 2006 21:51:56 -0000	1.55
+++ mesa.spec	11 Apr 2006 21:18:25 -0000	1.56
@@ -53,7 +53,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 3
+Release: 4
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -74,6 +74,7 @@
 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
 
 # General patches from upstream go here:
 
@@ -241,6 +242,7 @@
 %endif
 %patch5 -p0 -b .drop-static-inline
 %patch6 -p0 -b .noexecstack
+%patch7 -p0 -b .force-r300
 
 # According to Adam, this patch makes metacity's compositing
 # manager noticeably faster, but also may be a little too big of
@@ -432,6 +434,9 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Tue Apr 11 2006 Adam Jackson <ajackson at redhat.com> 6.5-4
+- Disable R300_FORCE_R300 hack for wider testing.
+
 * Mon Apr 10 2006 Kristian H??gsberg <krh at redhat.com> 6.5-3
 - Add mesa-6.5-noexecstack.patch to prevent assembly files from making
   libGL.so have executable stack.


--- mesa-6.4.1-texture-from-drawable.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 11 21:58:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 17:58:57 -0400
Subject: rpms/selinux-policy/devel policy-20060411.patch, 1.1,
	1.2 selinux-policy.spec, 1.171, 1.172
Message-ID: <200604112158.k3BLwvOT002008@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20060411.patch selinux-policy.spec 
Log Message:
* Tue Apr 11 2006 Dan Walsh <dwalsh at redhat.com> 2.2.30-2
- Change libraries.fc to stop shlib_t form overriding texrel_shlib_t


policy-20060411.patch:
 services/rpc.te     |    4 ++--
 services/samba.if   |    1 +
 system/libraries.fc |    7 +++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

Index: policy-20060411.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060411.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- policy-20060411.patch	11 Apr 2006 20:59:57 -0000	1.1
+++ policy-20060411.patch	11 Apr 2006 21:58:53 -0000	1.2
@@ -26,3 +26,19 @@
  		userdom_manage_user_home_content_files($1,smbd_t)
  		userdom_manage_user_home_content_symlinks($1,smbd_t)
  		userdom_manage_user_home_content_sockets($1,smbd_t)
+--- serefpolicy-2.2.30/policy/modules/system/libraries.fc~	2006-04-11 16:59:02.000000000 -0400
++++ serefpolicy-2.2.30/policy/modules/system/libraries.fc	2006-04-11 17:26:42.000000000 -0400
+@@ -55,8 +55,11 @@
+ /usr/(.*/)?java/.*\.jar			--	gen_context(system_u:object_r:shlib_t,s0)
+ /usr/(.*/)?java/.*\.jsa			--	gen_context(system_u:object_r:shlib_t,s0)
+ 
+-/usr/(.*/)?lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
+-/usr/(.*/)?lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
++/usr/lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
++/usr/local/lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
++
++/usr/lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
++/usr/local/lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
+ 
+ /usr/(.*/)?lib(64)?(/.*)?/ld-[^/]*\.so(\.[^/]*)* gen_context(system_u:object_r:ld_so_t,s0)
+ 


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- selinux-policy.spec	11 Apr 2006 20:59:57 -0000	1.171
+++ selinux-policy.spec	11 Apr 2006 21:58:53 -0000	1.172
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.30
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -326,6 +326,13 @@
 %endif
 
 %changelog
+* Tue Apr 11 2006 Dan Walsh <dwalsh at redhat.com> 2.2.30-2
+- Change libraries.fc to stop shlib_t form overriding texrel_shlib_t
+
+* Tue Apr 11 2006 Dan Walsh <dwalsh at redhat.com> 2.2.30-1
+- Fix samba creating dirs in homedir
+- Fix NFS so its booleans would work
+
 * Mon Apr 10 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-6
 - Allow secadm_t ability to relabel all files
 - Allow ftp to search xferlog_t directories



From fedora-cvs-commits at redhat.com  Tue Apr 11 22:38:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 18:38:01 -0400
Subject: rpms/mesa/devel mesa.spec,1.56,1.57
Message-ID: <200604112238.k3BMc1F7016631@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	mesa.spec 
Log Message:
* Tue Apr 11 2006 Kristian H??gsberg <krh at redhat.com> 6.5-5
- Bump for fc5 build.



Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- mesa.spec	11 Apr 2006 21:18:25 -0000	1.56
+++ mesa.spec	11 Apr 2006 22:37:58 -0000	1.57
@@ -53,7 +53,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 4
+Release: 5
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -434,6 +434,9 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Tue Apr 11 2006 Kristian H??gsberg <krh at redhat.com> 6.5-5
+- Bump for fc5 build.
+
 * Tue Apr 11 2006 Adam Jackson <ajackson at redhat.com> 6.5-4
 - Disable R300_FORCE_R300 hack for wider testing.
 



From fedora-cvs-commits at redhat.com  Tue Apr 11 22:41:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 18:41:20 -0400
Subject: rpms/kdegames/FC-4 kdegames.spec,1.40,1.41 sources,1.30,1.31
Message-ID: <200604112241.k3BMfKui016731@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdegames.spec sources 
Log Message:
3.5.2



Index: kdegames.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegames/FC-4/kdegames.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- kdegames.spec	1 Feb 2006 23:03:37 -0000	1.40
+++ kdegames.spec	11 Apr 2006 22:41:18 -0000	1.41
@@ -14,7 +14,7 @@
 %define qt_version 3.3.4
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.1
+Version: 3.5.2
 Release: 0.1.fc4
 Epoch: 6
 Summary: K Desktop Environment - Games
@@ -27,7 +27,6 @@
 Url: http://www.kde.org
 Patch: kde-libtool.patch
 Patch1: kdegames-3.1.1-konquest.patch
-Patch2: kdegames-3.5.0-s390x.patch
 
 Requires: kdelibs >= 6:%{version}
 Requires: kdebase >= 6:%{version}
@@ -69,9 +68,6 @@
 %setup -q -n %{name}-%{version}%{patch_name}
 %patch -p1 -b .libtool
 %patch1 -p1 -b .konquest
-%ifarch s390x s390
-%patch2 -p1 -b .s390x
-%endif
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
@@ -82,10 +78,6 @@
 
 export KDEDIR=%{prefix}
 
-FLAGS="$RPM_OPT_FLAGS"
-
-CFLAGS="$FLAGS" \
-CXXFLAGS="$FLAGS -fno-check-new" \
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
@@ -109,18 +101,16 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
-make -C klickety install DESTDIR=$RPM_BUILD_ROOT
-  
 # Make symlinks relative
-pushd $RPM_BUILD_ROOT/usr/share/doc/HTML/en
+pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    if [ -d $i -a -L $i/common ]; then
-      rm -f $RPM_BUILD_ROOT/usr/share/doc/HTML/en/$i/common
-      ln -sf ../common $RPM_BUILD_ROOT/usr/share/doc/HTML/en/$i
+      rm -f %{buildroot}%{_docdir}/HTML/en/$i/common
+      ln -sf ../common %{buildroot}%{_docdir}/HTML/en/$i
    fi
 done
 popd
@@ -152,6 +142,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Tue Apr 11 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc4 
+- update to 3.5.2
+
 * Wed Feb 01 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.1.fc4
 - 3.5.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdegames/FC-4/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	1 Feb 2006 22:52:32 -0000	1.30
+++ sources	11 Apr 2006 22:41:18 -0000	1.31
@@ -1 +1 @@
-fb44a24d646801989a4e7e837e628c00  kdegames-3.5.1-patched.tar.bz2
+143bbcb02e997767b4ba15f6bb5a653e  kdegames-3.5.2-patched.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 12 00:14:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 20:14:34 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.52,1.53
Message-ID: <200604120014.k3C0EYGI026821@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Tue Apr 11 2006 Kristian H??gsberg <krh at redhat.com> 1.0.99.901-2
- Bump for fc5 build.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- xorg-x11-server.spec	10 Apr 2006 03:10:33 -0000	1.52
+++ xorg-x11-server.spec	12 Apr 2006 00:14:32 -0000	1.53
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.0.99.901
-Release:   1
+Release:   2
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -565,6 +565,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Tue Apr 11 2006 Kristian H??gsberg <krh at redhat.com> 1.0.99.901-2
+- Bump for fc5 build.
+
 * Sat Apr  8 2006 Adam Jackson <ajackson at redhat.com> 1.0.99.901-1
 - Update to 7.1 RC1.
 



From fedora-cvs-commits at redhat.com  Wed Apr 12 01:42:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 21:42:25 -0400
Subject: rpms/xorg-x11-drv-ati/devel xorg-x11-drv-ati.spec,1.17,1.18
Message-ID: <200604120142.k3C1gPH5004569@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	xorg-x11-drv-ati.spec 
Log Message:
* Tue Apr 11 2006 Kristian H??gsberg <krh at redhat.com> 6.6.0-2
- Bump for fc5-bling build.



Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xorg-x11-drv-ati.spec	10 Apr 2006 03:12:59 -0000	1.17
+++ xorg-x11-drv-ati.spec	12 Apr 2006 01:42:12 -0000	1.18
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.6.0
-Release:   1
+Release:   2
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -83,6 +83,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Apr 11 2006 Kristian H??gsberg <krh at redhat.com> 6.6.0-2
+- Bump for fc5-bling build.
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 6.6.0-1
 - Update to 6.6.0 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Wed Apr 12 02:09:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 22:09:50 -0400
Subject: rpms/xorg-x11-drv-i810/devel xorg-x11-drv-i810.spec,1.13,1.14
Message-ID: <200604120209.k3C29oLb018697@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	xorg-x11-drv-i810.spec 
Log Message:
* Tue Apr 11 2006 Kristian H??gsberg <krh at redhat.com> 1.6.0-2
- Bump for fc5-bling build.



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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-drv-i810.spec	10 Apr 2006 03:19:10 -0000	1.13
+++ xorg-x11-drv-i810.spec	12 Apr 2006 02:09:48 -0000	1.14
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 i810 video driver
 Name:      xorg-x11-drv-i810
 Version:   1.6.0
-Release:   1
+Release:   2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   i810.xinf
@@ -78,6 +78,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Tue Apr 11 2006 Kristian H??gsberg <krh at redhat.com> 1.6.0-2
+- Bump for fc5-bling build.
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-1
 - Update to 1.6.0 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Wed Apr 12 03:26:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 23:26:17 -0400
Subject: rpms/gnome-desktop/devel .cvsignore, 1.29, 1.30 gnome-desktop.spec,
	1.54, 1.55 sources, 1.29, 1.30
Message-ID: <200604120326.k3C3QHue028392@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Log Message:
2.14.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	10 Apr 2006 17:44:56 -0000	1.29
+++ .cvsignore	12 Apr 2006 03:26:14 -0000	1.30
@@ -1,2 +1,3 @@
 gnome-desktop-2.14.0.tar.bz2
 gnome-desktop-2.14.1.tar.bz2
+gnome-desktop-2.14.1.1.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gnome-desktop.spec	10 Apr 2006 17:50:40 -0000	1.54
+++ gnome-desktop.spec	12 Apr 2006 03:26:14 -0000	1.55
@@ -11,7 +11,7 @@
 
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc.
 Name: gnome-desktop
-Version: 2.14.1
+Version: 2.14.1.1
 Release: 2
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-desktop/%{name}-%{version}.tar.bz2
@@ -134,6 +134,9 @@
 %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Mon Apr 11 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1.1-2
+- Update to 2.14.1.1
+
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
 - Update to 2.14.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	10 Apr 2006 17:44:56 -0000	1.29
+++ sources	12 Apr 2006 03:26:14 -0000	1.30
@@ -1 +1 @@
-e9d1ff5f8d140f171500c54226ff3e06  gnome-desktop-2.14.1.tar.bz2
+f3ffb360681c1dc17d1856f19a59e88f  gnome-desktop-2.14.1.1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 12 03:42:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Apr 2006 23:42:45 -0400
Subject: rpms/gnome-desktop/FC-5 gnome-desktop.spec, 1.54, 1.55 sources, 1.29,
	1.30
Message-ID: <200604120342.k3C3gj87028610@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-desktop.spec sources 
Log Message:
2.14.1.1



Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/FC-5/gnome-desktop.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gnome-desktop.spec	10 Apr 2006 17:51:48 -0000	1.54
+++ gnome-desktop.spec	12 Apr 2006 03:42:42 -0000	1.55
@@ -11,7 +11,7 @@
 
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc.
 Name: gnome-desktop
-Version: 2.14.1
+Version: 2.14.1.1
 Release: 1.fc5.1
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-desktop/%{name}-%{version}.tar.bz2
@@ -134,6 +134,9 @@
 %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Mon Apr 11 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1.1-1.fc5.1
+- Update to 2.14.1.1
+
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
 - Update to 2.14.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/FC-5/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	10 Apr 2006 17:46:14 -0000	1.29
+++ sources	12 Apr 2006 03:42:42 -0000	1.30
@@ -1 +1 @@
-e9d1ff5f8d140f171500c54226ff3e06  gnome-desktop-2.14.1.tar.bz2
+f3ffb360681c1dc17d1856f19a59e88f  gnome-desktop-2.14.1.1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 12 04:30:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 00:30:40 -0400
Subject: rpms/metacity/devel metacity.spec,1.67,1.68
Message-ID: <200604120430.k3C4UekR005728@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	metacity.spec 
Log Message:
* Wed Apr 12 2006 Kristian H??gsberg <krh at redhat.com> 2.15.0-4
- Bump for fc5-bling rebuild.



Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- metacity.spec	6 Apr 2006 14:17:45 -0000	1.67
+++ metacity.spec	12 Apr 2006 04:30:30 -0000	1.68
@@ -7,7 +7,7 @@
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 3
+Release: 4
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
 Source0: metacity-%{metacity_version}.%{metacity_snapshot}.tar.gz
 Source1: libcm-%{libcm_version}.tar.gz
@@ -32,6 +32,7 @@
 
 Requires: startup-notification >= 0.7
 Requires: redhat-artwork >= 0.62
+Requires: libXcomposite >= 0.3
 
 Patch0: metacity-2.4.13.90-ctrlaltdel.patch
 Patch1: metacity-2.13.89.0.2006.02.16-static-cm.patch
@@ -138,6 +139,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Apr 12 2006 Kristian H??gsberg <krh at redhat.com> 2.15.0-4
+- Bump for fc5-bling rebuild.
+
 * Thu Apr 6 2006 Soren Sandmann <sandmann at redhat.com> - 2.16.0-3
 - Bump libcm to 0.0.18.
 



From fedora-cvs-commits at redhat.com  Wed Apr 12 07:13:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 03:13:03 -0400
Subject: rpms/kde-i18n/FC-4 kde-i18n.spec, 1.42, 1.43 sources, 1.27,
	1.28 subdirs-kde-i18n, 1.7, 1.8
Message-ID: <200604120713.k3C7D33Z026252@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kde-i18n.spec sources subdirs-kde-i18n 
Log Message:
update to 3.5.2



Index: kde-i18n.spec
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/FC-4/kde-i18n.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- kde-i18n.spec	1 Feb 2006 18:11:24 -0000	1.42
+++ kde-i18n.spec	12 Apr 2006 07:13:01 -0000	1.43
@@ -3,7 +3,7 @@
 %define redhatify 1
 
 Name: kde-i18n
-Version: 3.5.1
+Version: 3.5.2
 Release: 0.1.fc4
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
@@ -48,6 +48,7 @@
 Source33: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-tr-%{version}.tar.bz2
 Source34: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-uk-%{version}.tar.bz2
 Source35: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_CN-%{version}.tar.bz2
+Source36: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_TW-%{version}.tar.bz2
 Source1000: subdirs-kde-i18n
 
 Requires: kdelibs >= 6:%{version}
@@ -1146,14 +1147,15 @@
 %lang(zh_CN) %{_datadir}/locale/zh_CN/*
 %lang(zh_CN) %doc %{_docdir}/HTML/zh_CN
 
-%if %{buildall}
 %files Chinese-Big5
 %defattr(-,root,root)
 %lang(zh_TW) %{_datadir}/locale/zh_TW/*
 %lang(zh_TW) %doc %{_docdir}/HTML/zh_TW
-%endif
 
 %changelog
+* Wed Apr 12 2006 Than Ngo <than at redhat.com> 1:3.5.2-0.1.fc4 
+- update to 3.5.2
+
 * Wed Feb 01 2006 Than Ngo <than at redhat.com> 1:3.5.1-0.1.fc4
 - 3.5.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/FC-4/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	1 Feb 2006 17:19:36 -0000	1.27
+++ sources	12 Apr 2006 07:13:01 -0000	1.28
@@ -1,36 +1,37 @@
-7914d80d0ab41709b61674a679a591aa  kde-i18n-ar-3.5.1.tar.bz2
-ef385a222ae6ed99f2715add155ffd14  kde-i18n-bg-3.5.1.tar.bz2
-c260d39e9c81045979614ab1efa71647  kde-i18n-bn-3.5.1.tar.bz2
-dac29cc60e4d39faec8f232097c7c3f6  kde-i18n-ca-3.5.1.tar.bz2
-1bd6e2b120b674e492d60990223b084f  kde-i18n-cs-3.5.1.tar.bz2
-424fb6ac034a1df1298689033093b3f2  kde-i18n-da-3.5.1.tar.bz2
-32a095984a17bcfa6ede3dd2c7013863  kde-i18n-de-3.5.1.tar.bz2
-684fa286f3541eab5b55ee141180e2af  kde-i18n-el-3.5.1.tar.bz2
-0f4f0bf3a7d0501bd7211687e11fdcaa  kde-i18n-en_GB-3.5.1.tar.bz2
-ad5ced34f31804701a68d2d64bccefd5  kde-i18n-es-3.5.1.tar.bz2
-8b23d4585f1621dd8184709bc2f3d2ab  kde-i18n-et-3.5.1.tar.bz2
-a94da3fb9427b410cd6a61731317d458  kde-i18n-fi-3.5.1.tar.bz2
-8ce740f45eebca8f87bdd6faf2d61d44  kde-i18n-fr-3.5.1.tar.bz2
-8578ada5131d1a4da7f714a52c6972c0  kde-i18n-he-3.5.1.tar.bz2
-2e7f52f02ea4a97986e0a78e26b7eafc  kde-i18n-hi-3.5.1.tar.bz2
-3911e1c525b6411c30b3848ec6d95503  kde-i18n-hu-3.5.1.tar.bz2
-381d659a746dd70eea9ea23c5fb80464  kde-i18n-is-3.5.1.tar.bz2
-1c637c5cebac6d61c13be2c56215e321  kde-i18n-it-3.5.1.tar.bz2
-30e060d0bd29cfae1d9cd85d4ea91d7f  kde-i18n-ja-3.5.1.tar.bz2
-8fef7b3f29ba8eb68ebd23f228af26ce  kde-i18n-nb-3.5.1.tar.bz2
-2cc0069ac1c8b5fde1dbc87df90329a7  kde-i18n-nl-3.5.1.tar.bz2
-303be4ff9cfb38617e4d30534c3b570b  kde-i18n-nn-3.5.1.tar.bz2
-ec6c5fd0ef940497993b5b6913445412  kde-i18n-pa-3.5.1.tar.bz2
-e058a3964abce47d8cd98c8edb49d6f2  kde-i18n-pl-3.5.1.tar.bz2
-e12cbd70fd6f95309f03ace2a7d3eb41  kde-i18n-pt-3.5.1.tar.bz2
-24fa0b4c146fce9cc7a0046865a9fd94  kde-i18n-pt_BR-3.5.1.tar.bz2
-b903996011ae71248f14ed20c55dce80  kde-i18n-ro-3.5.1.tar.bz2
-a134f766c77f2bbe72761c8d06aa19f1  kde-i18n-ru-3.5.1.tar.bz2
-567a3062c6b7b7cf69fac54a8c255c91  kde-i18n-sk-3.5.1.tar.bz2
-4df423236ce7410bc9108d9208beafaa  kde-i18n-sl-3.5.1.tar.bz2
-8ef952cac32b9b1f97575e3ace02bfc0  kde-i18n-sr-3.5.1.tar.bz2
-d3d71739a1ffcdaa20a35371cbac48ee  kde-i18n-sv-3.5.1.tar.bz2
-05d4060272ef4768292cc556505296cf  kde-i18n-ta-3.5.1.tar.bz2
-d60ba5802f565cd7568bd4359fe01f06  kde-i18n-tr-3.5.1.tar.bz2
-8c4a0a6a1779f09d84b6ddfe55df7ba9  kde-i18n-uk-3.5.1.tar.bz2
-809fc565769b2dffed4098d4a3230296  kde-i18n-zh_CN-3.5.1.tar.bz2
+e5751af9f27c7fcb8ae691565c0150e0  kde-i18n-ar-3.5.2.tar.bz2
+d2ead3b2e13e851026fa9e685bec3dd7  kde-i18n-bg-3.5.2.tar.bz2
+7579ee4cd94f47b15773e85d8ba9437a  kde-i18n-bn-3.5.2.tar.bz2
+01793ef292bfa573ac6dc469af0105c3  kde-i18n-ca-3.5.2.tar.bz2
+8301411b09198bcdc5aec9096959b46f  kde-i18n-cs-3.5.2.tar.bz2
+de4a0854323591412dcb0fd973a828df  kde-i18n-da-3.5.2.tar.bz2
+af0d1dddc3fdbcc3f57f592c118336b7  kde-i18n-de-3.5.2.tar.bz2
+e08304492dca910772ef644522863d0b  kde-i18n-el-3.5.2.tar.bz2
+f9187d95c02ef569841b619d7dcd92b4  kde-i18n-en_GB-3.5.2.tar.bz2
+957dc11b57ade36543f09170dd319daa  kde-i18n-es-3.5.2.tar.bz2
+adb0d578fcc6f0489a70463a4ab27ba6  kde-i18n-et-3.5.2.tar.bz2
+56ccbbbe792ace2db28a36561ed73baa  kde-i18n-fi-3.5.2.tar.bz2
+d5ee851fdca9491dcb007d120e41ca66  kde-i18n-fr-3.5.2.tar.bz2
+c4d4f74171a00d99c942a454b4bf2031  kde-i18n-he-3.5.2.tar.bz2
+7bbf72d240bf936dffcb8a10b39bc0b8  kde-i18n-hi-3.5.2.tar.bz2
+5f56f6776207de40b6f08f15cf738f5d  kde-i18n-hu-3.5.2.tar.bz2
+2afa1257a615c57689d018cf4f0a5ce5  kde-i18n-is-3.5.2.tar.bz2
+f9593f15023920f274d633d93a1f71ac  kde-i18n-it-3.5.2.tar.bz2
+b267752f706d73792455671100b45e78  kde-i18n-ja-3.5.2.tar.bz2
+3173be9cf4021e7ceab17aa5208a9ff2  kde-i18n-nb-3.5.2.tar.bz2
+e626d95e7399fce30af12103d8e5abbc  kde-i18n-nl-3.5.2.tar.bz2
+7688c9e32d1bd0fe86d8929491436abf  kde-i18n-nn-3.5.2.tar.bz2
+15ae531f16c41983cc9513a3b39af360  kde-i18n-pa-3.5.2.tar.bz2
+ed2038f4a158435298e5d592c1897317  kde-i18n-pl-3.5.2.tar.bz2
+0b34803baab37652581a7930fa90f8a1  kde-i18n-pt-3.5.2.tar.bz2
+e2d4eca4287ca58d89a6b9e0afb1ed83  kde-i18n-pt_BR-3.5.2.tar.bz2
+ce015703992dfdfaa2b0a1a1b68613bf  kde-i18n-ro-3.5.2.tar.bz2
+6ada1113e2f16a04f67efff4a277afe2  kde-i18n-ru-3.5.2.tar.bz2
+ce005e23d4769643e80799e311d420fe  kde-i18n-sk-3.5.2.tar.bz2
+0abde80912580fc6981f12d33533c7a7  kde-i18n-sl-3.5.2.tar.bz2
+5646220dc1449378914bbace9cb0ed4f  kde-i18n-sr-3.5.2.tar.bz2
+15baccdec08346e5379bf88487a81e4d  kde-i18n-sv-3.5.2.tar.bz2
+2b9fcc05c46676421ac9c84833f238ec  kde-i18n-ta-3.5.2.tar.bz2
+f6f84000f374e0cacae6f74cb14be234  kde-i18n-tr-3.5.2.tar.bz2
+da83d2460f25478a61cf8eb09dd2540e  kde-i18n-uk-3.5.2.tar.bz2
+d451f1d96fd2bcdf7c432b6c9b0e5963  kde-i18n-zh_CN-3.5.2.tar.bz2
+2371a7ff043e9944e091ac30a48bcc07  kde-i18n-zh_TW-3.5.2.tar.bz2


Index: subdirs-kde-i18n
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/FC-4/subdirs-kde-i18n,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- subdirs-kde-i18n	1 Feb 2006 17:19:36 -0000	1.7
+++ subdirs-kde-i18n	12 Apr 2006 07:13:01 -0000	1.8
@@ -34,3 +34,4 @@
 tr
 uk
 zh_CN
+zh_TW



From fedora-cvs-commits at redhat.com  Wed Apr 12 07:17:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 03:17:53 -0400
Subject: rpms/kdeadmin/FC-4 kdeadmin.spec,1.46,1.47 sources,1.31,1.32
Message-ID: <200604120717.k3C7HrOX007783@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdeadmin.spec sources 
Log Message:
3.5.2



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/FC-4/kdeadmin.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- kdeadmin.spec	1 Feb 2006 18:03:47 -0000	1.46
+++ kdeadmin.spec	12 Apr 2006 07:17:51 -0000	1.47
@@ -20,7 +20,7 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.1
+Version: 3.5.2
 Release: 0.1.fc4
 Name: kdeadmin
 Summary: Administrative tools for KDE.
@@ -316,15 +316,8 @@
    --vendor "" \
    --dir $RPM_BUILD_ROOT%{appdir} \
    --delete-original \
-   --copy-generic-name-to-name \
-   $RPM_BUILD_ROOT%{appdir}/kcron.desktop
-                                                                                                                        
-desktop-file-install \
-   --vendor "" \
-   --dir $RPM_BUILD_ROOT%{appdir} \
-   --delete-original \
-   --add-category "X-KDE-More" \
-   $RPM_BUILD_ROOT%{appdir}/kdat.desktop
+   --add-only-show-in KDE \
+   $RPM_BUILD_ROOT%{appdir}/kuser.desktop
 
 %post -p /sbin/ldconfig
 
@@ -409,6 +402,9 @@
 %endif
 
 %changelog
+* Wed Apr 12 2006 Than Ngo <than at redhat.com> 7:3.5.2-0.1.fc4 
+- update to 3.5.2
+
 * Wed Feb 01 2006 Than Ngo <than at redhat.com> 7:3.5.1-0.1.fc4
 - 3.5.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/FC-4/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	1 Feb 2006 17:41:38 -0000	1.31
+++ sources	12 Apr 2006 07:17:51 -0000	1.32
@@ -1 +1 @@
-08e9bddd2b42e0783d7f79d08cdb031b  kdeadmin-3.5.1.tar.bz2
+ad1f645ed9f140a7c9ce8602cc0c88b8  kdeadmin-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 12 07:23:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 03:23:47 -0400
Subject: rpms/kdesdk/FC-4 kdesdk.spec,1.39,1.40 sources,1.26,1.27
Message-ID: <200604120723.k3C7NlDQ007869@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdesdk.spec sources 
Log Message:
3.5.2



Index: kdesdk.spec
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/FC-4/kdesdk.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- kdesdk.spec	1 Feb 2006 22:09:53 -0000	1.39
+++ kdesdk.spec	12 Apr 2006 07:23:45 -0000	1.40
@@ -11,7 +11,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdesdk
-Version: 3.5.1
+Version: 3.5.2
 Release: 0.1.fc4
 Summary: The KDE Software Development Kit (SDK)
 URL: http://www.kde.org/
@@ -86,12 +86,7 @@
 Group: Applications/Multimedia
 
 %description gimp
-The standard K
-
-
-
-
-DE palette in GIMP format. This allows you to create/edit
+The standard KDE palette in GIMP format. This allows you to create/edit
 low-color KDE icons using the GIMP.
 
 %package kapptemplate
@@ -145,8 +140,6 @@
 export CFLAGS="$FLAGS"
 export CXXFLAGS="$FLAGS"
 
-perl -pi -e "d/kbugbuster//g" subdirs && rm -rf kbugbuster
-
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
@@ -178,14 +171,11 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-for f in cervisia catalogmanager kbabel kbabeldict kcachegrind kompare kuiviewer umbrello ; do
-   desktop-file-install \
-      --vendor "" \
-      --dir $RPM_BUILD_ROOT%{appdir} \
-      --delete-original \
-      --add-category="X-KDE-More" \
-      $RPM_BUILD_ROOT%{appdir}/$f.desktop
-done
+desktop-file-install --vendor "" --delete-original \
+  --dir $RPM_BUILD_ROOT%{appdir} \
+  --add-only-show-in KDE \
+  $RPM_BUILD_ROOT%{appdir}/kbugbuster.desktop \
+  $RPM_BUILD_ROOT%{appdir}/kuiviewer.desktop
 
 # make symlinks relative
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/HTML/en/common
@@ -239,6 +229,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Apr 12 2006 Than Ngo <than at redhat.com> 2:3.5.2-0.1.fc4 
+- update to 3.5.2
+
 * Wed Feb 01 2006 Than Ngo <than at redhat.com> 2:3.5.1-0.1.fc4
 - 3.5.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/FC-4/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	1 Feb 2006 22:09:53 -0000	1.26
+++ sources	12 Apr 2006 07:23:45 -0000	1.27
@@ -1 +1 @@
-93199b8bf5793681fdb2e5cbcfcfbd93  kdesdk-3.5.1.tar.bz2
+0047e87532930a390d7a1826fd8cdaf5  kdesdk-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 12 09:18:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 05:18:45 -0400
Subject: rpms/kdeedu/FC-4 kdeedu.spec,1.27,1.28 sources,1.24,1.25
Message-ID: <200604120918.k3C9Ijhc032464@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdeedu.spec sources 
Log Message:
3.5.2



Index: kdeedu.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/FC-4/kdeedu.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- kdeedu.spec	2 Feb 2006 13:54:15 -0000	1.27
+++ kdeedu.spec	12 Apr 2006 09:18:42 -0000	1.28
@@ -10,7 +10,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdeedu
-Version: 3.5.1
+Version: 3.5.2
 Release: 0.1.fc4
 Summary: Educational/Edutainment applications for KDE
 URL: http://www.kde.org/
@@ -149,12 +149,12 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/FC-4/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	2 Feb 2006 13:54:15 -0000	1.24
+++ sources	12 Apr 2006 09:18:42 -0000	1.25
@@ -1 +1 @@
-fe31b9a2ec4e299531c6b7beeab09534  kdeedu-3.5.1.tar.bz2
+ce62d2e67579280a3e000152fb365bff  kdeedu-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 12 09:19:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 05:19:35 -0400
Subject: rpms/kdeedu/FC-4 kdeedu.spec,1.28,1.29
Message-ID: <200604120919.k3C9JZ27032516@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdeedu.spec 
Log Message:
update to 3.5.2



Index: kdeedu.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/FC-4/kdeedu.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- kdeedu.spec	12 Apr 2006 09:18:42 -0000	1.28
+++ kdeedu.spec	12 Apr 2006 09:19:32 -0000	1.29
@@ -182,6 +182,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Apr 12 2006 Than Ngo <than at redhat.com> 3.5.2-0.1.fc4
+- 3.5.2
+
 * Thu Feb 02 2006 Than Ngo <than at redhat.com> 3.5.1-0.1.fc4
 - 3.5.1
 



From fedora-cvs-commits at redhat.com  Wed Apr 12 09:39:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 05:39:44 -0400
Subject: rpms/kdegraphics/FC-4 kdegraphics-3.5.1-warning.patch, NONE,
	1.1 kdegraphics.spec, 1.54, 1.55 sources, 1.29,
	1.30 kdegraphics-3.5.1-kpdf.patch, 1.1,
	NONE post-3.5.1-kdegraphics-CVE-2006-0301.diff, 1.1, NONE
Message-ID: <200604120939.k3C9diru032730@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdegraphics.spec sources 
Added Files:
	kdegraphics-3.5.1-warning.patch 
Removed Files:
	kdegraphics-3.5.1-kpdf.patch 
	post-3.5.1-kdegraphics-CVE-2006-0301.diff 
Log Message:
update to 3.5.2


kdegraphics-3.5.1-warning.patch:
 kpcursorlightcross.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kdegraphics-3.5.1-warning.patch ---
--- kdegraphics-3.5.1/kolourpaint/cursors/kpcursorlightcross.cpp.orig	2006-02-07 12:10:45.000000000 +0100
+++ kdegraphics-3.5.1/kolourpaint/cursors/kpcursorlightcross.cpp	2006-02-07 12:10:52.000000000 +0100
@@ -52,7 +52,8 @@
     const int MaskOpaque = 1;
     const int MaskTransparent = 0;
 
-    int colorValue, maskValue;
+    int colorValue = ColorWhite;
+    int maskValue = MaskTransparent;
 
     switch (pv)
     {


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-4/kdegraphics.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kdegraphics.spec	7 Feb 2006 10:58:27 -0000	1.54
+++ kdegraphics.spec	12 Apr 2006 09:39:41 -0000	1.55
@@ -3,22 +3,27 @@
 %define debug 0
 %define final 0
 
+%define kdelibs_epoch 6
+%define kdebase_epoch 6
+
 %define kpovmodeler 0
 %define kfract 0
 %define arts 1
 %define make_cvs 1
 
+%define appdir %{_datadir}/applications/kde
+
 %define no_scanner_archs s390 s390x
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.1
-Release: 0.2.fc4
+Version: 3.5.2
+Release: 0.1.fc4
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
 Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{rfelease}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 License: GPL
 Url: http://www.kde.org
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
@@ -26,12 +31,7 @@
 Patch0: kde-libtool.patch
 Patch1: kdegraphics-3.3.0-misc.patch
 Patch2: kdegraphics-3.3.1-xorg.patch
-
-# upstream fixes
-Patch50: kdegraphics-3.5.1-kpdf.patch
-
-# security fixes
-Patch100: post-3.5.1-kdegraphics-CVE-2006-0301.diff
+Patch3: kdegraphics-3.5.1-warning.patch
 
 %ifnarch %{no_scanner_archs}
 BuildRequires: sane-backends-devel >= 1.0.3-10
@@ -51,8 +51,8 @@
 BuildRequires: fribidi-devel 
 BuildRequires: libieee1284-devel
 
-Requires: kdelibs >= 6:%{version}
-Requires: kdebase >= 6:%{version}
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Requires: kdebase >= %{kdebase_epoch}:%{version}
 
 Prereq: /sbin/ldconfig
 
@@ -267,12 +267,7 @@
 %patch0 -p1 -b .libtool
 %patch1 -p1 -b .misc
 %patch2 -p1 -b .xorg
-
-# upstream patches
-%patch50 -p1 -b .kpdf
-
-# security patches
-%patch100 -p0 -b .CVE-2006-0301
+%patch3 -p1 -b .warning
 
 %if %{rhel}
   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfax\"" >kfax/configure.in.in
@@ -289,10 +284,6 @@
 %endif
 
 %build
-export PATH=`pwd`:$PATH
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
-export KDEDIR=%{_prefix}
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 %configure \
@@ -313,22 +304,22 @@
    --disable-debug \
    --disable-warnings \
 %endif
-   --includedir=/usr/include/kde \
-   --with-xinerama \
+   --includedir=%{_includedir}/kde \
 %ifnarch %{no_scanner_archs}
---with-kamera \
+   --with-kamera \
 %else
-   --without-kamera
+   --without-kamera \
 %endif
+   --with-xinerama
 
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    if [ -d $i -a -L $i/common ]; then
       rm -f $i/common
@@ -337,12 +328,12 @@
 done
 popd
 
-if [ -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/kcmkmrml.desktop ] ; then
-  echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/kcmkmrml.desktop
-fi
+for i in kcmkmrml ksnapshot ; do
+  [ -f %{buildroot}%{appdir}/$i.desktop ] && echo "OnlyShowIn=KDE;" >> %{buildroot}%{appdir}/$i.desktop
+done
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -358,11 +349,12 @@
 %{_datadir}/applications/kde/*
 %{_datadir}/applnk/*
 %{_datadir}/apps/*
-%{_datadir}/config/*
 %{_datadir}/config.kcfg/*
+%ifnarch %{no_scanner_archs}
+%{_datadir}/config/*
+%endif
 %{_datadir}/icons/*/*/*/*
 %{_datadir}/mimelnk/text/*
-%{_datadir}/mimelnk/image/*
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 
@@ -371,6 +363,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Wed Apr 12 2006 Than Ngo <than at redhat.com> 7:3.5.2-0.1.fc4
+- update to 3.5.2
+
 * Tue Feb 07 2006 Than Ngo <than at redhat.com> 7:3.5.1-0.2.fc4
 - apply patch to fix buffer overflow in kpdf, CVE-2006-0301 (#179056)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-4/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	1 Feb 2006 19:32:17 -0000	1.29
+++ sources	12 Apr 2006 09:39:41 -0000	1.30
@@ -1 +1 @@
-2cd1c5348b7df46cf7f9d91e1dbfebd2  kdegraphics-3.5.1.tar.bz2
+8e1816a2191ea85b889930159a5d1e46  kdegraphics-3.5.2.tar.bz2


--- kdegraphics-3.5.1-kpdf.patch DELETED ---


--- post-3.5.1-kdegraphics-CVE-2006-0301.diff DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 12 09:51:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 05:51:46 -0400
Subject: rpms/kdenetwork/FC-4 kdenetwork.spec,1.57,1.58 sources,1.36,1.37
Message-ID: <200604120951.k3C9pkhm014415@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdenetwork.spec sources 
Log Message:
3.5.2



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/FC-4/kdenetwork.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kdenetwork.spec	2 Feb 2006 10:31:57 -0000	1.57
+++ kdenetwork.spec	12 Apr 2006 09:51:43 -0000	1.58
@@ -5,12 +5,17 @@
 %define make_cvs 1
 %define xmms 0
 
-%define qt_version 1:3.3.4
+%define qt_version 3.3.4
+%define kdelibs_epoch 6
+%define kdebase_epoch 6
+%define qt_epoch 1
+
+%define appdir %{_datadir}/applications/kde
 
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdenetwork
-Version: 3.5.1
+Version: 3.5.2
 Release: 0.1.fc4
 Summary: K Desktop Environment - Network Applications
 Epoch: 7
@@ -31,8 +36,8 @@
 Patch4: kdenetwork-3.2.3-resolv.patch
 Patch8: kdenetwork-3.4.1-kopete-libgadu-va_copy.patch
 
-Requires: kdelibs >= 6:%{version}
-Requires: kdebase >= 6:%{version}
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Requires: kdebase >= %{kdebase_epoch}:%{version}
 Prereq: /sbin/chkconfig
 
 BuildRequires: qt-devel >= %{qt_version}
@@ -96,12 +101,6 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-FLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DNDEBUG -DNO_DEBUG"
-export CFLAGS="$FLAGS"
-export CXXFLAGS="$FLAGS -fno-use-cxa-atexit"
-export KDEDIR=%{_prefix}
-export LDFLAGS="$LDFLAGS `krb5-config --libs`"
-
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
@@ -122,55 +121,50 @@
    --with-qt-libraries=$QTDIR/lib \
    --includedir=%{_includedir}/kde
 
-# ld breaks with -fPIC on ppc, workaround
-# it will be removed when this bug is fixed
-%ifarch ppc ppc64
-   perl -pi -e 's,^pic_flag=" -fPIC -DPIC",pic_flag=" -fpic",g' libtool
-%endif
-
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
-mkdir -p $RPM_BUILD_ROOT/etc/pam.d
-cp %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/kppp
+mkdir -p %{buildroot}/etc/pam.d
+cp %{SOURCE1} %{buildroot}/etc/pam.d/kppp
 
 # Make symlinks relative
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/HTML/en/common
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+mkdir -p %{buildroot}%{_docdir}/HTML/en/common
+pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    [ -d $i -a -L $i/common ] && ln -nfs ../common $i
 done
 popd
 
 # Show only in KDE
-for i in fileshare kcmkrfb kcmktalkd kcmwifi krfb ; do
-   if [ -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/$i.desktop ] ; then
-      echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/$i.desktop
+for i in fileshare kcmkrfb kcmktalkd kcmwifi krfb kppp kppplogview kwifimanager \
+   kget knewsticker ksirc kdict ; do
+   if [ -f %{buildroot}%{appdir}/$i.desktop ] ; then
+      echo "OnlyShowIn=KDE;" >> %{buildroot}%{appdir}/$i.desktop
    fi
 done
 
 # Run kppp through consolehelper
-mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-mv $RPM_BUILD_ROOT%{_bindir}/kppp $RPM_BUILD_ROOT%{_sbindir}
-ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/kppp
-mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps
-cat >$RPM_BUILD_ROOT/etc/security/console.apps/kppp <<EOF
+mkdir -p %{buildroot}%{_sbindir}
+mv %{buildroot}%{_bindir}/kppp %{buildroot}%{_sbindir}
+ln -s consolehelper %{buildroot}%{_bindir}/kppp
+mkdir -p %{buildroot}/etc/security/console.apps
+cat >%{buildroot}/etc/security/console.apps/kppp <<EOF
 USER=root
 PROGRAM=%{_sbindir}/kppp
 SESSION=true
 EOF
 
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d
-cp %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d
+mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d
+cp %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d
 
 # Add lisa startup script
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
-install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/lisarc
-install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/lisa
+mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
+install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/lisarc
+install -m 0755 %{SOURCE5} %{buildroot}%{_sysconfdir}/rc.d/init.d/lisa
 
 %post
 /sbin/ldconfig
@@ -187,7 +181,7 @@
 exit 0
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -234,6 +228,9 @@
 %endif
 
 %changelog
+* Wed Apr 12 2006 Than Ngo <than at redhat.com> 7:3.5.2-0.1.fc4
+- update to 3.5.2
+
 * Thu Feb 02 2006 Than Ngo <than at redhat.com> 7:3.5.1-0.1.fc4
 - 3.5.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/FC-4/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	2 Feb 2006 10:31:57 -0000	1.36
+++ sources	12 Apr 2006 09:51:44 -0000	1.37
@@ -1 +1 @@
-02ced8c14c80f28635056488949d56d7  kdenetwork-3.5.1.tar.bz2
+dddc6bb65ffb9e46d118781ca0f26da4  kdenetwork-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 12 09:54:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 05:54:23 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.2.rh188467.printingdefaults.patch, NONE,
	1.1 openoffice.org-1.9.121.rh127576.gnomeprintui.patch, 1.14,
	1.15 openoffice.org.spec, 1.660, 1.661
Message-ID: <200604120954.k3C9sNl1014497@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.121.rh127576.gnomeprintui.patch 
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.2.rh188467.printingdefaults.patch 
Log Message:
separate printing defaults

openoffice.org-2.0.2.rh188467.printingdefaults.patch:
 configuration/ppds/SGENPRT.PS                |    0 
 configuration/psprint.conf                   |    0 
 psprint_config/configuration/ppds/SGENPRT.PS |    1 +
 psprint_config/configuration/psprint.conf    |    4 ++--
 4 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-2.0.2.rh188467.printingdefaults.patch ---
Index: configuration/ppds/SGENPRT.PS
===================================================================
RCS file: /cvs/external/psprint_config/configuration/ppds/SGENPRT.PS,v
retrieving revision 1.3
diff -u -p -u -r1.3 SGENPRT.PS
--- openoffice.org.orig/psprint_config/configuration/ppds/SGENPRT.PS	26 Nov 2004 16:10:35 -0000	1.3
+++ openoffice.org/psprint_config/configuration/ppds/SGENPRT.PS	30 Aug 2005 11:17:51 -0000
@@ -58,6 +58,7 @@
 *ColorDevice: True
 *DefaultColorSpace: RGB
 *LanguageLevel: "2"
+*TTRasterizer: Type42
 
 *% --- For None Color or old PostScript(R) printers use following lines ---
 *% *ColorDevice: False
Index: configuration/psprint.conf
===================================================================
RCS file: /cvs/external/psprint_config/configuration/psprint.conf,v
retrieving revision 1.2
diff -u -p -u -r1.2 psprint.conf
--- openoffice.org.orig/psprint_config/configuration/psprint.conf	9 Nov 2004 16:38:35 -0000	1.2
+++ openoffice.org/psprint_config/configuration/psprint.conf	30 Aug 2005 11:17:50 -0000
@@ -48,7 +48,7 @@
 ;         defaults for newly added printers.
 ; PerformFontSubstitution: wether to replace downloadable fonts
 ;         with resident fonts or not
-PerformFontSubstitution=true
+PerformFontSubstitution=false
 
 ; SubstFont_<downloadable font>: the resident font to replace
 ;         <downloadable font> if PerformFontSubstitution is true
@@ -84,7 +84,7 @@
 
 ; PerformFontSubstitution: wether to replace downloadable fonts
 ;         with resident fonts or not
-PerformFontSubstitution=true
+PerformFontSubstitution=false
 
 ; SubstFont_<downloadable font>: the resident font to replace
 ;         <downloadable font> if PerformFontSubstitution is true

openoffice.org-1.9.121.rh127576.gnomeprintui.patch:
 configuration/ppds/SGENPRT.PS                |    0 
 configuration/psprint.conf                   |    0 
 inc/jobset.hxx                               |    0 
 inc/print.hxx                                |    0 
 psprint/source/printer/cupsmgr.cxx           |   19 
 psprint/source/printer/makefile.mk           |    2 
 psprint/util/makefile.mk                     |    4 
 psprint_config/configuration/ppds/SGENPRT.PS |    2 
 psprint_config/configuration/psprint.conf    |    2 
 source/dialogs/makefile.mk                   |    0 
 source/dialogs/printdlg.cxx                  |    0 
 source/gdi/jobset.cxx                        |    0 
 source/printer/cupsmgr.cxx                   |    0 
 svtools/source/dialogs/makefile.mk           |    4 
 svtools/source/dialogs/printdlg.cxx          |  525 ++++++++++++++++++++++++++-
 svtools/util/makefile.mk                     |    8 
 util/makefile.mk                             |    0 
 vcl/inc/jobset.hxx                           |    1 
 vcl/inc/print.hxx                            |    1 
 vcl/source/gdi/jobset.cxx                    |  194 +++++++++
 20 files changed, 757 insertions(+), 5 deletions(-)

Index: openoffice.org-1.9.121.rh127576.gnomeprintui.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.121.rh127576.gnomeprintui.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- openoffice.org-1.9.121.rh127576.gnomeprintui.patch	11 Apr 2006 16:50:29 -0000	1.14
+++ openoffice.org-1.9.121.rh127576.gnomeprintui.patch	12 Apr 2006 09:54:19 -0000	1.15
@@ -945,14 +945,6 @@
  *PCFileName: "SGENPRT.PPD"
  
  
-@@ -58,6 +58,7 @@
- *ColorDevice: True
- *DefaultColorSpace: RGB
- *LanguageLevel: "2"
-+*TTRasterizer: Type42
- 
- *% --- For None Color or old PostScript(R) printers use following lines ---
- *% *ColorDevice: False
 --- openoffice.org.orig/psprint/util/makefile.mk	2006-04-10 16:10:36.000000000 +0100
 +++ openoffice.org/psprint/util/makefile.mk	2006-04-11 17:31:45.000000000 +0100
 @@ -89,5 +89,9 @@


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.660
retrieving revision 1.661
diff -u -r1.660 -r1.661
--- openoffice.org.spec	11 Apr 2006 16:51:59 -0000	1.660
+++ openoffice.org.spec	12 Apr 2006 09:54:19 -0000	1.661
@@ -1,6 +1,6 @@
 %define oootag OOB680
 %define ooomilestone 5
-%define rh_rpm_release 8.cmc2
+%define rh_rpm_release 9
 
 %define build_fc6 1
 %define build_rhel4 0
@@ -213,6 +213,7 @@
 Patch37: openoffice.org-1.9.74.ArchiveZip.patch
 Patch38: openoffice.org-2.0.1.gij4ant.patch
 %endif
+Patch39: openoffice.org-2.0.2.rh188467.printingdefaults.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1077,7 +1078,6 @@
 %patch34 -p1 -b .ooo62030.solenv._version.patch
 %patch35 -p1 -b .oooXXXXX.config_office.noppds.patch
 %patch36 -p1 -b .ooo63155.sfx2.badscript.patch
-
 %if %{build_rhel4}
 %patch37 -p1 -b .rhXXXXXX.config_office.archivezip.patch
 tar xjf %{SOURCE12}
@@ -1086,6 +1086,7 @@
 tar xzf %{SOURCE13} Archive-Zip-1.13/lib
 cd ../..
 %endif
+%patch39 -p1 -b .rh188467.printingdefaults.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -3570,8 +3571,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Tue Apr 11 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.9
+* Wed Apr 12 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.9
 - rh#187939# not detecting changes to CUPS printers during execution
+- rh#188467# set printer font-handling defaults
 
 * Mon Apr 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.8
 - rh#188053# more a11y fixes



From fedora-cvs-commits at redhat.com  Wed Apr 12 09:57:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 05:57:57 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.661, 1.662 sources,
	1.162, 1.163
Message-ID: <200604120957.k3C9vvKo014584@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec sources 
Log Message:
font updated


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.661
retrieving revision 1.662
diff -u -r1.661 -r1.662
--- openoffice.org.spec	12 Apr 2006 09:54:19 -0000	1.661
+++ openoffice.org.spec	12 Apr 2006 09:57:54 -0000	1.662
@@ -3574,6 +3574,7 @@
 * Wed Apr 12 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.9
 - rh#187939# not detecting changes to CUPS printers during execution
 - rh#188467# set printer font-handling defaults
+- ooo#59997# opensymbol font metrics changed
 
 * Mon Apr 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.8
 - rh#188053# more a11y fixes


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- sources	20 Mar 2006 10:27:55 -0000	1.162
+++ sources	12 Apr 2006 09:57:54 -0000	1.163
@@ -7,6 +7,6 @@
 1b4d9a03ebb4c864015620153afb77c6  Tigert-templates.tar.gz
 20789fc643e2b857291e1973075fccb0  OOB680_m5.tar.bz2
 67ba19cf8ac46671799ff63a48901e8b  openoffice.org-simple-crash_report.sh
-1fb6d1fc0b5c6f4425b3cd779727b30c  opens___.ttf
 8d8c4222654f718436c234582c8fd529  GSI_ga.sdf
 bfa60acd8b0c30a1a6d14165da45c1dd  openoffice.org-myspell-contrib.tar.gz
+dc56cc373f49ec25a188132ee98caf87  opens___.ttf



From fedora-cvs-commits at redhat.com  Wed Apr 12 10:07:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 06:07:01 -0400
Subject: rpms/kdeutils/FC-4 kdeutils.spec,1.36,1.37 sources,1.28,1.29
Message-ID: <200604121007.k3CA71dA014758@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdeutils.spec sources 
Log Message:
update to 3.5.2



Index: kdeutils.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/FC-4/kdeutils.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- kdeutils.spec	1 Feb 2006 20:57:04 -0000	1.36
+++ kdeutils.spec	12 Apr 2006 10:06:58 -0000	1.37
@@ -6,13 +6,17 @@
 %define redhatify 1
 
 %define qt_version 3.3.4
+%define kdelibs_epoch 6
+%define kdebase_epoch 6
+
+%define appdir %{_datadir}/applications/kde
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.1
+Version: 3.5.2
 Release: 0.1.fc4
 Name: kdeutils
-Prefix: /usr
+Prefix: %{_prefix}
 Summary: K Desktop Environment - Utilities
 Epoch: 6
 License: GPL
@@ -24,8 +28,8 @@
 Patch1: kdf-3.0.2-label.patch
 Patch2: kde-libtool.patch
 
-Requires: kdelibs >= 6:%{version}
-Requires: kdebase >= 6:%{version}
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Requires: kdebase >= %{kdebase_epoch}:%{version}
 
 Prereq: /sbin/ldconfig
 
@@ -50,6 +54,8 @@
 Obsoletes: kregexpeditor
 Obsoletes: kregexpeditor-devel
 Obsoletes: ktimer
+Obsoletes: superkaramba
+Provides: superkaramba
 
 %description
 Utilities for the K Desktop Environment.
@@ -99,7 +105,7 @@
 %package -n kcharselect
 Summary: Character Selector
 Group: User Interface/Desktops
-Requires: kdebase >= 3.0.4
+Requires: kdebase >= %{version}
 Obsoletes: kdeutils
 
 %description -n kcharselect
@@ -243,10 +249,6 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-export KDEDIR=%{prefix}
-export CXXFLAGS="$RPM_OPT_FLAGS"
-export CFLAGS="$RPM_OPT_FLAGS"
-
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
 %endif
@@ -277,28 +279,28 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 # Show only in KDE
 for i in kcalc kregexpeditor Kjots ktimer kdf kcmdf ksim KFloppy KEdit \
-         KCharSelect ark kwalletmanager kwalletconfig \
-         irkick kcmlirc laptop pcmcia kvaio thinkpad ; do
-   if [ -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/$i.desktop ] ; then
-      echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/$i.desktop
+   KCharSelect ark kwalletmanager kwalletconfig \
+   irkick kcmlirc laptop pcmcia kvaio thinkpad kwikdisk ; do
+   if [ -f %{buildroot}%{appdir}/$i.desktop ] ; then
+     echo "OnlyShowIn=KDE;" >> %{buildroot}%{appdir}/$i.desktop
    fi
 done
 
 # Make symlinks relative
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    [ -d $i -a -L $i/common ] && ln -sf ../common $i
 done
 popd
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -327,6 +329,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Wed Apr 12 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc4
+- update to 3.5.2
+
 * Wed Feb 01 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.1.fc4
 - 3.5.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/FC-4/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	1 Feb 2006 20:57:04 -0000	1.28
+++ sources	12 Apr 2006 10:06:58 -0000	1.29
@@ -1 +1 @@
-1286c6a09b04452adfe492de2fad79bd  kdeutils-3.5.1.tar.bz2
+08c01d6ceb8fb2173463838e43f986f5  kdeutils-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 12 10:19:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 06:19:52 -0400
Subject: rpms/kdevelop/FC-4 kdevelop.spec,1.33,1.34 sources,1.24,1.25
Message-ID: <200604121019.k3CAJqBQ028869@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdevelop.spec sources 
Log Message:
update to 3.3.2



Index: kdevelop.spec
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/FC-4/kdevelop.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- kdevelop.spec	2 Feb 2006 13:21:35 -0000	1.33
+++ kdevelop.spec	12 Apr 2006 10:19:50 -0000	1.34
@@ -1,16 +1,17 @@
 %define debug 0
 %define final 0
 
-%define kde_version 3.5.1
+%define kde_version 3.5.2
 %define qt_version 3.3.4
 %define qt_epoch 1
+%define kdelibs_epoch 6
 
 %define make_cvs 1
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdevelop
 Summary: Integrated Development Environment for C++/C
-Version: 3.3.1
+Version: 3.3.2
 Release: 0.1.fc4
 Epoch: 9
 URL: http://www.kdevelop.org/
@@ -27,7 +28,7 @@
 
 Prereq: /sbin/ldconfig
 
-Requires: kdelibs-devel >= 6:%{kde_version}
+Requires: kdelibs-devel >= %{kdelibs_epoch}:%{kde_version}
 Requires: make
 Requires: perl >= 0:5.004
 Requires: libtool
@@ -86,8 +87,6 @@
   make -C c_cpp_reference-2.0.2_for_KDE_3.0 -f admin/Makefile.common cvs
 %endif
 
-export FLAGS="$RPM_OPT_FLAGS"
-
 # c references
 pushd c_cpp_reference-2.0.2_for_KDE_3.0
 %configure \
@@ -119,20 +118,17 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-make DESTDIR=$RPM_BUILD_ROOT install
-make -C c_cpp_reference-2.0.2_for_KDE_3.0 DESTDIR=$RPM_BUILD_ROOT install
+rm -rf %{buildroot}
 
-# remove useless files
-rm -rf $RPM_BUILD_ROOT%{_prefix}/kdevbdb
+make DESTDIR=%{buildroot} install
+make -C c_cpp_reference-2.0.2_for_KDE_3.0 DESTDIR=%{buildroot} install
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -140,7 +136,7 @@
 %{_bindir}/*
 %{_libdir}/kde3/*
 %{_libdir}/lib*
-%{_libdir}/kconf_update_bin/
+%{_libdir}/kconf_update_bin/*
 %{_includedir}/*
 %{_datadir}/applications/kde/*
 %{_datadir}/apps/*
@@ -153,6 +149,9 @@
 %{_datadir}/servicetypes/*
 
 %changelog
+* Wed Apr 12 2006 Than Ngo <than at redhat.com> 9:3.3.2-0.1.fc4
+- update to 3.3.2
+
 * Thu Feb 02 2006 Than Ngo <than at redhat.com> 9:3.3.1-0.1.fc4
 - 3.3.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/FC-4/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	2 Feb 2006 13:21:35 -0000	1.24
+++ sources	12 Apr 2006 10:19:50 -0000	1.25
@@ -1,2 +1,2 @@
 5777e4d2dbfc3e6c2ba9f0ed6ea457f9  c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-e5e3d3ce60a0dcafb99721f6304f87ef  kdevelop-3.3.1.tar.bz2
+494c9320a5f8681b67a3a06fa0ce18b7  kdevelop-3.3.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 12 10:29:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 06:29:40 -0400
Subject: rpms/kdewebdev/FC-4 kdewebdev.spec,1.15,1.16 sources,1.8,1.9
Message-ID: <200604121029.k3CATe4e028997@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdewebdev.spec sources 
Log Message:
update to 3.5.2



Index: kdewebdev.spec
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/FC-4/kdewebdev.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kdewebdev.spec	2 Feb 2006 13:43:14 -0000	1.15
+++ kdewebdev.spec	12 Apr 2006 10:29:38 -0000	1.16
@@ -5,10 +5,13 @@
 %define arts 1
 
 %define qt_version 3.3.4
-%define kde_version 3.5.1
+%define kde_version 3.5.2
+%define kdelibs_epoch 6
+%define kdebase_epoch 6
+
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.1
+Version: 3.5.2
 Release: 0.1.fc4
 Summary: WEB Development package for the K Desktop Environment.
 Name: kdewebdev
@@ -66,9 +69,6 @@
   make -f admin/Makefile.common cvs
 %endif
 
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
-
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
@@ -96,27 +96,27 @@
 popd
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 
 # install tidy
-install tidy/bin/tab2space tidy/bin/tidy $RPM_BUILD_ROOT%{_bindir}/
+install tidy/bin/tab2space tidy/bin/tidy %{buildroot}%{_bindir}/
 
 # install docs
 for i in css html javascript ; do
    pushd $i
    ./install.sh <<EOF
-$RPM_BUILD_ROOT%{_datadir}/apps/quanta/doc
+%{buildroot}%{_datadir}/apps/quanta/doc
 EOF
    popd
    rm -rf $i
 done
 
-cp -R php php.docrc $RPM_BUILD_ROOT%{_datadir}/apps/quanta/doc
+cp -R php php.docrc %{buildroot}%{_datadir}/apps/quanta/doc
 
 # fix dangling symlinks
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    if [ -d $i -a -L $i/common ]; then
       rm -f $i/common
@@ -130,7 +130,7 @@
 %postun -p /sbin/ldconfig
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -154,6 +154,9 @@
 %{_includedir}/*
 
 %changelog
+* Wed Apr 12 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc4
+- update to 3.5.2
+
 * Thu Feb 02 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.1.fc4
 - 3.5.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	2 Feb 2006 13:43:14 -0000	1.8
+++ sources	12 Apr 2006 10:29:38 -0000	1.9
@@ -3,4 +3,4 @@
 eea6e25a1c25af1f5a0c33e32e52c136  javascript.tar.bz2
 149607cecd4bf6783dc6e43a03b80138  php_manual_en_20030401.tar.bz2
 98076a205e30873dad43d384b2366d23  tidy_src_041026.tgz
-0faea4e8088005ae60f58b21c60b32ea  kdewebdev-3.5.1.tar.bz2
+ddd2ded8178f7c4d094d73e95075e7fb  kdewebdev-3.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 12 11:31:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 07:31:52 -0400
Subject: rpms/ltrace/devel ltrace-testsuite.patch, 1.1, 1.2 ltrace.spec, 1.26,
	1.27
Message-ID: <200604121131.k3CBVq5K024812@cvs.devel.redhat.com>

Author: pmachata

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

Modified Files:
	ltrace-testsuite.patch ltrace.spec 
Log Message:
Testsuite clone: fail->xfail


ltrace-testsuite.patch:
 ChangeLog                                            |   58 +++
 Makefile.in                                          |   10 
 configure                                            |    2 
 configure.ac                                         |    5 
 testsuite/Makefile.in                                |   72 ++++
 testsuite/README                                     |  244 ++++++++++++++++
 testsuite/config/unix.exp                            |    1 
 testsuite/lib/compiler.c                             |   58 +++
 testsuite/lib/compiler.cc                            |   45 +++
 testsuite/lib/ltrace.exp                             |  277 +++++++++++++++++++
 testsuite/ltrace.main/Makefile.in                    |   34 ++
 testsuite/ltrace.main/main-internal-1.c              |    8 
 testsuite/ltrace.main/main-internal.c                |   19 +
 testsuite/ltrace.main/main-internal.exp              |   33 ++
 testsuite/ltrace.main/main-lib.c                     |    7 
 testsuite/ltrace.main/main.c                         |   21 +
 testsuite/ltrace.main/main.exp                       |   39 ++
 testsuite/ltrace.main/signals.c                      |   48 +++
 testsuite/ltrace.main/signals.exp                    |   39 ++
 testsuite/ltrace.main/system_calls.c                 |   68 ++++
 testsuite/ltrace.main/system_calls.exp               |   67 ++++
 testsuite/ltrace.minor/Makefile.in                   |   37 ++
 testsuite/ltrace.minor/attach-process.c              |   16 +
 testsuite/ltrace.minor/attach-process.exp            |   38 ++
 testsuite/ltrace.minor/count-record.c                |   51 +++
 testsuite/ltrace.minor/count-record.exp              |   77 +++++
 testsuite/ltrace.minor/demangle-lib.cpp              |   97 ++++++
 testsuite/ltrace.minor/demangle.cpp                  |  121 ++++++++
 testsuite/ltrace.minor/demangle.exp                  |   63 ++++
 testsuite/ltrace.minor/demangle.h                    |   36 ++
 testsuite/ltrace.minor/print-instruction-pointer.c   |   11 
 testsuite/ltrace.minor/print-instruction-pointer.exp |   42 ++
 testsuite/ltrace.minor/time-record-T.exp             |   84 +++++
 testsuite/ltrace.minor/time-record-tt.exp            |  107 +++++++
 testsuite/ltrace.minor/time-record-ttt.exp           |  112 +++++++
 testsuite/ltrace.minor/time-record.c                 |   23 +
 testsuite/ltrace.minor/trace-clone.c                 |   43 ++
 testsuite/ltrace.minor/trace-clone.exp               |   44 +++
 testsuite/ltrace.minor/trace-fork.c                  |   33 ++
 testsuite/ltrace.minor/trace-fork.exp                |   40 ++
 testsuite/ltrace.torture/Makefile.in                 |   34 ++
 testsuite/ltrace.torture/signals.c                   |   44 +++
 testsuite/ltrace.torture/signals.exp                 |   37 ++
 testsuite/run-my-tests.sh                            |   43 ++
 44 files changed, 2382 insertions(+), 6 deletions(-)

Index: ltrace-testsuite.patch
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace-testsuite.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ltrace-testsuite.patch	7 Apr 2006 12:47:45 -0000	1.1
+++ ltrace-testsuite.patch	12 Apr 2006 11:31:48 -0000	1.2
@@ -28,7 +28,7 @@
  		$(INSTALL_FILE) ltrace.1 $(DESTDIR)$(mandir)/man1
  
 +check:
-+		cd testsuite; $(MAKE) check
++		cd testsuite; $(MAKE) check; sleep 20
 +
  dummy:
  
@@ -1508,7 +1508,7 @@
 +	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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ltrace.spec	7 Apr 2006 12:47:45 -0000	1.26
+++ ltrace.spec	12 Apr 2006 11:31:48 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Tracks runtime library calls from dynamically linked executables.
 Name: ltrace
 Version: 0.4
-Release: 1
+Release: 1.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



From fedora-cvs-commits at redhat.com  Wed Apr 12 12:00:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 08:00:28 -0400
Subject: rpms/kdevelop/FC-4 kdevelop.spec,1.34,1.35
Message-ID: <200604121200.k3CC0SwB006452@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdevelop.spec 
Log Message:
3.5.2



Index: kdevelop.spec
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/FC-4/kdevelop.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- kdevelop.spec	12 Apr 2006 10:19:50 -0000	1.34
+++ kdevelop.spec	12 Apr 2006 11:59:52 -0000	1.35
@@ -114,8 +114,7 @@
   --with-qt-libraries=$QTDIR/lib \
   --with-extra-libs=%{_libdir}
 
-make %{?_smp_mflags} -C lib/util
-make %{?_smp_mflags}
+make #%{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}



From fedora-cvs-commits at redhat.com  Wed Apr 12 12:09:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 08:09:52 -0400
Subject: rpms/libvirt/FC-5 libvirt.spec,1.6,1.7 sources,1.5,1.6
Message-ID: <200604121209.k3CC9qXk006604@cvs.devel.redhat.com>

Author: veillard

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

Modified Files:
	libvirt.spec sources 
Log Message:
Preparing to push an update for FC5, Daniel



Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/FC-5/libvirt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libvirt.spec	28 Feb 2006 14:25:55 -0000	1.6
+++ libvirt.spec	12 Apr 2006 12:09:44 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Library providing an API to use the Xen virtualization
 Name: libvirt
-Version: 0.0.6
-Release: 1
+Version: 0.1.0
+Release: 1.FC5
 License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -10,7 +10,9 @@
 BuildRequires: xen python python-devel
 Requires: xen
 Requires: libxml2
+Requires: readline
 BuildRequires: libxml2-devel
+BuildRequires: readline-devel
 Obsoletes: libvir
 ExclusiveArch: i386 x86_64
 
@@ -70,6 +72,7 @@
 %defattr(-, root, root)
 
 %doc AUTHORS ChangeLog NEWS README COPYING.LIB TODO
+%doc %{_mandir}/man1/virsh.1*
 %{_bindir}/virsh
 %{_libdir}/lib*.so.*
 
@@ -99,6 +102,13 @@
 %doc python/libvirtclass.txt
 
 %changelog
+* Mon Apr 10 2006 Daniel Veillard <veillard at redhat.com> 0.1.0-1.FC5
+- various fixes
+- new APIs: for Node information and Reboot
+- virsh improvements and extensions
+- documentation updates and man page
+- enhancement and fixes of the XML description format
+
 * Tue Feb 28 2006 Daniel Veillard <veillard at redhat.com> 0.0.6-1
 - added error handling APIs
 - small bug fixes


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libvirt/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Feb 2006 14:25:55 -0000	1.5
+++ sources	12 Apr 2006 12:09:45 -0000	1.6
@@ -1 +1 @@
-51c4cd8255d8a639437959b934a2a5ac  libvirt-0.0.6.tar.gz
+bebb6a89c592d3e2ba19594de7341b81  libvirt-0.1.0.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 12 12:34:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 08:34:09 -0400
Subject: rpms/gnome-pilot-conduits/FC-5 gnome-pilot-conduits.spec,1.16,1.17
Message-ID: <200604121234.k3CCY9B9020748@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/gnome-pilot-conduits/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20734

Modified Files:
	gnome-pilot-conduits.spec 
Log Message:
rebuilt against stable pilot-link-0.11.8




Index: gnome-pilot-conduits.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot-conduits/FC-5/gnome-pilot-conduits.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gnome-pilot-conduits.spec	11 Feb 2006 03:15:46 -0000	1.16
+++ gnome-pilot-conduits.spec	12 Apr 2006 12:34:06 -0000	1.17
@@ -5,7 +5,7 @@
 Summary: Additional conduits for gnome-pilot
 Name: gnome-pilot-conduits
 Version: 2.0.13
-Release: 3.FC5.2
+Release: 3.FC5.3
 License: LGPL
 Group: Applications/Communications
 Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.0/%{name}-%{version}.tar.bz2
@@ -32,7 +32,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .lib64
-%patch2 -p1 -b .port-to-pilot-link-0.12
+#%patch2 -p1 -b .port-to-pilot-link-0.12
 
 %build
 %configure
@@ -63,6 +63,9 @@
 %{_libdir}/gnome-pilot/conduits/*.so
 
 %changelog
+* Wed Apr 12 2006 Than Ngo <than at redhat.com> 2.0.13-3.FC5.3
+- rebuilt against stable pilot-link-0.11.8
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0.13-3.FC5.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Apr 12 12:38:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 08:38:02 -0400
Subject: rpms/kdenetwork/FC-4 kdenetwork.spec,1.58,1.59
Message-ID: <200604121238.k3CCc2Mj020828@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdenetwork.spec 
Log Message:
3.5.2



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/FC-4/kdenetwork.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- kdenetwork.spec	12 Apr 2006 09:51:43 -0000	1.58
+++ kdenetwork.spec	12 Apr 2006 12:37:59 -0000	1.59
@@ -121,7 +121,7 @@
    --with-qt-libraries=$QTDIR/lib \
    --includedir=%{_includedir}/kde
 
-make %{?_smp_mflags}
+make #%{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}



From fedora-cvs-commits at redhat.com  Wed Apr 12 13:04:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 09:04:29 -0400
Subject: rpms/valgrind-callgrind/devel valgrind-callgrind.spec,1.14,1.15
Message-ID: <200604121304.k3CD4T2p002553@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/valgrind-callgrind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2537

Modified Files:
	valgrind-callgrind.spec 
Log Message:
0.10.1-3



Index: valgrind-callgrind.spec
===================================================================
RCS file: /cvs/dist/rpms/valgrind-callgrind/devel/valgrind-callgrind.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- valgrind-callgrind.spec	3 Apr 2006 20:53:03 -0000	1.14
+++ valgrind-callgrind.spec	12 Apr 2006 13:04:23 -0000	1.15
@@ -1,13 +1,13 @@
 Summary: Call-graph profiler plugin for valgrind
 Name: valgrind-callgrind
 Version: 0.10.1
-Release: 2
+Release: 3
 Source0: http://kcachegrind.sourceforge.net/callgrind-%{version}.tar.bz2
 License: GPL
 URL: http://kcachegrind.sourceforge.net/
 Group: Development/Debuggers
 BuildRoot: %{_tmppath}/%{name}-root
-ExclusiveArch: %{ix86} x86_64
+ExclusiveArch: %{ix86} x86_64 ppc
 BuildRequires: valgrind >= 1:3.1.1
 Requires: valgrind = 1:3.1.1
 # For make check
@@ -61,6 +61,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Apr 12 2006 Jakub Jelinek <jakub at redhat.com> 0.10.1-3
+- build also on ppc
+
 * Mon Apr 03 2006 Jakub Jelinek <jakub at redhat.com> 0.10.1-2
 - require valgrind 3.1.1
 



From fedora-cvs-commits at redhat.com  Wed Apr 12 13:33:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 09:33:21 -0400
Subject: rpms/libselinux/FC-5 .cvsignore, 1.102, 1.103 libselinux-rhat.patch,
	1.74, 1.75 libselinux.spec, 1.183, 1.184 sources, 1.104, 1.105
Message-ID: <200604121333.k3CDXLbW017024@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore libselinux-rhat.patch libselinux.spec sources 
Log Message:
* Mon Mar 27 2006 Dan Walsh <dwalsh at redhat.com> 1.30.1-2
- Fix python bindings for matchpathcon
- Fix booleans man page



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libselinux/FC-5/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- .cvsignore	20 Mar 2006 20:36:57 -0000	1.102
+++ .cvsignore	12 Apr 2006 13:33:17 -0000	1.103
@@ -76,3 +76,4 @@
 libselinux-1.29.6.tgz
 libselinux-1.29.7.tgz
 libselinux-1.30.tgz
+libselinux-1.30.1.tgz

libselinux-rhat.patch:
 man/man8/booleans.8 |   18 ++++++------------
 src/selinuxswig.i   |    5 +++--
 2 files changed, 9 insertions(+), 14 deletions(-)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/FC-5/libselinux-rhat.patch,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- libselinux-rhat.patch	14 Jan 2006 05:05:18 -0000	1.74
+++ libselinux-rhat.patch	12 Apr 2006 13:33:17 -0000	1.75
@@ -1,36 +1,64 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/Makefile libselinux-1.29.5/Makefile
---- nsalibselinux/Makefile	2005-02-09 17:04:51.000000000 -0500
-+++ libselinux-1.29.5/Makefile	2006-01-13 23:54:13.000000000 -0500
-@@ -2,12 +2,18 @@
- 	$(MAKE) -C src 
- 	$(MAKE) -C utils
- 
-+pywrap: 
-+	$(MAKE) -C src pywrap
-+
- install: 
- 	$(MAKE) -C include install
- 	$(MAKE) -C src install
- 	$(MAKE) -C utils install
- 	$(MAKE) -C man install
- 
-+install-pywrap: 
-+	$(MAKE) -C src install-pywrap 
-+
- relabel: 
- 	$(MAKE) -C src relabel
- 
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-1.29.5/src/Makefile
---- nsalibselinux/src/Makefile	2006-01-04 10:37:34.000000000 -0500
-+++ libselinux-1.29.5/src/Makefile	2006-01-13 23:54:50.000000000 -0500
-@@ -26,7 +26,9 @@
- 
- SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./
- 
--all: $(LIBA) $(LIBSO) $(SWIGSO)
-+all: $(LIBA) $(LIBSO) 
-+
-+pywrap: $(SWIGSO)
- 
- $(LIBA):  $(OBJS)
- 	$(AR) rcs $@ $^
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/booleans.8 libselinux-1.30.1/man/man8/booleans.8
+--- nsalibselinux/man/man8/booleans.8	2004-11-02 11:44:38.000000000 -0500
++++ libselinux-1.30.1/man/man8/booleans.8	2006-04-11 15:01:19.000000000 -0400
+@@ -17,17 +17,10 @@
+ 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.  The
+ .B system-config-securitylevel
+ tool provides an interface for altering
+-the settings in this file.  The
++the settings of booleans.  The
+ .B load_policy(8)
+ program will preserve
+ current boolean settings upon a policy reload by default, or can
+@@ -41,8 +34,11 @@
+ .B setsebool(8)
+ utility or the
+ .B togglesebool
+-utility.  These utilities only change the
++utility.  These utilities change the
+ current boolean value and do not affect the boot-time settings.
++You can use 
++.B setsebool -P 
++to permanantly change the setting of a boolean.
+ 
+ .SH AUTHOR	
+ This manual page was written by Dan Walsh <dwalsh at redhat.com>.
+@@ -51,5 +47,3 @@
+ .SH "SEE ALSO"
+ getsebool(8), setsebool(8), selinux(8), togglesebool(8)
+ 
+-.SH FILES
+-/etc/selinux/SELINUXTYPE/booleans, /etc/selinux/config
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-1.30.1/src/selinuxswig.i
+--- nsalibselinux/src/selinuxswig.i	2006-01-04 10:37:35.000000000 -0500
++++ libselinux-1.30.1/src/selinuxswig.i	2006-04-11 14:55:35.000000000 -0400
+@@ -29,8 +29,9 @@
+ 	$1 = &temp;
+ }
+ %typemap(argout) security_context_t * {
+-	$result = t_output_helper($result, PyString_FromString(*$1));
++	$result = SWIG_Python_AppendOutput($result, PyString_FromString(*$1));
+ }
++%typedef unsigned mode_t;
+ 
+ extern int is_selinux_enabled(void);
+ extern int is_selinux_mls_enabled(void);
+@@ -114,6 +115,6 @@
+ }
+ 
+ %typemap(argout) char ** {
+-	$result = t_output_helper($result, PyString_FromString(*$1));
++	$result = SWIG_Python_AppendOutput($result, PyString_FromString(*$1));
+ }
+ extern int getseuserbyname(const char *linuxuser, char **seuser, char **level);


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/FC-5/libselinux.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- libselinux.spec	22 Mar 2006 16:30:41 -0000	1.183
+++ libselinux.spec	12 Apr 2006 13:33:18 -0000	1.184
@@ -2,11 +2,12 @@
 %define libsetransver 0.1.20-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 1.30
-Release: 1.fc5
+Version: 1.30.1
+Release: 2
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
+Patch: libselinux-rhat.patch
 
 BuildRequires: libsepol-devel >= %{libsepolver}
 Requires: libsepol >= %{libsepolver}
@@ -50,6 +51,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .rhat
 
 %build
 make clean
@@ -109,8 +111,12 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
-* Mon Mar 18 2006 Dan Walsh <dwalsh at redhat.com> 1.30-1.fc5
-- rebuild for FC5
+* Mon Mar 27 2006 Dan Walsh <dwalsh at redhat.com> 1.30.1-2
+- Fix python bindings for matchpathcon
+- Fix booleans man page
+
+* Mon Mar 27 2006 Dan Walsh <dwalsh at redhat.com> 1.30.1-1
+	* Merged Makefile PYLIBVER definition patch from Dan Walsh.
 
 * Fri Mar 10 2006 Dan Walsh <dwalsh at redhat.com> 1.30-1
 - Make some fixes so it will build on RHEL4


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libselinux/FC-5/sources,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- sources	20 Mar 2006 20:36:57 -0000	1.104
+++ sources	12 Apr 2006 13:33:18 -0000	1.105
@@ -1 +1 @@
-b0834c79eac17c87c690542b0874cc53  libselinux-1.30.tgz
+16536badc245a1dd8d01539f63ced6c2  libselinux-1.30.1.tgz



From fedora-cvs-commits at redhat.com  Wed Apr 12 13:34:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 09:34:32 -0400
Subject: rpms/evolution/FC-5 evolution.spec,1.135,1.136
Message-ID: <200604121334.k3CDYWxp017100@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	evolution.spec 
Log Message:
rebuild 



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/evolution.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- evolution.spec	11 Apr 2006 03:07:22 -0000	1.135
+++ evolution.spec	12 Apr 2006 13:34:28 -0000	1.136
@@ -39,7 +39,7 @@
 
 Name: evolution
 Version: 2.6.1
-Release: 1.fc5.1
+Release: 1.fc5.2
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -635,6 +635,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Wed Apr 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.6.1-1.fc5.2
+- Rebuild against new (old) pilot-link
+
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.6.1-1.fc5.1
 - Update to 2.6.1
 



From fedora-cvs-commits at redhat.com  Wed Apr 12 13:36:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 09:36:37 -0400
Subject: rpms/libselinux/FC-5 libselinux.spec,1.184,1.185
Message-ID: <200604121336.k3CDabXN017203@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	libselinux.spec 
Log Message:
* Wed Apr 12 2006 Dan Walsh <dwalsh at redhat.com> 1.30.1-2
- Bump for FC-5



Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/FC-5/libselinux.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- libselinux.spec	12 Apr 2006 13:33:18 -0000	1.184
+++ libselinux.spec	12 Apr 2006 13:36:34 -0000	1.185
@@ -111,7 +111,10 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
-* Mon Mar 27 2006 Dan Walsh <dwalsh at redhat.com> 1.30.1-2
+* Wed Apr 12 2006 Dan Walsh <dwalsh at redhat.com> 1.30.1-2
+- Bump for FC-5
+
+* Mon Apr 11 2006 Dan Walsh <dwalsh at redhat.com> 1.30.1-2
 - Fix python bindings for matchpathcon
 - Fix booleans man page
 



From fedora-cvs-commits at redhat.com  Wed Apr 12 13:38:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 09:38:02 -0400
Subject: rpms/libselinux/FC-5 libselinux.spec,1.185,1.186
Message-ID: <200604121338.k3CDc2NQ017301@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	libselinux.spec 
Log Message:
* Wed Apr 12 2006 Dan Walsh <dwalsh at redhat.com> 1.30.1-2.fc5
- Bump for FC-5



Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/FC-5/libselinux.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- libselinux.spec	12 Apr 2006 13:36:34 -0000	1.185
+++ libselinux.spec	12 Apr 2006 13:37:58 -0000	1.186
@@ -3,7 +3,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 1.30.1
-Release: 2
+Release: 2.fc5
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -111,7 +111,7 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
-* Wed Apr 12 2006 Dan Walsh <dwalsh at redhat.com> 1.30.1-2
+* Wed Apr 12 2006 Dan Walsh <dwalsh at redhat.com> 1.30.1-2.fc5
 - Bump for FC-5
 
 * Mon Apr 11 2006 Dan Walsh <dwalsh at redhat.com> 1.30.1-2



From fedora-cvs-commits at redhat.com  Wed Apr 12 14:17:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 10:17:37 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.662,1.663
Message-ID: <200604121417.k3CEHb2S007066@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
rh#161530# try out the new soth african locales


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.662
retrieving revision 1.663
diff -u -r1.662 -r1.663
--- openoffice.org.spec	12 Apr 2006 09:57:54 -0000	1.662
+++ openoffice.org.spec	12 Apr 2006 14:17:35 -0000	1.663
@@ -20,6 +20,7 @@
 %define internaljavabits 1
 %define gnomeprintui 0
 %define obsoleteold 0
+%define new_sa_locales 0
 %endif
 %if %{build_fc6}
 %define forcegcc4 0
@@ -31,6 +32,7 @@
 %define internaljavabits 0
 %define gnomeprintui 1
 %define obsoleteold 1
+%define new_sa_locales 1
 %endif
 
 %if %{forcegcc4}
@@ -96,7 +98,12 @@
 %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
+%define langpack_common 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
+%if %{new_sa_locales}
+%define langpack_langs %{langpack_common} ns tn ts
+%else
+%define langpack_langs %{langpack_common}
+%endif
 %else
 %define langpack_langs en-US
 %endif
@@ -256,9 +263,11 @@
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-kde
 Obsoletes: openoffice.org-langpack-eo
+Obsoletes: openoffice.org-langpack-kn_IN
+%if ! %{new_sa_locales}
 Obsoletes: openoffice.org-langpack-tn
 Obsoletes: openoffice.org-langpack-ts
-Obsoletes: openoffice.org-langpack-kn_IN
+%endif
 Obsoletes: openoffice.org2-core
 %endif
 
@@ -969,6 +978,44 @@
 %description langpack-th_TH
 Provides additional thai translations for %{name}
 
+%if %{new_sa_locales}
+%package langpack-nso_ZA
+Summary: Northern Sotho language pack for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
+Obsoletes: openoffice.org2-langpack-nso_ZA
+%endif
+
+%description langpack-nso_ZA
+Provides additional Northern Sotho translations for %{name}
+
+%package langpack-tn_ZA
+Summary: Tswana language pack for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
+Obsoletes: openoffice.org2-langpack-tn_ZA
+Obsoletes: openoffice.org-langpack-tn
+%endif
+
+%description langpack-tn_ZA
+Provides additional tswana translations for %{name}
+
+%package langpack-ts_ZA
+Summary: Tsonga language pack for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
+Obsoletes: openoffice.org2-langpack-ts_ZA
+Obsoletes: openoffice.org-langpack-ts
+%endif
+
+%description langpack-ts_ZA
+Provides additional tsonga translations for %{name}
+
+%endif
+
 %package langpack-tr_TR
 Summary: Turkish language pack for %{name}
 Group: Applications/Productivity
@@ -2448,6 +2495,68 @@
 %dir %{instdir}/share/registry/modules/org/openoffice/Setup
 %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-zu.xcu
 
+%if %{new_sa_locales}
+%files langpack-tn_ZA
+%defattr(-,root,root)
+%dir %{instdir}
+%dir %{instdir}/help
+%{instdir}/help/tn
+%{instdir}/program/resource/*680tn.res
+%dir %{instdir}/share
+%{instdir}/share/readme/LICENSE_tn*
+%{instdir}/share/readme/README_tn*
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/res
+%{instdir}/share/registry/res/tn
+%dir %{instdir}/share/template
+%{instdir}/share/template/tn
+%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-tn.xcu
+
+%files langpack-ts_ZA
+%defattr(-,root,root)
+%dir %{instdir}
+%dir %{instdir}/help
+%{instdir}/help/ts
+%{instdir}/program/resource/*680ts.res
+%dir %{instdir}/share
+%{instdir}/share/readme/LICENSE_ts*
+%{instdir}/share/readme/README_ts*
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/res
+%{instdir}/share/registry/res/ts
+%dir %{instdir}/share/template
+%{instdir}/share/template/ts
+%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-ts.xcu
+
+%files langpack-nso_ZA
+%defattr(-,root,root)
+%dir %{instdir}
+%dir %{instdir}/help
+%{instdir}/help/ns
+%{instdir}/program/resource/*680ns.res
+%dir %{instdir}/share
+%{instdir}/share/readme/LICENSE_ns*
+%{instdir}/share/readme/README_ns*
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/res
+%{instdir}/share/registry/res/ns
+%dir %{instdir}/share/template
+%{instdir}/share/template/ns
+%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-ns.xcu
+%endif
+
 %endif
 
 %files core
@@ -3575,6 +3684,7 @@
 - rh#187939# not detecting changes to CUPS printers during execution
 - rh#188467# set printer font-handling defaults
 - ooo#59997# opensymbol font metrics changed
+- rh#161530# new South African locales exist in glibc now
 
 * Mon Apr 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.8
 - rh#188053# more a11y fixes



From fedora-cvs-commits at redhat.com  Wed Apr 12 15:16:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 11:16:43 -0400
Subject: rpms/ltrace/devel ltrace-opt_x.patch, 1.1,
	1.2 ltrace-testsuite.patch, 1.2, 1.3 ltrace.spec, 1.27, 1.28
Message-ID: <200604121516.k3CFGhN7009405@cvs.devel.redhat.com>

Author: pmachata

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

Modified Files:
	ltrace-opt_x.patch ltrace-testsuite.patch ltrace.spec 
Log Message:
- svn fix for opt_x patch
- patches for testsuite for s390{,x}
- turning off main-internal test. Fails on ia64, needs investigation.


ltrace-opt_x.patch:
 ChangeLog |    6 ++++++
 elf.c     |   29 ++++++++++++++++-------------
 elf.c.pm  |    2 +-
 options.c |    7 ++++---
 options.h |    8 +++++++-
 5 files changed, 34 insertions(+), 18 deletions(-)

Index: ltrace-opt_x.patch
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace-opt_x.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ltrace-opt_x.patch	7 Apr 2006 12:47:45 -0000	1.1
+++ ltrace-opt_x.patch	12 Apr 2006 15:16:39 -0000	1.2
@@ -125,3 +125,14 @@
  				p->next = opt_x;
  				opt_x = p;
  				break;
+--- elf.c	2006-04-12 10:35:39.000000000 -0400
++++ elf.c.pm	2006-04-12 10:36:01.000000000 -0400
+@@ -402,7 +402,7 @@ struct library_symbol *read_elf(struct p
+ 
+ 	if (proc->need_to_reinitialize_breakpoints) {
+ 		/* Add "PLTs_initialized_by_here" to opt_x list, if not already there. */
+-		main_cheat = (struct opt_e_t *)malloc(sizeof(struct opt_e_t));
++		main_cheat = (struct opt_x_t *)malloc(sizeof(struct opt_x_t));
+ 		if (main_cheat == NULL)
+ 			error(EXIT_FAILURE, 0, "Couldn allocate memory");
+ 		main_cheat->next = opt_x;

ltrace-testsuite.patch:
 ChangeLog                                            |   58 +++
 Makefile.in                                          |   10 
 configure                                            |    2 
 configure.ac                                         |    5 
 testsuite/Makefile.in                                |   72 ++++
 testsuite/README                                     |  244 ++++++++++++++++
 testsuite/config/unix.exp                            |    1 
 testsuite/lib/compiler.c                             |   58 +++
 testsuite/lib/compiler.cc                            |   45 +++
 testsuite/lib/ltrace.exp                             |  277 +++++++++++++++++++
 testsuite/ltrace.main/Makefile.in                    |   34 ++
 testsuite/ltrace.main/main-internal-1.c              |    8 
 testsuite/ltrace.main/main-internal.c                |   19 +
 testsuite/ltrace.main/main-internal.exp              |   33 ++
 testsuite/ltrace.main/main-lib.c                     |    7 
 testsuite/ltrace.main/main.c                         |   21 +
 testsuite/ltrace.main/main.exp                       |   39 ++
 testsuite/ltrace.main/signals.c                      |   48 +++
 testsuite/ltrace.main/signals.exp                    |   39 ++
 testsuite/ltrace.main/system_calls.c                 |   68 ++++
 testsuite/ltrace.main/system_calls.exp               |   67 ++++
 testsuite/ltrace.minor/Makefile.in                   |   37 ++
 testsuite/ltrace.minor/attach-process.c              |   16 +
 testsuite/ltrace.minor/attach-process.exp            |   38 ++
 testsuite/ltrace.minor/count-record.c                |   51 +++
 testsuite/ltrace.minor/count-record.exp              |   77 +++++
 testsuite/ltrace.minor/demangle-lib.cpp              |   97 ++++++
 testsuite/ltrace.minor/demangle.cpp                  |  121 ++++++++
 testsuite/ltrace.minor/demangle.exp                  |   63 ++++
 testsuite/ltrace.minor/demangle.h                    |   36 ++
 testsuite/ltrace.minor/print-instruction-pointer.c   |   11 
 testsuite/ltrace.minor/print-instruction-pointer.exp |   42 ++
 testsuite/ltrace.minor/time-record-T.exp             |   84 +++++
 testsuite/ltrace.minor/time-record-tt.exp            |  107 +++++++
 testsuite/ltrace.minor/time-record-ttt.exp           |  112 +++++++
 testsuite/ltrace.minor/time-record.c                 |   23 +
 testsuite/ltrace.minor/trace-clone.c                 |   43 ++
 testsuite/ltrace.minor/trace-clone.exp               |   44 +++
 testsuite/ltrace.minor/trace-fork.c                  |   33 ++
 testsuite/ltrace.minor/trace-fork.exp                |   40 ++
 testsuite/ltrace.torture/Makefile.in                 |   34 ++
 testsuite/ltrace.torture/signals.c                   |   44 +++
 testsuite/ltrace.torture/signals.exp                 |   37 ++
 testsuite/run-my-tests.sh                            |   43 ++
 44 files changed, 2382 insertions(+), 6 deletions(-)

Index: ltrace-testsuite.patch
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace-testsuite.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ltrace-testsuite.patch	12 Apr 2006 11:31:48 -0000	1.2
+++ ltrace-testsuite.patch	12 Apr 2006 15:16:39 -0000	1.3
@@ -1184,7 +1184,7 @@
 +}
 +
 +set pattern "display"
-+ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 12 
++#ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 12 
 Index: testsuite/ltrace.main/main-lib.c
 ===================================================================
 --- testsuite/ltrace.main/main-lib.c	(revision 0)
@@ -1301,9 +1301,9 @@
 +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
@@ -1316,7 +1316,7 @@
 +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


Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ltrace.spec	12 Apr 2006 11:31:48 -0000	1.27
+++ ltrace.spec	12 Apr 2006 15:16:39 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Tracks runtime library calls from dynamically linked executables.
 Name: ltrace
 Version: 0.4
-Release: 1.1
+Release: 1.2
 Source: ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_%{version}.orig.tar.gz
 Patch0: ltrace-opt_x.patch
 Patch1: ltrace-testsuite.patch
@@ -52,6 +52,11 @@
 %config /etc/ltrace.conf
 
 %changelog
+* Wed Apr 12 2006 Petr Machata <pmachata at redhat.com> - 0.4-1.2
+- svn fix for opt_x patch
+- patches for testsuite for s390{,x}
+- turning off main-internal test. Fails on ia64, needs investigation.
+
 * Fri Apr  7 2006 Petr Machata <pmachata at redhat.com> - 0.4-1
 - Upstream 0.4
 - opt_x patch: New structure for opt_x list elements, now with



From fedora-cvs-commits at redhat.com  Wed Apr 12 15:23:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 11:23:30 -0400
Subject: rpms/ltrace/devel ltrace-testsuite.patch, 1.3, 1.4 ltrace.spec, 1.28,
	1.29
Message-ID: <200604121523.k3CFNUkC009532@cvs.devel.redhat.com>

Author: pmachata

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

Modified Files:
	ltrace-testsuite.patch ltrace.spec 
Log Message:
Rebuild...


ltrace-testsuite.patch:
 ChangeLog                                            |   58 +++
 Makefile.in                                          |   10 
 configure                                            |    2 
 configure.ac                                         |    5 
 testsuite/Makefile.in                                |   72 ++++
 testsuite/README                                     |  244 ++++++++++++++++
 testsuite/config/unix.exp                            |    1 
 testsuite/lib/compiler.c                             |   58 +++
 testsuite/lib/compiler.cc                            |   45 +++
 testsuite/lib/ltrace.exp                             |  277 +++++++++++++++++++
 testsuite/ltrace.main/Makefile.in                    |   34 ++
 testsuite/ltrace.main/main-internal-1.c              |    8 
 testsuite/ltrace.main/main-internal.c                |   19 +
 testsuite/ltrace.main/main-internal.exp              |   33 ++
 testsuite/ltrace.main/main-lib.c                     |    7 
 testsuite/ltrace.main/main.c                         |   21 +
 testsuite/ltrace.main/main.exp                       |   39 ++
 testsuite/ltrace.main/signals.c                      |   48 +++
 testsuite/ltrace.main/signals.exp                    |   39 ++
 testsuite/ltrace.main/system_calls.c                 |   68 ++++
 testsuite/ltrace.main/system_calls.exp               |   67 ++++
 testsuite/ltrace.minor/Makefile.in                   |   37 ++
 testsuite/ltrace.minor/attach-process.c              |   16 +
 testsuite/ltrace.minor/attach-process.exp            |   38 ++
 testsuite/ltrace.minor/count-record.c                |   51 +++
 testsuite/ltrace.minor/count-record.exp              |   77 +++++
 testsuite/ltrace.minor/demangle-lib.cpp              |   97 ++++++
 testsuite/ltrace.minor/demangle.cpp                  |  121 ++++++++
 testsuite/ltrace.minor/demangle.exp                  |   63 ++++
 testsuite/ltrace.minor/demangle.h                    |   36 ++
 testsuite/ltrace.minor/print-instruction-pointer.c   |   11 
 testsuite/ltrace.minor/print-instruction-pointer.exp |   42 ++
 testsuite/ltrace.minor/time-record-T.exp             |   84 +++++
 testsuite/ltrace.minor/time-record-tt.exp            |  107 +++++++
 testsuite/ltrace.minor/time-record-ttt.exp           |  112 +++++++
 testsuite/ltrace.minor/time-record.c                 |   23 +
 testsuite/ltrace.minor/trace-clone.c                 |   43 ++
 testsuite/ltrace.minor/trace-clone.exp               |   44 +++
 testsuite/ltrace.minor/trace-fork.c                  |   33 ++
 testsuite/ltrace.minor/trace-fork.exp                |   40 ++
 testsuite/ltrace.torture/Makefile.in                 |   34 ++
 testsuite/ltrace.torture/signals.c                   |   44 +++
 testsuite/ltrace.torture/signals.exp                 |   37 ++
 testsuite/run-my-tests.sh                            |   43 ++
 44 files changed, 2382 insertions(+), 6 deletions(-)

Index: ltrace-testsuite.patch
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace-testsuite.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ltrace-testsuite.patch	12 Apr 2006 15:16:39 -0000	1.3
+++ ltrace-testsuite.patch	12 Apr 2006 15:23:26 -0000	1.4
@@ -28,7 +28,7 @@
  		$(INSTALL_FILE) ltrace.1 $(DESTDIR)$(mandir)/man1
  
 +check:
-+		cd testsuite; $(MAKE) check; sleep 20
++		cd testsuite; $(MAKE) check
 +
  dummy:
  


Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ltrace.spec	12 Apr 2006 15:16:39 -0000	1.28
+++ ltrace.spec	12 Apr 2006 15:23:26 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: Tracks runtime library calls from dynamically linked executables.
 Name: ltrace
 Version: 0.4
-Release: 1.2
+Release: 1.3
 Source: ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_%{version}.orig.tar.gz
 Patch0: ltrace-opt_x.patch
 Patch1: ltrace-testsuite.patch



From fedora-cvs-commits at redhat.com  Wed Apr 12 15:25:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 11:25:28 -0400
Subject: rpms/valgrind/devel valgrind-3.1.1-syscall-updates-from-trunk.patch,
	NONE, 1.1 valgrind-3.1.1-syscall-updates.patch, NONE,
	1.1 valgrind.spec, 1.29, 1.30
Message-ID: <200604121525.k3CFPS0v009609@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/valgrind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9592

Modified Files:
	valgrind.spec 
Added Files:
	valgrind-3.1.1-syscall-updates-from-trunk.patch 
	valgrind-3.1.1-syscall-updates.patch 
Log Message:
3.1.1-2


valgrind-3.1.1-syscall-updates-from-trunk.patch:
 priv_syswrap-generic.h |    1 
 priv_syswrap-linux.h   |   16 +++
 syswrap-amd64-linux.c  |   20 +++
 syswrap-generic.c      |   76 +++++---------
 syswrap-linux.c        |  256 +++++++++++++++++++++++++++++++++++++++++++++++++
 syswrap-ppc32-linux.c  |   23 +++-
 syswrap-x86-linux.c    |   59 ++++++++++-
 7 files changed, 396 insertions(+), 55 deletions(-)

--- NEW FILE valgrind-3.1.1-syscall-updates-from-trunk.patch ---
--- valgrind-3.1.1/coregrind/m_syswrap/syswrap-ppc32-linux.c.jj	2006-02-22 08:47:05.000000000 -0500
+++ valgrind-3.1.1/coregrind/m_syswrap/syswrap-ppc32-linux.c	2006-04-12 10:23:34.000000000 -0400
@@ -392,6 +392,7 @@ DECL_TEMPLATE(ppc32_linux, sys_clone);
 DECL_TEMPLATE(ppc32_linux, sys_sigreturn);
 DECL_TEMPLATE(ppc32_linux, sys_rt_sigreturn);
 DECL_TEMPLATE(ppc32_linux, sys_sigaction);
+DECL_TEMPLATE(ppc32_linux, sys_sigsuspend);
 
 PRE(sys_socketcall)
 {
@@ -1424,6 +1425,20 @@ POST(sys_sigaction)
       POST_MEM_WRITE( ARG3, sizeof(struct vki_old_sigaction));
 }
 
+PRE(sys_sigsuspend)
+{
+   /* The C library interface to sigsuspend just takes a pointer to
+      a signal mask but this system call only takes the first word of
+      the signal mask as an argument so only 32 signals are supported.
+     
+      In fact glibc normally uses rt_sigsuspend if it is available as
+      that takes a pointer to the signal mask so supports more signals.
+    */
+   *flags |= SfMayBlock;
+   PRINT("sys_sigsuspend ( %d )", ARG1 );
+   PRE_REG_READ1(int, "sigsuspend", vki_old_sigset_t, mask);
+}
+
 
 #undef PRE
 #undef POST
@@ -1461,7 +1476,7 @@ const SyscallTableEntry ML_(syscall_tabl
    GENX_(__NR_execve,            sys_execve),            // 11
    GENX_(__NR_chdir,             sys_chdir),             // 12
    GENXY(__NR_time,              sys_time),              // 13
-//..    GENX_(__NR_mknod,             sys_mknod),             // 14
+   GENX_(__NR_mknod,             sys_mknod),             // 14
 //.. 
    GENX_(__NR_chmod,             sys_chmod),             // 15
 //..    LINX_(__NR_lchown,            sys_lchown16),          // 16 ## P
@@ -1531,7 +1546,7 @@ const SyscallTableEntry ML_(syscall_tabl
 //.. 
 //..    LINX_(__NR_setreuid,          sys_setreuid16),        // 70
 //..    LINX_(__NR_setregid,          sys_setregid16),        // 71
-//..    GENX_(__NR_sigsuspend,        sys_sigsuspend),        // 72
+   PLAX_(__NR_sigsuspend,        sys_sigsuspend),        // 72
 //..    LINXY(__NR_sigpending,        sys_sigpending),        // 73
 //..    //   (__NR_sethostname,       sys_sethostname),       // 74 */*
 //.. 
@@ -1563,7 +1578,7 @@ const SyscallTableEntry ML_(syscall_tabl
    GENX_(__NR_getpriority,       sys_getpriority),       // 96
    GENX_(__NR_setpriority,       sys_setpriority),       // 97
 //..    GENX_(__NR_profil,            sys_ni_syscall),        // 98
-//..    GENXY(__NR_statfs,            sys_statfs),            // 99
+   GENXY(__NR_statfs,            sys_statfs),            // 99
 //.. 
 //..    GENXY(__NR_fstatfs,           sys_fstatfs),           // 100
 //..    LINX_(__NR_ioperm,            sys_ioperm),            // 101
@@ -1606,7 +1621,7 @@ const SyscallTableEntry ML_(syscall_tabl
 //..    GENX_(__NR_get_kernel_syms,   sys_ni_syscall),        // 130
 //..    LINX_(__NR_quotactl,          sys_quotactl),          // 131
    GENX_(__NR_getpgid,           sys_getpgid),           // 132
-//..    GENX_(__NR_fchdir,            sys_fchdir),            // 133
+   GENX_(__NR_fchdir,            sys_fchdir),            // 133
 //..    //   (__NR_bdflush,           sys_bdflush),           // 134 */Linux
 //.. 
 //..    //   (__NR_sysfs,             sys_sysfs),             // 135 SVr4
--- valgrind-3.1.1/coregrind/m_syswrap/priv_syswrap-generic.h.jj	2006-02-20 10:16:37.000000000 -0500
+++ valgrind-3.1.1/coregrind/m_syswrap/priv_syswrap-generic.h	2006-04-12 10:23:34.000000000 -0400
@@ -170,7 +170,6 @@ DECL_TEMPLATE(generic, sys_newfstat);   
 
 // For the remainder, not really sure yet
 DECL_TEMPLATE(generic, sys_ptrace);                // (x86?) (almost-P)
-DECL_TEMPLATE(generic, sys_sigsuspend);            // POSIX, but L (proto varies across archs)
 DECL_TEMPLATE(generic, sys_setrlimit);             // SVr4, 4.3BSD
 DECL_TEMPLATE(generic, sys_ioctl);                 // x86? (various)
 DECL_TEMPLATE(generic, sys_old_getrlimit);         // SVr4, 4.3BSD L?
--- valgrind-3.1.1/coregrind/m_syswrap/priv_syswrap-linux.h.jj	2006-02-20 10:16:37.000000000 -0500
+++ valgrind-3.1.1/coregrind/m_syswrap/priv_syswrap-linux.h	2006-04-12 10:22:08.000000000 -0400
@@ -74,6 +74,8 @@ DECL_TEMPLATE(linux, sys_prctl);
 DECL_TEMPLATE(linux, sys_sendfile);
 DECL_TEMPLATE(linux, sys_sendfile64);
 DECL_TEMPLATE(linux, sys_futex);
+DECL_TEMPLATE(linux, sys_pselect6);
+DECL_TEMPLATE(linux, sys_ppoll);
 
 DECL_TEMPLATE(linux, sys_epoll_create);
 DECL_TEMPLATE(linux, sys_epoll_ctl);
@@ -122,6 +124,20 @@ DECL_TEMPLATE(linux, sys_timer_delete);
 DECL_TEMPLATE(linux, sys_capget);
 DECL_TEMPLATE(linux, sys_capset);
 
+DECL_TEMPLATE(linux, sys_openat);
+DECL_TEMPLATE(linux, sys_mkdirat);
+DECL_TEMPLATE(linux, sys_mknodat);
+DECL_TEMPLATE(linux, sys_fchownat);
+DECL_TEMPLATE(linux, sys_futimesat);
+DECL_TEMPLATE(linux, sys_newfstatat);
+DECL_TEMPLATE(linux, sys_unlinkat);
+DECL_TEMPLATE(linux, sys_renameat);
+DECL_TEMPLATE(linux, sys_linkat);
+DECL_TEMPLATE(linux, sys_symlinkat);
+DECL_TEMPLATE(linux, sys_readlinkat);
+DECL_TEMPLATE(linux, sys_fchmodat);
+DECL_TEMPLATE(linux, sys_faccessat);
+
 // These ones have 32-bit generic equivalents, but the 16-bit versions (they
 // use 16-bit gid_t and uid_t types) seem to be Linux-specific.
 DECL_TEMPLATE(linux, sys_getuid16);
--- valgrind-3.1.1/coregrind/m_syswrap/syswrap-amd64-linux.c.jj	2006-02-22 08:47:05.000000000 -0500
+++ valgrind-3.1.1/coregrind/m_syswrap/syswrap-amd64-linux.c	2006-04-12 10:22:08.000000000 -0400
@@ -1271,6 +1271,26 @@ const SyscallTableEntry ML_(syscall_tabl
    LINX_(__NR_inotify_add_watch, sys_inotify_add_watch), // 254
 
    LINX_(__NR_inotify_rm_watch,	 sys_inotify_rm_watch), // 255
+//   LINX_(__NR_migrate_pages,	 sys_migrate_pages),    // 256
+   LINXY(__NR_openat,		 sys_openat),           // 257
+   LINX_(__NR_mkdirat,		 sys_mkdirat),          // 258
+   LINX_(__NR_mknodat,		 sys_mknodat),          // 259
+
+   LINX_(__NR_fchownat,		 sys_fchownat),         // 260
+   LINX_(__NR_futimesat,	 sys_futimesat),        // 261
+   LINXY(__NR_newfstatat,	 sys_newfstatat),       // 262
+   LINX_(__NR_unlinkat,		 sys_unlinkat),         // 263
+   LINX_(__NR_renameat,		 sys_renameat),         // 264
+
+   LINX_(__NR_linkat,		 sys_linkat),           // 265
+   LINX_(__NR_symlinkat,	 sys_symlinkat),        // 266
+   LINX_(__NR_readlinkat,	 sys_readlinkat),       // 267
+   LINX_(__NR_fchmodat,		 sys_fchmodat),         // 268
+   LINX_(__NR_faccessat,	 sys_faccessat),        // 269
+
+//   LINX_(__NR_pselect6,		 sys_ni_syscall),       // 270
+//   LINXY(__NR_ppoll,		 sys_ni_syscall),       // 271
+//   LINX_(__NR_unshare,		 sys_unshare),          // 272
 };
 
 const UInt ML_(syscall_table_size) = 
--- valgrind-3.1.1/coregrind/m_syswrap/syswrap-generic.c.jj	2006-02-22 08:47:05.000000000 -0500
+++ valgrind-3.1.1/coregrind/m_syswrap/syswrap-generic.c	2006-04-12 10:23:34.000000000 -0400
@@ -752,7 +752,7 @@ void msghdr_foreachfield ( 
    foreach_func ( tid, True, "(msg)", (Addr)&msg->msg_iovlen, sizeof( msg->msg_iovlen ) );
    foreach_func ( tid, True, "(msg)", (Addr)&msg->msg_control, sizeof( msg->msg_control ) );
    foreach_func ( tid, True, "(msg)", (Addr)&msg->msg_controllen, sizeof( msg->msg_controllen ) );
-   foreach_func ( tid, True, "(msg)", (Addr)&msg->msg_flags, sizeof( msg->msg_flags ) );
+   foreach_func ( tid, False, "(msg)", (Addr)&msg->msg_flags, sizeof( msg->msg_flags ) );
 
    if ( msg->msg_name )
       foreach_func ( tid, False,
@@ -769,7 +769,7 @@ void msghdr_foreachfield ( 
 
       for ( i = 0; i < msg->msg_iovlen; ++i, ++iov )
          foreach_func ( tid, False,
-                        "(msg.msg_iov[i]", 
+                        "(msg.msg_iov[i])", 
                         (Addr)iov->iov_base, iov->iov_len );
    }
 
@@ -2237,7 +2237,7 @@ POST(sys_pread64)
 
 PRE(sys_mknod)
 {
-   PRINT("sys_mknod ( %p, 0x%x, 0x%x )", ARG1, ARG2, ARG3 );
+   PRINT("sys_mknod ( %p(%s), 0x%x, 0x%x )", ARG1, ARG1, ARG2, ARG3 );
    PRE_REG_READ3(long, "mknod",
                  const char *, pathname, int, mode, unsigned, dev);
    PRE_MEM_RASCIIZ( "mknod(pathname)", ARG1 );
@@ -2581,21 +2581,21 @@ PRE(sys_brk)
 
 PRE(sys_chdir)
 {
-   PRINT("sys_chdir ( %p )", ARG1);
+   PRINT("sys_chdir ( %p(%s) )", ARG1,ARG1);
    PRE_REG_READ1(long, "chdir", const char *, path);
    PRE_MEM_RASCIIZ( "chdir(path)", ARG1 );
 }
 
 PRE(sys_chmod)
 {
-   PRINT("sys_chmod ( %p, %d )", ARG1,ARG2);
+   PRINT("sys_chmod ( %p(%s), %d )", ARG1,ARG1,ARG2);
    PRE_REG_READ2(long, "chmod", const char *, path, vki_mode_t, mode);
    PRE_MEM_RASCIIZ( "chmod(path)", ARG1 );
 }
 
 PRE(sys_chown)
 {
-   PRINT("sys_chown ( %p, 0x%x, 0x%x )", ARG1,ARG2,ARG3);
+   PRINT("sys_chown ( %p(%s), 0x%x, 0x%x )", ARG1,ARG1,ARG2,ARG3);
    PRE_REG_READ3(long, "chown",
                  const char *, path, vki_uid_t, owner, vki_gid_t, group);
    PRE_MEM_RASCIIZ( "chown(path)", ARG1 );
@@ -2603,7 +2603,7 @@ PRE(sys_chown)
 
 PRE(sys_lchown)
 {
-   PRINT("sys_lchown ( %p, 0x%x, 0x%x )", ARG1,ARG2,ARG3);
+   PRINT("sys_lchown ( %p(%s), 0x%x, 0x%x )", ARG1,ARG1,ARG2,ARG3);
    PRE_REG_READ3(long, "lchown",
                  const char *, path, vki_uid_t, owner, vki_gid_t, group);
    PRE_MEM_RASCIIZ( "lchown(path)", ARG1 );
@@ -4587,7 +4587,7 @@ PRE(sys_kill)
 PRE(sys_link)
 {
    *flags |= SfMayBlock;
-   PRINT("sys_link ( %p, %p)", ARG1, ARG2);
+   PRINT("sys_link ( %p(%s), %p(%s) )", ARG1,ARG1,ARG2,ARG2);
    PRE_REG_READ2(long, "link", const char *, oldpath, const char *, newpath);
    PRE_MEM_RASCIIZ( "link(oldpath)", ARG1);
    PRE_MEM_RASCIIZ( "link(newpath)", ARG2);
@@ -4612,7 +4612,7 @@ POST(sys_newlstat)
 PRE(sys_mkdir)
 {
    *flags |= SfMayBlock;
-   PRINT("sys_mkdir ( %p, %d )", ARG1,ARG2);
+   PRINT("sys_mkdir ( %p(%s), %d )", ARG1,ARG1,ARG2);
    PRE_REG_READ2(long, "mkdir", const char *, pathname, int, mode);
    PRE_MEM_RASCIIZ( "mkdir(pathname)", ARG1 );
 }
@@ -4865,7 +4865,6 @@ POST(sys_creat)
    }
 }
 
-// XXX: x86-specific, due to pollfd struct
 PRE(sys_poll)
 {
    /* struct pollfd {
@@ -4880,16 +4879,16 @@ PRE(sys_poll)
    *flags |= SfMayBlock;
    PRINT("sys_poll ( %p, %d, %d )\n", ARG1,ARG2,ARG3);
    PRE_REG_READ3(long, "poll",
-                 struct pollfd *, ufds, unsigned int, nfds, long, timeout);
-                     
+                 struct vki_pollfd *, ufds, unsigned int, nfds, long, timeout);
+
    for (i = 0; i < ARG2; i++) {
-      // 'fd' and 'events' field are inputs;  'revents' is output.
-      // XXX: this is x86 specific -- the pollfd struct varies across
-      // different architectures.
-      PRE_MEM_READ( "poll(ufds)",
-                    (Addr)(&ufds[i]), sizeof(int) + sizeof(short) );
-      PRE_MEM_WRITE( "poll(ufds)", (Addr)(&ufds[i].revents), sizeof(short) );
-   }  
+      PRE_MEM_READ( "poll(ufds.fd)",
+                    (Addr)(&ufds[i].fd), sizeof(ufds[i].fd) );
+      PRE_MEM_READ( "poll(ufds.events)",
+                    (Addr)(&ufds[i].events), sizeof(ufds[i].events) );
+      PRE_MEM_WRITE( "poll(ufd.reventss)",
+                     (Addr)(&ufds[i].revents), sizeof(ufds[i].revents) );
+   }
 }
 
 POST(sys_poll)
@@ -4897,9 +4896,8 @@ POST(sys_poll)
    if (RES > 0) {
       UInt i;
       struct vki_pollfd* ufds = (struct vki_pollfd *)ARG1;
-      // XXX: again, this is x86-specific
       for (i = 0; i < ARG2; i++)
-	 POST_MEM_WRITE( (Addr)(&ufds[i].revents), sizeof(Short) );
+	 POST_MEM_WRITE( (Addr)(&ufds[i].revents), sizeof(ufds[i].revents) );
    }
 }
 
@@ -4908,7 +4906,7 @@ PRE(sys_readlink)
    HChar name[25];
    Word  saved = SYSNO;
 
-   PRINT("sys_readlink ( %p, %p, %llu )", ARG1,ARG2,(ULong)ARG3);
+   PRINT("sys_readlink ( %p(%s), %p, %llu )", ARG1,ARG1,ARG2,(ULong)ARG3);
    PRE_REG_READ3(long, "readlink",
                  const char *, path, char *, buf, int, bufsiz);
    PRE_MEM_RASCIIZ( "readlink(path)", ARG1 );
@@ -4979,7 +4977,7 @@ POST(sys_readv)
 
 PRE(sys_rename)
 {
-   PRINT("sys_rename ( %p, %p )", ARG1, ARG2 );
+   PRINT("sys_rename ( %p(%s), %p(%s) )", ARG1,ARG1,ARG2,ARG2);
    PRE_REG_READ2(long, "rename", const char *, oldpath, const char *, newpath);
    PRE_MEM_RASCIIZ( "rename(oldpath)", ARG1 );
    PRE_MEM_RASCIIZ( "rename(newpath)", ARG2 );
@@ -4988,7 +4986,7 @@ PRE(sys_rename)
 PRE(sys_rmdir)
 {
    *flags |= SfMayBlock;
-   PRINT("sys_rmdir ( %p )", ARG1);
+   PRINT("sys_rmdir ( %p(%s) )", ARG1,ARG1);
    PRE_REG_READ1(long, "rmdir", const char *, pathname);
    PRE_MEM_RASCIIZ( "rmdir(pathname)", ARG1 );
 }
@@ -4999,7 +4997,7 @@ PRE(sys_select)
    PRINT("sys_select ( %d, %p, %p, %p, %p )", ARG1,ARG2,ARG3,ARG4,ARG5);
    PRE_REG_READ5(long, "select",
                  int, n, vki_fd_set *, readfds, vki_fd_set *, writefds,
-                 vki_fd_set *, exceptfds, struct timeval *, timeout);
+                 vki_fd_set *, exceptfds, struct vki_timeval *, timeout);
    // XXX: this possibly understates how much memory is read.
    if (ARG2 != 0)
       PRE_MEM_READ( "select(readfds)",   
@@ -5113,7 +5111,7 @@ POST(sys_newstat)
 
 PRE(sys_statfs)
 {
-   PRINT("sys_statfs ( %p, %p )",ARG1,ARG2);
+   PRINT("sys_statfs ( %p(%s), %p )",ARG1,ARG1,ARG2);
    PRE_REG_READ2(long, "statfs", const char *, path, struct statfs *, buf);
    PRE_MEM_RASCIIZ( "statfs(path)", ARG1 );
    PRE_MEM_WRITE( "statfs(buf)", ARG2, sizeof(struct vki_statfs) );
@@ -5125,7 +5123,7 @@ POST(sys_statfs)
 
 PRE(sys_statfs64)
 {
-   PRINT("sys_statfs64 ( %p, %llu, %p )",ARG1,(ULong)ARG2,ARG3);
+   PRINT("sys_statfs64 ( %p(%s), %llu, %p )",ARG1,ARG1,(ULong)ARG2,ARG3);
    PRE_REG_READ3(long, "statfs64",
                  const char *, path, vki_size_t, size, struct statfs64 *, buf);
    PRE_MEM_RASCIIZ( "statfs64(path)", ARG1 );
@@ -5139,7 +5137,7 @@ POST(sys_statfs64)
 PRE(sys_symlink)
 {
    *flags |= SfMayBlock;
-   PRINT("sys_symlink ( %p, %p )",ARG1,ARG2);
+   PRINT("sys_symlink ( %p(%s), %p(%s) )",ARG1,ARG1,ARG2,ARG2);
    PRE_REG_READ2(long, "symlink", const char *, oldpath, const char *, newpath);
    PRE_MEM_RASCIIZ( "symlink(oldpath)", ARG1 );
    PRE_MEM_RASCIIZ( "symlink(newpath)", ARG2 );
@@ -5271,7 +5269,7 @@ PRE(sys_writev)
 
 PRE(sys_utimes)
 {
-   PRINT("sys_utimes ( %p, %p )", ARG1,ARG2);
+   PRINT("sys_utimes ( %p(%s), %p )", ARG1,ARG1,ARG2);
    PRE_REG_READ2(long, "utimes", char *, filename, struct timeval *, tvp);
    PRE_MEM_RASCIIZ( "utimes(filename)", ARG1 );
    if (ARG2 != 0)
@@ -5280,7 +5278,7 @@ PRE(sys_utimes)
 
 PRE(sys_acct)
 {
-   PRINT("sys_acct ( %p )", ARG1);
+   PRINT("sys_acct ( %p(%s) )", ARG1,ARG1);
    PRE_REG_READ1(long, "acct", const char *, filename);
    PRE_MEM_RASCIIZ( "acct(filename)", ARG1 );
 }
@@ -5292,24 +5290,6 @@ PRE(sys_pause)
    PRE_REG_READ0(long, "pause");
 }
 
-//zz // XXX: x86-specific
-//zz PRE(sys_sigsuspend, SfMayBlock)
-//zz {
-//zz    /* The C library interface to sigsuspend just takes a pointer to
-//zz       a signal mask but this system call has three arguments - the first
-//zz       two don't appear to be used by the kernel and are always passed as
-//zz       zero by glibc and the third is the first word of the signal mask
-//zz       so only 32 signals are supported.
-//zz      
-//zz       In fact glibc normally uses rt_sigsuspend if it is available as
-//zz       that takes a pointer to the signal mask so supports more signals.
-//zz     */
-//zz    PRINT("sys_sigsuspend ( %d, %d, %d )", ARG1,ARG2,ARG3 );
-//zz    PRE_REG_READ3(int, "sigsuspend",
-//zz                  int, history0, int, history1,
-//zz                  vki_old_sigset_t, mask);
-//zz }
-
 // XXX: x86-specific
 PRE(sys_sigaltstack)
 {
--- valgrind-3.1.1/coregrind/m_syswrap/syswrap-linux.c.jj	2006-02-22 08:47:05.000000000 -0500
+++ valgrind-3.1.1/coregrind/m_syswrap/syswrap-linux.c	2006-04-12 10:22:08.000000000 -0400
@@ -33,6 +33,7 @@
 #include "pub_core_aspacemgr.h"
 #include "pub_core_debuginfo.h"    // VG_(di_notify_*)
 #include "pub_core_transtab.h"     // VG_(discard_translations)
+#include "pub_core_clientstate.h"
 #include "pub_core_debuglog.h"
 #include "pub_core_libcbase.h"
 #include "pub_core_libcassert.h"
@@ -793,6 +794,66 @@ POST(sys_futex)
    }
 }
 
+PRE(sys_pselect6)
+{
+   *flags |= SfMayBlock;
+   PRINT("sys_pselect6 ( %d, %p, %p, %p, %p, %p )", ARG1,ARG2,ARG3,ARG4,ARG5,ARG6);
+   PRE_REG_READ6(long, "pselect6",
+                 int, n, vki_fd_set *, readfds, vki_fd_set *, writefds,
+                 vki_fd_set *, exceptfds, struct vki_timeval *, timeout,
+                 void *, sig);
+   // XXX: this possibly understates how much memory is read.
+   if (ARG2 != 0)
+      PRE_MEM_READ( "pselect6(readfds)",   
+		     ARG2, ARG1/8 /* __FD_SETSIZE/8 */ );
+   if (ARG3 != 0)
+      PRE_MEM_READ( "pselect6(writefds)",  
+		     ARG3, ARG1/8 /* __FD_SETSIZE/8 */ );
+   if (ARG4 != 0)
+      PRE_MEM_READ( "pselect6(exceptfds)", 
+		     ARG4, ARG1/8 /* __FD_SETSIZE/8 */ );
+   if (ARG5 != 0)
+      PRE_MEM_READ( "pselect6(timeout)", ARG5, sizeof(struct vki_timeval) );
+   if (ARG6 != 0)
+      PRE_MEM_READ( "pselect6(sig)", ARG6, sizeof(void *)+sizeof(vki_size_t) );
+}
+
+PRE(sys_ppoll)
+{
+   UInt i;
+   struct vki_pollfd* ufds = (struct vki_pollfd *)ARG1;
+   *flags |= SfMayBlock;
+   PRINT("sys_ppoll ( %p, %d, %p, %p, %llu )\n", ARG1,ARG2,ARG3,ARG4,ARG5);
+   PRE_REG_READ5(long, "ppoll",
+                 struct vki_pollfd *, ufds, unsigned int, nfds,
+                 struct vki_timespec *, tsp, vki_sigset_t *, sigmask,
+                 vki_size_t, sigsetsize);
+
+   for (i = 0; i < ARG2; i++) {
+      PRE_MEM_READ( "ppoll(ufds.fd)",
+                    (Addr)(&ufds[i].fd), sizeof(ufds[i].fd) );
+      PRE_MEM_READ( "ppoll(ufds.events)",
+                    (Addr)(&ufds[i].events), sizeof(ufds[i].events) );
+      PRE_MEM_WRITE( "ppoll(ufd.reventss)",
+                     (Addr)(&ufds[i].revents), sizeof(ufds[i].revents) );
+   }
+
+   if (ARG3)
+      PRE_MEM_READ( "ppoll(tsp)", ARG3, sizeof(struct vki_timespec) );
+   if (ARG4)
+      PRE_MEM_READ( "ppoll(sigmask)", ARG4, sizeof(vki_sigset_t) );
+}
+
+POST(sys_ppoll)
+{
+   if (RES > 0) {
+      UInt i;
+      struct vki_pollfd* ufds = (struct vki_pollfd *)ARG1;
+      for (i = 0; i < ARG2; i++)
+	 POST_MEM_WRITE( (Addr)(&ufds[i].revents), sizeof(ufds[i].revents) );
+   }
+}
+
 
 /* ---------------------------------------------------------------------
    epoll_* wrappers
@@ -2210,6 +2271,201 @@ ML_(linux_POST_sys_msgctl) ( ThreadId ti
    }
 }
 
+/* ---------------------------------------------------------------------
+   *at wrappers
+   ------------------------------------------------------------------ */
+
+PRE(sys_openat)
+{
+   HChar  name[30];
+   SysRes sres;
+
+   if (ARG3 & VKI_O_CREAT) {
+      // 4-arg version
+      PRINT("sys_openat ( %d, %p(%s), %d, %d )",ARG1,ARG2,ARG2,ARG3,ARG4);
+      PRE_REG_READ4(long, "openat",
+                    int, dfd, const char *, filename, int, flags, int, mode);
+   } else {
+      // 3-arg version
+      PRINT("sys_openat ( %d, %p(%s), %d )",ARG1,ARG2,ARG2,ARG3);
+      PRE_REG_READ3(long, "openat",
+                    int, dfd, const char *, filename, int, flags);
+   }
+
+   if (!ML_(fd_allowed)(ARG1, "openat", tid, False))
+      SET_STATUS_Failure( VKI_EBADF );
+   else
+      PRE_MEM_RASCIIZ( "openat(filename)", ARG2 );
+
+   /* Handle the case where the open is of /proc/self/cmdline or
+      /proc/<pid>/cmdline, and just give it a copy of the fd for the
+      fake file we cooked up at startup (in m_main).  Also, seek the
+      cloned fd back to the start. */
+
+   VG_(sprintf)(name, "/proc/%d/cmdline", VG_(getpid)());
+   if (ML_(safe_to_deref)( (void*)ARG2, 1 )
+       && (VG_(strcmp)((Char *)ARG2, name) == 0 
+           || VG_(strcmp)((Char *)ARG2, "/proc/self/cmdline") == 0)) {
+      sres = VG_(dup)( VG_(cl_cmdline_fd) );
+      SET_STATUS_from_SysRes( sres );
+      if (!sres.isError) {
+         OffT off = VG_(lseek)( sres.val, 0, VKI_SEEK_SET );
+         if (off < 0)
+            SET_STATUS_Failure( VKI_EMFILE );
+      }
+      return;
+   }
+
+   /* Otherwise handle normally */
+   *flags |= SfMayBlock;
+}
+
+POST(sys_openat)
+{
+   vg_assert(SUCCESS);
+   if (!ML_(fd_allowed)(RES, "openat", tid, True)) {
+      VG_(close)(RES);
+      SET_STATUS_Failure( VKI_EMFILE );
+   } else {
+      if (VG_(clo_track_fds))
+         ML_(record_fd_open_with_given_name)(tid, RES, (Char*)ARG2);
+   }
+}
+
+PRE(sys_mkdirat)
+{
+   *flags |= SfMayBlock;
+   PRINT("sys_mkdirat ( %d, %p(%s), %d )", ARG1,ARG2,ARG2,ARG3);
+   PRE_REG_READ3(long, "mkdirat",
+                 int, dfd, const char *, pathname, int, mode);
+   PRE_MEM_RASCIIZ( "mkdirat(pathname)", ARG2 );
+}
+
+PRE(sys_mknodat)
+{
+   PRINT("sys_mknodat ( %d, %p(%s), 0x%x, 0x%x )", ARG1,ARG2,ARG2,ARG3,ARG4 );
+   PRE_REG_READ4(long, "mknodat",
+                 int, dfd, const char *, pathname, int, mode, unsigned, dev);
+   PRE_MEM_RASCIIZ( "mknodat(pathname)", ARG2 );
+}
+
+PRE(sys_fchownat)
+{
+   PRINT("sys_fchownat ( %d, %p(%s), 0x%x, 0x%x )", ARG1,ARG2,ARG2,ARG3,ARG4);
+   PRE_REG_READ4(long, "fchownat",
+                 int, dfd, const char *, path,
+                 vki_uid_t, owner, vki_gid_t, group);
+   PRE_MEM_RASCIIZ( "fchownat(path)", ARG2 );
+}
+
+PRE(sys_futimesat)
+{
+   PRINT("sys_futimesat ( %d, %p(%s), %p )", ARG1,ARG2,ARG2,ARG3);
+   PRE_REG_READ3(long, "futimesat",
+                 int, dfd, char *, filename, struct timeval *, tvp);
+   PRE_MEM_RASCIIZ( "futimesat(filename)", ARG2 );
+   if (ARG3 != 0)
+      PRE_MEM_READ( "futimesat(tvp)", ARG3, sizeof(struct vki_timeval) );
+}
+
+PRE(sys_newfstatat)
+{
+   PRINT("sys_newfstatat ( %d, %p(%s), %p )", ARG1,ARG2,ARG2,ARG3);
+   PRE_REG_READ3(long, "fstatat",
+                 int, dfd, char *, file_name, struct stat *, buf);
+   PRE_MEM_RASCIIZ( "fstatat(file_name)", ARG2 );
+   PRE_MEM_WRITE( "fstatat(buf)", ARG3, sizeof(struct vki_stat) );
+}
+
+POST(sys_newfstatat)
+{
+   POST_MEM_WRITE( ARG3, sizeof(struct vki_stat) );
+}
+
+PRE(sys_unlinkat)
+{
+   *flags |= SfMayBlock;
+   PRINT("sys_unlinkat ( %d, %p(%s) )", ARG1,ARG2,ARG2);
+   PRE_REG_READ2(long, "unlinkat", int, dfd, const char *, pathname);
+   PRE_MEM_RASCIIZ( "unlinkat(pathname)", ARG2 );
+}
+
+PRE(sys_renameat)
+{
+   PRINT("sys_renameat ( %d, %p(%s), %p(%s) )", ARG1,ARG2,ARG2,ARG3,ARG3);
+   PRE_REG_READ3(long, "renameat",
+                 int, dfd, const char *, oldpath, const char *, newpath);
+   PRE_MEM_RASCIIZ( "renameat(oldpath)", ARG2 );
+   PRE_MEM_RASCIIZ( "renameat(newpath)", ARG3 );
+}
+
+PRE(sys_linkat)
+{
+   *flags |= SfMayBlock;
+   PRINT("sys_linkat ( %d, %p(%s), %p(%s) )", ARG1,ARG2,ARG2,ARG3,ARG3);
+   PRE_REG_READ3(long, "linkat",
+                 int, dfd, const char *, oldpath, const char *, newpath);
+   PRE_MEM_RASCIIZ( "linkat(oldpath)", ARG2);
+   PRE_MEM_RASCIIZ( "linkat(newpath)", ARG3);
+}
+
+PRE(sys_symlinkat)
+{
+   *flags |= SfMayBlock;
+   PRINT("sys_symlinkat ( %d, %p(%s), %p(%s) )",ARG1,ARG2,ARG2,ARG3,ARG3);
+   PRE_REG_READ3(long, "symlinkat",
+                 int, dfd, const char *, oldpath, const char *, newpath);
+   PRE_MEM_RASCIIZ( "symlinkat(oldpath)", ARG2 );
+   PRE_MEM_RASCIIZ( "symlinkat(newpath)", ARG3 );
+}
+
+PRE(sys_readlinkat)
+{
+   HChar name[25];
+   Word  saved = SYSNO;
+
+   PRINT("sys_readlinkat ( %d, %p(%s), %p, %llu )", ARG1,ARG2,ARG2,ARG3,(ULong)ARG4);
+   PRE_REG_READ4(long, "readlinkat",
+                 int, dfd, const char *, path, char *, buf, int, bufsiz);
+   PRE_MEM_RASCIIZ( "readlinkat(path)", ARG2 );
+   PRE_MEM_WRITE( "readlinkat(buf)", ARG3,ARG4 );
+
+   /*
+    * Handle the case where readlinkat is looking at /proc/self/exe or
+    * /proc/<pid>/exe.
+    */
+   VG_(sprintf)(name, "/proc/%d/exe", VG_(getpid)());
+   if (ML_(safe_to_deref)((void*)ARG2, 1)
+       && (VG_(strcmp)((Char *)ARG2, name) == 0 
+           || VG_(strcmp)((Char *)ARG2, "/proc/self/exe") == 0)) {
+      VG_(sprintf)(name, "/proc/self/fd/%d", VG_(cl_exec_fd));
+      SET_STATUS_from_SysRes( VG_(do_syscall4)(saved, ARG1, (UWord)name, 
+                                                      ARG3, ARG4));
+   } else {
+      /* Normal case */
+      SET_STATUS_from_SysRes( VG_(do_syscall4)(saved, ARG1, ARG2, ARG3, ARG4));
+   }
+
+   if (SUCCESS && RES > 0)
+      POST_MEM_WRITE( ARG3, RES );
+}
+
+PRE(sys_fchmodat)
+{
+   PRINT("sys_fchmodat ( %d, %p(%s), %d )", ARG1,ARG2,ARG2,ARG3);
+   PRE_REG_READ3(long, "fchmodat",
+                 int, dfd, const char *, path, vki_mode_t, mode);
+   PRE_MEM_RASCIIZ( "fchmodat(path)", ARG2 );
+}
+
+PRE(sys_faccessat)
+{
+   PRINT("sys_faccessat ( %d, %p(%s), %d )", ARG1,ARG2,ARG2,ARG3);
+   PRE_REG_READ3(long, "faccessat",
+                 int, dfd, const char *, pathname, int, mode);
+   PRE_MEM_RASCIIZ( "faccessat(pathname)", ARG2 );
+}
+
 #undef PRE
 #undef POST
 
--- valgrind-3.1.1/coregrind/m_syswrap/syswrap-x86-linux.c.jj	2006-02-22 08:47:05.000000000 -0500
+++ valgrind-3.1.1/coregrind/m_syswrap/syswrap-x86-linux.c	2006-04-12 10:23:34.000000000 -0400
@@ -758,6 +758,7 @@ static void setup_child ( /*OUT*/ Thread
    magic. */
 DECL_TEMPLATE(x86_linux, sys_socketcall);
 DECL_TEMPLATE(x86_linux, sys_stat64);
+DECL_TEMPLATE(x86_linux, sys_fstatat64);
 DECL_TEMPLATE(x86_linux, sys_fstat64);
 DECL_TEMPLATE(x86_linux, sys_lstat64);
 DECL_TEMPLATE(x86_linux, sys_clone);
@@ -771,6 +772,7 @@ DECL_TEMPLATE(x86_linux, sys_set_thread_
 DECL_TEMPLATE(x86_linux, sys_get_thread_area);
 DECL_TEMPLATE(x86_linux, sys_ptrace);
 DECL_TEMPLATE(x86_linux, sys_sigaction);
+DECL_TEMPLATE(x86_linux, sys_sigsuspend);
 DECL_TEMPLATE(x86_linux, old_select);
 DECL_TEMPLATE(x86_linux, sys_vm86old);
 DECL_TEMPLATE(x86_linux, sys_vm86);
@@ -1332,7 +1334,7 @@ POST(sys_lstat64)
 
 PRE(sys_stat64)
 {
-   PRINT("sys_stat64 ( %p, %p )",ARG1,ARG2);
+   PRINT("sys_stat64 ( %p(%s), %p )",ARG1,ARG2,ARG2);
    PRE_REG_READ2(long, "stat64", char *, file_name, struct stat64 *, buf);
    PRE_MEM_RASCIIZ( "stat64(file_name)", ARG1 );
    PRE_MEM_WRITE( "stat64(buf)", ARG2, sizeof(struct vki_stat64) );
@@ -1343,6 +1345,20 @@ POST(sys_stat64)
    POST_MEM_WRITE( ARG2, sizeof(struct vki_stat64) );
 }
 
+PRE(sys_fstatat64)
+{
+   PRINT("sys_fstatat64 ( %d, %p(%s), %p )",ARG1,ARG2,ARG2,ARG3);
+   PRE_REG_READ3(long, "fstatat64",
+                 int, dfd, char *, file_name, struct stat64 *, buf);
+   PRE_MEM_RASCIIZ( "fstatat64(file_name)", ARG2 );
+   PRE_MEM_WRITE( "fstatat64(buf)", ARG3, sizeof(struct vki_stat64) );
+}
+
+POST(sys_fstatat64)
+{
+   POST_MEM_WRITE( ARG3, sizeof(struct vki_stat64) );
+}
+
 PRE(sys_fstat64)
 {
    PRINT("sys_fstat64 ( %d, %p )",ARG1,ARG2);
@@ -1679,6 +1695,24 @@ POST(sys_sigaction)
       POST_MEM_WRITE( ARG3, sizeof(struct vki_old_sigaction));
 }
 
+PRE(sys_sigsuspend)
+{
+   /* The C library interface to sigsuspend just takes a pointer to
+      a signal mask but this system call has three arguments - the first
+      two don't appear to be used by the kernel and are always passed as
+      zero by glibc and the third is the first word of the signal mask
+      so only 32 signals are supported.
+     
+      In fact glibc normally uses rt_sigsuspend if it is available as
+      that takes a pointer to the signal mask so supports more signals.
+    */
+   *flags |= SfMayBlock;
+   PRINT("sys_sigsuspend ( %d, %d, %d )", ARG1,ARG2,ARG3 );
+   PRE_REG_READ3(int, "sigsuspend",
+                 int, history0, int, history1,
+                 vki_old_sigset_t, mask);
+}
+
 PRE(sys_vm86old)
 {
    PRINT("sys_vm86old ( %p )", ARG1);
@@ -1848,7 +1882,7 @@ const SyscallTableEntry ML_(syscall_tabl
 //zz 
    LINX_(__NR_setreuid,          sys_setreuid16),     // 70
    LINX_(__NR_setregid,          sys_setregid16),     // 71
-//zz    GENX_(__NR_sigsuspend,        sys_sigsuspend),     // 72
+   PLAX_(__NR_sigsuspend,        sys_sigsuspend),     // 72
    LINXY(__NR_sigpending,        sys_sigpending),     // 73
 //zz    //   (__NR_sethostname,       sys_sethostname),    // 74 */*
 //zz 
@@ -2117,6 +2151,27 @@ const SyscallTableEntry ML_(syscall_tabl
    LINX_(__NR_inotify_init,	 sys_inotify_init),   // 291
    LINX_(__NR_inotify_add_watch, sys_inotify_add_watch), // 292
    LINX_(__NR_inotify_rm_watch,	 sys_inotify_rm_watch), // 293
+//   LINX_(__NR_migrate_pages,	 sys_migrate_pages),    // 294
+
+   LINXY(__NR_openat,		 sys_openat),           // 295
+   LINX_(__NR_mkdirat,		 sys_mkdirat),          // 296
+   LINX_(__NR_mknodat,		 sys_mknodat),          // 297
+   LINX_(__NR_fchownat,		 sys_fchownat),         // 298
+   LINX_(__NR_futimesat,	 sys_futimesat),        // 299
+
+   PLAXY(__NR_fstatat64,	 sys_fstatat64),        // 300
+   LINX_(__NR_unlinkat,		 sys_unlinkat),         // 301
+   LINX_(__NR_renameat,		 sys_renameat),         // 302
+   LINX_(__NR_linkat,		 sys_linkat),           // 303
+   LINX_(__NR_symlinkat,	 sys_symlinkat),        // 304
+
+   LINX_(__NR_readlinkat,	 sys_readlinkat),       // 305
+   LINX_(__NR_fchmodat,		 sys_fchmodat),         // 306
+   LINX_(__NR_faccessat,	 sys_faccessat),        // 307
+   LINX_(__NR_pselect6,		 sys_pselect6),         // 308
+   LINXY(__NR_ppoll,		 sys_ppoll),            // 309
+
+//   LINX_(__NR_unshare,		 sys_unshare),          // 310
 };
 
 const UInt ML_(syscall_table_size) = 

valgrind-3.1.1-syscall-updates.patch:
 syswrap-amd64-linux.c |    4 -
 syswrap-ppc32-linux.c |  132 +++++++++++++++++++++++++-------------------------
 2 files changed, 68 insertions(+), 68 deletions(-)

--- NEW FILE valgrind-3.1.1-syscall-updates.patch ---
--- valgrind-3.1.1/coregrind/m_syswrap/syswrap-ppc32-linux.c.jj	2006-04-12 10:23:34.000000000 -0400
+++ valgrind-3.1.1/coregrind/m_syswrap/syswrap-ppc32-linux.c	2006-04-12 11:15:39.000000000 -0400
@@ -1479,16 +1479,16 @@ const SyscallTableEntry ML_(syscall_tabl
    GENX_(__NR_mknod,             sys_mknod),             // 14
 //.. 
    GENX_(__NR_chmod,             sys_chmod),             // 15
-//..    LINX_(__NR_lchown,            sys_lchown16),          // 16 ## P
+   GENX_(__NR_lchown,            sys_lchown),          // 16 ## P
 //..    GENX_(__NR_break,             sys_ni_syscall),        // 17
 //..    //   (__NR_oldstat,           sys_stat),              // 18 (obsolete)
    LINX_(__NR_lseek,             sys_lseek),             // 19
 //.. 
    GENX_(__NR_getpid,            sys_getpid),            // 20
-//..    LINX_(__NR_mount,             sys_mount),             // 21
-//..    LINX_(__NR_umount,            sys_oldumount),         // 22
-   LINX_(__NR_setuid,            sys_setuid16),          // 23 ## P
-   LINX_(__NR_getuid,            sys_getuid16),          // 24 ## P
+   LINX_(__NR_mount,             sys_mount),             // 21
+   LINX_(__NR_umount,            sys_oldumount),         // 22
+   GENX_(__NR_setuid,            sys_setuid),            // 23 ## P
+   GENX_(__NR_getuid,            sys_getuid),            // 24 ## P
 //.. 
 //..    //   (__NR_stime,             sys_stime),             // 25 * (SVr4,SVID,X/OPEN)
 //..    PLAXY(__NR_ptrace,            sys_ptrace),            // 26
@@ -1515,14 +1515,14 @@ const SyscallTableEntry ML_(syscall_tabl
 //..    GENX_(__NR_prof,              sys_ni_syscall),        // 44
 //.. 
    GENX_(__NR_brk,               sys_brk),               // 45
-   LINX_(__NR_setgid,            sys_setgid16),          // 46
-   LINX_(__NR_getgid,            sys_getgid16),          // 47
+   GENX_(__NR_setgid,            sys_setgid),            // 46
+   GENX_(__NR_getgid,            sys_getgid),            // 47
 //..    //   (__NR_signal,            sys_signal),            // 48 */* (ANSI C)
-   LINX_(__NR_geteuid,           sys_geteuid16),         // 49
+   GENX_(__NR_geteuid,           sys_geteuid),           // 49
 
-   LINX_(__NR_getegid,           sys_getegid16),         // 50
+   GENX_(__NR_getegid,           sys_getegid),           // 50
 //..    GENX_(__NR_acct,              sys_acct),              // 51
-//..    LINX_(__NR_umount2,           sys_umount),            // 52
+   LINX_(__NR_umount2,           sys_umount),            // 52
 //..    GENX_(__NR_lock,              sys_ni_syscall),        // 53
    GENXY(__NR_ioctl,             sys_ioctl),             // 54
 //.. 
@@ -1533,7 +1533,7 @@ const SyscallTableEntry ML_(syscall_tabl
 //..    //   (__NR_oldolduname,       sys_olduname),          // 59 Linux -- obsolete
 
    GENX_(__NR_umask,             sys_umask),             // 60
-//..    GENX_(__NR_chroot,            sys_chroot),            // 61
+   GENX_(__NR_chroot,            sys_chroot),            // 61
 //..    //   (__NR_ustat,             sys_ustat)              // 62 SVr4 -- deprecated
    GENXY(__NR_dup2,              sys_dup2),              // 63
    GENX_(__NR_getppid,           sys_getppid),           // 64
@@ -1544,10 +1544,10 @@ const SyscallTableEntry ML_(syscall_tabl
 //..    //   (__NR_sgetmask,          sys_sgetmask),          // 68 */* (ANSI C)
 //..    //   (__NR_ssetmask,          sys_ssetmask),          // 69 */* (ANSI C)
 //.. 
-//..    LINX_(__NR_setreuid,          sys_setreuid16),        // 70
-//..    LINX_(__NR_setregid,          sys_setregid16),        // 71
+   GENX_(__NR_setreuid,          sys_setreuid),          // 70
+   GENX_(__NR_setregid,          sys_setregid),          // 71
    PLAX_(__NR_sigsuspend,        sys_sigsuspend),        // 72
-//..    LINXY(__NR_sigpending,        sys_sigpending),        // 73
+   LINXY(__NR_sigpending,        sys_sigpending),        // 73
 //..    //   (__NR_sethostname,       sys_sethostname),       // 74 */*
 //.. 
    GENX_(__NR_setrlimit,         sys_setrlimit),              // 75
@@ -1556,8 +1556,8 @@ const SyscallTableEntry ML_(syscall_tabl
    GENXY(__NR_gettimeofday,      sys_gettimeofday),           // 78
 //..    GENX_(__NR_settimeofday,      sys_settimeofday),      // 79
 //.. 
-   LINXY(__NR_getgroups,         sys_getgroups16),       // 80
-//..    LINX_(__NR_setgroups,         sys_setgroups16),       // 81
+   GENXY(__NR_getgroups,         sys_getgroups),         // 80
+   GENX_(__NR_setgroups,         sys_setgroups),         // 81
 //..    PLAX_(__NR_select,            old_select),            // 82
    GENX_(__NR_symlink,           sys_symlink),           // 83
 //..    //   (__NR_oldlstat,          sys_lstat),             // 84 -- obsolete
@@ -1570,17 +1570,17 @@ const SyscallTableEntry ML_(syscall_tabl
 
    PLAX_(__NR_mmap,              sys_mmap),                   // 90
    GENXY(__NR_munmap,            sys_munmap),                 // 91
-//..    GENX_(__NR_truncate,          sys_truncate),          // 92
+   GENX_(__NR_truncate,          sys_truncate),          // 92
    GENX_(__NR_ftruncate,         sys_ftruncate),         // 93
    GENX_(__NR_fchmod,            sys_fchmod),            // 94
 
-   LINX_(__NR_fchown,            sys_fchown16),          // 95
+   GENX_(__NR_fchown,            sys_fchown),            // 95
    GENX_(__NR_getpriority,       sys_getpriority),       // 96
    GENX_(__NR_setpriority,       sys_setpriority),       // 97
 //..    GENX_(__NR_profil,            sys_ni_syscall),        // 98
    GENXY(__NR_statfs,            sys_statfs),            // 99
 //.. 
-//..    GENXY(__NR_fstatfs,           sys_fstatfs),           // 100
+   GENXY(__NR_fstatfs,           sys_fstatfs),           // 100
 //..    LINX_(__NR_ioperm,            sys_ioperm),            // 101
    PLAXY(__NR_socketcall,        sys_socketcall),        // 102
 //..    LINXY(__NR_syslog,            sys_syslog),            // 103
@@ -1625,27 +1625,27 @@ const SyscallTableEntry ML_(syscall_tabl
 //..    //   (__NR_bdflush,           sys_bdflush),           // 134 */Linux
 //.. 
 //..    //   (__NR_sysfs,             sys_sysfs),             // 135 SVr4
-//..    LINX_(__NR_personality,       sys_personality),       // 136
+   LINX_(__NR_personality,       sys_personality),       // 136
 //..    GENX_(__NR_afs_syscall,       sys_ni_syscall),        // 137
-   LINX_(__NR_setfsuid,          sys_setfsuid16),        // 138
-   LINX_(__NR_setfsgid,          sys_setfsgid16),        // 139
+   LINX_(__NR_setfsuid,          sys_setfsuid),          // 138
+   LINX_(__NR_setfsgid,          sys_setfsgid),          // 139
 
    LINXY(__NR__llseek,           sys_llseek),            // 140
    GENXY(__NR_getdents,          sys_getdents),          // 141
    GENX_(__NR__newselect,        sys_select),            // 142
    GENX_(__NR_flock,             sys_flock),             // 143
-//..    GENX_(__NR_msync,             sys_msync),             // 144
+   GENX_(__NR_msync,             sys_msync),             // 144
 //.. 
    GENXY(__NR_readv,             sys_readv),             // 145
    GENX_(__NR_writev,            sys_writev),            // 146
-//..    GENX_(__NR_getsid,            sys_getsid),            // 147
+   GENX_(__NR_getsid,            sys_getsid),            // 147
    GENX_(__NR_fdatasync,         sys_fdatasync),         // 148
    LINXY(__NR__sysctl,           sys_sysctl),            // 149
 //.. 
-//..    GENX_(__NR_mlock,             sys_mlock),             // 150
-//..    GENX_(__NR_munlock,           sys_munlock),           // 151
-//..    GENX_(__NR_mlockall,          sys_mlockall),          // 152
-//..    LINX_(__NR_munlockall,        sys_munlockall),        // 153
+   GENX_(__NR_mlock,             sys_mlock),             // 150
+   GENX_(__NR_munlock,           sys_munlock),           // 151
+   GENX_(__NR_mlockall,          sys_mlockall),          // 152
+   LINX_(__NR_munlockall,        sys_munlockall),        // 153
 //..    LINXY(__NR_sched_setparam,    sys_sched_setparam),    // 154
 //.. 
    LINXY(__NR_sched_getparam,         sys_sched_getparam),        // 155
@@ -1658,35 +1658,35 @@ const SyscallTableEntry ML_(syscall_tabl
 //..    //LINX?(__NR_sched_rr_get_interval,  sys_sched_rr_get_interval), // 161 */*
    GENXY(__NR_nanosleep,         sys_nanosleep),         // 162
    GENX_(__NR_mremap,            sys_mremap),            // 163
-   LINX_(__NR_setresuid,         sys_setresuid16),       // 164
+   LINX_(__NR_setresuid,         sys_setresuid),         // 164
 
-   LINXY(__NR_getresuid,         sys_getresuid16),       // 165
+   LINXY(__NR_getresuid,         sys_getresuid),         // 165
 
 //..    GENX_(__NR_query_module,      sys_ni_syscall),        // 166
    GENXY(__NR_poll,              sys_poll),              // 167
 //..    //   (__NR_nfsservctl,        sys_nfsservctl),        // 168 */Linux
 //.. 
-//..    LINX_(__NR_setresgid,         sys_setresgid16),       // 169
-   LINXY(__NR_getresgid,         sys_getresgid16),       // 170
+   LINX_(__NR_setresgid,         sys_setresgid),         // 169
+   LINXY(__NR_getresgid,         sys_getresgid),         // 170
    LINX_(__NR_prctl,             sys_prctl),             // 171
    PLAX_(__NR_rt_sigreturn,      sys_rt_sigreturn),      // 172
    LINXY(__NR_rt_sigaction,      sys_rt_sigaction),      // 173
 
    LINXY(__NR_rt_sigprocmask,    sys_rt_sigprocmask),    // 174
-//..    LINXY(__NR_rt_sigpending,     sys_rt_sigpending),     // 175
+   LINXY(__NR_rt_sigpending,     sys_rt_sigpending),     // 175
    LINXY(__NR_rt_sigtimedwait,   sys_rt_sigtimedwait),   // 176
-//..    LINXY(__NR_rt_sigqueueinfo,   sys_rt_sigqueueinfo),   // 177
+   LINXY(__NR_rt_sigqueueinfo,   sys_rt_sigqueueinfo),   // 177
    LINX_(__NR_rt_sigsuspend,     sys_rt_sigsuspend),     // 178
 
    GENXY(__NR_pread64,           sys_pread64),           // 179
    GENX_(__NR_pwrite64,          sys_pwrite64),          // 180
-   LINX_(__NR_chown,             sys_chown16),           // 181
+   GENX_(__NR_chown,             sys_chown),             // 181
    GENXY(__NR_getcwd,            sys_getcwd),            // 182
 //..    LINXY(__NR_capget,            sys_capget),            // 183
 //.. 
 //..    LINX_(__NR_capset,            sys_capset),            // 184
    GENXY(__NR_sigaltstack,       sys_sigaltstack),       // 185
-//..    LINXY(__NR_sendfile,          sys_sendfile),          // 186
+   LINXY(__NR_sendfile,          sys_sendfile),          // 186
 //..    GENXY(__NR_getpmsg,           sys_getpmsg),           // 187
 //..    GENX_(__NR_putpmsg,           sys_putpmsg),           // 188
 
@@ -1695,7 +1695,7 @@ const SyscallTableEntry ML_(syscall_tabl
    GENXY(__NR_ugetrlimit,        sys_getrlimit),         // 190
 //__NR_readahead      // 191 ppc/Linux only?
    PLAX_(__NR_mmap2,             sys_mmap2),             // 192
-//..    GENX_(__NR_truncate64,        sys_truncate64),        // 193
+   GENX_(__NR_truncate64,        sys_truncate64),        // 193
    GENX_(__NR_ftruncate64,       sys_ftruncate64),       // 194
 //..    
 
@@ -1719,57 +1719,57 @@ const SyscallTableEntry ML_(syscall_tabl
 //..    LINX_(__NR_lsetxattr,         sys_lsetxattr),         // 210
 //..    LINX_(__NR_fsetxattr,         sys_fsetxattr),         // 211
    LINXY(__NR_getxattr,          sys_getxattr),          // 212
-//..    LINXY(__NR_lgetxattr,         sys_lgetxattr),         // 213
-//..    LINXY(__NR_fgetxattr,         sys_fgetxattr),         // 214
-//..    LINXY(__NR_listxattr,         sys_listxattr),         // 215
-//..    LINXY(__NR_llistxattr,        sys_llistxattr),        // 216
-//..    LINXY(__NR_flistxattr,        sys_flistxattr),        // 217
-//..    LINX_(__NR_removexattr,       sys_removexattr),       // 218
-//..    LINX_(__NR_lremovexattr,      sys_lremovexattr),      // 219
-//..    LINX_(__NR_fremovexattr,      sys_fremovexattr),      // 220
+   LINXY(__NR_lgetxattr,         sys_lgetxattr),         // 213
+   LINXY(__NR_fgetxattr,         sys_fgetxattr),         // 214
+   LINXY(__NR_listxattr,         sys_listxattr),         // 215
+   LINXY(__NR_llistxattr,        sys_llistxattr),        // 216
+   LINXY(__NR_flistxattr,        sys_flistxattr),        // 217
+   LINX_(__NR_removexattr,       sys_removexattr),       // 218
+   LINX_(__NR_lremovexattr,      sys_lremovexattr),      // 219
+   LINX_(__NR_fremovexattr,      sys_fremovexattr),      // 220
 
    LINXY(__NR_futex,             sys_futex),                  // 221
-//..    LINX_(__NR_sched_setaffinity, sys_sched_setaffinity), // 222
-//..    LINXY(__NR_sched_getaffinity, sys_sched_getaffinity), // 223
+   LINX_(__NR_sched_setaffinity, sys_sched_setaffinity), // 222
+   LINXY(__NR_sched_getaffinity, sys_sched_getaffinity), // 223
 /* 224 currently unused */
 
 // __NR_tuxcall                                               // 225
 
-//..    LINXY(__NR_sendfile64,        sys_sendfile64),        // 226
+   LINXY(__NR_sendfile64,        sys_sendfile64),        // 226
 //.. 
-//..    LINX_(__NR_io_setup,          sys_io_setup),          // 227
-//..    LINX_(__NR_io_destroy,        sys_io_destroy),        // 228
-//..    LINXY(__NR_io_getevents,      sys_io_getevents),      // 229
-//..    LINX_(__NR_io_submit,         sys_io_submit),         // 230
-//..    LINXY(__NR_io_cancel,         sys_io_cancel),         // 231
+   LINX_(__NR_io_setup,          sys_io_setup),          // 227
+   LINX_(__NR_io_destroy,        sys_io_destroy),        // 228
+   LINXY(__NR_io_getevents,      sys_io_getevents),      // 229
+   LINX_(__NR_io_submit,         sys_io_submit),         // 230
+   LINXY(__NR_io_cancel,         sys_io_cancel),         // 231
 //.. 
    LINX_(__NR_set_tid_address,   sys_set_tid_address),   // 232
 
 //..    LINX_(__NR_fadvise64,         sys_fadvise64),         // 233 */(Linux?)
    LINX_(__NR_exit_group,        sys_exit_group),        // 234
 //..    GENXY(__NR_lookup_dcookie,    sys_lookup_dcookie),    // 235
-//..    LINXY(__NR_epoll_create,      sys_epoll_create),      // 236
-//..    LINX_(__NR_epoll_ctl,         sys_epoll_ctl),         // 237
-//..    LINXY(__NR_epoll_wait,        sys_epoll_wait),        // 238
+   LINXY(__NR_epoll_create,      sys_epoll_create),      // 236
+   LINX_(__NR_epoll_ctl,         sys_epoll_ctl),         // 237
+   LINXY(__NR_epoll_wait,        sys_epoll_wait),        // 238
 
 //..    //   (__NR_remap_file_pages,  sys_remap_file_pages),  // 239 */Linux
-//..    LINXY(__NR_timer_create,      sys_timer_create),      // 240
-//..    LINXY(__NR_timer_settime,     sys_timer_settime),     // 241
-//..    LINXY(__NR_timer_gettime,     sys_timer_gettime),     // 242
-//..    LINX_(__NR_timer_getoverrun,  sys_timer_getoverrun),  // 243
-//..    LINX_(__NR_timer_delete,      sys_timer_delete),      // 244
-//..    LINX_(__NR_clock_settime,     sys_clock_settime),     // 245
+   LINXY(__NR_timer_create,      sys_timer_create),      // 240
+   LINXY(__NR_timer_settime,     sys_timer_settime),     // 241
+   LINXY(__NR_timer_gettime,     sys_timer_gettime),     // 242
+   LINX_(__NR_timer_getoverrun,  sys_timer_getoverrun),  // 243
+   LINX_(__NR_timer_delete,      sys_timer_delete),      // 244
+   LINX_(__NR_clock_settime,     sys_clock_settime),     // 245
    LINXY(__NR_clock_gettime,     sys_clock_gettime),     // 246
    LINXY(__NR_clock_getres,      sys_clock_getres),      // 247
-//..    LINXY(__NR_clock_nanosleep,   sys_clock_nanosleep),   // 248
+   LINXY(__NR_clock_nanosleep,   sys_clock_nanosleep),   // 248
 
 // __NR_swapcontext                                           // 249
 
    LINXY(__NR_tgkill,            sys_tgkill),            // 250 */Linux
 //..    GENX_(__NR_utimes,            sys_utimes),            // 251
-//..    GENXY(__NR_statfs64,          sys_statfs64),          // 252
-//..    GENXY(__NR_fstatfs64,         sys_fstatfs64),         // 253
-//..    LINX_(__NR_fadvise64_64,      sys_fadvise64_64),      // 254 */(Linux?)
+   GENXY(__NR_statfs64,          sys_statfs64),          // 252
+   GENXY(__NR_fstatfs64,         sys_fstatfs64),         // 253
+   LINX_(__NR_fadvise64_64,      sys_fadvise64_64),      // 254 */(Linux?)
 
 // __NR_rtas                                                  // 255
 
--- valgrind-3.1.1/coregrind/m_syswrap/syswrap-amd64-linux.c.jj	2006-04-12 10:22:08.000000000 -0400
+++ valgrind-3.1.1/coregrind/m_syswrap/syswrap-amd64-linux.c	2006-04-12 11:21:55.000000000 -0400
@@ -1012,7 +1012,7 @@ const SyscallTableEntry ML_(syscall_tabl
    GENXY(__NR_setitimer,         sys_setitimer),      // 38 
    GENX_(__NR_getpid,            sys_getpid),         // 39 
 
-   //   (__NR_sendfile,          sys_sendfile64),     // 40 
+   LINXY(__NR_sendfile,          sys_sendfile),       // 40 
    PLAXY(__NR_socket,            sys_socket),         // 41 
    PLAX_(__NR_connect,           sys_connect),        // 42
    PLAXY(__NR_accept,            sys_accept),         // 43 
@@ -1163,7 +1163,7 @@ const SyscallTableEntry ML_(syscall_tabl
    GENX_(__NR_settimeofday,      sys_settimeofday),   // 164 
 
    LINX_(__NR_mount,             sys_mount),          // 165
-   //   (__NR_umount2,           sys_umount),         // 166 
+   LINX_(__NR_umount2,           sys_umount),         // 166 
    //   (__NR_swapon,            sys_swapon),         // 167 
    //   (__NR_swapoff,           sys_swapoff),        // 168 
    //   (__NR_reboot,            sys_reboot),         // 169 


Index: valgrind.spec
===================================================================
RCS file: /cvs/dist/rpms/valgrind/devel/valgrind.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- valgrind.spec	3 Apr 2006 16:55:06 -0000	1.29
+++ valgrind.spec	12 Apr 2006 15:25:26 -0000	1.30
@@ -1,13 +1,15 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
 Version: 3.1.1
-Release: 1
+Release: 2
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
 Patch1: valgrind-3.1.1-valgrind_h.patch
 Patch2: valgrind-3.1.1-amd64-speedup.patch
 Patch3: valgrind-3.1.1-cfa-val-expr.patch
 Patch4: valgrind-3.1.1-glibc24.patch
+Patch5: valgrind-3.1.1-syscall-updates-from-trunk.patch
+Patch6: valgrind-3.1.1-syscall-updates.patch
 License: GPL
 URL: http://www.valgrind.org/
 Group: Development/Debuggers
@@ -34,6 +36,8 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 %ifarch x86_64
@@ -111,6 +115,9 @@
 %{_mandir}/man1/valgrind*
 
 %changelog
+* Wed Apr 12 2006 Jakub Jelinek <jakub at redhat.com> 3.1.1-2
+- handle many syscalls that were unhandled before, especially on ppc
+
 * Mon Apr  3 2006 Jakub Jelinek <jakub at redhat.com> 3.1.1-1
 - upgrade to 3.1.1
   - many bugfixes



From fedora-cvs-commits at redhat.com  Wed Apr 12 15:26:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 11:26:53 -0400
Subject: rpms/gnome-pilot/FC-4 gnome-pilot.spec,1.30,1.31
Message-ID: <200604121526.k3CFQroj009676@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/gnome-pilot/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv9655

Modified Files:
	gnome-pilot.spec 
Log Message:
rebuilt against pilot-link-0.11.8



Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/FC-4/gnome-pilot.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gnome-pilot.spec	30 Jun 2005 23:00:51 -0000	1.30
+++ gnome-pilot.spec	12 Apr 2006 15:26:51 -0000	1.31
@@ -1,8 +1,8 @@
-%define pilot_link_version 1:0.12.0-0.pre2.0
+%define pilot_link_version 2:0.11.8
 Summary: GNOME pilot programs
 Name: gnome-pilot
 Version: 2.0.13
-Release: 5.fc4
+Release: 5.fc4.1
 License: LGPL
 Group: Applications/Communications
 Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-pilot/2.0/%{name}-%{version}.tar.bz2
@@ -13,18 +13,18 @@
 Patch9: gnome-pilot-2.0.12-defines.patch
 
 # This patch has been regenerated by Mark G Adams:
+# patches for pilot-link-0.12
 Patch11: gnome-pilot-2.0.12-port-to-pilot-link-0.12.patch
+Patch12: gnome-pilot-2.0.13-include-pi-error.patch
+Patch13: rh-161799-attach-116013-backup_conduit_update.diff
 
 # Various patches by Mark G Adams filed in GNOME and RH Bugzilla:
 Patch16: gb-309077-attach-48373-fix-xml-properties-leak.patch
 Patch17: gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch
-Patch18: rh-161799-attach-116013-backup_conduit_update.diff
 Patch19: rh-161799-attach-116014-conduits_64bit.diff
 
-Patch20: gnome-pilot-2.0.13-include-pi-error.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: pilot-link >= %{pilot-link-version}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires: pilot-link >= %{pilot_link_version}
 Prereq: scrollkeeper
 Prereq: GConf2
 BuildRequires: libgnome-devel >= 2.0.0
@@ -35,7 +35,7 @@
 BuildRequires: bonobo-activation-devel >= 1.0.3
 BuildRequires: gnome-panel-devel >= 2.0.6
 BuildRequires: GConf2-devel >= 2.0
-BuildRequires: pilot-link-devel >= %{pilot-link-version}
+BuildRequires: pilot-link-devel >= %{pilot_link_version}
 ExcludeArch: s390 s390x
 
 %description
@@ -46,7 +46,7 @@
 Summary: GNOME pilot libraries, includes, etc
 Group: Development/Libraries
 Requires: ORBit2-devel
-Requires: pilot-link-devel >= %{pilot-link-version}
+Requires: pilot-link-devel >= %{pilot_link_version}
 Requires: %name = %{version}
 Requires: libgnomeui-devel
 
@@ -60,15 +60,18 @@
 %patch7 -p1 -b .move-conduits-code
 %patch8 -p1 -b .move-conduits-autotools
 %patch9 -p1 -b .defines
+
+# patches for pilot-link-0.12
+%if 0
 %patch11 -p0 -b .port-to-pilot-link-0.12
+%patch12 -p1 -b .include-pi-error
+%patch13 -p0 -b .backup_conduit_update
+%endif
 
 %patch16 -p0 -b .fix-xml-properties-leak
 %patch17 -p0 -b .backup-conduit-valgrind-fixes
-%patch18 -p0 -b .backup_conduit_update
 %patch19 -p0 -b .conduits_64bit
 
-%patch20 -p1 -b .include-pi-error
-
 %build
 autoreconf -i
 %configure
@@ -148,6 +151,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Apr 12 2006 Than Ngo <than at redhat.com> 2.0.13-5.fc4.1
+- rebuilt against pilot-link-0.11.8
+
 * Wed Jun 29 2005 David Malcolm <dmalcolm at redhat.com> - 2.0.13-5.fc4
 - Regenerate patch 18 with a fix for a crash in the backup conduit (would crash whenever no modifications had occurred since the last sync)
 - Fixed gnome-pilot-2.0.12-move-conduits-autotools.patch to set GNOME_PILOT_CONDUIT_SEARCH_PATH to libdir/gnome-pilot/conduits



From fedora-cvs-commits at redhat.com  Wed Apr 12 15:34:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 11:34:00 -0400
Subject: rpms/valgrind/devel valgrind-3.1.1-syscall-updates-from-trunk.patch,
	1.1, 1.2
Message-ID: <200604121534.k3CFY0OC009803@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/valgrind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9785

Modified Files:
	valgrind-3.1.1-syscall-updates-from-trunk.patch 
Log Message:
3.1.1-2


valgrind-3.1.1-syscall-updates-from-trunk.patch:
 m_syswrap/priv_syswrap-generic.h |    1 
 m_syswrap/priv_syswrap-linux.h   |   16 ++
 m_syswrap/syswrap-amd64-linux.c  |   20 +++
 m_syswrap/syswrap-generic.c      |   76 ++++-------
 m_syswrap/syswrap-linux.c        |  256 +++++++++++++++++++++++++++++++++++++++
 m_syswrap/syswrap-ppc32-linux.c  |   23 ++-
 m_syswrap/syswrap-x86-linux.c    |   59 ++++++++
 vki_unistd-amd64-linux.h         |   16 ++
 vki_unistd-x86-linux.h           |   16 ++
 9 files changed, 428 insertions(+), 55 deletions(-)

Index: valgrind-3.1.1-syscall-updates-from-trunk.patch
===================================================================
RCS file: /cvs/dist/rpms/valgrind/devel/valgrind-3.1.1-syscall-updates-from-trunk.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- valgrind-3.1.1-syscall-updates-from-trunk.patch	12 Apr 2006 15:25:26 -0000	1.1
+++ valgrind-3.1.1-syscall-updates-from-trunk.patch	12 Apr 2006 15:33:54 -0000	1.2
@@ -757,3 +757,51 @@
  };
  
  const UInt ML_(syscall_table_size) = 
+--- valgrind-3.1.1/coregrind/vki_unistd-x86-linux.h.jj	2006-02-20 10:16:42.000000000 -0500
++++ valgrind-3.1.1/coregrind/vki_unistd-x86-linux.h	2006-04-12 11:31:18.000000000 -0400
+@@ -323,5 +323,21 @@
+ #define __NR_inotify_init	291
+ #define __NR_inotify_add_watch	292
+ #define __NR_inotify_rm_watch	293
++#define __NR_migrate_pages	294
++#define __NR_openat		295
++#define __NR_mkdirat		296
++#define __NR_mknodat		297
++#define __NR_fchownat		298
++#define __NR_futimesat		299
++#define __NR_newfstatat		300
++#define __NR_unlinkat		301
++#define __NR_renameat		302
++#define __NR_linkat		303
++#define __NR_symlinkat		304
++#define __NR_readlinkat		305
++#define __NR_fchmodat		306
++#define __NR_faccessat		307
++#define __NR_pselect6		308
++#define __NR_ppoll		309
+ 
+ #endif /* __VKI_UNISTD_X86_LINUX_H */
+--- valgrind-3.1.1/coregrind/vki_unistd-amd64-linux.h.jj	2006-02-20 10:16:42.000000000 -0500
++++ valgrind-3.1.1/coregrind/vki_unistd-amd64-linux.h	2006-04-12 11:32:15.000000000 -0400
+@@ -332,5 +332,21 @@
+ #define __NR_inotify_init	253
+ #define __NR_inotify_add_watch	254
+ #define __NR_inotify_rm_watch	255
++#define __NR_migrate_pages	256
++#define __NR_openat		257
++#define __NR_mkdirat		258
++#define __NR_mknodat		259
++#define __NR_fchownat		260
++#define __NR_futimesat		261
++#define __NR_newfstatat		262
++#define __NR_unlinkat		263
++#define __NR_renameat		264
++#define __NR_linkat		265
++#define __NR_symlinkat		266
++#define __NR_readlinkat		267
++#define __NR_fchmodat		268
++#define __NR_faccessat		269
++#define __NR_pselect6		270
++#define __NR_ppoll		271
+ 
+ #endif /* __VKI_UNISTD_AMD64_LINUX_H */



From fedora-cvs-commits at redhat.com  Wed Apr 12 15:44:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 11:44:23 -0400
Subject: rpms/valgrind/devel valgrind-3.1.1-syscall-updates-from-trunk.patch,
	1.2, 1.3
Message-ID: <200604121544.k3CFiNJu010075@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/valgrind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10059

Modified Files:
	valgrind-3.1.1-syscall-updates-from-trunk.patch 
Log Message:
3.1.1-2


valgrind-3.1.1-syscall-updates-from-trunk.patch:
 m_syswrap/priv_syswrap-generic.h |    1 
 m_syswrap/priv_syswrap-linux.h   |   16 ++
 m_syswrap/syswrap-amd64-linux.c  |   20 +++
 m_syswrap/syswrap-generic.c      |   76 ++++-------
 m_syswrap/syswrap-linux.c        |  256 +++++++++++++++++++++++++++++++++++++++
 m_syswrap/syswrap-ppc32-linux.c  |   23 ++-
 m_syswrap/syswrap-x86-linux.c    |   59 ++++++++
 vki_unistd-amd64-linux.h         |   16 ++
 vki_unistd-x86-linux.h           |   16 ++
 9 files changed, 428 insertions(+), 55 deletions(-)

Index: valgrind-3.1.1-syscall-updates-from-trunk.patch
===================================================================
RCS file: /cvs/dist/rpms/valgrind/devel/valgrind-3.1.1-syscall-updates-from-trunk.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- valgrind-3.1.1-syscall-updates-from-trunk.patch	12 Apr 2006 15:33:54 -0000	1.2
+++ valgrind-3.1.1-syscall-updates-from-trunk.patch	12 Apr 2006 15:44:20 -0000	1.3
@@ -769,7 +769,7 @@
 +#define __NR_mknodat		297
 +#define __NR_fchownat		298
 +#define __NR_futimesat		299
-+#define __NR_newfstatat		300
++#define __NR_fstatat64		300
 +#define __NR_unlinkat		301
 +#define __NR_renameat		302
 +#define __NR_linkat		303



From fedora-cvs-commits at redhat.com  Wed Apr 12 16:07:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 12:07:06 -0400
Subject: rpms/valgrind/devel valgrind-3.1.1-syscall-updates.patch,1.1,1.2
Message-ID: <200604121607.k3CG76uL024229@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/valgrind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24210

Modified Files:
	valgrind-3.1.1-syscall-updates.patch 
Log Message:
3.1.1-2


valgrind-3.1.1-syscall-updates.patch:
 syswrap-amd64-linux.c |    4 -
 syswrap-generic.c     |    2 
 syswrap-ppc32-linux.c |  132 +++++++++++++++++++++++++-------------------------
 3 files changed, 69 insertions(+), 69 deletions(-)

Index: valgrind-3.1.1-syscall-updates.patch
===================================================================
RCS file: /cvs/dist/rpms/valgrind/devel/valgrind-3.1.1-syscall-updates.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- valgrind-3.1.1-syscall-updates.patch	12 Apr 2006 15:25:26 -0000	1.1
+++ valgrind-3.1.1-syscall-updates.patch	12 Apr 2006 16:06:31 -0000	1.2
@@ -294,3 +294,14 @@
     //   (__NR_swapon,            sys_swapon),         // 167 
     //   (__NR_swapoff,           sys_swapoff),        // 168 
     //   (__NR_reboot,            sys_reboot),         // 169 
+--- valgrind-3.1.1/coregrind/m_syswrap/syswrap-generic.c.jj10	2006-04-12 10:23:34.000000000 -0400
++++ valgrind-3.1.1/coregrind/m_syswrap/syswrap-generic.c	2006-04-12 12:04:23.000000000 -0400
+@@ -2877,7 +2877,7 @@ PRE(sys_ftruncate64)
+ #endif
+ 
+ // XXX: this wrapper is only suitable for 32-bit platforms
+-#if defined(VGP_x86_linux)
++#if defined(VGP_x86_linux) || defined(VGP_ppc32_linux)
+ PRE(sys_truncate64)
+ {
+    *flags |= SfMayBlock;



From fedora-cvs-commits at redhat.com  Wed Apr 12 17:10:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 13:10:57 -0400
Subject: rpms/perl-DBD-Pg/devel .cvsignore, 1.14, 1.15 perl-DBD-Pg.spec, 1.29,
	1.30 sources, 1.14, 1.15
Message-ID: <200604121710.k3CHAv93020343@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	.cvsignore perl-DBD-Pg.spec sources 
Log Message:
upgrade to 1.48


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-DBD-Pg/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	22 Mar 2006 21:06:08 -0000	1.14
+++ .cvsignore	12 Apr 2006 17:10:55 -0000	1.15
@@ -1,3 +1,4 @@
 DBD-Pg-1.43.tar.gz
 DBD-Pg-1.45.tar.gz
 DBD-Pg-1.47.tar.gz
+DBD-Pg-1.48.tar.gz


Index: perl-DBD-Pg.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBD-Pg/devel/perl-DBD-Pg.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- perl-DBD-Pg.spec	22 Mar 2006 21:06:08 -0000	1.29
+++ perl-DBD-Pg.spec	12 Apr 2006 17:10:55 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           perl-DBD-Pg
-Version:        1.47
-Release: 	1
+Version:        1.48
+Release: 	1.FC6
 Summary:        A PostgresSQL interface for perl
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Wed Apr 12 2006 Jason Vas Dias <jvdias at redhat.com> - 1.48-1
+- Upgrade to upstream version 1.48
+
 * Wed Mar 22 2006 Jason Vas Dias <jvdias at redhat.com> - 1.47-1
 - Upgrade to upstream version 1.47
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-DBD-Pg/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	22 Mar 2006 21:06:08 -0000	1.14
+++ sources	12 Apr 2006 17:10:55 -0000	1.15
@@ -1 +1 @@
-b469ce382b9f36acd7fe94a216d4dbc7  DBD-Pg-1.47.tar.gz
+77e56726219cccf2abb42f70c58b6eeb  DBD-Pg-1.48.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 12 17:32:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 13:32:54 -0400
Subject: rpms/perl-DBD-Pg/FC-5 .cvsignore, 1.14, 1.15 perl-DBD-Pg.spec, 1.29,
	1.30 sources, 1.14, 1.15
Message-ID: <200604121732.k3CHWsp4002367@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	.cvsignore perl-DBD-Pg.spec sources 
Log Message:
upgrade to 1.48


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-DBD-Pg/FC-5/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	22 Mar 2006 21:24:13 -0000	1.14
+++ .cvsignore	12 Apr 2006 17:31:43 -0000	1.15
@@ -1,3 +1,4 @@
 DBD-Pg-1.43.tar.gz
 DBD-Pg-1.45.tar.gz
 DBD-Pg-1.47.tar.gz
+DBD-Pg-1.48.tar.gz


Index: perl-DBD-Pg.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBD-Pg/FC-5/perl-DBD-Pg.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- perl-DBD-Pg.spec	22 Mar 2006 21:24:13 -0000	1.29
+++ perl-DBD-Pg.spec	12 Apr 2006 17:32:00 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           perl-DBD-Pg
-Version:        1.47
-Release: 	0.1.FC5
+Version:        1.48
+Release: 	1.FC5
 Summary:        A PostgresSQL interface for perl
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Wed Apr 12 2006 Jason Vas Dias <jvdias at redhat.com> - 1.48-1
+- Upgrade to upstream version 1.48
+
 * Wed Mar 22 2006 Jason Vas Dias <jvdias at redhat.com> - 1.47-1
 - Upgrade to upstream version 1.47
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-DBD-Pg/FC-5/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	22 Mar 2006 21:24:13 -0000	1.14
+++ sources	12 Apr 2006 17:32:01 -0000	1.15
@@ -1 +1 @@
-b469ce382b9f36acd7fe94a216d4dbc7  DBD-Pg-1.47.tar.gz
+77e56726219cccf2abb42f70c58b6eeb  DBD-Pg-1.48.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 12 18:09:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 14:09:17 -0400
Subject: rpms/perl-XML-Dumper/devel .cvsignore, 1.4, 1.5 perl-XML-Dumper.spec,
	1.11, 1.12 sources, 1.4, 1.5
Message-ID: <200604121809.k3CI9HbF016900@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	.cvsignore perl-XML-Dumper.spec sources 
Log Message:
upgrade to 0.81


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Dumper/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Nov 2005 10:38:00 -0000	1.4
+++ .cvsignore	12 Apr 2006 18:09:02 -0000	1.5
@@ -1,2 +1,3 @@
 XML-Dumper-0.71.tar.gz
 XML-Dumper-0.79.tar.gz
+XML-Dumper-0.81.tar.gz


Index: perl-XML-Dumper.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Dumper/devel/perl-XML-Dumper.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-XML-Dumper.spec	3 Feb 2006 21:24:14 -0000	1.11
+++ perl-XML-Dumper.spec	12 Apr 2006 18:09:03 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-XML-Dumper
-Version:        0.79
-Release: 	1.2
+Version:        0.81
+Release: 	1.FC6
 Summary:        Perl module for dumping Perl objects from/to XML
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Wed Apr 12 2006 Jason Vas Dias <jvdias at redhat.com> - 0.81-1
+- upgrade to 0.81
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 0.79-1.2
 - rebuild for new perl-5.8.8
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Dumper/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Nov 2005 10:38:00 -0000	1.4
+++ sources	12 Apr 2006 18:09:03 -0000	1.5
@@ -1 +1,2 @@
 d399034ff3cc94e03409d7602a657391  XML-Dumper-0.79.tar.gz
+10726bbe78bef5e4264d5f57533da7c1  XML-Dumper-0.81.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 12 18:17:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 14:17:27 -0400
Subject: rpms/perl-XML-Dumper/FC-5 .cvsignore, 1.4, 1.5 perl-XML-Dumper.spec,
	1.11, 1.12 sources, 1.4, 1.5
Message-ID: <200604121817.k3CIHRUt030964@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	.cvsignore perl-XML-Dumper.spec sources 
Log Message:
upgrade to 0.81


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Dumper/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Nov 2005 10:38:00 -0000	1.4
+++ .cvsignore	12 Apr 2006 18:17:24 -0000	1.5
@@ -1,2 +1,3 @@
 XML-Dumper-0.71.tar.gz
 XML-Dumper-0.79.tar.gz
+XML-Dumper-0.81.tar.gz


Index: perl-XML-Dumper.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Dumper/FC-5/perl-XML-Dumper.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-XML-Dumper.spec	3 Feb 2006 21:24:14 -0000	1.11
+++ perl-XML-Dumper.spec	12 Apr 2006 18:17:24 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-XML-Dumper
-Version:        0.79
-Release: 	1.2
+Version:        0.81
+Release: 	1.FC5
 Summary:        Perl module for dumping Perl objects from/to XML
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Wed Apr 12 2006 Jason Vas Dias <jvdias at redhat.com> - 0.81-1
+- upgrade to 0.81
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 0.79-1.2
 - rebuild for new perl-5.8.8
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Dumper/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Nov 2005 10:38:00 -0000	1.4
+++ sources	12 Apr 2006 18:17:24 -0000	1.5
@@ -1 +1,2 @@
 d399034ff3cc94e03409d7602a657391  XML-Dumper-0.79.tar.gz
+10726bbe78bef5e4264d5f57533da7c1  XML-Dumper-0.81.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 12 18:35:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 14:35:22 -0400
Subject: rpms/pirut/devel .cvsignore, 1.19, 1.20 pirut.spec, 1.20,
	1.21 sources, 1.20, 1.21
Message-ID: <200604121835.k3CIZMCg031261@cvs.devel.redhat.com>

Author: katzj

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	4 Mar 2006 00:56:47 -0000	1.19
+++ .cvsignore	12 Apr 2006 18:35:17 -0000	1.20
@@ -1 +1 @@
-pirut-1.0.1.tar.gz
+pirut-1.0.2.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/pirut.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- pirut.spec	4 Mar 2006 00:56:47 -0000	1.20
+++ pirut.spec	12 Apr 2006 18:35:17 -0000	1.21
@@ -2,14 +2,14 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 1.0.1
+Version: 1.0.2
 Release: 1
 License: GPL
 Group: Applications/System
 URL: http://fedoraproject.org
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: pygtk2, pygtk2-libglade, yum >= 2.5.3, comps-extras
+Requires: pygtk2, pygtk2-libglade, yum >= 2.5.3, comps-extras, rhpl
 Requires(post): desktop-file-utils >= 0.8
 Requires(postun): desktop-file-utils >= 0.8
 Obsoletes: system-config-packages, redhat-config-packages, pup
@@ -67,6 +67,17 @@
 
 
 %changelog
+* Wed Apr 12 2006 Jeremy Katz <katzj at redhat.com> - 1.0.2-1
+- Fix traceback with no groups defined (#186545)
+- Mark desktop files for translation (#188319)
+- Catch mirror error (#184326)
+- Change display name for package installer (#185169)
+- Improve progress bar updating a little
+- Require rhpl (#186796)
+- Add status bar and progress for searching from James Bowes (#186977)
+- Grab focus for search entry by default (#187597)
+- Give better error message about no network (#188529)
+
 * Fri Mar  3 2006 Jeremy Katz <katzj at redhat.com> - 1.0.1-1
 - Ensure we unlock things on exit (#183882)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	4 Mar 2006 00:56:47 -0000	1.20
+++ sources	12 Apr 2006 18:35:17 -0000	1.21
@@ -1 +1 @@
-b628cc41256fa48dfb77c54085823eb6  pirut-1.0.1.tar.gz
+00016ba9e89dcd61274f9597824dd2f2  pirut-1.0.2.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 12 18:42:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 14:42:18 -0400
Subject: rpms/rpm/devel rpm-4.4.2-doxy.patch,NONE,1.1 rpm.spec,1.197,1.198
Message-ID: <200604121842.k3CIgIWj031432@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31416

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.4.2-doxy.patch 
Log Message:
Resurrect doxygen (#187714)

rpm-4.4.2-doxy.patch:
 Doxyfile.in |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE rpm-4.4.2-doxy.patch ---
--- rpm-4.4.2/Doxyfile.in.doxy	2006-04-12 14:36:03.000000000 -0400
+++ rpm-4.4.2/Doxyfile.in	2006-04-12 14:36:15.000000000 -0400
@@ -599,7 +599,6 @@
                          @top_srcdir@/python/rpmte-py.h \
                          @top_srcdir@/python/rpmts-py.c \
                          @top_srcdir@/python/rpmts-py.h \
-                         @top_srcdir@/tools/dump.c \
                          @top_srcdir@/tools/dumpdb.c \
                          @top_srcdir@/tools/javadeps.c \
                          @top_srcdir@/tools/rpmcache.c \


Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- rpm.spec	11 Apr 2006 14:42:04 -0000	1.197
+++ rpm.spec	12 Apr 2006 18:42:16 -0000	1.198
@@ -20,7 +20,7 @@
 %define version 4.4.2
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 17
+Release: 18
 Group: System Environment/Base
 Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz
 Source1: mono-find-provides
@@ -48,6 +48,7 @@
 Patch20: rpm-4.4.2-netsharedpath.patch
 Patch21: rpm-4.4.2-userlock.patch
 Patch22: rpm-4.4.2-vercmp.patch
+Patch23: rpm-4.4.2-doxy.patch
 License: GPL
 Conflicts: patch < 2.5
 %ifos linux
@@ -180,6 +181,7 @@
 %patch20 -p1 -b .netsharedpath
 %patch21 -p1 -b .userlock
 %patch22 -p1 -b .vercmp
+%patch23 -p1 -b .doxy
 
 %build
 
@@ -572,6 +574,9 @@
 %{__includedir}/popt.h
 
 %changelog
+* Wed Apr 12 2006 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-18
+- Resurrect doxygen (#187714)
+
 * Tue Apr 11 2006 Jeremy Katz <katzj at redhat.com> - 4.4.2-17
 - remove redundant elfutils-libelf buildrequires
 - rpm-python doesn't require elfutils (related to #188495)



From fedora-cvs-commits at redhat.com  Wed Apr 12 20:10:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 16:10:18 -0400
Subject: rpms/tog-pegasus/devel pegasus-2.5.1-redhat-config.patch,1.4,1.5
Message-ID: <200604122010.k3CKAIxC009883@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9867

Modified Files:
	pegasus-2.5.1-redhat-config.patch 
Log Message:
disable stripping

pegasus-2.5.1-redhat-config.patch:
 Makefile.Release     |    6 +++---
 env_var_Linux.status |   14 +++++++-------
 mak/config-linux.mak |    3 ++-
 3 files changed, 12 insertions(+), 11 deletions(-)

Index: pegasus-2.5.1-redhat-config.patch
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/pegasus-2.5.1-redhat-config.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pegasus-2.5.1-redhat-config.patch	11 Apr 2006 19:57:55 -0000	1.4
+++ pegasus-2.5.1-redhat-config.patch	12 Apr 2006 20:10:15 -0000	1.5
@@ -1,5 +1,5 @@
 --- pegasus/env_var_Linux.status.redhat-config	2006-03-15 20:33:51.000000000 -0500
-+++ pegasus/env_var_Linux.status	2006-04-11 15:56:29.000000000 -0400
++++ pegasus/env_var_Linux.status	2006-04-12 13:46:18.000000000 -0400
 @@ -18,7 +18,9 @@
  PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
  endif
@@ -47,7 +47,7 @@
       $(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)/cimxml.socket
  
 --- pegasus/Makefile.Release.redhat-config	2006-01-30 11:16:16.000000000 -0500
-+++ pegasus/Makefile.Release	2006-04-11 15:47:08.000000000 -0400
++++ pegasus/Makefile.Release	2006-04-12 13:46:18.000000000 -0400
 @@ -590,10 +590,10 @@
  	$(foreach i, $(MANAGEDSYSTEM_MOF_FILES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus/$(i);)
  
@@ -70,3 +70,15 @@
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
  	@$(ECHO-E) "%config(noreplace) $(PEGASUS_CONFIG_DIR)/access.conf" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+--- pegasus/mak/config-linux.mak.redhat-config	2006-02-07 16:03:57.000000000 -0500
++++ pegasus/mak/config-linux.mak	2006-04-12 16:06:26.000000000 -0400
+@@ -118,7 +118,8 @@
+ ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS 
+   FLAGS += -g
+ else
+-  FLAGS += -s
++#  FLAGS += -s
++#  ^= let rpm handle stripping
+   #
+   # The -fno-enforce-eh-specs is not available in 2.9.5 and it probably
+   # appeared in the 3.0 series of compilers.



From fedora-cvs-commits at redhat.com  Wed Apr 12 20:42:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 16:42:43 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server-1.0.99.901-cow-fix.patch,
	NONE, 1.1 xorg-x11-server.spec, 1.53, 1.54
Message-ID: <200604122042.k3CKghan025139@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.0.99.901-cow-fix.patch 
Log Message:
* Wed Apr 12 2006 Kristian H??gsberg <krh at redhat.com> 1.0.99.901-3
- Add xorg-x11-server-1.0.99.901-cow-fix.patch to fix crash when
  releasing the COW.


xorg-x11-server-1.0.99.901-cow-fix.patch:
 compext.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xorg-x11-server-1.0.99.901-cow-fix.patch ---
diff -u -r1.6 -r1.6.2.1
--- composite/compext.c	2006/03/13 21:59:55	1.6
+++ composite/compext.c	2006/04/10 15:01:30	1.6.2.1
@@ -501,7 +501,7 @@
 	return BadMatch;
     }
 
-    deleteCompOverlayClient(pOc, pOc->pScreen);
+    FreeResource(pOc->resource, 0);
 
     cs = GetCompScreen(pScreen);
     if (cs->pOverlayClients == NULL) {


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- xorg-x11-server.spec	12 Apr 2006 00:14:32 -0000	1.53
+++ xorg-x11-server.spec	12 Apr 2006 20:42:41 -0000	1.54
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.0.99.901
-Release:   2
+Release:   3
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -22,8 +22,9 @@
 Patch6:    xserver-1.0.1-randr-sdk.patch
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=181292.  hacky patch
 Patch7:    xorg-x11-server-1.0.1-fpic-libxf86config.patch
-# REMOVE ME FOR 1.0.99.3
-#Patch8:	   xorg-x11-server-1.0.99.2-no-kdrive-dri.patch
+
+# REMOVE ME FOR 1.0.99.902
+Patch8:	   xorg-x11-server-1.0.99.901-cow-fix.patch
 
 # Spiffiffity feature/optimization patches.
 Patch100:  xorg-server-1.0.99.2-spiffiffity.patch
@@ -258,7 +259,7 @@
 %patch4 -p0 -b .composite-fastpath-fdo4320
 %patch6 -p1 -b .randrsdk
 %patch7 -p1 -b .xf86configfpic
-#%patch8 -p0 -b .no-kdrive-dri
+%patch8 -p0 -b .cow-fix
 
 %patch100 -p0 -b .spiffiffity
 
@@ -565,6 +566,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Wed Apr 12 2006 Kristian H??gsberg <krh at redhat.com> 1.0.99.901-3
+- Add xorg-x11-server-1.0.99.901-cow-fix.patch to fix crash when
+  releasing the COW.
+
 * Tue Apr 11 2006 Kristian H??gsberg <krh at redhat.com> 1.0.99.901-2
 - Bump for fc5 build.
 



From fedora-cvs-commits at redhat.com  Wed Apr 12 20:52:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 16:52:33 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.54,1.55
Message-ID: <200604122052.k3CKqXTU006759@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Wed Apr 12 2006 Kristian H??gsberg <krh at redhat.com> 1.0.99.901-4
- Bump for rawhide build.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- xorg-x11-server.spec	12 Apr 2006 20:42:41 -0000	1.54
+++ xorg-x11-server.spec	12 Apr 2006 20:52:30 -0000	1.55
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.0.99.901
-Release:   3
+Release:   4
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -566,6 +566,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Wed Apr 12 2006 Kristian H??gsberg <krh at redhat.com> 1.0.99.901-4
+- Bump for rawhide build.
+
 * Wed Apr 12 2006 Kristian H??gsberg <krh at redhat.com> 1.0.99.901-3
 - Add xorg-x11-server-1.0.99.901-cow-fix.patch to fix crash when
   releasing the COW.



From fedora-cvs-commits at redhat.com  Wed Apr 12 21:09:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 17:09:59 -0400
Subject: rpms/system-config-printer/devel pycups-threads.patch, NONE,
	1.1 system-config-printer.spec, NONE, 1.1 Makefile, 1.1,
	1.2 sources, 1.59, 1.60 printconf.spec, 1.62, NONE
Message-ID: <200604122109.k3CL9xJI006966@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	Makefile sources 
Added Files:
	pycups-threads.patch system-config-printer.spec 
Removed Files:
	printconf.spec 
Log Message:
New code base.

pycups-threads.patch:
 ChangeLog        |    5 +++++
 cupsconnection.c |    3 +++
 2 files changed, 8 insertions(+)

--- NEW FILE pycups-threads.patch ---
--- pycups-1.9.6/cupsconnection.c.threads	2006-04-03 11:53:05.000000000 +0100
+++ pycups-1.9.6/cupsconnection.c	2006-04-07 12:21:48.000000000 +0100
@@ -80,9 +80,12 @@
   if (!PyArg_ParseTupleAndKeywords (args, kwds, "", kwlist))
     return -1;
 
+  Py_BEGIN_ALLOW_THREADS;
   self->http = httpConnectEncrypt (cupsServer (),
 				   ippPort (),
 				   cupsEncryption ());
+  Py_END_ALLOW_THREADS;
+
   if (!self->http) {
     PyErr_SetString (PyExc_RuntimeError, "httpConnectionEncrypt failed");
     return -1;
--- pycups-1.9.6/ChangeLog.threads	2006-04-04 17:26:35.000000000 +0100
+++ pycups-1.9.6/ChangeLog	2006-04-07 12:21:48.000000000 +0100
@@ -0,0 +1,5 @@
+2006-04-07  Tim Waugh  <twaugh at redhat.com>
+
+	* cupsconnection.c (Connection_init): Allow threads during
+	httpConnectEncrypt().
+


--- NEW FILE system-config-printer.spec ---
%define pycups_version 1.9.6

Summary: A printer administration tool
Name: system-config-printer
Version: 0.7.3
Release: 1
License: GPL
Group: System Environment/Base
Source0: system-config-printer-%{version}.tar.bz2
Source1: pycups-%{pycups_version}.tar.bz2

Patch0: pycups-threads.patch

%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}

BuildRequires: cups-devel, python-devel
PreReq: python, python-abi = %{pyver}
PreReq: rhpl >= 0.81
BuildRoot: %{_tmppath}/%{name}-%{version}-root

Requires: pygtk2 >= 2.4.0, pygtk2-libglade

%description
system-config-mouse is a graphical user interface that allows
the user to configure a CUPS print server.

%prep
%setup -q -a 1
pushd pycups-%{pycups_version}
%patch0 -p1 -b .threads
popd

%build
pushd pycups-%{pycups_version}
make
popd

%install
rm -rf $RPM_BUILD_ROOT
pushd pycups-%{pycups_version}
make install DESTDIR=%buildroot
popd

mkdir -p %buildroot%{_datadir}/%{name}
mkdir -p %buildroot%{_bindir}
install -m0644 *.py %buildroot%{_datadir}/%{name}/
install -m0644 *.glade %buildroot%{_datadir}/%{name}/
chmod 755 %buildroot%{_datadir}/%{name}/%{name}.py
install -m0755 %{name} %buildroot%{_bindir}/

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc --parents pycups-%{pycups_version}/{ChangeLog,README,NEWS,TODO}
%doc ChangeLog README NEWS TODO
%{_libdir}/python*/*/*.so
%{_bindir}/%{name}
%{_datadir}/%{name}

%changelog
* Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com> 0.7.3-1
- Added threads patch from pycups CVS.
- Updated to system-config-printer-0.7.3.

* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com>
- Updated to pycups-1.9.6.

* Fri Mar 24 2006 Tim Waugh <twaugh at redhat.com>
- Updated to pycups-1.9.5.

* Fri Mar 17 2006 Tim Waugh <twaugh at redhat.com>
- Package the actual system-config-printer command.

* Thu Mar 16 2006 Tim Waugh <twaugh at redhat.com> 0.7.1-1
- Include s-c-printer tarball.
- Updated to pycups-1.9.4.

* Wed Mar 15 2006 Tim Waugh <twaugh at redhat.com> 0.7.0-1
- Initial spec file.




Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	14 Feb 2006 12:56:40 -0000	1.59
+++ sources	12 Apr 2006 21:09:45 -0000	1.60
@@ -1 +1,2 @@
-845ddb531b137b91a39f40070f6cf305  printconf-0.6.151.tar.bz2
+da787f94813be62db0ed29c51da7839e  pycups-1.9.6.tar.bz2
+854de918e3cf8201f98e54d314cd0ef1  system-config-printer-0.7.3.tar.bz2


--- printconf.spec DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 12 21:11:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 17:11:31 -0400
Subject: rpms/system-config-printer/devel .cvsignore, 1.57, 1.58 sources,
	1.60, 1.61 system-config-printer.spec, 1.1, 1.2
Message-ID: <200604122111.k3CLBVwR007023@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore sources system-config-printer.spec 
Log Message:
* Wed Apr 12 2006 Tim Waugh <twaugh at redhat.com> 0.7.4-1
- Updated to system-config-printer-0.7.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	14 Feb 2006 12:56:40 -0000	1.57
+++ .cvsignore	12 Apr 2006 21:11:29 -0000	1.58
@@ -37,3 +37,4 @@
 printconf-0.6.149.tar.bz2
 printconf-0.6.150.tar.bz2
 printconf-0.6.151.tar.bz2
+system-config-printer-0.7.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	12 Apr 2006 21:09:45 -0000	1.60
+++ sources	12 Apr 2006 21:11:29 -0000	1.61
@@ -1,2 +1,2 @@
 da787f94813be62db0ed29c51da7839e  pycups-1.9.6.tar.bz2
-854de918e3cf8201f98e54d314cd0ef1  system-config-printer-0.7.3.tar.bz2
+360a4428142d4cde6366509878c5cb32  system-config-printer-0.7.4.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- system-config-printer.spec	12 Apr 2006 21:09:45 -0000	1.1
+++ system-config-printer.spec	12 Apr 2006 21:11:29 -0000	1.2
@@ -2,7 +2,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.3
+Version: 0.7.4
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -60,6 +60,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Wed Apr 12 2006 Tim Waugh <twaugh at redhat.com> 0.7.4-1
+- Updated to system-config-printer-0.7.4.
+
 * Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com> 0.7.3-1
 - Added threads patch from pycups CVS.
 - Updated to system-config-printer-0.7.3.



From fedora-cvs-commits at redhat.com  Wed Apr 12 21:43:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 17:43:39 -0400
Subject: rpms/metacity/FC-5 metacity-2.14.2-strict.patch, NONE,
	1.1 metacity.spec, 1.65, 1.66
Message-ID: <200604122143.k3CLhdKw021493@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	metacity.spec 
Added Files:
	metacity-2.14.2-strict.patch 
Log Message:
- Make strict focus mode optional (off by default), bug 326159


metacity-2.14.2-strict.patch:
 common.h            |    6 +++++
 display.h           |   11 +++++-----
 metacity.schemas.in |   17 ++++++++++++++++
 prefs.c             |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 prefs.h             |    2 +
 window.c            |    9 +++++---
 6 files changed, 92 insertions(+), 8 deletions(-)

--- NEW FILE metacity-2.14.2-strict.patch ---
--- metacity-2.14.0/src/prefs.h.focus-new-windows	2006-03-03 18:34:22.000000000 +0000
+++ metacity-2.14.0/src/prefs.h	2006-03-25 11:11:22.000000000 +0000
@@ -31,6 +31,7 @@ typedef enum
 {
   META_PREF_MOUSE_BUTTON_MODS,
   META_PREF_FOCUS_MODE,
+  META_PREF_FOCUS_NEW_WINDOWS,
   META_PREF_RAISE_ON_CLICK,
   META_PREF_ACTION_DOUBLE_CLICK_TITLEBAR,
   META_PREF_AUTO_RAISE,
@@ -68,6 +69,7 @@ const char* meta_preference_to_string (M
 
 MetaVirtualModifier         meta_prefs_get_mouse_button_mods  (void);
 MetaFocusMode               meta_prefs_get_focus_mode         (void);
+MetaFocusNewWindows         meta_prefs_get_focus_new_windows  (void);
 gboolean                    meta_prefs_get_raise_on_click     (void);
 const char*                 meta_prefs_get_theme              (void);
 /* returns NULL if GTK default should be used */
--- metacity-2.14.0/src/common.h.focus-new-windows	2006-01-21 19:15:47.000000000 +0000
+++ metacity-2.14.0/src/common.h	2006-03-25 11:00:43.000000000 +0000
@@ -153,6 +153,12 @@ typedef enum
 
 typedef enum
 {
+  META_FOCUS_NEW_WINDOWS_SMART,
+  META_FOCUS_NEW_WINDOWS_STRICT
+} MetaFocusNewWindows;
+
+typedef enum
+{
   META_ACTION_DOUBLE_CLICK_TITLEBAR_TOGGLE_SHADE,
   META_ACTION_DOUBLE_CLICK_TITLEBAR_TOGGLE_MAXIMIZE,
   META_ACTION_DOUBLE_CLICK_TITLEBAR_MINIMIZE,
--- metacity-2.14.0/src/metacity.schemas.in.focus-new-windows	2006-03-03 18:34:22.000000000 +0000
+++ metacity-2.14.0/src/metacity.schemas.in	2006-03-25 10:54:01.000000000 +0000
@@ -67,6 +67,23 @@
     </schema>
 
     <schema>
+      <key>/schemas/apps/metacity/general/focus_new_windows</key>
+      <applyto>/apps/metacity/general/focus_new_windows</applyto>
+      <owner>metacity</owner>
+      <type>string</type>
+      <default>smart</default>
+      <locale name="C">
+         <short>Control how new windows get focus</short>
+         <long>
+          This option provides additional control over how newly created
+          windows get focus.  It has two possible values; "smart" applies
+          the user's normal focus mode, and "strict" results in windows
+          started from a terminal not being given focus.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
       <key>/schemas/apps/metacity/general/raise_on_click</key>
       <applyto>/apps/metacity/general/raise_on_click</applyto>
       <owner>metacity</owner>
--- metacity-2.14.0/src/window.c.focus-new-windows	2006-03-13 22:35:25.000000000 +0000
+++ metacity-2.14.0/src/window.c	2006-03-25 11:25:30.000000000 +0000
@@ -1771,15 +1771,16 @@ window_state_on_map (MetaWindow *window,
       return;
     }
 
-  /* Terminal usage is different; users typically intend to launch
+  /* Terminal usage may be different; some users intend to launch
    * many apps in quick succession or to just view things in the new
-   * window while still interacting with the terminal.  Therefore,
+   * window while still interacting with the terminal.  In that case,
    * apps launched from the terminal should not take focus.  This
    * isn't quite the same as not allowing focus to transfer from
    * terminals due to new window map, but the latter is a much easier
    * approximation to enforce so we do that.
    */
   if (*takes_focus &&
+      meta_prefs_get_focus_new_windows () == META_FOCUS_NEW_WINDOWS_STRICT &&
       !window->display->allow_terminal_deactivation &&
       __window_is_terminal (window->display->focus_window) &&
       !meta_window_is_ancestor_of_transient (window->display->focus_window,
@@ -7888,7 +7889,9 @@ meta_window_set_user_time (MetaWindow *w
       /* If this is a terminal, user interaction with it means the user likely
        * doesn't want to have focus transferred for now due to new windows.
        */
-      if (__window_is_terminal (window))
+      if (meta_prefs_get_focus_new_windows () ==
+               META_FOCUS_NEW_WINDOWS_STRICT &&
+          __window_is_terminal (window))
         window->display->allow_terminal_deactivation = FALSE;
     }
 }
--- metacity-2.14.0/src/display.h.focus-new-windows	2006-01-30 17:18:03.000000000 +0000
+++ metacity-2.14.0/src/display.h	2006-03-25 11:10:21.000000000 +0000
@@ -204,11 +204,12 @@ struct _MetaDisplay
    */
   guint mouse_mode : 1;
 
-  /* Helper var for strict focus for terminals; only relevant if the focus
-   * window is a terminal.  Typically, we don't allow new windows to take
-   * focus away from a terminal, but if the user explicitly did something
-   * that should allow a different window to gain focus (e.g. global
-   * keybinding or clicking on a dock), then we will allow the transfer.
+  /* Helper var for strict focus for terminals; only relevant in strict
+   * new window focus mode and if the focus window is a terminal.  In that
+   * case, we don't allow new windows to take focus away from a terminal,
+   * but if the user explicitly did something that should allow a different
+   * window to gain focus (e.g. global keybinding or clicking on a dock),
+   * then we will allow the transfer.
    */
   guint allow_terminal_deactivation : 1;
 
--- metacity-2.14.0/src/prefs.c.focus-new-windows	2006-03-03 18:34:22.000000000 +0000
+++ metacity-2.14.0/src/prefs.c	2006-03-25 11:00:18.000000000 +0000
@@ -42,6 +42,7 @@
  */
 #define KEY_MOUSE_BUTTON_MODS "/apps/metacity/general/mouse_button_modifier"
 #define KEY_FOCUS_MODE "/apps/metacity/general/focus_mode"
+#define KEY_FOCUS_NEW_WINDOWS "/apps/metacity/general/focus_new_windows"
 #define KEY_RAISE_ON_CLICK "/apps/metacity/general/raise_on_click"
 #define KEY_ACTION_DOUBLE_CLICK_TITLEBAR "/apps/metacity/general/action_double_click_titlebar"
 #define KEY_AUTO_RAISE "/apps/metacity/general/auto_raise"
@@ -82,6 +83,7 @@ static gboolean use_system_font = FALSE;
 static PangoFontDescription *titlebar_font = NULL;
 static MetaVirtualModifier mouse_button_mods = Mod1Mask;
 static MetaFocusMode focus_mode = META_FOCUS_MODE_CLICK;
+static MetaFocusNewWindows focus_new_windows = META_FOCUS_NEW_WINDOWS_SMART;
 static gboolean raise_on_click = TRUE;
 static char* current_theme = NULL;
 static int num_workspaces = 4;
@@ -126,6 +128,7 @@ static gboolean update_use_system_font  
 static gboolean update_titlebar_font      (const char *value);
 static gboolean update_mouse_button_mods  (const char *value);
 static gboolean update_focus_mode         (const char *value);
+static gboolean update_focus_new_windows  (const char *value);
 static gboolean update_raise_on_click     (gboolean    value);
 static gboolean update_theme              (const char *value);
 static gboolean update_visual_bell        (gboolean v1, gboolean v2);
@@ -375,6 +378,12 @@ meta_prefs_init (void)
   update_focus_mode (str_val);
   g_free (str_val);  
 
+  str_val = gconf_client_get_string (default_client, KEY_FOCUS_NEW_WINDOWS,
+                                     &err);
+  cleanup_error (&err);
+  update_focus_new_windows (str_val);
+  g_free (str_val);  
+
   if (get_bool (KEY_RAISE_ON_CLICK, &bool_val))
     update_raise_on_click (bool_val);
   
@@ -583,6 +592,22 @@ change_notify (GConfClient    *client,
       if (update_focus_mode (str))
         queue_changed (META_PREF_FOCUS_MODE);
     }
+  else if (strcmp (key, KEY_FOCUS_NEW_WINDOWS) == 0)
+    {
+      const char *str;
+
+      if (value && value->type != GCONF_VALUE_STRING)
+        {
+          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+                        KEY_FOCUS_NEW_WINDOWS);
+          goto out;
+        }
+      
+      str = value ? gconf_value_get_string (value) : NULL;
+
+      if (update_focus_new_windows (str))
+        queue_changed (META_PREF_FOCUS_NEW_WINDOWS);
+    }
   else if (strcmp (key, KEY_RAISE_ON_CLICK) == 0)
     {
       gboolean b;
@@ -1022,6 +1047,27 @@ update_focus_mode (const char *value)
 
 #ifdef HAVE_GCONF
 static gboolean
+update_focus_new_windows (const char *value)
+{
+  MetaFocusNewWindows old_mode = focus_new_windows;
+  
+  if (value != NULL)
+    {
+      if (g_ascii_strcasecmp (value, "smart") == 0)
+        focus_new_windows = META_FOCUS_NEW_WINDOWS_SMART;
+      else if (g_ascii_strcasecmp (value, "strict") == 0)
+        focus_new_windows = META_FOCUS_NEW_WINDOWS_STRICT;
+      else
+        meta_warning (_("GConf key '%s' is set to an invalid value\n"),
+                      KEY_FOCUS_NEW_WINDOWS);
+    }
+
+  return (old_mode != focus_new_windows);
+}
+#endif /* HAVE_GCONF */
+
+#ifdef HAVE_GCONF
+static gboolean
 update_raise_on_click (gboolean value)
 {
   gboolean old = raise_on_click;
@@ -1078,6 +1124,12 @@ meta_prefs_get_focus_mode (void)
   return focus_mode;
 }
 
+MetaFocusNewWindows
+meta_prefs_get_focus_new_windows (void)
+{
+  return focus_new_windows;
+}
+
 gboolean
 meta_prefs_get_raise_on_click (void)
 {
@@ -1573,6 +1625,9 @@ meta_preference_to_string (MetaPreferenc
     case META_PREF_FOCUS_MODE:
       return "FOCUS_MODE";
 
+    case META_PREF_FOCUS_NEW_WINDOWS:
+      return "FOCUS_NEW_WINDOWS";
+
     case META_PREF_RAISE_ON_CLICK:
       return "RAISE_ON_CLICK";
       


Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/FC-5/metacity.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- metacity.spec	11 Apr 2006 03:22:16 -0000	1.65
+++ metacity.spec	12 Apr 2006 21:43:37 -0000	1.66
@@ -7,7 +7,7 @@
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 1.fc5.1
+Release: 1.fc5.2
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
 Source0: metacity-%{metacity_version}.tar.bz2
 Source1: libcm-%{libcm_version}.0.%{libcm_snapshot_date}.tar.bz2
@@ -37,6 +37,7 @@
 Patch1: metacity-2.13.144-bling.patch
 Patch2: metacity-2.13.89.0.2006.02.16-static-cm.patch
 Patch3: metacity-2.13.89.0.2006.02.16-fix-type.patch
+Patch4: metacity-2.14.2-strict.patch
 
 %description
 
@@ -51,6 +52,7 @@
 %patch1 -p1 -b .bling
 %patch2 -p1 -b .static-cm
 %patch3 -p1 -b .fix-type
+%patch4 -p1 -b .strict
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -142,6 +144,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Apr 12 2006 Ray Strode <rstrode at redhat.com> - 2.14.2-1.fc5.2
+- Make strict focus mode optional (off by default), bug 326159
+
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1.fc5.1
 - Update to 2.14.2
 



From fedora-cvs-commits at redhat.com  Wed Apr 12 22:15:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 18:15:40 -0400
Subject: rpms/gdm/devel gdm-2.14.1-change-defaults.patch, 1.1, 1.2 gdm.spec,
	1.145, 1.146
Message-ID: <200604122215.k3CMFeS3003653@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3616

Modified Files:
	gdm-2.14.1-change-defaults.patch gdm.spec 
Log Message:
- fix libexecdir substitution problem in configuration file


gdm-2.14.1-change-defaults.patch:
 gdm.conf.in |   51 +++++++++++++++++++++++++++++----------------------
 1 files changed, 29 insertions(+), 22 deletions(-)

Index: gdm-2.14.1-change-defaults.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.14.1-change-defaults.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-2.14.1-change-defaults.patch	11 Apr 2006 13:28:05 -0000	1.1
+++ gdm-2.14.1-change-defaults.patch	12 Apr 2006 22:15:36 -0000	1.2
@@ -9,7 +9,7 @@
 -#Greeter=@libexecdir@/gdmlogin
 +# The greeter for local (non-xdmcp) logins.  Change gdmgreeter to gdmlogin to
 +# get the boring greeter.
-+Greeter=@EXPANDED_LIBEXECDIR@/gdmgreeter
++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


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- gdm.spec	11 Apr 2006 20:47:21 -0000	1.145
+++ gdm.spec	12 Apr 2006 22:15:36 -0000	1.146
@@ -15,7 +15,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.14.1
-Release: 3
+Release: 4
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -318,6 +318,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Wed Apr 12 2006 Ray Strode <rstrode at redhat.com> - 1:2.14.1-4
+- fix libexecdir substitution problem in configuration file
+
 * Tue Apr 11 2006 Ray Strode <rstrode at redhat.com> - 1:2.14.1-3
 - Add gdmthemetester.in to the mix (upstream bug 338079)
 



From fedora-cvs-commits at redhat.com  Wed Apr 12 22:35:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 18:35:05 -0400
Subject: rpms/gdm/FC-5 gdm-2.14.1-change-defaults.patch, 1.1, 1.2 gdm.spec,
	1.144, 1.145
Message-ID: <200604122235.k3CMZ4pv017845@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gdm-2.14.1-change-defaults.patch gdm.spec 
Log Message:
- Fix libexecdir substitution bug in config file


gdm-2.14.1-change-defaults.patch:
 gdm.conf.in |   51 +++++++++++++++++++++++++++++----------------------
 1 files changed, 29 insertions(+), 22 deletions(-)

Index: gdm-2.14.1-change-defaults.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/FC-5/gdm-2.14.1-change-defaults.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-2.14.1-change-defaults.patch	11 Apr 2006 13:57:59 -0000	1.1
+++ gdm-2.14.1-change-defaults.patch	12 Apr 2006 22:34:59 -0000	1.2
@@ -9,7 +9,7 @@
 -#Greeter=@libexecdir@/gdmlogin
 +# The greeter for local (non-xdmcp) logins.  Change gdmgreeter to gdmlogin to
 +# get the boring greeter.
-+Greeter=@EXPANDED_LIBEXECDIR@/gdmgreeter
++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


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/FC-5/gdm.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- gdm.spec	11 Apr 2006 21:05:01 -0000	1.144
+++ gdm.spec	12 Apr 2006 22:34:59 -0000	1.145
@@ -15,7 +15,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.14.1
-Release: 1.fc5.1
+Release: 1.fc5.2
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -318,6 +318,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Wed Apr 12 2006 Ray Strode <rstrode at redhat.com> - 1:2.14.1-1.fc5.2
+- Fix libexecdir substitution bug in config file
+
 * Tue Apr 11 2006 Ray Strode <rstrode at redhat.com> - 1:2.14.1-1.fc5.1
 - Update to 2.14.1
 - fixes CVE-2006-1057 (bug 188303)



From fedora-cvs-commits at redhat.com  Wed Apr 12 23:10:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 19:10:54 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2130,1.2131
Message-ID: <200604122310.k3CNAsM0032065@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Log Message:
add missing include dirs to kernel-devel


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2130
retrieving revision 1.2131
diff -u -r1.2130 -r1.2131
--- kernel-2.6.spec	12 Apr 2006 18:56:31 -0000	1.2130
+++ kernel-2.6.spec	12 Apr 2006 23:10:38 -0000	1.2131
@@ -1178,7 +1178,7 @@
     rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*/*.o
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
     cd include
-    cp -a acpi config linux math-emu media net pcmcia rxrpc scsi sound video asm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
+    cp -a acpi config keys linux math-emu media mtd net pcmcia rdma rxrpc scsi sound video asm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
     cp -a `readlink asm` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
     if [ "$Arch" = "x86_64" ]; then
       cp -a asm-i386 $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
@@ -1670,6 +1670,9 @@
 %endif
 
 %changelog
+* Wed Apr 12 2006 David Woodhouse <dwmw2 at redhat.com>
+- Add include/{mtd,rdma,keys} directories to kernel-devel package
+
 * Tue Apr 11 2006 Dave Jones <davej at redhat.com>
 - 2.6.17rc1-git4
 



From fedora-cvs-commits at redhat.com  Wed Apr 12 23:22:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Apr 2006 19:22:22 -0400
Subject: rpms/perl/devel perl-5.8.8-bz188441.patch,NONE,1.1
Message-ID: <200604122322.k3CNMMmh013740@cvs.devel.redhat.com>

Author: jvdias

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

Added Files:
	perl-5.8.8-bz188441.patch 
Log Message:
fix for bug bz188441: url(-relative=>1) must use $request_uri instead of $script_name if $rewrite_in_use, as does url(-absolute=>1)

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

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



From fedora-cvs-commits at redhat.com  Thu Apr 13 07:26:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 03:26:59 -0400
Subject: rpms/net-tools/devel net-tools-1.60-x25-proc.patch, NONE,
	1.1 net-tools.spec, 1.63, 1.64
Message-ID: <200604130726.k3D7Qxgn009007@cvs.devel.redhat.com>

Author: rvokal

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

Modified Files:
	net-tools.spec 
Added Files:
	net-tools-1.60-x25-proc.patch 
Log Message:
- fix wrong definition of _PATH_PROCNET_X25_ROUTE (#188786)

net-tools-1.60-x25-proc.patch:
 pathnames.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE net-tools-1.60-x25-proc.patch ---
--- net-tools-1.60/lib/pathnames.h.orig	2006-04-12 22:14:07.943885000 -0400
+++ net-tools-1.60/lib/pathnames.h	2006-04-12 22:19:34.072430000 -0400
@@ -42,8 +42,8 @@
 #define _PATH_PROCNET_RARP		"/proc/net/rarp"
 #define _PATH_ETHERS			"/etc/ethers"
 #define _PATH_PROCNET_ROSE_ROUTE	"/proc/net/rose_routes"
-#define _PATH_PROCNET_X25              "/proc/net/x25"
-#define _PATH_PROCNET_X25_ROUTE                "/proc/net/x25_routes"
+#define _PATH_PROCNET_X25		"/proc/net/x25"
+#define _PATH_PROCNET_X25_ROUTE		"/proc/net/x25/route"
 #define _PATH_PROCNET_DEV_MCAST		"/proc/net/dev_mcast"
 
 /* pathname for the netlink device */


Index: net-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/net-tools/devel/net-tools.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- net-tools.spec	6 Apr 2006 14:27:45 -0000	1.63
+++ net-tools.spec	13 Apr 2006 07:26:57 -0000	1.64
@@ -62,6 +62,7 @@
 Patch48: net-tools-1.60-netstat_inode.patch
 Patch49: net-tools-1.60-fgets.patch
 Patch50: net-tools-1.60-ifconfig_man.patch
+Patch51: net-tools-1.60-x25-proc.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 Requires(post,preun): chkconfig
@@ -120,6 +121,7 @@
 %patch48 -p1 -b .inode
 %patch49 -p1 -b .fgets
 %patch50 -p1 -b .inet_addr
+%patch51 -p1 -b .x25
 
 cp %SOURCE2 ./config.h
 cp %SOURCE3 ./config.make
@@ -231,6 +233,9 @@
 %{_sysconfdir}/rc.d/init.d/netplugd
 
 %changelog
+* Thu Apr 13 2006 Radek Vok??l <rvokal at redhat.com> - 1.60-67
+- fix wrong definition of _PATH_PROCNET_X25_ROUTE (#188786)
+
 * Thu Apr 06 2006 Radek Vok??l <rvokal at redhat.com> - 1.60-66
 - add note about -T to netstat
 



From fedora-cvs-commits at redhat.com  Thu Apr 13 07:27:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 03:27:51 -0400
Subject: rpms/net-tools/devel net-tools.spec,1.64,1.65
Message-ID: <200604130727.k3D7Rpeb009060@cvs.devel.redhat.com>

Author: rvokal

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

Modified Files:
	net-tools.spec 
Log Message:
release++


Index: net-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/net-tools/devel/net-tools.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- net-tools.spec	13 Apr 2006 07:26:57 -0000	1.64
+++ net-tools.spec	13 Apr 2006 07:27:49 -0000	1.65
@@ -3,7 +3,7 @@
 Summary: Basic networking tools.
 Name: net-tools
 Version: 1.60
-Release: 66
+Release: 67
 License: GPL
 Group: System Environment/Base
 Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 13 08:18:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 04:18:09 -0400
Subject: rpms/kdebase/devel kdebase-3.5.2-1-redhat.patch, NONE,
	1.1 kdebase.spec, 1.162, 1.163 kdebase-3.5.2-redhat.patch, 1.1, NONE
Message-ID: <200604130818.k3D8I99V005327@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.2-1-redhat.patch 
Removed Files:
	kdebase-3.5.2-redhat.patch 
Log Message:
fix startkde to look in /usr and /etc/kde for env/ and shutdown/


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

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


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- kdebase.spec	3 Apr 2006 21:45:35 -0000	1.162
+++ kdebase.spec	13 Apr 2006 08:18:07 -0000	1.163
@@ -20,7 +20,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.2
-Release: 2
+Release: 3
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -37,7 +37,7 @@
 Source7: mailsettings.cc
 
 Patch0: kde-libtool.patch
-Patch1: kdebase-3.5.2-redhat.patch
+Patch1: kdebase-3.5.2-1-redhat.patch
 Patch2: kdebase-3.3.92-vroot.patch
 Patch3: kdebase-3.x-shortcuts.patch
 Patch4: kdebase-3.2.0-keymap.patch
@@ -422,6 +422,9 @@
 %{_includedir}/kde/ksplash/*
 
 %changelog
+* Thu Apr 13 2006 Than Ngo <than at redhat.com> 6:3.5.2-3
+- fix startkde to look in /usr and /etc/kde for env/ and shutdown/
+
 * Mon Apr 03 2006 Than Ngo <than at redhat.com> 6:3.5.2-2
 - update dbus patch
 


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



From fedora-cvs-commits at redhat.com  Thu Apr 13 08:46:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 04:46:46 -0400
Subject: rpms/udev/devel udev-089-last_modalias.patch, NONE,
	1.1 udev-089-nopie.patch, NONE, 1.1 udev-089.tar.bz2.sign,
	NONE, 1.1 .cvsignore, 1.32, 1.33 sources, 1.32,
	1.33 start_udev, 1.51, 1.52 udev-rules.patch, 1.11,
	1.12 udev.spec, 1.162, 1.163 upstream, 1.4, 1.5
Message-ID: <200604130846.k3D8kkZx014138@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12981

Modified Files:
	.cvsignore sources start_udev udev-rules.patch udev.spec 
	upstream 
Added Files:
	udev-089-last_modalias.patch udev-089-nopie.patch 
	udev-089.tar.bz2.sign 
Log Message:
- version 089
- do not force loading of parport_pc (bug #186850)
- manually load snd-powermac (bug #176761)
- added usb floppy symlink (bug #185171)
- start_udev uses udevtrigger now instead of udevstart


udev-089-last_modalias.patch:
 udevtrigger.c |   41 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 41 insertions(+)

--- NEW FILE udev-089-last_modalias.patch ---
--- udev-089/udevtrigger.c.last_modalias	2006-04-03 14:41:10.000000000 +0200
+++ udev-089/udevtrigger.c	2006-04-13 08:11:59.000000000 +0200
@@ -30,6 +30,7 @@
 #include <syslog.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <fnmatch.h>
 
 #include "udev.h"
 
@@ -67,10 +68,46 @@
 	NULL
 };
 
+/* list of devices whose modaliases we should run last */
+static char *last_modalias_list[] = {
+	"pci:v*d*sv*sd*bc0Csc03i*",	/* USB controller */
+	"pci:v*d*sv*sd*bc0Csc00i10*",	/* Firewire controller */
+	NULL,
+};
+
+
 LIST_HEAD(device_first_list);
 LIST_HEAD(device_default_list);
 LIST_HEAD(device_last_list);
 
+
+static int modalias_is_greylisted(const char *path)
+{
+
+	char filename[PATH_SIZE];
+	char alias[PATH_SIZE];
+	int fd, i;
+	
+	snprintf(filename,sizeof(filename),"%s/%s/modalias", sysfs_path, path);
+	filename[sizeof(filename)-1] = '\0';
+	
+	fd = open(filename, O_RDONLY);
+	if (fd == -1)
+		return 0;
+	read(fd,alias,PATH_SIZE);
+	alias[sizeof(alias)-1] = '\0';
+	alias[strlen(alias)-1] = '\0';
+	
+	for (i = 0; last_modalias_list[i] != NULL; i++)
+		if (!fnmatch(last_modalias_list[i], alias, 0)) {
+			close(fd);
+			return 1;
+		}
+
+	close(fd);
+	return 0;
+}
+
 static int device_list_insert(const char *path)
 {
 	struct list_head *device_list = &device_default_list;
@@ -87,6 +124,10 @@
 			device_list = &device_last_list;
 			break;
 		}
+		if (modalias_is_greylisted(path)) {
+			device_list = &device_last_list;
+			break;
+		}
 	}
 
 	dbg("add '%s'" , path);

udev-089-nopie.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE udev-089-nopie.patch ---
--- udev-089/extras/volume_id/lib/Makefile.nopie	2006-04-12 15:03:07.000000000 +0200
+++ udev-089/extras/volume_id/lib/Makefile	2006-04-12 15:03:19.000000000 +0200
@@ -78,7 +78,7 @@
 
 $(SHLIB): $(HEADERS) .shlib $(addprefix .shlib/,$(OBJS))
 	$(E) "  CC      " $@
-	$(Q) $(CC) -shared $(CFLAGS) -o $@ \
+	$(Q) $(LD) -shared -o $@ \
 		-Wl,-soname,libvolume_id.so.$(SHLIB_CUR),--version-script,exported_symbols \
 		$(addprefix .shlib/,$(OBJS))
 	$(Q) ln -sf $@ libvolume_id.so.$(SHLIB_CUR)


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

iD8DBQBEMVclyGugalF9Dw4RAkuzAJ9u9BKZ86Pv/KLYSK5bJyhXACMCEACdFEjl
e0bVNMtNCImQEiK8abUsIQw=
=Gyt7
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	7 Feb 2006 11:06:12 -0000	1.32
+++ .cvsignore	13 Apr 2006 08:46:43 -0000	1.33
@@ -1 +1 @@
-udev-084.tar.bz2
+udev-089.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	7 Feb 2006 11:06:14 -0000	1.32
+++ sources	13 Apr 2006 08:46:43 -0000	1.33
@@ -1 +1 @@
-143b3691ae5e6f96995e5749894f78e4  udev-084.tar.bz2
+ed2d885527da9c5f72abd9a43cb1af98  udev-089.tar.bz2


Index: start_udev
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/start_udev,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- start_udev	21 Feb 2006 19:35:08 -0000	1.51
+++ start_udev	13 Apr 2006 08:46:43 -0000	1.52
@@ -166,7 +166,7 @@
 	echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
 	/sbin/udevd -d
 	ret=$[$ret + $?]
-	/sbin/udevstart
+	/sbin/udevtrigger
 	ret=$[$ret + $?]
 	wait_for_queue
 	ret=$[$ret + $?]

udev-rules.patch:
 50-udev.rules |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

Index: udev-rules.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- udev-rules.patch	6 Mar 2006 15:35:13 -0000	1.11
+++ udev-rules.patch	13 Apr 2006 08:46:43 -0000	1.12
@@ -1,318 +1,46 @@
---- udev-084/etc/udev/redhat/hotplug.rules.rhrules	2006-01-30 08:51:38.000000000 +0100
-+++ udev-084/etc/udev/redhat/hotplug.rules	2006-03-06 13:55:18.000000000 +0100
-@@ -1,8 +1,15 @@
- # do not call hotplug.d and dev.d for "drivers" and "module" events
--SUBSYSTEM=="drivers",	OPTIONS="last_rule"
--SUBSYSTEM=="module",	OPTIONS="last_rule"
-+SUBSYSTEM=="drivers",   GOTO="hotplug_end"
-+SUBSYSTEM=="module",    GOTO="hotplug_end"
-+ACTION="add",           GOTO="hotplug_comp"
-+ACTION="remove",        GOTO="hotplug_comp"
- 
-+GOTO="hotplug_end"
-+
-+LABEL="hotplug_comp"
- # compatibility support for the obsolete hotplug.d and dev.d directories
--ENV{UDEVD_EVENT}=="1",	RUN+="/lib/udev/udev_run_hotplugd"
-+ENV{UDEVD_EVENT}=="1",  RUN+="/lib/udev/udev_run_hotplugd"
- RUN+="/lib/udev/udev_run_devd"
- 
-+
-+LABEL="hotplug_end"
---- /dev/null	2006-02-15 18:27:05.942547250 +0100
-+++ udev-084/etc/udev/redhat/95-pam-console.rules	2006-03-06 13:55:18.000000000 +0100
-@@ -0,0 +1 @@
-+ACTION=="add", SYSFS{dev}="?*", KERNEL=="?*", RUN+="/sbin/pam_console_apply $env{DEVNAME} $env{DEVLINKS}"
---- /dev/null	2006-02-15 18:27:05.942547250 +0100
-+++ udev-084/etc/udev/redhat/05-udev-early.rules	2006-03-06 13:55:18.000000000 +0100
-@@ -0,0 +1,9 @@
-+# sysfs is populated after the event is sent
-+ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
-+ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
-+
-+# ignore these events until someone needs them
-+SUBSYSTEM=="drivers",		OPTIONS="ignore_device"
-+SUBSYSTEM=="module",		OPTIONS="ignore_device"
-+
-+ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", RUN="/sbin/firmware_helper", OPTIONS="last_rule"
---- udev-084/etc/udev/redhat/udev.rules.rhrules	2006-01-30 08:51:38.000000000 +0100
-+++ udev-084/etc/udev/redhat/udev.rules	2006-03-06 14:56:28.000000000 +0100
-@@ -3,47 +3,52 @@
- #
- # default is OWNER="root" GROUP="root", MODE="0600"
- #
--KERNEL="*", OWNER="root" GROUP="root", MODE="0600"
-+
-+KERNEL=="*", OWNER="root" GROUP="root", MODE="0600"
- 
- # all block devices
- SUBSYSTEM=="block",		GROUP="disk", MODE="0640"
- KERNEL=="root",			GROUP="disk", MODE="0640"
- 
- # console devices
--KERNEL=="tty",			MODE="0666", OPTIONS="last_rule"
--KERNEL=="console",		MODE="0600", OPTIONS="last_rule"
--KERNEL=="tty[0-9]",		GROUP="tty", MODE="0660", OPTIONS="last_rule"
--KERNEL=="tty[0-9][0-9]*",	GROUP="tty", MODE="0660", OPTIONS="last_rule"
--KERNEL=="vc/[0-9]*",		GROUP="tty", MODE="0660", OPTIONS="last_rule"
-+KERNEL=="tty",			NAME="%k", GROUP="tty", MODE="0666", OPTIONS="last_rule"
-+KERNEL=="console",              NAME="%k", MODE="0600", OPTIONS="last_rule"
-+KERNEL=="tty[0-9]*",            NAME="%k", GROUP="tty", MODE="0660", OPTIONS="last_rule"
-+KERNEL=="vc/[0-9]*",		NAME="%k", GROUP="tty", MODE="0660", OPTIONS="last_rule"
- 
- # pty devices
- #  Set this to 0660 if you only want users belonging to tty group
- #  to be able to allocate PTYs
--KERNEL=="ptmx",			GROUP="tty", MODE="0666", OPTIONS="last_rule"
--KERNEL=="pty[p-za-e][0-9a-f]*",	GROUP="tty", MODE="0660", OPTIONS="last_rule"
--KERNEL=="tty[p-za-e][0-9a-f]*",	GROUP="tty", MODE="0660", OPTIONS="last_rule"
--KERNEL=="pty/m*",		GROUP="tty", MODE="0660", OPTIONS="last_rule"
--KERNEL=="vc/s*",		GROUP="tty", MODE="0660", OPTIONS="last_rule"
-+KERNEL=="ptmx",                 NAME="%k", GROUP="tty", MODE="666", OPTIONS="last_rule"
-+KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty", MODE="660", OPTIONS="last_rule"
-+KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty", MODE="660", OPTIONS="last_rule"
-+KERNEL=="pty/m*",		NAME="%k", GROUP="tty", MODE="0660", OPTIONS="last_rule"
- 
- # serial+dialup devices
--KERNEL=="ttyS*",		GROUP="uucp", MODE="0660", OPTIONS="last_rule"
--KERNEL=="ttyACM*",		GROUP="uucp", MODE="0660", OPTIONS="last_rule"
--KERNEL=="ttyUSB*",		GROUP="uucp", MODE="0660", OPTIONS="last_rule"
--KERNEL=="ippp*",		MODE="0660"
--KERNEL=="isdn*",		MODE="0660"
--KERNEL=="isdnctrl*",		MODE="0660"
--KERNEL=="capi*",		MODE="0660"
--KERNEL=="dcbri*",		MODE="0660"
--KERNEL=="ircomm*",		GROUP="uucp", MODE="0660"
--KERNEL=="tts/[0-9]*",		GROUP="uucp", MODE="0660"
--KERNEL=="tts/USB[0-9]*",	GROUP="uucp", MODE="0660"
-+KERNEL=="ippp*",		NAME="%k", MODE="0660"
-+KERNEL=="isdn*",		NAME="%k", MODE="0660"
-+KERNEL=="isdnctrl*",		NAME="%k", MODE="0660"
-+KERNEL=="capi*",		NAME="%k", MODE="0660"
-+KERNEL=="dcbri*",		NAME="%k", MODE="0660"
-+KERNEL=="ircomm*",		NAME="%k", GROUP="uucp", MODE="0660"
-+KERNEL=="tts/[0-9]*",		NAME="%k", GROUP="uucp", MODE="0660"
-+KERNEL=="tts/USB[0-9]*",	NAME="%k", GROUP="uucp", MODE="0660"
-+KERNEL=="tty[A-Z]*",            NAME="%k", GROUP="uucp", MODE="0660"
-+KERNEL=="pppox*",               NAME="%k", GROUP="uucp", MODE="0660"
-+KERNEL=="ircomm*",              NAME="%k", GROUP="uucp", MODE="0660"
-+KERNEL=="modems/mwave*",        NAME="%k", GROUP="uucp", MODE="0660"
-+KERNEL=="hvc*",                 NAME="%k", GROUP="uucp", MODE="0660"
-+KERNEL=="hvsi*",                NAME="%k", GROUP="uucp", MODE="0660"
-+KERNEL=="iseries/vtty*",        NAME="%k", GROUP="uucp", MODE="0660"
-+KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", SYMLINK+="pilot"
-+KERNEL=="ttyUSB*", SYSFS{product}=="palmOne Handheld*", SYMLINK+="pilot"
- 
- # vc devices
--KERNEL=="vcs",			OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
--KERNEL=="vcs[0-9]*",		OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
--KERNEL=="vcsa",			OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
--KERNEL=="vcsa[0-9]*",		OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
--KERNEL=="vcc/*",		OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
-+KERNEL=="vcs",			NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
-+KERNEL=="vcs[0-9]*",		NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
-+KERNEL=="vcsa",			NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
-+KERNEL=="vcsa[0-9]*",		NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
-+KERNEL=="vcc/*",		NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
- 
- # memory devices
- KERNEL=="random",		MODE="0666", OPTIONS="last_rule"
-@@ -54,6 +59,8 @@
- KERNEL=="full",			MODE="0666", OPTIONS="last_rule"
- KERNEL=="null",			MODE="0666", OPTIONS="last_rule"
- KERNEL=="zero",			MODE="0666", OPTIONS="last_rule"
-+# 183 = /dev/hwrng        Generic random number generator
-+KERNEL=="hw_random",            NAME="hwrng", SYMLINK+="%k"
- 
- # misc devices
- KERNEL=="nvram",		MODE="0660"
-@@ -61,6 +68,10 @@
- 
- # floppy devices
- KERNEL=="fd[01]*",		GROUP="floppy", MODE="0660"
-+# fix floppy devices
-+KERNEL=="nvram", ACTION=="add", RUN+="load_floppy_module.sh"
-+KERNEL=="fd[0-9]*", ACTION=="add", SYSFS{device/cmos}=="*", RUN+="create_floppy_devices -c -t $sysfs{device/cmos} -m %M /dev/%k"
-+KERNEL=="fd[0-9]*", ACTION=="remove", RUN+="/bin/sh -c 'rm -f /dev/%k*'"
- 
- # audio devices
- KERNEL=="dsp*",			MODE="0660"
-@@ -131,7 +142,7 @@
- # dri devices
- KERNEL=="nvidia*",		MODE="0660"
- KERNEL=="3dfx*",		MODE="0660"
--KERNEL=="dri/*",		MODE="0666"
-+KERNEL=="card[0-9]*",		NAME="dri/%k", MODE="0666"
- 
- # usb devices
- KERNEL=="usb/dabusb*",		MODE="0660"
-@@ -142,16 +153,14 @@
- KERNEL=="z90crypt",		MODE="0666"
- 
- # DVB
--KERNEL=="dvb/*",		MODE="0660"
- KERNEL=="dvb",			MODE="0660"
--KERNEL=="dvb/adapter*",		MODE="0660"
-+SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", \
-+	NAME="%c", MODE="0660"
- 
- # create a symlink named after the device map name
- # note devmap_name comes with extras/multipath
- #KERNEL=="dm-[0-9]*", PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK+="%c"
- 
--# DRI devices always go into a subdirectory (as per the LSB spec)
--KERNEL=="card*",		NAME="dri/card%n"
- 
- # alsa devices
- KERNEL=="controlC[0-9]*",	NAME="snd/%k"
-@@ -179,8 +188,8 @@
- BUS=="usb", KERNEL=="lp[0-9]*",	NAME="usb/%k"
- 
- KERNEL=="microcode",		NAME="cpu/%k"
--KERNEL="msr[0-9]*",     	NAME="cpu/%n/msr"
--KERNEL="cpu[0-9]*",     	NAME="cpu/%n/cpuid"
-+KERNEL=="msr[0-9]*",     	NAME="cpu/%n/msr"
-+KERNEL=="cpu[0-9]*",     	NAME="cpu/%n/cpuid"
- 
- KERNEL=="ram1",			SYMLINK+="ram"
- KERNEL=="video0",		SYMLINK+="video"
-@@ -203,13 +212,12 @@
- KERNEL=="device-mapper",	NAME="mapper/control"
- 
- # old compat symlinks with enumeration
--KERNEL=="sr[0-9]*",		SYMLINK+="cdrom%e"
--KERNEL=="scd[0-9]*",		SYMLINK+="cdrom%e"
--KERNEL=="pcd[0-9]*",		SYMLINK+="cdrom%e"
--KERNEL=="fd[0-9]*",		SYMLINK+="floppy%e"
--KERNEL=="nst[0-9]", BUS=="scsi", 	SYMLINK+="tape%e", MODE="0660"
--KERNEL=="nosst[0-9]", BUS=="scsi", 	SYMLINK+="tape%e", MODE="0660"
--KERNEL=="sg[0-9]*", BUS="scsi", SYSFS{type}=="6", SYMLINK+="scanner%e", MODE="0660"
-+KERNEL=="sr[0-9]*",		SYMLINK+="cdrom cdrom-%k"
-+KERNEL=="scd[0-9]*",		SYMLINK+="cdrom cdrom-%k"
-+KERNEL=="pcd[0-9]*",		SYMLINK+="cdrom cdrom-%k"
-+KERNEL=="fd[0-9]*",		SYMLINK+="floppy-%k"
-+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"
-@@ -221,27 +229,30 @@
- KERNEL=="zappseudo",  		NAME="zap/pseudo"
- KERNEL=="zap[0-9]*",  		NAME="zap/%n"
- 
--BUS=="scsi", KERNEL=="sg[0-9]*", SYSFS{type}=="6", NAME="%k", SYMLINK="scanner%e", MODE="0660"
-+KERNEL=="pktcdvd", NAME="%k/control"
-+
-+
- 
--# do not seperate the next 2 lines!!
--KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/lib/udev/ide-media.sh %k", RESULT=="floppy", SYMLINK+="floppy%e", NAME{ignore_remove, all_partitions}="%k"
-+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", \
-+	SYSFS{device/media}=="floppy", \
-+	SYMLINK+="floppy floppy-%k", OPTIONS+="ignore_remove, all_partitions"
- 
--KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", RESULT=="cdrom", SYMLINK+="cdrom%e"
-+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", SYSFS{device/media}=="cdrom", SYMLINK+="cdrom cdrom-%k"
- 
--KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/lib/udev/check-cdrom.sh %k DVD", SYMLINK+="dvd%e"
--KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/lib/udev/check-cdrom.sh %k DVD", SYMLINK+="dvd%e"
-+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd dvd-%k"
-+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd dvd-%k"
- 
--KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/lib/udev/check-cdrom.sh %k CD-R", SYMLINK+="cdwriter%e"
--KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/lib/udev/check-cdrom.sh %k CD-R", SYMLINK+="cdwriter%e"
-+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter cdwriter-%k cdrw cdrw-%k"
-+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter cdwriter-%k cdrw cdrw-%k"
- 
--KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM="/lib/udev/check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter%e"
--KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/lib/udev/check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter%e"
-+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter dvdwriter-%k dvdrw dvdrw-%k"
-+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter dvdwriter-%k dvdrw dvdrw-%k"
- 
- # rename sr* to scd*
- KERNEL=="sr[0-9]*", BUS=="scsi", NAME="scd%n"
--KERNEL=="hd[a-z]*", BUS=="ide", SYSFS{removable}=="1", NAME{ignore_remove}="%k"
-+KERNEL=="hd*[0-9]", BUS=="ide", SYSFS{../removable}=="1", \
-+	OPTIONS+="ignore_remove"
- 
--KERNEL=="dvb*", PROGRAM=="/lib/udev/dvb.sh %k", NAME="%c"
- 
- #######################################
- # Persistent block device stuff - begin
-@@ -256,7 +267,8 @@
- KERNEL=="ram*|loop*|fd*|nbd*", GOTO="persistent_end"
- 
- # never access removable ide devices, the drivers are causing event loops on open()
--BUS=="ide", DRIVER!="ide-cdrom", SYSFS{removable}="1", GOTO="persistent_end"
-+BUS=="ide", DRIVER!="ide-cdrom", SYSFS{removable}=="1",	GOTO="persistent_end"
-+BUS=="ide", KERNEL=="hd*[0-9]", SYSFS{../removable}=="1", GOTO="persistent_end"
+--- udev-089/etc/udev/redhat/50-udev.rules.rhrules	2006-04-12 15:27:32.000000000 +0200
++++ udev-089/etc/udev/redhat/50-udev.rules	2006-04-12 15:29:35.000000000 +0200
+@@ -271,15 +271,15 @@
+ BUS=="ide", KERNEL=="hd*[0-9]", SYSFS{../removable}=="1", GOTO="persistent_end"
  
  # by-id (hardware serial number)
- KERNEL=="hd*[!0-9]", IMPORT{program}="/sbin/ata_id --export $tempnode"
-@@ -297,37 +309,43 @@
- # Persistent block device stuff - end
- #####################################
- 
--ACTION=="add", SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'X=%k X=$${X#usbdev} B=$${X%%%%.*} D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c"
-+ACTION=="add", SUBSYSTEM=="usb_device", \
-+	PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", \
-+	NAME="%c", MODE="0644"
- 
-+ACTION=="add", SUBSYSTEM=="?*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
- 
--# Perhaps this should just be for all subsystems?
--
--ACTION=="add", SUBSYSTEM=="pci", MODALIAS=="*", \
--	RUN+="/sbin/modprobe $modalias"
--ACTION=="add", SUBSYSTEM=="usb", MODALIAS=="*", \
--	RUN+="/sbin/modprobe $modalias"
--ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="*", \
--	RUN+="/sbin/modprobe $modalias"
--ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="*", \
-+ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="*", \
-         RUN+="/bin/sh -c 'echo 1 > /sys/$DEVPATH/allow_func_id_match'"
- 
--ACTION=="add", SUBSYSTEM=="ieee1394", MODALIAS=="*", \
--	RUN+="/sbin/modprobe $modalias"
-+# sd:           0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
-+# sr:           4 TYPE_WORM, 5 TYPE_ROM
-+# st/osst:      1 TYPE_TAPE
-+# sg: 		8 changer, [36] scanner
-+ACTION=="add", SUBSYSTEM="scsi" , SYSFS{type}=="0|7|14", \
-+	RUN+="/bin/sh -c 'echo 60 > /sys$$DEVPATH/timeout'"
-+ACTION=="add", SUBSYSTEM="scsi" , SYSFS{type}=="1", \
-+	RUN+="/bin/sh -c 'echo 900 > /sys$$DEVPATH/timeout'"
- 
--ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[07]", \
--	RUN+="/sbin/modprobe sd_mod"
--ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="14", \
-+
-+ACTION=="add", SUBSYSTEM=="scsi_device"	RUN+="/sbin/modprobe sg"
-+ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="0|7|14", \
- 	RUN+="/sbin/modprobe sd_mod"
--ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[45]", \
-+ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="[45]", \
- 	RUN+="/sbin/modprobe sr_mod"
--ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="On[sS]tream", \
-+
-+ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", SYSFS{type}=="[36]", \
-+	SYMLINK+="scanner scanner-%k", MODE="0660"
-+
-+ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", SYSFS{type}=="8", \
-+	SYMLINK+="changer changer-%k", MODE="0660", GROUP="disk"
-+
-+ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="1", SYSFS{device/vendor}=="On[sS]tream", \
- 	SYSFS{model}!="ADR*", RUN+="/sbin/modprobe osst"
--ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="On[sS]tream", \
-+ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="1", SYSFS{device/vendor}=="On[sS]tream", \
- 	SYSFS{model}=="ADR*", RUN+="/sbin/modprobe st"
--ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}!="On[sS]tream", \
-+ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="1", SYSFS{device/vendor}!="On[sS]tream", \
- 	RUN+="/sbin/modprobe st"
--ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[23689]", \
--	RUN+="/sbin/modprobe sg"
+-KERNEL=="hd*[!0-9]", IMPORT{program}="/sbin/ata_id --export $tempnode"
++KERNEL=="hd*[!0-9]", IMPORT{program}="/lib/udev/ata_id --export $tempnode"
+ KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}"
+ KERNEL=="hd*[0-9]", IMPORT{parent}=="ID_*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n"
+ 
+ KERNEL=="sd*[!0-9]|sr*", SYSFS{ieee1394_id}=="*", ENV{ID_SERIAL}="$sysfs{ieee1394_id}", ENV{ID_BUS}="ieee1394"
+-KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/sbin/usb_id -x"
+-KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/sbin/scsi_id -g -x -s %p -d $tempnode"
+-KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/sbin/scsi_id -g -x -a -s %p -d $tempnode"
+-KERNEL=="dasd*[!0-9]", IMPORT{program}="/sbin/dasd_id --export $tempnode"
++KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/usb_id -x"
++KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -s %p -d $tempnode"
++KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -a -s %p -d $tempnode"
++KERNEL=="dasd*[!0-9]", IMPORT{program}="/lib/udev/dasd_id --export $tempnode"
+ KERNEL=="sd*[!0-9]|sr*|dasd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
+ 
+ # for partitions import parent information
+@@ -287,19 +287,19 @@
+ KERNEL=="sd*[0-9]|dasd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
+ 
+ # by-path (shortest physical path)
+-KERNEL=="*[!0-9]|sr*", ENV{ID_TYPE}=="?*", IMPORT{program}="/sbin/path_id %p", SYMLINK+="disk/by-path/$env{ID_PATH}"
++KERNEL=="*[!0-9]|sr*", ENV{ID_TYPE}=="?*", IMPORT{program}="/lib/udev/path_id %p", SYMLINK+="disk/by-path/$env{ID_PATH}"
+ KERNEL=="sr*", GOTO="persistent_end"
+ KERNEL=="*[0-9]", IMPORT{parent}=="ID_*"
+ KERNEL=="*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"
+ 
+ # by-label/by-uuid (filesystem properties)
+ KERNEL=="*[!0-9]", SYSFS{removable}=="1", GOTO="persistent_end"
+-IMPORT{program}="/sbin/vol_id --export $tempnode"
++IMPORT{program}="/lib/udev/vol_id --export $tempnode"
+ ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
+ ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
+ 
+ # BIOS Enhanced Disk Device
+-KERNEL=="*[!0-9]", IMPORT{program}="/sbin/edd_id --export $tempnode"
++KERNEL=="*[!0-9]", IMPORT{program}="/lib/udev/edd_id --export $tempnode"
+ KERNEL=="*[!0-9]", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}"
+ KERNEL=="*[0-9]", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}-part%n"
  
--ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", \
--        RUN+="/sbin/firmware_helper"
-+RUN+="socket:/org/kernel/udev/monitor"
-+


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- udev.spec	8 Mar 2006 10:14:43 -0000	1.162
+++ udev.spec	13 Apr 2006 08:46:43 -0000	1.163
@@ -4,8 +4,8 @@
 
 Summary: A userspace implementation of devfs
 Name: udev
-Version: 084
-Release: 13
+Version: 089
+Release: 1
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -19,10 +19,12 @@
 
 Patch1: udev-permconv.patch
 Patch2: udev-rules.patch
-Patch3: udevstart2.patch
+#Patch3: udevstart2.patch
 Patch4: udev-084-floppy.patch
 Patch5: udev-extras.patch
 Patch6: udev-084-pg.patch
+Patch7: udev-089-nopie.patch
+Patch8: udev-089-last_modalias.patch
 
 ExclusiveOS: Linux
 URL: http://kernel.org/pub/linux/utils/kernel/hotplug/
@@ -44,10 +46,12 @@
 %setup -q  
 %patch1 -p1 -b .rhpermconv
 %patch2 -p1 -b .rhrules
-%patch3 -p1 -b .rhudevstart
+#%patch3 -p1 -b .rhudevstart
 %patch4 -p1 -b .rhfloppy
 %patch5 -p1 -b .rhextras
 %patch6 -p1 -b .pg
+%patch7 -p1 -b .nopie
+%patch8 -p1 -b .last_modalias
 
 %build
 
@@ -64,6 +68,7 @@
         extras/ata_id \
         extras/usb_id \
         extras/edd_id \
+        extras/path_id \
         extras/volume_id \
 %ifarch s390 s390x
         extras/dasd_id \
@@ -74,12 +79,14 @@
 mv extras/scsi_id/scsi_id extras/scsi_id/scsi_id.static
 mv extras/ata_id/ata_id extras/ata_id/ata_id.static
 mv extras/edd_id/edd_id extras/edd_id/edd_id.static
+mv extras/path_id/path_id extras/path_id/path_id.static
 %ifarch s390 s390x
 	mv extras/dasd_id/dasd_id extras/dasd_id/dasd_id.static
 %endif
 mv extras/usb_id/usb_id extras/usb_id/usb_id.static
 mv extras/volume_id/vol_id extras/volume_id/vol_id.static
 make clean
+make E='@echo' Q='@' -C extras/volume_id/lib clean
 
 make CC="gcc $RPM_OPT_FLAGS -fpie -pie" LDFLAGS="-pie" \
         USE_KLIBC=false \
@@ -111,11 +118,13 @@
 mv extras/scsi_id/scsi_id.static extras/scsi_id/scsi_id
 mv extras/ata_id/ata_id.static extras/ata_id/ata_id
 mv extras/edd_id/edd_id.static extras/edd_id/edd_id
+mv extras/path_id/path_id.static extras/path_id/path_id
 %ifarch s390 s390x
 	mv extras/dasd_id/dasd_id.static extras/dasd_id/dasd_id
 %endif
 mv extras/usb_id/usb_id.static extras/usb_id/usb_id
 mv extras/volume_id/vol_id.static extras/volume_id/vol_id
+touch extras/volume_id/vol_id
 
 make DESTDIR=$RPM_BUILD_ROOT install \
 	EXTRAS="	\
@@ -123,6 +132,7 @@
         extras/ata_id \
 	extras/usb_id \
 	extras/edd_id \
+	extras/path_id \
 	extras/volume_id \
 %ifarch s390 s390x
 	extras/dasd_id \
@@ -140,10 +150,10 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/{default,block}
 
 install -m 0644 etc/udev/redhat/05-udev-early.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/05-udev-early.rules
-install -m 0644 etc/udev/redhat/udev.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/50-udev.rules
+install -m 0644 etc/udev/redhat/50-udev.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/50-udev.rules
 install -m 0644 etc/udev/redhat/95-pam-console.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/95-pam-console.rules
 # Backwards compat
-install -m 0644 etc/udev/redhat/hotplug.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/51-hotplug.rules
+install -m 0644 etc/udev/redhat/51-hotplug.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/51-hotplug.rules
 
 install -m 0644 etc/udev/udev.conf $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.conf
 
@@ -162,19 +172,27 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/udev
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/sbin/start_udev
-install -m 0644 extras/path_id $RPM_BUILD_ROOT/sbin/path_id
+#install -m 0644 extras/path_id/path_id $RPM_BUILD_ROOT/sbin/path_id
 install -m 0755 firmware_helper $RPM_BUILD_ROOT/sbin
-install -m 0755 udevstart $RPM_BUILD_ROOT/sbin
+#install -m 0755 udevtrigger $RPM_BUILD_ROOT/sbin
 install -m 0644 extras/run_directory/MAKEDEV.dev $RPM_BUILD_ROOT/%{udev_scriptdir}/MAKEDEV.dev
 
 
 mkdir -p -m 0755 $RPM_BUILD_ROOT/lib/firmware
 
+pushd $RPM_BUILD_ROOT
+rm -f usr/include/libvolume_id.h \
+   usr/lib*/libvolume_id.a \
+   usr/lib*/libvolume_id.so \
+   usr/lib*/pkgconfig/libvolume_id.pc \
+   lib*/libvolume_id.*
+popd
+
 # short-term workaround
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/modules
 cat >$RPM_BUILD_ROOT/etc/sysconfig/modules/udev-stw.modules <<EOF
 #!/bin/sh
-for i in nvram floppy parport_pc parport lp;do
+for i in nvram floppy parport lp snd-powermac;do
         modprobe \$i >/dev/null 2>&1
 done
 EOF
@@ -222,26 +240,28 @@
 %files
 %defattr(-,root,root)
 %doc COPYING README TODO ChangeLog RELEASE-NOTES docs/* 
-%doc etc/udev/redhat/udev.rules
 %attr(0755,root,root) /sbin/udevd.static
 %attr(0755,root,root) /sbin/udevcontrol
 %attr(0755,root,root) /sbin/udevd
-%attr(0755,root,root) /sbin/udevstart
+%attr(0755,root,root) /sbin/udevtrigger
 %attr(0755,root,root) /sbin/start_udev
 #%attr(755,root,root) /sbin/udev_volume_id
 %attr(0755,root,root) %{udev_scriptdir}/udev_run_devd
 %attr(0755,root,root) %{udev_scriptdir}/udev_run_hotplugd
 %attr(755,root,root) /sbin/scsi_id
-%attr(755,root,root) /sbin/ata_id
-%attr(755,root,root) /sbin/edd_id
-%attr(755,root,root) /sbin/usb_id
-%attr(755,root,root) /sbin/vol_id
-%attr(755,root,root) /sbin/path_id
+%attr(755,root,root) %{udev_scriptdir}/scsi_id
+%attr(755,root,root) %{udev_scriptdir}/ata_id
+%attr(755,root,root) %{udev_scriptdir}/edd_id
+%attr(755,root,root) %{udev_scriptdir}/usb_id
+%attr(755,root,root) %{udev_scriptdir}/vol_id
+%attr(755,root,root) %{udev_scriptdir}/path_id
 %ifarch s390 s390x
-%attr(755,root,root) /sbin/dasd_id
+%attr(755,root,root) %{udev_scriptdir}/dasd_id
 %attr(0644,root,root) %{_mandir}/man8/dasd_id*.8*
 %endif
 %attr(755,root,root) /sbin/firmware_helper
+#%attr(0755,root,root) /%{_lib}/libvolume_id.so.0
+#%attr(0755,root,root) /%{_lib}/libvolume_id.so.0.61.0
 
 %attr(0755,root,root) %{_bindir}/udevtest
 %attr(0755,root,root) %{_bindir}/udevinfo
@@ -285,6 +305,13 @@
 %attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
 
 %changelog
+* Thu Apr 13 2006 Harald Hoyer <harald at redhat.com> - 089-1
+- version 089
+- do not force loading of parport_pc (bug #186850)
+- manually load snd-powermac (bug #176761)
+- added usb floppy symlink (bug #185171)
+- start_udev uses udevtrigger now instead of udevstart
+
 * Wed Mar 08 2006 Harald Hoyer <harald at redhat.com> - 084-13
 - fixed pam_console rules (#182600)
 


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/upstream,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- upstream	7 Feb 2006 11:06:20 -0000	1.4
+++ upstream	13 Apr 2006 08:46:43 -0000	1.5
@@ -1 +1 @@
-udev-084.tar.bz2
+udev-089.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 13 09:48:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 05:48:38 -0400
Subject: rpms/udev/devel udev-089-nopie.patch,1.1,1.2 udev.spec,1.163,1.164
Message-ID: <200604130948.k3D9mcev015757@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15743

Modified Files:
	udev-089-nopie.patch udev.spec 
Log Message:
correction for shlib

udev-089-nopie.patch:
 Makefile |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

Index: udev-089-nopie.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-089-nopie.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udev-089-nopie.patch	13 Apr 2006 08:46:43 -0000	1.1
+++ udev-089-nopie.patch	13 Apr 2006 09:48:33 -0000	1.2
@@ -1,11 +1,15 @@
---- udev-089/extras/volume_id/lib/Makefile.nopie	2006-04-12 15:03:07.000000000 +0200
-+++ udev-089/extras/volume_id/lib/Makefile	2006-04-12 15:03:19.000000000 +0200
-@@ -78,7 +78,7 @@
+--- udev-089/extras/volume_id/lib/Makefile.nopie	2006-04-03 14:41:10.000000000 +0200
++++ udev-089/extras/volume_id/lib/Makefile	2006-04-13 11:41:46.000000000 +0200
+@@ -76,9 +76,11 @@
+ 	$(E) "  RANLIB  " $@
+ 	$(Q) $(RANLIB) $@
  
++SHLIBFLAGS:=$(shell echo $(LDFLAGS)|sed -e 's/-pie//g')
++
  $(SHLIB): $(HEADERS) .shlib $(addprefix .shlib/,$(OBJS))
  	$(E) "  CC      " $@
 -	$(Q) $(CC) -shared $(CFLAGS) -o $@ \
-+	$(Q) $(LD) -shared -o $@ \
++	$(LD) $(SHLIBFLAGS) -shared -o $@ \
  		-Wl,-soname,libvolume_id.so.$(SHLIB_CUR),--version-script,exported_symbols \
  		$(addprefix .shlib/,$(OBJS))
  	$(Q) ln -sf $@ libvolume_id.so.$(SHLIB_CUR)


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- udev.spec	13 Apr 2006 08:46:43 -0000	1.163
+++ udev.spec	13 Apr 2006 09:48:34 -0000	1.164
@@ -19,7 +19,6 @@
 
 Patch1: udev-permconv.patch
 Patch2: udev-rules.patch
-#Patch3: udevstart2.patch
 Patch4: udev-084-floppy.patch
 Patch5: udev-extras.patch
 Patch6: udev-084-pg.patch
@@ -46,7 +45,6 @@
 %setup -q  
 %patch1 -p1 -b .rhpermconv
 %patch2 -p1 -b .rhrules
-#%patch3 -p1 -b .rhudevstart
 %patch4 -p1 -b .rhfloppy
 %patch5 -p1 -b .rhextras
 %patch6 -p1 -b .pg



From fedora-cvs-commits at redhat.com  Thu Apr 13 09:58:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 05:58:09 -0400
Subject: rpms/udev/devel udev-089-nopie.patch,1.2,1.3
Message-ID: <200604130958.k3D9w9gq015856@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15843

Modified Files:
	udev-089-nopie.patch 
Log Message:
correction for shlib

udev-089-nopie.patch:
 Makefile |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

Index: udev-089-nopie.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-089-nopie.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- udev-089-nopie.patch	13 Apr 2006 09:48:33 -0000	1.2
+++ udev-089-nopie.patch	13 Apr 2006 09:58:06 -0000	1.3
@@ -1,10 +1,10 @@
 --- udev-089/extras/volume_id/lib/Makefile.nopie	2006-04-03 14:41:10.000000000 +0200
-+++ udev-089/extras/volume_id/lib/Makefile	2006-04-13 11:41:46.000000000 +0200
++++ udev-089/extras/volume_id/lib/Makefile	2006-04-13 11:56:56.000000000 +0200
 @@ -76,9 +76,11 @@
  	$(E) "  RANLIB  " $@
  	$(Q) $(RANLIB) $@
  
-+SHLIBFLAGS:=$(shell echo $(LDFLAGS)|sed -e 's/-pie//g')
++SHLIBFLAGS:=$(shell echo $(LDFLAGS) $(CFLAGS) -fpic -fPIC|sed -e 's/-pie//g')
 +
  $(SHLIB): $(HEADERS) .shlib $(addprefix .shlib/,$(OBJS))
  	$(E) "  CC      " $@



From fedora-cvs-commits at redhat.com  Thu Apr 13 10:36:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 06:36:51 -0400
Subject: rpms/udev/devel udev-089-nopie.patch,1.3,1.4
Message-ID: <200604131036.k3DAapMx030262@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30247

Modified Files:
	udev-089-nopie.patch 
Log Message:
correction for shlib

udev-089-nopie.patch:
 Makefile |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

Index: udev-089-nopie.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-089-nopie.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- udev-089-nopie.patch	13 Apr 2006 09:58:06 -0000	1.3
+++ udev-089-nopie.patch	13 Apr 2006 10:36:46 -0000	1.4
@@ -1,6 +1,19 @@
 --- udev-089/extras/volume_id/lib/Makefile.nopie	2006-04-03 14:41:10.000000000 +0200
-+++ udev-089/extras/volume_id/lib/Makefile	2006-04-13 11:56:56.000000000 +0200
-@@ -76,9 +76,11 @@
++++ udev-089/extras/volume_id/lib/Makefile	2006-04-13 12:31:51.000000000 +0200
+@@ -65,9 +65,11 @@
+ .shlib:
+ 	$(Q) mkdir .shlib
+ 
++SHCFLAGS:=$(shell echo $(CFLAGS) -fpic -fPIC|sed -e 's/-pie//g')
++
+ .shlib/%.o: %.c
+ 	$(E) "  CC      " $@
+-	$(Q) $(CC) -c $(CFLAGS) -fPIC $< -o $@
++	$(Q) $(CC) -c $(SHCFLAGS)  $< -o $@
+ 
+ libvolume_id.a: $(HEADERS) $(OBJS)
+ 	$(Q) rm -f $@
+@@ -76,9 +78,11 @@
  	$(E) "  RANLIB  " $@
  	$(Q) $(RANLIB) $@
  



From fedora-cvs-commits at redhat.com  Thu Apr 13 11:22:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 07:22:58 -0400
Subject: rpms/kde-i18n/FC-5 kde-i18n.spec,1.55,1.56
Message-ID: <200604131122.k3DBMwZH026308@cvs.devel.redhat.com>

Author: than

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

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




Index: kde-i18n.spec
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/FC-5/kde-i18n.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- kde-i18n.spec	3 Apr 2006 21:18:59 -0000	1.55
+++ kde-i18n.spec	13 Apr 2006 11:22:55 -0000	1.56
@@ -4,7 +4,7 @@
 
 Name: kde-i18n
 Version: 3.5.2
-Release: 0.1.fc5
+Release: 0.2.fc5
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Epoch: 1
@@ -639,28 +639,24 @@
 for lang in *; do
   if [ -d $lang ]; then
     pushd $lang
-    if [ ! -d common ] ; then
-      ln -s ../en/common common
-    fi
-
     for i in */*/*; do
       if [ -d $i -a -L $i/common ]; then
         rm -f $i/common
-        ln -sf ../../../common $i
+        ln -sf ../../../$lang/docs/common $i
       fi
     done
 
     for i in */*; do
       if [ -d $i -a -L $i/common ]; then
         rm -f $i/common
-        ln -sf ../../common $i
+        ln -sf ../../$lang/docs/common $i
       fi
     done
 
     for i in *; do
       if [ -d $i -a -L $i/common ]; then
         rm -f $i/common
-        ln -sf ../common $i
+        ln -sf ../$lang/docs/common $i
       fi
     done
 
@@ -1154,6 +1150,9 @@
 %lang(zh_TW) %doc %{_docdir}/HTML/zh_TW
 
 %changelog
+* Thu Apr 13 2006 Than Ngo <than at redhat.com> 1:3.5.2-0.2.fc5
+- fix file conflict
+
 * Mon Apr 03 2006 Than Ngo <than at redhat.com> 1:3.5.2-0.1.fc5
 - update to 3.5.2
 



From fedora-cvs-commits at redhat.com  Thu Apr 13 11:33:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 07:33:20 -0400
Subject: rpms/valgrind/devel valgrind.spec,1.30,1.31
Message-ID: <200604131133.k3DBXK6J026527@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/valgrind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26514

Modified Files:
	valgrind.spec 
Log Message:
3.1.1-1.EL4



Index: valgrind.spec
===================================================================
RCS file: /cvs/dist/rpms/valgrind/devel/valgrind.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- valgrind.spec	12 Apr 2006 15:25:26 -0000	1.30
+++ valgrind.spec	13 Apr 2006 11:33:18 -0000	1.31
@@ -44,6 +44,7 @@
 # Ugly hack - libgcc 32-bit package might not be installed
 mkdir -p libgcc/32
 touch libgcc/32/libgcc_s.a
+touch libgcc/libgcc_s_32.a
 %configure CC="gcc -B `pwd`/libgcc/"
 %else
 %configure



From fedora-cvs-commits at redhat.com  Thu Apr 13 12:37:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 08:37:49 -0400
Subject: rpms/udev/devel udev-089-nopie.patch,1.4,1.5
Message-ID: <200604131237.k3DCbn91022606@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22588

Modified Files:
	udev-089-nopie.patch 
Log Message:
correction for shlib

udev-089-nopie.patch:
 Makefile |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

Index: udev-089-nopie.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-089-nopie.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- udev-089-nopie.patch	13 Apr 2006 10:36:46 -0000	1.4
+++ udev-089-nopie.patch	13 Apr 2006 12:37:35 -0000	1.5
@@ -1,19 +1,28 @@
 --- udev-089/extras/volume_id/lib/Makefile.nopie	2006-04-03 14:41:10.000000000 +0200
-+++ udev-089/extras/volume_id/lib/Makefile	2006-04-13 12:31:51.000000000 +0200
-@@ -65,9 +65,11 @@
++++ udev-089/extras/volume_id/lib/Makefile	2006-04-13 14:36:08.000000000 +0200
+@@ -54,7 +54,7 @@
+ 	libvolume_id.h		\
+ 	util.h
+ 
+-all: libvolume_id.a $(SHLIB) libvolume_id.pc
++all: libvolume_id.a 
+ .PHONY: all
+ .DEFAULT: all
+ 
+@@ -65,9 +65,10 @@
  .shlib:
  	$(Q) mkdir .shlib
  
 +SHCFLAGS:=$(shell echo $(CFLAGS) -fpic -fPIC|sed -e 's/-pie//g')
 +
  .shlib/%.o: %.c
- 	$(E) "  CC      " $@
+-	$(E) "  CC      " $@
 -	$(Q) $(CC) -c $(CFLAGS) -fPIC $< -o $@
-+	$(Q) $(CC) -c $(SHCFLAGS)  $< -o $@
++	$(CC) -c $(SHCFLAGS)  $< -o $@
  
  libvolume_id.a: $(HEADERS) $(OBJS)
  	$(Q) rm -f $@
-@@ -76,9 +78,11 @@
+@@ -76,9 +77,11 @@
  	$(E) "  RANLIB  " $@
  	$(Q) $(RANLIB) $@
  
@@ -26,3 +35,22 @@
  		-Wl,-soname,libvolume_id.so.$(SHLIB_CUR),--version-script,exported_symbols \
  		$(addprefix .shlib/,$(OBJS))
  	$(Q) ln -sf $@ libvolume_id.so.$(SHLIB_CUR)
+@@ -97,12 +100,12 @@
+ 	$(Q) echo "Cflags: -I\$${includedir}" >> $@
+ 
+ install: all
+-	$(INSTALL_DATA) -D libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h
+-	$(INSTALL_LIB) -D libvolume_id.a $(DESTDIR)$(usrlibdir)/libvolume_id.a
+-	$(INSTALL_LIB) -D $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)
+-	ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
+-	ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
+-	$(INSTALL_DATA) -D libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
++	#$(INSTALL_DATA) -D libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h
++	#$(INSTALL_LIB) -D libvolume_id.a $(DESTDIR)$(usrlibdir)/libvolume_id.a
++	#$(INSTALL_LIB) -D $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)
++	#ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
++	#ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
++	#$(INSTALL_DATA) -D libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
+ .PHONY: install
+ 
+ uninstall:



From fedora-cvs-commits at redhat.com  Thu Apr 13 12:46:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 08:46:44 -0400
Subject: rpms/bash/devel bash31-017,NONE,1.1 bash.spec,1.116,1.117
Message-ID: <200604131246.k3DCki8o003858@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/bash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2607

Modified Files:
	bash.spec 
Added Files:
	bash31-017 
Log Message:
* Thu Apr  13 2006 Tim Waugh <twaugh at redhat.com> 3.1-12
- Patchlevel 17.



--- NEW FILE bash31-017 ---
			     BASH PATCH REPORT
			     =================

Bash-Release: 3.1
Patch-ID: bash31-017

Bug-Reported-by: syphir at syphir.sytes.net
Bug-Reference-ID: <442421F5.3010105 at syphir.sytes.net>
Bug-Reference-URL: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=358831

Bug-Description:

Array expansion fails with an arithmetic syntax error when the subscript
appears within double quotes.  For example: ${a["4"]}.

Patch:

*** ../bash-3.1-patched/subst.c	Wed Apr 12 08:47:08 2006
--- subst.c	Wed Apr 12 08:49:02 2006
***************
*** 2576,2579 ****
--- 2576,2586 ----
  }
  
+ char *
+ expand_arith_string (string, quoted)
+      char *string;
+ {
+   return (expand_string_if_necessary (string, quoted, expand_string));
+ }
+ 
  #if defined (COND_COMMAND)
  /* Just remove backslashes in STRING.  Returns a new string. */
***************
*** 5249,5253 ****
      t = (char *)0;
  
!   temp1 = expand_string_if_necessary (substr, Q_DOUBLE_QUOTES, expand_string);
    *e1p = evalexp (temp1, &expok);
    free (temp1);
--- 5256,5260 ----
      t = (char *)0;
  
!   temp1 = expand_arith_string (substr, Q_DOUBLE_QUOTES);
    *e1p = evalexp (temp1, &expok);
    free (temp1);
***************
*** 5294,5298 ****
        t++;
        temp2 = savestring (t);
!       temp1 = expand_string_if_necessary (temp2, Q_DOUBLE_QUOTES, expand_string);
        free (temp2);
        t[-1] = ':';
--- 5301,5305 ----
        t++;
        temp2 = savestring (t);
!       temp1 = expand_arith_string (temp2, Q_DOUBLE_QUOTES);
        free (temp2);
        t[-1] = ':';
***************
*** 6436,6440 ****
  
  	  /* Expand variables found inside the expression. */
! 	  temp1 = expand_string_if_necessary (temp2, Q_DOUBLE_QUOTES, expand_string);
  	  free (temp2);
  
--- 6443,6447 ----
  
  	  /* Expand variables found inside the expression. */
! 	  temp1 = expand_arith_string (temp2, Q_DOUBLE_QUOTES);
  	  free (temp2);
  
***************
*** 6478,6482 ****
  
         /* Do initial variable expansion. */
!       temp1 = expand_string_if_necessary (temp, Q_DOUBLE_QUOTES, expand_string);
  
        goto arithsub;
--- 6485,6489 ----
  
         /* Do initial variable expansion. */
!       temp1 = expand_arith_string (temp, Q_DOUBLE_QUOTES);
  
        goto arithsub;
*** ../bash-3.1-patched/subst.h	Sun Nov  7 15:12:28 2004
--- subst.h	Mon Mar 27 09:10:38 2006
***************
*** 152,155 ****
--- 152,158 ----
  extern char *expand_assignment_string_to_string __P((char *, int));
  
+ /* Expand an arithmetic expression string */
+ extern char *expand_arith_string __P((char *, int));
+ 
  /* De-quoted quoted characters in STRING. */
  extern char *dequote_string __P((char *));
*** ../bash-3.1-patched/arrayfunc.c	Mon Jul  4 20:25:58 2005
--- arrayfunc.c	Mon Mar 27 09:10:47 2006
***************
*** 593,601 ****
    strncpy (exp, s, len - 1);
    exp[len - 1] = '\0';
! #if 0
!   t = expand_string_to_string (exp, 0);
! #else 
!   t = expand_string_to_string (exp, Q_DOUBLE_QUOTES);
! #endif
    this_command_name = (char *)NULL;
    val = evalexp (t, &expok);
--- 591,595 ----
    strncpy (exp, s, len - 1);
    exp[len - 1] = '\0';
!   t = expand_arith_string (exp, 0);
    this_command_name = (char *)NULL;
    val = evalexp (t, &expok);
*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
--- patchlevel.h	Wed Dec  7 13:48:42 2005
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 16
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 17
  
  #endif /* _PATCHLEVEL_H_ */


Index: bash.spec
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- bash.spec	4 Apr 2006 12:44:45 -0000	1.116
+++ bash.spec	13 Apr 2006 12:46:41 -0000	1.117
@@ -1,7 +1,7 @@
 Version: 3.1
 Name: bash
 Summary: The GNU Bourne Again shell (bash) version %{version}.
-Release: 11
+Release: 12
 Group: System Environment/Shells
 License: GPL
 Url: http://www.gnu.org/software/bash
@@ -27,6 +27,7 @@
 Patch14: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-014
 Patch15: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-015
 Patch16: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-016
+Patch17: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-017
 # Other patches
 Patch100: bash-2.03-paths.patch
 Patch101: bash-2.02-security.patch
@@ -81,6 +82,7 @@
 %patch14 -p0 -b .014
 %patch15 -p0 -b .015
 %patch16 -p0 -b .016
+%patch17 -p0 -b .017
 
 # Other patches
 %patch100 -p1 -b .paths
@@ -232,6 +234,9 @@
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Thu Apr  13 2006 Tim Waugh <twaugh at redhat.com> 3.1-12
+- Patchlevel 17.
+
 * Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 3.1-11
 - Patchlevel 16.
 



From fedora-cvs-commits at redhat.com  Thu Apr 13 12:48:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 08:48:28 -0400
Subject: rpms/kde-i18n/FC-4 kde-i18n.spec,1.43,1.44
Message-ID: <200604131248.k3DCmSnT004615@cvs.devel.redhat.com>

Author: than

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

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



Index: kde-i18n.spec
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/FC-4/kde-i18n.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- kde-i18n.spec	12 Apr 2006 07:13:01 -0000	1.43
+++ kde-i18n.spec	13 Apr 2006 12:48:26 -0000	1.44
@@ -4,7 +4,7 @@
 
 Name: kde-i18n
 Version: 3.5.2
-Release: 0.1.fc4
+Release: 0.2.fc4
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Epoch: 1
@@ -638,28 +638,24 @@
 for lang in *; do
   if [ -d $lang ]; then
     pushd $lang
-    if [ ! -d common ] ; then
-      ln -s ../en/common common
-    fi
-
     for i in */*/*; do
       if [ -d $i -a -L $i/common ]; then
         rm -f $i/common
-        ln -sf ../../../common $i
+        ln -sf ../../../$lang/docs/common $i
       fi
     done
 
     for i in */*; do
       if [ -d $i -a -L $i/common ]; then
         rm -f $i/common
-        ln -sf ../../common $i
+        ln -sf ../../$lang/docs/common $i
       fi
     done
 
     for i in *; do
       if [ -d $i -a -L $i/common ]; then
         rm -f $i/common
-        ln -sf ../common $i
+        ln -sf ../$lang/docs/common $i
       fi
     done
 
@@ -1153,6 +1149,9 @@
 %lang(zh_TW) %doc %{_docdir}/HTML/zh_TW
 
 %changelog
+* Thu Apr 13 2006 Than Ngo <than at redhat.com> 1:3.5.2-0.2.fc4
+- fix file conflict
+
 * Wed Apr 12 2006 Than Ngo <than at redhat.com> 1:3.5.2-0.1.fc4 
 - update to 3.5.2
 



From fedora-cvs-commits at redhat.com  Thu Apr 13 12:57:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 08:57:31 -0400
Subject: rpms/evolution/FC-4 evolution.spec,1.77,1.78
Message-ID: <200604131257.k3DCvV3C004866@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	evolution.spec 
Log Message:
REbuild against older pilot-link



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-4/evolution.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- evolution.spec	1 Nov 2005 16:25:06 -0000	1.77
+++ evolution.spec	13 Apr 2006 12:57:29 -0000	1.78
@@ -28,7 +28,7 @@
 
 Name: evolution
 Version: 2.2.3
-Release: 3.fc4
+Release: 4.fc4
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -73,7 +73,7 @@
 #Patch700: evolution-1.5.9.1-filechooser.patch
 
 # Patches for conduits by Mark G. Adams:
-Patch800: rh-161817-attach-116019-conduit_pilot_link_updates.diff
+# Patch800: rh-161817-attach-116019-conduit_pilot_link_updates.diff
 Patch801: gb-309138-attach-48417-fix-evo-conduit-memleaks.patch
 
 # Move .conduit files from share to lib (for the sake of multilib)
@@ -199,7 +199,7 @@
 
 #patch700 -p1 -b .filechooser
 
-%patch800 -p0 -b .fix-conduits
+# %patch800 -p0 -b .fix-conduits
 %patch801 -p0 -b .fix-evo-conduit-memleaks
 %patch802 -p1 -b .fix-conduit-dir
 %patch803 -p1 -b .no-gnome-common
@@ -362,6 +362,10 @@
 %{_libdir}/evolution/%{evo_major}/*.so
 
 %changelog
+* Thu Apr 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.2.3-4.fc4
+- Drop the fix-conduits patch and rebuild against the reverted
+  pilot-link
+
 * Tue Nov  1 2005 David Malcolm <dmalcolm at redhat.com> - 2.2.3-3.fc4
 - Fix the credits dialog (#169240)
 



From fedora-cvs-commits at redhat.com  Thu Apr 13 12:58:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 08:58:40 -0400
Subject: rpms/gnome-pilot-conduits/FC-4 gnome-pilot-conduits.spec,1.11,1.12
Message-ID: <200604131258.k3DCwejr004891@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/gnome-pilot-conduits/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv4877

Modified Files:
	gnome-pilot-conduits.spec 
Log Message:
rebuilt against stable pilot-link-0.11.8



Index: gnome-pilot-conduits.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot-conduits/FC-4/gnome-pilot-conduits.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnome-pilot-conduits.spec	11 Apr 2005 19:23:30 -0000	1.11
+++ gnome-pilot-conduits.spec	13 Apr 2006 12:58:38 -0000	1.12
@@ -5,7 +5,7 @@
 Summary: Additional conduits for gnome-pilot
 Name: gnome-pilot-conduits
 Version: 2.0.13
-Release: 1
+Release: 1.fc4.1
 License: LGPL
 Group: Applications/Communications
 Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.0/%{name}-%{version}.tar.bz2
@@ -32,7 +32,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .lib64
-%patch2 -p1 -b .port-to-pilot-link-0.12
+#%patch2 -p1 -b .port-to-pilot-link-0.12
 
 %build
 %configure
@@ -63,6 +63,9 @@
 %{_libdir}/gnome-pilot/conduits/*.so
 
 %changelog
+* Thu Apr 13 2006 Than Ngo <than at redhat.com> 2.0.13-1.fc4.1 
+- rebuilt against stable pilot-link-0.11.8
+
 * Mon Apr 11 2005 David Malcolm <dmalcolm at redhat.com> - 2.0.13-1
 - 2.0.13
 - require gnome-pilot 2.0.13



From fedora-cvs-commits at redhat.com  Thu Apr 13 13:39:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 09:39:47 -0400
Subject: rpms/kde-i18n/devel kde-i18n.spec,1.57,1.58
Message-ID: <200604131339.k3DDdlUv019429@cvs.devel.redhat.com>

Author: than

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

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




Index: kde-i18n.spec
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/devel/kde-i18n.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kde-i18n.spec	6 Apr 2006 12:58:36 -0000	1.57
+++ kde-i18n.spec	13 Apr 2006 13:39:44 -0000	1.58
@@ -4,7 +4,7 @@
 
 Name: kde-i18n
 Version: 3.5.2
-Release: 1
+Release: 2
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Epoch: 1
@@ -639,28 +639,24 @@
 for lang in *; do
   if [ -d $lang ]; then
     pushd $lang
-    if [ ! -d common ] ; then
-      ln -s ../en/common common
-    fi
-
     for i in */*/*; do
       if [ -d $i -a -L $i/common ]; then
         rm -f $i/common
-        ln -sf ../../../common $i
+        ln -sf ../../../$lang/docs/common $i
       fi
     done
 
     for i in */*; do
       if [ -d $i -a -L $i/common ]; then
         rm -f $i/common
-        ln -sf ../../common $i
+        ln -sf ../../$lang/docs/common $i
       fi
     done
 
     for i in *; do
       if [ -d $i -a -L $i/common ]; then
         rm -f $i/common
-        ln -sf ../common $i
+        ln -sf ../$lang/docs/common $i
       fi
     done
 
@@ -1154,6 +1150,9 @@
 %lang(zh_TW) %doc %{_docdir}/HTML/zh_TW
 
 %changelog
+* Thu Apr 13 2006 Than Ngo <than at redhat.com> 1:3.5.2-2 
+- fix file conflict
+
 * Mon Apr 03 2006 Than Ngo <than at redhat.com> 1:3.5.2-1
 - update to 3.5.2
 



From fedora-cvs-commits at redhat.com  Thu Apr 13 13:45:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 09:45:41 -0400
Subject: rpms/tar/devel tar-1.15.1-hugeSparse.patch, 1.1, 1.2 tar.spec, 1.33,
	1.34
Message-ID: <200604131345.k3DDjdm7019553@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/tar/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19536

Modified Files:
	tar-1.15.1-hugeSparse.patch tar.spec 
Log Message:
fix segmentation faul introduced with hugeSparse.patch


tar-1.15.1-hugeSparse.patch:
 sparse.c |  145 ++++++++++++++++++++++++++-------------------------------------
 1 files changed, 60 insertions(+), 85 deletions(-)

Index: tar-1.15.1-hugeSparse.patch
===================================================================
RCS file: /cvs/dist/rpms/tar/devel/tar-1.15.1-hugeSparse.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tar-1.15.1-hugeSparse.patch	22 Mar 2006 13:19:13 -0000	1.1
+++ tar-1.15.1-hugeSparse.patch	13 Apr 2006 13:45:34 -0000	1.2
@@ -1,5 +1,5 @@
---- tar-1.15.1/src/sparse.c.hugeSparse	2006-03-22 13:18:53.000000000 -0500
-+++ tar-1.15.1/src/sparse.c	2006-03-22 13:24:54.000000000 -0500
+--- tar-1.15.1/src/sparse.c.hugeSparse	2006-04-13 15:29:19.000000000 +0200
++++ tar-1.15.1/src/sparse.c	2006-04-13 15:32:29.000000000 +0200
 @@ -47,9 +47,9 @@
  {
    int fd;                           /* File descriptor */
@@ -231,11 +231,12 @@
    
    if (!sparse_select_optab (&file)
        || !tar_sparse_init (&file))
-@@ -456,15 +434,14 @@
+@@ -456,15 +434,15 @@
    struct tar_sparse_file file;
    size_t i;
  
-+  if (!tar_sparse_init (&file))
++  if (!sparse_select_optab (&file)
++      || !tar_sparse_init (&file))
 +    return dump_status_not_implemented;
 +
    file.stat_info = st;
@@ -250,7 +251,7 @@
    rc = tar_sparse_decode_header (&file);
    for (i = 0; rc && i < file.stat_info->sparse_map_avail; i++)
      rc = tar_sparse_extract_region (&file, i);
-@@ -491,8 +468,6 @@
+@@ -491,8 +469,6 @@
  }
  
  
@@ -259,7 +260,7 @@
  static bool
  check_sparse_region (struct tar_sparse_file *file, off_t beg, off_t end)
  {
-@@ -502,11 +477,9 @@
+@@ -502,11 +478,9 @@
    while (beg < end)
      {
        size_t bytes_read;
@@ -273,7 +274,7 @@
        bytes_read = safe_read (file->fd, diff_buffer, rdsize);
        if (bytes_read == SAFE_READ_ERROR)
  	{
-@@ -539,6 +512,7 @@
+@@ -539,6 +513,7 @@
      {
        size_t bytes_read;
        size_t rdsize = (size_left > BLOCKSIZE) ? BLOCKSIZE : size_left;
@@ -281,7 +282,7 @@
  
        union block *blk = find_next_block ();
        if (!blk)
-@@ -551,9 +525,9 @@
+@@ -551,9 +526,9 @@
        if (bytes_read == SAFE_READ_ERROR)
  	{
            read_diag_details (file->stat_info->orig_file_name,
@@ -294,7 +295,7 @@
  			     rdsize);
  	  return false;
  	}
-@@ -647,7 +621,7 @@
+@@ -647,7 +622,7 @@
        || file->stat_info->archive_file_size < 0)
      return add_fail;
  
@@ -303,7 +304,7 @@
    return add_ok;
  }
  
-@@ -669,7 +643,7 @@
+@@ -669,7 +644,7 @@
    size_t i;
    union block *h = current_header;
    int ext_p;
@@ -312,7 +313,7 @@
  
    file->stat_info->sparse_map_avail = 0;
    for (i = 0; i < SPARSES_IN_OLDGNU_HEADER; i++)
-@@ -756,7 +730,7 @@
+@@ -756,7 +731,7 @@
    return true;
  }
  
@@ -321,7 +322,7 @@
    NULL,  /* No init function */
    NULL,  /* No done function */
    oldgnu_sparse_member_p,
-@@ -795,7 +769,7 @@
+@@ -795,7 +770,7 @@
    size_t i;
    union block *h = current_header;
    int ext_p;
@@ -330,7 +331,7 @@
  
    file->stat_info->sparse_map_avail = 0;
  
-@@ -837,7 +811,7 @@
+@@ -837,7 +812,7 @@
  }
  
  
@@ -339,7 +340,7 @@
    NULL,  /* No init function */
    NULL,  /* No done function */
    star_sparse_member_p,
-@@ -890,7 +864,7 @@
+@@ -890,7 +865,7 @@
    return true;
  }
  


Index: tar.spec
===================================================================
RCS file: /cvs/dist/rpms/tar/devel/tar.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- tar.spec	22 Mar 2006 13:19:13 -0000	1.33
+++ tar.spec	13 Apr 2006 13:45:34 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: A GNU file archiving program.
 Name: tar
 Version: 1.15.1
-Release: 14
+Release: 15
 License: GPL
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -119,6 +119,9 @@
 %{_infodir}/tar.info*
 
 %changelog
+* Thu Apr 13 2006 Peter Vrabec <pvrabec at redhat.com> 1.15.1-15
+- fix segmentation faul introduced with hugeSparse.patch
+
 * Wed Mar 22 2006 Peter Vrabec <pvrabec at redhat.com> 1.15.1-14
 - fix problems with extracting large sparse archive members (#185460)
 



From fedora-cvs-commits at redhat.com  Thu Apr 13 15:35:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 11:35:28 -0400
Subject: rpms/parted/devel .cvsignore, 1.22, 1.23 parted.spec, 1.65,
	1.66 sources, 1.26, 1.27
Message-ID: <200604131535.k3DFZSKU012575@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/parted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12558

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	9 Nov 2005 19:18:54 -0000	1.22
+++ .cvsignore	13 Apr 2006 15:35:19 -0000	1.23
@@ -9,3 +9,4 @@
 parted-1.6.23.tar.gz
 parted-1.6.24.tar.gz
 parted-1.6.25.tar.gz
+parted-1.6.25.1.tar.gz


Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- parted.spec	14 Mar 2006 21:12:47 -0000	1.65
+++ parted.spec	13 Apr 2006 15:35:20 -0000	1.66
@@ -3,8 +3,8 @@
 
 Summary: The GNU disk partition manipulation program.
 Name: parted
-Version: 1.6.25
-Release: 8
+Version: 1.6.25.1
+Release: 1
 Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 Patch0: parted-1.6.3-fat.c.patch
 Patch3: parted-1.6.25-sx8.patch
@@ -22,7 +22,7 @@
 BuildRequires: e2fsprogs-devel libtermcap-devel readline-devel ncurses-devel
 BuildRequires: automake libtool gettext-devel texinfo
 BuildRequires: device-mapper >= 1.02.02, libselinux-devel libsepol-devel
-BuildRequires: gettext-devel
+BuildRequires: gettext-devel libtool
 
 Prereq: /sbin/install-info
 
@@ -32,7 +32,6 @@
 for new operating systems, reorganizing disk usage, and copying data
 to new hard disks.
 
-
 %package devel
 Summary: Files for developing apps which will manipulate disk partitions.
 Group: Development/Libraries
@@ -43,7 +42,6 @@
 partitions and filesystems using the routines provided by the GNU
 Parted library, you need to install this package.
 
-
 %prep
 %setup -q
 %patch0 -p1 -b .sigfpe
@@ -103,6 +101,10 @@
 %{_libdir}/*.a*
 
 %changelog
+* Thu Apr 13 2006 David Cantrell <dcantrell at redhat.com> - 1.6.25.1-1
+- Upgraded to parted-1.6.25.1
+- BuildRequires libtool
+
 * Tue Mar 14 2006 Jeremy Katz <katzj at redhat.com> - 1.6.25-8
 - fix ppc swraid
 - BR gettext-devel


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	9 Nov 2005 19:18:54 -0000	1.26
+++ sources	13 Apr 2006 15:35:20 -0000	1.27
@@ -1 +1 @@
-2ed5a721e425e3f10bb58f5a0fc7271c  parted-1.6.25.tar.gz
+8ad8b2c8aa865d9d6a43a4ecfe021782  parted-1.6.25.1.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 13 15:42:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 11:42:46 -0400
Subject: rpms/openoffice.org/devel sources,1.163,1.164
Message-ID: <200604131542.k3DFgk0D012899@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	sources 
Log Message:
keep opensymbol up to date


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- sources	12 Apr 2006 09:57:54 -0000	1.163
+++ sources	13 Apr 2006 15:42:42 -0000	1.164
@@ -9,4 +9,4 @@
 67ba19cf8ac46671799ff63a48901e8b  openoffice.org-simple-crash_report.sh
 8d8c4222654f718436c234582c8fd529  GSI_ga.sdf
 bfa60acd8b0c30a1a6d14165da45c1dd  openoffice.org-myspell-contrib.tar.gz
-dc56cc373f49ec25a188132ee98caf87  opens___.ttf
+32ea837fcd5ce94a809d51b74aa51266  opens___.ttf



From fedora-cvs-commits at redhat.com  Thu Apr 13 16:42:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 12:42:03 -0400
Subject: rpms/metacity/devel .cvsignore, 1.38, 1.39 metacity.spec, 1.68,
	1.69 sources, 1.38, 1.39
Message-ID: <200604131642.k3DGg3e5009278@cvs.devel.redhat.com>

Author: sandmann

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

Modified Files:
	.cvsignore metacity.spec sources 
Log Message:
* Thu Apr 13 2006 Soren Sandmann <sandmann at redhat.com> 2.15.0-5
- Update to libcm 0.0.19




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	6 Apr 2006 14:15:43 -0000	1.38
+++ .cvsignore	13 Apr 2006 16:42:01 -0000	1.39
@@ -1,3 +1,5 @@
 libcm-0.0.17.tar.gz
 metacity-2.15.0.20060331.tar.gz
 libcm-0.0.18.tar.gz
+libcm-0.0.19.tar.gz
+metacity-2.15.0.apr13-2006.tar.gz


Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- metacity.spec	12 Apr 2006 04:30:30 -0000	1.68
+++ metacity.spec	13 Apr 2006 16:42:01 -0000	1.69
@@ -1,13 +1,13 @@
 %define gettext_package metacity
 
-%define libcm_version 0.0.18
+%define libcm_version 0.0.19
 %define metacity_version 2.15.0
-%define metacity_snapshot 20060331
+%define metacity_snapshot apr13-2006
 
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 4
+Release: 5
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
 Source0: metacity-%{metacity_version}.%{metacity_snapshot}.tar.gz
 Source1: libcm-%{libcm_version}.tar.gz
@@ -139,6 +139,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Apr 13 2006 Soren Sandmann <sandmann at redhat.com> 2.15.0-5
+- Update to libcm 0.0.19
+
 * Wed Apr 12 2006 Kristian H??gsberg <krh at redhat.com> 2.15.0-4
 - Bump for fc5-bling rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	6 Apr 2006 14:15:43 -0000	1.38
+++ sources	13 Apr 2006 16:42:01 -0000	1.39
@@ -1,2 +1,2 @@
-df7434930a126a14995c9e98d9a4f736  metacity-2.15.0.20060331.tar.gz
-b6bebe5ec71cce73b9af09c91ffda5fa  libcm-0.0.18.tar.gz
+00289a8a5abbda47c2c2a4a31d026cd4  libcm-0.0.19.tar.gz
+d2b76466bad8b9182cf6baf5547b772f  metacity-2.15.0.apr13-2006.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 13 17:13:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 13:13:53 -0400
Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.2,
	1.3
Message-ID: <200604131713.k3DHDrLZ023696@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	system-config-printer.spec 
Log Message:
* Thu Apr 13 2006 Tim Waugh <twaugh at redhat.com> 0.7.4-2
- Obsoletes: system-config-printer-gui <= 0.6.152



Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- system-config-printer.spec	12 Apr 2006 21:11:29 -0000	1.2
+++ system-config-printer.spec	13 Apr 2006 17:13:51 -0000	1.3
@@ -3,7 +3,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 0.7.4
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source0: system-config-printer-%{version}.tar.bz2
@@ -20,6 +20,8 @@
 
 Requires: pygtk2 >= 2.4.0, pygtk2-libglade
 
+Obsoletes: system-config-printer-gui <= 0.6.152
+
 %description
 system-config-mouse is a graphical user interface that allows
 the user to configure a CUPS print server.
@@ -60,6 +62,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Thu Apr 13 2006 Tim Waugh <twaugh at redhat.com> 0.7.4-2
+- Obsoletes: system-config-printer-gui <= 0.6.152
+
 * Wed Apr 12 2006 Tim Waugh <twaugh at redhat.com> 0.7.4-1
 - Updated to system-config-printer-0.7.4.
 



From fedora-cvs-commits at redhat.com  Thu Apr 13 18:26:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 14:26:18 -0400
Subject: rpms/vte/devel vte.spec,1.65,1.66
Message-ID: <200604131826.k3DIQI3u002169@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/vte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2155

Modified Files:
	vte.spec 
Log Message:
* Thu Apr 13 2006 Kristian H??gsberg <krh at redhat.com> 0.12.0-2
- Add vte-0.12.0-real-transparency.patch for extra bling points.



Index: vte.spec
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- vte.spec	13 Mar 2006 12:55:33 -0000	1.65
+++ vte.spec	13 Apr 2006 18:26:16 -0000	1.66
@@ -1,6 +1,6 @@
 Name: vte
 Version: 0.12.0
-Release: 1.fc5.1
+Release: 2
 Summary: An experimental terminal emulator.
 License: LGPL
 Group: User Interface/X
@@ -12,6 +12,8 @@
 # initscripts creates the utmp group
 Prereq: initscripts 
 
+Patch0: vte-0.12.0-real-transparency.patch
+
 %description
 VTE is an experimental terminal emulator widget for use with GTK+ 2.0.
 
@@ -27,6 +29,8 @@
 %prep
 %setup -q
 
+%patch0 -p0 -b .real-transparency
+
 %build
 PYTHON=%{_bindir}/python`%{__python} -c "import sys ; print sys.version[:3]"`
 export PYTHON
@@ -98,6 +102,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Apr 13 2006 Kristian H??gsberg <krh at redhat.com> 0.12.0-2
+- Add vte-0.12.0-real-transparency.patch for extra bling points.
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> 0.12.0-1
 - Update to 0.12.0-1
 



From fedora-cvs-commits at redhat.com  Thu Apr 13 18:28:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 14:28:26 -0400
Subject: rpms/vte/devel vte-0.12.0-real-transparency.patch,NONE,1.1
Message-ID: <200604131828.k3DISQnD002261@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/vte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2247

Added Files:
	vte-0.12.0-real-transparency.patch 
Log Message:
Add patch.

vte-0.12.0-real-transparency.patch:
 vte-private.h |    1 +
 vte.c         |   17 ++++++++++++++++-
 vte.h         |    1 +
 vteapp.c      |    9 +++++++++
 vtedraw.c     |    6 ++++--
 vtedraw.h     |    6 ++++--
 vteft2.c      |    2 +-
 vtegl.c       |    2 +-
 vtepango.c    |    2 +-
 vtepangox.c   |    2 +-
 vteskel.c     |    4 +++-
 vtexft.c      |   14 +++++++++-----
 12 files changed, 51 insertions(+), 15 deletions(-)

--- NEW FILE vte-0.12.0-real-transparency.patch ---
--- ./src/vte-private.h.real-transparency	2006-03-08 15:31:13.000000000 -0500
+++ ./src/vte-private.h	2006-04-13 14:22:35.000000000 -0400
@@ -338,6 +338,7 @@
 	guint bg_update_tag;
 	GdkColor bg_tint_color;
 	long bg_saturation;	/* out of VTE_SATURATION_MAX */
+	guint16 bg_opacity;
 
 	/* Key modifiers. */
 	GdkModifierType modifiers;
--- ./src/vte.c.real-transparency	2006-03-12 22:29:31.000000000 -0500
+++ ./src/vte.c	2006-04-13 14:23:41.000000000 -0400
@@ -2160,6 +2160,19 @@
 }
 
 /**
+ * vte_terminal_set_opacity
+ * @terminal: a #VteTerminal
+ * @opacity: the new opacity
+ *
+ * CRACK ALERT!
+ */
+void
+vte_terminal_set_opacity(VteTerminal *terminal, guint16 opacity)
+{
+	terminal->pvt->bg_opacity = opacity;
+}
+
+/**
  * vte_terminal_set_default_colors:
  * @terminal: a #VteTerminal
  *
@@ -6808,6 +6821,7 @@
 	pvt->bg_tint_color.green = 0;
 	pvt->bg_tint_color.blue = 0;
 	pvt->bg_saturation = 0.4 * VTE_SATURATION_MAX;
+ 	pvt->bg_opacity = 0xffff;
 
 	/* Assume we're visible unless we're told otherwise. */
 	pvt->visibility_state = GDK_VISIBILITY_UNOBSCURED;
@@ -10212,7 +10226,8 @@
 		gdk_rgb_find_color(colormap, &bgcolor);
 	}
 	gdk_window_set_background(widget->window, &bgcolor);
-	_vte_draw_set_background_color(terminal->pvt->draw, &bgcolor);
+	_vte_draw_set_background_color(terminal->pvt->draw, &bgcolor,
+				       terminal->pvt->bg_opacity);
 
 	/* If we're transparent, and either have no root image or are being
 	 * told to update it, get a new copy of the root window. */
--- ./src/vte.h.real-transparency	2004-05-01 03:12:51.000000000 -0400
+++ ./src/vte.h	2006-04-13 14:22:35.000000000 -0400
@@ -274,6 +274,7 @@
 					    double saturation);
 void vte_terminal_set_background_transparent(VteTerminal *terminal,
 					     gboolean transparent);
+void vte_terminal_set_opacity(VteTerminal *terminal, guint16 opacity);
 
 /* Set whether or not the cursor blinks. */
 void vte_terminal_set_cursor_blinks(VteTerminal *terminal, gboolean blink);
--- ./src/vteapp.c.real-transparency	2006-02-10 04:25:56.000000000 -0500
+++ ./src/vteapp.c	2006-04-13 14:22:35.000000000 -0400
@@ -399,6 +399,8 @@
 int
 main(int argc, char **argv)
 {
+	GdkScreen *screen;
+	GdkColormap *colormap;
 	GtkWidget *window, *hbox, *scrollbar, *widget;
 	char *env_add[] = {"FOO=BAR", "BOO=BIZ", NULL};
 	const char *background = NULL;
@@ -574,6 +576,12 @@
 	g_signal_connect(G_OBJECT(window), "delete_event",
 			 GTK_SIGNAL_FUNC(deleted_and_quit), window);
 
+	/* Set ARGB colormap */
+	screen = gtk_widget_get_screen (window);
+	colormap = gdk_screen_get_rgba_colormap (screen);
+	if (colormap)
+	    gtk_widget_set_colormap(GTK_WIDGET (window), colormap);
+
 	/* Create a box to hold everything. */
 	hbox = gtk_hbox_new(0, FALSE);
 	gtk_container_add(GTK_CONTAINER(window), hbox);
@@ -665,6 +673,7 @@
 	}
 	vte_terminal_set_background_tint_color(VTE_TERMINAL(widget), &tint);
 	vte_terminal_set_colors(VTE_TERMINAL(widget), &fore, &back, NULL, 0);
+	vte_terminal_set_opacity(VTE_TERMINAL(widget), 0xcccc);
 	if (highlight_set) {
 		vte_terminal_set_color_highlight(VTE_TERMINAL(widget),
 						 &highlight);
--- ./src/vtedraw.c.real-transparency	2006-02-03 08:27:27.000000000 -0500
+++ ./src/vtedraw.c	2006-04-13 14:22:35.000000000 -0400
@@ -177,11 +177,13 @@
 }
 
 void
-_vte_draw_set_background_color(struct _vte_draw *draw, GdkColor *color)
+_vte_draw_set_background_color(struct _vte_draw *draw,
+			       GdkColor *color,
+			       guint16 opacity)
 {
 	g_return_if_fail(draw->impl != NULL);
 	g_return_if_fail(draw->impl->set_background_color != NULL);
-	draw->impl->set_background_color(draw, color);
+	draw->impl->set_background_color(draw, color, opacity);
 }
 
 void
--- ./src/vtedraw.h.real-transparency	2004-04-20 01:16:56.000000000 -0400
+++ ./src/vtedraw.h	2006-04-13 14:22:35.000000000 -0400
@@ -58,7 +58,7 @@
 	GdkColormap* (*get_colormap)(struct _vte_draw *draw);
 	void (*start)(struct _vte_draw *draw);
 	void (*end)(struct _vte_draw *draw);
-	void (*set_background_color)(struct _vte_draw *, GdkColor *);
+	void (*set_background_color)(struct _vte_draw *, GdkColor *, guint16);
 	void (*set_background_image)(struct _vte_draw *,
 				     enum VteBgSourceType type,
 				     GdkPixbuf *pixbuf,
@@ -116,7 +116,9 @@
 
 /* Set the background color, a background pixbuf (if you want transparency,
    you'll have to do that yourself), and clear an area to the default. */
-void _vte_draw_set_background_color(struct _vte_draw *draw, GdkColor *color);
+void _vte_draw_set_background_color(struct _vte_draw *draw,
+				    GdkColor *color,
+				    guint16 opacity);
 void _vte_draw_set_background_image(struct _vte_draw *draw,
 				    enum VteBgSourceType type,
 				    GdkPixbuf *pixbuf,
--- ./src/vteft2.c.real-transparency	2004-04-20 01:16:56.000000000 -0400
+++ ./src/vteft2.c	2006-04-13 14:22:35.000000000 -0400
@@ -149,7 +149,7 @@
 }
 
 static void
-_vte_ft2_set_background_color(struct _vte_draw *draw, GdkColor *color)
+_vte_ft2_set_background_color(struct _vte_draw *draw, GdkColor *color, guint16 opacity)
 {
 	struct _vte_ft2_data *data;
 	data = (struct _vte_ft2_data*) draw->impl_data;
--- ./src/vtegl.c.real-transparency	2004-04-20 01:16:56.000000000 -0400
+++ ./src/vtegl.c	2006-04-13 14:22:35.000000000 -0400
@@ -261,7 +261,7 @@
 }
 
 static void
-_vte_gl_set_background_color(struct _vte_draw *draw, GdkColor *color)
+_vte_gl_set_background_color(struct _vte_draw *draw, GdkColor *color, guint16 opacity)
 {
 	struct _vte_gl_data *data;
 
--- ./src/vtepango.c.real-transparency	2005-07-25 04:49:42.000000000 -0400
+++ ./src/vtepango.c	2006-04-13 14:22:35.000000000 -0400
@@ -178,7 +178,7 @@
 }
 
 static void
-_vte_pango_set_background_color(struct _vte_draw *draw, GdkColor *color)
+_vte_pango_set_background_color(struct _vte_draw *draw, GdkColor *color, guint16 opacity)
 {
 	struct _vte_pango_data *data;
 	data = (struct _vte_pango_data*) draw->impl_data;
--- ./src/vtepangox.c.real-transparency	2004-04-20 01:16:56.000000000 -0400
+++ ./src/vtepangox.c	2006-04-13 14:22:36.000000000 -0400
@@ -190,7 +190,7 @@
 }
 
 static void
-_vte_pango_x_set_background_color(struct _vte_draw *draw, GdkColor *color)
+_vte_pango_x_set_background_color(struct _vte_draw *draw, GdkColor *color, guint16 opacity)
 {
 	struct _vte_pango_x_data *data;
 	data = (struct _vte_pango_x_data*) draw->impl_data;
--- ./src/vteskel.c.real-transparency	2004-04-20 01:16:56.000000000 -0400
+++ ./src/vteskel.c	2006-04-13 14:22:36.000000000 -0400
@@ -34,6 +34,7 @@
 	GdkPixmap *pixmap;
 	gint pixmapw, pixmaph;
 	gint scrollx, scrolly;
+	guint16 opacity;
 };
 
 static gboolean
@@ -107,11 +108,12 @@
 }
 
 static void
-_vte_skel_set_background_color(struct _vte_draw *draw, GdkColor *color)
+_vte_skel_set_background_color(struct _vte_draw *draw, GdkColor *color, guint16 opacity)
 {
 	struct _vte_skel_data *data;
 	data = (struct _vte_skel_data*) draw->impl_data;
 	data->color = *color;
+	data->opacity = opacity;
 }
 
 static void
--- ./src/vtexft.c.real-transparency	2006-02-25 18:20:42.000000000 -0500
+++ ./src/vtexft.c	2006-04-13 14:22:36.000000000 -0400
@@ -69,6 +69,7 @@
 	XftDraw *draw;
 	GC gc;
 	GdkColor color;
+	guint16 opacity;
 	GdkPixmap *pixmap;
 	Pixmap xpixmap;
 	gint pixmapw, pixmaph;
@@ -332,6 +333,7 @@
 	data->draw = NULL;
 	data->gc = NULL;
 	memset(&data->color, 0, sizeof(data->color));
+	data->opacity = 0xffff;
 	data->pixmap = NULL;
 	data->xpixmap = -1;
 	data->pixmapw = data->pixmaph = -1;
@@ -435,11 +437,13 @@
 }
 
 static void
-_vte_xft_set_background_color(struct _vte_draw *draw, GdkColor *color)
+_vte_xft_set_background_color(struct _vte_draw *draw, GdkColor *color,
+			      guint16 opacity)
 {
 	struct _vte_xft_data *data;
 	data = (struct _vte_xft_data*) draw->impl_data;
 	data->color = *color;
+	data->opacity = opacity;
 }
 
 static void
@@ -485,10 +489,10 @@
 	if (!GDK_IS_PIXMAP(data->pixmap) ||
 	    (data->pixmapw <= 0) ||
 	    (data->pixmaph <= 0)) {
-		rcolor.red = data->color.red;
-		rcolor.green = data->color.green;
-		rcolor.blue = data->color.blue;
-		rcolor.alpha = 0xffff;
+		rcolor.red = data->color.red * data->opacity / 0xffff;
+		rcolor.green = data->color.green * data->opacity / 0xffff;
+		rcolor.blue = data->color.blue * data->opacity / 0xffff;
+		rcolor.alpha = data->opacity;
 		if (XftColorAllocValue(data->display, data->visual,
 				       data->colormap, &rcolor, &ftcolor)) {
 			XftDrawRect(data->draw, &ftcolor,



From fedora-cvs-commits at redhat.com  Thu Apr 13 18:38:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 14:38:26 -0400
Subject: rpms/vte/devel vte.spec,1.66,1.67
Message-ID: <200604131838.k3DIcQoX002422@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/vte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2391

Modified Files:
	vte.spec 
Log Message:
* Thu Apr 13 2006 Kristian H??gsberg <krh at redhat.com> 0.12.0-3
- Bump for rawhide build.



Index: vte.spec
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- vte.spec	13 Apr 2006 18:26:16 -0000	1.66
+++ vte.spec	13 Apr 2006 18:37:58 -0000	1.67
@@ -1,6 +1,6 @@
 Name: vte
 Version: 0.12.0
-Release: 2
+Release: 3
 Summary: An experimental terminal emulator.
 License: LGPL
 Group: User Interface/X
@@ -102,6 +102,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Apr 13 2006 Kristian H??gsberg <krh at redhat.com> 0.12.0-3
+- Bump for rawhide build.
+
 * Thu Apr 13 2006 Kristian H??gsberg <krh at redhat.com> 0.12.0-2
 - Add vte-0.12.0-real-transparency.patch for extra bling points.
 



From fedora-cvs-commits at redhat.com  Thu Apr 13 18:54:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 14:54:03 -0400
Subject: rpms/xterm/devel xterm-212-bz186935.patch, NONE,
	1.1 xterm-212-man-page_paths.patch, NONE,
	1.1 xterm-212-redhat-resources.patch, NONE, 1.1 xterm.spec,
	1.41, 1.42
Message-ID: <200604131854.k3DIs3ja031982@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/xterm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31949

Modified Files:
	xterm.spec 
Added Files:
	xterm-212-bz186935.patch xterm-212-man-page_paths.patch 
	xterm-212-redhat-resources.patch 
Log Message:
Upgrade to upstream version 212

xterm-212-bz186935.patch:
 charproc.c |   71 ++++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 49 insertions(+), 22 deletions(-)

--- NEW FILE xterm-212-bz186935.patch ---
--- xterm-212/charproc.c.bz186935	2006-04-09 20:34:36.000000000 -0400
+++ xterm-212/charproc.c	2006-04-13 13:39:44.000000000 -0400
@@ -5762,28 +5762,55 @@
     GC reverseCursorGC = screen->reversecursorGC;
     GC cursorOutlineGC = screen->cursoroutlineGC;
 
-    if (cursorGC)
-	XFreeGC(screen->display, cursorGC);
-    screen->cursorGC = 0;
-
-    if (fillCursorGC && (fillCursorGC != cursorGC))
-	XFreeGC(screen->display, fillCursorGC);
-    screen->fillCursorGC = 0;
-
-    if (reverseCursorGC
-	&& (reverseCursorGC != cursorGC)
-	&& (reverseCursorGC != fillCursorGC)
-	)
-	XFreeGC(screen->display, screen->reversecursorGC);
-    screen->reversecursorGC = 0;
-
-    if (cursorOutlineGC
-	&& (cursorOutlineGC != cursorGC)
-	&& (cursorOutlineGC != fillCursorGC)
-	&& (cursorOutlineGC != reverseCursorGC)
-	)
-	XFreeGC(screen->display, screen->cursoroutlineGC);
-    screen->cursoroutlineGC = 0;
+#if OPT_ISO_COLORS
+    if (screen->colorMode) {
+	if (cursorGC)
+	    XFreeGC(screen->display, cursorGC);
+	screen->cursorGC = 0;
+
+	if (fillCursorGC && (fillCursorGC != cursorGC))
+	    XFreeGC(screen->display, fillCursorGC);
+	screen->fillCursorGC = 0;
+
+	if (reverseCursorGC
+	    && (reverseCursorGC != cursorGC)
+	    && (reverseCursorGC != fillCursorGC)
+	    )
+	    XFreeGC(screen->display, screen->reversecursorGC);
+	screen->reversecursorGC = 0;
+
+	if (cursorOutlineGC
+	    && (cursorOutlineGC != cursorGC)
+	    && (cursorOutlineGC != fillCursorGC)
+	    && (cursorOutlineGC != reverseCursorGC)
+	    )
+	    XFreeGC(screen->display, screen->cursoroutlineGC);
+	screen->cursoroutlineGC = 0;
+    } else
+#endif
+    {
+	if ( cursorGC )    
+	    XtReleaseGC((Widget)term, cursorGC );
+	screen->cursorGC = 0;
+
+	if (  ( fillCursorGC )
+	   && ( fillCursorGC != cursorGC )
+	   ) XtReleaseGC((Widget)term, fillCursorGC);
+	screen->fillCursorGC = 0;
+
+	if (  ( reverseCursorGC )
+	   && ( reverseCursorGC != cursorGC )
+	   && ( reverseCursorGC != fillCursorGC )
+	   ) XtReleaseGC((Widget)term, reverseCursorGC);
+	screen->reversecursorGC = 0;
+
+	if (  ( cursorOutlineGC )
+	   && ( cursorOutlineGC != cursorGC )
+	   && ( cursorOutlineGC != fillCursorGC )
+	   && ( cursorOutlineGC != reverseCursorGC )
+	   ) XtReleaseGC((Widget)term, cursorOutlineGC);
+	screen->cursoroutlineGC = 0;
+    }
 }
 
 #ifdef NO_LEAKS

xterm-212-man-page_paths.patch:
 minstall.sh |   10 +++++++++-
 xterm.man   |    6 +++---
 2 files changed, 12 insertions(+), 4 deletions(-)

--- NEW FILE xterm-212-man-page_paths.patch ---
--- xterm-212/minstall.sh.man-page_paths	2006-04-09 20:34:37.000000000 -0400
+++ xterm-212/minstall.sh	2006-04-13 14:40:31.000000000 -0400
@@ -15,7 +15,12 @@
 OLD_FILE="$2"
 END_FILE="$3"
 APPS_DIR="$4"
-
+if [ -n "$apploaddir" ]; then
+   APPS_DIR="$apploaddir";
+fi
+fontpath=/usr/share/X11/fonts
+xorgcfgdir=/etc/X11
+xorgcfgfil=xorg.conf
 suffix=`echo "$END_FILE" | sed -e 's%^[^.]*.%%'`
 NEW_FILE=temp$$
 
@@ -23,6 +28,9 @@
 	-e s%__apploaddir__%$APPS_DIR% \
 	-e s%__mansuffix__%$suffix%g \
 	-e s%__miscmansuffix__%$suffix%g \
+	-e s%__fontpath__%$fontpath%g \
+	-e s%__xorgcfgdir__%$xorgcfgdir%g \
+	-e s%__xorgcfgfil__%$xorgcfgfil%g \
 	$OLD_FILE >$NEW_FILE
 
 echo "$MINSTALL $OLD_FILE $END_FILE"
--- xterm-212/xterm.man.man-page_paths	2006-04-09 20:34:37.000000000 -0400
+++ xterm-212/xterm.man	2006-04-13 14:35:07.000000000 -0400
@@ -1442,17 +1442,17 @@
 The font server claims to provide the bold font that \fIxterm\fP requests,
 but the result is not always readable.
 XFree86 provides a feature which can be used to suppress the scaling.
-In the X server's configuration file (e.g., "/etc/X11/XFree86"), you
+In the X server's configuration file (e.g., __xorgcfgdir__/__xorgcfgfil__), you
 can add ":unscaled" to the end of the directory specification for the
 "misc" fonts, which comprise the fixed-pitch fonts that are used by \fIxterm\fP.
 For example
 .RS
-	FontPath	"/usr/lib/X11/fonts/misc/"
+	FontPath	"__fontpath__"
 .RE
 .IP
 would become
 .RS
-	FontPath	"/usr/lib/X11/fonts/misc/:unscaled"
+	FontPath	"__fontpath__/misc/:unscaled"
 .RE
 .IP
 Depending on your configuration, the font server may have its own configuration

xterm-212-redhat-resources.patch:
 XTerm.ad |    6 ++++++
 1 files changed, 6 insertions(+)

--- NEW FILE xterm-212-redhat-resources.patch ---
--- xterm-212/XTerm.ad.redhat-resources	2006-04-13 13:40:45.000000000 -0400
+++ xterm-212/XTerm.ad	2006-04-13 13:46:07.000000000 -0400
@@ -186,3 +186,9 @@
 !
 ! Alternatively,
 !*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
+
+! Red Hat Defaults:
+*VT100*eightBitInput: 0
+*VT100*backarrowKey:  0
+*VT100*scrollBar:     1
+*VT100*utf8Title:     1


Index: xterm.spec
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- xterm.spec	29 Mar 2006 17:23:52 -0000	1.41
+++ xterm.spec	13 Apr 2006 18:54:00 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: xterm terminal emulator for the X Window System
 Name:    xterm
-Version: 211
-Release: 4.FC6
+Version: 212
+Release: 1.FC6
 URL:     http://dickey.his.com/xterm
 License: MIT
 Group:   User Interface/X
@@ -22,7 +22,9 @@
 Patch9: xterm-209-bz182382.patch
 Patch10: xterm-209-bz183993.patch
 Patch11: xterm-211-bz186094.patch
-Patch12: xterm-211-bz186935.patch
+Patch12: xterm-212-bz186935.patch
+Patch13: xterm-212-redhat-resources.patch
+Patch14: xterm-212-man-page_paths.patch
 BuildRequires: libXft-devel
 BuildRequires: freetype-devel
 BuildRequires: libXrender-devel
@@ -68,14 +70,18 @@
 #%patch5 -p1 -b .freetype
 #^- now fixed upstream in 208
 #%patch6 -p1 -b .eightBitInput_false
-%patch7 -p1 -b .redhat-resources
+#%patch7 -p1 -b .redhat-resources
+#      ^- patch now in patch13
 %patch8 -p1 -b .root-grab-console
 #%patch9 -p1 -b .bz182382
 #      ^- patch now upstream
 #%patch10 -p1 -b .bz183993
 #      ^- patch now upstream
-%patch11 -p1 -b .bz186094
+#%patch11 -p1 -b .bz186094
+#      ^- patch now in redhat-resources
 %patch12 -p1 -b .bz186935
+%patch13 -p1 -b .redhat-resources
+%patch14 -p1 -b .man-page_paths
 
 %build
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPROJECTROOT='\"/usr\"'"
@@ -105,7 +111,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall appsdir=$RPM_BUILD_ROOT/%{x11_app_defaults_dir}
+%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
@@ -132,6 +138,10 @@
 %doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n
 
 %changelog
+* Thu Apr 13 2006 Jason Vas Dias <jvdias at redhat.com> - 212-1
+- Upgrade to upstream version 212
+- fix bug 188031 : paths in man-page
+ 
 * Wed Mar 29 2006 Jason Vas Dias <jvdias at redhat.com> - 211-4
 - fix bug 186935: cursor GCs must be freed with XtReleaseGC
 



From fedora-cvs-commits at redhat.com  Thu Apr 13 18:56:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 14:56:00 -0400
Subject: rpms/xterm/devel .cvsignore,1.12,1.13 sources,1.12,1.13
Message-ID: <200604131856.k3DIu0MB000338@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/xterm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv304

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	21 Mar 2006 22:49:56 -0000	1.12
+++ .cvsignore	13 Apr 2006 18:55:57 -0000	1.13
@@ -10,3 +10,4 @@
 xterm-208.tgz
 xterm-209.tgz
 xterm-211.tgz
+xterm-212.tgz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	21 Mar 2006 22:49:56 -0000	1.12
+++ sources	13 Apr 2006 18:55:57 -0000	1.13
@@ -1,4 +1,4 @@
 0048925cb45d60429bc2f7665d563680  ctlseqs.txt.gz
 92826989d4f4aa610cf6222359f3f83a  UnicodeData-Latest.txt.gz
 6093439b8d79089f4ff1cdfed358b401  16colors.txt
-babb9a02ba7ebb7770f48e3257b2884e  xterm-211.tgz
+d39ec47dbf846e0e7dddb354280c4074  xterm-212.tgz



From fedora-cvs-commits at redhat.com  Thu Apr 13 19:13:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 15:13:47 -0400
Subject: rpms/gnome-terminal/devel
	gnome-terminal-2.14.1-real-transparency.patch, NONE,
	1.1 gnome-terminal.spec, 1.38, 1.39
Message-ID: <200604131913.k3DJDliO003177@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	gnome-terminal.spec 
Added Files:
	gnome-terminal-2.14.1-real-transparency.patch 
Log Message:
* Thu Apr 13 2006 Kristian H??gsberg <krh at redhat.com> 2.14.1-3
- Add vte-0.12.0-real-transparency.patch for extra bling points.


gnome-terminal-2.14.1-real-transparency.patch:
 profile-editor.c          |    0 
 src/profile-editor.c      |    0 
 src/terminal-screen.c     |   22 +++++--
 src/terminal-screen.h     |    2 
 src/terminal-widget-vte.c |    9 +++
 src/terminal-widget.h     |    3 +
 src/terminal-window.c     |  134 ++++++++++++++++++++++++++++++++++++++++++++++
 src/terminal-window.h     |    2 
 src/terminal.c            |    2 
 9 files changed, 168 insertions(+), 6 deletions(-)

--- NEW FILE gnome-terminal-2.14.1-real-transparency.patch ---
? help/bg/Makefile
? help/bg/Makefile.in
? help/bg/gnome-terminal-bg.omf.out
? help/bg/omf_timestamp
? help/uk/Makefile
? help/uk/Makefile.in
? help/uk/gnome-terminal-uk.omf.out
? help/uk/omf_timestamp
? po/.intltool-merge-cache
? src/.deps
? src/.libs
? src/skey/.deps
? src/skey/.libs
? src/skey/btoe.lo
? src/skey/libskey.la
? src/skey/md4.lo
? src/skey/md5.lo
? src/skey/sha1.lo
? src/skey/skey.lo
? src/skey/skeyutil.lo
Index: src/profile-editor.c
===================================================================
RCS file: /cvs/gnome/gnome-terminal/src/profile-editor.c,v
retrieving revision 1.57
diff -u -p -b -r1.57 profile-editor.c
Index: src/terminal-screen.c
===================================================================
RCS file: /cvs/gnome/gnome-terminal/src/terminal-screen.c,v
retrieving revision 1.123
diff -u -p -b -r1.123 terminal-screen.c
--- src/terminal-screen.c	2 Apr 2006 12:29:45 -0000	1.123
+++ src/terminal-screen.c	13 Apr 2006 18:01:03 -0000
@@ -119,8 +119,6 @@ static void terminal_screen_widget_encod
 
 static void terminal_screen_setup_dnd                (TerminalScreen *screen);
 
-static void reread_profile (TerminalScreen *screen);
-
 static gboolean cook_title  (TerminalScreen *screen, const char *raw_title, char **old_cooked_title);
 
 static void terminal_screen_cook_title      (TerminalScreen *screen);
@@ -521,12 +519,13 @@ terminal_screen_get_icon_title_set (Term
   return screen->priv->icon_title_set;
 }
 
-static void
-reread_profile (TerminalScreen *screen)
+void
+terminal_screen_reread_profile (TerminalScreen *screen)
 {
   TerminalProfile *profile;
   GtkWidget *term;
   TerminalBackgroundType bg_type;
+  TerminalWindow *window;
   
   profile = screen->priv->profile;  
   
@@ -600,13 +599,24 @@ reread_profile (TerminalScreen *screen)
 
   if (bg_type == TERMINAL_BACKGROUND_IMAGE ||
       bg_type == TERMINAL_BACKGROUND_TRANSPARENT)
+    {
     terminal_widget_set_background_darkness (term,
                                              terminal_profile_get_background_darkness (profile));
+      terminal_widget_set_background_opacity (term,
+					      terminal_profile_get_background_darkness (profile));
+    }      
   else
+    {
     terminal_widget_set_background_darkness (term, 0.0); /* normal color */
+      terminal_widget_set_background_opacity (term, 1);
+    }
   
+  window = terminal_screen_get_window (screen);
+  if (window == NULL || !terminal_window_uses_argb_visual (window))
   terminal_widget_set_background_transparent (term,
                                               bg_type == TERMINAL_BACKGROUND_TRANSPARENT);
+  else
+    terminal_widget_set_background_transparent (term, FALSE);
 
   terminal_widget_set_backspace_binding (term,
                                          terminal_profile_get_backspace_binding (profile));
@@ -698,7 +708,7 @@ profile_changed_callback (TerminalProfil
                           const TerminalSettingMask *mask,
                           TerminalScreen            *screen)
 {
-  reread_profile (screen);
+  terminal_screen_reread_profile (screen);
 }
 
 static void
@@ -946,7 +956,7 @@ terminal_screen_set_profile (TerminalScr
 
   screen->priv->profile = profile;
 
-  reread_profile (screen);
+  terminal_screen_reread_profile (screen);
 
   if (screen->priv->profile)
     g_signal_emit (G_OBJECT (screen), signals[PROFILE_SET], 0);
Index: src/terminal-screen.h
===================================================================
RCS file: /cvs/gnome/gnome-terminal/src/terminal-screen.h,v
retrieving revision 1.14
diff -u -p -b -r1.14 terminal-screen.h
--- src/terminal-screen.h	20 Jan 2006 18:05:42 -0000	1.14
+++ src/terminal-screen.h	13 Apr 2006 18:01:03 -0000
@@ -74,6 +74,8 @@ void terminal_screen_set_profile (Termin
                                   TerminalProfile *profile);
 TerminalProfile* terminal_screen_get_profile (TerminalScreen *screen);
 
+void terminal_screen_reread_profile (TerminalScreen *screen);
+
 void         terminal_screen_set_override_command (TerminalScreen  *screen,
                                                    char           **argv);
 const char** terminal_screen_get_override_command (TerminalScreen  *screen);
Index: src/terminal-widget-vte.c
===================================================================
RCS file: /cvs/gnome/gnome-terminal/src/terminal-widget-vte.c,v
retrieving revision 1.36
diff -u -p -b -r1.36 terminal-widget-vte.c
--- src/terminal-widget-vte.c	20 Jan 2006 18:05:42 -0000	1.36
+++ src/terminal-widget-vte.c	13 Apr 2006 18:01:03 -0000
@@ -351,6 +351,7 @@ void
 terminal_widget_set_background_transparent (GtkWidget *widget,
 					    gboolean   setting)
 {
+    /* FIXME: Don't enable this if we have a compmgr. */
   vte_terminal_set_background_transparent(VTE_TERMINAL(widget), setting);
 }
 
@@ -361,6 +362,14 @@ terminal_widget_set_background_darkness 
 {
   g_return_if_fail(VTE_IS_TERMINAL(widget));
   vte_terminal_set_background_saturation(VTE_TERMINAL(widget), 1.0 - factor);
+}
+
+void
+terminal_widget_set_background_opacity (GtkWidget *widget,
+					double     factor)
+{
+  g_return_if_fail(VTE_IS_TERMINAL(widget));
+  vte_terminal_set_opacity(VTE_TERMINAL(widget), factor * 0xffff);
 }
 
 void
Index: src/terminal-widget.h
===================================================================
RCS file: /cvs/gnome/gnome-terminal/src/terminal-widget.h,v
retrieving revision 1.12
diff -u -p -b -r1.12 terminal-widget.h
--- src/terminal-widget.h	20 Jan 2006 18:05:43 -0000	1.12
+++ src/terminal-widget.h	13 Apr 2006 18:01:03 -0000
@@ -90,6 +90,9 @@ void       terminal_widget_set_backgroun
 /* 0.0 = normal bg, 1.0 = all black bg, 0.5 = half darkened */
 void       terminal_widget_set_background_darkness    (GtkWidget            *widget,
                                                        double                factor);
+void	   terminal_widget_set_background_opacity     (GtkWidget            *widget,
+						       double                factor);
+
 void       terminal_widget_set_background_scrolls     (GtkWidget            *widget,
                                                        gboolean              setting);
 void       terminal_widget_set_normal_gdk_font        (GtkWidget            *widget,
Index: src/terminal-window.c
===================================================================
RCS file: /cvs/gnome/gnome-terminal/src/terminal-window.c,v
retrieving revision 1.126
diff -u -p -b -r1.126 terminal-window.c
--- src/terminal-window.c	1 Apr 2006 20:03:58 -0000	1.126
+++ src/terminal-window.c	13 Apr 2006 18:01:03 -0000
@@ -35,6 +35,11 @@
 #include <gdk/gdkkeysyms.h>
 #include <libsn/sn-launchee.h>
 
+#define HAVE_XFIXES 1
+#ifdef HAVE_XFIXES
+#include <X11/extensions/Xfixes.h>
+#endif
+
 struct _TerminalWindowPrivate
 {  
   GtkWidget *main_vbox;
@@ -85,6 +90,12 @@ struct _TerminalWindowPrivate
    * event-driven while GTK doesn't support _NET_WM_STATE_FULLSCREEN
    */
   guint fullscreen : 1;
+
+  /* Compositing manager integration*/
+  guint have_argb_visual : 1;
+  guint compositing_manager_present : 1;
+  int selection_notify_event;
+  int cm_selection_atom;
 };
 
 enum {
@@ -749,6 +760,115 @@ edit_menu_activate_callback (GtkMenuItem
   gtk_clipboard_request_text (window->priv->clipboard, (GtkClipboardTextReceivedFunc) update_edit_menu, window);
 }
 
+#ifdef HAVE_XFIXES
+
+static GdkFilterReturn
+compositing_manager_selection_changed (GdkXEvent *xevent,
+				       GdkEvent *event,
+				       gpointer data)
+{
+  TerminalWindow *window = (TerminalWindow *) data;
+  XFixesSelectionNotifyEvent *selection_notify =
+    (XFixesSelectionNotifyEvent *) xevent;
+  GList *tmp;
+
+  if (selection_notify->type != window->priv->selection_notify_event ||
+      selection_notify->selection != window->priv->cm_selection_atom)
+    return GDK_FILTER_CONTINUE;
+
+  switch (selection_notify->subtype)
+    {
+    case XFixesSetSelectionOwnerNotify:
+      if (selection_notify->owner != None)
+	window->priv->compositing_manager_present = TRUE;
+      else
+	window->priv->compositing_manager_present = FALSE;
+      break;
+
+    case XFixesSelectionWindowDestroyNotify:
+    case XFixesSelectionClientCloseNotify:
+      window->priv->compositing_manager_present = FALSE;
+      break;
+    }
+
+  for (tmp = window->priv->terms; tmp != NULL; tmp = tmp->next)
+    {
+      terminal_screen_reread_profile (tmp->data);
+    }
+
+  return GDK_FILTER_REMOVE;
+}
+
+static void
+initialize_alpha_mode (TerminalWindow *window)
+{
+  GdkScreen *screen;
+  GdkColormap *colormap;
+  char *atom_name;
+  Display *display;
+  GdkDisplay *gdk_display;
+  int fixes_major, fixes_minor;
+  int event_base, error_base;
+
+  gdk_display = gtk_widget_get_display (GTK_WIDGET (window));
+  display = gdk_x11_display_get_xdisplay (gdk_display);
+
+  if (!XFixesQueryExtension (display, &event_base, &error_base))
+    return;
+
+  /* XFixes version at least 1.0 will give us the selection events. */
+  fixes_major = 1;
+  fixes_minor = 0;
+  if (!XFixesQueryVersion (display, &fixes_major, &fixes_minor))
+    return;
+
+  /* We have a usable XFixes version, store the event number for later use. */
+  window->priv->selection_notify_event = event_base + XFixesSelectionNotify;
+
+  /* Set RGBA colormap if possible so VTE can use real alpha channels
+   * for transparency. */
+  screen = gtk_widget_get_screen (GTK_WIDGET (window));
+  colormap = gdk_screen_get_rgba_colormap (screen);
+  if (colormap == NULL)
+    return;
+
+  gtk_widget_set_colormap(GTK_WIDGET (window), colormap);
+  window->priv->have_argb_visual = TRUE;
+      
+  gdk_window_add_filter (GTK_WIDGET (window)->window,
+			 compositing_manager_selection_changed,
+			 window);
+
+  atom_name = g_strdup_printf ("_NET_WM_CM_S%d",
+			       gdk_screen_get_number (screen));
+  window->priv->cm_selection_atom = gdk_x11_get_xatom_by_name (atom_name);
+  g_free (atom_name);
+
+  if (XGetSelectionOwner (display, window->priv->cm_selection_atom) != None)
+    window->priv->compositing_manager_present = TRUE;
+  else
+    window->priv->compositing_manager_present = FALSE;
+}
+
+#else
+
+static void
+initialize_alpha_mode (TerminalWindow *window)
+{
+  window->priv->have_argb_visual = FALSE;
+  window->priv->compositing_manager_present = FALSE;
+}
+
+#endif
+
+
+gboolean
+terminal_window_uses_argb_visual (TerminalWindow *window)
+{
+    return window->priv->have_argb_visual &&
+	window->priv->compositing_manager_present;
+}
+
 static void
 terminal_window_init (TerminalWindow *window)
 {
@@ -781,6 +901,8 @@ terminal_window_init (TerminalWindow *wi
   window->priv->use_mnemonics = TRUE;
   window->priv->using_mnemonics = FALSE;
 
+  initialize_alpha_mode (window);
+
   /* force gtk to construct its GtkClipboard; otherwise our UI is very slow the first time we need it */
   window->priv->clipboard = gtk_clipboard_get_for_display (gtk_widget_get_display (GTK_WIDGET (window)), GDK_NONE);
 
@@ -1233,8 +1355,20 @@ terminal_window_show (GtkWidget *widget)
 void terminal_window_realized_callback (GtkWidget *window,
                                         gpointer   user_data)
 {
+  TerminalWindow *terminal_window = (TerminalWindow *) window;
+
   gdk_window_set_group (window->window, window->window);
   g_signal_handlers_disconnect_by_func (window, terminal_window_realized_callback, NULL);
+
+#ifdef HAVE_XFIXES
+  if (terminal_window->priv->have_argb_visual)
+      XFixesSelectSelectionInput (GDK_WINDOW_XDISPLAY (window->window),
+				  GDK_WINDOW_XID (window->window),
+				  terminal_window->priv->cm_selection_atom,
+				  XFixesSetSelectionOwnerNotifyMask |
+				  XFixesSelectionWindowDestroyNotifyMask |
+				  XFixesSelectionClientCloseNotifyMask);
+#endif
 }
 
 TerminalWindow*
Index: src/terminal-window.h
===================================================================
RCS file: /cvs/gnome/gnome-terminal/src/terminal-window.h,v
retrieving revision 1.11
diff -u -p -b -r1.11 terminal-window.h
--- src/terminal-window.h	20 Nov 2005 15:06:34 -0000	1.11
+++ src/terminal-window.h	13 Apr 2006 18:01:03 -0000
@@ -98,6 +98,8 @@ void terminal_window_reread_profile_list
 void terminal_window_set_startup_id (TerminalWindow *window,
                                      const char     *startup_id);
 
+gboolean terminal_window_uses_argb_visual (TerminalWindow *window);
+
 G_END_DECLS
 
 #endif /* TERMINAL_WINDOW_H */
Index: src/terminal.c
===================================================================
RCS file: /cvs/gnome/gnome-terminal/src/terminal.c,v
retrieving revision 1.96
diff -u -p -b -r1.96 terminal.c
--- src/terminal.c	2 Apr 2006 12:21:12 -0000	1.96
+++ src/terminal.c	13 Apr 2006 18:01:04 -0000
@@ -1966,6 +1966,8 @@ terminal_app_new_terminal (TerminalApp  
     
       terminal_window_add_screen (window, screen);
 
+      terminal_screen_reread_profile (screen);
+
       g_object_unref (G_OBJECT (screen));
     
       terminal_window_set_active (window, screen);


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gnome-terminal.spec	10 Apr 2006 14:29:08 -0000	1.38
+++ gnome-terminal.spec	13 Apr 2006 19:13:44 -0000	1.39
@@ -13,11 +13,12 @@
 Summary: GNOME Terminal
 Name: gnome-terminal
 Version: 2.14.1
-Release: 2
+Release: 3
 URL: http://www.gnome.org/
 Source0: gnome-terminal-%{version}.tar.bz2
 Source1: ne.po
 Patch0: gnome-terminal-2.12.0-inputmethod.patch
+Patch1: gnome-terminal-2.14.1-real-transparency.patch
 License: GPL 
 Group: User Interface/Desktops
 
@@ -53,6 +54,7 @@
 %setup -q
 cp ${RPM_SOURCE_DIR}/ne.po po
 %patch0 -p1 -b .inputmethod
+%patch1 -p0 -b .real-transparency
 
 %build
 
@@ -101,6 +103,9 @@
 %{_libdir}/bonobo
 
 %changelog
+* Thu Apr 13 2006 Kristian H??gsberg <krh at redhat.com> 2.14.1-3
+- Add vte-0.12.0-real-transparency.patch for extra bling points.
+
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
 - Update to 2.14.1
 



From fedora-cvs-commits at redhat.com  Thu Apr 13 19:14:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 15:14:43 -0400
Subject: rpms/xterm/FC-5 xterm-212-bz186935.patch, NONE,
	1.1 xterm-212-man-page_paths.patch, NONE,
	1.1 xterm-212-redhat-resources.patch, NONE, 1.1 .cvsignore,
	1.12, 1.13 sources, 1.12, 1.13 xterm.spec, 1.41, 1.42
Message-ID: <200604131914.k3DJEhLV003599@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	.cvsignore sources xterm.spec 
Added Files:
	xterm-212-bz186935.patch xterm-212-man-page_paths.patch 
	xterm-212-redhat-resources.patch 
Log Message:
upgrade to 212

xterm-212-bz186935.patch:
 charproc.c |   71 ++++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 49 insertions(+), 22 deletions(-)

--- NEW FILE xterm-212-bz186935.patch ---
--- xterm-212/charproc.c.bz186935	2006-04-09 20:34:36.000000000 -0400
+++ xterm-212/charproc.c	2006-04-13 13:39:44.000000000 -0400
@@ -5762,28 +5762,55 @@
     GC reverseCursorGC = screen->reversecursorGC;
     GC cursorOutlineGC = screen->cursoroutlineGC;
 
-    if (cursorGC)
-	XFreeGC(screen->display, cursorGC);
-    screen->cursorGC = 0;
-
-    if (fillCursorGC && (fillCursorGC != cursorGC))
-	XFreeGC(screen->display, fillCursorGC);
-    screen->fillCursorGC = 0;
-
-    if (reverseCursorGC
-	&& (reverseCursorGC != cursorGC)
-	&& (reverseCursorGC != fillCursorGC)
-	)
-	XFreeGC(screen->display, screen->reversecursorGC);
-    screen->reversecursorGC = 0;
-
-    if (cursorOutlineGC
-	&& (cursorOutlineGC != cursorGC)
-	&& (cursorOutlineGC != fillCursorGC)
-	&& (cursorOutlineGC != reverseCursorGC)
-	)
-	XFreeGC(screen->display, screen->cursoroutlineGC);
-    screen->cursoroutlineGC = 0;
+#if OPT_ISO_COLORS
+    if (screen->colorMode) {
+	if (cursorGC)
+	    XFreeGC(screen->display, cursorGC);
+	screen->cursorGC = 0;
+
+	if (fillCursorGC && (fillCursorGC != cursorGC))
+	    XFreeGC(screen->display, fillCursorGC);
+	screen->fillCursorGC = 0;
+
+	if (reverseCursorGC
+	    && (reverseCursorGC != cursorGC)
+	    && (reverseCursorGC != fillCursorGC)
+	    )
+	    XFreeGC(screen->display, screen->reversecursorGC);
+	screen->reversecursorGC = 0;
+
+	if (cursorOutlineGC
+	    && (cursorOutlineGC != cursorGC)
+	    && (cursorOutlineGC != fillCursorGC)
+	    && (cursorOutlineGC != reverseCursorGC)
+	    )
+	    XFreeGC(screen->display, screen->cursoroutlineGC);
+	screen->cursoroutlineGC = 0;
+    } else
+#endif
+    {
+	if ( cursorGC )    
+	    XtReleaseGC((Widget)term, cursorGC );
+	screen->cursorGC = 0;
+
+	if (  ( fillCursorGC )
+	   && ( fillCursorGC != cursorGC )
+	   ) XtReleaseGC((Widget)term, fillCursorGC);
+	screen->fillCursorGC = 0;
+
+	if (  ( reverseCursorGC )
+	   && ( reverseCursorGC != cursorGC )
+	   && ( reverseCursorGC != fillCursorGC )
+	   ) XtReleaseGC((Widget)term, reverseCursorGC);
+	screen->reversecursorGC = 0;
+
+	if (  ( cursorOutlineGC )
+	   && ( cursorOutlineGC != cursorGC )
+	   && ( cursorOutlineGC != fillCursorGC )
+	   && ( cursorOutlineGC != reverseCursorGC )
+	   ) XtReleaseGC((Widget)term, cursorOutlineGC);
+	screen->cursoroutlineGC = 0;
+    }
 }
 
 #ifdef NO_LEAKS

xterm-212-man-page_paths.patch:
 minstall.sh |   10 +++++++++-
 xterm.man   |    6 +++---
 2 files changed, 12 insertions(+), 4 deletions(-)

--- NEW FILE xterm-212-man-page_paths.patch ---
--- xterm-212/minstall.sh.man-page_paths	2006-04-09 20:34:37.000000000 -0400
+++ xterm-212/minstall.sh	2006-04-13 14:40:31.000000000 -0400
@@ -15,7 +15,12 @@
 OLD_FILE="$2"
 END_FILE="$3"
 APPS_DIR="$4"
-
+if [ -n "$apploaddir" ]; then
+   APPS_DIR="$apploaddir";
+fi
+fontpath=/usr/share/X11/fonts
+xorgcfgdir=/etc/X11
+xorgcfgfil=xorg.conf
 suffix=`echo "$END_FILE" | sed -e 's%^[^.]*.%%'`
 NEW_FILE=temp$$
 
@@ -23,6 +28,9 @@
 	-e s%__apploaddir__%$APPS_DIR% \
 	-e s%__mansuffix__%$suffix%g \
 	-e s%__miscmansuffix__%$suffix%g \
+	-e s%__fontpath__%$fontpath%g \
+	-e s%__xorgcfgdir__%$xorgcfgdir%g \
+	-e s%__xorgcfgfil__%$xorgcfgfil%g \
 	$OLD_FILE >$NEW_FILE
 
 echo "$MINSTALL $OLD_FILE $END_FILE"
--- xterm-212/xterm.man.man-page_paths	2006-04-09 20:34:37.000000000 -0400
+++ xterm-212/xterm.man	2006-04-13 14:35:07.000000000 -0400
@@ -1442,17 +1442,17 @@
 The font server claims to provide the bold font that \fIxterm\fP requests,
 but the result is not always readable.
 XFree86 provides a feature which can be used to suppress the scaling.
-In the X server's configuration file (e.g., "/etc/X11/XFree86"), you
+In the X server's configuration file (e.g., __xorgcfgdir__/__xorgcfgfil__), you
 can add ":unscaled" to the end of the directory specification for the
 "misc" fonts, which comprise the fixed-pitch fonts that are used by \fIxterm\fP.
 For example
 .RS
-	FontPath	"/usr/lib/X11/fonts/misc/"
+	FontPath	"__fontpath__"
 .RE
 .IP
 would become
 .RS
-	FontPath	"/usr/lib/X11/fonts/misc/:unscaled"
+	FontPath	"__fontpath__/misc/:unscaled"
 .RE
 .IP
 Depending on your configuration, the font server may have its own configuration

xterm-212-redhat-resources.patch:
 XTerm.ad |    6 ++++++
 1 files changed, 6 insertions(+)

--- NEW FILE xterm-212-redhat-resources.patch ---
--- xterm-212/XTerm.ad.redhat-resources	2006-04-13 13:40:45.000000000 -0400
+++ xterm-212/XTerm.ad	2006-04-13 13:46:07.000000000 -0400
@@ -186,3 +186,9 @@
 !
 ! Alternatively,
 !*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
+
+! Red Hat Defaults:
+*VT100*eightBitInput: 0
+*VT100*backarrowKey:  0
+*VT100*scrollBar:     1
+*VT100*utf8Title:     1


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xterm/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	21 Mar 2006 22:55:18 -0000	1.12
+++ .cvsignore	13 Apr 2006 19:14:40 -0000	1.13
@@ -10,3 +10,4 @@
 xterm-208.tgz
 xterm-209.tgz
 xterm-211.tgz
+xterm-212.tgz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xterm/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	21 Mar 2006 22:55:18 -0000	1.12
+++ sources	13 Apr 2006 19:14:40 -0000	1.13
@@ -1,4 +1,4 @@
 0048925cb45d60429bc2f7665d563680  ctlseqs.txt.gz
 92826989d4f4aa610cf6222359f3f83a  UnicodeData-Latest.txt.gz
 6093439b8d79089f4ff1cdfed358b401  16colors.txt
-babb9a02ba7ebb7770f48e3257b2884e  xterm-211.tgz
+d39ec47dbf846e0e7dddb354280c4074  xterm-212.tgz


Index: xterm.spec
===================================================================
RCS file: /cvs/dist/rpms/xterm/FC-5/xterm.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- xterm.spec	29 Mar 2006 16:43:31 -0000	1.41
+++ xterm.spec	13 Apr 2006 19:14:40 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: xterm terminal emulator for the X Window System
 Name:    xterm
-Version: 211
-Release: 4.FC5
+Version: 212
+Release: 1.FC5
 URL:     http://dickey.his.com/xterm
 License: MIT
 Group:   User Interface/X
@@ -22,7 +22,9 @@
 Patch9: xterm-209-bz182382.patch
 Patch10: xterm-209-bz183993.patch
 Patch11: xterm-211-bz186094.patch
-Patch12: xterm-211-bz186935.patch
+Patch12: xterm-212-bz186935.patch
+Patch13: xterm-212-redhat-resources.patch
+Patch14: xterm-212-man-page_paths.patch
 BuildRequires: libXft-devel
 BuildRequires: freetype-devel
 BuildRequires: libXrender-devel
@@ -68,14 +70,18 @@
 #%patch5 -p1 -b .freetype
 #^- now fixed upstream in 208
 #%patch6 -p1 -b .eightBitInput_false
-%patch7 -p1 -b .redhat-resources
+#%patch7 -p1 -b .redhat-resources
+#      ^- patch now in patch13
 %patch8 -p1 -b .root-grab-console
 #%patch9 -p1 -b .bz182382
 #      ^- patch now upstream
 #%patch10 -p1 -b .bz183993
 #      ^- patch now upstream
-%patch11 -p1 -b .bz186094
+#%patch11 -p1 -b .bz186094
+#      ^- patch now in redhat-resources
 %patch12 -p1 -b .bz186935
+%patch13 -p1 -b .redhat-resources
+%patch14 -p1 -b .man-page_paths
 
 %build
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPROJECTROOT='\"/usr\"'"
@@ -105,7 +111,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall appsdir=$RPM_BUILD_ROOT/%{x11_app_defaults_dir}
+%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
@@ -132,6 +138,10 @@
 %doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n
 
 %changelog
+* Thu Apr 13 2006 Jason Vas Dias <jvdias at redhat.com> - 212-1
+- Upgrade to upstream version 212
+- fix bug 188031 : paths in man-page
+ 
 * Wed Mar 29 2006 Jason Vas Dias <jvdias at redhat.com> - 211-4
 - fix bug 186935: cursor GCs must be freed with XtReleaseGC
 



From fedora-cvs-commits at redhat.com  Thu Apr 13 19:16:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 15:16:00 -0400
Subject: rpms/gnome-terminal/devel gnome-terminal.spec,1.39,1.40
Message-ID: <200604131916.k3DJG0BR007503@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	gnome-terminal.spec 
Log Message:
* Thu Apr 13 2006 Kristian H??gsberg <krh at redhat.com> 2.14.1-4
- Bump for rawhide build.



Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gnome-terminal.spec	13 Apr 2006 19:13:44 -0000	1.39
+++ gnome-terminal.spec	13 Apr 2006 19:15:58 -0000	1.40
@@ -13,7 +13,7 @@
 Summary: GNOME Terminal
 Name: gnome-terminal
 Version: 2.14.1
-Release: 3
+Release: 4
 URL: http://www.gnome.org/
 Source0: gnome-terminal-%{version}.tar.bz2
 Source1: ne.po
@@ -103,6 +103,9 @@
 %{_libdir}/bonobo
 
 %changelog
+* Thu Apr 13 2006 Kristian H??gsberg <krh at redhat.com> 2.14.1-4
+- Bump for rawhide build.
+
 * Thu Apr 13 2006 Kristian H??gsberg <krh at redhat.com> 2.14.1-3
 - Add vte-0.12.0-real-transparency.patch for extra bling points.
 



From fedora-cvs-commits at redhat.com  Thu Apr 13 20:10:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 16:10:40 -0400
Subject: rpms/xterm/FC-4 xterm-212-bz186935.patch, NONE,
	1.1 xterm-212-man-page_paths.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 sources, 1.8, 1.9 xterm-resources-redhat.patch, 1.8,
	1.9 xterm.spec, 1.20, 1.21
Message-ID: <200604132010.k3DKAdrb013645@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	.cvsignore sources xterm-resources-redhat.patch xterm.spec 
Added Files:
	xterm-212-bz186935.patch xterm-212-man-page_paths.patch 
Log Message:
Upgrade to 212

xterm-212-bz186935.patch:
 charproc.c |   71 ++++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 49 insertions(+), 22 deletions(-)

--- NEW FILE xterm-212-bz186935.patch ---
--- xterm-212/charproc.c.bz186935	2006-04-09 20:34:36.000000000 -0400
+++ xterm-212/charproc.c	2006-04-13 13:39:44.000000000 -0400
@@ -5762,28 +5762,55 @@
     GC reverseCursorGC = screen->reversecursorGC;
     GC cursorOutlineGC = screen->cursoroutlineGC;
 
-    if (cursorGC)
-	XFreeGC(screen->display, cursorGC);
-    screen->cursorGC = 0;
-
-    if (fillCursorGC && (fillCursorGC != cursorGC))
-	XFreeGC(screen->display, fillCursorGC);
-    screen->fillCursorGC = 0;
-
-    if (reverseCursorGC
-	&& (reverseCursorGC != cursorGC)
-	&& (reverseCursorGC != fillCursorGC)
-	)
-	XFreeGC(screen->display, screen->reversecursorGC);
-    screen->reversecursorGC = 0;
-
-    if (cursorOutlineGC
-	&& (cursorOutlineGC != cursorGC)
-	&& (cursorOutlineGC != fillCursorGC)
-	&& (cursorOutlineGC != reverseCursorGC)
-	)
-	XFreeGC(screen->display, screen->cursoroutlineGC);
-    screen->cursoroutlineGC = 0;
+#if OPT_ISO_COLORS
+    if (screen->colorMode) {
+	if (cursorGC)
+	    XFreeGC(screen->display, cursorGC);
+	screen->cursorGC = 0;
+
+	if (fillCursorGC && (fillCursorGC != cursorGC))
+	    XFreeGC(screen->display, fillCursorGC);
+	screen->fillCursorGC = 0;
+
+	if (reverseCursorGC
+	    && (reverseCursorGC != cursorGC)
+	    && (reverseCursorGC != fillCursorGC)
+	    )
+	    XFreeGC(screen->display, screen->reversecursorGC);
+	screen->reversecursorGC = 0;
+
+	if (cursorOutlineGC
+	    && (cursorOutlineGC != cursorGC)
+	    && (cursorOutlineGC != fillCursorGC)
+	    && (cursorOutlineGC != reverseCursorGC)
+	    )
+	    XFreeGC(screen->display, screen->cursoroutlineGC);
+	screen->cursoroutlineGC = 0;
+    } else
+#endif
+    {
+	if ( cursorGC )    
+	    XtReleaseGC((Widget)term, cursorGC );
+	screen->cursorGC = 0;
+
+	if (  ( fillCursorGC )
+	   && ( fillCursorGC != cursorGC )
+	   ) XtReleaseGC((Widget)term, fillCursorGC);
+	screen->fillCursorGC = 0;
+
+	if (  ( reverseCursorGC )
+	   && ( reverseCursorGC != cursorGC )
+	   && ( reverseCursorGC != fillCursorGC )
+	   ) XtReleaseGC((Widget)term, reverseCursorGC);
+	screen->reversecursorGC = 0;
+
+	if (  ( cursorOutlineGC )
+	   && ( cursorOutlineGC != cursorGC )
+	   && ( cursorOutlineGC != fillCursorGC )
+	   && ( cursorOutlineGC != reverseCursorGC )
+	   ) XtReleaseGC((Widget)term, cursorOutlineGC);
+	screen->cursoroutlineGC = 0;
+    }
 }
 
 #ifdef NO_LEAKS

xterm-212-man-page_paths.patch:
 minstall.sh |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE xterm-212-man-page_paths.patch ---
--- xterm-212/minstall.sh.man-page_paths	2006-04-09 20:34:37.000000000 -0400
+++ xterm-212/minstall.sh	2006-04-13 15:55:03.000000000 -0400
@@ -15,6 +15,9 @@
 OLD_FILE="$2"
 END_FILE="$3"
 APPS_DIR="$4"
+if [ -n "$apploaddir" ]; then
+    APPS_DIR="$apploaddir";
+fi
 
 suffix=`echo "$END_FILE" | sed -e 's%^[^.]*.%%'`
 NEW_FILE=temp$$


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xterm/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	13 Feb 2006 16:46:47 -0000	1.8
+++ .cvsignore	13 Apr 2006 20:10:25 -0000	1.9
@@ -2,5 +2,12 @@
 xterm-200.tgz
 xterm-205.tgz
 xterm-205.tgz.asc
+xterm-206.tgz
 xterm-207.tgz
+ctlseqs.txt.gz
+UnicodeData-Latest.txt.gz
+16colors.txt
 xterm-208.tgz
+xterm-209.tgz
+xterm-211.tgz
+xterm-212.tgz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xterm/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	13 Feb 2006 16:46:47 -0000	1.8
+++ sources	13 Apr 2006 20:10:25 -0000	1.9
@@ -1 +1,4 @@
-a062d0b398918015d07c31ecdcc5111a  xterm-208.tgz
+0048925cb45d60429bc2f7665d563680  ctlseqs.txt.gz
+92826989d4f4aa610cf6222359f3f83a  UnicodeData-Latest.txt.gz
+6093439b8d79089f4ff1cdfed358b401  16colors.txt
+d39ec47dbf846e0e7dddb354280c4074  xterm-212.tgz

xterm-resources-redhat.patch:
 XTerm.ad |    6 ++++++
 1 files changed, 6 insertions(+)

Index: xterm-resources-redhat.patch
===================================================================
RCS file: /cvs/dist/rpms/xterm/FC-4/xterm-resources-redhat.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xterm-resources-redhat.patch	13 Feb 2006 16:45:58 -0000	1.8
+++ xterm-resources-redhat.patch	13 Apr 2006 20:10:25 -0000	1.9
@@ -1,11 +1,12 @@
---- xterm-208/XTerm.ad.redhat-resources	2006-01-03 21:10:17.000000000 -0500
-+++ xterm-208/XTerm.ad	2006-01-17 15:05:24.000000000 -0500
-@@ -186,3 +186,8 @@
- 
- ! Here is a pattern that is useful for double-clicking on a URL:
- *charClass: 33:48,35:48,37-38:48,43-47:48,58:48,61:48,63-64:48,126:48
+--- xterm-212/XTerm.ad.redhat-resources	2006-04-13 13:40:45.000000000 -0400
++++ xterm-212/XTerm.ad	2006-04-13 13:46:07.000000000 -0400
+@@ -186,3 +186,9 @@
+ !
+ ! Alternatively,
+ !*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
 +
 +! Red Hat Defaults:
 +*VT100*eightBitInput: 0
 +*VT100*backarrowKey:  0
 +*VT100*scrollBar:     1
++*VT100*utf8Title:     1


Index: xterm.spec
===================================================================
RCS file: /cvs/dist/rpms/xterm/FC-4/xterm.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xterm.spec	7 Mar 2006 22:12:40 -0000	1.20
+++ xterm.spec	13 Apr 2006 20:10:25 -0000	1.21
@@ -1,10 +1,14 @@
 %define _x11bindir /usr/X11R6/bin
 %define _x11datadir /usr/X11R6/lib
+%{?!_with_256_color: %define _with_256_color 1}
+%{?!_with_tek4014: %define _with_tek4014 1}
+%{?!DEBUGINFO:     %define DEBUGINFO    1}
+%{?!enable_trace:  %define enable_trace 0}
 
 Summary: xterm terminal emulator for the X Window System
 Name: xterm
-Version: 208
-Release: 4.FC4
+Version: 212
+Release: 1.FC4
 URL: http://dickey.his.com/xterm
 License: MIT
 Group: User Interface/X
@@ -19,6 +23,8 @@
 Patch6: xterm-208-bz180450.patch
 Patch7: xterm-208-bz182382.patch
 Patch8: xterm-208-reverse-video-set-cursor-gcs.patch
+Patch9: xterm-212-bz186935.patch
+Patch10:xterm-212-man-page_paths.patch
 BuildRequires: xorg-x11-devel >= 6.7.0
 BuildRequires: utempter libtermcap-devel
 
@@ -40,14 +46,25 @@
 %patch3 -p1 -b .tty-group-name
 %patch4 -p1 -b .appsdir
 %patch5 -p1 -b .root-grab-console
-%patch6 -p1 -b .bz180450
-%patch7 -p1 -b .bz182382
-%patch8 -p1 -b .bz183993
+#%patch6 -p1 -b .bz180450
+#      ^- patch now upstream
+#%patch7 -p1 -b .bz182382
+#      ^- patch now upstream
+#%patch8 -p1 -b .bz183993
+#      ^- patch now upstream
+%patch9 -p1 -b .bz186935
+%patch10 -p1 -b .man-page_paths
 
-%{?!_with_256_color: %define _with_256_color 1}
-%{?!_with_tek4014: %define _with_tek4014 1}
+%if !%{DEBUGINFO}
+%define debug_package %{nil}
+%endif
 
 %build
+%if %{DEBUGINFO}
+export CFLAGS="$RPM_OPT_FLAGS"
+%else
+export CFLAGS=`echo $RPM_OPT_FLAGS | sed 's/-O2 -g/-g3 -gdwarf-2/g'`;
+%endif
 %configure --enable-luit \
            --enable-warnings \
            --enable-wide-chars \
@@ -58,13 +75,16 @@
 %if %{_with_256_color}
            --enable-256-color \
 %endif
+%if %{enable_trace}
+	   --enable-trace \
+%endif
 ;
 export XTERM_TTY_GROUP_NAME=tty;
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall appsdir=$RPM_BUILD_ROOT/%{_x11datadir}/X11/app-defaults
+%makeinstall appsdir=$RPM_BUILD_ROOT/%{_x11datadir}/X11/app-defaults apploaddir=%{_x11datadir}/X11/app-defaults
 #install-ti
 
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
@@ -79,9 +99,13 @@
   mkdir -p $RPM_BUILD_ROOT%{_x11bindir}
   ln -sf ../../bin/xterm $RPM_BUILD_ROOT%{_x11bindir}/xterm
 }
+%if !%{DEBUGINFO}
+/usr/lib/rpm/brp-compress
+exit 0
+%endif
 
 %clean
-#rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
@@ -96,6 +120,13 @@
 %{_x11bindir}/xterm
 
 %changelog
+* Thu Apr 13 2006 Jason Vas Dias <jvdias at redhat.com> - 212-1
+- Upgrade to upstream version 212
+- fix bug 188031 : paths in man-page 
+- fix bug 186935 : segfault on VisualBell in `screen' 
+- fix bug 186170 : revert charClass uncommenting 
+- fix bug 186094 : utfTitle
+
 * Tue Mar 07 2006 Jason Vas Dias <jvdias at redhat.com> - 208-4.FC4
 - fix bug 183993: call set_cursor_gcs in ReverseVideo
 



From fedora-cvs-commits at redhat.com  Thu Apr 13 20:33:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 16:33:54 -0400
Subject: rpms/selinux-policy/devel policy-20060411.patch, 1.2,
	1.3 selinux-policy.spec, 1.172, 1.173 policy-20060323.patch,
	1.12, NONE
Message-ID: <200604132033.k3DKXsbu001377@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20060411.patch selinux-policy.spec 
Removed Files:
	policy-20060323.patch 
Log Message:
* Thu Apr 14 2006 Dan Walsh <dwalsh at redhat.com> 2.2.31-1
- Update to latest from upstream
- Allow mono and unconfined to talk to initrc_t dbus objects


policy-20060411.patch:
 mcs                            |    6 +++-
 modules/admin/amanda.te        |    5 ++-
 modules/admin/bootloader.te    |    1 
 modules/admin/rpm.fc           |    1 
 modules/admin/su.fc            |    2 -
 modules/admin/usermanage.te    |    1 
 modules/apps/java.fc           |    9 ++----
 modules/apps/java.te           |    1 
 modules/apps/mono.te           |    6 ++++
 modules/kernel/corecommands.fc |   20 ++++++++------
 modules/kernel/devices.fc      |    3 +-
 modules/kernel/devices.if      |   24 +++++++++++++++--
 modules/kernel/files.fc        |   37 +++++++++++++++++---------
 modules/kernel/files.if        |   27 +++++++++++++++++++
 modules/kernel/kernel.if       |    3 +-
 modules/kernel/mcs.te          |    4 ++
 modules/kernel/mls.te          |    1 
 modules/services/avahi.te      |    1 
 modules/services/bind.fc       |    1 
 modules/services/hal.te        |    1 
 modules/services/kerberos.fc   |    4 +-
 modules/services/mailman.if    |   38 +++++++++++++++++++++++++++
 modules/services/postfix.te    |    3 ++
 modules/services/rpc.te        |    4 +-
 modules/services/samba.if      |    1 
 modules/services/samba.te      |    7 +++++
 modules/services/tftp.fc       |    3 +-
 modules/services/xserver.if    |   21 +++++++++++++++
 modules/system/authlogin.fc    |    3 +-
 modules/system/daemontools.fc  |    3 +-
 modules/system/fstools.te      |    1 
 modules/system/init.te         |    1 
 modules/system/libraries.fc    |   57 +++++++++++++++++++++++------------------
 modules/system/miscfiles.fc    |    2 -
 modules/system/modutils.fc     |    6 ++--
 modules/system/selinuxutil.if  |    7 ++---
 modules/system/unconfined.te   |    2 +
 modules/system/userdomain.if   |   20 ++++++++++++++
 modules/system/xen.te          |    5 +++
 39 files changed, 271 insertions(+), 71 deletions(-)

Index: policy-20060411.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060411.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- policy-20060411.patch	11 Apr 2006 21:58:53 -0000	1.2
+++ policy-20060411.patch	13 Apr 2006 20:33:48 -0000	1.3
@@ -1,5 +1,558 @@
---- serefpolicy-2.2.30/policy/modules/services/rpc.te~	2006-04-11 06:35:47.000000000 -0400
-+++ serefpolicy-2.2.30/policy/modules/services/rpc.te	2006-04-11 11:21:31.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.31/policy/mcs
+--- nsaserefpolicy/policy/mcs	2006-03-29 11:23:41.000000000 -0500
++++ serefpolicy-2.2.31/policy/mcs	2006-04-13 12:53:30.000000000 -0400
+@@ -134,14 +134,18 @@
+ # the high range of the file.  We use the high range of the process so
+ # that processes can always simply run at s0.
+ #
+-# Only files are constrained by MCS at this stage.
++# Note that getattr on files is always permitted.
+ #
+ mlsconstrain file { write setattr append unlink link rename ioctl lock execute relabelfrom }
+ 	( h1 dom h2 );
+ 
++# New filesystem object labels must be dominated by the relabeling subject
++# clearance, also the objects are single-level.
+ mlsconstrain file { create relabelto }
+ 	(( h1 dom h2 ) and ( l2 eq h2 ));
+ 
++# At this time we do not restrict "ps" type operations via MCS.  This
++# will probably change in future.
+ mlsconstrain file { read }
+ 	(( h1 dom h2 ) or ( t2 == domain ) or ( t1 == mlsfileread ));
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.2.31/policy/modules/admin/amanda.te
+--- nsaserefpolicy/policy/modules/admin/amanda.te	2006-03-24 11:15:40.000000000 -0500
++++ serefpolicy-2.2.31/policy/modules/admin/amanda.te	2006-04-13 12:53:30.000000000 -0400
+@@ -9,6 +9,7 @@
+ type amanda_t;
+ type amanda_inetd_exec_t;
+ inetd_udp_service_domain(amanda_t,amanda_inetd_exec_t)
++inetd_tcp_service_domain(amanda_t,amanda_inetd_exec_t)
+ role system_r types amanda_t;
+ 
+ type amanda_exec_t;
+@@ -183,13 +184,15 @@
+ 
+ optional_policy(`
+ 	nscd_socket_use(amanda_t)
++	nscd_socket_use(amanda_recover_t)
+ ')
+ 
+ ########################################
+ #
+ # Amanda recover local policy
+ 
+-allow amanda_recover_t self:capability { fowner fsetid kill setgid setuid chown dac_override net_bind_service };
++allow amanda_recover_t self:capability { fowner fsetid kill setgid setuid chown dac_override };
++corenet_tcp_bind_reserved_port(amanda_recover_t)
+ allow amanda_recover_t self:process { sigkill sigstop signal };
+ allow amanda_recover_t self:fifo_file { getattr ioctl read write };
+ allow amanda_recover_t self:unix_stream_socket { connect create read write };
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.31/policy/modules/admin/bootloader.te
+--- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-04-04 18:06:37.000000000 -0400
++++ serefpolicy-2.2.31/policy/modules/admin/bootloader.te	2006-04-13 12:53:30.000000000 -0400
+@@ -84,6 +84,7 @@
+ dev_read_sysfs(bootloader_t)
+ # for reading BIOS data
+ dev_read_raw_memory(bootloader_t)
++mls_file_read_up(bootloader_t)
+ 
+ fs_getattr_xattr_fs(bootloader_t)
+ fs_read_tmpfs_symlinks(bootloader_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.2.31/policy/modules/admin/rpm.fc
+--- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-04-04 18:06:37.000000000 -0400
++++ serefpolicy-2.2.31/policy/modules/admin/rpm.fc	2006-04-13 12:53:30.000000000 -0400
+@@ -10,6 +10,7 @@
+ /usr/lib(64)?/rpm/rpmv		-- 	gen_context(system_u:object_r:bin_t,s0)
+ 
+ /usr/share/yumex/yumex		--	gen_context(system_u:object_r:rpm_exec_t,s0)
++/usr/sbin/system-install-packages --	gen_context(system_u:object_r:rpm_exec_t,s0)
+ 
+ ifdef(`distro_redhat', `
+ /usr/bin/fedora-rmdevelrpms	--	gen_context(system_u:object_r:rpm_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.fc serefpolicy-2.2.31/policy/modules/admin/su.fc
+--- nsaserefpolicy/policy/modules/admin/su.fc	2006-03-23 14:33:29.000000000 -0500
++++ serefpolicy-2.2.31/policy/modules/admin/su.fc	2006-04-13 12:53:30.000000000 -0400
+@@ -1,5 +1,5 @@
+ 
+ /bin/su			--	gen_context(system_u:object_r:su_exec_t,s0)
+ 
+-/usr(/local)?/bin/ksu	--	gen_context(system_u:object_r:su_exec_t,s0)
++/usr/(local/)?bin/ksu	--	gen_context(system_u:object_r:su_exec_t,s0)
+ /usr/bin/kdesu		--	gen_context(system_u:object_r:su_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.2.31/policy/modules/admin/usermanage.te
+--- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-04-04 18:06:38.000000000 -0400
++++ serefpolicy-2.2.31/policy/modules/admin/usermanage.te	2006-04-13 12:53:30.000000000 -0400
+@@ -514,6 +514,7 @@
+ # Add/remove user home directories
+ userdom_home_filetrans_generic_user_home_dir(useradd_t)
+ userdom_manage_generic_user_home_content_dirs(useradd_t)
++userdom_manage_staff_home_dir(useradd_t)
+ userdom_generic_user_home_dir_filetrans_generic_user_home_content(useradd_t,notdevfile_class_set)
+ 
+ mta_manage_spool(useradd_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.2.31/policy/modules/apps/java.fc
+--- nsaserefpolicy/policy/modules/apps/java.fc	2006-04-12 13:44:36.000000000 -0400
++++ serefpolicy-2.2.31/policy/modules/apps/java.fc	2006-04-13 16:12:57.000000000 -0400
+@@ -1,11 +1,8 @@
+ #
+-# /opt
+-#
+-/opt(/.*)?/bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
+-
+-#
+ # /usr
+ #
+-/usr(/.*)?/bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
++/usr/(.*/)?bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
++/usr/lib(.*/)?bin/java([^/]*)? 	--	gen_context(system_u:object_r:java_exec_t,s0)
+ /usr/bin/gcj-dbtool	--	gen_context(system_u:object_r:java_exec_t,s0)
+ /usr/bin/gij		--	gen_context(system_u:object_r:java_exec_t,s0)
++/opt/(.*/)?bin/java([^/]*)? 	--	gen_context(system_u:object_r:java_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-2.2.31/policy/modules/apps/java.te
+--- nsaserefpolicy/policy/modules/apps/java.te	2006-04-12 13:44:36.000000000 -0400
++++ serefpolicy-2.2.31/policy/modules/apps/java.te	2006-04-13 15:36:02.000000000 -0400
+@@ -10,6 +10,7 @@
+ domain_type(java_t)
+ 
+ type java_exec_t;
++init_system_domain(java_t,java_exec_t)
+ files_type(java_exec_t)
+ 
+ ########################################
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.2.31/policy/modules/apps/mono.te
+--- nsaserefpolicy/policy/modules/apps/mono.te	2006-04-12 13:44:36.000000000 -0400
++++ serefpolicy-2.2.31/policy/modules/apps/mono.te	2006-04-13 16:32:05.000000000 -0400
+@@ -22,6 +22,8 @@
+ 	unconfined_domain_noaudit(mono_t)
+ 	role system_r types mono_t;
+ 
++	init_dbus_chat_script(mono_t)
++
+ 	optional_policy(`
+ 		avahi_dbus_chat(mono_t)
+ 	')
+@@ -29,4 +31,8 @@
+ 	optional_policy(`
+ 		hal_dbus_chat(mono_t)
+ 	')
++	optional_policy(`
++		networkmanager_dbus_chat(mono_t)
++	')
++
+ ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.2.31/policy/modules/kernel/corecommands.fc
+--- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-04-10 17:05:08.000000000 -0400
++++ serefpolicy-2.2.31/policy/modules/kernel/corecommands.fc	2006-04-13 14:39:12.000000000 -0400
+@@ -2,7 +2,8 @@
+ #
+ # /bin
+ #
+-/bin(/.*)?				gen_context(system_u:object_r:bin_t,s0)
++/bin				-d	gen_context(system_u:object_r:bin_t,s0)
++/bin/.*					gen_context(system_u:object_r:bin_t,s0)
+ /bin/d?ash			--	gen_context(system_u:object_r:shell_exec_t,s0)
+ /bin/bash			--	gen_context(system_u:object_r:shell_exec_t,s0)
+ /bin/bash2			--	gen_context(system_u:object_r:shell_exec_t,s0)
+@@ -86,27 +87,30 @@
+ #
+ # /sbin
+ #
+-/sbin(/.*)?				gen_context(system_u:object_r:sbin_t,s0)
++/sbin				-d	gen_context(system_u:object_r:sbin_t,s0)
++/sbin/.*				gen_context(system_u:object_r:sbin_t,s0)
+ /sbin/mkfs\.cramfs		--	gen_context(system_u:object_r:sbin_t,s0)
+ /sbin/insmod_ksymoops_clean	--	gen_context(system_u:object_r:sbin_t,s0)
+ 
+ #
+ # /opt
+ #
+-/opt(/.*)?/bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
++/opt/(.*/)?bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
+ 
+-/opt(/.*)?/libexec(/.*)?		gen_context(system_u:object_r:bin_t,s0)
++/opt/(.*/)?libexec(/.*)?		gen_context(system_u:object_r:bin_t,s0)
+ 
+-/opt(/.*)?/sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
++/opt/(.*/)?sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
+ 
+ #
+ # /usr
+ #
+-/usr(/.*)?/Bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
++/usr/(.*/)?Bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
+ 
+-/usr(/.*)?/bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
++/usr/(.*/)?bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
++/usr/lib(.*/)?bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
+ 
+-/usr(/.*)?/sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
++/usr/(.*/)?sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
++/usr/lib(.*/)?sbin(/.*)?		gen_context(system_u:object_r:sbin_t,s0)
+ 
+ /usr/lib/ccache/bin(/.*)?		gen_context(system_u:object_r:bin_t,s0)
+ /usr/lib/pgsql/test/regress/.*\.sh --	gen_context(system_u:object_r:bin_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.31/policy/modules/kernel/devices.fc
+--- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-04-12 13:44:36.000000000 -0400
++++ serefpolicy-2.2.31/policy/modules/kernel/devices.fc	2006-04-13 12:53:30.000000000 -0400
+@@ -1,5 +1,6 @@
+ 
+-/dev(/.*)?			gen_context(system_u:object_r:device_t,s0)
++/dev			-d	gen_context(system_u:object_r:device_t,s0)
++/dev/.*				gen_context(system_u:object_r:device_t,s0)
+ 
+ /dev/.*mouse.*		-c	gen_context(system_u:object_r:mouse_device_t,s0)
+ /dev/adsp		-c	gen_context(system_u:object_r:sound_device_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.31/policy/modules/kernel/devices.if
+--- nsaserefpolicy/policy/modules/kernel/devices.if	2006-04-12 13:44:36.000000000 -0400
++++ serefpolicy-2.2.31/policy/modules/kernel/devices.if	2006-04-13 12:53:30.000000000 -0400
+@@ -2701,7 +2701,7 @@
+ 	')
+ 
+ 	allow $1 device_t:dir r_dir_perms;
+-	allow $1 xen_device_t:chr_file r_file_perms;
++	allow $1 xen_device_t:chr_file rw_file_perms;
+ ')
+ 
+ ########################################
+@@ -2720,7 +2720,7 @@
+ 	')
+ 
+ 	allow $1 device_t:dir r_dir_perms;
+-	allow $1 xen_device_t:chr_file r_file_perms;
++	allow $1 xen_device_t:chr_file manage_file_perms;
+ ')
+ 
+ ########################################
+@@ -2874,3 +2874,23 @@
+ 
+ 	typeattribute $1 devices_unconfined_type;
+ ')
++
++########################################
++## <summary>
++##	Dontaudit getattr on all device nodes.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`dev_dontaudit_getattr_all_device_nodes',`
++	gen_require(`
++		attribute device_node;
++	')
++
++	dontaudit $1 device_t:dir_file_class_set getattr;
++	dontaudit $1 device_node:dir_file_class_set getattr;
++')
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.31/policy/modules/kernel/files.fc
+--- nsaserefpolicy/policy/modules/kernel/files.fc	2006-03-23 14:33:29.000000000 -0500
++++ serefpolicy-2.2.31/policy/modules/kernel/files.fc	2006-04-13 12:53:30.000000000 -0400
+@@ -25,7 +25,8 @@
+ #
+ # /boot
+ #
+-/boot(/.*)?			gen_context(system_u:object_r:boot_t,s0)
++/boot			-d	gen_context(system_u:object_r:boot_t,s0)
++/boot/.*			gen_context(system_u:object_r:boot_t,s0)
+ /boot/\.journal			<<none>>
+ /boot/lost\+found	-d	gen_context(system_u:object_r:lost_found_t,s15:c0.c255)
+ /boot/lost\+found/.*		<<none>>
+@@ -36,13 +37,15 @@
+ #
+ 
+ ifdef(`distro_redhat',`
+-/emul(/.*)?			gen_context(system_u:object_r:usr_t,s0)
++/emul			-d	gen_context(system_u:object_r:usr_t,s0)
++/emul/.*			gen_context(system_u:object_r:usr_t,s0)
+ ')
+ 
+ #
+ # /etc
+ #
+-/etc(/.*)?			gen_context(system_u:object_r:etc_t,s0)
++/etc			-d	gen_context(system_u:object_r:etc_t,s0)
++/etc/.*				gen_context(system_u:object_r:etc_t,s0)
+ /etc/\.fstab\.hal\..+	--	gen_context(system_u:object_r:etc_runtime_t,s0)
+ /etc/asound\.state	--	gen_context(system_u:object_r:etc_runtime_t,s0)
+ /etc/blkid(/.*)?		gen_context(system_u:object_r:etc_runtime_t,s0)
+@@ -104,7 +107,8 @@
+ #
+ # /lib(64)?
+ #
+-/lib(64)?/modules(/.*)?		gen_context(system_u:object_r:modules_object_t,s0)
++/lib/modules(/.*)?		gen_context(system_u:object_r:modules_object_t,s0)
++/lib64/modules(/.*)?		gen_context(system_u:object_r:modules_object_t,s0)
+ 
+ #
+ # /lost+found
+@@ -139,29 +143,34 @@
+ #
+ # /opt
+ #
+-/opt(/.*)?			gen_context(system_u:object_r:usr_t,s0)
++/opt			-d	gen_context(system_u:object_r:usr_t,s0)
++/opt/.*				gen_context(system_u:object_r:usr_t,s0)
+ 
+-/opt(/.*)?/var/lib(64)?(/.*)?	gen_context(system_u:object_r:var_lib_t,s0)
++/opt/(.*/)?var/lib(64)?(/.*)?	gen_context(system_u:object_r:var_lib_t,s0)
+ 
+ #
+ # /proc
+ #
+-/proc(/.*)?                     <<none>>
++/proc			-d	<<none>>
++/proc/.*			<<none>>
+ 
+ #
+ # /selinux
+ #
+-/selinux(/.*)?                  <<none>>
++/selinux		-d	<<none>>
++/selinux/.*			<<none>>
+ 
+ #
+ # /srv
+ #
+-/srv(/.*)?			gen_context(system_u:object_r:var_t,s0)
++/srv			-d	gen_context(system_u:object_r:var_t,s0)
++/srv/.*				gen_context(system_u:object_r:var_t,s0)
+ 
+ #
+ # /sys
+ #
+-/sys(/.*)?                      <<none>>
++/sys			-d	<<none>>
++/sys/.*				<<none>>
+ 
+ #
+ # /tmp
+@@ -176,7 +185,8 @@
+ #
+ # /usr
+ #
+-/usr(/.*)?			gen_context(system_u:object_r:usr_t,s0)
++/usr			-d	gen_context(system_u:object_r:usr_t,s0)
++/usr/.*				gen_context(system_u:object_r:usr_t,s0)
+ /usr/\.journal			<<none>>
+ 
+ /usr/doc(/.*)?/lib(/.*)?		gen_context(system_u:object_r:usr_t,s0)
+@@ -200,7 +210,7 @@
+ /usr/share(/.*)?/lib(64)?(/.*)?	gen_context(system_u:object_r:usr_t,s0)
+ 
+ /usr/src(/.*)?			gen_context(system_u:object_r:src_t,s0)
+-/usr/src(/.*)?/lib(/.*)?		gen_context(system_u:object_r:usr_t,s0)
++/usr/src/kernels/.+/lib(/.*)?		gen_context(system_u:object_r:usr_t,s0)
+ 
+ /usr/tmp			-d	gen_context(system_u:object_r:tmp_t,s0-s15:c0.c255)
+ /usr/tmp/.*			<<none>>
+@@ -208,7 +218,8 @@
+ #
+ # /var
+ #
+-/var(/.*)?			gen_context(system_u:object_r:var_t,s0)
++/var			-d	gen_context(system_u:object_r:var_t,s0)
++/var/.*				gen_context(system_u:object_r:var_t,s0)
+ /var/\.journal			<<none>>
+ 
+ /var/db/.*\.db		--	gen_context(system_u:object_r:etc_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.31/policy/modules/kernel/files.if
+--- nsaserefpolicy/policy/modules/kernel/files.if	2006-04-10 17:05:10.000000000 -0400
++++ serefpolicy-2.2.31/policy/modules/kernel/files.if	2006-04-13 12:53:30.000000000 -0400
+@@ -948,6 +948,18 @@
+ 
+ ########################################
+ #
++# files_stat_all_mountpoints(domain)
++#
++interface(`files_stat_all_mountpoints',`
++	gen_require(`
++		attribute mountpoint;
++	')
++
++	allow $1 mountpoint:dir { getattr };
++')
++
++########################################
++#
+ # files_list_root(domain)
+ #
+ interface(`files_list_root',`
+@@ -1661,6 +1673,21 @@
+ ')
+ 
+ ########################################
++#
++# files_unlink_boot_flag(domain)
++#
++# /halt, /.autofsck, etc
++#
++interface(`files_unlink_boot_flag',`
++	gen_require(`
++		type root_t;
++	')
++
++	allow $1 root_t:file unlink;
++')
++
++
++########################################
+ ## <summary>
+ ##	Read files in /etc that are dynamically
+ ##	created on boot, such as mtab.
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.31/policy/modules/kernel/kernel.if
+--- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-04-10 17:05:10.000000000 -0400
++++ serefpolicy-2.2.31/policy/modules/kernel/kernel.if	2006-04-13 15:25:54.000000000 -0400
+@@ -1148,7 +1148,8 @@
+ 
+ 	allow $1 proc_t:dir search;
+ 	allow $1 sysctl_t:dir r_dir_perms;
+-	allow $1 sysctl_vm_t:dir list_dir_perms;
++#hal needs allow hald_t sysctl_vm_t:dir write;
++	allow $1 sysctl_vm_t:dir rw_dir_perms;
+ 	allow $1 sysctl_vm_t:file rw_file_perms;
+ ')
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mcs.te serefpolicy-2.2.31/policy/modules/kernel/mcs.te
+--- nsaserefpolicy/policy/modules/kernel/mcs.te	2006-04-04 18:06:38.000000000 -0400
++++ serefpolicy-2.2.31/policy/modules/kernel/mcs.te	2006-04-13 12:53:30.000000000 -0400
+@@ -32,6 +32,10 @@
+ type xdm_exec_t;
+ 
+ ifdef(`enable_mcs',`
++# The eventual plan is to have a range_transition to s0 for the daemon by
++# default and have the daemons which need to run with all categories be
++# exceptions.  But while range_transitions have to be in the base module
++# this is not possible.
+ range_transition getty_t login_exec_t s0 - s0:c0.c255;
+ range_transition init_t xdm_exec_t s0 - s0:c0.c255;
+ range_transition initrc_t crond_exec_t s0 - s0:c0.c255;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.31/policy/modules/kernel/mls.te
+--- nsaserefpolicy/policy/modules/kernel/mls.te	2006-03-07 10:31:09.000000000 -0500
++++ serefpolicy-2.2.31/policy/modules/kernel/mls.te	2006-04-13 12:53:30.000000000 -0400
+@@ -60,6 +60,7 @@
+ 
+ ifdef(`enable_mls',`
+ range_transition initrc_t auditd_exec_t s15:c0.c255;
++range_transition secadm_t auditctl_exec_t s15:c0.c255;
+ range_transition kernel_t init_exec_t s0 - s15:c0.c255;
+ range_transition kernel_t lvm_exec_t s0 - s15:c0.c255;
+ ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.2.31/policy/modules/services/avahi.te
+--- nsaserefpolicy/policy/modules/services/avahi.te	2006-03-24 11:15:50.000000000 -0500
++++ serefpolicy-2.2.31/policy/modules/services/avahi.te	2006-04-13 16:17:29.000000000 -0400
+@@ -92,6 +92,7 @@
+ 	dbus_system_bus_client_template(avahi,avahi_t)
+ 	dbus_connect_system_bus(avahi_t)
+ 	dbus_send_system_bus(avahi_t)
++	init_dbus_chat_script(avahi_t)
+ ')
+ 
+ optional_policy(`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.fc serefpolicy-2.2.31/policy/modules/services/bind.fc
+--- nsaserefpolicy/policy/modules/services/bind.fc	2006-01-16 17:04:24.000000000 -0500
++++ serefpolicy-2.2.31/policy/modules/services/bind.fc	2006-04-13 12:53:30.000000000 -0400
+@@ -29,6 +29,7 @@
+ 
+ ifdef(`distro_redhat',`
+ /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)
+ /var/named/data(/.*)?		gen_context(system_u:object_r:named_cache_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.31/policy/modules/services/hal.te
+--- nsaserefpolicy/policy/modules/services/hal.te	2006-04-12 13:44:37.000000000 -0400
++++ serefpolicy-2.2.31/policy/modules/services/hal.te	2006-04-13 12:53:30.000000000 -0400
+@@ -103,6 +103,7 @@
+ fs_getattr_all_fs(hald_t)
+ fs_search_all(hald_t)
+ fs_list_auto_mountpoints(hald_t)
++files_stat_all_mountpoints(hald_t)
+ 
+ mls_file_read_up(hald_t)
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.fc serefpolicy-2.2.31/policy/modules/services/kerberos.fc
+--- nsaserefpolicy/policy/modules/services/kerberos.fc	2005-10-06 17:29:17.000000000 -0400
++++ serefpolicy-2.2.31/policy/modules/services/kerberos.fc	2006-04-13 12:53:30.000000000 -0400
+@@ -5,8 +5,8 @@
+ /etc/krb5kdc/kadm5.keytab 	--	gen_context(system_u:object_r:krb5_keytab_t,s0)
+ /etc/krb5kdc/principal.*		gen_context(system_u:object_r:krb5kdc_principal_t,s0)
+ 
+-/usr(/local)?(/kerberos)?/sbin/krb5kdc -- gen_context(system_u:object_r:krb5kdc_exec_t,s0)
+-/usr(/local)?(/kerberos)?/sbin/kadmind -- gen_context(system_u:object_r:kadmind_exec_t,s0)
++/usr/(local/)?(kerberos/)?sbin/krb5kdc -- gen_context(system_u:object_r:krb5kdc_exec_t,s0)
++/usr/(local/)?(kerberos/)?sbin/kadmind -- gen_context(system_u:object_r:kadmind_exec_t,s0)
+ 
+ /usr/local/var/krb5kdc(/.*)?		gen_context(system_u:object_r:krb5kdc_conf_t,s0)
+ /usr/local/var/krb5kdc/principal.*	gen_context(system_u:object_r:krb5kdc_principal_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-2.2.31/policy/modules/services/mailman.if
+--- nsaserefpolicy/policy/modules/services/mailman.if	2006-03-24 11:15:50.000000000 -0500
++++ serefpolicy-2.2.31/policy/modules/services/mailman.if	2006-04-13 12:53:30.000000000 -0400
+@@ -200,6 +200,44 @@
+ 
+ #######################################
+ ## <summary>
++##	Allow domain to to create mailman data files and write the directory
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`mailman_create_data_file',`
++	gen_require(`
++		type mailman_data_t;
++	')
++
++	allow $1 mailman_data_t:dir rw_dir_perms;
++	allow $1 mailman_data_t:file create_file_perms;
++')
++
++#######################################
++## <summary>
++##	Allow domain to to read mailman data files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`mailman_read_data_file',`
++	gen_require(`
++		type mailman_data_t;
++	')
++
++	allow $1 mailman_data_t:dir search_dir_perms;
++	allow $1 mailman_data_t:file read_file_perms;
++')
++
++#######################################
++## <summary>
+ ##	List the contents of mailman data directories.
+ ## </summary>
+ ## <param name="domain">
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.31/policy/modules/services/postfix.te
+--- nsaserefpolicy/policy/modules/services/postfix.te	2006-04-04 18:06:38.000000000 -0400
++++ serefpolicy-2.2.31/policy/modules/services/postfix.te	2006-04-13 12:53:30.000000000 -0400
+@@ -408,6 +408,9 @@
+ 
+ optional_policy(`
+ 	mailman_domtrans_queue(postfix_pipe_t)
++#	for postalias
++	mailman_create_data_file(postfix_master_t)
++	mailman_read_data_file(postfix_local_t)
+ ')
+ 
+ ########################################
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.2.31/policy/modules/services/rpc.te
+--- nsaserefpolicy/policy/modules/services/rpc.te	2006-03-24 11:15:50.000000000 -0500
++++ serefpolicy-2.2.31/policy/modules/services/rpc.te	2006-04-13 12:53:30.000000000 -0400
 @@ -110,13 +110,13 @@
  portmap_udp_chat(nfsd_t)
  
@@ -16,8 +569,9 @@
  ')
  
  ########################################
---- serefpolicy-2.2.30/policy/modules/services/samba.if~	2006-04-11 06:35:48.000000000 -0400
-+++ serefpolicy-2.2.30/policy/modules/services/samba.if	2006-04-11 11:07:50.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-2.2.31/policy/modules/services/samba.if
+--- nsaserefpolicy/policy/modules/services/samba.if	2006-02-21 14:35:36.000000000 -0500
++++ serefpolicy-2.2.31/policy/modules/services/samba.if	2006-04-13 12:53:30.000000000 -0400
 @@ -33,6 +33,7 @@
  	')
  
@@ -26,19 +580,348 @@
  		userdom_manage_user_home_content_files($1,smbd_t)
  		userdom_manage_user_home_content_symlinks($1,smbd_t)
  		userdom_manage_user_home_content_sockets($1,smbd_t)
---- serefpolicy-2.2.30/policy/modules/system/libraries.fc~	2006-04-11 16:59:02.000000000 -0400
-+++ serefpolicy-2.2.30/policy/modules/system/libraries.fc	2006-04-11 17:26:42.000000000 -0400
-@@ -55,8 +55,11 @@
- /usr/(.*/)?java/.*\.jar			--	gen_context(system_u:object_r:shlib_t,s0)
- /usr/(.*/)?java/.*\.jsa			--	gen_context(system_u:object_r:shlib_t,s0)
- 
--/usr/(.*/)?lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
--/usr/(.*/)?lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
-+/usr/lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
-+/usr/local/lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.31/policy/modules/services/samba.te
+--- nsaserefpolicy/policy/modules/services/samba.te	2006-04-12 13:44:37.000000000 -0400
++++ serefpolicy-2.2.31/policy/modules/services/samba.te	2006-04-13 12:53:30.000000000 -0400
+@@ -333,6 +333,13 @@
+ ')
+ allow smbd_t mtrr_device_t:file getattr;
+ 
++# Support Samba sharing of NFS mount points
++bool samba_share_nfs false;
++if (samba_share_nfs) {
++fs_manage_nfs_dirs(smbd_t)
++fs_manage_nfs_files(smbd_t)
++}
++
+ ########################################
+ #
+ # nmbd Local policy
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.fc serefpolicy-2.2.31/policy/modules/services/tftp.fc
+--- nsaserefpolicy/policy/modules/services/tftp.fc	2005-10-06 17:29:17.000000000 -0400
++++ serefpolicy-2.2.31/policy/modules/services/tftp.fc	2006-04-13 12:53:30.000000000 -0400
+@@ -2,4 +2,5 @@
+ /usr/sbin/atftpd	--	gen_context(system_u:object_r:tftpd_exec_t,s0)
+ /usr/sbin/in\.tftpd	--	gen_context(system_u:object_r:tftpd_exec_t,s0)
+ 
+-/tftpboot(/.*)?			gen_context(system_u:object_r:tftpdir_t,s0)
++/tftpboot		-d	gen_context(system_u:object_r:tftpdir_t,s0)
++/tftpboot/.*			gen_context(system_u:object_r:tftpdir_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.31/policy/modules/services/xserver.if
+--- nsaserefpolicy/policy/modules/services/xserver.if	2006-04-06 15:31:54.000000000 -0400
++++ serefpolicy-2.2.31/policy/modules/services/xserver.if	2006-04-13 12:53:30.000000000 -0400
+@@ -1070,3 +1070,24 @@
+ 
+ 	dontaudit $1 xdm_xserver_t:tcp_socket { read write };
+ ')
++
++########################################
++## <summary>
++##	Allow read and write to
++##	a XDM X server socket.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to allow
++##	</summary>
++## </param>
++#
++interface(`xserver_rw_xdm_sockets',`
++	gen_require(`
++		type xdm_xserver_tmp_t;
++	')
 +
-+/usr/lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
-+/usr/local/lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
++	allow $1 xdm_xserver_tmp_t:dir search;
++	allow $1 xdm_xserver_tmp_t:sock_file { read write };
++')
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.fc serefpolicy-2.2.31/policy/modules/system/authlogin.fc
+--- nsaserefpolicy/policy/modules/system/authlogin.fc	2006-01-19 17:48:34.000000000 -0500
++++ serefpolicy-2.2.31/policy/modules/system/authlogin.fc	2006-04-13 12:53:30.000000000 -0400
+@@ -7,7 +7,8 @@
+ /etc/passwd\.lock	--	gen_context(system_u:object_r:shadow_t,s0)
+ /etc/shadow.*		--	gen_context(system_u:object_r:shadow_t,s0)
+ 
+-/lib(64)?/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:pam_exec_t,s0)
++/lib/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:pam_exec_t,s0)
++/lib64/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:pam_exec_t,s0)
+ 
+ /sbin/pam_console_apply	 --	gen_context(system_u:object_r:pam_console_exec_t,s0)
+ /sbin/pam_timestamp_check --	gen_context(system_u:object_r:pam_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/daemontools.fc serefpolicy-2.2.31/policy/modules/system/daemontools.fc
+--- nsaserefpolicy/policy/modules/system/daemontools.fc	2006-04-05 11:35:09.000000000 -0400
++++ serefpolicy-2.2.31/policy/modules/system/daemontools.fc	2006-04-13 12:53:30.000000000 -0400
+@@ -2,7 +2,8 @@
+ # /service
+ #
+ 
+-/service(/.*)?			gen_context(system_u:object_r:svc_svc_t,s0)
++/service		-d	gen_context(system_u:object_r:svc_svc_t,s0)
++/service/.*			gen_context(system_u:object_r:svc_svc_t,s0)
+ 
+ #
+ # /usr
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.31/policy/modules/system/fstools.te
+--- nsaserefpolicy/policy/modules/system/fstools.te	2006-04-04 18:06:38.000000000 -0400
++++ serefpolicy-2.2.31/policy/modules/system/fstools.te	2006-04-13 12:53:30.000000000 -0400
+@@ -77,6 +77,7 @@
+ dev_getattr_usbfs_dirs(fsadm_t)
+ # Access to /dev/mapper/control
+ dev_rw_lvm_control(fsadm_t)
++dev_dontaudit_getattr_all_device_nodes(fsadm_t)
+ 
+ fs_search_auto_mountpoints(fsadm_t)
+ fs_getattr_xattr_fs(fsadm_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.31/policy/modules/system/init.te
+--- nsaserefpolicy/policy/modules/system/init.te	2006-04-06 15:32:43.000000000 -0400
++++ serefpolicy-2.2.31/policy/modules/system/init.te	2006-04-13 12:53:30.000000000 -0400
+@@ -352,6 +352,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.31/policy/modules/system/libraries.fc
+--- nsaserefpolicy/policy/modules/system/libraries.fc	2006-04-12 13:44:38.000000000 -0400
++++ serefpolicy-2.2.31/policy/modules/system/libraries.fc	2006-04-13 16:25:13.000000000 -0400
+@@ -24,17 +24,22 @@
+ #
+ # /lib(64)?
+ #
+-/lib(64)?(/.*)?					gen_context(system_u:object_r:lib_t,s0)
++/lib(/.*)?					gen_context(system_u:object_r:lib_t,s0)
++/lib64(/.*)?					gen_context(system_u:object_r:lib_t,s0)
+ /lib(64)?/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
+ /lib(64)?(/.*)?/ld-[^/]*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:ld_so_t,s0)
+ 
+ #
+ # /opt
+ #
+-/opt(/.*)?/lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
+-/opt(/.*)?/lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
+-/opt/.*/jre.*/libdeploy.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/opt/.*/jre.*/libjvm.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/opt/(.*/)?lib(/.*)?			gen_context(system_u:object_r:lib_t,s0)
++/opt/(.*/)?lib64(/.*)?			gen_context(system_u:object_r:lib_t,s0)
++/opt/(.*/)?lib/.*\.so		--	gen_context(system_u:object_r:shlib_t,s0)
++/opt/(.*/)?lib/.*\.so\.[^/]*	--	gen_context(system_u:object_r:shlib_t,s0)
++/opt/(.*/)?lib64/.*\.so		--	gen_context(system_u:object_r:shlib_t,s0)
++/opt/(.*/)?lib64/.*\.so\.[^/]*	--	gen_context(system_u:object_r:shlib_t,s0)
++/opt/(.*/)?jre.*/libdeploy.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/opt/(.*/)?jre.*/libjvm.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+ #
+ # /sbin
+@@ -44,18 +49,22 @@
+ #
+ # /usr
+ #
+-/usr(/.*)?/HelixPlayer/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/(.*/)?/HelixPlayer/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+-/usr(/.*)?/java/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/usr(/.*)?/java/.*\.jar			--	gen_context(system_u:object_r:shlib_t,s0)
+-/usr(/.*)?/java/.*\.jsa			--	gen_context(system_u:object_r:shlib_t,s0)
++/usr/(.*/)?java/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/(.*/)?java/.*\.jar			--	gen_context(system_u:object_r:shlib_t,s0)
++/usr/(.*/)?java/.*\.jsa			--	gen_context(system_u:object_r:shlib_t,s0)
++
++/usr/(.*/)?lib(/.*)?			gen_context(system_u:object_r:lib_t,s0)
++/usr/(.*/)?lib64(/.*)?			gen_context(system_u:object_r:lib_t,s0)
++/usr/(.*/)?lib/.*\.so		--	gen_context(system_u:object_r:shlib_t,s0)
++/usr/(.*/)?lib/.*\.so\.[^/]*	--	gen_context(system_u:object_r:shlib_t,s0)
++/usr/(.*/)?lib64/.*\.so		--	gen_context(system_u:object_r:shlib_t,s0)
++/usr/(.*/)?lib64/.*\.so\.[^/]*	--	gen_context(system_u:object_r:shlib_t,s0)
+ 
+-/usr(/.*)?/lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
+-/usr(/.*)?/lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
++/usr/(.*/)?lib(64)?(/.*)?/ld-[^/]*\.so(\.[^/]*)* gen_context(system_u:object_r:ld_so_t,s0)
+ 
+-/usr(/.*)?/lib(64)?(/.*)?/ld-[^/]*\.so(\.[^/]*)* gen_context(system_u:object_r:ld_so_t,s0)
+-
+-/usr(/.*)?/nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/(.*/)?nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+ /usr/lib(64)?/pgsql/test/regress/.*\.so	--	gen_context(system_u:object_r:shlib_t,s0)
+ 
+@@ -64,7 +73,7 @@
+ /usr/lib(64)?/im/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
+ /usr/lib(64)?/iiim/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
+ 
+-/usr(/.*)?/lib(64)?(/.*)?/nvidia/.*\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/(.*/)?lib(64)?(/.*)?/nvidia/.*\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libsipphoneapi\.so.*	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
+ /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libGLU\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -74,9 +83,9 @@
+ /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libGL(core)?\.so(\.[^/]*)*             --      	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libnvidia.*\.so(\.[^/]*)*              --      	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libXvMCNVIDIA\.so.*            --      	gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/usr/lib(64)?/vmware(.*/)?/VmPerl\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/vmware(.*/)?VmPerl\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+-/usr/(local/)?lib/wine/.*\.so  		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/(local/)?lib(64)?/wine/.*\.so  		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/(local/)?lib/libfame-.*\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/local/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
+ 
+@@ -127,7 +136,7 @@
+ /usr/lib(64)?/.*/program/libsvx680li\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/.*/program/libcomphelp4gcc3\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/.*/program/libsoffice\.so  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/usr(/.*)?/pcsc/drivers(/.*)?/lib(cm2020|cm4000|SCR24x)\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/(.*/)?pcsc/drivers(/.*)?/lib(cm2020|cm4000|SCR24x)\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+ /usr/lib(64)?/firefox.*\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/mozilla.*\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -182,13 +191,13 @@
+ /usr/lib(64)?/vmware/lib(/.*)?/libgdk-x11-.*\.so.*  -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+ # Java, Sun Microsystems (JPackage SRPM)
+-/usr/.*/jre.*/libdeploy.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/usr/.*/jre.*/libjvm.so			--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/(.*/)?jre.*/libdeploy.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/(.*/)?jre.*/libjvm.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+-/usr(/.*)?/intellinux/nppdf\.so		--	gen_context(system_u:object_r:texrel_shlib_t,s0)
+-/usr(/.*)?/intellinux/lib/\.so		--	gen_context(system_u:object_r:texrel_shlib_t,s0)
+-/usr(/.*)?/intellinux/plug_ins/.*\.api	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
+-/usr(/.*)?/intellinux/SPPlugins/ADMPlugin\.apl -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/(.*/)?intellinux/nppdf\.so		--	gen_context(system_u:object_r:texrel_shlib_t,s0)
++/usr/(.*/)?intellinux/lib/\.so		--	gen_context(system_u:object_r:texrel_shlib_t,s0)
++/usr/(.*/)?intellinux/plug_ins/.*\.api	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
++/usr/(.*/)?intellinux/SPPlugins/ADMPlugin\.apl -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ ') dnl end distro_redhat
+ 
+ ifdef(`distro_suse',`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.2.31/policy/modules/system/miscfiles.fc
+--- nsaserefpolicy/policy/modules/system/miscfiles.fc	2005-10-27 14:57:47.000000000 -0400
++++ serefpolicy-2.2.31/policy/modules/system/miscfiles.fc	2006-04-13 12:53:30.000000000 -0400
+@@ -7,7 +7,7 @@
+ #
+ # /opt
+ #
+-/opt(/.*)?/man(/.*)?		gen_context(system_u:object_r:man_t,s0)
++/opt/(.*/)?man(/.*)?		gen_context(system_u:object_r:man_t,s0)
+ 
+ #
+ # /srv
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.fc serefpolicy-2.2.31/policy/modules/system/modutils.fc
+--- nsaserefpolicy/policy/modules/system/modutils.fc	2005-10-06 17:29:17.000000000 -0400
++++ serefpolicy-2.2.31/policy/modules/system/modutils.fc	2006-04-13 12:53:30.000000000 -0400
+@@ -2,9 +2,11 @@
+ /etc/modules\.conf.*	--	gen_context(system_u:object_r:modules_conf_t,s0)
+ /etc/modprobe\.conf.*	--	gen_context(system_u:object_r:modules_conf_t,s0)
+ 
+-/lib(64)?/modules/[^/]+/modules\..+ -- gen_context(system_u:object_r:modules_dep_t,s0)
++/lib/modules/[^/]+/modules\..+ -- gen_context(system_u:object_r:modules_dep_t,s0)
++/lib64/modules/[^/]+/modules\..+ -- gen_context(system_u:object_r:modules_dep_t,s0)
+ 
+-/lib(64)?/modules/modprobe\.conf -- gen_context(system_u:object_r:modules_conf_t,s0)
++/lib/modules/modprobe\.conf -- gen_context(system_u:object_r:modules_conf_t,s0)
++/lib64/modules/modprobe\.conf -- gen_context(system_u:object_r:modules_conf_t,s0)
+ 
+ /sbin/depmod.*		--	gen_context(system_u:object_r:depmod_exec_t,s0)
+ /sbin/generate-modprobe\.conf -- gen_context(system_u:object_r:update_modules_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.31/policy/modules/system/selinuxutil.if
+--- nsaserefpolicy/policy/modules/system/selinuxutil.if	2006-03-29 14:18:17.000000000 -0500
++++ serefpolicy-2.2.31/policy/modules/system/selinuxutil.if	2006-04-13 15:29:28.000000000 -0400
+@@ -623,7 +623,8 @@
+ 	')
+ 
+ 	files_search_etc($1)
+-	allow $1 selinux_config_t:dir rw_dir_perms;
++	# semanage wants to rmdir 
++	allow $1 selinux_config_t:dir { rmdir rw_dir_perms };
+ 	allow $1 selinux_config_t:file manage_file_perms;
+ 	allow $1 selinux_config_t:lnk_file { getattr read };
+ ')
+@@ -697,8 +698,8 @@
+ 
+ 	files_search_etc($1)
+ 	allow $1 selinux_config_t:dir search;
+-	allow $1 file_context_t:dir r_dir_perms;
+-	allow $1 file_context_t:file rw_file_perms;
++	allow $1 file_context_t:dir rw_dir_perms;
++	allow $1 file_context_t:file create_file_perms;
+ 	allow $1 file_context_t:lnk_file { getattr read };
+ ')
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.31/policy/modules/system/unconfined.te
+--- nsaserefpolicy/policy/modules/system/unconfined.te	2006-04-12 13:44:38.000000000 -0400
++++ serefpolicy-2.2.31/policy/modules/system/unconfined.te	2006-04-13 15:21:35.000000000 -0400
+@@ -64,6 +64,8 @@
+ 	optional_policy(`
+ 		dbus_stub(unconfined_t)
+ 
++		init_dbus_chat_script(unconfined_t)
++
+ 		optional_policy(`
+ 			avahi_dbus_chat(unconfined_t)
+ 		')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.31/policy/modules/system/userdomain.if
+--- nsaserefpolicy/policy/modules/system/userdomain.if	2006-04-11 16:58:42.000000000 -0400
++++ serefpolicy-2.2.31/policy/modules/system/userdomain.if	2006-04-13 12:53:30.000000000 -0400
+@@ -4132,11 +4132,31 @@
+ 		type user_home_dir_t;
+ 	')
+ 
++	allow $1 user_home_dir_t:dir create_dir_perms;
+ 	files_home_filetrans($1,user_home_dir_t,dir)
+ ')
+ 
+ ########################################
+ ## <summary>
++##	Create staff home directories
++##	with automatic file type transition.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`userdom_manage_staff_home_dir',`
++	gen_require(`
++		type staff_home_dir_t;
++	')
++
++	allow $1 staff_home_dir_t:dir create_dir_perms;
++')
++
++########################################
++## <summary>
+ ##	Search generic user home directories.
+ ## </summary>
+ ## <param name="domain">
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.2.31/policy/modules/system/xen.te
+--- nsaserefpolicy/policy/modules/system/xen.te	2006-03-23 14:33:30.000000000 -0500
++++ serefpolicy-2.2.31/policy/modules/system/xen.te	2006-04-13 12:53:30.000000000 -0400
+@@ -19,6 +19,8 @@
+ # var/lib files
+ type xend_var_lib_t;
+ files_type(xend_var_lib_t)
++# for mounting an NFS store
++files_mountpoint(xend_var_lib_t)
+ 
+ # log files
+ type xend_var_log_t;
+@@ -67,6 +69,8 @@
+ allow xend_t self:tcp_socket create_stream_socket_perms;
+ allow xend_t self:packet_socket create_socket_perms;
+ 
++files_read_kernel_symbol_table(xend_t)
++
+ # pid file
+ allow xend_t xend_var_run_t:file manage_file_perms;
+ allow xend_t xend_var_run_t:sock_file manage_file_perms;
+@@ -210,6 +214,7 @@
+ dev_filetrans_xen(xenstored_t)
+ 
+ term_dontaudit_use_generic_ptys(xenstored_t)
++dev_rw_xen(xenstored_t)
  
- /usr/(.*/)?lib(64)?(/.*)?/ld-[^/]*\.so(\.[^/]*)* gen_context(system_u:object_r:ld_so_t,s0)
+ init_use_fds(xenstored_t)
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- selinux-policy.spec	11 Apr 2006 21:58:53 -0000	1.172
+++ selinux-policy.spec	13 Apr 2006 20:33:49 -0000	1.173
@@ -15,15 +15,12 @@
 %define CHECKPOLICYVER 1.30.1-2
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.30
-Release: 2
+Version: 2.2.31
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
-patch1: policy-20060323.patch
-patch2: file_contexts.patch
-patch3: policy-200604.patch
-patch4: policy-20060411.patch
+patch1: policy-20060411.patch
 Source1: modules-targeted.conf
 Source2: booleans-targeted.conf
 Source3: Makefile.devel
@@ -152,9 +149,6 @@
 %prep 
 %setup -q -n serefpolicy-%{version}
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1 
-%patch4 -p1 
 
 %install
 # Build targeted policy
@@ -326,6 +320,10 @@
 %endif
 
 %changelog
+* Thu Apr 14 2006 Dan Walsh <dwalsh at redhat.com> 2.2.31-1
+- Update to latest from upstream
+- Allow mono and unconfined to talk to initrc_t dbus objects
+
 * Tue Apr 11 2006 Dan Walsh <dwalsh at redhat.com> 2.2.30-2
 - Change libraries.fc to stop shlib_t form overriding texrel_shlib_t
 


--- policy-20060323.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 13 21:28:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 17:28:22 -0400
Subject: rpms/selinux-policy/devel .cvsignore,1.54,1.55 sources,1.58,1.59
Message-ID: <200604132128.k3DLSMGI007191@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Apr 14 2006 Dan Walsh <dwalsh at redhat.com> 2.2.31-1
- Update to latest from upstream
- Allow mono and unconfined to talk to initrc_t dbus objects



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	11 Apr 2006 20:59:57 -0000	1.54
+++ .cvsignore	13 Apr 2006 21:28:19 -0000	1.55
@@ -55,3 +55,4 @@
 serefpolicy-2.2.28.tgz
 serefpolicy-2.2.29.tgz
 serefpolicy-2.2.30.tgz
+serefpolicy-2.2.31.tgz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	11 Apr 2006 20:59:57 -0000	1.58
+++ sources	13 Apr 2006 21:28:19 -0000	1.59
@@ -1 +1 @@
-98fa24fd09b92b958155d3f0354e42e5  serefpolicy-2.2.30.tgz
+437521998aafb56999299bc4e3532244  serefpolicy-2.2.31.tgz



From fedora-cvs-commits at redhat.com  Fri Apr 14 00:49:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 20:49:41 -0400
Subject: rpms/anacron/devel anacron-2.3-lock-files.patch,NONE,1.1
Message-ID: <200604140049.k3E0nfGM007899@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/anacron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7873

Added Files:
	anacron-2.3-lock-files.patch 
Log Message:
fix bug 188403: add lock and pid file management to anacron process

anacron-2.3-lock-files.patch:
 global.h |    8 +++
 main.c   |  168 +++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 151 insertions(+), 25 deletions(-)

--- NEW FILE anacron-2.3-lock-files.patch ---
--- anacron-2.3/main.c.lock-files	2000-06-22 20:00:14.000000000 -0400
+++ anacron-2.3/main.c	2006-04-13 20:38:13.000000000 -0400
@@ -21,39 +21,42 @@
     `COPYING' that comes with the Anacron source distribution.
 */
 
-
-#include <time.h>
-#include <stdio.h>
+#include <sys/types.h>
 #include <unistd.h>
+#include <time.h>
 #include <signal.h>
 #include <fcntl.h>
-#include <sys/types.h>
+#include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <errno.h>
 #include "global.h"
 #include "gregor.h"
 
-pid_t primary_pid;
-int day_now;
-int year, month, day_of_month;                 /* date anacron started */
-
-char *program_name;
-char *anacrontab;
-int serialize, force, update_only, now,
-    no_daemon, quiet;                            /* command-line options */
-char **args;                       /* vector of "job" command-line arguments */
-int nargs;                                     /* number of these */
+pid_t primary_pid=-1;
+int day_now=0;
+int year=0, month=0, day_of_month=0;                 /* date anacron started */
+
+char *program_name=0;
+char *anacrontab=0;
+int serialize=0, force=0, update_only=0, now=0,
+    no_daemon=0, quiet=0;                            /* command-line options */
+char **args=0;                       /* vector of "job" command-line arguments */
+int nargs=0;                                     /* number of these */
 char *defarg = "*";
-int in_background;                             /* are we in the background? */
-int old_umask;                                 /* umask when started */
-sigset_t old_sigmask;                          /* signal mask when started */
-
-job_rec *first_job_rec;
-env_rec *first_env_rec;
-
-static time_t start_sec;                       /* time anacron started */
-static volatile int got_sigalrm, got_sigchld, got_sigusr1;
-int running_jobs, running_mailers;              /* , number of */
+int in_background=0;                             /* are we in the background? */
+int old_umask=0;                                 /* umask when started */
+sigset_t old_sigmask={0};                          /* signal mask when started */
+
+job_rec *first_job_rec=0;
+env_rec *first_env_rec=0;
+
+static time_t start_sec=0;                       /* time anacron started */
+static volatile int got_sigalrm=0, got_sigchld=0, got_sigusr1=0;
+int running_jobs=0, running_mailers=0;              /* , number of */
 
 static void
 print_version()
@@ -183,6 +186,8 @@
     if (close(fd)) die_e("Can't close file descriptor %d", fd);
 }
 
+static int anacron_already_running();
+
 static void
 go_background()
 /* Become a daemon. The foreground process exits successfully. */
@@ -206,9 +211,16 @@
     else
     {
 	/* child */
+	xcloselog();
 	primary_pid = getpid();
 	if (setsid() == -1) die_e("setsid() error");
 	in_background = 1;
+	chdir(SPOOLDIR);
+	if( anacron_already_running() )
+	{
+	    errno=EDEADLK;
+	    die_e("Cannot run in daemon mode - anacron already running.");	    
+	}
     }
 }
 
@@ -265,6 +277,16 @@
     sa.sa_mask = ss;
     sa.sa_flags = 0;
     if (sigaction(SIGUSR1, &sa, NULL)) die_e("sigaction error");
+    /* setup SIGQUIT handler */
+    sa.sa_handler = handle_sigusr1;
+    sa.sa_mask = ss;
+    sa.sa_flags = 0;
+    if (sigaction(SIGQUIT, &sa, NULL)) die_e("sigaction error");
+    /* setup SIGTERM handler */
+    sa.sa_handler = handle_sigusr1;
+    sa.sa_mask = ss;
+    sa.sa_flags = 0;
+    if (sigaction(SIGTERM, &sa, NULL)) die_e("sigaction error");
 }
 
 static void
@@ -409,6 +431,94 @@
 	explain("Jobs will be executed sequentially");
 }
 
+static void remove_lock_and_pid_files(void)
+{
+    unlink(PID_FILE);
+    unlink(LOCK_FILE);
+}
+
+static int anacron_already_running()
+{
+    char buf[PATH_MAX], buf2[PATH_MAX], buf3[32];
+    FILE *fp=0;
+    pid_t pid=-1;
+    mode_t mode;
+    int len, fd;
+
+    if ( access( PID_FILE, F_OK ) == 0 )
+    {
+	if ( ( fp = fopen( PID_FILE, "r" ) ) == 0L )
+	{
+	    complain("%s exists but is not readable",PID_FILE);
+	    return 1;
+	}
+
+	if ( fscanf(fp,"%u",&pid) != 1 )
+	{
+	    explain("%s does not contain a valid pid",PID_FILE);
+	    return 1;
+	}
+
+	fclose(fp);
+
+	snprintf(buf, PATH_MAX, "/proc/%u", pid);
+
+	if( access(buf, F_OK) == 0 )
+	{
+	
+	    snprintf(buf3, 32, "/proc/%u/exe", pid);
+	    if( (len = readlink(buf3, buf2, PATH_MAX)) <= 0 )
+		len = 0;
+
+	    buf2[len] = '\0';
+
+	    snprintf(buf3, 32, "/proc/%u/exe", getpid());
+	    if( (len = readlink(buf3,  buf, PATH_MAX)) <= 0 )
+		len = 0;
+	    buf[len] = '\0';
+	
+	    if( strcmp( buf, buf2 ) == 0 )
+		return 1;
+	}
+    }
+    /* main process removes lock files once it 
+     * has determined no other anacron is running:
+     */
+    remove_lock_and_pid_files();
+
+    if( no_daemon || in_background )
+    {
+	/* daemon process, or main process in no_daemon mode,
+         * creates the lock and pid files:
+	 */
+	if( ( fd = open(LOCK_FILE, O_CREAT | O_WRONLY | O_EXCL, 0600) ) == -1 )
+	{
+	    complain("Cannot exclusively create %s: %s",PID_FILE,strerror(errno));
+	    return 1;
+	}
+	close(fd);
+
+	mode = umask(0077);
+	if( ( fp = fopen(PID_FILE, "w") ) == 0L )
+	{
+	    complain("Cannot create %s",PID_FILE);
+	    umask(mode);
+	    return 1;
+	}
+	umask(mode);
+
+	/* lock and pid files removed automatically at normal exit
+         * by creator process:
+         */
+	atexit( remove_lock_and_pid_files );
+
+	fprintf(fp,"%u",getpid());
+	fflush(fp);
+	fclose(fp);
+    }
+    return 0;
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -423,6 +533,12 @@
 
     parse_opts(argc, argv);
 
+    if ( anacron_already_running() )
+    {
+	errno=EDEADLK;
+	die_e("Cannot run - another anacron process is already running.");
+    }
+
     if (anacrontab == NULL)
 	anacrontab = strdup(ANACRONTAB);
 
@@ -433,7 +549,9 @@
     old_umask = umask(0);
 
     if (sigprocmask(0, NULL, &old_sigmask)) die_e("sigset error");
-
+    
+    if( !no_daemon )
+	ioctl(0,TIOCNOTTY,0);
     if (fclose(stdin)) die_e("Can't close stdin");
     xopen(0, "/dev/null", O_RDONLY);
 
--- anacron-2.3/global.h.lock-files	2000-06-22 20:00:14.000000000 -0400
+++ anacron-2.3/global.h	2006-04-13 20:25:42.000000000 -0400
@@ -34,6 +34,14 @@
 /* Mail interface.  (All MTAs should supply this command) */
 #define SENDMAIL "/usr/sbin/sendmail"
 
+#ifndef PID_FILE
+#define PID_FILE "/var/run/anacron.pid"
+#endif
+
+#ifndef LOCK_FILE
+#define LOCK_FILE "/var/lock/subsys/anacron"
+#endif
+
 /* End of user-configurable section */
 
 



From fedora-cvs-commits at redhat.com  Fri Apr 14 00:49:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 20:49:57 -0400
Subject: rpms/anacron/devel anacron.init,1.5,1.6 anacron.spec,1.17,1.18
Message-ID: <200604140049.k3E0nvcf008021@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/anacron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7994

Modified Files:
	anacron.init anacron.spec 
Log Message:
fix bug 188403


Index: anacron.init
===================================================================
RCS file: /cvs/dist/rpms/anacron/devel/anacron.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- anacron.init	11 Jan 2006 22:03:07 -0000	1.5
+++ anacron.init	14 Apr 2006 00:49:54 -0000	1.6
@@ -3,32 +3,49 @@
 #
 # chkconfig: 2345 95 05
 # description: Run cron jobs that were left out due to downtime
-
+# pidfile: /var/run/anacron.pid
+#
 # Source function library.
 . /etc/rc.d/init.d/functions
 
 [ -f /usr/sbin/anacron ] || exit 0
 
 prog="anacron"
+PIDFILE=/var/run/${prog}.pid
 LOCKFILE=/var/lock/subsys/$prog
+#
+#  NOTE: anacron exits after it has determined it has no more work to do.
+#        Hence, its initscript cannot do normal lock file management.
+#        The anacron binary now creates its own /var/run/anacron.pid pid file
+#        and /var/lock/subsys lock files, and removes them automatically at exit,
+#        so at least there will be no more "anacron is dead but subsys locked" 
+#        messages.
+#
 
 start() {
     echo -n $"Starting $prog: " 
     daemon +19 anacron -s
     RETVAL=$?
-    touch $LOCKFILE
+    if [ $RETVAL -ne 0 ]; then
+	failure;
+    fi;
     echo
     return $RETVAL
 }
 
 stop() {
-    if test "x`pidof anacron`" != x; then
-	echo -n $"Stopping $prog: "
+    echo -n $"Stopping $prog: "
+    if [ -f $PIDFILE ]; then
 	killproc anacron
-	echo
+	RETVAL=$?
+	if [ $RETVAL -ne 0 ]; then 
+	    failure;
+	fi;
+    else
+	RETVAL=1
+	failure;
     fi
-    RETVAL=$?
-    rm -f $LOCKFILE
+    echo
     return $RETVAL
 }
 
@@ -44,10 +61,12 @@
 	status)
 	    status anacron
 	    ;;
+
 	restart)
 	    stop
 	    start
 	    ;;
+
 	condrestart)
 	    if [ -f $LOCKFILE ]; then
 		stop


Index: anacron.spec
===================================================================
RCS file: /cvs/dist/rpms/anacron/devel/anacron.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- anacron.spec	11 Feb 2006 01:36:12 -0000	1.17
+++ anacron.spec	14 Apr 2006 00:49:55 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A cron-like program that can run jobs lost during downtime.
 Name: anacron
 Version: 2.3
-Release: 36.1
+Release: 38.1
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.debian.org/debian/pool/main/a/anacron/%{name}_%{version}.orig.tar.gz
@@ -11,6 +11,7 @@
 Patch1: anacron-2.3-mail-content-type-77108.patch
 Patch2: anacron-2.3-noconst.patch
 Patch3: anacron-2.3-mailto.patch
+Patch4: anacron-2.3-lock-files.patch
 Requires: /bin/sh
 Requires: crontabs
 Prereq: /sbin/chkconfig
@@ -37,6 +38,7 @@
 %patch1 -p1 -b .charset
 %patch2 -p1 -b .noconst
 %patch3 -p1 -b .mailto
+%patch4 -p1 -b .lock-files
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -110,6 +112,18 @@
 %config /etc/cron.weekly/0anacron
 
 %changelog
+* 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
+  initscript cannot do normal /var/lock/subsys/anacron lock file
+  creation, else messages such as 'anacron dead but subsys locked'
+  will appear when changing init levels. 
+
+  Now, the anacron process itself creates its own 
+  /var/lock/subsys/anacron SysVinit lock file and
+  /var/run/anacron.pid pid file to co-operate more
+  gracefully with the initscript system.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.3-36.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Apr 14 00:51:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 20:51:38 -0400
Subject: rpms/anacron/devel anacron.spec,1.18,1.19
Message-ID: <200604140051.k3E0pbEq008681@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/anacron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8647

Modified Files:
	anacron.spec 
Log Message:
fix bug 188403: add lock and pid file management to anacron process


Index: anacron.spec
===================================================================
RCS file: /cvs/dist/rpms/anacron/devel/anacron.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- anacron.spec	14 Apr 2006 00:49:55 -0000	1.18
+++ anacron.spec	14 Apr 2006 00:51:34 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: A cron-like program that can run jobs lost during downtime.
 Name: anacron
 Version: 2.3
-Release: 38.1
+Release: 38.FC6
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.debian.org/debian/pool/main/a/anacron/%{name}_%{version}.orig.tar.gz



From fedora-cvs-commits at redhat.com  Fri Apr 14 01:07:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 21:07:26 -0400
Subject: rpms/anacron/FC-5 anacron.init,1.5,1.6 anacron.spec,1.17,1.18
Message-ID: <200604140107.k3E17Qb0022380@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	anacron.init anacron.spec 
Log Message:
fix bug 188403: add SysVinit lock and pid file management to anacron process and remove it from initscript


Index: anacron.init
===================================================================
RCS file: /cvs/dist/rpms/anacron/FC-5/anacron.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- anacron.init	11 Jan 2006 22:03:07 -0000	1.5
+++ anacron.init	14 Apr 2006 01:07:24 -0000	1.6
@@ -3,32 +3,49 @@
 #
 # chkconfig: 2345 95 05
 # description: Run cron jobs that were left out due to downtime
-
+# pidfile: /var/run/anacron.pid
+#
 # Source function library.
 . /etc/rc.d/init.d/functions
 
 [ -f /usr/sbin/anacron ] || exit 0
 
 prog="anacron"
+PIDFILE=/var/run/${prog}.pid
 LOCKFILE=/var/lock/subsys/$prog
+#
+#  NOTE: anacron exits after it has determined it has no more work to do.
+#        Hence, its initscript cannot do normal lock file management.
+#        The anacron binary now creates its own /var/run/anacron.pid pid file
+#        and /var/lock/subsys lock files, and removes them automatically at exit,
+#        so at least there will be no more "anacron is dead but subsys locked" 
+#        messages.
+#
 
 start() {
     echo -n $"Starting $prog: " 
     daemon +19 anacron -s
     RETVAL=$?
-    touch $LOCKFILE
+    if [ $RETVAL -ne 0 ]; then
+	failure;
+    fi;
     echo
     return $RETVAL
 }
 
 stop() {
-    if test "x`pidof anacron`" != x; then
-	echo -n $"Stopping $prog: "
+    echo -n $"Stopping $prog: "
+    if [ -f $PIDFILE ]; then
 	killproc anacron
-	echo
+	RETVAL=$?
+	if [ $RETVAL -ne 0 ]; then 
+	    failure;
+	fi;
+    else
+	RETVAL=1
+	failure;
     fi
-    RETVAL=$?
-    rm -f $LOCKFILE
+    echo
     return $RETVAL
 }
 
@@ -44,10 +61,12 @@
 	status)
 	    status anacron
 	    ;;
+
 	restart)
 	    stop
 	    start
 	    ;;
+
 	condrestart)
 	    if [ -f $LOCKFILE ]; then
 		stop


Index: anacron.spec
===================================================================
RCS file: /cvs/dist/rpms/anacron/FC-5/anacron.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- anacron.spec	11 Feb 2006 01:36:12 -0000	1.17
+++ anacron.spec	14 Apr 2006 01:07:24 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A cron-like program that can run jobs lost during downtime.
 Name: anacron
 Version: 2.3
-Release: 36.1
+Release: 38.FC6
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.debian.org/debian/pool/main/a/anacron/%{name}_%{version}.orig.tar.gz
@@ -11,6 +11,7 @@
 Patch1: anacron-2.3-mail-content-type-77108.patch
 Patch2: anacron-2.3-noconst.patch
 Patch3: anacron-2.3-mailto.patch
+Patch4: anacron-2.3-lock-files.patch
 Requires: /bin/sh
 Requires: crontabs
 Prereq: /sbin/chkconfig
@@ -37,6 +38,7 @@
 %patch1 -p1 -b .charset
 %patch2 -p1 -b .noconst
 %patch3 -p1 -b .mailto
+%patch4 -p1 -b .lock-files
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -110,6 +112,18 @@
 %config /etc/cron.weekly/0anacron
 
 %changelog
+* 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
+  initscript cannot do normal /var/lock/subsys/anacron lock file
+  creation, else messages such as 'anacron dead but subsys locked'
+  will appear when changing init levels. 
+
+  Now, the anacron process itself creates its own 
+  /var/lock/subsys/anacron SysVinit lock file and
+  /var/run/anacron.pid pid file to co-operate more
+  gracefully with the initscript system.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.3-36.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Apr 14 01:07:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 21:07:49 -0400
Subject: rpms/anacron/FC-5 anacron.spec,1.18,1.19
Message-ID: <200604140107.k3E17nOM022404@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	anacron.spec 
Log Message:
fix bug 188403: add SysVinit lock and pid file management to anacron process and remove it from initscript


Index: anacron.spec
===================================================================
RCS file: /cvs/dist/rpms/anacron/FC-5/anacron.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- anacron.spec	14 Apr 2006 01:07:24 -0000	1.18
+++ anacron.spec	14 Apr 2006 01:07:47 -0000	1.19
@@ -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.FC5
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.debian.org/debian/pool/main/a/anacron/%{name}_%{version}.orig.tar.gz



From fedora-cvs-commits at redhat.com  Fri Apr 14 01:12:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 21:12:36 -0400
Subject: rpms/anacron/FC-5 anacron-2.3-lock-files.patch,NONE,1.1
Message-ID: <200604140112.k3E1CaS4022509@cvs.devel.redhat.com>

Author: jvdias

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

Added Files:
	anacron-2.3-lock-files.patch 
Log Message:
fix bug 188403: add SysVinit lock and pid file management to anacron process and remove it from initscript

anacron-2.3-lock-files.patch:
 global.h |    8 +++
 main.c   |  168 +++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 151 insertions(+), 25 deletions(-)

--- NEW FILE anacron-2.3-lock-files.patch ---
--- anacron-2.3/main.c.lock-files	2000-06-22 20:00:14.000000000 -0400
+++ anacron-2.3/main.c	2006-04-13 20:38:13.000000000 -0400
@@ -21,39 +21,42 @@
     `COPYING' that comes with the Anacron source distribution.
 */
 
-
-#include <time.h>
-#include <stdio.h>
+#include <sys/types.h>
 #include <unistd.h>
+#include <time.h>
 #include <signal.h>
 #include <fcntl.h>
-#include <sys/types.h>
+#include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <errno.h>
 #include "global.h"
 #include "gregor.h"
 
-pid_t primary_pid;
-int day_now;
-int year, month, day_of_month;                 /* date anacron started */
-
-char *program_name;
-char *anacrontab;
-int serialize, force, update_only, now,
-    no_daemon, quiet;                            /* command-line options */
-char **args;                       /* vector of "job" command-line arguments */
-int nargs;                                     /* number of these */
+pid_t primary_pid=-1;
+int day_now=0;
+int year=0, month=0, day_of_month=0;                 /* date anacron started */
+
+char *program_name=0;
+char *anacrontab=0;
+int serialize=0, force=0, update_only=0, now=0,
+    no_daemon=0, quiet=0;                            /* command-line options */
+char **args=0;                       /* vector of "job" command-line arguments */
+int nargs=0;                                     /* number of these */
 char *defarg = "*";
-int in_background;                             /* are we in the background? */
-int old_umask;                                 /* umask when started */
-sigset_t old_sigmask;                          /* signal mask when started */
-
-job_rec *first_job_rec;
-env_rec *first_env_rec;
-
-static time_t start_sec;                       /* time anacron started */
-static volatile int got_sigalrm, got_sigchld, got_sigusr1;
-int running_jobs, running_mailers;              /* , number of */
+int in_background=0;                             /* are we in the background? */
+int old_umask=0;                                 /* umask when started */
+sigset_t old_sigmask={0};                          /* signal mask when started */
+
+job_rec *first_job_rec=0;
+env_rec *first_env_rec=0;
+
+static time_t start_sec=0;                       /* time anacron started */
+static volatile int got_sigalrm=0, got_sigchld=0, got_sigusr1=0;
+int running_jobs=0, running_mailers=0;              /* , number of */
 
 static void
 print_version()
@@ -183,6 +186,8 @@
     if (close(fd)) die_e("Can't close file descriptor %d", fd);
 }
 
+static int anacron_already_running();
+
 static void
 go_background()
 /* Become a daemon. The foreground process exits successfully. */
@@ -206,9 +211,16 @@
     else
     {
 	/* child */
+	xcloselog();
 	primary_pid = getpid();
 	if (setsid() == -1) die_e("setsid() error");
 	in_background = 1;
+	chdir(SPOOLDIR);
+	if( anacron_already_running() )
+	{
+	    errno=EDEADLK;
+	    die_e("Cannot run in daemon mode - anacron already running.");	    
+	}
     }
 }
 
@@ -265,6 +277,16 @@
     sa.sa_mask = ss;
     sa.sa_flags = 0;
     if (sigaction(SIGUSR1, &sa, NULL)) die_e("sigaction error");
+    /* setup SIGQUIT handler */
+    sa.sa_handler = handle_sigusr1;
+    sa.sa_mask = ss;
+    sa.sa_flags = 0;
+    if (sigaction(SIGQUIT, &sa, NULL)) die_e("sigaction error");
+    /* setup SIGTERM handler */
+    sa.sa_handler = handle_sigusr1;
+    sa.sa_mask = ss;
+    sa.sa_flags = 0;
+    if (sigaction(SIGTERM, &sa, NULL)) die_e("sigaction error");
 }
 
 static void
@@ -409,6 +431,94 @@
 	explain("Jobs will be executed sequentially");
 }
 
+static void remove_lock_and_pid_files(void)
+{
+    unlink(PID_FILE);
+    unlink(LOCK_FILE);
+}
+
+static int anacron_already_running()
+{
+    char buf[PATH_MAX], buf2[PATH_MAX], buf3[32];
+    FILE *fp=0;
+    pid_t pid=-1;
+    mode_t mode;
+    int len, fd;
+
+    if ( access( PID_FILE, F_OK ) == 0 )
+    {
+	if ( ( fp = fopen( PID_FILE, "r" ) ) == 0L )
+	{
+	    complain("%s exists but is not readable",PID_FILE);
+	    return 1;
+	}
+
+	if ( fscanf(fp,"%u",&pid) != 1 )
+	{
+	    explain("%s does not contain a valid pid",PID_FILE);
+	    return 1;
+	}
+
+	fclose(fp);
+
+	snprintf(buf, PATH_MAX, "/proc/%u", pid);
+
+	if( access(buf, F_OK) == 0 )
+	{
+	
+	    snprintf(buf3, 32, "/proc/%u/exe", pid);
+	    if( (len = readlink(buf3, buf2, PATH_MAX)) <= 0 )
+		len = 0;
+
+	    buf2[len] = '\0';
+
+	    snprintf(buf3, 32, "/proc/%u/exe", getpid());
+	    if( (len = readlink(buf3,  buf, PATH_MAX)) <= 0 )
+		len = 0;
+	    buf[len] = '\0';
+	
+	    if( strcmp( buf, buf2 ) == 0 )
+		return 1;
+	}
+    }
+    /* main process removes lock files once it 
+     * has determined no other anacron is running:
+     */
+    remove_lock_and_pid_files();
+
+    if( no_daemon || in_background )
+    {
+	/* daemon process, or main process in no_daemon mode,
+         * creates the lock and pid files:
+	 */
+	if( ( fd = open(LOCK_FILE, O_CREAT | O_WRONLY | O_EXCL, 0600) ) == -1 )
+	{
+	    complain("Cannot exclusively create %s: %s",PID_FILE,strerror(errno));
+	    return 1;
+	}
+	close(fd);
+
+	mode = umask(0077);
+	if( ( fp = fopen(PID_FILE, "w") ) == 0L )
+	{
+	    complain("Cannot create %s",PID_FILE);
+	    umask(mode);
+	    return 1;
+	}
+	umask(mode);
+
+	/* lock and pid files removed automatically at normal exit
+         * by creator process:
+         */
+	atexit( remove_lock_and_pid_files );
+
+	fprintf(fp,"%u",getpid());
+	fflush(fp);
+	fclose(fp);
+    }
+    return 0;
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -423,6 +533,12 @@
 
     parse_opts(argc, argv);
 
+    if ( anacron_already_running() )
+    {
+	errno=EDEADLK;
+	die_e("Cannot run - another anacron process is already running.");
+    }
+
     if (anacrontab == NULL)
 	anacrontab = strdup(ANACRONTAB);
 
@@ -433,7 +549,9 @@
     old_umask = umask(0);
 
     if (sigprocmask(0, NULL, &old_sigmask)) die_e("sigset error");
-
+    
+    if( !no_daemon )
+	ioctl(0,TIOCNOTTY,0);
     if (fclose(stdin)) die_e("Can't close stdin");
     xopen(0, "/dev/null", O_RDONLY);
 
--- anacron-2.3/global.h.lock-files	2000-06-22 20:00:14.000000000 -0400
+++ anacron-2.3/global.h	2006-04-13 20:25:42.000000000 -0400
@@ -34,6 +34,14 @@
 /* Mail interface.  (All MTAs should supply this command) */
 #define SENDMAIL "/usr/sbin/sendmail"
 
+#ifndef PID_FILE
+#define PID_FILE "/var/run/anacron.pid"
+#endif
+
+#ifndef LOCK_FILE
+#define LOCK_FILE "/var/lock/subsys/anacron"
+#endif
+
 /* End of user-configurable section */
 
 



From fedora-cvs-commits at redhat.com  Fri Apr 14 01:49:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 21:49:39 -0400
Subject: rpms/bind/devel bind.spec,1.104,1.105
Message-ID: <200604140149.k3E1ndBO030569@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30534

Modified Files:
	bind.spec 
Log Message:
fix bug 188382


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- bind.spec	4 Apr 2006 20:55:48 -0000	1.104
+++ bind.spec	14 Apr 2006 01:49:36 -0000	1.105
@@ -496,14 +496,17 @@
 
 
 %files
-%defattr(-,root,root)
-%attr(750,root,named)  %dir /var/named
-%attr(770,named,named) %dir /var/named/slaves
-%attr(770,named,named) %dir /var/named/data
-%attr(770,named,named) %dir /var/run/named
-%attr(754,root,root)   %config /etc/rc.d/init.d/named
+%defattr(0640,root,root,0750)
+%dir /var/named
+%defattr(0640,named,named,0750)
+%dir /var/named/slaves
+%dir /var/named/data
+%dir /var/run/named
+%defattr(0754,root,root,0755)
+%config /etc/rc.d/init.d/named
+%defattr(0640,root,named,0750)
 %config(noreplace) /etc/sysconfig/named
-%ghost %config(noreplace) %attr(0640,root,named) /etc/rndc.key
+%ghost %config(noreplace) /etc/rndc.key
 # ^- rndc.key now created on first install only if it does not exist
 # %verify(not size,not md5) %config(noreplace) %attr(0640,root,named) /etc/rndc.conf
 # ^- Let the named internal default rndc.conf be used -
@@ -514,6 +517,7 @@
 # ^- The default rndc.conf which uses rndc.key is in named's default internal config -
 #    so rndc.conf is not necessary.
 %config(noreplace) /etc/logrotate.d/named
+%defattr(0750,root,root,0755)
 %{_sbindir}/dnssec*
 %{_sbindir}/lwresd
 %{_sbindir}/named
@@ -522,6 +526,7 @@
 %{_sbindir}/rndc*
 %{_sbindir}/dns-keygen
 %{_sbindir}/bind-chroot-admin
+%defattr(0644,root,root,0755)
 %{_mandir}/man5/named.conf.5*
 %{_mandir}/man5/rndc.conf.5*
 %{_mandir}/man8/rndc.8*
@@ -543,22 +548,23 @@
 %endif
 
 %files libs
-%defattr(-,root,root)
+%defattr(0755,root,root,0755)
 %{_libdir}/*so*
 
 %files utils
-%defattr(-,root,root)
+%defattr(0755,root,root,0755)
 %{_bindir}/dig
 %{_bindir}/host
 %{_bindir}/nslookup
 %{_bindir}/nsupdate
+%defattr(0644,root,root,0755)
 %{_mandir}/man1/host.1*
 %{_mandir}/man8/nsupdate.8*
 %{_mandir}/man1/dig.1*
 %{_mandir}/man1/nslookup.1*
 
 %files devel
-%defattr(-,root,root)
+%defattr(0644,root,root,0755)
 %{_libdir}/libbind9.a
 %{_libdir}/libdns.a
 %{_libdir}/libisc.a
@@ -577,14 +583,13 @@
 %doc doc/draft doc/rfc
 
 %files config
-%defattr(-,root,root)
+%defattr(0640,root,named,0750)
 %config /etc/named.caching-nameserver.conf
 %ghost %config %{chroot_prefix}/etc/named.caching-nameserver.conf
 %config /etc/named.rfc1912.zones
 %ghost %config %{chroot_prefix}/etc/named.rfc1912.zones
 %ghost %config(noreplace) /etc/named.conf
 %ghost %config(noreplace) %{chroot_prefix}/etc/named.conf
-%defattr(-,named,named)
 %config /var/named/named.ca
 %ghost  %config %{chroot_prefix}/var/named/named.ca
 %config /var/named/named.local
@@ -599,33 +604,38 @@
 %ghost  %config %{chroot_prefix}/var/named/named.broadcast
 %config /var/named/named.zero
 %ghost  %config %{chroot_prefix}/var/named/named.zero
-%defattr(-,root,root)
+%defattr(0644,root,root,0755)
 %doc Copyright
 %doc rfc1912.txt
 
 %files chroot
-%defattr(-,root,root)
-%attr(750,root,named) %dir %prefix
-%attr(750,root,named) %dir %prefix/dev
-%attr(750,root,named) %dir %prefix/etc
-%attr(750,root,named) %dir %prefix/var
-%attr(770,root,named) %dir  %prefix/var/run
-%attr(770,named,named) %dir %prefix/var/tmp
-%attr(770,named,named) %dir %prefix/var/run/named
-%attr(750,root,named) %dir  %prefix/var/named
-%attr(770,named,named) %dir %prefix/var/named/slaves
-%attr(770,named,named) %dir %prefix/var/named/data
+%defattr(0640,root,named,0750)
+%dir %prefix
+%dir %prefix/dev
+%dir %prefix/etc
+%dir %prefix/var
+%dir  %prefix/var/run
+%dir  %prefix/var/named
 %ghost %config(noreplace) %prefix/etc/named.conf
 %ghost %config(noreplace) %prefix/etc/named.caching-nameserver.conf
 %ghost %config(noreplace) %prefix/etc/rndc.key
+%defattr(0660,named,named,0770)
+%dir %prefix/var/named/slaves
+%dir %prefix/var/named/data
+%dir %prefix/var/run/named
+%dir %prefix/var/tmp
 %ghost %prefix/dev/null
 %ghost %prefix/dev/random
+%ghost %prefix/dev/zero
+
 
 %if %{LIBBIND}
 
 %files libbind-devel
-%defattr(-,root,root)
-%{_libdir}/libbind.*
+%defattr(0755,root,root,0755)
+%{_libdir}/libbind.so*
+%defattr(0644,root,root,0755) 
+%{_libdir}/libbind.a
 %{_libdir}/pkgconfig/libbind.pc
 %{_includedir}/bind
 %{_mandir}/man3/libbind-*
@@ -637,12 +647,14 @@
 %if %{SDB}
 
 %files sdb
-%defattr(-,root,named)
+%defattr(0750,root,named,0755)
 %{_sbindir}/named_sdb
-%config /etc/openldap/schema/dnszone.schema
 %{_sbindir}/zone2ldap
 %{_sbindir}/ldap2zone
 %{_sbindir}/zonetodb
+%defattr(0640,root,named,0755)
+%config /etc/openldap/schema/dnszone.schema
+%defattr(0644,root,named,0755)
 %{_mandir}/man1/zone2ldap.1*
 %doc contrib/sdb/ldap/README.ldap contrib/sdb/ldap/INSTALL.ldap contrib/sdb/pgsql/README.sdb_pgsql
 



From fedora-cvs-commits at redhat.com  Fri Apr 14 02:03:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 22:03:18 -0400
Subject: rpms/avahi/devel avahi.spec,1.50,1.51
Message-ID: <200604140203.k3E23Ib5002383@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	avahi.spec 
Log Message:
fix bug 188381


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- avahi.spec	20 Mar 2006 22:50:55 -0000	1.50
+++ avahi.spec	14 Apr 2006 02:02:49 -0000	1.51
@@ -250,7 +250,7 @@
 %ghost %{_sysconfdir}/avahi/etc/localtime
 %{_sysconfdir}/avahi/hosts
 %dir %{_sysconfdir}/avahi/services
-%dir %{_localstatedir}/run/avahi-daemon
+%attr(0750,avahi,avahi) %dir %{_localstatedir}/run/avahi-daemon
 %config %{_sysconfdir}/avahi/avahi-daemon.conf
 %config %{_sysconfdir}/avahi/avahi-dnsconfd.action
 %config %{_sysconfdir}/dbus-1/system.d/avahi-dbus.conf



From fedora-cvs-commits at redhat.com  Fri Apr 14 03:21:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Apr 2006 23:21:34 -0400
Subject: rpms/xorg-x11-server/devel xorg-server-1.0.99.2-spiffiffity.patch,
	1.1, 1.2 xorg-x11-server.spec, 1.55, 1.56
Message-ID: <200604140321.k3E3LYTq030282@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	xorg-server-1.0.99.2-spiffiffity.patch xorg-x11-server.spec 
Log Message:
* Thu Apr 13 2006 Kristian H??gsberg <krh at redhat.com> 1.0.99.901-5
- Update spiffiffity patch to only suppress move damage events for
  manually redirected windows.


xorg-server-1.0.99.2-spiffiffity.patch:
 compalloc.c  |    2 ++
 compwindow.c |    8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

Index: xorg-server-1.0.99.2-spiffiffity.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-server-1.0.99.2-spiffiffity.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-server-1.0.99.2-spiffiffity.patch	4 Apr 2006 22:17:58 -0000	1.1
+++ xorg-server-1.0.99.2-spiffiffity.patch	14 Apr 2006 03:21:31 -0000	1.2
@@ -1,19 +1,6 @@
-This patch add two optimizations to speed up the metacity compositing
-manager (spiffiffity):
-
- - Don't generate damage on moves
- - Don't initialize bg=none windows by copying from the framebuffer.
-
-krh at redhat.com, Tue Apr  4 18:10:40 EDT 2006
-
-Index: composite/compalloc.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/composite/compalloc.c,v
-retrieving revision 1.9
-diff -u -p -u -r1.9 compalloc.c
---- composite/compalloc.c	13 Mar 2006 21:59:55 -0000	1.9
-+++ composite/compalloc.c	30 Mar 2006 16:54:00 -0000
-@@ -478,6 +478,7 @@ compNewPixmap (WindowPtr pWin, int x, in
+--- ./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.
       */
@@ -21,7 +8,7 @@
      if (pGC)
      {
  	XID val = IncludeInferiors;
-@@ -492,6 +493,7 @@ compNewPixmap (WindowPtr pWin, int x, in
+@@ -492,6 +493,7 @@
  			       w, h, 0, 0);
  	FreeScratchGC (pGC);
      }
@@ -29,30 +16,32 @@
      return pPixmap;
  }
  
-Index: composite/compwindow.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/composite/compwindow.c,v
-retrieving revision 1.13
-diff -u -p -u -r1.13 compwindow.c
---- composite/compwindow.c	29 Mar 2006 17:51:53 -0000	1.13
-+++ composite/compwindow.c	30 Mar 2006 16:54:00 -0000
-@@ -576,7 +576,9 @@ compCopyWindow (WindowPtr pWin, DDXPoint
+--- ./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);
-+#if 0
- 	DamageDamageRegion (&pWin->drawable, prgnSrc);
-+#endif
+-	DamageDamageRegion (&pWin->drawable, prgnSrc);
++	if (pWin->redirectDraw && cw->update == CompositeRedirectAutomatic)
++	  DamageDamageRegion (&pWin->drawable, prgnSrc);
      }
      cs->CopyWindow = pScreen->CopyWindow;
      pScreen->CopyWindow = compCopyWindow;
-@@ -655,7 +657,9 @@ compSetRedirectBorderClip (WindowPtr pWi
+@@ -655,7 +658,8 @@
      /*
       * Report that as damaged so it will be redrawn
       */
-+#if 0
-     DamageDamageRegion (&pWin->drawable, &damage);
-+#endif
+-    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.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- xorg-x11-server.spec	12 Apr 2006 20:52:30 -0000	1.55
+++ xorg-x11-server.spec	14 Apr 2006 03:21:31 -0000	1.56
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.0.99.901
-Release:   4
+Release:   5
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -566,6 +566,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Thu Apr 13 2006 Kristian H??gsberg <krh at redhat.com> 1.0.99.901-5
+- Update spiffiffity patch to only suppress move damage events for
+  manually redirected windows.
+
 * Wed Apr 12 2006 Kristian H??gsberg <krh at redhat.com> 1.0.99.901-4
 - Bump for rawhide build.
 



From fedora-cvs-commits at redhat.com  Fri Apr 14 05:51:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 01:51:46 -0400
Subject: rpms/firefox/devel .cvsignore, 1.21, 1.22 firefox.spec, 1.111,
	1.112 sources, 1.23, 1.24
Message-ID: <200604140551.k3E5pkaK021496@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
* Sat Mar 11 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-9
- Add a notice to the about dialog denoting this is a pango enabled build.
- Tweak the user agent denoting this is a pango enabled build.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	2 Feb 2006 04:25:46 -0000	1.21
+++ .cvsignore	14 Apr 2006 05:51:43 -0000	1.22
@@ -18,3 +18,4 @@
 firefox-langpacks-20060125.tar.bz2
 firefox-1.5.0.1-source.tar.bz2
 firefox-langpacks-1.5.0.1-20060201.tar.bz2
+firefox-1.5.0.2-source.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- firefox.spec	13 Mar 2006 15:08:34 -0000	1.111
+++ firefox.spec	14 Apr 2006 05:51:43 -0000	1.112
@@ -8,8 +8,8 @@
 
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
-Version:        1.5.0.1
-Release:        9
+Version:        1.5.0.2
+Release:        2
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -270,6 +270,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Apr 13 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-2
+- Firefox 1.5.0.2
+
 * Sat Mar 11 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-9
 - Add a notice to the about dialog denoting this is a pango enabled build.
 - Tweak the user agent denoting this is a pango enabled build.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	2 Feb 2006 04:25:46 -0000	1.23
+++ sources	14 Apr 2006 05:51:43 -0000	1.24
@@ -1,3 +1,3 @@
 b628d5f24a49ab15d1943b7d694edd90  firefox-gnomestripe-0.1.tar.gz
-c76f02956645bc823241379e27f76bb5  firefox-1.5.0.1-source.tar.bz2
 963584af1fd5d8b7551c7e92f44f2242  firefox-langpacks-1.5.0.1-20060201.tar.bz2
+6bd65d899e9bcb16c28225899cc61a1e  firefox-1.5.0.2-source.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr 14 05:52:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 01:52:56 -0400
Subject: rpms/gdb/FC-5 gdb-6.3-large-core-20051206.patch, NONE,
	1.1 gdb-6.3-support-fopen64-20060413.patch, NONE, 1.1 gdb.spec,
	1.178, 1.179
Message-ID: <200604140552.k3E5quYf022057@cvs.devel.redhat.com>

Author: aoliva

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

Modified Files:
	gdb.spec 
Added Files:
	gdb-6.3-large-core-20051206.patch 
	gdb-6.3-support-fopen64-20060413.patch 
Log Message:
* Thu Apr 13 2006 Stepan Kasal <skasal at redhat.com>    - 6.3.0.0-1.123
- Use fopen64 where available.  Fixes BZ 179399.
- Use bigger numbers than int.  Fixes BZ 171783.


gdb-6.3-large-core-20051206.patch:
 dcache.c      |    6 +++---
 dcache.h      |    4 ++--
 exec.c        |    4 ++--
 infptrace.c   |   10 +++++-----
 linux-nat.c   |   12 ++++++------
 linux-nat.h   |    7 ++++---
 remote-sim.c  |   29 ++++++++++++++++-------------
 remote.c      |   24 ++++++++++++++++--------
 symfile-mem.c |   10 +++++++++-
 target.c      |   53 +++++++++++++++++++++++++++--------------------------
 target.h      |   28 ++++++++++++++--------------
 thread-db.c   |    6 +++---
 12 files changed, 107 insertions(+), 86 deletions(-)

--- NEW FILE gdb-6.3-large-core-20051206.patch ---
2005-12-14  Jeff Johnston  <jjohnstn at redhat.com>

	* symfile-mem.c (read_memory): New static read callback function.
	(symfile_add_from_memory): Pass read_memory to bfd instead of
	target_read_memory.
	* target.c (target_xfer_memory): Add support for LONGEST len and
	change all callers.
	(deprecated_debug_xfer_memory, target_read_memory): Ditto.
	(target_write_memory, do_xfer_memory): Ditto.
	(target_xfer_memory_partial, target_read_memory_partial): Ditto.
	(target_write_memory_partial): Ditto.
	* infptrace.c (child_xfer_memory): Ditto.
	* linux-nat.c (linux_nat_xfer_memory): Ditto.
	(linux_nat_proc_xfer_memory): Ditto.
	* dcache.c (dcache_xfer_memory): Ditto.
	* exec.c (xfer_memory): Ditto.
	* remote.c (remote_xfer_memory): Ditto.
	* remote-sim.c (gdbsim_xfer_interior_memory): Ditto.
	* target.h: Change prototypes for functions changed above.
	* linux-nat.h: Ditto.
	* 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 @@
 #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)
+{
+  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");
 
   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.");
 
--- 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
    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 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)
 	    (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 *)) 
 	    nomemory);
   de_fault (to_files_info, 
 	    (void (*) (struct target_ops *)) 
@@ -945,7 +945,7 @@ target_xfer_partial (struct target_ops *
    implementing another singluar mechanism (for instance, a generic
    object:annex onto inferior:object:annex say).  */
 
-static LONGEST
+static int
 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
    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)
 {
   if (target_xfer_partial_p ())
     return xfer_using_stratum (TARGET_OBJECT_MEMORY, NULL,
@@ -1020,7 +1020,7 @@ target_read_memory (CORE_ADDR memaddr, c
 }
 
 int
-target_write_memory (CORE_ADDR memaddr, char *myaddr, int len)
+target_write_memory (CORE_ADDR memaddr, char *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;
 
    Result is -1 on error, or the number of bytes transfered.  */
 
-int
-do_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
+LONGEST
+do_xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len, int write,
 		struct mem_attrib *attrib)
 {
-  int res;
+  LONGEST res;
   int done = 0;
   struct target_ops *t;
 
@@ -1113,10 +1113,10 @@ do_xfer_memory (CORE_ADDR memaddr, char 
    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)
 {
-  int res;
-  int reg_len;
+  LONGEST res;
+  LONGEST reg_len;
   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.  */
 
-static int
-target_xfer_memory_partial (CORE_ADDR memaddr, char *myaddr, int len,
+static LONGEST
+target_xfer_memory_partial (CORE_ADDR memaddr, char *myaddr, LONGEST len,
 			    int write_p, int *err)
 {
-  int res;
-  int reg_len;
+  LONGEST res;
+  LONGEST reg_len;
   struct mem_region *region;
 
   /* Zero length requests are ok and require no work.  */
@@ -1250,8 +1250,8 @@ 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)
 {
   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
     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)
 {
   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)
   fprintf_unfiltered (gdb_stdlog, "target_prepare_to_store ()\n");
 }
 
-static int
-deprecated_debug_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len,
+static LONGEST
+deprecated_debug_xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len,
 			      int write, struct mem_attrib *attrib,
 			      struct target_ops *target)
 {
@@ -1996,9 +1997,9 @@ deprecated_debug_xfer_memory (CORE_ADDR 
 						attrib, target);
 
   fprintf_unfiltered (gdb_stdlog,
-		      "target_xfer_memory (0x%x, xxx, %d, %s, xxx) = %d",
+		      "target_xfer_memory (0x%x, xxx, %ld, %s, xxx) = %d",
 		      (unsigned int) memaddr,	/* possable truncate long long */
-		      len, write ? "write" : "read", retval);
+		      (long)len, write ? "write" : "read", retval);
 
   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
        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 len, int write,
+    LONGEST (*deprecated_xfer_memory) (CORE_ADDR memaddr, char *myaddr,
+				   LONGEST len, int write,
 				   struct mem_attrib *attrib,
 				   struct target_ops *target);
 
@@ -533,20 +533,20 @@ 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 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 xfer_memory (CORE_ADDR, char *, int, int,
-			struct mem_attrib *, struct target_ops *);
+extern LONGEST xfer_memory (CORE_ADDR, char *, LONGEST, int,
+			    struct mem_attrib *, struct target_ops *);
 
-extern int child_xfer_memory (CORE_ADDR, char *, int, int,
-			      struct mem_attrib *, struct target_ops *);
+extern LONGEST child_xfer_memory (CORE_ADDR, char *, 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,
    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 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)
    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,
+LONGEST
+child_xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len, int write,
 		   struct mem_attrib *attrib, struct target_ops *target)
 {
-  int i;
+  LONGEST i;
   /* Round starting address down to longword boundary.  */
   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));
-  int alloc = count * 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)
 
    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,
+		    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
@@ -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);
 
 #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)
    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,
+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)
 {
   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
@@ -27,6 +27,7 @@
 #include "gdb_string.h"
 #include <ctype.h>
 #include <fcntl.h>
+#include <limits.h>
 #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.  */
 
-static int
-remote_xfer_memory (CORE_ADDR mem_addr, char *buffer, int mem_len,
+static LONGEST
+remote_xfer_memory (CORE_ADDR mem_addr, char *buffer, LONGEST mem_len,
 		    int should_write, struct mem_attrib *attrib,
 		    struct target_ops *target)
 {
   CORE_ADDR targ_addr;
   int targ_len;
   int res;
+  int len;
+
+  /* This routine is not set up to handle > INT_MAX bytes.  */
+  if (mem_len >= (LONGEST)INT_MAX)
+    return 0;
+
+  len = (int)mem_len;
 
   /* Should this be the selected frame?  */
   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, 
   else
     res = remote_read_bytes (targ_addr, buffer, targ_len);
 
-  return res;
+  return (LONGEST)res;
 }
 
 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)
 
    Returns the number of bytes transferred. */
 
-static int
-gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len,
+static LONGEST
+gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len,
 			     int write, struct mem_attrib *attrib,
 			     struct target_ops *target)
 {
+  /* Convert to len type that sim_read and sim_write can handle.  */
+  int xfer_len = (int)len;
+
   if (!program_loaded)
     error ("No program loaded.");
 
@@ -755,22 +758,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",
-		       paddr_nz (memaddr), len, write);
+		       paddr_nz (memaddr), xfer_len, write);
       if (sr_get_debug () && write)
-	dump_mem (myaddr, len);
+	dump_mem (myaddr, xfer_len);
     }
 
   if (write)
     {
-      len = sim_write (gdbsim_desc, memaddr, myaddr, len);
+      xfer_len = sim_write (gdbsim_desc, memaddr, myaddr, xfer_len);
     }
   else
     {
-      len = sim_read (gdbsim_desc, memaddr, myaddr, len);
-      if (sr_get_debug () && len > 0)
-	dump_mem (myaddr, len);
+      xfer_len = sim_read (gdbsim_desc, memaddr, myaddr, xfer_len);
+      if (sr_get_debug () && xfer_len > 0)
+	dump_mem (myaddr, xfer_len);
     }
-  return len;
+  return (LONGEST)xfer_len;
 }
 
 static void

gdb-6.3-support-fopen64-20060413.patch:
 bfdio.c      |   10 ++++++++++
 cache.c      |    8 ++++----
 config.in    |    3 +++
 configure    |    2 +-
 configure.in |    2 +-
 libbfd-in.h  |    1 +
 opncls.c     |    4 ++--
 7 files changed, 22 insertions(+), 8 deletions(-)

--- NEW FILE gdb-6.3-support-fopen64-20060413.patch ---
--- gdb-6.3/bfd/opncls.c.it89056	2006-03-06 14:09:12.083254416 +0900
+++ gdb-6.3/bfd/opncls.c	2006-03-06 14:25:16.418653152 +0900
@@ -237,7 +237,7 @@
     }
 
 #ifndef HAVE_FDOPEN
-  nbfd->iostream = fopen (filename, FOPEN_RB);
+  nbfd->iostream = real_fopen (filename, FOPEN_RB);
 #else
   /* (O_ACCMODE) parens are to avoid Ultrix header file bug.  */
   switch (fdflags & (O_ACCMODE))
@@ -1353,7 +1353,7 @@
      .gnu_debuglink section, we insist upon the user providing us with a
      correct-for-section-creation-time path, but this need not conform to
      the gdb location algorithm.  */
-  handle = fopen (filename, FOPEN_RB);
+  handle = real_fopen (filename, FOPEN_RB);
   if (handle == NULL)
     {
       bfd_set_error (bfd_error_system_call);
--- gdb-6.3/bfd/cache.c.it89056	2006-03-06 14:28:30.916085048 +0900
+++ gdb-6.3/bfd/cache.c	2006-03-06 14:28:07.523641240 +0900
@@ -400,15 +400,15 @@
     {
     case read_direction:
     case no_direction:
-      abfd->iostream = (PTR) fopen (abfd->filename, FOPEN_RB);
+      abfd->iostream = (PTR) real_fopen (abfd->filename, FOPEN_RB);
       break;
     case both_direction:
     case write_direction:
       if (abfd->opened_once)
 	{
-	  abfd->iostream = (PTR) fopen (abfd->filename, FOPEN_RUB);
+	  abfd->iostream = (PTR) real_fopen (abfd->filename, FOPEN_RUB);
 	  if (abfd->iostream == NULL)
-	    abfd->iostream = (PTR) fopen (abfd->filename, FOPEN_WUB);
+	    abfd->iostream = (PTR) real_fopen (abfd->filename, FOPEN_WUB);
 	}
       else
 	{
@@ -438,7 +438,7 @@
 	  if (stat (abfd->filename, &s) == 0 && s.st_size != 0)
 	    unlink (abfd->filename);
 #endif
-	  abfd->iostream = (PTR) fopen (abfd->filename, FOPEN_WUB);
+	  abfd->iostream = (PTR) real_fopen (abfd->filename, FOPEN_WUB);
 	  abfd->opened_once = TRUE;
 	}
       break;
--- gdb-6.3/bfd/configure.in.it89056	2006-03-06 14:28:59.947671576 +0900
+++ gdb-6.3/bfd/configure.in	2006-03-06 14:29:49.606122344 +0900
@@ -910,7 +910,7 @@
 # fseeko, long.  This assumes that sizeof off_t is .ge. sizeof long.
 # Hopefully a reasonable assumption since fseeko et.al. should be
 # upward compatible.
-AC_CHECK_FUNCS(ftello ftello64 fseeko fseeko64)
+AC_CHECK_FUNCS(ftello ftello64 fseeko fseeko64 fopen64)
 if test x"$ac_cv_func_ftello" = xyes -a x"$ac_cv_func_fseeko" = xyes; then
     AC_COMPILE_CHECK_SIZEOF(off_t)
 fi
--- gdb-6.3/bfd/libbfd-in.h.it89056	2006-03-06 14:08:31.572413000 +0900
+++ gdb-6.3/bfd/libbfd-in.h	2006-03-06 14:09:03.867503400 +0900
@@ -626,6 +626,7 @@
    the system "off_t" or "off64_t", as the offset.  */
 extern file_ptr real_ftell (FILE *file);
 extern int real_fseek (FILE *file, file_ptr offset, int whence);
+extern FILE *real_fopen (const char *filename, const char *modes);
 
 FILE *	bfd_cache_lookup_worker
   (bfd *);
--- gdb-6.3/bfd/bfdio.c.it89056	2006-03-06 14:26:57.449294160 +0900
+++ gdb-6.3/bfd/bfdio.c	2006-03-06 14:27:06.755879344 +0900
@@ -62,6 +62,16 @@
 #endif
 }
 
+FILE *
+real_fopen (const char *filename, const char *modes)
+{
+#if defined (HAVE_FOPEN64)
+  return fopen64 (filename, modes);
+#else
+  return fopen (filename, modes);
+#endif
+}
+
 /*
 INTERNAL_DEFINITION
 	struct bfd_iovec
--- gdb-6.3/bfd/config.in.it89056	2006-03-06 16:17:59.190555552 +0900
+++ gdb-6.3/bfd/config.in	2006-03-06 16:19:13.888199784 +0900
@@ -37,6 +37,9 @@
 /* Define to 1 if you have the `fdopen' function. */
 #undef HAVE_FDOPEN
 
+/* Define to 1 if you have the `fopen64' function. */
+#undef HAVE_FOPEN64
+
 /* Define to 1 if you have the `fseeko' function. */
 #undef HAVE_FSEEKO
 
--- gdb-6.3/bfd/configure.it89056	2006-03-06 16:31:05.844965904 +0900
+++ gdb-6.3/bfd/configure	2006-03-06 16:31:23.721248296 +0900
@@ -11885,7 +11885,7 @@
 
 
 
-for ac_func in ftello ftello64 fseeko fseeko64
+for ac_func in ftello ftello64 fseeko fseeko64 fopen64
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/FC-5/gdb.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- gdb.spec	8 Mar 2006 23:48:02 -0000	1.178
+++ gdb.spec	14 Apr 2006 05:52:54 -0000	1.179
@@ -11,7 +11,7 @@
 Version: 6.3.0.0
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 1.122
+Release: 1.126
 
 License: GPL
 Group: Development/Debuggers
@@ -275,6 +275,12 @@
 # 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
+
 %ifarch ia64
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu libunwind >= 0.96-3
 %else
@@ -381,6 +387,8 @@
 %patch172 -p1
 %patch173 -p1
 %patch174 -p1
+%patch175 -p1
+%patch176 -p1
 
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
@@ -549,9 +557,13 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
-* Wed Mar  8 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.122
+* Thu Apr 13 2006 Stepan Kasal <skasal at redhat.com>    - 6.3.0.0-1.126
 - Bump up release number.
 
+* Thu Apr 13 2006 Stepan Kasal <skasal at redhat.com>    - 6.3.0.0-1.123
+- Use fopen64 where available.  Fixes BZ 179399.
+- Use bigger numbers than int.  Fixes BZ 171783.
+
 * Wed Mar  8 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.119
 - Fix regression in PIE debugging (BZ 133944) (re?)introduced by
 the prelink fix (BZ 175075).  Improve testcase for the prelink fix.



From fedora-cvs-commits at redhat.com  Fri Apr 14 05:52:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 01:52:57 -0400
Subject: rpms/gdb/FC-4 gdb-6.3-large-core-20051206.patch, NONE,
	1.1 gdb-6.3-support-fopen64-20060413.patch, NONE, 1.1 gdb.spec,
	1.175, 1.176
Message-ID: <200604140552.k3E5qvo7022034@cvs.devel.redhat.com>

Author: aoliva

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

Modified Files:
	gdb.spec 
Added Files:
	gdb-6.3-large-core-20051206.patch 
	gdb-6.3-support-fopen64-20060413.patch 
Log Message:
* Thu Apr 13 2006 Stepan Kasal <skasal at redhat.com>    - 6.3.0.0-1.123
- Use fopen64 where available.  Fixes BZ 179399.
- Use bigger numbers than int.  Fixes BZ 171783.


gdb-6.3-large-core-20051206.patch:
 dcache.c      |    6 +++---
 dcache.h      |    4 ++--
 exec.c        |    4 ++--
 infptrace.c   |   10 +++++-----
 linux-nat.c   |   12 ++++++------
 linux-nat.h   |    7 ++++---
 remote-sim.c  |   29 ++++++++++++++++-------------
 remote.c      |   24 ++++++++++++++++--------
 symfile-mem.c |   10 +++++++++-
 target.c      |   53 +++++++++++++++++++++++++++--------------------------
 target.h      |   28 ++++++++++++++--------------
 thread-db.c   |    6 +++---
 12 files changed, 107 insertions(+), 86 deletions(-)

--- NEW FILE gdb-6.3-large-core-20051206.patch ---
2005-12-14  Jeff Johnston  <jjohnstn at redhat.com>

	* symfile-mem.c (read_memory): New static read callback function.
	(symfile_add_from_memory): Pass read_memory to bfd instead of
	target_read_memory.
	* target.c (target_xfer_memory): Add support for LONGEST len and
	change all callers.
	(deprecated_debug_xfer_memory, target_read_memory): Ditto.
	(target_write_memory, do_xfer_memory): Ditto.
	(target_xfer_memory_partial, target_read_memory_partial): Ditto.
	(target_write_memory_partial): Ditto.
	* infptrace.c (child_xfer_memory): Ditto.
	* linux-nat.c (linux_nat_xfer_memory): Ditto.
	(linux_nat_proc_xfer_memory): Ditto.
	* dcache.c (dcache_xfer_memory): Ditto.
	* exec.c (xfer_memory): Ditto.
	* remote.c (remote_xfer_memory): Ditto.
	* remote-sim.c (gdbsim_xfer_interior_memory): Ditto.
	* target.h: Change prototypes for functions changed above.
	* linux-nat.h: Ditto.
	* 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 @@
 #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)
+{
+  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");
 
   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.");
 
--- 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
    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 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)
 	    (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 *)) 
 	    nomemory);
   de_fault (to_files_info, 
 	    (void (*) (struct target_ops *)) 
@@ -945,7 +945,7 @@ target_xfer_partial (struct target_ops *
    implementing another singluar mechanism (for instance, a generic
    object:annex onto inferior:object:annex say).  */
 
-static LONGEST
+static int
 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
    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)
 {
   if (target_xfer_partial_p ())
     return xfer_using_stratum (TARGET_OBJECT_MEMORY, NULL,
@@ -1020,7 +1020,7 @@ target_read_memory (CORE_ADDR memaddr, c
 }
 
 int
-target_write_memory (CORE_ADDR memaddr, char *myaddr, int len)
+target_write_memory (CORE_ADDR memaddr, char *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;
 
    Result is -1 on error, or the number of bytes transfered.  */
 
-int
-do_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
+LONGEST
+do_xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len, int write,
 		struct mem_attrib *attrib)
 {
-  int res;
+  LONGEST res;
   int done = 0;
   struct target_ops *t;
 
@@ -1113,10 +1113,10 @@ do_xfer_memory (CORE_ADDR memaddr, char 
    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)
 {
-  int res;
-  int reg_len;
+  LONGEST res;
+  LONGEST reg_len;
   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.  */
 
-static int
-target_xfer_memory_partial (CORE_ADDR memaddr, char *myaddr, int len,
+static LONGEST
+target_xfer_memory_partial (CORE_ADDR memaddr, char *myaddr, LONGEST len,
 			    int write_p, int *err)
 {
-  int res;
-  int reg_len;
+  LONGEST res;
+  LONGEST reg_len;
   struct mem_region *region;
 
   /* Zero length requests are ok and require no work.  */
@@ -1250,8 +1250,8 @@ 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)
 {
   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
     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)
 {
   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)
   fprintf_unfiltered (gdb_stdlog, "target_prepare_to_store ()\n");
 }
 
-static int
-deprecated_debug_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len,
+static LONGEST
+deprecated_debug_xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len,
 			      int write, struct mem_attrib *attrib,
 			      struct target_ops *target)
 {
@@ -1996,9 +1997,9 @@ deprecated_debug_xfer_memory (CORE_ADDR 
 						attrib, target);
 
   fprintf_unfiltered (gdb_stdlog,
-		      "target_xfer_memory (0x%x, xxx, %d, %s, xxx) = %d",
+		      "target_xfer_memory (0x%x, xxx, %ld, %s, xxx) = %d",
 		      (unsigned int) memaddr,	/* possable truncate long long */
-		      len, write ? "write" : "read", retval);
+		      (long)len, write ? "write" : "read", retval);
 
   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
        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 len, int write,
+    LONGEST (*deprecated_xfer_memory) (CORE_ADDR memaddr, char *myaddr,
+				   LONGEST len, int write,
 				   struct mem_attrib *attrib,
 				   struct target_ops *target);
 
@@ -533,20 +533,20 @@ 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 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 xfer_memory (CORE_ADDR, char *, int, int,
-			struct mem_attrib *, struct target_ops *);
+extern LONGEST xfer_memory (CORE_ADDR, char *, LONGEST, int,
+			    struct mem_attrib *, struct target_ops *);
 
-extern int child_xfer_memory (CORE_ADDR, char *, int, int,
-			      struct mem_attrib *, struct target_ops *);
+extern LONGEST child_xfer_memory (CORE_ADDR, char *, 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,
    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 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)
    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,
+LONGEST
+child_xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len, int write,
 		   struct mem_attrib *attrib, struct target_ops *target)
 {
-  int i;
+  LONGEST i;
   /* Round starting address down to longword boundary.  */
   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));
-  int alloc = count * 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)
 
    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,
+		    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
@@ -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);
 
 #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)
    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,
+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)
 {
   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
@@ -27,6 +27,7 @@
 #include "gdb_string.h"
 #include <ctype.h>
 #include <fcntl.h>
+#include <limits.h>
 #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.  */
 
-static int
-remote_xfer_memory (CORE_ADDR mem_addr, char *buffer, int mem_len,
+static LONGEST
+remote_xfer_memory (CORE_ADDR mem_addr, char *buffer, LONGEST mem_len,
 		    int should_write, struct mem_attrib *attrib,
 		    struct target_ops *target)
 {
   CORE_ADDR targ_addr;
   int targ_len;
   int res;
+  int len;
+
+  /* This routine is not set up to handle > INT_MAX bytes.  */
+  if (mem_len >= (LONGEST)INT_MAX)
+    return 0;
+
+  len = (int)mem_len;
 
   /* Should this be the selected frame?  */
   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, 
   else
     res = remote_read_bytes (targ_addr, buffer, targ_len);
 
-  return res;
+  return (LONGEST)res;
 }
 
 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)
 
    Returns the number of bytes transferred. */
 
-static int
-gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len,
+static LONGEST
+gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len,
 			     int write, struct mem_attrib *attrib,
 			     struct target_ops *target)
 {
+  /* Convert to len type that sim_read and sim_write can handle.  */
+  int xfer_len = (int)len;
+
   if (!program_loaded)
     error ("No program loaded.");
 
@@ -755,22 +758,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",
-		       paddr_nz (memaddr), len, write);
+		       paddr_nz (memaddr), xfer_len, write);
       if (sr_get_debug () && write)
-	dump_mem (myaddr, len);
+	dump_mem (myaddr, xfer_len);
     }
 
   if (write)
     {
-      len = sim_write (gdbsim_desc, memaddr, myaddr, len);
+      xfer_len = sim_write (gdbsim_desc, memaddr, myaddr, xfer_len);
     }
   else
     {
-      len = sim_read (gdbsim_desc, memaddr, myaddr, len);
-      if (sr_get_debug () && len > 0)
-	dump_mem (myaddr, len);
+      xfer_len = sim_read (gdbsim_desc, memaddr, myaddr, xfer_len);
+      if (sr_get_debug () && xfer_len > 0)
+	dump_mem (myaddr, xfer_len);
     }
-  return len;
+  return (LONGEST)xfer_len;
 }
 
 static void

gdb-6.3-support-fopen64-20060413.patch:
 bfdio.c      |   10 ++++++++++
 cache.c      |    8 ++++----
 config.in    |    3 +++
 configure    |    2 +-
 configure.in |    2 +-
 libbfd-in.h  |    1 +
 opncls.c     |    4 ++--
 7 files changed, 22 insertions(+), 8 deletions(-)

--- NEW FILE gdb-6.3-support-fopen64-20060413.patch ---
--- gdb-6.3/bfd/opncls.c.it89056	2006-03-06 14:09:12.083254416 +0900
+++ gdb-6.3/bfd/opncls.c	2006-03-06 14:25:16.418653152 +0900
@@ -237,7 +237,7 @@
     }
 
 #ifndef HAVE_FDOPEN
-  nbfd->iostream = fopen (filename, FOPEN_RB);
+  nbfd->iostream = real_fopen (filename, FOPEN_RB);
 #else
   /* (O_ACCMODE) parens are to avoid Ultrix header file bug.  */
   switch (fdflags & (O_ACCMODE))
@@ -1353,7 +1353,7 @@
      .gnu_debuglink section, we insist upon the user providing us with a
      correct-for-section-creation-time path, but this need not conform to
      the gdb location algorithm.  */
-  handle = fopen (filename, FOPEN_RB);
+  handle = real_fopen (filename, FOPEN_RB);
   if (handle == NULL)
     {
       bfd_set_error (bfd_error_system_call);
--- gdb-6.3/bfd/cache.c.it89056	2006-03-06 14:28:30.916085048 +0900
+++ gdb-6.3/bfd/cache.c	2006-03-06 14:28:07.523641240 +0900
@@ -400,15 +400,15 @@
     {
     case read_direction:
     case no_direction:
-      abfd->iostream = (PTR) fopen (abfd->filename, FOPEN_RB);
+      abfd->iostream = (PTR) real_fopen (abfd->filename, FOPEN_RB);
       break;
     case both_direction:
     case write_direction:
       if (abfd->opened_once)
 	{
-	  abfd->iostream = (PTR) fopen (abfd->filename, FOPEN_RUB);
+	  abfd->iostream = (PTR) real_fopen (abfd->filename, FOPEN_RUB);
 	  if (abfd->iostream == NULL)
-	    abfd->iostream = (PTR) fopen (abfd->filename, FOPEN_WUB);
+	    abfd->iostream = (PTR) real_fopen (abfd->filename, FOPEN_WUB);
 	}
       else
 	{
@@ -438,7 +438,7 @@
 	  if (stat (abfd->filename, &s) == 0 && s.st_size != 0)
 	    unlink (abfd->filename);
 #endif
-	  abfd->iostream = (PTR) fopen (abfd->filename, FOPEN_WUB);
+	  abfd->iostream = (PTR) real_fopen (abfd->filename, FOPEN_WUB);
 	  abfd->opened_once = TRUE;
 	}
       break;
--- gdb-6.3/bfd/configure.in.it89056	2006-03-06 14:28:59.947671576 +0900
+++ gdb-6.3/bfd/configure.in	2006-03-06 14:29:49.606122344 +0900
@@ -910,7 +910,7 @@
 # fseeko, long.  This assumes that sizeof off_t is .ge. sizeof long.
 # Hopefully a reasonable assumption since fseeko et.al. should be
 # upward compatible.
-AC_CHECK_FUNCS(ftello ftello64 fseeko fseeko64)
+AC_CHECK_FUNCS(ftello ftello64 fseeko fseeko64 fopen64)
 if test x"$ac_cv_func_ftello" = xyes -a x"$ac_cv_func_fseeko" = xyes; then
     AC_COMPILE_CHECK_SIZEOF(off_t)
 fi
--- gdb-6.3/bfd/libbfd-in.h.it89056	2006-03-06 14:08:31.572413000 +0900
+++ gdb-6.3/bfd/libbfd-in.h	2006-03-06 14:09:03.867503400 +0900
@@ -626,6 +626,7 @@
    the system "off_t" or "off64_t", as the offset.  */
 extern file_ptr real_ftell (FILE *file);
 extern int real_fseek (FILE *file, file_ptr offset, int whence);
+extern FILE *real_fopen (const char *filename, const char *modes);
 
 FILE *	bfd_cache_lookup_worker
   (bfd *);
--- gdb-6.3/bfd/bfdio.c.it89056	2006-03-06 14:26:57.449294160 +0900
+++ gdb-6.3/bfd/bfdio.c	2006-03-06 14:27:06.755879344 +0900
@@ -62,6 +62,16 @@
 #endif
 }
 
+FILE *
+real_fopen (const char *filename, const char *modes)
+{
+#if defined (HAVE_FOPEN64)
+  return fopen64 (filename, modes);
+#else
+  return fopen (filename, modes);
+#endif
+}
+
 /*
 INTERNAL_DEFINITION
 	struct bfd_iovec
--- gdb-6.3/bfd/config.in.it89056	2006-03-06 16:17:59.190555552 +0900
+++ gdb-6.3/bfd/config.in	2006-03-06 16:19:13.888199784 +0900
@@ -37,6 +37,9 @@
 /* Define to 1 if you have the `fdopen' function. */
 #undef HAVE_FDOPEN
 
+/* Define to 1 if you have the `fopen64' function. */
+#undef HAVE_FOPEN64
+
 /* Define to 1 if you have the `fseeko' function. */
 #undef HAVE_FSEEKO
 
--- gdb-6.3/bfd/configure.it89056	2006-03-06 16:31:05.844965904 +0900
+++ gdb-6.3/bfd/configure	2006-03-06 16:31:23.721248296 +0900
@@ -11885,7 +11885,7 @@
 
 
 
-for ac_func in ftello ftello64 fseeko fseeko64
+for ac_func in ftello ftello64 fseeko fseeko64 fopen64
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/FC-4/gdb.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- gdb.spec	8 Mar 2006 23:48:02 -0000	1.175
+++ gdb.spec	14 Apr 2006 05:52:54 -0000	1.176
@@ -11,7 +11,7 @@
 Version: 6.3.0.0
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 1.121
+Release: 1.125
 
 License: GPL
 Group: Development/Debuggers
@@ -275,6 +275,12 @@
 # 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
+
 %ifarch ia64
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu libunwind >= 0.96-3
 %else
@@ -381,6 +387,8 @@
 %patch172 -p1
 %patch173 -p1
 %patch174 -p1
+%patch175 -p1
+%patch176 -p1
 
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
@@ -549,9 +557,13 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
-* Wed Mar  8 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.121
+* Thu Apr 13 2006 Stepan Kasal <skasal at redhat.com>    - 6.3.0.0-1.125
 - Bump up release number.
 
+* Thu Apr 13 2006 Stepan Kasal <skasal at redhat.com>    - 6.3.0.0-1.123
+- Use fopen64 where available.  Fixes BZ 179399.
+- Use bigger numbers than int.  Fixes BZ 171783.
+
 * Wed Mar  8 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.119
 - Fix regression in PIE debugging (BZ 133944) (re?)introduced by
 the prelink fix (BZ 175075).  Improve testcase for the prelink fix.



From fedora-cvs-commits at redhat.com  Fri Apr 14 05:52:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 01:52:56 -0400
Subject: rpms/gdb/devel gdb-6.3-large-core-20051206.patch, NONE,
	1.1 gdb-6.3-support-fopen64-20060413.patch, NONE, 1.1 gdb.spec,
	1.178, 1.179
Message-ID: <200604140552.k3E5qug7022023@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21601/gdb-devel

Modified Files:
	gdb.spec 
Added Files:
	gdb-6.3-large-core-20051206.patch 
	gdb-6.3-support-fopen64-20060413.patch 
Log Message:
* Thu Apr 13 2006 Stepan Kasal <skasal at redhat.com>    - 6.3.0.0-1.123
- Use fopen64 where available.  Fixes BZ 179399.
- Use bigger numbers than int.  Fixes BZ 171783.


gdb-6.3-large-core-20051206.patch:
 dcache.c      |    6 +++---
 dcache.h      |    4 ++--
 exec.c        |    4 ++--
 infptrace.c   |   10 +++++-----
 linux-nat.c   |   12 ++++++------
 linux-nat.h   |    7 ++++---
 remote-sim.c  |   29 ++++++++++++++++-------------
 remote.c      |   24 ++++++++++++++++--------
 symfile-mem.c |   10 +++++++++-
 target.c      |   53 +++++++++++++++++++++++++++--------------------------
 target.h      |   28 ++++++++++++++--------------
 thread-db.c   |    6 +++---
 12 files changed, 107 insertions(+), 86 deletions(-)

--- NEW FILE gdb-6.3-large-core-20051206.patch ---
2005-12-14  Jeff Johnston  <jjohnstn at redhat.com>

	* symfile-mem.c (read_memory): New static read callback function.
	(symfile_add_from_memory): Pass read_memory to bfd instead of
	target_read_memory.
	* target.c (target_xfer_memory): Add support for LONGEST len and
	change all callers.
	(deprecated_debug_xfer_memory, target_read_memory): Ditto.
	(target_write_memory, do_xfer_memory): Ditto.
	(target_xfer_memory_partial, target_read_memory_partial): Ditto.
	(target_write_memory_partial): Ditto.
	* infptrace.c (child_xfer_memory): Ditto.
	* linux-nat.c (linux_nat_xfer_memory): Ditto.
	(linux_nat_proc_xfer_memory): Ditto.
	* dcache.c (dcache_xfer_memory): Ditto.
	* exec.c (xfer_memory): Ditto.
	* remote.c (remote_xfer_memory): Ditto.
	* remote-sim.c (gdbsim_xfer_interior_memory): Ditto.
	* target.h: Change prototypes for functions changed above.
	* linux-nat.h: Ditto.
	* 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 @@
 #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)
+{
+  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");
 
   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.");
 
--- 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
    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 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)
 	    (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 *)) 
 	    nomemory);
   de_fault (to_files_info, 
 	    (void (*) (struct target_ops *)) 
@@ -945,7 +945,7 @@ target_xfer_partial (struct target_ops *
    implementing another singluar mechanism (for instance, a generic
    object:annex onto inferior:object:annex say).  */
 
-static LONGEST
+static int
 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
    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)
 {
   if (target_xfer_partial_p ())
     return xfer_using_stratum (TARGET_OBJECT_MEMORY, NULL,
@@ -1020,7 +1020,7 @@ target_read_memory (CORE_ADDR memaddr, c
 }
 
 int
-target_write_memory (CORE_ADDR memaddr, char *myaddr, int len)
+target_write_memory (CORE_ADDR memaddr, char *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;
 
    Result is -1 on error, or the number of bytes transfered.  */
 
-int
-do_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
+LONGEST
+do_xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len, int write,
 		struct mem_attrib *attrib)
 {
-  int res;
+  LONGEST res;
   int done = 0;
   struct target_ops *t;
 
@@ -1113,10 +1113,10 @@ do_xfer_memory (CORE_ADDR memaddr, char 
    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)
 {
-  int res;
-  int reg_len;
+  LONGEST res;
+  LONGEST reg_len;
   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.  */
 
-static int
-target_xfer_memory_partial (CORE_ADDR memaddr, char *myaddr, int len,
+static LONGEST
+target_xfer_memory_partial (CORE_ADDR memaddr, char *myaddr, LONGEST len,
 			    int write_p, int *err)
 {
-  int res;
-  int reg_len;
+  LONGEST res;
+  LONGEST reg_len;
   struct mem_region *region;
 
   /* Zero length requests are ok and require no work.  */
@@ -1250,8 +1250,8 @@ 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)
 {
   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
     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)
 {
   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)
   fprintf_unfiltered (gdb_stdlog, "target_prepare_to_store ()\n");
 }
 
-static int
-deprecated_debug_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len,
+static LONGEST
+deprecated_debug_xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len,
 			      int write, struct mem_attrib *attrib,
 			      struct target_ops *target)
 {
@@ -1996,9 +1997,9 @@ deprecated_debug_xfer_memory (CORE_ADDR 
 						attrib, target);
 
   fprintf_unfiltered (gdb_stdlog,
-		      "target_xfer_memory (0x%x, xxx, %d, %s, xxx) = %d",
+		      "target_xfer_memory (0x%x, xxx, %ld, %s, xxx) = %d",
 		      (unsigned int) memaddr,	/* possable truncate long long */
-		      len, write ? "write" : "read", retval);
+		      (long)len, write ? "write" : "read", retval);
 
   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
        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 len, int write,
+    LONGEST (*deprecated_xfer_memory) (CORE_ADDR memaddr, char *myaddr,
+				   LONGEST len, int write,
 				   struct mem_attrib *attrib,
 				   struct target_ops *target);
 
@@ -533,20 +533,20 @@ 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 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 xfer_memory (CORE_ADDR, char *, int, int,
-			struct mem_attrib *, struct target_ops *);
+extern LONGEST xfer_memory (CORE_ADDR, char *, LONGEST, int,
+			    struct mem_attrib *, struct target_ops *);
 
-extern int child_xfer_memory (CORE_ADDR, char *, int, int,
-			      struct mem_attrib *, struct target_ops *);
+extern LONGEST child_xfer_memory (CORE_ADDR, char *, 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,
    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 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)
    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,
+LONGEST
+child_xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len, int write,
 		   struct mem_attrib *attrib, struct target_ops *target)
 {
-  int i;
+  LONGEST i;
   /* Round starting address down to longword boundary.  */
   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));
-  int alloc = count * 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)
 
    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,
+		    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
@@ -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);
 
 #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)
    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,
+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)
 {
   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
@@ -27,6 +27,7 @@
 #include "gdb_string.h"
 #include <ctype.h>
 #include <fcntl.h>
+#include <limits.h>
 #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.  */
 
-static int
-remote_xfer_memory (CORE_ADDR mem_addr, char *buffer, int mem_len,
+static LONGEST
+remote_xfer_memory (CORE_ADDR mem_addr, char *buffer, LONGEST mem_len,
 		    int should_write, struct mem_attrib *attrib,
 		    struct target_ops *target)
 {
   CORE_ADDR targ_addr;
   int targ_len;
   int res;
+  int len;
+
+  /* This routine is not set up to handle > INT_MAX bytes.  */
+  if (mem_len >= (LONGEST)INT_MAX)
+    return 0;
+
+  len = (int)mem_len;
 
   /* Should this be the selected frame?  */
   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, 
   else
     res = remote_read_bytes (targ_addr, buffer, targ_len);
 
-  return res;
+  return (LONGEST)res;
 }
 
 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)
 
    Returns the number of bytes transferred. */
 
-static int
-gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len,
+static LONGEST
+gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len,
 			     int write, struct mem_attrib *attrib,
 			     struct target_ops *target)
 {
+  /* Convert to len type that sim_read and sim_write can handle.  */
+  int xfer_len = (int)len;
+
   if (!program_loaded)
     error ("No program loaded.");
 
@@ -755,22 +758,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",
-		       paddr_nz (memaddr), len, write);
+		       paddr_nz (memaddr), xfer_len, write);
       if (sr_get_debug () && write)
-	dump_mem (myaddr, len);
+	dump_mem (myaddr, xfer_len);
     }
 
   if (write)
     {
-      len = sim_write (gdbsim_desc, memaddr, myaddr, len);
+      xfer_len = sim_write (gdbsim_desc, memaddr, myaddr, xfer_len);
     }
   else
     {
-      len = sim_read (gdbsim_desc, memaddr, myaddr, len);
-      if (sr_get_debug () && len > 0)
-	dump_mem (myaddr, len);
+      xfer_len = sim_read (gdbsim_desc, memaddr, myaddr, xfer_len);
+      if (sr_get_debug () && xfer_len > 0)
+	dump_mem (myaddr, xfer_len);
     }
-  return len;
+  return (LONGEST)xfer_len;
 }
 
 static void

gdb-6.3-support-fopen64-20060413.patch:
 bfdio.c      |   10 ++++++++++
 cache.c      |    8 ++++----
 config.in    |    3 +++
 configure    |    2 +-
 configure.in |    2 +-
 libbfd-in.h  |    1 +
 opncls.c     |    4 ++--
 7 files changed, 22 insertions(+), 8 deletions(-)

--- NEW FILE gdb-6.3-support-fopen64-20060413.patch ---
--- gdb-6.3/bfd/opncls.c.it89056	2006-03-06 14:09:12.083254416 +0900
+++ gdb-6.3/bfd/opncls.c	2006-03-06 14:25:16.418653152 +0900
@@ -237,7 +237,7 @@
     }
 
 #ifndef HAVE_FDOPEN
-  nbfd->iostream = fopen (filename, FOPEN_RB);
+  nbfd->iostream = real_fopen (filename, FOPEN_RB);
 #else
   /* (O_ACCMODE) parens are to avoid Ultrix header file bug.  */
   switch (fdflags & (O_ACCMODE))
@@ -1353,7 +1353,7 @@
      .gnu_debuglink section, we insist upon the user providing us with a
      correct-for-section-creation-time path, but this need not conform to
      the gdb location algorithm.  */
-  handle = fopen (filename, FOPEN_RB);
+  handle = real_fopen (filename, FOPEN_RB);
   if (handle == NULL)
     {
       bfd_set_error (bfd_error_system_call);
--- gdb-6.3/bfd/cache.c.it89056	2006-03-06 14:28:30.916085048 +0900
+++ gdb-6.3/bfd/cache.c	2006-03-06 14:28:07.523641240 +0900
@@ -400,15 +400,15 @@
     {
     case read_direction:
     case no_direction:
-      abfd->iostream = (PTR) fopen (abfd->filename, FOPEN_RB);
+      abfd->iostream = (PTR) real_fopen (abfd->filename, FOPEN_RB);
       break;
     case both_direction:
     case write_direction:
       if (abfd->opened_once)
 	{
-	  abfd->iostream = (PTR) fopen (abfd->filename, FOPEN_RUB);
+	  abfd->iostream = (PTR) real_fopen (abfd->filename, FOPEN_RUB);
 	  if (abfd->iostream == NULL)
-	    abfd->iostream = (PTR) fopen (abfd->filename, FOPEN_WUB);
+	    abfd->iostream = (PTR) real_fopen (abfd->filename, FOPEN_WUB);
 	}
       else
 	{
@@ -438,7 +438,7 @@
 	  if (stat (abfd->filename, &s) == 0 && s.st_size != 0)
 	    unlink (abfd->filename);
 #endif
-	  abfd->iostream = (PTR) fopen (abfd->filename, FOPEN_WUB);
+	  abfd->iostream = (PTR) real_fopen (abfd->filename, FOPEN_WUB);
 	  abfd->opened_once = TRUE;
 	}
       break;
--- gdb-6.3/bfd/configure.in.it89056	2006-03-06 14:28:59.947671576 +0900
+++ gdb-6.3/bfd/configure.in	2006-03-06 14:29:49.606122344 +0900
@@ -910,7 +910,7 @@
 # fseeko, long.  This assumes that sizeof off_t is .ge. sizeof long.
 # Hopefully a reasonable assumption since fseeko et.al. should be
 # upward compatible.
-AC_CHECK_FUNCS(ftello ftello64 fseeko fseeko64)
+AC_CHECK_FUNCS(ftello ftello64 fseeko fseeko64 fopen64)
 if test x"$ac_cv_func_ftello" = xyes -a x"$ac_cv_func_fseeko" = xyes; then
     AC_COMPILE_CHECK_SIZEOF(off_t)
 fi
--- gdb-6.3/bfd/libbfd-in.h.it89056	2006-03-06 14:08:31.572413000 +0900
+++ gdb-6.3/bfd/libbfd-in.h	2006-03-06 14:09:03.867503400 +0900
@@ -626,6 +626,7 @@
    the system "off_t" or "off64_t", as the offset.  */
 extern file_ptr real_ftell (FILE *file);
 extern int real_fseek (FILE *file, file_ptr offset, int whence);
+extern FILE *real_fopen (const char *filename, const char *modes);
 
 FILE *	bfd_cache_lookup_worker
   (bfd *);
--- gdb-6.3/bfd/bfdio.c.it89056	2006-03-06 14:26:57.449294160 +0900
+++ gdb-6.3/bfd/bfdio.c	2006-03-06 14:27:06.755879344 +0900
@@ -62,6 +62,16 @@
 #endif
 }
 
+FILE *
+real_fopen (const char *filename, const char *modes)
+{
+#if defined (HAVE_FOPEN64)
+  return fopen64 (filename, modes);
+#else
+  return fopen (filename, modes);
+#endif
+}
+
 /*
 INTERNAL_DEFINITION
 	struct bfd_iovec
--- gdb-6.3/bfd/config.in.it89056	2006-03-06 16:17:59.190555552 +0900
+++ gdb-6.3/bfd/config.in	2006-03-06 16:19:13.888199784 +0900
@@ -37,6 +37,9 @@
 /* Define to 1 if you have the `fdopen' function. */
 #undef HAVE_FDOPEN
 
+/* Define to 1 if you have the `fopen64' function. */
+#undef HAVE_FOPEN64
+
 /* Define to 1 if you have the `fseeko' function. */
 #undef HAVE_FSEEKO
 
--- gdb-6.3/bfd/configure.it89056	2006-03-06 16:31:05.844965904 +0900
+++ gdb-6.3/bfd/configure	2006-03-06 16:31:23.721248296 +0900
@@ -11885,7 +11885,7 @@
 
 
 
-for ac_func in ftello ftello64 fseeko fseeko64
+for ac_func in ftello ftello64 fseeko fseeko64 fopen64
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- gdb.spec	8 Mar 2006 23:48:02 -0000	1.178
+++ gdb.spec	14 Apr 2006 05:52:53 -0000	1.179
@@ -11,7 +11,7 @@
 Version: 6.3.0.0
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 1.122
+Release: 1.127
 
 License: GPL
 Group: Development/Debuggers
@@ -275,6 +275,12 @@
 # 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
+
 %ifarch ia64
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu libunwind >= 0.96-3
 %else
@@ -381,6 +387,8 @@
 %patch172 -p1
 %patch173 -p1
 %patch174 -p1
+%patch175 -p1
+%patch176 -p1
 
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
@@ -549,9 +557,13 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
-* Wed Mar  8 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.122
+* Thu Apr 13 2006 Stepan Kasal <skasal at redhat.com>    - 6.3.0.0-1.127
 - Bump up release number.
 
+* Thu Apr 13 2006 Stepan Kasal <skasal at redhat.com>    - 6.3.0.0-1.123
+- Use fopen64 where available.  Fixes BZ 179399.
+- Use bigger numbers than int.  Fixes BZ 171783.
+
 * Wed Mar  8 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.119
 - Fix regression in PIE debugging (BZ 133944) (re?)introduced by
 the prelink fix (BZ 175075).  Improve testcase for the prelink fix.



From fedora-cvs-commits at redhat.com  Fri Apr 14 06:46:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 02:46:44 -0400
Subject: rpms/firefox/devel .cvsignore, 1.22, 1.23 firefox.spec, 1.112,
	1.113 sources, 1.24, 1.25
Message-ID: <200604140646.k3E6kiOQ028914@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
new langpacks too


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	14 Apr 2006 05:51:43 -0000	1.22
+++ .cvsignore	14 Apr 2006 06:46:41 -0000	1.23
@@ -19,3 +19,4 @@
 firefox-1.5.0.1-source.tar.bz2
 firefox-langpacks-1.5.0.1-20060201.tar.bz2
 firefox-1.5.0.2-source.tar.bz2
+firefox-langpacks-1.5.0.2-20060413.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- firefox.spec	14 Apr 2006 05:51:43 -0000	1.112
+++ firefox.spec	14 Apr 2006 06:46:41 -0000	1.113
@@ -20,7 +20,7 @@
 %endif
 Source0:        %{tarball}
 Source1:        firefox-gnomestripe-0.1.tar.gz
-Source2:        firefox-langpacks-%{version}-20060201.tar.bz2
+Source2:        firefox-langpacks-%{version}-20060413.tar.bz2
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
 Source12:       firefox-redhat-default-bookmarks.html


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	14 Apr 2006 05:51:43 -0000	1.24
+++ sources	14 Apr 2006 06:46:41 -0000	1.25
@@ -1,3 +1,3 @@
 b628d5f24a49ab15d1943b7d694edd90  firefox-gnomestripe-0.1.tar.gz
-963584af1fd5d8b7551c7e92f44f2242  firefox-langpacks-1.5.0.1-20060201.tar.bz2
 6bd65d899e9bcb16c28225899cc61a1e  firefox-1.5.0.2-source.tar.bz2
+d0ca5cf530f1a60d0ca0180ddcd10b8b  firefox-langpacks-1.5.0.2-20060413.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr 14 07:06:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 03:06:28 -0400
Subject: rpms/gdb/FC-4 gdb-6.3-gstack-without-path-20060414.patch, NONE,
	1.1 gdb-6.3-sigchld-exception-20060331.patch, NONE,
	1.1 gdb.spec, 1.176, 1.177
Message-ID: <200604140706.k3E76SAt004406@cvs.devel.redhat.com>

Author: aoliva

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

Modified Files:
	gdb.spec 
Added Files:
	gdb-6.3-gstack-without-path-20060414.patch 
	gdb-6.3-sigchld-exception-20060331.patch 
Log Message:
* Fri Apr 14 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.128
- Avoid race conditions caused by exceptions messing with signal masks.
(BZ 175270, BZ 175083, maybe BZ 172938).
- Hardcode /bin and /usr/bin paths into gstack (BZ 179829).
- Build in a subdir of the source tree instead of in a sibling directory.
- Switch to versioning scheme that uses the same base revision number
for all OSes, and uses a suffix to tell the builds apart and ensure
upgradability.


gdb-6.3-gstack-without-path-20060414.patch:
 gstack.sh |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE gdb-6.3-gstack-without-path-20060414.patch ---
Index: gdb-6.3/gdb/gstack.sh
--- gdb-6.3/gdb/gstack.sh	2006-01-16 16:41:13.000000000 +0000
+++ gdb-6.3/gdb/gstack.sh	2006-02-02 09:22:12.000000000 +0000
@@ -17,17 +17,17 @@
 backtrace="bt"
 if test -d /proc/$1/task ; then
     # Newer kernel; has a task/ directory.
-    if test `ls /proc/$1/task | wc -l` -gt 1 2>/dev/null ; then
+    if test `/bin/ls /proc/$1/task | /usr/bin/wc -l` -gt 1 2>/dev/null ; then
 	backtrace="thread apply all bt"
     fi
 elif test -f /proc/$1/maps ; then
     # Older kernel; go by it loading libpthread.
-    if grep -e libpthread /proc/$1/maps > /dev/null 2>&1 ; then
+    if /bin/grep -e libpthread /proc/$1/maps > /dev/null 2>&1 ; then
 	backtrace="thread apply all bt"
     fi
 fi
 
-GDB=${GDB:-gdb}
+GDB=${GDB:-/usr/bin/gdb}
 
 if $GDB -nx --quiet --batch --readnever > /dev/null 2>&1; then
     readnever=--readnever
@@ -39,7 +39,7 @@
 $GDB --quiet $readnever -nx /proc/$1/exe $1 <<EOF 2>&1 | 
 $backtrace
 EOF
-sed -n \
+/bin/sed -n \
     -e 's/^(gdb) //' \
     -e '/^#/p' \
     -e '/^Thread/p'

gdb-6.3-sigchld-exception-20060331.patch:
 linux-nat.c |   35 ++++++++++++++++++++++-------------
 1 files changed, 22 insertions(+), 13 deletions(-)

--- NEW FILE gdb-6.3-sigchld-exception-20060331.patch ---
for gdb/ChangeLog
from Alexandre Oliva  <aoliva at redhat.com>

	* linux-nat.c (make_sure_sigchild_is_blocked): New function.
	(lin_lwp_attach_lwp, linux_nat_wait): Use it.

Index: gdb-6.3/gdb/linux-nat.c
===================================================================
--- gdb-6.3.orig/gdb/linux-nat.c	2006-02-14 17:21:08.000000000 -0200
+++ gdb-6.3/gdb/linux-nat.c	2006-03-31 03:21:17.000000000 -0300
@@ -827,6 +827,24 @@ iterate_over_lwps (int (*callback) (stru
   return NULL;
 }
 
+/* Make sure the set of blocked signals in effect contains SIGCHLD.
+   We used to try to avoid the system call by testing whether
+   blocked_mask contained SIGCHLD, but that is not reliable: caught
+   exceptions will restore the signal mask, leaving blocked_mask
+   unchanged.  There are no mechanisms available to get it in sync at
+   such times, since the exception that would cause this may be thrown
+   long after our caller returns.  Our callers could avoid the problem
+   by disabling the signal block before returning, but this would
+   defeat the point of the optimization.  Fortunately, all they care
+   about is that the signal block is in effect while they run, so
+   that's just what we do.  */
+static void
+make_sure_sigchild_is_blocked ()
+{
+  sigaddset (&blocked_mask, SIGCHLD);
+  sigprocmask (SIG_BLOCK, &blocked_mask, NULL);
+}
+
 /* Attach to the LWP specified by PID.  If VERBOSE is non-zero, print
    a message telling the user that a new LWP has been added to the
    process.  */
@@ -838,13 +856,9 @@ lin_lwp_attach_lwp (ptid_t ptid, int ver
 
   gdb_assert (is_lwp (ptid));
 
-  /* Make sure SIGCHLD is blocked.  We don't want SIGCHLD events
-     to interrupt either the ptrace() or waitpid() calls below.  */
-  if (!sigismember (&blocked_mask, SIGCHLD))
-    {
-      sigaddset (&blocked_mask, SIGCHLD);
-      sigprocmask (SIG_BLOCK, &blocked_mask, NULL);
-    }
+  /* We don't want SIGCHLD events to interrupt either the ptrace() or
+     waitpid() calls below.  */
+  make_sure_sigchild_is_blocked ();
 
   if (verbose)
     printf_filtered ("[New %s]\n", target_pid_to_str (ptid));
@@ -1856,12 +1870,7 @@ linux_nat_wait (ptid_t ptid, struct targ
 
   sigemptyset (&flush_mask);
 
-  /* Make sure SIGCHLD is blocked.  */
-  if (!sigismember (&blocked_mask, SIGCHLD))
-    {
-      sigaddset (&blocked_mask, SIGCHLD);
-      sigprocmask (SIG_BLOCK, &blocked_mask, NULL);
-    }
+  make_sure_sigchild_is_blocked ();
 
 retry:
 


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/FC-4/gdb.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- gdb.spec	14 Apr 2006 05:52:54 -0000	1.176
+++ gdb.spec	14 Apr 2006 07:05:50 -0000	1.177
@@ -11,7 +11,7 @@
 Version: 6.3.0.0
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 1.125
+Release: 1.128.FC4
 
 License: GPL
 Group: Development/Debuggers
@@ -21,7 +21,7 @@
 
 # For our convenience
 %define gdb_src gdb-6.3
-%define gdb_build gdb-%{version}-build-%{_target_platform}
+%define gdb_build %{gdb_src}/build-%{_target_platform}
 
 # Make sure we get rid of the old package gdb64, now that we have unified
 # support for 32-64 bits in one single 64-bit gdb.
@@ -281,6 +281,13 @@
 # Use bigger numbers than int.
 Patch176: gdb-6.3-large-core-20051206.patch
 
+# Do not let exceptions in GDB break SIGCHLD blocking.
+Patch177: gdb-6.3-sigchld-exception-20060331.patch
+
+# Hard-code executable names in gstack, such that it can run with a
+# corrupted or missing PATH.
+Patch178: gdb-6.3-gstack-without-path-20060414.patch
+
 %ifarch ia64
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu libunwind >= 0.96-3
 %else
@@ -389,6 +396,8 @@
 %patch174 -p1
 %patch175 -p1
 %patch176 -p1
+%patch177 -p1
+%patch178 -p1
 
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
@@ -435,7 +444,7 @@
 enable_build_warnings="--enable-gdb-build-warnings=,-Werror"
 %endif
 
-../%{gdb_src}/configure \
+../configure \
 	--prefix=%{_prefix} \
 	--sysconfdir=%{_sysconfdir} \
 	--mandir=%{_mandir} \
@@ -557,13 +566,25 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
-* Thu Apr 13 2006 Stepan Kasal <skasal at redhat.com>    - 6.3.0.0-1.125
+* Fri Apr 14 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.128
+- Avoid race conditions caused by exceptions messing with signal masks.
+(BZ 175270, BZ 175083, maybe BZ 172938).
+- Hardcode /bin and /usr/bin paths into gstack (BZ 179829).
+- Build in a subdir of the source tree instead of in a sibling directory.
+- Switch to versioning scheme that uses the same base revision number
+for all OSes, and uses a suffix to tell the builds apart and ensure
+upgradability.
+
+* Thu Apr 13 2006 Stepan Kasal <skasal at redhat.com>    - 6.3.0.0-1.127
 - Bump up release number.
 
 * Thu Apr 13 2006 Stepan Kasal <skasal at redhat.com>    - 6.3.0.0-1.123
-- Use fopen64 where available.  Fixes BZ 179399.
+- Use fopen64 where available.  Fixes BZ 178796.
 - Use bigger numbers than int.  Fixes BZ 171783.
 
+* Wed Mar  8 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.122
+- Bump up release number.
+
 * Wed Mar  8 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.119
 - Fix regression in PIE debugging (BZ 133944) (re?)introduced by
 the prelink fix (BZ 175075).  Improve testcase for the prelink fix.



From fedora-cvs-commits at redhat.com  Fri Apr 14 07:06:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 03:06:46 -0400
Subject: rpms/gdb/FC-5 gdb-6.3-gstack-without-path-20060414.patch, NONE,
	1.1 gdb-6.3-sigchld-exception-20060331.patch, NONE,
	1.1 gdb.spec, 1.179, 1.180
Message-ID: <200604140706.k3E76igb004500@cvs.devel.redhat.com>

Author: aoliva

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

Modified Files:
	gdb.spec 
Added Files:
	gdb-6.3-gstack-without-path-20060414.patch 
	gdb-6.3-sigchld-exception-20060331.patch 
Log Message:
* Fri Apr 14 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.128
- Avoid race conditions caused by exceptions messing with signal masks.
(BZ 175270, BZ 175083, maybe BZ 172938).
- Hardcode /bin and /usr/bin paths into gstack (BZ 179829).
- Build in a subdir of the source tree instead of in a sibling directory.
- Switch to versioning scheme that uses the same base revision number
for all OSes, and uses a suffix to tell the builds apart and ensure
upgradability.


gdb-6.3-gstack-without-path-20060414.patch:
 gstack.sh |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE gdb-6.3-gstack-without-path-20060414.patch ---
Index: gdb-6.3/gdb/gstack.sh
--- gdb-6.3/gdb/gstack.sh	2006-01-16 16:41:13.000000000 +0000
+++ gdb-6.3/gdb/gstack.sh	2006-02-02 09:22:12.000000000 +0000
@@ -17,17 +17,17 @@
 backtrace="bt"
 if test -d /proc/$1/task ; then
     # Newer kernel; has a task/ directory.
-    if test `ls /proc/$1/task | wc -l` -gt 1 2>/dev/null ; then
+    if test `/bin/ls /proc/$1/task | /usr/bin/wc -l` -gt 1 2>/dev/null ; then
 	backtrace="thread apply all bt"
     fi
 elif test -f /proc/$1/maps ; then
     # Older kernel; go by it loading libpthread.
-    if grep -e libpthread /proc/$1/maps > /dev/null 2>&1 ; then
+    if /bin/grep -e libpthread /proc/$1/maps > /dev/null 2>&1 ; then
 	backtrace="thread apply all bt"
     fi
 fi
 
-GDB=${GDB:-gdb}
+GDB=${GDB:-/usr/bin/gdb}
 
 if $GDB -nx --quiet --batch --readnever > /dev/null 2>&1; then
     readnever=--readnever
@@ -39,7 +39,7 @@
 $GDB --quiet $readnever -nx /proc/$1/exe $1 <<EOF 2>&1 | 
 $backtrace
 EOF
-sed -n \
+/bin/sed -n \
     -e 's/^(gdb) //' \
     -e '/^#/p' \
     -e '/^Thread/p'

gdb-6.3-sigchld-exception-20060331.patch:
 linux-nat.c |   35 ++++++++++++++++++++++-------------
 1 files changed, 22 insertions(+), 13 deletions(-)

--- NEW FILE gdb-6.3-sigchld-exception-20060331.patch ---
for gdb/ChangeLog
from Alexandre Oliva  <aoliva at redhat.com>

	* linux-nat.c (make_sure_sigchild_is_blocked): New function.
	(lin_lwp_attach_lwp, linux_nat_wait): Use it.

Index: gdb-6.3/gdb/linux-nat.c
===================================================================
--- gdb-6.3.orig/gdb/linux-nat.c	2006-02-14 17:21:08.000000000 -0200
+++ gdb-6.3/gdb/linux-nat.c	2006-03-31 03:21:17.000000000 -0300
@@ -827,6 +827,24 @@ iterate_over_lwps (int (*callback) (stru
   return NULL;
 }
 
+/* Make sure the set of blocked signals in effect contains SIGCHLD.
+   We used to try to avoid the system call by testing whether
+   blocked_mask contained SIGCHLD, but that is not reliable: caught
+   exceptions will restore the signal mask, leaving blocked_mask
+   unchanged.  There are no mechanisms available to get it in sync at
+   such times, since the exception that would cause this may be thrown
+   long after our caller returns.  Our callers could avoid the problem
+   by disabling the signal block before returning, but this would
+   defeat the point of the optimization.  Fortunately, all they care
+   about is that the signal block is in effect while they run, so
+   that's just what we do.  */
+static void
+make_sure_sigchild_is_blocked ()
+{
+  sigaddset (&blocked_mask, SIGCHLD);
+  sigprocmask (SIG_BLOCK, &blocked_mask, NULL);
+}
+
 /* Attach to the LWP specified by PID.  If VERBOSE is non-zero, print
    a message telling the user that a new LWP has been added to the
    process.  */
@@ -838,13 +856,9 @@ lin_lwp_attach_lwp (ptid_t ptid, int ver
 
   gdb_assert (is_lwp (ptid));
 
-  /* Make sure SIGCHLD is blocked.  We don't want SIGCHLD events
-     to interrupt either the ptrace() or waitpid() calls below.  */
-  if (!sigismember (&blocked_mask, SIGCHLD))
-    {
-      sigaddset (&blocked_mask, SIGCHLD);
-      sigprocmask (SIG_BLOCK, &blocked_mask, NULL);
-    }
+  /* We don't want SIGCHLD events to interrupt either the ptrace() or
+     waitpid() calls below.  */
+  make_sure_sigchild_is_blocked ();
 
   if (verbose)
     printf_filtered ("[New %s]\n", target_pid_to_str (ptid));
@@ -1856,12 +1870,7 @@ linux_nat_wait (ptid_t ptid, struct targ
 
   sigemptyset (&flush_mask);
 
-  /* Make sure SIGCHLD is blocked.  */
-  if (!sigismember (&blocked_mask, SIGCHLD))
-    {
-      sigaddset (&blocked_mask, SIGCHLD);
-      sigprocmask (SIG_BLOCK, &blocked_mask, NULL);
-    }
+  make_sure_sigchild_is_blocked ();
 
 retry:
 


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/FC-5/gdb.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- gdb.spec	14 Apr 2006 05:52:54 -0000	1.179
+++ gdb.spec	14 Apr 2006 07:06:28 -0000	1.180
@@ -11,7 +11,7 @@
 Version: 6.3.0.0
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 1.126
+Release: 1.128.FC5
 
 License: GPL
 Group: Development/Debuggers
@@ -21,7 +21,7 @@
 
 # For our convenience
 %define gdb_src gdb-6.3
-%define gdb_build gdb-%{version}-build-%{_target_platform}
+%define gdb_build %{gdb_src}/build-%{_target_platform}
 
 # Make sure we get rid of the old package gdb64, now that we have unified
 # support for 32-64 bits in one single 64-bit gdb.
@@ -281,6 +281,13 @@
 # Use bigger numbers than int.
 Patch176: gdb-6.3-large-core-20051206.patch
 
+# Do not let exceptions in GDB break SIGCHLD blocking.
+Patch177: gdb-6.3-sigchld-exception-20060331.patch
+
+# Hard-code executable names in gstack, such that it can run with a
+# corrupted or missing PATH.
+Patch178: gdb-6.3-gstack-without-path-20060414.patch
+
 %ifarch ia64
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu libunwind >= 0.96-3
 %else
@@ -389,6 +396,8 @@
 %patch174 -p1
 %patch175 -p1
 %patch176 -p1
+%patch177 -p1
+%patch178 -p1
 
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
@@ -435,7 +444,7 @@
 enable_build_warnings="--enable-gdb-build-warnings=,-Werror"
 %endif
 
-../%{gdb_src}/configure \
+../configure \
 	--prefix=%{_prefix} \
 	--sysconfdir=%{_sysconfdir} \
 	--mandir=%{_mandir} \
@@ -557,13 +566,25 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
-* Thu Apr 13 2006 Stepan Kasal <skasal at redhat.com>    - 6.3.0.0-1.126
+* Fri Apr 14 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.128
+- Avoid race conditions caused by exceptions messing with signal masks.
+(BZ 175270, BZ 175083, maybe BZ 172938).
+- Hardcode /bin and /usr/bin paths into gstack (BZ 179829).
+- Build in a subdir of the source tree instead of in a sibling directory.
+- Switch to versioning scheme that uses the same base revision number
+for all OSes, and uses a suffix to tell the builds apart and ensure
+upgradability.
+
+* Thu Apr 13 2006 Stepan Kasal <skasal at redhat.com>    - 6.3.0.0-1.127
 - Bump up release number.
 
 * Thu Apr 13 2006 Stepan Kasal <skasal at redhat.com>    - 6.3.0.0-1.123
-- Use fopen64 where available.  Fixes BZ 179399.
+- Use fopen64 where available.  Fixes BZ 178796.
 - Use bigger numbers than int.  Fixes BZ 171783.
 
+* Wed Mar  8 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.122
+- Bump up release number.
+
 * Wed Mar  8 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.119
 - Fix regression in PIE debugging (BZ 133944) (re?)introduced by
 the prelink fix (BZ 175075).  Improve testcase for the prelink fix.



From fedora-cvs-commits at redhat.com  Fri Apr 14 07:06:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 03:06:05 -0400
Subject: rpms/gdb/devel gdb-6.3-gstack-without-path-20060414.patch, NONE,
	1.1 gdb-6.3-sigchld-exception-20060331.patch, NONE,
	1.1 gdb.spec, 1.179, 1.180
Message-ID: <200604140706.k3E7651T004385@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4325/gdb-devel

Modified Files:
	gdb.spec 
Added Files:
	gdb-6.3-gstack-without-path-20060414.patch 
	gdb-6.3-sigchld-exception-20060331.patch 
Log Message:
* Fri Apr 14 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.128
- Avoid race conditions caused by exceptions messing with signal masks.
(BZ 175270, BZ 175083, maybe BZ 172938).
- Hardcode /bin and /usr/bin paths into gstack (BZ 179829).
- Build in a subdir of the source tree instead of in a sibling directory.
- Switch to versioning scheme that uses the same base revision number
for all OSes, and uses a suffix to tell the builds apart and ensure
upgradability.


gdb-6.3-gstack-without-path-20060414.patch:
 gstack.sh |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE gdb-6.3-gstack-without-path-20060414.patch ---
Index: gdb-6.3/gdb/gstack.sh
--- gdb-6.3/gdb/gstack.sh	2006-01-16 16:41:13.000000000 +0000
+++ gdb-6.3/gdb/gstack.sh	2006-02-02 09:22:12.000000000 +0000
@@ -17,17 +17,17 @@
 backtrace="bt"
 if test -d /proc/$1/task ; then
     # Newer kernel; has a task/ directory.
-    if test `ls /proc/$1/task | wc -l` -gt 1 2>/dev/null ; then
+    if test `/bin/ls /proc/$1/task | /usr/bin/wc -l` -gt 1 2>/dev/null ; then
 	backtrace="thread apply all bt"
     fi
 elif test -f /proc/$1/maps ; then
     # Older kernel; go by it loading libpthread.
-    if grep -e libpthread /proc/$1/maps > /dev/null 2>&1 ; then
+    if /bin/grep -e libpthread /proc/$1/maps > /dev/null 2>&1 ; then
 	backtrace="thread apply all bt"
     fi
 fi
 
-GDB=${GDB:-gdb}
+GDB=${GDB:-/usr/bin/gdb}
 
 if $GDB -nx --quiet --batch --readnever > /dev/null 2>&1; then
     readnever=--readnever
@@ -39,7 +39,7 @@
 $GDB --quiet $readnever -nx /proc/$1/exe $1 <<EOF 2>&1 | 
 $backtrace
 EOF
-sed -n \
+/bin/sed -n \
     -e 's/^(gdb) //' \
     -e '/^#/p' \
     -e '/^Thread/p'

gdb-6.3-sigchld-exception-20060331.patch:
 linux-nat.c |   35 ++++++++++++++++++++++-------------
 1 files changed, 22 insertions(+), 13 deletions(-)

--- NEW FILE gdb-6.3-sigchld-exception-20060331.patch ---
for gdb/ChangeLog
from Alexandre Oliva  <aoliva at redhat.com>

	* linux-nat.c (make_sure_sigchild_is_blocked): New function.
	(lin_lwp_attach_lwp, linux_nat_wait): Use it.

Index: gdb-6.3/gdb/linux-nat.c
===================================================================
--- gdb-6.3.orig/gdb/linux-nat.c	2006-02-14 17:21:08.000000000 -0200
+++ gdb-6.3/gdb/linux-nat.c	2006-03-31 03:21:17.000000000 -0300
@@ -827,6 +827,24 @@ iterate_over_lwps (int (*callback) (stru
   return NULL;
 }
 
+/* Make sure the set of blocked signals in effect contains SIGCHLD.
+   We used to try to avoid the system call by testing whether
+   blocked_mask contained SIGCHLD, but that is not reliable: caught
+   exceptions will restore the signal mask, leaving blocked_mask
+   unchanged.  There are no mechanisms available to get it in sync at
+   such times, since the exception that would cause this may be thrown
+   long after our caller returns.  Our callers could avoid the problem
+   by disabling the signal block before returning, but this would
+   defeat the point of the optimization.  Fortunately, all they care
+   about is that the signal block is in effect while they run, so
+   that's just what we do.  */
+static void
+make_sure_sigchild_is_blocked ()
+{
+  sigaddset (&blocked_mask, SIGCHLD);
+  sigprocmask (SIG_BLOCK, &blocked_mask, NULL);
+}
+
 /* Attach to the LWP specified by PID.  If VERBOSE is non-zero, print
    a message telling the user that a new LWP has been added to the
    process.  */
@@ -838,13 +856,9 @@ lin_lwp_attach_lwp (ptid_t ptid, int ver
 
   gdb_assert (is_lwp (ptid));
 
-  /* Make sure SIGCHLD is blocked.  We don't want SIGCHLD events
-     to interrupt either the ptrace() or waitpid() calls below.  */
-  if (!sigismember (&blocked_mask, SIGCHLD))
-    {
-      sigaddset (&blocked_mask, SIGCHLD);
-      sigprocmask (SIG_BLOCK, &blocked_mask, NULL);
-    }
+  /* We don't want SIGCHLD events to interrupt either the ptrace() or
+     waitpid() calls below.  */
+  make_sure_sigchild_is_blocked ();
 
   if (verbose)
     printf_filtered ("[New %s]\n", target_pid_to_str (ptid));
@@ -1856,12 +1870,7 @@ linux_nat_wait (ptid_t ptid, struct targ
 
   sigemptyset (&flush_mask);
 
-  /* Make sure SIGCHLD is blocked.  */
-  if (!sigismember (&blocked_mask, SIGCHLD))
-    {
-      sigaddset (&blocked_mask, SIGCHLD);
-      sigprocmask (SIG_BLOCK, &blocked_mask, NULL);
-    }
+  make_sure_sigchild_is_blocked ();
 
 retry:
 


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- gdb.spec	14 Apr 2006 05:52:53 -0000	1.179
+++ gdb.spec	14 Apr 2006 07:05:35 -0000	1.180
@@ -11,7 +11,7 @@
 Version: 6.3.0.0
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 1.127
+Release: 1.128.FC6
 
 License: GPL
 Group: Development/Debuggers
@@ -21,7 +21,7 @@
 
 # For our convenience
 %define gdb_src gdb-6.3
-%define gdb_build gdb-%{version}-build-%{_target_platform}
+%define gdb_build %{gdb_src}/build-%{_target_platform}
 
 # Make sure we get rid of the old package gdb64, now that we have unified
 # support for 32-64 bits in one single 64-bit gdb.
@@ -281,6 +281,13 @@
 # Use bigger numbers than int.
 Patch176: gdb-6.3-large-core-20051206.patch
 
+# Do not let exceptions in GDB break SIGCHLD blocking.
+Patch177: gdb-6.3-sigchld-exception-20060331.patch
+
+# Hard-code executable names in gstack, such that it can run with a
+# corrupted or missing PATH.
+Patch178: gdb-6.3-gstack-without-path-20060414.patch
+
 %ifarch ia64
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu libunwind >= 0.96-3
 %else
@@ -389,6 +396,8 @@
 %patch174 -p1
 %patch175 -p1
 %patch176 -p1
+%patch177 -p1
+%patch178 -p1
 
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
@@ -435,7 +444,7 @@
 enable_build_warnings="--enable-gdb-build-warnings=,-Werror"
 %endif
 
-../%{gdb_src}/configure \
+../configure \
 	--prefix=%{_prefix} \
 	--sysconfdir=%{_sysconfdir} \
 	--mandir=%{_mandir} \
@@ -557,13 +566,25 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Fri Apr 14 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.128
+- Avoid race conditions caused by exceptions messing with signal masks.
+(BZ 175270, BZ 175083, maybe BZ 172938).
+- Hardcode /bin and /usr/bin paths into gstack (BZ 179829).
+- Build in a subdir of the source tree instead of in a sibling directory.
+- Switch to versioning scheme that uses the same base revision number
+for all OSes, and uses a suffix to tell the builds apart and ensure
+upgradability.
+
 * Thu Apr 13 2006 Stepan Kasal <skasal at redhat.com>    - 6.3.0.0-1.127
 - Bump up release number.
 
 * Thu Apr 13 2006 Stepan Kasal <skasal at redhat.com>    - 6.3.0.0-1.123
-- Use fopen64 where available.  Fixes BZ 179399.
+- Use fopen64 where available.  Fixes BZ 178796.
 - Use bigger numbers than int.  Fixes BZ 171783.
 
+* Wed Mar  8 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.122
+- Bump up release number.
+
 * Wed Mar  8 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.119
 - Fix regression in PIE debugging (BZ 133944) (re?)introduced by
 the prelink fix (BZ 175075).  Improve testcase for the prelink fix.



From fedora-cvs-commits at redhat.com  Fri Apr 14 08:26:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 04:26:15 -0400
Subject: rpms/openssh/devel openssh-4.3p1-fromto-remote.patch, 1.1,
	1.2 openssh.spec, 1.90, 1.91
Message-ID: <200604140826.k3E8QFAM018869@cvs.devel.redhat.com>

Author: tmraz

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

Modified Files:
	openssh-4.3p1-fromto-remote.patch openssh.spec 
Log Message:
* Fri Apr 14 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-5
- don't request pseudoterminal allocation if stdin is not tty (#188983)


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

Index: openssh-4.3p1-fromto-remote.patch
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/openssh-4.3p1-fromto-remote.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openssh-4.3p1-fromto-remote.patch	1 Feb 2006 16:19:54 -0000	1.1
+++ openssh-4.3p1-fromto-remote.patch	14 Apr 2006 08:26:10 -0000	1.2
@@ -1,11 +1,15 @@
---- openssh-4.3p1/scp.c.fromto-remote	2006-01-31 12:11:38.000000000 +0100
-+++ openssh-4.3p1/scp.c	2006-02-01 16:59:46.000000000 +0100
-@@ -446,7 +446,7 @@
+--- openssh-4.3p2/scp.c.fromto-remote	2006-01-31 12:11:38.000000000 +0100
++++ openssh-4.3p2/scp.c	2006-04-14 10:09:56.000000000 +0200
+@@ -446,7 +446,11 @@
  				addargs(&alist, "-v");
  			addargs(&alist, "-x");
  			addargs(&alist, "-oClearAllForwardings yes");
 -			addargs(&alist, "-n");
-+			addargs(&alist, "-t");
++			if (isatty(fileno(stdin))) {
++				addargs(&alist, "-t");
++			} else {
++				addargs(&alist, "-n");
++			}
  
  			*src++ = 0;
  			if (*src == 0)


Index: openssh.spec
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- openssh.spec	2 Mar 2006 21:37:28 -0000	1.90
+++ openssh.spec	14 Apr 2006 08:26:10 -0000	1.91
@@ -58,7 +58,7 @@
 Summary: The OpenSSH implementation of SSH protocol versions 1 and 2.
 Name: openssh
 Version: 4.3p2
-%define rel 4
+%define rel 5
 %if %{rescue}
 %define %{rel}rescue
 %else
@@ -454,6 +454,9 @@
 %endif
 
 %changelog
+* Fri Apr 14 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-5
+- don't request pseudoterminal allocation if stdin is not tty (#188983)
+
 * Thu Mar  2 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-4
 - allow access if audit is not compiled in kernel (#183243)
 



From fedora-cvs-commits at redhat.com  Fri Apr 14 09:40:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 05:40:32 -0400
Subject: rpms/gcc/devel gcc41-pr26823.patch, NONE,
	1.1 gcc41-rh188649-test.patch, NONE, 1.1 .cvsignore, 1.143,
	1.144 gcc41.spec, 1.48, 1.49 sources, 1.145,
	1.146 gcc41-gomp-static.patch, 1.1, NONE gcc41-rh183212.patch,
	1.1, NONE
Message-ID: <200604140940.k3E9eWp7030215@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	.cvsignore gcc41.spec sources 
Added Files:
	gcc41-pr26823.patch gcc41-rh188649-test.patch 
Removed Files:
	gcc41-gomp-static.patch gcc41-rh183212.patch 
Log Message:
4.1.0-8


gcc41-pr26823.patch:
 except.c                          |   42 ++++++++++++++++++++++++++++++++++++++
 except.h                          |    1 
 testsuite/g++.dg/gomp/pr26823-1.C |   23 ++++++++++++++++++++
 testsuite/g++.dg/gomp/pr26823-2.C |   29 ++++++++++++++++++++++++++
 tree-cfg.c                        |   13 +++++++++--
 5 files changed, 105 insertions(+), 3 deletions(-)

--- NEW FILE gcc41-pr26823.patch ---
2006-04-13  Jakub Jelinek  <jakub at redhat.com>

	PR middle-end/26823
	* except.h (eh_region_outermost): New prototype.
	* except.c (eh_region_outermost): New function.
	* tree-cfg.c (find_outermost_region_in_block): Use it.

	* g++.dg/gomp/pr26823-1.C: New test.
	* g++.dg/gomp/pr26823-2.C: New test.

--- gcc/except.h.jj	2006-03-24 17:07:23.000000000 +0100
+++ gcc/except.h	2006-04-13 15:24:47.000000000 +0200
@@ -108,6 +108,7 @@ extern void expand_resx_expr (tree);
 extern void verify_eh_tree (struct function *);
 extern void dump_eh_tree (FILE *, struct function *);
 extern bool eh_region_outer_p (struct function *, int, int);
+extern int eh_region_outermost (struct function *, int, int);
 
 /* tree-eh.c */
 extern void add_stmt_to_eh_region_fn (struct function *, tree, int);
--- gcc/tree-cfg.c.jj	2006-04-01 13:14:58.000000000 +0200
+++ gcc/tree-cfg.c	2006-04-13 15:38:15.000000000 +0200
@@ -4733,9 +4733,16 @@ find_outermost_region_in_block (struct f
       int stmt_region;
 
       stmt_region = lookup_stmt_eh_region_fn (src_cfun, stmt);
-      if (stmt_region > 0
-	  && (region < 0 || eh_region_outer_p (src_cfun, stmt_region, region)))
-	region = stmt_region;
+      if (stmt_region > 0)
+	{
+	  if (region < 0)
+	    region = stmt_region;
+	  else if (stmt_region != region)
+	    {
+	      region = eh_region_outermost (src_cfun, stmt_region, region);
+	      gcc_assert (region != -1);
+	    }
+	}
     }
 
   return region;
--- gcc/except.c.jj	2006-04-10 13:54:18.000000000 +0200
+++ gcc/except.c	2006-04-13 15:35:53.000000000 +0200
@@ -1078,6 +1078,48 @@ eh_region_outer_p (struct function *ifun
 
   return false;
 }
+
+/* Return region number of region that is outer to both if REGION_A and
+   REGION_B in IFUN.  */
+
+int
+eh_region_outermost (struct function *ifun, int region_a, int region_b)
+{
+  struct eh_region *rp_a, *rp_b;
+  sbitmap b_outer;
+
+  gcc_assert (ifun->eh->last_region_number > 0);
+  gcc_assert (ifun->eh->region_tree);
+
+  rp_a = VEC_index (eh_region, ifun->eh->region_array, region_a);
+  rp_b = VEC_index (eh_region, ifun->eh->region_array, region_b);
+  gcc_assert (rp_a != NULL);
+  gcc_assert (rp_b != NULL);
+
+  b_outer = sbitmap_alloc (ifun->eh->last_region_number + 1);
+  sbitmap_zero (b_outer);
+
+  do
+    {
+      SET_BIT (b_outer, rp_b->region_number);
+      rp_b = rp_b->outer;
+    }
+  while (rp_b);
+
+  do
+    {
+      if (TEST_BIT (b_outer, rp_a->region_number))
+	{
+	  sbitmap_free (b_outer);
+	  return rp_a->region_number;
+	}
+      rp_a = rp_a->outer;
+    }
+  while (rp_a);
+
+  sbitmap_free (b_outer);
+  return -1;
+}
 
 static int
 t2r_eq (const void *pentry, const void *pdata)
--- gcc/testsuite/g++.dg/gomp/pr26823-1.C.jj	2006-04-13 15:42:27.000000000 +0200
+++ gcc/testsuite/g++.dg/gomp/pr26823-1.C	2006-04-13 15:42:15.000000000 +0200
@@ -0,0 +1,23 @@
+// PR middle-end/26823
+// { dg-do compile }
+
+struct A
+{
+  ~A () {}
+};
+
+struct B
+{
+  A a;
+  B ();
+};
+
+void
+foo ()
+{
+#pragma omp parallel
+  {
+    B b[1];
+    new int;
+  }
+}
--- gcc/testsuite/g++.dg/gomp/pr26823-2.C.jj	2006-04-13 15:42:35.000000000 +0200
+++ gcc/testsuite/g++.dg/gomp/pr26823-2.C	2006-04-13 15:43:05.000000000 +0200
@@ -0,0 +1,29 @@
+// PR middle-end/26823
+// { dg-do compile }
+
+struct A
+{
+  ~A () {}
+};
+
+extern void bar ();
+
+void
+foo ()
+{
+#pragma omp parallel
+  {
+    {
+      A a;
+      bar ();
+    }
+    {
+      A a;
+      bar ();
+    }
+    {
+      A a;
+      bar ();
+    }
+  }
+}

gcc41-rh188649-test.patch:
 20060412-1.c |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+)

--- NEW FILE gcc41-rh188649-test.patch ---
2006-04-12  Jakub Jelinek  <jakub at redhat.com>

	* gcc.c-torture/execute/20060412-1.c: New test.

--- gcc/testsuite/gcc.c-torture/execute/20060412-1.c.jj	2006-04-03 11:04:53.758553500 +0200
+++ gcc/testsuite/gcc.c-torture/execute/20060412-1.c	2006-04-12 10:54:20.000000000 +0200
@@ -0,0 +1,33 @@
+extern void abort (void);
+
+struct S
+{
+  long o;
+};
+
+struct T
+{
+  long o;
+  struct S m[82];
+};
+
+struct T t;
+
+int
+main ()
+{
+  struct S *p, *q;
+
+  p = (struct S *) &t;
+  p = &((struct T *) p)->m[0];
+  q = p + 82;
+  while (--q > p)
+    q->o = -1;
+  q->o = 0;
+
+  if (q > p)
+    abort ();
+  if (q - p > 0)
+    abort ();
+  return 0;
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- .cvsignore	10 Apr 2006 21:30:11 -0000	1.143
+++ .cvsignore	14 Apr 2006 09:40:18 -0000	1.144
@@ -1 +1 @@
-gcc-4.1.0-20060410.tar.bz2
+gcc-4.1.0-20060414.tar.bz2


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gcc41.spec	10 Apr 2006 21:30:22 -0000	1.48
+++ gcc41.spec	14 Apr 2006 09:40:18 -0000	1.49
@@ -1,6 +1,6 @@
-%define DATE 20060410
+%define DATE 20060414
 %define gcc_version 4.1.0
-%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
@@ -113,10 +113,10 @@
 Patch16: gcc41-pr20297-test.patch
 Patch17: gcc41-java-pr13212.patch
 Patch18: gcc41-objc-rh185398.patch
-Patch19: gcc41-gomp-static.patch
+Patch19: gcc41-pr26823.patch
 Patch20: gcc41-pr22375.patch
 Patch21: gcc41-pr24685.patch
-Patch22: gcc41-rh183212.patch
+Patch22: gcc41-rh188649-test.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -414,10 +414,10 @@
 %patch16 -p0 -E -b .pr20297-test~
 %patch17 -p0 -b .java-pr13212~
 %patch18 -p0 -b .objc-rh185398~
-%patch19 -p0 -b .gomp-static~
+%patch19 -p0 -b .pr26823~
 %patch20 -p0 -b .pr22375~
 %patch21 -p0 -b .pr24685~
-%patch22 -p0 -b .rh183212~
+%patch22 -p0 -b .rh188649-test~
 
 sed -i -e 's/4\.1\.1/4.1.0/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1435,6 +1435,14 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Apr 14 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-8
+- update from gcc-4_1-branch (-r112825:112951)
+  - PRs c++/26122, c++/26295, fortran/23634, fortran/25619, fortran/26257,
+	libgcj/23829, libgcj/26522, libgfortran/26890, target/27006
+- merge gomp changes from trunk (-r112934:112935)
+  - PR libgomp/26651
+- fix ICE in gomp handling of EH regions (PR middle-end/26823)
+
 * Mon Apr 10 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-7
 - update from gcc-4_1-branch (-r112727:112825)
   - PRs fortran/19101, fortran/25031, fortran/26779, fortran/26891,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- sources	10 Apr 2006 21:30:22 -0000	1.145
+++ sources	14 Apr 2006 09:40:18 -0000	1.146
@@ -1 +1 @@
-56f6a8fc0e1e97ff5f73df39ec08726b  gcc-4.1.0-20060410.tar.bz2
+3d39e406b849c2225ebb203a84013838  gcc-4.1.0-20060414.tar.bz2


--- gcc41-gomp-static.patch DELETED ---


--- gcc41-rh183212.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 14 11:21:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 07:21:53 -0400
Subject: rpms/krb5/devel krb5-kinit-man-typo.patch, NONE, 1.1 krb5.spec, 1.68,
	1.69
Message-ID: <200604141121.k3EBLrSv021925@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/krb5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21909

Modified Files:
	krb5.spec 
Added Files:
	krb5-kinit-man-typo.patch 
Log Message:
- Fix formatting typo in kinit.1 (krb5-kinit-man-typo.patch)

krb5-kinit-man-typo.patch:
 kinit.M |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE krb5-kinit-man-typo.patch ---
--- krb5-1.4.3/src/clients/kinit/kinit.M.orig	2005-09-12 21:24:46.000000000 +0200
+++ krb5-1.4.3/src/clients/kinit/kinit.M	2006-04-13 16:40:57.000000000 +0200
@@ -45,7 +45,8 @@
 .SH DESCRIPTION
 .I kinit
 obtains and caches an initial ticket-granting ticket for
-.IR principal .  The typical default behavior is to acquire only
+.IR principal .
+The typical default behavior is to acquire only
 Kerberos 5 tickets.  However, if kinit was built with both 
 Kerberos 4 support and with the default behavior of acquiring both
 types of tickets, it will try to acquire both Kerberos 5 and Kerberos 4


Index: krb5.spec
===================================================================
RCS file: /cvs/dist/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- krb5.spec	11 Feb 2006 03:49:47 -0000	1.68
+++ krb5.spec	14 Apr 2006 11:21:50 -0000	1.69
@@ -74,6 +74,8 @@
 Patch42: krb5-1.4.3-pthread_np.patch
 Patch43: krb5-1.4.3-kdc_max_dgram_size.patch
 Patch44: krb5-1.4.3-enospc.patch
+Patch45: krb5-kinit-man-typo.patch
+
 License: MIT, freely distributable.
 URL: http://web.mit.edu/kerberos/www/
 Group: System Environment/Libraries
@@ -138,6 +140,9 @@
 workstation.
 
 %changelog
+* Fri Apr 14 2006 Stepan Kasal <skasal at redhat.com>    - 1.4.3-5
+- Fix formatting typo in kinit.1 (krb5-kinit-man-typo.patch)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.4.3-4.1
 - bump again for double-long bug on ppc(64)
 
@@ -910,6 +915,7 @@
 # Don't apply this until we hear back from upstream.
 #%patch43 -p1 -b .kdc_max_dgram_size
 %patch44 -p1 -b .enospc
+%patch45 -p1
 cp src/krb524/README README.krb524
 find . -type f -name "*.info-dir" -exec rm -fv "{}" ";"
 gzip doc/*.ps



From fedora-cvs-commits at redhat.com  Fri Apr 14 11:25:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 07:25:24 -0400
Subject: rpms/krb5/devel krb5.spec,1.69,1.70
Message-ID: <200604141125.k3EBPOeu022062@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/krb5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22048

Modified Files:
	krb5.spec 
Log Message:
Change the release number.


Index: krb5.spec
===================================================================
RCS file: /cvs/dist/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- krb5.spec	14 Apr 2006 11:21:50 -0000	1.69
+++ krb5.spec	14 Apr 2006 11:25:22 -0000	1.70
@@ -10,7 +10,7 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.4.3
-Release: 4.1
+Release: 5
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.4/krb5-1.4.3-signed.tar
 Source0: krb5-%{version}.tar.gz



From fedora-cvs-commits at redhat.com  Fri Apr 14 11:31:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 07:31:17 -0400
Subject: rpms/libselinux/devel .cvsignore, 1.103, 1.104 libselinux.spec,
	1.185, 1.186 sources, 1.105, 1.106
Message-ID: <200604141131.k3EBVHgx022210@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore libselinux.spec sources 
Log Message:
* Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> 1.30.3-1
- Upgrade to latest from NSA
	* Added distclean target to Makefile.
	* Regenerated swig files.
	* Changed matchpathcon_init to verify that the spec file is
	  a regular file.
	* Merged python binding t_output_helper removal patch from Dan Walsh.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- .cvsignore	11 Apr 2006 18:25:46 -0000	1.103
+++ .cvsignore	14 Apr 2006 11:31:14 -0000	1.104
@@ -78,3 +78,4 @@
 libselinux-1.29.8.tgz
 libselinux-1.30.tgz
 libselinux-1.30.1.tgz
+libselinux-1.30.3.tgz


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- libselinux.spec	11 Apr 2006 19:03:13 -0000	1.185
+++ libselinux.spec	14 Apr 2006 11:31:14 -0000	1.186
@@ -2,12 +2,11 @@
 %define libsetransver 0.1.20-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 1.30.1
-Release: 2
+Version: 1.30.3
+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}
 Requires: libsepol >= %{libsepolver}
@@ -51,7 +50,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .rhat
 
 %build
 make clean
@@ -111,6 +109,14 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> 1.30.3-1
+- Upgrade to latest from NSA
+	* Added distclean target to Makefile.
+	* Regenerated swig files.
+	* Changed matchpathcon_init to verify that the spec file is
+	  a regular file.
+	* Merged python binding t_output_helper removal patch from Dan Walsh.
+
 * Mon Mar 27 2006 Dan Walsh <dwalsh at redhat.com> 1.30.1-2
 - Fix python bindings for matchpathcon
 - Fix booleans man page


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/sources,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- sources	11 Apr 2006 18:25:46 -0000	1.105
+++ sources	14 Apr 2006 11:31:14 -0000	1.106
@@ -1 +1 @@
-16536badc245a1dd8d01539f63ced6c2  libselinux-1.30.1.tgz
+70d1525b98d5906a9ac2566aeca7a65e  libselinux-1.30.3.tgz



From fedora-cvs-commits at redhat.com  Fri Apr 14 11:38:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 07:38:00 -0400
Subject: rpms/libsemanage/devel .cvsignore, 1.56, 1.57 libsemanage-rhat.patch,
	1.12, 1.13 libsemanage.spec, 1.85, 1.86 sources, 1.58, 1.59
Message-ID: <200604141138.k3EBc0dw022304@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsemanage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22290

Modified Files:
	.cvsignore libsemanage-rhat.patch libsemanage.spec sources 
Log Message:
* Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.5-1
- Upgrade to latest from NSA
	* Merged file context sorting code from Christopher Ashworth 
	  (Tresys Technology), based on fc_sort.c code in refpolicy.
	* Merged python binding t_output_helper removal patch from Dan Walsh.
	* Regenerated swig files.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	21 Mar 2006 15:45:45 -0000	1.56
+++ .cvsignore	14 Apr 2006 11:37:56 -0000	1.57
@@ -61,3 +61,5 @@
 libsemanage-1.5.31.tgz
 libsemanage-1.6.tgz
 libsemanage-1.6.2.tgz
+libsemanage-1.6.3.tgz
+libsemanage-1.6.5.tgz

libsemanage-rhat.patch:
 VERSION                   |    2 
 src/semanage.py           |  266 
 src/semanageswig_python.i |   74 
 src/semanageswig_wrap.c   |18275 ++++++++++++++++++++++++++--------------------
 4 files changed, 10620 insertions(+), 7997 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.12 -r 1.13 libsemanage-rhat.patch
Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libsemanage-rhat.patch	3 Apr 2006 20:49:58 -0000	1.12
+++ libsemanage-rhat.patch	14 Apr 2006 11:37:56 -0000	1.13
@@ -1,12 +1,20422 @@
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-1.6.2/src/semanage_store.c
---- nsalibsemanage/src/semanage_store.c	2006-03-10 09:48:01.000000000 -0500
-+++ libsemanage-1.6.2/src/semanage_store.c	2006-03-29 14:20:16.000000000 -0500
-@@ -1159,6 +1159,8 @@
- 		ERR(sh, "Could not open direct %s at %s.", lock_name, lock_file);
- 		return -1;
- 	}
-+	fcntl(fd, F_SETFD, FD_CLOEXEC);
-+
- 	if (sh->timeout == 0) {
- 		/* return immediately */
- 		origtime.tv_sec = 0;
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.py libsemanage-1.6.2/src/semanage.py
+--- nsalibsemanage/src/semanage.py	2006-02-16 13:35:22.000000000 -0500
++++ libsemanage-1.6.2/src/semanage.py	2006-04-03 19:12:41.000000000 -0400
+@@ -1,19 +1,19 @@
+-# This file was created automatically by SWIG.
++# This file was created automatically by SWIG 1.3.29.
+ # Don't modify this file, modify the SWIG interface instead.
+ # This file is compatible with both classic and new-style classes.
+ 
+ import _semanage
+-
++import new
++new_instancemethod = new.instancemethod
+ def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
++    if (name == "thisown"): return self.this.own(value)
+     if (name == "this"):
+-        if isinstance(value, class_type):
+-            self.__dict__[name] = value.this
+-            if hasattr(value,"thisown"): self.__dict__["thisown"] = value.thisown
+-            del value.thisown
++        if type(value).__name__ == 'PySwigObject':
++            self.__dict__[name] = value
+             return
+     method = class_type.__swig_setmethods__.get(name,None)
+     if method: return method(self,value)
+-    if (not static) or hasattr(self,name) or (name == "thisown"):
++    if (not static) or hasattr(self,name):
+         self.__dict__[name] = value
+     else:
+         raise AttributeError("You cannot add attributes to %s" % self)
+@@ -22,10 +22,16 @@
+     return _swig_setattr_nondynamic(self,class_type,name,value,0)
+ 
+ def _swig_getattr(self,class_type,name):
++    if (name == "thisown"): return self.this.own()
+     method = class_type.__swig_getmethods__.get(name,None)
+     if method: return method(self)
+     raise AttributeError,name
+ 
++def _swig_repr(self):
++    try: strthis = "proxy of " + self.this.__repr__()
++    except: strthis = ""
++    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
++
+ import types
+ try:
+     _object = types.ObjectType
+@@ -39,345 +45,179 @@
+ SEMANAGE_MSG_ERR = _semanage.SEMANAGE_MSG_ERR
+ SEMANAGE_MSG_WARN = _semanage.SEMANAGE_MSG_WARN
+ SEMANAGE_MSG_INFO = _semanage.SEMANAGE_MSG_INFO
+-
+ semanage_msg_get_level = _semanage.semanage_msg_get_level
+-
+ semanage_msg_get_channel = _semanage.semanage_msg_get_channel
+-
+ semanage_msg_get_fname = _semanage.semanage_msg_get_fname
+-
+ semanage_msg_set_callback = _semanage.semanage_msg_set_callback
+-
+ semanage_handle_create = _semanage.semanage_handle_create
+-
+ semanage_handle_destroy = _semanage.semanage_handle_destroy
+ SEMANAGE_CON_INVALID = _semanage.SEMANAGE_CON_INVALID
+ SEMANAGE_CON_DIRECT = _semanage.SEMANAGE_CON_DIRECT
+ SEMANAGE_CON_POLSERV_LOCAL = _semanage.SEMANAGE_CON_POLSERV_LOCAL
+ SEMANAGE_CON_POLSERV_REMOTE = _semanage.SEMANAGE_CON_POLSERV_REMOTE
+-
+ semanage_select_store = _semanage.semanage_select_store
+-
+ semanage_reload_policy = _semanage.semanage_reload_policy
+-
+ semanage_set_reload = _semanage.semanage_set_reload
+-
+ semanage_set_rebuild = _semanage.semanage_set_rebuild
+-
+ semanage_set_create_store = _semanage.semanage_set_create_store
+-
+ semanage_is_managed = _semanage.semanage_is_managed
+-
+ semanage_connect = _semanage.semanage_connect
+-
+ semanage_disconnect = _semanage.semanage_disconnect
+-
+ semanage_begin_transaction = _semanage.semanage_begin_transaction
+-
+ semanage_commit = _semanage.semanage_commit
+ SEMANAGE_CAN_READ = _semanage.SEMANAGE_CAN_READ
+ SEMANAGE_CAN_WRITE = _semanage.SEMANAGE_CAN_WRITE
+-
+ semanage_access_check = _semanage.semanage_access_check
+-
+ semanage_is_connected = _semanage.semanage_is_connected
+-
+ semanage_module_install = _semanage.semanage_module_install
+-
+ semanage_module_upgrade = _semanage.semanage_module_upgrade
+-
+ semanage_module_install_base = _semanage.semanage_module_install_base
+-
+ semanage_module_remove = _semanage.semanage_module_remove
+-
+ semanage_module_list = _semanage.semanage_module_list
+-
+ semanage_module_info_datum_destroy = _semanage.semanage_module_info_datum_destroy
+-
+ semanage_module_list_nth = _semanage.semanage_module_list_nth
+-
+ semanage_module_get_name = _semanage.semanage_module_get_name
+-
+ semanage_module_get_version = _semanage.semanage_module_get_version
+-
+ semanage_context_get_user = _semanage.semanage_context_get_user
+-
+ semanage_context_set_user = _semanage.semanage_context_set_user
+-
+ semanage_context_get_role = _semanage.semanage_context_get_role
+-
+ semanage_context_set_role = _semanage.semanage_context_set_role
+-
+ semanage_context_get_type = _semanage.semanage_context_get_type
+-
+ semanage_context_set_type = _semanage.semanage_context_set_type
+-
+ semanage_context_get_mls = _semanage.semanage_context_get_mls
+-
+ semanage_context_set_mls = _semanage.semanage_context_set_mls
+-
+ semanage_context_create = _semanage.semanage_context_create
+-
+ semanage_context_clone = _semanage.semanage_context_clone
+-
+ semanage_context_free = _semanage.semanage_context_free
+-
+ semanage_context_from_string = _semanage.semanage_context_from_string
+-
+ semanage_context_to_string = _semanage.semanage_context_to_string
+-
+ semanage_bool_key_create = _semanage.semanage_bool_key_create
+-
+ semanage_bool_key_extract = _semanage.semanage_bool_key_extract
+-
+ semanage_bool_key_free = _semanage.semanage_bool_key_free
+-
+ semanage_bool_compare = _semanage.semanage_bool_compare
+-
+ semanage_bool_compare2 = _semanage.semanage_bool_compare2
+-
+ semanage_bool_get_name = _semanage.semanage_bool_get_name
+-
+ semanage_bool_set_name = _semanage.semanage_bool_set_name
+-
+ semanage_bool_get_value = _semanage.semanage_bool_get_value
+-
+ semanage_bool_set_value = _semanage.semanage_bool_set_value
+-
+ semanage_bool_create = _semanage.semanage_bool_create
+-
+ semanage_bool_clone = _semanage.semanage_bool_clone
+-
+ semanage_bool_free = _semanage.semanage_bool_free
+-
+ semanage_bool_query = _semanage.semanage_bool_query
+-
+ semanage_bool_exists = _semanage.semanage_bool_exists
+-
+ semanage_bool_count = _semanage.semanage_bool_count
+-
+ semanage_bool_iterate = _semanage.semanage_bool_iterate
+-
+ semanage_bool_list = _semanage.semanage_bool_list
+-
+ semanage_bool_modify_local = _semanage.semanage_bool_modify_local
+-
+ semanage_bool_del_local = _semanage.semanage_bool_del_local
+-
+ semanage_bool_query_local = _semanage.semanage_bool_query_local
+-
+ semanage_bool_exists_local = _semanage.semanage_bool_exists_local
[...20043 lines suppressed...]
+-            return -1;
+-        }
+-        
+-        dict = PyModule_GetDict(m);
+-        if (dict == NULL) {
+-            /* Internal error -- modules must have a dict! */
+-            PyErr_Format(PyExc_SystemError, "module '%s' has no __dict__",
+-            PyModule_GetName(m));
+-            return -1;
+-        }
+-        if (PyDict_SetItemString(dict, name, o))
+-        return -1;
+-        Py_DECREF(o);
+-        return 0;
+-    }
+-#endif
+-    
+-    static swig_type_info **
+-    SWIG_Python_SetTypeListHandle(swig_type_info **type_list_handle) {
+-        static PyMethodDef swig_empty_runtime_method_table[] = {
+-            {
+-                NULL, NULL, 0, NULL
+-            } 
+-        };/* Sentinel */
+-        
+-        PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
+-        swig_empty_runtime_method_table);
+-        PyObject *pointer = PyCObject_FromVoidPtr((void *) type_list_handle, NULL);
+-        if (pointer && module) {
+-            PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer);
+-        }
+-        return type_list_handle;
+-    } 
+-    
+-    static swig_type_info **
+-    SWIG_Python_LookupTypePointer(swig_type_info **type_list_handle) {
+-        swig_type_info **type_pointer;
+-        
+-        /* first check if module already created */
+-        type_pointer = SWIG_Python_GetTypeListHandle();
+-        if (type_pointer) {
+-            return type_pointer;
+-        } else {
+-            /* create a new module and variable */
+-            return SWIG_Python_SetTypeListHandle(type_list_handle);
+-        }
+-    }
+-    
++  } 
++  
+ #ifdef __cplusplus
+ }
+ #endif
+@@ -9372,106 +12289,42 @@
+  *  Partial Init method
+  * -----------------------------------------------------------------------------*/
+ 
+-#ifdef SWIG_LINK_RUNTIME
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-SWIGEXPORT(void *) SWIG_ReturnGlobalTypeList(void *);
+-#endif
+-
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-SWIGEXPORT(void) SWIG_init(void) {
+-    static PyObject *SWIG_globals = 0; 
+-    static int       typeinit = 0;
+-    PyObject *m, *d;
+-    int       i;
+-    if (!SWIG_globals) SWIG_globals = SWIG_newvarlink();
+-    
+-    /* Fix SwigMethods to carry the callback ptrs when needed */
+-    SWIG_Python_FixMethods(SwigMethods, swig_const_table, swig_types, swig_types_initial);
+-    
+-    m = Py_InitModule((char *) SWIG_name, SwigMethods);
+-    d = PyModule_GetDict(m);
+-    
+-    if (!typeinit) {
+-#ifdef SWIG_LINK_RUNTIME
+-        swig_type_list_handle = (swig_type_info **) SWIG_ReturnGlobalTypeList(swig_type_list_handle);
+-#else
+-#  ifndef SWIG_STATIC_RUNTIME
+-        swig_type_list_handle = SWIG_Python_LookupTypePointer(swig_type_list_handle);
+-#  endif
+-#endif
+-        for (i = 0; swig_types_initial[i]; i++) {
+-            swig_types[i] = SWIG_TypeRegister(swig_types_initial[i]);
+-        }
+-        typeinit = 1;
+-    }
+-    SWIG_InstallConstants(d,swig_const_table);
+-    
+-    {
+-        PyDict_SetItemString(d,"SEMANAGE_MSG_ERR", SWIG_From_int((int)(1))); 
+-    }
+-    {
+-        PyDict_SetItemString(d,"SEMANAGE_MSG_WARN", SWIG_From_int((int)(2))); 
+-    }
+-    {
+-        PyDict_SetItemString(d,"SEMANAGE_MSG_INFO", SWIG_From_int((int)(3))); 
+-    }
+-    {
+-        PyDict_SetItemString(d,"SEMANAGE_CON_INVALID", SWIG_From_int((int)(SEMANAGE_CON_INVALID))); 
+-    }
+-    {
+-        PyDict_SetItemString(d,"SEMANAGE_CON_DIRECT", SWIG_From_int((int)(SEMANAGE_CON_DIRECT))); 
+-    }
+-    {
+-        PyDict_SetItemString(d,"SEMANAGE_CON_POLSERV_LOCAL", SWIG_From_int((int)(SEMANAGE_CON_POLSERV_LOCAL))); 
+-    }
+-    {
+-        PyDict_SetItemString(d,"SEMANAGE_CON_POLSERV_REMOTE", SWIG_From_int((int)(SEMANAGE_CON_POLSERV_REMOTE))); 
+-    }
+-    {
+-        PyDict_SetItemString(d,"SEMANAGE_CAN_READ", SWIG_From_int((int)(1))); 
+-    }
+-    {
+-        PyDict_SetItemString(d,"SEMANAGE_CAN_WRITE", SWIG_From_int((int)(2))); 
+-    }
+-    {
+-        PyDict_SetItemString(d,"SEMANAGE_PROTO_UDP", SWIG_From_int((int)(0))); 
+-    }
+-    {
+-        PyDict_SetItemString(d,"SEMANAGE_PROTO_TCP", SWIG_From_int((int)(1))); 
+-    }
+-    {
+-        PyDict_SetItemString(d,"SEMANAGE_FCONTEXT_ALL", SWIG_From_int((int)(0))); 
+-    }
+-    {
+-        PyDict_SetItemString(d,"SEMANAGE_FCONTEXT_REG", SWIG_From_int((int)(1))); 
+-    }
+-    {
+-        PyDict_SetItemString(d,"SEMANAGE_FCONTEXT_DIR", SWIG_From_int((int)(2))); 
+-    }
+-    {
+-        PyDict_SetItemString(d,"SEMANAGE_FCONTEXT_CHAR", SWIG_From_int((int)(3))); 
+-    }
+-    {
+-        PyDict_SetItemString(d,"SEMANAGE_FCONTEXT_BLOCK", SWIG_From_int((int)(4))); 
+-    }
+-    {
+-        PyDict_SetItemString(d,"SEMANAGE_FCONTEXT_SOCK", SWIG_From_int((int)(5))); 
+-    }
+-    {
+-        PyDict_SetItemString(d,"SEMANAGE_FCONTEXT_LINK", SWIG_From_int((int)(6))); 
+-    }
+-    {
+-        PyDict_SetItemString(d,"SEMANAGE_FCONTEXT_PIPE", SWIG_From_int((int)(7))); 
+-    }
+-    {
+-        PyDict_SetItemString(d,"SEMANAGE_PROTO_IP4", SWIG_From_int((int)(0))); 
+-    }
+-    {
+-        PyDict_SetItemString(d,"SEMANAGE_PROTO_IP6", SWIG_From_int((int)(1))); 
+-    }
++SWIGEXPORT void SWIG_init(void) {
++  PyObject *m, *d;
++  
++  /* Fix SwigMethods to carry the callback ptrs when needed */
++  SWIG_Python_FixMethods(SwigMethods, swig_const_table, swig_types, swig_type_initial);
++  
++  m = Py_InitModule((char *) SWIG_name, SwigMethods);
++  d = PyModule_GetDict(m);
++  
++  SWIG_InitializeModule(0);
++  SWIG_InstallConstants(d,swig_const_table);
++  
++  
++  SWIG_Python_SetConstant(d, "SEMANAGE_MSG_ERR",SWIG_From_int((int)(1)));
++  SWIG_Python_SetConstant(d, "SEMANAGE_MSG_WARN",SWIG_From_int((int)(2)));
++  SWIG_Python_SetConstant(d, "SEMANAGE_MSG_INFO",SWIG_From_int((int)(3)));
++  SWIG_Python_SetConstant(d, "SEMANAGE_CON_INVALID",SWIG_From_int((int)(SEMANAGE_CON_INVALID)));
++  SWIG_Python_SetConstant(d, "SEMANAGE_CON_DIRECT",SWIG_From_int((int)(SEMANAGE_CON_DIRECT)));
++  SWIG_Python_SetConstant(d, "SEMANAGE_CON_POLSERV_LOCAL",SWIG_From_int((int)(SEMANAGE_CON_POLSERV_LOCAL)));
++  SWIG_Python_SetConstant(d, "SEMANAGE_CON_POLSERV_REMOTE",SWIG_From_int((int)(SEMANAGE_CON_POLSERV_REMOTE)));
++  SWIG_Python_SetConstant(d, "SEMANAGE_CAN_READ",SWIG_From_int((int)(1)));
++  SWIG_Python_SetConstant(d, "SEMANAGE_CAN_WRITE",SWIG_From_int((int)(2)));
++  SWIG_Python_SetConstant(d, "SEMANAGE_PROTO_UDP",SWIG_From_int((int)(0)));
++  SWIG_Python_SetConstant(d, "SEMANAGE_PROTO_TCP",SWIG_From_int((int)(1)));
++  SWIG_Python_SetConstant(d, "SEMANAGE_FCONTEXT_ALL",SWIG_From_int((int)(0)));
++  SWIG_Python_SetConstant(d, "SEMANAGE_FCONTEXT_REG",SWIG_From_int((int)(1)));
++  SWIG_Python_SetConstant(d, "SEMANAGE_FCONTEXT_DIR",SWIG_From_int((int)(2)));
++  SWIG_Python_SetConstant(d, "SEMANAGE_FCONTEXT_CHAR",SWIG_From_int((int)(3)));
++  SWIG_Python_SetConstant(d, "SEMANAGE_FCONTEXT_BLOCK",SWIG_From_int((int)(4)));
++  SWIG_Python_SetConstant(d, "SEMANAGE_FCONTEXT_SOCK",SWIG_From_int((int)(5)));
++  SWIG_Python_SetConstant(d, "SEMANAGE_FCONTEXT_LINK",SWIG_From_int((int)(6)));
++  SWIG_Python_SetConstant(d, "SEMANAGE_FCONTEXT_PIPE",SWIG_From_int((int)(7)));
++  SWIG_Python_SetConstant(d, "SEMANAGE_PROTO_IP4",SWIG_From_int((int)(0)));
++  SWIG_Python_SetConstant(d, "SEMANAGE_PROTO_IP6",SWIG_From_int((int)(1)));
+ }
+ 
+diff --exclude-from=exclude -N -u -r nsalibsemanage/VERSION libsemanage-1.6.2/VERSION
+--- nsalibsemanage/VERSION	2006-04-05 13:33:50.000000000 -0400
++++ libsemanage-1.6.2/VERSION	2006-03-21 09:19:55.000000000 -0500
+@@ -1 +1 @@
+-1.6.3
++1.6.2


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- libsemanage.spec	3 Apr 2006 22:19:54 -0000	1.85
+++ libsemanage.spec	14 Apr 2006 11:37:57 -0000	1.86
@@ -1,13 +1,12 @@
-%define libsepolver 1.12-1
-%define libselinuxver 1.30-1
+%define libsepolver 1.12.5-1
+%define libselinuxver 1.30.3-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 1.6.2
-Release: 2
+Version: 1.6.5
+Release: 1
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
-Patch: libsemanage-rhat.patch
 
 BuildRoot: %{_tmppath}/%{name}-buildroot
 BuildRequires: libselinux-devel >= %{libselinuxver} 
@@ -40,7 +39,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .rhat
 
 %build
 make clean
@@ -74,6 +72,18 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.5-1
+- Upgrade to latest from NSA
+	* Merged file context sorting code from Christopher Ashworth 
+	  (Tresys Technology), based on fc_sort.c code in refpolicy.
+	* Merged python binding t_output_helper removal patch from Dan Walsh.
+	* Regenerated swig files.
+
+* Wed Mar 29 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.3-1
+- Fix to work with new version of swig
+- Upgrade to latest from NSA
+	* Merged corrected fix for descriptor leak from Dan Walsh.
+
 * Wed Mar 29 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.2-2
 - Fix leaky descriptor
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	21 Mar 2006 15:45:45 -0000	1.58
+++ sources	14 Apr 2006 11:37:57 -0000	1.59
@@ -1 +1 @@
-187deb14a3577967b5ddac2013cd641c  libsemanage-1.6.2.tgz
+e82f27ce38a2e02efecd00ca434545c5  libsemanage-1.6.5.tgz



From fedora-cvs-commits at redhat.com  Fri Apr 14 11:51:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 07:51:04 -0400
Subject: rpms/policycoreutils/devel .cvsignore, 1.106,
	1.107 policycoreutils-rhat.patch, 1.180,
	1.181 policycoreutils.spec, 1.257, 1.258 sources, 1.110, 1.111
Message-ID: <200604141151.k3EBp4tx004100@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4075

Modified Files:
	.cvsignore policycoreutils-rhat.patch policycoreutils.spec 
	sources 
Log Message:
* Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> 1.30.5-1
- Update from upstream
	* Added a test to setfiles to check that the spec file is
	  a regular file.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- .cvsignore	29 Mar 2006 20:39:44 -0000	1.106
+++ .cvsignore	14 Apr 2006 11:51:02 -0000	1.107
@@ -96,3 +96,4 @@
 policycoreutils-1.30.tgz
 policycoreutils-1.30.1.tgz
 policycoreutils-1.30.4.tgz
+policycoreutils-1.30.5.tgz

policycoreutils-rhat.patch:
 audit2allow/audit2allow      |  471 ++-------------------------------------
 audit2allow/audit2allow.1    |    5 
 audit2allow/avc.py           |  518 +++++++++++++++++++++++++++++++++++++++++++
 restorecond/restorecond.conf |    1 
 semanage/semanage            |   18 +
 semanage/seobject.py         |   30 +-
 setsebool/setsebool.8        |    2 
 7 files changed, 592 insertions(+), 453 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- policycoreutils-rhat.patch	5 Apr 2006 13:11:54 -0000	1.180
+++ policycoreutils-rhat.patch	14 Apr 2006 11:51:02 -0000	1.181
@@ -1,18 +1,546 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30.4/audit2allow/audit2allow
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30.5/audit2allow/audit2allow
 --- nsapolicycoreutils/audit2allow/audit2allow	2006-03-29 15:35:22.000000000 -0500
-+++ policycoreutils-1.30.4/audit2allow/audit2allow	2006-04-05 08:59:26.000000000 -0400
-@@ -577,7 +577,7 @@
++++ policycoreutils-1.30.5/audit2allow/audit2allow	2006-04-14 07:44:00.000000000 -0400
+@@ -24,431 +24,8 @@
+ #                                        02111-1307  USA
+ #
+ #  
+-import commands, sys, os, pwd, string, getopt, re, selinux
+-
+-obj="(\{[^\}]*\}|[^ \t:]*)"
+-allow_regexp="(allow|dontaudit)[ \t]+%s[ \t]*%s[ \t]*:[ \t]*%s[ \t]*%s" % (obj, obj, obj, obj)
+-awk_script='/^[[:blank:]]*interface[[:blank:]]*\(/ {\n\
+-        IFACEFILE=FILENAME\n\
+-	IFACENAME = gensub("^[[:blank:]]*interface[[:blank:]]*\\\\(\`?","","g",$0);\n\
+-	IFACENAME = gensub("\'?,.*$","","g",IFACENAME);\n\
+-}\n\
+-\n\
+-/^[[:blank:]]*(allow|dontaudit)[[:blank:]]+.*;[[:blank:]]*$/ {\n\
+-\n\
+-  if ((length(IFACENAME) > 0) && (IFACEFILE == FILENAME)){\n\
+-		ALLOW = gensub("^[[:blank:]]*","","g",$0)\n\
+-		ALLOW = gensub(";[[:blank:]]*$","","g",$0)\n\
+-		print FILENAME "\\t" IFACENAME "\\t" ALLOW;\n\
+-	}\n\
+-}\
+-'
+-
+-class accessTrans:
+-    def __init__(self):
+-        self.dict={}
+-	try:
+-		fd=open("/usr/share/selinux/devel/include/support/obj_perm_sets.spt")
+-	except IOError, error:
+-		raise IOError("Reference policy generation requires the policy development package.\n%s" % error)
+-        records=fd.read().split("\n")
+-        regexp="^define *\(`([^']*)' *, *` *\{([^}]*)}'"
+-        for r in records:
+-            m=re.match(regexp,r)
+-            if m!=None:
+-                self.dict[m.groups()[0]] = m.groups()[1].split()
+-        fd.close()
+-    def get(self, var):
+-        l=[]
+-        for v in var:
+-            if v in self.dict.keys():
+-                l += self.dict[v]
+-            else:
+-                if v not in ("{", "}"):
+-                    l.append(v)
+-        return l
+-
+-class interfaces:
+-    def __init__(self):
+-        self.dict={}
+-        trans=accessTrans()
+-	(input, output) = os.popen2("awk -f - /usr/share/selinux/devel/include/*/*.if 2> /dev/null")
+-	input.write(awk_script)
+-	input.close()
+-	records=output.read().split("\n")
+-	input.close()
+-        if len(records) > 0:
+-            regexp="([^ \t]*)[ \t]+([^ \t]*)[ \t]+%s" % allow_regexp
+-            for r in records:
+-                m=re.match(regexp,r)
+-                if m==None:
+-                    continue
+-                val=m.groups()
+-                file=os.path.basename(val[0]).split(".")[0]
+-                iface=val[1]
+-                Scon=val[3].split()
+-                Tcon=val[4].split()
+-                Class=val[5].split()
+-                Access=trans.get(val[6].split())
+-                for s in Scon:
+-                    for t in Tcon:
+-                        for c in Class:
+-                            if (s, t, c) not in self.dict.keys():
+-                                self.dict[(s, t, c)]=[]
+-                            self.dict[(s, t, c)].append((Access, file, iface))
+-    def out(self):
+-        keys=self.dict.keys()
+-        keys.sort()
+-        for k in keys:
+-            print k
+-            for i in self.dict[k]:
+-                print "\t", i
+-                
+-    def match(self, Scon, Tcon, Class, Access):
+-        keys=self.dict.keys()
+-        ret=[]
+-        if (Scon, Tcon, Class) in keys:
+-            for i in self.dict[(Scon, Tcon, Class)]:
+-                if Access in i[0]:
+-                    if i[2].find(Access) >= 0:
+-                        ret.insert(0, i)
+-                    else:
+-                        ret.append(i)
+-            return ret
+-        if ("$1", Tcon, Class) in keys:
+-            for i in self.dict[("$1", Tcon, Class)]:
+-                if Access in i[0]:
+-                    if i[2].find(Access) >= 0:
+-                        ret.insert(0, i)
+-                    else:
+-                        ret.append(i)
+-            return ret
+-        if (Scon, "$1", Class) in keys:
+-            for i in self.dict[(Scon, "$1", Class)]:
+-                if Access in i[0]:
+-                    if i[2].find(Access) >= 0:
+-                        ret.insert(0, i)
+-                    else:
+-                        ret.append(i)
+-            return ret
+-        else:
+-            return ret
+-        
+-
+-class serule:
+-	def __init__(self, type, source, target, seclass):
+-		self.type=type
+-		self.source=source
+-		self.target=target
+-		self.seclass=seclass
+-		self.avcinfo={}
+-		self.iface=None
+-		
+-	def add(self, avc):
+-		for a in avc[0]:
+-			if a not in self.avcinfo.keys():
+-				self.avcinfo[a]=[]
+-
+-			self.avcinfo[a].append(avc[1:])
+-
+-	def getAccess(self):
+-		if len(self.avcinfo.keys()) == 1:
+-			for i in self.avcinfo.keys():
+-				return i
+-		else:
+-			keys=self.avcinfo.keys()
+-			keys.sort()
+-			ret="{"
+-			for i in keys:
+-				ret=ret + " " + i				
+-			ret=ret+" }"
+-			return ret
+-	def out(self, verbose=0):
+-		ret=""
+-		ret=ret+"%s %s %s:%s %s;" % (self.type, self.source, self.gettarget(), self.seclass, self.getAccess())
+-		if verbose:
+-			keys=self.avcinfo.keys()
+-			keys.sort()
+-			for i in keys:
+-				for x in self.avcinfo[i]:
+-					ret=ret+"\n\t#TYPE=AVC  MSG=%s  " % x[0]
+-					if len(x[1]):
+-						ret=ret+"COMM=%s  " % x[1]
+-					if len(x[2]):
+-						ret=ret+"NAME=%s  " % x[2]
+-					ret=ret + " : " + i 
+-		return ret
+-		
+-	def gen_reference_policy(self, iface):
+-		ret=""
+-		Scon=self.source
+-		Tcon=self.gettarget()
+-		Class=self.seclass
+-		Access=self.getAccess()
+-		m=iface.match(Scon,Tcon,Class,Access)
+-		if len(m)==0:
+-			return self.out()
+-		else:
+-			file=m[0][1]
+-			ret="\n#%s\n"% self.out()
+-			ret += "optional_policy(`%s', `\n" % m[0][1]
+-			first=True
+-			for i in m:
+-				if file != i[1]:
+-					ret += "')\ngen_require(`%s', `\n" % i[1]
+-					file = i[1]
+-					first=True
+-				if first:
+-					ret += "\t%s(%s)\n" % (i[2], Scon)
+-					first=False
+-				else:
+-					ret += "#\t%s(%s)\n" % (i[2], Scon)
+-			ret += "');"
+-		return ret
+-		
+-	def gettarget(self):
+-		if self.source == self.target:
+-			return "self"
+-		else:
+-			return self.target
+-	
+-class seruleRecords:
+-	def __init__(self, input, last_reload=0, verbose=0, te_ind=0):
+-		self.last_reload=last_reload
+-                self.initialize()
+-		self.load(input, te_ind)
+-		self.gen_ref_policy = False
+-
+-        def initialize(self):
+-       		self.seRules={}
+-		self.seclasses={}
+-		self.types=[]
+-		self.roles=[]
+-
+-	def gen_reference_policy(self):
+-		self.gen_ref_policy = True
+-		self.iface=interfaces()
+-
+-	def warning(self, error):
+-		sys.stderr.write("%s: " % sys.argv[0])
+-		sys.stderr.write("%s\n" % error)
+-		sys.stderr.flush()
+-
+-	def load(self, input, te_ind=0):
+-		VALID_CMDS=("allow", "dontaudit", "auditallow", "role")
+-		
+-		avc=[]
+-		found=0
+-		line = input.readline()
+-		if te_ind:
+-			while line:
+-				rec=line.split()
+-				if len(rec) and rec[0] in VALID_CMDS:
+-					self.add_terule(line)
+-				line = input.readline()
+-					
+-		else:
+-			while line:
+-				rec=line.split()
+-				for i in rec:
+-					if i=="avc:" or i=="message=avc:" or i=="msg='avc:":
+-
+-						found=1
+-					else:
+-						avc.append(i)
+-				if found:
+-					self.add(avc)
+-					found=0
+-					avc=[]
+-				line = input.readline()
+-				
+-
+-	def get_target(self, i, rule):
+-		target=[]
+-		if rule[i][0] == "{":
+-			for t in rule[i].split("{"):
+-				if len(t):
+-					target.append(t)
+-			i=i+1
+-			for s in rule[i:]:
+-				if s.find("}") >= 0:
+-					for s1 in s.split("}"):
+-						if len(s1):
+-							target.append(s1)
+-						i=i+1
+-						return (i, target)
+-
+-				target.append(s)
+-				i=i+1
+-		else:
+-			if rule[i].find(";") >= 0:
+-				for s1 in rule[i].split(";"):
+-					if len(s1):
+-						target.append(s1)
+-			else:
+-				target.append(rule[i])
+-
+-		i=i+1
+-		return (i, target)
+-
+-	def rules_split(self, rules):
+-		(idx, target ) = self.get_target(0, rules)
+-		(idx, subject) = self.get_target(idx, rules)
+-		return (target, subject)
+-
+-	def add_terule(self, rule):
+-		rc = rule.split(":")
+-		rules=rc[0].split()
+-		type=rules[0]
+-		if type == "role":
+-			print type
+-		(sources, targets) = self.rules_split(rules[1:])
+-		rules=rc[1].split()
+-		(seclasses, access) = self.rules_split(rules)
+-		for scon in sources:
+-			for tcon in targets:
+-				for seclass in seclasses:
+-					self.add_rule(type, scon, tcon, seclass,access)
+-		
+-	def add_rule(self, rule_type, scon, tcon, seclass, access, msg="", comm="", name=""):
+-		self.add_seclass(seclass, access)
+-		self.add_type(tcon)
+-		self.add_type(scon)
+-		if (rule_type, scon, tcon, seclass) not in self.seRules.keys():
+-			self.seRules[(rule_type, scon, tcon, seclass)]=serule(rule_type, scon, tcon, seclass)
+-				
+-		self.seRules[(rule_type, scon, tcon, seclass)].add((access, msg, comm, name ))
+-
+-	def add(self,avc):
+-		scon=""
+-		tcon=""
+-		seclass=""
+-		comm=""
+-		name=""
+-		msg=""
+-		access=[]
+-		if "security_compute_sid" in avc:
+-			return
+-		
+-		if "load_policy" in avc and self.last_reload:
+-                        self.initialize()
+-
+-		if "granted" in avc:
+-			return
+-		try:
+-			for i in range (0, len(avc)):
+-				if avc[i]=="{":
+-					i=i+1
+-					while i<len(avc) and avc[i] != "}":
+-						access.append(avc[i])
+-						i=i+1
+-					continue
+-			
+-				t=avc[i].split('=')
+-				if len(t) < 2:
+-					continue
+-				if t[0]=="scontext":
+-					context=t[1].split(":")
+-					scon=context[2]
+-					srole=context[1]
+-					continue
+-				if t[0]=="tcontext":
+-					context=t[1].split(":")
+-					tcon=context[2]
+-					trole=context[1]
+-					continue
+-				if t[0]=="tclass":
+-					seclass=t[1]
+-					continue
+-				if t[0]=="comm":
+-					comm=t[1]
+-					continue
+-				if t[0]=="name":
+-					name=t[1]
+-					continue
+-				if t[0]=="msg":
+-					msg=t[1]
+-					continue
+-
+-			if scon=="" or tcon =="" or seclass=="":
+-				return
+-		except IndexError, e:
+-			self.warning("Bad AVC Line: %s" % avc)
+-			return
+-			
+-		self.add_role(srole)
+-		self.add_role(trole)
+-		self.add_rule("allow", scon, tcon, seclass, access, msg, comm, name)
+-
+-	def add_seclass(self,seclass, access):
+-		if seclass not in self.seclasses.keys():
+-				self.seclasses[seclass]=[]
+-		for a in access:
+-			if a not in self.seclasses[seclass]:
+-				self.seclasses[seclass].append(a)
+-				
+-	def add_role(self,role):
+-		if role not in self.roles:
+-				self.roles.append(role)
+-
+-	def add_type(self,type):
+-		if type not in self.types:
+-				self.types.append(type)
+-
+-	def gen_module(self, module):
+-            if self.gen_ref_policy:
+-		return "policy_module(%s, 1.0);" % module
+-            else:
+-		return "module %s 1.0;" % module
+-
+-	def gen_requires(self):
+-		self.roles.sort()
+-		self.types.sort()
+-		keys=self.seclasses.keys()
+-		keys.sort()
+-		rec="\n\nrequire {\n"
+-#		if len(self.roles) > 0:
+-#			for i in self.roles:
+-#				rec += "\trole %s; \n" % i
+-#			rec += "\n" 
+-#
+-		for i in keys:
+-			access=self.seclasses[i]
+-			if len(access) > 1:
+-				access.sort()
+-				rec += "\tclass %s {" % i
+-				for a in access:
+-					rec += " %s" % a
+-				rec += " }; \n"
+-			else:
+-				rec += "\tclass %s %s;\n" % (i, access[0])
+-				
+-		rec += "\n" 
+-			
+-		for i in self.types:
+-			rec += "\ttype %s; \n" % i
+-		rec += "};\n\n"
+-		return rec
+-	
+-	def out(self, require=0, module=""):
+-		rec=""
+-		if len(self.seRules.keys())==0:
+-		       raise(ValueError("No AVC messages found."))
+-		if module != "":
+-			rec += self.gen_module(module)
+-			rec += self.gen_requires()
+-		else:
+-			if requires:
+-				rec+=self.gen_requires()
+-
+-		keys=self.seRules.keys()
+-		keys.sort()
+-		for i in keys:
+-			if self.gen_ref_policy:
+-				rec += self.seRules[i].gen_reference_policy(self.iface)+"\n"
+-			else:
+-				rec += self.seRules[i].out(verbose)+"\n"
+-		return rec
++import commands, sys, os, getopt, selinux
++from avc import *
+ 
+ if __name__ == '__main__':
+ 
+@@ -469,10 +46,11 @@
+ 		-M               generate loadable module package, conflicts with -o\n\
+ 		-o, --output     append output to <outputfile>, conflicts with -M\n\
+ 		-r, --requires   generate require output \n\
+-		-t, --tefile     Indicates input is Existing Type Enforcement file\n\
++		-t, --tefile     Add input from Existing Type Enforcement file\n\
+ 		-f, --fcfile     Existing Type Enforcement file, requires -M\n\
+ 		-v, --verbose    verbose output\n\
+-		'
++                -A, --analyze    Analyze output\n\
++                '
+ 		if msg != "":
+ 			print msg
+ 		sys.exit(1)
+@@ -498,13 +76,15 @@
+ 		input_ind=0
+ 		output_ind=0
+ 		ref_ind=False
+-		te_ind=0
++		analyze=False
++		te_inputs=[]
+ 
+ 		fc_file=""
+ 		gopts, cmds = getopt.getopt(sys.argv[1:],
+-					    'adf:hi:lm:M:o:rtvR',
++					    'Aadf:hi:lm:M:o:rt:vR',
+ 					    ['all',
+-					     'dmesg',
++                                             'analyze',
++                                             'dmesg',
+ 					     'fcfile=',
+ 					     'help',
+ 					     'input=',
+@@ -513,12 +93,12 @@
+ 					     'output=',
+ 					     'requires',
+ 					     'reference',
+-					     'tefile',
++					     'tefile=',
+ 					     'verbose'
+ 					     ])
+ 		for o,a in gopts:
+ 			if o == "-a" or o == "--all":
+-				if input_ind or te_ind:
++				if input_ind:
+ 					usage()
+ 				input=open("/var/log/messages", "r")
+ 				auditlogs=1
+@@ -551,9 +131,8 @@
+ 			if o == "-r" or o == "--requires":
+ 				requires=1
+ 			if o == "-t" or o == "--tefile":
+-				if auditlogs:
+-					usage()
+-				te_ind=1
++				te_inputs.append(open(a, "r"))
++                                
+ 			if o == "-R" or o == "--reference":
+ 				ref_ind=True
+ 				
+@@ -565,25 +144,37 @@
+ 			if o == "-v" or o == "--verbose":
+ 				verbose=1
+ 				
++			if o == "-A" or o == "--analyze":
++				analyze=True
++				
+ 		if len(cmds) != 0:
+ 			usage()
+ 
+ 		if fc_file != "" and not buildPP:
+ 			usage("Error %s: Option -fc requires -M" % sys.argv[0])
+ 			
+-		out=seruleRecords(input, last_reload, verbose, te_ind)
++                serules=SERules(last_reload, verbose)
++
++                for i in te_inputs:
++                    te=TERules(serules)
++                    te.load(i)
++
++                serules.load(input)
+ 
+ 
  		if ref_ind:
- 			out.gen_reference_policy()
+-			out.gen_reference_policy()
++			serules.gen_reference_policy()
++
++		if analyze:
++			serules.analyze()
  
 -		if auditlogs:
 +		if auditlogs and os.path.exists("/var/log/audit/audit.log"):
  			input=os.popen("ausearch -m avc")
- 			out.load(input)
+-			out.load(input)
++			serules.load(input)
  
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-1.30.4/audit2allow/audit2allow.1
+ 		if buildPP:
+ 			print ("Generating type enforcment file: %s.te" % module)
+-		output.write(out.out(requires, module))
++		output.write(serules.out(requires, module))
+ 		output.flush()
+ 		if buildPP:
+ 			cmd="checkmodule %s -m -o %s.mod %s.te" % (get_mls_flag(), module, module)
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-1.30.5/audit2allow/audit2allow.1
 --- nsapolicycoreutils/audit2allow/audit2allow.1	2006-03-10 09:48:04.000000000 -0500
-+++ policycoreutils-1.30.4/audit2allow/audit2allow.1	2006-04-05 09:09:05.000000000 -0400
++++ policycoreutils-1.30.5/audit2allow/audit2allow.1	2006-04-14 07:44:00.000000000 -0400
 @@ -98,6 +98,11 @@
  .PP
  .SH EXAMPLE
@@ -25,18 +553,612 @@
  .B Using audit2allow to generate monolithic (non-module) policy
  $ cd /etc/selinux/$SELINUXTYPE/src/policy
  $ cat /var/log/audit/audit.log | audit2allow >> domains/misc/local.te
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.30.4/restorecond/restorecond.conf
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/avc.py policycoreutils-1.30.5/audit2allow/avc.py
+--- nsapolicycoreutils/audit2allow/avc.py	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-1.30.5/audit2allow/avc.py	2006-04-14 07:44:00.000000000 -0400
+@@ -0,0 +1,518 @@
++#! /usr/bin/env python
++# Copyright (C) 2006 Red Hat 
++# see file 'COPYING' for use and warranty information
++#
++# avc.py is a plugin modules used by audit2allow and other objects to process
++# avc messages from the log files
++#
++# Based off original audit2allow perl script: which credits
++#    newrules.pl, Copyright (C) 2001 Justin R. Smith (jsmith at mcs.drexel.edu)
++#    2003 Oct 11: Add -l option by Yuichi Nakamura(ynakam at users.sourceforge.jp)
++#
++#    This program is free software; you can redistribute it and/or
++#    modify it under the terms of the GNU General Public License as
++#    published by the Free Software Foundation; either version 2 of
++#    the License, or (at your option) any later version.
++#
++#    This program is distributed in the hope that it will be useful,
++#    but WITHOUT ANY WARRANTY; without even the implied warranty of
++#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++#    GNU General Public License for more details.
++#
++#    You should have received a copy of the GNU General Public License
++#    along with this program; if not, write to the Free Software
++#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA     
++#                                        02111-1307  USA
++#
++#  
++import sys, os, pwd, string, re, selinux
++
++obj="(\{[^\}]*\}|[^ \t:]*)"
++allow_regexp="(allow|dontaudit)[ \t]+%s[ \t]*%s[ \t]*:[ \t]*%s[ \t]*%s" % (obj, obj, obj, obj)
++awk_script='/^[[:blank:]]*interface[[:blank:]]*\(/ {\n\
++        IFACEFILE=FILENAME\n\
++	IFACENAME = gensub("^[[:blank:]]*interface[[:blank:]]*\\\\(\`?","","g",$0);\n\
++	IFACENAME = gensub("\'?,.*$","","g",IFACENAME);\n\
++}\n\
++\n\
++/^[[:blank:]]*(allow|dontaudit)[[:blank:]]+.*;[[:blank:]]*$/ {\n\
++\n\
++  if ((length(IFACENAME) > 0) && (IFACEFILE == FILENAME)){\n\
++		ALLOW = gensub("^[[:blank:]]*","","g",$0)\n\
++		ALLOW = gensub(";[[:blank:]]*$","","g",$0)\n\
++		print FILENAME "\\t" IFACENAME "\\t" ALLOW;\n\
++	}\n\
++}\
++'
++
++class context:
++    def __init__(self, scontext):
++        self.scontext=scontext
++        con=scontext.split(":")
++        self.user=con[0]
++        self.role=con[1]
++        self.type=con[2]
++        if len(con) > 3:
++            self.mls=con[3]
++        else:
++            self.mls="s0"
++        
++    def __str__(self):
++        return self.scontext
++
++class accessTrans:
++    def __init__(self):
++        self.dict={}
++	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)
++        records=fd.read().split("\n")
++        regexp="^define *\(`([^']*)' *, *` *\{([^}]*)}'"
++        for r in records:
++            m=re.match(regexp,r)
++            if m!=None:
++                self.dict[m.groups()[0]] = m.groups()[1].split()
++        fd.close()
++    def get(self, var):
++        l=[]
++        for v in var:
++            if v in self.dict.keys():
++                l += self.dict[v]
++            else:
++                if v not in ("{", "}"):
++                    l.append(v)
++        return l
++
++class interfaces:
++    def __init__(self):
++        self.dict={}
++        trans=accessTrans()
++	(input, output) = os.popen2("awk -f - /usr/share/selinux/devel/include/*/*.if 2> /dev/null")
++	input.write(awk_script)
++	input.close()
++	records=output.read().split("\n")
++	input.close()
++        if len(records) > 0:
++            regexp="([^ \t]*)[ \t]+([^ \t]*)[ \t]+%s" % allow_regexp
++            for r in records:
++                m=re.match(regexp,r)
++                if m==None:
++                    continue
++                val=m.groups()
++                file=os.path.basename(val[0]).split(".")[0]
++                iface=val[1]
++                Scon=val[3].split()
++                Tcon=val[4].split()
++                Class=val[5].split()
++                Access=trans.get(val[6].split())
++                for s in Scon:
++                    for t in Tcon:
++                        for c in Class:
++                            if (s, t, c) not in self.dict.keys():
++                                self.dict[(s, t, c)]=[]
++                            self.dict[(s, t, c)].append((Access, file, iface))
++    def out(self):
++        keys=self.dict.keys()
++        keys.sort()
++        for k in keys:
++            print k
++            for i in self.dict[k]:
++                print "\t", i
++                
++    def match(self, Scon, Tcon, Class, Access):
++        keys=self.dict.keys()
++        ret=[]
++        if (Scon, Tcon, Class) in keys:
++            for i in self.dict[(Scon, Tcon, Class)]:
++                if Access in i[0]:
++                    if i[2].find(Access) >= 0:
++                        ret.insert(0, i)
++                    else:
++                        ret.append(i)
++            return ret
++        if ("$1", Tcon, Class) in keys:
++            for i in self.dict[("$1", Tcon, Class)]:
++                if Access in i[0]:
++                    if i[2].find(Access) >= 0:
++                        ret.insert(0, i)
++                    else:
++                        ret.append(i)
++            return ret
++        if (Scon, "$1", Class) in keys:
++            for i in self.dict[(Scon, "$1", Class)]:
++                if Access in i[0]:
++                    if i[2].find(Access) >= 0:
++                        ret.insert(0, i)
++                    else:
++                        ret.append(i)
++            return ret
++        else:
++            return ret
++
++import glob, imp
++pluginPath="/usr/share/selinux/plugins" 
++if not pluginPath in sys.path:
++    sys.path.append(pluginPath)
++
++class Analyze:
++	def __init__(self):
++            self.plugins=[]
++            for p in glob.glob("/usr/share/selinux/plugins/*.py"):
++                plugin=os.path.basename(p)[:-3]
++                self.plugins.append(imp.load_module(plugin, *imp.find_module(plugin)))
++                
++        def process(self, AVCS):
++            ret=[]
++            avcs=AVCS
++            for p in self.plugins:
++                if avcs == None:
++                    break;
++                r = p.analyze(avcs)
++                if len(r)==0:
++                    continue
++                avcs=r[1]
++                if len(r[0]) > 0:
++                    ret.append(r[0])
++            return ret
++                
++class serule:
++	def __init__(self, key):
++		self.type=key[0]
++		self.source=key[1]
++		self.target=key[2]
++		self.seclass=key[3]
++                self.access=[]
++		self.avcinfo={}
++		self.iface=None
++		
++	def add(self, avc):
++		for a in avc[0]:
++			if a not in self.avcinfo.keys():
++				self.avcinfo[a]=[]
++                                self.access.append(a)
++			self.avcinfo[a].append(avc[1:])
++
++	def getAccess(self):
++		if len(self.access) == 1:
++                        return self.access[0]
++		else:
++                        self.access.sort()
++			return "{ " + string.join(self.access) +" }"
++
++	def getName(self):
++            print self.avcinfo
++                    
++	def out(self, verbose=0):
++		ret=""
++		ret=ret+"%s %s %s:%s %s;" % (self.type, self.source, self.gettarget(), self.seclass, self.getAccess())
++		if verbose:
++			keys=self.avcinfo.keys()
++			keys.sort()
++			for i in keys:
++				for x in self.avcinfo[i]:
++					ret=ret+"\n\t#TYPE=AVC  MSG=%s  " % x[0]
++					if len(x[1]):
++						ret=ret+"COMM=%s  " % x[1]
++					if len(x[2]):
++						ret=ret+"NAME=%s  " % x[2]
++					ret=ret + " : " + i 
++		return ret
++		
++	def gen_reference_policy(self, iface):
++		ret=""
++		Scon=self.source
++		Tcon=self.gettarget()
++		Class=self.seclass
++		Access=self.getAccess()
++		m=iface.match(Scon,Tcon,Class,Access)
++		if len(m)==0:
++			return self.out()
++		else:
++			file=m[0][1]
++			ret="\n#%s\n"% self.out()
++			ret += "optional_policy(`%s', `\n" % m[0][1]
++			first=True
++			for i in m:
++				if file != i[1]:
++					ret += "')\ngen_require(`%s', `\n" % i[1]
++					file = i[1]
++					first=True
++				if first:
++					ret += "\t%s(%s)\n" % (i[2], Scon)
++					first=False
++				else:
++					ret += "#\t%s(%s)\n" % (i[2], Scon)
++			ret += "');"
++		return ret
++		
++	def gettarget(self):
++		if self.source == self.target:
++			return "self"
++		else:
++			return self.target
++
++def warning(error):
++    sys.stderr.write("%s: " % sys.argv[0])
++    sys.stderr.write("%s\n" % error)
++    sys.stderr.flush()
++
++
++class TERules:
++	def __init__(self, serules):
++		self.VALID_CMDS=("allow", "dontaudit", "auditallow")
++                self.serules=serules
++
++        def load(self, input):
++		line = input.readline()
++                while line:
++                    rec=line.split()
++                    if len(rec) and rec[0] in self.VALID_CMDS:
++                        self.add_terule(line)
++                    line = input.readline()
++
++	def add_terule(self, rule):
++		rc = rule.split(":")
++		rules=rc[0].split()
++		type=rules[0]
++		(sources, targets) = self.rules_split(rules[1:])
++		rules=rc[1].split()
++		(classes, access) = self.rules_split(rules)
++		for scon in sources:
++			for tcon in targets:
++				for seclass in classes:
++					self.serules.add_rule(type, scon, tcon, seclass,access)
++		
++	def rules_split(self, rules):
++		(idx, target ) = self.get_target(0, rules)
++		(idx, subject) = self.get_target(idx, rules)
++		return (target, subject)
++
++	def get_target(self, i, rule):
++		target=[]
++		if rule[i][0] == "{":
++			for t in rule[i].split("{"):
++				if len(t):
++					target.append(t)
++			i=i+1
++			for s in rule[i:]:
++				if s.find("}") >= 0:
++					for s1 in s.split("}"):
++						if len(s1):
++							target.append(s1)
++						i=i+1
++						return (i, target)
++
++				target.append(s)
++				i=i+1
++		else:
++			if rule[i].find(";") >= 0:
++				for s1 in rule[i].split(";"):
++					if len(s1):
++						target.append(s1)
++			else:
++				target.append(rule[i])
++
++		i=i+1
++		return (i, target)
++
++
++ALLOW=0
++STYPE=1
++TTYPE=2
++CLASS=3
++COMM=1
++NAME=3
++
++class SERules:
++	def __init__(self, last_reload=0, verbose=0):
++		self.last_reload=last_reload
++                self.initialize()
++		self.gen_ref_policy = False
++		self.verbose = verbose
++                self.AVCS=[]
++
++        def initialize(self):
++       		self.seRules={}
++		self.classes={}
++		self.types=[]
++		self.roles=[]
++
++	def load(self, input):
++		dict=[]
++		found=0
++		line = input.readline()
++                while line:
++                    rec=line.split()
++                    for i in rec:
++                        if i=="avc:" or i=="message=avc:" or i=="msg='avc:":
++                            found=1
++                        else:
++                            dict.append(i)
++                        if found:
++                            self.translate(dict)
++                            found=0
++                            dict=[]
++                    line = input.readline()
++				
++
++        def translate(self,dict):
++                AVC={}
++		AVC["access"]=[]
++		if "security_compute_sid" in dict:
++			return
++		
++		if "load_policy" in dict and self.last_reload:
++                        self.initialize()
++
++		if "granted" in dict:
++			return
++		try:
++			for i in range (0, len(dict)):
++				if dict[i]=="{":
++					i=i+1
++					while i<len(dict) and dict[i] != "}":
++						AVC["access"].append(dict[i])
++						i=i+1
++					continue
++			
++				t=dict[i].split('=')
++				if len(t) < 2:
++					continue
++                                AVC[t[0]]=t[1]
++
++                        for i in ("scontext", "tcontext", "tclass"):
++                            if i not in AVC.keys():
++                                return
++
++		except IndexError, e:
++			warning("Bad AVC Line: %s" % avc)
++			return
++			
++		self.add_allow(AVC)
++
++        def add_avc(self, AVC):
++            for a in self.AVCS:
++                if a["tclass"] == AVC["tclass"] and a["access"] == AVC["access"] and a["tcontext"] == AVC["tcontext"] and a["scontext"] == AVC["scontext"] and a["comm"] == AVC["comm"] and a["name"] == AVC["name"]:
++                    return
++            self.AVCS.append(AVC)
++                
++	def add_rule(self, rule_type, scon, tcon, tclass, access, msg="", comm="", name=""):
++                AVC={}
++                AVC["tclass"]=tclass
++                AVC["access"]=access
++                AVC["tcon"]=tcon
++                AVC["scon"]=scon
++                AVC["comm"]=comm
++                AVC["name"]=name
++                self.add_avc(AVC)
++
++		self.add_class(tclass, access)
++		self.add_type(tcon)
++		self.add_type(scon)
++                key=(rule_type, scon, tcon, seclass)
++		if key not in self.seRules.keys():
++			self.seRules[key]=serule(key)
++		self.seRules[key].add((access, msg, comm, name ))
++
++	def add_allow(self, AVC):
++		self.add_class(AVC["tclass"], AVC["access"])
++                tcontext=context(AVC["tcontext"])
++                scontext=context(AVC["scontext"])
++
++		self.add_type(tcontext.type)
++		self.add_type(scontext.type)
++
++		self.add_role(scontext.role)
++
++                key=("allow", scontext.type, tcontext.type, AVC["tclass"])
++		if key not in self.seRules.keys():
++			self.seRules[key]=serule(key)
++                if "name" not in AVC.keys():
++                    AVC["name"]=""
++
++                self.add_avc(AVC)
++                self.seRules[key].add((AVC["access"], AVC["msg"], AVC["comm"], AVC["name"]))
++
++        def add_class(self,seclass, access):
++		if seclass not in self.classes.keys():
++				self.classes[seclass]=[]
++		for a in access:
++			if a not in self.classes[seclass]:
++				self.classes[seclass].append(a)
++				
++	def add_role(self,role):
++		if role not in self.roles:
++				self.roles.append(role)
++
++	def add_type(self,type):
++		if type not in self.types:
++				self.types.append(type)
++
++	def gen_reference_policy(self):
++		self.gen_ref_policy = True
++		self.iface=interfaces()
++
++	def gen_module(self, module):
++            if self.gen_ref_policy:
++		return "policy_module(%s, 1.0);" % module
++            else:
++		return "module %s 1.0;" % module
++
++	def gen_requires(self):
++		self.roles.sort()
++		self.types.sort()
++		keys=self.classes.keys()
++		keys.sort()
++		rec="\n\nrequire {\n"
++#		if len(self.roles) > 0:
++#			for i in self.roles:
++#				rec += "\trole %s; \n" % i
++#			rec += "\n" 
++#
++		for i in keys:
++			access=self.classes[i]
++			if len(access) > 1:
++				access.sort()
++				rec += "\tclass %s {" % i
++				for a in access:
++					rec += " %s" % a
++				rec += " }; \n"
++			else:
++				rec += "\tclass %s %s;\n" % (i, access[0])
++				
++		rec += "\n" 
++			
++		for i in self.types:
++			rec += "\ttype %s; \n" % i
++		rec += "};\n\n"
++		return rec
++	
++	def analyze(self):
++            a=Analyze()
++            analysys=a.process(self.AVCS)
++            for i in analysys:
++                print i[0][0]
++                print ""
++            sys.exit(0)
++                
++	def out(self, require=0, module=""):
++		rec=""
++		if len(self.seRules.keys())==0:
++		       raise(ValueError("No AVC messages found."))
++		if module != "":
++			rec += self.gen_module(module)
++			rec += self.gen_requires()
++		else:
++			if require:
++				rec+=self.gen_requires()
++
++		keys=self.seRules.keys()
++		keys.sort()
++		for i in keys:
++			if self.gen_ref_policy:
++				rec += self.seRules[i].gen_reference_policy(self.iface)+"\n"
++			else:
++				rec += self.seRules[i].out(self.verbose)+"\n"
++		return rec
++
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.30.5/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2006-03-29 11:08:21.000000000 -0500
-+++ policycoreutils-1.30.4/restorecond/restorecond.conf	2006-04-03 11:57:26.000000000 -0400
++++ policycoreutils-1.30.5/restorecond/restorecond.conf	2006-04-14 07:44:00.000000000 -0400
 @@ -2,3 +2,4 @@
  /etc/mtab
  /var/run/utmp
  ~/public_html
 +~/.mozilla/plugins/libflashplayer.so
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.30.4/semanage/semanage
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.30.5/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2006-03-29 15:35:22.000000000 -0500
-+++ policycoreutils-1.30.4/semanage/semanage	2006-04-01 04:54:36.000000000 -0500
-@@ -286,6 +286,8 @@
++++ policycoreutils-1.30.5/semanage/semanage	2006-04-14 07:45:07.000000000 -0400
+@@ -32,7 +32,7 @@
+ 		print '\
+ semanage {login|user|port|interface|fcontext|translation} -l [-n] \n\
+ semanage login -{a|d|m} [-sr] login_name\n\
+-semanage user -{a|d|m} [-LrR] selinux_name\n\
++semanage user -{a|d|m} [-LrRP] selinux_name\n\
+ semanage port -{a|d|m} [-tr] [ -p protocol ] port | port_range\n\
+ semanage interface -{a|d|m} [-tr] interface_spec\n\
+ semanage fcontext -{a|d|m} [-frst] file_spec\n\
+@@ -60,6 +60,7 @@
+ 		-p (named pipe) \n\n\
+ \
+ 	-p, --proto      Port protocol (tcp or udp)\n\
++	-P, --prefix     Prefix for home directory labeling\n\
+ 	-L, --level      Default SELinux Level (MLS/MCS Systems only)\n\
+ 	-R, --roles      SELinux Roles (ex: "sysadm_r staff_r")\n\
+ 	-T, --trans      SELinux Level Translation (MLS/MCS Systems only)\n\n\
+@@ -83,7 +84,7 @@
+ 		valid_option["login"] = []
+ 		valid_option["login"] += valid_everyone + [ '-s', '--seuser', '-r', '--range']
+ 		valid_option["user"] = []
+-		valid_option["user"] += valid_everyone + [ '-L', '--level', '-r', '--range', '-R', '--roles' ] 
++		valid_option["user"] += valid_everyone + [ '-L', '--level', '-r', '--range', '-R', '--roles', '-P', '--prefix' ] 
+ 		valid_option["port"] = []
+ 		valid_option["port"] += valid_everyone + [ '-t', '--type', '-r', '--range', '-p', '--protocol' ] 
+ 		valid_option["interface"] = []
+@@ -109,6 +110,7 @@
+ 		setrans = ""
+ 		roles = ""
+ 		seuser = ""
++		prefix = ""
+ 		heading=1
+ 
+ 		add = 0
+@@ -126,7 +128,7 @@
+ 		args = sys.argv[2:]
+ 
+ 		gopts, cmds = getopt.getopt(args,
+-					    'adf:lhmnp:s:R:L:r:t:T:',
++					    'adf:lhmnp:s:R:L:r:t:T:P:',
+ 					    ['add',
+ 					     'delete',
+ 					     'ftype=',
+@@ -140,7 +142,8 @@
+ 					     'level=',
+ 					     'roles=',
+ 					     'type=',
+-					     'trans='
++					     'trans=',
++					     'prefix='
+ 					     ])
+ 		for o, a in gopts:
+ 			if o not in option_dict[object]:
+@@ -185,6 +188,9 @@
+ 			if o == "-p" or o == '--proto':
+ 				proto = a
+ 
++			if o == "-P" or o == '--prefix':
++				prefix = a
++
+ 			if o == "-R" or o == '--roles':
+ 				roles = roles + " " + a
+ 
+@@ -235,7 +241,7 @@
+ 				rlist = roles.split()
+ 				if len(rlist) == 0:
+ 					raise ValueError("You must specify a role")
+-				OBJECT.add(target, rlist, selevel, serange)
++				OBJECT.add(target, rlist, selevel, serange, prefix)
+ 
+ 			if object == "port":
+ 				OBJECT.add(target, proto, serange, setype)
+@@ -286,6 +292,8 @@
  		errorExit("Options Error " + error.msg)
  	except ValueError, error:
  		errorExit(error.args[0])
@@ -45,3 +1167,93 @@
  	except IOError, error:
  		errorExit(error.args[1])
  	except KeyboardInterrupt, error:
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.30.5/semanage/seobject.py
+--- nsapolicycoreutils/semanage/seobject.py	2006-03-29 15:35:22.000000000 -0500
++++ policycoreutils-1.30.5/semanage/seobject.py	2006-04-14 07:47:13.000000000 -0400
+@@ -381,7 +381,7 @@
+ 	def __init__(self):
+ 		semanageRecords.__init__(self)
+ 
+-	def add(self, name, roles, selevel, serange):
++	def add(self, name, roles, selevel, serange, prefix):
+ 		if is_mls_enabled == 1:
+ 			if serange == "":
+ 				serange = "s0"
+@@ -427,6 +427,9 @@
+ 				if rc < 0:
+ 					raise ValueError("Could not set MLS level for %s" % name)
+ 
++			rc = semanage_user_set_prefix(self.sh, u, prefix)
++			if rc < 0:
++				raise ValueError("Could not add prefix %s for %s" % (r, prefix))
+ 			(rc,key) = semanage_user_key_extract(self.sh,u)
+ 			if rc < 0:
+ 				raise ValueError("Could not extract key for %s" % name)
+@@ -451,13 +454,15 @@
+ 		semanage_user_key_free(k)
+ 		semanage_user_free(u)
+ 
+-	def modify(self, name, roles = [], selevel = "", serange = ""):
++ 	def modify(self, name, roles = [], selevel = "", serange = "", prefix = ""):
++		oldroles=""
++		newroles = string.join(roles, ' ');
+ 		try:
+-			if len(roles) == 0  and serange == "" and selevel == "":
++ 			if prefix == "" and len(roles) == 0  and serange == "" and selevel == "":
+ 				if is_mls_enabled == 1:
+-					raise ValueError("Requires roles, level or range")
++ 					raise ValueError("Requires prefix, roles, level or range")
+ 				else:
+-					raise ValueError("Requires roles")
++ 					raise ValueError("Requires prefix or roles")
+ 
+ 			(rc,k) = semanage_user_key_create(self.sh, name)
+ 			if rc < 0:
+@@ -473,11 +478,21 @@
+ 			if rc < 0:
+ 				raise ValueError("Could not query user for %s" % name)
+ 
++			oldserange=semanage_user_get_mlsrange(u)
++			(rc, rlist)=semanage_user_get_roles(self.sh, u)
++			if rc >= 0:
++				oldroles = string.join(rlist, ' ');
++			newroles = newroles + ' ' + oldroles;
++
++
+ 			if serange != "":
+ 				semanage_user_set_mlsrange(self.sh, u, untranslate(serange))
+ 			if selevel != "":
+ 				semanage_user_set_mlslevel(self.sh, u, untranslate(selevel))
+ 
++			if prefix != "":
++				semanage_user_set_prefix(self.sh, u, prefix)
++
+ 			if len(roles) != 0:
+ 				for r in roles:
+ 					semanage_user_add_role(self.sh, u, r)
+@@ -495,10 +510,11 @@
+ 				raise ValueError("Could not modify SELinux user %s" % name)
+ 
+ 		except ValueError, error:
+-			mylog.log(0,"modify SELinux user record", name, seuser, seroles, serange, oldseuser, oldseroles, olrserange)
++			mylog.log(0,"modify SELinux user record", name, "", newroles, serange, "", oldroles, oldserange)
+ 			raise error
+ 		
+-		mylog.log(1,"modify SELinux user record", name, seuser, seroles, serange, oldseuser, oldseroles, olrserange)
++		mylog.log(1,"modify SELinux user record", name, "", newroles, serange, "", oldroles, oldserange)
++
+ 		semanage_user_key_free(k)
+ 		semanage_user_free(u)
+ 
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setsebool/setsebool.8 policycoreutils-1.30.5/setsebool/setsebool.8
+--- nsapolicycoreutils/setsebool/setsebool.8	2005-11-04 15:37:49.000000000 -0500
++++ policycoreutils-1.30.5/setsebool/setsebool.8	2006-04-14 07:44:00.000000000 -0400
+@@ -17,7 +17,7 @@
+ are not changed. 
+ 
+ If the -P option is given, all pending values are written to
+-the boolean file on disk.
++the policy file on disk. So they will be persistant across reboots.
+ 
+ .SH AUTHOR	
+ This manual page was written by Dan Walsh <dwalsh at redhat.com>.


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- policycoreutils.spec	6 Apr 2006 10:21:29 -0000	1.257
+++ policycoreutils.spec	14 Apr 2006 11:51:02 -0000	1.258
@@ -1,11 +1,11 @@
 %define libauditver 1.1.4-3
-%define libsepolver 1.12-1
-%define libsemanagever 1.6-1
-%define libselinuxver 1.30-1
+%define libsepolver 1.12.5-1
+%define libsemanagever 1.6.5-1
+%define libselinuxver 1.30.3-1
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.30.4
-Release: 4
+Version: 1.30.5
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -108,6 +108,11 @@
 /sbin/service restorecond condrestart
 
 %changelog
+* Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> 1.30.5-1
+- Update from upstream
+	* Added a test to setfiles to check that the spec file is
+	  a regular file.
+
 * Thu Apr 06 2006 Karsten Hopp <karsten at redhat.de> 1.30.4-4
 - added some missing buildrequires
 - added Requires: initscripts for /sbin/service


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- sources	29 Mar 2006 20:39:44 -0000	1.110
+++ sources	14 Apr 2006 11:51:02 -0000	1.111
@@ -1 +1 @@
-4af18b5ace84c5cb075f5160ab51f86b  policycoreutils-1.30.4.tgz
+b3eba7a93507ee2e576c184854d01610  policycoreutils-1.30.5.tgz



From fedora-cvs-commits at redhat.com  Fri Apr 14 11:58:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 07:58:12 -0400
Subject: rpms/krb5/FC-5 krb5-kinit-man-typo.patch, NONE, 1.1 krb5.spec, 1.68,
	1.69
Message-ID: <200604141158.k3EBwBsl004199@cvs.devel.redhat.com>

Author: skasal

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

Modified Files:
	krb5.spec 
Added Files:
	krb5-kinit-man-typo.patch 
Log Message:
- Fix formatting typo in kinit.1 (krb5-kinit-man-typo.patch)

krb5-kinit-man-typo.patch:
 kinit.M |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE krb5-kinit-man-typo.patch ---
--- krb5-1.4.3/src/clients/kinit/kinit.M.orig	2005-09-12 21:24:46.000000000 +0200
+++ krb5-1.4.3/src/clients/kinit/kinit.M	2006-04-13 16:40:57.000000000 +0200
@@ -45,7 +45,8 @@
 .SH DESCRIPTION
 .I kinit
 obtains and caches an initial ticket-granting ticket for
-.IR principal .  The typical default behavior is to acquire only
+.IR principal .
+The typical default behavior is to acquire only
 Kerberos 5 tickets.  However, if kinit was built with both 
 Kerberos 4 support and with the default behavior of acquiring both
 types of tickets, it will try to acquire both Kerberos 5 and Kerberos 4


Index: krb5.spec
===================================================================
RCS file: /cvs/dist/rpms/krb5/FC-5/krb5.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- krb5.spec	11 Feb 2006 03:49:47 -0000	1.68
+++ krb5.spec	14 Apr 2006 11:58:09 -0000	1.69
@@ -10,7 +10,7 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.4.3
-Release: 4.1
+Release: 5
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.4/krb5-1.4.3-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -74,6 +74,8 @@
 Patch42: krb5-1.4.3-pthread_np.patch
 Patch43: krb5-1.4.3-kdc_max_dgram_size.patch
 Patch44: krb5-1.4.3-enospc.patch
+Patch45: krb5-kinit-man-typo.patch
+
 License: MIT, freely distributable.
 URL: http://web.mit.edu/kerberos/www/
 Group: System Environment/Libraries
@@ -138,6 +140,9 @@
 workstation.
 
 %changelog
+* Fri Apr 14 2006 Stepan Kasal <skasal at redhat.com>    - 1.4.3-5
+- Fix formatting typo in kinit.1 (krb5-kinit-man-typo.patch)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.4.3-4.1
 - bump again for double-long bug on ppc(64)
 
@@ -910,6 +915,7 @@
 # Don't apply this until we hear back from upstream.
 #%patch43 -p1 -b .kdc_max_dgram_size
 %patch44 -p1 -b .enospc
+%patch45 -p1
 cp src/krb524/README README.krb524
 find . -type f -name "*.info-dir" -exec rm -fv "{}" ";"
 gzip doc/*.ps



From fedora-cvs-commits at redhat.com  Fri Apr 14 12:05:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 08:05:56 -0400
Subject: rpms/krb5/FC-4 krb5-kinit-man-typo.patch, NONE, 1.1 krb5.spec, 1.57,
	1.58
Message-ID: <200604141205.k3EC5uCP004372@cvs.devel.redhat.com>

Author: skasal

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

Modified Files:
	krb5.spec 
Added Files:
	krb5-kinit-man-typo.patch 
Log Message:
- Fix formatting typo in kinit.1 (krb5-kinit-man-typo.patch)

krb5-kinit-man-typo.patch:
 kinit.M |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE krb5-kinit-man-typo.patch ---
--- krb5-1.4.3/src/clients/kinit/kinit.M.orig	2005-09-12 21:24:46.000000000 +0200
+++ krb5-1.4.3/src/clients/kinit/kinit.M	2006-04-13 16:40:57.000000000 +0200
@@ -45,7 +45,8 @@
 .SH DESCRIPTION
 .I kinit
 obtains and caches an initial ticket-granting ticket for
-.IR principal .  The typical default behavior is to acquire only
+.IR principal .
+The typical default behavior is to acquire only
 Kerberos 5 tickets.  However, if kinit was built with both 
 Kerberos 4 support and with the default behavior of acquiring both
 types of tickets, it will try to acquire both Kerberos 5 and Kerberos 4


Index: krb5.spec
===================================================================
RCS file: /cvs/dist/rpms/krb5/FC-4/krb5.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- krb5.spec	1 Dec 2005 20:05:02 -0000	1.57
+++ krb5.spec	14 Apr 2006 12:05:53 -0000	1.58
@@ -7,7 +7,7 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.4.1
-Release: 6
+Release: 7
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.4/krb5-1.4.1-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -69,6 +69,8 @@
 Patch38: krb5-1.4-MITKRB5-SA-2005-003.patch
 Patch39: krb5-1.4.1-api.patch
 Patch40: krb5-1.4.1-telnet-environ.patch
+Patch45: krb5-kinit-man-typo.patch
+
 License: MIT, freely distributable.
 URL: http://web.mit.edu/kerberos/www/
 Group: System Environment/Libraries
@@ -133,6 +135,9 @@
 workstation.
 
 %changelog
+* Fri Apr 14 2006 Stepan Kasal <skasal at redhat.com>    - 1.4.1-7
+- Fix formatting typo in kinit.1 (krb5-kinit-man-typo.patch)
+
 * Thu Dec  1 2005 Nalin Dahyabhai <nalin at redhat.com> 1.4.1-6
 - make ksu setuid again (#137934, others)
 
@@ -871,6 +876,8 @@
 popd
 %patch39 -p1 -b .api
 %patch40 -p1 -b .telnet-environ
+%patch45 -p1
+
 cp src/krb524/README README.krb524
 find . -type f -name "*.info-dir" -exec rm -fv "{}" ";"
 gzip doc/*.ps



From fedora-cvs-commits at redhat.com  Fri Apr 14 12:26:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 08:26:57 -0400
Subject: rpms/krb5/FC-3 krb5-kinit-man-typo.patch, NONE, 1.1 .cvsignore, 1.16,
	1.17 krb5.spec, 1.40, 1.41
Message-ID: <200604141226.k3ECQvjc000535@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/krb5/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv506/FC-3

Modified Files:
	.cvsignore krb5.spec 
Added Files:
	krb5-kinit-man-typo.patch 
Log Message:
- Fix formatting typo in kinit.1 (krb5-kinit-man-typo.patch)

krb5-kinit-man-typo.patch:
 kinit.M |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE krb5-kinit-man-typo.patch ---
--- krb5-1.4.3/src/clients/kinit/kinit.M.orig	2005-09-12 21:24:46.000000000 +0200
+++ krb5-1.4.3/src/clients/kinit/kinit.M	2006-04-13 16:40:57.000000000 +0200
@@ -45,7 +45,8 @@
 .SH DESCRIPTION
 .I kinit
 obtains and caches an initial ticket-granting ticket for
-.IR principal .  The typical default behavior is to acquire only
+.IR principal .
+The typical default behavior is to acquire only
 Kerberos 5 tickets.  However, if kinit was built with both 
 Kerberos 4 support and with the default behavior of acquiring both
 types of tickets, it will try to acquire both Kerberos 5 and Kerberos 4


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/krb5/FC-3/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	13 Sep 2004 19:47:24 -0000	1.16
+++ .cvsignore	14 Apr 2006 12:26:54 -0000	1.17
@@ -1,3 +1,5 @@
 krb5-1.3.4.tar.gz
 krb5-1.3.5.tar.gz
 krb5-1.3.5.tar.gz.asc
+krb5-1.3.6.tar.gz
+krb5-1.3.6.tar.gz.asc


Index: krb5.spec
===================================================================
RCS file: /cvs/dist/rpms/krb5/FC-3/krb5.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- krb5.spec	1 Dec 2005 20:05:02 -0000	1.40
+++ krb5.spec	14 Apr 2006 12:26:54 -0000	1.41
@@ -7,7 +7,7 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.3.6
-Release: 8
+Release: 9
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/www/dist/krb5/1.3/krb5-1.3.5.tar
 Source0: krb5-%{version}.tar.gz
@@ -66,6 +66,8 @@
 Patch38: krb5-1.4-ncurses.patch
 Patch39: krb5-1.4.1-api.patch
 Patch40: krb5-1.4.1-telnet-environ.patch
+Patch45: krb5-kinit-man-typo.patch
+
 License: MIT, freely distributable.
 URL: http://web.mit.edu/kerberos/www/
 Group: System Environment/Libraries
@@ -130,6 +132,9 @@
 workstation.
 
 %changelog
+* Fri Apr 14 2006 Stepan Kasal <skasal at redhat.com>    - 1.3.6-9
+- Fix formatting typo in kinit.1 (krb5-kinit-man-typo.patch)
+
 * Thu Dec  1 2005 Nalin Dahyabhai <nalin at redhat.com> 1.3.6-8
 - make ksu setuid again (#137934, others)
 
@@ -836,6 +841,7 @@
 %patch38 -p1 -b .ncurses
 %patch39 -p1 -b .api
 %patch40 -p1 -b .telnet-environ
+%patch45 -p1
 cp src/krb524/README README.krb524
 find . -type f -name "*.info-dir" -exec rm -fv "{}" ";"
 gzip doc/*.ps



From fedora-cvs-commits at redhat.com  Fri Apr 14 12:52:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 08:52:20 -0400
Subject: rpms/net-tools/devel net-tools-1.60-sctp.patch, NONE,
	1.1 net-tools.spec, 1.65, 1.66
Message-ID: <200604141252.k3ECqKLA020697@cvs.devel.redhat.com>

Author: rvokal

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

Modified Files:
	net-tools.spec 
Added Files:
	net-tools-1.60-sctp.patch 
Log Message:
- display sctp connections using netstat -S <jbj at redhat.com>

net-tools-1.60-sctp.patch:
 netstat.c    |  412 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 statistics.c |   65 ++++++++-
 2 files changed, 464 insertions(+), 13 deletions(-)

--- NEW FILE net-tools-1.60-sctp.patch ---
--- net-tools-1.60/statistics.c.sctp	2006-04-13 10:06:45.000000000 -0400
+++ net-tools-1.60/statistics.c	2006-04-13 10:06:45.000000000 -0400
@@ -20,7 +20,7 @@
 #define UFWARN(x)
 #endif
 
-int print_static,f_raw,f_tcp,f_udp,f_unknown = 1;
+int print_static,f_raw,f_tcp,f_udp,f_sctp,f_unknown = 1;
 
 enum State {
     number = 0, opt_number, i_forward, i_inp_icmp, i_outp_icmp, i_rto_alg,
@@ -225,6 +225,27 @@
      { "TCPLoss", N_("%u TCP data loss events") },
 };
 
+struct entry Sctptab[] =
+{
+    {"SctpCurrEstab", N_("%u Current Associations"), number},
+    {"SctpActiveEstabs", N_("%u Active Associations"), number},
+    {"SctpPassiveEstabs", N_("%u Passive Associations"), number},
+    {"SctpAborteds", N_("%u Number of Aborteds "), number},
+    {"SctpShutdowns", N_("%u Number of Graceful Terminations"), number},
+    {"SctpOutOfBlues", N_("%u Number of Out of Blue packets"), number},
+    {"SctpChecksumErrors", N_("%u Number of Packets with invalid Checksum"), number},
+    {"SctpOutCtrlChunks", N_("%u Number of control chunks sent"), number},
+    {"SctpOutOrderChunks", N_("%u Number of ordered chunks sent"), number},
+    {"SctpOutUnorderChunks", N_("%u Number of Unordered chunks sent"), number},
+    {"SctpInCtrlChunks", N_("%u Number of control chunks received"), number},
+    {"SctpInOrderChunks", N_("%u Number of ordered chunks received"), number},
+    {"SctpInUnorderChunks", N_("%u Number of Unordered chunks received"), number},
+    {"SctpFragUsrMsgs", N_("%u Number of messages fragmented"), number},
+    {"SctpReasmUsrMsgs", N_("%u Number of messages reassembled "), number},
+    {"SctpOutSCTPPacks", N_("%u Number of SCTP packets sent"), number},
+    {"SctpInSCTPPacks", N_("%u Number of SCTP packets received"), number},
+};
+
 struct tabtab {
     char *title;
     struct entry *tab;
@@ -238,6 +259,7 @@
     {"Icmp", Icmptab, sizeof(Icmptab), &f_raw},
     {"Tcp", Tcptab, sizeof(Tcptab), &f_tcp},
     {"Udp", Udptab, sizeof(Udptab), &f_udp},
+    {"Sctp", Sctptab, sizeof(Sctptab), &f_sctp},
     {"TcpExt", Tcpexttab, sizeof(Tcpexttab), &f_tcp},
     {NULL}
 };
@@ -385,12 +407,39 @@
   return;
 }
 
+/* Process a file with name-value lines (like /proc/net/sctp/snmp) */
+void process_fd2(FILE *f, const char *filename)
+{
+    char buf1[1024];
+    char *sp;
+    struct tabtab *tab;
+    
+    tab = newtable(snmptabs, "Sctp");
+    
+    while (fgets(buf1, sizeof buf1, f)) {
+	sp = buf1 + strcspn(buf1, " \t\n");
+	if (!sp)
+	    goto formaterr;
+	*sp = '\0';
+    	sp++;
+
+	sp += strspn(sp, " \t\n"); 
 
-int parsesnmp(int flag_raw, int flag_tcp, int flag_udp)
+	if (*sp != '\0' && *(tab->flag)) 	
+	    printval(tab, buf1, strtoul(sp, 0, 10));
+    }
+  return;
+  
+formaterr:
+  fprintf(stderr,_("error parsing %s\n"), filename);
+  return;
+}
+
+int parsesnmp(int flag_raw, int flag_tcp, int flag_udp, int flag_sctp)
 {
     FILE *f;
 
-    f_raw = flag_raw; f_tcp = flag_tcp; f_udp = flag_udp;
+    f_raw = flag_raw; f_tcp = flag_tcp; f_udp = flag_udp; f_sctp = flag_sctp;
 
     f = fopen("/proc/net/snmp", "r");
     if (!f) {
@@ -418,6 +467,16 @@
     
         fclose(f);
     }
+
+    f = fopen("/proc/net/sctp/snmp", "r");
+    if (f) {
+	process_fd2(f,"/proc/net/sctp/snmp");
+	if (ferror(f))
+	    perror("/proc/net/sctp/snmp");
+
+	fclose(f);
+    }
+
     return(0);
 }
     
--- net-tools-1.60/netstat.c.sctp	2006-04-13 10:06:45.000000000 -0400
+++ net-tools-1.60/netstat.c	2006-04-13 10:10:23.000000000 -0400
@@ -58,6 +58,7 @@
  *
  *990420 {1.38} Tuan Hoang              removed a useless assignment from igmp_do_one()
  *20010404 {1.39} Arnaldo Carvalho de Melo - use setlocale
+ *20050516 {1.40} Ivan Skytte Joergensen:Added SCTP support
  *
  *              This program is free software; you can redistribute it
  *              and/or  modify it under  the terms of  the GNU General
@@ -108,7 +109,7 @@
 #endif
 
 /* prototypes for statistics.c */
-int parsesnmp(int, int, int);
+int parsesnmp(int, int, int, int);
 void inittab(void);
 
 typedef enum {
@@ -119,6 +120,29 @@
     SS_DISCONNECTING		/* in process of disconnecting  */
 } socket_state;
 
+
+#define SCTP_NSTATES  9         /* The number of states in array*/
+
+static const char *sctp_state[] = {
+    N_("EMPTY"),
+    N_("CLOSED"),
+    N_("COOKIE_WAIT"),
+    N_("COOKIE_ECHOED"),
+    N_("ESTABLISHED"),
+    N_("SHUTDOWN_PENDING"),
+    N_("SHUTDOWN_SENT"),
+    N_("SHUTDOWN_RECEIVED"),
+    N_("SHUTDOWN_ACK_SENT")
+};
+
+#define SCTP_NTYPES 3           /* The number of types in array */
+
+static const char *sctp_type[] = {
+    N_("udp"),
+    N_("udp-high-bw"),
+    N_("tcp")
+};
+
 #define SO_ACCEPTCON    (1<<16)	/* performed a listen           */
 #define SO_WAITDATA     (1<<17)	/* wait data to read            */
 #define SO_NOSPACE      (1<<18)	/* no space to write            */
@@ -150,6 +174,7 @@
 int flag_raw = 0;
 int flag_tcp = 0;
 int flag_udp = 0;
+int flag_sctp= 0;
 int flag_igmp= 0;
 int flag_rom = 0;
 int flag_exp = 1;
@@ -1189,6 +1214,365 @@
 	       udp_do_one);
 }
 
+static const char *sctp_socket_type_str(int type) {
+    if(type>=0 && type<SCTP_NTYPES)
+	return sctp_type[type];
+    else {
+	static char type_str_buf[64];
+	sprintf(type_str_buf,"UNKNOWN(%d)",type);
+	return type_str_buf;
+    }
+}
+
+static const char *sctp_state_str(int state)
+{
+    if(state>=0 && state<SCTP_NSTATES)
+	return sctp_state[state];
+    else {
+	static char state_str_buf[64];
+	sprintf(state_str_buf,"UNKNOWN(%d)",state);
+	return state_str_buf;
+    }
+}
+
+static const char *sctp_socket_state_str(int state)
+{
+    if(state>=0 && state<=10)
+        return tcp_state[state];
+    else {
+	static char state_str_buf[64];
+	sprintf(state_str_buf,"UNKNOWN(%d)",state);
+	return state_str_buf;
+    }
+}
+
+static struct aftype *process_sctp_addr_str(const char *addr_str, struct sockaddr *sa)
+{
+    if (strchr(addr_str,':')) {
+#if HAVE_AFINET6
+	extern struct aftype inet6_aftype;
+	/* Demangle what the kernel gives us */
+	struct in6_addr in6;
+	char addr6_str[INET6_ADDRSTRLEN];
+	unsigned u0,u1,u2,u3,u4,u5,u6,u7;
+	sscanf(addr_str, "%04X:%04X:%04X:%04X:%04X:%04X:%04X:%04X",
+	       &u0, &u1, &u2, &u3, &u4, &u5, &u6, &u7);
+	in6.s6_addr16[0] = htons(u0);
+	in6.s6_addr16[1] = htons(u1);
+	in6.s6_addr16[2] = htons(u2);
+	in6.s6_addr16[3] = htons(u3);
+	in6.s6_addr16[4] = htons(u4);
+	in6.s6_addr16[5] = htons(u5);
+	in6.s6_addr16[6] = htons(u6);
+	in6.s6_addr16[7] = htons(u7);
+
+	inet_ntop(AF_INET6, &in6, addr6_str, sizeof(addr6_str));
+	inet6_aftype.input(1, addr6_str, sa);
+	sa->sa_family = AF_INET6;
+#endif
+    } else {
+    	((struct sockaddr_in*)sa)->sin_addr.s_addr = inet_addr(addr_str);
+	sa->sa_family = AF_INET;
+    }
+    return get_afntype(sa->sa_family);
+}
+
+static void sctp_eps_do_one(int lnr, char *line)
+{
+    char buffer[1024];
+    int type, state, port;
+    int uid;
+    unsigned long inode;
+    
+    struct aftype *ap;
+#if HAVE_AFINET6
+    struct sockaddr_in6 localaddr;
+#else
+    struct sockaddr_in localaddr;
+#endif
+    const char *sty_str;
+    const char *sst_str;
+    const char *lport_str;
+    const char *uid_str;
+    const char *inode_str;
+    const char *pladdr_str;
+    char *laddrs_str;
+    
+    if(lnr == 0) {
+	/* ENDPT     SOCK   STY SST HBKT LPORT   uid inode pladdr LADDRS*/
+	return;
+    }
+    
+    strtok(line," \t\n"); /*skip ptr*/
+    strtok(0," \t\n");    /*skip ptr*/
+    sty_str = strtok(0," \t\n");
+    sst_str = strtok(0," \t\n");
+    strtok(0," \t\n"); /*skip hash bucket*/
+    lport_str=strtok(0," \t\n");
+    uid_str = strtok(0," \t\n");
+    inode_str = strtok(0," \t\n");
+    pladdr_str = strtok(0," \t\n");
+    laddrs_str=strtok(0,"\t\n");
+    
+    type = atoi(sty_str);
+    state = atoi(sst_str);
+    port = atoi(lport_str);
+    uid = atoi(uid_str);
+    inode = strtoul(inode_str,0,0);
+    
+    if(flag_sctp<=1) {
+	/* only print the primary address */
+	char local_addr[64];
+	char local_port[16];
+	
+	ap = process_sctp_addr_str(pladdr_str, (struct sockaddr*)&localaddr);
+	if(ap)
+	    safe_strncpy(local_addr,
+	                 ap->sprint((struct sockaddr *) &localaddr, flag_not),
+	                 sizeof(local_addr));
+	else
+	    sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family);
+	
+	snprintf(local_port, sizeof(local_port), "%s",
+	         get_sname(htons(port), "sctp",
+	                   flag_not & FLAG_NUM_PORT));
+	
+	printf("sctp                ");
+	sprintf(buffer,"%s:%s", local_addr, local_port);
+	printf("%-47s", buffer);
+    	printf(" %-12s", sctp_socket_state_str(state));
+    } else {
+    	/*print all addresses*/
+	const char *this_local_addr;
+	int first=1;
+	char local_port[16];
+	snprintf(local_port, sizeof(local_port), "%s",
+		 get_sname(htons(port), "sctp",
+			   flag_not & FLAG_NUM_PORT));
+	for(this_local_addr=strtok(laddrs_str," \t\n");
+	    this_local_addr;
+	    this_local_addr=strtok(0," \t\n"))
+	{
+	    char local_addr[64];
+	    ap = process_sctp_addr_str(this_local_addr, (struct sockaddr*)&localaddr);
+	    if(ap)
+		safe_strncpy(local_addr,
+		             ap->sprint((struct sockaddr *) &localaddr, flag_not),
+		             sizeof(local_addr));
+	    else
+		sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family);
+
+	    if(!first) printf("\n");
+	    if(first)
+	        printf("sctp                ");
+	    else
+	        printf("                    ");
+	    sprintf(buffer,"%s:%s", local_addr, local_port);
+	    printf("%-47s", buffer);
+	    printf(" %-12s", first?sctp_socket_state_str(state):"");
+	    first = 0;
+	}
+    }
+
+    finish_this_one(uid,inode,"");
+}
+
+static void sctp_assoc_do_one(int lnr, char *line)
+{
+    char buffer[1024];
+    int type, state, state2, lport,rport;
+    int uid;
+    unsigned rxqueue,txqueue;
+    unsigned long inode;
+    
+    struct aftype *ap;
+#if HAVE_AFINET6
+    struct sockaddr_in6 localaddr,remoteaddr;
+#else
+    struct sockaddr_in localaddr,remoteaddr;
+#endif
+    const char *sty_str;
+    const char *sst_str;
+    const char *st_str;
+    const char *txqueue_str;
+    const char *rxqueue_str;
+    const char *lport_str,*rport_str;
+    const char *uid_str;
+    const char *inode_str;
+    const char *pladdr_str;
+    char *laddrs_str;
+    const char *praddr_str;
+    char *raddrs_str;
+    
+    if(lnr == 0) {
+	/* ASSOC     SOCK   STY SST ST HBKT tx_queue rx_queue uid inode LPORT RPORT pladdr praddr LADDRS <-> RADDRS*/
+	return;
+    }
+    
+    strtok(line," \t\n"); /*skip ptr*/
+    strtok(0," \t\n");    /*skip ptr*/
+    sty_str = strtok(0," \t\n");
+    sst_str = strtok(0," \t\n");
+    st_str = strtok(0," \t\n");
+    strtok(0," \t\n"); /*skip hash bucket*/
+    txqueue_str =  strtok(0," \t\n");
+    rxqueue_str =  strtok(0," \t\n");
+    uid_str = strtok(0," \t\n");
+    inode_str = strtok(0," \t\n");
+    lport_str=strtok(0," \t\n");
+    rport_str=strtok(0," \t\n");
+    pladdr_str = strtok(0," \t\n");
+    praddr_str = strtok(0," \t\n");
+    laddrs_str=strtok(0,"<->\t\n");
+    raddrs_str=strtok(0,"<->\t\n");
+
+    type = atoi(sty_str);
+    state = atoi(sst_str);
+    state2 = atoi(st_str);
+    txqueue = atoi(txqueue_str);
+    rxqueue = atoi(rxqueue_str);
+    uid = atoi(uid_str);
+    inode = strtoul(inode_str,0,0);
+    lport = atoi(lport_str);
+    rport = atoi(rport_str);
+    
+    if(flag_sctp<=1) {
+	/* only print the primary addresses */
+	char local_addr[64];
+	char local_port[16];
+	char remote_addr[64];
+	char remote_port[16];
+	
+	ap = process_sctp_addr_str(pladdr_str, (struct sockaddr*)&localaddr);
+	if(ap)
+	    safe_strncpy(local_addr,
+	                 ap->sprint((struct sockaddr *) &localaddr, flag_not),
+	                 sizeof(local_addr));
+	else
+	    sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family);
+	
+	snprintf(local_port, sizeof(local_port), "%s",
+	         get_sname(htons(lport), "sctp",
+	                   flag_not & FLAG_NUM_PORT));
+	
+	ap = process_sctp_addr_str(praddr_str, (struct sockaddr*)&remoteaddr);
+	if(ap)
+	    safe_strncpy(remote_addr,
+	                 ap->sprint((struct sockaddr *) &remoteaddr, flag_not),
+	                 sizeof(remote_addr));
+	else
+	    sprintf(remote_addr,_("unsupported address family %d"), ((struct sockaddr*)&remoteaddr)->sa_family);
+	
+	snprintf(remote_port, sizeof(remote_port), "%s",
+		 get_sname(htons(rport), "sctp",
+			   flag_not & FLAG_NUM_PORT));
+
+	printf("sctp");
+	printf("  %6u %6u ", rxqueue, txqueue);
+	sprintf(buffer,"%s:%s", local_addr, local_port);
+	printf("%-23s", buffer);
+	printf(" ");
+	sprintf(buffer,"%s:%s", remote_addr, remote_port);
+	printf("%-23s", buffer);
+    	printf(" %-12s", sctp_socket_state_str(state));
+    } else {
+    	/*print all addresses*/
+	const char *this_local_addr;
+	const char *this_remote_addr;
+	char *ss1,*ss2;
+	int first=1;
+	char local_port[16];
+	char remote_port[16];
+	snprintf(local_port, sizeof(local_port), "%s",
+	         get_sname(htons(lport), "sctp",
+	                   flag_not & FLAG_NUM_PORT));
+	snprintf(remote_port, sizeof(remote_port), "%s",
+	         get_sname(htons(rport), "sctp",
+	                   flag_not & FLAG_NUM_PORT));
+
+	this_local_addr=strtok_r(laddrs_str," \t\n",&ss1);
+	this_remote_addr=strtok_r(raddrs_str," \t\n",&ss2);
+	while(this_local_addr || this_remote_addr) {
+	    char local_addr[64];
+	    char remote_addr[64];
+	    if(this_local_addr) {
+		ap = process_sctp_addr_str(this_local_addr, (struct sockaddr*)&localaddr);
+		if(ap)
+		    safe_strncpy(local_addr,
+		                 ap->sprint((struct sockaddr *) &localaddr, flag_not),
+		                 sizeof(local_addr));
+		else
+		    sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family);
+	    }
+	    if(this_remote_addr) {
+		ap = process_sctp_addr_str(this_remote_addr, (struct sockaddr*)&remoteaddr);
+		if(ap)
+		    safe_strncpy(remote_addr,
+		                 ap->sprint((struct sockaddr *) &remoteaddr, flag_not),
+		                 sizeof(remote_addr));
+		else
+		    sprintf(remote_addr,_("unsupported address family %d"), ((struct sockaddr*)&remoteaddr)->sa_family);
+	    }
+
+	    if(!first) printf("\n");
+	    if(first)
+		printf("sctp  %6u %6u ", rxqueue, txqueue);
+	    else
+		printf("                    ");
+	    if(this_local_addr) {
+		if(first)
+		    sprintf(buffer,"%s:%s", local_addr, local_port);
+		else
+		    sprintf(buffer,"%s", local_addr);
+		printf("%-23s", buffer);
+	    } else
+	    	printf("%-23s", "");
+	    printf(" ");
+	    if(this_remote_addr) {
+		if(first)
+		    sprintf(buffer,"%s:%s", remote_addr, remote_port);
+		else
+		    sprintf(buffer,"%s", remote_addr);
+		printf("%-23s", buffer);
+	    } else
+		printf("%-23s", "");
+
+	    printf(" %-12s", first?sctp_socket_state_str(state):"");
+
+	    first = 0;
+	    this_local_addr=strtok_r(0," \t\n",&ss1);
+	    this_remote_addr=strtok_r(0," \t\n",&ss2);
+	}
+    }
+
+    finish_this_one(uid,inode,"");
+}
+
+static int sctp_info_eps(void)
+{
+#if !defined(_PATH_PROCNET_SCTP_EPS)
+#define	_PATH_PROCNET_SCTP_EPS	"/proc/net/sctp/eps"
+#endif
+    INFO_GUTS(_PATH_PROCNET_SCTP_EPS, "AF INET (sctp)",
+              sctp_eps_do_one);
+}
+
+static int sctp_info_assocs(void)
+{
+#if !defined(_PATH_PROCNET_SCTP_ASSOCS)
+#define	_PATH_PROCNET_SCTP_ASSOCS	"/proc/net/sctp/assocs"
+#endif
+    INFO_GUTS(_PATH_PROCNET_SCTP_ASSOCS, "AF INET (sctp)",
+              sctp_assoc_do_one);
+}
+
+static int sctp_info(void)
+{
+    if(flag_all)
+    	sctp_info_eps();
+    return sctp_info_assocs();
+}
+
 static void raw_do_one(int lnr, const char *line)
 {
     char buffer[8192], local_addr[64], rem_addr[64];
@@ -1742,7 +2126,7 @@
     fprintf(stderr, _("        -Z, --context              display SELinux security context for sockets\n\n"));
 
     fprintf(stderr, _("  <Iface>: Name of interface to monitor/list.\n"));
-    fprintf(stderr, _("  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --netrom\n"));
+    fprintf(stderr, _("  <Socket>={-t|--tcp} {-u|--udp} {-S|--sctp} {-w|--raw} {-x|--unix} --ax25 --ipx --netrom\n"));
     fprintf(stderr, _("  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF);
     fprintf(stderr, _("  List of possible address families (which support routing):\n"));
     print_aflist(1); /* 1 = routeable */
@@ -1769,6 +2153,7 @@
 	{"protocol", 1, 0, 'A'},
 	{"tcp", 0, 0, 't'},
 	{"udp", 0, 0, 'u'},
+	{"sctp", 0, 0, 'S' },
 	{"raw", 0, 0, 'w'},
 	{"unix", 0, 0, 'x'},
 	{"listening", 0, 0, 'l'},
@@ -1801,7 +2186,7 @@
 
     afname[0] = '\0';
 
-    while ((i = getopt_long(argc, argv, "MCFA:acdegphiI::nNorstuVv?wxlZT", longopts, &lop)) != EOF)
+    while ((i = getopt_long(argc, argv, "MCFA:acdegphiI::nNorstuSVv?wxlZT", longopts, &lop)) != EOF)
 	switch (i) {
 	case -1:
 	    break;
@@ -1887,10 +2272,12 @@
 	case 't':
 	    flag_tcp++;
 	    break;
-
 	case 'u':
 	    flag_udp++;
 	    break;
+	case 'S':
+	    flag_sctp++;
+	    break;
 	case 'w':
 	    flag_raw++;
 	    break;
@@ -1932,13 +2319,13 @@
     if (flag_int + flag_rou + flag_mas + flag_sta > 1)
 	usage();
 
-    if ((flag_inet || flag_inet6 || flag_sta) && !(flag_tcp || flag_udp || flag_raw))
-	flag_tcp = flag_udp = flag_raw = 1;
+    if ((flag_inet || flag_inet6 || flag_sta) && !(flag_tcp || flag_udp || flag_sctp || flag_raw))
+	flag_tcp = flag_udp = flag_sctp = flag_raw = 1;
 
-    if ((flag_tcp || flag_udp || flag_raw || flag_igmp) && !(flag_inet || flag_inet6))
+    if ((flag_tcp || flag_udp || flag_sctp || flag_raw || flag_igmp) && !(flag_inet || flag_inet6))
         flag_inet = flag_inet6 = 1;
 
-    flag_arg = flag_tcp + flag_udp + flag_raw + flag_unx + flag_ipx
+    flag_arg = flag_tcp + flag_udp + flag_sctp + flag_raw + flag_unx + flag_ipx
 	+ flag_ax25 + flag_netrom + flag_igmp + flag_x25;
     
     if (flag_mas) {
@@ -1964,7 +2351,7 @@
     if (flag_sta) {
       for(;;) {
         inittab();
-	i = parsesnmp(flag_raw, flag_tcp, flag_udp);
+	i = parsesnmp(flag_raw, flag_tcp, flag_udp, flag_sctp);
 	
 	if(i || !flag_cnt)
 	  break;
@@ -2006,7 +2393,7 @@
 	return (i);
     }
     for (;;) {
-	if (!flag_arg || flag_tcp || flag_udp || flag_raw) {
+	if (!flag_arg || flag_tcp || flag_udp || flag_sctp || flag_raw) {
 #if HAVE_AFINET
 	    prg_cache_load();
 	    printf(_("Active Internet connections "));	/* xxx */
@@ -2044,6 +2431,11 @@
 	    if (i)
 		return (i);
 	}
+	if (!flag_arg || flag_sctp) {
+	    i = sctp_info();
+	    if (i)
+		return (i);
+	}
 	if (!flag_arg || flag_raw) {
 	    i = raw_info();
 	    if (i)


Index: net-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/net-tools/devel/net-tools.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- net-tools.spec	13 Apr 2006 07:27:49 -0000	1.65
+++ net-tools.spec	14 Apr 2006 12:52:16 -0000	1.66
@@ -3,7 +3,7 @@
 Summary: Basic networking tools.
 Name: net-tools
 Version: 1.60
-Release: 67
+Release: 68
 License: GPL
 Group: System Environment/Base
 Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2
@@ -63,6 +63,7 @@
 Patch49: net-tools-1.60-fgets.patch
 Patch50: net-tools-1.60-ifconfig_man.patch
 Patch51: net-tools-1.60-x25-proc.patch
+Patch52: net-tools-1.60-sctp.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 Requires(post,preun): chkconfig
@@ -122,6 +123,7 @@
 %patch49 -p1 -b .fgets
 %patch50 -p1 -b .inet_addr
 %patch51 -p1 -b .x25
+%patch52 -p1 -b .sctp
 
 cp %SOURCE2 ./config.h
 cp %SOURCE3 ./config.make
@@ -233,6 +235,9 @@
 %{_sysconfdir}/rc.d/init.d/netplugd
 
 %changelog
+* Fri Apr 14 2006 Radek Vok??l <rvokal at redhat.com> - 1.60-68
+- display sctp connections using netstat -S <jbj at redhat.com>
+
 * Thu Apr 13 2006 Radek Vok??l <rvokal at redhat.com> - 1.60-67
 - fix wrong definition of _PATH_PROCNET_X25_ROUTE (#188786)
 



From fedora-cvs-commits at redhat.com  Fri Apr 14 13:41:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 09:41:40 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.181,
	1.182 policycoreutils.spec, 1.258, 1.259
Message-ID: <200604141341.k3EDfeGu013586@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13523

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> 1.30.5-2
- Add /etc/samba/secrets.tdb to restorecond.conf


policycoreutils-rhat.patch:
 audit2allow/audit2allow      |  471 ++-------------------------------------
 audit2allow/audit2allow.1    |    5 
 audit2allow/avc.py           |  518 +++++++++++++++++++++++++++++++++++++++++++
 restorecond/restorecond.conf |    2 
 semanage/semanage            |   18 +
 semanage/seobject.py         |   30 +-
 setsebool/setsebool.8        |    2 
 7 files changed, 593 insertions(+), 453 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- policycoreutils-rhat.patch	14 Apr 2006 11:51:02 -0000	1.181
+++ policycoreutils-rhat.patch	14 Apr 2006 13:41:33 -0000	1.182
@@ -1077,8 +1077,10 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.30.5/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2006-03-29 11:08:21.000000000 -0500
-+++ policycoreutils-1.30.5/restorecond/restorecond.conf	2006-04-14 07:44:00.000000000 -0400
-@@ -2,3 +2,4 @@
++++ policycoreutils-1.30.5/restorecond/restorecond.conf	2006-04-14 09:40:32.000000000 -0400
+@@ -1,4 +1,6 @@
+ /etc/resolv.conf
++/etc/samba/secrets.tdb
  /etc/mtab
  /var/run/utmp
  ~/public_html


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- policycoreutils.spec	14 Apr 2006 11:51:02 -0000	1.258
+++ policycoreutils.spec	14 Apr 2006 13:41:33 -0000	1.259
@@ -5,7 +5,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.5
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -108,6 +108,9 @@
 /sbin/service restorecond condrestart
 
 %changelog
+* Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> 1.30.5-2
+- Add /etc/samba/secrets.tdb to restorecond.conf
+
 * Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> 1.30.5-1
 - Update from upstream
 	* Added a test to setfiles to check that the spec file is



From fedora-cvs-commits at redhat.com  Fri Apr 14 14:38:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 10:38:35 -0400
Subject: rpms/firefox/devel firefox.spec, 1.113,
	1.114 firefox-1.5.0.1-dumpstack.patch, 1.3, NONE
Message-ID: <200604141438.k3EEcZdZ023814@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	firefox.spec 
Removed Files:
	firefox-1.5.0.1-dumpstack.patch 
Log Message:
dumpstack.patch merged upstream already


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- firefox.spec	14 Apr 2006 06:46:41 -0000	1.113
+++ firefox.spec	14 Apr 2006 14:38:32 -0000	1.114
@@ -37,7 +37,6 @@
 Patch3:         firefox-1.1-nss-system-nspr.patch
 Patch4:         firefox-1.5-with-system-nss.patch
 Patch5:         firefox-1.1-visibility.patch
-Patch6:         firefox-1.5.0.1-dumpstack.patch
 
 # customization patches
 Patch20:        firefox-redhat-homepage.patch
@@ -109,7 +108,6 @@
 %ifnarch i386
 %patch5  -p0
 %endif
-%patch6 -p0
 
 %patch20 -p0
 %patch21 -p1


--- firefox-1.5.0.1-dumpstack.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 14 14:49:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 10:49:19 -0400
Subject: rpms/firefox/devel firefox.spec, 1.114,
	1.115 firefox-1.5-pango-typo.patch, 1.1, NONE
Message-ID: <200604141449.k3EEnJDr008605@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	firefox.spec 
Removed Files:
	firefox-1.5-pango-typo.patch 
Log Message:
pango typo patch has been merged


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- firefox.spec	14 Apr 2006 14:38:32 -0000	1.114
+++ firefox.spec	14 Apr 2006 14:49:16 -0000	1.115
@@ -55,7 +55,6 @@
 Patch81:        firefox-nopangoxft.patch
 
 # patches from upstream (Patch100+)
-Patch100:       firefox-1.5-pango-typo.patch
 Patch101:       firefox-1.5-pango-ua.patch
 Patch102:       firefox-1.5-pango-about.patch
 
@@ -120,7 +119,6 @@
 %patch42 -p0
 %patch81 -p1
 
-%patch100 -p0 -b .pango-typo
 %patch101 -p0 -b .pango-ua
 %patch102 -p0 -b .pango-about
 


--- firefox-1.5-pango-typo.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 14 15:14:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 11:14:51 -0400
Subject: rpms/libsemanage/devel .cvsignore, 1.57, 1.58 libsemanage.spec, 1.86,
	1.87 sources, 1.59, 1.60
Message-ID: <200604141514.k3EFEpFm001394@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsemanage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1359

Modified Files:
	.cvsignore libsemanage.spec sources 
Log Message:
* Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.6-1
- Upgrade to latest from NSA
	* Merged updated file context sorting patch from Christopher
	  Ashworth, with bug fix for escaped character flag.
	* Merged file context sorting code from Christopher Ashworth 
	  (Tresys Technology), based on fc_sort.c code in refpolicy.
	* Merged python binding t_output_helper removal patch from Dan Walsh.
	* Regenerated swig files.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	14 Apr 2006 11:37:56 -0000	1.57
+++ .cvsignore	14 Apr 2006 15:14:48 -0000	1.58
@@ -63,3 +63,4 @@
 libsemanage-1.6.2.tgz
 libsemanage-1.6.3.tgz
 libsemanage-1.6.5.tgz
+libsemanage-1.6.6.tgz


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- libsemanage.spec	14 Apr 2006 11:37:57 -0000	1.86
+++ libsemanage.spec	14 Apr 2006 15:14:48 -0000	1.87
@@ -2,7 +2,7 @@
 %define libselinuxver 1.30.3-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 1.6.5
+Version: 1.6.6
 Release: 1
 License: GPL
 Group: System Environment/Libraries
@@ -72,8 +72,10 @@
 %{_mandir}/man3/*
 
 %changelog
-* Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.5-1
+* Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.6-1
 - Upgrade to latest from NSA
+	* Merged updated file context sorting patch from Christopher
+	  Ashworth, with bug fix for escaped character flag.
 	* Merged file context sorting code from Christopher Ashworth 
 	  (Tresys Technology), based on fc_sort.c code in refpolicy.
 	* Merged python binding t_output_helper removal patch from Dan Walsh.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	14 Apr 2006 11:37:57 -0000	1.59
+++ sources	14 Apr 2006 15:14:48 -0000	1.60
@@ -1 +1 @@
-e82f27ce38a2e02efecd00ca434545c5  libsemanage-1.6.5.tgz
+99ab30368829dafdd98a56cd8d612962  libsemanage-1.6.6.tgz



From fedora-cvs-commits at redhat.com  Fri Apr 14 15:43:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 11:43:17 -0400
Subject: rpms/openoffice.org/devel sources,1.164,1.165
Message-ID: <200604141543.k3EFhHkw022634@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	sources 
Log Message:
yet another opensymbol font


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- sources	13 Apr 2006 15:42:42 -0000	1.164
+++ sources	14 Apr 2006 15:43:13 -0000	1.165
@@ -9,4 +9,4 @@
 67ba19cf8ac46671799ff63a48901e8b  openoffice.org-simple-crash_report.sh
 8d8c4222654f718436c234582c8fd529  GSI_ga.sdf
 bfa60acd8b0c30a1a6d14165da45c1dd  openoffice.org-myspell-contrib.tar.gz
-32ea837fcd5ce94a809d51b74aa51266  opens___.ttf
+afe937f8dd4c3aa10e9bda068059cdfd  opens___.ttf



From fedora-cvs-commits at redhat.com  Fri Apr 14 16:17:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 12:17:06 -0400
Subject: rpms/pilot-link/FC-5 pilot-link-0.11.8-realpath.path, NONE,
	1.1 pilot-link.spec, 1.40, 1.41
Message-ID: <200604141617.k3EGH614027131@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/pilot-link/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27070

Modified Files:
	pilot-link.spec 
Added Files:
	pilot-link-0.11.8-realpath.path 
Log Message:
fix pilot-xfer crash on missing device node #186779




--- NEW FILE pilot-link-0.11.8-realpath.path ---
--- pilot-link-0.11.8/libpisock/connect.c.orig	2006-04-14 17:58:37.000000000 +0200
+++ pilot-link-0.11.8/libpisock/connect.c	2006-04-14 18:01:37.000000000 +0200
@@ -24,6 +24,12 @@
 #include <errno.h>
 #include <unistd.h>
 #include <sys/stat.h>
+#include <limits.h>
+
+/* PATH_MAX is not defined in limits.h on some platforms */
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
 
 #include "pi-socket.h"
 #include "pi-dlp.h"
@@ -106,7 +112,7 @@
 
 
 		if (portname) {
-			char realport[50];
+			char realport[PATH_MAX];
 			realpath(portname, realport);
 			errno = save_errno;
 


Index: pilot-link.spec
===================================================================
RCS file: /cvs/dist/rpms/pilot-link/FC-5/pilot-link.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- pilot-link.spec	29 Mar 2006 20:26:36 -0000	1.40
+++ pilot-link.spec	14 Apr 2006 16:17:03 -0000	1.41
@@ -4,7 +4,7 @@
 Summary: File transfer utilities between Linux and PalmPilots.
 Name: pilot-link
 Version: 0.11.8
-Release: 12.2.fc5
+Release: 12.3.fc5
 Source: pilot-link-%{version}.tar.bz2
 Url: http://www.pilot-link.org/
 Patch1: pilot-link-0.11.0-perlmd5.patch
@@ -15,6 +15,7 @@
 Patch7: pilot-link-0.11.8-readfile.patch
 Patch8: pilot-link-0.11.8-underquoted.patch
 Patch9: pilot-link-0.11.8-misc1.patch
+Patch10: pilot-link-0.11.8-realpath.path
 Epoch: 2
 License: GPL
 Group: Applications/Communications
@@ -69,9 +70,10 @@
 %patch7 -p1 -b .read
 %patch8 -p1 -b .underquoted
 %patch9 -p1 -b .misc1
+%patch10 -p1 -b .realpath
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %configure \
+CFLAGS="%{optflags}" %configure \
   --with-python=no \
   --with-itcl=no \
   --with-tk=no \
@@ -87,13 +89,13 @@
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %if %{support_perl}
 if test -f bindings/Perl/Makefile.PL ; then
    cd bindings/Perl
    perl -pi -e 's|^\$libdir =.*|\$libdir = "%{buildroot}%{_libdir}";|g' Makefile.PL
-   CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor
+   CFLAGS="%{optflags}" perl Makefile.PL PREFIX=%{buildroot}%{_prefix} INSTALLDIRS=vendor
    make
    cd ../..
 fi
@@ -109,7 +111,7 @@
 %endif
 
 # remove files we don't want to include
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*.la
 
 # remove broken prog
 rm -f %{buildroot}%{_bindir}/pilot-prc
@@ -119,7 +121,7 @@
 %postun -p /sbin/ldconfig
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -141,6 +143,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Fri Apr 14 2006 Than Ngo <than at redhat.com> 2:0.11.8-12.3.fc5
+- fix pilot-xfer crash on missing device node #186779
+
 * Wed Mar 29 2006 Than Ngo <than at redhat.com> 2:0.11.8-12.2.fc5 
 - rebuild to get rid of libpisock.so.9
 



From fedora-cvs-commits at redhat.com  Fri Apr 14 17:03:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 13:03:36 -0400
Subject: rpms/pilot-link/FC-5 pilot-link.spec,1.41,1.42
Message-ID: <200604141703.k3EH3aiP021924@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/pilot-link/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21895

Modified Files:
	pilot-link.spec 
Log Message:
- don't include unnecessary man page #185147



Index: pilot-link.spec
===================================================================
RCS file: /cvs/dist/rpms/pilot-link/FC-5/pilot-link.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- pilot-link.spec	14 Apr 2006 16:17:03 -0000	1.41
+++ pilot-link.spec	14 Apr 2006 17:03:32 -0000	1.42
@@ -108,6 +108,8 @@
   make install -C bindings/Perl
   rm -f %{buildroot}%{_libdir}/perl5/vendor_perl/%{perl_version}/*/auto/PDA/Pilot/Pilot.bs \
         %{buildroot}%{_libdir}/perl5/site_perl/*/*/*/PDA/Pilot/.packlist
+%else
+  rm -f %{buildroot}%{_mandir}/man1/ietf2datebook*
 %endif
 
 # remove files we don't want to include
@@ -145,6 +147,7 @@
 %changelog
 * Fri Apr 14 2006 Than Ngo <than at redhat.com> 2:0.11.8-12.3.fc5
 - fix pilot-xfer crash on missing device node #186779
+- don't include unnecessary man page #185147
 
 * Wed Mar 29 2006 Than Ngo <than at redhat.com> 2:0.11.8-12.2.fc5 
 - rebuild to get rid of libpisock.so.9



From fedora-cvs-commits at redhat.com  Fri Apr 14 18:11:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 14:11:55 -0400
Subject: rpms/kernel/devel/configs config-xen-generic,1.13,1.14
Message-ID: <200604141811.k3EIBtlB018469@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	config-xen-generic 
Log Message:
rebase xen & all its friends


Index: config-xen-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-generic,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- config-xen-generic	13 Mar 2006 21:05:33 -0000	1.13
+++ config-xen-generic	14 Apr 2006 18:11:52 -0000	1.14
@@ -24,7 +24,7 @@
 # X86 Processor Configuration
 #
 CONFIG_X86_XEN=y
-# CONFIG_X86_PC is not set
+# CONFIG_X86_GENERICARCH is not set
 CONFIG_MMU=y
 CONFIG_UID16=y
 CONFIG_GENERIC_ISA_DMA=y
@@ -114,3 +114,5 @@
 #
 # CONFIG_KEXEC is not set
 # CONFIG_CRASH is not set
+CONFIG_XEN_SYSFS=y
+# CONFIG_OPROFILE is not set



From fedora-cvs-commits at redhat.com  Fri Apr 14 18:12:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 14:12:04 -0400
Subject: rpms/kernel/devel/scripts rebase-xen.sh,1.2,1.3
Message-ID: <200604141812.k3EIBw2O018482@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	rebase-xen.sh 
Log Message:
rebase xen & all its friends


Index: rebase-xen.sh
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/scripts/rebase-xen.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rebase-xen.sh	6 Mar 2006 16:32:55 -0000	1.2
+++ rebase-xen.sh	14 Apr 2006 18:11:53 -0000	1.3
@@ -2,11 +2,11 @@
 
 set -x
 
-if [ ! -d linux-2.6.*-xen0 -o ! -d ref-linux-2.6.* ] ; then
+if [ ! -d linux-2.6.*-xen -o ! -d ref-linux-2.6.* ] ; then
     make prep-kernels || exit 1
 fi
 
-pushd *xen0 || exit 1
+pushd linux-2.6.*-xen || exit 1
 make distclean || exit 1
 popd
 
@@ -19,9 +19,9 @@
 # our own Makefile changes; exclude these the easy way by making the files
 # the same in both arms of the diff!
 #
-\cp -f *xen0/Makefile ref-linux-2.6.*/Makefile
+\cp -f *-xen/Makefile ref-linux-2.6.*/Makefile
 
-diff -Nru -p --exclude='.*' ref-linux-2.6.* *xen0 > linux-2.6-xen.patch
+diff -Nru -p --exclude='.*' ref-linux-2.6.* linux-2.6*-xen > linux-2.6-xen.patch
 if [ $? -gt 1 ] ; then
     exit $?
 fi



From fedora-cvs-commits at redhat.com  Fri Apr 14 18:11:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 14:11:55 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2131,
	1.2132 linux-2.6-debug-oops-pause.patch, 1.10,
	1.11 linux-2.6-devmem-xen.patch, 1.1,
	1.2 linux-2.6-execshield-xen.patch, 1.4,
	1.5 linux-2.6-xen-compile-fixes.patch, 1.4,
	1.5 linux-2.6-xen.patch, 1.6, 1.7 sources, 1.346,
	1.347 linux-2.6-crash-xen.patch, 1.2,
	NONE linux-2.6-percpu-NR_CPUS-hotplug-fix.patch, 1.2,
	NONE linux-2.6-vdso-xen.patch, 1.1,
	NONE linux-2.6-xen-i386-mach-io-check-nmi.patch, 1.2,
	NONE linux-2.6-xen-net-csum.patch, 1.2,
	NONE linux-2.6-xen-pmd-shared.patch, 1.2,
	NONE linux-2.6-xen-smp-alts.patch, 1.2, NONE
Message-ID: <200604141811.k3EIBt0v018460@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-2.6.spec linux-2.6-debug-oops-pause.patch 
	linux-2.6-devmem-xen.patch linux-2.6-execshield-xen.patch 
	linux-2.6-xen-compile-fixes.patch linux-2.6-xen.patch sources 
Removed Files:
	linux-2.6-crash-xen.patch 
	linux-2.6-percpu-NR_CPUS-hotplug-fix.patch 
	linux-2.6-vdso-xen.patch 
	linux-2.6-xen-i386-mach-io-check-nmi.patch 
	linux-2.6-xen-net-csum.patch linux-2.6-xen-pmd-shared.patch 
	linux-2.6-xen-smp-alts.patch 
Log Message:
rebase xen & all its friends


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2131
retrieving revision 1.2132
diff -u -r1.2131 -r1.2132
--- kernel-2.6.spec	12 Apr 2006 23:10:38 -0000	1.2131
+++ kernel-2.6.spec	14 Apr 2006 18:11:38 -0000	1.2132
@@ -7,7 +7,7 @@
 %define buildsmp 0
 %define buildpae 0
 # Whether to apply the Xen patches, leave this enabled.
-%define includexen 0
+%define includexen 1
 # Whether to build the Xen kernels, disable if you want.
 %define buildxen 1
 %define buildxenPAE 0
@@ -180,7 +180,7 @@
 
 
 Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
-Source1: xen-20060320.tar.bz2
+Source1: xen-20060413.tar.bz2
 Source2: Config.mk
 
 Source10: COPYING.modules
@@ -242,12 +242,6 @@
 # 500 - 599   s390(x)
 # 600 - 699   sparc(64)
 
-# 690 - 699 xen patches already split in their system
-Patch690: linux-2.6-xen-i386-mach-io-check-nmi.patch
-Patch691: linux-2.6-xen-net-csum.patch
-Patch692: linux-2.6-xen-pmd-shared.patch
-Patch693: linux-2.6-xen-smp-alts.patch
-
 # 700 - 799 Xen
 Patch700: linux-2.6-xen.patch
 Patch701: linux-2.6-xen-compile-fixes.patch
@@ -255,7 +249,6 @@
 Patch703: linux-2.6-xen-move-vdso-fixmap.patch
 Patch704: linux-2.6-xen-vsyscall_base.patch
 Patch706: linux-2.6-xen_remap_vma_flags.patch
-Patch709: linux-2.6-percpu-NR_CPUS-hotplug-fix.patch
 
 #
 # Patches 800 through 899 are reserved for bugfixes to the core system
@@ -268,7 +261,6 @@
 Patch810: linux-2.6-execshield.patch
 Patch811: linux-2.6-execshield-xen.patch
 Patch812: linux-2.6-xen-vdso-note.patch
-Patch813: linux-2.6-vdso-xen.patch
 
 # Module signing infrastructure.
 Patch900: linux-2.6-modsign-core.patch
@@ -312,7 +304,6 @@
 
 # Provide read only /dev/crash driver.
 Patch1060: linux-2.6-crash-driver.patch
-Patch1061: linux-2.6-crash-xen.patch
 
 Patch1070: linux-2.6-sleepon.patch
 
@@ -781,13 +772,6 @@
 # Xen
 #
 %if %{includexen}
-# Base Xen patch from linux-2.6-merge.hg
-%patch690 -p1
-# Conflict with non-xen kernels
-#%patch691 -p1
-%patch692 -p1
-%patch693 -p1
-
 #
 # Apply the main xen patch...
 #
@@ -819,7 +803,6 @@
 %patch702 -p1
 %patch704 -p1
 %patch706 -p1
-%patch709 -p1
 
 %endif
 
@@ -843,7 +826,6 @@
 %if %{includexen}
 %patch811 -p1
 %patch812 -p1
-#%patch813 -p1
 %endif
 
 
@@ -896,17 +878,13 @@
 #
 %patch1050 -p1
 %if %{includexen}
-#TODO! --sct @@@
-#%patch1051 -p1
+%patch1051 -p1
 %endif
 
 #
 # /dev/crash driver for the crashdump analysis tool
 #
 %patch1060 -p1
-%if %{includexen}
-%patch1061 -p1
-%endif
 
 #
 # Most^WAll users of sleep_on are broken; fix a bunch
@@ -1670,6 +1648,13 @@
 %endif
 
 %changelog
+* Fri Apr 14 2006 Juan Quintela <quintela at redhat.com>
+- Enable xen again.
+- Update xen hypervisor to cset 9638.
+- Update xen patch to linux-2.6.tip-xen.hg cset 26602.
+- Remove/rediff lots of patches.
+- x86_64 xen don't work, fixing that.
+
 * Wed Apr 12 2006 David Woodhouse <dwmw2 at redhat.com>
 - Add include/{mtd,rdma,keys} directories to kernel-devel package
 

linux-2.6-debug-oops-pause.patch:
 traps.c |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-oops-pause.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-oops-pause.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-debug-oops-pause.patch	9 Feb 2006 21:45:32 -0000	1.10
+++ linux-2.6-debug-oops-pause.patch	14 Apr 2006 18:11:39 -0000	1.11
@@ -6,9 +6,9 @@
 
 (Wow, I'm really getting desperate for better debug data).
 
-diff -urpN --exclude-from=/home/devel/davej/.exclude linux-2.6.15.noarch/arch/i386/kernel/traps.c oops-pause/arch/i386/kernel/traps.c
---- linux-2.6.15.noarch/arch/i386/kernel/traps.c	2006-02-03 23:31:55.000000000 -0500
-+++ oops-pause/arch/i386/kernel/traps.c	2006-02-03 23:35:44.000000000 -0500
+diff -uNp linux-2.6.16.noarch/arch/i386/kernel/traps.c.orig linux-2.6.16.noarch/arch/i386/kernel/traps.c
+--- linux-2.6.16.noarch/arch/i386/kernel/traps.c.orig	2006-03-24 14:10:02.000000000 +0100
++++ linux-2.6.16.noarch/arch/i386/kernel/traps.c	2006-03-24 14:14:01.000000000 +0100
 @@ -28,6 +28,7 @@
  #include <linux/utsname.h>
  #include <linux/kprobes.h>
@@ -17,7 +17,7 @@
  
  #ifdef CONFIG_EISA
  #include <linux/ioport.h>
-@@ -151,6 +152,18 @@ static inline unsigned long print_contex
+@@ -168,6 +169,18 @@ static inline unsigned long print_contex
  	return ebp;
  }
  
@@ -36,15 +36,15 @@
  static void show_trace_log_lvl(struct task_struct *task,
  			       unsigned long *stack, char *log_lvl)
  {
-@@ -190,6 +190,7 @@ static void show_trace_log_lvl(struct ta
+@@ -193,6 +206,7 @@ static void show_trace_log_lvl(struct ta
+ 		if (!stack)
  			break;
- 		printk(log_lvl);
- 		printk(" =======================\n");
+ 		printk("%s =======================\n", log_lvl);
 +		//pause_for_two_minutes();
  	}
  }
  
-@@ -287,7 +300,8 @@ void show_registers(struct pt_regs *regs
+@@ -302,7 +316,8 @@ void show_registers(struct pt_regs *regs
  		}
  	}
  	printk("\n");

linux-2.6-devmem-xen.patch:
 arch/i386/mm/init-xen.c                |   13 +++++++++++++
 arch/x86_64/mm/init-xen.c              |   26 ++++++++++++++++++++++++++
 include/asm-i386/mach-xen/asm/page.h   |    1 +
 include/asm-x86_64/mach-xen/asm/page.h |    4 ++++
 4 files changed, 44 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-devmem-xen.patch	15 Oct 2005 01:07:29 -0000	1.1
+++ linux-2.6-devmem-xen.patch	14 Apr 2006 18:11:39 -0000	1.2
@@ -1,31 +1,105 @@
---- linux-2.6.8/include/asm-xen/asm-i386/page.h.devmem	2004-10-15 15:24:02.000000000 -0400
-+++ linux-2.6.8/include/asm-xen/asm-i386/page.h	2004-10-15 15:24:31.000000000 -0400
-@@ -207,6 +207,8 @@ static __inline__ int get_order(unsigned
- #define virt_to_machine(_a)	(phys_to_machine(__pa(_a)))
- #define machine_to_virt(_m)	(__va(machine_to_phys(_m)))
+diff -uNp linux-2.6.16.noarch/arch/i386/mm/init-xen.c.orig linux-2.6.16.noarch/arch/i386/mm/init-xen.c
+--- linux-2.6.16.noarch/arch/i386/mm/init-xen.c.orig	2006-04-13 19:37:24.000000000 +0200
++++ linux-2.6.16.noarch/arch/i386/mm/init-xen.c	2006-04-13 19:39:38.000000000 +0200
+@@ -280,6 +280,17 @@ int page_is_ram(unsigned long pagenr)
  
-+#define devmem_is_allowed(x) 1
+ #endif
+ 
++int devmem_is_allowed(unsigned long pagenr)
++{
++   if (pagenr <= 256)
++       return 1;
++   if (!page_is_ram(pagenr))
++       return 1;
++   return 0;
++}
 +
- #endif /* __KERNEL__ */
++EXPORT_SYMBOL_GPL(page_is_ram);
++
+ #ifdef CONFIG_HIGHMEM
+ pte_t *kmap_pte;
+ pgprot_t kmap_prot;
+@@ -734,6 +745,7 @@ void __init mem_init(void)
+  * Specifically, in the case of x86, we will always add
+  * memory to the highmem for now.
+  */
++#ifdef CONFIG_HOTPLUG_MEMORY
+ #ifndef CONFIG_NEED_MULTIPLE_NODES
+ int add_memory(u64 start, u64 size)
+ {
+@@ -750,6 +762,7 @@ int remove_memory(u64 start, u64 size)
+ 	return -EINVAL;
+ }
+ #endif
++#endif
+ 
+ kmem_cache_t *pgd_cache;
+ kmem_cache_t *pmd_cache;
+diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.orig/arch/x86_64/mm/init-xen.c linux-2.6.16.noarch/arch/x86_64/mm/init-xen.c
+--- linux-2.6.16.orig/arch/x86_64/mm/init-xen.c	2006-04-13 14:19:58.000000000 +0200
++++ linux-2.6.16.noarch/arch/x86_64/mm/init-xen.c	2006-04-13 16:16:23.000000000 +0200
+@@ -847,6 +847,10 @@ void __init clear_kernel_mapping(unsigne
+ 	__flush_tlb_all();
+ } 
+ 
++static inline int page_is_ram (unsigned long pagenr)
++{
++	return 1;
++}
+ /*
+  * Memory hotplug specific functions
+  * These are only for non-NUMA machines right now.
+@@ -891,6 +895,28 @@ EXPORT_SYMBOL_GPL(remove_memory);
  
- #endif /* _I386_PAGE_H */
---- linux-2.6.11/include/asm-xen/asm-i386/io.h.rc4	2005-05-16 16:30:29.000000000 -0400
-+++ linux-2.6.11/include/asm-xen/asm-i386/io.h	2005-05-16 16:31:41.000000000 -0400
-@@ -50,6 +50,17 @@
- #include <linux/vmalloc.h>
- #include <asm/fixmap.h>
+ #endif
  
 +/*
-+ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
-+ * access
++ * devmem_is_allowed() checks to see if /dev/mem access to a certain address is
++ * valid. The argument is a physical page number.
++ *
++ *
++ * On x86-64, access has to be given to the first megabyte of ram because that area
++ * contains bios code and data regions used by X and dosemu and similar apps.
++ * Access has to be given to non-kernel-ram areas as well, these contain the PCI
++ * mmio resources as well as potential bios/acpi data regions.
 + */
-+#define xlate_dev_mem_ptr(p)    __va(p)
++int devmem_is_allowed(unsigned long pagenr)
++{
++	if (pagenr <= 256)
++		return 1;
++	if (!page_is_ram(pagenr))
++		return 1;
++	return 0;
++}
 +
-+/*
-+ * Convert a virtual cached pointer to an uncached pointer
-+ */
-+#define xlate_dev_kmem_ptr(p)   p
 +
- /**
-  *	virt_to_phys	-	map virtual addresses to physical
-  *	@address: address to remap
++EXPORT_SYMBOL_GPL(devmem_is_allowed);
++
+ static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules,
+ 			 kcore_vsyscall;
+ 
+diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.orig/include/asm-i386/mach-xen/asm/page.h linux-2.6.16.noarch/include/asm-i386/mach-xen/asm/page.h
+--- linux-2.6.16.orig/include/asm-i386/mach-xen/asm/page.h	2006-04-13 14:19:59.000000000 +0200
++++ linux-2.6.16.noarch/include/asm-i386/mach-xen/asm/page.h	2006-04-13 16:19:23.000000000 +0200
+@@ -276,6 +276,7 @@ extern unsigned int __VMALLOC_RESERVE;
+ 
+ extern int sysctl_legacy_va_layout;
+ 
++extern int devmem_is_allowed(unsigned long pagenr);
+ extern int page_is_ram(unsigned long pagenr);
+ 
+ #endif /* __ASSEMBLY__ */
+diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.orig/include/asm-x86_64/mach-xen/asm/page.h linux-2.6.16.noarch/include/asm-x86_64/mach-xen/asm/page.h
+--- linux-2.6.16.orig/include/asm-x86_64/mach-xen/asm/page.h	2006-04-13 14:19:58.000000000 +0200
++++ linux-2.6.16.noarch/include/asm-x86_64/mach-xen/asm/page.h	2006-04-13 16:20:50.000000000 +0200
+@@ -309,6 +309,10 @@ static inline pgd_t __pgd(unsigned long 
+ 
+ #define __HAVE_ARCH_GATE_AREA 1	
+ 
++#ifndef __ASSEMBLY__
++extern int devmem_is_allowed(unsigned long pagenr);
++#endif
++
+ #endif /* __KERNEL__ */
+ 
+ #include <asm-generic/memory_model.h>

linux-2.6-execshield-xen.patch:
 arch/i386/kernel/entry-xen.S                                |    8 -
 arch/i386/kernel/process-xen.c                              |   58 +++++++
 arch/i386/kernel/smp-xen.c                                  |    2 
 arch/i386/kernel/traps-xen.c                                |   92 +++++++++++-
 arch/i386/mm/init-xen.c                                     |   11 +
 linux-2.6.15.i686/include/asm-x86_64/mach-xen/asm/pgtable.h |    2 
 linux-2.6.16.i686/arch/i386/kernel/sysenter.c               |    2 
 linux-2.6.16.noarch/arch/x86_64/kernel/setup64-xen.c        |   23 ---
 8 files changed, 168 insertions(+), 30 deletions(-)

Index: linux-2.6-execshield-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield-xen.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-execshield-xen.patch	21 Mar 2006 16:57:38 -0000	1.4
+++ linux-2.6-execshield-xen.patch	14 Apr 2006 18:11:39 -0000	1.5
@@ -267,10 +267,10 @@
  
  	pagetable_init();
  
-diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/x86_64/kernel/setup64-xen.c linux-2.6.15.noarch/arch/x86_64/kernel/setup64-xen.c
---- linux-2.6.15.orig/arch/x86_64/kernel/setup64-xen.c	2006-02-10 20:25:28.000000000 +0100
-+++ linux-2.6.15.noarch/arch/x86_64/kernel/setup64-xen.c	2006-02-10 21:27:22.000000000 +0100
-@@ -51,7 +51,7 @@ Control non executable mappings for 64bi
+diff -uNp linux-2.6.16.noarch/arch/x86_64/kernel/setup64-xen.c.orig linux-2.6.16.noarch/arch/x86_64/kernel/setup64-xen.c
+--- linux-2.6.16.noarch/arch/x86_64/kernel/setup64-xen.c.orig	2006-04-13 14:02:32.000000000 +0200
++++ linux-2.6.16.noarch/arch/x86_64/kernel/setup64-xen.c	2006-04-13 14:05:07.000000000 +0200
+@@ -55,7 +55,7 @@ Control non executable mappings for 64bi
  on	Enable(default)
  off	Disable
  */ 
@@ -279,15 +279,13 @@
  {
  	if (!strncmp(str, "on", 2)) {
                  __supported_pte_mask |= _PAGE_NX; 
-@@ -60,28 +60,7 @@ int __init nonx_setup(char *str)
- 		do_not_nx = 1;
- 		__supported_pte_mask &= ~_PAGE_NX;
+@@ -66,27 +66,6 @@ int __init nonx_setup(char *str)
          }
--	return 0;
--} 
+ 	return 1;
+ } 
 -__setup("noexec=", nonx_setup);	/* parsed early actually */
 -
--int force_personality32 = READ_IMPLIES_EXEC;
+-int force_personality32 = 0; 
 -
 -/* noexec32=on|off
 -Control non executable heap for 32bit processes.
@@ -302,12 +300,13 @@
 -		force_personality32 &= ~READ_IMPLIES_EXEC;
 -	else if (!strcmp(str, "off"))
 -		force_personality32 |= READ_IMPLIES_EXEC;
--	return 0;
- }
+-	return 1;
+-}
 -__setup("noexec32=", nonx32_setup);
- 
+-
  /*
   * Great future plan:
+  * Declare PDA itself and support (irqstack,tss,pgd) as per cpu data.
 diff -uNp linux-2.6.15.i686/include/asm-x86_64/mach-xen/asm/pgtable.h.orig linux-2.6.15.i686/include/asm-x86_64/mach-xen/asm/pgtable.h
 --- linux-2.6.15.i686/include/asm-x86_64/mach-xen/asm/pgtable.h.orig	2006-02-23 16:50:14.000000000 +0100
 +++ linux-2.6.15.i686/include/asm-x86_64/mach-xen/asm/pgtable.h	2006-02-23 16:59:04.000000000 +0100

linux-2.6-xen-compile-fixes.patch:
 arch/i386/kernel/acpi/boot-xen.c                             |    3 +
 linux-2.6.15.ia64/fs/Kconfig                                 |    1 
 linux-2.6.15.xen/arch/i386/kernel/Makefile                   |    3 -
 linux-2.6.15.xen/arch/i386/kernel/smp-xen.c                  |    1 
 linux-2.6.15.xen/arch/i386/mm/init-xen.c                     |    1 
 linux-2.6.15.xen/arch/x86_64/kernel/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/arch/x86_64/ia32/ia32entry-xen.S         |   17 +++++------
 linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_tcp.c    |    5 ---
 linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_udp.c    |    5 ---
 19 files changed, 57 insertions(+), 30 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-xen-compile-fixes.patch	23 Mar 2006 23:51:08 -0000	1.4
+++ linux-2.6-xen-compile-fixes.patch	14 Apr 2006 18:11:39 -0000	1.5
@@ -231,242 +231,89 @@
  	return 0;
  }
  
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/arch/i386/mm/init-xen.c linux-2.6.16.noarch/arch/i386/mm/init-xen.c
---- linux-2.6.16.orig/arch/i386/mm/init-xen.c	2006-03-23 16:45:01.000000000 +0100
-+++ linux-2.6.16.noarch/arch/i386/mm/init-xen.c	2006-03-23 19:03:36.000000000 +0100
-@@ -317,7 +317,7 @@ static void __init permanent_kmaps_init(
- 
- static void __meminit free_new_highpage(struct page *page, int pfn)
- {
--	set_page_count(page, 1);
-+	init_page_count(page);
- 	if (pfn < xen_start_info->nr_pages)
- 		__free_page(page);
- 	totalhigh_pages++;
-@@ -676,7 +676,7 @@ void __init mem_init(void)
- 	/* XEN: init and count low-mem pages outside initial allocation. */
- 	for (pfn = xen_start_info->nr_pages; pfn < max_low_pfn; pfn++) {
- 		ClearPageReserved(&mem_map[pfn]);
--		set_page_count(&mem_map[pfn], 1);
-+		init_page_count(&mem_map[pfn]);
- 		totalram_pages++;
- 	}
- 
-@@ -814,7 +814,7 @@ void free_initmem(void)
- 	addr = (unsigned long)(&__init_begin);
- 	for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
- 		ClearPageReserved(virt_to_page(addr));
--		set_page_count(virt_to_page(addr), 1);
-+		init_page_count(virt_to_page(addr));
- 		memset((void *)addr, 0xcc, PAGE_SIZE);
- 		free_page(addr);
- 		totalram_pages++;
-@@ -853,7 +853,7 @@ void free_initrd_mem(unsigned long start
- 		printk (KERN_INFO "Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
- 	for (; start < end; start += PAGE_SIZE) {
- 		ClearPageReserved(virt_to_page(start));
--		set_page_count(virt_to_page(start), 1);
-+		init_page_count(virt_to_page(start));
- 		free_page(start);
- 		totalram_pages++;
- 	}
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/arch/i386/mm/pgtable-xen.c linux-2.6.16.noarch/arch/i386/mm/pgtable-xen.c
---- linux-2.6.16.orig/arch/i386/mm/pgtable-xen.c	2006-03-23 16:44:59.000000000 +0100
-+++ linux-2.6.16.noarch/arch/i386/mm/pgtable-xen.c	2006-03-23 19:04:29.000000000 +0100
-@@ -236,7 +236,7 @@ struct page *pte_alloc_one(struct mm_str
- 	pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, 0);
- 	if (pte) {
- 		SetPageForeign(pte, pte_free);
--		set_page_count(pte, 1);
-+		init_page_count(pte);
- 	}
- #endif
- 	return pte;
-@@ -251,7 +251,7 @@ void pte_free(struct page *pte)
- 			va, pfn_pte(page_to_pfn(pte), PAGE_KERNEL), 0));
- 
- 	ClearPageForeign(pte);
--	set_page_count(pte, 1);
-+	init_page_count(pte);
- 
- 	__free_page(pte);
- }
-diff -urNp --exclude-from=/home/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-03-23 16:44:53.000000000 +0100
-+++ linux-2.6.16.noarch/arch/x86_64/mm/init-xen.c	2006-03-23 19:02:17.000000000 +0100
-@@ -812,7 +812,7 @@ void __init clear_kernel_mapping(unsigne
- void online_page(struct page *page)
- {
- 	ClearPageReserved(page);
--	set_page_count(page, 1);
-+	init_page_count(page);
- 	__free_page(page);
- 	totalram_pages++;
- 	num_physpages++;
-@@ -930,7 +930,7 @@ void free_initmem(void)
- 	addr = (unsigned long)(&__init_begin);
- 	for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
- 		ClearPageReserved(virt_to_page(addr));
--		set_page_count(virt_to_page(addr), 1);
-+		init_page_count(virt_to_page(addr));
- 		memset((void *)(addr & ~(PAGE_SIZE-1)), 0xcc, PAGE_SIZE); 
- 		make_page_writable(
- 			__va(__pa(addr)), XENFEAT_writable_page_tables);
-@@ -978,7 +978,7 @@ void free_initrd_mem(unsigned long start
- 	printk ("Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
- 	for (; start < end; start += PAGE_SIZE) {
- 		ClearPageReserved(virt_to_page(start));
--		set_page_count(virt_to_page(start), 1);
-+		init_page_count(virt_to_page(start));
- 		free_page(start);
- 		totalram_pages++;
- 	}
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/drivers/xen/balloon/balloon.c linux-2.6.16.noarch/drivers/xen/balloon/balloon.c
---- linux-2.6.16.orig/drivers/xen/balloon/balloon.c	2006-03-23 16:44:53.000000000 +0100
-+++ linux-2.6.16.noarch/drivers/xen/balloon/balloon.c	2006-03-23 19:00:45.000000000 +0100
-@@ -231,7 +231,7 @@ static int increase_reservation(unsigned
- 
- 		/* Relinquish the page back to the allocator. */
- 		ClearPageReserved(page);
--		set_page_count(page, 1);
-+		init_page_count(page);
- 		__free_page(page);
- 	}
- 
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/drivers/xen/netback/netback.c linux-2.6.16.noarch/drivers/xen/netback/netback.c
---- linux-2.6.16.orig/drivers/xen/netback/netback.c	2006-03-23 16:44:53.000000000 +0100
-+++ linux-2.6.16.noarch/drivers/xen/netback/netback.c	2006-03-23 19:00:32.000000000 +0100
-@@ -665,7 +665,7 @@ static void netif_page_release(struct pa
- 	u16 pending_idx = page - virt_to_page(mmap_vstart);
- 
- 	/* Ready for next use. */
--	set_page_count(page, 1);
-+	init_page_count(page);
- 
- 	netif_idx_release(pending_idx);
- }
-@@ -785,7 +785,7 @@ static int __init netback_init(void)
- 
- 	for (i = 0; i < MAX_PENDING_REQS; i++) {
- 		page = virt_to_page(MMAP_VADDR(i));
--		set_page_count(page, 1);
-+		init_page_count(page);
- 		SetPageForeign(page, netif_page_release);
- 	}
- 
-diff -uNp linux-2.6.16.noarch/arch/x86_64/mm/pageattr-xen.c.orig linux-2.6.16.noarch/arch/x86_64/mm/pageattr-xen.c
---- linux-2.6.16.noarch/arch/x86_64/mm/pageattr-xen.c.orig	2006-03-23 22:18:23.000000000 +0100
-+++ linux-2.6.16.noarch/arch/x86_64/mm/pageattr-xen.c	2006-03-24 00:15:24.000000000 +0100
-@@ -199,6 +199,13 @@ static struct page *split_large_page(uns
- 	pte_t *pbase;
- 	if (!base) 
- 		return NULL;
-+	/*
-+	 * page_private is used to track the number of entries in
-+	 * the page table page have non standard attributes.
-+	 */
-+	SetPagePrivate(base);
-+	page_private(base) = 0;
-+
- 	address = __pa(address);
- 	addr = address & LARGE_PAGE_MASK; 
- 	pbase = (pte_t *)page_address(base);
-@@ -231,26 +238,12 @@ static inline void flush_map(unsigned lo
- 	on_each_cpu(flush_kernel_map, (void *)address, 1, 1);
- }
- 
--struct deferred_page { 
--	struct deferred_page *next; 
--	struct page *fpage;
--	unsigned long address;
--}; 
--static struct deferred_page *df_list; /* protected by init_mm.mmap_sem */
-+static struct page *deferred_pages; /* protected by init_mm.mmap_sem */
- 
--static inline void save_page(unsigned long address, struct page *fpage)
-+static inline void save_page(struct page *fpage)
- {
--	struct deferred_page *df;
--	df = kmalloc(sizeof(struct deferred_page), GFP_KERNEL); 
--	if (!df) {
--		flush_map(address);
--		__free_page(fpage);
--	} else { 
--		df->next = df_list;
--		df->fpage = fpage;
--		df->address = address;
--		df_list = df;
--	} 			
-+	fpage->lru.next = (struct list_head *)deferred_pages;
-+	deferred_pages = fpage;
- }
- 
- /* 
-@@ -292,8 +285,8 @@ __change_page_attr(unsigned long address
- 			set_pte(kpte, pfn_pte(pfn, prot));
- 		} else {
-  			/*
-- 			 * split_large_page will take the reference for this change_page_attr
-- 			 * on the split page.
-+			 * split_large_page will take the reference for this
-+			 * change_page_attr on the split page.
-  			 */
- 
- 			struct page *split;
-@@ -305,10 +298,11 @@ __change_page_attr(unsigned long address
- 			set_pte(kpte,mk_pte(split, ref_prot2));
- 			kpte_page = split;
- 		}	
--		get_page(kpte_page);
-+		page_private(kpte_page)++;
- 	} else if ((kpte_flags & _PAGE_PSE) == 0) { 
- 		set_pte(kpte, pfn_pte(pfn, ref_prot));
--		__put_page(kpte_page);
-+		BUG_ON(page_private(kpte_page) == 0);
-+		page_private(kpte_page)--;
- 	} else
- 		BUG();
- 
-@@ -324,13 +318,9 @@ __change_page_attr(unsigned long address
- #else
- 	if (!PageReserved(kpte_page))
- #endif
--		switch (page_count(kpte_page)) {
--		case 1:
--			save_page(address, kpte_page); 		     
-+		if (page_private(kpte_page) == 0) {
-+			save_page(kpte_page);
- 			revert_page(address, ref_prot);
--			break;
--		case 0:
--			BUG(); /* memleak and failed 2M page regeneration */
- 	 	}
- 	return 0;
- } 
-@@ -383,17 +373,18 @@ int change_page_attr(struct page *page, 
- 
- void global_flush_tlb(void)
- { 
--	struct deferred_page *df, *next_df;
-+	struct page *dpage;
- 
- 	down_read(&init_mm.mmap_sem);
--	df = xchg(&df_list, NULL);
-+	dpage = xchg(&deferred_pages, NULL);
- 	up_read(&init_mm.mmap_sem);
--	flush_map((df && !df->next) ? df->address : 0);
--	for (; df; df = next_df) { 
--		next_df = df->next;
--		if (df->fpage) 
--			__free_page(df->fpage);
--		kfree(df);
+diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.works/arch/x86_64/ia32/ia32entry-xen.S linux-2.6.16.noarch/arch/x86_64/ia32/ia32entry-xen.S
+--- linux-2.6.16.works/arch/x86_64/ia32/ia32entry-xen.S	2006-04-13 14:19:58.000000000 +0200
++++ linux-2.6.16.noarch/arch/x86_64/ia32/ia32entry-xen.S	2006-04-13 20:12:17.000000000 +0200
+@@ -17,6 +17,8 @@
+ 
+ #define __XEN_X86_64 1
+ 	
++#define IA32_NR_syscalls ((ia32_syscall_end - ia32_sys_call_table)/8)
 +
-+	flush_map((dpage && !dpage->lru.next) ? (unsigned long)page_address(dpage) : 0);
-+	while (dpage) {
-+		struct page *tmp = dpage;
-+		dpage = (struct page *)dpage->lru.next;
-+		ClearPagePrivate(tmp);
-+		__free_page(tmp);
- 	} 
- } 
- 
+ 	.macro IA32_ARG_FIXUP noebp=0
+ 	movl	%edi,%r8d
+ 	.if \noebp
+@@ -127,8 +129,8 @@ ENTRY(ia32_sysenter_target)
+ 	CFI_REMEMBER_STATE
+ 	jnz  sysenter_tracesys
+ sysenter_do_call:	
+-	cmpl	$(IA32_NR_syscalls),%eax
+-	jae	ia32_badsys
++	cmpl	$(IA32_NR_syscalls-1),%eax
++	ja	ia32_badsys
+ 	IA32_ARG_FIXUP 1
+ 	call	*ia32_sys_call_table(,%rax,8)
+ 	movq	%rax,RAX-ARGOFFSET(%rsp)
+@@ -231,8 +233,8 @@ ENTRY(ia32_cstar_target)
+ 	CFI_REMEMBER_STATE
+ 	jnz   cstar_tracesys
+ cstar_do_call:	
+-	cmpl $IA32_NR_syscalls,%eax
+-	jae  ia32_badsys
++	cmpl $IA32_NR_syscalls-1,%eax
++	ja  ia32_badsys
+ 	IA32_ARG_FIXUP 1
+ 	call *ia32_sys_call_table(,%rax,8)
+ 	movq %rax,RAX-ARGOFFSET(%rsp)
+@@ -323,8 +325,8 @@ ENTRY(ia32_syscall)
+ 	testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP),threadinfo_flags(%r10)
+ 	jnz ia32_tracesys
+ ia32_do_syscall:	
+-	cmpl $(IA32_NR_syscalls),%eax
+-	jae  ia32_badsys
++	cmpl $(IA32_NR_syscalls-1),%eax
++	ja  ia32_badsys
+ 	IA32_ARG_FIXUP
+ 	call *ia32_sys_call_table(,%rax,8) # xxx: rip relative
+ ia32_sysret:
+@@ -718,6 +720,3 @@ ia32_sys_call_table:
+ 	.quad compat_sys_set_robust_list
+ 	.quad compat_sys_get_robust_list
+ ia32_syscall_end:		
+-	.rept IA32_NR_syscalls-(ia32_syscall_end-ia32_sys_call_table)/8
+-		.quad ni_syscall
+-	.endr
+diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.i686/net/ipv4/netfilter/ip_nat_proto_tcp.c linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_tcp.c
+--- linux-2.6.16.i686/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-04-13 23:58:07.000000000 +0200
++++ linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-04-14 19:39:59.000000000 +0200
+@@ -129,12 +129,9 @@ tcp_manip_pkt(struct sk_buff **pskb,
+ 	if (hdrsize < sizeof(*hdr))
+ 		return 1;
+ 
+-#ifdef CONFIG_XEN
+ 	if ((*pskb)->proto_csum_blank) {
+ 		hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
+-	} else 
+-#endif
+-	{
++	} else {
+ 		hdr->check = ip_nat_cheat_check(~oldip, newip,
+ 					ip_nat_cheat_check(oldport ^ 0xFFFF,
+ 							   newport,
+diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.i686/net/ipv4/netfilter/ip_nat_proto_udp.c linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_udp.c
+--- linux-2.6.16.i686/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-04-13 23:58:39.000000000 +0200
++++ linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-04-14 19:39:59.000000000 +0200
+@@ -114,12 +114,9 @@ udp_manip_pkt(struct sk_buff **pskb,
+ 		portptr = &hdr->dest;
+ 	}
+ 	if (hdr->check) { /* 0 is a special case meaning no checksum */
+-#ifdef CONFIG_XEN
+ 		if ((*pskb)->proto_csum_blank) {
+ 			hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
+-		} else 
+-#endif
+-		{
++		} else {
+ 			hdr->check = ip_nat_cheat_check(~oldip, newip,
+ 					ip_nat_cheat_check(*portptr ^ 0xFFFF,
+ 							   newport,

linux-2.6-xen.patch:
 linux-2.6.16.noarch/arch/x86_64/Makefile                 |   20 
 linux-2.6.16.noarch/arch/x86_64/ia32/Makefile            |   20 
 tip2/arch/i386/Kconfig                                   |  100 
 tip2/arch/i386/Kconfig.cpu                               |    2 
 tip2/arch/i386/Makefile                                  |   24 
 tip2/arch/i386/boot-xen/Makefile                         |   21 
 tip2/arch/i386/kernel/Makefile                           |   31 
 tip2/arch/i386/kernel/acpi/Makefile                      |    4 
 tip2/arch/i386/kernel/acpi/boot-xen.c                    | 1161 ++++++
 tip2/arch/i386/kernel/apic-xen.c                         |  141 
 tip2/arch/i386/kernel/asm-offsets.c                      |    5 
 tip2/arch/i386/kernel/cpu/Makefile                       |    5 
 tip2/arch/i386/kernel/cpu/common-xen.c                   |  732 ++++
 tip2/arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 tip2/arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 tip2/arch/i386/kernel/early_printk-xen.c                 |    2 
 tip2/arch/i386/kernel/entry-xen.S                        |  880 ++++
 tip2/arch/i386/kernel/entry.S                            |    4 
 tip2/arch/i386/kernel/fixup.c                            |   95 
 tip2/arch/i386/kernel/head-xen.S                         |  171 
 tip2/arch/i386/kernel/init_task-xen.c                    |   51 
 tip2/arch/i386/kernel/io_apic-xen.c                      | 2744 +++++++++++++++
 tip2/arch/i386/kernel/ioport-xen.c                       |  122 
 tip2/arch/i386/kernel/irq-xen.c                          |  306 +
 tip2/arch/i386/kernel/irq.c                              |    4 
 tip2/arch/i386/kernel/ldt-xen.c                          |  269 +
 tip2/arch/i386/kernel/microcode-xen.c                    |  148 
 tip2/arch/i386/kernel/mpparse-xen.c                      | 1189 ++++++
 tip2/arch/i386/kernel/pci-dma-xen.c                      |  344 +
 tip2/arch/i386/kernel/process-xen.c                      |  824 ++++
 tip2/arch/i386/kernel/quirks-xen.c                       |   48 
 tip2/arch/i386/kernel/setup-xen.c                        | 1826 +++++++++
 tip2/arch/i386/kernel/smp-xen.c                          |  613 +++
 tip2/arch/i386/kernel/swiotlb.c                          |  674 +++
 tip2/arch/i386/kernel/sysenter.c                         |   90 
 tip2/arch/i386/kernel/time-xen.c                         | 1097 +++++
 tip2/arch/i386/kernel/traps-xen.c                        | 1123 ++++++
 tip2/arch/i386/kernel/traps.c                            |    9 
 tip2/arch/i386/kernel/vm86.c                             |    8 
 tip2/arch/i386/kernel/vsyscall-note-xen.S                |   32 
 tip2/arch/i386/kernel/vsyscall.S                         |    2 
 tip2/arch/i386/mach-xen/Makefile                         |    5 
 tip2/arch/i386/mach-xen/setup.c                          |   49 
 tip2/arch/i386/mm/Makefile                               |    8 
 tip2/arch/i386/mm/fault-xen.c                            |  683 +++
 tip2/arch/i386/mm/highmem-xen.c                          |  123 
 tip2/arch/i386/mm/hypervisor.c                           |  424 ++
 tip2/arch/i386/mm/init-xen.c                             |  853 ++++
 tip2/arch/i386/mm/ioremap-xen.c                          |  486 ++
 tip2/arch/i386/mm/pageattr.c                             |    2 
 tip2/arch/i386/mm/pgtable-xen.c                          |  652 +++
 tip2/arch/i386/mm/pgtable.c                              |   12 
 tip2/arch/i386/oprofile/Makefile                         |    4 
 tip2/arch/i386/oprofile/xenoprof.c                       |  395 ++
 tip2/arch/i386/pci/Makefile                              |    9 
 tip2/arch/i386/pci/irq-xen.c                             | 1202 ++++++
 tip2/arch/i386/pci/pcifront.c                            |   55 
 tip2/arch/i386/power/Makefile                            |    4 
 tip2/arch/ia64/Kconfig                                   |   46 
 tip2/arch/ia64/Makefile                                  |   16 
 tip2/arch/ia64/hp/sim/Makefile                           |    2 
 tip2/arch/ia64/kernel/entry.S                            |   32 
 tip2/arch/ia64/kernel/head.S                             |    6 
 tip2/arch/ia64/kernel/pal.S                              |    5 
 tip2/arch/ia64/kernel/sal.c                              |    3 
 tip2/arch/ia64/kernel/setup.c                            |   32 
 tip2/arch/ia64/xen/Makefile                              |    5 
 tip2/arch/ia64/xen/drivers/Makefile                      |   20 
 tip2/arch/ia64/xen/drivers/README                        |    2 
 tip2/arch/ia64/xen/drivers/coreMakefile                  |   26 
 tip2/arch/ia64/xen/drivers/evtchn_ia64.c                 |  273 +
 tip2/arch/ia64/xen/drivers/patches/blkback.c.patch       |   33 
 tip2/arch/ia64/xen/drivers/patches/console.c.patch       |   11 
 tip2/arch/ia64/xen/drivers/patches/devmem.c.patch        |    2 
 tip2/arch/ia64/xen/drivers/patches/gnttab.c.patch        |   33 
 tip2/arch/ia64/xen/drivers/patches/privcmd.c.patch       |   30 
 tip2/arch/ia64/xen/drivers/xenia64_init.c                |   55 
 tip2/arch/ia64/xen/hypercall.S                           |  365 +
 tip2/arch/ia64/xen/xen_ksyms.c                           |   12 
 tip2/arch/ia64/xen/xenconsole.c                          |   19 
 tip2/arch/ia64/xen/xenentry.S                            |  850 ++++
 tip2/arch/ia64/xen/xenhpski.c                            |   19 
 tip2/arch/ia64/xen/xenivt.S                              | 2032 +++++++++++
 tip2/arch/ia64/xen/xenminstate.h                         |  367 ++
 tip2/arch/ia64/xen/xenpal.S                              |   73 
 tip2/arch/ia64/xen/xensetup.S                            |   35 
 tip2/arch/um/kernel/physmem.c                            |    4 
 tip2/arch/x86_64/Kconfig                                 |   62 
 tip2/arch/x86_64/ia32/ia32entry-xen.S                    |  723 +++
 tip2/arch/x86_64/ia32/syscall32-xen.c                    |  128 
 tip2/arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 tip2/arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 tip2/arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 tip2/arch/x86_64/kernel/Makefile                         |   18 
 tip2/arch/x86_64/kernel/acpi/Makefile                    |    1 
 tip2/arch/x86_64/kernel/apic-xen.c                       |  198 +
 tip2/arch/x86_64/kernel/asm-offsets.c                    |    2 
 tip2/arch/x86_64/kernel/e820-xen.c                       |  744 ++++
 tip2/arch/x86_64/kernel/early_printk-xen.c               |  304 +
 tip2/arch/x86_64/kernel/entry-xen.S                      | 1149 ++++++
 tip2/arch/x86_64/kernel/entry.S                          |    2 
 tip2/arch/x86_64/kernel/genapic-xen.c                    |  144 
 tip2/arch/x86_64/kernel/genapic_xen.c                    |  162 
 tip2/arch/x86_64/kernel/head-xen.S                       |  163 
 tip2/arch/x86_64/kernel/head64-xen.c                     |  140 
 tip2/arch/x86_64/kernel/init_task.c                      |    3 
 tip2/arch/x86_64/kernel/io_apic-xen.c                    | 2231 ++++++++++++
 tip2/arch/x86_64/kernel/ioport-xen.c                     |   58 
 tip2/arch/x86_64/kernel/irq-xen.c                        |  163 
 tip2/arch/x86_64/kernel/irq.c                            |    4 
 tip2/arch/x86_64/kernel/ldt-xen.c                        |  282 +
 tip2/arch/x86_64/kernel/mpparse-xen.c                    | 1002 +++++
 tip2/arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 tip2/arch/x86_64/kernel/process-xen.c                    |  796 ++++
 tip2/arch/x86_64/kernel/setup-xen.c                      | 1677 +++++++++
 tip2/arch/x86_64/kernel/setup64-xen.c                    |  360 +
 tip2/arch/x86_64/kernel/smp-xen.c                        |  596 +++
 tip2/arch/x86_64/kernel/smp.c                            |    4 
 tip2/arch/x86_64/kernel/traps-xen.c                      | 1020 +++++
 tip2/arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 tip2/arch/x86_64/kernel/x8664_ksyms-xen.c                |  158 
 tip2/arch/x86_64/kernel/xen_entry.S                      |   40 
 tip2/arch/x86_64/mm/Makefile                             |   10 
 tip2/arch/x86_64/mm/fault-xen.c                          |  644 +++
 tip2/arch/x86_64/mm/init-xen.c                           | 1145 ++++++
 tip2/arch/x86_64/mm/pageattr-xen.c                       |  390 ++
 tip2/arch/x86_64/oprofile/Makefile                       |    5 
 tip2/arch/x86_64/pci/Makefile                            |   12 
 tip2/drivers/Makefile                                    |    1 
 tip2/drivers/acpi/Kconfig                                |    3 
 tip2/drivers/base/bus.c                                  |    5 
 tip2/drivers/char/mem.c                                  |    6 
 tip2/drivers/char/tpm/Kconfig                            |   14 
 tip2/drivers/char/tpm/Makefile                           |    1 
 tip2/drivers/char/tpm/tpm.c                              |   44 
 tip2/drivers/char/tpm/tpm.h                              |    7 
 tip2/drivers/char/tpm/tpm_atmel.c                        |  230 -
 tip2/drivers/char/tpm/tpm_nsc.c                          |  395 --
 tip2/drivers/char/tpm/tpm_xen.c                          |  536 ++
 tip2/drivers/char/tty_io.c                               |    7 
 tip2/drivers/firmware/Kconfig                            |    2 
 tip2/drivers/pci/Kconfig                                 |    1 
 tip2/drivers/serial/Kconfig                              |    1 
 tip2/drivers/video/Kconfig                               |    2 
 tip2/drivers/xen/Kconfig                                 |  212 +
 tip2/drivers/xen/Makefile                                |   22 
 tip2/drivers/xen/balloon/Makefile                        |    2 
 tip2/drivers/xen/balloon/balloon.c                       |  592 +++
 tip2/drivers/xen/blkback/Makefile                        |    3 
 tip2/drivers/xen/blkback/blkback.c                       |  597 +++
 tip2/drivers/xen/blkback/common.h                        |  145 
 tip2/drivers/xen/blkback/interface.c                     |  184 +
 tip2/drivers/xen/blkback/vbd.c                           |  126 
 tip2/drivers/xen/blkback/xenbus.c                        |  421 ++
 tip2/drivers/xen/blkfront/Kconfig                        |    6 
 tip2/drivers/xen/blkfront/Makefile                       |    5 
 tip2/drivers/xen/blkfront/blkfront.c                     |  819 ++++
 tip2/drivers/xen/blkfront/block.h                        |  165 
 tip2/drivers/xen/blkfront/vbd.c                          |  327 +
 tip2/drivers/xen/blktap/Makefile                         |    3 
 tip2/drivers/xen/blktap/blktap.c                         |  910 ++++
 tip2/drivers/xen/blktap/common.h                         |  110 
 tip2/drivers/xen/blktap/interface.c                      |  146 
 tip2/drivers/xen/blktap/xenbus.c                         |  233 +
 tip2/drivers/xen/char/Makefile                           |    2 
 tip2/drivers/xen/char/mem.c                              |  192 +
 tip2/drivers/xen/console/Makefile                        |    2 
 tip2/drivers/xen/console/console.c                       |  648 +++
 tip2/drivers/xen/console/xencons_ring.c                  |  151 
 tip2/drivers/xen/core/Makefile                           |   11 
 tip2/drivers/xen/core/evtchn.c                           |  863 ++++
 tip2/drivers/xen/core/features.c                         |   29 
 tip2/drivers/xen/core/gnttab.c                           |  464 ++
 tip2/drivers/xen/core/hypervisor_sysfs.c                 |   57 
 tip2/drivers/xen/core/reboot.c                           |  377 ++
 tip2/drivers/xen/core/skbuff.c                           |  144 
 tip2/drivers/xen/core/smpboot.c                          |  576 +++
 tip2/drivers/xen/core/xen_proc.c                         |   29 
 tip2/drivers/xen/core/xen_sysfs.c                        |  311 +
 tip2/drivers/xen/evtchn/Makefile                         |    2 
 tip2/drivers/xen/evtchn/evtchn.c                         |  464 ++
 tip2/drivers/xen/net_driver_util.c                       |   68 
 tip2/drivers/xen/netback/Makefile                        |    5 
 tip2/drivers/xen/netback/common.h                        |  133 
 tip2/drivers/xen/netback/interface.c                     |  334 +
 tip2/drivers/xen/netback/loopback.c                      |  254 +
 tip2/drivers/xen/netback/netback.c                       |  865 ++++
 tip2/drivers/xen/netback/xenbus.c                        |  366 ++
 tip2/drivers/xen/netfront/Kconfig                        |    6 
 tip2/drivers/xen/netfront/Makefile                       |    4 
 tip2/drivers/xen/netfront/netfront.c                     | 1524 ++++++++
 tip2/drivers/xen/pciback/Makefile                        |   10 
 tip2/drivers/xen/pciback/conf_space.c                    |  345 +
 tip2/drivers/xen/pciback/conf_space.h                    |   97 
 tip2/drivers/xen/pciback/conf_space_header.c             |  267 +
 tip2/drivers/xen/pciback/passthrough.c                   |  157 
 tip2/drivers/xen/pciback/pci_stub.c                      |  695 +++
 tip2/drivers/xen/pciback/pciback.h                       |   78 
 tip2/drivers/xen/pciback/pciback_ops.c                   |   74 
 tip2/drivers/xen/pciback/vpci.c                          |  204 +
 tip2/drivers/xen/pciback/xenbus.c                        |  441 ++
 tip2/drivers/xen/pcifront/Makefile                       |    7 
 tip2/drivers/xen/pcifront/pci.c                          |   46 
 tip2/drivers/xen/pcifront/pci_op.c                       |  272 +
 tip2/drivers/xen/pcifront/pcifront.h                     |   40 
 tip2/drivers/xen/pcifront/xenbus.c                       |  294 +
 tip2/drivers/xen/privcmd/Makefile                        |    2 
 tip2/drivers/xen/privcmd/privcmd.c                       |  303 +
 tip2/drivers/xen/tpmback/Makefile                        |    4 
 tip2/drivers/xen/tpmback/common.h                        |   91 
 tip2/drivers/xen/tpmback/interface.c                     |  194 +
 tip2/drivers/xen/tpmback/tpmback.c                       | 1060 +++++
 tip2/drivers/xen/tpmback/xenbus.c                        |  329 +
 tip2/drivers/xen/tpmfront/Makefile                       |    2 
 tip2/drivers/xen/tpmfront/tpmfront.c                     |  768 ++++
 tip2/drivers/xen/tpmfront/tpmfront.h                     |   40 
 tip2/drivers/xen/util.c                                  |   80 
 tip2/drivers/xen/xenbus/Makefile                         |    8 
 tip2/drivers/xen/xenbus/xenbus_client.c                  |  412 ++
 tip2/drivers/xen/xenbus/xenbus_comms.c                   |  218 +
 tip2/drivers/xen/xenbus/xenbus_comms.h                   |   53 
 tip2/drivers/xen/xenbus/xenbus_dev.c                     |  252 +
 tip2/drivers/xen/xenbus/xenbus_probe.c                   | 1083 +++++
 tip2/drivers/xen/xenbus/xenbus_xs.c                      |  856 ++++
 tip2/fs/Kconfig                                          |    1 
 tip2/include/asm-i386/a.out.h                            |    2 
 tip2/include/asm-i386/apic.h                             |    2 
 tip2/include/asm-i386/elf.h                              |    7 
 tip2/include/asm-i386/fixmap.h                           |   13 
 tip2/include/asm-i386/mach-default/mach_traps.h          |   12 
 tip2/include/asm-i386/mach-xen/asm/agp.h                 |   37 
 tip2/include/asm-i386/mach-xen/asm/desc.h                |  164 
 tip2/include/asm-i386/mach-xen/asm/dma-mapping.h         |  156 
 tip2/include/asm-i386/mach-xen/asm/fixmap.h              |  156 
 tip2/include/asm-i386/mach-xen/asm/floppy.h              |  147 
 tip2/include/asm-i386/mach-xen/asm/highmem.h             |   81 
 tip2/include/asm-i386/mach-xen/asm/hw_irq.h              |   73 
 tip2/include/asm-i386/mach-xen/asm/hypercall.h           |  357 +
 tip2/include/asm-i386/mach-xen/asm/hypervisor.h          |  224 +
 tip2/include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 tip2/include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 tip2/include/asm-i386/mach-xen/asm/mmu.h                 |   21 
 tip2/include/asm-i386/mach-xen/asm/mmu_context.h         |  105 
 tip2/include/asm-i386/mach-xen/asm/page.h                |  326 +
 tip2/include/asm-i386/mach-xen/asm/param.h               |   24 
 tip2/include/asm-i386/mach-xen/asm/pci.h                 |  154 
 tip2/include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 tip2/include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 tip2/include/asm-i386/mach-xen/asm/pgtable-2level.h      |   85 
 tip2/include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 tip2/include/asm-i386/mach-xen/asm/pgtable-3level.h      |  183 +
 tip2/include/asm-i386/mach-xen/asm/pgtable.h             |  520 ++
 tip2/include/asm-i386/mach-xen/asm/processor.h           |  756 ++++
 tip2/include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 tip2/include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 tip2/include/asm-i386/mach-xen/asm/segment.h             |  117 
 tip2/include/asm-i386/mach-xen/asm/setup.h               |   64 
 tip2/include/asm-i386/mach-xen/asm/smp.h                 |  104 
 tip2/include/asm-i386/mach-xen/asm/spinlock.h            |  200 +
 tip2/include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 tip2/include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 
 tip2/include/asm-i386/mach-xen/asm/system.h              |  576 +++
 tip2/include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 tip2/include/asm-i386/mach-xen/asm/vga.h                 |   20 
 tip2/include/asm-i386/mach-xen/irq_vectors.h             |  125 
 tip2/include/asm-i386/mach-xen/mach_traps.h              |   33 
 tip2/include/asm-i386/mach-xen/setup_arch_post.h         |   54 
 tip2/include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 tip2/include/asm-i386/page.h                             |    4 
 tip2/include/asm-i386/pgtable-2level-defs.h              |    2 
 tip2/include/asm-i386/pgtable-3level-defs.h              |    2 
 tip2/include/asm-ia64/fixmap.h                           |    2 
 tip2/include/asm-ia64/gcc_intrin.h                       |   60 
 tip2/include/asm-ia64/hypercall.h                        |  274 +
 tip2/include/asm-ia64/hypervisor.h                       |  138 
 tip2/include/asm-ia64/intel_intrin.h                     |   68 
 tip2/include/asm-ia64/meminit.h                          |    5 
 tip2/include/asm-ia64/pal.h                              |    1 
 tip2/include/asm-ia64/privop.h                           |   59 
 tip2/include/asm-ia64/processor.h                        |    1 
 tip2/include/asm-ia64/synch_bitops.h                     |   61 
 tip2/include/asm-ia64/system.h                           |    4 
 tip2/include/asm-ia64/xen/privop.h                       |  277 +
 tip2/include/asm-um/page.h                               |    2 
 tip2/include/asm-x86_64/apic.h                           |    2 
 tip2/include/asm-x86_64/hw_irq.h                         |    2 
 tip2/include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 tip2/include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 tip2/include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 tip2/include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 +
 tip2/include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 tip2/include/asm-x86_64/mach-xen/asm/fixmap.h            |  114 
 tip2/include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 tip2/include/asm-x86_64/mach-xen/asm/hw_irq.h            |  141 
 tip2/include/asm-x86_64/mach-xen/asm/hypercall.h         |  357 +
 tip2/include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 tip2/include/asm-x86_64/mach-xen/asm/io.h                |  327 +
 tip2/include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 tip2/include/asm-x86_64/mach-xen/asm/mmu.h               |   33 
 tip2/include/asm-x86_64/mach-xen/asm/mmu_context.h       |  134 
 tip2/include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 tip2/include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 tip2/include/asm-x86_64/mach-xen/asm/page.h              |  317 +
 tip2/include/asm-x86_64/mach-xen/asm/param.h             |   23 
 tip2/include/asm-x86_64/mach-xen/asm/pci.h               |  174 
 tip2/include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 tip2/include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 +++
 tip2/include/asm-x86_64/mach-xen/asm/processor.h         |  494 ++
 tip2/include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 tip2/include/asm-x86_64/mach-xen/asm/smp.h               |  153 
 tip2/include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 tip2/include/asm-x86_64/mach-xen/asm/system.h            |  428 ++
 tip2/include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 tip2/include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 tip2/include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 tip2/include/asm-x86_64/mach-xen/asm/xor.h               |  328 +
 tip2/include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 tip2/include/asm-x86_64/mach-xen/mach_time.h             |  111 
 tip2/include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 tip2/include/asm-x86_64/mach-xen/setup_arch_post.h       |   41 
 tip2/include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 tip2/include/linux/gfp.h                                 |    6 
 tip2/include/linux/highmem.h                             |    6 
 tip2/include/linux/mm.h                                  |   13 
 tip2/include/linux/pfn.h                                 |    2 
 tip2/include/linux/skbuff.h                              |   13 
 tip2/include/xen/balloon.h                               |   73 
 tip2/include/xen/driver_util.h                           |   26 
 tip2/include/xen/evtchn.h                                |  126 
 tip2/include/xen/features.h                              |   20 
 tip2/include/xen/foreign_page.h                          |   40 
 tip2/include/xen/gnttab.h                                |  126 
 tip2/include/xen/hypervisor_sysfs.h                      |   32 
 tip2/include/xen/interface/acm.h                         |  181 
 tip2/include/xen/interface/acm_ops.h                     |   98 
 tip2/include/xen/interface/arch-ia64.h                   |  337 +
 tip2/include/xen/interface/arch-x86_32.h                 |  200 +
 tip2/include/xen/interface/arch-x86_64.h                 |  273 +
 tip2/include/xen/interface/callback.h                    |   57 
 tip2/include/xen/interface/dom0_ops.h                    |  531 ++
 tip2/include/xen/interface/event_channel.h               |  211 +
 tip2/include/xen/interface/features.h                    |   53 
 tip2/include/xen/interface/grant_table.h                 |  311 +
 tip2/include/xen/interface/hvm/hvm_info_table.h          |   24 
 tip2/include/xen/interface/hvm/ioreq.h                   |   94 
 tip2/include/xen/interface/hvm/vmx_assist.h              |   97 
 tip2/include/xen/interface/io/blkif.h                    |   85 
 tip2/include/xen/interface/io/console.h                  |   33 
 tip2/include/xen/interface/io/netif.h                    |   84 
 tip2/include/xen/interface/io/pciif.h                    |   55 
 tip2/include/xen/interface/io/ring.h                     |  265 +
 tip2/include/xen/interface/io/tpmif.h                    |   56 
 tip2/include/xen/interface/io/xenbus.h                   |   42 
 tip2/include/xen/interface/io/xs_wire.h                  |   97 
 tip2/include/xen/interface/memory.h                      |  155 
 tip2/include/xen/interface/nmi.h                         |   59 
 tip2/include/xen/interface/physdev.h                     |   71 
 tip2/include/xen/interface/sched.h                       |  100 
 tip2/include/xen/interface/sched_ctl.h                   |   64 
 tip2/include/xen/interface/trace.h                       |   86 
 tip2/include/xen/interface/vcpu.h                        |  119 
 tip2/include/xen/interface/version.h                     |   64 
 tip2/include/xen/interface/xen-compat.h                  |   34 
 tip2/include/xen/interface/xen.h                         |  459 ++
 tip2/include/xen/interface/xenoprof.h                    |   72 
 tip2/include/xen/net_driver_util.h                       |   58 
 tip2/include/xen/pcifront.h                              |   39 
 tip2/include/xen/public/evtchn.h                         |  101 
 tip2/include/xen/public/privcmd.h                        |   94 
 tip2/include/xen/tpmfe.h                                 |   40 
 tip2/include/xen/xen_proc.h                              |   23 
 tip2/include/xen/xenbus.h                                |  306 +
 tip2/include/xen/xencons.h                               |   14 
 tip2/kernel/Kconfig.preempt                              |    1 
 tip2/kernel/irq/manage.c                                 |   24 
 tip2/kernel/irq/migration.c                              |    3 
 tip2/lib/Kconfig.debug                                   |   31 
 tip2/lib/Makefile                                        |    3 
 tip2/mm/Kconfig                                          |    3 
 tip2/mm/highmem.c                                        |   11 
 tip2/mm/memory.c                                         |  116 
 tip2/mm/mmap.c                                           |    4 
 tip2/mm/page_alloc.c                                     |    6 
 tip2/net/core/dev.c                                      |   50 
 tip2/net/core/skbuff.c                                   |   41 
 tip2/net/ipv4/netfilter/ip_nat_proto_tcp.c               |    6 
 tip2/net/ipv4/netfilter/ip_nat_proto_udp.c               |    9 
 tip2/scripts/Makefile.xen                                |   14 
 388 files changed, 80006 insertions(+), 856 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.6 -r 1.7 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-xen.patch	22 Mar 2006 23:50:26 -0000	1.6
+++ linux-2.6-xen.patch	14 Apr 2006 18:11:39 -0000	1.7
@@ -1,32 +1,7 @@
-diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/arch/i386/boot-xen/Makefile linux-2.6.16-rc6-xen0/arch/i386/boot-xen/Makefile
---- ref-linux-2.6.16-rc6/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16-rc6-xen0/arch/i386/boot-xen/Makefile	2006-03-20 22:06:19.000000000 +0100
-@@ -0,0 +1,21 @@
-+
-+OBJCOPYFLAGS := -g --strip-unneeded
-+
-+vmlinuz: vmlinux-stripped FORCE
-+	$(call if_changed,gzip)
-+
-+vmlinux-stripped: vmlinux FORCE
-+	$(call if_changed,objcopy)
-+
-+INSTALL_ROOT := $(patsubst %/boot,%,$(INSTALL_PATH))
-+
-+XINSTALL_NAME ?= $(KERNELRELEASE)
-+install:
-+	mkdir -p $(INSTALL_ROOT)/boot
-+	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
-+	rm -f $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
-+	install -m0644 vmlinuz $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
-+	install -m0644 vmlinux $(INSTALL_ROOT)/boot/vmlinux-syms-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
-+	install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
-+	install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
-+	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
-diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/arch/i386/Kconfig linux-2.6.16-rc6-xen0/arch/i386/Kconfig
---- ref-linux-2.6.16-rc6/arch/i386/Kconfig	2006-03-20 22:09:16.000000000 +0100
-+++ linux-2.6.16-rc6-xen0/arch/i386/Kconfig	2006-03-20 22:06:19.000000000 +0100
-@@ -58,6 +58,15 @@ config X86_PC
+diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff src/linux-2.6.17-rc1/arch/i386/Kconfig tip2/arch/i386/Kconfig
+--- src/linux-2.6.17-rc1/arch/i386/Kconfig	2006-04-12 22:59:33.000000000 +0200
++++ tip2/arch/i386/Kconfig	2006-04-10 15:29:39.000000000 +0200
+@@ -62,6 +62,15 @@ config X86_PC
  	help
  	  Choose this option if your computer is a standard PC or compatible.
  
@@ -42,7 +17,7 @@
  config X86_ELAN
  	bool "AMD Elan"
  	help
-@@ -159,6 +168,7 @@ source "arch/i386/Kconfig.cpu"
+@@ -164,6 +173,7 @@ source "arch/i386/Kconfig.cpu"
  
  config HPET_TIMER
  	bool "HPET Timer Support"
@@ -50,7 +25,7 @@
  	help
  	  This enables the use of the HPET for the kernel's internal timer.
  	  HPET is the next generation timer replacing legacy 8254s.
-@@ -231,7 +241,7 @@ config NR_CPUS
+@@ -223,7 +233,7 @@ config NR_CPUS
  
  config SCHED_SMT
  	bool "SMT (Hyperthreading) scheduler support"
@@ -59,7 +34,16 @@
  	default off
  	help
  	  SMT scheduler support improves the CPU scheduler's decision making
-@@ -243,7 +253,7 @@ source "kernel/Kconfig.preempt"
+@@ -233,7 +243,7 @@ config SCHED_SMT
+ 
+ config SCHED_MC
+ 	bool "Multi-core scheduler support"
+-	depends on SMP
++	depends on SMP && !X86_XEN
+ 	default y
+ 	help
+ 	  Multi-core scheduler support improves the CPU scheduler's decision
+@@ -244,7 +254,7 @@ source "kernel/Kconfig.preempt"
  
  config X86_UP_APIC
  	bool "Local APIC support on uniprocessors"
@@ -68,7 +52,7 @@
  	help
  	  A local APIC (Advanced Programmable Interrupt Controller) is an
  	  integrated interrupt controller in the CPU. If you have a single-CPU
-@@ -268,12 +278,12 @@ config X86_UP_IOAPIC
+@@ -269,12 +279,12 @@ config X86_UP_IOAPIC
  
  config X86_LOCAL_APIC
  	bool
@@ -83,7 +67,7 @@
  	default y
  
  config X86_VISWS_APIC
-@@ -281,9 +291,14 @@ config X86_VISWS_APIC
+@@ -282,9 +292,14 @@ config X86_VISWS_APIC
  	depends on X86_VISWS
  	default y
  
@@ -99,7 +83,7 @@
  	---help---
  	  Machine Check Exception support allows the processor to notify the
  	  kernel if it detects a problem (e.g. overheating, component failure).
-@@ -373,6 +388,7 @@ config X86_REBOOTFIXUPS
+@@ -374,6 +389,7 @@ config X86_REBOOTFIXUPS
  
  config MICROCODE
  	tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support"
@@ -107,7 +91,7 @@
  	---help---
  	  If you say Y here and also to "/dev file system support" in the
  	  'File systems' section, you will be able to update the microcode on
-@@ -390,6 +406,7 @@ config MICROCODE
+@@ -391,6 +407,7 @@ config MICROCODE
  
  config X86_MSR
  	tristate "/dev/cpu/*/msr - Model-specific register support"
@@ -115,7 +99,7 @@
  	help
  	  This device gives privileged processes access to the x86
  	  Model-Specific Registers (MSRs).  It is a character device with
-@@ -405,6 +422,10 @@ config X86_CPUID
+@@ -406,6 +423,10 @@ config X86_CPUID
  	  with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
  	  /dev/cpu/31/cpuid.
  
@@ -126,7 +110,7 @@
  source "drivers/firmware/Kconfig"
  
  choice
-@@ -573,7 +594,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
+@@ -572,7 +593,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
  
  config HIGHPTE
  	bool "Allocate 3rd-level pagetables from highmem"
@@ -135,7 +119,7 @@
  	help
  	  The VM uses one page table entry for each page of physical memory.
  	  For systems with a lot of RAM, this can be wasteful of precious
-@@ -582,6 +603,7 @@ config HIGHPTE
+@@ -581,6 +602,7 @@ config HIGHPTE
  
  config MATH_EMULATION
  	bool "Math emulation"
@@ -143,7 +127,7 @@
  	---help---
  	  Linux can emulate a math coprocessor (used for floating point
  	  operations) if you don't have one. 486DX and Pentium processors have
-@@ -607,6 +629,8 @@ config MATH_EMULATION
+@@ -606,6 +628,8 @@ config MATH_EMULATION
  
  config MTRR
  	bool "MTRR (Memory Type Range Register) support"
@@ -152,7 +136,7 @@
  	---help---
  	  On Intel P6 family processors (Pentium Pro, Pentium II and later)
  	  the Memory Type Range Registers (MTRRs) may be used to control
-@@ -641,7 +665,7 @@ config MTRR
+@@ -640,7 +664,7 @@ config MTRR
  
  config EFI
  	bool "Boot from EFI support (EXPERIMENTAL)"
@@ -161,7 +145,7 @@
  	default n
  	---help---
  	This enables the the kernel to boot on EFI platforms using
-@@ -659,7 +683,7 @@ config EFI
+@@ -658,7 +682,7 @@ config EFI
  
  config IRQBALANCE
   	bool "Enable kernel irq balancing"
@@ -170,7 +154,7 @@
  	default y
  	help
   	  The default yes will allow the kernel to do irq load balancing.
-@@ -702,7 +726,7 @@ source kernel/Kconfig.hz
+@@ -706,7 +730,7 @@ source kernel/Kconfig.hz
  
  config KEXEC
  	bool "kexec system call (EXPERIMENTAL)"
@@ -179,7 +163,16 @@
  	help
  	  kexec is a system call that implements the ability to shutdown your
  	  current kernel, and to start another kernel.  It is like a reboot
-@@ -756,6 +780,7 @@ config HOTPLUG_CPU
+@@ -750,7 +774,7 @@ config PHYSICAL_START
+ 
+ config HOTPLUG_CPU
+ 	bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
+-	depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER && !X86_PC
++	depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER && (!X86_PC || X86_XEN)
+ 	---help---
+ 	  Say Y here to experiment with turning CPUs off and on.  CPUs
+ 	  can be controlled through /sys/devices/system/cpu.
+@@ -760,6 +784,7 @@ config HOTPLUG_CPU
  config DOUBLEFAULT
  	default y
  	bool "Enable doublefault exception handler" if EMBEDDED
@@ -187,7 +180,7 @@
  	help
[...22632 lines suppressed...]
-diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/scripts/Makefile.xen linux-2.6.16-rc6-xen0/scripts/Makefile.xen
---- ref-linux-2.6.16-rc6/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16-rc6-xen0/scripts/Makefile.xen	2006-03-20 22:06:21.000000000 +0100
+diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff src/linux-2.6.17-rc1/net/ipv4/netfilter/ip_nat_proto_tcp.c tip2/net/ipv4/netfilter/ip_nat_proto_tcp.c
+--- src/linux-2.6.17-rc1/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-03-20 06:53:29.000000000 +0100
++++ tip2/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-04-10 15:30:58.000000000 +0200
+@@ -129,10 +129,14 @@ tcp_manip_pkt(struct sk_buff **pskb,
+ 	if (hdrsize < sizeof(*hdr))
+ 		return 1;
+ 
+-	hdr->check = ip_nat_cheat_check(~oldip, newip,
++	if ((*pskb)->proto_csum_blank) {
++		hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
++	} else {
++		hdr->check = ip_nat_cheat_check(~oldip, newip,
+ 					ip_nat_cheat_check(oldport ^ 0xFFFF,
+ 							   newport,
+ 							   hdr->check));
++	}
+ 	return 1;
+ }
+ 
+diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff src/linux-2.6.17-rc1/net/ipv4/netfilter/ip_nat_proto_udp.c tip2/net/ipv4/netfilter/ip_nat_proto_udp.c
+--- src/linux-2.6.17-rc1/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-03-20 06:53:29.000000000 +0100
++++ tip2/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-04-10 15:30:58.000000000 +0200
+@@ -113,11 +113,16 @@ udp_manip_pkt(struct sk_buff **pskb,
+ 		newport = tuple->dst.u.udp.port;
+ 		portptr = &hdr->dest;
+ 	}
+-	if (hdr->check) /* 0 is a special case meaning no checksum */
+-		hdr->check = ip_nat_cheat_check(~oldip, newip,
++	if (hdr->check) { /* 0 is a special case meaning no checksum */
++		if ((*pskb)->proto_csum_blank) {
++			hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
++		} else {
++			hdr->check = ip_nat_cheat_check(~oldip, newip,
+ 					ip_nat_cheat_check(*portptr ^ 0xFFFF,
+ 							   newport,
+ 							   hdr->check));
++		}
++	}
+ 	*portptr = newport;
+ 	return 1;
+ }
+diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff src/linux-2.6.17-rc1/scripts/Makefile.xen tip2/scripts/Makefile.xen
+--- src/linux-2.6.17-rc1/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
++++ tip2/scripts/Makefile.xen	2006-04-10 15:31:00.000000000 +0200
 @@ -0,0 +1,14 @@
 +
 +# cherrypickxen($1 = allobj)
@@ -80908,3 +84019,149 @@
 +	  )
 +# filterxen($1 = allobj, $2 = noobjs)
 +filterxen = $(filter-out $(2), $(1))
+diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff src/linux-2.6.17-rc1/include/xen/interface/version.h tip2/include/xen/interface/version.h
+--- src/linux-2.6.17-rc1/include/xen/interface/version.h	1970-01-01 01:00:00.000000000 +0100
++++ tip2/include/xen/interface/version.h	2006-04-10 15:30:55.000000000 +0200
+@@ -0,0 +1,64 @@
++/******************************************************************************
++ * version.h
++ * 
++ * Xen version, type, and compile information.
++ * 
++ * Copyright (c) 2005, Nguyen Anh Quynh <aquynh at gmail.com>
++ * Copyright (c) 2005, Keir Fraser <keir at xensource.com>
++ */
++
++#ifndef __XEN_PUBLIC_VERSION_H__
++#define __XEN_PUBLIC_VERSION_H__
++
++/* NB. All ops return zero on success, except XENVER_version. */
++
++/* arg == NULL; returns major:minor (16:16). */
++#define XENVER_version      0
++
++/* arg == xen_extraversion_t. */
++#define XENVER_extraversion 1
++typedef char xen_extraversion_t[16];
++#define XEN_EXTRAVERSION_LEN (sizeof(xen_extraversion_t))
++
++/* arg == xen_compile_info_t. */
++#define XENVER_compile_info 2
++typedef struct xen_compile_info {
++    char compiler[64];
++    char compile_by[16];
++    char compile_domain[32];
++    char compile_date[32];
++} xen_compile_info_t;
++
++#define XENVER_capabilities 3
++typedef char xen_capabilities_info_t[1024];
++#define XEN_CAPABILITIES_INFO_LEN (sizeof(xen_capabilities_info_t))
++
++#define XENVER_changeset 4
++typedef char xen_changeset_info_t[64];
++#define XEN_CHANGESET_INFO_LEN (sizeof(xen_changeset_info_t))
++
++#define XENVER_platform_parameters 5
++typedef struct xen_platform_parameters {
++    unsigned long virt_start;
++} xen_platform_parameters_t;
++
++#define XENVER_get_features 6
++typedef struct xen_feature_info {
++    unsigned int submap_idx;    /* IN: which 32-bit submap to return */
++    uint32_t     submap;        /* OUT: 32-bit submap */
++} xen_feature_info_t;
++
++/* Declares the features reported by XENVER_get_features. */
++#include "features.h"
++
++#endif /* __XEN_PUBLIC_VERSION_H__ */
++
++/*
++ * Local variables:
++ * mode: C
++ * c-set-style: "BSD"
++ * c-basic-offset: 4
++ * tab-width: 4
++ * indent-tabs-mode: nil
++ * End:
++ */
+diff -uNp linux-2.6.16.noarch/arch/x86_64/Makefile.orig linux-2.6.16.noarch/arch/x86_64/Makefile
+--- linux-2.6.16.noarch/arch/x86_64/Makefile.orig	2006-04-13 13:51:16.000000000 +0200
++++ linux-2.6.16.noarch/arch/x86_64/Makefile	2006-04-13 13:46:18.000000000 +0200
+@@ -31,6 +31,10 @@ cflags-$(CONFIG_MK8) += $(call cc-option
+ cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona)
+ cflags-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=generic)
+ 
++cppflags-$(CONFIG_XEN) += \
++	-D__XEN_INTERFACE_VERSION__=$(CONFIG_XEN_INTERFACE_VERSION)
++CPPFLAGS += $(cppflags-y)
++
+ cflags-y += -m64
+ cflags-y += -mno-red-zone
+ cflags-y += -mcmodel=kernel
+@@ -72,6 +76,21 @@ boot := arch/x86_64/boot
+ PHONY += bzImage bzlilo install archmrproper \
+ 	 fdimage fdimage144 fdimage288 isoimage archclean
+ 
++ifdef CONFIG_XEN
++CPPFLAGS := -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(CPPFLAGS)
++head-y := arch/x86_64/kernel/head-xen.o arch/x86_64/kernel/head64-xen.o arch/x86_64/kernel/init_task.o
++LDFLAGS_vmlinux := -e _start
++boot := arch/i386/boot-xen
++.PHONY: vmlinuz
++#Default target when executing "make"
++all: vmlinuz
++
++vmlinuz: vmlinux
++	$(Q)$(MAKE) $(build)=$(boot) $@
++
++install:
++	$(Q)$(MAKE) $(build)=$(boot) XENGUEST=$(XENGUEST) $@
++else
+ #Default target when executing "make"
+ all: bzImage
+ 
+@@ -92,6 +111,7 @@ fdimage fdimage144 fdimage288 isoimage: 
+ 
+ install:
+ 	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@ 
++endif
+ 
+ archclean:
+ 	$(Q)$(MAKE) $(clean)=$(boot)
+diff -uNp linux-2.6.16.noarch/arch/x86_64/ia32/Makefile.orig linux-2.6.16.noarch/arch/x86_64/ia32/Makefile
+--- linux-2.6.16.noarch/arch/x86_64/ia32/Makefile.orig	2006-04-13 13:51:34.000000000 +0200
++++ linux-2.6.16.noarch/arch/x86_64/ia32/Makefile	2006-04-13 13:48:11.000000000 +0200
+@@ -26,12 +26,28 @@ quiet_cmd_syscall = SYSCALL $@
+ 			   -Wl,-soname=linux-gate.so.1 -o $@ \
+ 			   -Wl,-T,$(filter-out FORCE,$^)
+ 
++$(obj)/vsyscall-int80.so \
+ $(obj)/vsyscall-sysenter.so $(obj)/vsyscall-syscall.so: \
+ $(obj)/vsyscall-%.so: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE
+ 	$(call if_changed,syscall)
+ 
+-AFLAGS_vsyscall-sysenter.o = -m32
+-AFLAGS_vsyscall-syscall.o = -m32
++AFLAGS_vsyscall-sysenter.o = -m32 -Iarch/i386/kernel
++AFLAGS_vsyscall-syscall.o = -m32 -Iarch/i386/kernel
++
++ifdef CONFIG_XEN
++AFLAGS_vsyscall-int80.o = -m32 -Iarch/i386/kernel
++CFLAGS_syscall32-xen.o += -DUSE_INT80
++AFLAGS_syscall32_syscall-xen.o += -DUSE_INT80
++
++$(obj)/syscall32_syscall-xen.o: \
++	$(foreach F,int80 sysenter syscall,$(obj)/vsyscall-$F.so)
++
++targets := $(foreach F,int80 sysenter syscall,vsyscall-$F.o vsyscall-$F.so)
++
++include $(srctree)/scripts/Makefile.xen
++
++obj-y := $(call cherrypickxen, $(obj-y))
++endif
+ AFLAGS_syscall32_syscall.o += -m64
+ AFLAGS_ia32entry.o += -m64
+ 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -r1.346 -r1.347
--- sources	11 Apr 2006 13:01:42 -0000	1.346
+++ sources	14 Apr 2006 18:11:52 -0000	1.347
@@ -1,5 +1,4 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
-8c70806f9075ebc0087f7ce1b8911700  xen-20060320.tar.bz2
 ee1b5bf019ec60a34ef7bf1b2a0c1291  patch-2.6.17-rc1.bz2
 33a1f95f8b4dbad15a69b2628cf16d09  patch-2.6.17-rc1-git3.bz2
 8ae04240509d86bf520010c497f359e2  patch-2.6.17-rc1-git4.bz2


--- linux-2.6-crash-xen.patch DELETED ---


--- linux-2.6-percpu-NR_CPUS-hotplug-fix.patch DELETED ---


--- linux-2.6-vdso-xen.patch DELETED ---


--- linux-2.6-xen-i386-mach-io-check-nmi.patch DELETED ---


--- linux-2.6-xen-net-csum.patch DELETED ---


--- linux-2.6-xen-pmd-shared.patch DELETED ---


--- linux-2.6-xen-smp-alts.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 14 18:34:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 14:34:19 -0400
Subject: rpms/kernel/devel linux-2.6-xen-compile-fixes.patch,1.5,1.6
Message-ID: <200604141834.k3EIYJ28006877@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	linux-2.6-xen-compile-fixes.patch 
Log Message:
fixed last xen bits

linux-2.6-xen-compile-fixes.patch:
 arch/i386/kernel/acpi/boot-xen.c                             |    3 +
 linux-2.6.15.ia64/fs/Kconfig                                 |    1 
 linux-2.6.15.xen/arch/i386/kernel/Makefile                   |    3 -
 linux-2.6.15.xen/arch/i386/kernel/smp-xen.c                  |    1 
 linux-2.6.15.xen/arch/i386/mm/init-xen.c                     |    1 
 linux-2.6.15.xen/arch/x86_64/kernel/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/arch/x86_64/ia32/ia32entry-xen.S         |   17 +++++------
 linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_tcp.c    |    5 ++-
 linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_udp.c    |    5 ++-
 19 files changed, 63 insertions(+), 24 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-xen-compile-fixes.patch	14 Apr 2006 18:11:39 -0000	1.5
+++ linux-2.6-xen-compile-fixes.patch	14 Apr 2006 18:33:56 -0000	1.6
@@ -286,34 +286,34 @@
 diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.i686/net/ipv4/netfilter/ip_nat_proto_tcp.c linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_tcp.c
 --- linux-2.6.16.i686/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-04-13 23:58:07.000000000 +0200
 +++ linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-04-14 19:39:59.000000000 +0200
-@@ -129,12 +129,9 @@ tcp_manip_pkt(struct sk_buff **pskb,
+@@ -129,9 +129,12 @@ tcp_manip_pkt(struct sk_buff **pskb,
  	if (hdrsize < sizeof(*hdr))
  		return 1;
  
--#ifdef CONFIG_XEN
++#ifdef CONFIG_XEN
  	if ((*pskb)->proto_csum_blank) {
  		hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
--	} else 
--#endif
--	{
-+	} else {
++	} else 
++#endif
++	{
+-	} else {
  		hdr->check = ip_nat_cheat_check(~oldip, newip,
  					ip_nat_cheat_check(oldport ^ 0xFFFF,
  							   newport,
 diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.i686/net/ipv4/netfilter/ip_nat_proto_udp.c linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_udp.c
 --- linux-2.6.16.i686/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-04-13 23:58:39.000000000 +0200
 +++ linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-04-14 19:39:59.000000000 +0200
-@@ -114,12 +114,9 @@ udp_manip_pkt(struct sk_buff **pskb,
+@@ -114,9 +114,12 @@ udp_manip_pkt(struct sk_buff **pskb,
  		portptr = &hdr->dest;
  	}
  	if (hdr->check) { /* 0 is a special case meaning no checksum */
--#ifdef CONFIG_XEN
++#ifdef CONFIG_XEN
  		if ((*pskb)->proto_csum_blank) {
  			hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
--		} else 
--#endif
--		{
-+		} else {
++		} else 
++#endif
++		{
+-		} else {
  			hdr->check = ip_nat_cheat_check(~oldip, newip,
  					ip_nat_cheat_check(*portptr ^ 0xFFFF,
  							   newport,



From fedora-cvs-commits at redhat.com  Fri Apr 14 18:34:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 14:34:46 -0400
Subject: rpms/kernel/devel/configs config-xen-generic, 1.14,
	1.15 config-xen-x86_64, 1.2, 1.3 config-xen-xen0, 1.5, 1.6
Message-ID: <200604141834.k3EIYk3t006902@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	config-xen-generic config-xen-x86_64 config-xen-xen0 
Log Message:
fixed last xen bits


Index: config-xen-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-generic,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- config-xen-generic	14 Apr 2006 18:11:52 -0000	1.14
+++ config-xen-generic	14 Apr 2006 18:34:18 -0000	1.15
@@ -116,3 +116,11 @@
 # CONFIG_CRASH is not set
 CONFIG_XEN_SYSFS=y
 # CONFIG_OPROFILE is not set
+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


Index: config-xen-x86_64
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-x86_64,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-xen-x86_64	13 Feb 2006 21:17:48 -0000	1.2
+++ config-xen-x86_64	14 Apr 2006 18:34:18 -0000	1.3
@@ -12,3 +12,6 @@
 
 CONFIG_NR_CPUS=8
 # CONFIG_EARLY_PRINTK is not set
+
+CONFIG_PCI=y
+# CONFIG_PCI_MMCONFIG is not set


Index: config-xen-xen0
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-xen0,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config-xen-xen0	7 Mar 2006 19:37:17 -0000	1.5
+++ config-xen-xen0	14 Apr 2006 18:34:18 -0000	1.6
@@ -73,3 +73,11 @@
 #
 # CONFIG_X86_POWERNOW_K7 is not set
 # CONFIG_X86_P4_CLOCKMOD is not set
+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



From fedora-cvs-commits at redhat.com  Fri Apr 14 18:43:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 14:43:02 -0400
Subject: rpms/kernel/devel .cvsignore,1.405,1.406 sources,1.347,1.348
Message-ID: <200604141843.k3EIh2M8008438@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	.cvsignore sources 
Log Message:
tarballs also need to be uploaded, right?


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -r1.405 -r1.406
--- .cvsignore	11 Apr 2006 13:01:39 -0000	1.405
+++ .cvsignore	14 Apr 2006 18:42:59 -0000	1.406
@@ -6,3 +6,4 @@
 patch-2.6.17-rc1.bz2
 patch-2.6.17-rc1-git3.bz2
 patch-2.6.17-rc1-git4.bz2
+xen-20060413.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -r1.347 -r1.348
--- sources	14 Apr 2006 18:11:52 -0000	1.347
+++ sources	14 Apr 2006 18:42:59 -0000	1.348
@@ -2,3 +2,4 @@
 ee1b5bf019ec60a34ef7bf1b2a0c1291  patch-2.6.17-rc1.bz2
 33a1f95f8b4dbad15a69b2628cf16d09  patch-2.6.17-rc1-git3.bz2
 8ae04240509d86bf520010c497f359e2  patch-2.6.17-rc1-git4.bz2
+e8e055329db3aad40a010ded0f8bdcf9  xen-20060413.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr 14 18:57:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 14:57:39 -0400
Subject: rpms/kernel/devel linux-2.6-xen.patch,1.7,1.8
Message-ID: <200604141857.k3EIvdjg028302@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	linux-2.6-xen.patch 
Log Message:
x86 needs also this

linux-2.6-xen.patch:
 linux-2.6.16.noarch/arch/x86_64/Makefile                 |   20 
 linux-2.6.16.noarch/arch/x86_64/ia32/Makefile            |   20 
 tip2/arch/i386/Kconfig                                   |  100 
 tip2/arch/i386/Kconfig.cpu                               |    2 
 tip2/arch/i386/Makefile                                  |   24 
 tip2/arch/i386/boot-xen/Makefile                         |   21 
 tip2/arch/i386/kernel/Makefile                           |   31 
 tip2/arch/i386/kernel/acpi/Makefile                      |    4 
 tip2/arch/i386/kernel/acpi/boot-xen.c                    | 1161 ++++++
 tip2/arch/i386/kernel/apic-xen.c                         |  141 
 tip2/arch/i386/kernel/asm-offsets.c                      |    5 
 tip2/arch/i386/kernel/cpu/Makefile                       |    5 
 tip2/arch/i386/kernel/cpu/common-xen.c                   |  732 ++++
 tip2/arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 tip2/arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 tip2/arch/i386/kernel/early_printk-xen.c                 |    2 
 tip2/arch/i386/kernel/entry-xen.S                        |  880 ++++
 tip2/arch/i386/kernel/entry.S                            |    4 
 tip2/arch/i386/kernel/fixup.c                            |   95 
 tip2/arch/i386/kernel/head-xen.S                         |  171 
 tip2/arch/i386/kernel/init_task-xen.c                    |   51 
 tip2/arch/i386/kernel/io_apic-xen.c                      | 2744 +++++++++++++++
 tip2/arch/i386/kernel/ioport-xen.c                       |  122 
 tip2/arch/i386/kernel/irq-xen.c                          |  306 +
 tip2/arch/i386/kernel/irq.c                              |    4 
 tip2/arch/i386/kernel/ldt-xen.c                          |  269 +
 tip2/arch/i386/kernel/microcode-xen.c                    |  148 
 tip2/arch/i386/kernel/mpparse-xen.c                      | 1189 ++++++
 tip2/arch/i386/kernel/pci-dma-xen.c                      |  344 +
 tip2/arch/i386/kernel/process-xen.c                      |  824 ++++
 tip2/arch/i386/kernel/quirks-xen.c                       |   48 
 tip2/arch/i386/kernel/setup-xen.c                        | 1826 +++++++++
 tip2/arch/i386/kernel/smp-xen.c                          |  613 +++
 tip2/arch/i386/kernel/swiotlb.c                          |  674 +++
 tip2/arch/i386/kernel/sysenter.c                         |   90 
 tip2/arch/i386/kernel/time-xen.c                         | 1097 +++++
 tip2/arch/i386/kernel/traps-xen.c                        | 1123 ++++++
 tip2/arch/i386/kernel/traps.c                            |    9 
 tip2/arch/i386/kernel/vm86.c                             |    8 
 tip2/arch/i386/kernel/vsyscall-note-xen.S                |   32 
 tip2/arch/i386/kernel/vsyscall.S                         |    2 
 tip2/arch/i386/mach-xen/Makefile                         |    5 
 tip2/arch/i386/mach-xen/setup.c                          |   49 
 tip2/arch/i386/mm/Makefile                               |    8 
 tip2/arch/i386/mm/fault-xen.c                            |  683 +++
 tip2/arch/i386/mm/highmem-xen.c                          |  123 
 tip2/arch/i386/mm/hypervisor.c                           |  424 ++
 tip2/arch/i386/mm/init-xen.c                             |  853 ++++
 tip2/arch/i386/mm/ioremap-xen.c                          |  486 ++
 tip2/arch/i386/mm/pageattr.c                             |    2 
 tip2/arch/i386/mm/pgtable-xen.c                          |  652 +++
 tip2/arch/i386/mm/pgtable.c                              |   12 
 tip2/arch/i386/oprofile/Makefile                         |    4 
 tip2/arch/i386/oprofile/xenoprof.c                       |  395 ++
 tip2/arch/i386/pci/Makefile                              |    9 
 tip2/arch/i386/pci/irq-xen.c                             | 1202 ++++++
 tip2/arch/i386/pci/pcifront.c                            |   55 
 tip2/arch/i386/power/Makefile                            |    4 
 tip2/arch/ia64/Kconfig                                   |   46 
 tip2/arch/ia64/Makefile                                  |   16 
 tip2/arch/ia64/hp/sim/Makefile                           |    2 
 tip2/arch/ia64/kernel/entry.S                            |   32 
 tip2/arch/ia64/kernel/head.S                             |    6 
 tip2/arch/ia64/kernel/pal.S                              |    5 
 tip2/arch/ia64/kernel/sal.c                              |    3 
 tip2/arch/ia64/kernel/setup.c                            |   32 
 tip2/arch/ia64/xen/Makefile                              |    5 
 tip2/arch/ia64/xen/drivers/Makefile                      |   20 
 tip2/arch/ia64/xen/drivers/README                        |    2 
 tip2/arch/ia64/xen/drivers/coreMakefile                  |   26 
 tip2/arch/ia64/xen/drivers/evtchn_ia64.c                 |  273 +
 tip2/arch/ia64/xen/drivers/patches/blkback.c.patch       |   33 
 tip2/arch/ia64/xen/drivers/patches/console.c.patch       |   11 
 tip2/arch/ia64/xen/drivers/patches/devmem.c.patch        |    2 
 tip2/arch/ia64/xen/drivers/patches/gnttab.c.patch        |   33 
 tip2/arch/ia64/xen/drivers/patches/privcmd.c.patch       |   30 
 tip2/arch/ia64/xen/drivers/xenia64_init.c                |   55 
 tip2/arch/ia64/xen/hypercall.S                           |  365 +
 tip2/arch/ia64/xen/xen_ksyms.c                           |   12 
 tip2/arch/ia64/xen/xenconsole.c                          |   19 
 tip2/arch/ia64/xen/xenentry.S                            |  850 ++++
 tip2/arch/ia64/xen/xenhpski.c                            |   19 
 tip2/arch/ia64/xen/xenivt.S                              | 2032 +++++++++++
 tip2/arch/ia64/xen/xenminstate.h                         |  367 ++
 tip2/arch/ia64/xen/xenpal.S                              |   73 
 tip2/arch/ia64/xen/xensetup.S                            |   35 
 tip2/arch/um/kernel/physmem.c                            |    4 
 tip2/arch/x86_64/Kconfig                                 |   62 
 tip2/arch/x86_64/ia32/ia32entry-xen.S                    |  723 +++
 tip2/arch/x86_64/ia32/syscall32-xen.c                    |  128 
 tip2/arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 tip2/arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 tip2/arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 tip2/arch/x86_64/kernel/Makefile                         |   18 
 tip2/arch/x86_64/kernel/acpi/Makefile                    |    1 
 tip2/arch/x86_64/kernel/apic-xen.c                       |  198 +
 tip2/arch/x86_64/kernel/asm-offsets.c                    |    2 
 tip2/arch/x86_64/kernel/e820-xen.c                       |  744 ++++
 tip2/arch/x86_64/kernel/early_printk-xen.c               |  304 +
 tip2/arch/x86_64/kernel/entry-xen.S                      | 1149 ++++++
 tip2/arch/x86_64/kernel/entry.S                          |    2 
 tip2/arch/x86_64/kernel/genapic-xen.c                    |  144 
 tip2/arch/x86_64/kernel/genapic_xen.c                    |  162 
 tip2/arch/x86_64/kernel/head-xen.S                       |  163 
 tip2/arch/x86_64/kernel/head64-xen.c                     |  140 
 tip2/arch/x86_64/kernel/init_task.c                      |    3 
 tip2/arch/x86_64/kernel/io_apic-xen.c                    | 2231 ++++++++++++
 tip2/arch/x86_64/kernel/ioport-xen.c                     |   58 
 tip2/arch/x86_64/kernel/irq-xen.c                        |  163 
 tip2/arch/x86_64/kernel/irq.c                            |    4 
 tip2/arch/x86_64/kernel/ldt-xen.c                        |  282 +
 tip2/arch/x86_64/kernel/mpparse-xen.c                    | 1002 +++++
 tip2/arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 tip2/arch/x86_64/kernel/process-xen.c                    |  796 ++++
 tip2/arch/x86_64/kernel/setup-xen.c                      | 1677 +++++++++
 tip2/arch/x86_64/kernel/setup64-xen.c                    |  360 +
 tip2/arch/x86_64/kernel/smp-xen.c                        |  596 +++
 tip2/arch/x86_64/kernel/smp.c                            |    4 
 tip2/arch/x86_64/kernel/traps-xen.c                      | 1020 +++++
 tip2/arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 tip2/arch/x86_64/kernel/x8664_ksyms-xen.c                |  158 
 tip2/arch/x86_64/kernel/xen_entry.S                      |   40 
 tip2/arch/x86_64/mm/Makefile                             |   10 
 tip2/arch/x86_64/mm/fault-xen.c                          |  644 +++
 tip2/arch/x86_64/mm/init-xen.c                           | 1145 ++++++
 tip2/arch/x86_64/mm/pageattr-xen.c                       |  390 ++
 tip2/arch/x86_64/oprofile/Makefile                       |    5 
 tip2/arch/x86_64/pci/Makefile                            |   12 
 tip2/drivers/Makefile                                    |    1 
 tip2/drivers/acpi/Kconfig                                |    3 
 tip2/drivers/base/bus.c                                  |    5 
 tip2/drivers/char/mem.c                                  |    6 
 tip2/drivers/char/tpm/Kconfig                            |   14 
 tip2/drivers/char/tpm/Makefile                           |    1 
 tip2/drivers/char/tpm/tpm.c                              |   44 
 tip2/drivers/char/tpm/tpm.h                              |    7 
 tip2/drivers/char/tpm/tpm_atmel.c                        |  230 -
 tip2/drivers/char/tpm/tpm_nsc.c                          |  395 --
 tip2/drivers/char/tpm/tpm_xen.c                          |  536 ++
 tip2/drivers/char/tty_io.c                               |    7 
 tip2/drivers/firmware/Kconfig                            |    2 
 tip2/drivers/pci/Kconfig                                 |    1 
 tip2/drivers/serial/Kconfig                              |    1 
 tip2/drivers/video/Kconfig                               |    2 
 tip2/drivers/xen/Kconfig                                 |  212 +
 tip2/drivers/xen/Makefile                                |   22 
 tip2/drivers/xen/balloon/Makefile                        |    2 
 tip2/drivers/xen/balloon/balloon.c                       |  592 +++
 tip2/drivers/xen/blkback/Makefile                        |    3 
 tip2/drivers/xen/blkback/blkback.c                       |  597 +++
 tip2/drivers/xen/blkback/common.h                        |  145 
 tip2/drivers/xen/blkback/interface.c                     |  184 +
 tip2/drivers/xen/blkback/vbd.c                           |  126 
 tip2/drivers/xen/blkback/xenbus.c                        |  421 ++
 tip2/drivers/xen/blkfront/Kconfig                        |    6 
 tip2/drivers/xen/blkfront/Makefile                       |    5 
 tip2/drivers/xen/blkfront/blkfront.c                     |  819 ++++
 tip2/drivers/xen/blkfront/block.h                        |  165 
 tip2/drivers/xen/blkfront/vbd.c                          |  327 +
 tip2/drivers/xen/blktap/Makefile                         |    3 
 tip2/drivers/xen/blktap/blktap.c                         |  910 ++++
 tip2/drivers/xen/blktap/common.h                         |  110 
 tip2/drivers/xen/blktap/interface.c                      |  146 
 tip2/drivers/xen/blktap/xenbus.c                         |  233 +
 tip2/drivers/xen/char/Makefile                           |    2 
 tip2/drivers/xen/char/mem.c                              |  192 +
 tip2/drivers/xen/console/Makefile                        |    2 
 tip2/drivers/xen/console/console.c                       |  648 +++
 tip2/drivers/xen/console/xencons_ring.c                  |  151 
 tip2/drivers/xen/core/Makefile                           |   11 
 tip2/drivers/xen/core/evtchn.c                           |  863 ++++
 tip2/drivers/xen/core/features.c                         |   29 
 tip2/drivers/xen/core/gnttab.c                           |  464 ++
 tip2/drivers/xen/core/hypervisor_sysfs.c                 |   57 
 tip2/drivers/xen/core/reboot.c                           |  377 ++
 tip2/drivers/xen/core/skbuff.c                           |  144 
 tip2/drivers/xen/core/smpboot.c                          |  576 +++
 tip2/drivers/xen/core/xen_proc.c                         |   29 
 tip2/drivers/xen/core/xen_sysfs.c                        |  311 +
 tip2/drivers/xen/evtchn/Makefile                         |    2 
 tip2/drivers/xen/evtchn/evtchn.c                         |  464 ++
 tip2/drivers/xen/net_driver_util.c                       |   68 
 tip2/drivers/xen/netback/Makefile                        |    5 
 tip2/drivers/xen/netback/common.h                        |  133 
 tip2/drivers/xen/netback/interface.c                     |  334 +
 tip2/drivers/xen/netback/loopback.c                      |  254 +
 tip2/drivers/xen/netback/netback.c                       |  865 ++++
 tip2/drivers/xen/netback/xenbus.c                        |  366 ++
 tip2/drivers/xen/netfront/Kconfig                        |    6 
 tip2/drivers/xen/netfront/Makefile                       |    4 
 tip2/drivers/xen/netfront/netfront.c                     | 1524 ++++++++
 tip2/drivers/xen/pciback/Makefile                        |   10 
 tip2/drivers/xen/pciback/conf_space.c                    |  345 +
 tip2/drivers/xen/pciback/conf_space.h                    |   97 
 tip2/drivers/xen/pciback/conf_space_header.c             |  267 +
 tip2/drivers/xen/pciback/passthrough.c                   |  157 
 tip2/drivers/xen/pciback/pci_stub.c                      |  695 +++
 tip2/drivers/xen/pciback/pciback.h                       |   78 
 tip2/drivers/xen/pciback/pciback_ops.c                   |   74 
 tip2/drivers/xen/pciback/vpci.c                          |  204 +
 tip2/drivers/xen/pciback/xenbus.c                        |  441 ++
 tip2/drivers/xen/pcifront/Makefile                       |    7 
 tip2/drivers/xen/pcifront/pci.c                          |   46 
 tip2/drivers/xen/pcifront/pci_op.c                       |  272 +
 tip2/drivers/xen/pcifront/pcifront.h                     |   40 
 tip2/drivers/xen/pcifront/xenbus.c                       |  294 +
 tip2/drivers/xen/privcmd/Makefile                        |    2 
 tip2/drivers/xen/privcmd/privcmd.c                       |  303 +
 tip2/drivers/xen/tpmback/Makefile                        |    4 
 tip2/drivers/xen/tpmback/common.h                        |   91 
 tip2/drivers/xen/tpmback/interface.c                     |  194 +
 tip2/drivers/xen/tpmback/tpmback.c                       | 1060 +++++
 tip2/drivers/xen/tpmback/xenbus.c                        |  329 +
 tip2/drivers/xen/tpmfront/Makefile                       |    2 
 tip2/drivers/xen/tpmfront/tpmfront.c                     |  768 ++++
 tip2/drivers/xen/tpmfront/tpmfront.h                     |   40 
 tip2/drivers/xen/util.c                                  |   80 
 tip2/drivers/xen/xenbus/Makefile                         |    8 
 tip2/drivers/xen/xenbus/xenbus_client.c                  |  412 ++
 tip2/drivers/xen/xenbus/xenbus_comms.c                   |  218 +
 tip2/drivers/xen/xenbus/xenbus_comms.h                   |   53 
 tip2/drivers/xen/xenbus/xenbus_dev.c                     |  252 +
 tip2/drivers/xen/xenbus/xenbus_probe.c                   | 1083 +++++
 tip2/drivers/xen/xenbus/xenbus_xs.c                      |  856 ++++
 tip2/fs/Kconfig                                          |    1 
 tip2/include/asm-i386/a.out.h                            |    2 
 tip2/include/asm-i386/apic.h                             |    2 
 tip2/include/asm-i386/elf.h                              |    7 
 tip2/include/asm-i386/fixmap.h                           |   13 
 tip2/include/asm-i386/mach-default/mach_traps.h          |   12 
 tip2/include/asm-i386/mach-xen/asm/agp.h                 |   37 
 tip2/include/asm-i386/mach-xen/asm/desc.h                |  164 
 tip2/include/asm-i386/mach-xen/asm/dma-mapping.h         |  156 
 tip2/include/asm-i386/mach-xen/asm/fixmap.h              |  156 
 tip2/include/asm-i386/mach-xen/asm/floppy.h              |  147 
 tip2/include/asm-i386/mach-xen/asm/highmem.h             |   81 
 tip2/include/asm-i386/mach-xen/asm/hw_irq.h              |   73 
 tip2/include/asm-i386/mach-xen/asm/hypercall.h           |  357 +
 tip2/include/asm-i386/mach-xen/asm/hypervisor.h          |  224 +
 tip2/include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 tip2/include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 tip2/include/asm-i386/mach-xen/asm/mmu.h                 |   21 
 tip2/include/asm-i386/mach-xen/asm/mmu_context.h         |  105 
 tip2/include/asm-i386/mach-xen/asm/page.h                |  326 +
 tip2/include/asm-i386/mach-xen/asm/param.h               |   24 
 tip2/include/asm-i386/mach-xen/asm/pci.h                 |  154 
 tip2/include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 tip2/include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 tip2/include/asm-i386/mach-xen/asm/pgtable-2level.h      |   85 
 tip2/include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 tip2/include/asm-i386/mach-xen/asm/pgtable-3level.h      |  183 +
 tip2/include/asm-i386/mach-xen/asm/pgtable.h             |  520 ++
 tip2/include/asm-i386/mach-xen/asm/processor.h           |  756 ++++
 tip2/include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 tip2/include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 tip2/include/asm-i386/mach-xen/asm/segment.h             |  117 
 tip2/include/asm-i386/mach-xen/asm/setup.h               |   64 
 tip2/include/asm-i386/mach-xen/asm/smp.h                 |  104 
 tip2/include/asm-i386/mach-xen/asm/spinlock.h            |  200 +
 tip2/include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 tip2/include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 
 tip2/include/asm-i386/mach-xen/asm/system.h              |  576 +++
 tip2/include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 tip2/include/asm-i386/mach-xen/asm/vga.h                 |   20 
 tip2/include/asm-i386/mach-xen/irq_vectors.h             |  125 
 tip2/include/asm-i386/mach-xen/mach_traps.h              |   33 
 tip2/include/asm-i386/mach-xen/setup_arch_post.h         |   54 
 tip2/include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 tip2/include/asm-i386/page.h                             |    4 
 tip2/include/asm-i386/pgtable-2level-defs.h              |    2 
 tip2/include/asm-i386/pgtable-3level-defs.h              |    2 
 tip2/include/asm-ia64/fixmap.h                           |    2 
 tip2/include/asm-ia64/gcc_intrin.h                       |   60 
 tip2/include/asm-ia64/hypercall.h                        |  274 +
 tip2/include/asm-ia64/hypervisor.h                       |  138 
 tip2/include/asm-ia64/intel_intrin.h                     |   68 
 tip2/include/asm-ia64/meminit.h                          |    5 
 tip2/include/asm-ia64/pal.h                              |    1 
 tip2/include/asm-ia64/privop.h                           |   59 
 tip2/include/asm-ia64/processor.h                        |    1 
 tip2/include/asm-ia64/synch_bitops.h                     |   61 
 tip2/include/asm-ia64/system.h                           |    4 
 tip2/include/asm-ia64/xen/privop.h                       |  277 +
 tip2/include/asm-um/page.h                               |    2 
 tip2/include/asm-x86_64/apic.h                           |    2 
 tip2/include/asm-x86_64/hw_irq.h                         |    2 
 tip2/include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 tip2/include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 tip2/include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 tip2/include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 +
 tip2/include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 tip2/include/asm-x86_64/mach-xen/asm/fixmap.h            |  114 
 tip2/include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 tip2/include/asm-x86_64/mach-xen/asm/hw_irq.h            |  141 
 tip2/include/asm-x86_64/mach-xen/asm/hypercall.h         |  357 +
 tip2/include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 tip2/include/asm-x86_64/mach-xen/asm/io.h                |  327 +
 tip2/include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 tip2/include/asm-x86_64/mach-xen/asm/mmu.h               |   33 
 tip2/include/asm-x86_64/mach-xen/asm/mmu_context.h       |  134 
 tip2/include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 tip2/include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 tip2/include/asm-x86_64/mach-xen/asm/page.h              |  317 +
 tip2/include/asm-x86_64/mach-xen/asm/param.h             |   23 
 tip2/include/asm-x86_64/mach-xen/asm/pci.h               |  174 
 tip2/include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 tip2/include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 +++
 tip2/include/asm-x86_64/mach-xen/asm/processor.h         |  494 ++
 tip2/include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 tip2/include/asm-x86_64/mach-xen/asm/smp.h               |  153 
 tip2/include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 tip2/include/asm-x86_64/mach-xen/asm/system.h            |  428 ++
 tip2/include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 tip2/include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 tip2/include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 tip2/include/asm-x86_64/mach-xen/asm/xor.h               |  328 +
 tip2/include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 tip2/include/asm-x86_64/mach-xen/mach_time.h             |  111 
 tip2/include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 tip2/include/asm-x86_64/mach-xen/setup_arch_post.h       |   41 
 tip2/include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 tip2/include/linux/gfp.h                                 |    6 
 tip2/include/linux/highmem.h                             |    6 
 tip2/include/linux/mm.h                                  |   13 
 tip2/include/linux/pfn.h                                 |    2 
 tip2/include/linux/skbuff.h                              |   13 
 tip2/include/xen/balloon.h                               |   73 
 tip2/include/xen/driver_util.h                           |   26 
 tip2/include/xen/evtchn.h                                |  126 
 tip2/include/xen/features.h                              |   20 
 tip2/include/xen/foreign_page.h                          |   40 
 tip2/include/xen/gnttab.h                                |  126 
 tip2/include/xen/hypervisor_sysfs.h                      |   32 
 tip2/include/xen/interface/acm.h                         |  181 
 tip2/include/xen/interface/acm_ops.h                     |   98 
 tip2/include/xen/interface/arch-ia64.h                   |  337 +
 tip2/include/xen/interface/arch-x86_32.h                 |  200 +
 tip2/include/xen/interface/arch-x86_64.h                 |  273 +
 tip2/include/xen/interface/callback.h                    |   57 
 tip2/include/xen/interface/dom0_ops.h                    |  531 ++
 tip2/include/xen/interface/event_channel.h               |  211 +
 tip2/include/xen/interface/features.h                    |   53 
 tip2/include/xen/interface/grant_table.h                 |  311 +
 tip2/include/xen/interface/hvm/hvm_info_table.h          |   24 
 tip2/include/xen/interface/hvm/ioreq.h                   |   94 
 tip2/include/xen/interface/hvm/vmx_assist.h              |   97 
 tip2/include/xen/interface/io/blkif.h                    |   85 
 tip2/include/xen/interface/io/console.h                  |   33 
 tip2/include/xen/interface/io/netif.h                    |   84 
 tip2/include/xen/interface/io/pciif.h                    |   55 
 tip2/include/xen/interface/io/ring.h                     |  265 +
 tip2/include/xen/interface/io/tpmif.h                    |   56 
 tip2/include/xen/interface/io/xenbus.h                   |   42 
 tip2/include/xen/interface/io/xs_wire.h                  |   97 
 tip2/include/xen/interface/memory.h                      |  155 
 tip2/include/xen/interface/nmi.h                         |   59 
 tip2/include/xen/interface/physdev.h                     |   71 
 tip2/include/xen/interface/sched.h                       |  100 
 tip2/include/xen/interface/sched_ctl.h                   |   64 
 tip2/include/xen/interface/trace.h                       |   86 
 tip2/include/xen/interface/vcpu.h                        |  119 
 tip2/include/xen/interface/version.h                     |   64 
 tip2/include/xen/interface/xen-compat.h                  |   34 
 tip2/include/xen/interface/xen.h                         |  459 ++
 tip2/include/xen/interface/xenoprof.h                    |   72 
 tip2/include/xen/net_driver_util.h                       |   58 
 tip2/include/xen/pcifront.h                              |   39 
 tip2/include/xen/public/evtchn.h                         |  101 
 tip2/include/xen/public/privcmd.h                        |   94 
 tip2/include/xen/tpmfe.h                                 |   40 
 tip2/include/xen/xen_proc.h                              |   23 
 tip2/include/xen/xenbus.h                                |  306 +
 tip2/include/xen/xencons.h                               |   14 
 tip2/kernel/Kconfig.preempt                              |    1 
 tip2/kernel/irq/manage.c                                 |   24 
 tip2/kernel/irq/migration.c                              |    3 
 tip2/lib/Kconfig.debug                                   |   31 
 tip2/lib/Makefile                                        |    3 
 tip2/mm/Kconfig                                          |    3 
 tip2/mm/highmem.c                                        |   11 
 tip2/mm/memory.c                                         |  116 
 tip2/mm/mmap.c                                           |    4 
 tip2/mm/page_alloc.c                                     |    6 
 tip2/net/core/dev.c                                      |   50 
 tip2/net/core/skbuff.c                                   |   41 
 tip2/net/ipv4/netfilter/ip_nat_proto_tcp.c               |    6 
 tip2/net/ipv4/netfilter/ip_nat_proto_udp.c               |    9 
 tip2/scripts/Makefile.xen                                |   14 
 388 files changed, 80006 insertions(+), 856 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-xen.patch	14 Apr 2006 18:11:39 -0000	1.7
+++ linux-2.6-xen.patch	14 Apr 2006 18:57:37 -0000	1.8
@@ -40771,7 +40771,7 @@
  	oprofilefs.o oprofile_stats.o \
  	timer_int.o )
  
-+ifdef
++ifdef CONFIG_XEN
 +OPROFILE-y := xenoprof.o
 +else
  OPROFILE-y := init.o backtrace.o



From fedora-cvs-commits at redhat.com  Fri Apr 14 19:47:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 15:47:07 -0400
Subject: rpms/policycoreutils/devel .cvsignore, 1.107,
	1.108 policycoreutils-rhat.patch, 1.182,
	1.183 policycoreutils.spec, 1.259, 1.260 sources, 1.111, 1.112
Message-ID: <200604141947.k3EJl7dQ002923@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2878

Modified Files:
	.cvsignore policycoreutils-rhat.patch policycoreutils.spec 
	sources 
Log Message:
* Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> 1.30.6-1
- Add /etc/samba/secrets.tdb to restorecond.conf
- Update from upstream
	* Merged semanage prefix support from Russell Coker.
	* Added a test to setfiles to check that the spec file is
	  a regular file.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- .cvsignore	14 Apr 2006 11:51:02 -0000	1.107
+++ .cvsignore	14 Apr 2006 19:47:03 -0000	1.108
@@ -97,3 +97,4 @@
 policycoreutils-1.30.1.tgz
 policycoreutils-1.30.4.tgz
 policycoreutils-1.30.5.tgz
+policycoreutils-1.30.6.tgz

policycoreutils-rhat.patch:
 audit2allow/audit2allow      |  472 ++-------------------------------------
 audit2allow/audit2allow.1    |    5 
 audit2allow/avc.py           |  518 +++++++++++++++++++++++++++++++++++++++++++
 restorecond/restorecond.conf |    2 
 semanage/semanage            |    2 
 semanage/seobject.py         |   14 -
 setsebool/setsebool.8        |    2 
 7 files changed, 572 insertions(+), 443 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- policycoreutils-rhat.patch	14 Apr 2006 13:41:33 -0000	1.182
+++ policycoreutils-rhat.patch	14 Apr 2006 19:47:04 -0000	1.183
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30.5/audit2allow/audit2allow
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30.6/audit2allow/audit2allow
 --- nsapolicycoreutils/audit2allow/audit2allow	2006-03-29 15:35:22.000000000 -0500
-+++ policycoreutils-1.30.5/audit2allow/audit2allow	2006-04-14 07:44:00.000000000 -0400
++++ policycoreutils-1.30.6/audit2allow/audit2allow	2006-04-14 15:07:36.000000000 -0400
 @@ -24,431 +24,8 @@
  #                                        02111-1307  USA
  #
@@ -495,7 +495,7 @@
  			if o == "-R" or o == "--reference":
  				ref_ind=True
  				
-@@ -565,25 +144,37 @@
+@@ -565,25 +144,38 @@
  			if o == "-v" or o == "--verbose":
  				verbose=1
  				
@@ -524,6 +524,7 @@
 +
 +		if analyze:
 +			serules.analyze()
++			sys.exit(0)
  
 -		if auditlogs:
 +		if auditlogs and os.path.exists("/var/log/audit/audit.log"):
@@ -538,9 +539,9 @@
  		output.flush()
  		if buildPP:
  			cmd="checkmodule %s -m -o %s.mod %s.te" % (get_mls_flag(), module, module)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-1.30.5/audit2allow/audit2allow.1
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-1.30.6/audit2allow/audit2allow.1
 --- nsapolicycoreutils/audit2allow/audit2allow.1	2006-03-10 09:48:04.000000000 -0500
-+++ policycoreutils-1.30.5/audit2allow/audit2allow.1	2006-04-14 07:44:00.000000000 -0400
++++ policycoreutils-1.30.6/audit2allow/audit2allow.1	2006-04-14 13:50:16.000000000 -0400
 @@ -98,6 +98,11 @@
  .PP
  .SH EXAMPLE
@@ -553,9 +554,9 @@
  .B Using audit2allow to generate monolithic (non-module) policy
  $ cd /etc/selinux/$SELINUXTYPE/src/policy
  $ cat /var/log/audit/audit.log | audit2allow >> domains/misc/local.te
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/avc.py policycoreutils-1.30.5/audit2allow/avc.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/avc.py policycoreutils-1.30.6/audit2allow/avc.py
 --- nsapolicycoreutils/audit2allow/avc.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.30.5/audit2allow/avc.py	2006-04-14 07:44:00.000000000 -0400
++++ policycoreutils-1.30.6/audit2allow/avc.py	2006-04-14 15:46:22.000000000 -0400
 @@ -0,0 +1,518 @@
 +#! /usr/bin/env python
 +# Copyright (C) 2006 Red Hat 
@@ -989,6 +990,8 @@
 +			self.seRules[key]=serule(key)
 +                if "name" not in AVC.keys():
 +                    AVC["name"]=""
++                if "comm" not in AVC.keys():
++                    AVC["comm"]=""
 +
 +                self.add_avc(AVC)
 +                self.seRules[key].add((AVC["access"], AVC["msg"], AVC["comm"], AVC["name"]))
@@ -1049,11 +1052,9 @@
 +	
 +	def analyze(self):
 +            a=Analyze()
-+            analysys=a.process(self.AVCS)
-+            for i in analysys:
++            for i in a.process(self.AVCS):
 +                print i[0][0]
 +                print ""
-+            sys.exit(0)
 +                
 +	def out(self, require=0, module=""):
 +		rec=""
@@ -1075,9 +1076,9 @@
 +				rec += self.seRules[i].out(self.verbose)+"\n"
 +		return rec
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.30.5/restorecond/restorecond.conf
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.30.6/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2006-03-29 11:08:21.000000000 -0500
-+++ policycoreutils-1.30.5/restorecond/restorecond.conf	2006-04-14 09:40:32.000000000 -0400
++++ policycoreutils-1.30.6/restorecond/restorecond.conf	2006-04-14 13:50:16.000000000 -0400
 @@ -1,4 +1,6 @@
  /etc/resolv.conf
 +/etc/samba/secrets.tdb
@@ -1085,82 +1086,10 @@
  /var/run/utmp
  ~/public_html
 +~/.mozilla/plugins/libflashplayer.so
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.30.5/semanage/semanage
---- nsapolicycoreutils/semanage/semanage	2006-03-29 15:35:22.000000000 -0500
-+++ policycoreutils-1.30.5/semanage/semanage	2006-04-14 07:45:07.000000000 -0400
-@@ -32,7 +32,7 @@
- 		print '\
- semanage {login|user|port|interface|fcontext|translation} -l [-n] \n\
- semanage login -{a|d|m} [-sr] login_name\n\
--semanage user -{a|d|m} [-LrR] selinux_name\n\
-+semanage user -{a|d|m} [-LrRP] selinux_name\n\
- semanage port -{a|d|m} [-tr] [ -p protocol ] port | port_range\n\
- semanage interface -{a|d|m} [-tr] interface_spec\n\
- semanage fcontext -{a|d|m} [-frst] file_spec\n\
-@@ -60,6 +60,7 @@
- 		-p (named pipe) \n\n\
- \
- 	-p, --proto      Port protocol (tcp or udp)\n\
-+	-P, --prefix     Prefix for home directory labeling\n\
- 	-L, --level      Default SELinux Level (MLS/MCS Systems only)\n\
- 	-R, --roles      SELinux Roles (ex: "sysadm_r staff_r")\n\
- 	-T, --trans      SELinux Level Translation (MLS/MCS Systems only)\n\n\
-@@ -83,7 +84,7 @@
- 		valid_option["login"] = []
- 		valid_option["login"] += valid_everyone + [ '-s', '--seuser', '-r', '--range']
- 		valid_option["user"] = []
--		valid_option["user"] += valid_everyone + [ '-L', '--level', '-r', '--range', '-R', '--roles' ] 
-+		valid_option["user"] += valid_everyone + [ '-L', '--level', '-r', '--range', '-R', '--roles', '-P', '--prefix' ] 
- 		valid_option["port"] = []
- 		valid_option["port"] += valid_everyone + [ '-t', '--type', '-r', '--range', '-p', '--protocol' ] 
- 		valid_option["interface"] = []
-@@ -109,6 +110,7 @@
- 		setrans = ""
- 		roles = ""
- 		seuser = ""
-+		prefix = ""
- 		heading=1
- 
- 		add = 0
-@@ -126,7 +128,7 @@
- 		args = sys.argv[2:]
- 
- 		gopts, cmds = getopt.getopt(args,
--					    'adf:lhmnp:s:R:L:r:t:T:',
-+					    'adf:lhmnp:s:R:L:r:t:T:P:',
- 					    ['add',
- 					     'delete',
- 					     'ftype=',
-@@ -140,7 +142,8 @@
- 					     'level=',
- 					     'roles=',
- 					     'type=',
--					     'trans='
-+					     'trans=',
-+					     'prefix='
- 					     ])
- 		for o, a in gopts:
- 			if o not in option_dict[object]:
-@@ -185,6 +188,9 @@
- 			if o == "-p" or o == '--proto':
- 				proto = a
- 
-+			if o == "-P" or o == '--prefix':
-+				prefix = a
-+
- 			if o == "-R" or o == '--roles':
- 				roles = roles + " " + a
- 
-@@ -235,7 +241,7 @@
- 				rlist = roles.split()
- 				if len(rlist) == 0:
- 					raise ValueError("You must specify a role")
--				OBJECT.add(target, rlist, selevel, serange)
-+				OBJECT.add(target, rlist, selevel, serange, prefix)
- 
- 			if object == "port":
- 				OBJECT.add(target, proto, serange, setype)
-@@ -286,6 +292,8 @@
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.30.6/semanage/semanage
+--- nsapolicycoreutils/semanage/semanage	2006-04-14 13:10:51.000000000 -0400
++++ policycoreutils-1.30.6/semanage/semanage	2006-04-14 13:50:16.000000000 -0400
+@@ -292,6 +292,8 @@
  		errorExit("Options Error " + error.msg)
  	except ValueError, error:
  		errorExit(error.args[0])
@@ -1169,49 +1098,19 @@
  	except IOError, error:
  		errorExit(error.args[1])
  	except KeyboardInterrupt, error:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.30.5/semanage/seobject.py
---- nsapolicycoreutils/semanage/seobject.py	2006-03-29 15:35:22.000000000 -0500
-+++ policycoreutils-1.30.5/semanage/seobject.py	2006-04-14 07:47:13.000000000 -0400
-@@ -381,7 +381,7 @@
- 	def __init__(self):
- 		semanageRecords.__init__(self)
- 
--	def add(self, name, roles, selevel, serange):
-+	def add(self, name, roles, selevel, serange, prefix):
- 		if is_mls_enabled == 1:
- 			if serange == "":
- 				serange = "s0"
-@@ -427,6 +427,9 @@
- 				if rc < 0:
- 					raise ValueError("Could not set MLS level for %s" % name)
- 
-+			rc = semanage_user_set_prefix(self.sh, u, prefix)
-+			if rc < 0:
-+				raise ValueError("Could not add prefix %s for %s" % (r, prefix))
- 			(rc,key) = semanage_user_key_extract(self.sh,u)
- 			if rc < 0:
- 				raise ValueError("Could not extract key for %s" % name)
-@@ -451,13 +454,15 @@
- 		semanage_user_key_free(k)
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.30.6/semanage/seobject.py
+--- nsapolicycoreutils/semanage/seobject.py	2006-04-14 13:10:51.000000000 -0400
++++ policycoreutils-1.30.6/semanage/seobject.py	2006-04-14 13:52:19.000000000 -0400
+@@ -455,6 +455,8 @@
  		semanage_user_free(u)
  
--	def modify(self, name, roles = [], selevel = "", serange = ""):
-+ 	def modify(self, name, roles = [], selevel = "", serange = "", prefix = ""):
+ 	def modify(self, name, roles = [], selevel = "", serange = "", prefix = ""):
 +		oldroles=""
 +		newroles = string.join(roles, ' ');
  		try:
--			if len(roles) == 0  and serange == "" and selevel == "":
-+ 			if prefix == "" and len(roles) == 0  and serange == "" and selevel == "":
+ 			if prefix == "" and len(roles) == 0  and serange == "" and selevel == "":
  				if is_mls_enabled == 1:
--					raise ValueError("Requires roles, level or range")
-+ 					raise ValueError("Requires prefix, roles, level or range")
- 				else:
--					raise ValueError("Requires roles")
-+ 					raise ValueError("Requires prefix or roles")
- 
- 			(rc,k) = semanage_user_key_create(self.sh, name)
- 			if rc < 0:
-@@ -473,11 +478,21 @@
+@@ -476,6 +478,13 @@
  			if rc < 0:
  				raise ValueError("Could not query user for %s" % name)
  
@@ -1225,15 +1124,7 @@
  			if serange != "":
  				semanage_user_set_mlsrange(self.sh, u, untranslate(serange))
  			if selevel != "":
- 				semanage_user_set_mlslevel(self.sh, u, untranslate(selevel))
- 
-+			if prefix != "":
-+				semanage_user_set_prefix(self.sh, u, prefix)
-+
- 			if len(roles) != 0:
- 				for r in roles:
- 					semanage_user_add_role(self.sh, u, r)
-@@ -495,10 +510,11 @@
+@@ -501,10 +510,11 @@
  				raise ValueError("Could not modify SELinux user %s" % name)
  
  		except ValueError, error:
@@ -1247,9 +1138,9 @@
  		semanage_user_key_free(k)
  		semanage_user_free(u)
  
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setsebool/setsebool.8 policycoreutils-1.30.5/setsebool/setsebool.8
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setsebool/setsebool.8 policycoreutils-1.30.6/setsebool/setsebool.8
 --- nsapolicycoreutils/setsebool/setsebool.8	2005-11-04 15:37:49.000000000 -0500
-+++ policycoreutils-1.30.5/setsebool/setsebool.8	2006-04-14 07:44:00.000000000 -0400
++++ policycoreutils-1.30.6/setsebool/setsebool.8	2006-04-14 13:50:16.000000000 -0400
 @@ -17,7 +17,7 @@
  are not changed. 
  


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -r1.259 -r1.260
--- policycoreutils.spec	14 Apr 2006 13:41:33 -0000	1.259
+++ policycoreutils.spec	14 Apr 2006 19:47:04 -0000	1.260
@@ -4,8 +4,8 @@
 %define libselinuxver 1.30.3-1
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.30.5
-Release: 2
+Version: 1.30.6
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -108,11 +108,10 @@
 /sbin/service restorecond condrestart
 
 %changelog
-* Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> 1.30.5-2
+* Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> 1.30.6-1
 - Add /etc/samba/secrets.tdb to restorecond.conf
-
-* Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> 1.30.5-1
 - Update from upstream
+	* Merged semanage prefix support from Russell Coker.
 	* Added a test to setfiles to check that the spec file is
 	  a regular file.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- sources	14 Apr 2006 11:51:02 -0000	1.111
+++ sources	14 Apr 2006 19:47:04 -0000	1.112
@@ -1 +1 @@
-b3eba7a93507ee2e576c184854d01610  policycoreutils-1.30.5.tgz
+8debed023798b5de5252be47d5fd1b1b  policycoreutils-1.30.6.tgz



From fedora-cvs-commits at redhat.com  Fri Apr 14 19:50:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 15:50:06 -0400
Subject: rpms/selinux-policy/devel .cvsignore, 1.55,
	1.56 policy-20060411.patch, 1.3, 1.4 selinux-policy.spec,
	1.173, 1.174 sources, 1.59, 1.60
Message-ID: <200604141950.k3EJo6hf004198@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore policy-20060411.patch selinux-policy.spec sources 
Log Message:
* Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> 2.2.32-1
- Update to latest from upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	13 Apr 2006 21:28:19 -0000	1.55
+++ .cvsignore	14 Apr 2006 19:50:03 -0000	1.56
@@ -56,3 +56,4 @@
 serefpolicy-2.2.29.tgz
 serefpolicy-2.2.30.tgz
 serefpolicy-2.2.31.tgz
+serefpolicy-2.2.32.tgz

policy-20060411.patch:
 Rules.modular                           |    2 -
 policy/mcs                              |    6 ++-
 policy/modules/admin/amanda.te          |    5 ++
 policy/modules/admin/bootloader.te      |    1 
 policy/modules/admin/rpm.fc             |    1 
 policy/modules/admin/su.fc              |    2 -
 policy/modules/admin/usermanage.te      |    1 
 policy/modules/apps/java.fc             |    9 +---
 policy/modules/apps/java.te             |    1 
 policy/modules/apps/mono.te             |    6 +++
 policy/modules/kernel/corecommands.fc   |   20 ++++++----
 policy/modules/kernel/devices.fc        |    3 +
 policy/modules/kernel/devices.if        |   24 +++++++++++-
 policy/modules/kernel/files.fc          |   37 ++++++++++++-------
 policy/modules/kernel/files.if          |   27 ++++++++++++++
 policy/modules/kernel/kernel.if         |    3 +
 policy/modules/kernel/mcs.te            |    4 ++
 policy/modules/kernel/mls.te            |    1 
 policy/modules/services/avahi.te        |    1 
 policy/modules/services/bind.fc         |    1 
 policy/modules/services/ftp.te          |    1 
 policy/modules/services/hal.te          |    1 
 policy/modules/services/kerberos.fc     |    4 +-
 policy/modules/services/mailman.if      |   38 ++++++++++++++++++++
 policy/modules/services/postfix.te      |    3 +
 policy/modules/services/postgresql.if   |    2 +
 policy/modules/services/rpc.te          |    4 +-
 policy/modules/services/samba.if        |    1 
 policy/modules/services/samba.te        |   12 +++++-
 policy/modules/services/spamassassin.fc |    2 -
 policy/modules/services/tftp.fc         |    3 +
 policy/modules/services/xserver.if      |   21 +++++++++++
 policy/modules/system/authlogin.fc      |    3 +
 policy/modules/system/authlogin.te      |    4 ++
 policy/modules/system/daemontools.fc    |    3 +
 policy/modules/system/fstools.te        |    1 
 policy/modules/system/init.te           |    1 
 policy/modules/system/libraries.fc      |   60 +++++++++++++++++++-------------
 policy/modules/system/miscfiles.fc      |    2 -
 policy/modules/system/modutils.fc       |    6 ++-
 policy/modules/system/selinuxutil.if    |    4 +-
 policy/modules/system/unconfined.te     |    3 +
 policy/modules/system/userdomain.if     |   28 ++++++++++----
 policy/modules/system/xen.te            |    5 ++
 44 files changed, 286 insertions(+), 81 deletions(-)

Index: policy-20060411.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060411.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- policy-20060411.patch	13 Apr 2006 20:33:48 -0000	1.3
+++ policy-20060411.patch	14 Apr 2006 19:50:03 -0000	1.4
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.31/policy/mcs
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.32/policy/mcs
 --- nsaserefpolicy/policy/mcs	2006-03-29 11:23:41.000000000 -0500
-+++ serefpolicy-2.2.31/policy/mcs	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/mcs	2006-04-14 12:06:19.000000000 -0400
 @@ -134,14 +134,18 @@
  # the high range of the file.  We use the high range of the process so
  # that processes can always simply run at s0.
@@ -21,9 +21,9 @@
  mlsconstrain file { read }
  	(( h1 dom h2 ) or ( t2 == domain ) or ( t1 == mlsfileread ));
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.2.31/policy/modules/admin/amanda.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.2.32/policy/modules/admin/amanda.te
 --- nsaserefpolicy/policy/modules/admin/amanda.te	2006-03-24 11:15:40.000000000 -0500
-+++ serefpolicy-2.2.31/policy/modules/admin/amanda.te	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/admin/amanda.te	2006-04-14 12:06:19.000000000 -0400
 @@ -9,6 +9,7 @@
  type amanda_t;
  type amanda_inetd_exec_t;
@@ -49,9 +49,9 @@
  allow amanda_recover_t self:process { sigkill sigstop signal };
  allow amanda_recover_t self:fifo_file { getattr ioctl read write };
  allow amanda_recover_t self:unix_stream_socket { connect create read write };
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.31/policy/modules/admin/bootloader.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.32/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-04-04 18:06:37.000000000 -0400
-+++ serefpolicy-2.2.31/policy/modules/admin/bootloader.te	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/admin/bootloader.te	2006-04-14 12:06:19.000000000 -0400
 @@ -84,6 +84,7 @@
  dev_read_sysfs(bootloader_t)
  # for reading BIOS data
@@ -60,9 +60,9 @@
  
  fs_getattr_xattr_fs(bootloader_t)
  fs_read_tmpfs_symlinks(bootloader_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.2.31/policy/modules/admin/rpm.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.2.32/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-04-04 18:06:37.000000000 -0400
-+++ serefpolicy-2.2.31/policy/modules/admin/rpm.fc	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/admin/rpm.fc	2006-04-14 12:06:19.000000000 -0400
 @@ -10,6 +10,7 @@
  /usr/lib(64)?/rpm/rpmv		-- 	gen_context(system_u:object_r:bin_t,s0)
  
@@ -71,9 +71,9 @@
  
  ifdef(`distro_redhat', `
  /usr/bin/fedora-rmdevelrpms	--	gen_context(system_u:object_r:rpm_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.fc serefpolicy-2.2.31/policy/modules/admin/su.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.fc serefpolicy-2.2.32/policy/modules/admin/su.fc
 --- nsaserefpolicy/policy/modules/admin/su.fc	2006-03-23 14:33:29.000000000 -0500
-+++ serefpolicy-2.2.31/policy/modules/admin/su.fc	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/admin/su.fc	2006-04-14 12:06:19.000000000 -0400
 @@ -1,5 +1,5 @@
  
  /bin/su			--	gen_context(system_u:object_r:su_exec_t,s0)
@@ -81,9 +81,9 @@
 -/usr(/local)?/bin/ksu	--	gen_context(system_u:object_r:su_exec_t,s0)
 +/usr/(local/)?bin/ksu	--	gen_context(system_u:object_r:su_exec_t,s0)
  /usr/bin/kdesu		--	gen_context(system_u:object_r:su_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.2.31/policy/modules/admin/usermanage.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.2.32/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.2.31/policy/modules/admin/usermanage.te	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/admin/usermanage.te	2006-04-14 12:06:19.000000000 -0400
 @@ -514,6 +514,7 @@
  # Add/remove user home directories
  userdom_home_filetrans_generic_user_home_dir(useradd_t)
@@ -92,9 +92,9 @@
  userdom_generic_user_home_dir_filetrans_generic_user_home_content(useradd_t,notdevfile_class_set)
  
  mta_manage_spool(useradd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.2.31/policy/modules/apps/java.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.2.32/policy/modules/apps/java.fc
 --- nsaserefpolicy/policy/modules/apps/java.fc	2006-04-12 13:44:36.000000000 -0400
-+++ serefpolicy-2.2.31/policy/modules/apps/java.fc	2006-04-13 16:12:57.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/apps/java.fc	2006-04-14 12:06:19.000000000 -0400
 @@ -1,11 +1,8 @@
  #
 -# /opt
@@ -110,9 +110,9 @@
  /usr/bin/gcj-dbtool	--	gen_context(system_u:object_r:java_exec_t,s0)
  /usr/bin/gij		--	gen_context(system_u:object_r:java_exec_t,s0)
 +/opt/(.*/)?bin/java([^/]*)? 	--	gen_context(system_u:object_r:java_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-2.2.31/policy/modules/apps/java.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-2.2.32/policy/modules/apps/java.te
 --- nsaserefpolicy/policy/modules/apps/java.te	2006-04-12 13:44:36.000000000 -0400
-+++ serefpolicy-2.2.31/policy/modules/apps/java.te	2006-04-13 15:36:02.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/apps/java.te	2006-04-14 12:06:19.000000000 -0400
 @@ -10,6 +10,7 @@
  domain_type(java_t)
  
@@ -121,9 +121,9 @@
  files_type(java_exec_t)
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.2.31/policy/modules/apps/mono.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.2.32/policy/modules/apps/mono.te
 --- nsaserefpolicy/policy/modules/apps/mono.te	2006-04-12 13:44:36.000000000 -0400
-+++ serefpolicy-2.2.31/policy/modules/apps/mono.te	2006-04-13 16:32:05.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/apps/mono.te	2006-04-14 12:06:19.000000000 -0400
 @@ -22,6 +22,8 @@
  	unconfined_domain_noaudit(mono_t)
  	role system_r types mono_t;
@@ -142,9 +142,9 @@
 +	')
 +
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.2.31/policy/modules/kernel/corecommands.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.2.32/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-04-10 17:05:08.000000000 -0400
-+++ serefpolicy-2.2.31/policy/modules/kernel/corecommands.fc	2006-04-13 14:39:12.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/kernel/corecommands.fc	2006-04-14 12:06:19.000000000 -0400
 @@ -2,7 +2,8 @@
  #
  # /bin
@@ -193,9 +193,9 @@
  
  /usr/lib/ccache/bin(/.*)?		gen_context(system_u:object_r:bin_t,s0)
  /usr/lib/pgsql/test/regress/.*\.sh --	gen_context(system_u:object_r:bin_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.31/policy/modules/kernel/devices.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.32/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-04-12 13:44:36.000000000 -0400
-+++ serefpolicy-2.2.31/policy/modules/kernel/devices.fc	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/kernel/devices.fc	2006-04-14 12:06:19.000000000 -0400
 @@ -1,5 +1,6 @@
  
 -/dev(/.*)?			gen_context(system_u:object_r:device_t,s0)
@@ -204,9 +204,9 @@
  
  /dev/.*mouse.*		-c	gen_context(system_u:object_r:mouse_device_t,s0)
  /dev/adsp		-c	gen_context(system_u:object_r:sound_device_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.31/policy/modules/kernel/devices.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.32/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2006-04-12 13:44:36.000000000 -0400
-+++ serefpolicy-2.2.31/policy/modules/kernel/devices.if	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/kernel/devices.if	2006-04-14 12:06:19.000000000 -0400
 @@ -2701,7 +2701,7 @@
  	')
  
@@ -249,9 +249,9 @@
 +	dontaudit $1 device_node:dir_file_class_set getattr;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.31/policy/modules/kernel/files.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.32/policy/modules/kernel/files.fc
 --- nsaserefpolicy/policy/modules/kernel/files.fc	2006-03-23 14:33:29.000000000 -0500
-+++ serefpolicy-2.2.31/policy/modules/kernel/files.fc	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/kernel/files.fc	2006-04-14 12:06:19.000000000 -0400
 @@ -25,7 +25,8 @@
  #
  # /boot
@@ -360,9 +360,9 @@
  /var/\.journal			<<none>>
  
  /var/db/.*\.db		--	gen_context(system_u:object_r:etc_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.31/policy/modules/kernel/files.if
---- nsaserefpolicy/policy/modules/kernel/files.if	2006-04-10 17:05:10.000000000 -0400
-+++ serefpolicy-2.2.31/policy/modules/kernel/files.if	2006-04-13 12:53:30.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.32/policy/modules/kernel/files.if
+--- nsaserefpolicy/policy/modules/kernel/files.if	2006-04-14 07:58:12.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/kernel/files.if	2006-04-14 12:06:19.000000000 -0400
 @@ -948,6 +948,18 @@
  
  ########################################
@@ -404,9 +404,9 @@
  ## <summary>
  ##	Read files in /etc that are dynamically
  ##	created on boot, such as mtab.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.31/policy/modules/kernel/kernel.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.32/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-04-10 17:05:10.000000000 -0400
-+++ serefpolicy-2.2.31/policy/modules/kernel/kernel.if	2006-04-13 15:25:54.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/kernel/kernel.if	2006-04-14 12:06:19.000000000 -0400
 @@ -1148,7 +1148,8 @@
  
  	allow $1 proc_t:dir search;
@@ -417,9 +417,9 @@
  	allow $1 sysctl_vm_t:file rw_file_perms;
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mcs.te serefpolicy-2.2.31/policy/modules/kernel/mcs.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mcs.te serefpolicy-2.2.32/policy/modules/kernel/mcs.te
 --- nsaserefpolicy/policy/modules/kernel/mcs.te	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.2.31/policy/modules/kernel/mcs.te	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/kernel/mcs.te	2006-04-14 12:06:19.000000000 -0400
 @@ -32,6 +32,10 @@
  type xdm_exec_t;
  
@@ -431,9 +431,9 @@
  range_transition getty_t login_exec_t s0 - s0:c0.c255;
  range_transition init_t xdm_exec_t s0 - s0:c0.c255;
  range_transition initrc_t crond_exec_t s0 - s0:c0.c255;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.31/policy/modules/kernel/mls.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.32/policy/modules/kernel/mls.te
 --- nsaserefpolicy/policy/modules/kernel/mls.te	2006-03-07 10:31:09.000000000 -0500
-+++ serefpolicy-2.2.31/policy/modules/kernel/mls.te	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/kernel/mls.te	2006-04-14 12:06:19.000000000 -0400
 @@ -60,6 +60,7 @@
  
  ifdef(`enable_mls',`
@@ -442,9 +442,9 @@
  range_transition kernel_t init_exec_t s0 - s15:c0.c255;
  range_transition kernel_t lvm_exec_t s0 - s15:c0.c255;
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.2.31/policy/modules/services/avahi.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.2.32/policy/modules/services/avahi.te
 --- nsaserefpolicy/policy/modules/services/avahi.te	2006-03-24 11:15:50.000000000 -0500
-+++ serefpolicy-2.2.31/policy/modules/services/avahi.te	2006-04-13 16:17:29.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/services/avahi.te	2006-04-14 12:06:19.000000000 -0400
 @@ -92,6 +92,7 @@
  	dbus_system_bus_client_template(avahi,avahi_t)
  	dbus_connect_system_bus(avahi_t)
@@ -453,9 +453,9 @@
  ')
  
  optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.fc serefpolicy-2.2.31/policy/modules/services/bind.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.fc serefpolicy-2.2.32/policy/modules/services/bind.fc
 --- nsaserefpolicy/policy/modules/services/bind.fc	2006-01-16 17:04:24.000000000 -0500
-+++ serefpolicy-2.2.31/policy/modules/services/bind.fc	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/services/bind.fc	2006-04-14 12:06:19.000000000 -0400
 @@ -29,6 +29,7 @@
  
  ifdef(`distro_redhat',`
@@ -464,9 +464,20 @@
  /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)
  /var/named/data(/.*)?		gen_context(system_u:object_r:named_cache_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.31/policy/modules/services/hal.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.2.32/policy/modules/services/ftp.te
+--- nsaserefpolicy/policy/modules/services/ftp.te	2006-04-12 13:44:37.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/services/ftp.te	2006-04-14 13:41:32.000000000 -0400
+@@ -126,6 +126,7 @@
+ seutil_dontaudit_search_config(ftpd_t)
+ 
+ sysnet_read_config(ftpd_t)
++sysnet_use_ldap(ftpd_t)
+ 
+ userdom_dontaudit_search_sysadm_home_dirs(ftpd_t)
+ userdom_dontaudit_use_unpriv_user_fds(ftpd_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.32/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2006-04-12 13:44:37.000000000 -0400
-+++ serefpolicy-2.2.31/policy/modules/services/hal.te	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/services/hal.te	2006-04-14 12:06:19.000000000 -0400
 @@ -103,6 +103,7 @@
  fs_getattr_all_fs(hald_t)
  fs_search_all(hald_t)
@@ -475,9 +486,9 @@
  
  mls_file_read_up(hald_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.fc serefpolicy-2.2.31/policy/modules/services/kerberos.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.fc serefpolicy-2.2.32/policy/modules/services/kerberos.fc
 --- nsaserefpolicy/policy/modules/services/kerberos.fc	2005-10-06 17:29:17.000000000 -0400
-+++ serefpolicy-2.2.31/policy/modules/services/kerberos.fc	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/services/kerberos.fc	2006-04-14 12:06:19.000000000 -0400
 @@ -5,8 +5,8 @@
  /etc/krb5kdc/kadm5.keytab 	--	gen_context(system_u:object_r:krb5_keytab_t,s0)
  /etc/krb5kdc/principal.*		gen_context(system_u:object_r:krb5kdc_principal_t,s0)
@@ -489,9 +500,9 @@
  
  /usr/local/var/krb5kdc(/.*)?		gen_context(system_u:object_r:krb5kdc_conf_t,s0)
  /usr/local/var/krb5kdc/principal.*	gen_context(system_u:object_r:krb5kdc_principal_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-2.2.31/policy/modules/services/mailman.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-2.2.32/policy/modules/services/mailman.if
 --- nsaserefpolicy/policy/modules/services/mailman.if	2006-03-24 11:15:50.000000000 -0500
-+++ serefpolicy-2.2.31/policy/modules/services/mailman.if	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/services/mailman.if	2006-04-14 12:06:19.000000000 -0400
 @@ -200,6 +200,44 @@
  
  #######################################
@@ -537,9 +548,9 @@
  ##	List the contents of mailman data directories.
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.31/policy/modules/services/postfix.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.32/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.2.31/policy/modules/services/postfix.te	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/services/postfix.te	2006-04-14 12:06:19.000000000 -0400
 @@ -408,6 +408,9 @@
  
  optional_policy(`
@@ -550,9 +561,19 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.2.31/policy/modules/services/rpc.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.if serefpolicy-2.2.32/policy/modules/services/postgresql.if
+--- nsaserefpolicy/policy/modules/services/postgresql.if	2006-02-10 17:05:19.000000000 -0500
++++ serefpolicy-2.2.32/policy/modules/services/postgresql.if	2006-04-14 12:06:19.000000000 -0400
+@@ -119,4 +119,6 @@
+ 	files_search_pids($1)
+ 	allow $1 postgresql_t:unix_stream_socket connectto;
+ 	allow $1 postgresql_var_run_t:sock_file write;
++        # Some versions of postgresql put the sock file in /tmp
++	allow $1 postgresql_tmp_t:sock_file write;
+ ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.2.32/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2006-03-24 11:15:50.000000000 -0500
-+++ serefpolicy-2.2.31/policy/modules/services/rpc.te	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/services/rpc.te	2006-04-14 12:06:19.000000000 -0400
 @@ -110,13 +110,13 @@
  portmap_udp_chat(nfsd_t)
  
@@ -569,9 +590,9 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-2.2.31/policy/modules/services/samba.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-2.2.32/policy/modules/services/samba.if
 --- nsaserefpolicy/policy/modules/services/samba.if	2006-02-21 14:35:36.000000000 -0500
-+++ serefpolicy-2.2.31/policy/modules/services/samba.if	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/services/samba.if	2006-04-14 12:06:19.000000000 -0400
 @@ -33,6 +33,7 @@
  	')
  
@@ -580,10 +601,39 @@
  		userdom_manage_user_home_content_files($1,smbd_t)
  		userdom_manage_user_home_content_symlinks($1,smbd_t)
  		userdom_manage_user_home_content_sockets($1,smbd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.31/policy/modules/services/samba.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.32/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2006-04-12 13:44:37.000000000 -0400
-+++ serefpolicy-2.2.31/policy/modules/services/samba.te	2006-04-13 12:53:30.000000000 -0400
-@@ -333,6 +333,13 @@
++++ serefpolicy-2.2.32/policy/modules/services/samba.te	2006-04-14 13:42:57.000000000 -0400
+@@ -106,8 +106,8 @@
+ files_tmp_filetrans(samba_net_t, samba_net_tmp_t, { file dir })
+ 
+ allow samba_net_t samba_var_t:dir rw_dir_perms;
++allow samba_net_t samba_var_t:file create_file_perms;
+ allow samba_net_t samba_var_t:lnk_file create_lnk_perms;
+-allow samba_net_t samba_var_t:file create_lnk_perms;
+ 
+ kernel_read_proc_symlinks(samba_net_t)
+ 
+@@ -160,8 +160,10 @@
+ 	corenet_non_ipsec_sendrecv(samba_net_t)
+ 	corenet_tcp_bind_all_nodes(samba_net_t)
+ 	sysnet_read_config(samba_net_t)
++        corenet_tcp_connect_ldap_port(samba_net_t)
+ ')
+ 
++
+ optional_policy(`
+ 	nscd_socket_use(samba_net_t)
+ ')
+@@ -268,6 +270,7 @@
+ 
+ init_use_fds(smbd_t)
+ init_use_script_ptys(smbd_t)
++init_rw_utmp(smbd_t)
+ 
+ libs_use_ld_so(smbd_t)
+ libs_use_shared_libs(smbd_t)
+@@ -333,6 +336,13 @@
  ')
  allow smbd_t mtrr_device_t:file getattr;
  
@@ -597,9 +647,19 @@
  ########################################
  #
  # nmbd Local policy
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.fc serefpolicy-2.2.31/policy/modules/services/tftp.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-2.2.32/policy/modules/services/spamassassin.fc
+--- nsaserefpolicy/policy/modules/services/spamassassin.fc	2005-12-01 17:57:16.000000000 -0500
++++ serefpolicy-2.2.32/policy/modules/services/spamassassin.fc	2006-04-14 12:06:19.000000000 -0400
+@@ -1,5 +1,5 @@
+ 
+-/usr/bin/sa-learn	--	gen_context(system_u:object_r:spamd_exec_t,s0)
++/usr/bin/sa-learn	--	gen_context(system_u:object_r:spamc_exec_t,s0)
+ /usr/bin/spamc		--	gen_context(system_u:object_r:spamc_exec_t,s0)
+ /usr/bin/spamd		--	gen_context(system_u:object_r:spamd_exec_t,s0)
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.fc serefpolicy-2.2.32/policy/modules/services/tftp.fc
 --- nsaserefpolicy/policy/modules/services/tftp.fc	2005-10-06 17:29:17.000000000 -0400
-+++ serefpolicy-2.2.31/policy/modules/services/tftp.fc	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/services/tftp.fc	2006-04-14 12:06:19.000000000 -0400
 @@ -2,4 +2,5 @@
  /usr/sbin/atftpd	--	gen_context(system_u:object_r:tftpd_exec_t,s0)
  /usr/sbin/in\.tftpd	--	gen_context(system_u:object_r:tftpd_exec_t,s0)
@@ -607,9 +667,9 @@
 -/tftpboot(/.*)?			gen_context(system_u:object_r:tftpdir_t,s0)
 +/tftpboot		-d	gen_context(system_u:object_r:tftpdir_t,s0)
 +/tftpboot/.*			gen_context(system_u:object_r:tftpdir_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.31/policy/modules/services/xserver.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.32/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2006-04-06 15:31:54.000000000 -0400
-+++ serefpolicy-2.2.31/policy/modules/services/xserver.if	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/services/xserver.if	2006-04-14 12:06:19.000000000 -0400
 @@ -1070,3 +1070,24 @@
  
  	dontaudit $1 xdm_xserver_t:tcp_socket { read write };
@@ -635,9 +695,9 @@
 +	allow $1 xdm_xserver_tmp_t:sock_file { read write };
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.fc serefpolicy-2.2.31/policy/modules/system/authlogin.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.fc serefpolicy-2.2.32/policy/modules/system/authlogin.fc
 --- nsaserefpolicy/policy/modules/system/authlogin.fc	2006-01-19 17:48:34.000000000 -0500
-+++ serefpolicy-2.2.31/policy/modules/system/authlogin.fc	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/system/authlogin.fc	2006-04-14 12:06:19.000000000 -0400
 @@ -7,7 +7,8 @@
  /etc/passwd\.lock	--	gen_context(system_u:object_r:shadow_t,s0)
  /etc/shadow.*		--	gen_context(system_u:object_r:shadow_t,s0)
@@ -648,9 +708,26 @@
  
  /sbin/pam_console_apply	 --	gen_context(system_u:object_r:pam_console_exec_t,s0)
  /sbin/pam_timestamp_check --	gen_context(system_u:object_r:pam_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/daemontools.fc serefpolicy-2.2.31/policy/modules/system/daemontools.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.32/policy/modules/system/authlogin.te
+--- nsaserefpolicy/policy/modules/system/authlogin.te	2006-04-04 18:06:38.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/system/authlogin.te	2006-04-14 12:06:19.000000000 -0400
+@@ -173,9 +173,13 @@
+ dev_setattr_video_dev(pam_console_t)
+ dev_getattr_xserver_misc_dev(pam_console_t)
+ dev_setattr_xserver_misc_dev(pam_console_t)
++dev_read_urand(pam_console_t)
+ 
+ fs_search_auto_mountpoints(pam_console_t)
+ 
++miscfiles_read_localization(pam_console_t)
++miscfiles_read_certs(pam_console_t)
++
+ storage_getattr_fixed_disk_dev(pam_console_t)
+ storage_setattr_fixed_disk_dev(pam_console_t)
+ storage_getattr_removable_dev(pam_console_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/daemontools.fc serefpolicy-2.2.32/policy/modules/system/daemontools.fc
 --- nsaserefpolicy/policy/modules/system/daemontools.fc	2006-04-05 11:35:09.000000000 -0400
-+++ serefpolicy-2.2.31/policy/modules/system/daemontools.fc	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/system/daemontools.fc	2006-04-14 12:06:19.000000000 -0400
 @@ -2,7 +2,8 @@
  # /service
  #
@@ -661,9 +738,9 @@
  
  #
  # /usr
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.31/policy/modules/system/fstools.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.32/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.2.31/policy/modules/system/fstools.te	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/system/fstools.te	2006-04-14 12:06:19.000000000 -0400
 @@ -77,6 +77,7 @@
  dev_getattr_usbfs_dirs(fsadm_t)
  # Access to /dev/mapper/control
@@ -672,9 +749,9 @@
  
  fs_search_auto_mountpoints(fsadm_t)
  fs_getattr_xattr_fs(fsadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.31/policy/modules/system/init.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.32/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2006-04-06 15:32:43.000000000 -0400
-+++ serefpolicy-2.2.31/policy/modules/system/init.te	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/system/init.te	2006-04-14 12:06:19.000000000 -0400
 @@ -352,6 +352,7 @@
  files_mounton_isid_type_dirs(initrc_t)
  files_list_default(initrc_t)
@@ -683,9 +760,9 @@
  
  libs_rw_ld_so_cache(initrc_t)
  libs_use_ld_so(initrc_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.31/policy/modules/system/libraries.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.32/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-04-12 13:44:38.000000000 -0400
-+++ serefpolicy-2.2.31/policy/modules/system/libraries.fc	2006-04-13 16:25:13.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/system/libraries.fc	2006-04-14 12:06:19.000000000 -0400
 @@ -24,17 +24,22 @@
  #
  # /lib(64)?
@@ -755,19 +832,18 @@
  /usr/lib(64)?/libsipphoneapi\.so.*	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
  /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libGLU\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -74,9 +83,9 @@
+@@ -74,9 +83,8 @@
  /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libGL(core)?\.so(\.[^/]*)*             --      	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libnvidia.*\.so(\.[^/]*)*              --      	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libXvMCNVIDIA\.so.*            --      	gen_context(system_u:object_r:textrel_shlib_t,s0)
 -/usr/lib(64)?/vmware(.*/)?/VmPerl\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/lib(64)?/vmware(.*/)?VmPerl\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
 -/usr/(local/)?lib/wine/.*\.so  		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/(local/)?lib(64)?/wine/.*\.so  		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/(local/)?lib/libfame-.*\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/local/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
  
-@@ -127,7 +136,7 @@
+@@ -127,7 +135,7 @@
  /usr/lib(64)?/.*/program/libsvx680li\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/.*/program/libcomphelp4gcc3\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/.*/program/libsoffice\.so  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -776,8 +852,12 @@
  
  /usr/lib(64)?/firefox.*\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/mozilla.*\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -182,13 +191,13 @@
+@@ -180,15 +188,17 @@
+ 
+ # vmware 
  /usr/lib(64)?/vmware/lib(/.*)?/libgdk-x11-.*\.so.*  -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/vmware/lib(/.*)?/HConfig.so  -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/vmware/(.*/)?VmPerl\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
  # Java, Sun Microsystems (JPackage SRPM)
 -/usr/.*/jre.*/libdeploy.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -796,9 +876,15 @@
  ') dnl end distro_redhat
  
  ifdef(`distro_suse',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.2.31/policy/modules/system/miscfiles.fc
+@@ -214,3 +224,5 @@
+ /var/spool/postfix/lib(64)?/lib.*\.so.*	--	gen_context(system_u:object_r:shlib_t,s0)
+ /var/spool/postfix/lib(64)?/[^/]*/lib.*\.so.* -- gen_context(system_u:object_r:shlib_t,s0)
+ /var/spool/postfix/lib(64)?/devfsd/.*\.so.* -- gen_context(system_u:object_r:shlib_t,s0)
++/usr/NX/lib/libXcomp.so.*	--  gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/NX/lib/libjpeg.so.* 	--  gen_context(system_u:object_r:textrel_shlib_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.2.32/policy/modules/system/miscfiles.fc
 --- nsaserefpolicy/policy/modules/system/miscfiles.fc	2005-10-27 14:57:47.000000000 -0400
-+++ serefpolicy-2.2.31/policy/modules/system/miscfiles.fc	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/system/miscfiles.fc	2006-04-14 12:06:19.000000000 -0400
 @@ -7,7 +7,7 @@
  #
  # /opt
@@ -808,9 +894,9 @@
  
  #
  # /srv
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.fc serefpolicy-2.2.31/policy/modules/system/modutils.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.fc serefpolicy-2.2.32/policy/modules/system/modutils.fc
 --- nsaserefpolicy/policy/modules/system/modutils.fc	2005-10-06 17:29:17.000000000 -0400
-+++ serefpolicy-2.2.31/policy/modules/system/modutils.fc	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/system/modutils.fc	2006-04-14 12:06:19.000000000 -0400
 @@ -2,9 +2,11 @@
  /etc/modules\.conf.*	--	gen_context(system_u:object_r:modules_conf_t,s0)
  /etc/modprobe\.conf.*	--	gen_context(system_u:object_r:modules_conf_t,s0)
@@ -825,20 +911,10 @@
  
  /sbin/depmod.*		--	gen_context(system_u:object_r:depmod_exec_t,s0)
  /sbin/generate-modprobe\.conf -- gen_context(system_u:object_r:update_modules_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.31/policy/modules/system/selinuxutil.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.32/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2006-03-29 14:18:17.000000000 -0500
-+++ serefpolicy-2.2.31/policy/modules/system/selinuxutil.if	2006-04-13 15:29:28.000000000 -0400
-@@ -623,7 +623,8 @@
- 	')
- 
- 	files_search_etc($1)
--	allow $1 selinux_config_t:dir rw_dir_perms;
-+	# semanage wants to rmdir 
-+	allow $1 selinux_config_t:dir { rmdir rw_dir_perms };
- 	allow $1 selinux_config_t:file manage_file_perms;
- 	allow $1 selinux_config_t:lnk_file { getattr read };
- ')
-@@ -697,8 +698,8 @@
++++ serefpolicy-2.2.32/policy/modules/system/selinuxutil.if	2006-04-14 12:06:19.000000000 -0400
+@@ -697,8 +697,8 @@
  
  	files_search_etc($1)
  	allow $1 selinux_config_t:dir search;
@@ -849,10 +925,18 @@
  	allow $1 file_context_t:lnk_file { getattr read };
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.31/policy/modules/system/unconfined.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.32/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-04-12 13:44:38.000000000 -0400
-+++ serefpolicy-2.2.31/policy/modules/system/unconfined.te	2006-04-13 15:21:35.000000000 -0400
-@@ -64,6 +64,8 @@
++++ serefpolicy-2.2.32/policy/modules/system/unconfined.te	2006-04-14 12:06:19.000000000 -0400
+@@ -37,6 +37,7 @@
+ 	logging_domtrans_auditctl(unconfined_t)
+ 
+ 	seutil_domtrans_restorecon(unconfined_t)
++	seutil_domtrans_semanage(unconfined_t)
+ 
+ 	userdom_unconfined(unconfined_t)
+ 	userdom_priveleged_home_dir_manager(unconfined_t)
+@@ -64,6 +65,8 @@
  	optional_policy(`
  		dbus_stub(unconfined_t)
  
@@ -861,10 +945,32 @@
  		optional_policy(`
  			avahi_dbus_chat(unconfined_t)
  		')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.31/policy/modules/system/userdomain.if
---- nsaserefpolicy/policy/modules/system/userdomain.if	2006-04-11 16:58:42.000000000 -0400
-+++ serefpolicy-2.2.31/policy/modules/system/userdomain.if	2006-04-13 12:53:30.000000000 -0400
-@@ -4132,11 +4132,31 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.32/policy/modules/system/userdomain.if
+--- nsaserefpolicy/policy/modules/system/userdomain.if	2006-04-14 07:58:13.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/system/userdomain.if	2006-04-14 12:06:19.000000000 -0400
+@@ -379,10 +379,6 @@
+ 	')
+ 
+ 	optional_policy(`
+-		jabber_tcp_connect($1_t)
+-	')
+-
+-	optional_policy(`
+ 		nis_use_ypbind($1_t)
+ 	')
+ 
+@@ -408,10 +404,6 @@
+ 	')
+ 
+ 	optional_policy(`
+-		perdition_tcp_connect($1_t)
+-	')
+-
+-	optional_policy(`
+ 		portmap_tcp_connect($1_t)
+ 	')
+ 
+@@ -4140,11 +4132,31 @@
  		type user_home_dir_t;
  	')
  
@@ -896,9 +1002,9 @@
  ##	Search generic user home directories.
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.2.31/policy/modules/system/xen.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.2.32/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-03-23 14:33:30.000000000 -0500
-+++ serefpolicy-2.2.31/policy/modules/system/xen.te	2006-04-13 12:53:30.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/system/xen.te	2006-04-14 12:06:19.000000000 -0400
 @@ -19,6 +19,8 @@
  # var/lib files
  type xend_var_lib_t;
@@ -925,3 +1031,15 @@
  
  init_use_fds(xenstored_t)
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.2.32/Rules.modular
+--- nsaserefpolicy/Rules.modular	2006-03-23 14:33:29.000000000 -0500
++++ serefpolicy-2.2.32/Rules.modular	2006-04-14 14:21:43.000000000 -0400
+@@ -208,7 +208,7 @@
+ #
+ $(APPDIR)/customizable_types: $(BASE_CONF)
+ 	@mkdir -p $(APPDIR)
+-	$(verbose) $(GREP) '^[[:blank:]]*type .*customizable' $< | cut -d',' -f1 | cut -d' ' -f2 | $(SORT) -u > $(TMPDIR)/customizable_types
++	$(verbose) $(GREP) '^[[:blank:]]*type .*customizable' $< | cut -d';' -f1 | cut -d',' -f1 | cut -d' ' -f2 | $(SORT) -u > $(TMPDIR)/customizable_types
+ 	$(verbose) install -m 644 $(TMPDIR)/customizable_types $@ 
+ 
+ ########################################


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- selinux-policy.spec	13 Apr 2006 20:33:49 -0000	1.173
+++ selinux-policy.spec	14 Apr 2006 19:50:03 -0000	1.174
@@ -15,7 +15,7 @@
 %define CHECKPOLICYVER 1.30.1-2
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.31
+Version: 2.2.32
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -122,6 +122,7 @@
 %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; \
@@ -320,6 +321,9 @@
 %endif
 
 %changelog
+* Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> 2.2.32-1
+- Update to latest from upstream
+
 * Thu Apr 14 2006 Dan Walsh <dwalsh at redhat.com> 2.2.31-1
 - Update to latest from upstream
 - Allow mono and unconfined to talk to initrc_t dbus objects


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	13 Apr 2006 21:28:19 -0000	1.59
+++ sources	14 Apr 2006 19:50:03 -0000	1.60
@@ -1 +1 @@
-437521998aafb56999299bc4e3532244  serefpolicy-2.2.31.tgz
+7a3563e2478a4b18dc689de8561831b5  serefpolicy-2.2.32.tgz



From fedora-cvs-commits at redhat.com  Fri Apr 14 20:35:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 16:35:28 -0400
Subject: rpms/selinux-policy/devel policy-20060411.patch,1.4,1.5
Message-ID: <200604142035.k3EKZSeS029397@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20060411.patch 
Log Message:
* Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> 2.2.32-1
- Update to latest from upstream


policy-20060411.patch:
 Rules.modular                           |    2 -
 policy/mcs                              |    6 ++-
 policy/modules/admin/amanda.te          |    9 ++++
 policy/modules/admin/bootloader.te      |    1 
 policy/modules/admin/rpm.fc             |    1 
 policy/modules/admin/su.fc              |    2 -
 policy/modules/admin/usermanage.te      |    1 
 policy/modules/apps/java.fc             |    9 +---
 policy/modules/apps/java.te             |    1 
 policy/modules/apps/mono.te             |    6 +++
 policy/modules/kernel/corecommands.fc   |   20 ++++++----
 policy/modules/kernel/devices.fc        |    3 +
 policy/modules/kernel/devices.if        |   24 +++++++++++-
 policy/modules/kernel/files.fc          |   37 ++++++++++++-------
 policy/modules/kernel/files.if          |   27 ++++++++++++++
 policy/modules/kernel/kernel.if         |    3 +
 policy/modules/kernel/mcs.te            |    4 ++
 policy/modules/kernel/mls.te            |    1 
 policy/modules/services/avahi.te        |    1 
 policy/modules/services/bind.fc         |    1 
 policy/modules/services/ftp.te          |    1 
 policy/modules/services/hal.te          |    1 
 policy/modules/services/kerberos.fc     |    4 +-
 policy/modules/services/mailman.if      |   38 ++++++++++++++++++++
 policy/modules/services/postfix.te      |    5 ++
 policy/modules/services/postgresql.if   |    4 +-
 policy/modules/services/rpc.te          |    4 +-
 policy/modules/services/samba.if        |    1 
 policy/modules/services/samba.te        |   12 +++++-
 policy/modules/services/spamassassin.fc |    2 -
 policy/modules/services/tftp.fc         |    3 +
 policy/modules/services/xserver.if      |   21 +++++++++++
 policy/modules/system/authlogin.fc      |    3 +
 policy/modules/system/authlogin.te      |    4 ++
 policy/modules/system/daemontools.fc    |    3 +
 policy/modules/system/fstools.te        |    1 
 policy/modules/system/init.te           |    1 
 policy/modules/system/libraries.fc      |   60 +++++++++++++++++++-------------
 policy/modules/system/miscfiles.fc      |    2 -
 policy/modules/system/modutils.fc       |    6 ++-
 policy/modules/system/selinuxutil.if    |    4 +-
 policy/modules/system/unconfined.te     |    3 +
 policy/modules/system/userdomain.if     |   28 ++++++++++----
 policy/modules/system/xen.te            |    5 ++
 44 files changed, 293 insertions(+), 82 deletions(-)

Index: policy-20060411.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060411.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- policy-20060411.patch	14 Apr 2006 19:50:03 -0000	1.4
+++ policy-20060411.patch	14 Apr 2006 20:35:12 -0000	1.5
@@ -23,7 +23,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.2.32/policy/modules/admin/amanda.te
 --- nsaserefpolicy/policy/modules/admin/amanda.te	2006-03-24 11:15:40.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/admin/amanda.te	2006-04-14 12:06:19.000000000 -0400
++++ serefpolicy-2.2.32/policy/modules/admin/amanda.te	2006-04-14 14:29:14.000000000 -0400
 @@ -9,6 +9,7 @@
  type amanda_t;
  type amanda_inetd_exec_t;
@@ -32,7 +32,18 @@
  role system_r types amanda_t;
  
  type amanda_exec_t;
-@@ -183,13 +184,15 @@
+@@ -141,6 +142,10 @@
+ corenet_non_ipsec_sendrecv(amanda_t)
+ corenet_tcp_bind_all_nodes(amanda_t)
+ corenet_udp_bind_all_nodes(amanda_t)
++corenet_tcp_bind_reserved_port(amanda_t)
++corenet_udp_bind_reserved_port(amanda_t)
++corenet_dontaudit_tcp_bind_all_reserved_ports(amanda_t)
++corenet_dontaudit_udp_bind_all_reserved_ports(amanda_t)
+ 
+ dev_getattr_all_blk_files(amanda_t)
+ dev_getattr_all_chr_files(amanda_t)
+@@ -183,13 +188,15 @@
  
  optional_policy(`
  	nscd_socket_use(amanda_t)
@@ -550,8 +561,24 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.32/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/services/postfix.te	2006-04-14 12:06:19.000000000 -0400
-@@ -408,6 +408,9 @@
++++ serefpolicy-2.2.32/policy/modules/services/postfix.te	2006-04-14 14:54:13.000000000 -0400
+@@ -305,6 +305,7 @@
+ 
+ kernel_read_kernel_sysctls(postfix_map_t)
+ kernel_dontaudit_list_proc(postfix_map_t)
++kernel_dontaudit_read_system_state(postfix_map_t)
+ 
+ corenet_tcp_sendrecv_all_if(postfix_map_t)
+ corenet_udp_sendrecv_all_if(postfix_map_t)
+@@ -350,6 +351,7 @@
+ ifdef(`targeted_policy',`
+ 	# FIXME: would be better to use a run interface
+ 	role system_r types postfix_map_t;
++	term_dontaudit_use_generic_ptys(postfix_map_t)
+ ')
+ 
+ tunable_policy(`read_default_t',`
+@@ -408,6 +410,9 @@
  
  optional_policy(`
  	mailman_domtrans_queue(postfix_pipe_t)
@@ -563,8 +590,15 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.if serefpolicy-2.2.32/policy/modules/services/postgresql.if
 --- nsaserefpolicy/policy/modules/services/postgresql.if	2006-02-10 17:05:19.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/services/postgresql.if	2006-04-14 12:06:19.000000000 -0400
-@@ -119,4 +119,6 @@
++++ serefpolicy-2.2.32/policy/modules/services/postgresql.if	2006-04-14 16:09:39.000000000 -0400
+@@ -113,10 +113,12 @@
+ #
+ interface(`postgresql_stream_connect',`
+ 	gen_require(`
+-		type postgresql_t, postgresql_var_run_t;
++		type postgresql_t, postgresql_var_run_t, postgresql_tmp_t;
+ 	')
+ 
  	files_search_pids($1)
  	allow $1 postgresql_t:unix_stream_socket connectto;
  	allow $1 postgresql_var_run_t:sock_file write;



From fedora-cvs-commits at redhat.com  Fri Apr 14 20:49:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 16:49:36 -0400
Subject: rpms/kernel/devel linux-2.6-xen-compile-fixes.patch,1.6,1.7
Message-ID: <200604142049.k3EKnaot025738@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	linux-2.6-xen-compile-fixes.patch 
Log Message:
bandaid to get x86_64 xenU to compile (/me really, really hates apic subarch xen abuse)

linux-2.6-xen-compile-fixes.patch:
 arch/i386/kernel/acpi/boot-xen.c                             |    3 +
 linux-2.6.15.ia64/fs/Kconfig                                 |    1 
 linux-2.6.15.xen/arch/i386/kernel/Makefile                   |    3 -
 linux-2.6.15.xen/arch/i386/kernel/smp-xen.c                  |    1 
 linux-2.6.15.xen/arch/i386/mm/init-xen.c                     |    1 
 linux-2.6.15.xen/arch/x86_64/kernel/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/arch/x86_64/ia32/ia32entry-xen.S         |   17 +++++------
 linux-2.6.16.noarch/include/asm-x86_64/ipi.h                 |    2 +
 linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_tcp.c    |    5 ++-
 linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_udp.c    |    5 ++-
 20 files changed, 65 insertions(+), 24 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-xen-compile-fixes.patch	14 Apr 2006 18:33:56 -0000	1.6
+++ linux-2.6-xen-compile-fixes.patch	14 Apr 2006 20:49:32 -0000	1.7
@@ -317,3 +317,21 @@
  			hdr->check = ip_nat_cheat_check(~oldip, newip,
  					ip_nat_cheat_check(*portptr ^ 0xFFFF,
  							   newport,
+diff linux-2.6.16.nowork/include/asm-x86_64/ipi.h linux-2.6.16.noarch/include/asm-x86_64/ipi.h
+--- linux-2.6.16.nowork/include/asm-x86_64/ipi.h	2006-03-20 06:53:29.000000000 +0100
++++ linux-2.6.16.noarch/include/asm-x86_64/ipi.h	2006-04-14 21:46:59.000000000 +0200
+@@ -49,6 +49,7 @@ static inline int __prepare_ICR2 (unsign
+ 	return SET_APIC_DEST_FIELD(mask);
+ }
+ 
++#ifndef CONFIG_XEN_UNPRIVILEGED_GUEST
+ static inline void __send_IPI_shortcut(unsigned int shortcut, int vector, unsigned int dest)
+ {
+ 	/*
+@@ -113,5 +114,6 @@ static inline void send_IPI_mask_sequenc
+ 	}
+ 	local_irq_restore(flags);
+ }
++#endif
+ 
+ #endif /* __ASM_IPI_H */



From fedora-cvs-commits at redhat.com  Fri Apr 14 22:53:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 18:53:51 -0400
Subject: rpms/kernel/devel linux-2.6-xen.patch,1.8,1.9
Message-ID: <200604142253.k3EMrpbw020601@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	linux-2.6-xen.patch 
Log Message:
xenU x86 also wanted care :( nothing defines phys_pkg_id for SMP and unpriviledge guest

linux-2.6-xen.patch:
 linux-2.6.16.noarch/arch/x86_64/Makefile                 |   20 
 linux-2.6.16.noarch/arch/x86_64/ia32/Makefile            |   20 
 tip2/arch/i386/Kconfig                                   |  100 
 tip2/arch/i386/Kconfig.cpu                               |    2 
 tip2/arch/i386/Makefile                                  |   24 
 tip2/arch/i386/boot-xen/Makefile                         |   21 
 tip2/arch/i386/kernel/Makefile                           |   31 
 tip2/arch/i386/kernel/acpi/Makefile                      |    4 
 tip2/arch/i386/kernel/acpi/boot-xen.c                    | 1161 ++++++
 tip2/arch/i386/kernel/apic-xen.c                         |  141 
 tip2/arch/i386/kernel/asm-offsets.c                      |    5 
 tip2/arch/i386/kernel/cpu/Makefile                       |    5 
 tip2/arch/i386/kernel/cpu/common-xen.c                   |  732 ++++
 tip2/arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 tip2/arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 tip2/arch/i386/kernel/early_printk-xen.c                 |    2 
 tip2/arch/i386/kernel/entry-xen.S                        |  880 ++++
 tip2/arch/i386/kernel/entry.S                            |    4 
 tip2/arch/i386/kernel/fixup.c                            |   95 
 tip2/arch/i386/kernel/head-xen.S                         |  171 
 tip2/arch/i386/kernel/init_task-xen.c                    |   51 
 tip2/arch/i386/kernel/io_apic-xen.c                      | 2744 +++++++++++++++
 tip2/arch/i386/kernel/ioport-xen.c                       |  122 
 tip2/arch/i386/kernel/irq-xen.c                          |  306 +
 tip2/arch/i386/kernel/irq.c                              |    4 
 tip2/arch/i386/kernel/ldt-xen.c                          |  269 +
 tip2/arch/i386/kernel/microcode-xen.c                    |  148 
 tip2/arch/i386/kernel/mpparse-xen.c                      | 1189 ++++++
 tip2/arch/i386/kernel/pci-dma-xen.c                      |  344 +
 tip2/arch/i386/kernel/process-xen.c                      |  824 ++++
 tip2/arch/i386/kernel/quirks-xen.c                       |   48 
 tip2/arch/i386/kernel/setup-xen.c                        | 1826 +++++++++
 tip2/arch/i386/kernel/smp-xen.c                          |  613 +++
 tip2/arch/i386/kernel/swiotlb.c                          |  674 +++
 tip2/arch/i386/kernel/sysenter.c                         |   90 
 tip2/arch/i386/kernel/time-xen.c                         | 1097 +++++
 tip2/arch/i386/kernel/traps-xen.c                        | 1123 ++++++
 tip2/arch/i386/kernel/traps.c                            |    9 
 tip2/arch/i386/kernel/vm86.c                             |    8 
 tip2/arch/i386/kernel/vsyscall-note-xen.S                |   32 
 tip2/arch/i386/kernel/vsyscall.S                         |    2 
 tip2/arch/i386/mach-xen/Makefile                         |    5 
 tip2/arch/i386/mach-xen/setup.c                          |   49 
 tip2/arch/i386/mm/Makefile                               |    8 
 tip2/arch/i386/mm/fault-xen.c                            |  683 +++
 tip2/arch/i386/mm/highmem-xen.c                          |  123 
 tip2/arch/i386/mm/hypervisor.c                           |  424 ++
 tip2/arch/i386/mm/init-xen.c                             |  853 ++++
 tip2/arch/i386/mm/ioremap-xen.c                          |  486 ++
 tip2/arch/i386/mm/pageattr.c                             |    2 
 tip2/arch/i386/mm/pgtable-xen.c                          |  652 +++
 tip2/arch/i386/mm/pgtable.c                              |   12 
 tip2/arch/i386/oprofile/Makefile                         |    4 
 tip2/arch/i386/oprofile/xenoprof.c                       |  395 ++
 tip2/arch/i386/pci/Makefile                              |    9 
 tip2/arch/i386/pci/irq-xen.c                             | 1202 ++++++
 tip2/arch/i386/pci/pcifront.c                            |   55 
 tip2/arch/i386/power/Makefile                            |    4 
 tip2/arch/ia64/Kconfig                                   |   46 
 tip2/arch/ia64/Makefile                                  |   16 
 tip2/arch/ia64/hp/sim/Makefile                           |    2 
 tip2/arch/ia64/kernel/entry.S                            |   32 
 tip2/arch/ia64/kernel/head.S                             |    6 
 tip2/arch/ia64/kernel/pal.S                              |    5 
 tip2/arch/ia64/kernel/sal.c                              |    3 
 tip2/arch/ia64/kernel/setup.c                            |   32 
 tip2/arch/ia64/xen/Makefile                              |    5 
 tip2/arch/ia64/xen/drivers/Makefile                      |   20 
 tip2/arch/ia64/xen/drivers/README                        |    2 
 tip2/arch/ia64/xen/drivers/coreMakefile                  |   26 
 tip2/arch/ia64/xen/drivers/evtchn_ia64.c                 |  273 +
 tip2/arch/ia64/xen/drivers/patches/blkback.c.patch       |   33 
 tip2/arch/ia64/xen/drivers/patches/console.c.patch       |   11 
 tip2/arch/ia64/xen/drivers/patches/devmem.c.patch        |    2 
 tip2/arch/ia64/xen/drivers/patches/gnttab.c.patch        |   33 
 tip2/arch/ia64/xen/drivers/patches/privcmd.c.patch       |   30 
 tip2/arch/ia64/xen/drivers/xenia64_init.c                |   55 
 tip2/arch/ia64/xen/hypercall.S                           |  365 +
 tip2/arch/ia64/xen/xen_ksyms.c                           |   12 
 tip2/arch/ia64/xen/xenconsole.c                          |   19 
 tip2/arch/ia64/xen/xenentry.S                            |  850 ++++
 tip2/arch/ia64/xen/xenhpski.c                            |   19 
 tip2/arch/ia64/xen/xenivt.S                              | 2032 +++++++++++
 tip2/arch/ia64/xen/xenminstate.h                         |  367 ++
 tip2/arch/ia64/xen/xenpal.S                              |   73 
 tip2/arch/ia64/xen/xensetup.S                            |   35 
 tip2/arch/um/kernel/physmem.c                            |    4 
 tip2/arch/x86_64/Kconfig                                 |   62 
 tip2/arch/x86_64/ia32/ia32entry-xen.S                    |  723 +++
 tip2/arch/x86_64/ia32/syscall32-xen.c                    |  128 
 tip2/arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 tip2/arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 tip2/arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 tip2/arch/x86_64/kernel/Makefile                         |   18 
 tip2/arch/x86_64/kernel/acpi/Makefile                    |    1 
 tip2/arch/x86_64/kernel/apic-xen.c                       |  198 +
 tip2/arch/x86_64/kernel/asm-offsets.c                    |    2 
 tip2/arch/x86_64/kernel/e820-xen.c                       |  744 ++++
 tip2/arch/x86_64/kernel/early_printk-xen.c               |  304 +
 tip2/arch/x86_64/kernel/entry-xen.S                      | 1149 ++++++
 tip2/arch/x86_64/kernel/entry.S                          |    2 
 tip2/arch/x86_64/kernel/genapic-xen.c                    |  144 
 tip2/arch/x86_64/kernel/genapic_xen.c                    |  162 
 tip2/arch/x86_64/kernel/head-xen.S                       |  163 
 tip2/arch/x86_64/kernel/head64-xen.c                     |  140 
 tip2/arch/x86_64/kernel/init_task.c                      |    3 
 tip2/arch/x86_64/kernel/io_apic-xen.c                    | 2231 ++++++++++++
 tip2/arch/x86_64/kernel/ioport-xen.c                     |   58 
 tip2/arch/x86_64/kernel/irq-xen.c                        |  163 
 tip2/arch/x86_64/kernel/irq.c                            |    4 
 tip2/arch/x86_64/kernel/ldt-xen.c                        |  282 +
 tip2/arch/x86_64/kernel/mpparse-xen.c                    | 1002 +++++
 tip2/arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 tip2/arch/x86_64/kernel/process-xen.c                    |  796 ++++
 tip2/arch/x86_64/kernel/setup-xen.c                      | 1677 +++++++++
 tip2/arch/x86_64/kernel/setup64-xen.c                    |  360 +
 tip2/arch/x86_64/kernel/smp-xen.c                        |  596 +++
 tip2/arch/x86_64/kernel/smp.c                            |    4 
 tip2/arch/x86_64/kernel/traps-xen.c                      | 1020 +++++
 tip2/arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 tip2/arch/x86_64/kernel/x8664_ksyms-xen.c                |  158 
 tip2/arch/x86_64/kernel/xen_entry.S                      |   40 
 tip2/arch/x86_64/mm/Makefile                             |   10 
 tip2/arch/x86_64/mm/fault-xen.c                          |  644 +++
 tip2/arch/x86_64/mm/init-xen.c                           | 1145 ++++++
 tip2/arch/x86_64/mm/pageattr-xen.c                       |  390 ++
 tip2/arch/x86_64/oprofile/Makefile                       |    5 
 tip2/arch/x86_64/pci/Makefile                            |   12 
 tip2/drivers/Makefile                                    |    1 
 tip2/drivers/acpi/Kconfig                                |    3 
 tip2/drivers/base/bus.c                                  |    5 
 tip2/drivers/char/mem.c                                  |    6 
 tip2/drivers/char/tpm/Kconfig                            |   14 
 tip2/drivers/char/tpm/Makefile                           |    1 
 tip2/drivers/char/tpm/tpm.c                              |   44 
 tip2/drivers/char/tpm/tpm.h                              |    7 
 tip2/drivers/char/tpm/tpm_atmel.c                        |  230 -
 tip2/drivers/char/tpm/tpm_nsc.c                          |  395 --
 tip2/drivers/char/tpm/tpm_xen.c                          |  536 ++
 tip2/drivers/char/tty_io.c                               |    7 
 tip2/drivers/firmware/Kconfig                            |    2 
 tip2/drivers/pci/Kconfig                                 |    1 
 tip2/drivers/serial/Kconfig                              |    1 
 tip2/drivers/video/Kconfig                               |    2 
 tip2/drivers/xen/Kconfig                                 |  212 +
 tip2/drivers/xen/Makefile                                |   22 
 tip2/drivers/xen/balloon/Makefile                        |    2 
 tip2/drivers/xen/balloon/balloon.c                       |  592 +++
 tip2/drivers/xen/blkback/Makefile                        |    3 
 tip2/drivers/xen/blkback/blkback.c                       |  597 +++
 tip2/drivers/xen/blkback/common.h                        |  145 
 tip2/drivers/xen/blkback/interface.c                     |  184 +
 tip2/drivers/xen/blkback/vbd.c                           |  126 
 tip2/drivers/xen/blkback/xenbus.c                        |  421 ++
 tip2/drivers/xen/blkfront/Kconfig                        |    6 
 tip2/drivers/xen/blkfront/Makefile                       |    5 
 tip2/drivers/xen/blkfront/blkfront.c                     |  819 ++++
 tip2/drivers/xen/blkfront/block.h                        |  165 
 tip2/drivers/xen/blkfront/vbd.c                          |  327 +
 tip2/drivers/xen/blktap/Makefile                         |    3 
 tip2/drivers/xen/blktap/blktap.c                         |  910 ++++
 tip2/drivers/xen/blktap/common.h                         |  110 
 tip2/drivers/xen/blktap/interface.c                      |  146 
 tip2/drivers/xen/blktap/xenbus.c                         |  233 +
 tip2/drivers/xen/char/Makefile                           |    2 
 tip2/drivers/xen/char/mem.c                              |  192 +
 tip2/drivers/xen/console/Makefile                        |    2 
 tip2/drivers/xen/console/console.c                       |  648 +++
 tip2/drivers/xen/console/xencons_ring.c                  |  151 
 tip2/drivers/xen/core/Makefile                           |   11 
 tip2/drivers/xen/core/evtchn.c                           |  863 ++++
 tip2/drivers/xen/core/features.c                         |   29 
 tip2/drivers/xen/core/gnttab.c                           |  464 ++
 tip2/drivers/xen/core/hypervisor_sysfs.c                 |   57 
 tip2/drivers/xen/core/reboot.c                           |  377 ++
 tip2/drivers/xen/core/skbuff.c                           |  144 
 tip2/drivers/xen/core/smpboot.c                          |  576 +++
 tip2/drivers/xen/core/xen_proc.c                         |   29 
 tip2/drivers/xen/core/xen_sysfs.c                        |  311 +
 tip2/drivers/xen/evtchn/Makefile                         |    2 
 tip2/drivers/xen/evtchn/evtchn.c                         |  464 ++
 tip2/drivers/xen/net_driver_util.c                       |   68 
 tip2/drivers/xen/netback/Makefile                        |    5 
 tip2/drivers/xen/netback/common.h                        |  133 
 tip2/drivers/xen/netback/interface.c                     |  334 +
 tip2/drivers/xen/netback/loopback.c                      |  254 +
 tip2/drivers/xen/netback/netback.c                       |  865 ++++
 tip2/drivers/xen/netback/xenbus.c                        |  366 ++
 tip2/drivers/xen/netfront/Kconfig                        |    6 
 tip2/drivers/xen/netfront/Makefile                       |    4 
 tip2/drivers/xen/netfront/netfront.c                     | 1524 ++++++++
 tip2/drivers/xen/pciback/Makefile                        |   10 
 tip2/drivers/xen/pciback/conf_space.c                    |  345 +
 tip2/drivers/xen/pciback/conf_space.h                    |   97 
 tip2/drivers/xen/pciback/conf_space_header.c             |  267 +
 tip2/drivers/xen/pciback/passthrough.c                   |  157 
 tip2/drivers/xen/pciback/pci_stub.c                      |  695 +++
 tip2/drivers/xen/pciback/pciback.h                       |   78 
 tip2/drivers/xen/pciback/pciback_ops.c                   |   74 
 tip2/drivers/xen/pciback/vpci.c                          |  204 +
 tip2/drivers/xen/pciback/xenbus.c                        |  441 ++
 tip2/drivers/xen/pcifront/Makefile                       |    7 
 tip2/drivers/xen/pcifront/pci.c                          |   46 
 tip2/drivers/xen/pcifront/pci_op.c                       |  272 +
 tip2/drivers/xen/pcifront/pcifront.h                     |   40 
 tip2/drivers/xen/pcifront/xenbus.c                       |  294 +
 tip2/drivers/xen/privcmd/Makefile                        |    2 
 tip2/drivers/xen/privcmd/privcmd.c                       |  303 +
 tip2/drivers/xen/tpmback/Makefile                        |    4 
 tip2/drivers/xen/tpmback/common.h                        |   91 
 tip2/drivers/xen/tpmback/interface.c                     |  194 +
 tip2/drivers/xen/tpmback/tpmback.c                       | 1060 +++++
 tip2/drivers/xen/tpmback/xenbus.c                        |  329 +
 tip2/drivers/xen/tpmfront/Makefile                       |    2 
 tip2/drivers/xen/tpmfront/tpmfront.c                     |  768 ++++
 tip2/drivers/xen/tpmfront/tpmfront.h                     |   40 
 tip2/drivers/xen/util.c                                  |   80 
 tip2/drivers/xen/xenbus/Makefile                         |    8 
 tip2/drivers/xen/xenbus/xenbus_client.c                  |  412 ++
 tip2/drivers/xen/xenbus/xenbus_comms.c                   |  218 +
 tip2/drivers/xen/xenbus/xenbus_comms.h                   |   53 
 tip2/drivers/xen/xenbus/xenbus_dev.c                     |  252 +
 tip2/drivers/xen/xenbus/xenbus_probe.c                   | 1083 +++++
 tip2/drivers/xen/xenbus/xenbus_xs.c                      |  856 ++++
 tip2/fs/Kconfig                                          |    1 
 tip2/include/asm-i386/a.out.h                            |    2 
 tip2/include/asm-i386/apic.h                             |    2 
 tip2/include/asm-i386/elf.h                              |    7 
 tip2/include/asm-i386/fixmap.h                           |   13 
 tip2/include/asm-i386/mach-default/mach_traps.h          |   12 
 tip2/include/asm-i386/mach-xen/asm/agp.h                 |   37 
 tip2/include/asm-i386/mach-xen/asm/desc.h                |  164 
 tip2/include/asm-i386/mach-xen/asm/dma-mapping.h         |  156 
 tip2/include/asm-i386/mach-xen/asm/fixmap.h              |  156 
 tip2/include/asm-i386/mach-xen/asm/floppy.h              |  147 
 tip2/include/asm-i386/mach-xen/asm/highmem.h             |   81 
 tip2/include/asm-i386/mach-xen/asm/hw_irq.h              |   73 
 tip2/include/asm-i386/mach-xen/asm/hypercall.h           |  357 +
 tip2/include/asm-i386/mach-xen/asm/hypervisor.h          |  224 +
 tip2/include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 tip2/include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 tip2/include/asm-i386/mach-xen/asm/mmu.h                 |   21 
 tip2/include/asm-i386/mach-xen/asm/mmu_context.h         |  105 
 tip2/include/asm-i386/mach-xen/asm/page.h                |  326 +
 tip2/include/asm-i386/mach-xen/asm/param.h               |   24 
 tip2/include/asm-i386/mach-xen/asm/pci.h                 |  154 
 tip2/include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 tip2/include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 tip2/include/asm-i386/mach-xen/asm/pgtable-2level.h      |   85 
 tip2/include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 tip2/include/asm-i386/mach-xen/asm/pgtable-3level.h      |  183 +
 tip2/include/asm-i386/mach-xen/asm/pgtable.h             |  520 ++
 tip2/include/asm-i386/mach-xen/asm/processor.h           |  756 ++++
 tip2/include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 tip2/include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 tip2/include/asm-i386/mach-xen/asm/segment.h             |  117 
 tip2/include/asm-i386/mach-xen/asm/setup.h               |   64 
 tip2/include/asm-i386/mach-xen/asm/smp.h                 |  104 
 tip2/include/asm-i386/mach-xen/asm/spinlock.h            |  200 +
 tip2/include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 tip2/include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 
 tip2/include/asm-i386/mach-xen/asm/system.h              |  576 +++
 tip2/include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 tip2/include/asm-i386/mach-xen/asm/vga.h                 |   20 
 tip2/include/asm-i386/mach-xen/irq_vectors.h             |  125 
 tip2/include/asm-i386/mach-xen/mach_traps.h              |   33 
 tip2/include/asm-i386/mach-xen/setup_arch_post.h         |   54 
 tip2/include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 tip2/include/asm-i386/page.h                             |    4 
 tip2/include/asm-i386/pgtable-2level-defs.h              |    2 
 tip2/include/asm-i386/pgtable-3level-defs.h              |    2 
 tip2/include/asm-ia64/fixmap.h                           |    2 
 tip2/include/asm-ia64/gcc_intrin.h                       |   60 
 tip2/include/asm-ia64/hypercall.h                        |  274 +
 tip2/include/asm-ia64/hypervisor.h                       |  138 
 tip2/include/asm-ia64/intel_intrin.h                     |   68 
 tip2/include/asm-ia64/meminit.h                          |    5 
 tip2/include/asm-ia64/pal.h                              |    1 
 tip2/include/asm-ia64/privop.h                           |   59 
 tip2/include/asm-ia64/processor.h                        |    1 
 tip2/include/asm-ia64/synch_bitops.h                     |   61 
 tip2/include/asm-ia64/system.h                           |    4 
 tip2/include/asm-ia64/xen/privop.h                       |  277 +
 tip2/include/asm-um/page.h                               |    2 
 tip2/include/asm-x86_64/apic.h                           |    2 
 tip2/include/asm-x86_64/hw_irq.h                         |    2 
 tip2/include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 tip2/include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 tip2/include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 tip2/include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 +
 tip2/include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 tip2/include/asm-x86_64/mach-xen/asm/fixmap.h            |  114 
 tip2/include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 tip2/include/asm-x86_64/mach-xen/asm/hw_irq.h            |  141 
 tip2/include/asm-x86_64/mach-xen/asm/hypercall.h         |  357 +
 tip2/include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 tip2/include/asm-x86_64/mach-xen/asm/io.h                |  327 +
 tip2/include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 tip2/include/asm-x86_64/mach-xen/asm/mmu.h               |   33 
 tip2/include/asm-x86_64/mach-xen/asm/mmu_context.h       |  134 
 tip2/include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 tip2/include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 tip2/include/asm-x86_64/mach-xen/asm/page.h              |  317 +
 tip2/include/asm-x86_64/mach-xen/asm/param.h             |   23 
 tip2/include/asm-x86_64/mach-xen/asm/pci.h               |  174 
 tip2/include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 tip2/include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 +++
 tip2/include/asm-x86_64/mach-xen/asm/processor.h         |  494 ++
 tip2/include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 tip2/include/asm-x86_64/mach-xen/asm/smp.h               |  153 
 tip2/include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 tip2/include/asm-x86_64/mach-xen/asm/system.h            |  428 ++
 tip2/include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 tip2/include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 tip2/include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 tip2/include/asm-x86_64/mach-xen/asm/xor.h               |  328 +
 tip2/include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 tip2/include/asm-x86_64/mach-xen/mach_time.h             |  111 
 tip2/include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 tip2/include/asm-x86_64/mach-xen/setup_arch_post.h       |   41 
 tip2/include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 tip2/include/linux/gfp.h                                 |    6 
 tip2/include/linux/highmem.h                             |    6 
 tip2/include/linux/mm.h                                  |   13 
 tip2/include/linux/pfn.h                                 |    2 
 tip2/include/linux/skbuff.h                              |   13 
 tip2/include/xen/balloon.h                               |   73 
 tip2/include/xen/driver_util.h                           |   26 
 tip2/include/xen/evtchn.h                                |  126 
 tip2/include/xen/features.h                              |   20 
 tip2/include/xen/foreign_page.h                          |   40 
 tip2/include/xen/gnttab.h                                |  126 
 tip2/include/xen/hypervisor_sysfs.h                      |   32 
 tip2/include/xen/interface/acm.h                         |  181 
 tip2/include/xen/interface/acm_ops.h                     |   98 
 tip2/include/xen/interface/arch-ia64.h                   |  337 +
 tip2/include/xen/interface/arch-x86_32.h                 |  200 +
 tip2/include/xen/interface/arch-x86_64.h                 |  273 +
 tip2/include/xen/interface/callback.h                    |   57 
 tip2/include/xen/interface/dom0_ops.h                    |  531 ++
 tip2/include/xen/interface/event_channel.h               |  211 +
 tip2/include/xen/interface/features.h                    |   53 
 tip2/include/xen/interface/grant_table.h                 |  311 +
 tip2/include/xen/interface/hvm/hvm_info_table.h          |   24 
 tip2/include/xen/interface/hvm/ioreq.h                   |   94 
 tip2/include/xen/interface/hvm/vmx_assist.h              |   97 
 tip2/include/xen/interface/io/blkif.h                    |   85 
 tip2/include/xen/interface/io/console.h                  |   33 
 tip2/include/xen/interface/io/netif.h                    |   84 
 tip2/include/xen/interface/io/pciif.h                    |   55 
 tip2/include/xen/interface/io/ring.h                     |  265 +
 tip2/include/xen/interface/io/tpmif.h                    |   56 
 tip2/include/xen/interface/io/xenbus.h                   |   42 
 tip2/include/xen/interface/io/xs_wire.h                  |   97 
 tip2/include/xen/interface/memory.h                      |  155 
 tip2/include/xen/interface/nmi.h                         |   59 
 tip2/include/xen/interface/physdev.h                     |   71 
 tip2/include/xen/interface/sched.h                       |  100 
 tip2/include/xen/interface/sched_ctl.h                   |   64 
 tip2/include/xen/interface/trace.h                       |   86 
 tip2/include/xen/interface/vcpu.h                        |  119 
 tip2/include/xen/interface/version.h                     |   64 
 tip2/include/xen/interface/xen-compat.h                  |   34 
 tip2/include/xen/interface/xen.h                         |  459 ++
 tip2/include/xen/interface/xenoprof.h                    |   72 
 tip2/include/xen/net_driver_util.h                       |   58 
 tip2/include/xen/pcifront.h                              |   39 
 tip2/include/xen/public/evtchn.h                         |  101 
 tip2/include/xen/public/privcmd.h                        |   94 
 tip2/include/xen/tpmfe.h                                 |   40 
 tip2/include/xen/xen_proc.h                              |   23 
 tip2/include/xen/xenbus.h                                |  306 +
 tip2/include/xen/xencons.h                               |   14 
 tip2/kernel/Kconfig.preempt                              |    1 
 tip2/kernel/irq/manage.c                                 |   24 
 tip2/kernel/irq/migration.c                              |    3 
 tip2/lib/Kconfig.debug                                   |   31 
 tip2/lib/Makefile                                        |    3 
 tip2/mm/Kconfig                                          |    3 
 tip2/mm/highmem.c                                        |   11 
 tip2/mm/memory.c                                         |  116 
 tip2/mm/mmap.c                                           |    4 
 tip2/mm/page_alloc.c                                     |    6 
 tip2/net/core/dev.c                                      |   50 
 tip2/net/core/skbuff.c                                   |   41 
 tip2/net/ipv4/netfilter/ip_nat_proto_tcp.c               |    6 
 tip2/net/ipv4/netfilter/ip_nat_proto_udp.c               |    9 
 tip2/scripts/Makefile.xen                                |   14 
 388 files changed, 80006 insertions(+), 856 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-xen.patch	14 Apr 2006 18:57:37 -0000	1.8
+++ linux-2.6-xen.patch	14 Apr 2006 22:53:47 -0000	1.9
@@ -2123,7 +2123,7 @@
 +			if (c->x86 >= 0x6)
 +				c->x86_model += ((tfms >> 16) & 0xF) << 4;
 +			c->x86_mask = tfms & 15;
-+#ifdef CONFIG_SMP
++#if defined(CONFIG_SMP) && !defined(CONFIG_XEN_UNPRIVILEGED_GUEST)
 +			c->apicid = phys_pkg_id((ebx >> 24) & 0xFF, 0);
 +#else
 +			c->apicid = (ebx >> 24) & 0xFF;



From fedora-cvs-commits at redhat.com  Fri Apr 14 23:35:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 19:35:43 -0400
Subject: rpms/tog-pegasus/devel pegasus-2.5.1-HOSTNAME_MAX.patch, NONE,
	1.1 pegasus-2.5.1-PATH_MAX.patch, NONE,
	1.1 pegasus-2.5.1-obz4945.patch, NONE, 1.1 tog-pegasus.spec,
	1.28, 1.29
Message-ID: <200604142335.k3ENZhkI012616@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12564

Modified Files:
	tog-pegasus.spec 
Added Files:
	pegasus-2.5.1-HOSTNAME_MAX.patch pegasus-2.5.1-PATH_MAX.patch 
	pegasus-2.5.1-obz4945.patch 
Log Message:
fix upstream bugzillas 4934(4943) and 4945; fix PATH_MAX and MAXHOSTNAMELEN issues;

pegasus-2.5.1-HOSTNAME_MAX.patch:
 Platform_LINUX_IA64_GNU.h      |    7 +++++--
 Platform_LINUX_IX86_GNU.h      |    7 +++++--
 Platform_LINUX_PPC64_GNU.h     |    7 +++++--
 Platform_LINUX_PPC_GNU.h       |    7 +++++--
 Platform_LINUX_X86_64_GNU.h    |    7 +++++--
 Platform_LINUX_XSCALE_GNU.h    |    7 +++++--
 Platform_LINUX_ZSERIES64_GNU.h |    8 ++++++--
 Platform_LINUX_ZSERIES_GNU.h   |    7 +++++--
 8 files changed, 41 insertions(+), 16 deletions(-)

--- NEW FILE pegasus-2.5.1-HOSTNAME_MAX.patch ---
--- pegasus/src/Pegasus/Common/Platform_LINUX_XSCALE_GNU.h.HOSTNAME_MAX	2006-01-30 11:17:07.000000000 -0500
+++ pegasus/src/Pegasus/Common/Platform_LINUX_XSCALE_GNU.h	2006-04-14 18:41:28.000000000 -0400
@@ -72,9 +72,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/param.h> // For MAXHOSTNAMELEN
+#include <limits.h> 
 
-#if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN)
-#define PEGASUS_MAXHOSTNAMELEN 64
+#ifdef _POSIX_HOST_NAME_MAX
+#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX)
+#else
+#define PEGASUS_MAXHOSTNAMELEN 255
 #endif
 
 #define PEGASUS_SOCKLEN_T socklen_t
--- pegasus/src/Pegasus/Common/Platform_LINUX_IA64_GNU.h.HOSTNAME_MAX	2006-01-30 11:17:07.000000000 -0500
+++ pegasus/src/Pegasus/Common/Platform_LINUX_IA64_GNU.h	2006-04-14 18:37:02.000000000 -0400
@@ -69,9 +69,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/param.h> // For MAXHOSTNAMELEN
+#include <limits.h> 
 
-#if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN)
-#define PEGASUS_MAXHOSTNAMELEN 64
+#ifdef _POSIX_HOST_NAME_MAX
+#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX)
+#else
+#define PEGASUS_MAXHOSTNAMELEN 255
 #endif
 
 #define PEGASUS_SOCKLEN_T socklen_t
--- pegasus/src/Pegasus/Common/Platform_LINUX_ZSERIES_GNU.h.HOSTNAME_MAX	2006-01-30 11:17:07.000000000 -0500
+++ pegasus/src/Pegasus/Common/Platform_LINUX_ZSERIES_GNU.h	2006-04-14 18:40:02.000000000 -0400
@@ -69,9 +69,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/param.h> // For MAXHOSTNAMELEN
+#include <limits.h> 
 
-#if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN)
-#define PEGASUS_MAXHOSTNAMELEN 64
+#ifdef _POSIX_HOST_NAME_MAX
+#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX)
+#else
+#define PEGASUS_MAXHOSTNAMELEN 255
 #endif
 
 #define PEGASUS_SOCKLEN_T socklen_t
--- pegasus/src/Pegasus/Common/Platform_LINUX_X86_64_GNU.h.HOSTNAME_MAX	2006-01-30 11:17:07.000000000 -0500
+++ pegasus/src/Pegasus/Common/Platform_LINUX_X86_64_GNU.h	2006-04-14 18:38:18.000000000 -0400
@@ -73,9 +73,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/param.h> // For MAXHOSTNAMELEN
+#include <limits.h> 
 
-#if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN)
-#define PEGASUS_MAXHOSTNAMELEN 64
+#ifdef _POSIX_HOST_NAME_MAX
+#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX)
+#else
+#define PEGASUS_MAXHOSTNAMELEN 255
 #endif
 
 #define PEGASUS_SOCKLEN_T socklen_t
--- pegasus/src/Pegasus/Common/Platform_LINUX_PPC_GNU.h.HOSTNAME_MAX	2006-01-30 11:17:07.000000000 -0500
+++ pegasus/src/Pegasus/Common/Platform_LINUX_PPC_GNU.h	2006-04-14 18:38:50.000000000 -0400
@@ -73,9 +73,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/param.h> // For MAXHOSTNAMELEN
+#include <limits.h> 
 
-#if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN)
-#define PEGASUS_MAXHOSTNAMELEN 64
+#ifdef _POSIX_HOST_NAME_MAX
+#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX)
+#else
+#define PEGASUS_MAXHOSTNAMELEN 255
 #endif
 
 #define PEGASUS_SOCKLEN_T socklen_t
--- pegasus/src/Pegasus/Common/Platform_LINUX_IX86_GNU.h.HOSTNAME_MAX	2006-01-30 11:17:07.000000000 -0500
+++ pegasus/src/Pegasus/Common/Platform_LINUX_IX86_GNU.h	2006-04-14 18:37:23.000000000 -0400
@@ -74,9 +74,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/param.h> // For MAXHOSTNAMELEN
+#include <limits.h> 
 
-#if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN)
-#define PEGASUS_MAXHOSTNAMELEN 64
+#ifdef _POSIX_HOST_NAME_MAX
+#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX)
+#else
+#define PEGASUS_MAXHOSTNAMELEN 255
 #endif
 
 #define PEGASUS_SOCKLEN_T socklen_t
--- pegasus/src/Pegasus/Common/Platform_LINUX_ZSERIES64_GNU.h.HOSTNAME_MAX	2006-01-30 11:17:07.000000000 -0500
+++ pegasus/src/Pegasus/Common/Platform_LINUX_ZSERIES64_GNU.h	2006-04-14 18:40:30.000000000 -0400
@@ -70,8 +70,12 @@
 #include <stdlib.h>
 #include <sys/param.h> // For MAXHOSTNAMELEN
 
-#if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN)
-#define PEGASUS_MAXHOSTNAMELEN 64
+#include <limits.h> 
+
+#ifdef _POSIX_HOST_NAME_MAX
+#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX)
+#else
+#define PEGASUS_MAXHOSTNAMELEN 255
 #endif
 
 #define PEGASUS_SOCKLEN_T socklen_t
--- pegasus/src/Pegasus/Common/Platform_LINUX_PPC64_GNU.h.HOSTNAME_MAX	2006-01-30 11:17:07.000000000 -0500
+++ pegasus/src/Pegasus/Common/Platform_LINUX_PPC64_GNU.h	2006-04-14 18:39:13.000000000 -0400
@@ -73,9 +73,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/param.h> // For MAXHOSTNAMELEN
+#include <limits.h> 
 
-#if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN)
-#define PEGASUS_MAXHOSTNAMELEN 64
+#ifdef _POSIX_HOST_NAME_MAX
+#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX)
+#else
+#define PEGASUS_MAXHOSTNAMELEN 255
 #endif
 
 #define PEGASUS_SOCKLEN_T socklen_t

pegasus-2.5.1-PATH_MAX.patch:
 System.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE pegasus-2.5.1-PATH_MAX.patch ---
--- pegasus/src/Pegasus/Common/System.cpp.PATH_MAX	2006-01-30 11:17:08.000000000 -0500
+++ pegasus/src/Pegasus/Common/System.cpp	2006-04-14 18:19:27.000000000 -0400
@@ -185,13 +185,13 @@
 char *System::extract_file_path(const char *fullpath, char *dirname)
 {
   char *p;
-  char buff[2048];
+  char buff[PATH_MAX];
   if (fullpath == NULL)
     {
       dirname[0] = '\0';
       return dirname;
     }
-  strcpy(buff, fullpath);
+  strncpy(buff, fullpath, PATH_MAX);
   for(p = buff + strlen(buff); p >= buff; p--)
     {
       if (*p == '\\' || *p == '/')

pegasus-2.5.1-obz4945.patch:
 ControlProviders/CertificateProvider/CertificateProvider.cpp |   69 ++++++++++-
 msg/Server/pegasusServer_en.txt                              |    5 
 2 files changed, 67 insertions(+), 7 deletions(-)

--- NEW FILE pegasus-2.5.1-obz4945.patch ---
--- pegasus/src/Pegasus/msg/Server/pegasusServer_en.txt.obz4945	2006-03-15 16:28:36.000000000 -0500
+++ pegasus/src/Pegasus/msg/Server/pegasusServer_en.txt	2006-04-14 17:55:22.000000000 -0400
@@ -1167,8 +1167,11 @@
 
     ControlProviders.CertificateProvider.EMPTY_CRL:string {"PGS03312: The certificate revocation list is empty."}
 
-        ControlProviders.CertificateProvider.TRUSTSTORE_RELOAD_FAILED:string {"PGS03313: Trust store reload failed. Certificate deletion will not be effective until cimserver restart."}
+    ControlProviders.CertificateProvider.TRUSTSTORE_RELOAD_FAILED:string {"PGS03313: Trust store reload failed. Certificate deletion will not be effective until cimserver restart."}
 
+    ControlProviders.CertificateProvider.ERROR_WRITING_CERT:string {"PGS03314: Unable to add certificate to truststore. Error while trying to write certificate."}
+
+    ControlProviders.CertificateProvider.ERROR_WRITING_CRL:string {"PGS03315: Unable to add CRL to truststore. Error while trying to write CRL."}
 
         // ==========================================================
         // Messages for CIMOMHandle
--- pegasus/src/Pegasus/ControlProviders/CertificateProvider/CertificateProvider.cpp.obz4945	2006-03-14 16:06:37.000000000 -0500
+++ pegasus/src/Pegasus/ControlProviders/CertificateProvider/CertificateProvider.cpp	2006-04-14 17:55:21.000000000 -0400
@@ -1384,10 +1384,38 @@
             sprintf(newFileName, "%s", (const char*) certificateFileName.getCString());
         
             //use the ssl functions to write out the client x509 certificate
-            //TODO: add some error checking here
             BIO* outFile = BIO_new(BIO_s_file());
-            BIO_write_filename(outFile, newFileName);
-            int i = PEM_write_bio_X509(outFile, xCert);
+            if (outFile == NULL)
+            {
+                PEG_TRACE_STRING(TRC_CONTROLPROVIDER, Tracer::LEVEL2,
+                    "Unable to add certificate to truststore. "
+                    "Error while trying to write certificate, BIO_new returned error");
+                MessageLoaderParms parms("ControlProviders.CertificateProvider.ERROR_WRITING_CERT",
+                    "Unable to add certificate to truststore. Error while trying to write certificate.");
+                throw CIMException(CIM_ERR_FAILED, parms);
+            }
+
+            if (!BIO_write_filename(outFile, newFileName))
+            {
+                BIO_free_all(outFile);
+                PEG_TRACE_STRING(TRC_CONTROLPROVIDER, Tracer::LEVEL2,
+                    "Unable to add certificate to truststore. Error while trying to write certificate, "
+                    "BIO_write_filename returned error");
+                MessageLoaderParms parms("ControlProviders.CertificateProvider.ERROR_WRITING_CERT",
+                    "Unable to add certificate to truststore. Error while trying to write certificate.");
+                throw CIMException(CIM_ERR_FAILED, parms);
+            }
+            if (!PEM_write_bio_X509(outFile, xCert))
+            {
+                BIO_free_all(outFile);
+                PEG_TRACE_STRING(TRC_CONTROLPROVIDER, Tracer::LEVEL2,
+                    "Unable to add certificate to truststore. "
+                    "Error while trying to write certificate, PEM_write_bio_X509 returned error");
+                MessageLoaderParms parms("ControlProviders.CertificateProvider.ERROR_WRITING_CERT",
+                    "Unable to add certificate to truststore. Error while trying to write certificate.");
+                throw CIMException(CIM_ERR_FAILED, parms);
+            }
+
             BIO_free_all(outFile);
             
             if (userName == String::EMPTY)
@@ -1528,10 +1556,39 @@
             sprintf(newFileName, "%s", (const char*) crlFileName.getCString());
         
             //use the ssl functions to write out the client x509 certificate
-            //TODO: add some error checking here
             BIO* outFile = BIO_new(BIO_s_file());
-            BIO_write_filename(outFile, newFileName);
-            int i = PEM_write_bio_X509_CRL(outFile, xCrl);
+            if (outFile == NULL)
+            {
+                PEG_TRACE_STRING(TRC_CONTROLPROVIDER, Tracer::LEVEL2,
+                    "Unable to add CRL to truststore. "
+                    "Error while trying to write CRL, BIO_new returned error");
+                MessageLoaderParms parms("ControlProviders.CertificateProvider.ERROR_WRITING_CRL",
+                    "Unable to add CRL to truststore. Error while trying to write CRL.");
+                throw CIMException(CIM_ERR_FAILED, parms);
+            }
+
+            if (!BIO_write_filename(outFile, newFileName))
+            {
+                BIO_free_all(outFile);
+                PEG_TRACE_STRING(TRC_CONTROLPROVIDER, Tracer::LEVEL2,
+                    "Unable to add CRL to truststore. "
+                    "Error while trying to write CRL, BIO_write_filename returned error");
+                MessageLoaderParms parms("ControlProviders.CertificateProvider.ERROR_WRITING_CRL",
+                    "Unable to add CRL to truststore. Error while trying to write CRL.");
+                throw CIMException(CIM_ERR_FAILED, parms);
+            }
+
+            if (!PEM_write_bio_X509_CRL(outFile, xCrl))
+            {
+                BIO_free_all(outFile);
+                PEG_TRACE_STRING(TRC_CONTROLPROVIDER, Tracer::LEVEL2,
+                    "Unable to add CRL to truststore. "
+                    "Error while trying to write CRL, PEM_write_bio_X509_CRL returned error");
+                MessageLoaderParms parms("ControlProviders.CertificateProvider.ERROR_WRITING_CRL",
+                    "Unable to add CRL to truststore. Error while trying to write CRL.");
+                throw CIMException(CIM_ERR_FAILED, parms);
+            }
+
             BIO_free_all(outFile);
 
             Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::TRACE, 


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- tog-pegasus.spec	11 Apr 2006 19:46:17 -0000	1.28
+++ tog-pegasus.spec	14 Apr 2006 23:35:38 -0000	1.29
@@ -31,7 +31,7 @@
 %define pegasus_uid	66
 
 Version: 		2.5.1
-Release: 		1%{?LINUX_VERSION:.%{LINUX_VERSION}}
+Release: 		2%{?LINUX_VERSION:.%{LINUX_VERSION}}
 Epoch:   		2
 #
 Summary:   		OpenPegasus WBEM Services for Linux
@@ -61,6 +61,10 @@
 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
+Patch16:		pegasus-2.5.1-HOSTNAME_MAX.patch
 #
 Conflicts: 		openwbem
 Provides: 		tog-pegasus-cimserver
@@ -128,6 +132,10 @@
 %patch10 -p1 -b .fix-zseries-flags
 %patch11 -p1 -b .fix-tests
 %patch12 -p1 -b .AutoPtr-Core
+%patch13 -p1 -b .obz4934
+%patch14 -p1 -b .obz4945
+%patch15 -p1 -b .PATH_MAX
+%patch16 -p1 -b .HOSTNAME_MAX
 
 %build
 rm -rf ${RPM_BUILD_ROOT} || :;
@@ -263,6 +271,12 @@
 :;
 
 %changelog
+* Fri Apr 14 2006 Jason Vas Dias <jvdias at redhat.com> - 2:2.5.1-2
+- Apply patches for the two '2.5.2_APPROVED' upstream bugzillas 
+  4934(4943) and 4945 :
+  (http://cvs.opengroup.org/bugzilla/buglist.cgi?bug_id=4943%2C4945)
+- Fix the PATH_MAX and MAXHOSTNAMELEN issues (again)
+
 * Thu Apr 06 2006 Jason Vas Dias <jvdias at redhat.com> - 2:2.5.1-1
 - Upgrade to version 2.5.1 (including new upstream .spec file).
 



From fedora-cvs-commits at redhat.com  Fri Apr 14 23:40:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 19:40:16 -0400
Subject: rpms/tog-pegasus/devel pegasus-2.5.1-obz4934.patch,NONE,1.1
Message-ID: <200604142340.k3ENeGFN013200@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13170

Added Files:
	pegasus-2.5.1-obz4934.patch 
Log Message:
fix upstream bugzillas 4934(4943) and 4945; fix PATH_MAX and MAXHOSTNAMELEN issues;

pegasus-2.5.1-obz4934.patch:
 ProviderManager2/ProviderManagerService.cpp |   23 +++++++++--------------
 Server/CIMOperationRequestDispatcher.cpp    |    1 +
 2 files changed, 10 insertions(+), 14 deletions(-)

--- NEW FILE pegasus-2.5.1-obz4934.patch ---
--- pegasus/src/Pegasus/ProviderManager2/ProviderManagerService.cpp.obz4934	2006-02-28 14:53:30.000000000 -0500
+++ pegasus/src/Pegasus/ProviderManager2/ProviderManagerService.cpp	2006-04-14 17:47:30.000000000 -0400
@@ -567,8 +567,8 @@
     CIMRequestMessage* request,
     CIMResponseMessage* response)
 {
-	CIMStatusCode code = CIM_ERR_SUCCESS;
-	String message;
+    PEG_METHOD_ENTER(TRC_PROVIDERMANAGER,
+        "ProviderManagerService::responseChunkCallback");
 
 	try
 	{
@@ -601,25 +601,20 @@
 		
 		op->_async_callback(op, service, op->_callback_ptr);
 	}
-
-	catch(CIMException &e)
-	{
-		code = e.getCode();
-		message = e.getMessage();
-	}
 	catch(Exception &e)
 	{
-		code = CIM_ERR_FAILED;
-		message = e.getMessage();
+        PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,
+            "Exception in ProviderManagerService::responseChunkCallback: " +
+                e.getMessage() + ".  Chunk not delivered.");
 	}
 	catch(...)
 	{
-		code = CIM_ERR_FAILED;
-		message = cimStatusCodeToString(code);
+        PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,
+            "Exception in ProviderManagerService::responseChunkCallback.  "
+                "Chunk not delivered.");
 	}
 
-	if (code !=  CIM_ERR_SUCCESS)
-		response->cimException = PEGASUS_CIM_EXCEPTION(code, message);
+    PEG_METHOD_EXIT();
 }
 
 Message* ProviderManagerService::_processMessage(CIMRequestMessage* request)
--- pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.cpp.obz4934	2006-03-14 17:12:21.000000000 -0500
+++ pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.cpp	2006-04-14 17:24:06.000000000 -0400
@@ -1770,6 +1770,7 @@
     {
         // put back the async request because there are more chunks to come.
         op->put_request(asyncRequest);
+        delete asyncReply;
     }
     else
     {



From fedora-cvs-commits at redhat.com  Fri Apr 14 23:47:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 19:47:48 -0400
Subject: rpms/tog-pegasus/FC-5 pegasus-2.5.1-HOSTNAME_MAX.patch, NONE,
	1.1 pegasus-2.5.1-PATH_MAX.patch, NONE,
	1.1 pegasus-2.5.1-obz4934.patch, NONE,
	1.1 pegasus-2.5.1-obz4945.patch, NONE, 1.1 tog-pegasus.spec,
	1.25, 1.26
Message-ID: <200604142347.k3ENllGV029598@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv29562

Modified Files:
	tog-pegasus.spec 
Added Files:
	pegasus-2.5.1-HOSTNAME_MAX.patch pegasus-2.5.1-PATH_MAX.patch 
	pegasus-2.5.1-obz4934.patch pegasus-2.5.1-obz4945.patch 
Log Message:
fix upstream bugzillas 4934(4943) and 4945; fix PATH_MAX and MAXHOSTNAMELEN issues;

pegasus-2.5.1-HOSTNAME_MAX.patch:
 Platform_LINUX_IA64_GNU.h      |    7 +++++--
 Platform_LINUX_IX86_GNU.h      |    7 +++++--
 Platform_LINUX_PPC64_GNU.h     |    7 +++++--
 Platform_LINUX_PPC_GNU.h       |    7 +++++--
 Platform_LINUX_X86_64_GNU.h    |    7 +++++--
 Platform_LINUX_XSCALE_GNU.h    |    7 +++++--
 Platform_LINUX_ZSERIES64_GNU.h |    8 ++++++--
 Platform_LINUX_ZSERIES_GNU.h   |    7 +++++--
 8 files changed, 41 insertions(+), 16 deletions(-)

--- NEW FILE pegasus-2.5.1-HOSTNAME_MAX.patch ---
--- pegasus/src/Pegasus/Common/Platform_LINUX_XSCALE_GNU.h.HOSTNAME_MAX	2006-01-30 11:17:07.000000000 -0500
+++ pegasus/src/Pegasus/Common/Platform_LINUX_XSCALE_GNU.h	2006-04-14 18:41:28.000000000 -0400
@@ -72,9 +72,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/param.h> // For MAXHOSTNAMELEN
+#include <limits.h> 
 
-#if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN)
-#define PEGASUS_MAXHOSTNAMELEN 64
+#ifdef _POSIX_HOST_NAME_MAX
+#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX)
+#else
+#define PEGASUS_MAXHOSTNAMELEN 255
 #endif
 
 #define PEGASUS_SOCKLEN_T socklen_t
--- pegasus/src/Pegasus/Common/Platform_LINUX_IA64_GNU.h.HOSTNAME_MAX	2006-01-30 11:17:07.000000000 -0500
+++ pegasus/src/Pegasus/Common/Platform_LINUX_IA64_GNU.h	2006-04-14 18:37:02.000000000 -0400
@@ -69,9 +69,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/param.h> // For MAXHOSTNAMELEN
+#include <limits.h> 
 
-#if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN)
-#define PEGASUS_MAXHOSTNAMELEN 64
+#ifdef _POSIX_HOST_NAME_MAX
+#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX)
+#else
+#define PEGASUS_MAXHOSTNAMELEN 255
 #endif
 
 #define PEGASUS_SOCKLEN_T socklen_t
--- pegasus/src/Pegasus/Common/Platform_LINUX_ZSERIES_GNU.h.HOSTNAME_MAX	2006-01-30 11:17:07.000000000 -0500
+++ pegasus/src/Pegasus/Common/Platform_LINUX_ZSERIES_GNU.h	2006-04-14 18:40:02.000000000 -0400
@@ -69,9 +69,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/param.h> // For MAXHOSTNAMELEN
+#include <limits.h> 
 
-#if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN)
-#define PEGASUS_MAXHOSTNAMELEN 64
+#ifdef _POSIX_HOST_NAME_MAX
+#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX)
+#else
+#define PEGASUS_MAXHOSTNAMELEN 255
 #endif
 
 #define PEGASUS_SOCKLEN_T socklen_t
--- pegasus/src/Pegasus/Common/Platform_LINUX_X86_64_GNU.h.HOSTNAME_MAX	2006-01-30 11:17:07.000000000 -0500
+++ pegasus/src/Pegasus/Common/Platform_LINUX_X86_64_GNU.h	2006-04-14 18:38:18.000000000 -0400
@@ -73,9 +73,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/param.h> // For MAXHOSTNAMELEN
+#include <limits.h> 
 
-#if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN)
-#define PEGASUS_MAXHOSTNAMELEN 64
+#ifdef _POSIX_HOST_NAME_MAX
+#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX)
+#else
+#define PEGASUS_MAXHOSTNAMELEN 255
 #endif
 
 #define PEGASUS_SOCKLEN_T socklen_t
--- pegasus/src/Pegasus/Common/Platform_LINUX_PPC_GNU.h.HOSTNAME_MAX	2006-01-30 11:17:07.000000000 -0500
+++ pegasus/src/Pegasus/Common/Platform_LINUX_PPC_GNU.h	2006-04-14 18:38:50.000000000 -0400
@@ -73,9 +73,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/param.h> // For MAXHOSTNAMELEN
+#include <limits.h> 
 
-#if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN)
-#define PEGASUS_MAXHOSTNAMELEN 64
+#ifdef _POSIX_HOST_NAME_MAX
+#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX)
+#else
+#define PEGASUS_MAXHOSTNAMELEN 255
 #endif
 
 #define PEGASUS_SOCKLEN_T socklen_t
--- pegasus/src/Pegasus/Common/Platform_LINUX_IX86_GNU.h.HOSTNAME_MAX	2006-01-30 11:17:07.000000000 -0500
+++ pegasus/src/Pegasus/Common/Platform_LINUX_IX86_GNU.h	2006-04-14 18:37:23.000000000 -0400
@@ -74,9 +74,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/param.h> // For MAXHOSTNAMELEN
+#include <limits.h> 
 
-#if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN)
-#define PEGASUS_MAXHOSTNAMELEN 64
+#ifdef _POSIX_HOST_NAME_MAX
+#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX)
+#else
+#define PEGASUS_MAXHOSTNAMELEN 255
 #endif
 
 #define PEGASUS_SOCKLEN_T socklen_t
--- pegasus/src/Pegasus/Common/Platform_LINUX_ZSERIES64_GNU.h.HOSTNAME_MAX	2006-01-30 11:17:07.000000000 -0500
+++ pegasus/src/Pegasus/Common/Platform_LINUX_ZSERIES64_GNU.h	2006-04-14 18:40:30.000000000 -0400
@@ -70,8 +70,12 @@
 #include <stdlib.h>
 #include <sys/param.h> // For MAXHOSTNAMELEN
 
-#if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN)
-#define PEGASUS_MAXHOSTNAMELEN 64
+#include <limits.h> 
+
+#ifdef _POSIX_HOST_NAME_MAX
+#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX)
+#else
+#define PEGASUS_MAXHOSTNAMELEN 255
 #endif
 
 #define PEGASUS_SOCKLEN_T socklen_t
--- pegasus/src/Pegasus/Common/Platform_LINUX_PPC64_GNU.h.HOSTNAME_MAX	2006-01-30 11:17:07.000000000 -0500
+++ pegasus/src/Pegasus/Common/Platform_LINUX_PPC64_GNU.h	2006-04-14 18:39:13.000000000 -0400
@@ -73,9 +73,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/param.h> // For MAXHOSTNAMELEN
+#include <limits.h> 
 
-#if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN)
-#define PEGASUS_MAXHOSTNAMELEN 64
+#ifdef _POSIX_HOST_NAME_MAX
+#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX)
+#else
+#define PEGASUS_MAXHOSTNAMELEN 255
 #endif
 
 #define PEGASUS_SOCKLEN_T socklen_t

pegasus-2.5.1-PATH_MAX.patch:
 System.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE pegasus-2.5.1-PATH_MAX.patch ---
--- pegasus/src/Pegasus/Common/System.cpp.PATH_MAX	2006-01-30 11:17:08.000000000 -0500
+++ pegasus/src/Pegasus/Common/System.cpp	2006-04-14 18:19:27.000000000 -0400
@@ -185,13 +185,13 @@
 char *System::extract_file_path(const char *fullpath, char *dirname)
 {
   char *p;
-  char buff[2048];
+  char buff[PATH_MAX];
   if (fullpath == NULL)
     {
       dirname[0] = '\0';
       return dirname;
     }
-  strcpy(buff, fullpath);
+  strncpy(buff, fullpath, PATH_MAX);
   for(p = buff + strlen(buff); p >= buff; p--)
     {
       if (*p == '\\' || *p == '/')

pegasus-2.5.1-obz4934.patch:
 ProviderManager2/ProviderManagerService.cpp |   23 +++++++++--------------
 Server/CIMOperationRequestDispatcher.cpp    |    1 +
 2 files changed, 10 insertions(+), 14 deletions(-)

--- NEW FILE pegasus-2.5.1-obz4934.patch ---
--- pegasus/src/Pegasus/ProviderManager2/ProviderManagerService.cpp.obz4934	2006-02-28 14:53:30.000000000 -0500
+++ pegasus/src/Pegasus/ProviderManager2/ProviderManagerService.cpp	2006-04-14 17:47:30.000000000 -0400
@@ -567,8 +567,8 @@
     CIMRequestMessage* request,
     CIMResponseMessage* response)
 {
-	CIMStatusCode code = CIM_ERR_SUCCESS;
-	String message;
+    PEG_METHOD_ENTER(TRC_PROVIDERMANAGER,
+        "ProviderManagerService::responseChunkCallback");
 
 	try
 	{
@@ -601,25 +601,20 @@
 		
 		op->_async_callback(op, service, op->_callback_ptr);
 	}
-
-	catch(CIMException &e)
-	{
-		code = e.getCode();
-		message = e.getMessage();
-	}
 	catch(Exception &e)
 	{
-		code = CIM_ERR_FAILED;
-		message = e.getMessage();
+        PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,
+            "Exception in ProviderManagerService::responseChunkCallback: " +
+                e.getMessage() + ".  Chunk not delivered.");
 	}
 	catch(...)
 	{
-		code = CIM_ERR_FAILED;
-		message = cimStatusCodeToString(code);
+        PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,
+            "Exception in ProviderManagerService::responseChunkCallback.  "
+                "Chunk not delivered.");
 	}
 
-	if (code !=  CIM_ERR_SUCCESS)
-		response->cimException = PEGASUS_CIM_EXCEPTION(code, message);
+    PEG_METHOD_EXIT();
 }
 
 Message* ProviderManagerService::_processMessage(CIMRequestMessage* request)
--- pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.cpp.obz4934	2006-03-14 17:12:21.000000000 -0500
+++ pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.cpp	2006-04-14 17:24:06.000000000 -0400
@@ -1770,6 +1770,7 @@
     {
         // put back the async request because there are more chunks to come.
         op->put_request(asyncRequest);
+        delete asyncReply;
     }
     else
     {

pegasus-2.5.1-obz4945.patch:
 ControlProviders/CertificateProvider/CertificateProvider.cpp |   69 ++++++++++-
 msg/Server/pegasusServer_en.txt                              |    5 
 2 files changed, 67 insertions(+), 7 deletions(-)

--- NEW FILE pegasus-2.5.1-obz4945.patch ---
--- pegasus/src/Pegasus/msg/Server/pegasusServer_en.txt.obz4945	2006-03-15 16:28:36.000000000 -0500
+++ pegasus/src/Pegasus/msg/Server/pegasusServer_en.txt	2006-04-14 17:55:22.000000000 -0400
@@ -1167,8 +1167,11 @@
 
     ControlProviders.CertificateProvider.EMPTY_CRL:string {"PGS03312: The certificate revocation list is empty."}
 
-        ControlProviders.CertificateProvider.TRUSTSTORE_RELOAD_FAILED:string {"PGS03313: Trust store reload failed. Certificate deletion will not be effective until cimserver restart."}
+    ControlProviders.CertificateProvider.TRUSTSTORE_RELOAD_FAILED:string {"PGS03313: Trust store reload failed. Certificate deletion will not be effective until cimserver restart."}
 
+    ControlProviders.CertificateProvider.ERROR_WRITING_CERT:string {"PGS03314: Unable to add certificate to truststore. Error while trying to write certificate."}
+
+    ControlProviders.CertificateProvider.ERROR_WRITING_CRL:string {"PGS03315: Unable to add CRL to truststore. Error while trying to write CRL."}
 
         // ==========================================================
         // Messages for CIMOMHandle
--- pegasus/src/Pegasus/ControlProviders/CertificateProvider/CertificateProvider.cpp.obz4945	2006-03-14 16:06:37.000000000 -0500
+++ pegasus/src/Pegasus/ControlProviders/CertificateProvider/CertificateProvider.cpp	2006-04-14 17:55:21.000000000 -0400
@@ -1384,10 +1384,38 @@
             sprintf(newFileName, "%s", (const char*) certificateFileName.getCString());
         
             //use the ssl functions to write out the client x509 certificate
-            //TODO: add some error checking here
             BIO* outFile = BIO_new(BIO_s_file());
-            BIO_write_filename(outFile, newFileName);
-            int i = PEM_write_bio_X509(outFile, xCert);
+            if (outFile == NULL)
+            {
+                PEG_TRACE_STRING(TRC_CONTROLPROVIDER, Tracer::LEVEL2,
+                    "Unable to add certificate to truststore. "
+                    "Error while trying to write certificate, BIO_new returned error");
+                MessageLoaderParms parms("ControlProviders.CertificateProvider.ERROR_WRITING_CERT",
+                    "Unable to add certificate to truststore. Error while trying to write certificate.");
+                throw CIMException(CIM_ERR_FAILED, parms);
+            }
+
+            if (!BIO_write_filename(outFile, newFileName))
+            {
+                BIO_free_all(outFile);
+                PEG_TRACE_STRING(TRC_CONTROLPROVIDER, Tracer::LEVEL2,
+                    "Unable to add certificate to truststore. Error while trying to write certificate, "
+                    "BIO_write_filename returned error");
+                MessageLoaderParms parms("ControlProviders.CertificateProvider.ERROR_WRITING_CERT",
+                    "Unable to add certificate to truststore. Error while trying to write certificate.");
+                throw CIMException(CIM_ERR_FAILED, parms);
+            }
+            if (!PEM_write_bio_X509(outFile, xCert))
+            {
+                BIO_free_all(outFile);
+                PEG_TRACE_STRING(TRC_CONTROLPROVIDER, Tracer::LEVEL2,
+                    "Unable to add certificate to truststore. "
+                    "Error while trying to write certificate, PEM_write_bio_X509 returned error");
+                MessageLoaderParms parms("ControlProviders.CertificateProvider.ERROR_WRITING_CERT",
+                    "Unable to add certificate to truststore. Error while trying to write certificate.");
+                throw CIMException(CIM_ERR_FAILED, parms);
+            }
+
             BIO_free_all(outFile);
             
             if (userName == String::EMPTY)
@@ -1528,10 +1556,39 @@
             sprintf(newFileName, "%s", (const char*) crlFileName.getCString());
         
             //use the ssl functions to write out the client x509 certificate
-            //TODO: add some error checking here
             BIO* outFile = BIO_new(BIO_s_file());
-            BIO_write_filename(outFile, newFileName);
-            int i = PEM_write_bio_X509_CRL(outFile, xCrl);
+            if (outFile == NULL)
+            {
+                PEG_TRACE_STRING(TRC_CONTROLPROVIDER, Tracer::LEVEL2,
+                    "Unable to add CRL to truststore. "
+                    "Error while trying to write CRL, BIO_new returned error");
+                MessageLoaderParms parms("ControlProviders.CertificateProvider.ERROR_WRITING_CRL",
+                    "Unable to add CRL to truststore. Error while trying to write CRL.");
+                throw CIMException(CIM_ERR_FAILED, parms);
+            }
+
+            if (!BIO_write_filename(outFile, newFileName))
+            {
+                BIO_free_all(outFile);
+                PEG_TRACE_STRING(TRC_CONTROLPROVIDER, Tracer::LEVEL2,
+                    "Unable to add CRL to truststore. "
+                    "Error while trying to write CRL, BIO_write_filename returned error");
+                MessageLoaderParms parms("ControlProviders.CertificateProvider.ERROR_WRITING_CRL",
+                    "Unable to add CRL to truststore. Error while trying to write CRL.");
+                throw CIMException(CIM_ERR_FAILED, parms);
+            }
+
+            if (!PEM_write_bio_X509_CRL(outFile, xCrl))
+            {
+                BIO_free_all(outFile);
+                PEG_TRACE_STRING(TRC_CONTROLPROVIDER, Tracer::LEVEL2,
+                    "Unable to add CRL to truststore. "
+                    "Error while trying to write CRL, PEM_write_bio_X509_CRL returned error");
+                MessageLoaderParms parms("ControlProviders.CertificateProvider.ERROR_WRITING_CRL",
+                    "Unable to add CRL to truststore. Error while trying to write CRL.");
+                throw CIMException(CIM_ERR_FAILED, parms);
+            }
+
             BIO_free_all(outFile);
 
             Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::TRACE, 


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/FC-5/tog-pegasus.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- tog-pegasus.spec	11 Apr 2006 20:40:59 -0000	1.25
+++ tog-pegasus.spec	14 Apr 2006 23:47:45 -0000	1.26
@@ -31,7 +31,7 @@
 %define pegasus_uid	66
 
 Version: 		2.5.1
-Release: 		1%{?LINUX_VERSION:.%{LINUX_VERSION}}
+Release: 		2%{?LINUX_VERSION:.%{LINUX_VERSION}}
 Epoch:   		2
 #
 Summary:   		OpenPegasus WBEM Services for Linux
@@ -61,6 +61,10 @@
 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
+Patch16:		pegasus-2.5.1-HOSTNAME_MAX.patch
 #
 Conflicts: 		openwbem
 Provides: 		tog-pegasus-cimserver
@@ -128,6 +132,10 @@
 %patch10 -p1 -b .fix-zseries-flags
 %patch11 -p1 -b .fix-tests
 %patch12 -p1 -b .AutoPtr-Core
+%patch13 -p1 -b .obz4934
+%patch14 -p1 -b .obz4945
+%patch15 -p1 -b .PATH_MAX
+%patch16 -p1 -b .HOSTNAME_MAX
 
 %build
 rm -rf ${RPM_BUILD_ROOT} || :;
@@ -263,6 +271,12 @@
 :;
 
 %changelog
+* Fri Apr 14 2006 Jason Vas Dias <jvdias at redhat.com> - 2:2.5.1-2
+- Apply patches for the two '2.5.2_APPROVED' upstream bugzillas 
+  4934(4943) and 4945 :
+  (http://cvs.opengroup.org/bugzilla/buglist.cgi?bug_id=4943%2C4945)
+- Fix the PATH_MAX and MAXHOSTNAMELEN issues (again)
+
 * Thu Apr 06 2006 Jason Vas Dias <jvdias at redhat.com> - 2:2.5.1-1
 - Upgrade to version 2.5.1 (including new upstream .spec file).
 



From fedora-cvs-commits at redhat.com  Fri Apr 14 23:49:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 19:49:20 -0400
Subject: rpms/tog-pegasus/FC-5 pegasus-2.5.1-redhat-config.patch,1.1,1.2
Message-ID: <200604142349.k3ENnKvj030206@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv30169

Modified Files:
	pegasus-2.5.1-redhat-config.patch 
Log Message:
fix upstream bugzillas 4934(4943) and 4945; fix PATH_MAX and MAXHOSTNAMELEN issues;

pegasus-2.5.1-redhat-config.patch:
 Makefile.Release     |    6 +++---
 env_var_Linux.status |   14 +++++++-------
 mak/config-linux.mak |    3 ++-
 3 files changed, 12 insertions(+), 11 deletions(-)

Index: pegasus-2.5.1-redhat-config.patch
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/FC-5/pegasus-2.5.1-redhat-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pegasus-2.5.1-redhat-config.patch	11 Apr 2006 20:40:59 -0000	1.1
+++ pegasus-2.5.1-redhat-config.patch	14 Apr 2006 23:49:17 -0000	1.2
@@ -1,5 +1,5 @@
 --- pegasus/env_var_Linux.status.redhat-config	2006-03-15 20:33:51.000000000 -0500
-+++ pegasus/env_var_Linux.status	2006-04-11 15:56:29.000000000 -0400
++++ pegasus/env_var_Linux.status	2006-04-12 13:46:18.000000000 -0400
 @@ -18,7 +18,9 @@
  PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
  endif
@@ -47,7 +47,7 @@
       $(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)/cimxml.socket
  
 --- pegasus/Makefile.Release.redhat-config	2006-01-30 11:16:16.000000000 -0500
-+++ pegasus/Makefile.Release	2006-04-11 15:47:08.000000000 -0400
++++ pegasus/Makefile.Release	2006-04-12 13:46:18.000000000 -0400
 @@ -590,10 +590,10 @@
  	$(foreach i, $(MANAGEDSYSTEM_MOF_FILES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus/$(i);)
  
@@ -70,3 +70,15 @@
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
  	@$(ECHO-E) "%config(noreplace) $(PEGASUS_CONFIG_DIR)/access.conf" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+--- pegasus/mak/config-linux.mak.redhat-config	2006-02-07 16:03:57.000000000 -0500
++++ pegasus/mak/config-linux.mak	2006-04-12 16:06:26.000000000 -0400
+@@ -118,7 +118,8 @@
+ ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS 
+   FLAGS += -g
+ else
+-  FLAGS += -s
++#  FLAGS += -s
++#  ^= let rpm handle stripping
+   #
+   # The -fno-enforce-eh-specs is not available in 2.9.5 and it probably
+   # appeared in the 3.0 series of compilers.



From fedora-cvs-commits at redhat.com  Sat Apr 15 00:24:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Apr 2006 20:24:51 -0400
Subject: rpms/xorg-x11-server-utils/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xorg-x11-server-utils.spec, 1.13,
	1.14 lbxproxy-1.0.1-datadir-AtomControl-fix.patch, 1.1, NONE
Message-ID: <200604150024.k3F0Op8V007760@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7723/devel

Modified Files:
	.cvsignore sources xorg-x11-server-utils.spec 
Removed Files:
	lbxproxy-1.0.1-datadir-AtomControl-fix.patch 
Log Message:
auto-import xorg-x11-server-utils-1.0.1-2 on branch devel from xorg-x11-server-utils-1.0.1-2.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server-utils/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 Jan 2006 16:10:02 -0000	1.4
+++ .cvsignore	15 Apr 2006 00:24:48 -0000	1.5
@@ -1,10 +1,8 @@
 iceauth-1.0.1.tar.bz2
-lbxproxy-1.0.1.tar.bz2
 rgb-1.0.0.tar.bz2
 sessreg-1.0.0.tar.bz2
 xcmsdb-1.0.1.tar.bz2
 xgamma-1.0.1.tar.bz2
-xhost-1.0.0.tar.bz2
 xmodmap-1.0.0.tar.bz2
 xrandr-1.0.1.tar.bz2
 xrdb-1.0.1.tar.bz2
@@ -16,3 +14,4 @@
 xstdcmap-1.0.1.tar.bz2
 xtrap-1.0.1.tar.bz2
 xvidtune-1.0.1.tar.bz2
+xhost-1.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server-utils/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Jan 2006 16:10:02 -0000	1.4
+++ sources	15 Apr 2006 00:24:48 -0000	1.5
@@ -1,10 +1,8 @@
 50df9a5718b3cb6544a1c9f38b392b09  iceauth-1.0.1.tar.bz2
-9d5045a5c76b1fe360221b967a5aa0e9  lbxproxy-1.0.1.tar.bz2
 04349739e0ce2a8557d32ffc55cb8d69  rgb-1.0.0.tar.bz2
 15c8032bbf5197e8fb5d071d9500a880  sessreg-1.0.0.tar.bz2
 8579d5f50ba7f0c4a5bf16b9670fea01  xcmsdb-1.0.1.tar.bz2
 45d8fa3c85d4bfda87251798fd605a45  xgamma-1.0.1.tar.bz2
-426abcd1b36236a9dbe56770f57fcdfb  xhost-1.0.0.tar.bz2
 6c45ef77c26dce98e625d1f99df16468  xmodmap-1.0.0.tar.bz2
 14de596b7276c46b77e336cbb4f13c24  xrandr-1.0.1.tar.bz2
 9ed059ee45780d32c697d4acc6b07192  xrdb-1.0.1.tar.bz2
@@ -16,3 +14,4 @@
 86ab558441edfb86f853639e4290a754  xstdcmap-1.0.1.tar.bz2
 e49c695a0af17bc4896e51c298304643  xtrap-1.0.1.tar.bz2
 e0744594f4e5969b20df28d897781318  xvidtune-1.0.1.tar.bz2
+5300c9aafa58878c8f6e85379d5c199c  xhost-1.0.1.tar.bz2


Index: xorg-x11-server-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server-utils/devel/xorg-x11-server-utils.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-server-utils.spec	1 Mar 2006 06:37:01 -0000	1.13
+++ xorg-x11-server-utils.spec	15 Apr 2006 00:24:48 -0000	1.14
@@ -3,18 +3,17 @@
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1.2
+Release: 2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
 
 Source0:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/iceauth-1.0.1.tar.bz2
-Source1:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/lbxproxy-1.0.1.tar.bz2
 Source2:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/rgb-1.0.0.tar.bz2
 Source3:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/sessreg-1.0.0.tar.bz2
 Source4:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xcmsdb-1.0.1.tar.bz2
 Source5:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xgamma-1.0.1.tar.bz2
-Source6:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xhost-1.0.0.tar.bz2
+Source6:  http://xorg.freedesktop.org/releases/individual/app/xhost-1.0.1.tar.bz2
 Source7:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xmodmap-1.0.0.tar.bz2
 Source8:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xrandr-1.0.1.tar.bz2
 Source9:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xrdb-1.0.1.tar.bz2
@@ -35,9 +34,6 @@
 # iceauth section
 #Patch0: 
 
-# lbxproxy section
-Patch1000: lbxproxy-1.0.1-datadir-AtomControl-fix.patch
-
 # rgb section
 Patch1100: rgb-1.0.0-datadir-rgbpath-fix.patch
 # xvidtune section
@@ -61,11 +57,11 @@
 # xrdb requires the C preprocessor to work properly
 Requires: cpp
 
-Provides: iceauth lbxproxy rgb sessreg xcmsdb xgamma xhost
+Provides: iceauth rgb sessreg xcmsdb xgamma xhost
 Provides: xmodmap xrandr xrdb xrefresh xset xsetmode xsetpointer
 Provides: xsetroot xstdcmap xtrap xvidtune
 
-# NOTE: iceauth, lbxproxy, rgb, sessreg, xcmsdb, xgamma, xhost, xmodmap,
+# NOTE: iceauth, rgb, sessreg, xcmsdb, xgamma, xhost, xmodmap,
 # xrandr, xrdb, xrefresh, xset, xsetmode, xsetpointer, xsetroot, xstdcmap,
 # xtrap, xvidtune, were all in xorg-x11 and XFree86 packages, so we obsolete
 # them to ensure upgrades work.
@@ -76,8 +72,7 @@
 of the X server.
 
 %prep
-%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17
-%patch1000 -p0 -b .datadir-AtomControl-fix
+%setup -q -c %{name}-%{version} -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17
 
 %patch1100 -p0 -b .datadir-rgbpath-fix
 
@@ -92,12 +87,6 @@
       echo "******************** $app"
 
       case $app in
-         lbxproxy-*)
-            aclocal --force
-            automake -f
-            autoconf
-            %configure ;#configdir=%{_datadir}/X11/lbxproxy
-            ;;
          rgb-*)
             # FIXME: run autotools junk to kick in our patch
             aclocal --force
@@ -129,9 +118,6 @@
    for app in * ; do
       pushd $app
       case $app in
-         lbxproxy-*)
-            make install DESTDIR=$RPM_BUILD_ROOT
-            ;;
          *)
             make install DESTDIR=$RPM_BUILD_ROOT
             ;;
@@ -147,7 +133,6 @@
 %defattr(-,root,root,-)
 %doc
 %{_bindir}/iceauth
-%{_bindir}/lbxproxy
 %{_bindir}/sessreg
 %{_bindir}/showrgb
 %{_bindir}/xcmsdb
@@ -174,11 +159,8 @@
 %{_datadir}/X11/rgb.txt
 %dir %{_datadir}/X11/app-defaults
 %{_datadir}/X11/app-defaults/Xvidtune
-%dir %{_datadir}/X11/lbxproxy
-%{_datadir}/X11/lbxproxy/AtomControl
 #%dir %{_mandir}/man1x
 %{_mandir}/man1/iceauth.1x*
-%{_mandir}/man1/lbxproxy.1x*
 %{_mandir}/man1/sessreg.1x*
 %{_mandir}/man1/showrgb.1x*
 %{_mandir}/man1/xcmsdb.1x*
@@ -204,6 +186,10 @@
 %{_mandir}/man1/xvidtune.1x*
 
 %changelog
+* Fri Apr 14 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-2
+- Drop lbxproxy, LBX is deprecated upstream
+- Update to xhost 1.0.1
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 


--- lbxproxy-1.0.1-datadir-AtomControl-fix.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sat Apr 15 10:33:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Apr 2006 06:33:34 -0400
Subject: rpms/selinux-policy/FC-5 .cvsignore, 1.49, 1.50 selinux-policy.spec,
	1.163, 1.164 sources, 1.53, 1.54
Message-ID: <200604151033.k3FAXYVM026465@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore selinux-policy.spec sources 
Log Message:
* Sat Apr 15 2006 Dan Walsh <dwalsh at redhat.com> 2.2.32-1.fc5
- Bump for fc5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	3 Apr 2006 17:32:00 -0000	1.49
+++ .cvsignore	15 Apr 2006 10:33:31 -0000	1.50
@@ -50,3 +50,4 @@
 serefpolicy-2.2.23.tgz
 serefpolicy-2.2.25.tgz
 serefpolicy-2.2.29.tgz
+serefpolicy-2.2.32.tgz


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/selinux-policy.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- selinux-policy.spec	4 Apr 2006 09:47:54 -0000	1.163
+++ selinux-policy.spec	15 Apr 2006 10:33:31 -0000	1.164
@@ -15,12 +15,12 @@
 %define CHECKPOLICYVER 1.30.3-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.29
-Release: 3.fc5
+Version: 2.2.32
+Release: 1.fc5
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
-patch: policy-20060323.patch
+patch: policy-20060411.patch
 Source1: modules-targeted.conf
 Source2: booleans-targeted.conf
 Source3: Makefile.devel
@@ -122,6 +122,7 @@
 %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; \
@@ -148,7 +149,7 @@
 
 %prep 
 %setup -q -n serefpolicy-%{version}
-%patch -p1 
+%patch -p1
 
 %install
 # Build targeted policy
@@ -320,6 +321,53 @@
 %endif
 
 %changelog
+* Sat Apr 15 2006 Dan Walsh <dwalsh at redhat.com> 2.2.32-1.fc5
+- Bump for fc5
+
+* Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> 2.2.32-1
+- Update to latest from upstream
+
+* Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> 2.2.31-1
+- Update to latest from upstream
+- Allow mono and unconfined to talk to initrc_t dbus objects
+
+* Tue Apr 11 2006 Dan Walsh <dwalsh at redhat.com> 2.2.30-2
+- Change libraries.fc to stop shlib_t form overriding texrel_shlib_t
+
+* Tue Apr 11 2006 Dan Walsh <dwalsh at redhat.com> 2.2.30-1
+- Fix samba creating dirs in homedir
+- Fix NFS so its booleans would work
+
+* Mon Apr 10 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-6
+- Allow secadm_t ability to relabel all files
+- Allow ftp to search xferlog_t directories
+- Allow mysql to communicate with ldap
+- Allow rsync to bind to rsync_port_t
+
+* Mon Apr 10 2006 Russell Coker <rcoker at redhat.com> 2.2.29-5
+- Fixed mailman with Postfix #183928
+- Allowed semanage to create file_context files.
+- Allowed amanda_t to access inetd_t TCP sockets and allowed amanda_recover_t
+  to bind to reserved ports.  #149030
+- Don't allow devpts_t to be associated with tmp_t.
+- Allow hald_t to stat all mountpoints.
+- Added boolean samba_share_nfs to allow smbd_t full access to NFS mounts.
+  #169947
+- Make mount run in mount_t domain from unconfined_t to prevent mislabeling of
+  /etc/mtab.
+- Changed the file_contexts to not have a regex before the first ^/[a-z]/
+  whenever possible, makes restorecon slightly faster.
+- Correct the label of /etc/named.caching-nameserver.conf
+- Now label /usr/src/kernels/.+/lib(/.*)? as usr_t instead of
+  /usr/src(/.*)?/lib(/.*)? - I don't think we need anything else under /usr/src
+  hit by this.
+- Granted xen access to /boot, allowed mounting on xend_var_lib_t, and allowed
+  xenstored_t rw access to the xen device node.
+
+* Mon Apr 4 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-4
+- More textrel_shlib_t file path fixes
+- Add ada support
+
 * Tue Apr 4 2006 Dan Walsh <dwalsh at redhat.com> 2.2.29-3.fc5
 - Bump for fc5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	3 Apr 2006 17:32:00 -0000	1.53
+++ sources	15 Apr 2006 10:33:31 -0000	1.54
@@ -1 +1 @@
-a2106965fe20d1d3d41e0d4e05c2effb  serefpolicy-2.2.29.tgz
+7a3563e2478a4b18dc689de8561831b5  serefpolicy-2.2.32.tgz



From fedora-cvs-commits at redhat.com  Sat Apr 15 10:34:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Apr 2006 06:34:19 -0400
Subject: rpms/selinux-policy/FC-5 policy-20060411.patch,NONE,1.1
Message-ID: <200604151034.k3FAYJ2d026607@cvs.devel.redhat.com>

Author: dwalsh

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

Added Files:
	policy-20060411.patch 
Log Message:
* Sat Apr 15 2006 Dan Walsh <dwalsh at redhat.com> 2.2.32-1.fc5
- Bump for fc5


policy-20060411.patch:
 Rules.modular                           |    2 -
 policy/mcs                              |    6 ++-
 policy/modules/admin/amanda.te          |    9 ++++
 policy/modules/admin/bootloader.te      |    1 
 policy/modules/admin/rpm.fc             |    1 
 policy/modules/admin/su.fc              |    2 -
 policy/modules/admin/usermanage.te      |    1 
 policy/modules/apps/java.fc             |    9 +---
 policy/modules/apps/java.te             |    1 
 policy/modules/apps/mono.te             |    6 +++
 policy/modules/kernel/corecommands.fc   |   20 ++++++----
 policy/modules/kernel/devices.fc        |    3 +
 policy/modules/kernel/devices.if        |   24 +++++++++++-
 policy/modules/kernel/files.fc          |   37 ++++++++++++-------
 policy/modules/kernel/files.if          |   27 ++++++++++++++
 policy/modules/kernel/kernel.if         |    3 +
 policy/modules/kernel/mcs.te            |    4 ++
 policy/modules/kernel/mls.te            |    1 
 policy/modules/services/avahi.te        |    1 
 policy/modules/services/bind.fc         |    1 
 policy/modules/services/ftp.te          |    1 
 policy/modules/services/hal.te          |    1 
 policy/modules/services/kerberos.fc     |    4 +-
 policy/modules/services/mailman.if      |   38 ++++++++++++++++++++
 policy/modules/services/postfix.te      |    5 ++
 policy/modules/services/postgresql.if   |    4 +-
 policy/modules/services/rpc.te          |    4 +-
 policy/modules/services/samba.if        |    1 
 policy/modules/services/samba.te        |   12 +++++-
 policy/modules/services/spamassassin.fc |    2 -
 policy/modules/services/tftp.fc         |    3 +
 policy/modules/services/xserver.if      |   21 +++++++++++
 policy/modules/system/authlogin.fc      |    3 +
 policy/modules/system/authlogin.te      |    4 ++
 policy/modules/system/daemontools.fc    |    3 +
 policy/modules/system/fstools.te        |    1 
 policy/modules/system/init.te           |    1 
 policy/modules/system/libraries.fc      |   60 +++++++++++++++++++-------------
 policy/modules/system/miscfiles.fc      |    2 -
 policy/modules/system/modutils.fc       |    6 ++-
 policy/modules/system/selinuxutil.if    |    4 +-
 policy/modules/system/unconfined.te     |    3 +
 policy/modules/system/userdomain.if     |   28 ++++++++++----
 policy/modules/system/xen.te            |    5 ++
 44 files changed, 293 insertions(+), 82 deletions(-)

--- NEW FILE policy-20060411.patch ---
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.32/policy/mcs
--- nsaserefpolicy/policy/mcs	2006-03-29 11:23:41.000000000 -0500
+++ serefpolicy-2.2.32/policy/mcs	2006-04-14 12:06:19.000000000 -0400
@@ -134,14 +134,18 @@
 # the high range of the file.  We use the high range of the process so
 # that processes can always simply run at s0.
 #
-# Only files are constrained by MCS at this stage.
+# Note that getattr on files is always permitted.
 #
 mlsconstrain file { write setattr append unlink link rename ioctl lock execute relabelfrom }
 	( h1 dom h2 );
 
+# New filesystem object labels must be dominated by the relabeling subject
+# clearance, also the objects are single-level.
 mlsconstrain file { create relabelto }
 	(( h1 dom h2 ) and ( l2 eq h2 ));
 
+# At this time we do not restrict "ps" type operations via MCS.  This
+# will probably change in future.
 mlsconstrain file { read }
 	(( h1 dom h2 ) or ( t2 == domain ) or ( t1 == mlsfileread ));
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.2.32/policy/modules/admin/amanda.te
--- nsaserefpolicy/policy/modules/admin/amanda.te	2006-03-24 11:15:40.000000000 -0500
+++ serefpolicy-2.2.32/policy/modules/admin/amanda.te	2006-04-14 14:29:14.000000000 -0400
@@ -9,6 +9,7 @@
 type amanda_t;
 type amanda_inetd_exec_t;
 inetd_udp_service_domain(amanda_t,amanda_inetd_exec_t)
+inetd_tcp_service_domain(amanda_t,amanda_inetd_exec_t)
 role system_r types amanda_t;
 
 type amanda_exec_t;
@@ -141,6 +142,10 @@
 corenet_non_ipsec_sendrecv(amanda_t)
 corenet_tcp_bind_all_nodes(amanda_t)
 corenet_udp_bind_all_nodes(amanda_t)
+corenet_tcp_bind_reserved_port(amanda_t)
+corenet_udp_bind_reserved_port(amanda_t)
+corenet_dontaudit_tcp_bind_all_reserved_ports(amanda_t)
+corenet_dontaudit_udp_bind_all_reserved_ports(amanda_t)
 
 dev_getattr_all_blk_files(amanda_t)
 dev_getattr_all_chr_files(amanda_t)
@@ -183,13 +188,15 @@
 
 optional_policy(`
 	nscd_socket_use(amanda_t)
+	nscd_socket_use(amanda_recover_t)
 ')
 
 ########################################
 #
 # Amanda recover local policy
 
-allow amanda_recover_t self:capability { fowner fsetid kill setgid setuid chown dac_override net_bind_service };
+allow amanda_recover_t self:capability { fowner fsetid kill setgid setuid chown dac_override };
+corenet_tcp_bind_reserved_port(amanda_recover_t)
 allow amanda_recover_t self:process { sigkill sigstop signal };
 allow amanda_recover_t self:fifo_file { getattr ioctl read write };
 allow amanda_recover_t self:unix_stream_socket { connect create read write };
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.32/policy/modules/admin/bootloader.te
--- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-04-04 18:06:37.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/admin/bootloader.te	2006-04-14 12:06:19.000000000 -0400
@@ -84,6 +84,7 @@
 dev_read_sysfs(bootloader_t)
 # for reading BIOS data
 dev_read_raw_memory(bootloader_t)
+mls_file_read_up(bootloader_t)
 
 fs_getattr_xattr_fs(bootloader_t)
 fs_read_tmpfs_symlinks(bootloader_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.2.32/policy/modules/admin/rpm.fc
--- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-04-04 18:06:37.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/admin/rpm.fc	2006-04-14 12:06:19.000000000 -0400
@@ -10,6 +10,7 @@
 /usr/lib(64)?/rpm/rpmv		-- 	gen_context(system_u:object_r:bin_t,s0)
 
 /usr/share/yumex/yumex		--	gen_context(system_u:object_r:rpm_exec_t,s0)
+/usr/sbin/system-install-packages --	gen_context(system_u:object_r:rpm_exec_t,s0)
 
 ifdef(`distro_redhat', `
 /usr/bin/fedora-rmdevelrpms	--	gen_context(system_u:object_r:rpm_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.fc serefpolicy-2.2.32/policy/modules/admin/su.fc
--- nsaserefpolicy/policy/modules/admin/su.fc	2006-03-23 14:33:29.000000000 -0500
+++ serefpolicy-2.2.32/policy/modules/admin/su.fc	2006-04-14 12:06:19.000000000 -0400
@@ -1,5 +1,5 @@
 
 /bin/su			--	gen_context(system_u:object_r:su_exec_t,s0)
 
-/usr(/local)?/bin/ksu	--	gen_context(system_u:object_r:su_exec_t,s0)
+/usr/(local/)?bin/ksu	--	gen_context(system_u:object_r:su_exec_t,s0)
 /usr/bin/kdesu		--	gen_context(system_u:object_r:su_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.2.32/policy/modules/admin/usermanage.te
--- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-04-04 18:06:38.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/admin/usermanage.te	2006-04-14 12:06:19.000000000 -0400
@@ -514,6 +514,7 @@
 # Add/remove user home directories
 userdom_home_filetrans_generic_user_home_dir(useradd_t)
 userdom_manage_generic_user_home_content_dirs(useradd_t)
+userdom_manage_staff_home_dir(useradd_t)
 userdom_generic_user_home_dir_filetrans_generic_user_home_content(useradd_t,notdevfile_class_set)
 
 mta_manage_spool(useradd_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.2.32/policy/modules/apps/java.fc
--- nsaserefpolicy/policy/modules/apps/java.fc	2006-04-12 13:44:36.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/apps/java.fc	2006-04-14 12:06:19.000000000 -0400
@@ -1,11 +1,8 @@
 #
-# /opt
-#
-/opt(/.*)?/bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
-
-#
 # /usr
 #
-/usr(/.*)?/bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
+/usr/(.*/)?bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
+/usr/lib(.*/)?bin/java([^/]*)? 	--	gen_context(system_u:object_r:java_exec_t,s0)
 /usr/bin/gcj-dbtool	--	gen_context(system_u:object_r:java_exec_t,s0)
 /usr/bin/gij		--	gen_context(system_u:object_r:java_exec_t,s0)
+/opt/(.*/)?bin/java([^/]*)? 	--	gen_context(system_u:object_r:java_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-2.2.32/policy/modules/apps/java.te
--- nsaserefpolicy/policy/modules/apps/java.te	2006-04-12 13:44:36.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/apps/java.te	2006-04-14 12:06:19.000000000 -0400
@@ -10,6 +10,7 @@
 domain_type(java_t)
 
 type java_exec_t;
+init_system_domain(java_t,java_exec_t)
 files_type(java_exec_t)
 
 ########################################
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.2.32/policy/modules/apps/mono.te
--- nsaserefpolicy/policy/modules/apps/mono.te	2006-04-12 13:44:36.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/apps/mono.te	2006-04-14 12:06:19.000000000 -0400
@@ -22,6 +22,8 @@
 	unconfined_domain_noaudit(mono_t)
 	role system_r types mono_t;
 
+	init_dbus_chat_script(mono_t)
+
 	optional_policy(`
 		avahi_dbus_chat(mono_t)
 	')
@@ -29,4 +31,8 @@
 	optional_policy(`
 		hal_dbus_chat(mono_t)
 	')
+	optional_policy(`
+		networkmanager_dbus_chat(mono_t)
+	')
+
 ')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.2.32/policy/modules/kernel/corecommands.fc
--- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-04-10 17:05:08.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/kernel/corecommands.fc	2006-04-14 12:06:19.000000000 -0400
@@ -2,7 +2,8 @@
 #
 # /bin
 #
-/bin(/.*)?				gen_context(system_u:object_r:bin_t,s0)
+/bin				-d	gen_context(system_u:object_r:bin_t,s0)
+/bin/.*					gen_context(system_u:object_r:bin_t,s0)
 /bin/d?ash			--	gen_context(system_u:object_r:shell_exec_t,s0)
 /bin/bash			--	gen_context(system_u:object_r:shell_exec_t,s0)
 /bin/bash2			--	gen_context(system_u:object_r:shell_exec_t,s0)
@@ -86,27 +87,30 @@
 #
 # /sbin
 #
-/sbin(/.*)?				gen_context(system_u:object_r:sbin_t,s0)
+/sbin				-d	gen_context(system_u:object_r:sbin_t,s0)
+/sbin/.*				gen_context(system_u:object_r:sbin_t,s0)
 /sbin/mkfs\.cramfs		--	gen_context(system_u:object_r:sbin_t,s0)
 /sbin/insmod_ksymoops_clean	--	gen_context(system_u:object_r:sbin_t,s0)
 
 #
 # /opt
 #
-/opt(/.*)?/bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
+/opt/(.*/)?bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
 
-/opt(/.*)?/libexec(/.*)?		gen_context(system_u:object_r:bin_t,s0)
+/opt/(.*/)?libexec(/.*)?		gen_context(system_u:object_r:bin_t,s0)
 
-/opt(/.*)?/sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
+/opt/(.*/)?sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
 
 #
 # /usr
 #
-/usr(/.*)?/Bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
+/usr/(.*/)?Bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
 
-/usr(/.*)?/bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
+/usr/(.*/)?bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
+/usr/lib(.*/)?bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
 
-/usr(/.*)?/sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
+/usr/(.*/)?sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
+/usr/lib(.*/)?sbin(/.*)?		gen_context(system_u:object_r:sbin_t,s0)
 
 /usr/lib/ccache/bin(/.*)?		gen_context(system_u:object_r:bin_t,s0)
 /usr/lib/pgsql/test/regress/.*\.sh --	gen_context(system_u:object_r:bin_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.32/policy/modules/kernel/devices.fc
--- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-04-12 13:44:36.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/kernel/devices.fc	2006-04-14 12:06:19.000000000 -0400
@@ -1,5 +1,6 @@
 
-/dev(/.*)?			gen_context(system_u:object_r:device_t,s0)
+/dev			-d	gen_context(system_u:object_r:device_t,s0)
+/dev/.*				gen_context(system_u:object_r:device_t,s0)
 
 /dev/.*mouse.*		-c	gen_context(system_u:object_r:mouse_device_t,s0)
 /dev/adsp		-c	gen_context(system_u:object_r:sound_device_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.32/policy/modules/kernel/devices.if
--- nsaserefpolicy/policy/modules/kernel/devices.if	2006-04-12 13:44:36.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/kernel/devices.if	2006-04-14 12:06:19.000000000 -0400
@@ -2701,7 +2701,7 @@
 	')
 
 	allow $1 device_t:dir r_dir_perms;
-	allow $1 xen_device_t:chr_file r_file_perms;
+	allow $1 xen_device_t:chr_file rw_file_perms;
 ')
 
 ########################################
@@ -2720,7 +2720,7 @@
 	')
 
 	allow $1 device_t:dir r_dir_perms;
-	allow $1 xen_device_t:chr_file r_file_perms;
+	allow $1 xen_device_t:chr_file manage_file_perms;
 ')
 
 ########################################
@@ -2874,3 +2874,23 @@
 
 	typeattribute $1 devices_unconfined_type;
 ')
+
+########################################
+## <summary>
+##	Dontaudit getattr on all device nodes.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+#
+interface(`dev_dontaudit_getattr_all_device_nodes',`
+	gen_require(`
+		attribute device_node;
+	')
+
+	dontaudit $1 device_t:dir_file_class_set getattr;
+	dontaudit $1 device_node:dir_file_class_set getattr;
+')
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.32/policy/modules/kernel/files.fc
--- nsaserefpolicy/policy/modules/kernel/files.fc	2006-03-23 14:33:29.000000000 -0500
+++ serefpolicy-2.2.32/policy/modules/kernel/files.fc	2006-04-14 12:06:19.000000000 -0400
@@ -25,7 +25,8 @@
 #
 # /boot
 #
-/boot(/.*)?			gen_context(system_u:object_r:boot_t,s0)
+/boot			-d	gen_context(system_u:object_r:boot_t,s0)
+/boot/.*			gen_context(system_u:object_r:boot_t,s0)
 /boot/\.journal			<<none>>
 /boot/lost\+found	-d	gen_context(system_u:object_r:lost_found_t,s15:c0.c255)
 /boot/lost\+found/.*		<<none>>
@@ -36,13 +37,15 @@
 #
 
 ifdef(`distro_redhat',`
-/emul(/.*)?			gen_context(system_u:object_r:usr_t,s0)
+/emul			-d	gen_context(system_u:object_r:usr_t,s0)
+/emul/.*			gen_context(system_u:object_r:usr_t,s0)
 ')
 
 #
 # /etc
 #
-/etc(/.*)?			gen_context(system_u:object_r:etc_t,s0)
+/etc			-d	gen_context(system_u:object_r:etc_t,s0)
+/etc/.*				gen_context(system_u:object_r:etc_t,s0)
 /etc/\.fstab\.hal\..+	--	gen_context(system_u:object_r:etc_runtime_t,s0)
 /etc/asound\.state	--	gen_context(system_u:object_r:etc_runtime_t,s0)
 /etc/blkid(/.*)?		gen_context(system_u:object_r:etc_runtime_t,s0)
@@ -104,7 +107,8 @@
 #
 # /lib(64)?
 #
-/lib(64)?/modules(/.*)?		gen_context(system_u:object_r:modules_object_t,s0)
+/lib/modules(/.*)?		gen_context(system_u:object_r:modules_object_t,s0)
+/lib64/modules(/.*)?		gen_context(system_u:object_r:modules_object_t,s0)
 
 #
 # /lost+found
@@ -139,29 +143,34 @@
 #
 # /opt
 #
-/opt(/.*)?			gen_context(system_u:object_r:usr_t,s0)
+/opt			-d	gen_context(system_u:object_r:usr_t,s0)
+/opt/.*				gen_context(system_u:object_r:usr_t,s0)
 
-/opt(/.*)?/var/lib(64)?(/.*)?	gen_context(system_u:object_r:var_lib_t,s0)
+/opt/(.*/)?var/lib(64)?(/.*)?	gen_context(system_u:object_r:var_lib_t,s0)
 
 #
 # /proc
 #
-/proc(/.*)?                     <<none>>
+/proc			-d	<<none>>
+/proc/.*			<<none>>
 
 #
 # /selinux
 #
-/selinux(/.*)?                  <<none>>
+/selinux		-d	<<none>>
+/selinux/.*			<<none>>
 
 #
 # /srv
 #
-/srv(/.*)?			gen_context(system_u:object_r:var_t,s0)
+/srv			-d	gen_context(system_u:object_r:var_t,s0)
+/srv/.*				gen_context(system_u:object_r:var_t,s0)
 
 #
 # /sys
 #
-/sys(/.*)?                      <<none>>
+/sys			-d	<<none>>
+/sys/.*				<<none>>
 
 #
 # /tmp
@@ -176,7 +185,8 @@
 #
 # /usr
 #
-/usr(/.*)?			gen_context(system_u:object_r:usr_t,s0)
+/usr			-d	gen_context(system_u:object_r:usr_t,s0)
+/usr/.*				gen_context(system_u:object_r:usr_t,s0)
 /usr/\.journal			<<none>>
 
 /usr/doc(/.*)?/lib(/.*)?		gen_context(system_u:object_r:usr_t,s0)
@@ -200,7 +210,7 @@
 /usr/share(/.*)?/lib(64)?(/.*)?	gen_context(system_u:object_r:usr_t,s0)
 
 /usr/src(/.*)?			gen_context(system_u:object_r:src_t,s0)
-/usr/src(/.*)?/lib(/.*)?		gen_context(system_u:object_r:usr_t,s0)
+/usr/src/kernels/.+/lib(/.*)?		gen_context(system_u:object_r:usr_t,s0)
 
 /usr/tmp			-d	gen_context(system_u:object_r:tmp_t,s0-s15:c0.c255)
 /usr/tmp/.*			<<none>>
@@ -208,7 +218,8 @@
 #
 # /var
 #
-/var(/.*)?			gen_context(system_u:object_r:var_t,s0)
+/var			-d	gen_context(system_u:object_r:var_t,s0)
+/var/.*				gen_context(system_u:object_r:var_t,s0)
 /var/\.journal			<<none>>
 
 /var/db/.*\.db		--	gen_context(system_u:object_r:etc_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.32/policy/modules/kernel/files.if
--- nsaserefpolicy/policy/modules/kernel/files.if	2006-04-14 07:58:12.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/kernel/files.if	2006-04-14 12:06:19.000000000 -0400
@@ -948,6 +948,18 @@
 
 ########################################
 #
+# files_stat_all_mountpoints(domain)
+#
+interface(`files_stat_all_mountpoints',`
+	gen_require(`
+		attribute mountpoint;
+	')
+
+	allow $1 mountpoint:dir { getattr };
+')
+
+########################################
+#
 # files_list_root(domain)
 #
 interface(`files_list_root',`
@@ -1661,6 +1673,21 @@
 ')
 
 ########################################
+#
+# files_unlink_boot_flag(domain)
+#
+# /halt, /.autofsck, etc
+#
+interface(`files_unlink_boot_flag',`
+	gen_require(`
+		type root_t;
+	')
+
+	allow $1 root_t:file unlink;
+')
+
+
+########################################
 ## <summary>
 ##	Read files in /etc that are dynamically
 ##	created on boot, such as mtab.
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.32/policy/modules/kernel/kernel.if
--- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-04-10 17:05:10.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/kernel/kernel.if	2006-04-14 12:06:19.000000000 -0400
@@ -1148,7 +1148,8 @@
 
 	allow $1 proc_t:dir search;
 	allow $1 sysctl_t:dir r_dir_perms;
-	allow $1 sysctl_vm_t:dir list_dir_perms;
+#hal needs allow hald_t sysctl_vm_t:dir write;
+	allow $1 sysctl_vm_t:dir rw_dir_perms;
 	allow $1 sysctl_vm_t:file rw_file_perms;
 ')
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mcs.te serefpolicy-2.2.32/policy/modules/kernel/mcs.te
--- nsaserefpolicy/policy/modules/kernel/mcs.te	2006-04-04 18:06:38.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/kernel/mcs.te	2006-04-14 12:06:19.000000000 -0400
@@ -32,6 +32,10 @@
 type xdm_exec_t;
 
 ifdef(`enable_mcs',`
+# The eventual plan is to have a range_transition to s0 for the daemon by
+# default and have the daemons which need to run with all categories be
+# exceptions.  But while range_transitions have to be in the base module
+# this is not possible.
 range_transition getty_t login_exec_t s0 - s0:c0.c255;
 range_transition init_t xdm_exec_t s0 - s0:c0.c255;
 range_transition initrc_t crond_exec_t s0 - s0:c0.c255;
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.32/policy/modules/kernel/mls.te
--- nsaserefpolicy/policy/modules/kernel/mls.te	2006-03-07 10:31:09.000000000 -0500
+++ serefpolicy-2.2.32/policy/modules/kernel/mls.te	2006-04-14 12:06:19.000000000 -0400
@@ -60,6 +60,7 @@
 
 ifdef(`enable_mls',`
 range_transition initrc_t auditd_exec_t s15:c0.c255;
+range_transition secadm_t auditctl_exec_t s15:c0.c255;
 range_transition kernel_t init_exec_t s0 - s15:c0.c255;
 range_transition kernel_t lvm_exec_t s0 - s15:c0.c255;
 ')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.2.32/policy/modules/services/avahi.te
--- nsaserefpolicy/policy/modules/services/avahi.te	2006-03-24 11:15:50.000000000 -0500
+++ serefpolicy-2.2.32/policy/modules/services/avahi.te	2006-04-14 12:06:19.000000000 -0400
@@ -92,6 +92,7 @@
 	dbus_system_bus_client_template(avahi,avahi_t)
 	dbus_connect_system_bus(avahi_t)
 	dbus_send_system_bus(avahi_t)
+	init_dbus_chat_script(avahi_t)
 ')
 
 optional_policy(`
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.fc serefpolicy-2.2.32/policy/modules/services/bind.fc
--- nsaserefpolicy/policy/modules/services/bind.fc	2006-01-16 17:04:24.000000000 -0500
+++ serefpolicy-2.2.32/policy/modules/services/bind.fc	2006-04-14 12:06:19.000000000 -0400
@@ -29,6 +29,7 @@
 
 ifdef(`distro_redhat',`
 /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)
 /var/named/data(/.*)?		gen_context(system_u:object_r:named_cache_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.2.32/policy/modules/services/ftp.te
--- nsaserefpolicy/policy/modules/services/ftp.te	2006-04-12 13:44:37.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/services/ftp.te	2006-04-14 13:41:32.000000000 -0400
@@ -126,6 +126,7 @@
 seutil_dontaudit_search_config(ftpd_t)
 
 sysnet_read_config(ftpd_t)
+sysnet_use_ldap(ftpd_t)
 
 userdom_dontaudit_search_sysadm_home_dirs(ftpd_t)
 userdom_dontaudit_use_unpriv_user_fds(ftpd_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.32/policy/modules/services/hal.te
--- nsaserefpolicy/policy/modules/services/hal.te	2006-04-12 13:44:37.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/services/hal.te	2006-04-14 12:06:19.000000000 -0400
@@ -103,6 +103,7 @@
 fs_getattr_all_fs(hald_t)
 fs_search_all(hald_t)
 fs_list_auto_mountpoints(hald_t)
+files_stat_all_mountpoints(hald_t)
 
 mls_file_read_up(hald_t)
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.fc serefpolicy-2.2.32/policy/modules/services/kerberos.fc
--- nsaserefpolicy/policy/modules/services/kerberos.fc	2005-10-06 17:29:17.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/services/kerberos.fc	2006-04-14 12:06:19.000000000 -0400
@@ -5,8 +5,8 @@
 /etc/krb5kdc/kadm5.keytab 	--	gen_context(system_u:object_r:krb5_keytab_t,s0)
 /etc/krb5kdc/principal.*		gen_context(system_u:object_r:krb5kdc_principal_t,s0)
 
-/usr(/local)?(/kerberos)?/sbin/krb5kdc -- gen_context(system_u:object_r:krb5kdc_exec_t,s0)
-/usr(/local)?(/kerberos)?/sbin/kadmind -- gen_context(system_u:object_r:kadmind_exec_t,s0)
+/usr/(local/)?(kerberos/)?sbin/krb5kdc -- gen_context(system_u:object_r:krb5kdc_exec_t,s0)
+/usr/(local/)?(kerberos/)?sbin/kadmind -- gen_context(system_u:object_r:kadmind_exec_t,s0)
 
 /usr/local/var/krb5kdc(/.*)?		gen_context(system_u:object_r:krb5kdc_conf_t,s0)
 /usr/local/var/krb5kdc/principal.*	gen_context(system_u:object_r:krb5kdc_principal_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-2.2.32/policy/modules/services/mailman.if
--- nsaserefpolicy/policy/modules/services/mailman.if	2006-03-24 11:15:50.000000000 -0500
+++ serefpolicy-2.2.32/policy/modules/services/mailman.if	2006-04-14 12:06:19.000000000 -0400
@@ -200,6 +200,44 @@
 
 #######################################
 ## <summary>
+##	Allow domain to to create mailman data files and write the directory
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`mailman_create_data_file',`
+	gen_require(`
+		type mailman_data_t;
+	')
+
+	allow $1 mailman_data_t:dir rw_dir_perms;
+	allow $1 mailman_data_t:file create_file_perms;
+')
+
+#######################################
+## <summary>
+##	Allow domain to to read mailman data files
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`mailman_read_data_file',`
+	gen_require(`
+		type mailman_data_t;
+	')
+
+	allow $1 mailman_data_t:dir search_dir_perms;
+	allow $1 mailman_data_t:file read_file_perms;
+')
+
+#######################################
+## <summary>
 ##	List the contents of mailman data directories.
 ## </summary>
 ## <param name="domain">
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.32/policy/modules/services/postfix.te
--- nsaserefpolicy/policy/modules/services/postfix.te	2006-04-04 18:06:38.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/services/postfix.te	2006-04-14 14:54:13.000000000 -0400
@@ -305,6 +305,7 @@
 
 kernel_read_kernel_sysctls(postfix_map_t)
 kernel_dontaudit_list_proc(postfix_map_t)
+kernel_dontaudit_read_system_state(postfix_map_t)
 
 corenet_tcp_sendrecv_all_if(postfix_map_t)
 corenet_udp_sendrecv_all_if(postfix_map_t)
@@ -350,6 +351,7 @@
 ifdef(`targeted_policy',`
 	# FIXME: would be better to use a run interface
 	role system_r types postfix_map_t;
+	term_dontaudit_use_generic_ptys(postfix_map_t)
 ')
 
 tunable_policy(`read_default_t',`
@@ -408,6 +410,9 @@
 
 optional_policy(`
 	mailman_domtrans_queue(postfix_pipe_t)
+#	for postalias
+	mailman_create_data_file(postfix_master_t)
+	mailman_read_data_file(postfix_local_t)
 ')
 
 ########################################
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.if serefpolicy-2.2.32/policy/modules/services/postgresql.if
--- nsaserefpolicy/policy/modules/services/postgresql.if	2006-02-10 17:05:19.000000000 -0500
+++ serefpolicy-2.2.32/policy/modules/services/postgresql.if	2006-04-14 16:09:39.000000000 -0400
@@ -113,10 +113,12 @@
 #
 interface(`postgresql_stream_connect',`
 	gen_require(`
-		type postgresql_t, postgresql_var_run_t;
+		type postgresql_t, postgresql_var_run_t, postgresql_tmp_t;
 	')
 
 	files_search_pids($1)
 	allow $1 postgresql_t:unix_stream_socket connectto;
 	allow $1 postgresql_var_run_t:sock_file write;
+        # Some versions of postgresql put the sock file in /tmp
+	allow $1 postgresql_tmp_t:sock_file write;
 ')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.2.32/policy/modules/services/rpc.te
--- nsaserefpolicy/policy/modules/services/rpc.te	2006-03-24 11:15:50.000000000 -0500
+++ serefpolicy-2.2.32/policy/modules/services/rpc.te	2006-04-14 12:06:19.000000000 -0400
@@ -110,13 +110,13 @@
 portmap_udp_chat(nfsd_t)
 
 tunable_policy(`nfs_export_all_rw',`
-	auth_read_all_dirs_except_shadow(nfsd_t) 
 	fs_read_noxattr_fs_files(nfsd_t) 
+	auth_manage_all_files_except_shadow(nfsd_t)
 ')
 
 tunable_policy(`nfs_export_all_ro',`
-	auth_read_all_dirs_except_shadow(nfsd_t) 
 	fs_read_noxattr_fs_files(nfsd_t) 
+	auth_read_all_files_except_shadow(nfsd_t)
 ')
 
 ########################################
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-2.2.32/policy/modules/services/samba.if
--- nsaserefpolicy/policy/modules/services/samba.if	2006-02-21 14:35:36.000000000 -0500
+++ serefpolicy-2.2.32/policy/modules/services/samba.if	2006-04-14 12:06:19.000000000 -0400
@@ -33,6 +33,7 @@
 	')
 
 	tunable_policy(`samba_enable_home_dirs',`
+		userdom_manage_user_home_content_dirs($1,smbd_t)
 		userdom_manage_user_home_content_files($1,smbd_t)
 		userdom_manage_user_home_content_symlinks($1,smbd_t)
 		userdom_manage_user_home_content_sockets($1,smbd_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.32/policy/modules/services/samba.te
--- nsaserefpolicy/policy/modules/services/samba.te	2006-04-12 13:44:37.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/services/samba.te	2006-04-14 13:42:57.000000000 -0400
@@ -106,8 +106,8 @@
 files_tmp_filetrans(samba_net_t, samba_net_tmp_t, { file dir })
 
 allow samba_net_t samba_var_t:dir rw_dir_perms;
+allow samba_net_t samba_var_t:file create_file_perms;
 allow samba_net_t samba_var_t:lnk_file create_lnk_perms;
-allow samba_net_t samba_var_t:file create_lnk_perms;
 
 kernel_read_proc_symlinks(samba_net_t)
 
@@ -160,8 +160,10 @@
 	corenet_non_ipsec_sendrecv(samba_net_t)
 	corenet_tcp_bind_all_nodes(samba_net_t)
 	sysnet_read_config(samba_net_t)
+        corenet_tcp_connect_ldap_port(samba_net_t)
 ')
 
+
 optional_policy(`
 	nscd_socket_use(samba_net_t)
 ')
@@ -268,6 +270,7 @@
 
 init_use_fds(smbd_t)
 init_use_script_ptys(smbd_t)
+init_rw_utmp(smbd_t)
 
 libs_use_ld_so(smbd_t)
 libs_use_shared_libs(smbd_t)
@@ -333,6 +336,13 @@
 ')
 allow smbd_t mtrr_device_t:file getattr;
 
+# Support Samba sharing of NFS mount points
+bool samba_share_nfs false;
+if (samba_share_nfs) {
+fs_manage_nfs_dirs(smbd_t)
+fs_manage_nfs_files(smbd_t)
+}
+
 ########################################
 #
 # nmbd Local policy
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-2.2.32/policy/modules/services/spamassassin.fc
--- nsaserefpolicy/policy/modules/services/spamassassin.fc	2005-12-01 17:57:16.000000000 -0500
+++ serefpolicy-2.2.32/policy/modules/services/spamassassin.fc	2006-04-14 12:06:19.000000000 -0400
@@ -1,5 +1,5 @@
 
-/usr/bin/sa-learn	--	gen_context(system_u:object_r:spamd_exec_t,s0)
+/usr/bin/sa-learn	--	gen_context(system_u:object_r:spamc_exec_t,s0)
 /usr/bin/spamc		--	gen_context(system_u:object_r:spamc_exec_t,s0)
 /usr/bin/spamd		--	gen_context(system_u:object_r:spamd_exec_t,s0)
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.fc serefpolicy-2.2.32/policy/modules/services/tftp.fc
--- nsaserefpolicy/policy/modules/services/tftp.fc	2005-10-06 17:29:17.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/services/tftp.fc	2006-04-14 12:06:19.000000000 -0400
@@ -2,4 +2,5 @@
 /usr/sbin/atftpd	--	gen_context(system_u:object_r:tftpd_exec_t,s0)
 /usr/sbin/in\.tftpd	--	gen_context(system_u:object_r:tftpd_exec_t,s0)
 
-/tftpboot(/.*)?			gen_context(system_u:object_r:tftpdir_t,s0)
+/tftpboot		-d	gen_context(system_u:object_r:tftpdir_t,s0)
+/tftpboot/.*			gen_context(system_u:object_r:tftpdir_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.32/policy/modules/services/xserver.if
--- nsaserefpolicy/policy/modules/services/xserver.if	2006-04-06 15:31:54.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/services/xserver.if	2006-04-14 12:06:19.000000000 -0400
@@ -1070,3 +1070,24 @@
 
 	dontaudit $1 xdm_xserver_t:tcp_socket { read write };
 ')
+
+########################################
+## <summary>
+##	Allow read and write to
+##	a XDM X server socket.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to allow
+##	</summary>
+## </param>
+#
+interface(`xserver_rw_xdm_sockets',`
+	gen_require(`
+		type xdm_xserver_tmp_t;
+	')
+
+	allow $1 xdm_xserver_tmp_t:dir search;
+	allow $1 xdm_xserver_tmp_t:sock_file { read write };
+')
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.fc serefpolicy-2.2.32/policy/modules/system/authlogin.fc
--- nsaserefpolicy/policy/modules/system/authlogin.fc	2006-01-19 17:48:34.000000000 -0500
+++ serefpolicy-2.2.32/policy/modules/system/authlogin.fc	2006-04-14 12:06:19.000000000 -0400
@@ -7,7 +7,8 @@
 /etc/passwd\.lock	--	gen_context(system_u:object_r:shadow_t,s0)
 /etc/shadow.*		--	gen_context(system_u:object_r:shadow_t,s0)
 
-/lib(64)?/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:pam_exec_t,s0)
+/lib/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:pam_exec_t,s0)
+/lib64/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:pam_exec_t,s0)
 
 /sbin/pam_console_apply	 --	gen_context(system_u:object_r:pam_console_exec_t,s0)
 /sbin/pam_timestamp_check --	gen_context(system_u:object_r:pam_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.32/policy/modules/system/authlogin.te
--- nsaserefpolicy/policy/modules/system/authlogin.te	2006-04-04 18:06:38.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/system/authlogin.te	2006-04-14 12:06:19.000000000 -0400
@@ -173,9 +173,13 @@
 dev_setattr_video_dev(pam_console_t)
 dev_getattr_xserver_misc_dev(pam_console_t)
 dev_setattr_xserver_misc_dev(pam_console_t)
+dev_read_urand(pam_console_t)
 
 fs_search_auto_mountpoints(pam_console_t)
 
+miscfiles_read_localization(pam_console_t)
+miscfiles_read_certs(pam_console_t)
+
 storage_getattr_fixed_disk_dev(pam_console_t)
 storage_setattr_fixed_disk_dev(pam_console_t)
 storage_getattr_removable_dev(pam_console_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/daemontools.fc serefpolicy-2.2.32/policy/modules/system/daemontools.fc
--- nsaserefpolicy/policy/modules/system/daemontools.fc	2006-04-05 11:35:09.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/system/daemontools.fc	2006-04-14 12:06:19.000000000 -0400
@@ -2,7 +2,8 @@
 # /service
 #
 
-/service(/.*)?			gen_context(system_u:object_r:svc_svc_t,s0)
+/service		-d	gen_context(system_u:object_r:svc_svc_t,s0)
+/service/.*			gen_context(system_u:object_r:svc_svc_t,s0)
 
 #
 # /usr
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.32/policy/modules/system/fstools.te
--- nsaserefpolicy/policy/modules/system/fstools.te	2006-04-04 18:06:38.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/system/fstools.te	2006-04-14 12:06:19.000000000 -0400
@@ -77,6 +77,7 @@
 dev_getattr_usbfs_dirs(fsadm_t)
 # Access to /dev/mapper/control
 dev_rw_lvm_control(fsadm_t)
+dev_dontaudit_getattr_all_device_nodes(fsadm_t)
 
 fs_search_auto_mountpoints(fsadm_t)
 fs_getattr_xattr_fs(fsadm_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.32/policy/modules/system/init.te
--- nsaserefpolicy/policy/modules/system/init.te	2006-04-06 15:32:43.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/system/init.te	2006-04-14 12:06:19.000000000 -0400
@@ -352,6 +352,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.32/policy/modules/system/libraries.fc
--- nsaserefpolicy/policy/modules/system/libraries.fc	2006-04-12 13:44:38.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/system/libraries.fc	2006-04-14 12:06:19.000000000 -0400
@@ -24,17 +24,22 @@
 #
 # /lib(64)?
 #
-/lib(64)?(/.*)?					gen_context(system_u:object_r:lib_t,s0)
+/lib(/.*)?					gen_context(system_u:object_r:lib_t,s0)
+/lib64(/.*)?					gen_context(system_u:object_r:lib_t,s0)
 /lib(64)?/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
 /lib(64)?(/.*)?/ld-[^/]*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:ld_so_t,s0)
 
 #
 # /opt
 #
-/opt(/.*)?/lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
-/opt(/.*)?/lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
-/opt/.*/jre.*/libdeploy.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-/opt/.*/jre.*/libjvm.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+/opt/(.*/)?lib(/.*)?			gen_context(system_u:object_r:lib_t,s0)
+/opt/(.*/)?lib64(/.*)?			gen_context(system_u:object_r:lib_t,s0)
+/opt/(.*/)?lib/.*\.so		--	gen_context(system_u:object_r:shlib_t,s0)
+/opt/(.*/)?lib/.*\.so\.[^/]*	--	gen_context(system_u:object_r:shlib_t,s0)
+/opt/(.*/)?lib64/.*\.so		--	gen_context(system_u:object_r:shlib_t,s0)
+/opt/(.*/)?lib64/.*\.so\.[^/]*	--	gen_context(system_u:object_r:shlib_t,s0)
+/opt/(.*/)?jre.*/libdeploy.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+/opt/(.*/)?jre.*/libjvm.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 
 #
 # /sbin
@@ -44,18 +49,22 @@
 #
 # /usr
 #
-/usr(/.*)?/HelixPlayer/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+/usr/(.*/)?/HelixPlayer/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 
-/usr(/.*)?/java/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-/usr(/.*)?/java/.*\.jar			--	gen_context(system_u:object_r:shlib_t,s0)
-/usr(/.*)?/java/.*\.jsa			--	gen_context(system_u:object_r:shlib_t,s0)
+/usr/(.*/)?java/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+/usr/(.*/)?java/.*\.jar			--	gen_context(system_u:object_r:shlib_t,s0)
+/usr/(.*/)?java/.*\.jsa			--	gen_context(system_u:object_r:shlib_t,s0)
+
+/usr/(.*/)?lib(/.*)?			gen_context(system_u:object_r:lib_t,s0)
+/usr/(.*/)?lib64(/.*)?			gen_context(system_u:object_r:lib_t,s0)
+/usr/(.*/)?lib/.*\.so		--	gen_context(system_u:object_r:shlib_t,s0)
+/usr/(.*/)?lib/.*\.so\.[^/]*	--	gen_context(system_u:object_r:shlib_t,s0)
+/usr/(.*/)?lib64/.*\.so		--	gen_context(system_u:object_r:shlib_t,s0)
+/usr/(.*/)?lib64/.*\.so\.[^/]*	--	gen_context(system_u:object_r:shlib_t,s0)
 
-/usr(/.*)?/lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
-/usr(/.*)?/lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
+/usr/(.*/)?lib(64)?(/.*)?/ld-[^/]*\.so(\.[^/]*)* gen_context(system_u:object_r:ld_so_t,s0)
 
-/usr(/.*)?/lib(64)?(/.*)?/ld-[^/]*\.so(\.[^/]*)* gen_context(system_u:object_r:ld_so_t,s0)
-
-/usr(/.*)?/nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+/usr/(.*/)?nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 
 /usr/lib(64)?/pgsql/test/regress/.*\.so	--	gen_context(system_u:object_r:shlib_t,s0)
 
@@ -64,7 +73,7 @@
 /usr/lib(64)?/im/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
 /usr/lib(64)?/iiim/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
 
-/usr(/.*)?/lib(64)?(/.*)?/nvidia/.*\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+/usr/(.*/)?lib(64)?(/.*)?/nvidia/.*\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?/libsipphoneapi\.so.*	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
 /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?/libGLU\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -74,9 +83,8 @@
 /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libGL(core)?\.so(\.[^/]*)*             --      	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libnvidia.*\.so(\.[^/]*)*              --      	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libXvMCNVIDIA\.so.*            --      	gen_context(system_u:object_r:textrel_shlib_t,s0)
-/usr/lib(64)?/vmware(.*/)?/VmPerl\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 
-/usr/(local/)?lib/wine/.*\.so  		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+/usr/(local/)?lib(64)?/wine/.*\.so  		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/(local/)?lib/libfame-.*\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/local/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
 
@@ -127,7 +135,7 @@
 /usr/lib(64)?/.*/program/libsvx680li\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?/.*/program/libcomphelp4gcc3\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?/.*/program/libsoffice\.so  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-/usr(/.*)?/pcsc/drivers(/.*)?/lib(cm2020|cm4000|SCR24x)\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+/usr/(.*/)?pcsc/drivers(/.*)?/lib(cm2020|cm4000|SCR24x)\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
 
 /usr/lib(64)?/firefox.*\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?/mozilla.*\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -180,15 +188,17 @@
 
 # vmware 
 /usr/lib(64)?/vmware/lib(/.*)?/libgdk-x11-.*\.so.*  -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+/usr/lib(64)?/vmware/lib(/.*)?/HConfig.so  -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+/usr/lib(64)?/vmware/(.*/)?VmPerl\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 
 # Java, Sun Microsystems (JPackage SRPM)
-/usr/.*/jre.*/libdeploy.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-/usr/.*/jre.*/libjvm.so			--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+/usr/(.*/)?jre.*/libdeploy.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+/usr/(.*/)?jre.*/libjvm.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 
-/usr(/.*)?/intellinux/nppdf\.so		--	gen_context(system_u:object_r:texrel_shlib_t,s0)
-/usr(/.*)?/intellinux/lib/\.so		--	gen_context(system_u:object_r:texrel_shlib_t,s0)
-/usr(/.*)?/intellinux/plug_ins/.*\.api	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
-/usr(/.*)?/intellinux/SPPlugins/ADMPlugin\.apl -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+/usr/(.*/)?intellinux/nppdf\.so		--	gen_context(system_u:object_r:texrel_shlib_t,s0)
+/usr/(.*/)?intellinux/lib/\.so		--	gen_context(system_u:object_r:texrel_shlib_t,s0)
+/usr/(.*/)?intellinux/plug_ins/.*\.api	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
+/usr/(.*/)?intellinux/SPPlugins/ADMPlugin\.apl -- gen_context(system_u:object_r:textrel_shlib_t,s0)
 ') dnl end distro_redhat
 
 ifdef(`distro_suse',`
@@ -214,3 +224,5 @@
 /var/spool/postfix/lib(64)?/lib.*\.so.*	--	gen_context(system_u:object_r:shlib_t,s0)
 /var/spool/postfix/lib(64)?/[^/]*/lib.*\.so.* -- gen_context(system_u:object_r:shlib_t,s0)
 /var/spool/postfix/lib(64)?/devfsd/.*\.so.* -- gen_context(system_u:object_r:shlib_t,s0)
+/usr/NX/lib/libXcomp.so.*	--  gen_context(system_u:object_r:textrel_shlib_t,s0)
+/usr/NX/lib/libjpeg.so.* 	--  gen_context(system_u:object_r:textrel_shlib_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.2.32/policy/modules/system/miscfiles.fc
--- nsaserefpolicy/policy/modules/system/miscfiles.fc	2005-10-27 14:57:47.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/system/miscfiles.fc	2006-04-14 12:06:19.000000000 -0400
@@ -7,7 +7,7 @@
 #
 # /opt
 #
-/opt(/.*)?/man(/.*)?		gen_context(system_u:object_r:man_t,s0)
+/opt/(.*/)?man(/.*)?		gen_context(system_u:object_r:man_t,s0)
 
 #
 # /srv
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.fc serefpolicy-2.2.32/policy/modules/system/modutils.fc
--- nsaserefpolicy/policy/modules/system/modutils.fc	2005-10-06 17:29:17.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/system/modutils.fc	2006-04-14 12:06:19.000000000 -0400
@@ -2,9 +2,11 @@
 /etc/modules\.conf.*	--	gen_context(system_u:object_r:modules_conf_t,s0)
 /etc/modprobe\.conf.*	--	gen_context(system_u:object_r:modules_conf_t,s0)
 
-/lib(64)?/modules/[^/]+/modules\..+ -- gen_context(system_u:object_r:modules_dep_t,s0)
+/lib/modules/[^/]+/modules\..+ -- gen_context(system_u:object_r:modules_dep_t,s0)
+/lib64/modules/[^/]+/modules\..+ -- gen_context(system_u:object_r:modules_dep_t,s0)
 
-/lib(64)?/modules/modprobe\.conf -- gen_context(system_u:object_r:modules_conf_t,s0)
+/lib/modules/modprobe\.conf -- gen_context(system_u:object_r:modules_conf_t,s0)
+/lib64/modules/modprobe\.conf -- gen_context(system_u:object_r:modules_conf_t,s0)
 
 /sbin/depmod.*		--	gen_context(system_u:object_r:depmod_exec_t,s0)
 /sbin/generate-modprobe\.conf -- gen_context(system_u:object_r:update_modules_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.32/policy/modules/system/selinuxutil.if
--- nsaserefpolicy/policy/modules/system/selinuxutil.if	2006-03-29 14:18:17.000000000 -0500
+++ serefpolicy-2.2.32/policy/modules/system/selinuxutil.if	2006-04-14 12:06:19.000000000 -0400
@@ -697,8 +697,8 @@
 
 	files_search_etc($1)
 	allow $1 selinux_config_t:dir search;
-	allow $1 file_context_t:dir r_dir_perms;
-	allow $1 file_context_t:file rw_file_perms;
+	allow $1 file_context_t:dir rw_dir_perms;
+	allow $1 file_context_t:file create_file_perms;
 	allow $1 file_context_t:lnk_file { getattr read };
 ')
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.32/policy/modules/system/unconfined.te
--- nsaserefpolicy/policy/modules/system/unconfined.te	2006-04-12 13:44:38.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/system/unconfined.te	2006-04-14 12:06:19.000000000 -0400
@@ -37,6 +37,7 @@
 	logging_domtrans_auditctl(unconfined_t)
 
 	seutil_domtrans_restorecon(unconfined_t)
+	seutil_domtrans_semanage(unconfined_t)
 
 	userdom_unconfined(unconfined_t)
 	userdom_priveleged_home_dir_manager(unconfined_t)
@@ -64,6 +65,8 @@
 	optional_policy(`
 		dbus_stub(unconfined_t)
 
+		init_dbus_chat_script(unconfined_t)
+
 		optional_policy(`
 			avahi_dbus_chat(unconfined_t)
 		')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.32/policy/modules/system/userdomain.if
--- nsaserefpolicy/policy/modules/system/userdomain.if	2006-04-14 07:58:13.000000000 -0400
+++ serefpolicy-2.2.32/policy/modules/system/userdomain.if	2006-04-14 12:06:19.000000000 -0400
@@ -379,10 +379,6 @@
 	')
 
 	optional_policy(`
-		jabber_tcp_connect($1_t)
-	')
-
-	optional_policy(`
 		nis_use_ypbind($1_t)
 	')
 
@@ -408,10 +404,6 @@
 	')
 
 	optional_policy(`
-		perdition_tcp_connect($1_t)
-	')
-
-	optional_policy(`
 		portmap_tcp_connect($1_t)
 	')
 
@@ -4140,11 +4132,31 @@
 		type user_home_dir_t;
 	')
 
+	allow $1 user_home_dir_t:dir create_dir_perms;
 	files_home_filetrans($1,user_home_dir_t,dir)
 ')
 
 ########################################
 ## <summary>
+##	Create staff home directories
+##	with automatic file type transition.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`userdom_manage_staff_home_dir',`
+	gen_require(`
+		type staff_home_dir_t;
+	')
+
+	allow $1 staff_home_dir_t:dir create_dir_perms;
+')
+
+########################################
+## <summary>
 ##	Search generic user home directories.
 ## </summary>
 ## <param name="domain">
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.2.32/policy/modules/system/xen.te
--- nsaserefpolicy/policy/modules/system/xen.te	2006-03-23 14:33:30.000000000 -0500
+++ serefpolicy-2.2.32/policy/modules/system/xen.te	2006-04-14 12:06:19.000000000 -0400
@@ -19,6 +19,8 @@
 # var/lib files
 type xend_var_lib_t;
 files_type(xend_var_lib_t)
+# for mounting an NFS store
+files_mountpoint(xend_var_lib_t)
 
 # log files
 type xend_var_log_t;
@@ -67,6 +69,8 @@
 allow xend_t self:tcp_socket create_stream_socket_perms;
 allow xend_t self:packet_socket create_socket_perms;
 
+files_read_kernel_symbol_table(xend_t)
+
 # pid file
 allow xend_t xend_var_run_t:file manage_file_perms;
 allow xend_t xend_var_run_t:sock_file manage_file_perms;
@@ -210,6 +214,7 @@
 dev_filetrans_xen(xenstored_t)
 
 term_dontaudit_use_generic_ptys(xenstored_t)
+dev_rw_xen(xenstored_t)
 
 init_use_fds(xenstored_t)
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.2.32/Rules.modular
--- nsaserefpolicy/Rules.modular	2006-03-23 14:33:29.000000000 -0500
+++ serefpolicy-2.2.32/Rules.modular	2006-04-14 14:21:43.000000000 -0400
@@ -208,7 +208,7 @@
 #
 $(APPDIR)/customizable_types: $(BASE_CONF)
 	@mkdir -p $(APPDIR)
-	$(verbose) $(GREP) '^[[:blank:]]*type .*customizable' $< | cut -d',' -f1 | cut -d' ' -f2 | $(SORT) -u > $(TMPDIR)/customizable_types
+	$(verbose) $(GREP) '^[[:blank:]]*type .*customizable' $< | cut -d';' -f1 | cut -d',' -f1 | cut -d' ' -f2 | $(SORT) -u > $(TMPDIR)/customizable_types
 	$(verbose) install -m 644 $(TMPDIR)/customizable_types $@ 
 
 ########################################



From fedora-cvs-commits at redhat.com  Sat Apr 15 10:48:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Apr 2006 06:48:03 -0400
Subject: rpms/pyparted/devel pyparted.spec,1.18,1.19
Message-ID: <200604151048.k3FAm3ZP005482@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/pyparted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5402

Modified Files:
	pyparted.spec 
Log Message:
rebuild for new parted


Index: pyparted.spec
===================================================================
RCS file: /cvs/dist/rpms/pyparted/devel/pyparted.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- pyparted.spec	11 Feb 2006 05:21:47 -0000	1.18
+++ pyparted.spec	15 Apr 2006 10:47:54 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: python module for parted
 Name: pyparted
 Version: 1.6.10
-Release: 1.2.1
+Release: 2
 License: GPL
 Group: System Environment/Libraries
 Source0: %{name}-%{version}.tar.gz
@@ -41,6 +41,9 @@
 
 
 %changelog
+* Sat Apr 15 2006 Caolan McNamara <caolanm at redhat.com> - 1.6.10-2
+- rebuild for new parted
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.6.10-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Sat Apr 15 11:10:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Apr 2006 07:10:10 -0400
Subject: rpms/net-snmp/devel net-snmp-5.3.0.1-ifnumber.patch, NONE,
	1.1 net-snmp.spec, 1.70, 1.71
Message-ID: <200604151110.k3FBAAPc015915@cvs.devel.redhat.com>

Author: rvokal

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

Modified Files:
	net-snmp.spec 
Added Files:
	net-snmp-5.3.0.1-ifnumber.patch 
Log Message:
- fix missing IF-MIB::ifNumber.0 (#189007)

net-snmp-5.3.0.1-ifnumber.patch:
 ifTable.c           |   45 +++++++++++++++++++++++++++++++++++++++++++++
 ifTable_constants.h |    1 +
 2 files changed, 46 insertions(+)

--- NEW FILE net-snmp-5.3.0.1-ifnumber.patch ---
Index: agent/mibgroup/if-mib/ifTable/ifTable.c
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/agent/mibgroup/if-mib/ifTable/ifTable.c,v
retrieving revision 1.25
diff -u -p -r1.25 ifTable.c
--- agent/mibgroup/if-mib/ifTable/ifTable.c	25 Jan 2006 16:25:54 -0000	1.25
+++ agent/mibgroup/if-mib/ifTable/ifTable.c	13 Feb 2006 23:49:45 -0000
@@ -44,6 +44,12 @@ ifTable_registration ifTable_user_contex
 void            initialize_table_ifTable(void);
 void            shutdown_table_ifTable(void);
 
+static int
+_if_number_handler(netsnmp_mib_handler *handler,
+                   netsnmp_handler_registration *reginfo,
+                   netsnmp_agent_request_info *reqinfo,
+                   netsnmp_request_info *requests);
+
 
 /**
  * Initializes the ifTable module
@@ -135,6 +141,24 @@ initialize_table_ifTable(void)
      * call interface initialization code
      */
     _ifTable_initialize_interface(user_context, flags);
+
+    /*
+     * register scalar for ifNumber
+     */
+    {
+        oid             reg_oid[] =
+            { IFTABLE_NUMBER };
+        netsnmp_handler_registration *myreg;
+
+        myreg =
+            netsnmp_create_handler_registration("if number",
+                                                _if_number_handler,
+                                                &reg_oid,
+                                                OID_LENGTH(reg_oid),
+                                                HANDLER_CAN_RONLY);
+        netsnmp_register_instance(myreg);
+    }
+
 }                               /* initialize_table_ifTable */
 
 /**
@@ -2302,5 +2326,26 @@ ifTable_check_dependencies(ifTable_rowre
     return rc;
 }                               /* ifTable_check_dependencies */
 
+
+static int
+_if_number_handler(netsnmp_mib_handler *handler,
+                      netsnmp_handler_registration *reginfo,
+                      netsnmp_agent_request_info *reqinfo,
+                      netsnmp_request_info *requests)
+{
+    if (MODE_GET == reqinfo->mode) {
+        int val = ifTable_container_size();
+        snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
+                                 (u_char *) &val, sizeof(val));
+    } else
+        netsnmp_assert("bad mode in RO handler");
+    
+    if (handler->next && handler->next->access_method)
+        return netsnmp_call_next_handler(handler, reginfo, reqinfo,
+                                         requests);
+    
+    return SNMP_ERR_NOERROR;
+}
+
 /** @} */
 /** @{ */
Index: agent/mibgroup/if-mib/ifTable/ifTable_constants.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/agent/mibgroup/if-mib/ifTable/ifTable_constants.h,v
retrieving revision 1.9
diff -u -p -r1.9 ifTable_constants.h
--- agent/mibgroup/if-mib/ifTable/ifTable_constants.h	29 Nov 2005 22:14:32 -0000	1.9
+++ agent/mibgroup/if-mib/ifTable/ifTable_constants.h	13 Feb 2006 23:49:45 -0000
@@ -15,6 +15,7 @@ extern          "C" {
      * scalars
      */
 #define IFTABLE_LAST_CHANGE  1,3,6,1,2,1,31,1,5
+#define IFTABLE_NUMBER  1,3,6,1,2,1,2,1,0
 
 
     /*


Index: net-snmp.spec
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- net-snmp.spec	5 Apr 2006 09:02:01 -0000	1.70
+++ net-snmp.spec	15 Apr 2006 11:10:07 -0000	1.71
@@ -3,7 +3,7 @@
 Summary: A collection of SNMP protocol tools and libraries.
 Name: net-snmp
 Version: 5.3
-Release: 7
+Release: 8
 
 License: BSDish
 Group: System Environment/Daemons
@@ -36,6 +36,7 @@
 Patch27: net-snmp-5.3-oid-names.patch
 Patch28: net-snmp-5.3-disman.patch
 Patch29: net-snmp-5.3-diskio.patch
+Patch30: net-snmp-5.3.0.1-ifnumber.patch
 
 Prereq: /sbin/chkconfig
 Obsoletes: ucd-snmp
@@ -145,6 +146,7 @@
 %patch27 -p0 -b .oid
 %patch28 -p1 -b .disman
 %patch29 -p1 -b .diskio
+%patch30 -p0 -b .ifnumbed
 
 # Do this patch with a perl hack...
 perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
@@ -327,6 +329,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Sat Apr 15 2006 Radek Vok??l <rvokal at redhat.com> 5.3-8
+- fix missing IF-MIB::ifNumber.0 (#189007)
+
 * Wed Apr 05 2006 Radek Vok??l <rvokal at redhat.com> 5.3-7
 - fix parsing of /proc/diskstats
 - fix disman monitor crash



From fedora-cvs-commits at redhat.com  Sat Apr 15 19:11:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Apr 2006 15:11:08 -0400
Subject: rpms/system-config-printer/devel .cvsignore, 1.58, 1.59 sources,
	1.61, 1.62 system-config-printer.spec, 1.3, 1.4
Message-ID: <200604151911.k3FJB8OM030434@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore sources system-config-printer.spec 
Log Message:
* Sat Apr 15 2006 Tim Waugh <twaugh at redhat.com>
- Updated to pycups-1.9.7.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	12 Apr 2006 21:11:29 -0000	1.58
+++ .cvsignore	15 Apr 2006 19:11:03 -0000	1.59
@@ -38,3 +38,4 @@
 printconf-0.6.150.tar.bz2
 printconf-0.6.151.tar.bz2
 system-config-printer-0.7.4.tar.bz2
+pycups-1.9.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	12 Apr 2006 21:11:29 -0000	1.61
+++ sources	15 Apr 2006 19:11:05 -0000	1.62
@@ -1,2 +1,2 @@
-da787f94813be62db0ed29c51da7839e  pycups-1.9.6.tar.bz2
 360a4428142d4cde6366509878c5cb32  system-config-printer-0.7.4.tar.bz2
+6a77867eae1a07cc4b119f2af5824d23  pycups-1.9.7.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- system-config-printer.spec	13 Apr 2006 17:13:51 -0000	1.3
+++ system-config-printer.spec	15 Apr 2006 19:11:05 -0000	1.4
@@ -1,4 +1,4 @@
-%define pycups_version 1.9.6
+%define pycups_version 1.9.7
 
 Summary: A printer administration tool
 Name: system-config-printer
@@ -62,6 +62,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Sat Apr 15 2006 Tim Waugh <twaugh at redhat.com>
+- Updated to pycups-1.9.7.
+
 * Thu Apr 13 2006 Tim Waugh <twaugh at redhat.com> 0.7.4-2
 - Obsoletes: system-config-printer-gui <= 0.6.152
 



From fedora-cvs-commits at redhat.com  Sun Apr 16 20:33:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Apr 2006 16:33:51 -0400
Subject: rpms/audit/devel .cvsignore, 1.60, 1.61 audit.spec, 1.86,
	1.87 sources, 1.68, 1.69
Message-ID: <200604162033.k3GKXppq013865@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13824

Modified Files:
	.cvsignore audit.spec sources 
Log Message:
* Sun Apr 16 2006 Steve Grubb <sgrubb at redhat.com> 1.2.1-1
- New message type for trusted apps
- Add new keywords today, yesterday, now for ausearch and aureport
- Make audit_log_user_avc_message really send to syslog on error
- Updated syscall tables in auditctl
- Deprecated the 'possible' action for syscall rules in auditctl
- Update watch code to use file syscalls instead of 'all' in auditctl



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	7 Apr 2006 21:06:04 -0000	1.60
+++ .cvsignore	16 Apr 2006 20:33:48 -0000	1.61
@@ -57,3 +57,4 @@
 audit-1.1.5.tar.gz
 audit-1.1.6.tar.gz
 audit-1.2.tar.gz
+audit-1.2.1.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- audit.spec	7 Apr 2006 21:06:18 -0000	1.86
+++ audit.spec	16 Apr 2006 20:33:48 -0000	1.87
@@ -1,6 +1,6 @@
 Summary: User space tools for 2.6 kernel auditing.
 Name: audit
-Version: 1.2
+Version: 1.2.1
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -154,6 +154,14 @@
 
 
 %changelog
+* Sun Apr 16 2006 Steve Grubb <sgrubb at redhat.com> 1.2.1-1
+- New message type for trusted apps
+- Add new keywords today, yesterday, now for ausearch and aureport
+- Make audit_log_user_avc_message really send to syslog on error
+- Updated syscall tables in auditctl
+- Deprecated the 'possible' action for syscall rules in auditctl
+- Update watch code to use file syscalls instead of 'all' in auditctl
+
 * Fri Apr 7 2006 Steve Grubb <sgrubb at redhat.com> 1.2-1
 - Add support for new file system auditing kernel subsystem
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources	7 Apr 2006 21:06:18 -0000	1.68
+++ sources	16 Apr 2006 20:33:48 -0000	1.69
@@ -1 +1 @@
-65c3bc8ea4a1b6fc90e2b0321237a5ad  audit-1.2.tar.gz
+537d4ee68428e2ba2f01a8c07287fb6e  audit-1.2.1.tar.gz



From fedora-cvs-commits at redhat.com  Sun Apr 16 22:23:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Apr 2006 18:23:54 -0400
Subject: rpms/kernel/FC-5 patch-2.6.16.5.bz2.sign, NONE, 1.1 .cvsignore,
	1.385, 1.386 kernel-2.6.spec, 1.2088, 1.2089 sources, 1.326,
	1.327 upstream, 1.299, 1.300 patch-2.6.16.2.bz2.sign, 1.1, NONE
Message-ID: <200604162223.k3GMNsdx032223@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16.5.bz2.sign 
Removed Files:
	patch-2.6.16.2.bz2.sign 
Log Message:
.5



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

iD8DBQBEPWQ8yGugalF9Dw4RApFgAJ0eCBnYrsvMd0svhpLIAR/BdVoKWQCfSxn4
uJiYpcH7PR2mGTs5amraFi4=
=7mAF
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -r1.385 -r1.386
--- .cvsignore	8 Apr 2006 01:32:54 -0000	1.385
+++ .cvsignore	16 Apr 2006 22:23:50 -0000	1.386
@@ -3,4 +3,4 @@
 kernel-2.6.16
 xen-20060301.tar.bz2
 linux-2.6.16.tar.bz2
-patch-2.6.16.2.bz2
+patch-2.6.16.5.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2088
retrieving revision 1.2089
diff -u -r1.2088 -r1.2089
--- kernel-2.6.spec	8 Apr 2006 01:32:54 -0000	1.2088
+++ kernel-2.6.spec	16 Apr 2006 22:23:50 -0000	1.2089
@@ -214,7 +214,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16.2.bz2
+Patch1: patch-2.6.16.5.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1687,6 +1687,9 @@
 %endif
 
 %changelog
+* Sun Apr 16 2006 Dave Jones <davej at redhat.com>
+- 2.6.16.5
+
 * Fri Apr  7 2006 Dave Jones <davej at redhat.com>
 - 2.6.16.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -r1.326 -r1.327
--- sources	8 Apr 2006 01:32:55 -0000	1.326
+++ sources	16 Apr 2006 22:23:51 -0000	1.327
@@ -1,3 +1,3 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 cdfde609af8adcf58d7ff626599b2d90  xen-20060301.tar.bz2
-b316050dcee26ce66757fb87908586ec  patch-2.6.16.2.bz2
+89b230ec92becdf961da573c49ce5e7d  patch-2.6.16.5.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- upstream	8 Apr 2006 01:32:55 -0000	1.299
+++ upstream	16 Apr 2006 22:23:51 -0000	1.300
@@ -1,3 +1,3 @@
 linux-2.6.16.tar.bz2
-patch-2.6.16.2.bz2
+patch-2.6.16.5.bz2
 


--- patch-2.6.16.2.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sun Apr 16 22:33:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Apr 2006 18:33:59 -0400
Subject: rpms/kernel/FC-4 patch-2.6.16.5.bz2.sign, NONE, 1.1 .cvsignore,
	1.178, 1.179 kernel-2.6.spec, 1.1620, 1.1621 sources, 1.162,
	1.163 upstream, 1.103, 1.104 patch-2.6.16.2.bz2.sign, 1.1, NONE
Message-ID: <200604162233.k3GMXx5v013448@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16.5.bz2.sign 
Removed Files:
	patch-2.6.16.2.bz2.sign 
Log Message:
.5



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

iD8DBQBEPWQ8yGugalF9Dw4RApFgAJ0eCBnYrsvMd0svhpLIAR/BdVoKWQCfSxn4
uJiYpcH7PR2mGTs5amraFi4=
=7mAF
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/.cvsignore,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- .cvsignore	8 Apr 2006 01:41:58 -0000	1.178
+++ .cvsignore	16 Apr 2006 22:33:52 -0000	1.179
@@ -2,4 +2,4 @@
 temp-*
 kernel-2.6.16
 linux-2.6.16.tar.bz2
-patch-2.6.16.2.bz2
+patch-2.6.16.5.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1620
retrieving revision 1.1621
diff -u -r1.1620 -r1.1621
--- kernel-2.6.spec	8 Apr 2006 01:41:58 -0000	1.1620
+++ kernel-2.6.spec	16 Apr 2006 22:33:53 -0000	1.1621
@@ -192,7 +192,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16.2.bz2
+Patch1: patch-2.6.16.5.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1062,6 +1062,9 @@
 %endif
 
 %changelog
+* Sun Apr 16 2006 Dave Jones <davej at redhat.com>
+- 2.6.16.5
+
 * Fri Apr  7 2006 Dave Jones <davej at redhat.com>
 - 2.6.16.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/sources,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- sources	8 Apr 2006 01:42:00 -0000	1.162
+++ sources	16 Apr 2006 22:33:56 -0000	1.163
@@ -1 +1,2 @@
-b316050dcee26ce66757fb87908586ec  patch-2.6.16.2.bz2
+9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
+89b230ec92becdf961da573c49ce5e7d  patch-2.6.16.5.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/upstream,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- upstream	8 Apr 2006 01:42:00 -0000	1.103
+++ upstream	16 Apr 2006 22:33:56 -0000	1.104
@@ -1,2 +1,2 @@
 linux-2.6.16.tar.bz2
-patch-2.6.16.2.bz2
+patch-2.6.16.5.bz2


--- patch-2.6.16.2.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sun Apr 16 22:58:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Apr 2006 18:58:51 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.176,
	1.177 config-ia64-generic, 1.23, 1.24
Message-ID: <200604162258.k3GMwpXd027796@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic config-ia64-generic 
Log Message:
git12



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- config-generic	4 Apr 2006 18:37:05 -0000	1.176
+++ config-generic	16 Apr 2006 22:58:48 -0000	1.177
@@ -93,7 +93,8 @@
 CONFIG_INFINIBAND_MTHCA=m
 # CONFIG_INFINIBAND_MTHCA_DEBUG is not set
 CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
@@ -457,6 +458,7 @@
 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
 # CONFIG_SCSI_QLOGIC_FC is not set
 # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
@@ -2160,6 +2162,7 @@
 CONFIG_USB_SERIAL_EDGEPORT_TI=m
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_FUNSOFT=m
 CONFIG_USB_SERIAL_GARMIN=m
 CONFIG_USB_SERIAL_HP4X=m
 CONFIG_USB_SERIAL_IPAQ=m
@@ -2219,12 +2222,10 @@
 CONFIG_USB_LEGOTOWER=m
 CONFIG_USB_FILE_STORAGE=m
 # CONFIG_USB_FILE_STORAGE_TEST is not set
-CONFIG_USB_MTOUCH=m
 CONFIG_USB_ATI_REMOTE=m
 CONFIG_USB_ATI_REMOTE2=m
 CONFIG_USB_ALI_M5632=y
 # CONFIG_USB_CYTHERM is not set
-CONFIG_USB_EGALAX=m
 CONFIG_USB_PHIDGETSERVO=m
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_PHIDGETKIT=m
@@ -2233,7 +2234,6 @@
 CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_ACECAD=m
-CONFIG_USB_ITMTOUCH=m
 CONFIG_USB_ATM=m
 CONFIG_USB_CXACRU=m
 CONFIG_USB_XUSBATM=m
@@ -2242,6 +2242,9 @@
 CONFIG_USB_LD=m
 CONFIG_USB_APPLETOUCH=m
 
+CONFIG_USB_TOUCHSCREEN=m
+
+
 #
 # File systems
 #


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- config-ia64-generic	26 Mar 2006 00:13:38 -0000	1.23
+++ config-ia64-generic	16 Apr 2006 22:58:48 -0000	1.24
@@ -170,5 +170,5 @@
 # CONFIG_PERMIT_BSP_REMOVE is not set
 # CONFIG_FORCE_CPEI_RETARGET is not set
 
-CONFIG_IA64_NR_NODES=256
+CONFIG_NODES_SHIFT=8
 



From fedora-cvs-commits at redhat.com  Sun Apr 16 22:58:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Apr 2006 18:58:51 -0400
Subject: rpms/kernel/devel .cvsignore, 1.406, 1.407 kernel-2.6.spec, 1.2132,
	1.2133 linux-2.6-compile-fixes.patch, 1.66,
	1.67 linux-2.6-debug-pm-pci.patch, 1.1,
	1.2 linux-2.6-debug-sysfs-crash-debugging.patch, 1.4,
	1.5 linux-2.6-random-patches.patch, 1.5,
	1.6 linux-2.6-tux.patch, 1.17, 1.18 sources, 1.348,
	1.349 upstream, 1.319, 1.320 patch-2.6.17-rc1-git4.bz2.sign,
	1.1, NONE
Message-ID: <200604162258.k3GMwpkf027782@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch 
	linux-2.6-debug-pm-pci.patch 
	linux-2.6-debug-sysfs-crash-debugging.patch 
	linux-2.6-random-patches.patch linux-2.6-tux.patch sources 
	upstream 
Removed Files:
	patch-2.6.17-rc1-git4.bz2.sign 
Log Message:
git12



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -r1.406 -r1.407
--- .cvsignore	14 Apr 2006 18:42:59 -0000	1.406
+++ .cvsignore	16 Apr 2006 22:58:48 -0000	1.407
@@ -2,8 +2,6 @@
 temp-*
 kernel-2.6.16
 linux-2.6.16.tar.bz2
-xen-20060320.tar.bz2
 patch-2.6.17-rc1.bz2
-patch-2.6.17-rc1-git3.bz2
-patch-2.6.17-rc1-git4.bz2
+patch-2.6.17-rc1-git12.bz2
 xen-20060413.tar.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2132
retrieving revision 1.2133
diff -u -r1.2132 -r1.2133
--- kernel-2.6.spec	14 Apr 2006 18:11:38 -0000	1.2132
+++ kernel-2.6.spec	16 Apr 2006 22:58:48 -0000	1.2133
@@ -7,7 +7,7 @@
 %define buildsmp 0
 %define buildpae 0
 # Whether to apply the Xen patches, leave this enabled.
-%define includexen 1
+%define includexen 0
 # Whether to build the Xen kernels, disable if you want.
 %define buildxen 1
 %define buildxenPAE 0
@@ -213,7 +213,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.17-rc1.bz2
-Patch2: patch-2.6.17-rc1-git4.bz2
+Patch2: patch-2.6.17-rc1-git12.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1009,7 +1009,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
@@ -1648,6 +1648,9 @@
 %endif
 
 %changelog
+* Sun Apr 16 2006 Dave Jones <davej at redhat.com>
+- Big rebase to 2.6.17-rc1-git12
+
 * Fri Apr 14 2006 Juan Quintela <quintela at redhat.com>
 - Enable xen again.
 - Update xen hypervisor to cset 9638.

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.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- linux-2.6-compile-fixes.patch	10 Apr 2006 18:41:28 -0000	1.66
+++ linux-2.6-compile-fixes.patch	16 Apr 2006 22:58:48 -0000	1.67
@@ -1,15 +0,0 @@
-
-include/asm/atomic.h:94: warning: implicit declaration of function 'unlikely'
-include/asm/atomic.h:97: warning: implicit declaration of function 'likely'
-
---- linux-2.6.16.noarch/include/asm-s390/atomic.h~	2006-04-01 00:07:45.000000000 -0500
-+++ linux-2.6.16.noarch/include/asm-s390/atomic.h	2006-04-01 00:08:08.000000000 -0500
-@@ -1,6 +1,8 @@
- #ifndef __ARCH_S390_ATOMIC__
- #define __ARCH_S390_ATOMIC__
- 
-+#include <linux/compiler.h>
-+
- /*
-  *  include/asm-s390/atomic.h
-  *

linux-2.6-debug-pm-pci.patch:
 pci.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

Index: linux-2.6-debug-pm-pci.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-pm-pci.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-debug-pm-pci.patch	1 Mar 2006 20:51:03 -0000	1.1
+++ linux-2.6-debug-pm-pci.patch	16 Apr 2006 22:58:48 -0000	1.2
@@ -1,6 +1,7 @@
---- linux-2.6.15.noarch/drivers/pci/pci.c~	2006-03-01 15:41:00.000000000 -0500
-+++ linux-2.6.15.noarch/drivers/pci/pci.c	2006-03-01 15:47:37.000000000 -0500
-@@ -454,9 +454,17 @@ int 
+
+--- linux-2.6.16.noarch/drivers/pci/pci.c~	2006-04-16 17:36:34.000000000 -0500
++++ linux-2.6.16.noarch/drivers/pci/pci.c	2006-04-16 17:37:42.000000000 -0500
+@@ -461,9 +461,17 @@ int 
  pci_restore_state(struct pci_dev *dev)
  {
  	int i;
@@ -12,11 +13,11 @@
 +		pci_read_config_dword(dev, i * 4, &val);
 +		if (val != dev->saved_config_space[i]) {
 +			printk (KERN_DEBUG "PM: Writing back config space on device %s at offset %x. (Was %x, writing %x)\n",
-+						pci_name(dev), i,
-+						val, (int) dev->saved_config_space[i]);
++				pci_name(dev), i,
++				val, (int) dev->saved_config_space[i]);
 +			pci_write_config_dword(dev,i * 4, dev->saved_config_space[i]);
 +		}
 +	}
+ 	pci_restore_msi_state(dev);
+ 	pci_restore_msix_state(dev);
  	return 0;
- }
- 

linux-2.6-debug-sysfs-crash-debugging.patch:
 devel-akpm/arch/i386/kernel/traps.c     |    5 +++++
 devel-akpm/fs/sysfs/file.c              |    7 +++++++
 linux-2.6.14/arch/x86_64/kernel/traps.c |    5 +++++
 3 files changed, 17 insertions(+)

Index: linux-2.6-debug-sysfs-crash-debugging.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-sysfs-crash-debugging.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-debug-sysfs-crash-debugging.patch	27 Mar 2006 18:54:19 -0000	1.4
+++ linux-2.6-debug-sysfs-crash-debugging.patch	16 Apr 2006 22:58:48 -0000	1.5
@@ -18,12 +18,11 @@
 diff -puN fs/sysfs/file.c~sysfs-crash-debugging fs/sysfs/file.c
 --- devel/fs/sysfs/file.c~sysfs-crash-debugging	2005-11-22 22:31:16.000000000 -0800
 +++ devel-akpm/fs/sysfs/file.c	2005-11-22 22:31:16.000000000 -0800
-@@ -6,6 +6,8 @@
- #include <linux/fsnotify.h>
+@@ -7,6 +7,7 @@
  #include <linux/kobject.h>
  #include <linux/namei.h>
+ #include <linux/poll.h>
 +#include <linux/limits.h>
-+
  #include <asm/uaccess.h>
  #include <asm/semaphore.h>
  

linux-2.6-random-patches.patch:
 linux-2.6.15.noarch/drivers/char/watchdog/machzwd.c        |    3 +--
 linux-2.6.15.noarch/drivers/char/watchdog/sc1200wdt.c      |    2 +-
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/av7110.c       |    2 +-
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget-ci.c    |    2 +-
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget-patch.c |    2 +-
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget.c       |    5 +----
 linux-2.6.15/kernel/power/snapshot.c                       |    1 +
 7 files changed, 7 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-random-patches.patch	3 Apr 2006 04:16:53 -0000	1.5
+++ linux-2.6-random-patches.patch	16 Apr 2006 22:58:48 -0000	1.6
@@ -1,20 +1,4 @@
 
-Doubletalk printk's an extraneous \n
-
-Signed-off-by: Dave Jones <davej at redhat.com>
-
---- linux-2.6.15.noarch/drivers/char/dtlk.c~	2006-02-01 22:17:38.000000000 -0500
-+++ linux-2.6.15.noarch/drivers/char/dtlk.c	2006-02-01 22:19:16.000000000 -0500
-@@ -490,7 +490,7 @@ for (i = 0; i < 10; i++)			\
- 		release_region(dtlk_portlist[i], DTLK_IO_EXTENT);
- 	}
- 
--	printk(KERN_INFO "\nDoubleTalk PC - not found\n");
-+	printk(KERN_INFO "DoubleTalk PC - not found\n");
- 	return -ENODEV;
- }
- 
-
 --- linux-2.6.15.noarch/drivers/media/dvb/ttpci/av7110.c~	2006-01-31 20:22:02.000000000 -0500
 +++ linux-2.6.15.noarch/drivers/media/dvb/ttpci/av7110.c	2006-01-31 20:24:27.000000000 -0500
 @@ -2956,7 +2956,7 @@ MODULE_DEVICE_TABLE(pci, pci_tbl);

linux-2.6-tux.patch:
 linux-2.6.16.noarch/include/linux/buffer_head.h |    1 
 linux-2.6.16.noarch/include/linux/sysctl.h      |   50 
 linux-2.6.16.noarch/net/socket.c                |   54 
 linux-tux.q/arch/alpha/kernel/systbls.S         |    8 
 linux-tux.q/arch/i386/kernel/syscall_table.S    |   10 
 linux-tux.q/arch/ia64/kernel/entry.S            |    8 
 linux-tux.q/arch/ia64/kernel/ia64_ksyms.c       |    5 
 linux-tux.q/arch/x86_64/ia32/ia32entry.S        |   10 
 linux-tux.q/fs/dcache.c                         |   36 
 linux-tux.q/fs/exec.c                           |    2 
 linux-tux.q/fs/fcntl.c                          |    4 
 linux-tux.q/fs/namei.c                          |   18 
 linux-tux.q/fs/namespace.c                      |    2 
 linux-tux.q/fs/open.c                           |    4 
 linux-tux.q/fs/pipe.c                           |    2 
 linux-tux.q/fs/read_write.c                     |    2 
 linux-tux.q/include/asm-alpha/fcntl.h           |    1 
 linux-tux.q/include/asm-generic/fcntl.h         |    4 
 linux-tux.q/include/asm-i386/unistd.h           |    5 
 linux-tux.q/include/asm-ia64/unistd.h           |    2 
 linux-tux.q/include/asm-sparc/fcntl.h           |    1 
 linux-tux.q/include/asm-sparc64/fcntl.h         |    1 
 linux-tux.q/include/asm-x86_64/unistd.h         |   10 
 linux-tux.q/include/linux/dcache.h              |    8 
 linux-tux.q/include/linux/errno.h               |    3 
 linux-tux.q/include/linux/file.h                |    2 
 linux-tux.q/include/linux/fs.h                  |    7 
 linux-tux.q/include/linux/kmod.h                |    2 
 linux-tux.q/include/linux/namei.h               |    2 
 linux-tux.q/include/linux/net.h                 |    1 
 linux-tux.q/include/linux/sched.h               |    5 
 linux-tux.q/include/linux/skbuff.h              |    2 
 linux-tux.q/include/linux/socket.h              |    4 
 linux-tux.q/include/net/sock.h                  |    8 
 linux-tux.q/include/net/tcp.h                   |    3 
 linux-tux.q/include/net/tux.h                   |  804 ++++++++
 linux-tux.q/include/net/tux_u.h                 |  163 +
 linux-tux.q/kernel/exit.c                       |    7 
 linux-tux.q/kernel/fork.c                       |    1 
 linux-tux.q/kernel/kmod.c                       |   28 
 linux-tux.q/kernel/signal.c                     |    1 
 linux-tux.q/mm/filemap.c                        |   19 
 linux-tux.q/mm/truncate.c                       |    2 
 linux-tux.q/net/Kconfig                         |    1 
 linux-tux.q/net/Makefile                        |    1 
 linux-tux.q/net/core/sock.c                     |    5 
 linux-tux.q/net/ipv4/tcp.c                      |    3 
 linux-tux.q/net/ipv4/tcp_input.c                |    1 
 linux-tux.q/net/ipv4/tcp_output.c               |    3 
 linux-tux.q/net/tux/Kconfig                     |   25 
 linux-tux.q/net/tux/Makefile                    |   12 
 linux-tux.q/net/tux/abuf.c                      |  190 ++
 linux-tux.q/net/tux/accept.c                    |  863 +++++++++
 linux-tux.q/net/tux/cachemiss.c                 |  265 ++
 linux-tux.q/net/tux/cgi.c                       |  171 +
 linux-tux.q/net/tux/directory.c                 |  302 +++
 linux-tux.q/net/tux/extcgi.c                    |  329 +++
 linux-tux.q/net/tux/gzip.c                      |   40 
 linux-tux.q/net/tux/input.c                     |  641 +++++++
 linux-tux.q/net/tux/logger.c                    |  837 +++++++++
 linux-tux.q/net/tux/main.c                      | 1417 +++++++++++++++
 linux-tux.q/net/tux/mod.c                       |  262 ++
 linux-tux.q/net/tux/output.c                    |  352 +++
 linux-tux.q/net/tux/parser.h                    |  102 +
 linux-tux.q/net/tux/postpone.c                  |   77 
 linux-tux.q/net/tux/proc.c                      | 1149 ++++++++++++
 linux-tux.q/net/tux/proto_ftp.c                 | 1555 ++++++++++++++++
 linux-tux.q/net/tux/proto_http.c                | 2197 ++++++++++++++++++++++++
 linux-tux.q/net/tux/redirect.c                  |  172 +
 linux-tux.q/net/tux/times.c                     |  392 ++++
 linux-tux.q/net/tux/times.h                     |   26 
 linux-tux.q/net/tux/userspace.c                 |   27 
 72 files changed, 12697 insertions(+), 32 deletions(-)

Index: linux-2.6-tux.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-tux.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- linux-2.6-tux.patch	1 Apr 2006 02:07:22 -0000	1.17
+++ linux-2.6-tux.patch	16 Apr 2006 22:58:48 -0000	1.18
@@ -532,9 +532,9 @@
  				    struct file_ra_state *, struct file *,
 -				    loff_t *, read_descriptor_t *, read_actor_t);
 +				    loff_t *, read_descriptor_t *, read_actor_t, int);
- extern ssize_t generic_file_splice_read(struct file *, struct inode *, size_t, unsigned int);
- extern ssize_t generic_file_splice_write(struct inode *, struct file *, size_t, unsigned int);
- extern void
+ 
+ /* fs/splice.c */
+ extern ssize_t generic_file_splice_read(struct file *, loff_t *,
 @@ -1607,14 +1607,15 @@ static inline int xip_truncate_page(stru
  
  static inline void do_generic_file_read(struct file * filp, loff_t *ppos,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -r1.348 -r1.349
--- sources	14 Apr 2006 18:42:59 -0000	1.348
+++ sources	16 Apr 2006 22:58:48 -0000	1.349
@@ -1,5 +1,4 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 ee1b5bf019ec60a34ef7bf1b2a0c1291  patch-2.6.17-rc1.bz2
-33a1f95f8b4dbad15a69b2628cf16d09  patch-2.6.17-rc1-git3.bz2
-8ae04240509d86bf520010c497f359e2  patch-2.6.17-rc1-git4.bz2
 e8e055329db3aad40a010ded0f8bdcf9  xen-20060413.tar.bz2
+a116af6c1723ef2a7b5aff5b380fcd35  patch-2.6.17-rc1-git12.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -r1.319 -r1.320
--- upstream	11 Apr 2006 13:01:42 -0000	1.319
+++ upstream	16 Apr 2006 22:58:48 -0000	1.320
@@ -1,3 +1,3 @@
 linux-2.6.16.tar.bz2
 patch-2.6.17-rc1.bz2
-patch-2.6.17-rc1-git4.bz2
+patch-2.6.17-rc1-git12.bz2


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



From fedora-cvs-commits at redhat.com  Sun Apr 16 23:07:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Apr 2006 19:07:37 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2133,
	1.2134 linux-2.6-compile-fixes.patch, 1.67, 1.68
Message-ID: <200604162307.k3GN7bK9028017@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-compile-fixes.patch 
Log Message:
fix ppc build



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2133
retrieving revision 1.2134
diff -u -r1.2133 -r1.2134
--- kernel-2.6.spec	16 Apr 2006 22:58:48 -0000	1.2133
+++ kernel-2.6.spec	16 Apr 2006 23:07:33 -0000	1.2134
@@ -1009,7 +1009,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:
 spu_callbacks.c |    1 +
 1 files changed, 1 insertion(+)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- linux-2.6-compile-fixes.patch	16 Apr 2006 22:58:48 -0000	1.67
+++ linux-2.6-compile-fixes.patch	16 Apr 2006 23:07:34 -0000	1.68
@@ -0,0 +1,10 @@
+--- linux-2.6.16.noarch/arch/powerpc/platforms/cell/spu_callbacks.c~	2006-04-16 18:06:07.000000000 -0500
++++ linux-2.6.16.noarch/arch/powerpc/platforms/cell/spu_callbacks.c	2006-04-16 18:07:12.000000000 -0500
+@@ -317,6 +317,7 @@ void *spu_syscall_table[] = {
+ 	[__NR_ppoll]			sys_ni_syscall, /* sys_ppoll */
+ 	[__NR_unshare]			sys_unshare,
+ 	[__NR_splice]			sys_splice,
++	[__NR_tee]			sys_tee,
+ };
+ 
+ long spu_sys_callback(struct spu_syscall_block *s)



From fedora-cvs-commits at redhat.com  Mon Apr 17 05:12:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 01:12:06 -0400
Subject: rpms/ruby/devel ruby.spec,1.55,1.56
Message-ID: <200604170512.k3H5C6aR016675@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16627

Modified Files:
	ruby.spec 
Log Message:
* Mon Apr 17 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-4
- correct sitelibdir. (#184198)


Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- ruby.spec	11 Feb 2006 05:36:38 -0000	1.55
+++ ruby.spec	17 Apr 2006 05:12:03 -0000	1.56
@@ -1,10 +1,10 @@
 %define manver		1.4.6
 %define	rubyxver	1.8
-%define	sitedir		%{_libdir}/site_ruby
+%define	sitedir		%{_libdir}/ruby/site_ruby
 
 Name:		ruby
 Version:	1.8.4
-Release:	3.2
+Release:	4.fc6
 License:	Distributable
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -420,6 +420,9 @@
 %dir %{_datadir}/emacs/site-lisp/ruby-mode
 
 %changelog
+* Mon Apr 17 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-4
+- correct sitelibdir. (#184198)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.8.4-3.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Apr 17 07:42:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 03:42:32 -0400
Subject: rpms/man-pages-ja/devel .cvsignore, 1.35, 1.36 man-pages-ja.spec,
	1.41, 1.42 sources, 1.34, 1.35
Message-ID: <200604170742.k3H7gW7F010124@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/man-pages-ja/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10086

Modified Files:
	.cvsignore man-pages-ja.spec sources 
Log Message:
* Mon Apr 17 2006 Akira TAGOH <tagoh at redhat.com> - 20060415-1
- updates to 20060415.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/man-pages-ja/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	20 Mar 2006 13:53:24 -0000	1.35
+++ .cvsignore	17 Apr 2006 07:42:29 -0000	1.36
@@ -22,3 +22,4 @@
 man-pages-ja-20060115.tar.gz
 man-pages-ja-20060215.tar.gz
 man-pages-ja-20060315.tar.gz
+man-pages-ja-20060415.tar.gz


Index: man-pages-ja.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-ja/devel/man-pages-ja.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- man-pages-ja.spec	20 Mar 2006 13:53:24 -0000	1.41
+++ man-pages-ja.spec	17 Apr 2006 07:42:29 -0000	1.42
@@ -1,4 +1,4 @@
-%define	manver		20060315
+%define	manver		20060415
 %define	use_utf8	1
 
 Summary: Japanese man (manual) pages from the Japanese Manual Project
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Mon Apr 17 2006 Akira TAGOH <tagoh at redhat.com> - 20060415-1
+- updates to 20060415.
+
 * Mon Mar 20 2006 Akira TAGOH <tagoh at redhat.com> - 20060315-1
 - updates to 20060315.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/man-pages-ja/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	20 Mar 2006 13:53:24 -0000	1.34
+++ sources	17 Apr 2006 07:42:29 -0000	1.35
@@ -1 +1 @@
-37d8ab6e78c397fdeb4c930076479423  man-pages-ja-20060315.tar.gz
+075683602893d553b290573bf21356f4  man-pages-ja-20060415.tar.gz



From fedora-cvs-commits at redhat.com  Mon Apr 17 13:05:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 09:05:29 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2089,1.2090
Message-ID: <200604171305.k3HD5Tls002457@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Add missing include dirs


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2089
retrieving revision 1.2090
diff -u -r1.2089 -r1.2090
--- kernel-2.6.spec	16 Apr 2006 22:23:50 -0000	1.2089
+++ kernel-2.6.spec	17 Apr 2006 13:05:19 -0000	1.2090
@@ -1233,7 +1233,7 @@
     rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*/*.o
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
     cd include
-    cp -a acpi config linux math-emu media net pcmcia rxrpc scsi sound video asm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
+    cp -a acpi config keys linux math-emu media mtd net pcmcia rdma rxrpc scsi sound video asm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
     cp -a `readlink asm` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
     if [ "$Arch" = "x86_64" ]; then
       cp -a asm-i386 $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
@@ -1687,6 +1687,9 @@
 %endif
 
 %changelog
+* Mon Apr 17 2006 David Woodhouse <dwmw2 at redhat.com>
+- Add include/{mtd,rdma,keys} directories to kernel-devel package
+
 * Sun Apr 16 2006 Dave Jones <davej at redhat.com>
 - 2.6.16.5
 



From fedora-cvs-commits at redhat.com  Mon Apr 17 13:07:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 09:07:15 -0400
Subject: rpms/at-spi/devel at-spi-1.7.7-miscompile.patch, 1.3,
	1.4 at-spi.spec, 1.35, 1.36
Message-ID: <200604171307.k3HD7FiE002526@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/at-spi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2484

Modified Files:
	at-spi-1.7.7-miscompile.patch at-spi.spec 
Log Message:
revert the previous change


at-spi-1.7.7-miscompile.patch:
 atk-bridge/bridge.c       |    2 +-
 cspi/bonobo/cspi-bonobo.c |    5 ++++-
 libspi/util.c             |    2 ++
 registryd/registry-main.c |    2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

Index: at-spi-1.7.7-miscompile.patch
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi-1.7.7-miscompile.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- at-spi-1.7.7-miscompile.patch	4 Apr 2006 19:21:30 -0000	1.3
+++ at-spi-1.7.7-miscompile.patch	17 Apr 2006 13:07:11 -0000	1.4
@@ -20,15 +20,6 @@
  		{
  		    *screen_p = '\0';
  		}
-@@ -694,7 +694,7 @@
-   
-   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);
- 
 --- at-spi-1.7.7/cspi/bonobo/cspi-bonobo.c.miscompile	2006-04-04 14:20:31.000000000 -0400
 +++ at-spi-1.7.7/cspi/bonobo/cspi-bonobo.c	2006-04-04 14:21:18.000000000 -0400
 @@ -26,6 +26,9 @@


Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- at-spi.spec	4 Apr 2006 19:21:30 -0000	1.35
+++ at-spi.spec	17 Apr 2006 13:07:11 -0000	1.36
@@ -7,7 +7,7 @@
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
 Version: 1.7.7
-Release: 5
+Release: 6
 URL: http://developer.gnome.org/projects/gap/
 Source0: %{name}-%{version}.tar.bz2
 Patch0: at-spi-1.7.7-miscompile.patch
@@ -92,6 +92,9 @@
 %{_includedir}/* 
 
 %changelog
+* 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



From fedora-cvs-commits at redhat.com  Mon Apr 17 14:16:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 10:16:34 -0400
Subject: rpms/at-spi/FC-5 at-spi-1.7.7-miscompile.patch, 1.1, 1.2 at-spi.spec,
	1.32, 1.33
Message-ID: <200604171416.k3HEGYQS020382@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/at-spi/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19070

Modified Files:
	at-spi-1.7.7-miscompile.patch at-spi.spec 
Log Message:
revert previous change


at-spi-1.7.7-miscompile.patch:
 atk-bridge/bridge.c       |    2 +-
 cspi/bonobo/cspi-bonobo.c |    5 ++++-
 libspi/util.c             |    2 ++
 registryd/registry-main.c |    2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

Index: at-spi-1.7.7-miscompile.patch
===================================================================
RCS file: /cvs/dist/rpms/at-spi/FC-5/at-spi-1.7.7-miscompile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- at-spi-1.7.7-miscompile.patch	4 Apr 2006 19:37:04 -0000	1.1
+++ at-spi-1.7.7-miscompile.patch	17 Apr 2006 14:16:18 -0000	1.2
@@ -20,15 +20,6 @@
  		{
  		    *screen_p = '\0';
  		}
-@@ -694,7 +694,7 @@
-   
-   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);
- 
 --- at-spi-1.7.7/cspi/bonobo/cspi-bonobo.c.miscompile	2006-04-04 14:20:31.000000000 -0400
 +++ at-spi-1.7.7/cspi/bonobo/cspi-bonobo.c	2006-04-04 14:21:18.000000000 -0400
 @@ -26,6 +26,9 @@


Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/FC-5/at-spi.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- at-spi.spec	4 Apr 2006 19:37:04 -0000	1.32
+++ at-spi.spec	17 Apr 2006 14:16:18 -0000	1.33
@@ -7,7 +7,7 @@
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
 Version: 1.7.7
-Release: 1.fc5.1
+Release: 1.fc5.2
 URL: http://developer.gnome.org/projects/gap/
 Source0: %{name}-%{version}.tar.bz2
 Patch0: at-spi-1.7.7-miscompile.patch
@@ -92,6 +92,9 @@
 %{_includedir}/* 
 
 %changelog
+* Mon Apr 17 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-1.fc5.2
+- Revert the previous change
+
 * Tue Apr  4 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-1.fc5.1
 - Fix a missing declaration
 - Fix segfaults on x86_64



From fedora-cvs-commits at redhat.com  Mon Apr 17 15:36:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 11:36:36 -0400
Subject: rpms/metacity/FC-5 .cvsignore, 1.37, 1.38 metacity.spec, 1.66,
	1.67 sources, 1.37, 1.38
Message-ID: <200604171536.k3HFaa53010838@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore metacity.spec sources 
Log Message:
2.14.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/metacity/FC-5/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	11 Apr 2006 03:22:16 -0000	1.37
+++ .cvsignore	17 Apr 2006 15:36:33 -0000	1.38
@@ -1,3 +1,4 @@
 libcm-0.0.16.0.2006.03.06.tar.bz2
 metacity-2.14.0.tar.bz2
 metacity-2.14.2.tar.bz2
+metacity-2.14.3.tar.bz2


Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/FC-5/metacity.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- metacity.spec	12 Apr 2006 21:43:37 -0000	1.66
+++ metacity.spec	17 Apr 2006 15:36:34 -0000	1.67
@@ -2,12 +2,12 @@
 
 %define libcm_version 0.0.16
 %define libcm_snapshot_date 2006.03.06
-%define metacity_version 2.14.2
+%define metacity_version 2.14.3
 
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 1.fc5.2
+Release: 1.fc5.1
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
 Source0: metacity-%{metacity_version}.tar.bz2
 Source1: libcm-%{libcm_version}.0.%{libcm_snapshot_date}.tar.bz2
@@ -37,7 +37,6 @@
 Patch1: metacity-2.13.144-bling.patch
 Patch2: metacity-2.13.89.0.2006.02.16-static-cm.patch
 Patch3: metacity-2.13.89.0.2006.02.16-fix-type.patch
-Patch4: metacity-2.14.2-strict.patch
 
 %description
 
@@ -52,7 +51,6 @@
 %patch1 -p1 -b .bling
 %patch2 -p1 -b .static-cm
 %patch3 -p1 -b .fix-type
-%patch4 -p1 -b .strict
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -144,6 +142,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Apr 17 2006 Matthias Clasen <mclasen at redhat.com> 2.14.3-1.fc5.1
+- Update to 2.14.3
+
 * Wed Apr 12 2006 Ray Strode <rstrode at redhat.com> - 2.14.2-1.fc5.2
 - Make strict focus mode optional (off by default), bug 326159
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/metacity/FC-5/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	11 Apr 2006 03:22:16 -0000	1.37
+++ sources	17 Apr 2006 15:36:34 -0000	1.38
@@ -1,2 +1,2 @@
 eba1b4b6d6a18eb4fc28e35045b63b0e  libcm-0.0.16.0.2006.03.06.tar.bz2
-8540978df1e82befbded9ae38afc315d  metacity-2.14.2.tar.bz2
+57c0bc3cf4103097e126df892ecc1d58  metacity-2.14.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 17 15:40:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 11:40:57 -0400
Subject: rpms/sound-juicer/devel sound-juicer.spec, 1.48, 1.49 sources, 1.22,
	1.23
Message-ID: <200604171540.k3HFeupc011641@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/sound-juicer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11577

Modified Files:
	sound-juicer.spec sources 
Log Message:
2.14.3



Index: sound-juicer.spec
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sound-juicer.spec	10 Apr 2006 16:52:37 -0000	1.48
+++ sound-juicer.spec	17 Apr 2006 15:40:45 -0000	1.49
@@ -12,7 +12,7 @@
 
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
-Version:	2.14.2
+Version:	2.14.3
 Release:	2
 License:	GPL
 Group:		Applications/Multimedia
@@ -99,6 +99,9 @@
 %{_datadir}/icons/hicolor/*
 
 %changelog
+* Mon Apr 17 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-2
+- Update to 2.14.3
+
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-2
 - Update to 2.14.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	10 Apr 2006 16:27:29 -0000	1.22
+++ sources	17 Apr 2006 15:40:49 -0000	1.23
@@ -1 +1 @@
-b7f849eecc18cd8e534bd305742aaa19  sound-juicer-2.14.2.tar.bz2
+c525c4ef4e8cae163f7f1b6a28460e49  sound-juicer-2.14.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 17 15:49:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 11:49:37 -0400
Subject: rpms/sound-juicer/FC-5 sound-juicer.spec, 1.47, 1.48 sources, 1.22,
	1.23
Message-ID: <200604171549.k3HFnbsd025559@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/sound-juicer/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv25134

Modified Files:
	sound-juicer.spec sources 
Log Message:
2.14.3



Index: sound-juicer.spec
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/FC-5/sound-juicer.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sound-juicer.spec	10 Apr 2006 16:32:46 -0000	1.47
+++ sound-juicer.spec	17 Apr 2006 15:49:34 -0000	1.48
@@ -12,7 +12,7 @@
 
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
-Version:	2.14.2
+Version:	2.14.3
 Release:	1.fc5.1
 License:	GPL
 Group:		Applications/Multimedia
@@ -100,6 +100,9 @@
 %{_datadir}/icons/hicolor/*
 
 %changelog
+* Mon Apr 17 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-1.fc5.1
+- Update to 2.14.3
+
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1.fc5.1
 - Update to 2.14.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/FC-5/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	10 Apr 2006 16:32:46 -0000	1.22
+++ sources	17 Apr 2006 15:49:34 -0000	1.23
@@ -1 +1 @@
-b7f849eecc18cd8e534bd305742aaa19  sound-juicer-2.14.2.tar.bz2
+c525c4ef4e8cae163f7f1b6a28460e49  sound-juicer-2.14.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 17 15:53:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 11:53:39 -0400
Subject: rpms/gnome-games/FC-5 gnome-games-2.14.1-fix-schema.patch, NONE,
	1.1 gnome-games.spec, 1.70, 1.71
Message-ID: <200604171553.k3HFrd0M028656@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-games.spec 
Added Files:
	gnome-games-2.14.1-fix-schema.patch 
Log Message:
- Fix schema install bug. Reported by Dawid Gajownik <gajownik at fedora.pl>


gnome-games-2.14.1-fix-schema.patch:
 dz.po |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnome-games-2.14.1-fix-schema.patch ---
--- gnome-games-2.14.1/po/dz.po.fix-schema	2006-04-17 11:44:48.000000000 -0400
+++ gnome-games-2.14.1/po/dz.po	2006-04-17 11:48:41.000000000 -0400
@@ -4712,7 +4712,7 @@ msgstr "????????????????????????????????
 
 #: ../gtali/gtali.schemas.in.h:5
 msgid "[Human,Wilber,Bill,Monica,Kenneth,Janet]"
-msgstr "[????????? ????????????????????? ???????????? ???????????????????????? ???????????????????????? ????????????????????????"
+msgstr "[????????? ????????????????????? ???????????? ???????????????????????? ???????????????????????? ????????????????????????]"
 
 #: ../gtali/gyahtzee.c:118
 msgid "The game is a draw!"


Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/FC-5/gnome-games.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- gnome-games.spec	10 Apr 2006 14:51:52 -0000	1.70
+++ gnome-games.spec	17 Apr 2006 15:53:24 -0000	1.71
@@ -11,7 +11,7 @@
 Summary: GNOME games.
 Name: gnome-games
 Version: 2.14.1
-Release: 1.fc5.1
+Release: 1.fc5.2
 Epoch: 1
 License: LGPL
 Group: Amusements/Games
@@ -40,6 +40,8 @@
 # Needed by intltool
 BuildRequires: perl-XML-Parser
 
+Patch0: gnome-games-2.14.1-fix-schema.patch
+
 %description
 
 The gnome-games package includes some small games that come with the
@@ -48,6 +50,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix-schema
 
 tar xjf %{SOURCE2}
 
@@ -177,6 +180,9 @@
 
 
 %changelog
+* Mon Apr 17 2006 Ray Strode <rstrode at redhat.com> - 2.14.1-1.fc5.2
+- Fix schema install bug. Reported by Dawid Gajownik <gajownik at fedora.pl>
+
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
 - Update to 2.14.1
 



From fedora-cvs-commits at redhat.com  Mon Apr 17 16:23:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 12:23:52 -0400
Subject: rpms/rhythmbox/devel .cvsignore, 1.21, 1.22 rhythmbox.spec, 1.54,
	1.55 sources, 1.23, 1.24
Message-ID: <200604171623.k3HGNqVS016846@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore rhythmbox.spec sources 
Log Message:
0.9.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	4 Feb 2006 20:10:49 -0000	1.21
+++ .cvsignore	17 Apr 2006 16:23:37 -0000	1.22
@@ -6,3 +6,4 @@
 rhythmbox-0.9.2.cvs20060201.tar.bz2
 rhythmbox-0.9.3.tar.bz2
 rhythmbox-0.9.3.1.tar.bz2
+rhythmbox-0.9.4.tar.bz2


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- rhythmbox.spec	8 Mar 2006 06:20:08 -0000	1.54
+++ rhythmbox.spec	17 Apr 2006 16:23:37 -0000	1.55
@@ -2,8 +2,8 @@
 
 Name: rhythmbox
 Summary: Music Management Application 
-Version: 0.9.3.1
-Release: 3
+Version: 0.9.4
+Release: 2
 License: GPL
 Group: Applications/Multimedia
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/%{name}-%{version}.tar.bz2
@@ -103,6 +103,9 @@
 %{_libdir}/pkgconfig/rhythmbox.pc
 
 %changelog
+* Mon Apr 17 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.4-2
+- Update to 0.9.4
+
 * Wed Mar 08 2006 Ray Strode <rstrode at redhat.com> - 0.9.3.1-3
 - fix icon on notification bubbles (bug 183720)
 - patch from CVS to escape bubble markup, found by 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	4 Feb 2006 20:10:49 -0000	1.23
+++ sources	17 Apr 2006 16:23:37 -0000	1.24
@@ -1 +1 @@
-0b63402c35c10de5581d79f5157a0739  rhythmbox-0.9.3.1.tar.bz2
+0d335864738d6de0d0e6acc2964f8bc4  rhythmbox-0.9.4.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 17 16:30:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 12:30:02 -0400
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.55,1.56
Message-ID: <200604171630.k3HGU28A019120@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	rhythmbox.spec 
Log Message:
0.9.4



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- rhythmbox.spec	17 Apr 2006 16:23:37 -0000	1.55
+++ rhythmbox.spec	17 Apr 2006 16:29:59 -0000	1.56
@@ -27,8 +27,6 @@
 PreReq: desktop-file-utils >= %{desktop_file_utils_version}
 # no nautilus-cd-burner on s390
 ExcludeArch: s390 s390x
-Patch0: rhythmbox-0.9.3.1-playlist.patch
-Patch1: rhythmbox-0.9.3.1-trayicon.patch
 Patch2: rhythmbox-0.9.3.1-use-icon-name.patch
 
 %description
@@ -39,8 +37,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .playlist
-%patch1 -p1 -b .trayicon
 %patch2 -p1 -b .use-icon-name
 
 %build
@@ -105,6 +101,7 @@
 %changelog
 * Mon Apr 17 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.4-2
 - Update to 0.9.4
+- Drop upstreamed patches
 
 * Wed Mar 08 2006 Ray Strode <rstrode at redhat.com> - 0.9.3.1-3
 - fix icon on notification bubbles (bug 183720)



From fedora-cvs-commits at redhat.com  Mon Apr 17 16:34:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 12:34:07 -0400
Subject: rpms/gnome-menus/devel .cvsignore, 1.11, 1.12 gnome-menus.spec, 1.27,
	1.28 sources, 1.11, 1.12
Message-ID: <200604171634.k3HGY7KM019993@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-menus.spec sources 
Log Message:
2.14.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	17 Jan 2006 05:07:41 -0000	1.11
+++ .cvsignore	17 Apr 2006 16:34:04 -0000	1.12
@@ -5,3 +5,4 @@
 gnome-menus-2.12.0.tar.bz2
 >>>>>>> 1.10
 gnome-menus-2.13.5.tar.bz2
+gnome-menus-2.14.0.tar.bz2


Index: gnome-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gnome-menus.spec	11 Feb 2006 03:14:41 -0000	1.27
+++ gnome-menus.spec	17 Apr 2006 16:34:04 -0000	1.28
@@ -6,8 +6,8 @@
 
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
-Version: 2.13.5
-Release: 5.2
+Version: 2.14.0
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
@@ -91,6 +91,9 @@
 %{_bindir}/gnome-menu-spec-test
 
 %changelog
+* Mon Apr 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-2
+- Update to 2.14.0
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.5-5.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	17 Jan 2006 05:07:41 -0000	1.11
+++ sources	17 Apr 2006 16:34:04 -0000	1.12
@@ -1 +1 @@
-07083058ce27a2132bc3f578c055fff6  gnome-menus-2.13.5.tar.bz2
+7aa0c08fc8b9caabb4be46e1cfb595fc  gnome-menus-2.14.0.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 17 16:36:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 12:36:38 -0400
Subject: rpms/gnome-menus/devel gnome-menus.spec,1.28,1.29
Message-ID: <200604171636.k3HGacH0020452@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-menus.spec 
Log Message:
drop upstreamed patch



Index: gnome-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gnome-menus.spec	17 Apr 2006 16:34:04 -0000	1.28
+++ gnome-menus.spec	17 Apr 2006 16:36:35 -0000	1.29
@@ -18,7 +18,6 @@
 BuildRequires: glib2-devel >= 2.6.0
 BuildRequires: %{python}-devel >= 2.3.0
 BuildRequires: gamin-devel
-Patch0: gnome-menus-2.13.5-break-loop.patch
 
 %description
 gnome-menus is an implementation of the draft "Desktop
@@ -38,7 +37,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .break-loop
 
 %build
 %configure \
@@ -93,6 +91,7 @@
 %changelog
 * Mon Apr 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-2
 - Update to 2.14.0
+- Drop upstreamed patch
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.5-5.2
 - bump again for double-long bug on ppc(64)



From fedora-cvs-commits at redhat.com  Mon Apr 17 16:43:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 12:43:07 -0400
Subject: rpms/gnome-menus/FC-5 gnome-menus.spec,1.27,1.28 sources,1.11,1.12
Message-ID: <200604171643.k3HGh7CN021603@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-menus.spec sources 
Log Message:
2.14.0



Index: gnome-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/FC-5/gnome-menus.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gnome-menus.spec	11 Feb 2006 03:14:41 -0000	1.27
+++ gnome-menus.spec	17 Apr 2006 16:43:04 -0000	1.28
@@ -6,8 +6,8 @@
 
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
-Version: 2.13.5
-Release: 5.2
+Version: 2.14.0
+Release: 1.fc5.1
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
@@ -18,7 +18,6 @@
 BuildRequires: glib2-devel >= 2.6.0
 BuildRequires: %{python}-devel >= 2.3.0
 BuildRequires: gamin-devel
-Patch0: gnome-menus-2.13.5-break-loop.patch
 
 %description
 gnome-menus is an implementation of the draft "Desktop
@@ -38,7 +37,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .break-loop
 
 %build
 %configure \
@@ -91,6 +89,10 @@
 %{_bindir}/gnome-menu-spec-test
 
 %changelog
+* Mon Apr 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1.fc5.1
+- Update to 2.14.0
+- Drop upstreamed patch
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.5-5.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	17 Jan 2006 05:07:41 -0000	1.11
+++ sources	17 Apr 2006 16:43:04 -0000	1.12
@@ -1 +1 @@
-07083058ce27a2132bc3f578c055fff6  gnome-menus-2.13.5.tar.bz2
+7aa0c08fc8b9caabb4be46e1cfb595fc  gnome-menus-2.14.0.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 17 17:07:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 13:07:50 -0400
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.56,1.57
Message-ID: <200604171707.k3HH7ovr021744@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	rhythmbox.spec 
Log Message:
fix file lists



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- rhythmbox.spec	17 Apr 2006 16:29:59 -0000	1.56
+++ rhythmbox.spec	17 Apr 2006 17:07:34 -0000	1.57
@@ -13,6 +13,7 @@
 Requires: libgnomeui >= 2.6.0
 Requires: eel2 >= 2.0.0
 Requires: libgpod 
+Requires: scrollkeeper
 BuildRequires: libgpod-devel
 BuildRequires: libgnomeui-devel >= 2.6.0
 BuildRequires: nautilus-cd-burner-devel
@@ -41,8 +42,13 @@
 
 %build
 
-%configure --with-bonobo --with-ipod --with-dbus --with-mdns=avahi
-%{__make} %{?_smp_mflags}
+%configure \
+	--with-bonobo \
+	--with-ipod \
+	--with-dbus \
+	--with-mdns=avahi \
+	--disable-scrollkeeper
+make
 
 %install
 rm -rf %{buildroot}
@@ -51,6 +57,7 @@
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 rm -f %{buildroot}%{_libdir}/bonobo/*.{a,la}
 rm -f %{buildroot}%{_libdir}/bonobo/librb-nautilus-context-menu.so
+rm -f %{buildroot}%{_libdir}/rhythmbox/plugins/*.{a,la}
 
 for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do
     sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile
@@ -76,10 +83,12 @@
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null
 done
 update-desktop-database %{_datadir}/applications
+scrollkeeper-update
 
 %postun
 /sbin/ldconfig
 update-desktop-database %{_datadir}/applications
+scrollkeeper-update
 
 %files -f %{name}.lang
 %defattr(-, root, root)
@@ -97,6 +106,8 @@
 %{_libdir}/bonobo/servers/*.server
 %{_datadir}/dbus-1/services/org.gnome.Rhythmbox.service
 %{_libdir}/pkgconfig/rhythmbox.pc
+%{_libdir}/rhythmbox/plugins
+%{_libexecdir}/rhythmbox-metadata
 
 %changelog
 * Mon Apr 17 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.4-2



From fedora-cvs-commits at redhat.com  Mon Apr 17 17:36:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 13:36:17 -0400
Subject: rpms/rhythmbox/FC-5 rhythmbox.spec,1.54,1.55 sources,1.23,1.24
Message-ID: <200604171736.k3HHaH57004027@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	rhythmbox.spec sources 
Log Message:
0.9.4



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/FC-5/rhythmbox.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- rhythmbox.spec	8 Mar 2006 06:20:08 -0000	1.54
+++ rhythmbox.spec	17 Apr 2006 17:36:12 -0000	1.55
@@ -2,8 +2,8 @@
 
 Name: rhythmbox
 Summary: Music Management Application 
-Version: 0.9.3.1
-Release: 3
+Version: 0.9.4
+Release: 1.fc5.1
 License: GPL
 Group: Applications/Multimedia
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/%{name}-%{version}.tar.bz2
@@ -13,6 +13,7 @@
 Requires: libgnomeui >= 2.6.0
 Requires: eel2 >= 2.0.0
 Requires: libgpod 
+Requires: scrollkeeper
 BuildRequires: libgpod-devel
 BuildRequires: libgnomeui-devel >= 2.6.0
 BuildRequires: nautilus-cd-burner-devel
@@ -27,8 +28,6 @@
 PreReq: desktop-file-utils >= %{desktop_file_utils_version}
 # no nautilus-cd-burner on s390
 ExcludeArch: s390 s390x
-Patch0: rhythmbox-0.9.3.1-playlist.patch
-Patch1: rhythmbox-0.9.3.1-trayicon.patch
 Patch2: rhythmbox-0.9.3.1-use-icon-name.patch
 
 %description
@@ -39,14 +38,17 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .playlist
-%patch1 -p1 -b .trayicon
 %patch2 -p1 -b .use-icon-name
 
 %build
 
-%configure --with-bonobo --with-ipod --with-dbus --with-mdns=avahi
-%{__make} %{?_smp_mflags}
+%configure \
+	--with-bonobo \
+	--with-ipod \
+	--with-dbus \
+	--with-mdns=avahi \
+	--disable-scrollkeeper
+make
 
 %install
 rm -rf %{buildroot}
@@ -55,6 +57,7 @@
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 rm -f %{buildroot}%{_libdir}/bonobo/*.{a,la}
 rm -f %{buildroot}%{_libdir}/bonobo/librb-nautilus-context-menu.so
+rm -f %{buildroot}%{_libdir}/rhythmbox/plugins/*.{a,la}
 
 for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do
     sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile
@@ -80,10 +83,12 @@
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null
 done
 update-desktop-database %{_datadir}/applications
+scrollkeeper-update
 
 %postun
 /sbin/ldconfig
 update-desktop-database %{_datadir}/applications
+scrollkeeper-update
 
 %files -f %{name}.lang
 %defattr(-, root, root)
@@ -101,8 +106,14 @@
 %{_libdir}/bonobo/servers/*.server
 %{_datadir}/dbus-1/services/org.gnome.Rhythmbox.service
 %{_libdir}/pkgconfig/rhythmbox.pc
+%{_libdir}/rhythmbox/plugins
+%{_libexecdir}/rhythmbox-metadata
 
 %changelog
+* Mon Apr 17 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.4-1.fc5.1
+- Update to 0.9.4
+- Drop upstreamed patches
+
 * Wed Mar 08 2006 Ray Strode <rstrode at redhat.com> - 0.9.3.1-3
 - fix icon on notification bubbles (bug 183720)
 - patch from CVS to escape bubble markup, found by 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/FC-5/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	4 Feb 2006 20:10:49 -0000	1.23
+++ sources	17 Apr 2006 17:36:12 -0000	1.24
@@ -1 +1 @@
-0b63402c35c10de5581d79f5157a0739  rhythmbox-0.9.3.1.tar.bz2
+0d335864738d6de0d0e6acc2964f8bc4  rhythmbox-0.9.4.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 17 17:59:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 13:59:43 -0400
Subject: rpms/bluez-utils/devel bluetooth.init, 1.4, 1.5 dund.init, 1.4,
	1.5 hidd.init, 1.5, 1.6
Message-ID: <200604171759.k3HHxhAe001827@cvs.devel.redhat.com>

Author: pjones

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

Modified Files:
	bluetooth.init dund.init hidd.init 
Log Message:
- make "status" work right for all 3 init scripts
- don't check networking before starting hidd
- don't bail on files provided by the package not being there when we're
  testing for their contents later anyway



Index: bluetooth.init
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/bluetooth.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bluetooth.init	2 May 2005 16:57:01 -0000	1.4
+++ bluetooth.init	17 Apr 2006 17:59:40 -0000	1.5
@@ -11,7 +11,6 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-
 UART_CONF="/etc/bluetooth/uart"
 
 [ -e /etc/sysconfig/bluetooth ] && . /etc/sysconfig/bluetooth
@@ -32,8 +31,10 @@
 start()
 {
 	echo -n $"Starting Bluetooth services:"
-	daemon /usr/sbin/hcid
-	daemon sdpd
+	daemon --pidfile /var/run/hcid.pid /usr/sbin/hcid
+	touch /var/lock/subsys/hcid
+	daemon --pidfile /var/run/sdpd.pid sdpd
+	touch /var/lock/subsys/sdpd
 	[ "$HID2HCI_ENABLE" = "true" ] && hid2hci --tohci > /dev/null 2>&1 || :
 	start_uarts
 	rfcomm bind all
@@ -47,7 +48,9 @@
 	stop_uarts
 	rfcomm release all
 	[ "$HID2HCI_UNDO" = "true" ] && hid2hci --tohid > /dev/null 2>&1 || :
+	rm -f /var/lock/subsys/sdpd
 	killproc sdpd
+	rm -f /var/lock/subsys/hcid
 	killproc hcid
 	rm -f /var/lock/subsys/bluetooth
 	echo ""


Index: dund.init
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/dund.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dund.init	7 Mar 2006 16:14:55 -0000	1.4
+++ dund.init	17 Apr 2006 17:59:40 -0000	1.5
@@ -14,14 +14,12 @@
 
 [ "${NETWORKING}" = "yes" ] || exit 0
 
-[ -r /etc/sysconfig/dund ] || exit 0
-
-. /etc/sysconfig/dund
-
-[ -z "$DUNDARGS" ] && exit 0
+[ -r /etc/sysconfig/dund ] && . /etc/sysconfig/dund
 
 start() 
 {
+	[ -z "$DUNDARGS" ] && exit 0
+
         echo -n $"Starting dund: "
         daemon /usr/bin/dund $DUNDARGS
 
@@ -39,8 +37,6 @@
         echo
 }
 
-[ -f /usr/bin/dund ] || exit 0
-
 # See how we were called.
 case "$1" in
   start)
@@ -56,6 +52,9 @@
   condrestart)
 	[ -e /var/lock/subsys/dund ] && (stop; start)
 	;;
+  status)
+  	status dund
+	;;
   *)
         echo $"Usage: $0 {start|stop|restart|reload|condrestart}"
         exit 1


Index: hidd.init
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/hidd.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hidd.init	7 Mar 2006 16:14:55 -0000	1.5
+++ hidd.init	17 Apr 2006 17:59:40 -0000	1.6
@@ -10,18 +10,12 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network
-
-[ "${NETWORKING}" = "yes" ] || exit 0
-
-[ -r /etc/sysconfig/hidd ] || exit 0
-
-. /etc/sysconfig/hidd
-
-[ -z "$HIDDARGS" ] && exit 0
+[ -r /etc/sysconfig/hidd ] && . /etc/sysconfig/hidd
 
 start() 
 {
+	[ -z "$HIDDARGS" ] && exit 0
+
         echo -n $"Starting hidd: "
         daemon /usr/bin/hidd $HIDDARGS
 
@@ -56,6 +50,9 @@
   condrestart)
 	[ -e /var/lock/subsys/hidd ] && (stop; start)
 	;;
+  status)
+  	status hidd
+	;;
   *)
         echo $"Usage: $0 {start|stop|restart|reload|condrestart}"
         exit 1



From fedora-cvs-commits at redhat.com  Mon Apr 17 18:05:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 14:05:28 -0400
Subject: rpms/bluez-utils/devel bluetooth.init,1.5,1.6
Message-ID: <200604171805.k3HI5SA7002819@cvs.devel.redhat.com>

Author: pjones

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

Modified Files:
	bluetooth.init 
Log Message:
- remove lockfiles _after_ killproc



Index: bluetooth.init
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/bluetooth.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bluetooth.init	17 Apr 2006 17:59:40 -0000	1.5
+++ bluetooth.init	17 Apr 2006 18:05:24 -0000	1.6
@@ -48,10 +48,10 @@
 	stop_uarts
 	rfcomm release all
 	[ "$HID2HCI_UNDO" = "true" ] && hid2hci --tohid > /dev/null 2>&1 || :
-	rm -f /var/lock/subsys/sdpd
 	killproc sdpd
-	rm -f /var/lock/subsys/hcid
+	rm -f /var/lock/subsys/sdpd
 	killproc hcid
+	rm -f /var/lock/subsys/hcid
 	rm -f /var/lock/subsys/bluetooth
 	echo ""
 }



From fedora-cvs-commits at redhat.com  Mon Apr 17 18:07:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 14:07:53 -0400
Subject: rpms/bluez-utils/devel bluetooth.init,1.6,1.7
Message-ID: <200604171807.k3HI7ro2003199@cvs.devel.redhat.com>

Author: pjones

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

Modified Files:
	bluetooth.init 
Log Message:
- we don't need --pidfile on daemon



Index: bluetooth.init
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/bluetooth.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bluetooth.init	17 Apr 2006 18:05:24 -0000	1.6
+++ bluetooth.init	17 Apr 2006 18:07:51 -0000	1.7
@@ -31,9 +31,9 @@
 start()
 {
 	echo -n $"Starting Bluetooth services:"
-	daemon --pidfile /var/run/hcid.pid /usr/sbin/hcid
+	daemon /usr/sbin/hcid
 	touch /var/lock/subsys/hcid
-	daemon --pidfile /var/run/sdpd.pid sdpd
+	daemon /usr/sbin/sdpd
 	touch /var/lock/subsys/sdpd
 	[ "$HID2HCI_ENABLE" = "true" ] && hid2hci --tohci > /dev/null 2>&1 || :
 	start_uarts



From fedora-cvs-commits at redhat.com  Mon Apr 17 18:11:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 14:11:17 -0400
Subject: rpms/bluez-utils/devel pand.init,1.4,1.5
Message-ID: <200604171811.k3HIBHBJ003781@cvs.devel.redhat.com>

Author: pjones

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

Modified Files:
	pand.init 
Log Message:
- fix status
- don't fail if sysconfig file missing
- only check sysconfig values on startup



Index: pand.init
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/pand.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pand.init	7 Mar 2006 16:14:55 -0000	1.4
+++ pand.init	17 Apr 2006 18:11:12 -0000	1.5
@@ -14,14 +14,11 @@
 
 [ "${NETWORKING}" = "yes" ] || exit 0
 
-[ -r /etc/sysconfig/pand ] || exit 0
-
-. /etc/sysconfig/pand
-
-[ -z "$PANDARGS" ] && exit 0
+[ -r /etc/sysconfig/pand ] && . /etc/sysconfig/pand
 
 start() 
 {
+	[ -z "$PANDARGS" ] && exit 0
         [ -x /etc/bluetooth/pan/system-up ] && /etc/bluetooth/pan/system-up
 
         echo -n $"Starting pand: "
@@ -59,6 +56,9 @@
   condrestart)
 	[ -e /var/lock/subsys/pand ] && (stop; start)
 	;;
+  status)
+  	status pand
+	;;
   *)
         echo $"Usage: $0 {start|stop|restart|reload|condrestart}"
         exit 1



From fedora-cvs-commits at redhat.com  Mon Apr 17 18:13:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 14:13:27 -0400
Subject: rpms/gnucash/devel .cvsignore, 1.15, 1.16 gnucash.spec, 1.31,
	1.32 sources, 1.16, 1.17
Message-ID: <200604171813.k3HIDRh4004087@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4040

Modified Files:
	.cvsignore gnucash.spec sources 
Log Message:
update to 1.9.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	6 Apr 2006 04:54:01 -0000	1.15
+++ .cvsignore	17 Apr 2006 18:13:24 -0000	1.16
@@ -1,6 +1,2 @@
-gnucash-1.9.1.svn13429.tar.bz2
-gnucash-docs-1.9.1.svn13429.tar.bz2
-gnucash-1.9.3.tar.gz
-gnucash-docs-1.9.3.svn13703.tar.bz2
-gnucash-1.9.4.tar.gz
-gnucash-docs-1.9.4.svn13741.tar.bz2
+gnucash-1.9.5.tar.gz
+gnucash-docs-1.9.5.svn13798.tar.bz2


Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gnucash.spec	7 Apr 2006 14:51:46 -0000	1.31
+++ gnucash.spec	17 Apr 2006 18:13:24 -0000	1.32
@@ -1,10 +1,10 @@
-%define svnrev 13741
+%define svnrev 13798
 
 %define buildsvn 0
 
 Name: gnucash
 Summary: GnuCash is an application to keep track of your finances.
-Version: 1.9.4
+Version: 1.9.5
 %if %{buildsvn}
 Release: 1.svn%{svnrev}.1
 %else
@@ -140,6 +140,9 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Mon Apr 17 2006 Bill Nottingham <notting at redhat.com> - 1.9.5-1
+- update to 1.9.5
+
 * Thu Apr  6 2006 Bill Nottingham <notting at redhat.com> - 1.9.4-1
 - update to 1.9.4
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	6 Apr 2006 04:54:01 -0000	1.16
+++ sources	17 Apr 2006 18:13:24 -0000	1.17
@@ -1,2 +1,2 @@
-47d4224f001b46d4ca81c6b9dd46bd94  gnucash-1.9.4.tar.gz
-57738a4c27ea6e68a4870357f1b9091e  gnucash-docs-1.9.4.svn13741.tar.bz2
+3ed82ce7d87483bfd43496b5e7e18b4b  gnucash-1.9.5.tar.gz
+693be0ba720e09edcf4df205be61f031  gnucash-docs-1.9.5.svn13798.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 17 19:04:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 15:04:07 -0400
Subject: rpms/bluez-utils/devel bluez-utils.spec,1.40,1.41
Message-ID: <200604171904.k3HJ47He011843@cvs.devel.redhat.com>

Author: pjones

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

Modified Files:
	bluez-utils.spec 
Log Message:
- changelog/revision



Index: bluez-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- bluez-utils.spec	23 Mar 2006 18:37:33 -0000	1.40
+++ bluez-utils.spec	17 Apr 2006 19:04:01 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
 Version: 2.25
-Release: 5
+Release: 6
 License: GPL
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -113,6 +113,9 @@
 %{_libdir}/cups/backend/bluetooth
 
 %changelog
+* Mon Apr 17 2006 Peter Jones <pjones at redhat.com> - 2.25-
+- Clean up initscripts.
+
 * Thu Mar 23 2006 Peter Jones <pjones at redhat.com> - 2.25-5
 - Don't poll every 200ms when nothing happens unless there's poll event
   in hidd.



From fedora-cvs-commits at redhat.com  Mon Apr 17 19:15:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 15:15:36 -0400
Subject: rpms/control-center/devel control-center-2.13.90-fedora-apps.patch,
	1.3, 1.4 control-center.spec, 1.133, 1.134
Message-ID: <200604171915.k3HJFaXF013242@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13211

Modified Files:
	control-center-2.13.90-fedora-apps.patch control-center.spec 
Log Message:
fix thunderbird commandline


control-center-2.13.90-fedora-apps.patch:
 gnome-default-applications.xml.in |  111 ++++++++------------------------------
 1 files changed, 24 insertions(+), 87 deletions(-)

Index: control-center-2.13.90-fedora-apps.patch
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center-2.13.90-fedora-apps.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- control-center-2.13.90-fedora-apps.patch	10 Apr 2006 23:39:12 -0000	1.3
+++ control-center-2.13.90-fedora-apps.patch	17 Apr 2006 19:15:31 -0000	1.4
@@ -1,5 +1,5 @@
---- control-center-2.13.90/capplets/default-applications/gnome-default-applications.xml.in.fedora-apps	2006-01-28 13:52:24.000000000 -0500
-+++ control-center-2.13.90/capplets/default-applications/gnome-default-applications.xml.in	2006-01-30 14:23:21.000000000 -0500
+--- control-center-2.14.1/capplets/default-applications/gnome-default-applications.xml.in.fedora-apps	2006-03-29 11:00:20.000000000 -0500
++++ control-center-2.14.1/capplets/default-applications/gnome-default-applications.xml.in	2006-04-17 15:14:21.000000000 -0400
 @@ -44,24 +44,6 @@
        <win-command>galeon -w %s</win-command>
      </web-browser>
@@ -107,7 +107,8 @@
 -      <_name>Thunderbird</_name>
 +      <_name>Thunderbird Mail</_name>
        <executable>thunderbird</executable>
-       <command>thunderbird -compose %s</command>
+-      <command>thunderbird -compose %s</command>
++      <command>thunderbird mailto:%s</command>
        <icon-name>thunderbird</icon-name>
        <run-in-terminal>false</run-in-terminal>
      </mail-reader>
@@ -129,7 +130,7 @@
        <_name>Mutt</_name>
        <executable>mutt</executable>
        <command>mutt %s</command>
-@@ -228,8 +144,15 @@
+@@ -228,6 +144,13 @@
        <run-in-terminal>true</run-in-terminal>
      </mail-reader>
      <mail-reader>
@@ -141,11 +142,8 @@
 +    </mail-reader>
 +    <mail-reader>
        <_name>Sylpheed-Claws</_name>
--      <executable>sylpheed-claws</executable>
-+      <executable>sylpheed-claws</executable>
+       <executable>sylpheed-claws</executable>
        <command>sylpheed-claws --compose %s</command>
-       <icon-name>sylpheed</icon-name>
-       <run-in-terminal>false</run-in-terminal>
 @@ -245,6 +168,20 @@
        <exec-flag>-e</exec-flag>
      </terminal>


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- control-center.spec	10 Apr 2006 23:54:23 -0000	1.133
+++ control-center.spec	17 Apr 2006 19:15:32 -0000	1.134
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center.
 Name: control-center
 Version: 2.14.1
-Release: 2
+Release: 3
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -232,6 +232,9 @@
 # (also its headers)
 
 %changelog
+* Mon Apr 17 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-3
+- Fix the thunderbird commandline
+
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
 - Update to 2.14.1
 



From fedora-cvs-commits at redhat.com  Mon Apr 17 19:20:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 15:20:22 -0400
Subject: rpms/pykickstart/devel .cvsignore, 1.26, 1.27 pykickstart.spec, 1.26,
	1.27 sources, 1.27, 1.28
Message-ID: <200604171920.k3HJKMtp022760@cvs.devel.redhat.com>

Author: clumens

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	27 Mar 2006 21:01:26 -0000	1.26
+++ .cvsignore	17 Apr 2006 19:20:17 -0000	1.27
@@ -15,3 +15,4 @@
 pykickstart-0.23.tar.gz
 pykickstart-0.24.tar.gz
 pykickstart-0.25.tar.gz
+pykickstart-0.26.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- pykickstart.spec	27 Mar 2006 21:01:41 -0000	1.26
+++ pykickstart.spec	17 Apr 2006 19:20:17 -0000	1.27
@@ -2,7 +2,7 @@
 
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
-Version: 0.25
+Version: 0.26
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -24,7 +24,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python setup.py install --root=${RPM_BUILD_ROOT}
+make DESTDIR=${RPM_BUILD_ROOT} install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -34,8 +34,17 @@
 %doc README ChangeLog COPYING docs/programmers-guide
 %{python_sitelib}/pykickstart
 /usr/bin/ksvalidator
+/usr/share/locale/*/*/*
 
 %changelog
+* Mon Apr 17 2006 Chris Lumens <clumens at redhat.com> 0.26-1
+- Ignore spaces before group names (#188095).
+- Added some translations.
+- Add options for repo command.
+- Reorder %packages section output.
+- Output %packages header options.
+- Initialize RAID and volume group members to empty lists.
+
 * Mon Mar 27 2006 Chris Lumens <clumens at redhat.com> 0.25-1
 - Add support for the logging command.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	27 Mar 2006 21:01:41 -0000	1.27
+++ sources	17 Apr 2006 19:20:17 -0000	1.28
@@ -1 +1 @@
-bacb2a262490ffbe8d8c3fb14662cbe4  pykickstart-0.25.tar.gz
+5a84760bfabe8b7230bf43a59df144f9  pykickstart-0.26.tar.gz



From fedora-cvs-commits at redhat.com  Mon Apr 17 19:23:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 15:23:20 -0400
Subject: rpms/control-center/FC-5 control-center-2.13.90-fedora-apps.patch,
	1.3, 1.4 control-center.spec, 1.131, 1.132
Message-ID: <200604171923.k3HJNKPE029273@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv29205

Modified Files:
	control-center-2.13.90-fedora-apps.patch control-center.spec 
Log Message:

fix thunderbird commandline


control-center-2.13.90-fedora-apps.patch:
 gnome-default-applications.xml.in |  111 ++++++++------------------------------
 1 files changed, 24 insertions(+), 87 deletions(-)

Index: control-center-2.13.90-fedora-apps.patch
===================================================================
RCS file: /cvs/dist/rpms/control-center/FC-5/control-center-2.13.90-fedora-apps.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- control-center-2.13.90-fedora-apps.patch	10 Apr 2006 23:46:38 -0000	1.3
+++ control-center-2.13.90-fedora-apps.patch	17 Apr 2006 19:23:16 -0000	1.4
@@ -1,5 +1,5 @@
---- control-center-2.13.90/capplets/default-applications/gnome-default-applications.xml.in.fedora-apps	2006-01-28 13:52:24.000000000 -0500
-+++ control-center-2.13.90/capplets/default-applications/gnome-default-applications.xml.in	2006-01-30 14:23:21.000000000 -0500
+--- control-center-2.14.1/capplets/default-applications/gnome-default-applications.xml.in.fedora-apps	2006-03-29 11:00:20.000000000 -0500
++++ control-center-2.14.1/capplets/default-applications/gnome-default-applications.xml.in	2006-04-17 15:14:21.000000000 -0400
 @@ -44,24 +44,6 @@
        <win-command>galeon -w %s</win-command>
      </web-browser>
@@ -107,7 +107,8 @@
 -      <_name>Thunderbird</_name>
 +      <_name>Thunderbird Mail</_name>
        <executable>thunderbird</executable>
-       <command>thunderbird -compose %s</command>
+-      <command>thunderbird -compose %s</command>
++      <command>thunderbird mailto:%s</command>
        <icon-name>thunderbird</icon-name>
        <run-in-terminal>false</run-in-terminal>
      </mail-reader>
@@ -129,7 +130,7 @@
        <_name>Mutt</_name>
        <executable>mutt</executable>
        <command>mutt %s</command>
-@@ -228,8 +144,15 @@
+@@ -228,6 +144,13 @@
        <run-in-terminal>true</run-in-terminal>
      </mail-reader>
      <mail-reader>
@@ -141,11 +142,8 @@
 +    </mail-reader>
 +    <mail-reader>
        <_name>Sylpheed-Claws</_name>
--      <executable>sylpheed-claws</executable>
-+      <executable>sylpheed-claws</executable>
+       <executable>sylpheed-claws</executable>
        <command>sylpheed-claws --compose %s</command>
-       <icon-name>sylpheed</icon-name>
-       <run-in-terminal>false</run-in-terminal>
 @@ -245,6 +168,20 @@
        <exec-flag>-e</exec-flag>
      </terminal>


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/FC-5/control-center.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- control-center.spec	10 Apr 2006 23:55:04 -0000	1.131
+++ control-center.spec	17 Apr 2006 19:23:16 -0000	1.132
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center.
 Name: control-center
 Version: 2.14.1
-Release: 1.fc5.1
+Release: 1.fc5.2
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -232,6 +232,9 @@
 # (also its headers)
 
 %changelog
+* Mon Apr 17 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.2
+- Fix thunderbird commandline
+
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
 - Update to 2.14.1
 



From fedora-cvs-commits at redhat.com  Mon Apr 17 20:41:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 16:41:21 -0400
Subject: rpms/libraw1394/FC-5 .cvsignore, 1.6, 1.7 libraw1394.spec, 1.17,
	1.18 sources, 1.6, 1.7
Message-ID: <200604172041.k3HKfLU6005060@cvs.devel.redhat.com>

Author: jwilson

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

Modified Files:
	.cvsignore libraw1394.spec sources 
Log Message:
Update to libraw1394 1.2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libraw1394/FC-5/.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	17 Apr 2006 20:41:19 -0000	1.7
@@ -1 +1,2 @@
 libraw1394-1.2.0.tar.gz
+libraw1394-1.2.1.tar.gz


Index: libraw1394.spec
===================================================================
RCS file: /cvs/dist/rpms/libraw1394/FC-5/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	17 Apr 2006 20:41:19 -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
+Version: 1.2.1
+Release: 1.fc5
 License: LGPL
 Group: System Environment/Libraries
 Source: http://www.linux1394.org/dl/libraw1394-%{version}.tar.gz
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Thu Apr 13 2006 Jarod Wilson <jwilson at redhat.com> - 1.2.1-1.fc5
+- 1.2.1
+
 * 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)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libraw1394/FC-5/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	17 Apr 2006 20:41:19 -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  Mon Apr 17 20:36:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 16:36:31 -0400
Subject: rpms/createrepo/devel .cvsignore, 1.8, 1.9 createrepo.spec, 1.15,
	1.16 sources, 1.8, 1.9 createrepo-0.4.3-HEAD.patch, 1.1,
	NONE createrepo-genclass-cleanup.patch, 1.1,
	NONE createrepo-genclass-multidirs.patch, 1.1,
	NONE createrepo-genclass-splitprocessing.patch, 1.1,
	NONE createrepo-genclass.patch, 1.1,
	NONE createrepo-relative.patch, 1.5, NONE
Message-ID: <200604172036.k3HKaVUV002691@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/createrepo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2520

Modified Files:
	.cvsignore createrepo.spec sources 
Removed Files:
	createrepo-0.4.3-HEAD.patch createrepo-genclass-cleanup.patch 
	createrepo-genclass-multidirs.patch 
	createrepo-genclass-splitprocessing.patch 
	createrepo-genclass.patch createrepo-relative.patch 
Log Message:
New version


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/createrepo/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2005 12:25:53 -0000	1.8
+++ .cvsignore	17 Apr 2006 20:36:13 -0000	1.9
@@ -1,2 +1,3 @@
 createrepo-0.4.2.tar.gz
 createrepo-0.4.3.tar.gz
+createrepo-0.4.4.tar.gz


Index: createrepo.spec
===================================================================
RCS file: /cvs/dist/rpms/createrepo/devel/createrepo.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- createrepo.spec	9 Dec 2005 22:40:06 -0000	1.15
+++ createrepo.spec	17 Apr 2006 20:36:14 -0000	1.16
@@ -1,17 +1,11 @@
 Summary: Creates a common metadata repository
 Name: createrepo
-Version: 0.4.3
-Release: 5.1
+Version: 0.4.4
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
-Patch0: createrepo-0.4.3-HEAD.patch
-Patch1: createrepo-genclass.patch
-Patch2: createrepo-genclass-cleanup.patch
-Patch3: createrepo-genclass-splitprocessing.patch
-Patch4: createrepo-genclass-multidirs.patch
-Patch5: createrepo-relative.patch
-URL: http://linux.duke.edu/metadata/
+URL: http://linux.duke.edu/projects/metadata/
 BuildRoot: %{_tmppath}/%{name}-%{version}root
 BuildArchitectures: noarch
 Requires: python >= 2.1, rpm-python, rpm >= 0:4.1.1, libxml2-python
@@ -22,12 +16,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -46,6 +34,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Apr 17 2006 Paul Nasrat <pnasrat at redhat.com> - 0.4.4-1
+- Update to latest upstream
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/createrepo/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2005 12:25:53 -0000	1.8
+++ sources	17 Apr 2006 20:36:14 -0000	1.9
@@ -1 +1 @@
-49988da42b354f3acaa833ae271e9a18  createrepo-0.4.3.tar.gz
+28c02a17e08024849e0730676a26d55b  createrepo-0.4.4.tar.gz


--- createrepo-0.4.3-HEAD.patch DELETED ---


--- createrepo-genclass-cleanup.patch DELETED ---


--- createrepo-genclass-multidirs.patch DELETED ---


--- createrepo-genclass-splitprocessing.patch DELETED ---


--- createrepo-genclass.patch DELETED ---


--- createrepo-relative.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 17 20:52:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 16:52:28 -0400
Subject: rpms/kernel/devel linux-2.6-xen.patch,1.9,1.10
Message-ID: <200604172052.k3HKqS2l019575@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	linux-2.6-xen.patch 
Log Message:
rediff xen to work with git12

linux-2.6-xen.patch:
 linux-2.6.16.noarch/arch/x86_64/Makefile                 |   20 
 linux-2.6.16.noarch/arch/x86_64/ia32/Makefile            |   20 
 linux-2.6.16.noarch/arch/x86_64/kernel/Makefile          |   19 
 linux-2.6.16.noarch/init/Kconfig                         |    1 
 tip2/arch/i386/Kconfig                                   |   99 
 tip2/arch/i386/Kconfig.cpu                               |    2 
 tip2/arch/i386/Makefile                                  |   24 
 tip2/arch/i386/boot-xen/Makefile                         |   21 
 tip2/arch/i386/kernel/Makefile                           |   31 
 tip2/arch/i386/kernel/acpi/Makefile                      |    4 
 tip2/arch/i386/kernel/acpi/boot-xen.c                    | 1161 ++++++
 tip2/arch/i386/kernel/apic-xen.c                         |  141 
 tip2/arch/i386/kernel/asm-offsets.c                      |    5 
 tip2/arch/i386/kernel/cpu/Makefile                       |    5 
 tip2/arch/i386/kernel/cpu/common-xen.c                   |  732 ++++
 tip2/arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 tip2/arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 tip2/arch/i386/kernel/early_printk-xen.c                 |    2 
 tip2/arch/i386/kernel/entry-xen.S                        |  880 ++++
 tip2/arch/i386/kernel/entry.S                            |    4 
 tip2/arch/i386/kernel/fixup.c                            |   95 
 tip2/arch/i386/kernel/head-xen.S                         |  171 
 tip2/arch/i386/kernel/init_task-xen.c                    |   51 
 tip2/arch/i386/kernel/io_apic-xen.c                      | 2744 +++++++++++++++
 tip2/arch/i386/kernel/ioport-xen.c                       |  122 
 tip2/arch/i386/kernel/irq-xen.c                          |  306 +
 tip2/arch/i386/kernel/irq.c                              |    4 
 tip2/arch/i386/kernel/ldt-xen.c                          |  269 +
 tip2/arch/i386/kernel/microcode-xen.c                    |  148 
 tip2/arch/i386/kernel/mpparse-xen.c                      | 1189 ++++++
 tip2/arch/i386/kernel/pci-dma-xen.c                      |  344 +
 tip2/arch/i386/kernel/process-xen.c                      |  824 ++++
 tip2/arch/i386/kernel/quirks-xen.c                       |   48 
 tip2/arch/i386/kernel/setup-xen.c                        | 1826 +++++++++
 tip2/arch/i386/kernel/smp-xen.c                          |  613 +++
 tip2/arch/i386/kernel/swiotlb.c                          |  674 +++
 tip2/arch/i386/kernel/sysenter.c                         |   90 
 tip2/arch/i386/kernel/time-xen.c                         | 1097 +++++
 tip2/arch/i386/kernel/traps-xen.c                        | 1123 ++++++
 tip2/arch/i386/kernel/traps.c                            |    9 
 tip2/arch/i386/kernel/vm86.c                             |    8 
 tip2/arch/i386/kernel/vsyscall-note-xen.S                |   32 
 tip2/arch/i386/kernel/vsyscall.S                         |    2 
 tip2/arch/i386/mach-xen/Makefile                         |    5 
 tip2/arch/i386/mach-xen/setup.c                          |   49 
 tip2/arch/i386/mm/Makefile                               |    8 
 tip2/arch/i386/mm/fault-xen.c                            |  683 +++
 tip2/arch/i386/mm/highmem-xen.c                          |  123 
 tip2/arch/i386/mm/hypervisor.c                           |  424 ++
 tip2/arch/i386/mm/init-xen.c                             |  853 ++++
 tip2/arch/i386/mm/ioremap-xen.c                          |  486 ++
 tip2/arch/i386/mm/pageattr.c                             |    2 
 tip2/arch/i386/mm/pgtable-xen.c                          |  652 +++
 tip2/arch/i386/mm/pgtable.c                              |   12 
 tip2/arch/i386/oprofile/Makefile                         |    4 
 tip2/arch/i386/oprofile/xenoprof.c                       |  395 ++
 tip2/arch/i386/pci/Makefile                              |    9 
 tip2/arch/i386/pci/irq-xen.c                             | 1202 ++++++
 tip2/arch/i386/pci/pcifront.c                            |   55 
 tip2/arch/i386/power/Makefile                            |    4 
 tip2/arch/ia64/Kconfig                                   |   46 
 tip2/arch/ia64/Makefile                                  |   16 
 tip2/arch/ia64/hp/sim/Makefile                           |    2 
 tip2/arch/ia64/kernel/entry.S                            |   32 
 tip2/arch/ia64/kernel/head.S                             |    6 
 tip2/arch/ia64/kernel/pal.S                              |    5 
 tip2/arch/ia64/kernel/sal.c                              |    3 
 tip2/arch/ia64/kernel/setup.c                            |   32 
 tip2/arch/ia64/xen/Makefile                              |    5 
 tip2/arch/ia64/xen/drivers/Makefile                      |   20 
 tip2/arch/ia64/xen/drivers/README                        |    2 
 tip2/arch/ia64/xen/drivers/coreMakefile                  |   26 
 tip2/arch/ia64/xen/drivers/evtchn_ia64.c                 |  273 +
 tip2/arch/ia64/xen/drivers/patches/blkback.c.patch       |   33 
 tip2/arch/ia64/xen/drivers/patches/console.c.patch       |   11 
 tip2/arch/ia64/xen/drivers/patches/devmem.c.patch        |    2 
 tip2/arch/ia64/xen/drivers/patches/gnttab.c.patch        |   33 
 tip2/arch/ia64/xen/drivers/patches/privcmd.c.patch       |   30 
 tip2/arch/ia64/xen/drivers/xenia64_init.c                |   55 
 tip2/arch/ia64/xen/hypercall.S                           |  365 +
 tip2/arch/ia64/xen/xen_ksyms.c                           |   12 
 tip2/arch/ia64/xen/xenconsole.c                          |   19 
 tip2/arch/ia64/xen/xenentry.S                            |  850 ++++
 tip2/arch/ia64/xen/xenhpski.c                            |   19 
 tip2/arch/ia64/xen/xenivt.S                              | 2032 +++++++++++
 tip2/arch/ia64/xen/xenminstate.h                         |  367 ++
 tip2/arch/ia64/xen/xenpal.S                              |   73 
 tip2/arch/ia64/xen/xensetup.S                            |   35 
 tip2/arch/um/kernel/physmem.c                            |    4 
 tip2/arch/x86_64/Kconfig                                 |   62 
 tip2/arch/x86_64/ia32/ia32entry-xen.S                    |  723 +++
 tip2/arch/x86_64/ia32/syscall32-xen.c                    |  128 
 tip2/arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 tip2/arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 tip2/arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 tip2/arch/x86_64/kernel/acpi/Makefile                    |    1 
 tip2/arch/x86_64/kernel/apic-xen.c                       |  198 +
 tip2/arch/x86_64/kernel/asm-offsets.c                    |    2 
 tip2/arch/x86_64/kernel/e820-xen.c                       |  744 ++++
 tip2/arch/x86_64/kernel/early_printk-xen.c               |  304 +
 tip2/arch/x86_64/kernel/entry-xen.S                      | 1149 ++++++
 tip2/arch/x86_64/kernel/entry.S                          |    2 
 tip2/arch/x86_64/kernel/genapic-xen.c                    |  144 
 tip2/arch/x86_64/kernel/genapic_xen.c                    |  162 
 tip2/arch/x86_64/kernel/head-xen.S                       |  163 
 tip2/arch/x86_64/kernel/head64-xen.c                     |  140 
 tip2/arch/x86_64/kernel/init_task.c                      |    3 
 tip2/arch/x86_64/kernel/io_apic-xen.c                    | 2231 ++++++++++++
 tip2/arch/x86_64/kernel/ioport-xen.c                     |   58 
 tip2/arch/x86_64/kernel/irq-xen.c                        |  163 
 tip2/arch/x86_64/kernel/irq.c                            |    4 
 tip2/arch/x86_64/kernel/ldt-xen.c                        |  282 +
 tip2/arch/x86_64/kernel/mpparse-xen.c                    | 1002 +++++
 tip2/arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 tip2/arch/x86_64/kernel/process-xen.c                    |  796 ++++
 tip2/arch/x86_64/kernel/setup-xen.c                      | 1677 +++++++++
 tip2/arch/x86_64/kernel/setup64-xen.c                    |  360 +
 tip2/arch/x86_64/kernel/smp-xen.c                        |  596 +++
 tip2/arch/x86_64/kernel/smp.c                            |    4 
 tip2/arch/x86_64/kernel/traps-xen.c                      | 1020 +++++
 tip2/arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 tip2/arch/x86_64/kernel/x8664_ksyms-xen.c                |  158 
 tip2/arch/x86_64/kernel/xen_entry.S                      |   40 
 tip2/arch/x86_64/mm/Makefile                             |   10 
 tip2/arch/x86_64/mm/fault-xen.c                          |  644 +++
 tip2/arch/x86_64/mm/init-xen.c                           | 1145 ++++++
 tip2/arch/x86_64/mm/pageattr-xen.c                       |  390 ++
 tip2/arch/x86_64/oprofile/Makefile                       |    5 
 tip2/arch/x86_64/pci/Makefile                            |   12 
 tip2/drivers/Makefile                                    |    1 
 tip2/drivers/acpi/Kconfig                                |    3 
 tip2/drivers/char/mem.c                                  |    6 
 tip2/drivers/char/tpm/Kconfig                            |   14 
 tip2/drivers/char/tpm/Makefile                           |    1 
 tip2/drivers/char/tpm/tpm.c                              |   44 
 tip2/drivers/char/tpm/tpm.h                              |    7 
 tip2/drivers/char/tpm/tpm_atmel.c                        |  230 -
 tip2/drivers/char/tpm/tpm_nsc.c                          |  395 --
 tip2/drivers/char/tpm/tpm_xen.c                          |  536 ++
 tip2/drivers/char/tty_io.c                               |    7 
 tip2/drivers/firmware/Kconfig                            |    2 
 tip2/drivers/pci/Kconfig                                 |    1 
 tip2/drivers/serial/Kconfig                              |    1 
 tip2/drivers/video/Kconfig                               |    2 
 tip2/drivers/xen/Kconfig                                 |  212 +
 tip2/drivers/xen/Makefile                                |   22 
 tip2/drivers/xen/balloon/Makefile                        |    2 
 tip2/drivers/xen/balloon/balloon.c                       |  592 +++
 tip2/drivers/xen/blkback/Makefile                        |    3 
 tip2/drivers/xen/blkback/blkback.c                       |  597 +++
 tip2/drivers/xen/blkback/common.h                        |  145 
 tip2/drivers/xen/blkback/interface.c                     |  184 +
 tip2/drivers/xen/blkback/vbd.c                           |  126 
 tip2/drivers/xen/blkback/xenbus.c                        |  421 ++
 tip2/drivers/xen/blkfront/Kconfig                        |    6 
 tip2/drivers/xen/blkfront/Makefile                       |    5 
 tip2/drivers/xen/blkfront/blkfront.c                     |  819 ++++
 tip2/drivers/xen/blkfront/block.h                        |  165 
 tip2/drivers/xen/blkfront/vbd.c                          |  327 +
 tip2/drivers/xen/blktap/Makefile                         |    3 
 tip2/drivers/xen/blktap/blktap.c                         |  910 ++++
 tip2/drivers/xen/blktap/common.h                         |  110 
 tip2/drivers/xen/blktap/interface.c                      |  146 
 tip2/drivers/xen/blktap/xenbus.c                         |  233 +
 tip2/drivers/xen/char/Makefile                           |    2 
 tip2/drivers/xen/char/mem.c                              |  192 +
 tip2/drivers/xen/console/Makefile                        |    2 
 tip2/drivers/xen/console/console.c                       |  648 +++
 tip2/drivers/xen/console/xencons_ring.c                  |  151 
 tip2/drivers/xen/core/Makefile                           |   11 
 tip2/drivers/xen/core/evtchn.c                           |  863 ++++
 tip2/drivers/xen/core/features.c                         |   29 
 tip2/drivers/xen/core/gnttab.c                           |  464 ++
 tip2/drivers/xen/core/hypervisor_sysfs.c                 |   57 
 tip2/drivers/xen/core/reboot.c                           |  377 ++
 tip2/drivers/xen/core/skbuff.c                           |  144 
 tip2/drivers/xen/core/smpboot.c                          |  576 +++
 tip2/drivers/xen/core/xen_proc.c                         |   29 
 tip2/drivers/xen/core/xen_sysfs.c                        |  311 +
 tip2/drivers/xen/evtchn/Makefile                         |    2 
 tip2/drivers/xen/evtchn/evtchn.c                         |  464 ++
 tip2/drivers/xen/net_driver_util.c                       |   68 
 tip2/drivers/xen/netback/Makefile                        |    5 
 tip2/drivers/xen/netback/common.h                        |  133 
 tip2/drivers/xen/netback/interface.c                     |  334 +
 tip2/drivers/xen/netback/loopback.c                      |  254 +
 tip2/drivers/xen/netback/netback.c                       |  865 ++++
 tip2/drivers/xen/netback/xenbus.c                        |  366 ++
 tip2/drivers/xen/netfront/Kconfig                        |    6 
 tip2/drivers/xen/netfront/Makefile                       |    4 
 tip2/drivers/xen/netfront/netfront.c                     | 1524 ++++++++
 tip2/drivers/xen/pciback/Makefile                        |   10 
 tip2/drivers/xen/pciback/conf_space.c                    |  345 +
 tip2/drivers/xen/pciback/conf_space.h                    |   97 
 tip2/drivers/xen/pciback/conf_space_header.c             |  267 +
 tip2/drivers/xen/pciback/passthrough.c                   |  157 
 tip2/drivers/xen/pciback/pci_stub.c                      |  695 +++
 tip2/drivers/xen/pciback/pciback.h                       |   78 
 tip2/drivers/xen/pciback/pciback_ops.c                   |   74 
 tip2/drivers/xen/pciback/vpci.c                          |  204 +
 tip2/drivers/xen/pciback/xenbus.c                        |  441 ++
 tip2/drivers/xen/pcifront/Makefile                       |    7 
 tip2/drivers/xen/pcifront/pci.c                          |   46 
 tip2/drivers/xen/pcifront/pci_op.c                       |  272 +
 tip2/drivers/xen/pcifront/pcifront.h                     |   40 
 tip2/drivers/xen/pcifront/xenbus.c                       |  294 +
 tip2/drivers/xen/privcmd/Makefile                        |    2 
 tip2/drivers/xen/privcmd/privcmd.c                       |  303 +
 tip2/drivers/xen/tpmback/Makefile                        |    4 
 tip2/drivers/xen/tpmback/common.h                        |   91 
 tip2/drivers/xen/tpmback/interface.c                     |  194 +
 tip2/drivers/xen/tpmback/tpmback.c                       | 1060 +++++
 tip2/drivers/xen/tpmback/xenbus.c                        |  329 +
 tip2/drivers/xen/tpmfront/Makefile                       |    2 
 tip2/drivers/xen/tpmfront/tpmfront.c                     |  768 ++++
 tip2/drivers/xen/tpmfront/tpmfront.h                     |   40 
 tip2/drivers/xen/util.c                                  |   80 
 tip2/drivers/xen/xenbus/Makefile                         |    8 
 tip2/drivers/xen/xenbus/xenbus_client.c                  |  412 ++
 tip2/drivers/xen/xenbus/xenbus_comms.c                   |  218 +
 tip2/drivers/xen/xenbus/xenbus_comms.h                   |   53 
 tip2/drivers/xen/xenbus/xenbus_dev.c                     |  252 +
 tip2/drivers/xen/xenbus/xenbus_probe.c                   | 1083 +++++
 tip2/drivers/xen/xenbus/xenbus_xs.c                      |  856 ++++
 tip2/fs/Kconfig                                          |    1 
 tip2/include/asm-i386/a.out.h                            |    2 
 tip2/include/asm-i386/apic.h                             |    2 
 tip2/include/asm-i386/elf.h                              |    7 
 tip2/include/asm-i386/fixmap.h                           |   13 
 tip2/include/asm-i386/mach-default/mach_traps.h          |   12 
 tip2/include/asm-i386/mach-xen/asm/agp.h                 |   37 
 tip2/include/asm-i386/mach-xen/asm/desc.h                |  164 
 tip2/include/asm-i386/mach-xen/asm/dma-mapping.h         |  156 
 tip2/include/asm-i386/mach-xen/asm/fixmap.h              |  156 
 tip2/include/asm-i386/mach-xen/asm/floppy.h              |  147 
 tip2/include/asm-i386/mach-xen/asm/highmem.h             |   81 
 tip2/include/asm-i386/mach-xen/asm/hw_irq.h              |   73 
 tip2/include/asm-i386/mach-xen/asm/hypercall.h           |  357 +
 tip2/include/asm-i386/mach-xen/asm/hypervisor.h          |  224 +
 tip2/include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 tip2/include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 tip2/include/asm-i386/mach-xen/asm/mmu.h                 |   21 
 tip2/include/asm-i386/mach-xen/asm/mmu_context.h         |  105 
 tip2/include/asm-i386/mach-xen/asm/page.h                |  326 +
 tip2/include/asm-i386/mach-xen/asm/param.h               |   24 
 tip2/include/asm-i386/mach-xen/asm/pci.h                 |  154 
 tip2/include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 tip2/include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 tip2/include/asm-i386/mach-xen/asm/pgtable-2level.h      |   85 
 tip2/include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 tip2/include/asm-i386/mach-xen/asm/pgtable-3level.h      |  183 +
 tip2/include/asm-i386/mach-xen/asm/pgtable.h             |  520 ++
 tip2/include/asm-i386/mach-xen/asm/processor.h           |  756 ++++
 tip2/include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 tip2/include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 tip2/include/asm-i386/mach-xen/asm/segment.h             |  117 
 tip2/include/asm-i386/mach-xen/asm/setup.h               |   64 
 tip2/include/asm-i386/mach-xen/asm/smp.h                 |  104 
 tip2/include/asm-i386/mach-xen/asm/spinlock.h            |  200 +
 tip2/include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 tip2/include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 
 tip2/include/asm-i386/mach-xen/asm/system.h              |  576 +++
 tip2/include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 tip2/include/asm-i386/mach-xen/asm/vga.h                 |   20 
 tip2/include/asm-i386/mach-xen/irq_vectors.h             |  125 
 tip2/include/asm-i386/mach-xen/mach_traps.h              |   33 
 tip2/include/asm-i386/mach-xen/setup_arch_post.h         |   54 
 tip2/include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 tip2/include/asm-i386/page.h                             |    4 
 tip2/include/asm-i386/pgtable-2level-defs.h              |    2 
 tip2/include/asm-i386/pgtable-3level-defs.h              |    2 
 tip2/include/asm-ia64/fixmap.h                           |    2 
 tip2/include/asm-ia64/gcc_intrin.h                       |   60 
 tip2/include/asm-ia64/hypercall.h                        |  274 +
 tip2/include/asm-ia64/hypervisor.h                       |  138 
 tip2/include/asm-ia64/intel_intrin.h                     |   68 
 tip2/include/asm-ia64/meminit.h                          |    5 
 tip2/include/asm-ia64/pal.h                              |    1 
 tip2/include/asm-ia64/privop.h                           |   59 
 tip2/include/asm-ia64/processor.h                        |    1 
 tip2/include/asm-ia64/synch_bitops.h                     |   61 
 tip2/include/asm-ia64/system.h                           |    4 
 tip2/include/asm-ia64/xen/privop.h                       |  277 +
 tip2/include/asm-um/page.h                               |    2 
 tip2/include/asm-x86_64/apic.h                           |    2 
 tip2/include/asm-x86_64/hw_irq.h                         |    2 
 tip2/include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 tip2/include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 tip2/include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 tip2/include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 +
 tip2/include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 tip2/include/asm-x86_64/mach-xen/asm/fixmap.h            |  114 
 tip2/include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 tip2/include/asm-x86_64/mach-xen/asm/hw_irq.h            |  141 
 tip2/include/asm-x86_64/mach-xen/asm/hypercall.h         |  357 +
 tip2/include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 tip2/include/asm-x86_64/mach-xen/asm/io.h                |  327 +
 tip2/include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 tip2/include/asm-x86_64/mach-xen/asm/mmu.h               |   33 
 tip2/include/asm-x86_64/mach-xen/asm/mmu_context.h       |  134 
 tip2/include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 tip2/include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 tip2/include/asm-x86_64/mach-xen/asm/page.h              |  317 +
 tip2/include/asm-x86_64/mach-xen/asm/param.h             |   23 
 tip2/include/asm-x86_64/mach-xen/asm/pci.h               |  174 
 tip2/include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 tip2/include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 +++
 tip2/include/asm-x86_64/mach-xen/asm/processor.h         |  494 ++
 tip2/include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 tip2/include/asm-x86_64/mach-xen/asm/smp.h               |  153 
 tip2/include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 tip2/include/asm-x86_64/mach-xen/asm/system.h            |  428 ++
 tip2/include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 tip2/include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 tip2/include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 tip2/include/asm-x86_64/mach-xen/asm/xor.h               |  328 +
 tip2/include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 tip2/include/asm-x86_64/mach-xen/mach_time.h             |  111 
 tip2/include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 tip2/include/asm-x86_64/mach-xen/setup_arch_post.h       |   41 
 tip2/include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 tip2/include/linux/gfp.h                                 |    6 
 tip2/include/linux/highmem.h                             |    6 
 tip2/include/linux/mm.h                                  |   13 
 tip2/include/linux/pfn.h                                 |    2 
 tip2/include/linux/skbuff.h                              |   13 
 tip2/include/xen/balloon.h                               |   73 
 tip2/include/xen/driver_util.h                           |   26 
 tip2/include/xen/evtchn.h                                |  126 
 tip2/include/xen/features.h                              |   20 
 tip2/include/xen/foreign_page.h                          |   40 
 tip2/include/xen/gnttab.h                                |  126 
 tip2/include/xen/hypervisor_sysfs.h                      |   32 
 tip2/include/xen/interface/acm.h                         |  181 
 tip2/include/xen/interface/acm_ops.h                     |   98 
 tip2/include/xen/interface/arch-ia64.h                   |  337 +
 tip2/include/xen/interface/arch-x86_32.h                 |  200 +
 tip2/include/xen/interface/arch-x86_64.h                 |  273 +
 tip2/include/xen/interface/callback.h                    |   57 
 tip2/include/xen/interface/dom0_ops.h                    |  531 ++
 tip2/include/xen/interface/event_channel.h               |  211 +
 tip2/include/xen/interface/features.h                    |   53 
 tip2/include/xen/interface/grant_table.h                 |  311 +
 tip2/include/xen/interface/hvm/hvm_info_table.h          |   24 
 tip2/include/xen/interface/hvm/ioreq.h                   |   94 
 tip2/include/xen/interface/hvm/vmx_assist.h              |   97 
 tip2/include/xen/interface/io/blkif.h                    |   85 
 tip2/include/xen/interface/io/console.h                  |   33 
 tip2/include/xen/interface/io/netif.h                    |   84 
 tip2/include/xen/interface/io/pciif.h                    |   55 
 tip2/include/xen/interface/io/ring.h                     |  265 +
 tip2/include/xen/interface/io/tpmif.h                    |   56 
 tip2/include/xen/interface/io/xenbus.h                   |   42 
 tip2/include/xen/interface/io/xs_wire.h                  |   97 
 tip2/include/xen/interface/memory.h                      |  155 
 tip2/include/xen/interface/nmi.h                         |   59 
 tip2/include/xen/interface/physdev.h                     |   71 
 tip2/include/xen/interface/sched.h                       |  100 
 tip2/include/xen/interface/sched_ctl.h                   |   64 
 tip2/include/xen/interface/trace.h                       |   86 
 tip2/include/xen/interface/vcpu.h                        |  119 
 tip2/include/xen/interface/version.h                     |   64 
 tip2/include/xen/interface/xen-compat.h                  |   34 
 tip2/include/xen/interface/xen.h                         |  459 ++
 tip2/include/xen/interface/xenoprof.h                    |   72 
 tip2/include/xen/net_driver_util.h                       |   58 
 tip2/include/xen/pcifront.h                              |   39 
 tip2/include/xen/public/evtchn.h                         |  101 
 tip2/include/xen/public/privcmd.h                        |   94 
 tip2/include/xen/tpmfe.h                                 |   40 
 tip2/include/xen/xen_proc.h                              |   23 
 tip2/include/xen/xenbus.h                                |  306 +
 tip2/include/xen/xencons.h                               |   14 
 tip2/kernel/Kconfig.preempt                              |    1 
 tip2/kernel/irq/manage.c                                 |   24 
 tip2/lib/Kconfig.debug                                   |   31 
 tip2/lib/Makefile                                        |    3 
 tip2/mm/Kconfig                                          |    3 
 tip2/mm/highmem.c                                        |   11 
 tip2/mm/memory.c                                         |  116 
 tip2/mm/mmap.c                                           |    4 
 tip2/mm/page_alloc.c                                     |    6 
 tip2/net/core/dev.c                                      |   50 
 tip2/net/core/skbuff.c                                   |   41 
 tip2/net/ipv4/netfilter/ip_nat_proto_tcp.c               |    6 
 tip2/net/ipv4/netfilter/ip_nat_proto_udp.c               |    9 
 tip2/scripts/Makefile.xen                                |   14 
 387 files changed, 79999 insertions(+), 856 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-xen.patch	14 Apr 2006 22:53:47 -0000	1.9
+++ linux-2.6-xen.patch	17 Apr 2006 20:52:10 -0000	1.10
@@ -172,14 +172,6 @@
  	---help---
  	  Say Y here to experiment with turning CPUs off and on.  CPUs
  	  can be controlled through /sys/devices/system/cpu.
-@@ -760,6 +784,7 @@ config HOTPLUG_CPU
- config DOUBLEFAULT
- 	default y
- 	bool "Enable doublefault exception handler" if EMBEDDED
-+	depends on !X86_NO_TSS
- 	help
-           This option allows trapping of rare doublefault exceptions that
-           would otherwise cause a system to silently reboot. Disabling this
 @@ -770,18 +795,20 @@ endmenu
  
  
@@ -26670,42 +26662,6 @@
 -#include "../../i386/kernel/vsyscall-note.S"
 +#include <vsyscall-note.S>
  
-diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff src/linux-2.6.17-rc1/arch/x86_64/kernel/Makefile tip2/arch/x86_64/kernel/Makefile
---- src/linux-2.6.17-rc1/arch/x86_64/kernel/Makefile	2006-03-20 06:53:29.000000000 +0100
-+++ tip2/arch/x86_64/kernel/Makefile	2006-04-10 15:29:55.000000000 +0200
-@@ -20,11 +20,13 @@ obj-$(CONFIG_MICROCODE)		+= microcode.o
- obj-$(CONFIG_X86_CPUID)		+= cpuid.o
- obj-$(CONFIG_SMP)		+= smp.o smpboot.o trampoline.o
- obj-$(CONFIG_X86_LOCAL_APIC)	+= apic.o  nmi.o
-+obj-$(CONFIG_X86_XEN_GENAPIC)	+= genapic.o genapic_xen.o
- obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o mpparse.o \
- 		genapic.o genapic_cluster.o genapic_flat.o
- obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o crash.o
- obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o
--obj-$(CONFIG_PM)		+= suspend.o
-+obj-$(CONFIG_SOFTWARE_SUSPEND)	+= suspend.o
-+obj-$(CONFIG_ACPI_SLEEP)	+= suspend.o
- obj-$(CONFIG_SOFTWARE_SUSPEND)	+= suspend_asm.o
- obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
- obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
-@@ -51,3 +53,17 @@ i8237-y				+= ../../i386/kernel/i8237.o
- msr-$(subst m,y,$(CONFIG_X86_MSR))  += ../../i386/kernel/msr.o
- dmi_scan-y			+= ../../i386/kernel/dmi_scan.o
- 
-+ifdef CONFIG_XEN
-+time-y				+= ../../i386/kernel/time-xen.o
-+pci-dma-y			+= ../../i386/kernel/pci-dma-xen.o
-+microcode-$(subst m,y,$(CONFIG_MICROCODE))  := ../../i386/kernel/microcode-xen.o
-+quirks-y			:= ../../i386/kernel/quirks-xen.o
-+
-+n-obj-xen := i8259.o reboot.o i8237.o smpboot.o trampoline.o
-+
-+include $(srctree)/scripts/Makefile.xen
-+
-+obj-y := $(call filterxen, $(obj-y), $(n-obj-xen))
-+obj-y := $(call cherrypickxen, $(obj-y))
-+extra-y := $(call cherrypickxen, $(extra-y))
-+endif
 diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff src/linux-2.6.17-rc1/arch/x86_64/kernel/acpi/Makefile tip2/arch/x86_64/kernel/acpi/Makefile
 --- src/linux-2.6.17-rc1/arch/x86_64/kernel/acpi/Makefile	2006-03-20 06:53:29.000000000 +0100
 +++ tip2/arch/x86_64/kernel/acpi/Makefile	2006-04-10 15:29:55.000000000 +0200
@@ -40839,21 +40795,6 @@
  	default y
  	help
  	  The Power Management Timer is available on all ACPI-capable,
-diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff src/linux-2.6.17-rc1/drivers/base/bus.c tip2/drivers/base/bus.c
---- src/linux-2.6.17-rc1/drivers/base/bus.c	2006-04-12 22:59:34.000000000 +0200
-+++ tip2/drivers/base/bus.c	2006-04-10 15:29:58.000000000 +0200
-@@ -188,6 +188,11 @@ static ssize_t driver_bind(struct device
- 		up(&dev->sem);
- 		if (dev->parent)
- 			up(&dev->parent->sem);
-+
-+		if (err > 0) 		/* success */
-+			err = count;
-+		else if (err == 0)	/* driver didn't accept device */
-+			err = -ENODEV;
- 	}
- 	put_device(dev);
- 	put_bus(bus);
 diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff src/linux-2.6.17-rc1/drivers/char/mem.c tip2/drivers/char/mem.c
 --- src/linux-2.6.17-rc1/drivers/char/mem.c	2006-04-12 22:59:35.000000000 +0200
 +++ tip2/drivers/char/mem.c	2006-04-10 15:30:01.000000000 +0200
@@ -83496,16 +83437,6 @@
  	if (irq >= NR_IRQS)
  		return;
  
-diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff src/linux-2.6.17-rc1/kernel/irq/migration.c tip2/kernel/irq/migration.c
---- src/linux-2.6.17-rc1/kernel/irq/migration.c	2006-04-12 22:59:44.000000000 +0200
-+++ tip2/kernel/irq/migration.c	2006-04-10 20:50:53.000000000 +0200
-@@ -1,3 +1,6 @@
-+
-+
-+
- #include <linux/irq.h>
- 
- #if defined(CONFIG_GENERIC_PENDING_IRQ)
 diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff src/linux-2.6.17-rc1/lib/Kconfig.debug tip2/lib/Kconfig.debug
 --- src/linux-2.6.17-rc1/lib/Kconfig.debug	2006-04-12 22:59:44.000000000 +0200
 +++ tip2/lib/Kconfig.debug	2006-04-10 15:30:55.000000000 +0200
@@ -84165,3 +84096,51 @@
  AFLAGS_syscall32_syscall.o += -m64
  AFLAGS_ia32entry.o += -m64
  
+diff -uNp linux-2.6.16.noarch/arch/x86_64/kernel/Makefile.orig linux-2.6.16.noarch/arch/x86_64/kernel/Makefile
+--- linux-2.6.16.noarch/arch/x86_64/kernel/Makefile.orig	2006-04-17 22:41:11.000000000 +0200
++++ linux-2.6.16.noarch/arch/x86_64/kernel/Makefile	2006-04-17 22:35:26.000000000 +0200
+@@ -20,11 +20,13 @@ obj-$(CONFIG_MICROCODE)		+= microcode.o
+ obj-$(CONFIG_X86_CPUID)		+= cpuid.o
+ obj-$(CONFIG_SMP)		+= smp.o smpboot.o trampoline.o
+ obj-$(CONFIG_X86_LOCAL_APIC)	+= apic.o  nmi.o
++obj-$(CONFIG_X86_XEN_GENAPIC)	+= genapic.o genapic_xen.o
+ obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o mpparse.o \
+ 		genapic.o genapic_cluster.o genapic_flat.o
+ obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o crash.o
+ obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o
+-obj-$(CONFIG_PM)		+= suspend.o
++obj-$(CONFIG_SOFTWARE_SUSPEND)	+= suspend.o
++obj-$(CONFIG_ACPI_SLEEP)	+= suspend.o
+ obj-$(CONFIG_SOFTWARE_SUSPEND)	+= suspend_asm.o
+ obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
+ obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
+@@ -49,3 +51,18 @@ intel_cacheinfo-y		+= ../../i386/kernel/
+ quirks-y			+= ../../i386/kernel/quirks.o
+ i8237-y				+= ../../i386/kernel/i8237.o
+ msr-$(subst m,y,$(CONFIG_X86_MSR))  += ../../i386/kernel/msr.o
++
++ifdef CONFIG_XEN
++time-y				+= ../../i386/kernel/time-xen.o
++pci-dma-y			+= ../../i386/kernel/pci-dma-xen.o
++microcode-$(subst m,y,$(CONFIG_MICROCODE))  := ../../i386/kernel/microcode-xen.o
++quirks-y			:= ../../i386/kernel/quirks-xen.o
++
++n-obj-xen := i8259.o reboot.o i8237.o smpboot.o trampoline.o
++
++include $(srctree)/scripts/Makefile.xen
++
++obj-y := $(call filterxen, $(obj-y), $(n-obj-xen))
++obj-y := $(call cherrypickxen, $(obj-y))
++extra-y := $(call cherrypickxen, $(extra-y))
++endif
+diff -uNp linux-2.6.16.noarch/init/Kconfig.orig linux-2.6.16.noarch/init/Kconfig
+--- linux-2.6.16.noarch/init/Kconfig.orig	2006-04-17 22:33:15.000000000 +0200
++++ linux-2.6.16.noarch/init/Kconfig	2006-04-17 22:33:54.000000000 +0200
+@@ -377,6 +377,7 @@ config SLAB
+ config DOUBLEFAULT
+ 	default y
+ 	bool "Enable doublefault exception handler" if EMBEDDED && X86_32
++	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



From fedora-cvs-commits at redhat.com  Mon Apr 17 21:57:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 17:57:24 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2091, 1.2092 linux-2.6-xen.patch,
	1.6, 1.7
Message-ID: <200604172157.k3HLvOPS003535@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-xen.patch 
Log Message:
- Disable the SMP alternatives patch for now.
- Revive Xen.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2091
retrieving revision 1.2092
diff -u -r1.2091 -r1.2092
--- kernel-2.6.spec	17 Apr 2006 21:41:09 -0000	1.2091
+++ kernel-2.6.spec	17 Apr 2006 21:57:06 -0000	1.2092
@@ -6,7 +6,7 @@
 %define buildup 1
 %define buildsmp 1
 # Whether to apply the Xen patches, leave this enabled.
-%define includexen 0
+%define includexen 1
 # Whether to build the Xen kernels, disable if you want.
 %define buildxen 1
 %define buildxenPAE 0
@@ -764,7 +764,7 @@
 # Fix broken x86-64 32bit vDSO
 %patch208 -p1
 # SMP alternatives
-%patch209 -p1
+#%patch209 -p1
 
 #
 # ppc64
@@ -1689,6 +1689,8 @@
 %changelog
 * Mon Apr 17 2006 Dave Jones <davej at redhat.com>
 - 2.6.16.6
+- Disable the SMP alternatives patch for now.
+- Revive Xen.
 
 * Mon Apr 17 2006 David Woodhouse <dwmw2 at redhat.com>
 - Add include/{mtd,rdma,keys} directories to kernel-devel package

linux-2.6-xen.patch:
 linux-2.6.16-rc5-xen0/arch/i386/Kconfig                                   |   98 
 linux-2.6.16-rc5-xen0/arch/i386/Kconfig.cpu                               |    2 
 linux-2.6.16-rc5-xen0/arch/i386/Makefile                                  |   18 
 linux-2.6.16-rc5-xen0/arch/i386/boot-xen/Makefile                         |   21 
 linux-2.6.16-rc5-xen0/arch/i386/kernel/Makefile                           |   33 
 linux-2.6.16-rc5-xen0/arch/i386/kernel/acpi/Makefile                      |    4 
 linux-2.6.16-rc5-xen0/arch/i386/kernel/acpi/boot-xen.c                    | 1161 ++++
 linux-2.6.16-rc5-xen0/arch/i386/kernel/apic-xen.c                         |  140 
 linux-2.6.16-rc5-xen0/arch/i386/kernel/asm-offsets.c                      |    5 
 linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/Makefile                       |    5 
 linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/common-xen.c                   |  719 ++
 linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/mtrr/main-xen.c                |  187 
 linux-2.6.16-rc5-xen0/arch/i386/kernel/early_printk-xen.c                 |    2 
 linux-2.6.16-rc5-xen0/arch/i386/kernel/entry-xen.S                        |  857 +++
 linux-2.6.16-rc5-xen0/arch/i386/kernel/fixup.c                            |   95 
 linux-2.6.16-rc5-xen0/arch/i386/kernel/head-xen.S                         |  173 
 linux-2.6.16-rc5-xen0/arch/i386/kernel/init_task-xen.c                    |   51 
 linux-2.6.16-rc5-xen0/arch/i386/kernel/io_apic-xen.c                      | 2730 ++++++++++
 linux-2.6.16-rc5-xen0/arch/i386/kernel/ioport-xen.c                       |  122 
 linux-2.6.16-rc5-xen0/arch/i386/kernel/irq-xen.c                          |  306 +
 linux-2.6.16-rc5-xen0/arch/i386/kernel/ldt-xen.c                          |  269 
 linux-2.6.16-rc5-xen0/arch/i386/kernel/microcode-xen.c                    |  164 
 linux-2.6.16-rc5-xen0/arch/i386/kernel/mpparse-xen.c                      | 1188 ++++
 linux-2.6.16-rc5-xen0/arch/i386/kernel/pci-dma-xen.c                      |  344 +
 linux-2.6.16-rc5-xen0/arch/i386/kernel/process-xen.c                      |  833 +++
 linux-2.6.16-rc5-xen0/arch/i386/kernel/quirks-xen.c                       |   48 
 linux-2.6.16-rc5-xen0/arch/i386/kernel/setup-xen.c                        | 1888 ++++++
 linux-2.6.16-rc5-xen0/arch/i386/kernel/smp-xen.c                          |  617 ++
 linux-2.6.16-rc5-xen0/arch/i386/kernel/swiotlb.c                          |  674 ++
 linux-2.6.16-rc5-xen0/arch/i386/kernel/sysenter.c                         |   90 
 linux-2.6.16-rc5-xen0/arch/i386/kernel/time-xen.c                         | 1067 +++
 linux-2.6.16-rc5-xen0/arch/i386/kernel/traps-xen.c                        | 1094 ++++
 linux-2.6.16-rc5-xen0/arch/i386/kernel/vm86.c                             |    8 
 linux-2.6.16-rc5-xen0/arch/i386/kernel/vmlinux.lds.S                      |    4 
 linux-2.6.16-rc5-xen0/arch/i386/kernel/vsyscall-note-xen.S                |   32 
 linux-2.6.16-rc5-xen0/arch/i386/kernel/vsyscall.S                         |    2 
 linux-2.6.16-rc5-xen0/arch/i386/mach-xen/Makefile                         |    5 
 linux-2.6.16-rc5-xen0/arch/i386/mach-xen/setup.c                          |   37 
 linux-2.6.16-rc5-xen0/arch/i386/mm/Makefile                               |    8 
 linux-2.6.16-rc5-xen0/arch/i386/mm/fault-xen.c                            |  617 ++
 linux-2.6.16-rc5-xen0/arch/i386/mm/highmem-xen.c                          |  123 
 linux-2.6.16-rc5-xen0/arch/i386/mm/hypervisor.c                           |  471 +
 linux-2.6.16-rc5-xen0/arch/i386/mm/init-xen.c                             |  846 +++
 linux-2.6.16-rc5-xen0/arch/i386/mm/ioremap-xen.c                          |  462 +
 linux-2.6.16-rc5-xen0/arch/i386/mm/pgtable-xen.c                          |  646 ++
 linux-2.6.16-rc5-xen0/arch/i386/mm/pgtable.c                              |   62 
 linux-2.6.16-rc5-xen0/arch/i386/pci/Makefile                              |    9 
 linux-2.6.16-rc5-xen0/arch/i386/pci/irq-xen.c                             | 1202 ++++
 linux-2.6.16-rc5-xen0/arch/i386/pci/pcifront.c                            |   55 
 linux-2.6.16-rc5-xen0/arch/i386/power/Makefile                            |    4 
 linux-2.6.16-rc5-xen0/arch/ia64/Kconfig                                   |   43 
 linux-2.6.16-rc5-xen0/arch/ia64/Makefile                                  |   10 
 linux-2.6.16-rc5-xen0/arch/ia64/hp/sim/Makefile                           |    2 
 linux-2.6.16-rc5-xen0/arch/ia64/kernel/entry.S                            |   32 
 linux-2.6.16-rc5-xen0/arch/ia64/kernel/head.S                             |    4 
 linux-2.6.16-rc5-xen0/arch/ia64/kernel/pal.S                              |    5 
 linux-2.6.16-rc5-xen0/arch/ia64/kernel/sal.c                              |    3 
 linux-2.6.16-rc5-xen0/arch/ia64/kernel/setup.c                            |    4 
 linux-2.6.16-rc5-xen0/arch/ia64/xen-mkbuildtree-post                      |    2 
 linux-2.6.16-rc5-xen0/arch/ia64/xen-mkbuildtree-pre                       |   50 
 linux-2.6.16-rc5-xen0/arch/ia64/xen/Makefile                              |    5 
 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/Makefile                      |   20 
 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/README                        |    2 
 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/coreMakefile                  |   24 
 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/evtchn_ia64.c                 |  266 
 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/patches/blkback.c.patch       |   33 
 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/patches/console.c.patch       |   11 
 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/patches/devmem.c.patch        |    2 
 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/patches/gnttab.c.patch        |   33 
 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/patches/privcmd.c.patch       |   30 
 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/xenia64_init.c                |   55 
 linux-2.6.16-rc5-xen0/arch/ia64/xen/hypercall.S                           |  323 +
 linux-2.6.16-rc5-xen0/arch/ia64/xen/xen_ksyms.c                           |   12 
 linux-2.6.16-rc5-xen0/arch/ia64/xen/xenconsole.c                          |   19 
 linux-2.6.16-rc5-xen0/arch/ia64/xen/xenentry.S                            |  850 +++
 linux-2.6.16-rc5-xen0/arch/ia64/xen/xenhpski.c                            |   19 
 linux-2.6.16-rc5-xen0/arch/ia64/xen/xenivt.S                              | 2044 +++++++
 linux-2.6.16-rc5-xen0/arch/ia64/xen/xenminstate.h                         |  367 +
 linux-2.6.16-rc5-xen0/arch/ia64/xen/xenpal.S                              |   73 
 linux-2.6.16-rc5-xen0/arch/ia64/xen/xensetup.S                            |   33 
 linux-2.6.16-rc5-xen0/arch/um/kernel/physmem.c                            |    4 
 linux-2.6.16-rc5-xen0/arch/x86_64/Kconfig                                 |   60 
 linux-2.6.16-rc5-xen0/arch/x86_64/Makefile                                |   16 
 linux-2.6.16-rc5-xen0/arch/x86_64/ia32/ia32entry-xen.S                    |  721 ++
 linux-2.6.16-rc5-xen0/arch/x86_64/ia32/syscall32-xen.c                    |  128 
 linux-2.6.16-rc5-xen0/arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 linux-2.6.16-rc5-xen0/arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 linux-2.6.16-rc5-xen0/arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/Makefile                         |   18 
 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/acpi/Makefile                    |    1 
 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/apic-xen.c                       |  200 
 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/asm-offsets.c                    |    2 
 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/e820-xen.c                       |  744 ++
 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/early_printk-xen.c               |  306 +
 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/entry-xen.S                      | 1140 ++++
 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/genapic-xen.c                    |  144 
 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/genapic_xen.c                    |  162 
 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/head-xen.S                       |  156 
 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/head64-xen.c                     |  140 
 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/init_task.c                      |    3 
 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/io_apic-xen.c                    | 2231 ++++++++
 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/ioport-xen.c                     |   58 
 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/irq-xen.c                        |  168 
 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/ldt-xen.c                        |  282 +
 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/mpparse-xen.c                    | 1005 +++
 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/process-xen.c                    |  810 ++
 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/setup-xen.c                      | 1635 +++++
 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/setup64-xen.c                    |  360 +
 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/smp-xen.c                        |  596 ++
 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/traps-xen.c                      | 1023 +++
 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/vsyscall-xen.c                   |  239 
 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/x8664_ksyms-xen.c                |  172 
 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/xen_entry.S                      |   41 
 linux-2.6.16-rc5-xen0/arch/x86_64/mm/Makefile                             |   10 
 linux-2.6.16-rc5-xen0/arch/x86_64/mm/fault-xen.c                          |  595 ++
 linux-2.6.16-rc5-xen0/arch/x86_64/mm/init-xen.c                           | 1107 ++++
 linux-2.6.16-rc5-xen0/arch/x86_64/mm/pageattr-xen.c                       |  392 +
 linux-2.6.16-rc5-xen0/arch/x86_64/pci/Makefile                            |   12 
 linux-2.6.16-rc5-xen0/drivers/Makefile                                    |    1 
 linux-2.6.16-rc5-xen0/drivers/acpi/Kconfig                                |    3 
 linux-2.6.16-rc5-xen0/drivers/acpi/tables.c                               |    7 
 linux-2.6.16-rc5-xen0/drivers/char/mem.c                                  |    6 
 linux-2.6.16-rc5-xen0/drivers/char/tpm/Kconfig                            |   14 
 linux-2.6.16-rc5-xen0/drivers/char/tpm/Makefile                           |    1 
 linux-2.6.16-rc5-xen0/drivers/char/tpm/tpm.c                              |   44 
 linux-2.6.16-rc5-xen0/drivers/char/tpm/tpm.h                              |    7 
 linux-2.6.16-rc5-xen0/drivers/char/tpm/tpm_xen.c                          |  536 +
 linux-2.6.16-rc5-xen0/drivers/char/tty_io.c                               |    7 
 linux-2.6.16-rc5-xen0/drivers/firmware/Kconfig                            |    2 
 linux-2.6.16-rc5-xen0/drivers/pci/Kconfig                                 |    1 
 linux-2.6.16-rc5-xen0/drivers/serial/Kconfig                              |    1 
 linux-2.6.16-rc5-xen0/drivers/video/Kconfig                               |    2 
 linux-2.6.16-rc5-xen0/drivers/xen/Kconfig                                 |  200 
 linux-2.6.16-rc5-xen0/drivers/xen/Makefile                                |   22 
 linux-2.6.16-rc5-xen0/drivers/xen/balloon/Makefile                        |    2 
 linux-2.6.16-rc5-xen0/drivers/xen/balloon/balloon.c                       |  585 ++
 linux-2.6.16-rc5-xen0/drivers/xen/blkback/Makefile                        |    3 
 linux-2.6.16-rc5-xen0/drivers/xen/blkback/blkback.c                       |  596 ++
 linux-2.6.16-rc5-xen0/drivers/xen/blkback/common.h                        |  123 
 linux-2.6.16-rc5-xen0/drivers/xen/blkback/interface.c                     |  164 
 linux-2.6.16-rc5-xen0/drivers/xen/blkback/vbd.c                           |  102 
 linux-2.6.16-rc5-xen0/drivers/xen/blkback/xenbus.c                        |  421 +
 linux-2.6.16-rc5-xen0/drivers/xen/blkfront/Makefile                       |    5 
 linux-2.6.16-rc5-xen0/drivers/xen/blkfront/blkfront.c                     |  834 +++
 linux-2.6.16-rc5-xen0/drivers/xen/blkfront/block.h                        |  162 
 linux-2.6.16-rc5-xen0/drivers/xen/blkfront/vbd.c                          |  323 +
 linux-2.6.16-rc5-xen0/drivers/xen/blktap/Makefile                         |    3 
 linux-2.6.16-rc5-xen0/drivers/xen/blktap/blktap.c                         |  910 +++
 linux-2.6.16-rc5-xen0/drivers/xen/blktap/common.h                         |  110 
 linux-2.6.16-rc5-xen0/drivers/xen/blktap/interface.c                      |  146 
 linux-2.6.16-rc5-xen0/drivers/xen/blktap/xenbus.c                         |  234 
 linux-2.6.16-rc5-xen0/drivers/xen/char/Makefile                           |    2 
 linux-2.6.16-rc5-xen0/drivers/xen/char/mem.c                              |  156 
 linux-2.6.16-rc5-xen0/drivers/xen/console/Makefile                        |    2 
 linux-2.6.16-rc5-xen0/drivers/xen/console/console.c                       |  647 ++
 linux-2.6.16-rc5-xen0/drivers/xen/console/xencons_ring.c                  |  125 
 linux-2.6.16-rc5-xen0/drivers/xen/core/Makefile                           |    9 
 linux-2.6.16-rc5-xen0/drivers/xen/core/evtchn.c                           |  823 +++
 linux-2.6.16-rc5-xen0/drivers/xen/core/features.c                         |   29 
 linux-2.6.16-rc5-xen0/drivers/xen/core/gnttab.c                           |  429 +
 linux-2.6.16-rc5-xen0/drivers/xen/core/reboot.c                           |  442 +
 linux-2.6.16-rc5-xen0/drivers/xen/core/skbuff.c                           |  144 
 linux-2.6.16-rc5-xen0/drivers/xen/core/smpboot.c                          |  464 +
 linux-2.6.16-rc5-xen0/drivers/xen/core/xen_proc.c                         |   29 
 linux-2.6.16-rc5-xen0/drivers/xen/evtchn/Makefile                         |    2 
 linux-2.6.16-rc5-xen0/drivers/xen/evtchn/evtchn.c                         |  459 +
 linux-2.6.16-rc5-xen0/drivers/xen/net_driver_util.c                       |   68 
 linux-2.6.16-rc5-xen0/drivers/xen/netback/Makefile                        |    5 
 linux-2.6.16-rc5-xen0/drivers/xen/netback/common.h                        |  110 
 linux-2.6.16-rc5-xen0/drivers/xen/netback/interface.c                     |  320 +
 linux-2.6.16-rc5-xen0/drivers/xen/netback/loopback.c                      |  231 
 linux-2.6.16-rc5-xen0/drivers/xen/netback/netback.c                       |  835 +++
 linux-2.6.16-rc5-xen0/drivers/xen/netback/xenbus.c                        |  327 +
 linux-2.6.16-rc5-xen0/drivers/xen/netfront/Makefile                       |    4 
 linux-2.6.16-rc5-xen0/drivers/xen/netfront/netfront.c                     | 1504 +++++
 linux-2.6.16-rc5-xen0/drivers/xen/pciback/Makefile                        |   10 
 linux-2.6.16-rc5-xen0/drivers/xen/pciback/conf_space.c                    |  324 +
 linux-2.6.16-rc5-xen0/drivers/xen/pciback/conf_space.h                    |   97 
 linux-2.6.16-rc5-xen0/drivers/xen/pciback/conf_space_header.c             |  269 
 linux-2.6.16-rc5-xen0/drivers/xen/pciback/passthrough.c                   |  116 
 linux-2.6.16-rc5-xen0/drivers/xen/pciback/pci_stub.c                      |  377 +
 linux-2.6.16-rc5-xen0/drivers/xen/pciback/pciback.h                       |   73 
 linux-2.6.16-rc5-xen0/drivers/xen/pciback/pciback_ops.c                   |   84 
 linux-2.6.16-rc5-xen0/drivers/xen/pciback/vpci.c                          |  163 
 linux-2.6.16-rc5-xen0/drivers/xen/pciback/xenbus.c                        |  439 +
 linux-2.6.16-rc5-xen0/drivers/xen/pcifront/Makefile                       |    7 
 linux-2.6.16-rc5-xen0/drivers/xen/pcifront/pci.c                          |   44 
 linux-2.6.16-rc5-xen0/drivers/xen/pcifront/pci_op.c                       |  245 
 linux-2.6.16-rc5-xen0/drivers/xen/pcifront/pcifront.h                     |   40 
 linux-2.6.16-rc5-xen0/drivers/xen/pcifront/xenbus.c                       |  295 +
 linux-2.6.16-rc5-xen0/drivers/xen/privcmd/Makefile                        |    2 
 linux-2.6.16-rc5-xen0/drivers/xen/privcmd/privcmd.c                       |  302 +
 linux-2.6.16-rc5-xen0/drivers/xen/tpmback/Makefile                        |    4 
 linux-2.6.16-rc5-xen0/drivers/xen/tpmback/common.h                        |   91 
 linux-2.6.16-rc5-xen0/drivers/xen/tpmback/interface.c                     |  203 
 linux-2.6.16-rc5-xen0/drivers/xen/tpmback/tpmback.c                       | 1118 ++++
 linux-2.6.16-rc5-xen0/drivers/xen/tpmback/xenbus.c                        |  333 +
 linux-2.6.16-rc5-xen0/drivers/xen/tpmfront/Makefile                       |    2 
 linux-2.6.16-rc5-xen0/drivers/xen/tpmfront/tpmfront.c                     |  729 ++
 linux-2.6.16-rc5-xen0/drivers/xen/tpmfront/tpmfront.h                     |   40 
 linux-2.6.16-rc5-xen0/drivers/xen/util.c                                  |   80 
 linux-2.6.16-rc5-xen0/drivers/xen/xenbus/Makefile                         |    8 
 linux-2.6.16-rc5-xen0/drivers/xen/xenbus/xenbus_client.c                  |  403 +
 linux-2.6.16-rc5-xen0/drivers/xen/xenbus/xenbus_comms.c                   |  203 
 linux-2.6.16-rc5-xen0/drivers/xen/xenbus/xenbus_comms.h                   |   50 
 linux-2.6.16-rc5-xen0/drivers/xen/xenbus/xenbus_dev.c                     |  238 
 linux-2.6.16-rc5-xen0/drivers/xen/xenbus/xenbus_probe.c                   | 1015 +++
 linux-2.6.16-rc5-xen0/drivers/xen/xenbus/xenbus_xs.c                      |  821 +++
 linux-2.6.16-rc5-xen0/fs/Kconfig                                          |    1 
 linux-2.6.16-rc5-xen0/include/asm-i386/a.out.h                            |    2 
 linux-2.6.16-rc5-xen0/include/asm-i386/apic.h                             |    2 
 linux-2.6.16-rc5-xen0/include/asm-i386/elf.h                              |    7 
 linux-2.6.16-rc5-xen0/include/asm-i386/fixmap.h                           |   13 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/agp.h                 |   37 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/desc.h                |  164 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/dma-mapping.h         |  156 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/fixmap.h              |  158 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/floppy.h              |  147 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/highmem.h             |   81 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/hw_irq.h              |   73 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/hypercall.h           |  323 +
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/hypervisor.h          |  163 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/io.h                  |  401 +
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/mmu.h                 |   21 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/mmu_context.h         |  105 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/page.h                |  326 +
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/param.h               |   24 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pci.h                 |  154 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pgtable-2level.h      |   83 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pgtable-3level.h      |  181 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pgtable.h             |  512 +
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/processor.h           |  762 ++
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/segment.h             |  117 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/setup.h               |   66 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/smp.h                 |  103 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/spinlock.h            |  217 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/system.h              |  679 ++
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/vga.h                 |   20 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/irq_vectors.h             |  125 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/mach_traps.h              |   33 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/setup_arch_post.h         |   50 
 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 linux-2.6.16-rc5-xen0/include/asm-i386/page.h                             |    4 
 linux-2.6.16-rc5-xen0/include/asm-i386/spinlock.h                         |    6 
 linux-2.6.16-rc5-xen0/include/asm-i386/system.h                           |    2 
 linux-2.6.16-rc5-xen0/include/asm-ia64/fixmap.h                           |    2 
 linux-2.6.16-rc5-xen0/include/asm-ia64/gcc_intrin.h                       |   60 
 linux-2.6.16-rc5-xen0/include/asm-ia64/hypercall.h                        |  500 +
 linux-2.6.16-rc5-xen0/include/asm-ia64/hypervisor.h                       |   70 
 linux-2.6.16-rc5-xen0/include/asm-ia64/intel_intrin.h                     |   68 
 linux-2.6.16-rc5-xen0/include/asm-ia64/pal.h                              |    1 
 linux-2.6.16-rc5-xen0/include/asm-ia64/privop.h                           |   59 
 linux-2.6.16-rc5-xen0/include/asm-ia64/processor.h                        |    1 
 linux-2.6.16-rc5-xen0/include/asm-ia64/synch_bitops.h                     |   61 
 linux-2.6.16-rc5-xen0/include/asm-ia64/system.h                           |    4 
 linux-2.6.16-rc5-xen0/include/asm-ia64/xen/privop.h                       |  272 
 linux-2.6.16-rc5-xen0/include/asm-um/page.h                               |    2 
 linux-2.6.16-rc5-xen0/include/asm-x86_64/apic.h                           |    2 
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/desc.h              |  263 
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/fixmap.h            |  111 
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/floppy.h            |  206 
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/hw_irq.h            |  141 
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/hypercall.h         |  323 +
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/io.h                |  359 +
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/mmu.h               |   33 
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/mmu_context.h       |  134 
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/page.h              |  317 +
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/pci.h               |  174 
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/pgalloc.h           |  199 
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/processor.h         |  503 +
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/smp.h               |  152 
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/system.h            |  434 +
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/xor.h               |  328 +
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/mach_time.h             |  122 
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/setup_arch_post.h       |   52 
 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 linux-2.6.16-rc5-xen0/include/linux/gfp.h                                 |    6 
 linux-2.6.16-rc5-xen0/include/linux/highmem.h                             |    6 
 linux-2.6.16-rc5-xen0/include/linux/irq.h                                 |    3 
 linux-2.6.16-rc5-xen0/include/linux/mm.h                                  |   13 
 linux-2.6.16-rc5-xen0/include/linux/skbuff.h                              |   13 
 linux-2.6.16-rc5-xen0/include/xen/balloon.h                               |   70 
 linux-2.6.16-rc5-xen0/include/xen/driver_util.h                           |   26 
 linux-2.6.16-rc5-xen0/include/xen/evtchn.h                                |  123 
 linux-2.6.16-rc5-xen0/include/xen/features.h                              |   20 
 linux-2.6.16-rc5-xen0/include/xen/foreign_page.h                          |   40 
 linux-2.6.16-rc5-xen0/include/xen/gnttab.h                                |  120 
 linux-2.6.16-rc5-xen0/include/xen/interface/COPYING                       |   28 
 linux-2.6.16-rc5-xen0/include/xen/interface/acm.h                         |  181 
 linux-2.6.16-rc5-xen0/include/xen/interface/acm_ops.h                     |   96 
 linux-2.6.16-rc5-xen0/include/xen/interface/arch-ia64.h                   |  314 +
 linux-2.6.16-rc5-xen0/include/xen/interface/arch-x86_32.h                 |  158 
 linux-2.6.16-rc5-xen0/include/xen/interface/arch-x86_64.h                 |  243 
 linux-2.6.16-rc5-xen0/include/xen/interface/dom0_ops.h                    |  488 +
 linux-2.6.16-rc5-xen0/include/xen/interface/event_channel.h               |  203 
 linux-2.6.16-rc5-xen0/include/xen/interface/features.h                    |   53 
 linux-2.6.16-rc5-xen0/include/xen/interface/grant_table.h                 |  306 +
 linux-2.6.16-rc5-xen0/include/xen/interface/hvm/hvm_info_table.h          |   24 
 linux-2.6.16-rc5-xen0/include/xen/interface/hvm/ioreq.h                   |   93 
 linux-2.6.16-rc5-xen0/include/xen/interface/hvm/vmx_assist.h              |   97 
 linux-2.6.16-rc5-xen0/include/xen/interface/io/blkif.h                    |   85 
 linux-2.6.16-rc5-xen0/include/xen/interface/io/console.h                  |   33 
 linux-2.6.16-rc5-xen0/include/xen/interface/io/netif.h                    |   76 
 linux-2.6.16-rc5-xen0/include/xen/interface/io/pciif.h                    |   55 
 linux-2.6.16-rc5-xen0/include/xen/interface/io/ring.h                     |  270 
 linux-2.6.16-rc5-xen0/include/xen/interface/io/tpmif.h                    |   56 
 linux-2.6.16-rc5-xen0/include/xen/interface/io/xenbus.h                   |   44 
 linux-2.6.16-rc5-xen0/include/xen/interface/io/xs_wire.h                  |   97 
 linux-2.6.16-rc5-xen0/include/xen/interface/memory.h                      |  153 
 linux-2.6.16-rc5-xen0/include/xen/interface/nmi.h                         |   54 
 linux-2.6.16-rc5-xen0/include/xen/interface/physdev.h                     |   70 
 linux-2.6.16-rc5-xen0/include/xen/interface/sched.h                       |   60 
 linux-2.6.16-rc5-xen0/include/xen/interface/sched_ctl.h                   |   68 
 linux-2.6.16-rc5-xen0/include/xen/interface/trace.h                       |   90 
 linux-2.6.16-rc5-xen0/include/xen/interface/vcpu.h                        |  119 
 linux-2.6.16-rc5-xen0/include/xen/interface/version.h                     |   64 
 linux-2.6.16-rc5-xen0/include/xen/interface/xen.h                         |  463 +
 linux-2.6.16-rc5-xen0/include/xen/net_driver_util.h                       |   56 
 linux-2.6.16-rc5-xen0/include/xen/pcifront.h                              |   39 
 linux-2.6.16-rc5-xen0/include/xen/public/evtchn.h                         |   98 
 linux-2.6.16-rc5-xen0/include/xen/public/privcmd.h                        |   91 
 linux-2.6.16-rc5-xen0/include/xen/public/xenstored.h                      |   89 
 linux-2.6.16-rc5-xen0/include/xen/tpmfe.h                                 |   40 
 linux-2.6.16-rc5-xen0/include/xen/xen_proc.h                              |   23 
 linux-2.6.16-rc5-xen0/include/xen/xenbus.h                                |  298 +
 linux-2.6.16-rc5-xen0/include/xen/xencons.h                               |   14 
 linux-2.6.16-rc5-xen0/kernel/Kconfig.preempt                              |    1 
 linux-2.6.16-rc5-xen0/kernel/irq/manage.c                                 |   84 
 linux-2.6.16-rc5-xen0/lib/Kconfig.debug                                   |    2 
 linux-2.6.16-rc5-xen0/lib/Makefile                                        |    3 
 linux-2.6.16-rc5-xen0/mm/Kconfig                                          |    3 
 linux-2.6.16-rc5-xen0/mm/highmem.c                                        |   11 
 linux-2.6.16-rc5-xen0/mm/memory.c                                         |  112 
 linux-2.6.16-rc5-xen0/mm/mmap.c                                           |    4 
 linux-2.6.16-rc5-xen0/mm/page_alloc.c                                     |    6 
 linux-2.6.16-rc5-xen0/net/core/dev.c                                      |   50 
 linux-2.6.16-rc5-xen0/net/core/skbuff.c                                   |   41 
 linux-2.6.16-rc5-xen0/scripts/Makefile.xen                                |   14 
 linux-2.6.16.noarch/arch/x86_64/ia32/Makefile                             |   21 
 364 files changed, 77454 insertions(+), 245 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-xen.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-xen.patch	27 Mar 2006 22:10:39 -0000	1.6
+++ linux-2.6-xen.patch	17 Apr 2006 21:57:06 -0000	1.7
@@ -18174,14 +18174,6 @@
 diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/mm/pgtable.c linux-2.6.16-rc5-xen0/arch/i386/mm/pgtable.c
 --- ref-linux-2.6.16-rc5/arch/i386/mm/pgtable.c	2006-03-01 11:12:36.000000000 -0500
 +++ linux-2.6.16-rc5-xen0/arch/i386/mm/pgtable.c	2006-03-01 11:09:37.000000000 -0500
-@@ -13,6 +13,7 @@
- #include <linux/slab.h>
- #include <linux/pagemap.h>
- #include <linux/spinlock.h>
-+#include <linux/module.h>
- 
- #include <asm/system.h>
- #include <asm/pgtable.h>
 @@ -138,6 +139,10 @@ void set_pmd_pfn(unsigned long vaddr, un
  	__flush_tlb_one(vaddr);
  }



From fedora-cvs-commits at redhat.com  Mon Apr 17 22:04:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 18:04:32 -0400
Subject: rpms/kernel/FC-4 patch-2.6.16.6.bz2.sign, NONE, 1.1 .cvsignore,
	1.179, 1.180 kernel-2.6.spec, 1.1621, 1.1622 sources, 1.163,
	1.164 upstream, 1.104, 1.105 patch-2.6.16.5.bz2.sign, 1.1, NONE
Message-ID: <200604172204.k3HM4WLq003734@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16.6.bz2.sign 
Removed Files:
	patch-2.6.16.5.bz2.sign 
Log Message:
.6



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

iD8DBQBEQ/7IyGugalF9Dw4RAko6AJ9dHuLejhX1Il9EtaN0ZmZCh06vcACaA0sU
5aHYloRthzLAv++ntcijihg=
=mXcO
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/.cvsignore,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- .cvsignore	16 Apr 2006 22:33:52 -0000	1.179
+++ .cvsignore	17 Apr 2006 22:04:25 -0000	1.180
@@ -2,4 +2,4 @@
 temp-*
 kernel-2.6.16
 linux-2.6.16.tar.bz2
-patch-2.6.16.5.bz2
+patch-2.6.16.6.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1621
retrieving revision 1.1622
diff -u -r1.1621 -r1.1622
--- kernel-2.6.spec	16 Apr 2006 22:33:53 -0000	1.1621
+++ kernel-2.6.spec	17 Apr 2006 22:04:25 -0000	1.1622
@@ -192,7 +192,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16.5.bz2
+Patch1: patch-2.6.16.6.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1062,6 +1062,9 @@
 %endif
 
 %changelog
+* Mon Apr 17 2006 Dave Jones <davej at redhat.com>
+- 2.6.16.6
+
 * Sun Apr 16 2006 Dave Jones <davej at redhat.com>
 - 2.6.16.5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/sources,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- sources	16 Apr 2006 22:33:56 -0000	1.163
+++ sources	17 Apr 2006 22:04:28 -0000	1.164
@@ -1,2 +1,2 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
-89b230ec92becdf961da573c49ce5e7d  patch-2.6.16.5.bz2
+8e5edf58d3b8790080df5481afed5981  patch-2.6.16.6.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/upstream,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- upstream	16 Apr 2006 22:33:56 -0000	1.104
+++ upstream	17 Apr 2006 22:04:28 -0000	1.105
@@ -1,2 +1,2 @@
 linux-2.6.16.tar.bz2
-patch-2.6.16.5.bz2
+patch-2.6.16.6.bz2


--- patch-2.6.16.5.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 17 22:06:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 18:06:13 -0400
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1622,1.1623
Message-ID: <200604172206.k3HM6DwO003778@cvs.devel.redhat.com>

Author: davej

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

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.1622
retrieving revision 1.1623
diff -u -r1.1622 -r1.1623
--- kernel-2.6.spec	17 Apr 2006 22:04:25 -0000	1.1622
+++ kernel-2.6.spec	17 Apr 2006 22:06:10 -0000	1.1623
@@ -1062,7 +1062,7 @@
 %endif
 
 %changelog
-* Mon Apr 17 2006 Dave Jones <davej at redhat.com>
+* Mon Apr 17 2006 Dave Jones <davej at redhat.com> [2.6.16-1.2092_FC4]
 - 2.6.16.6
 
 * Sun Apr 16 2006 Dave Jones <davej at redhat.com>



From fedora-cvs-commits at redhat.com  Mon Apr 17 22:16:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 18:16:44 -0400
Subject: rpms/dbus/devel dbus-0.61-selinux-avc-audit.patch, 1.1,
	1.2 dbus.spec, 1.74, 1.75
Message-ID: <200604172216.k3HMGiTO011323@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9549

Modified Files:
	dbus-0.61-selinux-avc-audit.patch dbus.spec 
Log Message:
- New audit patch


dbus-0.61-selinux-avc-audit.patch:
 bus/selinux.c            |   38 +++++++++++++++++++
 configure.in             |   22 +++++++++++
 dbus/dbus-sysdeps-util.c |   92 +++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 149 insertions(+), 3 deletions(-)

Index: dbus-0.61-selinux-avc-audit.patch
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus-0.61-selinux-avc-audit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dbus-0.61-selinux-avc-audit.patch	24 Feb 2006 20:36:51 -0000	1.1
+++ dbus-0.61-selinux-avc-audit.patch	17 Apr 2006 22:16:40 -0000	1.2
@@ -1,66 +1,3 @@
---- dbus-0.61/dbus/dbus-sysdeps-util.c.selinux-avc-audit	2006-02-24 10:46:45.000000000 -0500
-+++ dbus-0.61/dbus/dbus-sysdeps-util.c	2006-02-24 14:41:15.000000000 -0500
-@@ -42,6 +42,10 @@
- #include <sys/socket.h>
- #include <dirent.h>
- #include <sys/un.h>
-+#ifdef HAVE_LIBAUDIT
-+#include <sys/prctl.h>
-+#include <sys/capability.h>
-+#endif /* HAVE_LIBAUDIT */
- 
- #ifndef O_BINARY
- #define O_BINARY 0
-@@ -247,6 +251,12 @@
-                         dbus_gid_t     gid,
-                         DBusError     *error)
- {
-+#ifdef HAVE_LIBAUDIT
-+  int priv = !getuid();
-+  if (priv)
-+    prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0);
-+#endif /* HAVE_LIBAUDIT */
-+
-   /* setgroups() only works if we are a privileged process,
-    * so we don't return error on failure; the only possible
-    * failure is that we don't have perms to do it.
-@@ -265,6 +275,10 @@
-       dbus_set_error (error, _dbus_error_from_errno (errno),
-                       "Failed to set GID to %lu: %s", gid,
-                       _dbus_strerror (errno));
-+#ifdef HAVE_LIBAUDIT
-+      if (priv)
-+        prctl(PR_SET_KEEPCAPS, 0, 0, 0, 0);
-+#endif /* HAVE_LIBAUDIT */
-       return FALSE;
-     }
-   
-@@ -273,9 +287,25 @@
-       dbus_set_error (error, _dbus_error_from_errno (errno),
-                       "Failed to set UID to %lu: %s", uid,
-                       _dbus_strerror (errno));
-+#ifdef HAVE_LIBAUDIT
-+      if (priv)
-+        prctl(PR_SET_KEEPCAPS, 0, 0, 0, 0);
-+#endif /* HAVE_LIBAUDIT */
-       return FALSE;
-     }
-   
-+#ifdef HAVE_LIBAUDIT
-+    if (priv) {
-+        cap_t new_caps;
-+        cap_value_t cap_list[] = { CAP_AUDIT_WRITE };
-+
-+        prctl(PR_SET_KEEPCAPS, 0, 0, 0, 0);
-+        new_caps = cap_init();
-+        cap_set_flag(new_caps, CAP_PERMITTED, 1, cap_list, CAP_SET);
-+        cap_set_flag(new_caps, CAP_EFFECTIVE, 1, cap_list, CAP_SET);
-+        cap_set_proc(new_caps);
-+    }
-+#endif /* HAVE_LIBAUDIT */
-   return TRUE;
- }
- 
 --- dbus-0.61/bus/selinux.c.selinux-avc-audit	2006-02-24 14:41:15.000000000 -0500
 +++ dbus-0.61/bus/selinux.c	2006-02-24 14:41:15.000000000 -0500
 @@ -38,6 +38,9 @@
@@ -173,3 +110,127 @@
  #### Set up final flags
  DBUS_CLIENT_CFLAGS=
  DBUS_CLIENT_LIBS=
+--- dbus-0.61-orig/dbus/dbus-sysdeps-util.c.selinux-avc-audit	2006-02-24 10:46:45.000000000 -0500
++++ dbus-0.61/dbus/dbus-sysdeps-util.c	2006-04-04 13:00:04.000000000 -0400
+@@ -42,6 +42,11 @@
+ #include <sys/socket.h>
+ #include <dirent.h>
+ #include <sys/un.h>
++#ifdef HAVE_LIBAUDIT
++#include <sys/prctl.h>
++#include <sys/capability.h>
++#include <libaudit.h>
++#endif /* HAVE_LIBAUDIT */
+ 
+ #ifndef O_BINARY
+ #define O_BINARY 0
+@@ -247,6 +252,55 @@
+                         dbus_gid_t     gid,
+                         DBusError     *error)
+ {
++  int priv = FALSE;
++  
++#ifdef HAVE_LIBAUDIT
++  /* have a tmp set of caps that we use to transition to the usr/grp dbus should
++   * run as ... doesn't really help. But keeps people happy.
++   */
++  cap_t new_caps = NULL;
++
++  priv = !getuid();
++  if (priv)
++    {
++      cap_value_t new_cap_list[] = { CAP_AUDIT_WRITE };
++      cap_value_t tmp_cap_list[] = { CAP_AUDIT_WRITE, CAP_SETUID, CAP_SETGID };
++      cap_t tmp_caps = cap_init();
++      
++      if (!tmp_caps || !(new_caps = cap_init()))
++        {
++          dbus_set_error (error, DBUS_ERROR_FAILED,
++                          "Failed to initialize drop of capabilities\n");
++          if (tmp_caps)
++            cap_free(tmp_caps);
++          return FALSE;
++        }
++
++      /* assume these work... */
++      cap_set_flag(new_caps, CAP_PERMITTED, 1, new_cap_list, CAP_SET);
++      cap_set_flag(new_caps, CAP_EFFECTIVE, 1, new_cap_list, CAP_SET);
++      cap_set_flag(tmp_caps, CAP_PERMITTED, 3, tmp_cap_list, CAP_SET);
++      cap_set_flag(tmp_caps, CAP_EFFECTIVE, 3, tmp_cap_list, CAP_SET);
++      
++      if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0) == -1)
++        {
++          dbus_set_error (error, _dbus_error_from_errno (errno),
++                          "Failed to set keep-capabilities: %s\n",
++                          _dbus_strerror (errno));
++          cap_free(tmp_caps);
++          goto fail;
++        }
++      if (cap_set_proc(tmp_caps))
++        {
++          dbus_set_error (error, DBUS_ERROR_FAILED,
++                          "Failed to drop capabilities\n");
++          cap_free(tmp_caps);
++          goto fail;
++        }
++      cap_free(tmp_caps);
++    }
++#endif /* HAVE_LIBAUDIT */
++
+   /* setgroups() only works if we are a privileged process,
+    * so we don't return error on failure; the only possible
+    * failure is that we don't have perms to do it.
+@@ -265,7 +319,7 @@
+       dbus_set_error (error, _dbus_error_from_errno (errno),
+                       "Failed to set GID to %lu: %s", gid,
+                       _dbus_strerror (errno));
+-      return FALSE;
++      goto fail;
+     }
+   
+   if (setuid (uid) < 0)
+@@ -273,10 +327,42 @@
+       dbus_set_error (error, _dbus_error_from_errno (errno),
+                       "Failed to set UID to %lu: %s", uid,
+                       _dbus_strerror (errno));
+-      return FALSE;
++      goto fail;
+     }
+   
+-  return TRUE;
++#ifdef HAVE_LIBAUDIT
++    if (priv)
++      {
++        if (cap_set_proc(new_caps))
++          {
++            dbus_set_error (error, DBUS_ERROR_FAILED,
++                            "Failed to drop capabilities\n");
++            goto fail;
++          }
++        cap_free(new_caps);
++        
++        if (prctl(PR_SET_KEEPCAPS, 0, 0, 0, 0) == -1)
++          { /* should always work, if it did above */
++            dbus_set_error (error, _dbus_error_from_errno (errno),
++                            "Failed to unset keep-capabilities: %s\n",
++                            _dbus_strerror (errno));
++            return FALSE;
++          }
++      }
++#endif
++
++ return TRUE;
++
++ fail:
++#ifdef HAVE_LIBAUDIT
++  if (priv)
++    {
++      /* should always work, if it did above */
++      prctl(PR_SET_KEEPCAPS, 0, 0, 0, 0);
++      cap_free(new_caps);
++    }
++#endif
++  return FALSE;
+ }
+ 
+ /** Installs a UNIX signal handler


Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- dbus.spec	24 Feb 2006 23:10:54 -0000	1.74
+++ dbus.spec	17 Apr 2006 22:16:40 -0000	1.75
@@ -19,7 +19,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 0.61
-Release: 3
+Release: 4 
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL/GPL
@@ -342,7 +342,10 @@
 %endif
 
 %changelog
-* Fri Feb 24 2006 John (J5) Palmieri <johnp at redhat.com> 0.61-2
+* Mon Apr 17 2006 John (J5) Palmieri <johnp at redhat.com> 0.61-4
+- New audit patch
+
+* Fri Feb 24 2006 John (J5) Palmieri <johnp at redhat.com> 0.61-3
 - ABI hasn't changed so add patch that makes dbus-sharp think
   it is still 0.60 (mono uses hard version names so any change
   means apps need to recompile)



From fedora-cvs-commits at redhat.com  Mon Apr 17 21:17:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 17:17:28 -0400
Subject: rpms/gnome-terminal/devel gnome-terminal.spec,1.41,1.42
Message-ID: <200604172117.k3HLHSco026351@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	gnome-terminal.spec 
Log Message:
* Mon Apr 17 2006 Kristian H??gsberg <krh at redhat.com> 2.14.1-6
- Bumpd for rawhide build.



Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gnome-terminal.spec	17 Apr 2006 21:09:32 -0000	1.41
+++ gnome-terminal.spec	17 Apr 2006 21:16:59 -0000	1.42
@@ -13,7 +13,7 @@
 Summary: GNOME Terminal
 Name: gnome-terminal
 Version: 2.14.1
-Release: 5
+Release: 6
 URL: http://www.gnome.org/
 Source0: gnome-terminal-%{version}.tar.bz2
 Source1: ne.po
@@ -103,6 +103,9 @@
 %{_libdir}/bonobo
 
 %changelog
+* Mon Apr 17 2006 Kristian H??gsberg <krh at redhat.com> 2.14.1-6
+- Bumpd for rawhide build.
+
 * Mon Apr 17 2006 Kristian H??gsberg <krh at redhat.com> 2.14.1-5
 - Fix gnome-terminal-2.14.1-real-transparency.patch to check for
   window->priv != NULL before dereferencing.



From fedora-cvs-commits at redhat.com  Mon Apr 17 21:12:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 17:12:49 -0400
Subject: rpms/audiofile/devel audiofile.spec,1.19,1.20
Message-ID: <200604172112.k3HLCn59025796@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/audiofile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25674

Modified Files:
	audiofile.spec 
Log Message:
- Remove Makefile* from docs so they are not installed




Index: audiofile.spec
===================================================================
RCS file: /cvs/dist/rpms/audiofile/devel/audiofile.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- audiofile.spec	24 Mar 2006 16:22:28 -0000	1.19
+++ audiofile.spec	17 Apr 2006 21:12:46 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A library for accessing various audio file formats.
 Name: audiofile
 Version: 0.2.6
-Release: 3
+Release: 4 
 Epoch: 1
 License: LGPL
 Group: System Environment/Libraries
@@ -46,6 +46,7 @@
 %makeinstall
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f docs/Makefile*
 
 %post
 /sbin/ldconfig
@@ -73,6 +74,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* 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
+
 * Fri Mar 24 2006 Matthias Clasen <mclasen at redhat.com> - 1:0.2.6-3
 - Reduce memory consumption by making data tables const
 



From fedora-cvs-commits at redhat.com  Mon Apr 17 21:41:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 17:41:28 -0400
Subject: rpms/kernel/FC-5 patch-2.6.16.6.bz2.sign, NONE, 1.1 .cvsignore,
	1.386, 1.387 kernel-2.6.spec, 1.2090, 1.2091 sources, 1.327,
	1.328 upstream, 1.300, 1.301 patch-2.6.16.5.bz2.sign, 1.1, NONE
Message-ID: <200604172141.k3HLfS7s009769@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16.6.bz2.sign 
Removed Files:
	patch-2.6.16.5.bz2.sign 
Log Message:
.6



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

iD8DBQBEQ/7IyGugalF9Dw4RAko6AJ9dHuLejhX1Il9EtaN0ZmZCh06vcACaA0sU
5aHYloRthzLAv++ntcijihg=
=mXcO
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -r1.386 -r1.387
--- .cvsignore	16 Apr 2006 22:23:50 -0000	1.386
+++ .cvsignore	17 Apr 2006 21:41:07 -0000	1.387
@@ -3,4 +3,4 @@
 kernel-2.6.16
 xen-20060301.tar.bz2
 linux-2.6.16.tar.bz2
-patch-2.6.16.5.bz2
+patch-2.6.16.6.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2090
retrieving revision 1.2091
diff -u -r1.2090 -r1.2091
--- kernel-2.6.spec	17 Apr 2006 13:05:19 -0000	1.2090
+++ kernel-2.6.spec	17 Apr 2006 21:41:09 -0000	1.2091
@@ -214,7 +214,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16.5.bz2
+Patch1: patch-2.6.16.6.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1687,6 +1687,9 @@
 %endif
 
 %changelog
+* Mon Apr 17 2006 Dave Jones <davej at redhat.com>
+- 2.6.16.6
+
 * Mon Apr 17 2006 David Woodhouse <dwmw2 at redhat.com>
 - Add include/{mtd,rdma,keys} directories to kernel-devel package
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -r1.327 -r1.328
--- sources	16 Apr 2006 22:23:51 -0000	1.327
+++ sources	17 Apr 2006 21:41:24 -0000	1.328
@@ -1,3 +1,3 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 cdfde609af8adcf58d7ff626599b2d90  xen-20060301.tar.bz2
-89b230ec92becdf961da573c49ce5e7d  patch-2.6.16.5.bz2
+8e5edf58d3b8790080df5481afed5981  patch-2.6.16.6.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- upstream	16 Apr 2006 22:23:51 -0000	1.300
+++ upstream	17 Apr 2006 21:41:24 -0000	1.301
@@ -1,3 +1,3 @@
 linux-2.6.16.tar.bz2
-patch-2.6.16.5.bz2
+patch-2.6.16.6.bz2
 


--- patch-2.6.16.5.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 17 21:24:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 17:24:41 -0400
Subject: rpms/gtk2-engines/devel gtk-engines-2.7.4-clone.patch, NONE,
	1.1 gtk2-engines.spec, 1.37, 1.38
Message-ID: <200604172124.k3HLOfGW001169@cvs.devel.redhat.com>

Author: sandmann

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

Modified Files:
	gtk2-engines.spec 
Added Files:
	gtk-engines-2.7.4-clone.patch 
Log Message:
* Mon Apr 17 2006 Soren Sandmann <sandmann at redhat.com> - 2.7.4-4
- Add missing clone method in the Clearlooks engine



gtk-engines-2.7.4-clone.patch:
 clearlooks_style.c |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+)

--- NEW FILE gtk-engines-2.7.4-clone.patch ---
--- gtk-engines-2.7.4/engines/clearlooks/src/clearlooks_style.c.clone	2006-04-17 17:13:09.000000000 -0400
+++ gtk-engines-2.7.4/engines/clearlooks/src/clearlooks_style.c	2006-04-17 17:14:44.000000000 -0400
@@ -1482,6 +1482,25 @@
 static void
 clearlooks_style_init (ClearlooksStyle * style)
 {
+
+}
+
+static GtkStyle *
+clearlooks_style_clone (GtkStyle *style)
+{
+	ClearlooksStyle *original = CLEARLOOKS_STYLE (style);
+	ClearlooksStyle *clone = g_object_new (G_OBJECT_TYPE (style), NULL);
+
+	clone->colors = original->colors;
+	clone->progressbarstyle = original->progressbarstyle;
+	clone->menubarstyle = original->menubarstyle;
+	clone->menuitemstyle = original->menuitemstyle;
+	clone->listviewitemstyle = original->listviewitemstyle;
+	clone->scrollbar_color = original->scrollbar_color;
+	clone->has_scrollbar_color = original->has_scrollbar_color;
+	clone->animation = original->animation;
+	
+	return GTK_STYLE (clone);
 }
 
 static void
@@ -1493,6 +1512,7 @@
 
 	style_class->unrealize        = clearlooks_style_unrealize;
 	style_class->init_from_rc     = clearlooks_style_init_from_rc;
+	style_class->clone	      = clearlooks_style_clone;
 	style_class->draw_handle      = draw_handle;
 	style_class->draw_slider      = draw_slider;
 	style_class->draw_shadow_gap  = draw_shadow_gap;


Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gtk2-engines.spec	27 Feb 2006 02:58:18 -0000	1.37
+++ gtk2-engines.spec	17 Apr 2006 21:24:29 -0000	1.38
@@ -1,7 +1,7 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
 Version:        2.7.4
-Release:	3
+Release:	4
 License:        GPL
 Group:          System Environment/Libraries
 Source:         gtk-engines-%{version}.tar.bz2
@@ -9,6 +9,8 @@
 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 clone method in clearlooks engine
+Patch2:		gtk-engines-2.7.4-clone.patch
 
 Requires:       gtk2 >= 2.2.0
 Conflicts:  	gnome-themes < 2.9.0
@@ -29,6 +31,7 @@
 %setup -q -n gtk-engines-%{version}
 %patch0 -p1 -b .fixes
 %patch1 -p1 -b .leaks
+%patch2 -p1 -b .clone
 
 %build
 %configure
@@ -66,6 +69,9 @@
 %{_datadir}/themes
 
 %changelog
+* Mon Apr 17 2006 Soren Sandmann <sandmann at redhat.com> - 2.7.4-4
+- Add missing clone method in the Clearlooks engine
+
 * Sun Feb 26 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.4-3
 - Fix memory leaks in the Clearlooks engine
 



From fedora-cvs-commits at redhat.com  Mon Apr 17 21:29:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 17:29:39 -0400
Subject: rpms/tog-pegasus/devel pegasus-2.5.1-fix_repupgrade.patch, NONE,
	1.1 tog-pegasus.spec, 1.29, 1.30
Message-ID: <200604172129.k3HLTdbG005531@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3927

Modified Files:
	tog-pegasus.spec 
Added Files:
	pegasus-2.5.1-fix_repupgrade.patch 
Log Message:
fix repupgrade during RPM upgrade

pegasus-2.5.1-fix_repupgrade.patch:
 RepositoryUpgrade.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE pegasus-2.5.1-fix_repupgrade.patch ---
--- pegasus/src/Clients/repupgrade/RepositoryUpgrade.cpp.fix_repupgrade	2006-01-31 14:34:30.000000000 -0500
+++ pegasus/src/Clients/repupgrade/RepositoryUpgrade.cpp	2006-04-17 16:09:24.000000000 -0400
@@ -295,9 +295,9 @@
     const String NEW_REPOSITORY_PATH = "/wbem_var/opt/wbem/repository";
     const String RepositoryUpgrade::_LOG_PATH  = "/wbem_var/opt/wbem/upgrade";
 #elif defined(PEGASUS_USE_RELEASE_DIRS) && defined(PEGASUS_OS_LINUX)
-    const String OLD_REPOSITORY_PATH = "/var/opt/tog-pegasus/prev_repository";
-    const String NEW_REPOSITORY_PATH = "/var/opt/tog-pegasus/repository";
-    const String RepositoryUpgrade::_LOG_PATH  = "/var/opt/tog-pegasus/log/upgrade";
+    const String OLD_REPOSITORY_PATH = "/var/lib/Pegasus/prev_repository";
+    const String NEW_REPOSITORY_PATH = "/var/lib/Pegasus/repository";
+    const String RepositoryUpgrade::_LOG_PATH  = "/var/lib/Pegasus/log/install.log";
 #define REPUPGRADE_USE_RELEASE_DIRS true
 #else
     const String RepositoryUpgrade::_LOG_PATH


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- tog-pegasus.spec	14 Apr 2006 23:35:38 -0000	1.29
+++ tog-pegasus.spec	17 Apr 2006 21:29:22 -0000	1.30
@@ -31,7 +31,7 @@
 %define pegasus_uid	66
 
 Version: 		2.5.1
-Release: 		2%{?LINUX_VERSION:.%{LINUX_VERSION}}
+Release: 		3%{?LINUX_VERSION:.%{LINUX_VERSION}}
 Epoch:   		2
 #
 Summary:   		OpenPegasus WBEM Services for Linux
@@ -65,6 +65,7 @@
 Patch14:		pegasus-2.5.1-obz4945.patch
 Patch15:		pegasus-2.5.1-PATH_MAX.patch
 Patch16:		pegasus-2.5.1-HOSTNAME_MAX.patch
+Patch17:		pegasus-2.5.1-fix_repupgrade.patch
 #
 Conflicts: 		openwbem
 Provides: 		tog-pegasus-cimserver
@@ -136,6 +137,7 @@
 %patch14 -p1 -b .obz4945
 %patch15 -p1 -b .PATH_MAX
 %patch16 -p1 -b .HOSTNAME_MAX
+%patch17 -p1 -b .fix_repupgrade
 
 %build
 rm -rf ${RPM_BUILD_ROOT} || :;
@@ -246,8 +248,7 @@
    if [ -d /var/lib/Pegasus/prev_repository ]; then
    #  The user's old repository was moved to /var/lib/Pegasus/prev_repository, which 
    #  now must be upgraded to the new repository in /var/lib/Pegasus/repository:
-	/usr/sbin/repupgrade /var/lib/Pegasus/prev_repository /var/lib/Pegasus/repository \
-			     2>> /var/lib/Pegasus/log/install.log || :;
+	/usr/sbin/repupgrade 2>> /var/lib/Pegasus/log/install.log || :;
         mv /var/lib/Pegasus/prev_repository /var/lib/Pegasus/prev_repository_`date '+%Y-%m-%d-%s.%N'`.rpmsave;
    fi;
    /sbin/service tog-pegasus condrestart >/dev/null 2>&1 || :;
@@ -271,6 +272,9 @@
 :;
 
 %changelog
+* Mon Apr 17 2006 Jason Vas Dias <jvdias at redhat.com> - 2:2.5.1-3
+- Fix repupgrade (make it use correct paths)
+
 * Fri Apr 14 2006 Jason Vas Dias <jvdias at redhat.com> - 2:2.5.1-2
 - Apply patches for the two '2.5.2_APPROVED' upstream bugzillas 
   4934(4943) and 4945 :



From fedora-cvs-commits at redhat.com  Mon Apr 17 21:09:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 17:09:48 -0400
Subject: rpms/gnome-terminal/devel
	gnome-terminal-2.14.1-real-transparency.patch, 1.1,
	1.2 gnome-terminal.spec, 1.40, 1.41
Message-ID: <200604172109.k3HL9moP025442@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	gnome-terminal-2.14.1-real-transparency.patch 
	gnome-terminal.spec 
Log Message:
* Mon Apr 17 2006 Kristian H??gsberg <krh at redhat.com> 2.14.1-5
- Fix gnome-terminal-2.14.1-real-transparency.patch to check for
  window->priv != NULL before dereferencing.


gnome-terminal-2.14.1-real-transparency.patch:
 terminal-screen.c     |   22 +++++---
 terminal-screen.h     |    2 
 terminal-widget-vte.c |    9 +++
 terminal-widget.h     |    3 +
 terminal-window.c     |  135 ++++++++++++++++++++++++++++++++++++++++++++++++++
 terminal-window.h     |    2 
 terminal.c            |    2 
 7 files changed, 169 insertions(+), 6 deletions(-)

Index: gnome-terminal-2.14.1-real-transparency.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal-2.14.1-real-transparency.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-terminal-2.14.1-real-transparency.patch	13 Apr 2006 19:13:44 -0000	1.1
+++ gnome-terminal-2.14.1-real-transparency.patch	17 Apr 2006 21:09:31 -0000	1.2
@@ -1,36 +1,6 @@
-? help/bg/Makefile
-? help/bg/Makefile.in
-? help/bg/gnome-terminal-bg.omf.out
-? help/bg/omf_timestamp
-? help/uk/Makefile
-? help/uk/Makefile.in
-? help/uk/gnome-terminal-uk.omf.out
-? help/uk/omf_timestamp
-? po/.intltool-merge-cache
-? src/.deps
-? src/.libs
-? src/skey/.deps
-? src/skey/.libs
-? src/skey/btoe.lo
-? src/skey/libskey.la
-? src/skey/md4.lo
-? src/skey/md5.lo
-? src/skey/sha1.lo
-? src/skey/skey.lo
-? src/skey/skeyutil.lo
-Index: src/profile-editor.c
-===================================================================
-RCS file: /cvs/gnome/gnome-terminal/src/profile-editor.c,v
-retrieving revision 1.57
-diff -u -p -b -r1.57 profile-editor.c
-Index: src/terminal-screen.c
-===================================================================
-RCS file: /cvs/gnome/gnome-terminal/src/terminal-screen.c,v
-retrieving revision 1.123
-diff -u -p -b -r1.123 terminal-screen.c
---- src/terminal-screen.c	2 Apr 2006 12:29:45 -0000	1.123
-+++ src/terminal-screen.c	13 Apr 2006 18:01:03 -0000
-@@ -119,8 +119,6 @@ static void terminal_screen_widget_encod
+--- ./src/terminal-screen.c.real-transparency	2006-04-17 16:57:41.000000000 -0400
++++ ./src/terminal-screen.c	2006-04-17 16:57:41.000000000 -0400
+@@ -119,8 +119,6 @@
  
  static void terminal_screen_setup_dnd                (TerminalScreen *screen);
  
@@ -39,7 +9,7 @@
  static gboolean cook_title  (TerminalScreen *screen, const char *raw_title, char **old_cooked_title);
  
  static void terminal_screen_cook_title      (TerminalScreen *screen);
-@@ -521,12 +519,13 @@ terminal_screen_get_icon_title_set (Term
+@@ -521,12 +519,13 @@
    return screen->priv->icon_title_set;
  }
  
@@ -55,7 +25,7 @@
    
    profile = screen->priv->profile;  
    
-@@ -600,13 +599,24 @@ reread_profile (TerminalScreen *screen)
+@@ -600,13 +599,24 @@
  
    if (bg_type == TERMINAL_BACKGROUND_IMAGE ||
        bg_type == TERMINAL_BACKGROUND_TRANSPARENT)
@@ -80,7 +50,7 @@
  
    terminal_widget_set_backspace_binding (term,
                                           terminal_profile_get_backspace_binding (profile));
-@@ -698,7 +708,7 @@ profile_changed_callback (TerminalProfil
+@@ -698,7 +708,7 @@
                            const TerminalSettingMask *mask,
                            TerminalScreen            *screen)
  {
@@ -89,7 +59,7 @@
  }
  
  static void
-@@ -946,7 +956,7 @@ terminal_screen_set_profile (TerminalScr
+@@ -946,7 +956,7 @@
  
    screen->priv->profile = profile;
  
@@ -98,14 +68,9 @@
  
    if (screen->priv->profile)
      g_signal_emit (G_OBJECT (screen), signals[PROFILE_SET], 0);
-Index: src/terminal-screen.h
-===================================================================
-RCS file: /cvs/gnome/gnome-terminal/src/terminal-screen.h,v
-retrieving revision 1.14
-diff -u -p -b -r1.14 terminal-screen.h
---- src/terminal-screen.h	20 Jan 2006 18:05:42 -0000	1.14
-+++ src/terminal-screen.h	13 Apr 2006 18:01:03 -0000
-@@ -74,6 +74,8 @@ void terminal_screen_set_profile (Termin
+--- ./src/terminal-screen.h.real-transparency	2006-01-20 13:05:42.000000000 -0500
++++ ./src/terminal-screen.h	2006-04-17 16:57:41.000000000 -0400
+@@ -74,6 +74,8 @@
                                    TerminalProfile *profile);
  TerminalProfile* terminal_screen_get_profile (TerminalScreen *screen);
  
@@ -114,14 +79,9 @@
  void         terminal_screen_set_override_command (TerminalScreen  *screen,
                                                     char           **argv);
  const char** terminal_screen_get_override_command (TerminalScreen  *screen);
-Index: src/terminal-widget-vte.c
-===================================================================
-RCS file: /cvs/gnome/gnome-terminal/src/terminal-widget-vte.c,v
-retrieving revision 1.36
-diff -u -p -b -r1.36 terminal-widget-vte.c
---- src/terminal-widget-vte.c	20 Jan 2006 18:05:42 -0000	1.36
-+++ src/terminal-widget-vte.c	13 Apr 2006 18:01:03 -0000
-@@ -351,6 +351,7 @@ void
+--- ./src/terminal-widget-vte.c.real-transparency	2006-01-20 13:05:42.000000000 -0500
++++ ./src/terminal-widget-vte.c	2006-04-17 16:57:41.000000000 -0400
+@@ -351,6 +351,7 @@
  terminal_widget_set_background_transparent (GtkWidget *widget,
  					    gboolean   setting)
  {
@@ -129,29 +89,24 @@
    vte_terminal_set_background_transparent(VTE_TERMINAL(widget), setting);
  }
  
-@@ -361,6 +362,14 @@ terminal_widget_set_background_darkness 
- {
-   g_return_if_fail(VTE_IS_TERMINAL(widget));
-   vte_terminal_set_background_saturation(VTE_TERMINAL(widget), 1.0 - factor);
-+}
-+
-+void
+@@ -364,6 +365,14 @@
+ }
+ 
+ void
 +terminal_widget_set_background_opacity (GtkWidget *widget,
 +					double     factor)
 +{
 +  g_return_if_fail(VTE_IS_TERMINAL(widget));
 +  vte_terminal_set_opacity(VTE_TERMINAL(widget), factor * 0xffff);
- }
- 
- void
-Index: src/terminal-widget.h
-===================================================================
-RCS file: /cvs/gnome/gnome-terminal/src/terminal-widget.h,v
-retrieving revision 1.12
-diff -u -p -b -r1.12 terminal-widget.h
---- src/terminal-widget.h	20 Jan 2006 18:05:43 -0000	1.12
-+++ src/terminal-widget.h	13 Apr 2006 18:01:03 -0000
-@@ -90,6 +90,9 @@ void       terminal_widget_set_backgroun
++}
++
++void
+ terminal_widget_set_background_scrolls (GtkWidget *widget,
+ 					gboolean   setting)
+ {
+--- ./src/terminal-widget.h.real-transparency	2006-01-20 13:05:43.000000000 -0500
++++ ./src/terminal-widget.h	2006-04-17 16:57:41.000000000 -0400
+@@ -90,6 +90,9 @@
  /* 0.0 = normal bg, 1.0 = all black bg, 0.5 = half darkened */
  void       terminal_widget_set_background_darkness    (GtkWidget            *widget,
                                                         double                factor);
@@ -161,13 +116,8 @@
  void       terminal_widget_set_background_scrolls     (GtkWidget            *widget,
                                                         gboolean              setting);
  void       terminal_widget_set_normal_gdk_font        (GtkWidget            *widget,
-Index: src/terminal-window.c
-===================================================================
-RCS file: /cvs/gnome/gnome-terminal/src/terminal-window.c,v
-retrieving revision 1.126
-diff -u -p -b -r1.126 terminal-window.c
---- src/terminal-window.c	1 Apr 2006 20:03:58 -0000	1.126
-+++ src/terminal-window.c	13 Apr 2006 18:01:03 -0000
+--- ./src/terminal-window.c.real-transparency	2006-03-04 01:21:01.000000000 -0500
++++ ./src/terminal-window.c	2006-04-17 17:05:20.000000000 -0400
 @@ -35,6 +35,11 @@
  #include <gdk/gdkkeysyms.h>
  #include <libsn/sn-launchee.h>
@@ -180,7 +130,7 @@
  struct _TerminalWindowPrivate
  {  
    GtkWidget *main_vbox;
-@@ -85,6 +90,12 @@ struct _TerminalWindowPrivate
+@@ -85,6 +90,12 @@
     * event-driven while GTK doesn't support _NET_WM_STATE_FULLSCREEN
     */
    guint fullscreen : 1;
@@ -193,7 +143,7 @@
  };
  
  enum {
-@@ -749,6 +760,115 @@ edit_menu_activate_callback (GtkMenuItem
+@@ -749,6 +760,116 @@
    gtk_clipboard_request_text (window->priv->clipboard, (GtkClipboardTextReceivedFunc) update_edit_menu, window);
  }
  
@@ -209,7 +159,8 @@
 +    (XFixesSelectionNotifyEvent *) xevent;
 +  GList *tmp;
 +
-+  if (selection_notify->type != window->priv->selection_notify_event ||
++  if (window->priv == NULL ||
++      selection_notify->type != window->priv->selection_notify_event ||
 +      selection_notify->selection != window->priv->cm_selection_atom)
 +    return GDK_FILTER_CONTINUE;
 +
@@ -309,7 +260,7 @@
  static void
  terminal_window_init (TerminalWindow *window)
  {
-@@ -781,6 +901,8 @@ terminal_window_init (TerminalWindow *wi
+@@ -781,6 +902,8 @@
    window->priv->use_mnemonics = TRUE;
    window->priv->using_mnemonics = FALSE;
  
@@ -318,7 +269,7 @@
    /* force gtk to construct its GtkClipboard; otherwise our UI is very slow the first time we need it */
    window->priv->clipboard = gtk_clipboard_get_for_display (gtk_widget_get_display (GTK_WIDGET (window)), GDK_NONE);
  
-@@ -1233,8 +1355,20 @@ terminal_window_show (GtkWidget *widget)
+@@ -1233,8 +1356,20 @@
  void terminal_window_realized_callback (GtkWidget *window,
                                          gpointer   user_data)
  {
@@ -339,14 +290,9 @@
  }
  
  TerminalWindow*
-Index: src/terminal-window.h
-===================================================================
-RCS file: /cvs/gnome/gnome-terminal/src/terminal-window.h,v
-retrieving revision 1.11
-diff -u -p -b -r1.11 terminal-window.h
---- src/terminal-window.h	20 Nov 2005 15:06:34 -0000	1.11
-+++ src/terminal-window.h	13 Apr 2006 18:01:03 -0000
-@@ -98,6 +98,8 @@ void terminal_window_reread_profile_list
+--- ./src/terminal-window.h.real-transparency	2005-11-20 10:06:34.000000000 -0500
++++ ./src/terminal-window.h	2006-04-17 16:57:41.000000000 -0400
+@@ -98,6 +98,8 @@
  void terminal_window_set_startup_id (TerminalWindow *window,
                                       const char     *startup_id);
  
@@ -355,14 +301,9 @@
  G_END_DECLS
  
  #endif /* TERMINAL_WINDOW_H */
-Index: src/terminal.c
-===================================================================
-RCS file: /cvs/gnome/gnome-terminal/src/terminal.c,v
-retrieving revision 1.96
-diff -u -p -b -r1.96 terminal.c
---- src/terminal.c	2 Apr 2006 12:21:12 -0000	1.96
-+++ src/terminal.c	13 Apr 2006 18:01:04 -0000
-@@ -1966,6 +1966,8 @@ terminal_app_new_terminal (TerminalApp  
+--- ./src/terminal.c.real-transparency	2006-03-04 01:10:54.000000000 -0500
++++ ./src/terminal.c	2006-04-17 16:57:41.000000000 -0400
+@@ -1966,6 +1966,8 @@
      
        terminal_window_add_screen (window, screen);
  


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gnome-terminal.spec	13 Apr 2006 19:15:58 -0000	1.40
+++ gnome-terminal.spec	17 Apr 2006 21:09:32 -0000	1.41
@@ -13,7 +13,7 @@
 Summary: GNOME Terminal
 Name: gnome-terminal
 Version: 2.14.1
-Release: 4
+Release: 5
 URL: http://www.gnome.org/
 Source0: gnome-terminal-%{version}.tar.bz2
 Source1: ne.po
@@ -103,11 +103,15 @@
 %{_libdir}/bonobo
 
 %changelog
+* Mon Apr 17 2006 Kristian H??gsberg <krh at redhat.com> 2.14.1-5
+- Fix gnome-terminal-2.14.1-real-transparency.patch to check for
+  window->priv != NULL before dereferencing.
+
 * Thu Apr 13 2006 Kristian H??gsberg <krh at redhat.com> 2.14.1-4
 - Bump for rawhide build.
 
 * Thu Apr 13 2006 Kristian H??gsberg <krh at redhat.com> 2.14.1-3
-- Add vte-0.12.0-real-transparency.patch for extra bling points.
+- Add gnome-terminal-2.14.1-real-transparency.patch for extra bling points.
 
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
 - Update to 2.14.1



From fedora-cvs-commits at redhat.com  Mon Apr 17 22:50:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 18:50:13 -0400
Subject: rpms/notify-daemon/devel notify-daemon-0.3.1-xselection.patch, 1.1,
	1.2 notify-daemon.spec, 1.12, 1.13
Message-ID: <200604172250.k3HMoDHQ012106@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/notify-daemon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12079

Modified Files:
	notify-daemon-0.3.1-xselection.patch notify-daemon.spec 
Log Message:
* Mon Apr 17 2006 Kristian H??gsberg <krh at redhat.com> 0.3.1-10
- Update name of compositing manager selection to track recent
  metacity changes.


notify-daemon-0.3.1-xselection.patch:
 eggnotificationbubblewidget.c |   32 +++++++++++++++++++++++++-------
 1 files changed, 25 insertions(+), 7 deletions(-)

Index: notify-daemon-0.3.1-xselection.patch
===================================================================
RCS file: /cvs/dist/rpms/notify-daemon/devel/notify-daemon-0.3.1-xselection.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- notify-daemon-0.3.1-xselection.patch	3 Feb 2006 22:29:40 -0000	1.1
+++ notify-daemon-0.3.1-xselection.patch	17 Apr 2006 22:50:05 -0000	1.2
@@ -21,7 +21,7 @@
 +  char buf[128];
 +  GdkWindow *owner = NULL;
 +
-+  snprintf (buf, sizeof (buf), "CM_S%d", number);
++  snprintf (buf, sizeof (buf), "_NET_WM_CM_S%d", number);
 +
 +  GdkAtom clipboard_atom = gdk_atom_intern (buf, FALSE);
 +


Index: notify-daemon.spec
===================================================================
RCS file: /cvs/dist/rpms/notify-daemon/devel/notify-daemon.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- notify-daemon.spec	8 Mar 2006 18:24:35 -0000	1.12
+++ notify-daemon.spec	17 Apr 2006 22:50:05 -0000	1.13
@@ -4,7 +4,7 @@
 Summary: Notification Daemon 
 Name: notify-daemon
 Version: 0.3.1
-Release: 9 
+Release: 10
 URL: http://www.galago-project.org/specs/notification/ 
 License: GPL
 Group: System Environment/Libraries
@@ -54,6 +54,10 @@
 %{_datadir}/dbus-1/services/notify-daemon.service
 
 %changelog
+* Mon Apr 17 2006 Kristian H??gsberg <krh at redhat.com> 0.3.1-10
+- Update name of compositing manager selection to track recent
+  metacity changes.
+
 * Wed Mar 08 2006 John (J5) Palmieri <johnp at redhat.com> - 0.3.1-9
 - Add patch to fix struct handling in the dbus glib binding for dbus 0.61
   so image data works again



From fedora-cvs-commits at redhat.com  Tue Apr 18 01:08:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 21:08:29 -0400
Subject: rpms/bluez-utils/devel bluez-utils.spec,1.41,1.42
Message-ID: <200604180108.k3I18Tdl005290@cvs.devel.redhat.com>

Author: pjones

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

Modified Files:
	bluez-utils.spec 
Log Message:
- fix the chkconfig and service invocations
- bump the release
- changelog



Index: bluez-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- bluez-utils.spec	17 Apr 2006 19:04:01 -0000	1.41
+++ bluez-utils.spec	18 Apr 2006 01:08:13 -0000	1.42
@@ -79,20 +79,26 @@
 %post
 /sbin/chkconfig --add bluetooth
 /sbin/chkconfig --add hidd
+/sbin/chkconfig --add dund
+/sbin/chkconfig --add pand
 if [ "$1" = "1" ]; then
-/sbin/service bluetooth condrestart
-/sbin/service hidd condrestart
+	/sbin/service bluetooth condrestart >/dev/null 2>&1
+	/sbin/service hidd condrestart >/dev/null 2>&1
+	/sbin/service dund condrestart >/dev/null 2>&1
+	/sbin/service pand condrestart >/dev/null 2>&1
 fi
-exit 0
 
 %preun
-/sbin/service bluetooth stop > /dev/null 2>&1
-/sbin/service hidd stop > /dev/null 2>&1
 if [ "$1" = "0" ]; then
-/sbin/chkconfig --del bluetooth
-/sbin/chkconfig --del hidd
+	/sbin/service bluetooth stop >/dev/null 2>&1
+	/sbin/service hidd stop >/dev/null 2>&1
+	/sbin/service dund stop >/dev/null 2>&1
+	/sbin/service pand stop >/dev/null 2>&1
+	/sbin/chkconfig --del bluetooth
+	/sbin/chkconfig --del hidd
+	/sbin/chkconfig --del dund
+	/sbin/chkconfig --del pand
 fi
-exit 0
 
 %files
 %defattr(-, root, root)
@@ -113,8 +119,9 @@
 %{_libdir}/cups/backend/bluetooth
 
 %changelog
-* Mon Apr 17 2006 Peter Jones <pjones at redhat.com> - 2.25-
+* Mon Apr 17 2006 Peter Jones <pjones at redhat.com> - 2.25-6
 - Clean up initscripts.
+- Clean up specfile.
 
 * Thu Mar 23 2006 Peter Jones <pjones at redhat.com> - 2.25-5
 - Don't poll every 200ms when nothing happens unless there's poll event



From fedora-cvs-commits at redhat.com  Tue Apr 18 01:17:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 21:17:58 -0400
Subject: rpms/pm-utils/devel pm-utils.spec,1.31,1.32
Message-ID: <200604180117.k3I1HwTO015856@cvs.devel.redhat.com>

Author: pjones

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

Modified Files:
	pm-utils.spec 
Log Message:
- update changelog
- bump version



Index: pm-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- pm-utils.spec	11 Mar 2006 18:40:40 -0000	1.31
+++ pm-utils.spec	18 Apr 2006 01:17:54 -0000	1.32
@@ -1,11 +1,12 @@
 Name: pm-utils
 Summary: Power management utilities and scripts for Fedora Core
 License: GPL
-Version: 0.15
+Version: 0.17
 Release: 1
 Group: System Environment/Base
 ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64
 Requires: usermode kbd pciutils >= 2.2.1
+Conflicts: bluez-utils < 2.25-6
 Source: pm-utils-%{version}.tar.gz
 Source10: http://ftp.debian.org/debian/pool/main/v/vbetool/vbetool_0.5-1.tar.gz
 Source20: radeontool-1.5.tar.gz
@@ -81,6 +82,17 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Apr 17 2006 Peter Jones <pjones at redhat.com> - 0.17-1
+- add more helper functions
+- rework things that were forking an extra subshell
+- fix the suspend lock
+- work around bluetooth/usb suspend wackiness
+
+* Fri Mar 17 2006 Peter Jones <pjones at redhat.com> - 0.16-1
+- rework the difference between hibernate and suspend; get rid of PM_MODE
+- add 00clear script
+- move default_resume_kernel from "functions" to 01grub's hibernate section
+
 * Sat Mar 11 2006 Peter Jones <pjones at redhat.com> - 0.15-1
 - fix hibernate check in a way that doesn't break "sleep".
 



From fedora-cvs-commits at redhat.com  Tue Apr 18 01:36:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 21:36:49 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2134,1.2135
Message-ID: <200604180136.k3I1anpD000851@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-2.6.spec 
Log Message:
enable xen again


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2134
retrieving revision 1.2135
diff -u -r1.2134 -r1.2135
--- kernel-2.6.spec	16 Apr 2006 23:07:33 -0000	1.2134
+++ kernel-2.6.spec	18 Apr 2006 01:36:47 -0000	1.2135
@@ -7,7 +7,7 @@
 %define buildsmp 0
 %define buildpae 0
 # Whether to apply the Xen patches, leave this enabled.
-%define includexen 0
+%define includexen 1
 # Whether to build the Xen kernels, disable if you want.
 %define buildxen 1
 %define buildxenPAE 0
@@ -1648,6 +1648,9 @@
 %endif
 
 %changelog
+* Mon Apr 17 2006 Juan Quintela <quintela at redhat.com>
+- enable xen again.
+
 * Sun Apr 16 2006 Dave Jones <davej at redhat.com>
 - Big rebase to 2.6.17-rc1-git12
 



From fedora-cvs-commits at redhat.com  Tue Apr 18 03:50:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 23:50:34 -0400
Subject: rpms/kernel/FC-5 patch-2.6.16.7.bz2.sign, NONE, 1.1 .cvsignore,
	1.387, 1.388 kernel-2.6.spec, 1.2092, 1.2093 sources, 1.328,
	1.329 upstream, 1.301, 1.302 patch-2.6.16.6.bz2.sign, 1.1, NONE
Message-ID: <200604180350.k3I3oYkj009431@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16.7.bz2.sign 
Removed Files:
	patch-2.6.16.6.bz2.sign 
Log Message:
.7



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

iD8DBQBERA9ryGugalF9Dw4RAsxMAJ0cTrtyt4dFTmGHA1YxIbsyjGlqdgCdEAVz
O8VRsbhWbh7cVR4BtoLXhXo=
=SHPv
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -r1.387 -r1.388
--- .cvsignore	17 Apr 2006 21:41:07 -0000	1.387
+++ .cvsignore	18 Apr 2006 03:50:32 -0000	1.388
@@ -3,4 +3,4 @@
 kernel-2.6.16
 xen-20060301.tar.bz2
 linux-2.6.16.tar.bz2
-patch-2.6.16.6.bz2
+patch-2.6.16.7.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2092
retrieving revision 1.2093
diff -u -r1.2092 -r1.2093
--- kernel-2.6.spec	17 Apr 2006 21:57:06 -0000	1.2092
+++ kernel-2.6.spec	18 Apr 2006 03:50:32 -0000	1.2093
@@ -214,7 +214,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16.6.bz2
+Patch1: patch-2.6.16.7.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1687,6 +1687,9 @@
 %endif
 
 %changelog
+* Tue Apr 18 2006 Dave Jones <davej at redhat.com>
+- 2.6.16.7
+
 * Mon Apr 17 2006 Dave Jones <davej at redhat.com>
 - 2.6.16.6
 - Disable the SMP alternatives patch for now.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -r1.328 -r1.329
--- sources	17 Apr 2006 21:41:24 -0000	1.328
+++ sources	18 Apr 2006 03:50:32 -0000	1.329
@@ -1,3 +1,3 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 cdfde609af8adcf58d7ff626599b2d90  xen-20060301.tar.bz2
-8e5edf58d3b8790080df5481afed5981  patch-2.6.16.6.bz2
+9520cf6badb80e2a8bb008e715533add  patch-2.6.16.7.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- upstream	17 Apr 2006 21:41:24 -0000	1.301
+++ upstream	18 Apr 2006 03:50:32 -0000	1.302
@@ -1,3 +1,2 @@
 linux-2.6.16.tar.bz2
-patch-2.6.16.6.bz2
-
+patch-2.6.16.7.bz2


--- patch-2.6.16.6.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 18 03:51:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Apr 2006 23:51:00 -0400
Subject: rpms/kernel/FC-4 patch-2.6.16.7.bz2.sign, NONE, 1.1 .cvsignore,
	1.180, 1.181 kernel-2.6.spec, 1.1623, 1.1624 sources, 1.164,
	1.165 upstream, 1.105, 1.106 patch-2.6.16.6.bz2.sign, 1.1, NONE
Message-ID: <200604180351.k3I3p0wo009689@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16.7.bz2.sign 
Removed Files:
	patch-2.6.16.6.bz2.sign 
Log Message:
.7



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

iD8DBQBERA9ryGugalF9Dw4RAsxMAJ0cTrtyt4dFTmGHA1YxIbsyjGlqdgCdEAVz
O8VRsbhWbh7cVR4BtoLXhXo=
=SHPv
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/.cvsignore,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- .cvsignore	17 Apr 2006 22:04:25 -0000	1.180
+++ .cvsignore	18 Apr 2006 03:50:57 -0000	1.181
@@ -2,4 +2,4 @@
 temp-*
 kernel-2.6.16
 linux-2.6.16.tar.bz2
-patch-2.6.16.6.bz2
+patch-2.6.16.7.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1623
retrieving revision 1.1624
diff -u -r1.1623 -r1.1624
--- kernel-2.6.spec	17 Apr 2006 22:06:10 -0000	1.1623
+++ kernel-2.6.spec	18 Apr 2006 03:50:57 -0000	1.1624
@@ -192,7 +192,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16.6.bz2
+Patch1: patch-2.6.16.7.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1062,6 +1062,9 @@
 %endif
 
 %changelog
+* Tue Apr 18 2006 Dave Jones <davej at redhat.com> [2.6.16-1.2093_FC4]
+- 2.6.16.7
+
 * Mon Apr 17 2006 Dave Jones <davej at redhat.com> [2.6.16-1.2092_FC4]
 - 2.6.16.6
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/sources,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- sources	17 Apr 2006 22:04:28 -0000	1.164
+++ sources	18 Apr 2006 03:50:58 -0000	1.165
@@ -1,2 +1,2 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
-8e5edf58d3b8790080df5481afed5981  patch-2.6.16.6.bz2
+9520cf6badb80e2a8bb008e715533add  patch-2.6.16.7.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/upstream,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- upstream	17 Apr 2006 22:04:28 -0000	1.105
+++ upstream	18 Apr 2006 03:50:58 -0000	1.106
@@ -1,2 +1,2 @@
 linux-2.6.16.tar.bz2
-patch-2.6.16.6.bz2
+patch-2.6.16.7.bz2


--- patch-2.6.16.6.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 18 04:32:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 00:32:59 -0400
Subject: rpms/firefox/FC-5 .cvsignore, 1.21, 1.22 firefox.spec, 1.111,
	1.112 sources, 1.23, 1.24 firefox-1.5-pango-typo.patch, 1.1,
	NONE firefox-1.5.0.1-dumpstack.patch, 1.3, NONE
Message-ID: <200604180432.k3I4Wxxh031136@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	.cvsignore firefox.spec sources 
Removed Files:
	firefox-1.5-pango-typo.patch firefox-1.5.0.1-dumpstack.patch 
Log Message:
* Mon Apr 19 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-1.1.fc5
- Update to 1.5.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-5/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	2 Feb 2006 04:25:46 -0000	1.21
+++ .cvsignore	18 Apr 2006 04:32:45 -0000	1.22
@@ -18,3 +18,5 @@
 firefox-langpacks-20060125.tar.bz2
 firefox-1.5.0.1-source.tar.bz2
 firefox-langpacks-1.5.0.1-20060201.tar.bz2
+firefox-langpacks-1.5.0.2-20060417.tar.bz2
+firefox-1.5.0.2-source.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-5/firefox.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- firefox.spec	13 Mar 2006 15:08:34 -0000	1.111
+++ firefox.spec	18 Apr 2006 04:32:46 -0000	1.112
@@ -8,8 +8,8 @@
 
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
-Version:        1.5.0.1
-Release:        9
+Version:        1.5.0.2
+Release:        1.1.fc5
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -20,7 +20,7 @@
 %endif
 Source0:        %{tarball}
 Source1:        firefox-gnomestripe-0.1.tar.gz
-Source2:        firefox-langpacks-%{version}-20060201.tar.bz2
+Source2:        firefox-langpacks-%{version}-20060417.tar.bz2
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
 Source12:       firefox-redhat-default-bookmarks.html
@@ -37,7 +37,6 @@
 Patch3:         firefox-1.1-nss-system-nspr.patch
 Patch4:         firefox-1.5-with-system-nss.patch
 Patch5:         firefox-1.1-visibility.patch
-Patch6:         firefox-1.5.0.1-dumpstack.patch
 
 # customization patches
 Patch20:        firefox-redhat-homepage.patch
@@ -56,7 +55,6 @@
 Patch81:        firefox-nopangoxft.patch
 
 # patches from upstream (Patch100+)
-Patch100:       firefox-1.5-pango-typo.patch
 Patch101:       firefox-1.5-pango-ua.patch
 Patch102:       firefox-1.5-pango-about.patch
 
@@ -109,7 +107,6 @@
 %ifnarch i386
 %patch5  -p0
 %endif
-%patch6 -p0
 
 %patch20 -p0
 %patch21 -p1
@@ -122,7 +119,6 @@
 %patch42 -p0
 %patch81 -p1
 
-%patch100 -p0 -b .pango-typo
 %patch101 -p0 -b .pango-ua
 %patch102 -p0 -b .pango-about
 
@@ -270,6 +266,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Apr 19 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-1.1.fc5
+- Update to 1.5.0.2
+
 * Sat Mar 11 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-9
 - Add a notice to the about dialog denoting this is a pango enabled build.
 - Tweak the user agent denoting this is a pango enabled build.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-5/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	2 Feb 2006 04:25:46 -0000	1.23
+++ sources	18 Apr 2006 04:32:46 -0000	1.24
@@ -1,3 +1,3 @@
 b628d5f24a49ab15d1943b7d694edd90  firefox-gnomestripe-0.1.tar.gz
-c76f02956645bc823241379e27f76bb5  firefox-1.5.0.1-source.tar.bz2
-963584af1fd5d8b7551c7e92f44f2242  firefox-langpacks-1.5.0.1-20060201.tar.bz2
+6bd65d899e9bcb16c28225899cc61a1e  firefox-1.5.0.2-source.tar.bz2
+d8668d3fd1754eb56c56619bec039510  firefox-langpacks-1.5.0.2-20060417.tar.bz2


--- firefox-1.5-pango-typo.patch DELETED ---


--- firefox-1.5.0.1-dumpstack.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 18 04:46:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 00:46:33 -0400
Subject: rpms/pm-utils/devel .cvsignore,1.18,1.19 sources,1.22,1.23
Message-ID: <200604180446.k3I4kXhK004522@cvs.devel.redhat.com>

Author: pjones

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

Modified Files:
	.cvsignore sources 
Log Message:
- update tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	11 Mar 2006 18:40:40 -0000	1.18
+++ .cvsignore	18 Apr 2006 04:46:30 -0000	1.19
@@ -1,3 +1,3 @@
 vbetool_0.5-1.tar.gz
 radeontool-1.5.tar.gz
-pm-utils-0.15.tar.gz
+pm-utils-0.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	11 Mar 2006 18:40:40 -0000	1.22
+++ sources	18 Apr 2006 04:46:30 -0000	1.23
@@ -1,3 +1,3 @@
 8065eebe5a2b163e43b40461bfe49a56  radeontool-1.5.tar.gz
 950a87f99d17bc4f4ced73cec7103859  vbetool_0.5-1.tar.gz
-f553d92add277509c08f750ef4ec2026  pm-utils-0.15.tar.gz
+e0a0e71885e1339dde1ba25da204a34e  pm-utils-0.17.tar.gz



From fedora-cvs-commits at redhat.com  Tue Apr 18 05:22:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 01:22:55 -0400
Subject: rpms/gnome-terminal/devel
	gnome-terminal-2.14.1-real-transparency.patch, 1.2,
	1.3 gnome-terminal.spec, 1.42, 1.43
Message-ID: <200604180522.k3I5Mt2j011235@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	gnome-terminal-2.14.1-real-transparency.patch 
	gnome-terminal.spec 
Log Message:
* Tue Apr 18 2006 Kristian H??gsberg <krh at redhat.com> 2.14.1-7
- Only use ARGB visual if a compositing manager is running to avoid
  slow-down caused by automatic compositor.


gnome-terminal-2.14.1-real-transparency.patch:
 terminal-screen.c     |   22 ++++++++++++++++------
 terminal-screen.h     |    2 ++
 terminal-widget-vte.c |    9 +++++++++
 terminal-widget.h     |    3 +++
 terminal-window.c     |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 terminal-window.h     |    2 ++
 terminal.c            |    2 ++
 7 files changed, 82 insertions(+), 6 deletions(-)

Index: gnome-terminal-2.14.1-real-transparency.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal-2.14.1-real-transparency.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-terminal-2.14.1-real-transparency.patch	17 Apr 2006 21:09:31 -0000	1.2
+++ gnome-terminal-2.14.1-real-transparency.patch	18 Apr 2006 05:22:51 -0000	1.3
@@ -1,5 +1,5 @@
---- ./src/terminal-screen.c.real-transparency	2006-04-17 16:57:41.000000000 -0400
-+++ ./src/terminal-screen.c	2006-04-17 16:57:41.000000000 -0400
+--- ./src/terminal-screen.c.real-transparency	2006-04-18 00:29:10.000000000 -0400
++++ ./src/terminal-screen.c	2006-04-18 00:29:10.000000000 -0400
 @@ -119,8 +119,6 @@
  
  static void terminal_screen_setup_dnd                (TerminalScreen *screen);
@@ -69,7 +69,7 @@
    if (screen->priv->profile)
      g_signal_emit (G_OBJECT (screen), signals[PROFILE_SET], 0);
 --- ./src/terminal-screen.h.real-transparency	2006-01-20 13:05:42.000000000 -0500
-+++ ./src/terminal-screen.h	2006-04-17 16:57:41.000000000 -0400
++++ ./src/terminal-screen.h	2006-04-18 00:29:10.000000000 -0400
 @@ -74,6 +74,8 @@
                                    TerminalProfile *profile);
  TerminalProfile* terminal_screen_get_profile (TerminalScreen *screen);
@@ -80,7 +80,7 @@
                                                     char           **argv);
  const char** terminal_screen_get_override_command (TerminalScreen  *screen);
 --- ./src/terminal-widget-vte.c.real-transparency	2006-01-20 13:05:42.000000000 -0500
-+++ ./src/terminal-widget-vte.c	2006-04-17 16:57:41.000000000 -0400
++++ ./src/terminal-widget-vte.c	2006-04-18 00:29:10.000000000 -0400
 @@ -351,6 +351,7 @@
  terminal_widget_set_background_transparent (GtkWidget *widget,
  					    gboolean   setting)
@@ -105,7 +105,7 @@
  					gboolean   setting)
  {
 --- ./src/terminal-widget.h.real-transparency	2006-01-20 13:05:43.000000000 -0500
-+++ ./src/terminal-widget.h	2006-04-17 16:57:41.000000000 -0400
++++ ./src/terminal-widget.h	2006-04-18 00:29:10.000000000 -0400
 @@ -90,6 +90,9 @@
  /* 0.0 = normal bg, 1.0 = all black bg, 0.5 = half darkened */
  void       terminal_widget_set_background_darkness    (GtkWidget            *widget,
@@ -117,77 +117,21 @@
                                                         gboolean              setting);
  void       terminal_widget_set_normal_gdk_font        (GtkWidget            *widget,
 --- ./src/terminal-window.c.real-transparency	2006-03-04 01:21:01.000000000 -0500
-+++ ./src/terminal-window.c	2006-04-17 17:05:20.000000000 -0400
-@@ -35,6 +35,11 @@
- #include <gdk/gdkkeysyms.h>
- #include <libsn/sn-launchee.h>
- 
-+#define HAVE_XFIXES 1
-+#ifdef HAVE_XFIXES
-+#include <X11/extensions/Xfixes.h>
-+#endif
-+
- struct _TerminalWindowPrivate
- {  
-   GtkWidget *main_vbox;
-@@ -85,6 +90,12 @@
++++ ./src/terminal-window.c	2006-04-18 00:58:59.000000000 -0400
+@@ -85,6 +85,9 @@
     * event-driven while GTK doesn't support _NET_WM_STATE_FULLSCREEN
     */
    guint fullscreen : 1;
 +
 +  /* Compositing manager integration*/
 +  guint have_argb_visual : 1;
-+  guint compositing_manager_present : 1;
-+  int selection_notify_event;
-+  int cm_selection_atom;
  };
  
  enum {
-@@ -749,6 +760,116 @@
-   gtk_clipboard_request_text (window->priv->clipboard, (GtkClipboardTextReceivedFunc) update_edit_menu, window);
+@@ -750,6 +753,47 @@
  }
  
-+#ifdef HAVE_XFIXES
-+
-+static GdkFilterReturn
-+compositing_manager_selection_changed (GdkXEvent *xevent,
-+				       GdkEvent *event,
-+				       gpointer data)
-+{
-+  TerminalWindow *window = (TerminalWindow *) data;
-+  XFixesSelectionNotifyEvent *selection_notify =
-+    (XFixesSelectionNotifyEvent *) xevent;
-+  GList *tmp;
-+
-+  if (window->priv == NULL ||
-+      selection_notify->type != window->priv->selection_notify_event ||
-+      selection_notify->selection != window->priv->cm_selection_atom)
-+    return GDK_FILTER_CONTINUE;
-+
-+  switch (selection_notify->subtype)
-+    {
-+    case XFixesSetSelectionOwnerNotify:
-+      if (selection_notify->owner != None)
-+	window->priv->compositing_manager_present = TRUE;
-+      else
-+	window->priv->compositing_manager_present = FALSE;
-+      break;
-+
-+    case XFixesSelectionWindowDestroyNotify:
-+    case XFixesSelectionClientCloseNotify:
-+      window->priv->compositing_manager_present = FALSE;
-+      break;
-+    }
-+
-+  for (tmp = window->priv->terms; tmp != NULL; tmp = tmp->next)
-+    {
-+      terminal_screen_reread_profile (tmp->data);
-+    }
-+
-+  return GDK_FILTER_REMOVE;
-+}
-+
-+static void
+ static void
 +initialize_alpha_mode (TerminalWindow *window)
 +{
 +  GdkScreen *screen;
@@ -195,72 +139,44 @@
 +  char *atom_name;
 +  Display *display;
 +  GdkDisplay *gdk_display;
-+  int fixes_major, fixes_minor;
-+  int event_base, error_base;
++  int atom;
 +
 +  gdk_display = gtk_widget_get_display (GTK_WIDGET (window));
 +  display = gdk_x11_display_get_xdisplay (gdk_display);
 +
-+  if (!XFixesQueryExtension (display, &event_base, &error_base))
-+    return;
-+
-+  /* XFixes version at least 1.0 will give us the selection events. */
-+  fixes_major = 1;
-+  fixes_minor = 0;
-+  if (!XFixesQueryVersion (display, &fixes_major, &fixes_minor))
-+    return;
-+
-+  /* We have a usable XFixes version, store the event number for later use. */
-+  window->priv->selection_notify_event = event_base + XFixesSelectionNotify;
-+
-+  /* Set RGBA colormap if possible so VTE can use real alpha channels
-+   * for transparency. */
-+  screen = gtk_widget_get_screen (GTK_WIDGET (window));
-+  colormap = gdk_screen_get_rgba_colormap (screen);
-+  if (colormap == NULL)
-+    return;
-+
-+  gtk_widget_set_colormap(GTK_WIDGET (window), colormap);
-+  window->priv->have_argb_visual = TRUE;
-+      
-+  gdk_window_add_filter (GTK_WIDGET (window)->window,
-+			 compositing_manager_selection_changed,
-+			 window);
-+
 +  atom_name = g_strdup_printf ("_NET_WM_CM_S%d",
 +			       gdk_screen_get_number (screen));
-+  window->priv->cm_selection_atom = gdk_x11_get_xatom_by_name (atom_name);
++  atom = gdk_x11_get_xatom_by_name (atom_name);
 +  g_free (atom_name);
++  
++  screen = gtk_widget_get_screen (GTK_WIDGET (window));
++  colormap = gdk_screen_get_rgba_colormap (screen);
 +
-+  if (XGetSelectionOwner (display, window->priv->cm_selection_atom) != None)
-+    window->priv->compositing_manager_present = TRUE;
-+  else
-+    window->priv->compositing_manager_present = FALSE;
-+}
-+
-+#else
++  if (colormap != NULL && XGetSelectionOwner (display, atom) != None)
++    {
++      /* Set RGBA colormap if possible so VTE can use real alpha
++       * channels for transparency. */
 +
-+static void
-+initialize_alpha_mode (TerminalWindow *window)
-+{
-+  window->priv->have_argb_visual = FALSE;
-+  window->priv->compositing_manager_present = FALSE;
++      gtk_widget_set_colormap(GTK_WIDGET (window), colormap);
++      window->priv->have_argb_visual = TRUE;
++    }
++  else
++    {
++      window->priv->have_argb_visual = FALSE;
++    }
 +}
 +
-+#endif
-+
-+
 +gboolean
 +terminal_window_uses_argb_visual (TerminalWindow *window)
 +{
-+    return window->priv->have_argb_visual &&
-+	window->priv->compositing_manager_present;
++  return window->priv->have_argb_visual;
 +}
 +
- static void
++static void
  terminal_window_init (TerminalWindow *window)
  {
-@@ -781,6 +902,8 @@
+   GtkWidget *mi;
+@@ -781,6 +825,8 @@
    window->priv->use_mnemonics = TRUE;
    window->priv->using_mnemonics = FALSE;
  
@@ -269,7 +185,7 @@
    /* force gtk to construct its GtkClipboard; otherwise our UI is very slow the first time we need it */
    window->priv->clipboard = gtk_clipboard_get_for_display (gtk_widget_get_display (GTK_WIDGET (window)), GDK_NONE);
  
-@@ -1233,8 +1356,20 @@
+@@ -1233,6 +1279,8 @@
  void terminal_window_realized_callback (GtkWidget *window,
                                          gpointer   user_data)
  {
@@ -277,21 +193,9 @@
 +
    gdk_window_set_group (window->window, window->window);
    g_signal_handlers_disconnect_by_func (window, terminal_window_realized_callback, NULL);
-+
-+#ifdef HAVE_XFIXES
-+  if (terminal_window->priv->have_argb_visual)
-+      XFixesSelectSelectionInput (GDK_WINDOW_XDISPLAY (window->window),
-+				  GDK_WINDOW_XID (window->window),
-+				  terminal_window->priv->cm_selection_atom,
-+				  XFixesSetSelectionOwnerNotifyMask |
-+				  XFixesSelectionWindowDestroyNotifyMask |
-+				  XFixesSelectionClientCloseNotifyMask);
-+#endif
  }
- 
- TerminalWindow*
 --- ./src/terminal-window.h.real-transparency	2005-11-20 10:06:34.000000000 -0500
-+++ ./src/terminal-window.h	2006-04-17 16:57:41.000000000 -0400
++++ ./src/terminal-window.h	2006-04-18 00:29:10.000000000 -0400
 @@ -98,6 +98,8 @@
  void terminal_window_set_startup_id (TerminalWindow *window,
                                       const char     *startup_id);
@@ -302,7 +206,7 @@
  
  #endif /* TERMINAL_WINDOW_H */
 --- ./src/terminal.c.real-transparency	2006-03-04 01:10:54.000000000 -0500
-+++ ./src/terminal.c	2006-04-17 16:57:41.000000000 -0400
++++ ./src/terminal.c	2006-04-18 00:29:10.000000000 -0400
 @@ -1966,6 +1966,8 @@
      
        terminal_window_add_screen (window, screen);


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gnome-terminal.spec	17 Apr 2006 21:16:59 -0000	1.42
+++ gnome-terminal.spec	18 Apr 2006 05:22:51 -0000	1.43
@@ -13,7 +13,7 @@
 Summary: GNOME Terminal
 Name: gnome-terminal
 Version: 2.14.1
-Release: 6
+Release: 7
 URL: http://www.gnome.org/
 Source0: gnome-terminal-%{version}.tar.bz2
 Source1: ne.po
@@ -103,6 +103,10 @@
 %{_libdir}/bonobo
 
 %changelog
+* Tue Apr 18 2006 Kristian H??gsberg <krh at redhat.com> 2.14.1-7
+- Only use ARGB visual if a compositing manager is running to avoid
+  slow-down caused by automatic compositor.
+
 * Mon Apr 17 2006 Kristian H??gsberg <krh at redhat.com> 2.14.1-6
 - Bumpd for rawhide build.
 



From fedora-cvs-commits at redhat.com  Tue Apr 18 05:26:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 01:26:38 -0400
Subject: rpms/gnome-terminal/devel gnome-terminal.spec,1.43,1.44
Message-ID: <200604180526.k3I5QcIH011306@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	gnome-terminal.spec 
Log Message:
* Tue Apr 18 2006 Kristian H??gsberg <krh at redhat.com> 2.14.1-8
- Bump for rawhide build.



Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gnome-terminal.spec	18 Apr 2006 05:22:51 -0000	1.43
+++ gnome-terminal.spec	18 Apr 2006 05:26:36 -0000	1.44
@@ -13,7 +13,7 @@
 Summary: GNOME Terminal
 Name: gnome-terminal
 Version: 2.14.1
-Release: 7
+Release: 8
 URL: http://www.gnome.org/
 Source0: gnome-terminal-%{version}.tar.bz2
 Source1: ne.po
@@ -103,6 +103,9 @@
 %{_libdir}/bonobo
 
 %changelog
+* Tue Apr 18 2006 Kristian H??gsberg <krh at redhat.com> 2.14.1-8
+- Bump for rawhide build.
+
 * Tue Apr 18 2006 Kristian H??gsberg <krh at redhat.com> 2.14.1-7
 - Only use ARGB visual if a compositing manager is running to avoid
   slow-down caused by automatic compositor.



From fedora-cvs-commits at redhat.com  Tue Apr 18 05:38:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 01:38:33 -0400
Subject: rpms/metacity/devel metacity.spec,1.69,1.70
Message-ID: <200604180538.k3I5cXUJ011419@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	metacity.spec 
Log Message:
* Tue Apr 18 2006 Kristian H??gsberg <krh at redhat.com> 2.15.0-6
- Bump for fc5-bling build.



Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- metacity.spec	13 Apr 2006 16:42:01 -0000	1.69
+++ metacity.spec	18 Apr 2006 05:38:31 -0000	1.70
@@ -7,7 +7,7 @@
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 5
+Release: 6
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
 Source0: metacity-%{metacity_version}.%{metacity_snapshot}.tar.gz
 Source1: libcm-%{libcm_version}.tar.gz
@@ -139,6 +139,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Apr 18 2006 Kristian H??gsberg <krh at redhat.com> 2.15.0-6
+- Bump for fc5-bling build.
+
 * Thu Apr 13 2006 Soren Sandmann <sandmann at redhat.com> 2.15.0-5
 - Update to libcm 0.0.19
 



From fedora-cvs-commits at redhat.com  Tue Apr 18 06:33:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 02:33:41 -0400
Subject: rpms/gimp/devel gimp-2.2.11-htmlview.patch, NONE, 1.1 .cvsignore,
	1.25, 1.26 gimp.spec, 1.91, 1.92 sources, 1.25,
	1.26 gimp-2.2.10-htmlview.patch, 1.1, NONE
Message-ID: <200604180633.k3I6XfAt032035@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/gimp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32000

Modified Files:
	.cvsignore gimp.spec sources 
Added Files:
	gimp-2.2.11-htmlview.patch 
Removed Files:
	gimp-2.2.10-htmlview.patch 
Log Message:
version 2.2.11


gimp-2.2.11-htmlview.patch:
 app/config/gimpguiconfig.c |    2 +-
 etc/gimprc                 |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gimp-2.2.11-htmlview.patch ---
--- gimp-2.2.11/app/config/gimpguiconfig.c.htmlview	2006-02-14 11:13:14.000000000 +0100
+++ gimp-2.2.11/app/config/gimpguiconfig.c	2006-04-18 08:30:02.000000000 +0200
@@ -43,7 +43,7 @@
 #ifdef G_OS_WIN32
 #  define DEFAULT_WEB_BROWSER      "not used on Windows"
 #else
-#  define DEFAULT_WEB_BROWSER      "mozilla %s"
+#  define DEFAULT_WEB_BROWSER      "htmlview %s"
 #endif
 
 
--- gimp-2.2.11/etc/gimprc.htmlview	2006-04-13 14:08:54.000000000 +0200
+++ gimp-2.2.11/etc/gimprc	2006-04-18 08:28:25.000000000 +0200
@@ -585,7 +585,7 @@
 # appended to the command with a space separating the two.  This is a single
 # filename.
 # 
-# (web-browser "mozilla %s")
+# (web-browser "htmlview %s")
 
 # The window type hint that is set on the toolbox. This may affect how your
 # window manager decorates and handles the toolbox window.  Possible values


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	29 Dec 2005 10:02:31 -0000	1.25
+++ .cvsignore	18 Apr 2006 06:33:28 -0000	1.26
@@ -1 +1 @@
-gimp-2.2.10.tar.bz2
+gimp-2.2.11.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- gimp.spec	3 Mar 2006 14:59:29 -0000	1.91
+++ gimp.spec	18 Apr 2006 06:33:29 -0000	1.92
@@ -11,7 +11,7 @@
 
 Summary:	The GNU Image Manipulation Program
 Name: 		gimp
-Version: 	2.2.10
+Version: 	2.2.11
 %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: %{?prever:0.0.%{prever}.}4
+Release: %{?prever:0.0.%{prever}.}1
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -77,7 +77,7 @@
 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.10-htmlview.patch
+Patch5:     gimp-2.2.11-htmlview.patch
 
 %description
 The GIMP (GNU Image Manipulation Program) is a powerful image
@@ -354,6 +354,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Apr 18 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-1
+- version 2.2.11
+
 * Fri Mar 03 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.10-4
 - use htmlview as default web browser (#183730, patch by Ben Levenson)
 - require hicolor-icon-theme (#182784, #182785)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	29 Dec 2005 10:02:35 -0000	1.25
+++ sources	18 Apr 2006 06:33:29 -0000	1.26
@@ -1 +1 @@
-aa29506ed2272af02941a7a601a7a097  gimp-2.2.10.tar.bz2
+0403e9b4e0415c99cd27b137b9839212  gimp-2.2.11.tar.bz2


--- gimp-2.2.10-htmlview.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 18 06:39:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 02:39:50 -0400
Subject: rpms/gimp/FC-5 gimp-2.2.11-htmlview.patch, NONE, 1.1 .cvsignore,
	1.25, 1.26 gimp.spec, 1.91, 1.92 sources, 1.25,
	1.26 gimp-2.2.10-htmlview.patch, 1.1, NONE
Message-ID: <200604180639.k3I6doCW000367@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	.cvsignore gimp.spec sources 
Added Files:
	gimp-2.2.11-htmlview.patch 
Removed Files:
	gimp-2.2.10-htmlview.patch 
Log Message:
version 2.2.11


gimp-2.2.11-htmlview.patch:
 app/config/gimpguiconfig.c |    2 +-
 etc/gimprc                 |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gimp-2.2.11-htmlview.patch ---
--- gimp-2.2.11/app/config/gimpguiconfig.c.htmlview	2006-02-14 11:13:14.000000000 +0100
+++ gimp-2.2.11/app/config/gimpguiconfig.c	2006-04-18 08:30:02.000000000 +0200
@@ -43,7 +43,7 @@
 #ifdef G_OS_WIN32
 #  define DEFAULT_WEB_BROWSER      "not used on Windows"
 #else
-#  define DEFAULT_WEB_BROWSER      "mozilla %s"
+#  define DEFAULT_WEB_BROWSER      "htmlview %s"
 #endif
 
 
--- gimp-2.2.11/etc/gimprc.htmlview	2006-04-13 14:08:54.000000000 +0200
+++ gimp-2.2.11/etc/gimprc	2006-04-18 08:28:25.000000000 +0200
@@ -585,7 +585,7 @@
 # appended to the command with a space separating the two.  This is a single
 # filename.
 # 
-# (web-browser "mozilla %s")
+# (web-browser "htmlview %s")
 
 # The window type hint that is set on the toolbox. This may affect how your
 # window manager decorates and handles the toolbox window.  Possible values


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-5/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	29 Dec 2005 10:02:31 -0000	1.25
+++ .cvsignore	18 Apr 2006 06:39:47 -0000	1.26
@@ -1 +1 @@
-gimp-2.2.10.tar.bz2
+gimp-2.2.11.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-5/gimp.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- gimp.spec	3 Mar 2006 14:59:29 -0000	1.91
+++ gimp.spec	18 Apr 2006 06:39:47 -0000	1.92
@@ -11,7 +11,7 @@
 
 Summary:	The GNU Image Manipulation Program
 Name: 		gimp
-Version: 	2.2.10
+Version: 	2.2.11
 %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: %{?prever:0.0.%{prever}.}4
+Release: 0.fc5.%{?prever:0.0.%{prever}.}1
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -77,7 +77,7 @@
 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.10-htmlview.patch
+Patch5:     gimp-2.2.11-htmlview.patch
 
 %description
 The GIMP (GNU Image Manipulation Program) is a powerful image
@@ -354,6 +354,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Apr 18 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-0.fc5.1
+- version 2.2.11
+
 * Fri Mar 03 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.10-4
 - use htmlview as default web browser (#183730, patch by Ben Levenson)
 - require hicolor-icon-theme (#182784, #182785)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-5/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	29 Dec 2005 10:02:35 -0000	1.25
+++ sources	18 Apr 2006 06:39:47 -0000	1.26
@@ -1 +1 @@
-aa29506ed2272af02941a7a601a7a097  gimp-2.2.10.tar.bz2
+0403e9b4e0415c99cd27b137b9839212  gimp-2.2.11.tar.bz2


--- gimp-2.2.10-htmlview.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 18 06:46:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 02:46:57 -0400
Subject: rpms/gimp/FC-4 .cvsignore, 1.24, 1.25 gimp.spec, 1.78, 1.79 sources,
	1.24, 1.25
Message-ID: <200604180646.k3I6kvBX016163@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	.cvsignore gimp.spec sources 
Log Message:
version 2.2.11



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-4/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	29 Dec 2005 12:42:39 -0000	1.24
+++ .cvsignore	18 Apr 2006 06:46:54 -0000	1.25
@@ -1 +1 @@
-gimp-2.2.10.tar.bz2
+gimp-2.2.11.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-4/gimp.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- gimp.spec	29 Dec 2005 12:42:39 -0000	1.78
+++ gimp.spec	18 Apr 2006 06:46:54 -0000	1.79
@@ -1,12 +1,17 @@
+%define _enable_modularX %{?enable_modularX:%{enable_modularX}}%{?!enable_modularX:0}
 %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:0}
+
+#
+#
 
 Summary:	The GNU Image Manipulation Program
 Name: 		gimp
-Version: 	2.2.10
+Version: 	2.2.11
 %define binver 2.2
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -14,7 +19,7 @@
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
 #define prever pre2
-Release: 	0.fc4.%{?prever:0.0.%{prever}.}1
+Release: 0.fc4.%{?prever:0.0.%{prever}.}1
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -35,7 +40,14 @@
 BuildRequires:	libpng-devel
 BuildRequires:	libmng-devel
 BuildRequires:	libexif-devel
+%if %_enable_modularX
+BuildRequires:	libX11-devel
+BuildRequires:	libXmu-devel
+# these are req's for libXmu but not yet required by libXmu-devel
+BuildRequires:	libXt-devel
+%else
 BuildRequires:	xorg-x11-devel
+%endif
 BuildRequires:	gimp-print-devel >= 4.2.0
 BuildRequires:	automake >= 1.7
 BuildRequires:	autoconf >= 2.54
@@ -43,20 +55,29 @@
 BuildRequires:	perl
 BuildRequires:	libwmf-devel >= 0.2.8
 BuildRequires:  intltool
+BuildRequires:  findutils
+%if %_with_lcms
+BuildRequires:	lcms-devel
+%endif
 Requires:	desktop-file-utils >= 0.9
 Requires:	glib2 >= 2.4.8
 Requires: 	gtk2 >= 2.4.14
 Requires:	pango >= 1.6.0
 Requires:	fontconfig >= 2.2.0
 Requires:	gimp-print >= 4.2.0
-Requires(post): /sbin/ldconfig /usr/bin/update-desktop-database
-Requires(postun): /sbin/ldconfig /usr/bin/update-desktop-database
+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
 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
 
 %description
 The GIMP (GNU Image Manipulation Program) is a powerful image
@@ -85,6 +106,7 @@
 %patch2 -p1 -b .icontheme
 %patch3 -p1 -b .gcc4
 %patch4 -p1 -b .gifload
+%patch5 -p1 -b .htmlview
 
 %build
 libtoolize --copy --force
@@ -95,8 +117,9 @@
 autoconf
 LIBAA="disable"; export LIBAA
 if [ ! -f configure ]; then
-  CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --quiet $MYARCH_FLAGS --prefix=%{_prefix}
+  ./autogen.sh --quiet $MYARCH_FLAGS --prefix=%{_prefix}
 fi
+CFLAGS="%optflags -fomit-frame-pointer" \
 %configure \
 	--disable-perl \
 %if %_enable_python
@@ -119,6 +142,11 @@
 %else
 	--disable-print \
 %endif
+%if %_with_lcms
+	--with-lcms \
+%else
+	--without-lcms \
+%endif
 ;
 
 make %{?_smp_mflags}
@@ -134,6 +162,11 @@
 # makeinstall macro won't work here - libexec is overriden
 make DESTDIR=$RPM_BUILD_ROOT install
 
+%ifos linux
+# remove .la files
+find %buildroot -name \*.la -exec %__rm -f {} \;
+%endif
+
 # symlink desktop icon
 ln -s ../../../../gimp/%{interfacever}/images/wilber-icon.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/gimp.png
 
@@ -305,17 +338,55 @@
 
 %{_libdir}/*.so
 %{_libdir}/*.a
-%{_libdir}/*.la
-%{_datadir}/aclocal/*.m4
 %{_libdir}/gimp/%{interfacever}/modules/*.a
+%ifnos linux
+%{_libdir}/*.la
 %{_libdir}/gimp/%{interfacever}/modules/*.la
+%endif
+%{_datadir}/aclocal/*.m4
 %{_includedir}/gimp-%{interfacever}
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Apr 18 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-0.fc4.1
+- version 2.2.11
+
+* Fri Mar 03 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.10-4
+- use htmlview as default web browser (#183730, patch by Ben Levenson)
+- require hicolor-icon-theme (#182784, #182785)
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2:2.2.10-2.2
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2:2.2.10-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Tue Jan 10 2006 Nils Philippsen <nphilipp at redhat.com>
+- rebuild with lcms
+
 * Thu Dec 29 2005 Nils Philippsen <nphilipp at redhat.com> - 2.2.10
 - version 2.2.10
 
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+- rebuilt
+
+* Fri Dec 09 2005 Nils Philippsen <nphilipp at redhat.com>
+- build with -fomit-frame-pointer to let assembly build with gcc 4.1
+
+* Fri Dec 02 2005 Nils Philippsen <nphilipp at redhat.com>
+- build with gcc 4.1
+
+* Tue Nov 08 2005 Nils Philippsen <nphilipp at redhat.com>
+- don't include .la files (#172626)
+- require findutils for building
+
+* Wed Nov 02 2005 Nils Philippsen <nphilipp at redhat.com> - 2.2.9
+- version 2.2.9
+- first attempt at dealing with modular X
+
+* Tue Aug 16 2005 Nils Philippsen <nphilipp at redhat.com>
+- rebuild
+
 * Thu Jul 28 2005 Nils Philippsen <nphilipp at redhat.com>
 - fix gimptool manpage symlink
 
@@ -323,6 +394,7 @@
 - version 2.2.8
 - clean up file list generation a bit
 - gimptool manpage is in section 1 not 5
+- list auto-generated .pyc and .pyo files
 
 * Fri May 13 2005 Nils Philippsen <nphilipp at redhat.com>
 - fix inline asm of MMX/SSE optimizations instead of using -mmmx and the like


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-4/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	29 Dec 2005 12:42:39 -0000	1.24
+++ sources	18 Apr 2006 06:46:54 -0000	1.25
@@ -1 +1 @@
-aa29506ed2272af02941a7a601a7a097  gimp-2.2.10.tar.bz2
+0403e9b4e0415c99cd27b137b9839212  gimp-2.2.11.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 18 06:48:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 02:48:06 -0400
Subject: rpms/gimp/FC-4 gimp-2.2.11-htmlview.patch,NONE,1.1
Message-ID: <200604180648.k3I6m6Q7017242@cvs.devel.redhat.com>

Author: nphilipp

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

Added Files:
	gimp-2.2.11-htmlview.patch 
Log Message:
use htmlview as default web browser (#183730, patch by Ben Levenson, modified)


gimp-2.2.11-htmlview.patch:
 app/config/gimpguiconfig.c |    2 +-
 etc/gimprc                 |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gimp-2.2.11-htmlview.patch ---
--- gimp-2.2.11/app/config/gimpguiconfig.c.htmlview	2006-02-14 11:13:14.000000000 +0100
+++ gimp-2.2.11/app/config/gimpguiconfig.c	2006-04-18 08:30:02.000000000 +0200
@@ -43,7 +43,7 @@
 #ifdef G_OS_WIN32
 #  define DEFAULT_WEB_BROWSER      "not used on Windows"
 #else
-#  define DEFAULT_WEB_BROWSER      "mozilla %s"
+#  define DEFAULT_WEB_BROWSER      "htmlview %s"
 #endif
 
 
--- gimp-2.2.11/etc/gimprc.htmlview	2006-04-13 14:08:54.000000000 +0200
+++ gimp-2.2.11/etc/gimprc	2006-04-18 08:28:25.000000000 +0200
@@ -585,7 +585,7 @@
 # appended to the command with a space separating the two.  This is a single
 # filename.
 # 
-# (web-browser "mozilla %s")
+# (web-browser "htmlview %s")
 
 # The window type hint that is set on the toolbox. This may affect how your
 # window manager decorates and handles the toolbox window.  Possible values



From fedora-cvs-commits at redhat.com  Tue Apr 18 07:06:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 03:06:24 -0400
Subject: rpms/firefox/FC-4 .cvsignore, 1.13, 1.14 firefox.spec, 1.78,
	1.79 sources, 1.15,
	1.16 firefox-1.0.7-CVE-2005-4134-long-history-dos.patch, 1.1,
	NONE firefox-1.0.7-CVE-2006-0292-javascript-unrooted.patch, 1.1,
	NONE firefox-1.0.7-CVE-2006-0296-XULDocument.persist.patch,
	1.1, NONE
Message-ID: <200604180706.k3I76Ovd022160@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	.cvsignore firefox.spec sources 
Removed Files:
	firefox-1.0.7-CVE-2005-4134-long-history-dos.patch 
	firefox-1.0.7-CVE-2006-0292-javascript-unrooted.patch 
	firefox-1.0.7-CVE-2006-0296-XULDocument.persist.patch 
Log Message:
* Mon Apr 17 2006 Christopher Aillon <caillon at redhat.com> 0:1.0.8-1.1.fc4
- Update to firefox 1.0.8



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-4/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	18 Jul 2005 22:13:14 -0000	1.13
+++ .cvsignore	18 Apr 2006 07:06:20 -0000	1.14
@@ -10,3 +10,4 @@
 firefox-1.0.3-source.tar.bz2
 firefox-1.0-locales.tar.bz2
 firefox-1.0.6-source.tar.bz2
+firefox-1.0.8-source.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-4/firefox.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- firefox.spec	2 Feb 2006 18:53:12 -0000	1.78
+++ firefox.spec	18 Apr 2006 07:06:21 -0000	1.79
@@ -10,8 +10,8 @@
 
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
-Version:        1.0.7
-Release:        1.2.fc4
+Version:        1.0.8
+Release:        1.1.fc4
 Epoch:          0
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
@@ -35,7 +35,6 @@
 # build patches
 Patch1:         firefox-0.7.3-freetype-compile.patch
 Patch2:         firefox-1.0-prdtoa.patch
-Patch3:         firefox-1.0-gcc4-compile.patch
 Patch4:         firefox-1.0-recv-fortify.patch
 Patch5:         firefox-1.0-gfxshared_s.patch
 Patch6:         firefox-1.0-nss-system-nspr.patch
@@ -75,10 +74,6 @@
 Patch106:       firefox-1.0-candidate-window.patch
 Patch107:       firefox-1.0-imgloader-comarray.patch
 
-Patch110:       firefox-1.0.7-CVE-2006-0296-XULDocument.persist.patch
-Patch111:       firefox-1.0.7-CVE-2006-0292-javascript-unrooted.patch
-Patch112:       firefox-1.0.7-CVE-2005-4134-long-history-dos.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libpng-devel, libjpeg-devel
 BuildRequires:  zlib-devel, zip
@@ -121,7 +116,6 @@
 %patch1 -p0
 %endif
 %patch2  -p0
-%patch3  -p0
 %patch4  -p0
 %patch5  -p0
 %patch6  -p1
@@ -153,10 +147,6 @@
 %patch106 -p1
 %patch107 -p0
 
-%patch110 -p0
-%patch111 -p0
-%patch112 -p0
-
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
 
@@ -334,6 +324,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Apr 17 2006 Christopher Aillon <caillon at redhat.com> 0:1.0.8-1.1.fc4
+- Update to firefox 1.0.8
+
 * Sun Jan 29 2006 Christopher Aillon <caillon at redhat.com> 0:1.0.7-1.2.fc4
 - Fix CVE-2005-4134, CVE-2006-0292, CVE-2006-0296
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-4/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	22 Sep 2005 19:20:49 -0000	1.15
+++ sources	18 Apr 2006 07:06:21 -0000	1.16
@@ -1,3 +1,3 @@
 b628d5f24a49ab15d1943b7d694edd90  firefox-gnomestripe-0.1.tar.gz
 2a9c2ae93baa98b96d28db380a805442  firefox-1.0-locales.tar.bz2
-8110edecdd755131dc512d7dc8206263  firefox-1.0.7-source.tar.bz2
+fda8175ccf756df346df5bc95bfb217f  firefox-1.0.8-source.tar.bz2


--- firefox-1.0.7-CVE-2005-4134-long-history-dos.patch DELETED ---


--- firefox-1.0.7-CVE-2006-0292-javascript-unrooted.patch DELETED ---


--- firefox-1.0.7-CVE-2006-0296-XULDocument.persist.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 18 07:26:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 03:26:21 -0400
Subject: rpms/firefox/FC-4 firefox-1.0-gcc4-compile.patch, 1.1,
	1.2 firefox.spec, 1.79, 1.80
Message-ID: <200604180726.k3I7QLAx009862@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	firefox-1.0-gcc4-compile.patch firefox.spec 
Log Message:
gcc4 fun

firefox-1.0-gcc4-compile.patch:
 gfx/src/freetype/nsFreeType.cpp                   |    2 +-
 netwerk/protocol/http/src/nsHttpConnectionMgr.cpp |    4 ++--
 widget/src/gtk2/nsDragService.cpp                 |   10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

Index: firefox-1.0-gcc4-compile.patch
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-4/firefox-1.0-gcc4-compile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-1.0-gcc4-compile.patch	4 Mar 2005 20:15:28 -0000	1.1
+++ firefox-1.0-gcc4-compile.patch	18 Apr 2006 07:26:17 -0000	1.2
@@ -32,39 +32,6 @@
  
      switch (name) {
      case MAX_CONNECTIONS:
-Index: security/nss/lib/pki1/oiddata.h
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/pki1/oiddata.h,v
-retrieving revision 1.1
-diff -u -r1.1 oiddata.h
---- security/nss/lib/pki1/oiddata.h	4 Jan 2002 05:22:07 -0000	1.1
-+++ security/nss/lib/pki1/oiddata.h	4 Mar 2005 19:59:58 -0000
-@@ -43,9 +43,6 @@
- #include "nsspki1t.h"
- #endif /* NSSPKI1T_H */
- 
--extern const NSSOID nss_builtin_oids[];
--extern const PRUint32 nss_builtin_oid_count;
--
- /*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
- /*extern const PRUint32 nss_attribute_type_alias_count;*/
- 
-Index: security/nss/lib/pki1/pki1.h
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/pki1/pki1.h,v
-retrieving revision 1.2
-diff -u -r1.2 pki1.h
---- security/nss/lib/pki1/pki1.h	19 Jul 2001 20:40:42 -0000	1.2
-+++ security/nss/lib/pki1/pki1.h	4 Mar 2005 19:59:59 -0000
-@@ -58,6 +58,8 @@
- /* fgmr 19990505 moved these here from oiddata.h */
- extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];
- extern const PRUint32 nss_attribute_type_alias_count;
-+extern const NSSOID nss_builtin_oids[];
-+extern const PRUint32 nss_builtin_oid_count;
- 
- /*
-  * NSSOID
 Index: widget/src/gtk2/nsDragService.cpp
 ===================================================================
 RCS file: /cvsroot/mozilla/widget/src/gtk2/nsDragService.cpp,v


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-4/firefox.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- firefox.spec	18 Apr 2006 07:06:21 -0000	1.79
+++ firefox.spec	18 Apr 2006 07:26:17 -0000	1.80
@@ -35,6 +35,7 @@
 # build patches
 Patch1:         firefox-0.7.3-freetype-compile.patch
 Patch2:         firefox-1.0-prdtoa.patch
+Patch3:         firefox-1.0-gcc4-compile.patch
 Patch4:         firefox-1.0-recv-fortify.patch
 Patch5:         firefox-1.0-gfxshared_s.patch
 Patch6:         firefox-1.0-nss-system-nspr.patch
@@ -116,6 +117,7 @@
 %patch1 -p0
 %endif
 %patch2  -p0
+%patch3  -p0
 %patch4  -p0
 %patch5  -p0
 %patch6  -p1



From fedora-cvs-commits at redhat.com  Tue Apr 18 09:02:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 05:02:59 -0400
Subject: rpms/man-pages/devel man-pages-2.29-sigprocmask.patch, NONE,
	1.1 .cvsignore, 1.21, 1.22 man-pages.spec, 1.39, 1.40 sources,
	1.21, 1.22
Message-ID: <200604180902.k3I92xsQ023307@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/man-pages/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23175

Modified Files:
	.cvsignore man-pages.spec sources 
Added Files:
	man-pages-2.29-sigprocmask.patch 
Log Message:
- update to 2.29
- fix sigprocmask(2) man page (#189121)


man-pages-2.29-sigprocmask.patch:
 sigprocmask.2 |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE man-pages-2.29-sigprocmask.patch ---
--- man-pages-2.29/man2/sigprocmask.2.pom	2006-04-18 10:27:53.000000000 +0200
+++ man-pages-2.29/man2/sigprocmask.2	2006-04-18 10:31:51.000000000 +0200
@@ -68,7 +68,7 @@
 is ignored),
 but the current value of the signal mask is nevertheless returned in
 .IR oldset 
-(it it is not NULL).
+(if it is not NULL).
 
 The use of
 .BR sigprocmask ()


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	14 Mar 2006 12:17:21 -0000	1.21
+++ .cvsignore	18 Apr 2006 09:02:51 -0000	1.22
@@ -1,3 +1,3 @@
 man-pages-extralocale.tar.bz2
 man2.tar.gz
-man-pages-2.25.tar.gz
+man-pages-2.29.tar.bz2


Index: man-pages.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- man-pages.spec	16 Mar 2006 11:40:17 -0000	1.39
+++ man-pages.spec	18 Apr 2006 09:02:51 -0000	1.40
@@ -1,10 +1,10 @@
 Summary: Man (manual) pages from the Linux Documentation Project.
 Name: man-pages
-Version: 2.25
-Release: 2
+Version: 2.29
+Release: 1
 License: distributable
 Group: Documentation
-Source0: http://www.kernel.org/pub/linux/docs/manpages/man-pages-%{version}.tar.gz
+Source0: http://www.kernel.org/pub/linux/docs/manpages/man-pages-%{version}.tar.bz2
 Source1: rpcgen.1
 Source2: resolver.5
 Source6: man-pages-extralocale.tar.bz2
@@ -25,6 +25,7 @@
 Patch22: man-pages-2.20-nscd.conf.patch
 Patch23: man-pages-2.25-dbopen.patch
 Patch24: man-pages-2.25-malloc.patch
+Patch25: man-pages-2.29-sigprocmask.patch
 
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -58,6 +59,7 @@
 %patch22 -p1 
 %patch23 -p1
 %patch24 -p1
+%patch25 -p1
 
 %build
 
@@ -149,11 +151,15 @@
 
 %files
 %defattr(0644,root,root,0755)
-%doc README man-pages-%{version}.Announce POSIX-COPYRIGHT
+%doc README man-pages-2.28.Announce POSIX-COPYRIGHT
 %{_mandir}/man*/*
 %{_mandir}/en/man*/*
 
 %changelog
+* Mon Apr 18 2006 Ivana Varekova <varekova at redhat.com> 2.29-1
+- update to 2.29
+- fix sigprocmask(2) man page (#189121)
+
 * Thu Mar 16 2006 Ivana Varekova <varekova at redhat.com> 2.25-2
 - fix MALLOC_CHECK_ description (#185502)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	14 Mar 2006 12:17:21 -0000	1.21
+++ sources	18 Apr 2006 09:02:51 -0000	1.22
@@ -1,3 +1,3 @@
 57f2e0500d177e05647990eae439a8ee  man-pages-extralocale.tar.bz2
 af09d031dcee66929510e078d00066f2  man2.tar.gz
-e08fe1037a97eaa9821e86427e1fdc98  man-pages-2.25.tar.gz
+4f3314650ea0ee615fb6468ff1cb1207  man-pages-2.29.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 18 10:11:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 06:11:45 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch, NONE,
	1.1 openoffice.org.spec, 1.663, 1.664
Message-ID: <200604181011.k3IABjes003724@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch 
Log Message:
ooo#64463# drop Xaw require

openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch:
 config_office/configure.in                          |    3 ++-
 extensions/source/plugin/inc/plugin/unx/plugcon.hxx |    2 +-
 extensions/source/plugin/unx/makefile.mk            |    4 ++--
 extensions/source/plugin/unx/npwrap.cxx             |    2 +-
 source/plugin/inc/plugin/unx/plugcon.hxx            |    0 
 source/plugin/unx/makefile.mk                       |    0 
 source/plugin/unx/npwrap.cxx                        |    0 
 7 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch ---
Index: source/plugin/inc/plugin/unx/plugcon.hxx
===================================================================
RCS file: /cvs/util/extensions/source/plugin/inc/plugin/unx/plugcon.hxx,v
retrieving revision 1.9
diff -u -r1.9 plugcon.hxx
--- openoffice.org.orig/extensions/source/plugin/inc/plugin/unx/plugcon.hxx	20 Jan 2006 12:58:34 -0000	1.9
+++ openoffice.org/extensions/source/plugin/inc/plugin/unx/plugcon.hxx	18 Apr 2006 09:59:51 -0000
@@ -69,7 +69,7 @@
 #if defined USE_MOTIF
 #include <Xm/DrawingA.h>
 #else
-#include <X11/Xaw/Label.h>
+#include <X11/Composite.h>
 #endif
 #include <X11/Xatom.h>
 #define XP_UNIX
Index: source/plugin/unx/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/plugin/unx/makefile.mk,v
retrieving revision 1.9
diff -u -r1.9 makefile.mk
--- openoffice.org.orig/extensions/source/plugin/unx/makefile.mk	20 Jan 2006 12:59:15 -0000	1.9
+++ openoffice.org/extensions/source/plugin/unx/makefile.mk	18 Apr 2006 09:59:51 -0000
@@ -72,9 +72,9 @@
 APP1STDLIBS+=-lXm -lXt -lXext -lX11 -ldl
 .ELSE
 .IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
-APP1STDLIBS+=-lXaw -lXt -lXext -lX11
+APP1STDLIBS+=-lXt -lXext -lX11
 .ELSE
-APP1STDLIBS+=-lXaw -lXt -lXext -lX11 -ldl
+APP1STDLIBS+=-lXt -lXext -lX11 -ldl
 .ENDIF
 .ENDIF
 
Index: source/plugin/unx/npwrap.cxx
===================================================================
RCS file: /cvs/util/extensions/source/plugin/unx/npwrap.cxx,v
retrieving revision 1.12
diff -u -r1.12 npwrap.cxx
--- openoffice.org.orig/extensions/source/plugin/unx/npwrap.cxx	8 Sep 2005 19:56:16 -0000	1.12
+++ openoffice.org/extensions/source/plugin/unx/npwrap.cxx	18 Apr 2006 09:59:52 -0000
@@ -117,7 +117,7 @@
 		xmDrawingAreaWidgetClass,
 #else
         "",
-		labelWidgetClass,
+		compositeWidgetClass,
 #endif
   		shell,
         XtNwidth, 200,
diff -ru config_office.orig/configure.in config_office/configure.in
--- openoffice.org.orig/config_office/configure.in	2006-04-18 11:00:38.000000000 +0100
+++ openoffice.org/config_office/configure.in	2006-04-18 11:02:40.000000000 +0100
@@ -3323,7 +3323,7 @@
    AC_PATH_X
    AC_PATH_XTRA
    CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-   AC_CHECK_HEADERS(X11/Xaw/Label.h,[],[AC_MSG_ERROR([Xaw include headers not found])])
+   AC_CHECK_HEADERS(X11/Composite.h,[],[AC_MSG_ERROR([Xt include headers not found])])
 
    if test "x$x_includes" = "x"; then
      x_includes="/usr/include"
@@ -3431,6 +3431,7 @@
     AC_MSG_RESULT([internal])
     SYSTEM_NAS=NO
     ENABLE_NAS=YES
+    AC_CHECK_HEADERS(X11/Xaw/Label.h,[],[AC_MSG_ERROR([Xaw include headers not found])])
     BUILD_TYPE="$BUILD_TYPE NAS"
     dnl ===================================================================
     dnl Check whether xmkmf program can be used, x systems only


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.663
retrieving revision 1.664
diff -u -r1.663 -r1.664
--- openoffice.org.spec	12 Apr 2006 14:17:35 -0000	1.663
+++ openoffice.org.spec	18 Apr 2006 10:11:41 -0000	1.664
@@ -1,6 +1,6 @@
 %define oootag OOB680
 %define ooomilestone 5
-%define rh_rpm_release 9
+%define rh_rpm_release 10
 
 %define build_fc6 1
 %define build_rhel4 0
@@ -155,7 +155,7 @@
 BuildRequires:	desktop-file-utils >= 0.9, evolution-data-server-devel
 BuildRequires:	libxslt-devel, unixODBC-devel, db4-devel, mozilla-devel
 %if ! %{build_rhel4}
-BuildRequires:	libXaw-devel, libXt-devel, libICE-devel
+BuildRequires:	libXt-devel, libICE-devel
 %endif
 %if ! %{internallibwpd}
 BuildRequires:  libwpd-devel >= 0.8.0
@@ -221,6 +221,7 @@
 Patch38: openoffice.org-2.0.1.gij4ant.patch
 %endif
 Patch39: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch40: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1134,6 +1135,7 @@
 cd ../..
 %endif
 %patch39 -p1 -b .rh188467.printingdefaults.patch
+%patch40 -p1 -b .ooo64463.extensions.noxaw.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -3680,6 +3682,10 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Tue Apr 18 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.10
+- ooo#64463# don't require Xaw for the use mozilla plugins (e.g flash)
+  in OOo feature
+
 * Wed Apr 12 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.9
 - rh#187939# not detecting changes to CUPS printers during execution
 - rh#188467# set printer font-handling defaults



From fedora-cvs-commits at redhat.com  Tue Apr 18 12:28:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 08:28:19 -0400
Subject: rpms/pilot-link/FC-4 pilot-link-0.11.8-realpath.path, NONE,
	1.1 pilot-link.spec, 1.30, 1.31
Message-ID: <200604181228.k3ICSJSs026759@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/pilot-link/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv26709

Modified Files:
	pilot-link.spec 
Added Files:
	pilot-link-0.11.8-realpath.path 
Log Message:
- fix pilot-xfer crash on missing device node #186779
- don't include unnecessary man page #185147



--- NEW FILE pilot-link-0.11.8-realpath.path ---
--- pilot-link-0.11.8/libpisock/connect.c.orig	2006-04-14 17:58:37.000000000 +0200
+++ pilot-link-0.11.8/libpisock/connect.c	2006-04-14 18:01:37.000000000 +0200
@@ -24,6 +24,12 @@
 #include <errno.h>
 #include <unistd.h>
 #include <sys/stat.h>
+#include <limits.h>
+
+/* PATH_MAX is not defined in limits.h on some platforms */
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
 
 #include "pi-socket.h"
 #include "pi-dlp.h"
@@ -106,7 +112,7 @@
 
 
 		if (portname) {
-			char realport[50];
+			char realport[PATH_MAX];
 			realpath(portname, realport);
 			errno = save_errno;
 


Index: pilot-link.spec
===================================================================
RCS file: /cvs/dist/rpms/pilot-link/FC-4/pilot-link.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- pilot-link.spec	29 Mar 2006 20:28:18 -0000	1.30
+++ pilot-link.spec	18 Apr 2006 12:28:16 -0000	1.31
@@ -4,7 +4,7 @@
 Summary: File transfer utilities between Linux and PalmPilots.
 Name: pilot-link
 Version: 0.11.8
-Release: 11.2.fc4
+Release: 11.3.fc4
 Source: pilot-link-%{version}.tar.bz2
 Url: http://www.pilot-link.org/
 Patch1: pilot-link-0.11.0-perlmd5.patch
@@ -15,6 +15,7 @@
 Patch7: pilot-link-0.11.8-readfile.patch
 Patch8: pilot-link-0.11.8-underquoted.patch
 Patch9: pilot-link-0.11.8-misc1.patch
+Patch10: pilot-link-0.11.8-realpath.path
 Epoch: 2
 License: GPL
 Group: Applications/Communications
@@ -69,6 +70,7 @@
 %patch7 -p1 -b .read
 %patch8 -p1 -b .underquoted
 %patch9 -p1 -b .misc1
+%patch10 -p1 -b .realpath
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %configure \
@@ -106,6 +108,8 @@
   make install -C bindings/Perl
   rm -f %{buildroot}%{_libdir}/perl5/vendor_perl/%{perl_version}/*/auto/PDA/Pilot/Pilot.bs \
         %{buildroot}%{_libdir}/perl5/site_perl/*/*/*/PDA/Pilot/.packlist
+%else
+  rm -f %{buildroot}%{_mandir}/man1/ietf2datebook*
 %endif
 
 # remove files we don't want to include
@@ -141,6 +145,10 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Tue Apr 18 2006 Than Ngo <than at redhat.com> 2:0.11.8-11.3.fc4
+- fix pilot-xfer crash on missing device node #186779
+- don't include unnecessary man page #185147
+
 * Wed Mar 29 2006 Than Ngo <than at redhat.com> 2:0.11.8-11.2.fc4 
 - rebuild to get rid of libpisock.so.9 
 



From fedora-cvs-commits at redhat.com  Tue Apr 18 12:58:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 08:58:18 -0400
Subject: rpms/dvd+rw-tools/FC-5 dvd+rw-tools.spec,1.18,1.19
Message-ID: <200604181258.k3ICwI5e016729@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/dvd+rw-tools/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16667

Modified Files:
	dvd+rw-tools.spec 
Log Message:
- compile with smaller buffer size
- removed O_EXCL patch



Index: dvd+rw-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/dvd+rw-tools/FC-5/dvd+rw-tools.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- dvd+rw-tools.spec	24 Mar 2006 13:57:45 -0000	1.18
+++ dvd+rw-tools.spec	18 Apr 2006 12:58:16 -0000	1.19
@@ -1,7 +1,7 @@
 Summary:	Toolchain to master DVD+RW/+R media
 Name:		dvd+rw-tools
 Version:	6.1
-Release: 	0.FC5.1
+Release: 	0.FC5.2
 License:	GPL
 Group:		Applications/Multimedia
 Source:		http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-%{version}.tar.gz
@@ -20,13 +20,13 @@
 %prep
 %setup -q  -n %{name}-%{version}
 %patch -p1 -b .manpatch
-%patch10 -p1 -b .excl
+#%patch10 -p1 -b .excl
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
 
-make
+make WARN="-DDEFAULT_BUF_SIZE_MB=16"
 cp %SOURCE1 index.html
 
 %install
@@ -54,6 +54,10 @@
 %{_mandir}/man1/growisofs.1*
 
 %changelog
+* Tue Apr 18 2006 Harald Hoyer <harald at redhat.com> - 6.1-0.FC5.2
+- compile with smaller buffer size
+- removed O_EXCL patch
+
 * Fri Mar 24 2006 Harald Hoyer <harald at redhat.com> - 6.1-0.FC5.1
 - version 6.1
 



From fedora-cvs-commits at redhat.com  Tue Apr 18 13:07:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 09:07:14 -0400
Subject: rpms/pilot-link/FC-4 pilot-link.spec,1.31,1.32
Message-ID: <200604181307.k3ID7EYe017662@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/pilot-link/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv17604

Modified Files:
	pilot-link.spec 
Log Message:
rebuilt



Index: pilot-link.spec
===================================================================
RCS file: /cvs/dist/rpms/pilot-link/FC-4/pilot-link.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- pilot-link.spec	18 Apr 2006 12:28:16 -0000	1.31
+++ pilot-link.spec	18 Apr 2006 13:07:10 -0000	1.32
@@ -4,7 +4,7 @@
 Summary: File transfer utilities between Linux and PalmPilots.
 Name: pilot-link
 Version: 0.11.8
-Release: 11.3.fc4
+Release: 11.4.fc4
 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
+* Tue Apr 18 2006 Than Ngo <than at redhat.com> 2:0.11.8-11.4.fc4 
+- rebuilt
+
 * Tue Apr 18 2006 Than Ngo <than at redhat.com> 2:0.11.8-11.3.fc4
 - fix pilot-xfer crash on missing device node #186779
 - don't include unnecessary man page #185147



From fedora-cvs-commits at redhat.com  Tue Apr 18 13:13:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 09:13:47 -0400
Subject: rpms/pilot-link/FC-5 pilot-link.spec,1.42,1.43
Message-ID: <200604181313.k3IDDlX1018344@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/pilot-link/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18292

Modified Files:
	pilot-link.spec 
Log Message:
rebuilt



Index: pilot-link.spec
===================================================================
RCS file: /cvs/dist/rpms/pilot-link/FC-5/pilot-link.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- pilot-link.spec	14 Apr 2006 17:03:32 -0000	1.42
+++ pilot-link.spec	18 Apr 2006 13:13:44 -0000	1.43
@@ -4,7 +4,7 @@
 Summary: File transfer utilities between Linux and PalmPilots.
 Name: pilot-link
 Version: 0.11.8
-Release: 12.3.fc5
+Release: 12.4.fc5
 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
+* Tue Apr 18 2006 Than Ngo <than at redhat.com> 2:0.11.8-12.4.fc5 
+- rebuilt
+
 * Fri Apr 14 2006 Than Ngo <than at redhat.com> 2:0.11.8-12.3.fc5
 - fix pilot-xfer crash on missing device node #186779
 - don't include unnecessary man page #185147



From fedora-cvs-commits at redhat.com  Tue Apr 18 13:14:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 09:14:08 -0400
Subject: rpms/system-config-printer/FC-5 .cvsignore, 1.60,
	1.61 printconf.spec, 1.65, 1.66 sources, 1.62, 1.63
Message-ID: <200604181314.k3IDE8Oq018464@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore printconf.spec sources 
Log Message:
* Tue Apr 18 2006 Tim Waugh <twaugh at redhat.com> 0.6.151.4-1
- 0.6.151.4:
  - Don't rely on printer-state-message attribute being present (bug #189062).



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/FC-5/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	8 Apr 2006 19:01:15 -0000	1.60
+++ .cvsignore	18 Apr 2006 13:14:05 -0000	1.61
@@ -40,3 +40,4 @@
 printconf-0.6.151.1.tar.bz2
 printconf-0.6.151.2.tar.bz2
 printconf-0.6.151.3.tar.bz2
+printconf-0.6.151.4.tar.bz2


Index: printconf.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/FC-5/printconf.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- printconf.spec	8 Apr 2006 19:01:15 -0000	1.65
+++ printconf.spec	18 Apr 2006 13:14:05 -0000	1.66
@@ -1,6 +1,6 @@
 Summary: A printer configuration backend/frontend combination.
 Name: system-config-printer
-Version: 0.6.151.3
+Version: 0.6.151.4
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -174,9 +174,13 @@
 
 
 %changelog
+* Tue Apr 18 2006 Tim Waugh <twaugh at redhat.com> 0.6.151.4-1
+- 0.6.151.4:
+  - Don't rely on printer-state-message attribute being present (bug #189062).
+
 * Sat Apr  8 2006 Tim Waugh <twaugh at redhat.com> 0.6.151.3-1
 - 0.6.151.3:
-  - Don't add default lpoptions to new queues (bug #188348).
+  - Changed default lpoptions behaviour for CUPS 1.2 (bug #188348).
 
 * Wed Mar 29 2006 Tim Waugh <twaugh at redhat.com> 0.6.151.2-1
 - 0.6.151.2:


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/FC-5/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	8 Apr 2006 19:01:32 -0000	1.62
+++ sources	18 Apr 2006 13:14:05 -0000	1.63
@@ -1 +1 @@
-0711e2353e6f59ddcbd38b076b1773a4  printconf-0.6.151.3.tar.bz2
+b7fa9941298fdd6647bcd1e2b77ea43d  printconf-0.6.151.4.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 18 14:23:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 10:23:24 -0400
Subject: rpms/xen/devel xen-3.0.1-cloexec.patch, 1.2, 1.3 xen.spec, 1.106,
	1.107
Message-ID: <200604181423.k3IENOCm022213@cvs.devel.redhat.com>

Author: veillard

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

Modified Files:
	xen-3.0.1-cloexec.patch xen.spec 
Log Message:
Incorporating fix from #188361, Daniel


xen-3.0.1-cloexec.patch:
 tools/python/xen/xend/XendCheckpoint.py             |    4 ++++
 xen-3.0.1/tools/libxc/xc_misc.c                     |   11 ++++++++++-
 xen-3.0.1/tools/python/xen/xend/server/SrvDaemon.py |    9 ++++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

Index: xen-3.0.1-cloexec.patch
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen-3.0.1-cloexec.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-3.0.1-cloexec.patch	7 Mar 2006 22:09:42 -0000	1.2
+++ xen-3.0.1-cloexec.patch	18 Apr 2006 14:23:19 -0000	1.3
@@ -49,3 +49,23 @@
      return fd;
  }
  
+--- xen-3.0.1/tools/python/xen/xend/XendCheckpoint.py	2006-03-01 17:38:59.000000000 -0500
++++ xen-3.0.1-save/tools/python/xen/xend/XendCheckpoint.py	2006-04-07 12:38:03.000000000 -0400
+@@ -22,6 +22,7 @@
+ from XendError import XendError
+ from XendLogging import log
+ 
++import fcntl
+ 
+ SIGNATURE = "LinuxGuestRecord"
+ XC_SAVE = "xc_save"
+@@ -181,6 +182,9 @@
+ 
+ 
+ def forkHelper(cmd, fd, inputHandler, closeToChild):
++    fcntl.fcntl(fd,          fcntl.F_SETFD,0)
++    fcntl.fcntl(xc.handle(), fcntl.F_SETFD,0)
++
+     child = xPopen3(cmd, True, -1, [fd, xc.handle()])
+ 
+     if closeToChild:


Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- xen.spec	9 Mar 2006 05:15:37 -0000	1.106
+++ xen.spec	18 Apr 2006 14:23:19 -0000	1.107
@@ -5,7 +5,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0.1
-Release: 4
+Release: 5
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -165,6 +165,9 @@
 %dir %{_localstatedir}/run/xenstored
 
 %changelog
+* Tue Apr 18 2006 Daniel Veillard <veillard at redhat.com> - 3.0.1-5
+- augment the close on exec patch with the fix for #188361
+
 * Thu Mar  9 2006 Jeremy Katz <katzj at redhat.com> - 3.0.1-4
 - add udev rule so that /dev/xen/evtchn gets created properly
 - make pygrub not use /tmp for SELinux



From fedora-cvs-commits at redhat.com  Tue Apr 18 14:36:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 10:36:19 -0400
Subject: rpms/sqlite/devel .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 sqlite.spec, 1.15, 1.16
Message-ID: <200604181436.k3IEaJ4b022427@cvs.devel.redhat.com>

Author: pnasrat

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

Modified Files:
	.cvsignore sources sqlite.spec 
Log Message:
New version


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sqlite/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	31 Jan 2006 19:31:38 -0000	1.9
+++ .cvsignore	18 Apr 2006 14:36:16 -0000	1.10
@@ -5,3 +5,4 @@
 sqlite-3.2.8.tar.gz
 sqlite-3.3.2.tar.gz
 sqlite-3.3.3.tar.gz
+sqlite-3.3.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sqlite/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	31 Jan 2006 19:31:38 -0000	1.9
+++ sources	18 Apr 2006 14:36:17 -0000	1.10
@@ -1 +1 @@
-eb5d9d7e7853b3af78e767d709b7fced  sqlite-3.3.3.tar.gz
+dd2a7b6f2a07a4403a0b5e17e8ed5b88  sqlite-3.3.5.tar.gz


Index: sqlite.spec
===================================================================
RCS file: /cvs/dist/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sqlite.spec	11 Feb 2006 05:43:20 -0000	1.15
+++ sqlite.spec	18 Apr 2006 14:36:17 -0000	1.16
@@ -3,8 +3,8 @@
 
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
-Version: 3.3.3
-Release: 1.2
+Version: 3.3.5
+Release: 1
 License: Public Domain
 Group: 	Applications/Databases
 URL: http://www.sqlite.org/
@@ -96,6 +96,9 @@
 %endif
 
 %changelog
+* Mon Apr 17 2006 Paul Nasrat <pnasrat at redhat.com> - 3.3.5-1
+- Update to 3.3.5
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.3.3-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Apr 18 14:38:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 10:38:18 -0400
Subject: rpms/dvd+rw-tools/devel dvd+rw-tools-5.17.4.8.6.manpatch, 1.1,
	1.2 dvd+rw-tools-5.21.4.10.8-excl.patch, 1.1,
	1.2 dvd+rw-tools.spec, 1.16, 1.17 sources, 1.6, 1.7
Message-ID: <200604181438.k3IEcI02022501@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/dvd+rw-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22488

Modified Files:
	dvd+rw-tools-5.17.4.8.6.manpatch 
	dvd+rw-tools-5.21.4.10.8-excl.patch dvd+rw-tools.spec sources 
Log Message:
- version 6.1


Index: dvd+rw-tools-5.17.4.8.6.manpatch
===================================================================
RCS file: /cvs/dist/rpms/dvd+rw-tools/devel/dvd+rw-tools-5.17.4.8.6.manpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dvd+rw-tools-5.17.4.8.6.manpatch	9 Sep 2004 04:23:06 -0000	1.1
+++ dvd+rw-tools-5.17.4.8.6.manpatch	18 Apr 2006 14:38:14 -0000	1.2
@@ -1,7 +1,7 @@
---- dvd+rw-tools-5.17.4.8.6/Makefile.m4.manpatch	2004-01-29 12:07:37.187269384 +0100
-+++ dvd+rw-tools-5.17.4.8.6/Makefile.m4	2004-01-29 12:08:19.313865168 +0100
-@@ -115,7 +115,7 @@
- LINK.o=$(LINK.cc)
+--- dvd+rw-tools-6.1/Makefile.m4.manpatch	2006-01-20 09:08:22.000000000 +0100
++++ dvd+rw-tools-6.1/Makefile.m4	2006-03-22 14:08:08.000000000 +0100
+@@ -173,7 +173,7 @@
+ LINK.o	=$(LINK.cc)
  
  prefix?=/usr/local
 -manprefix?=$(shell case $(prefix) in (*/usr/?*) echo $(prefix)/man ;; (*) echo $(prefix)/share/man ;; esac)
@@ -9,7 +9,7 @@
  
  bin_mode?=0755	# yes, default is *no* set-uid
  minus_o:=$(shell [[ `id -u` == 0 ]] && echo "-o root")
-@@ -123,8 +123,8 @@
+@@ -181,12 +181,12 @@
  install:	dvd+rw-tools
  	[[ -d $(prefix)/bin ]] || mkdir -p $(prefix)/bin
  	install $(minus_o) -m $(bin_mode) $(CHAIN) $(prefix)/bin
@@ -17,6 +17,12 @@
 -	install $(minus_o) -m 0644 growisofs.1 $(manprefix)/man1
 +	[[ -d $(mandir)/man1 ]] || mkdir -p $(mandir)/man1
 +	install $(minus_o) -m 0644 growisofs.1 $(mandir)/man1
+ 	[[ -f rpl8 ]] && \
+-	  install $(minus_o) -m $(bin_mode) rpl8 $(prefix)/bin
++	  install $(minus_o) -m $(bin_mode) rpl8 $(prefix)/bin || :
+ 	[[ -f btcflash ]] && \
+-	  install $(minus_o) -m $(bin_mode) btcflash $(prefix)/bin
++	  install $(minus_o) -m $(bin_mode) btcflash $(prefix)/bin || :
  ])
+ 
  # common section
- [

dvd+rw-tools-5.21.4.10.8-excl.patch:
 growisofs.c   |   28 +++++++++++++++++++++++++++-
 transport.hxx |   32 ++++++++++++++++++++++++++++++--
 2 files changed, 57 insertions(+), 3 deletions(-)

Index: dvd+rw-tools-5.21.4.10.8-excl.patch
===================================================================
RCS file: /cvs/dist/rpms/dvd+rw-tools/devel/dvd+rw-tools-5.21.4.10.8-excl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dvd+rw-tools-5.21.4.10.8-excl.patch	9 Sep 2004 04:24:14 -0000	1.1
+++ dvd+rw-tools-5.21.4.10.8-excl.patch	18 Apr 2006 14:38:14 -0000	1.2
@@ -1,6 +1,50 @@
---- dvd+rw-tools-5.21.4.10.8/transport.hxx.excl	2004-08-25 01:36:29.000000000 +0200
-+++ dvd+rw-tools-5.21.4.10.8/transport.hxx	2004-09-01 13:01:48.669600384 +0200
-@@ -191,6 +191,33 @@
+--- dvd+rw-tools-6.1/growisofs.c.excl	2006-01-26 22:16:54.000000000 +0100
++++ dvd+rw-tools-6.1/growisofs.c	2006-03-22 14:01:42.000000000 +0100
+@@ -593,6 +593,32 @@
+   return ret;
+ }
+ 
++int open64excl(const char *device, int mode)
++{
++  int f, i;
++    
++  f = open64(device, mode | O_EXCL);
++    
++  if (f < 0) {
++    if (errno != EBUSY)	
++      return f;
++      
++    for (i = 0; (i < 10) && (f == -1); i++) {
++      fprintf(stderr, "Error trying to open %s exclusively ... retrying in 1 second.\n", device);
++      usleep(1000000 + (long)(100000.0 * rand()/(RAND_MAX+1.0)));
++      f = open64(device, mode | O_EXCL);
++    }
++      
++    if (f < 0) {
++      fprintf(stderr, "Trying to open without locking.\n");
++      f = open64(device, mode);      
++    }
++  }
++    
++  return f;
++}
++
++
+ char *setup_fds (char *device)
+ { char *odevice;
+   uid_t uid=getuid();
+@@ -667,7 +693,7 @@
+      * with set-root-uid should fill in for the kernel
+      * deficiency...
+      */
+-    if ((fd = open64 (device,O_RDWR|O_NONBLOCK)) >= 0)
++    if ((fd = open64excl (device,O_RDWR|O_NONBLOCK)) >= 0)
+     {	if (fstat64 (fd,&sc) < 0)
+ 	    fprintf (stderr,":-( unable to stat64(\"%s\"): ",device),
+ 	    perror (NULL), exit (FATAL_START(errno));
+--- dvd+rw-tools-6.1/transport.hxx.excl	2006-01-26 09:02:32.000000000 +0100
++++ dvd+rw-tools-6.1/transport.hxx	2006-03-22 13:58:38.000000000 +0100
+@@ -217,6 +217,33 @@
      ~Scsi_Command()	{ if (fd>=0 && autoclose) close(fd),fd=-1;
  			  if (filename) free(filename),filename=NULL;
  			}
@@ -34,7 +78,7 @@
      int associate (const char *file,const struct stat *ref=NULL)
      { struct stat sb;
  
-@@ -199,8 +226,9 @@
+@@ -225,8 +252,9 @@
  	 * execution under Linux kernel 2.6[.8]. Under 2.4 it
  	 * falls down to O_RDONLY...
  	 */
@@ -46,47 +90,3 @@
  	if (fstat(fd,&sb) < 0)				return 0;
  	if (!S_ISBLK(sb.st_mode))	{ errno=ENOTBLK;return 0; }
  
---- dvd+rw-tools-5.21.4.10.8/growisofs.c.excl	2004-08-25 01:02:29.000000000 +0200
-+++ dvd+rw-tools-5.21.4.10.8/growisofs.c	2004-09-01 13:01:09.706523672 +0200
-@@ -487,6 +487,32 @@
-   return ret;
- }
- 
-+int open64excl(const char *device, int mode)
-+{
-+  int f, i;
-+    
-+  f = open64(device, mode | O_EXCL);
-+    
-+  if (f < 0) {
-+    if (errno != EBUSY)	
-+      return f;
-+      
-+    for (i = 0; (i < 10) && (f == -1); i++) {
-+      fprintf(stderr, "Error trying to open %s exclusively ... retrying in 1 second.\n", device);
-+      usleep(1000000 + (long)(100000.0 * rand()/(RAND_MAX+1.0)));
-+      f = open64(device, mode | O_EXCL);
-+    }
-+      
-+    if (f < 0) {
-+      fprintf(stderr, "Trying to open without locking.\n");
-+      f = open64(device, mode);      
-+    }
-+  }
-+    
-+  return f;
-+}
-+
-+
- char *setup_fds (char *device)
- { char *odevice;
-   uid_t uid=getuid();
-@@ -561,7 +587,7 @@
-      * with set-root-uid should fill in for the kernel
-      * deficiency...
-      */
--    if ((fd = open64 (device,O_RDWR|O_NONBLOCK)) >= 0)
-+    if ((fd = open64excl(device,O_RDWR|O_NONBLOCK)) >= 0)
- 	ioctl_handle=(void *)(long)fd;
-     else
- 	ioctl_handle=(void *)(long)dup(in_fd);


Index: dvd+rw-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/dvd+rw-tools/devel/dvd+rw-tools.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- dvd+rw-tools.spec	11 Feb 2006 02:28:10 -0000	1.16
+++ dvd+rw-tools.spec	18 Apr 2006 14:38:14 -0000	1.17
@@ -1,7 +1,7 @@
 Summary:	Toolchain to master DVD+RW/+R media
 Name:		dvd+rw-tools
-Version:	5.21.4.10.8
-Release: 6.2.1
+Version:	6.1
+Release: 	1
 License:	GPL
 Group:		Applications/Multimedia
 Source:		http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-%{version}.tar.gz
@@ -20,13 +20,13 @@
 %prep
 %setup -q  -n %{name}-%{version}
 %patch -p1 -b .manpatch
-%patch10 -p1 -b .excl
+#%patch10 -p1 -b .excl
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
 
-make
+make WARN="-DDEFAULT_BUF_SIZE_MB=16"
 cp %SOURCE1 index.html
 
 %install
@@ -54,6 +54,9 @@
 %{_mandir}/man1/growisofs.1*
 
 %changelog
+* Fri Mar 24 2006 Harald Hoyer <harald at redhat.com> - 6.1-0.FC5.1
+- version 6.1
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.21.4.10.8-6.2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dvd+rw-tools/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Sep 2004 04:24:11 -0000	1.6
+++ sources	18 Apr 2006 14:38:14 -0000	1.7
@@ -1 +1 @@
-b931c02e2b23342f664276ef26d1502c  dvd+rw-tools-5.21.4.10.8.tar.gz
+d6bad594e55a2e0d7cf76ce452fce399  dvd+rw-tools-6.1.tar.gz



From fedora-cvs-commits at redhat.com  Tue Apr 18 14:44:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 10:44:53 -0400
Subject: rpms/dvd+rw-tools/devel dvd+rw-tools.spec,1.17,1.18
Message-ID: <200604181444.k3IEirwA001814@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/dvd+rw-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1778

Modified Files:
	dvd+rw-tools.spec 
Log Message:



Index: dvd+rw-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/dvd+rw-tools/devel/dvd+rw-tools.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- dvd+rw-tools.spec	18 Apr 2006 14:38:14 -0000	1.17
+++ dvd+rw-tools.spec	18 Apr 2006 14:44:50 -0000	1.18
@@ -1,7 +1,7 @@
 Summary:	Toolchain to master DVD+RW/+R media
 Name:		dvd+rw-tools
 Version:	6.1
-Release: 	1
+Release: 	2
 License:	GPL
 Group:		Applications/Multimedia
 Source:		http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-%{version}.tar.gz
@@ -54,7 +54,11 @@
 %{_mandir}/man1/growisofs.1*
 
 %changelog
-* Fri Mar 24 2006 Harald Hoyer <harald at redhat.com> - 6.1-0.FC5.1
+* Tue Apr 18 2006 Harald Hoyer <harald at redhat.com> - 6.1-2
+- compile with smaller buffer size
+- removed O_EXCL patch
+
+* Fri Mar 24 2006 Harald Hoyer <harald at redhat.com> - 6.1-1
 - version 6.1
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.21.4.10.8-6.2.1



From fedora-cvs-commits at redhat.com  Tue Apr 18 14:45:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 10:45:18 -0400
Subject: rpms/dvd+rw-tools/devel .cvsignore,1.6,1.7
Message-ID: <200604181445.k3IEjIFR002008@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/dvd+rw-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1977

Modified Files:
	.cvsignore 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dvd+rw-tools/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Sep 2004 04:24:11 -0000	1.6
+++ .cvsignore	18 Apr 2006 14:45:16 -0000	1.7
@@ -1 +1 @@
-dvd+rw-tools-5.21.4.10.8.tar.gz
+dvd+rw-tools-6.1.tar.gz



From fedora-cvs-commits at redhat.com  Tue Apr 18 14:50:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 10:50:14 -0400
Subject: rpms/dvd+rw-tools/devel dvd+rw-tools.spec, 1.18,
	1.19 dvd+rw-tools-5.21.4.10.8-excl.patch, 1.2, NONE
Message-ID: <200604181450.k3IEoEpR017368@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/dvd+rw-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17306

Modified Files:
	dvd+rw-tools.spec 
Removed Files:
	dvd+rw-tools-5.21.4.10.8-excl.patch 
Log Message:



Index: dvd+rw-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/dvd+rw-tools/devel/dvd+rw-tools.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- dvd+rw-tools.spec	18 Apr 2006 14:44:50 -0000	1.18
+++ dvd+rw-tools.spec	18 Apr 2006 14:50:12 -0000	1.19
@@ -7,7 +7,6 @@
 Source:		http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-%{version}.tar.gz
 Source1: 	index.html
 Patch: 		dvd+rw-tools-5.17.4.8.6.manpatch
-Patch10: 	dvd+rw-tools-5.21.4.10.8-excl.patch
 URL:		http://fy.chalmers.se/~appro/linux/DVD+RW/
 Requires:	mkisofs >= 2.0
 BuildRoot:	%{_tmppath}/%{name}-root
@@ -20,7 +19,6 @@
 %prep
 %setup -q  -n %{name}-%{version}
 %patch -p1 -b .manpatch
-#%patch10 -p1 -b .excl
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"


--- dvd+rw-tools-5.21.4.10.8-excl.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 18 14:54:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 10:54:07 -0400
Subject: rpms/dvd+rw-tools/devel dvd+rw-tools.spec,1.19,1.20
Message-ID: <200604181454.k3IEs7fC018982@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/dvd+rw-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18919

Modified Files:
	dvd+rw-tools.spec 
Log Message:



Index: dvd+rw-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/dvd+rw-tools/devel/dvd+rw-tools.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- dvd+rw-tools.spec	18 Apr 2006 14:50:12 -0000	1.19
+++ dvd+rw-tools.spec	18 Apr 2006 14:54:02 -0000	1.20
@@ -1,7 +1,7 @@
 Summary:	Toolchain to master DVD+RW/+R media
 Name:		dvd+rw-tools
 Version:	6.1
-Release: 	2
+Release: 	3
 License:	GPL
 Group:		Applications/Multimedia
 Source:		http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-%{version}.tar.gz



From fedora-cvs-commits at redhat.com  Tue Apr 18 15:04:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 11:04:20 -0400
Subject: rpms/firefox/devel firefox.spec,1.115,1.116 sources,1.25,1.26
Message-ID: <200604181504.k3IF4Ke7021926@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	firefox.spec sources 
Log Message:
* Tue Apr 18 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-3
- Drop some broken langpacks



Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- firefox.spec	14 Apr 2006 14:49:16 -0000	1.115
+++ firefox.spec	18 Apr 2006 15:04:03 -0000	1.116
@@ -9,7 +9,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.2
-Release:        2
+Release:        3
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -20,7 +20,7 @@
 %endif
 Source0:        %{tarball}
 Source1:        firefox-gnomestripe-0.1.tar.gz
-Source2:        firefox-langpacks-%{version}-20060413.tar.bz2
+Source2:        firefox-langpacks-%{version}-20060417.tar.bz2
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
 Source12:       firefox-redhat-default-bookmarks.html
@@ -266,6 +266,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Apr 18 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-3
+- Drop some broken langpacks
+
 * Thu Apr 13 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-2
 - Firefox 1.5.0.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	14 Apr 2006 06:46:41 -0000	1.25
+++ sources	18 Apr 2006 15:04:17 -0000	1.26
@@ -1,3 +1,3 @@
 b628d5f24a49ab15d1943b7d694edd90  firefox-gnomestripe-0.1.tar.gz
 6bd65d899e9bcb16c28225899cc61a1e  firefox-1.5.0.2-source.tar.bz2
-d0ca5cf530f1a60d0ca0180ddcd10b8b  firefox-langpacks-1.5.0.2-20060413.tar.bz2
+d8668d3fd1754eb56c56619bec039510  firefox-langpacks-1.5.0.2-20060417.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 18 15:46:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 11:46:05 -0400
Subject: rpms/hplip/FC-5 hplip-strcasecmp.patch, 1.1, 1.2 hplip.spec, 1.60,
	1.61
Message-ID: <200604181546.k3IFk5S6016346@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip-strcasecmp.patch hplip.spec 
Log Message:
* Tue Apr 18 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-1.3
- Fixed another case-sensitive match.


hplip-strcasecmp.patch:
 device.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: hplip-strcasecmp.patch
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/hplip-strcasecmp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hplip-strcasecmp.patch	4 Apr 2006 10:44:43 -0000	1.1
+++ hplip-strcasecmp.patch	18 Apr 2006 15:45:52 -0000	1.2
@@ -1,5 +1,5 @@
---- hplip-0.9.10/io/hpiod/device.cpp.strcasecmp	2006-04-04 11:00:24.000000000 +0100
-+++ hplip-0.9.10/io/hpiod/device.cpp	2006-04-04 11:00:40.000000000 +0100
+--- hplip-0.9.10/io/hpiod/device.cpp.strcasecmp	2006-03-03 00:07:26.000000000 +0000
++++ hplip-0.9.10/io/hpiod/device.cpp	2006-04-18 15:44:14.000000000 +0100
 @@ -633,7 +633,7 @@
     pSys->GeneralizeModel(sz, gen, sizeof(gen));
  
@@ -9,3 +9,12 @@
        goto bugout;
  
     if (usb_get_string_simple(hd, dev->descriptor.iSerialNumber, sz, sizeof(sz)) < 0)
+@@ -913,7 +913,7 @@
+    /* Make sure uri model still matches device id model. */
+    pSys->GetURIModel(URI, uriModel, sizeof(uriModel));
+    pSys->GetModel(ID, model, sizeof(model));
+-   if (strcmp(uriModel, model) != 0)
++   if (strcasecmp(uriModel, model) != 0)
+    {
+       *result = R_INVALID_DEVICE_NODE;  /* found different device plugged in */  
+       syslog(LOG_ERR, "invalid model %s != %s Device::Open %s %d\n", uriModel, model, __FILE__, __LINE__);


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/hplip.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- hplip.spec	4 Apr 2006 11:42:23 -0000	1.60
+++ hplip.spec	18 Apr 2006 15:45:52 -0000	1.61
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 0.9.10
-Release: 1.2
+Release: 1.3
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -184,6 +184,9 @@
 fi
 
 %changelog
+* Tue Apr 18 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-1.3
+- Fixed another case-sensitive match.
+
 * Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-1.2
 - Use case-insensitive matching.  0.9.8 gave all-uppercase in some
   situations.



From fedora-cvs-commits at redhat.com  Tue Apr 18 15:48:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 11:48:53 -0400
Subject: rpms/hplip/devel hplip-strcasecmp.patch, 1.1, 1.2 hplip.spec, 1.65,
	1.66
Message-ID: <200604181548.k3IFmrvA029986@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip-strcasecmp.patch hplip.spec 
Log Message:
* Tue Apr 18 2006 Tim Waugh <twaugh at redhat.com>
- Fixed another case-sensitive match.


hplip-strcasecmp.patch:
 device.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: hplip-strcasecmp.patch
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip-strcasecmp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hplip-strcasecmp.patch	4 Apr 2006 10:45:59 -0000	1.1
+++ hplip-strcasecmp.patch	18 Apr 2006 15:48:48 -0000	1.2
@@ -1,5 +1,5 @@
---- hplip-0.9.10/io/hpiod/device.cpp.strcasecmp	2006-04-04 11:00:24.000000000 +0100
-+++ hplip-0.9.10/io/hpiod/device.cpp	2006-04-04 11:00:40.000000000 +0100
+--- hplip-0.9.10/io/hpiod/device.cpp.strcasecmp	2006-03-03 00:07:26.000000000 +0000
++++ hplip-0.9.10/io/hpiod/device.cpp	2006-04-18 15:44:14.000000000 +0100
 @@ -633,7 +633,7 @@
     pSys->GeneralizeModel(sz, gen, sizeof(gen));
  
@@ -9,3 +9,12 @@
        goto bugout;
  
     if (usb_get_string_simple(hd, dev->descriptor.iSerialNumber, sz, sizeof(sz)) < 0)
+@@ -913,7 +913,7 @@
+    /* Make sure uri model still matches device id model. */
+    pSys->GetURIModel(URI, uriModel, sizeof(uriModel));
+    pSys->GetModel(ID, model, sizeof(model));
+-   if (strcmp(uriModel, model) != 0)
++   if (strcasecmp(uriModel, model) != 0)
+    {
+       *result = R_INVALID_DEVICE_NODE;  /* found different device plugged in */  
+       syslog(LOG_ERR, "invalid model %s != %s Device::Open %s %d\n", uriModel, model, __FILE__, __LINE__);


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- hplip.spec	4 Apr 2006 12:02:26 -0000	1.65
+++ hplip.spec	18 Apr 2006 15:48:48 -0000	1.66
@@ -170,6 +170,9 @@
 fi
 
 %changelog
+* Tue Apr 18 2006 Tim Waugh <twaugh at redhat.com>
+- Fixed another case-sensitive match.
+
 * Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-4
 - Use case-insensitive matching.  0.9.8 gave all-uppercase in some
   situations.



From fedora-cvs-commits at redhat.com  Tue Apr 18 15:57:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 11:57:02 -0400
Subject: rpms/hplip/devel hplip-0.9.10-1.patch, NONE,
	1.1 hplip-strcasecmp.patch, 1.2, 1.3 hplip.spec, 1.66, 1.67
Message-ID: <200604181557.k3IFv0px000893@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip-strcasecmp.patch hplip.spec 
Added Files:
	hplip-0.9.10-1.patch 
Log Message:
- Patchlevel 1.

hplip-0.9.10-1.patch:
 device.cpp |   12 ------------
 1 files changed, 12 deletions(-)

--- NEW FILE hplip-0.9.10-1.patch ---
diff -uNr hplip-0.9.10.old/io/hpiod/device.cpp hplip-0.9.10.new/io/hpiod/device.cpp
--- hplip-0.9.10.old/io/hpiod/device.cpp	2006-03-02 16:07:26.000000000 -0800
+++ hplip-0.9.10.new/io/hpiod/device.cpp	2006-04-07 16:07:07.000000000 -0700
@@ -846,8 +846,6 @@
 
 int Device::Open(char *sendBuf, int *result)
 {
-   char uriModel[128];
-   char model[128];
    int len=0;
    int config, interface, altset;
 
@@ -910,16 +908,6 @@
       }        
    }
 
-   /* Make sure uri model still matches device id model. */
-   pSys->GetURIModel(URI, uriModel, sizeof(uriModel));
-   pSys->GetModel(ID, model, sizeof(model));
-   if (strcmp(uriModel, model) != 0)
-   {
-      *result = R_INVALID_DEVICE_NODE;  /* found different device plugged in */  
-      syslog(LOG_ERR, "invalid model %s != %s Device::Open %s %d\n", uriModel, model, __FILE__, __LINE__);
-      goto blackout;
-   }
-
 blackout:
    pthread_mutex_unlock(&mutex);
 

hplip-strcasecmp.patch:
 device.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: hplip-strcasecmp.patch
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip-strcasecmp.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hplip-strcasecmp.patch	18 Apr 2006 15:48:48 -0000	1.2
+++ hplip-strcasecmp.patch	18 Apr 2006 15:56:58 -0000	1.3
@@ -1,5 +1,5 @@
---- hplip-0.9.10/io/hpiod/device.cpp.strcasecmp	2006-03-03 00:07:26.000000000 +0000
-+++ hplip-0.9.10/io/hpiod/device.cpp	2006-04-18 15:44:14.000000000 +0100
+--- hplip-0.9.10/io/hpiod/device.cpp.strcasecmp	2006-04-18 16:54:40.000000000 +0100
++++ hplip-0.9.10/io/hpiod/device.cpp	2006-04-18 16:54:57.000000000 +0100
 @@ -633,7 +633,7 @@
     pSys->GeneralizeModel(sz, gen, sizeof(gen));
  
@@ -9,12 +9,3 @@
        goto bugout;
  
     if (usb_get_string_simple(hd, dev->descriptor.iSerialNumber, sz, sizeof(sz)) < 0)
-@@ -913,7 +913,7 @@
-    /* Make sure uri model still matches device id model. */
-    pSys->GetURIModel(URI, uriModel, sizeof(uriModel));
-    pSys->GetModel(ID, model, sizeof(model));
--   if (strcmp(uriModel, model) != 0)
-+   if (strcasecmp(uriModel, model) != 0)
-    {
-       *result = R_INVALID_DEVICE_NODE;  /* found different device plugged in */  
-       syslog(LOG_ERR, "invalid model %s != %s Device::Open %s %d\n", uriModel, model, __FILE__, __LINE__);


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- hplip.spec	18 Apr 2006 15:48:48 -0000	1.66
+++ hplip.spec	18 Apr 2006 15:56:58 -0000	1.67
@@ -16,6 +16,7 @@
 Patch4: hplip-cups-backend.patch
 Patch5: hplip-strcasecmp.patch
 Patch6: hplip-revert-hpijs.patch
+Patch7: hplip-0.9.10-1.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -81,6 +82,9 @@
 # Last known working hpijs comes from 0.9.8, so use that.
 %patch6 -p1 -b .revert-hpijs
 
+# Patchlevel 1.
+%patch7 -p1 -b .0.9.10-1
+
 autoconf # for patch4
 
 %build
@@ -171,6 +175,7 @@
 
 %changelog
 * Tue Apr 18 2006 Tim Waugh <twaugh at redhat.com>
+- Patchlevel 1.
 - Fixed another case-sensitive match.
 
 * Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-4



From fedora-cvs-commits at redhat.com  Tue Apr 18 15:57:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 11:57:37 -0400
Subject: rpms/hplip/FC-5 hplip-0.9.10-1.patch, NONE,
	1.1 hplip-strcasecmp.patch, 1.2, 1.3 hplip.spec, 1.61, 1.62
Message-ID: <200604181557.k3IFvbIi001123@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip-strcasecmp.patch hplip.spec 
Added Files:
	hplip-0.9.10-1.patch 
Log Message:
- Patchlevel 1.

hplip-0.9.10-1.patch:
 device.cpp |   12 ------------
 1 files changed, 12 deletions(-)

--- NEW FILE hplip-0.9.10-1.patch ---
diff -uNr hplip-0.9.10.old/io/hpiod/device.cpp hplip-0.9.10.new/io/hpiod/device.cpp
--- hplip-0.9.10.old/io/hpiod/device.cpp	2006-03-02 16:07:26.000000000 -0800
+++ hplip-0.9.10.new/io/hpiod/device.cpp	2006-04-07 16:07:07.000000000 -0700
@@ -846,8 +846,6 @@
 
 int Device::Open(char *sendBuf, int *result)
 {
-   char uriModel[128];
-   char model[128];
    int len=0;
    int config, interface, altset;
 
@@ -910,16 +908,6 @@
       }        
    }
 
-   /* Make sure uri model still matches device id model. */
-   pSys->GetURIModel(URI, uriModel, sizeof(uriModel));
-   pSys->GetModel(ID, model, sizeof(model));
-   if (strcmp(uriModel, model) != 0)
-   {
-      *result = R_INVALID_DEVICE_NODE;  /* found different device plugged in */  
-      syslog(LOG_ERR, "invalid model %s != %s Device::Open %s %d\n", uriModel, model, __FILE__, __LINE__);
-      goto blackout;
-   }
-
 blackout:
    pthread_mutex_unlock(&mutex);
 

hplip-strcasecmp.patch:
 device.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: hplip-strcasecmp.patch
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/hplip-strcasecmp.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hplip-strcasecmp.patch	18 Apr 2006 15:45:52 -0000	1.2
+++ hplip-strcasecmp.patch	18 Apr 2006 15:57:32 -0000	1.3
@@ -1,5 +1,5 @@
---- hplip-0.9.10/io/hpiod/device.cpp.strcasecmp	2006-03-03 00:07:26.000000000 +0000
-+++ hplip-0.9.10/io/hpiod/device.cpp	2006-04-18 15:44:14.000000000 +0100
+--- hplip-0.9.10/io/hpiod/device.cpp.strcasecmp	2006-04-18 16:54:40.000000000 +0100
++++ hplip-0.9.10/io/hpiod/device.cpp	2006-04-18 16:54:57.000000000 +0100
 @@ -633,7 +633,7 @@
     pSys->GeneralizeModel(sz, gen, sizeof(gen));
  
@@ -9,12 +9,3 @@
        goto bugout;
  
     if (usb_get_string_simple(hd, dev->descriptor.iSerialNumber, sz, sizeof(sz)) < 0)
-@@ -913,7 +913,7 @@
-    /* Make sure uri model still matches device id model. */
-    pSys->GetURIModel(URI, uriModel, sizeof(uriModel));
-    pSys->GetModel(ID, model, sizeof(model));
--   if (strcmp(uriModel, model) != 0)
-+   if (strcasecmp(uriModel, model) != 0)
-    {
-       *result = R_INVALID_DEVICE_NODE;  /* found different device plugged in */  
-       syslog(LOG_ERR, "invalid model %s != %s Device::Open %s %d\n", uriModel, model, __FILE__, __LINE__);


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/hplip.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- hplip.spec	18 Apr 2006 15:45:52 -0000	1.61
+++ hplip.spec	18 Apr 2006 15:57:32 -0000	1.62
@@ -185,6 +185,7 @@
 
 %changelog
 * Tue Apr 18 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-1.3
+- Patchlevel 1.
 - Fixed another case-sensitive match.
 
 * Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-1.2



From fedora-cvs-commits at redhat.com  Tue Apr 18 15:59:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 11:59:25 -0400
Subject: rpms/hplip/FC-5 hplip.spec,1.62,1.63
Message-ID: <200604181559.k3IFxPfW001865@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
- Require hpijs sub-package (bug #189140).


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/hplip.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- hplip.spec	18 Apr 2006 15:57:32 -0000	1.62
+++ hplip.spec	18 Apr 2006 15:59:23 -0000	1.63
@@ -22,7 +22,7 @@
 Requires: PyQt
 
 %define hpijs_epoch 1
-Conflicts: hpijs < %{hpijs_epoch}:%{version}-%{release}
+Requires: hpijs = %{hpijs_epoch}:%{version}-%{release}
 
 BuildRequires: net-snmp-devel
 BuildRequires: cups-devel
@@ -187,6 +187,7 @@
 * Tue Apr 18 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-1.3
 - Patchlevel 1.
 - Fixed another case-sensitive match.
+- Require hpijs sub-package (bug #189140).
 
 * Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-1.2
 - Use case-insensitive matching.  0.9.8 gave all-uppercase in some



From fedora-cvs-commits at redhat.com  Tue Apr 18 15:59:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 11:59:50 -0400
Subject: rpms/hplip/devel hplip.spec,1.67,1.68
Message-ID: <200604181559.k3IFxoOY002045@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
- Require hpijs sub-package (bug #189140).


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- hplip.spec	18 Apr 2006 15:56:58 -0000	1.67
+++ hplip.spec	18 Apr 2006 15:59:48 -0000	1.68
@@ -23,7 +23,7 @@
 Requires: PyQt
 
 %define hpijs_epoch 1
-Conflicts: hpijs < %{hpijs_epoch}:%{version}-%{release}
+Requires: hpijs = %{hpijs_epoch}:%{version}-%{release}
 
 BuildRequires: net-snmp-devel
 BuildRequires: cups-devel
@@ -177,6 +177,7 @@
 * Tue Apr 18 2006 Tim Waugh <twaugh at redhat.com>
 - Patchlevel 1.
 - Fixed another case-sensitive match.
+- Require hpijs sub-package (bug #189140).
 
 * Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-4
 - Use case-insensitive matching.  0.9.8 gave all-uppercase in some



From fedora-cvs-commits at redhat.com  Tue Apr 18 16:15:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 12:15:50 -0400
Subject: rpms/gnome-utils/devel gnome-utils.spec, 1.104, 1.105 sources, 1.47,
	1.48 gnome-system-log.console, 1.1, NONE gnome-system-log.pam,
	1.2, NONE
Message-ID: <200604181615.k3IGFoXk004491@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-utils.spec sources 
Removed Files:
	gnome-system-log.console gnome-system-log.pam 
Log Message:
split off 



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- gnome-utils.spec	13 Mar 2006 21:24:00 -0000	1.104
+++ gnome-utils.spec	18 Apr 2006 16:15:47 -0000	1.105
@@ -1,77 +1,67 @@
-%define glib2_version 2.6.0
-%define pango_version 1.8.0
+%define glib2_version 2.9.1
 %define gtk2_version 2.6.0
-%define libgnomeui_version 2.12.0
-%define libgnome_version 2.12.0
-%define gail_version 1.2.0
-%define gnome_panel_version 2.9.4
 %define desktop_file_utils_version 0.9
-%define libgnomeprint_2_2_version 2.8.0
-%define libgnomeprintui_2_2_version 2.8.0
-%define gnome_doc_utils_version 0.3.2
-
-%define po_package gnome-utils-2.0
-
-%define gcalctool_version 5.7.32
-%define gucharmap_version 1.6.0
-%define zenity_version 2.14.0
-
-%define dbus_version 0.60
-
-Summary: GNOME utility programs.
-Name: gnome-utils
-Version: 2.14.0
-Release: 3
-Epoch: 1
-License: GPL
-Group: Applications/System
-Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-utils/gnome-utils-%{version}.tar.bz2
-Source2: gcalctool-%{gcalctool_version}.tar.gz
-Source3: gucharmap-%{gucharmap_version}.tar.bz2
-Source4: zenity-%{zenity_version}.tar.bz2
-Source5: gnome-system-log.console
-Source6: gnome-system-log.pam
-
-Patch0: gnome-utils-2.11.90-schemasdir.patch
-Patch1: gcalctool-flex-crap.patch
-Patch2: logview-close-crash.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Obsoletes: gnome
-URL: http://www.gnome.org
 
-PreReq: %{_bindir}/update-gtk-immodules
-PreReq: desktop-file-utils >= %{desktop_file_utils_version}
+Name:           gnome-utils
+Version:        2.14.0
+Release:        6
+Summary:        GNOME utility programs
+
+Group:          Applications/System
+License:        GPL
+URL: 	http://www.gnome.org
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/gnome-utils/gnome-utils-%{version}.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  glib2-devel >= %{glib2_version}
-BuildRequires:  pango-devel >= %{pango_version}
+Patch0: 	logview-close-crash.patch
+
+BuildRequires:  gnome-doc-utils >= 0.3.2
+BuildRequires: 	glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
-BuildRequires:  libglade2-devel
-BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
-BuildRequires:  libgnome-devel >= %{libgnome_version}
-BuildRequires:  libgnomecanvas-devel
-BuildRequires:  libgnomeprint22-devel >= %{libgnomeprint_2_2_version}
-BuildRequires:  libgnomeprintui22-devel >= %{libgnomeprintui_2_2_version}
-BuildRequires:  gail-devel >= %{gail_version}
-BuildRequires:  gnome-panel >= %{gnome_panel_version}
-BuildRequires:  gnome-panel-devel
-BuildRequires:  desktop-file-utils >= %{desktop_file_utils_version}
-BuildRequires:  e2fsprogs-devel
-BuildRequires:  gnome-desktop-devel
-BuildRequires:  bison
-BuildRequires:  flex
-BuildRequires:  hal-devel
-BuildRequires:  dbus-devel >= %{dbus_version}
-BuildRequires:  gnome-doc-utils >= %{gnome_doc_utils_version}
+BuildRequires:  libgnome-devel >= 2.13.7
+BuildRequires:  libgnomeui-devel >= 2.13.2
+BuildRequires:  libgnomeprintui22-devel >= 2.8.0
+BuildRequires:  gnome-desktop-devel >= 2.9.91
+BuildRequires:  gnome-panel-devel >= 2.9.4
+BuildRequires:  libXmu-devel 
+BuildRequires:  libX11-devel 
+
+Requires:	usermode
+
+Requires(post): scrollkeeper
+Requires(post): desktop-file-utils >= %{desktop_file_utils_version} 
+Requires(post): GConf2
+
+Requires(postun): scrollkeeper
+Requires(postun): desktop-file-utils >= %{desktop_file_utils_version} 
+
+# Requirements to make upgrading from older gnome-utils work
+# can be dropped post-FC6
+Requires:	gcalctool
+Requires:	gucharmap
+Requires:	zenity
+
 %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
 window manager for the X Window System. The gnome-utils package
-includes a set of small "desk accessory" utility applications for GNOME
-such as a calculator.
+includes a set of small "desk accessory" utility applications for GNOME.
+
+%package devel
+Summary: Libraries and headers for gnome-utils libraries
+Group: Development/Libraries
+Requires:  glib2-devel >= %{glib2_version}
+Requires:  gtk2-devel >= %{gtk2_version}
+Requires:  gnome-utils = %{version}-%{release}
+
+%description devel
+The gnome-utils-devel package contains header files and other resources
+needed develop programs using the libraries contained in gnome-utils.
+
 
 %prep
 %setup -q
+%patch0 -p1 -b .logview-close
 
 # Hide from menus
 pushd gsearchtool
@@ -82,151 +72,128 @@
 echo "NoDisplay=true" >> gfloppy.desktop.in
 popd
 
-tar xzf %{SOURCE2}
-tar xjf %{SOURCE3}
-tar xjf %{SOURCE4}
-
-pushd gcalctool-%{gcalctool_version}
-%patch0 -p2 -b .schemasdir
-%patch1 -p2 -b .flex-crap
-popd
-
-%patch2 -p1 -b .logview-close
 
 %build
-pushd gcalctool-%{gcalctool_version}
-%configure
-make
-popd
-
-pushd gucharmap-%{gucharmap_version}
-%configure --disable-gtk-immodules --disable-scrollkeeper
-make
-popd
-
-pushd zenity-%{zenity_version}
 %configure --disable-scrollkeeper
-make
-popd
+make %{?_smp_mflags}
 
-%configure --disable-scrollkeeper
-make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-
-pushd gcalctool-%{gcalctool_version}
-make install DESTDIR=$RPM_BUILD_ROOT
-popd
-
-pushd gucharmap-%{gucharmap_version}
-make install DESTDIR=$RPM_BUILD_ROOT RUN_QUERY_IMMODULES_TEST=false
-popd
-
-pushd zenity-%{zenity_version}
-make install DESTDIR=$RPM_BUILD_ROOT
-popd
-
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-# in GNOME only
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
   --add-only-show-in GNOME                                  \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
-## delete, duplicates file roller
-/bin/rm -rf $RPM_BUILD_ROOT%{_bindir}/archive-generator
-/bin/rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/*archive-generator*
-/bin/rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/help/archive-generator
-/bin/rm -rf $RPM_BUILD_ROOT%{_datadir}/omf/gnome-utils/*archive-generator*
-
 # make gnome-system-log use consolehelper
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 /bin/mv $RPM_BUILD_ROOT%{_bindir}/gnome-system-log $RPM_BUILD_ROOT%{_sbindir}/gnome-system-log
 pushd $RPM_BUILD_ROOT%{_bindir}
 /bin/ln -fs consolehelper gnome-system-log
 popd
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
-cp %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/gnome-system-log
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
-cp %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/gnome-system-log
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
+cat <<EOF >$RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/gnome-system-log
+USER=root
+PROGRAM=/usr/sbin/gnome-system-log
+SESSION=true
+EOF
 
-# blow scrollkeeper crap
-/bin/rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
-
-%find_lang %{po_package}
-%find_lang zenity-0.1
-%find_lang gucharmap
-%find_lang gcalctool
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
+cat <<EOF >$RPM_BUILD_ROOT%{_sysconfdir}/pam.d/gnome-system-log
+#%PAM-1.0
+auth		include		config-util
+account		include		config-util
+session		include		config-util
+EOF
 
-cat %{po_package}.lang zenity-0.1.lang gucharmap.lang gcalctool.lang > all.lang
+%find_lang gnome-utils-2.0
 
-/bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
-/bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
-/bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.2.0/immodules/*.a
-/bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.2.0/immodules/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications
+scrollkeeper-update -q
+update-desktop-database -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="gnome-dictionary.schemas gfloppy.schemas logview.schemas gcalctool.schemas gnome-search-tool.schemas gnome-screenshot.schemas"
+export SCHEMAS="gnome-dictionary.schemas logview.schemas gnome-search-tool.schemas gnome-screenshot.schemas" 
 for S in $SCHEMAS; do
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
+  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null 
 done
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then 
-  /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
-fi
 
 
 %postun
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then 
-  /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
-fi
+scrollkeeper-update -q
+update-desktop-database -q
 
 
-%files -f all.lang
-%defattr(-, root, root)
-
+%files -f gnome-utils-2.0.lang
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%{_datadir}/pixmaps
-%{_datadir}/man/man*/*
-%{_datadir}/applications
-%{_datadir}/gnome-utils
-%{_datadir}/gnome-system-log
-%{_datadir}/gnome
-%{_datadir}/omf
-%{_datadir}/zenity
-%{_datadir}/gnome-screenshot
-%{_datadir}/gnome-2.0
-%{_datadir}/gdict-1.0
-%{_datadir}/gnome-dictionary
-%{_datadir}/gtk-doc/html/gdict
-%{_datadir}/icons/hicolor/48x48/apps/*
-%{_libdir}/pkgconfig/*
-%{_bindir}/*
-%{_libexecdir}/*
-%{_libdir}/*.so*
-%{_libdir}/bonobo
-%{_sysconfdir}/gconf
-%{_includedir}/*
-%{_sbindir}/gnome-system-log
 %{_sysconfdir}/security/console.apps/gnome-system-log
 %{_sysconfdir}/pam.d/gnome-system-log
+%{_sysconfdir}/gconf/schemas/gnome-dictionary.schemas
+%{_sysconfdir}/gconf/schemas/gnome-screenshot.schemas
+%{_sysconfdir}/gconf/schemas/gnome-search-tool.schemas
+%{_sysconfdir}/gconf/schemas/logview.schemas
+%{_bindir}/gnome-dictionary
+%{_bindir}/gnome-panel-screenshot
+%{_bindir}/gnome-screenshot
+%{_bindir}/gnome-search-tool
+%{_bindir}/gnome-system-log
+%{_sbindir}/gnome-system-log
+%{_datadir}/applications/gnome-dictionary.desktop
+%{_datadir}/applications/gnome-screenshot.desktop
+%{_datadir}/applications/gnome-search-tool.desktop
+%{_datadir}/applications/gnome-system-log.desktop
+%{_datadir}/gdict-1.0/
+%{_datadir}/gnome-dictionary/
+%{_datadir}/gnome-screenshot/
+%{_datadir}/gnome-system-log/
+%{_datadir}/gnome/help/gnome-dictionary/
+%{_datadir}/gnome/help/gnome-search-tool/
+%{_datadir}/gnome/help/gnome-system-log/
+%{_datadir}/pixmaps/gnome-dictionary.png
+%{_datadir}/pixmaps/gsearchtool/thumbnail_frame.png
+%{_libexecdir}/gnome-dictionary-applet
+%{_datadir}/gnome-2.0/ui/GNOME_DictionaryApplet.xml
+%{_libdir}/bonobo/servers/GNOME_DictionaryApplet.server
+%{_libdir}/libgdict-1.0.so.*
+%{_datadir}/gtk-doc/html/gdict/
+%{_datadir}/man/man1/gnome-dictionary.1.gz
+%{_datadir}/man/man1/gnome-search-tool.1.gz
+%{_datadir}/man/man1/gnome-system-log.1.gz
+%{_datadir}/omf/gnome-dictionary/
+%{_datadir}/omf/gnome-search-tool/
+%{_datadir}/omf/gnome-system-log/
+
+
+%files devel
+%{_libdir}/libgdict-1.0.so
+%{_libdir}/pkgconfig/gdict-1.0.pc
+%{_includedir}/gdict-1.0/
+
 
 %changelog
+* Tue Apr 18 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-6
+- Incorporate package review feedback
+- Split off a -devel subpackage
+
+* Tue Apr 11 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-5
+- Split off gucharmap, zenity, gcalctool
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-3
 - Update to zenity 2.14.0
 
@@ -567,7 +534,7 @@
 * Thu Mar 15 2001 Havoc Pennington <hp at redhat.com>
 - translations
 
-* Fri Feb 23 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri Feb 23 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - use %%{_tmppath}
 - move changelog to end of file
 - langify, remember to run %%find_lang twice as there


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	13 Mar 2006 21:12:19 -0000	1.47
+++ sources	18 Apr 2006 16:15:47 -0000	1.48
@@ -1,4 +1 @@
 d1d16ff6bfc1f6ddc110d18ec4dfdbfa  gnome-utils-2.14.0.tar.bz2
-8af03f350c988d1565922b10776bc725  gucharmap-1.6.0.tar.bz2
-c4d4234f6951389027399e9c596a8abe  gcalctool-5.7.32.tar.gz
-872f0f25a3c41b9a4e89cb3be9518e11  zenity-2.14.0.tar.bz2


--- gnome-system-log.console DELETED ---


--- gnome-system-log.pam DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 18 16:17:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 12:17:47 -0400
Subject: rpms/hplip/devel hplip.spec,1.68,1.69
Message-ID: <200604181617.k3IGHlMN018989@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
- Don't package unneeded files (bug #189162).


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- hplip.spec	18 Apr 2006 15:59:48 -0000	1.68
+++ hplip.spec	18 Apr 2006 16:17:44 -0000	1.69
@@ -124,6 +124,13 @@
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
 mv %{buildroot}%{_sysconfdir}/{init.d,rc.d/init.d}/hplip
 
+# Remove files we don't want to package.
+rm -f %{buildroot}%{_datadir}/hplip/hplip
+rm -f %{buildroot}%{_datadir}/hplip/hplip.conf
+rm -f %{buildroot}%{_datadir}/hplip/hplip_overview.png
+rm -f %{buildroot}%{_datadir}/hplip/hplip_readme.html
+rm -f %{buildroot}%{_datadir}/hplip/hplip.sh
+
 %clean
 rm -rf %{buildroot}
 
@@ -178,6 +185,7 @@
 - Patchlevel 1.
 - Fixed another case-sensitive match.
 - Require hpijs sub-package (bug #189140).
+- Don't package unneeded files (bug #189162).
 
 * Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-4
 - Use case-insensitive matching.  0.9.8 gave all-uppercase in some



From fedora-cvs-commits at redhat.com  Tue Apr 18 16:17:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 12:17:51 -0400
Subject: rpms/hplip/FC-5 hplip.spec,1.63,1.64
Message-ID: <200604181617.k3IGHpcL019029@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
- Don't package unneeded files (bug #189162).


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/hplip.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- hplip.spec	18 Apr 2006 15:59:23 -0000	1.63
+++ hplip.spec	18 Apr 2006 16:17:48 -0000	1.64
@@ -130,6 +130,13 @@
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
 mv %{buildroot}%{_sysconfdir}/{init.d,rc.d/init.d}/hplip
 
+# Remove files we don't want to package.
+rm -f %{buildroot}%{_datadir}/hplip/hplip
+rm -f %{buildroot}%{_datadir}/hplip/hplip.conf
+rm -f %{buildroot}%{_datadir}/hplip/hplip_overview.png
+rm -f %{buildroot}%{_datadir}/hplip/hplip_readme.html
+rm -f %{buildroot}%{_datadir}/hplip/hplip.sh
+
 %clean
 rm -rf %{buildroot}
 
@@ -188,6 +195,7 @@
 - Patchlevel 1.
 - Fixed another case-sensitive match.
 - Require hpijs sub-package (bug #189140).
+- Don't package unneeded files (bug #189162).
 
 * Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-1.2
 - Use case-insensitive matching.  0.9.8 gave all-uppercase in some



From fedora-cvs-commits at redhat.com  Tue Apr 18 16:18:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 12:18:53 -0400
Subject: rpms/tog-pegasus/FC-5 pegasus-2.5.1-fix_repupgrade.patch, NONE,
	1.1 tog-pegasus.spec, 1.26, 1.27
Message-ID: <200604181618.k3IGIrJD019436@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19406

Modified Files:
	tog-pegasus.spec 
Added Files:
	pegasus-2.5.1-fix_repupgrade.patch 
Log Message:
fix repupgrade

pegasus-2.5.1-fix_repupgrade.patch:
 RepositoryUpgrade.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE pegasus-2.5.1-fix_repupgrade.patch ---
--- pegasus/src/Clients/repupgrade/RepositoryUpgrade.cpp.fix_repupgrade	2006-01-31 14:34:30.000000000 -0500
+++ pegasus/src/Clients/repupgrade/RepositoryUpgrade.cpp	2006-04-17 16:09:24.000000000 -0400
@@ -295,9 +295,9 @@
     const String NEW_REPOSITORY_PATH = "/wbem_var/opt/wbem/repository";
     const String RepositoryUpgrade::_LOG_PATH  = "/wbem_var/opt/wbem/upgrade";
 #elif defined(PEGASUS_USE_RELEASE_DIRS) && defined(PEGASUS_OS_LINUX)
-    const String OLD_REPOSITORY_PATH = "/var/opt/tog-pegasus/prev_repository";
-    const String NEW_REPOSITORY_PATH = "/var/opt/tog-pegasus/repository";
-    const String RepositoryUpgrade::_LOG_PATH  = "/var/opt/tog-pegasus/log/upgrade";
+    const String OLD_REPOSITORY_PATH = "/var/lib/Pegasus/prev_repository";
+    const String NEW_REPOSITORY_PATH = "/var/lib/Pegasus/repository";
+    const String RepositoryUpgrade::_LOG_PATH  = "/var/lib/Pegasus/log/install.log";
 #define REPUPGRADE_USE_RELEASE_DIRS true
 #else
     const String RepositoryUpgrade::_LOG_PATH


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/FC-5/tog-pegasus.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- tog-pegasus.spec	14 Apr 2006 23:47:45 -0000	1.26
+++ tog-pegasus.spec	18 Apr 2006 16:18:50 -0000	1.27
@@ -31,7 +31,7 @@
 %define pegasus_uid	66
 
 Version: 		2.5.1
-Release: 		2%{?LINUX_VERSION:.%{LINUX_VERSION}}
+Release: 		3%{?LINUX_VERSION:.%{LINUX_VERSION}}
 Epoch:   		2
 #
 Summary:   		OpenPegasus WBEM Services for Linux
@@ -65,6 +65,7 @@
 Patch14:		pegasus-2.5.1-obz4945.patch
 Patch15:		pegasus-2.5.1-PATH_MAX.patch
 Patch16:		pegasus-2.5.1-HOSTNAME_MAX.patch
+Patch17:		pegasus-2.5.1-fix_repupgrade.patch
 #
 Conflicts: 		openwbem
 Provides: 		tog-pegasus-cimserver
@@ -136,6 +137,7 @@
 %patch14 -p1 -b .obz4945
 %patch15 -p1 -b .PATH_MAX
 %patch16 -p1 -b .HOSTNAME_MAX
+%patch17 -p1 -b .fix_repupgrade
 
 %build
 rm -rf ${RPM_BUILD_ROOT} || :;
@@ -246,8 +248,7 @@
    if [ -d /var/lib/Pegasus/prev_repository ]; then
    #  The user's old repository was moved to /var/lib/Pegasus/prev_repository, which 
    #  now must be upgraded to the new repository in /var/lib/Pegasus/repository:
-	/usr/sbin/repupgrade /var/lib/Pegasus/prev_repository /var/lib/Pegasus/repository \
-			     2>> /var/lib/Pegasus/log/install.log || :;
+	/usr/sbin/repupgrade 2>> /var/lib/Pegasus/log/install.log || :;
         mv /var/lib/Pegasus/prev_repository /var/lib/Pegasus/prev_repository_`date '+%Y-%m-%d-%s.%N'`.rpmsave;
    fi;
    /sbin/service tog-pegasus condrestart >/dev/null 2>&1 || :;
@@ -271,6 +272,9 @@
 :;
 
 %changelog
+* Mon Apr 17 2006 Jason Vas Dias <jvdias at redhat.com> - 2:2.5.1-3
+- Fix repupgrade (make it use correct paths)
+
 * Fri Apr 14 2006 Jason Vas Dias <jvdias at redhat.com> - 2:2.5.1-2
 - Apply patches for the two '2.5.2_APPROVED' upstream bugzillas 
   4934(4943) and 4945 :



From fedora-cvs-commits at redhat.com  Tue Apr 18 16:24:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 12:24:00 -0400
Subject: rpms/gnome-utils/devel gnome-utils.spec,1.105,1.106
Message-ID: <200604181624.k3IGO04G021476@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-utils.spec 
Log Message:
bump rev



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- gnome-utils.spec	18 Apr 2006 16:15:47 -0000	1.105
+++ gnome-utils.spec	18 Apr 2006 16:23:57 -0000	1.106
@@ -4,7 +4,7 @@
 
 Name:           gnome-utils
 Version:        2.14.0
-Release:        6
+Release:        7
 Summary:        GNOME utility programs
 
 Group:          Applications/System
@@ -187,6 +187,9 @@
 
 
 %changelog
+* Tue Apr 18 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-7
+- Bump rev
+
 * Tue Apr 18 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-6
 - Incorporate package review feedback
 - Split off a -devel subpackage



From fedora-cvs-commits at redhat.com  Tue Apr 18 16:49:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 12:49:42 -0400
Subject: rpms/gnome-utils/devel gnome-utils.spec,1.106,1.107
Message-ID: <200604181649.k3IGngGj009686@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-utils.spec 
Log Message:
Re-add the epoch



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- gnome-utils.spec	18 Apr 2006 16:23:57 -0000	1.106
+++ gnome-utils.spec	18 Apr 2006 16:49:39 -0000	1.107
@@ -4,7 +4,8 @@
 
 Name:           gnome-utils
 Version:        2.14.0
-Release:        7
+Release:        8
+Epoch: 		1
 Summary:        GNOME utility programs
 
 Group:          Applications/System
@@ -187,6 +188,9 @@
 
 
 %changelog
+* Tue Apr 18 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-8
+- Re-add the epoch
+
 * Tue Apr 18 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-7
 - Bump rev
 



From fedora-cvs-commits at redhat.com  Tue Apr 18 16:58:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 12:58:14 -0400
Subject: rpms/gnome-utils/devel gnome-utils.spec,1.107,1.108
Message-ID: <200604181658.k3IGwEH4013121@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-utils.spec 
Log Message:
fix file lists



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- gnome-utils.spec	18 Apr 2006 16:49:39 -0000	1.107
+++ gnome-utils.spec	18 Apr 2006 16:58:11 -0000	1.108
@@ -149,23 +149,28 @@
 %{_sysconfdir}/gconf/schemas/gnome-screenshot.schemas
 %{_sysconfdir}/gconf/schemas/gnome-search-tool.schemas
 %{_sysconfdir}/gconf/schemas/logview.schemas
+%{_sysconfdir}/gconf/schemas/gfloppy.schemas
 %{_bindir}/gnome-dictionary
 %{_bindir}/gnome-panel-screenshot
 %{_bindir}/gnome-screenshot
 %{_bindir}/gnome-search-tool
 %{_bindir}/gnome-system-log
+%{_bindir}/gfloppy
 %{_sbindir}/gnome-system-log
 %{_datadir}/applications/gnome-dictionary.desktop
 %{_datadir}/applications/gnome-screenshot.desktop
 %{_datadir}/applications/gnome-search-tool.desktop
 %{_datadir}/applications/gnome-system-log.desktop
+%{_datadir}/applications/gnome-gfloppy.desktop
 %{_datadir}/gdict-1.0/
 %{_datadir}/gnome-dictionary/
 %{_datadir}/gnome-screenshot/
 %{_datadir}/gnome-system-log/
+%{_datadir}/gnome-utils/
 %{_datadir}/gnome/help/gnome-dictionary/
 %{_datadir}/gnome/help/gnome-search-tool/
 %{_datadir}/gnome/help/gnome-system-log/
+%{_datadir}/gnome/help/gfloppy/
 %{_datadir}/pixmaps/gnome-dictionary.png
 %{_datadir}/pixmaps/gsearchtool/thumbnail_frame.png
 %{_libexecdir}/gnome-dictionary-applet
@@ -176,9 +181,11 @@
 %{_datadir}/man/man1/gnome-dictionary.1.gz
 %{_datadir}/man/man1/gnome-search-tool.1.gz
 %{_datadir}/man/man1/gnome-system-log.1.gz
+%{_datadir}/man/man1/gfloppy.1.gz
 %{_datadir}/omf/gnome-dictionary/
 %{_datadir}/omf/gnome-search-tool/
 %{_datadir}/omf/gnome-system-log/
+%{_datadir}/omf/gfloppy/
 
 
 %files devel



From fedora-cvs-commits at redhat.com  Tue Apr 18 17:10:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 13:10:39 -0400
Subject: rpms/xen/FC-5 xen-3.0.1-cloexec.patch,1.2,1.3 xen.spec,1.106,1.107
Message-ID: <200604181710.k3IHAdIk014286@cvs.devel.redhat.com>

Author: veillard

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

Modified Files:
	xen-3.0.1-cloexec.patch xen.spec 
Log Message:
Preparing a test release for #188361, Daniel


xen-3.0.1-cloexec.patch:
 tools/python/xen/xend/XendCheckpoint.py             |    4 ++++
 xen-3.0.1/tools/libxc/xc_misc.c                     |   11 ++++++++++-
 xen-3.0.1/tools/python/xen/xend/server/SrvDaemon.py |    9 ++++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

Index: xen-3.0.1-cloexec.patch
===================================================================
RCS file: /cvs/dist/rpms/xen/FC-5/xen-3.0.1-cloexec.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-3.0.1-cloexec.patch	7 Mar 2006 22:09:42 -0000	1.2
+++ xen-3.0.1-cloexec.patch	18 Apr 2006 17:10:09 -0000	1.3
@@ -49,3 +49,23 @@
      return fd;
  }
  
+--- xen-3.0.1/tools/python/xen/xend/XendCheckpoint.py	2006-03-01 17:38:59.000000000 -0500
++++ xen-3.0.1-save/tools/python/xen/xend/XendCheckpoint.py	2006-04-07 12:38:03.000000000 -0400
+@@ -22,6 +22,7 @@
+ from XendError import XendError
+ from XendLogging import log
+ 
++import fcntl
+ 
+ SIGNATURE = "LinuxGuestRecord"
+ XC_SAVE = "xc_save"
+@@ -181,6 +182,9 @@
+ 
+ 
+ def forkHelper(cmd, fd, inputHandler, closeToChild):
++    fcntl.fcntl(fd,          fcntl.F_SETFD,0)
++    fcntl.fcntl(xc.handle(), fcntl.F_SETFD,0)
++
+     child = xPopen3(cmd, True, -1, [fd, xc.handle()])
+ 
+     if closeToChild:


Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/FC-5/xen.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- xen.spec	9 Mar 2006 05:15:37 -0000	1.106
+++ xen.spec	18 Apr 2006 17:10:09 -0000	1.107
@@ -5,7 +5,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0.1
-Release: 4
+Release: 5.FC5
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -165,6 +165,9 @@
 %dir %{_localstatedir}/run/xenstored
 
 %changelog
+* Tue Apr 18 2006 Daniel Veillard <veillard at redhat.com> - 3.0.1-5.FC5
+- augment the close on exec patch with the fix for #188361
+
 * Thu Mar  9 2006 Jeremy Katz <katzj at redhat.com> - 3.0.1-4
 - add udev rule so that /dev/xen/evtchn gets created properly
 - make pygrub not use /tmp for SELinux



From fedora-cvs-commits at redhat.com  Tue Apr 18 17:16:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 13:16:47 -0400
Subject: rpms/hplip/devel hplip.spec,1.69,1.70
Message-ID: <200604181716.k3IHGlfT027578@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
- Put fax PPD in the right place (bug #186213).


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- hplip.spec	18 Apr 2006 16:17:44 -0000	1.69
+++ hplip.spec	18 Apr 2006 17:16:40 -0000	1.70
@@ -89,12 +89,13 @@
 
 %build
 %configure --disable-foomatic-install --disable-cups-install
-make
+make hpppddir=%{_datadir}/foomatic/db/source/PPD/HP
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_bindir}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} \
+	hpppddir=%{_datadir}/foomatic/db/source/PPD/HP
 
 # Move SANE backend into correct directory
 mkdir -p %{buildroot}%{_libdir}/sane
@@ -147,12 +148,12 @@
 %{_datadir}/hplip
 %{_libdir}/python*/site-packages/*
 %{_datadir}/applications/*.desktop
-%{_datadir}/ppd
 
 %files -n hpijs
 %defattr(-,root,root)
 %doc prnt/hpijs/COPYING prnt/hpijs/hpijs_readme.html prnt/hpijs/gs_hpijs.png
 %{_bindir}/hpijs
+%{_datadir}/foomatic/db/source/PPD/HP
 #%{_bindir}/hppgsz
 
 %files -n libsane-hpaio
@@ -186,6 +187,7 @@
 - Fixed another case-sensitive match.
 - Require hpijs sub-package (bug #189140).
 - Don't package unneeded files (bug #189162).
+- Put fax PPD in the right place (bug #186213).
 
 * Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-4
 - Use case-insensitive matching.  0.9.8 gave all-uppercase in some



From fedora-cvs-commits at redhat.com  Tue Apr 18 17:16:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 13:16:51 -0400
Subject: rpms/hplip/FC-5 hplip.spec,1.64,1.65
Message-ID: <200604181716.k3IHGpVf027861@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
- Put fax PPD in the right place (bug #186213).


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/hplip.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- hplip.spec	18 Apr 2006 16:17:48 -0000	1.64
+++ hplip.spec	18 Apr 2006 17:16:48 -0000	1.65
@@ -85,12 +85,13 @@
 
 %build
 %configure --disable-foomatic-install --disable-cups-install
-make
+make hpppddir=%{_datadir}/foomatic/db/source/PPD/HP
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_bindir}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} \
+	hpppddir=%{_datadir}/foomatic/db/source/PPD/HP
 
 # Move SANE backend into correct directory
 mkdir -p %{buildroot}%{_libdir}/sane
@@ -157,12 +158,12 @@
 %{_datadir}/hplip
 %{_libdir}/python*/site-packages/*
 %{_datadir}/applications/*.desktop
-%{_datadir}/ppd
 
 %files -n hpijs
 %defattr(-,root,root)
 %doc prnt/hpijs/COPYING prnt/hpijs/hpijs_readme.html prnt/hpijs/gs_hpijs.png
 %{_bindir}/hpijs
+%{_datadir}/foomatic/db/source/PPD/HP
 #%{_bindir}/hppgsz
 
 %files -n libsane-hpaio
@@ -196,6 +197,7 @@
 - Fixed another case-sensitive match.
 - Require hpijs sub-package (bug #189140).
 - Don't package unneeded files (bug #189162).
+- Put fax PPD in the right place (bug #186213).
 
 * Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-1.2
 - Use case-insensitive matching.  0.9.8 gave all-uppercase in some



From fedora-cvs-commits at redhat.com  Tue Apr 18 17:17:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 13:17:44 -0400
Subject: rpms/hplip/devel hplip.spec,1.70,1.71
Message-ID: <200604181717.k3IHHiQo030832@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
0.9.10-5


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- hplip.spec	18 Apr 2006 17:16:40 -0000	1.70
+++ hplip.spec	18 Apr 2006 17:17:42 -0000	1.71
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 0.9.10
-Release: 4
+Release: 5
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -182,7 +182,7 @@
 fi
 
 %changelog
-* Tue Apr 18 2006 Tim Waugh <twaugh at redhat.com>
+* Tue Apr 18 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-5
 - Patchlevel 1.
 - Fixed another case-sensitive match.
 - Require hpijs sub-package (bug #189140).



From fedora-cvs-commits at redhat.com  Tue Apr 18 17:24:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 13:24:19 -0400
Subject: rpms/emacs/devel emacs.spec,1.69,1.70
Message-ID: <200604181724.k3IHOJAl009631@cvs.devel.redhat.com>

Author: coldwell

Update of /cvs/dist/rpms/emacs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9617

Modified Files:
	emacs.spec 
Log Message:
don't clobber site-lisp/default.el (Ritesh Khadgaray, 180153)


Index: emacs.spec
===================================================================
RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- emacs.spec	7 Mar 2006 12:04:00 -0000	1.69
+++ emacs.spec	18 Apr 2006 17:24:17 -0000	1.70
@@ -11,7 +11,7 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Version: 21.4
-Release: 14
+Release: 14.1
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -533,7 +533,7 @@
 %if %{emacs21}
 %exclude %{emacs_libexecdir}/fns-%{version}.*.el
 %endif
-%attr(0644,root,root) %config %{_datadir}/emacs/site-lisp/default.el
+%attr(0644,root,root) %config(noreplace) %{_datadir}/emacs/site-lisp/default.el
 %attr(0644,root,root) %config %{_datadir}/emacs/site-lisp/site-start.el
 
 %files -f el-filelist el
@@ -549,6 +549,9 @@
 %endif
 
 %changelog
+* Tue Apr 18 2006 Chip Coldwell <coldwell at redhat.com> - 21.4-14.1
+- don't clobber site-lisp/default.el (Ritesh Khadgaray, 180153)
+
 * Tue Mar  7 2006 Jens Petersen <petersen at redhat.com> - 21.4-14
 - bring back setarch for i386 with -R option in spec file and drop
   emacs-21-personality-linux32-101818.patch since it no longer seems



From fedora-cvs-commits at redhat.com  Tue Apr 18 17:57:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 13:57:39 -0400
Subject: rpms/file-roller/devel .cvsignore, 1.35, 1.36 file-roller.spec, 1.56,
	1.57 sources, 1.36, 1.37
Message-ID: <200604181757.k3IHvdUU008305@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/file-roller/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8243

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.14.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	11 Apr 2006 04:09:31 -0000	1.35
+++ .cvsignore	18 Apr 2006 17:57:36 -0000	1.36
@@ -21,3 +21,4 @@
 file-roller-2.13.92.tar.bz2
 file-roller-2.14.0.tar.bz2
 file-roller-2.14.1.tar.bz2
+file-roller-2.14.2.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- file-roller.spec	11 Apr 2006 04:37:50 -0000	1.56
+++ file-roller.spec	18 Apr 2006 17:57:36 -0000	1.57
@@ -19,11 +19,6 @@
 Source:		file-roller-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/file-roller-%{version}-root
 
-PreReq:         scrollkeeper >= 0.3.4-2
-PreReq:         GConf2
-PreReq:         /usr/bin/gconftool-2
-PreReq:         desktop-file-utils >= %{desktop_file_utils_version}
-
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -34,6 +29,15 @@
 BuildRequires: libtool
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
+BuildRequires: scrollkeeper
+
+Requires(post): scrollkeeper
+Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
+Requires(post): GConf2
+
+Requires(postun): scrollkeeper
+Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
+
 
 # The context menu API changed in 2.2.0:
 Conflicts: nautilus < 2.2.0
@@ -59,9 +63,6 @@
 %makeinstall
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-# temporary hack to add missing semicolon, fix sent upstream
-perl -pi -e 's/Categories=Application;Utility$/Categories=Application;Utility;/' $RPM_BUILD_ROOT%{_datadir}/applications/*
-
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
   --add-only-show-in GNOME                                  \
@@ -84,8 +85,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-update-desktop-database %{_datadir}/applications
-scrollkeeper-update
+update-desktop-database -q
+scrollkeeper-update -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 SCHEMAS="file-roller.schemas"
 for S in $SCHEMAS; do
@@ -97,8 +98,8 @@
 fi
 
 %postun
-update-desktop-database %{_datadir}/applications
-scrollkeeper-update
+update-desktop-database -q
+scrollkeeper-update -q
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
@@ -117,6 +118,10 @@
 %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so
 
 %changelog
+* Tue Apr 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-2
+- Update to 2.14.2
+- Some .spec file cleanups
+
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
 - Update to 2.14.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	11 Apr 2006 04:09:31 -0000	1.36
+++ sources	18 Apr 2006 17:57:36 -0000	1.37
@@ -1 +1 @@
-31f994e5874e8f96c33cbe39d9e7a7e9  file-roller-2.14.1.tar.bz2
+4900dc4b2e4f0f173bd88cb5e6b9bde1  file-roller-2.14.2.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 18 17:58:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 13:58:44 -0400
Subject: rpms/file-roller/devel file-roller.spec,1.57,1.58
Message-ID: <200604181758.k3IHwiLU008850@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/file-roller/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8783

Modified Files:
	file-roller.spec 
Log Message:
2.14.2



Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- file-roller.spec	18 Apr 2006 17:57:36 -0000	1.57
+++ file-roller.spec	18 Apr 2006 17:58:42 -0000	1.58
@@ -10,7 +10,7 @@
 
 Summary:	File Roller is a tool for viewing and creating archives.
 Name:		file-roller
-Version:	2.14.1
+Version:	2.14.2
 Release: 	2
 
 License:	GPL



From fedora-cvs-commits at redhat.com  Tue Apr 18 18:05:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 14:05:51 -0400
Subject: rpms/file-roller/devel file-roller.spec,1.58,1.59
Message-ID: <200604181805.k3II5p3W009704@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/file-roller/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9683

Modified Files:
	file-roller.spec 
Log Message:
cleanup



Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- file-roller.spec	18 Apr 2006 17:58:42 -0000	1.58
+++ file-roller.spec	18 Apr 2006 18:05:48 -0000	1.59
@@ -8,10 +8,10 @@
 %define nautilus_version 2.9.0
 %define gnome_doc_utils_version 0.3.2
 
-Summary:	File Roller is a tool for viewing and creating archives.
+Summary:	File Roller is a tool for viewing and creating archives
 Name:		file-roller
 Version:	2.14.2
-Release: 	2
+Release: 	3	
 
 License:	GPL
 Group:		Applications/Archiving
@@ -118,6 +118,9 @@
 %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so
 
 %changelog
+* Tue Apr 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-3
+- Remove dot from summary
+
 * Tue Apr 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-2
 - Update to 2.14.2
 - Some .spec file cleanups



From fedora-cvs-commits at redhat.com  Tue Apr 18 18:08:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 14:08:35 -0400
Subject: rpms/file-roller/FC-5 file-roller.spec,1.56,1.57 sources,1.36,1.37
Message-ID: <200604181808.k3II8ZEp009853@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/file-roller/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9813

Modified Files:
	file-roller.spec sources 
Log Message:
2.14.2



Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/FC-5/file-roller.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- file-roller.spec	11 Apr 2006 04:51:32 -0000	1.56
+++ file-roller.spec	18 Apr 2006 18:08:19 -0000	1.57
@@ -8,10 +8,10 @@
 %define nautilus_version 2.9.0
 %define gnome_doc_utils_version 0.3.2
 
-Summary:	File Roller is a tool for viewing and creating archives.
+Summary:	File Roller is a tool for viewing and creating archives
 Name:		file-roller
-Version:	2.14.1
-Release: 	1.fc5.1
+Version:	2.14.2
+Release:	1.fc5.1 
 
 License:	GPL
 Group:		Applications/Archiving
@@ -19,11 +19,6 @@
 Source:		file-roller-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/file-roller-%{version}-root
 
-PreReq:         scrollkeeper >= 0.3.4-2
-PreReq:         GConf2
-PreReq:         /usr/bin/gconftool-2
-PreReq:         desktop-file-utils >= %{desktop_file_utils_version}
-
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -34,6 +29,15 @@
 BuildRequires: libtool
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
+BuildRequires: scrollkeeper
+
+Requires(post): scrollkeeper
+Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
+Requires(post): GConf2
+
+Requires(postun): scrollkeeper
+Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
+
 
 # The context menu API changed in 2.2.0:
 Conflicts: nautilus < 2.2.0
@@ -59,9 +63,6 @@
 %makeinstall
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-# temporary hack to add missing semicolon, fix sent upstream
-perl -pi -e 's/Categories=Application;Utility$/Categories=Application;Utility;/' $RPM_BUILD_ROOT%{_datadir}/applications/*
-
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
   --add-only-show-in GNOME                                  \
@@ -84,8 +85,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-update-desktop-database %{_datadir}/applications
-scrollkeeper-update
+update-desktop-database -q
+scrollkeeper-update -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 SCHEMAS="file-roller.schemas"
 for S in $SCHEMAS; do
@@ -97,8 +98,8 @@
 fi
 
 %postun
-update-desktop-database %{_datadir}/applications
-scrollkeeper-update
+update-desktop-database -q
+scrollkeeper-update -q
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
@@ -117,7 +118,11 @@
 %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so
 
 %changelog
-* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
+* Tue Apr 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1.fc5.1
+- Update to 2.14.2
+- Some .spec file cleanups
+
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
 - Update to 2.14.1
 
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/file-roller/FC-5/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	11 Apr 2006 04:13:32 -0000	1.36
+++ sources	18 Apr 2006 18:08:19 -0000	1.37
@@ -1 +1 @@
-31f994e5874e8f96c33cbe39d9e7a7e9  file-roller-2.14.1.tar.bz2
+4900dc4b2e4f0f173bd88cb5e6b9bde1  file-roller-2.14.2.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 18 18:48:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 14:48:23 -0400
Subject: rpms/kernel/devel patch-2.6.17-rc1-git13.bz2.sign, NONE,
	1.1 .cvsignore, 1.407, 1.408 kernel-2.6.spec, 1.2135,
	1.2136 sources, 1.349, 1.350 upstream, 1.320, 1.321
Message-ID: <200604181848.k3IImNm6015873@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17-rc1-git13.bz2.sign 
Log Message:
git13



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

iD8DBQBERI7wyGugalF9Dw4RAhBzAJ43EVAEp0KGMsOq2yY03rxEOYDJWQCePqt4
WP5mKl6mnorjlWm32kbe73U=
=5HLZ
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -r1.407 -r1.408
--- .cvsignore	16 Apr 2006 22:58:48 -0000	1.407
+++ .cvsignore	18 Apr 2006 18:48:19 -0000	1.408
@@ -3,5 +3,5 @@
 kernel-2.6.16
 linux-2.6.16.tar.bz2
 patch-2.6.17-rc1.bz2
-patch-2.6.17-rc1-git12.bz2
 xen-20060413.tar.bz2
+patch-2.6.17-rc1-git13.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2135
retrieving revision 1.2136
diff -u -r1.2135 -r1.2136
--- kernel-2.6.spec	18 Apr 2006 01:36:47 -0000	1.2135
+++ kernel-2.6.spec	18 Apr 2006 18:48:20 -0000	1.2136
@@ -213,7 +213,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.17-rc1.bz2
-Patch2: patch-2.6.17-rc1-git12.bz2
+Patch2: patch-2.6.17-rc1-git13.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1648,6 +1648,9 @@
 %endif
 
 %changelog
+* Tue Apr 18 2006 Dave Jones <davej at redhat.com>
+- 2.6.17rc1-git13
+
 * Mon Apr 17 2006 Juan Quintela <quintela at redhat.com>
 - enable xen again.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -r1.349 -r1.350
--- sources	16 Apr 2006 22:58:48 -0000	1.349
+++ sources	18 Apr 2006 18:48:20 -0000	1.350
@@ -1,4 +1,4 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 ee1b5bf019ec60a34ef7bf1b2a0c1291  patch-2.6.17-rc1.bz2
 e8e055329db3aad40a010ded0f8bdcf9  xen-20060413.tar.bz2
-a116af6c1723ef2a7b5aff5b380fcd35  patch-2.6.17-rc1-git12.bz2
+adf86e3084d31a02ed1fc4ed84932bee  patch-2.6.17-rc1-git13.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -r1.320 -r1.321
--- upstream	16 Apr 2006 22:58:48 -0000	1.320
+++ upstream	18 Apr 2006 18:48:20 -0000	1.321
@@ -1,3 +1,3 @@
 linux-2.6.16.tar.bz2
 patch-2.6.17-rc1.bz2
-patch-2.6.17-rc1-git12.bz2
+patch-2.6.17-rc1-git13.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 18 18:52:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 14:52:06 -0400
Subject: rpms/gtk2-engines/devel gtk2-engines.spec,1.38,1.39
Message-ID: <200604181852.k3IIq6eD017177@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	gtk2-engines.spec 
Log Message:
* Tue Apr 18 2006 Kristian H??gsberg <krh at redhat.com> 2.7.4-5
- Bump for fc5-blig repo build.



Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gtk2-engines.spec	17 Apr 2006 21:24:29 -0000	1.38
+++ gtk2-engines.spec	18 Apr 2006 18:52:03 -0000	1.39
@@ -1,7 +1,7 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
 Version:        2.7.4
-Release:	4
+Release:	5
 License:        GPL
 Group:          System Environment/Libraries
 Source:         gtk-engines-%{version}.tar.bz2
@@ -69,6 +69,9 @@
 %{_datadir}/themes
 
 %changelog
+* Tue Apr 18 2006 Kristian H??gsberg <krh at redhat.com> 2.7.4-5
+- Bump for fc5-blig repo build.
+
 * Mon Apr 17 2006 Soren Sandmann <sandmann at redhat.com> - 2.7.4-4
 - Add missing clone method in the Clearlooks engine
 



From fedora-cvs-commits at redhat.com  Tue Apr 18 20:15:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 16:15:45 -0400
Subject: rpms/ipsec-tools/devel ipsec-tools-0.6.5-mls.patch, NONE,
	1.1 ipsec-tools.spec, 1.23, 1.24
Message-ID: <200604182015.k3IKFjhf032109@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/ipsec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31628

Modified Files:
	ipsec-tools.spec 
Added Files:
	ipsec-tools-0.6.5-mls.patch 
Log Message:
* Tue Apr 18 2006 Dan Walsh <dwalsh at redhat.com> - 0.6.4-2
- Add MLS Patch to allow use of labeled networks
- Patch provided by Joy Latten <latten at austin.ibm.com>


ipsec-tools-0.6.5-mls.patch:
 ipsec-tools-0.6.5.p1/configure.ac              |   35 +++++
 ipsec-tools-0.6.5.p1/src/libipsec/pfkey.c      |    3 
 ipsec-tools-0.6.5.p1/src/libipsec/pfkey_dump.c |   37 ++++++
 ipsec-tools-0.6.5.p1/src/setkey/parse.y        |   77 +++++++++++-
 ipsec-tools-0.6.5.p1/src/setkey/setkey.8       |   45 +++++++
 ipsec-tools-0.6.5.p1/src/setkey/token.l        |    1 
 ipsec-tools-0.6.5.p2/src/libipsec/libpfkey.h   |   12 +
 ipsec-tools-0.6.5.p2/src/libipsec/pfkey.c      |   96 ++++++++++++++-
 ipsec-tools-0.6.5.p2/src/racoon/Makefile.am    |    8 -
 ipsec-tools-0.6.5.p2/src/racoon/backupsa.c     |    3 
 ipsec-tools-0.6.5.p2/src/racoon/cftoken.l      |    1 
 ipsec-tools-0.6.5.p2/src/racoon/ipsec_doi.c    |   38 ++++++
 ipsec-tools-0.6.5.p2/src/racoon/ipsec_doi.h    |    4 
 ipsec-tools-0.6.5.p2/src/racoon/isakmp.c       |    2 
 ipsec-tools-0.6.5.p2/src/racoon/isakmp_quick.c |   13 ++
 ipsec-tools-0.6.5.p2/src/racoon/pfkey.c        |  146 +++++++++++++++++++++++-
 ipsec-tools-0.6.5.p2/src/racoon/policy.c       |   29 ++++
 ipsec-tools-0.6.5.p2/src/racoon/policy.h       |   16 ++
 ipsec-tools-0.6.5.p2/src/racoon/proposal.c     |   77 ++++++++++++
 ipsec-tools-0.6.5.p2/src/racoon/proposal.h     |    4 
 ipsec-tools-0.6.5.p2/src/racoon/remoteconf.c   |    1 
 ipsec-tools-0.6.5.p2/src/racoon/security.c     |  152 +++++++++++++++++++++++++
 22 files changed, 765 insertions(+), 35 deletions(-)

--- NEW FILE ipsec-tools-0.6.5-mls.patch ---
diff -urpN ipsec-tools-0.6.5.orig/configure.ac ipsec-tools-0.6.5.p1/configure.ac
--- ipsec-tools-0.6.5.orig/configure.ac	2006-03-02 12:15:22.000000000 -0600
+++ ipsec-tools-0.6.5.p1/configure.ac	2006-03-02 14:43:59.000000000 -0600
@@ -588,6 +588,41 @@ AC_CHECK_TYPE([ipsec_policy_t], 
 	      	#include <netinet6/ipsec.h>
 	      ])
 
+# Check if kernel support is available for Security Context, defaults to no.
+kernel_secctx="no"
+
+AC_MSG_CHECKING(kernel Security Context support)
+case $host_os in
+linux*)
+# Linux kernel Security Context check
+AC_EGREP_CPP(yes,
+[#include <linux/pfkeyv2.h>
+#ifdef SADB_X_EXT_SEC_CTX
+yes
+#endif
+], [kernel_secctx="yes"])
+	;;
+esac
+AC_MSG_RESULT($kernel_secctx)
+
+AC_MSG_CHECKING(whether to support Security Context)
+AC_ARG_ENABLE(security-context,
+	[  --enable-security-context    enable Security Context(yes/no/kernel)],
+	[if test "$enable_security-context" = "kernel"; then
+		enable_security_context=$kernel_secctx; fi],
+	[enable_security_context=$kernel_secctx])
+AC_MSG_RESULT($enable_security_context)
+
+if test "$enable_security_context" = "yes"; then
+	if test "$kernel_secctx" = "no" ; then
+		AC_MSG_ERROR([Security Context requested, but no kernel support! Aborting.])
+	else
+		AC_DEFINE([HAVE_SECCTX], [], [Enable Security Context])
+		SECCTX_OBJS="security.o"
+		AC_SUBST(SECCTX_OBJS)
+	fi
+fi
+
 CFLAGS="$CFLAGS $CFLAGS_ADD"
 CPPFLAGS="$CPPFLAGS $CPPFLAGS_ADD"
 
diff -urpN ipsec-tools-0.6.5.orig/src/libipsec/pfkey.c ipsec-tools-0.6.5.p1/src/libipsec/pfkey.c
--- ipsec-tools-0.6.5.orig/src/libipsec/pfkey.c	2006-03-02 12:15:22.000000000 -0600
+++ ipsec-tools-0.6.5.p1/src/libipsec/pfkey.c	2006-03-02 15:03:10.000000000 -0600
@@ -1969,6 +1969,9 @@ pfkey_align(msg, mhp)
 #ifdef SADB_X_EXT_PACKET
 		case SADB_X_EXT_PACKET:
 #endif
+#ifdef SADB_X_EXT_SEC_CTX
+		case SADB_X_EXT_SEC_CTX:
+#endif
 
 			mhp[ext->sadb_ext_type] = (void *)ext;
 			break;
diff -urpN ipsec-tools-0.6.5.orig/src/libipsec/pfkey_dump.c ipsec-tools-0.6.5.p1/src/libipsec/pfkey_dump.c
--- ipsec-tools-0.6.5.orig/src/libipsec/pfkey_dump.c	2006-03-02 12:15:22.000000000 -0600
+++ ipsec-tools-0.6.5.p1/src/libipsec/pfkey_dump.c	2006-03-02 14:45:44.000000000 -0600
@@ -243,6 +243,9 @@ pfkey_sadump1(m, withports)
 	struct sadb_ident *m_sid, *m_did;
 	struct sadb_sens *m_sens;
 #endif
+#ifdef SADB_X_EXT_SEC_CTX
+	struct sadb_x_sec_ctx *m_sec_ctx;
+#endif
 #ifdef SADB_X_EXT_NAT_T_TYPE
 	struct sadb_x_nat_t_type *natt_type;
 	struct sadb_x_nat_t_port *natt_sport, *natt_dport;
@@ -279,6 +282,9 @@ pfkey_sadump1(m, withports)
 	m_did = (void *)mhp[SADB_EXT_IDENTITY_DST];
 	m_sens = (void *)mhp[SADB_EXT_SENSITIVITY];
 #endif
+#ifdef SADB_X_EXT_SEC_CTX
+	m_sec_ctx = (struct sadb_x_sec_ctx *)mhp[SADB_X_EXT_SEC_CTX];
+#endif
 #ifdef SADB_X_EXT_NAT_T_TYPE
 	natt_type = (void *)mhp[SADB_X_EXT_NAT_T_TYPE];
 	natt_sport = (void *)mhp[SADB_X_EXT_NAT_T_SPORT];
@@ -433,6 +439,19 @@ pfkey_sadump1(m, withports)
 			0 : m_lfts->sadb_lifetime_allocations));
 	}
 
+#ifdef SADB_X_EXT_SEC_CTX
+	if (m_sec_ctx != NULL) {
+		printf("\tsecurity context doi: %u\n",
+					m_sec_ctx->sadb_x_ctx_doi);
+		printf("\tsecurity context algorithm: %u\n",
+					m_sec_ctx->sadb_x_ctx_alg);
+		printf("\tsecurity context length: %u\n",
+					m_sec_ctx->sadb_x_ctx_len);
+		printf("\tsecurity context: %s\n",
+			(char *)m_sec_ctx + sizeof(struct sadb_x_sec_ctx));
+	}
+#endif
+
 	printf("\tsadb_seq=%lu pid=%lu ",
 		(u_long)m->sadb_msg_seq,
 		(u_long)m->sadb_msg_pid);
@@ -470,6 +489,9 @@ pfkey_spdump1(m, withports)
 #endif
 	struct sadb_x_policy *m_xpl;
 	struct sadb_lifetime *m_lftc = NULL, *m_lfth = NULL;
+#ifdef SADB_X_EXT_SEC_CTX
+	struct sadb_x_sec_ctx *m_sec_ctx;
+#endif
 	struct sockaddr *sa;
 	u_int16_t sport = 0, dport = 0;
 
@@ -492,6 +514,9 @@ pfkey_spdump1(m, withports)
 	m_lftc = (void *)mhp[SADB_EXT_LIFETIME_CURRENT];
 	m_lfth = (void *)mhp[SADB_EXT_LIFETIME_HARD];
 
+#ifdef SADB_X_EXT_SEC_CTX
+	m_sec_ctx = (struct sadb_x_sec_ctx *)mhp[SADB_X_EXT_SEC_CTX];
+#endif
 #ifdef __linux__
 	/* *bsd indicates per-socket policies by omiting src and dst 
 	 * extensions. Linux always includes them, but we can catch it
@@ -596,6 +621,18 @@ pfkey_spdump1(m, withports)
 			(u_long)m_lfth->sadb_lifetime_usetime);
 	}
 
+#ifdef SADB_X_EXT_SEC_CTX
+	if (m_sec_ctx != NULL) {
+		printf("\tsecurity context doi: %u\n",
+					m_sec_ctx->sadb_x_ctx_doi);
+		printf("\tsecurity context algorithm: %u\n",
+					m_sec_ctx->sadb_x_ctx_alg);
+		printf("\tsecurity context length: %u\n",
+					m_sec_ctx->sadb_x_ctx_len);
+		printf("\tsecurity context: %s\n",
+			(char *)m_sec_ctx + sizeof(struct sadb_x_sec_ctx));
+	}
+#endif
 
 	printf("\tspid=%ld seq=%ld pid=%ld\n",
 		(u_long)m_xpl->sadb_x_policy_id,
diff -urpN ipsec-tools-0.6.5.orig/src/setkey/parse.y ipsec-tools-0.6.5.p1/src/setkey/parse.y
--- ipsec-tools-0.6.5.orig/src/setkey/parse.y	2006-03-02 12:15:22.000000000 -0600
+++ ipsec-tools-0.6.5.p1/src/setkey/parse.y	2006-03-02 14:47:06.000000000 -0600
@@ -78,6 +78,15 @@ const char *p_key_auth;
 time_t p_lt_hard, p_lt_soft;
 size_t p_lb_hard, p_lb_soft;
 
+struct security_ctx {
+        __u8 doi;
+        __u8 alg;
+        __u16 len;
+        char *buf;
+};
+
+struct security_ctx sec_ctx;
+
 static u_int p_natt_type;
 static struct addrinfo * p_natt_oa = NULL;
 
@@ -124,6 +133,7 @@ static int setkeymsg_add __P((unsigned i
 %token F_POLICY PL_REQUESTS
 %token F_AIFLAGS
 %token TAGGED
+%token SECURITY_CTX
 
 %type <num> prefix protocol_spec upper_spec
 %type <num> ALG_ENC ALG_ENC_DESDERIV ALG_ENC_DES32IV ALG_ENC_OLD ALG_ENC_NOKEY
@@ -533,12 +543,18 @@ extension
 	|	F_LIFETIME_SOFT DECSTRING { p_lt_soft = $2; }
 	|	F_LIFEBYTE_HARD DECSTRING { p_lb_hard = $2; }
 	|	F_LIFEBYTE_SOFT DECSTRING { p_lb_soft = $2; }
+	|       SECURITY_CTX DECSTRING DECSTRING QUOTEDSTRING {
+		sec_ctx.doi = $2;
+		sec_ctx.alg = $3;
+		sec_ctx.len = $4.len+1;
+		sec_ctx.buf = $4.buf;
+	}
 	;
 
 	/* definition about command for SPD management */
 	/* spdadd */
 spdadd_command
-	:	SPDADD ipaddropts STRING prefix portstr STRING prefix portstr upper_spec upper_misc_spec policy_spec EOT
+	:	SPDADD ipaddropts STRING prefix portstr STRING prefix portstr upper_spec upper_misc_spec context_spec policy_spec EOT
 		{
 			int status;
 			struct addrinfo *src, *dst;
@@ -570,7 +586,7 @@ spdadd_command
 				return -1;
 			}
 
-			status = setkeymsg_spdaddr(SADB_X_SPDADD, $9, &$11,
+			status = setkeymsg_spdaddr(SADB_X_SPDADD, $9, &$12,
 			    src, $4, dst, $7);
 			freeaddrinfo(src);
 			freeaddrinfo(dst);
@@ -589,7 +605,7 @@ spdadd_command
 	;
 
 spddelete_command
-	:	SPDDELETE ipaddropts STRING prefix portstr STRING prefix portstr upper_spec upper_misc_spec policy_spec EOT
+	:	SPDDELETE ipaddropts STRING prefix portstr STRING prefix portstr upper_spec upper_misc_spec context_spec policy_spec EOT
 		{
 			int status;
 			struct addrinfo *src, *dst;
@@ -617,7 +633,7 @@ spddelete_command
 				return -1;
 			}
 
-			status = setkeymsg_spdaddr(SADB_X_SPDDELETE, $9, &$11,
+			status = setkeymsg_spdaddr(SADB_X_SPDDELETE, $9, &$12,
 			    src, $4, dst, $7);
 			freeaddrinfo(src);
 			freeaddrinfo(dst);
@@ -792,6 +808,16 @@ upper_misc_spec
 		}
 	;
 
+context_spec
+	:	/* NOTHING */
+	|	SECURITY_CTX DECSTRING DECSTRING QUOTEDSTRING {
+			sec_ctx.doi = $2;
+			sec_ctx.alg = $3;
+			sec_ctx.len = $4.len+1;
+			sec_ctx.buf = $4.buf;
+		}
+	;
+
 policy_spec
 	:	F_POLICY policy_requests
 		{
@@ -939,7 +965,27 @@ setkeymsg_spdaddr(type, upper, policy, s
 
 			setvarbuf(buf, &l, (struct sadb_ext *)&m_addr,
 			    sizeof(m_addr), sa, salen);
-
+#ifdef SADB_X_EXT_SEC_CTX
+			/* Add security context label */
+			if (sec_ctx.doi) {
+				struct sadb_x_sec_ctx m_sec_ctx;
+				u_int slen = sizeof(struct sadb_x_sec_ctx);
+
+				memset(&m_sec_ctx, 0, slen);
+
+				m_sec_ctx.sadb_x_sec_len =
+				PFKEY_UNIT64(slen + PFKEY_ALIGN8(sec_ctx.len));
+
+				m_sec_ctx.sadb_x_sec_exttype = 
+					SADB_X_EXT_SEC_CTX;
+				m_sec_ctx.sadb_x_ctx_len = sec_ctx.len;/*bytes*/
+				m_sec_ctx.sadb_x_ctx_doi = sec_ctx.doi;
+				m_sec_ctx.sadb_x_ctx_alg = sec_ctx.alg;
+				setvarbuf(buf, &l, 
+					  (struct sadb_ext *)&m_sec_ctx, slen, 
+					  (caddr_t)sec_ctx.buf, sec_ctx.len);
+			}
+#endif
 			msg->sadb_msg_len = PFKEY_UNIT64(l);
 
 			sendkeymsg(buf, l);
@@ -1268,6 +1314,25 @@ setkeymsg_add(type, satype, srcs, dsts)
 		l += slen;
 	}
 
+#ifdef SADB_X_EXT_SEC_CTX
+	/* Add security context label */
+	if (sec_ctx.doi) {
+		struct sadb_x_sec_ctx m_sec_ctx;
+		u_int slen = sizeof(struct sadb_x_sec_ctx);
+
+		memset(&m_sec_ctx, 0, slen);
+
+		m_sec_ctx.sadb_x_sec_len = PFKEY_UNIT64(slen +
+					PFKEY_ALIGN8(sec_ctx.len));
+		m_sec_ctx.sadb_x_sec_exttype = SADB_X_EXT_SEC_CTX;
+		m_sec_ctx.sadb_x_ctx_len = sec_ctx.len; /* bytes */
+		m_sec_ctx.sadb_x_ctx_doi = sec_ctx.doi;
+		m_sec_ctx.sadb_x_ctx_alg = sec_ctx.alg;
+		setvarbuf(buf, &l, (struct sadb_ext *)&m_sec_ctx, slen,
+			  (caddr_t)sec_ctx.buf, sec_ctx.len); 
+	}
+#endif
+
 	len = sizeof(struct sadb_sa);
 	m_sa.sadb_sa_len = PFKEY_UNIT64(len);
 	m_sa.sadb_sa_exttype = SADB_EXT_SA;
@@ -1513,6 +1578,8 @@ parse_init()
 	p_lt_hard = p_lt_soft = 0;
 	p_lb_hard = p_lb_soft = 0;
 
+	memset(&sec_ctx, 0, sizeof(struct security_ctx));
+
 	p_aiflags = 0;
 	p_aifamily = PF_UNSPEC;
 
diff -urpN ipsec-tools-0.6.5.orig/src/setkey/setkey.8 ipsec-tools-0.6.5.p1/src/setkey/setkey.8
--- ipsec-tools-0.6.5.orig/src/setkey/setkey.8	2006-03-02 12:15:22.000000000 -0600
+++ ipsec-tools-0.6.5.p1/src/setkey/setkey.8	2006-03-02 14:46:18.000000000 -0600
@@ -218,7 +218,7 @@ on the command line achieves the same fu
 .It Xo
 .Li spdadd
 .Op Fl 46n
-.Ar src_range Ar dst_range Ar upperspec Ar policy
+.Ar src_range Ar dst_range Ar upperspec Ar label Ar policy
 .Li ;
 .Xc
 Add an SPD entry.
@@ -368,6 +368,20 @@ Specify hard/soft life time duration of 
 .It Fl bh Ar bytes
 .It Fl bs Ar bytes
 Specify hard/soft life time duration of the SA measured in bytes transported.
+.\"
+.It Fl ctx Ar doi Ar algorithm Ar context-name
+Specify an access control label. The access control label is interpreted 
+by the LSM (e.g., SELinux). Ultimately, it enables MAC on network 
+communications. 
+.Bl -tag -width Fl -compact
+.It Ar doi
+The domain of interpretation, which is used by the
+IKE daemon to identify the domain in which negotiation takes place. 
+.It Ar algorithm
+Indicates the LSM for which the label is generated (e.g., SELinux).
+.It Ar context-name 
+The string representation of the label that is interpreted by the LSM.
+.El
 .El
 .\"
 .Pp
@@ -488,6 +502,27 @@ to use with IPsec.
 You have to consider carefully what to use.
 .\"
 .Pp
+.It Ar label
+.Ar label 
+is the access control label for the policy. This label is interpreted
+by the LSM (e.g., SELinux). Ultimately, it enables MAC on network
+communications. When a policy contains an access control label, SAs
+negotiated with this policy will contain the label. It's format:
+.Bl -tag -width Fl -compact
+.\"
+.It Fl ctx Ar doi Ar algorithm Ar context-name
+.Bl -tag -width Fl -compact
+.It Ar doi
+The domain of interpretation, which is used by the
+IKE daemon to identify the domain in which negotiation takes place.
+.It Ar algorithm
+Indicates the LSM for which the label is generated (e.g., SELinux).
+.It Ar context-name
+The string representation of the label that is interpreted by the LSM.
+.El
+.El
+.\"
+.Pp
 .It Ar policy
 .Ar policy
 is in one of the following three formats:
@@ -796,6 +831,14 @@ spdadd 10.0.11.41/32[21] 10.0.11.33/32[a
 	-P out ipsec esp/tunnel/192.168.0.1-192.168.1.2/require ;
 
 add 10.1.10.34 10.1.10.36 tcp 0x1000 -A tcp-md5 "TCP-MD5 BGP secret" ;
+
+add 10.0.11.41 10.0.11.33 esp 0x10001
+	-ctx 1 1 "system_u:system_r:unconfined_t:SystemLow-SystemHigh"
+	-E des-cbc 0x3ffe05014819ffff;
+
+spdadd 10.0.11.41 10.0.11.33 any
+	-ctx 1 1 "system_u:system_r:unconfined_t:SystemLow-SystemHigh"
+	-P out ipsec esp/transport//require ;
 .Ed
 .\"
 .Sh SEE ALSO
diff -urpN ipsec-tools-0.6.5.orig/src/setkey/token.l ipsec-tools-0.6.5.p1/src/setkey/token.l
--- ipsec-tools-0.6.5.orig/src/setkey/token.l	2006-03-02 12:15:22.000000000 -0600
+++ ipsec-tools-0.6.5.p1/src/setkey/token.l	2006-03-02 14:46:53.000000000 -0600
@@ -236,6 +236,7 @@ nocyclic-seq	{ return(NOCYCLICSEQ); }
 {hyphen}ls	{ return(F_LIFETIME_SOFT); }
 {hyphen}bh	{ return(F_LIFEBYTE_HARD); }
 {hyphen}bs	{ return(F_LIFEBYTE_SOFT); }
+{hyphen}ctx	{ return(SECURITY_CTX); }
 
 	/* ... */
 any		{ return(ANY); }
diff -urpN ipsec-tools-0.6.5.p1/src/libipsec/libpfkey.h ipsec-tools-0.6.5.p2/src/libipsec/libpfkey.h
--- ipsec-tools-0.6.5.p1/src/libipsec/libpfkey.h	2006-03-02 14:43:32.000000000 -0600
+++ ipsec-tools-0.6.5.p2/src/libipsec/libpfkey.h	2006-03-02 14:51:51.000000000 -0600
@@ -88,21 +88,25 @@ int pfkey_send_getspi __P((int, u_int, u
 int pfkey_send_update __P((int, u_int, u_int, struct sockaddr *,
 	struct sockaddr *, u_int32_t, u_int32_t, u_int,
 	caddr_t, u_int, u_int, u_int, u_int, u_int, u_int32_t, u_int64_t,
-	u_int64_t, u_int64_t, u_int32_t));
+	u_int64_t, u_int64_t, u_int32_t,
+	u_int8_t, u_int8_t, caddr_t, u_int16_t));
 int pfkey_send_update_nat __P((int, u_int, u_int, struct sockaddr *,
 	struct sockaddr *, u_int32_t, u_int32_t, u_int,
 	caddr_t, u_int, u_int, u_int, u_int, u_int, u_int32_t, u_int64_t,
 	u_int64_t, u_int64_t, u_int32_t,
-	u_int8_t, u_int16_t, u_int16_t, struct sockaddr *, u_int16_t));
+	u_int8_t, u_int16_t, u_int16_t, struct sockaddr *, u_int16_t,
+	u_int8_t, u_int8_t, caddr_t, u_int16_t));
 int pfkey_send_add __P((int, u_int, u_int, struct sockaddr *,
 	struct sockaddr *, u_int32_t, u_int32_t, u_int,
 	caddr_t, u_int, u_int, u_int, u_int, u_int, u_int32_t, u_int64_t,
-	u_int64_t, u_int64_t, u_int32_t));
+	u_int64_t, u_int64_t, u_int32_t,
+	u_int8_t, u_int8_t, caddr_t, u_int16_t));
 int pfkey_send_add_nat __P((int, u_int, u_int, struct sockaddr *,
 	struct sockaddr *, u_int32_t, u_int32_t, u_int,
 	caddr_t, u_int, u_int, u_int, u_int, u_int, u_int32_t, u_int64_t,
 	u_int64_t, u_int64_t, u_int32_t,
-	u_int8_t, u_int16_t, u_int16_t, struct sockaddr *, u_int16_t));
+	u_int8_t, u_int16_t, u_int16_t, struct sockaddr *, u_int16_t,
+	u_int8_t, u_int8_t, caddr_t, u_int16_t));
 int pfkey_send_delete __P((int, u_int, u_int,
 	struct sockaddr *, struct sockaddr *, u_int32_t));
 int pfkey_send_delete_all __P((int, u_int, u_int,
diff -urpN ipsec-tools-0.6.5.p1/src/libipsec/pfkey.c ipsec-tools-0.6.5.p2/src/libipsec/pfkey.c
--- ipsec-tools-0.6.5.p1/src/libipsec/pfkey.c	2006-03-02 15:03:10.000000000 -0600
+++ ipsec-tools-0.6.5.p2/src/libipsec/pfkey.c	2006-03-02 15:00:45.000000000 -0600
@@ -62,7 +62,8 @@ static int pfkey_send_x1 __P((int, u_int
 	struct sockaddr *, u_int32_t, u_int32_t, u_int, caddr_t,
 	u_int, u_int, u_int, u_int, u_int, u_int32_t, u_int32_t,
 	u_int32_t, u_int32_t, u_int32_t,
-	u_int8_t, u_int16_t, u_int16_t, struct sockaddr *, u_int16_t));
+	u_int8_t, u_int16_t, u_int16_t, struct sockaddr *, u_int16_t,
+	u_int8_t, u_int8_t, caddr_t, u_int16_t));
 static int pfkey_send_x2 __P((int, u_int, u_int, u_int,
 	struct sockaddr *, struct sockaddr *, u_int32_t));
 static int pfkey_send_x3 __P((int, u_int, u_int));
@@ -81,6 +82,10 @@ static caddr_t pfkey_setsadbkey __P((cad
 static caddr_t pfkey_setsadblifetime __P((caddr_t, caddr_t, u_int, u_int32_t,
 	u_int32_t, u_int32_t, u_int32_t));
 static caddr_t pfkey_setsadbxsa2 __P((caddr_t, caddr_t, u_int32_t, u_int32_t));
+#ifdef SADB_X_EXT_SEC_CTX
+static caddr_t pfkey_setsecctx __P((caddr_t, caddr_t, u_int, u_int8_t, 
+	u_int8_t, caddr_t, u_int16_t));
+#endif
 
 #ifdef SADB_X_EXT_NAT_T_TYPE
 static caddr_t pfkey_set_natt_type __P((caddr_t, caddr_t, u_int, u_int8_t));
@@ -494,7 +499,9 @@ pfkey_send_getspi(so, satype, mode, src,
 int
 pfkey_send_update(so, satype, mode, src, dst, spi, reqid, wsize,
 		keymat, e_type, e_keylen, a_type, a_keylen, flags,
-		l_alloc, l_bytes, l_addtime, l_usetime, seq)
+		l_alloc, l_bytes, l_addtime, l_usetime, seq, 
+		ctxdoi, ctxalg, ctxstr, ctxstrlen)
+		
 	int so;
 	u_int satype, mode, wsize;
 	struct sockaddr *src, *dst;
@@ -504,13 +511,17 @@ pfkey_send_update(so, satype, mode, src,
 	u_int32_t l_alloc;
 	u_int64_t l_bytes, l_addtime, l_usetime;
 	u_int32_t seq;
+	u_int8_t ctxdoi, ctxalg;
+	caddr_t ctxstr;
+	u_int16_t ctxstrlen;
 {
 	int len;
 	if ((len = pfkey_send_x1(so, SADB_UPDATE, satype, mode, src, dst, spi,
 			reqid, wsize,
 			keymat, e_type, e_keylen, a_type, a_keylen, flags,
 			l_alloc, (u_int)l_bytes, (u_int)l_addtime, 
-			(u_int)l_usetime, seq, 0, 0, 0, NULL, 0)) < 0)
+			(u_int)l_usetime, seq, 0, 0, 0, NULL, 0,
+			ctxdoi, ctxalg, ctxstr, ctxstrlen)) < 0)
 		return -1;
 
 	return len;
@@ -522,7 +533,7 @@ pfkey_send_update_nat(so, satype, mode, 
 		      keymat, e_type, e_keylen, a_type, a_keylen, flags,
 		      l_alloc, l_bytes, l_addtime, l_usetime, seq,
 		      l_natt_type, l_natt_sport, l_natt_dport, l_natt_oa,
-		      l_natt_frag)
+		      l_natt_frag, ctxdoi, ctxalg, ctxstr, ctxstrlen)
 	int so;
 	u_int satype, mode, wsize;
 	struct sockaddr *src, *dst;
@@ -536,6 +547,9 @@ pfkey_send_update_nat(so, satype, mode, 
 	u_int16_t l_natt_sport, l_natt_dport;
 	struct sockaddr *l_natt_oa;
 	u_int16_t l_natt_frag;
+	u_int8_t ctxdoi, ctxalg;
+	caddr_t ctxstr;
+	u_int16_t ctxstrlen;
 {
 	int len;
 	if ((len = pfkey_send_x1(so, SADB_UPDATE, satype, mode, src, dst, spi,
@@ -543,7 +557,8 @@ pfkey_send_update_nat(so, satype, mode, 
 			keymat, e_type, e_keylen, a_type, a_keylen, flags,
 			l_alloc, (u_int)l_bytes, (u_int)l_addtime, 
 			(u_int)l_usetime, seq, l_natt_type, l_natt_sport, 
-			l_natt_dport, l_natt_oa, l_natt_frag)) < 0)
+			l_natt_dport, l_natt_oa, l_natt_frag,
+			ctxdoi, ctxalg, ctxstr, ctxstrlen)) < 0)
 		return -1;
 
 	return len;
@@ -560,7 +575,9 @@ pfkey_send_update_nat(so, satype, mode, 
 int
 pfkey_send_add(so, satype, mode, src, dst, spi, reqid, wsize,
 		keymat, e_type, e_keylen, a_type, a_keylen, flags,
-		l_alloc, l_bytes, l_addtime, l_usetime, seq)
+		l_alloc, l_bytes, l_addtime, l_usetime, seq,
+		ctxdoi, ctxalg, ctxstr, ctxstrlen)
+
 	int so;
 	u_int satype, mode, wsize;
 	struct sockaddr *src, *dst;
@@ -570,13 +587,17 @@ pfkey_send_add(so, satype, mode, src, ds
 	u_int32_t l_alloc;
 	u_int64_t l_bytes, l_addtime, l_usetime;
 	u_int32_t seq;
+	u_int8_t ctxdoi, ctxalg;
+	caddr_t ctxstr;
+	u_int16_t ctxstrlen;
 {
 	int len;
 	if ((len = pfkey_send_x1(so, SADB_ADD, satype, mode, src, dst, spi,
 			reqid, wsize,
 			keymat, e_type, e_keylen, a_type, a_keylen, flags,
 			l_alloc, (u_int)l_bytes, (u_int)l_addtime, 
-			(u_int)l_usetime, seq, 0, 0, 0, NULL, 0)) < 0)
+			(u_int)l_usetime, seq, 0, 0, 0, NULL, 0,
+			ctxdoi, ctxalg, ctxstr, ctxstrlen)) < 0)
 		return -1;
 
 	return len;
@@ -588,7 +609,7 @@ pfkey_send_add_nat(so, satype, mode, src
 		   keymat, e_type, e_keylen, a_type, a_keylen, flags,
 		   l_alloc, l_bytes, l_addtime, l_usetime, seq,
 		   l_natt_type, l_natt_sport, l_natt_dport, l_natt_oa,
-		   l_natt_frag)
+		   l_natt_frag, ctxdoi, ctxalg, ctxstr, ctxstrlen)
 	int so;
 	u_int satype, mode, wsize;
 	struct sockaddr *src, *dst;
@@ -602,6 +623,9 @@ pfkey_send_add_nat(so, satype, mode, src
 	u_int16_t l_natt_sport, l_natt_dport;
 	struct sockaddr *l_natt_oa;
 	u_int16_t l_natt_frag;
+	u_int8_t ctxdoi, ctxalg;
+	caddr_t ctxstr;
+	u_int16_t ctxstrlen;
 {
 	int len;
 	if ((len = pfkey_send_x1(so, SADB_ADD, satype, mode, src, dst, spi,
@@ -609,7 +633,8 @@ pfkey_send_add_nat(so, satype, mode, src
 			keymat, e_type, e_keylen, a_type, a_keylen, flags,
 			l_alloc, (u_int)l_bytes, (u_int)l_addtime, 
 			(u_int)l_usetime, seq, l_natt_type, l_natt_sport, 
-			l_natt_dport, l_natt_oa, l_natt_frag)) < 0)
+			l_natt_dport, l_natt_oa, l_natt_frag,
+			ctxdoi, ctxalg, ctxstr, ctxstrlen)) < 0)
 		return -1;
 
 	return len;
@@ -1202,7 +1227,7 @@ pfkey_send_x1(so, type, satype, mode, sr
 		keymat, e_type, e_keylen, a_type, a_keylen, flags,
 		l_alloc, l_bytes, l_addtime, l_usetime, seq,
 	        l_natt_type, l_natt_sport, l_natt_dport, l_natt_oa, 
-		l_natt_frag)
+		l_natt_frag, ctxdoi, ctxalg, ctxstr, ctxstrlen)
 	int so;
 	u_int type, satype, mode;
 	struct sockaddr *src, *dst, *l_natt_oa;
@@ -1214,6 +1239,9 @@ pfkey_send_x1(so, type, satype, mode, sr
 	u_int16_t l_natt_sport, l_natt_dport;
 	u_int8_t l_natt_type;
 	u_int16_t l_natt_frag;
+	u_int8_t ctxdoi, ctxalg;
+	caddr_t ctxstr;
+	u_int16_t ctxstrlen;
 {
 	struct sadb_msg *newmsg;
 	int len;
@@ -1302,6 +1330,12 @@ pfkey_send_x1(so, type, satype, mode, sr
 	if (a_type != SADB_AALG_NONE)
 		len += (sizeof(struct sadb_key) + PFKEY_ALIGN8(a_keylen));
 
+#ifdef SADB_X_EXT_SEC_CTX 
+	if (ctxstr != NULL)
+		len += (sizeof(struct sadb_x_sec_ctx)
+		    + PFKEY_ALIGN8(ctxstrlen));
+#endif
+
 #ifdef SADB_X_EXT_NAT_T_TYPE
 	/* add nat-t packets */
 	if (l_natt_type) {
@@ -1392,6 +1426,16 @@ pfkey_send_x1(so, type, satype, mode, sr
 		free(newmsg);
 		return -1;
 	}
+#ifdef SADB_X_EXT_SEC_CTX 
+	if (ctxstr != NULL) {
+		p = pfkey_setsecctx(p, ep, SADB_X_EXT_SEC_CTX, ctxdoi, 
+				ctxalg, ctxstr, ctxstrlen);
+		if (!p) {
+			free(newmsg);
+			return -1;
+		}
+	}
+#endif
 
 #ifdef SADB_X_EXT_NAT_T_TYPE
 	/* Add nat-t messages */
@@ -2408,3 +2452,35 @@ pfkey_set_natt_frag(buf, lim, type, l_na
 	return(buf + len);
 }
 #endif
+
+#ifdef SADB_X_EXT_SEC_CTX 
+static caddr_t
+pfkey_setsecctx(buf, lim, type, ctx_doi, ctx_alg, sec_ctx, sec_ctxlen)
+	caddr_t buf;
+	caddr_t lim;
+	u_int type;
+	u_int8_t ctx_doi, ctx_alg;
+	caddr_t sec_ctx;
+	u_int16_t sec_ctxlen;
+{
+	struct sadb_x_sec_ctx *p;
+	u_int len;
+
+	p = (struct sadb_x_sec_ctx *)buf;
+	len = sizeof(struct sadb_x_sec_ctx) + PFKEY_ALIGN8(sec_ctxlen);
+	
+	if (buf + len > lim)
+		return NULL;
+	
+	memset(p, 0, len);
+	p->sadb_x_sec_len = PFKEY_UNIT64(len);
+	p->sadb_x_sec_exttype = type;
+	p->sadb_x_ctx_len = sec_ctxlen;
+	p->sadb_x_ctx_doi = ctx_doi;
+	p->sadb_x_ctx_alg = ctx_alg;
+		
+	memcpy(p + 1, sec_ctx, sec_ctxlen);
+
+	return buf + len;
+}
+#endif 
diff -urpN ipsec-tools-0.6.5.p1/src/racoon/backupsa.c ipsec-tools-0.6.5.p2/src/racoon/backupsa.c
--- ipsec-tools-0.6.5.p1/src/racoon/backupsa.c	2006-03-02 14:43:31.000000000 -0600
+++ ipsec-tools-0.6.5.p2/src/racoon/backupsa.c	2006-03-02 14:52:47.000000000 -0600
@@ -331,7 +331,8 @@ do { \
 				wsize,
 				keymat,
 				e_type, e_keylen, a_type, a_keylen, flags,
-				0, l_bytes, l_addtime, 0, seq) < 0) {
+				0, l_bytes, l_addtime, 0, seq,
+				0, 0, NULL, 0) < 0) {
 			plog(LLV_ERROR, LOCATION, NULL,
 				"restore SA filed line#%d in %s: %s\n",
 				line, lcconf->pathinfo[LC_PATHTYPE_BACKUPSA], ipsec_strerror());
diff -urpN ipsec-tools-0.6.5.p1/src/racoon/cftoken.l ipsec-tools-0.6.5.p2/src/racoon/cftoken.l
--- ipsec-tools-0.6.5.p1/src/racoon/cftoken.l	2006-03-02 14:43:31.000000000 -0600
+++ ipsec-tools-0.6.5.p2/src/racoon/cftoken.l	2006-03-02 14:52:58.000000000 -0600
@@ -70,6 +70,7 @@
 #include "isakmp_var.h"
 #include "isakmp.h"
 #include "ipsec_doi.h"
+#include "policy.h"
 #include "proposal.h"
 #include "nattraversal.h"
 #ifdef GC
diff -urpN ipsec-tools-0.6.5.p1/src/racoon/ipsec_doi.c ipsec-tools-0.6.5.p2/src/racoon/ipsec_doi.c
--- ipsec-tools-0.6.5.p1/src/racoon/ipsec_doi.c	2006-03-02 14:43:31.000000000 -0600
+++ ipsec-tools-0.6.5.p2/src/racoon/ipsec_doi.c	2006-03-02 14:53:08.000000000 -0600
@@ -2379,6 +2379,15 @@ ahmismatch:
 			}
 			break;
 
+#ifdef HAVE_SECCTX
+		case IPSECDOI_ATTR_SECCTX:
+			if (flag) {
+				plog(LLV_ERROR, LOCATION, NULL,
+					"SECCTX must be in TLV.\n");
+				return -1;
+			}
+		break;
+#endif
 		case IPSECDOI_ATTR_KEY_ROUNDS:
 		case IPSECDOI_ATTR_COMP_DICT_SIZE:
 		case IPSECDOI_ATTR_COMP_PRIVALG:
@@ -2882,6 +2891,10 @@ setph2proposal0(iph2, pp, pr)
 	caddr_t x0, x;
 	u_int8_t *np_t; /* pointer next trns type in previous header */
 	const u_int8_t *spi;
+#ifdef HAVE_SECCTX
+	int truectxlen = 0;
+#endif
+
 
 	p = vmalloc(sizeof(*prop) + sizeof(pr->spi));
 	if (p == NULL)
@@ -2983,6 +2996,16 @@ setph2proposal0(iph2, pp, pr)
 
 		if (alg_oakley_dhdef_ok(iph2->sainfo->pfs_group))
 			attrlen += sizeof(struct isakmp_data);
+#ifdef HAVE_SECCTX
+		/* ctx_str is defined as char ctx_str[MAX_CTXSTR_SIZ].
+		 * The string may be smaller than MAX_CTXSTR_SIZ.
+		 */
+		if (*pp->sctx.ctx_str) {
+			truectxlen = sizeof(struct security_ctx) -
+				     (MAX_CTXSTR_SIZE - pp->sctx.ctx_strlen);
+			attrlen += sizeof(struct isakmp_data) + truectxlen;
+		}
+#endif /* HAVE_SECCTX */
 
 		p = vrealloc(p, p->l + sizeof(*trns) + attrlen);
 		if (p == NULL)
@@ -3038,6 +3061,13 @@ setph2proposal0(iph2, pp, pr)
 			x = isakmp_set_attr_l(x, IPSECDOI_ATTR_GRP_DESC,
 				iph2->sainfo->pfs_group);
 
+#ifdef HAVE_SECCTX
+		if (*pp->sctx.ctx_str) {
+			x = isakmp_set_attr_v(x, IPSECDOI_ATTR_SECCTX,
+					      (caddr_t)&pp->sctx, truectxlen);
+		}
+#endif
+
 		/* update length of this transform. */
 		trns = (struct isakmp_pl_t *)(p->v + trnsoff);
 		trns->h.len = htons(sizeof(*trns) + attrlen);
@@ -4154,6 +4184,14 @@ ipsecdoi_t2satrns(t, pp, pr, tr)
 			tr->encklen = ntohs(d->lorv);
 			break;
 
+#ifdef HAVE_SECCTX
+		case IPSECDOI_ATTR_SECCTX:
+		{
+			int len = ntohs(d->lorv);
+			memcpy(&pp->sctx, d + 1, len);
+			break;
+		}
+#endif
 		case IPSECDOI_ATTR_KEY_ROUNDS:
 		case IPSECDOI_ATTR_COMP_DICT_SIZE:
 		case IPSECDOI_ATTR_COMP_PRIVALG:
diff -urpN ipsec-tools-0.6.5.p1/src/racoon/ipsec_doi.h ipsec-tools-0.6.5.p2/src/racoon/ipsec_doi.h
--- ipsec-tools-0.6.5.p1/src/racoon/ipsec_doi.h	2006-03-02 14:43:31.000000000 -0600
+++ ipsec-tools-0.6.5.p2/src/racoon/ipsec_doi.h	2006-03-02 14:53:13.000000000 -0600
@@ -133,6 +133,10 @@
 #define IPSECDOI_ATTR_COMP_DICT_SIZE          8 /* B */
 #define IPSECDOI_ATTR_COMP_PRIVALG            9 /* V */
 
+#ifdef HAVE_SECCTX
+#define IPSECDOI_ATTR_SECCTX	     	     10 /* V */
+#endif
+
 /* 4.6.1 Security Association Payload */
 struct ipsecdoi_pl_sa {
 	struct isakmp_gen h;
diff -urpN ipsec-tools-0.6.5.p1/src/racoon/isakmp.c ipsec-tools-0.6.5.p2/src/racoon/isakmp.c
--- ipsec-tools-0.6.5.p1/src/racoon/isakmp.c	2006-03-02 14:43:31.000000000 -0600
+++ ipsec-tools-0.6.5.p2/src/racoon/isakmp.c	2006-03-02 14:53:23.000000000 -0600
@@ -84,11 +84,11 @@
 #include "oakley.h"
 #include "evt.h"
 #include "handler.h"
+#include "policy.h"
 #include "proposal.h"
 #include "ipsec_doi.h"
 #include "pfkey.h"
 #include "crypto_openssl.h"
-#include "policy.h"
 #include "isakmp_ident.h"
 #include "isakmp_agg.h"
 #include "isakmp_base.h"
diff -urpN ipsec-tools-0.6.5.p1/src/racoon/isakmp_quick.c ipsec-tools-0.6.5.p2/src/racoon/isakmp_quick.c
--- ipsec-tools-0.6.5.p1/src/racoon/isakmp_quick.c	2006-03-02 14:43:31.000000000 -0600
+++ ipsec-tools-0.6.5.p2/src/racoon/isakmp_quick.c	2006-03-02 14:53:30.000000000 -0600
@@ -2037,6 +2037,19 @@ get_proposal_r(iph2)
 	if (spidx.ul_proto == 0)
 		spidx.ul_proto = IPSEC_ULPROTO_ANY;
 
+#ifdef HAVE_SECCTX
+	/*
+	 * Need to use security context in spidx to ensure the correct
+	 * policy is selected. The only way to get the security context
+	 * is to look into the proposal sent by peer ahead of time.
+	 */
+	if (get_security_context(iph2->sa, &spidx)) {
+		plog(LLV_ERROR, LOCATION, NULL, 
+			"error occurred trying to get security context.\n");
+		return ISAKMP_INTERNAL_ERROR;
+	}
+#endif /* HAVE_SECCTX */
+
 	/* get inbound policy */
 	sp_in = getsp_r(&spidx);
 	if (sp_in == NULL) {
diff -urpN ipsec-tools-0.6.5.p1/src/racoon/Makefile.am ipsec-tools-0.6.5.p2/src/racoon/Makefile.am
--- ipsec-tools-0.6.5.p1/src/racoon/Makefile.am	2006-03-02 14:43:31.000000000 -0600
+++ ipsec-tools-0.6.5.p2/src/racoon/Makefile.am	2006-03-02 14:53:42.000000000 -0600
@@ -31,12 +31,12 @@ racoon_SOURCES = \
 	safefile.c backupsa.c genlist.c rsalist.c \
 	cftoken.l cfparse.y prsa_tok.l prsa_par.y 
 EXTRA_racoon_SOURCES = isakmp_xauth.c isakmp_cfg.c isakmp_unity.c throttle.c \
-	isakmp_frag.c nattraversal.c $(MISSING_ALGOS)
+	isakmp_frag.c nattraversal.c security.c $(MISSING_ALGOS)
 racoon_LDFLAGS = ../libipsec/libipsec.la
-racoon_LDADD = $(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) $(LEXLIB) \
-	vmbuf.o sockmisc.o misc.o
+racoon_LDADD = $(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) \
+	$(SECCTX_OBJS) $(LEXLIB) vmbuf.o sockmisc.o misc.o
 racoon_DEPENDENCIES = ../libipsec/libipsec.la \
-	$(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) \
+	$(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) $(SECCTX_OBJS) \
 	vmbuf.o sockmisc.o misc.o
 
 racoonctl_SOURCES = racoonctl.c str2val.c 
diff -urpN ipsec-tools-0.6.5.p1/src/racoon/pfkey.c ipsec-tools-0.6.5.p2/src/racoon/pfkey.c
--- ipsec-tools-0.6.5.p1/src/racoon/pfkey.c	2006-03-02 14:43:31.000000000 -0600
+++ ipsec-tools-0.6.5.p2/src/racoon/pfkey.c	2006-03-02 14:53:56.000000000 -0600
@@ -1009,6 +1009,10 @@ pk_sendupdate(iph2)
 	u_int wsize = 4;  /* XXX static size of window */ 
 	int proxy = 0;
 	struct ph2natt natt;
+	u_int8_t ctxdoi = 0, ctxalg = 0;
+	u_int16_t ctxstrlen = 0;
+	caddr_t ctxstr = NULL;
+	
 
 	/* sanity check */
 	if (iph2->approval == NULL) {
@@ -1070,6 +1074,15 @@ pk_sendupdate(iph2)
 		lifebyte = 0;
 #endif
 
+#ifdef HAVE_SECCTX
+		if (*iph2->approval->sctx.ctx_str) {
+			ctxdoi = iph2->approval->sctx.ctx_doi;
+			ctxalg = iph2->approval->sctx.ctx_alg;
+			ctxstrlen = iph2->approval->sctx.ctx_strlen;
+			ctxstr = iph2->approval->sctx.ctx_str;
+		}
+#endif /* HAVE_SECCTX */
+
 #ifdef ENABLE_NATT
 		plog(LLV_DEBUG, LOCATION, NULL, "call pfkey_send_update_nat\n");
 		if (pr->udp_encap) {
@@ -1097,7 +1110,8 @@ pk_sendupdate(iph2)
 				0, lifebyte, iph2->approval->lifetime, 0,
 				iph2->seq,
 				natt.type, natt.sport, natt.dport, natt.oa,
-				natt.frag) < 0) {
+				natt.frag,
+				ctxdoi, ctxalg, ctxstr, ctxstrlen) < 0) {
 			plog(LLV_ERROR, LOCATION, NULL,
 				"libipsec failed send update_nat (%s)\n",
 				ipsec_strerror());
@@ -1117,7 +1131,8 @@ pk_sendupdate(iph2)
 				pr->keymat->v,
 				e_type, e_keylen, a_type, a_keylen, flags,
 				0, lifebyte, iph2->approval->lifetime, 0,
-				iph2->seq) < 0) {
+				iph2->seq,
+				ctxdoi, ctxalg, ctxstr, ctxstrlen) < 0) {
 			plog(LLV_ERROR, LOCATION, NULL,
 				"libipsec failed send update (%s)\n",
 				ipsec_strerror());
@@ -1301,6 +1316,9 @@ pk_sendadd(iph2)
 	u_int wsize = 4; /* XXX static size of window */ 
 	int proxy = 0;
 	struct ph2natt natt;
+	u_int8_t ctxdoi = 0, ctxalg = 0;
+	u_int16_t ctxstrlen = 0;
+	caddr_t ctxstr = NULL;
 
 	/* sanity check */
 	if (iph2->approval == NULL) {
@@ -1362,6 +1380,15 @@ pk_sendadd(iph2)
 		lifebyte = 0;
 #endif
 
+#ifdef HAVE_SECCTX
+		if (*iph2->approval->sctx.ctx_str) {
+			ctxdoi = iph2->approval->sctx.ctx_doi;
+			ctxalg = iph2->approval->sctx.ctx_alg;
+			ctxstrlen = iph2->approval->sctx.ctx_strlen;
+			ctxstr = iph2->approval->sctx.ctx_str;
+		}
+#endif /* HAVE_SECCTX */
+
 #ifdef ENABLE_NATT
 		plog(LLV_DEBUG, LOCATION, NULL, "call pfkey_send_add_nat\n");
 
@@ -1394,7 +1421,8 @@ pk_sendadd(iph2)
 				0, lifebyte, iph2->approval->lifetime, 0,
 				iph2->seq,
 				natt.type, natt.sport, natt.dport, natt.oa,
-				natt.frag) < 0) {
+				natt.frag,
+				ctxdoi, ctxalg, ctxstr, ctxstrlen) < 0) {
 			plog(LLV_ERROR, LOCATION, NULL,
 				"libipsec failed send add_nat (%s)\n",
 				ipsec_strerror());
@@ -1419,7 +1447,8 @@ pk_sendadd(iph2)
 				pr->keymat_p->v,
 				e_type, e_keylen, a_type, a_keylen, flags,
 				0, lifebyte, iph2->approval->lifetime, 0,
-				iph2->seq) < 0) {
+				iph2->seq,
+				ctxdoi, ctxalg, ctxstr, ctxstrlen) < 0) {
 			plog(LLV_ERROR, LOCATION, NULL,
 				"libipsec failed send add (%s)\n",
 				ipsec_strerror());
@@ -1757,6 +1786,11 @@ pk_recvacquire(mhp)
 	spidx.prefs = sp_out->spidx.prefd;
 	spidx.prefd = sp_out->spidx.prefs;
 	spidx.ul_proto = sp_out->spidx.ul_proto;
+#ifdef HAVE_SECCTX
+	if (*sp_out->spidx.sec_ctx.ctx_str)
+		memcpy(&spidx.sec_ctx, &sp_out->spidx.sec_ctx, 
+			sizeof(spidx.sec_ctx));
+#endif
 
 	sp_in = getsp(&spidx);
 	if (sp_in) {
@@ -1970,6 +2004,10 @@ getsadbpolicy(policy0, policylen0, type,
 	int policylen;
 	int xisrlen;
 	u_int satype, mode;
+	int len = 0;
+#ifdef HAVE_SECCTX
+	int ctxlen = 0;
+#endif
 
 	/* get policy buffer size */
 	policylen = sizeof(struct sadb_x_policy);
@@ -1984,6 +2022,13 @@ getsadbpolicy(policy0, policylen0, type,
 			policylen += PFKEY_ALIGN8(xisrlen);
 		}
 	}
+#ifdef HAVE_SECCTX
+	if (*spidx->sec_ctx.ctx_str) {
+		ctxlen = sizeof(struct sadb_x_sec_ctx)
+			   + PFKEY_ALIGN8(spidx->sec_ctx.ctx_strlen);
+		policylen += ctxlen;
+	}
+#endif
 
 	/* make policy structure */
 	policy = racoon_malloc(policylen);
@@ -2002,12 +2047,31 @@ getsadbpolicy(policy0, policylen0, type,
 #ifdef HAVE_PFKEY_POLICY_PRIORITY
 	xpl->sadb_x_policy_priority = PRIORITY_DEFAULT;
 #endif
+	len++;
 
+#ifdef HAVE_SECCTX
+	if (*spidx->sec_ctx.ctx_str) {
+		struct sadb_x_sec_ctx *p;
+
+		p = (struct sadb_x_sec_ctx *)(xpl + len);
+		memset(p, 0, ctxlen);
+		p->sadb_x_sec_len = PFKEY_UNIT64(ctxlen);
+		p->sadb_x_sec_exttype = SADB_X_EXT_SEC_CTX;
+		p->sadb_x_ctx_len = spidx->sec_ctx.ctx_strlen;
+		p->sadb_x_ctx_doi = spidx->sec_ctx.ctx_doi;
+		p->sadb_x_ctx_alg = spidx->sec_ctx.ctx_alg;
+                                                                                
+		memcpy(p + 1,spidx->sec_ctx.ctx_str,spidx->sec_ctx.ctx_strlen);
+		len += ctxlen;
+	}
+#endif /* HAVE_SECCTX */
+	
 	/* no need to append policy information any more if type is SPDDELETE */
 	if (type == SADB_X_SPDDELETE)
 		goto end;
 
-	xisr = (struct sadb_x_ipsecrequest *)(xpl + 1);
+
+	xisr = (struct sadb_x_ipsecrequest *)(xpl + len);
 
 	for (pr = iph2->approval->head; pr; pr = pr->next) {
 
@@ -2148,6 +2212,18 @@ pk_recvspdupdate(mhp)
 			&spidx);
 #endif
 
+#ifdef HAVE_SECCTX
+	if (mhp[SADB_X_EXT_SEC_CTX] != NULL) {
+		struct sadb_x_sec_ctx *ctx;
+
+		ctx = (struct sadb_x_sec_ctx *)mhp[SADB_X_EXT_SEC_CTX];
+		spidx.sec_ctx.ctx_alg = ctx->sadb_x_ctx_alg;
+		spidx.sec_ctx.ctx_doi = ctx->sadb_x_ctx_doi;
+		spidx.sec_ctx.ctx_strlen = ctx->sadb_x_ctx_len;
+		memcpy(spidx.sec_ctx.ctx_str, ctx + 1, ctx->sadb_x_ctx_len);
+	}
+#endif /* HAVE SEC_CTX */
+		
 	sp = getsp(&spidx);
 	if (sp == NULL) {
 		plog(LLV_ERROR, LOCATION, NULL,
@@ -2249,6 +2325,18 @@ pk_recvspdadd(mhp)
 			&spidx);
 #endif
 
+#ifdef HAVE_SECCTX
+	if (mhp[SADB_X_EXT_SEC_CTX] != NULL) {
+		struct sadb_x_sec_ctx *ctx;
+
+		ctx = (struct sadb_x_sec_ctx *)mhp[SADB_X_EXT_SEC_CTX];
+		spidx.sec_ctx.ctx_alg = ctx->sadb_x_ctx_alg;
+		spidx.sec_ctx.ctx_doi = ctx->sadb_x_ctx_doi;
+		spidx.sec_ctx.ctx_strlen = ctx->sadb_x_ctx_len;
+		memcpy(spidx.sec_ctx.ctx_str, ctx + 1, ctx->sadb_x_ctx_len);
+	}
+#endif /* HAVE_SECCTX */
+
 	sp = getsp(&spidx);
 	if (sp != NULL) {
 		plog(LLV_ERROR, LOCATION, NULL,
@@ -2345,6 +2433,18 @@ pk_recvspddelete(mhp)
 			&spidx);
 #endif
 
+#ifdef HAVE_SECCTX
+	if (mhp[SADB_X_EXT_SEC_CTX] != NULL) {
+		struct sadb_x_sec_ctx *ctx;
+
+		ctx = (struct sadb_x_sec_ctx *)mhp[SADB_X_EXT_SEC_CTX];
+		spidx.sec_ctx.ctx_alg = ctx->sadb_x_ctx_alg;
+		spidx.sec_ctx.ctx_doi = ctx->sadb_x_ctx_doi;
+		spidx.sec_ctx.ctx_strlen = ctx->sadb_x_ctx_len;
+		memcpy(spidx.sec_ctx.ctx_str, ctx + 1, ctx->sadb_x_ctx_len);
+	}
+#endif /* HAVE_SECCTX */
+
 	sp = getsp(&spidx);
 	if (sp == NULL) {
 		plog(LLV_ERROR, LOCATION, NULL,
@@ -2400,6 +2500,18 @@ pk_recvspdexpire(mhp)
 			&spidx);
 #endif
 
+#ifdef HAVE_SECCTX
+	if (mhp[SADB_X_EXT_SEC_CTX] != NULL) {
+		struct sadb_x_sec_ctx *ctx;
+
+		ctx = (struct sadb_x_sec_ctx *)mhp[SADB_X_EXT_SEC_CTX];
+		spidx.sec_ctx.ctx_alg = ctx->sadb_x_ctx_alg;
+		spidx.sec_ctx.ctx_doi = ctx->sadb_x_ctx_doi;
+		spidx.sec_ctx.ctx_strlen = ctx->sadb_x_ctx_len;
+		memcpy(spidx.sec_ctx.ctx_str, ctx + 1, ctx->sadb_x_ctx_len);
+	}
+#endif /* HAVE_SECCTX */
+
 	sp = getsp(&spidx);
 	if (sp == NULL) {
 		plog(LLV_ERROR, LOCATION, NULL,
@@ -2475,6 +2587,18 @@ pk_recvspddump(mhp)
 			&spidx);
 #endif
 
+#ifdef HAVE_SECCTX
+	if (mhp[SADB_X_EXT_SEC_CTX] != NULL) {
+		struct sadb_x_sec_ctx *ctx;
+
+		ctx = (struct sadb_x_sec_ctx *)mhp[SADB_X_EXT_SEC_CTX];
+		spidx.sec_ctx.ctx_alg = ctx->sadb_x_ctx_alg;
+		spidx.sec_ctx.ctx_doi = ctx->sadb_x_ctx_doi;
+		spidx.sec_ctx.ctx_strlen = ctx->sadb_x_ctx_len;
+		memcpy(spidx.sec_ctx.ctx_str, ctx + 1, ctx->sadb_x_ctx_len);
+	}
+#endif /* HAVE_SECCTX */
+
 	sp = getsp(&spidx);
 	if (sp != NULL) {
 		plog(LLV_ERROR, LOCATION, NULL,
@@ -2832,6 +2956,18 @@ addnewsp(mhp)
 			&new->spidx);
 #endif
 
+#ifdef HAVE_SECCTX
+	if (mhp[SADB_X_EXT_SEC_CTX] != NULL) {
+		struct sadb_x_sec_ctx *ctx;
+
+		ctx = (struct sadb_x_sec_ctx *)mhp[SADB_X_EXT_SEC_CTX];
+		new->spidx.sec_ctx.ctx_alg = ctx->sadb_x_ctx_alg;
+		new->spidx.sec_ctx.ctx_doi = ctx->sadb_x_ctx_doi;
+		new->spidx.sec_ctx.ctx_strlen = ctx->sadb_x_ctx_len;
+		memcpy(new->spidx.sec_ctx.ctx_str,ctx + 1,ctx->sadb_x_ctx_len);
+	}
+#endif /* HAVE_SECCTX */
+
 	inssp(new);
 
 	return 0;
diff -urpN ipsec-tools-0.6.5.p1/src/racoon/policy.c ipsec-tools-0.6.5.p2/src/racoon/policy.c
--- ipsec-tools-0.6.5.p1/src/racoon/policy.c	2006-03-02 14:43:31.000000000 -0600
+++ ipsec-tools-0.6.5.p2/src/racoon/policy.c	2006-03-02 14:54:04.000000000 -0600
@@ -203,6 +203,14 @@ cmpspidxstrict(a, b)
 			   (struct sockaddr *)&b->dst))
 		return 1;
 
+#ifdef HAVE_SECCTX
+	if (a->sec_ctx.ctx_alg != b->sec_ctx.ctx_alg 
+	 || a->sec_ctx.ctx_doi != b->sec_ctx.ctx_doi
+	 || a->sec_ctx.ctx_strlen != b->sec_ctx.ctx_strlen
+	 || (memcmp(a->sec_ctx.ctx_str, b->sec_ctx.ctx_str, 
+	     a->sec_ctx.ctx_strlen) != 0))
+		return 1;
+#endif
 	return 0;
 }
 
@@ -273,6 +281,15 @@ cmpspidxwild(a, b)
 	if (cmpsaddrwild((struct sockaddr *)&sa1, (struct sockaddr *)&sa2))
 		return 1;
 
+#ifdef HAVE_SECCTX
+	if (a->sec_ctx.ctx_alg != b->sec_ctx.ctx_alg 
+	 || a->sec_ctx.ctx_doi != b->sec_ctx.ctx_doi
+	 || a->sec_ctx.ctx_strlen != b->sec_ctx.ctx_strlen
+	 || (memcmp(a->sec_ctx.ctx_str, b->sec_ctx.ctx_str, 
+	     a->sec_ctx.ctx_strlen) != 0))
+		return 1;
+#endif
+
 	return 0;
 }
 
@@ -462,8 +479,18 @@ spidx2str(spidx)
 	p += i;
 	blen -= i;
 
-	snprintf(p, blen, "proto=%s dir=%s",
+	i = snprintf(p, blen, "proto=%s dir=%s",
 		s_proto(spidx->ul_proto), s_direction(spidx->dir));
+	
+#ifdef HAVE_SECCTX
+	if (spidx->sec_ctx.ctx_strlen) {
+		p += i;
+		blen -= i;
+		snprintf(p, blen, " sec_ctx:doi=%d,alg=%d,len=%d,str=%s", 
+	  		spidx->sec_ctx.ctx_doi, spidx->sec_ctx.ctx_alg,
+			spidx->sec_ctx.ctx_strlen, spidx->sec_ctx.ctx_str);
+	}
+#endif
 
 	return buf;
 }
diff -urpN ipsec-tools-0.6.5.p1/src/racoon/policy.h ipsec-tools-0.6.5.p2/src/racoon/policy.h
--- ipsec-tools-0.6.5.p1/src/racoon/policy.h	2006-03-02 14:43:32.000000000 -0600
+++ ipsec-tools-0.6.5.p2/src/racoon/policy.h	2006-03-02 14:54:09.000000000 -0600
@@ -34,6 +34,18 @@
 
 #include <sys/queue.h>
 
+#ifdef HAVE_SECCTX
+#define MAX_CTXSTR_SIZE 50
+struct security_ctx {
+	u_int8_t ctx_doi;	/* Security Context DOI */
+	u_int8_t ctx_alg;	/* Security Context Algorithm */
+	u_int16_t ctx_strlen;	/* Security Context stringlength
+				 * (includes terminating NULL)
+				 */
+	char ctx_str[MAX_CTXSTR_SIZE];	/* Security Context string */
+};
+#endif
+
 /* refs. ipsec.h */
 /*
  * Security Policy Index
@@ -50,6 +62,9 @@ struct policyindex {
 	u_int8_t prefd;			/* prefix length in bits for dst */
 	u_int16_t ul_proto;		/* upper layer Protocol */
 	u_int32_t priority;		/* priority for the policy */
+#ifdef HAVE_SECCTX
+	struct security_ctx sec_ctx;	/* Security Context */
+#endif
 };
 
 /* Security Policy Data Base */
@@ -131,5 +146,6 @@ extern void initsp __P((void));
 extern struct ipsecrequest *newipsecreq __P((void));
 
 extern const char *spidx2str __P((const struct policyindex *));
+extern int get_security_context __P((vchar_t *, struct policyindex *));
 
 #endif /* _POLICY_H */
diff -urpN ipsec-tools-0.6.5.p1/src/racoon/proposal.c ipsec-tools-0.6.5.p2/src/racoon/proposal.c
--- ipsec-tools-0.6.5.p1/src/racoon/proposal.c	2006-03-02 14:43:31.000000000 -0600
+++ ipsec-tools-0.6.5.p2/src/racoon/proposal.c	2006-03-02 14:54:22.000000000 -0600
@@ -311,6 +311,60 @@ cmpsaprop_alloc(ph1, pp1, pp2, side)
 		goto err;
 	}
 
+#ifdef HAVE_SECCTX
+	/* check the security_context properties.
+	 * It is possible for one side to have a security context
+	 * and the other side doesn't. If so, this is an error.
+	 */
+	
+	if (*pp1->sctx.ctx_str && !(*pp2->sctx.ctx_str)) {
+		plog(LLV_ERROR, LOCATION, NULL,
+			"My proposal missing security context\n");
+		goto err;
+	}
+	if (!(*pp1->sctx.ctx_str) && *pp2->sctx.ctx_str) {
+		plog(LLV_ERROR, LOCATION, NULL,
+			"Peer is missing security context\n");
+		goto err;
+	}
+		
+	if (*pp1->sctx.ctx_str && *pp2->sctx.ctx_str) {
+		if (pp1->sctx.ctx_doi == pp2->sctx.ctx_doi)
+			newpp->sctx.ctx_doi = pp1->sctx.ctx_doi;
+		else {
+			plog(LLV_ERROR, LOCATION, NULL,
+				"sec doi mismatched: "
+				"my:%d peer:%d\n",
+				pp2->sctx.ctx_doi, pp1->sctx.ctx_doi);
+			goto err;
+		}
+		
+		if (pp1->sctx.ctx_alg == pp2->sctx.ctx_alg)
+			newpp->sctx.ctx_alg = pp1->sctx.ctx_alg;
+		else {
+			plog(LLV_ERROR, LOCATION, NULL,
+				"sec alg mismatched: "
+				"my:%d peer:%d\n",
+				pp2->sctx.ctx_alg, pp1->sctx.ctx_alg);
+			goto err;
+		}
+	
+		if ((pp1->sctx.ctx_strlen != pp2->sctx.ctx_strlen) || 
+		memcmp(pp1->sctx.ctx_str, pp2->sctx.ctx_str, 
+		       pp1->sctx.ctx_strlen) != 0) {
+			plog(LLV_ERROR, LOCATION, NULL,
+				"security-context string mismatched: "
+				"my: %s peer: %s\n",
+				pp2->sctx.ctx_str, pp1->sctx.ctx_str);
+			goto err;
+		} else {
+			newpp->sctx.ctx_strlen = pp1->sctx.ctx_strlen;
+			memcpy(newpp->sctx.ctx_str, pp1->sctx.ctx_str, 
+			       pp1->sctx.ctx_strlen);
+		}
+	}	
+#endif /* HAVE_SECCTX */
+
 	npr1 = npr2 = 0;
 	for (pr1 = pp1->head; pr1; pr1 = pr1->next)
 		npr1++;
@@ -960,7 +1014,7 @@ set_proposal_from_policy(iph2, sp_main, 
 	struct saprop *newpp;
 	struct ipsecrequest *req;
 	int encmodesv = IPSEC_MODE_TRANSPORT; /* use only when complex_bundle */
-
+	
 	newpp = newsaprop();
 	if (newpp == NULL) {
 		plog(LLV_ERROR, LOCATION, NULL,
@@ -971,6 +1025,15 @@ set_proposal_from_policy(iph2, sp_main, 
 	newpp->lifetime = iph2->sainfo->lifetime;
 	newpp->lifebyte = iph2->sainfo->lifebyte;
 	newpp->pfs_group = iph2->sainfo->pfs_group;
+#ifdef HAVE_SECCTX
+	if (*sp_main->spidx.sec_ctx.ctx_str) {
+		newpp->sctx.ctx_doi = sp_main->spidx.sec_ctx.ctx_doi;
+		newpp->sctx.ctx_alg = sp_main->spidx.sec_ctx.ctx_alg;
+		newpp->sctx.ctx_strlen = sp_main->spidx.sec_ctx.ctx_strlen;
+		memcpy(newpp->sctx.ctx_str, sp_main->spidx.sec_ctx.ctx_str, 
+			sp_main->spidx.sec_ctx.ctx_strlen);
+	}
+#endif /* HAVE_SECCTX */
 
 	if (lcconf->complex_bundle)
 		goto skip1;
@@ -1125,7 +1188,17 @@ set_proposal_from_proposal(iph2)
 		pp0->lifetime = iph2->sainfo->lifetime;
 		pp0->lifebyte = iph2->sainfo->lifebyte;
 		pp0->pfs_group = iph2->sainfo->pfs_group;
-
+		
+#ifdef HAVE_SECCTX
+		if (*pp_peer->sctx.ctx_str) {
+			pp0->sctx.ctx_doi = pp_peer->sctx.ctx_doi;
+			pp0->sctx.ctx_alg = pp_peer->sctx.ctx_alg;
+			pp0->sctx.ctx_strlen = pp_peer->sctx.ctx_strlen;
+			memcpy(pp0->sctx.ctx_str, pp_peer->sctx.ctx_str,
+				pp_peer->sctx.ctx_strlen);
+		}
+#endif /* HAVE_SECCTX */
+		
 		if (pp_peer->next != NULL) {
 			plog(LLV_ERROR, LOCATION, NULL,
 				"pp_peer is inconsistency, ignore it.\n");
diff -urpN ipsec-tools-0.6.5.p1/src/racoon/proposal.h ipsec-tools-0.6.5.p2/src/racoon/proposal.h
--- ipsec-tools-0.6.5.p1/src/racoon/proposal.h	2006-03-02 14:43:31.000000000 -0600
+++ ipsec-tools-0.6.5.p2/src/racoon/proposal.h	2006-03-02 14:54:28.000000000 -0600
@@ -60,7 +60,9 @@ struct saprop {
 	int pfs_group;			/* pfs group */
 	int claim;			/* flag to send RESPONDER-LIFETIME. */
 					/* XXX assumed DOI values are 1 or 2. */
-
+#ifdef HAVE_SECCTX
+	struct security_ctx sctx;	/* security context structure */
+#endif
 	struct saproto *head;
 	struct saprop *next;
 };
diff -urpN ipsec-tools-0.6.5.p1/src/racoon/remoteconf.c ipsec-tools-0.6.5.p2/src/racoon/remoteconf.c
--- ipsec-tools-0.6.5.p1/src/racoon/remoteconf.c	2006-03-02 14:43:31.000000000 -0600
+++ ipsec-tools-0.6.5.p2/src/racoon/remoteconf.c	2006-03-02 14:54:41.000000000 -0600
@@ -66,6 +66,7 @@
 #include "remoteconf.h"
 #include "localconf.h"
 #include "grabmyaddr.h"
+#include "policy.h"
 #include "proposal.h"
 #include "vendorid.h"
 #include "gcmalloc.h"
diff -urpN ipsec-tools-0.6.5.p1/src/racoon/security.c ipsec-tools-0.6.5.p2/src/racoon/security.c
--- ipsec-tools-0.6.5.p1/src/racoon/security.c	1969-12-31 18:00:00.000000000 -0600
+++ ipsec-tools-0.6.5.p2/src/racoon/security.c	2006-03-02 14:54:47.000000000 -0600
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2005 International Business Machines Corporation
+ * 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.
+ */
+
+
+#include "config.h"
+
+#include <sys/types.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "var.h"
+#include "vmbuf.h"
+#include "misc.h"
+#include "plog.h"
+
+#include "isakmp_var.h"
+#include "isakmp.h"
+#include "ipsec_doi.h"
+#include "policy.h"
+#include "strnames.h"
+#include "handler.h"
+
+/* 
+ * Get the security context information from SA.
+ */
+int
+get_security_context(sa, p)
+	vchar_t *sa;
+	struct policyindex *p;
+{
+	int len = 0;
+	int flag, type = 0;
+	u_int16_t lorv;
+	caddr_t bp;
+	vchar_t *pbuf = NULL;
+	vchar_t *tbuf = NULL;
+	struct isakmp_parse_t *pa;
+	struct isakmp_parse_t *ta;
+	struct isakmp_pl_p *prop;
+	struct isakmp_pl_t *trns;
+	struct isakmp_data *d;
+	struct ipsecdoi_sa_b *sab = (struct ipsecdoi_sa_b *)sa->v;
+	
+	/* check SA payload size */
+	if (sa->l < sizeof(*sab)) {
+		plog(LLV_ERROR, LOCATION, NULL,
+			"Invalid SA length = %zu.\n", sa->l);
+		return -1;
+	}
+
+	bp = (caddr_t)(sab + 1); /* here bp points to first proposal payload */
+	len = sa->l - sizeof(*sab);
+
+	pbuf = isakmp_parsewoh(ISAKMP_NPTYPE_P, (struct isakmp_gen *)bp, len);
+	if (pbuf == NULL)
+		return -1;
+
+	pa = (struct isakmp_parse_t *)pbuf->v; 
+        /* check the value of next payload */
+	if (pa->type != ISAKMP_NPTYPE_P) {
+		plog(LLV_ERROR, LOCATION, NULL,
+			"Invalid payload type=%u\n", pa->type);
+		vfree(pbuf);
+		return -1;
+	}
+
+	if (pa->len == 0) {
+		plog(LLV_ERROR, LOCATION, NULL,
+		"invalid proposal with length %d\n", pa->len);
+		vfree(pbuf);
+		return -1;
+	}
+
+	/* our first proposal */
+	prop = (struct isakmp_pl_p *)pa->ptr;
+
+	/* now get transform */
+	bp = (caddr_t)prop + sizeof(struct isakmp_pl_p) + prop->spi_size;
+	len = ntohs(prop->h.len) - 
+		(sizeof(struct isakmp_pl_p) + prop->spi_size);
+	tbuf = isakmp_parsewoh(ISAKMP_NPTYPE_T, (struct isakmp_gen *)bp, len);
+	if (tbuf == NULL)
+		return -1;
+
+	ta = (struct isakmp_parse_t *)tbuf->v;
+	if (ta->type != ISAKMP_NPTYPE_T) {
+		plog(LLV_ERROR, LOCATION, NULL,
+		     "Invalid payload type=%u\n", ta->type);
+		return -1;
+	}
+	
+	trns = (struct isakmp_pl_t *)ta->ptr;
+
+	len = ntohs(trns->h.len) - sizeof(struct isakmp_pl_t);
+	d = (struct isakmp_data *)((caddr_t)trns + sizeof(struct isakmp_pl_t));
+
+	while (len > 0) {
+		type = ntohs(d->type) & ~ISAKMP_GEN_MASK;
+		flag = ntohs(d->type) & ISAKMP_GEN_MASK;
+		lorv = ntohs(d->lorv);
+
+		if (type != IPSECDOI_ATTR_SECCTX) {
+			if (flag) {
+				len -= sizeof(*d);
+				d = (struct isakmp_data *)((char *)d 
+				     + sizeof(*d));
+			} else {
+				len -= (sizeof(*d) + lorv);
+				d = (struct isakmp_data *)((caddr_t)d
+				     + sizeof(*d) + lorv);
+			}
+		} else {
+			flag = ntohs(d->type & ISAKMP_GEN_MASK);
+			if (flag) {
+				plog(LLV_ERROR, LOCATION, NULL,
+				     "SECCTX must be in TLV.\n");
+				return -1;
+			}
+			memcpy(&p->sec_ctx, d + 1, lorv);
+			return 0;
+		}
+	}
+	return 0;
+}


Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ipsec-tools.spec	11 Feb 2006 03:37:37 -0000	1.23
+++ ipsec-tools.spec	18 Apr 2006 20:15:42 -0000	1.24
@@ -1,6 +1,6 @@
 Name: ipsec-tools
 Version: 0.6.4
-Release: 1.1
+Release: 2
 Summary: Tools for configuring and using IPSEC
 License: BSD
 Group: System Environment/Base
@@ -16,10 +16,11 @@
 Patch2: isakmp.c.diff
 Patch5: ipsec-tools-0.5-64bit.patch
 #Patch6: ipsec-tools-0.6.1-openssl-098.patch
+Patch7: ipsec-tools-0.6.5-mls.patch
 BuildPrereq: openssl-devel, krb5-devel, bison, flex
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: initscripts >= 7.31.11.EL-1
-
+	
 %description
 This is the IPsec-Tools package.  You need this package in order to
 really use the IPsec functionality in the linux-2.5+ kernels.  This
@@ -34,6 +35,7 @@
 %patch2 -p1
 %patch5 -p1 -b .64bit
 #%patch6 -p1 -b .openssl-098
+%patch7 -p1 -b .mls
 
 mkdir -p kernel-headers/linux
 cp %{SOURCE1} %{SOURCE2} %{SOURCE5} %{SOURCE6} kernel-headers/linux
@@ -90,6 +92,10 @@
 %config(noreplace) /etc/racoon/racoon.conf
 
 %changelog
+* Tue Apr 18 2006 Dan Walsh <dwalsh at redhat.com> - 0.6.4-2
+- Add MLS Patch to allow use of labeled networks
+- Patch provided by Joy Latten <latten at austin.ibm.com>
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.6.4-1.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Apr 18 20:35:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 16:35:24 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.243, 1.244 anaconda.spec, 1.364,
	1.365 sources, 1.363, 1.364
Message-ID: <200604182035.k3IKZOxu026919@cvs.devel.redhat.com>

Author: clumens

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- .cvsignore	4 Apr 2006 20:37:21 -0000	1.243
+++ .cvsignore	18 Apr 2006 20:35:20 -0000	1.244
@@ -1 +1 @@
-anaconda-11.1.0.3.tar.bz2
+anaconda-11.1.0.4.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -r1.364 -r1.365
--- anaconda.spec	4 Apr 2006 20:37:21 -0000	1.364
+++ anaconda.spec	18 Apr 2006 20:35:20 -0000	1.365
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.3
+Version: 11.1.0.4
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -79,6 +79,13 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Apr 18 2006 Chris Lumens <clumens at redhat.com> 11.1.0.4-1
+- Pass version to mkstamp for discinfo files (jkeating).
+- Fix FTP method handling.
+- Don't download RPMs twice on FTP and HTTP methods (pnasrat, #183654).
+- Use libuser for setting root password.
+- Fix up rescue image script problems (dcantrel, #188011).
+
 * Tue Apr 04 2006 Chris Lumens <clumens at redhat.com> 11.1.0.3-1
 - Fix up for rhpxl Modes changes.
 - Fix handling of video driver if there's no list of drivers available.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -r1.363 -r1.364
--- sources	4 Apr 2006 20:37:25 -0000	1.363
+++ sources	18 Apr 2006 20:35:20 -0000	1.364
@@ -1 +1 @@
-01e95f7580622996b7e80a868adfadf0  anaconda-11.1.0.3.tar.bz2
+2e1fc5ad1a266a1cd016c83f47b75b7d  anaconda-11.1.0.4.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 18 20:53:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 16:53:57 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.183,
	1.184 policycoreutils.spec, 1.260, 1.261
Message-ID: <200604182053.k3IKrvqO008520@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8503

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Mon Apr 18 2006 Dan Walsh <dwalsh at redhat.com> 1.30.6-2
- Ship avc.py


policycoreutils-rhat.patch:
 audit2allow/Makefile         |    4 
 audit2allow/audit2allow      |  472 ++-------------------------------------
 audit2allow/audit2allow.1    |    5 
 audit2allow/avc.py           |  518 +++++++++++++++++++++++++++++++++++++++++++
 restorecond/restorecond.conf |    2 
 semanage/semanage            |    2 
 semanage/seobject.py         |   14 -
 setsebool/setsebool.8        |    2 
 8 files changed, 576 insertions(+), 443 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- policycoreutils-rhat.patch	14 Apr 2006 19:47:04 -0000	1.183
+++ policycoreutils-rhat.patch	18 Apr 2006 20:53:54 -0000	1.184
@@ -1076,6 +1076,27 @@
 +				rec += self.seRules[i].out(self.verbose)+"\n"
 +		return rec
 +
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-1.30.6/audit2allow/Makefile
+--- nsapolicycoreutils/audit2allow/Makefile	2005-01-21 09:01:35.000000000 -0500
++++ policycoreutils-1.30.6/audit2allow/Makefile	2006-04-18 16:51:11.000000000 -0400
+@@ -3,6 +3,8 @@
+ BINDIR ?= $(PREFIX)/bin
+ MANDIR ?= $(PREFIX)/share/man
+ LOCALEDIR ?= /usr/share/locale
++PYLIBVER ?= python2.4
++PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER)
+ 
+ TARGETS=audit2allow
+ 
+@@ -13,6 +15,8 @@
+ 	install -m 755 $(TARGETS) $(BINDIR)
+ 	-mkdir -p $(MANDIR)/man1
+ 	install -m 644 audit2allow.1 $(MANDIR)/man1/
++	test -d $(PYTHONLIBDIR)/site-packages || install -m 755 -d $(PYTHONLIBDIR)/site-packages
++	install -m 755 avc.py $(PYTHONLIBDIR)/site-packages
+ 
+ clean:
+ 
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.30.6/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2006-03-29 11:08:21.000000000 -0500
 +++ policycoreutils-1.30.6/restorecond/restorecond.conf	2006-04-14 13:50:16.000000000 -0400


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- policycoreutils.spec	14 Apr 2006 19:47:04 -0000	1.260
+++ policycoreutils.spec	18 Apr 2006 20:53:54 -0000	1.261
@@ -5,7 +5,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.6
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -101,6 +101,7 @@
 %config %{_sysconfdir}/pam.d/run_init
 %config(noreplace) %{_sysconfdir}/sestatus.conf
 %{_libdir}/python2.4/site-packages/seobject.py*
+%{_libdir}/python2.4/site-packages/avc.py*
 %attr(755,root,root) /etc/rc.d/init.d/restorecond
 %config(noreplace) /etc/selinux/restorecond.conf
 
@@ -108,6 +109,9 @@
 /sbin/service restorecond condrestart
 
 %changelog
+* Mon Apr 18 2006 Dan Walsh <dwalsh at redhat.com> 1.30.6-2
+- Ship avc.py
+
 * Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> 1.30.6-1
 - Add /etc/samba/secrets.tdb to restorecond.conf
 - Update from upstream



From fedora-cvs-commits at redhat.com  Tue Apr 18 21:09:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 17:09:24 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2136,1.2137
Message-ID: <200604182109.k3IL9OD9008907@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
- Enable DECNET to keep both users happy. (#120628)
- Enable TPM modules. (#189020)
- Enable some SGI specific ia64 options. (#188915)
- Add missing -kdump %preuninstall (#189100)




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2136
retrieving revision 1.2137
diff -u -r1.2136 -r1.2137
--- kernel-2.6.spec	18 Apr 2006 18:48:20 -0000	1.2136
+++ kernel-2.6.spec	18 Apr 2006 21:09:21 -0000	1.2137
@@ -1458,6 +1458,10 @@
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}smp
 
+%preun kdump
+/sbin/modprobe loop 2> /dev/null > /dev/null  || :
+/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}kdump
+
 %preun xen0
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen0
@@ -1650,6 +1654,10 @@
 %changelog
 * Tue Apr 18 2006 Dave Jones <davej at redhat.com>
 - 2.6.17rc1-git13
+- Enable DECNET to keep both users happy. (#120628)
+- Enable TPM modules. (#189020)
+- Enable some SGI specific ia64 options. (#188915)
+- 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  Tue Apr 18 21:09:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 17:09:24 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.177,
	1.178 config-ia64-generic, 1.24, 1.25 config-x86-generic, 1.49,
	1.50 config-x86_64-generic, 1.39, 1.40
Message-ID: <200604182109.k3IL9O9E008918@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic config-ia64-generic config-x86-generic 
	config-x86_64-generic 
Log Message:
- Enable DECNET to keep both users happy. (#120628)
- Enable TPM modules. (#189020)
- Enable some SGI specific ia64 options. (#188915)
- Add missing -kdump %preuninstall (#189100)




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- config-generic	16 Apr 2006 22:58:48 -0000	1.177
+++ config-generic	18 Apr 2006 21:09:21 -0000	1.178
@@ -626,7 +626,6 @@
 CONFIG_IP_VS_NQ=m
 CONFIG_IP_VS_FTP=m
 
-
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
@@ -635,7 +634,10 @@
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_IPV6_TUNNEL=m
-# CONFIG_DECNET is not set
+CONFIG_DECNET=m
+CONFIG_DECNET_ROUTER=y
+CONFIG_DECNET_ROUTE_FWMARK=y
+# CONFIG_DECNET_NF_GRABULATOR is not set
 CONFIG_BRIDGE=m
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK=m
@@ -1410,9 +1412,9 @@
 # CONFIG_STALDRV is not set
 # CONFIG_FTAPE is not set
 # CONFIG_IBM_ASM is not set
-# CONFIG_TCG_TPM is not set
-# CONFIG_TCG_NSC is not set
-# CONFIG_TCG_ATMEL is not set
+CONFIG_TCG_TPM=m
+CONFIG_TCG_NSC=m
+CONFIG_TCG_ATMEL=m
 # CONFIG_TCG_INFINEON is not set
 # CONFIG_TELCLOCK is not set
 


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- config-ia64-generic	16 Apr 2006 22:58:48 -0000	1.24
+++ config-ia64-generic	18 Apr 2006 21:09:21 -0000	1.25
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 #
- 
+
 #
 # Processor type and features
 #
@@ -36,7 +36,7 @@
 # CONFIG_MMTIMER is not set
 CONFIG_IOSAPIC=y
 CONFIG_FORCE_MAX_ZONEORDER=18
-CONFIG_NR_CPUS=512
+CONFIG_NR_CPUS=1024
 # CONFIG_IA32_SUPPORT is not set
 # CONFIG_COMPAT is not set
 CONFIG_PERFMON=y
@@ -95,11 +95,11 @@
 #
 # CONFIG_MTD is not set
 
-# 
+#
 # SGI
-# 
+#
 CONFIG_SGI_SNSC=y
-# CONFIG_IA64_SGI_SN_XP is not set
+CONFIG_IA64_SGI_SN_XP=y
 
 #
 # SCSI low-level drivers


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- config-x86-generic	10 Apr 2006 19:14:07 -0000	1.49
+++ config-x86-generic	18 Apr 2006 21:09:21 -0000	1.50
@@ -290,4 +290,4 @@
 
 CONFIG_SND_ES18XX=m
 
-
+CONFIG_TCG_INFINEON=m


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- config-x86_64-generic	10 Apr 2006 18:41:28 -0000	1.39
+++ config-x86_64-generic	18 Apr 2006 21:09:21 -0000	1.40
@@ -158,3 +158,5 @@
 CONFIG_REORDER=y
 
 CONFIG_SCHED_MC=y
+
+CONFIG_TCG_INFINEON=m



From fedora-cvs-commits at redhat.com  Tue Apr 18 21:10:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 17:10:43 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2093,1.2094
Message-ID: <200604182110.k3ILAhJq019405@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Add missing %preuninstall for -kdump kernels. (#189100)



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2093
retrieving revision 1.2094
diff -u -r1.2093 -r1.2094
--- kernel-2.6.spec	18 Apr 2006 03:50:32 -0000	1.2093
+++ kernel-2.6.spec	18 Apr 2006 21:10:37 -0000	1.2094
@@ -1516,6 +1516,10 @@
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}smp
 
+%preun kdump
+/sbin/modprobe loop 2> /dev/null > /dev/null  || :
+/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}kdump
+
 %preun xen0
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen0
@@ -1689,6 +1693,7 @@
 %changelog
 * Tue Apr 18 2006 Dave Jones <davej at redhat.com>
 - 2.6.16.7
+- Add missing %preuninstall for -kdump kernels. (#189100)
 
 * Mon Apr 17 2006 Dave Jones <davej at redhat.com>
 - 2.6.16.6



From fedora-cvs-commits at redhat.com  Tue Apr 18 23:07:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 19:07:31 -0400
Subject: rpms/kernel/FC-5 patch-2.6.16.8.bz2.sign, NONE, 1.1 .cvsignore,
	1.388, 1.389 kernel-2.6.spec, 1.2094, 1.2095 sources, 1.329,
	1.330 patch-2.6.16.7.bz2.sign, 1.1, NONE
Message-ID: <200604182307.k3IN7V3S004386@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	.cvsignore kernel-2.6.spec sources 
Added Files:
	patch-2.6.16.8.bz2.sign 
Removed Files:
	patch-2.6.16.7.bz2.sign 
Log Message:
2.6.16.8



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

iD8DBQBERV6TyGugalF9Dw4RApMXAJ0XMYr7dmglKT5jnn2zG+QOXEfAkwCeMUw+
hMPcmCGPu5U3XBpL0v3V6GU=
=lXMC
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -r1.388 -r1.389
--- .cvsignore	18 Apr 2006 03:50:32 -0000	1.388
+++ .cvsignore	18 Apr 2006 23:07:20 -0000	1.389
@@ -3,4 +3,4 @@
 kernel-2.6.16
 xen-20060301.tar.bz2
 linux-2.6.16.tar.bz2
-patch-2.6.16.7.bz2
+patch-2.6.16.8.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2094
retrieving revision 1.2095
diff -u -r1.2094 -r1.2095
--- kernel-2.6.spec	18 Apr 2006 21:10:37 -0000	1.2094
+++ kernel-2.6.spec	18 Apr 2006 23:07:22 -0000	1.2095
@@ -214,7 +214,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16.7.bz2
+Patch1: patch-2.6.16.8.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1691,6 +1691,9 @@
 %endif
 
 %changelog
+* Wed Apr 19 2006 David Woodhouse <dwmw2 at redhat.com>
+- 2.6.16.8
+
 * Tue Apr 18 2006 Dave Jones <davej at redhat.com>
 - 2.6.16.7
 - Add missing %preuninstall for -kdump kernels. (#189100)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -r1.329 -r1.330
--- sources	18 Apr 2006 03:50:32 -0000	1.329
+++ sources	18 Apr 2006 23:07:28 -0000	1.330
@@ -1,3 +1,3 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 cdfde609af8adcf58d7ff626599b2d90  xen-20060301.tar.bz2
-9520cf6badb80e2a8bb008e715533add  patch-2.6.16.7.bz2
+8162e5fda09c9d1d35d9e7faab928912  patch-2.6.16.8.bz2


--- patch-2.6.16.7.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 18 23:09:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 19:09:40 -0400
Subject: rpms/kernel/FC-5 upstream,1.302,1.303
Message-ID: <200604182309.k3IN9eti004704@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	upstream 
Log Message:
2.6.16.8


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -r1.302 -r1.303
--- upstream	18 Apr 2006 03:50:32 -0000	1.302
+++ upstream	18 Apr 2006 23:09:28 -0000	1.303
@@ -1,2 +1,2 @@
 linux-2.6.16.tar.bz2
-patch-2.6.16.7.bz2
+patch-2.6.16.8.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 18 23:44:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 19:44:44 -0400
Subject: rpms/jwhois/devel jwhois.spec,1.25,1.26
Message-ID: <200604182344.k3INiitM027003@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/jwhois/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26972

Modified Files:
	jwhois.spec 
Log Message:
* Wed Apr 19 2006 Miloslav Trmac <mitr at redhat.com> - 3.2.3-4
- Update to upstream config as of Apr 19 2006 (#188366)



Index: jwhois.spec
===================================================================
RCS file: /cvs/dist/rpms/jwhois/devel/jwhois.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jwhois.spec	11 Feb 2006 03:42:58 -0000	1.25
+++ jwhois.spec	18 Apr 2006 23:44:40 -0000	1.26
@@ -1,10 +1,10 @@
 Name: jwhois
 Version: 3.2.3
-Release: 3.2.1
+Release: 4
 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
-#Patch0: jwhois-3.2.3-config-cvs.patch
+Patch0: jwhois-3.2.3-config-cvs.patch
 Patch1: jwhois-3.2.2-afrinic.patch
 Patch2: jwhois-3.2.2-ru.patch
 Patch3: jwhois-3.2.3-sigpipe.patch
@@ -20,7 +20,7 @@
 
 %prep
 %setup -q
-#patch0 -p0 -b .config
+%patch0 -p0 -b .config
 %patch1 -p1 -b .afrinic
 %patch2 -p1 -b .ru
 %patch3 -p1 -b .sigpipe
@@ -63,6 +63,9 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Wed Apr 19 2006 Miloslav Trmac <mitr at redhat.com> - 3.2.3-4
+- Update to upstream config as of Apr 19 2006 (#188366)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.2.3-3.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Apr 18 23:45:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 19:45:46 -0400
Subject: rpms/jwhois/devel jwhois-3.2.3-config-cvs.patch,NONE,1.1
Message-ID: <200604182345.k3INjkTS027174@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/jwhois/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27129

Added Files:
	jwhois-3.2.3-config-cvs.patch 
Log Message:
* Wed Apr 19 2006 Miloslav Trmac <mitr at redhat.com> - 3.2.3-4
- Update to upstream config as of Apr 19 2006 (#188366)


jwhois-3.2.3-config-cvs.patch:
 jwhois.conf |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE jwhois-3.2.3-config-cvs.patch ---
Note that this is not a pure CVS diff, a hunk adding the "connect-timeout"
option has been removed.

Index: example/jwhois.conf
===================================================================
RCS file: /sources/jwhois/jwhois/example/jwhois.conf,v
retrieving revision 1.119
retrieving revision 1.122
diff -u -r1.119 -r1.122
--- example/jwhois.conf	9 Jul 2005 18:31:51 -0000	1.119
+++ example/jwhois.conf	12 Apr 2006 14:23:40 -0000	1.122
@@ -180,7 +180,7 @@
 	"\\.cx$" = "whois.nic.cx";
 	"\\.cy$" = "whois.ripe.net";
 	"\\.cz$" = "whois.nic.cz";
-	"\\.de$" = "www.denic.de";
+	"\\.de$" = "whois.denic.de";
 	"\\.dk$" = "whois.dk-hostmaster.dk";
 	"\\.do$" = "whois.nic.do";
 	"\\.dz$" = "whois.ripe.net";
@@ -189,6 +189,7 @@
 	"\\.ee$" = "whois.eenet.ee";
 	"\\.eg$" = "whois.ripe.net";
 	"\\.es$" = "www.nic.es";
+	"\\.eu$" = "whois.eu";
 	"\\.fi$" = "whois.ficora.fi";
 	"\\.fj$" = "whois.usp.ac.fj";
 	"\\.fm$" = "www.dot.fm";
@@ -866,6 +867,10 @@
 		form-element = "domainname";
 		form-extra = "service=WhoisData&lang=en&submit=Accept";
 	}
+	"whois\\.denic\\.de" {
+		whois-server = "whois.denic.de";
+		query-format = "-C UTF-8 -T dn,ace $*";
+	}
 	"whois\\.nic\\.ad\\.jp" {
 		query-format = "$*/e";
 	}



From fedora-cvs-commits at redhat.com  Tue Apr 18 23:54:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 19:54:17 -0400
Subject: rpms/bind/devel bind-chroot-admin.in,1.5,1.6
Message-ID: <200604182354.k3INsH4i011729@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11677

Modified Files:
	bind-chroot-admin.in 
Log Message:
fix bug 188382; deal with redundant .rpmsave links; prevent redundant backups


Index: bind-chroot-admin.in
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind-chroot-admin.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bind-chroot-admin.in	3 Apr 2006 16:27:51 -0000	1.5
+++ bind-chroot-admin.in	18 Apr 2006 23:54:14 -0000	1.6
@@ -67,7 +67,10 @@
     if [ -L "$BIND_CHROOT_PREFIX" ]; then
 	BIND_CHROOT_PREFIX=`/usr/bin/readlink "$BIND_CHROOT_PREFIX"`;
     fi
-
+    if [ -e /etc/sysconfig/named ]; then
+	/bin/chown root:named /etc/sysconfig/named;
+	/bin/chmod 0640 /etc/sysconfig/named;
+    fi
     /bin/mkdir -p ${BIND_DIR}/{slaves,data};
     /bin/chown root:named ${BIND_DIR};
     /bin/chown named:named ${BIND_DIR}/{slaves,data};
@@ -79,12 +82,13 @@
     /bin/chmod 750 ${BIND_CHROOT_PREFIX}/{,etc,dev,var,var/{run,named/}};
     /bin/chown named:named ${BIND_CHROOT_PREFIX}/var/{run/named,named/{data,slaves}};
     /bin/chmod 770 ${BIND_CHROOT_PREFIX}/var/{run/named,named/{slaves,data}};        
-
+    
     [ ! -e "${BIND_CHROOT_PREFIX}/dev/random" ] && /bin/mknod "${BIND_CHROOT_PREFIX}/dev/random" c 1 8 
     [ ! -e "${BIND_CHROOT_PREFIX}/dev/zero" ] && /bin/mknod "${BIND_CHROOT_PREFIX}/dev/zero" c 1 5
     [ ! -e "${BIND_CHROOT_PREFIX}/dev/null" ] && /bin/mknod "${BIND_CHROOT_PREFIX}/dev/null" c 1 3
     [ ! -e "${BIND_CHROOT_PREFIX}/etc/localtime" ] &&  [ -e /etc/localtime ] && /bin/cp -fp /etc/localtime "${BIND_CHROOT_PREFIX}/etc/localtime";
-    chmod 666 "${BIND_CHROOT_PREFIX}"/dev/{random,null,zero};
+    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       
        for dev in random zero null; do
 	   /usr/bin/chcon --reference=/dev/$dev ${BIND_CHROOT_PREFIX}/dev/$dev;
@@ -121,7 +125,7 @@
     fi
     if [ -e "$dst" ]; then
        if [ ! -L "$dst" ]; then
-	  if [ ! -s "$dst" ]; then
+	  if [ ! -s "$dst" ] || /usr/bin/cmp "$dst" "$src" > /dev/null 2>&1; then
 	     /bin/rm -f "$dst";
 	  else	     
 	     if [ "$src" -nt "$dst" ] || [ ! "$dst" -nt "$src" ] ; then
@@ -135,13 +139,15 @@
           dstlnk=`/usr/bin/readlink "$dst"`
 	  if [ "$dstlnk" != $src ]; then
 	     /bin/rm -f $dst;
-	     if [ "$dstlnk" != "$dst" ] && [ -s $dstlnk ]; then
-		 if [ "$dstlnk" -nt "$src" ] || [ ! "$dstlnk" -nt "$src" ] ; then		     
-		     /bin/cp -fp "$dstlnk" "$dst".`/bin/date +'%Y-%m-%d_%H-%M-%S.%N'`;
-		 else
-		     /bin/mv "$src" "$src".`/bin/date +'%Y-%m-%d_%H-%M-%S.%N'`;
-		     /bin/cp -fp "$dstlnk" "$src";
-		 fi;
+	     if ! /usr/bin/cmp "$dstlnk" "$src" > /dev/null 2>&1; then
+		if [ "$dstlnk" != "$dst" ] && [ -s $dstlnk ]; then
+		   if [ "$dstlnk" -nt "$src" ] || [ ! "$dstlnk" -nt "$src" ] ; then		     
+		      /bin/cp -fp "$dstlnk" "$dst".`/bin/date +'%Y-%m-%d_%H-%M-%S.%N'`;
+		   else
+		      /bin/mv "$src" "$src".`/bin/date +'%Y-%m-%d_%H-%M-%S.%N'`;
+		      /bin/cp -fp "$dstlnk" "$src";
+		  fi;
+	        fi;
 	     fi;
 	  else
 	     return 0;
@@ -207,6 +213,11 @@
 	    replace_with_link ${BIND_CHROOT_PREFIX}/$f $f;
 	    [ ! -e $changed ] && touch $changed;
 	done;
+	/usr/bin/find /etc/{named.*,rndc.*}.rpmsave ${BIND_DIR}/*.rpmsave  -maxdepth 0 -type l 2>/dev/null |
+	while read f;
+	do
+	    /bin/rm -f $f >/dev/null 2>&1;
+	done
 	pfx=${BIND_CHROOT_PREFIX}
     else              # chroot is disabled	
 	/usr/bin/find /var/named/chroot/{etc/{named.*,rndc.*},var/named{/*,/data/*,/slaves/*}} -maxdepth 0 |
@@ -225,27 +236,32 @@
 };'     > /etc/rndc.key;
     elif /bin/egrep -q '@KEY@' /etc/rndc.key; then
 	/bin/sed -i -e 's^@KEY@^'`/usr/sbin/dns-keygen`'^' /etc/rndc.key ;
-    fi
-    chown root:named ${pfx}/var/named/* >/dev/null 2>&1;
+    fi    
+    chown -h root:named /var/named/* >/dev/null 2>&1;
+    chown -h root:named ${BIND_CHROOT_PREFIX}/var/named/* >/dev/null 2>&1;
+    chown -h root:named /etc/{named,rndc}.* >/dev/null 2>&1;
+    chown -h root:named ${BIND_CHROOT_PREFIX}/etc/{named,rndc}.* >/dev/null 2>&1;
     chmod 750 ${pfx}/var/named  >/dev/null 2>&1;
     chmod 640 ${pfx}/var/named/* >/dev/null 2>&1;
     chmod 750 ${pfx}/var/named/*/. >/dev/null 2>&1;
-    chown named:named ${pfx}/var/named/{data{,/*},slaves{,*/}} >/dev/null 2>&1;
+    chown -h named:named /var/named/{data{,/*},slaves{,*/}} >/dev/null 2>&1;
+    chown -h named:named ${BIND_CHROOT_PREFIX}/var/named/{data{,/*},slaves{,*/}} >/dev/null 2>&1;
     chmod 770 ${pfx}/var/named/{data,slaves} >/dev/null 2>&1;
     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 [ -n "$pfx" ]; then
-		/sbin/restorecon -R $pfx/etc $pfx/var/named $pfx/var/run/named >/dev/null 2>&1;
-		if [ -e $pfx/etc/localtime ] && [ -e /etc/localtime ] ; then 
-		   /usr/bin/chcon --reference=/etc/localtime $pfx/etc/localtime >/dev/null 2>&1;
-		fi;		
-	    else
-		/sbin/restorecon /etc/{named,rndc}.* >/dev/null 2>&1;
-		/usr/bin/chcon --reference=/etc/named.conf /etc/named.* >/dev/null 2>&1;
-		/sbin/restorecon -e /var/named/chroot /var/named{/,/data/,/slaves/}* >/dev/null 2>&1;
-	    fi;
+	   /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;
+	   fi;		
+	   /usr/bin/chcon -h --reference=/etc/named.conf /etc/named.*    >/dev/null 2>&1;
+	   /usr/bin/chcon -h --reference=/etc/rndc.key   /etc/rndc.key   >/dev/null 2>&1;
+	   /usr/bin/chcon -h --reference=/etc/rndc.conf  /etc/rndc.conf  >/dev/null 2>&1;
+	   /usr/bin/chcon -h --reference=/var/named     /var/named{/,/*} >/dev/null 2>&1;
+	   /usr/bin/chcon -h --reference=/var/named/slaves /var/named/{slaves,data}{/,/*} >/dev/null 2>&1;
+	   /sbin/restorecon /var/named/named.ca ${BIND_CHROOT_PREFIX}/var/named/named.ca  >/dev/null 2>&1;
+	   /usr/bin/chcon -h --reference=${BIND_CHROOT_PREFIX}/var/named/named.ca /var/named/named.ca >/dev/null 2>&1;
 	fi;
 	/sbin/service named condrestart
 	rm -f $changed;



From fedora-cvs-commits at redhat.com  Wed Apr 19 00:01:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 20:01:59 -0400
Subject: rpms/jwhois/FC-5 jwhois.spec,1.25,1.26
Message-ID: <200604190001.k3J01xij024396@cvs.devel.redhat.com>

Author: mitr

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

Modified Files:
	jwhois.spec 
Log Message:
* Wed Apr 19 2006 Miloslav Trmac <mitr at redhat.com> - 3.2.3-3.3.fc5.1
- Update to upstream config as of Apr 19 2006 (#188366)



Index: jwhois.spec
===================================================================
RCS file: /cvs/dist/rpms/jwhois/FC-5/jwhois.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jwhois.spec	11 Feb 2006 03:42:58 -0000	1.25
+++ jwhois.spec	19 Apr 2006 00:01:55 -0000	1.26
@@ -1,10 +1,10 @@
 Name: jwhois
 Version: 3.2.3
-Release: 3.2.1
+Release: 3.3.fc5.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
-#Patch0: jwhois-3.2.3-config-cvs.patch
+Patch0: jwhois-3.2.3-config-cvs.patch
 Patch1: jwhois-3.2.2-afrinic.patch
 Patch2: jwhois-3.2.2-ru.patch
 Patch3: jwhois-3.2.3-sigpipe.patch
@@ -20,7 +20,7 @@
 
 %prep
 %setup -q
-#patch0 -p0 -b .config
+%patch0 -p0 -b .config
 %patch1 -p1 -b .afrinic
 %patch2 -p1 -b .ru
 %patch3 -p1 -b .sigpipe
@@ -63,6 +63,9 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Wed Apr 19 2006 Miloslav Trmac <mitr at redhat.com> - 3.2.3-3.3.fc5.1
+- Update to upstream config as of Apr 19 2006 (#188366)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.2.3-3.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Apr 19 00:04:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 20:04:13 -0400
Subject: rpms/jwhois/FC-5 jwhois-3.2.3-config-cvs.patch,NONE,1.1
Message-ID: <200604190004.k3J04DHA024435@cvs.devel.redhat.com>

Author: mitr

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

Added Files:
	jwhois-3.2.3-config-cvs.patch 
Log Message:
* Wed Apr 19 2006 Miloslav Trmac <mitr at redhat.com> - 3.2.3-3.3.fc5.1
- Update to upstream config as of Apr 19 2006 (#188366)


jwhois-3.2.3-config-cvs.patch:
 jwhois.conf |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE jwhois-3.2.3-config-cvs.patch ---
Note that this is not a pure CVS diff, a hunk adding the "connect-timeout"
option has been removed.

Index: example/jwhois.conf
===================================================================
RCS file: /sources/jwhois/jwhois/example/jwhois.conf,v
retrieving revision 1.119
retrieving revision 1.122
diff -u -r1.119 -r1.122
--- example/jwhois.conf	9 Jul 2005 18:31:51 -0000	1.119
+++ example/jwhois.conf	12 Apr 2006 14:23:40 -0000	1.122
@@ -180,7 +180,7 @@
 	"\\.cx$" = "whois.nic.cx";
 	"\\.cy$" = "whois.ripe.net";
 	"\\.cz$" = "whois.nic.cz";
-	"\\.de$" = "www.denic.de";
+	"\\.de$" = "whois.denic.de";
 	"\\.dk$" = "whois.dk-hostmaster.dk";
 	"\\.do$" = "whois.nic.do";
 	"\\.dz$" = "whois.ripe.net";
@@ -189,6 +189,7 @@
 	"\\.ee$" = "whois.eenet.ee";
 	"\\.eg$" = "whois.ripe.net";
 	"\\.es$" = "www.nic.es";
+	"\\.eu$" = "whois.eu";
 	"\\.fi$" = "whois.ficora.fi";
 	"\\.fj$" = "whois.usp.ac.fj";
 	"\\.fm$" = "www.dot.fm";
@@ -866,6 +867,10 @@
 		form-element = "domainname";
 		form-extra = "service=WhoisData&lang=en&submit=Accept";
 	}
+	"whois\\.denic\\.de" {
+		whois-server = "whois.denic.de";
+		query-format = "-C UTF-8 -T dn,ace $*";
+	}
 	"whois\\.nic\\.ad\\.jp" {
 		query-format = "$*/e";
 	}



From fedora-cvs-commits at redhat.com  Wed Apr 19 00:15:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 20:15:46 -0400
Subject: rpms/bind/devel bind-chroot-admin.in,1.6,1.7
Message-ID: <200604190015.k3J0Fkwu024567@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24553

Modified Files:
	bind-chroot-admin.in 
Log Message:
fix bug 188382; deal with redundant .rpmsave links; prevent redundant backups


Index: bind-chroot-admin.in
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind-chroot-admin.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bind-chroot-admin.in	18 Apr 2006 23:54:14 -0000	1.6
+++ bind-chroot-admin.in	19 Apr 2006 00:15:44 -0000	1.7
@@ -259,7 +259,7 @@
 	   /usr/bin/chcon -h --reference=/etc/rndc.key   /etc/rndc.key   >/dev/null 2>&1;
 	   /usr/bin/chcon -h --reference=/etc/rndc.conf  /etc/rndc.conf  >/dev/null 2>&1;
 	   /usr/bin/chcon -h --reference=/var/named     /var/named{/,/*} >/dev/null 2>&1;
-	   /usr/bin/chcon -h --reference=/var/named/slaves /var/named/{slaves,data}{/,/*} >/dev/null 2>&1;
+	   /usr/bin/chcon -h --reference=${BIND_CHROOT_PREFIX}/var/named/slaves /var/named/{slaves,data}{/,/*} >/dev/null 2>&1;
 	   /sbin/restorecon /var/named/named.ca ${BIND_CHROOT_PREFIX}/var/named/named.ca  >/dev/null 2>&1;
 	   /usr/bin/chcon -h --reference=${BIND_CHROOT_PREFIX}/var/named/named.ca /var/named/named.ca >/dev/null 2>&1;
 	fi;



From fedora-cvs-commits at redhat.com  Wed Apr 19 00:20:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 20:20:00 -0400
Subject: rpms/bind/devel bind-chroot-admin.in,1.7,1.8
Message-ID: <200604190020.k3J0K0aA005980@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5967

Modified Files:
	bind-chroot-admin.in 
Log Message:
fix bug 188382; deal with redundant .rpmsave links; prevent redundant backups


Index: bind-chroot-admin.in
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind-chroot-admin.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bind-chroot-admin.in	19 Apr 2006 00:15:44 -0000	1.7
+++ bind-chroot-admin.in	19 Apr 2006 00:19:58 -0000	1.8
@@ -261,6 +261,7 @@
 	   /usr/bin/chcon -h --reference=/var/named     /var/named{/,/*} >/dev/null 2>&1;
 	   /usr/bin/chcon -h --reference=${BIND_CHROOT_PREFIX}/var/named/slaves /var/named/{slaves,data}{/,/*} >/dev/null 2>&1;
 	   /sbin/restorecon /var/named/named.ca ${BIND_CHROOT_PREFIX}/var/named/named.ca  >/dev/null 2>&1;
+	   /sbin/restorecon ${BIND_CHROOT_PREFIX};
 	   /usr/bin/chcon -h --reference=${BIND_CHROOT_PREFIX}/var/named/named.ca /var/named/named.ca >/dev/null 2>&1;
 	fi;
 	/sbin/service named condrestart



From fedora-cvs-commits at redhat.com  Wed Apr 19 00:37:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 20:37:19 -0400
Subject: rpms/bind/devel bind-9.3.2-bz173961.patch, 1.1, 1.2 bind.spec, 1.105,
	1.106
Message-ID: <200604190037.k3J0bJwQ006111@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6096

Modified Files:
	bind-9.3.2-bz173961.patch bind.spec 
Log Message:
- 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
- rebuild for new gcc, glibc-kernheaders


bind-9.3.2-bz173961.patch:
 resolver.c |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

Index: bind-9.3.2-bz173961.patch
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind-9.3.2-bz173961.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bind-9.3.2-bz173961.patch	4 Apr 2006 20:53:59 -0000	1.1
+++ bind-9.3.2-bz173961.patch	19 Apr 2006 00:37:16 -0000	1.2
@@ -1,11 +1,56 @@
 --- bind-9.3.2/lib/dns/resolver.c.bz173961	2005-10-13 21:38:48.000000000 -0400
-+++ bind-9.3.2/lib/dns/resolver.c	2006-04-04 14:23:26.000000000 -0400
-@@ -3794,7 +3794,7 @@
- 			result = ISC_R_SUCCESS;
++++ bind-9.3.2/lib/dns/resolver.c	2006-04-18 15:01:15.000000000 -0400
+@@ -3763,23 +3763,28 @@
+ 		  isc_result_t *eresultp)
+ {
+ 	isc_result_t result;
++	dns_rdataset_t rdataset;
++
++	if (ardataset == NULL) {
++		dns_rdataset_init(&rdataset);
++		ardataset = &rdataset;
++	}
+ 	result = dns_ncache_add(message, cache, node, covers, now,
+ 				maxttl, ardataset);
+-	if (result == DNS_R_UNCHANGED) {
++	if ((result == DNS_R_UNCHANGED) || (result == ISC_R_SUCCESS)) {
+ 		/*
+-		 * The data in the cache are better than the negative cache
+-		 * entry we're trying to add.
++		 * If the cache now contains a negative entry and we
++		 * care about whether it is DNS_R_NCACHENXDOMAIN or
++		 * DNS_R_NCACHENXRRSET then extract it.
+ 		 */
+-		if (ardataset != NULL && ardataset->type == 0) {
++		if (ardataset->type == 0) {
+ 			/*
+-			 * The cache data is also a negative cache
+-			 * entry.
++			 * The cache data is a negative cache entry.
+ 			 */
+ 			if (NXDOMAIN(ardataset))
+ 				*eresultp = DNS_R_NCACHENXDOMAIN;
+ 			else
+ 				*eresultp = DNS_R_NCACHENXRRSET;
+-			result = ISC_R_SUCCESS;
+ 		} else {
+ 			/*
+ 			 * Either we don't care about the nature of the
+@@ -3791,14 +3796,11 @@
+ 			 * XXXRTH  There's a CNAME/DNAME problem here.
+ 			 */
+ 			*eresultp = ISC_R_SUCCESS;
+-			result = ISC_R_SUCCESS;
  		}
- 	} else if (result == ISC_R_SUCCESS) {
+-	} else if (result == ISC_R_SUCCESS) {
 -		if (NXDOMAIN(ardataset))
-+	        if ((ardataset != NULL) && NXDOMAIN(ardataset))
- 			*eresultp = DNS_R_NCACHENXDOMAIN;
- 		else
- 			*eresultp = DNS_R_NCACHENXRRSET;
+-			*eresultp = DNS_R_NCACHENXDOMAIN;
+-		else
+-			*eresultp = DNS_R_NCACHENXRRSET;
++		result = ISC_R_SUCCESS;
+ 	}
++	if ((ardataset == &rdataset) && dns_rdataset_isassociated(ardataset))
++		dns_rdataset_disassociate(ardataset);
+ 
+ 	return (result);
+ }


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- bind.spec	14 Apr 2006 01:49:36 -0000	1.105
+++ bind.spec	19 Apr 2006 00:37:16 -0000	1.106
@@ -17,7 +17,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.3.2
-Release: 	20.FC6
+Release: 	22.FC6
 Epoch:   	30
 Url: 		http://www.isc.org/products/BIND/
 Buildroot: 	%{_tmppath}/%{name}-root
@@ -391,6 +391,7 @@
 touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/etc/rndc.key
 touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/dev/null
 touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/dev/random
+touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/dev/zero
 #end chroot
 make DESTDIR=${RPM_BUILD_ROOT} install
 touch ${RPM_BUILD_ROOT}%{_sysconfdir}/rndc.conf
@@ -496,13 +497,13 @@
 
 
 %files
-%defattr(0640,root,root,0750)
+%defattr(0640,root,named,0750)
 %dir /var/named
-%defattr(0640,named,named,0750)
+%defattr(0660,named,named,0770)
 %dir /var/named/slaves
 %dir /var/named/data
 %dir /var/run/named
-%defattr(0754,root,root,0755)
+%defattr(0750,root,root,0750)
 %config /etc/rc.d/init.d/named
 %defattr(0640,root,named,0750)
 %config(noreplace) /etc/sysconfig/named
@@ -543,8 +544,8 @@
 %doc doc/README.DBUS
 %attr(644,root,root) %config /etc/dbus-1/system.d/named.conf
 %attr(644,root,root) %config /usr/share/dbus-1/services/named.service
-%attr(754,root,root) %{_sbindir}/namedGetForwarders
-%attr(754,root,root) %{_sbindir}/namedSetForwarders
+%attr(750,root,root) %{_sbindir}/namedGetForwarders
+%attr(750,root,root) %{_sbindir}/namedSetForwarders
 %endif
 
 %files libs
@@ -584,25 +585,25 @@
 
 %files config
 %defattr(0640,root,named,0750)
-%config /etc/named.caching-nameserver.conf
+%config %verify(not link) /etc/named.caching-nameserver.conf
 %ghost %config %{chroot_prefix}/etc/named.caching-nameserver.conf
-%config /etc/named.rfc1912.zones
+%config %verify(not link) /etc/named.rfc1912.zones
 %ghost %config %{chroot_prefix}/etc/named.rfc1912.zones
 %ghost %config(noreplace) /etc/named.conf
 %ghost %config(noreplace) %{chroot_prefix}/etc/named.conf
-%config /var/named/named.ca
+%config %verify(not link) /var/named/named.ca
 %ghost  %config %{chroot_prefix}/var/named/named.ca
-%config /var/named/named.local
+%config %verify(not link) /var/named/named.local
 %ghost  %config %{chroot_prefix}/var/named/named.local
-%config /var/named/localhost.zone
+%config %verify(not link) /var/named/localhost.zone
 %ghost  %config %{chroot_prefix}/var/named/localhost.zone
-%config /var/named/localdomain.zone
+%config %verify(not link) /var/named/localdomain.zone
 %ghost  %config %{chroot_prefix}/var/named/localdomain.zone
-%config /var/named/named.ip6.local
+%config %verify(not link) /var/named/named.ip6.local
 %ghost  %config %{chroot_prefix}/var/named/named.ip6.local
-%config /var/named/named.broadcast
+%config %verify(not link) /var/named/named.broadcast
 %ghost  %config %{chroot_prefix}/var/named/named.broadcast
-%config /var/named/named.zero
+%config %verify(not link) /var/named/named.zero
 %ghost  %config %{chroot_prefix}/var/named/named.zero
 %defattr(0644,root,root,0755)
 %doc Copyright
@@ -689,7 +690,7 @@
 
 %preun
 if [ "$1" = 0 ]; then
-   /etc/rc.d/init.d/named stop >/dev/null 2>&1 || :;
+   /sbin/service named stop >/dev/null 2>&1 || :;
    /sbin/chkconfig --del named || :;
 fi
 :;
@@ -697,7 +698,7 @@
 %postun
 /sbin/ldconfig
 if [ "$1" -ge 1 ]; then
-   /etc/rc.d/init.d/named condrestart >/dev/null 2>&1 || :;
+   /sbin/service named condrestart >/dev/null 2>&1 || :;
 fi;
 :;
 
@@ -720,14 +721,6 @@
 fi
 :;
 
-%postun utils
-if [ $1 = 0 ]; then
-   if [ -f /var/lock/subsys/named ]; then
-      /etc/rc.d/init.d/named stop >/dev/null  2>&1 || :;
-   fi;
-fi;
-:;
-
 
 %post libs -p /sbin/ldconfig
 
@@ -812,6 +805,12 @@
 :;
 
 %changelog
+* 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
+- rebuild for new gcc, glibc-kernheaders
+
 * Tue Apr 04 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-20
 - fix resolver.c ncache_adderesult segfault reported in addenda to bug 173961 
   (upstream bugs #15642, #15528 ?)



From fedora-cvs-commits at redhat.com  Wed Apr 19 03:45:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 23:45:23 -0400
Subject: rpms/kernel/devel patch-2.6.17-rc2.bz2.sign, NONE, 1.1 .cvsignore,
	1.408, 1.409 kernel-2.6.spec, 1.2137,
	1.2138 linux-2.6-xen.patch, 1.10, 1.11 sources, 1.350,
	1.351 upstream, 1.321, 1.322 patch-2.6.17-rc1-git13.bz2.sign,
	1.1, NONE patch-2.6.17-rc1.bz2.sign, 1.1, NONE
Message-ID: <200604190345.k3J3jN4W000432@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-xen.patch sources 
	upstream 
Added Files:
	patch-2.6.17-rc2.bz2.sign 
Removed Files:
	patch-2.6.17-rc1-git13.bz2.sign patch-2.6.17-rc1.bz2.sign 
Log Message:
rc2



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

iD8DBQBERa2fyGugalF9Dw4RAsRmAJ9+Fb+htuilvk2QBTA0L/Ux/bJ9AgCfflYU
fnnvSKObUBFSPA0GCpYsjrg=
=GArp
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -r1.408 -r1.409
--- .cvsignore	18 Apr 2006 18:48:19 -0000	1.408
+++ .cvsignore	19 Apr 2006 03:45:17 -0000	1.409
@@ -2,6 +2,5 @@
 temp-*
 kernel-2.6.16
 linux-2.6.16.tar.bz2
-patch-2.6.17-rc1.bz2
 xen-20060413.tar.bz2
-patch-2.6.17-rc1-git13.bz2
+patch-2.6.17-rc2.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2137
retrieving revision 1.2138
diff -u -r1.2137 -r1.2138
--- kernel-2.6.spec	18 Apr 2006 21:09:21 -0000	1.2137
+++ kernel-2.6.spec	19 Apr 2006 03:45:17 -0000	1.2138
@@ -212,8 +212,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17-rc1.bz2
-Patch2: patch-2.6.17-rc1-git13.bz2
+Patch1: patch-2.6.17-rc2.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -711,7 +710,7 @@
 
 # Update to latest upstream.
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -1450,7 +1449,7 @@
   popd > /dev/null
 fi
 
-%preun 
+%preun
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}
 
@@ -1653,6 +1652,7 @@
 
 %changelog
 * Tue Apr 18 2006 Dave Jones <davej at redhat.com>
+- 2.6.17rc2
 - 2.6.17rc1-git13
 - Enable DECNET to keep both users happy. (#120628)
 - Enable TPM modules. (#189020)

linux-2.6-xen.patch:
 linux-2.6.16.noarch/arch/i386/Kconfig.debug              |    1 
 linux-2.6.16.noarch/arch/x86_64/Makefile                 |   20 
 linux-2.6.16.noarch/arch/x86_64/ia32/Makefile            |   20 
 linux-2.6.16.noarch/arch/x86_64/kernel/Makefile          |   19 
 tip2/arch/i386/Kconfig                                   |   99 
 tip2/arch/i386/Kconfig.cpu                               |    2 
 tip2/arch/i386/Makefile                                  |   24 
 tip2/arch/i386/boot-xen/Makefile                         |   21 
 tip2/arch/i386/kernel/Makefile                           |   31 
 tip2/arch/i386/kernel/acpi/Makefile                      |    4 
 tip2/arch/i386/kernel/acpi/boot-xen.c                    | 1161 ++++++
 tip2/arch/i386/kernel/apic-xen.c                         |  141 
 tip2/arch/i386/kernel/asm-offsets.c                      |    5 
 tip2/arch/i386/kernel/cpu/Makefile                       |    5 
 tip2/arch/i386/kernel/cpu/common-xen.c                   |  732 ++++
 tip2/arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 tip2/arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 tip2/arch/i386/kernel/early_printk-xen.c                 |    2 
 tip2/arch/i386/kernel/entry-xen.S                        |  880 ++++
 tip2/arch/i386/kernel/entry.S                            |    4 
 tip2/arch/i386/kernel/fixup.c                            |   95 
 tip2/arch/i386/kernel/head-xen.S                         |  171 
 tip2/arch/i386/kernel/init_task-xen.c                    |   51 
 tip2/arch/i386/kernel/io_apic-xen.c                      | 2744 +++++++++++++++
 tip2/arch/i386/kernel/ioport-xen.c                       |  122 
 tip2/arch/i386/kernel/irq-xen.c                          |  306 +
 tip2/arch/i386/kernel/irq.c                              |    4 
 tip2/arch/i386/kernel/ldt-xen.c                          |  269 +
 tip2/arch/i386/kernel/microcode-xen.c                    |  148 
 tip2/arch/i386/kernel/mpparse-xen.c                      | 1189 ++++++
 tip2/arch/i386/kernel/pci-dma-xen.c                      |  344 +
 tip2/arch/i386/kernel/process-xen.c                      |  824 ++++
 tip2/arch/i386/kernel/quirks-xen.c                       |   48 
 tip2/arch/i386/kernel/setup-xen.c                        | 1826 +++++++++
 tip2/arch/i386/kernel/smp-xen.c                          |  613 +++
 tip2/arch/i386/kernel/swiotlb.c                          |  674 +++
 tip2/arch/i386/kernel/sysenter.c                         |   90 
 tip2/arch/i386/kernel/time-xen.c                         | 1097 +++++
 tip2/arch/i386/kernel/traps-xen.c                        | 1123 ++++++
 tip2/arch/i386/kernel/traps.c                            |    9 
 tip2/arch/i386/kernel/vm86.c                             |    8 
 tip2/arch/i386/kernel/vsyscall-note-xen.S                |   32 
 tip2/arch/i386/kernel/vsyscall.S                         |    2 
 tip2/arch/i386/mach-xen/Makefile                         |    5 
 tip2/arch/i386/mach-xen/setup.c                          |   49 
 tip2/arch/i386/mm/Makefile                               |    8 
 tip2/arch/i386/mm/fault-xen.c                            |  683 +++
 tip2/arch/i386/mm/highmem-xen.c                          |  123 
 tip2/arch/i386/mm/hypervisor.c                           |  424 ++
 tip2/arch/i386/mm/init-xen.c                             |  853 ++++
 tip2/arch/i386/mm/ioremap-xen.c                          |  486 ++
 tip2/arch/i386/mm/pageattr.c                             |    2 
 tip2/arch/i386/mm/pgtable-xen.c                          |  652 +++
 tip2/arch/i386/mm/pgtable.c                              |   12 
 tip2/arch/i386/oprofile/Makefile                         |    4 
 tip2/arch/i386/oprofile/xenoprof.c                       |  395 ++
 tip2/arch/i386/pci/Makefile                              |    9 
 tip2/arch/i386/pci/irq-xen.c                             | 1202 ++++++
 tip2/arch/i386/pci/pcifront.c                            |   55 
 tip2/arch/i386/power/Makefile                            |    4 
 tip2/arch/ia64/Kconfig                                   |   46 
 tip2/arch/ia64/Makefile                                  |   16 
 tip2/arch/ia64/hp/sim/Makefile                           |    2 
 tip2/arch/ia64/kernel/entry.S                            |   32 
 tip2/arch/ia64/kernel/head.S                             |    6 
 tip2/arch/ia64/kernel/pal.S                              |    5 
 tip2/arch/ia64/kernel/sal.c                              |    3 
 tip2/arch/ia64/kernel/setup.c                            |   32 
 tip2/arch/ia64/xen/Makefile                              |    5 
 tip2/arch/ia64/xen/drivers/Makefile                      |   20 
 tip2/arch/ia64/xen/drivers/README                        |    2 
 tip2/arch/ia64/xen/drivers/coreMakefile                  |   26 
 tip2/arch/ia64/xen/drivers/evtchn_ia64.c                 |  273 +
 tip2/arch/ia64/xen/drivers/patches/blkback.c.patch       |   33 
 tip2/arch/ia64/xen/drivers/patches/console.c.patch       |   11 
 tip2/arch/ia64/xen/drivers/patches/devmem.c.patch        |    2 
 tip2/arch/ia64/xen/drivers/patches/gnttab.c.patch        |   33 
 tip2/arch/ia64/xen/drivers/patches/privcmd.c.patch       |   30 
 tip2/arch/ia64/xen/drivers/xenia64_init.c                |   55 
 tip2/arch/ia64/xen/hypercall.S                           |  365 +
 tip2/arch/ia64/xen/xen_ksyms.c                           |   12 
 tip2/arch/ia64/xen/xenconsole.c                          |   19 
 tip2/arch/ia64/xen/xenentry.S                            |  850 ++++
 tip2/arch/ia64/xen/xenhpski.c                            |   19 
 tip2/arch/ia64/xen/xenivt.S                              | 2032 +++++++++++
 tip2/arch/ia64/xen/xenminstate.h                         |  367 ++
 tip2/arch/ia64/xen/xenpal.S                              |   73 
 tip2/arch/ia64/xen/xensetup.S                            |   35 
 tip2/arch/um/kernel/physmem.c                            |    4 
 tip2/arch/x86_64/Kconfig                                 |   62 
 tip2/arch/x86_64/ia32/ia32entry-xen.S                    |  723 +++
 tip2/arch/x86_64/ia32/syscall32-xen.c                    |  128 
 tip2/arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 tip2/arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 tip2/arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 tip2/arch/x86_64/kernel/acpi/Makefile                    |    1 
 tip2/arch/x86_64/kernel/apic-xen.c                       |  198 +
 tip2/arch/x86_64/kernel/asm-offsets.c                    |    2 
 tip2/arch/x86_64/kernel/e820-xen.c                       |  744 ++++
 tip2/arch/x86_64/kernel/early_printk-xen.c               |  304 +
 tip2/arch/x86_64/kernel/entry-xen.S                      | 1149 ++++++
 tip2/arch/x86_64/kernel/entry.S                          |    2 
 tip2/arch/x86_64/kernel/genapic-xen.c                    |  144 
 tip2/arch/x86_64/kernel/genapic_xen.c                    |  162 
 tip2/arch/x86_64/kernel/head-xen.S                       |  163 
 tip2/arch/x86_64/kernel/head64-xen.c                     |  140 
 tip2/arch/x86_64/kernel/init_task.c                      |    3 
 tip2/arch/x86_64/kernel/io_apic-xen.c                    | 2231 ++++++++++++
 tip2/arch/x86_64/kernel/ioport-xen.c                     |   58 
 tip2/arch/x86_64/kernel/irq-xen.c                        |  163 
 tip2/arch/x86_64/kernel/irq.c                            |    4 
 tip2/arch/x86_64/kernel/ldt-xen.c                        |  282 +
 tip2/arch/x86_64/kernel/mpparse-xen.c                    | 1002 +++++
 tip2/arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 tip2/arch/x86_64/kernel/process-xen.c                    |  796 ++++
 tip2/arch/x86_64/kernel/setup-xen.c                      | 1677 +++++++++
 tip2/arch/x86_64/kernel/setup64-xen.c                    |  360 +
 tip2/arch/x86_64/kernel/smp-xen.c                        |  596 +++
 tip2/arch/x86_64/kernel/smp.c                            |    4 
 tip2/arch/x86_64/kernel/traps-xen.c                      | 1020 +++++
 tip2/arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 tip2/arch/x86_64/kernel/x8664_ksyms-xen.c                |  158 
 tip2/arch/x86_64/kernel/xen_entry.S                      |   40 
 tip2/arch/x86_64/mm/Makefile                             |   10 
 tip2/arch/x86_64/mm/fault-xen.c                          |  644 +++
 tip2/arch/x86_64/mm/init-xen.c                           | 1145 ++++++
 tip2/arch/x86_64/mm/pageattr-xen.c                       |  390 ++
 tip2/arch/x86_64/oprofile/Makefile                       |    5 
 tip2/arch/x86_64/pci/Makefile                            |   12 
 tip2/drivers/Makefile                                    |    1 
 tip2/drivers/acpi/Kconfig                                |    3 
 tip2/drivers/char/mem.c                                  |    6 
 tip2/drivers/char/tpm/Kconfig                            |   14 
 tip2/drivers/char/tpm/Makefile                           |    1 
 tip2/drivers/char/tpm/tpm.c                              |   44 
 tip2/drivers/char/tpm/tpm.h                              |    7 
 tip2/drivers/char/tpm/tpm_atmel.c                        |  230 -
 tip2/drivers/char/tpm/tpm_nsc.c                          |  395 --
 tip2/drivers/char/tpm/tpm_xen.c                          |  536 ++
 tip2/drivers/char/tty_io.c                               |    7 
 tip2/drivers/firmware/Kconfig                            |    2 
 tip2/drivers/pci/Kconfig                                 |    1 
 tip2/drivers/serial/Kconfig                              |    1 
 tip2/drivers/video/Kconfig                               |    2 
 tip2/drivers/xen/Kconfig                                 |  212 +
 tip2/drivers/xen/Makefile                                |   22 
 tip2/drivers/xen/balloon/Makefile                        |    2 
 tip2/drivers/xen/balloon/balloon.c                       |  592 +++
 tip2/drivers/xen/blkback/Makefile                        |    3 
 tip2/drivers/xen/blkback/blkback.c                       |  597 +++
 tip2/drivers/xen/blkback/common.h                        |  145 
 tip2/drivers/xen/blkback/interface.c                     |  184 +
 tip2/drivers/xen/blkback/vbd.c                           |  126 
 tip2/drivers/xen/blkback/xenbus.c                        |  421 ++
 tip2/drivers/xen/blkfront/Kconfig                        |    6 
 tip2/drivers/xen/blkfront/Makefile                       |    5 
 tip2/drivers/xen/blkfront/blkfront.c                     |  819 ++++
 tip2/drivers/xen/blkfront/block.h                        |  165 
 tip2/drivers/xen/blkfront/vbd.c                          |  327 +
 tip2/drivers/xen/blktap/Makefile                         |    3 
 tip2/drivers/xen/blktap/blktap.c                         |  910 ++++
 tip2/drivers/xen/blktap/common.h                         |  110 
 tip2/drivers/xen/blktap/interface.c                      |  146 
 tip2/drivers/xen/blktap/xenbus.c                         |  233 +
 tip2/drivers/xen/char/Makefile                           |    2 
 tip2/drivers/xen/char/mem.c                              |  192 +
 tip2/drivers/xen/console/Makefile                        |    2 
 tip2/drivers/xen/console/console.c                       |  648 +++
 tip2/drivers/xen/console/xencons_ring.c                  |  151 
 tip2/drivers/xen/core/Makefile                           |   11 
 tip2/drivers/xen/core/evtchn.c                           |  863 ++++
 tip2/drivers/xen/core/features.c                         |   29 
 tip2/drivers/xen/core/gnttab.c                           |  464 ++
 tip2/drivers/xen/core/hypervisor_sysfs.c                 |   57 
 tip2/drivers/xen/core/reboot.c                           |  377 ++
 tip2/drivers/xen/core/skbuff.c                           |  144 
 tip2/drivers/xen/core/smpboot.c                          |  576 +++
 tip2/drivers/xen/core/xen_proc.c                         |   29 
 tip2/drivers/xen/core/xen_sysfs.c                        |  311 +
 tip2/drivers/xen/evtchn/Makefile                         |    2 
 tip2/drivers/xen/evtchn/evtchn.c                         |  464 ++
 tip2/drivers/xen/net_driver_util.c                       |   68 
 tip2/drivers/xen/netback/Makefile                        |    5 
 tip2/drivers/xen/netback/common.h                        |  133 
 tip2/drivers/xen/netback/interface.c                     |  334 +
 tip2/drivers/xen/netback/loopback.c                      |  254 +
 tip2/drivers/xen/netback/netback.c                       |  865 ++++
 tip2/drivers/xen/netback/xenbus.c                        |  366 ++
 tip2/drivers/xen/netfront/Kconfig                        |    6 
 tip2/drivers/xen/netfront/Makefile                       |    4 
 tip2/drivers/xen/netfront/netfront.c                     | 1524 ++++++++
 tip2/drivers/xen/pciback/Makefile                        |   10 
 tip2/drivers/xen/pciback/conf_space.c                    |  345 +
 tip2/drivers/xen/pciback/conf_space.h                    |   97 
 tip2/drivers/xen/pciback/conf_space_header.c             |  267 +
 tip2/drivers/xen/pciback/passthrough.c                   |  157 
 tip2/drivers/xen/pciback/pci_stub.c                      |  695 +++
 tip2/drivers/xen/pciback/pciback.h                       |   78 
 tip2/drivers/xen/pciback/pciback_ops.c                   |   74 
 tip2/drivers/xen/pciback/vpci.c                          |  204 +
 tip2/drivers/xen/pciback/xenbus.c                        |  441 ++
 tip2/drivers/xen/pcifront/Makefile                       |    7 
 tip2/drivers/xen/pcifront/pci.c                          |   46 
 tip2/drivers/xen/pcifront/pci_op.c                       |  272 +
 tip2/drivers/xen/pcifront/pcifront.h                     |   40 
 tip2/drivers/xen/pcifront/xenbus.c                       |  294 +
 tip2/drivers/xen/privcmd/Makefile                        |    2 
 tip2/drivers/xen/privcmd/privcmd.c                       |  303 +
 tip2/drivers/xen/tpmback/Makefile                        |    4 
 tip2/drivers/xen/tpmback/common.h                        |   91 
 tip2/drivers/xen/tpmback/interface.c                     |  194 +
 tip2/drivers/xen/tpmback/tpmback.c                       | 1060 +++++
 tip2/drivers/xen/tpmback/xenbus.c                        |  329 +
 tip2/drivers/xen/tpmfront/Makefile                       |    2 
 tip2/drivers/xen/tpmfront/tpmfront.c                     |  768 ++++
 tip2/drivers/xen/tpmfront/tpmfront.h                     |   40 
 tip2/drivers/xen/util.c                                  |   80 
 tip2/drivers/xen/xenbus/Makefile                         |    8 
 tip2/drivers/xen/xenbus/xenbus_client.c                  |  412 ++
 tip2/drivers/xen/xenbus/xenbus_comms.c                   |  218 +
 tip2/drivers/xen/xenbus/xenbus_comms.h                   |   53 
 tip2/drivers/xen/xenbus/xenbus_dev.c                     |  252 +
 tip2/drivers/xen/xenbus/xenbus_probe.c                   | 1083 +++++
 tip2/drivers/xen/xenbus/xenbus_xs.c                      |  856 ++++
 tip2/fs/Kconfig                                          |    1 
 tip2/include/asm-i386/a.out.h                            |    2 
 tip2/include/asm-i386/apic.h                             |    2 
 tip2/include/asm-i386/elf.h                              |    7 
 tip2/include/asm-i386/fixmap.h                           |   13 
 tip2/include/asm-i386/mach-default/mach_traps.h          |   12 
 tip2/include/asm-i386/mach-xen/asm/agp.h                 |   37 
 tip2/include/asm-i386/mach-xen/asm/desc.h                |  164 
 tip2/include/asm-i386/mach-xen/asm/dma-mapping.h         |  156 
 tip2/include/asm-i386/mach-xen/asm/fixmap.h              |  156 
 tip2/include/asm-i386/mach-xen/asm/floppy.h              |  147 
 tip2/include/asm-i386/mach-xen/asm/highmem.h             |   81 
 tip2/include/asm-i386/mach-xen/asm/hw_irq.h              |   73 
 tip2/include/asm-i386/mach-xen/asm/hypercall.h           |  357 +
 tip2/include/asm-i386/mach-xen/asm/hypervisor.h          |  224 +
 tip2/include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 tip2/include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 tip2/include/asm-i386/mach-xen/asm/mmu.h                 |   21 
 tip2/include/asm-i386/mach-xen/asm/mmu_context.h         |  105 
 tip2/include/asm-i386/mach-xen/asm/page.h                |  326 +
 tip2/include/asm-i386/mach-xen/asm/param.h               |   24 
 tip2/include/asm-i386/mach-xen/asm/pci.h                 |  154 
 tip2/include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 tip2/include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 tip2/include/asm-i386/mach-xen/asm/pgtable-2level.h      |   85 
 tip2/include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 tip2/include/asm-i386/mach-xen/asm/pgtable-3level.h      |  183 +
 tip2/include/asm-i386/mach-xen/asm/pgtable.h             |  520 ++
 tip2/include/asm-i386/mach-xen/asm/processor.h           |  756 ++++
 tip2/include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 tip2/include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 tip2/include/asm-i386/mach-xen/asm/segment.h             |  117 
 tip2/include/asm-i386/mach-xen/asm/setup.h               |   64 
 tip2/include/asm-i386/mach-xen/asm/smp.h                 |  104 
 tip2/include/asm-i386/mach-xen/asm/spinlock.h            |  200 +
 tip2/include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 tip2/include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 
 tip2/include/asm-i386/mach-xen/asm/system.h              |  576 +++
 tip2/include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 tip2/include/asm-i386/mach-xen/asm/vga.h                 |   20 
 tip2/include/asm-i386/mach-xen/irq_vectors.h             |  125 
 tip2/include/asm-i386/mach-xen/mach_traps.h              |   33 
 tip2/include/asm-i386/mach-xen/setup_arch_post.h         |   54 
 tip2/include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 tip2/include/asm-i386/page.h                             |    4 
 tip2/include/asm-i386/pgtable-2level-defs.h              |    2 
 tip2/include/asm-i386/pgtable-3level-defs.h              |    2 
 tip2/include/asm-ia64/fixmap.h                           |    2 
 tip2/include/asm-ia64/gcc_intrin.h                       |   60 
 tip2/include/asm-ia64/hypercall.h                        |  274 +
 tip2/include/asm-ia64/hypervisor.h                       |  138 
 tip2/include/asm-ia64/intel_intrin.h                     |   68 
 tip2/include/asm-ia64/meminit.h                          |    5 
 tip2/include/asm-ia64/pal.h                              |    1 
 tip2/include/asm-ia64/privop.h                           |   59 
 tip2/include/asm-ia64/processor.h                        |    1 
 tip2/include/asm-ia64/synch_bitops.h                     |   61 
 tip2/include/asm-ia64/system.h                           |    4 
 tip2/include/asm-ia64/xen/privop.h                       |  277 +
 tip2/include/asm-um/page.h                               |    2 
 tip2/include/asm-x86_64/apic.h                           |    2 
 tip2/include/asm-x86_64/hw_irq.h                         |    2 
 tip2/include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 tip2/include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 tip2/include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 tip2/include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 +
 tip2/include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 tip2/include/asm-x86_64/mach-xen/asm/fixmap.h            |  114 
 tip2/include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 tip2/include/asm-x86_64/mach-xen/asm/hw_irq.h            |  141 
 tip2/include/asm-x86_64/mach-xen/asm/hypercall.h         |  357 +
 tip2/include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 tip2/include/asm-x86_64/mach-xen/asm/io.h                |  327 +
 tip2/include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 tip2/include/asm-x86_64/mach-xen/asm/mmu.h               |   33 
 tip2/include/asm-x86_64/mach-xen/asm/mmu_context.h       |  134 
 tip2/include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 tip2/include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 tip2/include/asm-x86_64/mach-xen/asm/page.h              |  317 +
 tip2/include/asm-x86_64/mach-xen/asm/param.h             |   23 
 tip2/include/asm-x86_64/mach-xen/asm/pci.h               |  174 
 tip2/include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 tip2/include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 +++
 tip2/include/asm-x86_64/mach-xen/asm/processor.h         |  494 ++
 tip2/include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 tip2/include/asm-x86_64/mach-xen/asm/smp.h               |  153 
 tip2/include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 tip2/include/asm-x86_64/mach-xen/asm/system.h            |  428 ++
 tip2/include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 tip2/include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 tip2/include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 tip2/include/asm-x86_64/mach-xen/asm/xor.h               |  328 +
 tip2/include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 tip2/include/asm-x86_64/mach-xen/mach_time.h             |  111 
 tip2/include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 tip2/include/asm-x86_64/mach-xen/setup_arch_post.h       |   41 
 tip2/include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 tip2/include/linux/gfp.h                                 |    6 
 tip2/include/linux/highmem.h                             |    6 
 tip2/include/linux/mm.h                                  |   13 
 tip2/include/linux/pfn.h                                 |    2 
 tip2/include/linux/skbuff.h                              |   13 
 tip2/include/xen/balloon.h                               |   73 
 tip2/include/xen/driver_util.h                           |   26 
 tip2/include/xen/evtchn.h                                |  126 
 tip2/include/xen/features.h                              |   20 
 tip2/include/xen/foreign_page.h                          |   40 
 tip2/include/xen/gnttab.h                                |  126 
 tip2/include/xen/hypervisor_sysfs.h                      |   32 
 tip2/include/xen/interface/acm.h                         |  181 
 tip2/include/xen/interface/acm_ops.h                     |   98 
 tip2/include/xen/interface/arch-ia64.h                   |  337 +
 tip2/include/xen/interface/arch-x86_32.h                 |  200 +
 tip2/include/xen/interface/arch-x86_64.h                 |  273 +
 tip2/include/xen/interface/callback.h                    |   57 
 tip2/include/xen/interface/dom0_ops.h                    |  531 ++
 tip2/include/xen/interface/event_channel.h               |  211 +
 tip2/include/xen/interface/features.h                    |   53 
 tip2/include/xen/interface/grant_table.h                 |  311 +
 tip2/include/xen/interface/hvm/hvm_info_table.h          |   24 
 tip2/include/xen/interface/hvm/ioreq.h                   |   94 
 tip2/include/xen/interface/hvm/vmx_assist.h              |   97 
 tip2/include/xen/interface/io/blkif.h                    |   85 
 tip2/include/xen/interface/io/console.h                  |   33 
 tip2/include/xen/interface/io/netif.h                    |   84 
 tip2/include/xen/interface/io/pciif.h                    |   55 
 tip2/include/xen/interface/io/ring.h                     |  265 +
 tip2/include/xen/interface/io/tpmif.h                    |   56 
 tip2/include/xen/interface/io/xenbus.h                   |   42 
 tip2/include/xen/interface/io/xs_wire.h                  |   97 
 tip2/include/xen/interface/memory.h                      |  155 
 tip2/include/xen/interface/nmi.h                         |   59 
 tip2/include/xen/interface/physdev.h                     |   71 
 tip2/include/xen/interface/sched.h                       |  100 
 tip2/include/xen/interface/sched_ctl.h                   |   64 
 tip2/include/xen/interface/trace.h                       |   86 
 tip2/include/xen/interface/vcpu.h                        |  119 
 tip2/include/xen/interface/version.h                     |   64 
 tip2/include/xen/interface/xen-compat.h                  |   34 
 tip2/include/xen/interface/xen.h                         |  459 ++
 tip2/include/xen/interface/xenoprof.h                    |   72 
 tip2/include/xen/net_driver_util.h                       |   58 
 tip2/include/xen/pcifront.h                              |   39 
 tip2/include/xen/public/evtchn.h                         |  101 
 tip2/include/xen/public/privcmd.h                        |   94 
 tip2/include/xen/tpmfe.h                                 |   40 
 tip2/include/xen/xen_proc.h                              |   23 
 tip2/include/xen/xenbus.h                                |  306 +
 tip2/include/xen/xencons.h                               |   14 
 tip2/kernel/Kconfig.preempt                              |    1 
 tip2/kernel/irq/manage.c                                 |   24 
 tip2/lib/Kconfig.debug                                   |   31 
 tip2/lib/Makefile                                        |    3 
 tip2/mm/Kconfig                                          |    3 
 tip2/mm/highmem.c                                        |   11 
 tip2/mm/memory.c                                         |  116 
 tip2/mm/mmap.c                                           |    4 
 tip2/mm/page_alloc.c                                     |    6 
 tip2/net/core/dev.c                                      |   50 
 tip2/net/core/skbuff.c                                   |   41 
 tip2/net/ipv4/netfilter/ip_nat_proto_tcp.c               |    6 
 tip2/net/ipv4/netfilter/ip_nat_proto_udp.c               |    9 
 tip2/scripts/Makefile.xen                                |   14 
 387 files changed, 79999 insertions(+), 856 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-xen.patch	17 Apr 2006 20:52:10 -0000	1.10
+++ linux-2.6-xen.patch	19 Apr 2006 03:45:17 -0000	1.11
@@ -84133,13 +84133,12 @@
 +obj-y := $(call cherrypickxen, $(obj-y))
 +extra-y := $(call cherrypickxen, $(extra-y))
 +endif
-diff -uNp linux-2.6.16.noarch/init/Kconfig.orig linux-2.6.16.noarch/init/Kconfig
---- linux-2.6.16.noarch/init/Kconfig.orig	2006-04-17 22:33:15.000000000 +0200
-+++ linux-2.6.16.noarch/init/Kconfig	2006-04-17 22:33:54.000000000 +0200
-@@ -377,6 +377,7 @@ config SLAB
+--- linux-2.6.16.noarch/arch/i386/Kconfig.debug~	2006-04-18 22:40:38.000000000 -0500
++++ linux-2.6.16.noarch/arch/i386/Kconfig.debug	2006-04-18 22:41:11.000000000 -0500
+@@ -84,6 +84,7 @@ config X86_MPPARSE
  config DOUBLEFAULT
  	default y
- 	bool "Enable doublefault exception handler" if EMBEDDED && X86_32
+ 	bool "Enable doublefault exception handler" if EMBEDDED
 +	depends on !X86_NO_TSS
  	help
            This option allows trapping of rare doublefault exceptions that


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -r1.350 -r1.351
--- sources	18 Apr 2006 18:48:20 -0000	1.350
+++ sources	19 Apr 2006 03:45:19 -0000	1.351
@@ -1,4 +1,3 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
-ee1b5bf019ec60a34ef7bf1b2a0c1291  patch-2.6.17-rc1.bz2
 e8e055329db3aad40a010ded0f8bdcf9  xen-20060413.tar.bz2
-adf86e3084d31a02ed1fc4ed84932bee  patch-2.6.17-rc1-git13.bz2
+87c4ea50e1b25ad808b65ad3fb19a9b5  patch-2.6.17-rc2.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -r1.321 -r1.322
--- upstream	18 Apr 2006 18:48:20 -0000	1.321
+++ upstream	19 Apr 2006 03:45:19 -0000	1.322
@@ -1,3 +1,2 @@
 linux-2.6.16.tar.bz2
-patch-2.6.17-rc1.bz2
-patch-2.6.17-rc1-git13.bz2
+patch-2.6.17-rc2.bz2


--- patch-2.6.17-rc1-git13.bz2.sign DELETED ---


--- patch-2.6.17-rc1.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 19 03:48:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Apr 2006 23:48:57 -0400
Subject: rpms/libmusicbrainz/devel libmusicbrainz.spec,1.14,1.15
Message-ID: <200604190348.k3J3mvhD015491@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libmusicbrainz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv377

Modified Files:
	libmusicbrainz.spec 
Log Message:
cleanups



Index: libmusicbrainz.spec
===================================================================
RCS file: /cvs/dist/rpms/libmusicbrainz/devel/libmusicbrainz.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libmusicbrainz.spec	11 Feb 2006 04:10:12 -0000	1.14
+++ libmusicbrainz.spec	19 Apr 2006 03:48:55 -0000	1.15
@@ -1,12 +1,12 @@
-Summary: A library for accessing MusicBrainz servers
+Summary: Library for accessing MusicBrainz servers
 Name: libmusicbrainz
 Version: 2.1.1
-Release: 2.1
+Release: 3
 License: LGPL
 Group: System Environment/Libraries
-URL: http://www.musicbrainz.org
-Source0: %{name}-%{version}.tar.gz
-BuildPreReq: libstdc++-devel gcc-c++
+URL: http://www.musicbrainz.org/
+Source0: ftp://ftp.musicbrainz.org/pub/musicbrainz/%{name}-%{version}.tar.gz
+BuildRequires: libstdc++-devel
 BuildRequires: expat-devel
 Patch2: libmusicbrainz-2.0.2-cast-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -19,12 +19,12 @@
 
 %package devel
 Summary: Headers for developing programs that will use libmusicbrainz
-Group:      Development/Libraries
-Requires:   %{name}
-Requires:  libstdc++-devel
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: libstdc++-devel
 Obsoletes: musicbrainz-devel
 
-%description   devel
+%description devel
 This package contains the headers that programmers will need to develop
 applications which will use libmusicbrainz.
 
@@ -34,7 +34,7 @@
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -52,16 +52,19 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README TODO INSTALL
+%doc AUTHORS COPYING ChangeLog README TODO
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root,-)
+%defattr(-,root,root,0755)
 %{_libdir}/pkgconfig/*pc
 %{_includedir}/musicbrainz
 %{_libdir}/*.so
 
 %changelog
+* Tue Apr 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.1.1-3
+- apply .spec file cleanups from Matthias Saou (#172926)
+
 * 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 Apr 19 04:05:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 00:05:46 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2138,1.2139
Message-ID: <200604190405.k3J45kLg020047@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
xen borked



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2138
retrieving revision 1.2139
diff -u -r1.2138 -r1.2139
--- kernel-2.6.spec	19 Apr 2006 03:45:17 -0000	1.2138
+++ kernel-2.6.spec	19 Apr 2006 04:05:22 -0000	1.2139
@@ -7,7 +7,7 @@
 %define buildsmp 0
 %define buildpae 0
 # Whether to apply the Xen patches, leave this enabled.
-%define includexen 1
+%define includexen 0
 # Whether to build the Xen kernels, disable if you want.
 %define buildxen 1
 %define buildxenPAE 0



From fedora-cvs-commits at redhat.com  Wed Apr 19 04:43:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 00:43:45 -0400
Subject: rpms/hal/devel hal.spec,1.87,1.88
Message-ID: <200604190443.k3J4hjZB006775@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6734

Modified Files:
	hal.spec 
Log Message:
Require pm-utils



Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- hal.spec	3 Mar 2006 18:48:27 -0000	1.87
+++ hal.spec	19 Apr 2006 04:43:31 -0000	1.88
@@ -13,13 +13,14 @@
 %define libusb_version          0.1.10a-1
 %define dmidecode_version       2.7
 %define cryptsetup_luks_version 1.0.1-2
+%define pm_utils_version        0.10-1
 
 %define hal_user_uid           68
 
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.7
-Release: 3 
+Release: 4
 URL: http://www.freedesktop.org/Software/hal
 Source0: %{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
@@ -47,6 +48,7 @@
 Requires: libselinux >= %{libselinux_version}
 Requires: initscripts >= %{initscripts_version}
 Requires: cryptsetup-luks >= %{cryptsetup_luks_version}
+Requires: pm-utils >= %{pm_utils_version}
 Conflicts: kernel < %{kernel_version}
 %ifnarch s390 s390x
 Requires: libusb >= %{libusb_version}
@@ -191,6 +193,9 @@
 %{_bindir}/hal-device-manager
 
 %changelog
+* Wed Apr 19 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.7-4
+- Add Requires on pm-utils >= 0.10-1 (#185134, Andrew Overholt)
+
 * Fri Mar 03 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7-3
 - Fix fstab clearing script to not strip whitespace
 



From fedora-cvs-commits at redhat.com  Wed Apr 19 05:27:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 01:27:58 -0400
Subject: rpms/totem/devel totem.spec,1.56,1.57
Message-ID: <200604190527.k3J5Rww9012657@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12586

Modified Files:
	totem.spec 
Log Message:
Add missing BuildRequires



Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- totem.spec	14 Mar 2006 22:34:27 -0000	1.56
+++ totem.spec	19 Apr 2006 05:27:54 -0000	1.57
@@ -5,20 +5,25 @@
 Summary: Movie player for GNOME 2
 Name: totem
 Version: 1.4.0
-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
+
 Requires(post): GConf2
+Requires(post): desktop-file-utils
+
+Requires(postun): desktop-file-utils
+
 Requires: gnome-desktop >= 2.6.0
 Requires: gstreamer >= %gstreamer_version
 Requires: gstreamer-plugins-base >= %gstreamer_plugins_base_version
 Requires: gstreamer-plugins-good >= %gstreamer_plugins_good_version
-
 Requires: iso-codes
+
 BuildRequires: gcc-c++, pkgconfig, gettext, scrollkeeper
 BuildRequires: gstreamer-devel >= %gstreamer_version
 BuildRequires: gstreamer-plugins-base-devel >= %gstreamer_plugins_base_version
@@ -26,6 +31,13 @@
 BuildRequires: perl-XML-Parser
 BuildRequires: iso-codes-devel
 BuildRequires: mozilla-devel
+BuildRequires: gnome-icon-theme
+BuildRequires: nautilus
+BuildRequires: libXtst-devel
+BuildRequires: libXxf86vm-devel
+BuildRequires: libXt-devel
+BuildRequires: dbus-devel
+
 Obsoletes: nautilus-media
 
 %description
@@ -93,7 +105,7 @@
 
 %post
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications
+update-desktop-database -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 
 SCHEMAS="totem.schemas totem-handlers.schemas totem-video-thumbnail.schemas" 
@@ -104,7 +116,9 @@
      >/dev/null || :
 done
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+update-desktop-database -q
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -135,6 +149,9 @@
 %{_libdir}/*so
 
 %changelog
+* Wed Apr 19 2006 Matthias Clasen <mclasen at redhat.com> - 1.4.0-3
+- Add missing BuildRequires (#181304)
+
 * Tue Mar 14 2006 Ray Strode <rstrode at redhat.com> - 1.4.0-2
 - Update to 1.4.0
 



From fedora-cvs-commits at redhat.com  Wed Apr 19 06:44:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 02:44:26 -0400
Subject: rpms/gimp/devel gimp.spec,1.92,1.93
Message-ID: <200604190644.k3J6iQKs002844@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/gimp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2827

Modified Files:
	gimp.spec 
Log Message:
require pkgconfig (#189314)



Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- gimp.spec	18 Apr 2006 06:33:29 -0000	1.92
+++ gimp.spec	19 Apr 2006 06:44:08 -0000	1.93
@@ -19,7 +19,7 @@
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
 #define prever pre2
-Release: %{?prever:0.0.%{prever}.}1
+Release: %{?prever:0.0.%{prever}.}2
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -59,6 +59,7 @@
 %if %_with_lcms
 BuildRequires:	lcms-devel
 %endif
+Requires:   pkgconfig
 Requires:	desktop-file-utils >= 0.9
 Requires:	glib2 >= 2.4.8
 Requires: 	gtk2 >= 2.4.14
@@ -354,6 +355,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Apr 19 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-2
+- require pkgconfig (#189314)
+
 * Tue Apr 18 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-1
 - version 2.2.11
 



From fedora-cvs-commits at redhat.com  Wed Apr 19 06:44:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 02:44:51 -0400
Subject: rpms/gimp/FC-5 gimp.spec,1.92,1.93
Message-ID: <200604190644.k3J6ipXm002863@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	gimp.spec 
Log Message:
require pkgconfig (#189314)



Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-5/gimp.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- gimp.spec	18 Apr 2006 06:39:47 -0000	1.92
+++ gimp.spec	19 Apr 2006 06:44:47 -0000	1.93
@@ -19,7 +19,7 @@
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
 #define prever pre2
-Release: 0.fc5.%{?prever:0.0.%{prever}.}1
+Release: 0.fc5.%{?prever:0.0.%{prever}.}2
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -59,6 +59,7 @@
 %if %_with_lcms
 BuildRequires:	lcms-devel
 %endif
+Requires:   pkgconfig
 Requires:	desktop-file-utils >= 0.9
 Requires:	glib2 >= 2.4.8
 Requires: 	gtk2 >= 2.4.14
@@ -354,7 +355,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Tue Apr 18 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-0.fc5.1
+* Wed Apr 19 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-0.fc5.2
+- require pkgconfig (#189314)
+
+* Tu Apr 18 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-0.fc5.1
 - version 2.2.11
 
 * Fri Mar 03 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.10-4



From fedora-cvs-commits at redhat.com  Wed Apr 19 06:45:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 02:45:09 -0400
Subject: rpms/gimp/FC-4 gimp.spec,1.79,1.80
Message-ID: <200604190645.k3J6j1dG002878@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	gimp.spec 
Log Message:
require pkgconfig (#189314)



Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-4/gimp.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- gimp.spec	18 Apr 2006 06:46:54 -0000	1.79
+++ gimp.spec	19 Apr 2006 06:44:55 -0000	1.80
@@ -19,7 +19,7 @@
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
 #define prever pre2
-Release: 0.fc4.%{?prever:0.0.%{prever}.}1
+Release: 0.fc4.%{?prever:0.0.%{prever}.}2
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -59,6 +59,7 @@
 %if %_with_lcms
 BuildRequires:	lcms-devel
 %endif
+Requires:   pkgconfig
 Requires:	desktop-file-utils >= 0.9
 Requires:	glib2 >= 2.4.8
 Requires: 	gtk2 >= 2.4.14
@@ -348,6 +349,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Apr 19 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-0.fc4.2
+- require pkgconfig (#189314)
+
 * Tue Apr 18 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-0.fc4.1
 - version 2.2.11
 



From fedora-cvs-commits at redhat.com  Wed Apr 19 06:46:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 02:46:38 -0400
Subject: rpms/gimp/FC-5 gimp.spec,1.93,1.94
Message-ID: <200604190646.k3J6kcbj012345@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	gimp.spec 
Log Message:
correct typo in changelog



Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-5/gimp.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- gimp.spec	19 Apr 2006 06:44:47 -0000	1.93
+++ gimp.spec	19 Apr 2006 06:46:36 -0000	1.94
@@ -358,7 +358,7 @@
 * Wed Apr 19 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-0.fc5.2
 - require pkgconfig (#189314)
 
-* Tu Apr 18 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-0.fc5.1
+* Tue Apr 18 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-0.fc5.1
 - version 2.2.11
 
 * Fri Mar 03 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.10-4



From fedora-cvs-commits at redhat.com  Wed Apr 19 09:02:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 05:02:25 -0400
Subject: rpms/stardict/devel stardict.spec,1.16,1.17
Message-ID: <200604190902.k3J92OKp013224@cvs.devel.redhat.com>

Author: majain

Update of /cvs/dist/rpms/stardict/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13001/rpms/stardict/devel

Modified Files:
	stardict.spec 
Log Message:
Corrected spelling mistakes in the description section, RH bug #161777



Index: stardict.spec
===================================================================
RCS file: /cvs/dist/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- stardict.spec	11 Feb 2006 05:44:03 -0000	1.16
+++ stardict.spec	19 Apr 2006 09:02:19 -0000	1.17
@@ -17,8 +17,8 @@
 
 %description
 StarDict is a Cross-Platform and international dictionary written in Gtk2.
-It has powerful features such as "Glob-style pattern matching," "Scan
-seletion word," "Fuzzy search," etc.
+It has powerful features such as "Glob-style pattern matching", "Scan selection word,"
+"Fuzzy query," etc.
 
 %prep
 %setup
@@ -60,6 +60,9 @@
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %changelog
+* Tue Apr 18 2006 Mayank Jain <majain at redhat.com>
+- Corrected spelling mistakes in the description section, RH bug #161777
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.4.5-2.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Apr 19 09:04:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 05:04:19 -0400
Subject: rpms/kernel/FC-5 patch-2.6.16.9.bz2.sign, NONE, 1.1 .cvsignore,
	1.389, 1.390 kernel-2.6.spec, 1.2095, 1.2096 sources, 1.330,
	1.331 upstream, 1.303, 1.304 patch-2.6.16.8.bz2.sign, 1.1, NONE
Message-ID: <200604190904.k3J94JCk013482@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16.9.bz2.sign 
Removed Files:
	patch-2.6.16.8.bz2.sign 
Log Message:
2.6.16.9


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

iD8DBQBEReIzyGugalF9Dw4RAlBVAJ9thQ/q4FQn1e2wdo418wfVzb3o2gCfeSdC
ASHqvU3yQBCXBQhxyU1Ndr4=
=ZLrI
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -r1.389 -r1.390
--- .cvsignore	18 Apr 2006 23:07:20 -0000	1.389
+++ .cvsignore	19 Apr 2006 09:04:06 -0000	1.390
@@ -3,4 +3,4 @@
 kernel-2.6.16
 xen-20060301.tar.bz2
 linux-2.6.16.tar.bz2
-patch-2.6.16.8.bz2
+patch-2.6.16.9.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2095
retrieving revision 1.2096
diff -u -r1.2095 -r1.2096
--- kernel-2.6.spec	18 Apr 2006 23:07:22 -0000	1.2095
+++ kernel-2.6.spec	19 Apr 2006 09:04:06 -0000	1.2096
@@ -214,7 +214,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16.8.bz2
+Patch1: patch-2.6.16.9.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1692,6 +1692,9 @@
 
 %changelog
 * Wed Apr 19 2006 David Woodhouse <dwmw2 at redhat.com>
+- 2.6.16.9
+
+* Wed Apr 19 2006 David Woodhouse <dwmw2 at redhat.com>
 - 2.6.16.8
 
 * Tue Apr 18 2006 Dave Jones <davej at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -r1.330 -r1.331
--- sources	18 Apr 2006 23:07:28 -0000	1.330
+++ sources	19 Apr 2006 09:04:07 -0000	1.331
@@ -1,3 +1,3 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 cdfde609af8adcf58d7ff626599b2d90  xen-20060301.tar.bz2
-8162e5fda09c9d1d35d9e7faab928912  patch-2.6.16.8.bz2
+2424bb387b97c5f6950379173cddc05f  patch-2.6.16.9.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -r1.303 -r1.304
--- upstream	18 Apr 2006 23:09:28 -0000	1.303
+++ upstream	19 Apr 2006 09:04:07 -0000	1.304
@@ -1,2 +1,2 @@
 linux-2.6.16.tar.bz2
-patch-2.6.16.8.bz2
+patch-2.6.16.9.bz2


--- patch-2.6.16.8.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 19 09:06:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 05:06:14 -0400
Subject: rpms/gnome-user-share/FC-5 gnome-user-share-dav_groupfile, NONE,
	1.1 gnome-user-share-httpd-2.2.patch, 1.1,
	1.2 gnome-user-share.spec, 1.10, 1.11
Message-ID: <200604190906.k3J96EVt013877@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/gnome-user-share/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13729

Modified Files:
	gnome-user-share-httpd-2.2.patch gnome-user-share.spec 
Added Files:
	gnome-user-share-dav_groupfile 
Log Message:
* Wed Apr 19 2006 Alexander Larsson <alexl at redhat.com> - 0.9-4
- Fix http 2.2 patch for password authentication
- Patch from Veit Wahlich <cru at zodia.de>




--- NEW FILE gnome-user-share-dav_groupfile ---
guest: guest

gnome-user-share-httpd-2.2.patch:
 dav_user.conf |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletion(-)

Index: gnome-user-share-httpd-2.2.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-share/FC-5/gnome-user-share-httpd-2.2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-user-share-httpd-2.2.patch	3 Feb 2006 14:45:53 -0000	1.1
+++ gnome-user-share-httpd-2.2.patch	19 Apr 2006 09:06:11 -0000	1.2
@@ -1,16 +1,21 @@
-Migrate to httpd 2.2 configuration.
-
---- dav_user.conf	2005-12-11 05:01:41.000000000 -0500
-+++ dav_user.conf	2006-01-27 17:49:27.000000000 -0500
-@@ -10,6 +10,7 @@
+Index: dav_user.conf
+===================================================================
+RCS file: /cvs/gnome/gnome-user-share/dav_user.conf,v
+retrieving revision 1.5
+diff -u -p -r1.5 dav_user.conf
+--- dav_user.conf	29 Nov 2004 13:41:45 -0000	1.5
++++ dav_user.conf	19 Apr 2006 08:50:04 -0000
+@@ -10,7 +10,9 @@ LimitXMLRequestBody 100000
  
  LoadModule dav_module /etc/httpd/modules/mod_dav.so
  LoadModule dav_fs_module /etc/httpd/modules/mod_dav_fs.so
 +LoadModule authn_file_module /etc/httpd/modules/mod_authn_file.so
  LoadModule auth_digest_module /etc/httpd/modules/mod_auth_digest.so
++LoadModule authz_groupfile_module /etc/httpd/modules/mod_authz_groupfile.so
  
  DocumentRoot ${HOME}/Public
-@@ -20,7 +21,9 @@
+ <Directory "${HOME}/Public">
+@@ -20,16 +22,21 @@ DocumentRoot ${HOME}/Public
    AuthType Digest
    AuthName "Please log in as the user guest"
    AuthDigestDomain /
@@ -18,6 +23,18 @@
 +
 +  AuthDigestProvider file
 +  AuthUserFile ${HOME}/.gnome2/user-share/passwd
++  AuthGroupFile /usr/share/gnome-user-share/dav_groupfile
  
  
    <IfDefine RequirePasswordAlways>
+     Require user guest
++    Require group guest
+   </IfDefine>
+ 
+   <IfDefine RequirePasswordOnWrite>
+     <LimitExcept GET OPTIONS PROPFIND>
+       Require user guest
++      Require group guest
+     </LimitExcept>
+   </IfDefine>
+ </Directory>


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-share/FC-5/gnome-user-share.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome-user-share.spec	1 Mar 2006 12:33:29 -0000	1.10
+++ gnome-user-share.spec	19 Apr 2006 09:06:11 -0000	1.11
@@ -1,11 +1,12 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 0.9
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.gz
+Source1: %{name}-dav_groupfile
 Patch1: gnome-user-share-httpd-2.2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: httpd >= 2.2.0
@@ -17,7 +18,10 @@
 Prereq: GConf2
 
 %description
-gnome-user-share 
+This programm allows GNOME users to share the files in their ~/Public folder
+directly through the WebDAV protocol. The existence of the DAV services is
+automatically announced on the local IP subnet through Avahi.
+Access can be configured to be readonly, read-write and authenticated.
 
 %prep
 %setup -q
@@ -34,6 +38,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
+install -c -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/dav_groupfile
+
 desktop-file-install --vendor gnome --delete-original                   \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications			        \
   --add-only-show-in GNOME                                              \
@@ -62,6 +68,10 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Wed Apr 19 2006 Alexander Larsson <alexl at redhat.com> - 0.9-4
+- Fix http 2.2 patch for password authentication
+- Patch from Veit Wahlich <cru at zodia.de>
+
 * Wed Mar 01 2006 Karsten Hopp <karsten at redhat.de> 0.9-3
 - BuildRequires: gtk2-devel, libglade2-devel, libselinux-devel
 



From fedora-cvs-commits at redhat.com  Wed Apr 19 09:18:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 05:18:16 -0400
Subject: rpms/hplip/FC-5 hplip.spec,1.65,1.66
Message-ID: <200604190918.k3J9IGNE025060@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
* Wed Apr 19 2006 Tim Waugh <twaugh at redhat.com>
- Don't package COPYING twice (bug #189162).



Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/hplip.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- hplip.spec	18 Apr 2006 17:16:48 -0000	1.65
+++ hplip.spec	19 Apr 2006 09:18:13 -0000	1.66
@@ -132,6 +132,7 @@
 mv %{buildroot}%{_sysconfdir}/{init.d,rc.d/init.d}/hplip
 
 # Remove files we don't want to package.
+rm -f %{buildroot}%{_datadir}/hplip/COPYING
 rm -f %{buildroot}%{_datadir}/hplip/hplip
 rm -f %{buildroot}%{_datadir}/hplip/hplip.conf
 rm -f %{buildroot}%{_datadir}/hplip/hplip_overview.png
@@ -192,6 +193,9 @@
 fi
 
 %changelog
+* Wed Apr 19 2006 Tim Waugh <twaugh at redhat.com>
+- Don't package COPYING twice (bug #189162).
+
 * Tue Apr 18 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-1.3
 - Patchlevel 1.
 - Fixed another case-sensitive match.



From fedora-cvs-commits at redhat.com  Wed Apr 19 09:18:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 05:18:57 -0400
Subject: rpms/hplip/devel hplip.spec,1.71,1.72
Message-ID: <200604190918.k3J9Ivg8027298@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
* Wed Apr 19 2006 Tim Waugh <twaugh at redhat.com>
- Don't package COPYING twice (bug #189162).



Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- hplip.spec	18 Apr 2006 17:17:42 -0000	1.71
+++ hplip.spec	19 Apr 2006 09:18:55 -0000	1.72
@@ -126,6 +126,7 @@
 mv %{buildroot}%{_sysconfdir}/{init.d,rc.d/init.d}/hplip
 
 # Remove files we don't want to package.
+rm -f %{buildroot}%{_datadir}/hplip/COPYING
 rm -f %{buildroot}%{_datadir}/hplip/hplip
 rm -f %{buildroot}%{_datadir}/hplip/hplip.conf
 rm -f %{buildroot}%{_datadir}/hplip/hplip_overview.png
@@ -182,6 +183,9 @@
 fi
 
 %changelog
+* Wed Apr 19 2006 Tim Waugh <twaugh at redhat.com>
+- Don't package COPYING twice (bug #189162).
+
 * Tue Apr 18 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-5
 - Patchlevel 1.
 - Fixed another case-sensitive match.



From fedora-cvs-commits at redhat.com  Wed Apr 19 09:31:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 05:31:18 -0400
Subject: rpms/stardict/devel .cvsignore,1.4,1.5 sources,1.5,1.6
Message-ID: <200604190931.k3J9VHTZ000544@cvs.devel.redhat.com>

Author: majain

Update of /cvs/dist/rpms/stardict/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv366

Modified Files:
	.cvsignore sources 
Log Message:
Added the new stardict-2.4.6 to the CVS.
Tested the build on a test machine running FC5
19 april 2006, Mayank Jain <majain at redhat.com>



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/stardict/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Sep 2005 00:57:34 -0000	1.4
+++ .cvsignore	19 Apr 2006 09:31:14 -0000	1.5
@@ -1,3 +1,4 @@
 stardict.tar.gz
 stardict-2.4.4.tar.bz2
 stardict-2.4.5.tar.bz2
+stardict-2.4.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/stardict/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Sep 2005 00:57:34 -0000	1.5
+++ sources	19 Apr 2006 09:31:14 -0000	1.6
@@ -1,3 +1,4 @@
 db0bf6590ac16ed2352c136821b08bb3  stardict.tar.gz
 e1c2df19fc854f81bdec4b3409eb95e1  stardict-2.4.4.tar.bz2
 78543ca107bf7a70a96ba41313de8883  stardict-2.4.5.tar.bz2
+a985bb3737903ffcea880e6df1433661  stardict-2.4.6.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 19 11:44:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 07:44:52 -0400
Subject: rpms/udev/devel start_udev, 1.52, 1.53 udev-rules.patch, 1.12,
	1.13 udev.spec, 1.164, 1.165
Message-ID: <200604191144.k3JBiqsw002138@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2098

Modified Files:
	start_udev udev-rules.patch udev.spec 
Log Message:
version 090


Index: start_udev
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/start_udev,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- start_udev	13 Apr 2006 08:46:43 -0000	1.52
+++ start_udev	19 Apr 2006 11:44:47 -0000	1.53
@@ -109,23 +109,13 @@
 
 
 wait_for_queue() {
-	loop=20
-	while test ! -d /dev/.udev/queue; do
-                usleep 100000;
-                test "$loop" -gt 0 || return 1
-                loop=$(($loop - 1))
-        done
-
-	loop=200
-	while test -d /dev/.udev/queue; do
-		usleep 100000;
-		if [ "$loop" -le 0 ]; then
-			echo -n "Wait timeout. Will continue in the background."
-			return 1
-		fi
-		loop=$(($loop - 1))
-	done
-	return 0
+	local ret=0
+	/sbin/udevsettle --timeout=100
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		echo -n "Wait timeout. Will continue in the background."
+	fi
+	return $ret;
 }
 
 export ACTION=add

udev-rules.patch:
 50-udev.rules |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 deletions(-)

Index: udev-rules.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- udev-rules.patch	13 Apr 2006 08:46:43 -0000	1.12
+++ udev-rules.patch	19 Apr 2006 11:44:47 -0000	1.13
@@ -1,6 +1,28 @@
---- udev-089/etc/udev/redhat/50-udev.rules.rhrules	2006-04-12 15:27:32.000000000 +0200
-+++ udev-089/etc/udev/redhat/50-udev.rules	2006-04-12 15:29:35.000000000 +0200
-@@ -271,15 +271,15 @@
+--- udev-089/etc/udev/redhat/50-udev.rules.rhrules	2006-04-03 14:41:10.000000000 +0200
++++ udev-089/etc/udev/redhat/50-udev.rules	2006-04-18 12:00:25.000000000 +0200
+@@ -40,8 +40,9 @@
+ KERNEL=="hvc*",                 NAME="%k", GROUP="uucp", MODE="0660"
+ KERNEL=="hvsi*",                NAME="%k", GROUP="uucp", MODE="0660"
+ KERNEL=="iseries/vtty*",        NAME="%k", GROUP="uucp", MODE="0660"
+-KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", SYMLINK+="pilot"
+-KERNEL=="ttyUSB*", SYSFS{product}=="palmOne Handheld*", SYMLINK+="pilot"
++KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", SYMLINK+="pilot", GROUP="uucp", MODE="0660"
++KERNEL=="ttyUSB*", SYSFS{product}=="palmOne Handheld*", SYMLINK+="pilot", GROUP="uucp", MODE="0660"
++KERNEL=="ttyUSB*", SYSFS{product}=="Handspring Visor*", SYMLINK+="pilot", GROUP="uucp", MODE="0660"
+ 
+ # vc devices
+ KERNEL=="vcs",			NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
+@@ -90,9 +91,6 @@
+ KERNEL=="dmmidi*",		MODE="0660"
+ KERNEL=="sndstat",		MODE="0660"
+ 
+-# pilot/palm devices
+-KERNEL=="pilot",		GROUP="uucp", MODE="0660"
+-
+ # lp devices
+ KERNEL=="lp*",			GROUP="lp", MODE="0660"
+ KERNEL=="parport*",		GROUP="lp", MODE="0660"
+@@ -271,15 +269,15 @@
  BUS=="ide", KERNEL=="hd*[0-9]", SYSFS{../removable}=="1", GOTO="persistent_end"
  
  # by-id (hardware serial number)
@@ -21,7 +43,7 @@
  KERNEL=="sd*[!0-9]|sr*|dasd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
  
  # for partitions import parent information
-@@ -287,19 +287,19 @@
+@@ -287,19 +285,19 @@
  KERNEL=="sd*[0-9]|dasd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
  
  # by-path (shortest physical path)


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- udev.spec	13 Apr 2006 09:48:34 -0000	1.164
+++ udev.spec	19 Apr 2006 11:44:47 -0000	1.165
@@ -4,7 +4,7 @@
 
 Summary: A userspace implementation of devfs
 Name: udev
-Version: 089
+Version: 090
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -242,6 +242,7 @@
 %attr(0755,root,root) /sbin/udevcontrol
 %attr(0755,root,root) /sbin/udevd
 %attr(0755,root,root) /sbin/udevtrigger
+%attr(0755,root,root) /sbin/udevsettle
 %attr(0755,root,root) /sbin/start_udev
 #%attr(755,root,root) /sbin/udev_volume_id
 %attr(0755,root,root) %{udev_scriptdir}/udev_run_devd
@@ -303,6 +304,9 @@
 %attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
 
 %changelog
+* Wed Apr 19 2006 Harald Hoyer <harald at redhat.com> - 090-1
+- version 090
+
 * Thu Apr 13 2006 Harald Hoyer <harald at redhat.com> - 089-1
 - version 089
 - do not force loading of parport_pc (bug #186850)



From fedora-cvs-commits at redhat.com  Wed Apr 19 11:48:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 07:48:18 -0400
Subject: rpms/udev/devel .cvsignore,1.33,1.34 sources,1.33,1.34
Message-ID: <200604191148.k3JBmIM2017044@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17017

Modified Files:
	.cvsignore sources 
Log Message:
version 090


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	13 Apr 2006 08:46:43 -0000	1.33
+++ .cvsignore	19 Apr 2006 11:48:15 -0000	1.34
@@ -1 +1 @@
-udev-089.tar.bz2
+udev-090.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	13 Apr 2006 08:46:43 -0000	1.33
+++ sources	19 Apr 2006 11:48:15 -0000	1.34
@@ -1 +1 @@
-ed2d885527da9c5f72abd9a43cb1af98  udev-089.tar.bz2
+44acf418a23b0be826aa55828ada07db  udev-090.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 19 11:55:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 07:55:47 -0400
Subject: rpms/selinux-policy/devel policy-20060411.patch, 1.6,
	1.7 selinux-policy.spec, 1.175, 1.176
Message-ID: <200604191155.k3JBtlcC019915@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20060411.patch selinux-policy.spec 
Log Message:
* Tue Apr 18 2006 Dan Walsh <dwalsh at redhat.com> 2.2.33-1
- Update to latest from upstream
- Add James Antill patch for xen
- Many fixes for pegasus


policy-20060411.patch:
 Rules.modular                           |    2 -
 policy/modules/apps/java.te             |    3 ++
 policy/modules/kernel/devices.if        |   20 ++++++++++++++++++
 policy/modules/kernel/files.if          |   35 ++++++++++++++++++++++++++++++++
 policy/modules/kernel/mls.te            |    1 
 policy/modules/services/cups.fc         |    3 +-
 policy/modules/services/ftp.te          |    1 
 policy/modules/services/pegasus.fc      |    1 
 policy/modules/services/pegasus.te      |    8 +++++++
 policy/modules/services/postfix.te      |    2 +
 policy/modules/services/postgresql.if   |    4 ++-
 policy/modules/services/privoxy.te      |    1 
 policy/modules/services/samba.te        |    5 +++-
 policy/modules/services/spamassassin.fc |    2 -
 policy/modules/services/xserver.if      |   21 +++++++++++++++++++
 policy/modules/system/authlogin.te      |    4 +++
 policy/modules/system/fstools.te        |    1 
 policy/modules/system/init.te           |    1 
 policy/modules/system/libraries.fc      |    5 +++-
 policy/modules/system/mount.if          |   22 ++++++++++++++++++++
 policy/modules/system/mount.te          |    9 ++++++++
 policy/modules/system/selinuxutil.if    |    4 +--
 policy/modules/system/sysnetwork.te     |    2 +
 policy/modules/system/unconfined.if     |   18 ++++++++++++++++
 policy/modules/system/unconfined.te     |    7 ++----
 policy/modules/system/userdomain.if     |    1 
 policy/modules/system/xen.if            |   18 ++++++++++++++++
 policy/modules/system/xen.te            |    1 
 28 files changed, 190 insertions(+), 12 deletions(-)

Index: policy-20060411.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060411.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- policy-20060411.patch	17 Apr 2006 11:27:44 -0000	1.6
+++ policy-20060411.patch	19 Apr 2006 11:55:43 -0000	1.7
@@ -1,241 +1,21 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.32/policy/mcs
---- nsaserefpolicy/policy/mcs	2006-03-29 11:23:41.000000000 -0500
-+++ serefpolicy-2.2.32/policy/mcs	2006-04-14 12:06:19.000000000 -0400
-@@ -134,14 +134,18 @@
- # the high range of the file.  We use the high range of the process so
- # that processes can always simply run at s0.
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-2.2.33/policy/modules/apps/java.te
+--- nsaserefpolicy/policy/modules/apps/java.te	2006-04-18 22:49:59.000000000 -0400
++++ serefpolicy-2.2.33/policy/modules/apps/java.te	2006-04-18 23:10:07.000000000 -0400
+@@ -7,8 +7,11 @@
  #
--# Only files are constrained by MCS at this stage.
-+# Note that getattr on files is always permitted.
- #
- mlsconstrain file { write setattr append unlink link rename ioctl lock execute relabelfrom }
- 	( h1 dom h2 );
- 
-+# New filesystem object labels must be dominated by the relabeling subject
-+# clearance, also the objects are single-level.
- mlsconstrain file { create relabelto }
- 	(( h1 dom h2 ) and ( l2 eq h2 ));
- 
-+# At this time we do not restrict "ps" type operations via MCS.  This
-+# will probably change in future.
- mlsconstrain file { read }
- 	(( h1 dom h2 ) or ( t2 == domain ) or ( t1 == mlsfileread ));
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.2.32/policy/modules/admin/amanda.te
---- nsaserefpolicy/policy/modules/admin/amanda.te	2006-03-24 11:15:40.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/admin/amanda.te	2006-04-14 14:29:14.000000000 -0400
-@@ -9,6 +9,7 @@
- type amanda_t;
- type amanda_inetd_exec_t;
- inetd_udp_service_domain(amanda_t,amanda_inetd_exec_t)
-+inetd_tcp_service_domain(amanda_t,amanda_inetd_exec_t)
- role system_r types amanda_t;
- 
- type amanda_exec_t;
-@@ -141,6 +142,10 @@
- corenet_non_ipsec_sendrecv(amanda_t)
- corenet_tcp_bind_all_nodes(amanda_t)
- corenet_udp_bind_all_nodes(amanda_t)
-+corenet_tcp_bind_reserved_port(amanda_t)
-+corenet_udp_bind_reserved_port(amanda_t)
-+corenet_dontaudit_tcp_bind_all_reserved_ports(amanda_t)
-+corenet_dontaudit_udp_bind_all_reserved_ports(amanda_t)
- 
- dev_getattr_all_blk_files(amanda_t)
- dev_getattr_all_chr_files(amanda_t)
-@@ -183,13 +188,15 @@
- 
- optional_policy(`
- 	nscd_socket_use(amanda_t)
-+	nscd_socket_use(amanda_recover_t)
- ')
- 
- ########################################
- #
- # Amanda recover local policy
- 
--allow amanda_recover_t self:capability { fowner fsetid kill setgid setuid chown dac_override net_bind_service };
-+allow amanda_recover_t self:capability { fowner fsetid kill setgid setuid chown dac_override };
-+corenet_tcp_bind_reserved_port(amanda_recover_t)
- allow amanda_recover_t self:process { sigkill sigstop signal };
- allow amanda_recover_t self:fifo_file { getattr ioctl read write };
- allow amanda_recover_t self:unix_stream_socket { connect create read write };
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.32/policy/modules/admin/bootloader.te
---- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-04-04 18:06:37.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/admin/bootloader.te	2006-04-14 12:06:19.000000000 -0400
-@@ -84,6 +84,7 @@
- dev_read_sysfs(bootloader_t)
- # for reading BIOS data
- dev_read_raw_memory(bootloader_t)
-+mls_file_read_up(bootloader_t)
- 
- fs_getattr_xattr_fs(bootloader_t)
- fs_read_tmpfs_symlinks(bootloader_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.2.32/policy/modules/admin/rpm.fc
---- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-04-04 18:06:37.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/admin/rpm.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -10,6 +10,7 @@
- /usr/lib(64)?/rpm/rpmv		-- 	gen_context(system_u:object_r:bin_t,s0)
- 
- /usr/share/yumex/yumex		--	gen_context(system_u:object_r:rpm_exec_t,s0)
-+/usr/sbin/system-install-packages --	gen_context(system_u:object_r:rpm_exec_t,s0)
- 
- ifdef(`distro_redhat', `
- /usr/bin/fedora-rmdevelrpms	--	gen_context(system_u:object_r:rpm_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.fc serefpolicy-2.2.32/policy/modules/admin/su.fc
---- nsaserefpolicy/policy/modules/admin/su.fc	2006-03-23 14:33:29.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/admin/su.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -1,5 +1,5 @@
- 
- /bin/su			--	gen_context(system_u:object_r:su_exec_t,s0)
- 
--/usr(/local)?/bin/ksu	--	gen_context(system_u:object_r:su_exec_t,s0)
-+/usr/(local/)?bin/ksu	--	gen_context(system_u:object_r:su_exec_t,s0)
- /usr/bin/kdesu		--	gen_context(system_u:object_r:su_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.2.32/policy/modules/admin/usermanage.te
---- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/admin/usermanage.te	2006-04-14 12:06:19.000000000 -0400
-@@ -514,6 +514,7 @@
- # Add/remove user home directories
- userdom_home_filetrans_generic_user_home_dir(useradd_t)
- userdom_manage_generic_user_home_content_dirs(useradd_t)
-+userdom_manage_staff_home_dir(useradd_t)
- userdom_generic_user_home_dir_filetrans_generic_user_home_content(useradd_t,notdevfile_class_set)
- 
- mta_manage_spool(useradd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.2.32/policy/modules/apps/java.fc
---- nsaserefpolicy/policy/modules/apps/java.fc	2006-04-12 13:44:36.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/apps/java.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -1,11 +1,8 @@
- #
--# /opt
--#
--/opt(/.*)?/bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
--
--#
- # /usr
- #
--/usr(/.*)?/bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
-+/usr/(.*/)?bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
-+/usr/lib(.*/)?bin/java([^/]*)? 	--	gen_context(system_u:object_r:java_exec_t,s0)
- /usr/bin/gcj-dbtool	--	gen_context(system_u:object_r:java_exec_t,s0)
- /usr/bin/gij		--	gen_context(system_u:object_r:java_exec_t,s0)
-+/opt/(.*/)?bin/java([^/]*)? 	--	gen_context(system_u:object_r:java_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-2.2.32/policy/modules/apps/java.te
---- nsaserefpolicy/policy/modules/apps/java.te	2006-04-12 13:44:36.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/apps/java.te	2006-04-14 12:06:19.000000000 -0400
-@@ -10,6 +10,7 @@
- domain_type(java_t)
  
+ type java_t;
++domain_type(java_t)
++
  type java_exec_t;
-+init_system_domain(java_t,java_exec_t)
- files_type(java_exec_t)
+ init_system_domain(java_t,java_exec_t)
++files_type(java_exec_t)
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.2.32/policy/modules/apps/mono.te
---- nsaserefpolicy/policy/modules/apps/mono.te	2006-04-12 13:44:36.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/apps/mono.te	2006-04-14 12:06:19.000000000 -0400
-@@ -22,6 +22,8 @@
- 	unconfined_domain_noaudit(mono_t)
- 	role system_r types mono_t;
- 
-+	init_dbus_chat_script(mono_t)
-+
- 	optional_policy(`
- 		avahi_dbus_chat(mono_t)
- 	')
-@@ -29,4 +31,8 @@
- 	optional_policy(`
- 		hal_dbus_chat(mono_t)
- 	')
-+	optional_policy(`
-+		networkmanager_dbus_chat(mono_t)
-+	')
-+
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.2.32/policy/modules/kernel/corecommands.fc
---- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-04-10 17:05:08.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/kernel/corecommands.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -2,7 +2,8 @@
- #
- # /bin
- #
--/bin(/.*)?				gen_context(system_u:object_r:bin_t,s0)
-+/bin				-d	gen_context(system_u:object_r:bin_t,s0)
-+/bin/.*					gen_context(system_u:object_r:bin_t,s0)
- /bin/d?ash			--	gen_context(system_u:object_r:shell_exec_t,s0)
- /bin/bash			--	gen_context(system_u:object_r:shell_exec_t,s0)
- /bin/bash2			--	gen_context(system_u:object_r:shell_exec_t,s0)
-@@ -86,27 +87,30 @@
  #
- # /sbin
- #
--/sbin(/.*)?				gen_context(system_u:object_r:sbin_t,s0)
-+/sbin				-d	gen_context(system_u:object_r:sbin_t,s0)
-+/sbin/.*				gen_context(system_u:object_r:sbin_t,s0)
- /sbin/mkfs\.cramfs		--	gen_context(system_u:object_r:sbin_t,s0)
- /sbin/insmod_ksymoops_clean	--	gen_context(system_u:object_r:sbin_t,s0)
- 
- #
- # /opt
- #
--/opt(/.*)?/bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
-+/opt/(.*/)?bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
- 
--/opt(/.*)?/libexec(/.*)?		gen_context(system_u:object_r:bin_t,s0)
-+/opt/(.*/)?libexec(/.*)?		gen_context(system_u:object_r:bin_t,s0)
- 
--/opt(/.*)?/sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
-+/opt/(.*/)?sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
- 
- #
- # /usr
- #
--/usr(/.*)?/Bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
-+/usr/(.*/)?Bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
- 
--/usr(/.*)?/bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
-+/usr/(.*/)?bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
-+/usr/lib(.*/)?bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
- 
--/usr(/.*)?/sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
-+/usr/(.*/)?sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
-+/usr/lib(.*/)?sbin(/.*)?		gen_context(system_u:object_r:sbin_t,s0)
- 
- /usr/lib/ccache/bin(/.*)?		gen_context(system_u:object_r:bin_t,s0)
- /usr/lib/pgsql/test/regress/.*\.sh --	gen_context(system_u:object_r:bin_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.32/policy/modules/kernel/devices.fc
---- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-04-12 13:44:36.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/kernel/devices.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -1,5 +1,6 @@
- 
--/dev(/.*)?			gen_context(system_u:object_r:device_t,s0)
-+/dev			-d	gen_context(system_u:object_r:device_t,s0)
-+/dev/.*				gen_context(system_u:object_r:device_t,s0)
- 
- /dev/.*mouse.*		-c	gen_context(system_u:object_r:mouse_device_t,s0)
- /dev/adsp		-c	gen_context(system_u:object_r:sound_device_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.32/policy/modules/kernel/devices.if
---- nsaserefpolicy/policy/modules/kernel/devices.if	2006-04-12 13:44:36.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/kernel/devices.if	2006-04-14 12:06:19.000000000 -0400
-@@ -2701,7 +2701,7 @@
- 	')
- 
- 	allow $1 device_t:dir r_dir_perms;
--	allow $1 xen_device_t:chr_file r_file_perms;
-+	allow $1 xen_device_t:chr_file rw_file_perms;
- ')
- 
- ########################################
-@@ -2720,7 +2720,7 @@
- 	')
- 
- 	allow $1 device_t:dir r_dir_perms;
--	allow $1 xen_device_t:chr_file r_file_perms;
-+	allow $1 xen_device_t:chr_file manage_file_perms;
- ')
- 
- ########################################
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.33/policy/modules/kernel/devices.if
+--- nsaserefpolicy/policy/modules/kernel/devices.if	2006-04-18 22:49:59.000000000 -0400
++++ serefpolicy-2.2.33/policy/modules/kernel/devices.if	2006-04-18 23:10:07.000000000 -0400
 @@ -2874,3 +2874,23 @@
  
  	typeattribute $1 devices_unconfined_type;
@@ -260,140 +40,37 @@
 +	dontaudit $1 device_node:dir_file_class_set getattr;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.32/policy/modules/kernel/files.fc
---- nsaserefpolicy/policy/modules/kernel/files.fc	2006-03-23 14:33:29.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/kernel/files.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -25,7 +25,8 @@
- #
- # /boot
- #
--/boot(/.*)?			gen_context(system_u:object_r:boot_t,s0)
-+/boot			-d	gen_context(system_u:object_r:boot_t,s0)
-+/boot/.*			gen_context(system_u:object_r:boot_t,s0)
- /boot/\.journal			<<none>>
- /boot/lost\+found	-d	gen_context(system_u:object_r:lost_found_t,s15:c0.c255)
- /boot/lost\+found/.*		<<none>>
-@@ -36,13 +37,15 @@
- #
- 
- ifdef(`distro_redhat',`
--/emul(/.*)?			gen_context(system_u:object_r:usr_t,s0)
-+/emul			-d	gen_context(system_u:object_r:usr_t,s0)
-+/emul/.*			gen_context(system_u:object_r:usr_t,s0)
- ')
- 
- #
- # /etc
- #
--/etc(/.*)?			gen_context(system_u:object_r:etc_t,s0)
-+/etc			-d	gen_context(system_u:object_r:etc_t,s0)
-+/etc/.*				gen_context(system_u:object_r:etc_t,s0)
- /etc/\.fstab\.hal\..+	--	gen_context(system_u:object_r:etc_runtime_t,s0)
- /etc/asound\.state	--	gen_context(system_u:object_r:etc_runtime_t,s0)
- /etc/blkid(/.*)?		gen_context(system_u:object_r:etc_runtime_t,s0)
-@@ -104,7 +107,8 @@
- #
- # /lib(64)?
- #
--/lib(64)?/modules(/.*)?		gen_context(system_u:object_r:modules_object_t,s0)
-+/lib/modules(/.*)?		gen_context(system_u:object_r:modules_object_t,s0)
-+/lib64/modules(/.*)?		gen_context(system_u:object_r:modules_object_t,s0)
- 
- #
- # /lost+found
-@@ -139,29 +143,34 @@
- #
- # /opt
- #
--/opt(/.*)?			gen_context(system_u:object_r:usr_t,s0)
-+/opt			-d	gen_context(system_u:object_r:usr_t,s0)
-+/opt/.*				gen_context(system_u:object_r:usr_t,s0)
- 
--/opt(/.*)?/var/lib(64)?(/.*)?	gen_context(system_u:object_r:var_lib_t,s0)
-+/opt/(.*/)?var/lib(64)?(/.*)?	gen_context(system_u:object_r:var_lib_t,s0)
- 
- #
- # /proc
- #
--/proc(/.*)?                     <<none>>
-+/proc			-d	<<none>>
-+/proc/.*			<<none>>
- 
- #
- # /selinux
- #
--/selinux(/.*)?                  <<none>>
-+/selinux		-d	<<none>>
-+/selinux/.*			<<none>>
- 
- #
- # /srv
- #
--/srv(/.*)?			gen_context(system_u:object_r:var_t,s0)
-+/srv			-d	gen_context(system_u:object_r:var_t,s0)
-+/srv/.*				gen_context(system_u:object_r:var_t,s0)
- 
- #
- # /sys
- #
--/sys(/.*)?                      <<none>>
-+/sys			-d	<<none>>
-+/sys/.*				<<none>>
- 
- #
- # /tmp
-@@ -176,7 +185,8 @@
- #
- # /usr
- #
--/usr(/.*)?			gen_context(system_u:object_r:usr_t,s0)
-+/usr			-d	gen_context(system_u:object_r:usr_t,s0)
-+/usr/.*				gen_context(system_u:object_r:usr_t,s0)
- /usr/\.journal			<<none>>
- 
- /usr/doc(/.*)?/lib(/.*)?		gen_context(system_u:object_r:usr_t,s0)
-@@ -200,7 +210,7 @@
- /usr/share(/.*)?/lib(64)?(/.*)?	gen_context(system_u:object_r:usr_t,s0)
- 
- /usr/src(/.*)?			gen_context(system_u:object_r:src_t,s0)
--/usr/src(/.*)?/lib(/.*)?		gen_context(system_u:object_r:usr_t,s0)
-+/usr/src/kernels/.+/lib(/.*)?		gen_context(system_u:object_r:usr_t,s0)
- 
- /usr/tmp			-d	gen_context(system_u:object_r:tmp_t,s0-s15:c0.c255)
- /usr/tmp/.*			<<none>>
-@@ -208,7 +218,8 @@
- #
- # /var
- #
--/var(/.*)?			gen_context(system_u:object_r:var_t,s0)
-+/var			-d	gen_context(system_u:object_r:var_t,s0)
-+/var/.*				gen_context(system_u:object_r:var_t,s0)
- /var/\.journal			<<none>>
- 
- /var/db/.*\.db		--	gen_context(system_u:object_r:etc_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.32/policy/modules/kernel/files.if
---- nsaserefpolicy/policy/modules/kernel/files.if	2006-04-14 07:58:12.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/kernel/files.if	2006-04-14 12:06:19.000000000 -0400
-@@ -948,6 +948,18 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.33/policy/modules/kernel/files.if
+--- nsaserefpolicy/policy/modules/kernel/files.if	2006-04-18 22:49:59.000000000 -0400
++++ serefpolicy-2.2.33/policy/modules/kernel/files.if	2006-04-19 07:51:01.000000000 -0400
+@@ -1268,6 +1268,26 @@
  
  ########################################
- #
-+# files_stat_all_mountpoints(domain)
+ ## <summary>
++##     Read kernel files in the /boot directory.
++## </summary>
++## <param name="domain">
++##     <summary>
++##     Domain allowed access.
++##     </summary>
++## </param>
 +#
-+interface(`files_stat_all_mountpoints',`
-+	gen_require(`
-+		attribute mountpoint;
-+	')
-+
-+	allow $1 mountpoint:dir { getattr };
++interface(`files_read_kernel_img',`
++       gen_require(`
++               type boot_t;
++       ')
++
++       allow $1 boot_t:dir r_dir_perms;
++       allow $1 boot_t:file { getattr read };
++       allow $1 boot_t:lnk_file { getattr read };
 +')
 +
 +########################################
-+#
- # files_list_root(domain)
- #
- interface(`files_list_root',`
-@@ -1661,6 +1673,21 @@
++## <summary>
+ ##	Install a kernel into the /boot directory.
+ ## </summary>
+ ## <param name="domain">
+@@ -1679,6 +1699,21 @@
  ')
  
  ########################################
@@ -415,36 +92,9 @@
  ## <summary>
  ##	Read files in /etc that are dynamically
  ##	created on boot, such as mtab.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.32/policy/modules/kernel/kernel.if
---- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-04-10 17:05:10.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/kernel/kernel.if	2006-04-14 12:06:19.000000000 -0400
-@@ -1148,7 +1148,8 @@
- 
- 	allow $1 proc_t:dir search;
- 	allow $1 sysctl_t:dir r_dir_perms;
--	allow $1 sysctl_vm_t:dir list_dir_perms;
-+#hal needs allow hald_t sysctl_vm_t:dir write;
-+	allow $1 sysctl_vm_t:dir rw_dir_perms;
- 	allow $1 sysctl_vm_t:file rw_file_perms;
- ')
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mcs.te serefpolicy-2.2.32/policy/modules/kernel/mcs.te
---- nsaserefpolicy/policy/modules/kernel/mcs.te	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/kernel/mcs.te	2006-04-14 12:06:19.000000000 -0400
-@@ -32,6 +32,10 @@
- type xdm_exec_t;
- 
- ifdef(`enable_mcs',`
-+# The eventual plan is to have a range_transition to s0 for the daemon by
-+# default and have the daemons which need to run with all categories be
-+# exceptions.  But while range_transitions have to be in the base module
-+# this is not possible.
- range_transition getty_t login_exec_t s0 - s0:c0.c255;
- range_transition init_t xdm_exec_t s0 - s0:c0.c255;
- range_transition initrc_t crond_exec_t s0 - s0:c0.c255;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.32/policy/modules/kernel/mls.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.33/policy/modules/kernel/mls.te
 --- nsaserefpolicy/policy/modules/kernel/mls.te	2006-03-07 10:31:09.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/kernel/mls.te	2006-04-14 12:06:19.000000000 -0400
++++ serefpolicy-2.2.33/policy/modules/kernel/mls.te	2006-04-18 23:10:07.000000000 -0400
 @@ -60,6 +60,7 @@
  
  ifdef(`enable_mls',`
@@ -453,31 +103,9 @@
  range_transition kernel_t init_exec_t s0 - s15:c0.c255;
  range_transition kernel_t lvm_exec_t s0 - s15:c0.c255;
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.2.32/policy/modules/services/avahi.te
---- nsaserefpolicy/policy/modules/services/avahi.te	2006-03-24 11:15:50.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/services/avahi.te	2006-04-14 12:06:19.000000000 -0400
-@@ -92,6 +92,7 @@
- 	dbus_system_bus_client_template(avahi,avahi_t)
- 	dbus_connect_system_bus(avahi_t)
- 	dbus_send_system_bus(avahi_t)
-+	init_dbus_chat_script(avahi_t)
- ')
- 
- optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.fc serefpolicy-2.2.32/policy/modules/services/bind.fc
---- nsaserefpolicy/policy/modules/services/bind.fc	2006-01-16 17:04:24.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/services/bind.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -29,6 +29,7 @@
- 
- ifdef(`distro_redhat',`
- /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)
- /var/named/data(/.*)?		gen_context(system_u:object_r:named_cache_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.2.32/policy/modules/services/cups.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.2.33/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2006-03-23 14:33:30.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/services/cups.fc	2006-04-17 07:15:02.000000000 -0400
++++ serefpolicy-2.2.33/policy/modules/services/cups.fc	2006-04-18 23:10:07.000000000 -0400
 @@ -35,7 +35,8 @@
  /usr/share/hplip/hpssd.py --	gen_context(system_u:object_r:hplip_exec_t,s0)
  
@@ -488,9 +116,9 @@
  
  /var/lib/cups/certs	-d	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /var/lib/cups/certs/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.2.32/policy/modules/services/ftp.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.2.33/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2006-04-12 13:44:37.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/services/ftp.te	2006-04-14 13:41:32.000000000 -0400
++++ serefpolicy-2.2.33/policy/modules/services/ftp.te	2006-04-18 23:10:07.000000000 -0400
 @@ -126,6 +126,7 @@
  seutil_dontaudit_search_config(ftpd_t)
  
@@ -499,83 +127,58 @@
  
  userdom_dontaudit_search_sysadm_home_dirs(ftpd_t)
  userdom_dontaudit_use_unpriv_user_fds(ftpd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.32/policy/modules/services/hal.te
---- nsaserefpolicy/policy/modules/services/hal.te	2006-04-12 13:44:37.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/services/hal.te	2006-04-14 12:06:19.000000000 -0400
-@@ -103,6 +103,7 @@
- fs_getattr_all_fs(hald_t)
- fs_search_all(hald_t)
- fs_list_auto_mountpoints(hald_t)
-+files_stat_all_mountpoints(hald_t)
- 
- mls_file_read_up(hald_t)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.fc serefpolicy-2.2.32/policy/modules/services/kerberos.fc
---- nsaserefpolicy/policy/modules/services/kerberos.fc	2005-10-06 17:29:17.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/services/kerberos.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -5,8 +5,8 @@
- /etc/krb5kdc/kadm5.keytab 	--	gen_context(system_u:object_r:krb5_keytab_t,s0)
- /etc/krb5kdc/principal.*		gen_context(system_u:object_r:krb5kdc_principal_t,s0)
- 
--/usr(/local)?(/kerberos)?/sbin/krb5kdc -- gen_context(system_u:object_r:krb5kdc_exec_t,s0)
--/usr(/local)?(/kerberos)?/sbin/kadmind -- gen_context(system_u:object_r:kadmind_exec_t,s0)
-+/usr/(local/)?(kerberos/)?sbin/krb5kdc -- gen_context(system_u:object_r:krb5kdc_exec_t,s0)
-+/usr/(local/)?(kerberos/)?sbin/kadmind -- gen_context(system_u:object_r:kadmind_exec_t,s0)
- 
- /usr/local/var/krb5kdc(/.*)?		gen_context(system_u:object_r:krb5kdc_conf_t,s0)
- /usr/local/var/krb5kdc/principal.*	gen_context(system_u:object_r:krb5kdc_principal_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-2.2.32/policy/modules/services/mailman.if
---- nsaserefpolicy/policy/modules/services/mailman.if	2006-03-24 11:15:50.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/services/mailman.if	2006-04-14 12:06:19.000000000 -0400
-@@ -200,6 +200,44 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.fc serefpolicy-2.2.33/policy/modules/services/pegasus.fc
+--- nsaserefpolicy/policy/modules/services/pegasus.fc	2005-11-07 15:10:44.000000000 -0500
++++ serefpolicy-2.2.33/policy/modules/services/pegasus.fc	2006-04-19 07:45:04.000000000 -0400
+@@ -3,6 +3,7 @@
+ /etc/Pegasus/pegasus_current.conf	gen_context(system_u:object_r:pegasus_data_t,s0)
+ 
+ /usr/sbin/cimserver		--	gen_context(system_u:object_r:pegasus_exec_t,s0)
++
+ /usr/sbin/init_repository	-- 	gen_context(system_u:object_r:pegasus_exec_t,s0)
+ 
+ /var/lib/Pegasus(/.*)?	                gen_context(system_u:object_r:pegasus_data_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.33/policy/modules/services/pegasus.te
+--- nsaserefpolicy/policy/modules/services/pegasus.te	2006-04-04 18:06:38.000000000 -0400
++++ serefpolicy-2.2.33/policy/modules/services/pegasus.te	2006-04-19 07:53:45.000000000 -0400
+@@ -79,11 +79,16 @@
+ corenet_tcp_connect_pegasus_https_port(pegasus_t)
+ corenet_tcp_connect_generic_port(pegasus_t)
+ 
++corecmd_exec_sbin(pegasus_t)
++corecmd_exec_bin(pegasus_t)
++corecmd_exec_shell(pegasus_t)
++
+ dev_read_sysfs(pegasus_t)
+ dev_read_urand(pegasus_t)
+ 
+ fs_getattr_all_fs(pegasus_t)
+ fs_search_auto_mountpoints(pegasus_t)
++files_getattr_all_dirs(pegasus_t)
+ 
+ term_dontaudit_use_console(pegasus_t)
+ 
+@@ -98,6 +103,8 @@
+ files_read_var_lib_files(pegasus_t)
+ files_read_var_lib_symlinks(pegasus_t)
+ 
++hostname_exec(pegasus_t)
++
+ init_use_fds(pegasus_t)
+ init_use_script_ptys(pegasus_t)
+ init_rw_utmp(pegasus_t)
+@@ -116,6 +123,7 @@
+ 	term_dontaudit_use_unallocated_ttys(pegasus_t)
+ 	term_dontaudit_use_generic_ptys(pegasus_t)
+ 	files_dontaudit_read_root_files(pegasus_t)
++	unconfined_signull(pegasus_t)
+ ')
  
- #######################################
- ## <summary>
-+##	Allow domain to to create mailman data files and write the directory
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`mailman_create_data_file',`
-+	gen_require(`
-+		type mailman_data_t;
-+	')
-+
-+	allow $1 mailman_data_t:dir rw_dir_perms;
-+	allow $1 mailman_data_t:file create_file_perms;
-+')
-+
-+#######################################
-+## <summary>
-+##	Allow domain to to read mailman data files
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`mailman_read_data_file',`
-+	gen_require(`
-+		type mailman_data_t;
-+	')
-+
-+	allow $1 mailman_data_t:dir search_dir_perms;
-+	allow $1 mailman_data_t:file read_file_perms;
-+')
-+
-+#######################################
-+## <summary>
- ##	List the contents of mailman data directories.
- ## </summary>
- ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.32/policy/modules/services/postfix.te
---- nsaserefpolicy/policy/modules/services/postfix.te	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/services/postfix.te	2006-04-14 14:54:13.000000000 -0400
-@@ -305,6 +305,7 @@
+ optional_policy(`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.33/policy/modules/services/postfix.te
+--- nsaserefpolicy/policy/modules/services/postfix.te	2006-04-18 22:50:00.000000000 -0400
++++ serefpolicy-2.2.33/policy/modules/services/postfix.te	2006-04-18 23:10:07.000000000 -0400
+@@ -315,6 +315,7 @@
  
  kernel_read_kernel_sysctls(postfix_map_t)
  kernel_dontaudit_list_proc(postfix_map_t)
@@ -583,7 +186,7 @@
  
  corenet_tcp_sendrecv_all_if(postfix_map_t)
  corenet_udp_sendrecv_all_if(postfix_map_t)
-@@ -350,6 +351,7 @@
+@@ -360,6 +361,7 @@
  ifdef(`targeted_policy',`
  	# FIXME: would be better to use a run interface
  	role system_r types postfix_map_t;
@@ -591,19 +194,9 @@
  ')
  
  tunable_policy(`read_default_t',`
-@@ -408,6 +410,9 @@
- 
- optional_policy(`
- 	mailman_domtrans_queue(postfix_pipe_t)
-+#	for postalias
-+	mailman_create_data_file(postfix_master_t)
-+	mailman_read_data_file(postfix_local_t)
- ')
- 
- ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.if serefpolicy-2.2.32/policy/modules/services/postgresql.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.if serefpolicy-2.2.33/policy/modules/services/postgresql.if
 --- nsaserefpolicy/policy/modules/services/postgresql.if	2006-02-10 17:05:19.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/services/postgresql.if	2006-04-14 16:09:39.000000000 -0400
++++ serefpolicy-2.2.33/policy/modules/services/postgresql.if	2006-04-18 23:10:07.000000000 -0400
 @@ -113,10 +113,12 @@
  #
  interface(`postgresql_stream_connect',`
@@ -618,9 +211,9 @@
 +        # Some versions of postgresql put the sock file in /tmp
 +	allow $1 postgresql_tmp_t:sock_file write;
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.te serefpolicy-2.2.32/policy/modules/services/privoxy.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.te serefpolicy-2.2.33/policy/modules/services/privoxy.te
 --- nsaserefpolicy/policy/modules/services/privoxy.te	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/services/privoxy.te	2006-04-17 06:37:23.000000000 -0400
++++ serefpolicy-2.2.33/policy/modules/services/privoxy.te	2006-04-18 23:10:07.000000000 -0400
 @@ -50,6 +50,7 @@
  corenet_non_ipsec_sendrecv(privoxy_t)
  corenet_tcp_bind_http_cache_port(privoxy_t)
@@ -629,39 +222,9 @@
  corenet_tcp_connect_ftp_port(privoxy_t)
  corenet_tcp_connect_tor_port(privoxy_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.2.32/policy/modules/services/rpc.te
---- nsaserefpolicy/policy/modules/services/rpc.te	2006-03-24 11:15:50.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/services/rpc.te	2006-04-14 12:06:19.000000000 -0400
-@@ -110,13 +110,13 @@
- portmap_udp_chat(nfsd_t)
- 
- tunable_policy(`nfs_export_all_rw',`
--	auth_read_all_dirs_except_shadow(nfsd_t) 
- 	fs_read_noxattr_fs_files(nfsd_t) 
-+	auth_manage_all_files_except_shadow(nfsd_t)
- ')
- 
- tunable_policy(`nfs_export_all_ro',`
--	auth_read_all_dirs_except_shadow(nfsd_t) 
- 	fs_read_noxattr_fs_files(nfsd_t) 
-+	auth_read_all_files_except_shadow(nfsd_t)
- ')
- 
- ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-2.2.32/policy/modules/services/samba.if
---- nsaserefpolicy/policy/modules/services/samba.if	2006-02-21 14:35:36.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/services/samba.if	2006-04-14 12:06:19.000000000 -0400
-@@ -33,6 +33,7 @@
- 	')
- 
- 	tunable_policy(`samba_enable_home_dirs',`
-+		userdom_manage_user_home_content_dirs($1,smbd_t)
- 		userdom_manage_user_home_content_files($1,smbd_t)
- 		userdom_manage_user_home_content_symlinks($1,smbd_t)
- 		userdom_manage_user_home_content_sockets($1,smbd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.32/policy/modules/services/samba.te
---- nsaserefpolicy/policy/modules/services/samba.te	2006-04-12 13:44:37.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/services/samba.te	2006-04-14 13:42:57.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.33/policy/modules/services/samba.te
+--- nsaserefpolicy/policy/modules/services/samba.te	2006-04-18 22:50:00.000000000 -0400
++++ serefpolicy-2.2.33/policy/modules/services/samba.te	2006-04-18 23:10:07.000000000 -0400
 @@ -106,8 +106,8 @@
  files_tmp_filetrans(samba_net_t, samba_net_tmp_t, { file dir })
  
@@ -683,7 +246,7 @@
  optional_policy(`
  	nscd_socket_use(samba_net_t)
  ')
-@@ -268,6 +270,7 @@
+@@ -269,6 +271,7 @@
  
  init_use_fds(smbd_t)
  init_use_script_ptys(smbd_t)
@@ -691,23 +254,9 @@
  
  libs_use_ld_so(smbd_t)
  libs_use_shared_libs(smbd_t)
-@@ -333,6 +336,13 @@
- ')
- allow smbd_t mtrr_device_t:file getattr;
- 
-+# Support Samba sharing of NFS mount points
-+bool samba_share_nfs false;
-+if (samba_share_nfs) {
-+fs_manage_nfs_dirs(smbd_t)
-+fs_manage_nfs_files(smbd_t)
-+}
-+
- ########################################
- #
- # nmbd Local policy
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-2.2.32/policy/modules/services/spamassassin.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-2.2.33/policy/modules/services/spamassassin.fc
 --- nsaserefpolicy/policy/modules/services/spamassassin.fc	2005-12-01 17:57:16.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/services/spamassassin.fc	2006-04-14 12:06:19.000000000 -0400
++++ serefpolicy-2.2.33/policy/modules/services/spamassassin.fc	2006-04-18 23:10:07.000000000 -0400
 @@ -1,5 +1,5 @@
  
 -/usr/bin/sa-learn	--	gen_context(system_u:object_r:spamd_exec_t,s0)
@@ -715,19 +264,9 @@
  /usr/bin/spamc		--	gen_context(system_u:object_r:spamc_exec_t,s0)
  /usr/bin/spamd		--	gen_context(system_u:object_r:spamd_exec_t,s0)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.fc serefpolicy-2.2.32/policy/modules/services/tftp.fc
---- nsaserefpolicy/policy/modules/services/tftp.fc	2005-10-06 17:29:17.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/services/tftp.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -2,4 +2,5 @@
- /usr/sbin/atftpd	--	gen_context(system_u:object_r:tftpd_exec_t,s0)
- /usr/sbin/in\.tftpd	--	gen_context(system_u:object_r:tftpd_exec_t,s0)
- 
--/tftpboot(/.*)?			gen_context(system_u:object_r:tftpdir_t,s0)
-+/tftpboot		-d	gen_context(system_u:object_r:tftpdir_t,s0)
-+/tftpboot/.*			gen_context(system_u:object_r:tftpdir_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.32/policy/modules/services/xserver.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.33/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2006-04-06 15:31:54.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/services/xserver.if	2006-04-14 12:06:19.000000000 -0400
++++ serefpolicy-2.2.33/policy/modules/services/xserver.if	2006-04-18 23:10:07.000000000 -0400
 @@ -1070,3 +1070,24 @@
  
  	dontaudit $1 xdm_xserver_t:tcp_socket { read write };
@@ -753,22 +292,9 @@
 +	allow $1 xdm_xserver_tmp_t:sock_file { read write };
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.fc serefpolicy-2.2.32/policy/modules/system/authlogin.fc
---- nsaserefpolicy/policy/modules/system/authlogin.fc	2006-01-19 17:48:34.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/system/authlogin.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -7,7 +7,8 @@
- /etc/passwd\.lock	--	gen_context(system_u:object_r:shadow_t,s0)
- /etc/shadow.*		--	gen_context(system_u:object_r:shadow_t,s0)
- 
--/lib(64)?/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:pam_exec_t,s0)
-+/lib/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:pam_exec_t,s0)
-+/lib64/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:pam_exec_t,s0)
- 
- /sbin/pam_console_apply	 --	gen_context(system_u:object_r:pam_console_exec_t,s0)
- /sbin/pam_timestamp_check --	gen_context(system_u:object_r:pam_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.32/policy/modules/system/authlogin.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.33/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/system/authlogin.te	2006-04-14 12:06:19.000000000 -0400
++++ serefpolicy-2.2.33/policy/modules/system/authlogin.te	2006-04-18 23:10:07.000000000 -0400
 @@ -173,9 +173,13 @@
  dev_setattr_video_dev(pam_console_t)
  dev_getattr_xserver_misc_dev(pam_console_t)
@@ -783,22 +309,9 @@
  storage_getattr_fixed_disk_dev(pam_console_t)
  storage_setattr_fixed_disk_dev(pam_console_t)
  storage_getattr_removable_dev(pam_console_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/daemontools.fc serefpolicy-2.2.32/policy/modules/system/daemontools.fc
---- nsaserefpolicy/policy/modules/system/daemontools.fc	2006-04-05 11:35:09.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/system/daemontools.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -2,7 +2,8 @@
- # /service
- #
- 
--/service(/.*)?			gen_context(system_u:object_r:svc_svc_t,s0)
-+/service		-d	gen_context(system_u:object_r:svc_svc_t,s0)
-+/service/.*			gen_context(system_u:object_r:svc_svc_t,s0)
- 
- #
- # /usr
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.32/policy/modules/system/fstools.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.33/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/system/fstools.te	2006-04-14 12:06:19.000000000 -0400
++++ serefpolicy-2.2.33/policy/modules/system/fstools.te	2006-04-18 23:10:07.000000000 -0400
 @@ -77,6 +77,7 @@
  dev_getattr_usbfs_dirs(fsadm_t)
  # Access to /dev/mapper/control
@@ -807,9 +320,9 @@
  
  fs_search_auto_mountpoints(fsadm_t)
  fs_getattr_xattr_fs(fsadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.32/policy/modules/system/init.te
---- nsaserefpolicy/policy/modules/system/init.te	2006-04-06 15:32:43.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/system/init.te	2006-04-14 12:06:19.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.33/policy/modules/system/init.te
+--- nsaserefpolicy/policy/modules/system/init.te	2006-04-18 22:50:00.000000000 -0400
++++ serefpolicy-2.2.33/policy/modules/system/init.te	2006-04-18 23:10:07.000000000 -0400
 @@ -352,6 +352,7 @@
  files_mounton_isid_type_dirs(initrc_t)
  files_list_default(initrc_t)
@@ -818,99 +331,18 @@
  
  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.32/policy/modules/system/libraries.fc
---- nsaserefpolicy/policy/modules/system/libraries.fc	2006-04-12 13:44:38.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/system/libraries.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -24,17 +24,22 @@
- #
- # /lib(64)?
- #
--/lib(64)?(/.*)?					gen_context(system_u:object_r:lib_t,s0)
-+/lib(/.*)?					gen_context(system_u:object_r:lib_t,s0)
-+/lib64(/.*)?					gen_context(system_u:object_r:lib_t,s0)
- /lib(64)?/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
- /lib(64)?(/.*)?/ld-[^/]*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:ld_so_t,s0)
- 
- #
- # /opt
- #
--/opt(/.*)?/lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
--/opt(/.*)?/lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
--/opt/.*/jre.*/libdeploy.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
--/opt/.*/jre.*/libjvm.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/opt/(.*/)?lib(/.*)?			gen_context(system_u:object_r:lib_t,s0)
-+/opt/(.*/)?lib64(/.*)?			gen_context(system_u:object_r:lib_t,s0)
-+/opt/(.*/)?lib/.*\.so		--	gen_context(system_u:object_r:shlib_t,s0)
-+/opt/(.*/)?lib/.*\.so\.[^/]*	--	gen_context(system_u:object_r:shlib_t,s0)
-+/opt/(.*/)?lib64/.*\.so		--	gen_context(system_u:object_r:shlib_t,s0)
-+/opt/(.*/)?lib64/.*\.so\.[^/]*	--	gen_context(system_u:object_r:shlib_t,s0)
-+/opt/(.*/)?jre.*/libdeploy.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/opt/(.*/)?jre.*/libjvm.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
- #
- # /sbin
-@@ -44,18 +49,22 @@
- #
- # /usr
- #
--/usr(/.*)?/HelixPlayer/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/(.*/)?/HelixPlayer/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
--/usr(/.*)?/java/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
--/usr(/.*)?/java/.*\.jar			--	gen_context(system_u:object_r:shlib_t,s0)
--/usr(/.*)?/java/.*\.jsa			--	gen_context(system_u:object_r:shlib_t,s0)
-+/usr/(.*/)?java/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/(.*/)?java/.*\.jar			--	gen_context(system_u:object_r:shlib_t,s0)
-+/usr/(.*/)?java/.*\.jsa			--	gen_context(system_u:object_r:shlib_t,s0)
-+
-+/usr/(.*/)?lib(/.*)?			gen_context(system_u:object_r:lib_t,s0)
-+/usr/(.*/)?lib64(/.*)?			gen_context(system_u:object_r:lib_t,s0)
-+/usr/(.*/)?lib/.*\.so		--	gen_context(system_u:object_r:shlib_t,s0)
-+/usr/(.*/)?lib/.*\.so\.[^/]*	--	gen_context(system_u:object_r:shlib_t,s0)
-+/usr/(.*/)?lib64/.*\.so		--	gen_context(system_u:object_r:shlib_t,s0)
-+/usr/(.*/)?lib64/.*\.so\.[^/]*	--	gen_context(system_u:object_r:shlib_t,s0)
- 
--/usr(/.*)?/lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
--/usr(/.*)?/lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
-+/usr/(.*/)?lib(64)?(/.*)?/ld-[^/]*\.so(\.[^/]*)* gen_context(system_u:object_r:ld_so_t,s0)
- 
--/usr(/.*)?/lib(64)?(/.*)?/ld-[^/]*\.so(\.[^/]*)* gen_context(system_u:object_r:ld_so_t,s0)
--
--/usr(/.*)?/nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/(.*/)?nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
- /usr/lib(64)?/pgsql/test/regress/.*\.so	--	gen_context(system_u:object_r:shlib_t,s0)
- 
-@@ -64,7 +73,7 @@
- /usr/lib(64)?/im/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
- /usr/lib(64)?/iiim/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
- 
--/usr(/.*)?/lib(64)?(/.*)?/nvidia/.*\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/(.*/)?lib(64)?(/.*)?/nvidia/.*\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/libsipphoneapi\.so.*	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
- /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/libGLU\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -74,9 +83,8 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.33/policy/modules/system/libraries.fc
+--- nsaserefpolicy/policy/modules/system/libraries.fc	2006-04-18 22:50:00.000000000 -0400
++++ serefpolicy-2.2.33/policy/modules/system/libraries.fc	2006-04-18 23:10:07.000000000 -0400
+@@ -83,7 +83,6 @@
  /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libGL(core)?\.so(\.[^/]*)*             --      	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libnvidia.*\.so(\.[^/]*)*              --      	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libXvMCNVIDIA\.so.*            --      	gen_context(system_u:object_r:textrel_shlib_t,s0)
--/usr/lib(64)?/vmware(.*/)?/VmPerl\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/usr/lib(64)?/vmware(.*/)?VmPerl\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
--/usr/(local/)?lib/wine/.*\.so  		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/(local/)?lib(64)?/wine/.*\.so  		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/(local/)?lib(64)?/wine/.*\.so  		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/(local/)?lib/libfame-.*\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/local/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
- 
-@@ -127,7 +135,7 @@
- /usr/lib(64)?/.*/program/libsvx680li\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/.*/program/libcomphelp4gcc3\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/.*/program/libsoffice\.so  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
--/usr(/.*)?/pcsc/drivers(/.*)?/lib(cm2020|cm4000|SCR24x)\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/(.*/)?pcsc/drivers(/.*)?/lib(cm2020|cm4000|SCR24x)\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
- /usr/lib(64)?/firefox.*\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/mozilla.*\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -180,15 +188,17 @@
+@@ -189,6 +188,8 @@
  
  # vmware 
  /usr/lib(64)?/vmware/lib(/.*)?/libgdk-x11-.*\.so.*  -- gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -918,60 +350,16 @@
 +/usr/lib(64)?/vmware/(.*/)?VmPerl\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
  # Java, Sun Microsystems (JPackage SRPM)
--/usr/.*/jre.*/libdeploy.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
--/usr/.*/jre.*/libjvm.so			--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/(.*/)?jre.*/libdeploy.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/(.*/)?jre.*/libjvm.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
--/usr(/.*)?/intellinux/nppdf\.so		--	gen_context(system_u:object_r:texrel_shlib_t,s0)
--/usr(/.*)?/intellinux/lib/\.so		--	gen_context(system_u:object_r:texrel_shlib_t,s0)
--/usr(/.*)?/intellinux/plug_ins/.*\.api	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
--/usr(/.*)?/intellinux/SPPlugins/ADMPlugin\.apl -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/(.*/)?intellinux/nppdf\.so		--	gen_context(system_u:object_r:texrel_shlib_t,s0)
-+/usr/(.*/)?intellinux/lib/\.so		--	gen_context(system_u:object_r:texrel_shlib_t,s0)
-+/usr/(.*/)?intellinux/plug_ins/.*\.api	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
-+/usr/(.*/)?intellinux/SPPlugins/ADMPlugin\.apl -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- ') dnl end distro_redhat
- 
- ifdef(`distro_suse',`
-@@ -214,3 +224,5 @@
+ /usr/(.*/)?jre.*/libdeploy.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -223,3 +224,5 @@
  /var/spool/postfix/lib(64)?/lib.*\.so.*	--	gen_context(system_u:object_r:shlib_t,s0)
  /var/spool/postfix/lib(64)?/[^/]*/lib.*\.so.* -- gen_context(system_u:object_r:shlib_t,s0)
  /var/spool/postfix/lib(64)?/devfsd/.*\.so.* -- gen_context(system_u:object_r:shlib_t,s0)
 +/usr/NX/lib/libXcomp.so.*	--  gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/NX/lib/libjpeg.so.* 	--  gen_context(system_u:object_r:textrel_shlib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.2.32/policy/modules/system/miscfiles.fc
---- nsaserefpolicy/policy/modules/system/miscfiles.fc	2005-10-27 14:57:47.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/system/miscfiles.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -7,7 +7,7 @@
- #
- # /opt
- #
--/opt(/.*)?/man(/.*)?		gen_context(system_u:object_r:man_t,s0)
-+/opt/(.*/)?man(/.*)?		gen_context(system_u:object_r:man_t,s0)
- 
- #
- # /srv
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.fc serefpolicy-2.2.32/policy/modules/system/modutils.fc
---- nsaserefpolicy/policy/modules/system/modutils.fc	2005-10-06 17:29:17.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/system/modutils.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -2,9 +2,11 @@
- /etc/modules\.conf.*	--	gen_context(system_u:object_r:modules_conf_t,s0)
- /etc/modprobe\.conf.*	--	gen_context(system_u:object_r:modules_conf_t,s0)
- 
--/lib(64)?/modules/[^/]+/modules\..+ -- gen_context(system_u:object_r:modules_dep_t,s0)
-+/lib/modules/[^/]+/modules\..+ -- gen_context(system_u:object_r:modules_dep_t,s0)
-+/lib64/modules/[^/]+/modules\..+ -- gen_context(system_u:object_r:modules_dep_t,s0)
- 
--/lib(64)?/modules/modprobe\.conf -- gen_context(system_u:object_r:modules_conf_t,s0)
-+/lib/modules/modprobe\.conf -- gen_context(system_u:object_r:modules_conf_t,s0)
-+/lib64/modules/modprobe\.conf -- gen_context(system_u:object_r:modules_conf_t,s0)
- 
- /sbin/depmod.*		--	gen_context(system_u:object_r:depmod_exec_t,s0)
- /sbin/generate-modprobe\.conf -- gen_context(system_u:object_r:update_modules_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.if serefpolicy-2.2.32/policy/modules/system/mount.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.if serefpolicy-2.2.33/policy/modules/system/mount.if
 --- nsaserefpolicy/policy/modules/system/mount.if	2006-03-02 18:45:56.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/system/mount.if	2006-04-17 07:02:48.000000000 -0400
++++ serefpolicy-2.2.33/policy/modules/system/mount.if	2006-04-18 23:10:07.000000000 -0400
 @@ -113,3 +113,25 @@
  	allow $1 mount_t:udp_socket rw_socket_perms;
  ')
@@ -998,9 +386,9 @@
 +	allow unconfined_mount_t $1:fifo_file rw_file_perms;
 +	allow unconfined_mount_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.32/policy/modules/system/mount.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.33/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-04-12 13:44:38.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/system/mount.te	2006-04-17 07:12:08.000000000 -0400
++++ serefpolicy-2.2.33/policy/modules/system/mount.te	2006-04-18 23:10:07.000000000 -0400
 @@ -151,3 +151,12 @@
  optional_policy(`
  	samba_domtrans_smbmount(mount_t)
@@ -1014,9 +402,9 @@
 +	files_manage_etc_runtime_files(unconfined_mount_t)
 +	unconfined_domain(unconfined_mount_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.32/policy/modules/system/selinuxutil.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.33/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2006-03-29 14:18:17.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/system/selinuxutil.if	2006-04-14 12:06:19.000000000 -0400
++++ serefpolicy-2.2.33/policy/modules/system/selinuxutil.if	2006-04-18 23:10:07.000000000 -0400
 @@ -697,8 +697,8 @@
  
  	files_search_etc($1)
@@ -1028,9 +416,54 @@
  	allow $1 file_context_t:lnk_file { getattr read };
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.32/policy/modules/system/unconfined.te
---- nsaserefpolicy/policy/modules/system/unconfined.te	2006-04-12 13:44:38.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/system/unconfined.te	2006-04-15 08:15:21.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.2.33/policy/modules/system/sysnetwork.te
+--- nsaserefpolicy/policy/modules/system/sysnetwork.te	2006-03-24 11:15:53.000000000 -0500
++++ serefpolicy-2.2.33/policy/modules/system/sysnetwork.te	2006-04-18 23:44:30.000000000 -0400
+@@ -248,6 +248,7 @@
+ 
+ optional_policy(`
+ 	xen_append_log(dhcpc_t)
++	xen_dontaudit_rw_unix_stream_sockets(dhcpc_t)
+ ')
+ 
+ ########################################
+@@ -346,4 +347,5 @@
+ 
+ optional_policy(`
+ 	xen_append_log(ifconfig_t)
++	xen_dontaudit_rw_unix_stream_sockets(ifconfig_t)
+ ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.33/policy/modules/system/unconfined.if
+--- nsaserefpolicy/policy/modules/system/unconfined.if	2006-04-12 13:44:38.000000000 -0400
++++ serefpolicy-2.2.33/policy/modules/system/unconfined.if	2006-04-19 07:53:34.000000000 -0400
+@@ -224,6 +224,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Send a SIGNULL signal to the unconfined domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`unconfined_signull',`
++	gen_require(`
++		type unconfined_t;
++	')
++
++	allow $1 unconfined_t:process signull;
++')
++
++########################################
++## <summary>
+ ##	Send generic signals to the unconfined domain.
+ ## </summary>
+ ## <param name="domain">
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.33/policy/modules/system/unconfined.te
+--- nsaserefpolicy/policy/modules/system/unconfined.te	2006-04-18 22:50:00.000000000 -0400
++++ serefpolicy-2.2.33/policy/modules/system/unconfined.te	2006-04-18 23:10:07.000000000 -0400
 @@ -37,10 +37,13 @@
  	logging_domtrans_auditctl(unconfined_t)
  
@@ -1045,41 +478,21 @@
  	optional_policy(`
  		ada_domtrans(unconfined_t)
  	')
-@@ -64,6 +67,8 @@
- 	optional_policy(`
- 		dbus_stub(unconfined_t)
- 
-+		init_dbus_chat_script(unconfined_t)
-+
- 		optional_policy(`
- 			avahi_dbus_chat(unconfined_t)
- 		')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.32/policy/modules/system/userdomain.if
---- nsaserefpolicy/policy/modules/system/userdomain.if	2006-04-14 07:58:13.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/system/userdomain.if	2006-04-14 12:06:19.000000000 -0400
-@@ -379,10 +379,6 @@
- 	')
- 
- 	optional_policy(`
--		jabber_tcp_connect($1_t)
--	')
--
--	optional_policy(`
- 		nis_use_ypbind($1_t)
- 	')
- 
-@@ -408,10 +404,6 @@
+@@ -140,10 +143,6 @@
  	')
  
  	optional_policy(`
--		perdition_tcp_connect($1_t)
+-		seutil_domtrans_semanage(unconfined_t)
 -	')
 -
 -	optional_policy(`
- 		portmap_tcp_connect($1_t)
+ 		sysnet_domtrans_dhcpc(unconfined_t)
  	')
  
-@@ -4140,11 +4132,31 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.33/policy/modules/system/userdomain.if
+--- nsaserefpolicy/policy/modules/system/userdomain.if	2006-04-18 22:50:01.000000000 -0400
++++ serefpolicy-2.2.33/policy/modules/system/userdomain.if	2006-04-18 23:10:07.000000000 -0400
+@@ -4171,6 +4171,7 @@
  		type user_home_dir_t;
  	')
  
@@ -1087,62 +500,48 @@
  	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.33/policy/modules/system/xen.if
+--- nsaserefpolicy/policy/modules/system/xen.if	2006-03-23 16:08:51.000000000 -0500
++++ serefpolicy-2.2.33/policy/modules/system/xen.if	2006-04-18 23:44:30.000000000 -0400
+@@ -47,6 +47,24 @@
+ 
  ########################################
  ## <summary>
-+##	Create staff home directories
-+##	with automatic file type transition.
++##     Don't audit leaked file descriptor.
 +## </summary>
 +## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
++##     <summary>
++##     Domain to don't audit.
++##     </summary>
 +## </param>
 +#
-+interface(`userdom_manage_staff_home_dir',`
-+	gen_require(`
-+		type staff_home_dir_t;
-+	')
++interface(`xen_dontaudit_rw_unix_stream_sockets',`
++       gen_require(`
++               type xend_t;
++       ')
 +
-+	allow $1 staff_home_dir_t:dir create_dir_perms;
++       dontaudit $1 xend_t:unix_stream_socket { read write };
 +')
 +
 +########################################
 +## <summary>
- ##	Search generic user home directories.
+ ##	Connect to xenstored over an unix stream socket.
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.2.32/policy/modules/system/xen.te
---- nsaserefpolicy/policy/modules/system/xen.te	2006-03-23 14:33:30.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/system/xen.te	2006-04-14 12:06:19.000000000 -0400
-@@ -19,6 +19,8 @@
- # var/lib files
- type xend_var_lib_t;
- files_type(xend_var_lib_t)
-+# for mounting an NFS store
-+files_mountpoint(xend_var_lib_t)
- 
- # log files
- type xend_var_log_t;
-@@ -67,6 +69,8 @@
- allow xend_t self:tcp_socket create_stream_socket_perms;
- allow xend_t self:packet_socket create_socket_perms;
- 
-+files_read_kernel_symbol_table(xend_t)
-+
- # pid file
- allow xend_t xend_var_run_t:file manage_file_perms;
- allow xend_t xend_var_run_t:sock_file manage_file_perms;
-@@ -210,6 +214,7 @@
- dev_filetrans_xen(xenstored_t)
- 
- term_dontaudit_use_generic_ptys(xenstored_t)
-+dev_rw_xen(xenstored_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.2.33/policy/modules/system/xen.te
+--- nsaserefpolicy/policy/modules/system/xen.te	2006-04-18 22:50:01.000000000 -0400
++++ serefpolicy-2.2.33/policy/modules/system/xen.te	2006-04-18 23:45:51.000000000 -0400
+@@ -125,6 +125,7 @@
+ 
+ files_read_etc_files(xend_t)
+ files_read_kernel_symbol_table(xend_t)
++files_read_kernel_img(xend_t)
  
- init_use_fds(xenstored_t)
+ storage_raw_read_fixed_disk(xend_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.2.32/Rules.modular
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.2.33/Rules.modular
 --- nsaserefpolicy/Rules.modular	2006-03-23 14:33:29.000000000 -0500
-+++ serefpolicy-2.2.32/Rules.modular	2006-04-14 14:21:43.000000000 -0400
++++ serefpolicy-2.2.33/Rules.modular	2006-04-18 23:10:07.000000000 -0400
 @@ -208,7 +208,7 @@
  #
  $(APPDIR)/customizable_types: $(BASE_CONF)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- selinux-policy.spec	17 Apr 2006 11:27:44 -0000	1.175
+++ selinux-policy.spec	19 Apr 2006 11:55:43 -0000	1.176
@@ -15,8 +15,8 @@
 %define CHECKPOLICYVER 1.30.1-2
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.32
-Release: 2
+Version: 2.2.33
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -321,6 +321,11 @@
 %endif
 
 %changelog
+* Tue Apr 18 2006 Dan Walsh <dwalsh at redhat.com> 2.2.33-1
+- Update to latest from upstream
+- Add James Antill patch for xen
+- Many fixes for pegasus
+
 * Sat Apr 14 2006 Dan Walsh <dwalsh at redhat.com> 2.2.32-2
 - Add unconfined_mount_t
 - Allow privoxy to connect to httpd_cache



From fedora-cvs-commits at redhat.com  Wed Apr 19 12:10:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 08:10:23 -0400
Subject: rpms/selinux-policy/devel .cvsignore,1.56,1.57 sources,1.60,1.61
Message-ID: <200604191210.k3JCANOw022448@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Apr 18 2006 Dan Walsh <dwalsh at redhat.com> 2.2.33-1
- Update to latest from upstream
- Add James Antill patch for xen
- Many fixes for pegasus



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	14 Apr 2006 19:50:03 -0000	1.56
+++ .cvsignore	19 Apr 2006 12:10:10 -0000	1.57
@@ -57,3 +57,4 @@
 serefpolicy-2.2.30.tgz
 serefpolicy-2.2.31.tgz
 serefpolicy-2.2.32.tgz
+serefpolicy-2.2.33.tgz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	14 Apr 2006 19:50:03 -0000	1.60
+++ sources	19 Apr 2006 12:10:10 -0000	1.61
@@ -1 +1 @@
-7a3563e2478a4b18dc689de8561831b5  serefpolicy-2.2.32.tgz
+0bbd9672d8ecd25b79dfd28adbc9b5e2  serefpolicy-2.2.33.tgz



From fedora-cvs-commits at redhat.com  Wed Apr 19 13:17:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 09:17:27 -0400
Subject: rpms/gnome-utils/devel dict-whitelisting.patch, NONE,
	1.1 gnome-utils.spec, 1.108, 1.109
Message-ID: <200604191317.k3JDHR2g011986@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-utils.spec 
Added Files:
	dict-whitelisting.patch 
Log Message:
fix some crashes in gnome-dictionary


dict-whitelisting.patch:
 gdict-client-context.c |   41 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 36 insertions(+), 5 deletions(-)

--- NEW FILE dict-whitelisting.patch ---
--- gnome-utils-2.14.0/gnome-dictionary/libgdict/gdict-client-context.c.dict-whitelisting	2006-04-19 09:02:13.000000000 -0400
+++ gnome-utils-2.14.0/gnome-dictionary/libgdict/gdict-client-context.c	2006-04-19 09:02:24.000000000 -0400
@@ -1629,10 +1629,11 @@
 
 /* retrieve the status code from the server response line */
 static gint
-get_status_code (const gchar *line)
+get_status_code (const gchar *line,
+		 gint         old_status)
 {
   gchar *status;
-  gint retval;
+  gint possible_status, retval;
   
   if (strlen (line) < 3)
     return 0;
@@ -1643,12 +1644,42 @@
     return 0;
   
   status = g_strndup (line, 3);
-  retval = atoi (status);
+  possible_status = atoi (status);
   g_free (status);
+
+  /* status whitelisting: sometimes, a database *cough* moby-thes *cough*
+   * might return a number as first word; we do a small check here for
+   * invalid status codes based on the previously set status; we don't check
+   * the whole line, as we need only to be sure that the status code is
+   * consistent with what we expect.
+   */
+  switch (old_status)
+    {
+    case GDICT_STATUS_WORD_DB_NAME:
+      if (possible_status == GDICT_STATUS_OK)
+	retval = possible_status;
+      else
+        retval = 0;
+      break;
+    case GDICT_STATUS_N_DEFINITIONS_RETRIEVED:
+      if (possible_status == GDICT_STATUS_WORD_DB_NAME)
+	retval = possible_status;
+      else
+	retval = 0;
+      break;
+    case GDICT_STATUS_N_MATCHES_FOUND:
+      if (possible_status == GDICT_STATUS_OK)
+	retval = possible_status;
+      else
+	retval = 0;
+      break;
+    default:
+      retval = possible_status;
+      break;
+    }
   
   return retval;
 }  
-  
 
 static gboolean
 gdict_client_context_io_watch_cb (GIOChannel         *channel,
@@ -1735,7 +1766,7 @@
       /* truncate the line terminator before parsing */
       line[term] = '\0';
       
-      status_code = get_status_code (line);
+      status_code = get_status_code (line, priv->status_code);
       if ((status_code == 0) || (GDICT_IS_VALID_STATUS_CODE (status_code)))
         {
           priv->status_code = status_code;


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- gnome-utils.spec	18 Apr 2006 16:58:11 -0000	1.108
+++ gnome-utils.spec	19 Apr 2006 13:17:24 -0000	1.109
@@ -4,7 +4,7 @@
 
 Name:           gnome-utils
 Version:        2.14.0
-Release:        8
+Release:        9
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -15,6 +15,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0: 	logview-close-crash.patch
+# fix some crashes in gdict, http://bugzilla.gnome.org/show_bug.cgi?id=330782
+Patch1:		dict-whitelisting.patch
 
 BuildRequires:  gnome-doc-utils >= 0.3.2
 BuildRequires: 	glib2-devel >= %{glib2_version}
@@ -63,6 +65,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .logview-close
+%patch1 -p1 -b .dict-whitelisting
 
 # Hide from menus
 pushd gsearchtool
@@ -195,6 +198,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-9
+- Fix some crashes in gdict (#189090)
+
 * Tue Apr 18 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-8
 - Re-add the epoch
 



From fedora-cvs-commits at redhat.com  Wed Apr 19 13:31:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 09:31:49 -0400
Subject: rpms/gnome-utils/FC-5 dict-whitelisting.patch, NONE,
	1.1 gnome-utils.spec, 1.105, 1.106
Message-ID: <200604191331.k3JDVnaV028829@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-utils.spec 
Added Files:
	dict-whitelisting.patch 
Log Message:
fix some dictionary crashes


dict-whitelisting.patch:
 gdict-client-context.c |   41 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 36 insertions(+), 5 deletions(-)

--- NEW FILE dict-whitelisting.patch ---
--- gnome-utils-2.14.0/gnome-dictionary/libgdict/gdict-client-context.c.dict-whitelisting	2006-04-19 09:02:13.000000000 -0400
+++ gnome-utils-2.14.0/gnome-dictionary/libgdict/gdict-client-context.c	2006-04-19 09:02:24.000000000 -0400
@@ -1629,10 +1629,11 @@
 
 /* retrieve the status code from the server response line */
 static gint
-get_status_code (const gchar *line)
+get_status_code (const gchar *line,
+		 gint         old_status)
 {
   gchar *status;
-  gint retval;
+  gint possible_status, retval;
   
   if (strlen (line) < 3)
     return 0;
@@ -1643,12 +1644,42 @@
     return 0;
   
   status = g_strndup (line, 3);
-  retval = atoi (status);
+  possible_status = atoi (status);
   g_free (status);
+
+  /* status whitelisting: sometimes, a database *cough* moby-thes *cough*
+   * might return a number as first word; we do a small check here for
+   * invalid status codes based on the previously set status; we don't check
+   * the whole line, as we need only to be sure that the status code is
+   * consistent with what we expect.
+   */
+  switch (old_status)
+    {
+    case GDICT_STATUS_WORD_DB_NAME:
+      if (possible_status == GDICT_STATUS_OK)
+	retval = possible_status;
+      else
+        retval = 0;
+      break;
+    case GDICT_STATUS_N_DEFINITIONS_RETRIEVED:
+      if (possible_status == GDICT_STATUS_WORD_DB_NAME)
+	retval = possible_status;
+      else
+	retval = 0;
+      break;
+    case GDICT_STATUS_N_MATCHES_FOUND:
+      if (possible_status == GDICT_STATUS_OK)
+	retval = possible_status;
+      else
+	retval = 0;
+      break;
+    default:
+      retval = possible_status;
+      break;
+    }
   
   return retval;
 }  
-  
 
 static gboolean
 gdict_client_context_io_watch_cb (GIOChannel         *channel,
@@ -1735,7 +1766,7 @@
       /* truncate the line terminator before parsing */
       line[term] = '\0';
       
-      status_code = get_status_code (line);
+      status_code = get_status_code (line, priv->status_code);
       if ((status_code == 0) || (GDICT_IS_VALID_STATUS_CODE (status_code)))
         {
           priv->status_code = status_code;


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/FC-5/gnome-utils.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- gnome-utils.spec	11 Apr 2006 13:10:19 -0000	1.105
+++ gnome-utils.spec	19 Apr 2006 13:31:46 -0000	1.106
@@ -21,7 +21,7 @@
 Summary: GNOME utility programs.
 Name: gnome-utils
 Version: 2.14.0
-Release: 4
+Release: 4.fc5.1
 Epoch: 1
 License: GPL
 Group: Applications/System
@@ -35,6 +35,8 @@
 Patch0: gnome-utils-2.11.90-schemasdir.patch
 Patch1: gcalctool-flex-crap.patch
 Patch2: logview-close-crash.patch
+# fix some crashes in gdict, http://bugzilla.gnome.org/show_bug.cgi?id=330782
+Patch3: dict-whitelisting.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Obsoletes: gnome
@@ -92,6 +94,7 @@
 popd
 
 %patch2 -p1 -b .logview-close
+%patch3 -p1 -b .dict-whitelisting
 
 %build
 pushd gcalctool-%{gcalctool_version}
@@ -227,6 +230,9 @@
 %{_sysconfdir}/pam.d/gnome-system-log
 
 %changelog
+* Wed Apr 19 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-4.fc5.1
+- Fix some crashes in gdict (#189090)
+
 * Tue Apr 11 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-4
 - Update to zenity 2.14.1
 



From fedora-cvs-commits at redhat.com  Wed Apr 19 14:01:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 10:01:54 -0400
Subject: rpms/bind/FC-5 bind-9.3.2-bz173961.patch, NONE,
	1.1 bind-9.3.2-prctl_set_dumpable.patch, NONE,
	1.1 bind-chroot-admin.in, 1.5, 1.6 bind.spec, 1.102, 1.103
Message-ID: <200604191401.k3JE1s7c027204@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	bind-chroot-admin.in bind.spec 
Added Files:
	bind-9.3.2-bz173961.patch bind-9.3.2-prctl_set_dumpable.patch 
Log Message:
fix bugs 188382, 189186, 173961

bind-9.3.2-bz173961.patch:
 resolver.c |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

--- NEW FILE bind-9.3.2-bz173961.patch ---
--- bind-9.3.2/lib/dns/resolver.c.bz173961	2005-10-13 21:38:48.000000000 -0400
+++ bind-9.3.2/lib/dns/resolver.c	2006-04-18 15:01:15.000000000 -0400
@@ -3763,23 +3763,28 @@
 		  isc_result_t *eresultp)
 {
 	isc_result_t result;
+	dns_rdataset_t rdataset;
+
+	if (ardataset == NULL) {
+		dns_rdataset_init(&rdataset);
+		ardataset = &rdataset;
+	}
 	result = dns_ncache_add(message, cache, node, covers, now,
 				maxttl, ardataset);
-	if (result == DNS_R_UNCHANGED) {
+	if ((result == DNS_R_UNCHANGED) || (result == ISC_R_SUCCESS)) {
 		/*
-		 * The data in the cache are better than the negative cache
-		 * entry we're trying to add.
+		 * If the cache now contains a negative entry and we
+		 * care about whether it is DNS_R_NCACHENXDOMAIN or
+		 * DNS_R_NCACHENXRRSET then extract it.
 		 */
-		if (ardataset != NULL && ardataset->type == 0) {
+		if (ardataset->type == 0) {
 			/*
-			 * The cache data is also a negative cache
-			 * entry.
+			 * The cache data is a negative cache entry.
 			 */
 			if (NXDOMAIN(ardataset))
 				*eresultp = DNS_R_NCACHENXDOMAIN;
 			else
 				*eresultp = DNS_R_NCACHENXRRSET;
-			result = ISC_R_SUCCESS;
 		} else {
 			/*
 			 * Either we don't care about the nature of the
@@ -3791,14 +3796,11 @@
 			 * XXXRTH  There's a CNAME/DNAME problem here.
 			 */
 			*eresultp = ISC_R_SUCCESS;
-			result = ISC_R_SUCCESS;
 		}
-	} else if (result == ISC_R_SUCCESS) {
-		if (NXDOMAIN(ardataset))
-			*eresultp = DNS_R_NCACHENXDOMAIN;
-		else
-			*eresultp = DNS_R_NCACHENXRRSET;
+		result = ISC_R_SUCCESS;
 	}
+	if ((ardataset == &rdataset) && dns_rdataset_isassociated(ardataset))
+		dns_rdataset_disassociate(ardataset);
 
 	return (result);
 }

bind-9.3.2-prctl_set_dumpable.patch:
 os.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE bind-9.3.2-prctl_set_dumpable.patch ---
--- bind-9.3.2/bin/named/unix/os.c.prctl_set_dumpable	2005-05-19 21:37:19.000000000 -0400
+++ bind-9.3.2/bin/named/unix/os.c	2006-04-04 16:43:11.000000000 -0400
@@ -252,6 +252,10 @@
 	caps |= (1 << CAP_SYS_RESOURCE);
 
 	linux_setcaps(caps);
+
+	/* allow us to continue to be able to generate coredumps after setuid:
+	 */
+	prctl(PR_SET_DUMPABLE,1,0,0,0);
 }
 
 #ifdef HAVE_SYS_PRCTL_H


Index: bind-chroot-admin.in
===================================================================
RCS file: /cvs/dist/rpms/bind/FC-5/bind-chroot-admin.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bind-chroot-admin.in	3 Apr 2006 16:51:52 -0000	1.5
+++ bind-chroot-admin.in	19 Apr 2006 14:01:13 -0000	1.6
@@ -67,7 +67,10 @@
     if [ -L "$BIND_CHROOT_PREFIX" ]; then
 	BIND_CHROOT_PREFIX=`/usr/bin/readlink "$BIND_CHROOT_PREFIX"`;
     fi
-
+    if [ -e /etc/sysconfig/named ]; then
+	/bin/chown root:named /etc/sysconfig/named;
+	/bin/chmod 0640 /etc/sysconfig/named;
+    fi
     /bin/mkdir -p ${BIND_DIR}/{slaves,data};
     /bin/chown root:named ${BIND_DIR};
     /bin/chown named:named ${BIND_DIR}/{slaves,data};
@@ -79,12 +82,13 @@
     /bin/chmod 750 ${BIND_CHROOT_PREFIX}/{,etc,dev,var,var/{run,named/}};
     /bin/chown named:named ${BIND_CHROOT_PREFIX}/var/{run/named,named/{data,slaves}};
     /bin/chmod 770 ${BIND_CHROOT_PREFIX}/var/{run/named,named/{slaves,data}};        
-
+    
     [ ! -e "${BIND_CHROOT_PREFIX}/dev/random" ] && /bin/mknod "${BIND_CHROOT_PREFIX}/dev/random" c 1 8 
     [ ! -e "${BIND_CHROOT_PREFIX}/dev/zero" ] && /bin/mknod "${BIND_CHROOT_PREFIX}/dev/zero" c 1 5
     [ ! -e "${BIND_CHROOT_PREFIX}/dev/null" ] && /bin/mknod "${BIND_CHROOT_PREFIX}/dev/null" c 1 3
     [ ! -e "${BIND_CHROOT_PREFIX}/etc/localtime" ] &&  [ -e /etc/localtime ] && /bin/cp -fp /etc/localtime "${BIND_CHROOT_PREFIX}/etc/localtime";
-    chmod 666 "${BIND_CHROOT_PREFIX}"/dev/{random,null,zero};
+    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       
        for dev in random zero null; do
 	   /usr/bin/chcon --reference=/dev/$dev ${BIND_CHROOT_PREFIX}/dev/$dev;
@@ -121,7 +125,7 @@
     fi
     if [ -e "$dst" ]; then
        if [ ! -L "$dst" ]; then
-	  if [ ! -s "$dst" ]; then
+	  if [ ! -s "$dst" ] || /usr/bin/cmp "$dst" "$src" > /dev/null 2>&1; then
 	     /bin/rm -f "$dst";
 	  else	     
 	     if [ "$src" -nt "$dst" ] || [ ! "$dst" -nt "$src" ] ; then
@@ -135,13 +139,15 @@
           dstlnk=`/usr/bin/readlink "$dst"`
 	  if [ "$dstlnk" != $src ]; then
 	     /bin/rm -f $dst;
-	     if [ "$dstlnk" != "$dst" ] && [ -s $dstlnk ]; then
-		 if [ "$dstlnk" -nt "$src" ] || [ ! "$dstlnk" -nt "$src" ] ; then		     
-		     /bin/cp -fp "$dstlnk" "$dst".`/bin/date +'%Y-%m-%d_%H-%M-%S.%N'`;
-		 else
-		     /bin/mv "$src" "$src".`/bin/date +'%Y-%m-%d_%H-%M-%S.%N'`;
-		     /bin/cp -fp "$dstlnk" "$src";
-		 fi;
+	     if ! /usr/bin/cmp "$dstlnk" "$src" > /dev/null 2>&1; then
+		if [ "$dstlnk" != "$dst" ] && [ -s $dstlnk ]; then
+		   if [ "$dstlnk" -nt "$src" ] || [ ! "$dstlnk" -nt "$src" ] ; then		     
+		      /bin/cp -fp "$dstlnk" "$dst".`/bin/date +'%Y-%m-%d_%H-%M-%S.%N'`;
+		   else
+		      /bin/mv "$src" "$src".`/bin/date +'%Y-%m-%d_%H-%M-%S.%N'`;
+		      /bin/cp -fp "$dstlnk" "$src";
+		  fi;
+	        fi;
 	     fi;
 	  else
 	     return 0;
@@ -207,6 +213,11 @@
 	    replace_with_link ${BIND_CHROOT_PREFIX}/$f $f;
 	    [ ! -e $changed ] && touch $changed;
 	done;
+	/usr/bin/find /etc/{named.*,rndc.*}.rpmsave ${BIND_DIR}/*.rpmsave  -maxdepth 0 -type l 2>/dev/null |
+	while read f;
+	do
+	    /bin/rm -f $f >/dev/null 2>&1;
+	done
 	pfx=${BIND_CHROOT_PREFIX}
     else              # chroot is disabled	
 	/usr/bin/find /var/named/chroot/{etc/{named.*,rndc.*},var/named{/*,/data/*,/slaves/*}} -maxdepth 0 |
@@ -225,27 +236,33 @@
 };'     > /etc/rndc.key;
     elif /bin/egrep -q '@KEY@' /etc/rndc.key; then
 	/bin/sed -i -e 's^@KEY@^'`/usr/sbin/dns-keygen`'^' /etc/rndc.key ;
-    fi
-    chown root:named ${pfx}/var/named/* >/dev/null 2>&1;
+    fi    
+    chown -h root:named /var/named/* >/dev/null 2>&1;
+    chown -h root:named ${BIND_CHROOT_PREFIX}/var/named/* >/dev/null 2>&1;
+    chown -h root:named /etc/{named,rndc}.* >/dev/null 2>&1;
+    chown -h root:named ${BIND_CHROOT_PREFIX}/etc/{named,rndc}.* >/dev/null 2>&1;
     chmod 750 ${pfx}/var/named  >/dev/null 2>&1;
     chmod 640 ${pfx}/var/named/* >/dev/null 2>&1;
     chmod 750 ${pfx}/var/named/*/. >/dev/null 2>&1;
-    chown named:named ${pfx}/var/named/{data{,/*},slaves{,*/}} >/dev/null 2>&1;
+    chown -h named:named /var/named/{data{,/*},slaves{,*/}} >/dev/null 2>&1;
+    chown -h named:named ${BIND_CHROOT_PREFIX}/var/named/{data{,/*},slaves{,*/}} >/dev/null 2>&1;
     chmod 770 ${pfx}/var/named/{data,slaves} >/dev/null 2>&1;
     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 [ -n "$pfx" ]; then
-		/sbin/restorecon -R $pfx/etc $pfx/var/named $pfx/var/run/named >/dev/null 2>&1;
-		if [ -e $pfx/etc/localtime ] && [ -e /etc/localtime ] ; then 
-		   /usr/bin/chcon --reference=/etc/localtime $pfx/etc/localtime >/dev/null 2>&1;
-		fi;		
-	    else
-		/sbin/restorecon /etc/{named,rndc}.* >/dev/null 2>&1;
-		/usr/bin/chcon --reference=/etc/named.conf /etc/named.* >/dev/null 2>&1;
-		/sbin/restorecon -e /var/named/chroot /var/named{/,/data/,/slaves/}* >/dev/null 2>&1;
-	    fi;
+	   /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;
+	   fi;		
+	   /usr/bin/chcon -h --reference=/etc/named.conf /etc/named.*    >/dev/null 2>&1;
+	   /usr/bin/chcon -h --reference=/etc/rndc.key   /etc/rndc.key   >/dev/null 2>&1;
+	   /usr/bin/chcon -h --reference=/etc/rndc.conf  /etc/rndc.conf  >/dev/null 2>&1;
+	   /usr/bin/chcon -h --reference=/var/named     /var/named{/,/*} >/dev/null 2>&1;
+	   /usr/bin/chcon -h --reference=${BIND_CHROOT_PREFIX}/var/named/slaves /var/named/{slaves,data}{/,/*} >/dev/null 2>&1;
+	   /sbin/restorecon /var/named/named.ca ${BIND_CHROOT_PREFIX}/var/named/named.ca  >/dev/null 2>&1;
+	   /sbin/restorecon ${BIND_CHROOT_PREFIX};
+	   /usr/bin/chcon -h --reference=${BIND_CHROOT_PREFIX}/var/named/named.ca /var/named/named.ca >/dev/null 2>&1;
 	fi;
 	/sbin/service named condrestart
 	rm -f $changed;


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/FC-5/bind.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- bind.spec	3 Apr 2006 16:52:19 -0000	1.102
+++ bind.spec	19 Apr 2006 14:01:13 -0000	1.103
@@ -17,7 +17,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.3.2
-Release: 	16.FC5
+Release: 	20.FC5
 Epoch:   	30
 Url: 		http://www.isc.org/products/BIND/
 Buildroot: 	%{_tmppath}/%{name}-root
@@ -87,6 +87,8 @@
 Patch28: 	bind-9.3.2rc1-dbus-0.6.patch
 Patch29: 	bind-9.3.2-bz177854.patch
 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
 #
 Requires:	bind-libs = %{epoch}:%{version}-%{release}, glibc  >= 2.2
 Requires(post): bash, coreutils, sed, grep, chkconfig >= 1.3.26
@@ -313,6 +315,8 @@
 # this patch no longer required (kernel now fixed):
 # %patch29 -p1 -b .bz177854
 %patch30 -p1 -b .bz187286_fix_host_cname
+%patch31 -p1 -b .bz173961
+%patch32 -p1 -b .prctl_set_dumpable
 #
 # this must follow all dbus patches:
 %if %{SDB}
@@ -387,6 +391,7 @@
 touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/etc/rndc.key
 touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/dev/null
 touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/dev/random
+touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/dev/zero
 #end chroot
 make DESTDIR=${RPM_BUILD_ROOT} install
 touch ${RPM_BUILD_ROOT}%{_sysconfdir}/rndc.conf
@@ -492,14 +497,17 @@
 
 
 %files
-%defattr(-,root,root)
-%attr(750,root,named)  %dir /var/named
-%attr(770,named,named) %dir /var/named/slaves
-%attr(770,named,named) %dir /var/named/data
-%attr(770,named,named) %dir /var/run/named
-%attr(754,root,root)   %config /etc/rc.d/init.d/named
+%defattr(0640,root,named,0750)
+%dir /var/named
+%defattr(0660,named,named,0770)
+%dir /var/named/slaves
+%dir /var/named/data
+%dir /var/run/named
+%defattr(0750,root,root,0750)
+%config /etc/rc.d/init.d/named
+%defattr(0640,root,named,0750)
 %config(noreplace) /etc/sysconfig/named
-%ghost %config(noreplace) %attr(0640,root,named) /etc/rndc.key
+%ghost %config(noreplace) /etc/rndc.key
 # ^- rndc.key now created on first install only if it does not exist
 # %verify(not size,not md5) %config(noreplace) %attr(0640,root,named) /etc/rndc.conf
 # ^- Let the named internal default rndc.conf be used -
@@ -510,6 +518,7 @@
 # ^- The default rndc.conf which uses rndc.key is in named's default internal config -
 #    so rndc.conf is not necessary.
 %config(noreplace) /etc/logrotate.d/named
+%defattr(0750,root,root,0755)
 %{_sbindir}/dnssec*
 %{_sbindir}/lwresd
 %{_sbindir}/named
@@ -518,6 +527,7 @@
 %{_sbindir}/rndc*
 %{_sbindir}/dns-keygen
 %{_sbindir}/bind-chroot-admin
+%defattr(0644,root,root,0755)
 %{_mandir}/man5/named.conf.5*
 %{_mandir}/man5/rndc.conf.5*
 %{_mandir}/man8/rndc.8*
@@ -534,27 +544,28 @@
 %doc doc/README.DBUS
 %attr(644,root,root) %config /etc/dbus-1/system.d/named.conf
 %attr(644,root,root) %config /usr/share/dbus-1/services/named.service
-%attr(754,root,root) %{_sbindir}/namedGetForwarders
-%attr(754,root,root) %{_sbindir}/namedSetForwarders
+%attr(750,root,root) %{_sbindir}/namedGetForwarders
+%attr(750,root,root) %{_sbindir}/namedSetForwarders
 %endif
 
 %files libs
-%defattr(-,root,root)
+%defattr(0755,root,root,0755)
 %{_libdir}/*so*
 
 %files utils
-%defattr(-,root,root)
+%defattr(0755,root,root,0755)
 %{_bindir}/dig
 %{_bindir}/host
 %{_bindir}/nslookup
 %{_bindir}/nsupdate
+%defattr(0644,root,root,0755)
 %{_mandir}/man1/host.1*
 %{_mandir}/man8/nsupdate.8*
 %{_mandir}/man1/dig.1*
 %{_mandir}/man1/nslookup.1*
 
 %files devel
-%defattr(-,root,root)
+%defattr(0644,root,root,0755)
 %{_libdir}/libbind9.a
 %{_libdir}/libdns.a
 %{_libdir}/libisc.a
@@ -573,55 +584,59 @@
 %doc doc/draft doc/rfc
 
 %files config
-%defattr(-,root,root)
-%config /etc/named.caching-nameserver.conf
+%defattr(0640,root,named,0750)
+%config %verify(not link) /etc/named.caching-nameserver.conf
 %ghost %config %{chroot_prefix}/etc/named.caching-nameserver.conf
-%config /etc/named.rfc1912.zones
+%config %verify(not link) /etc/named.rfc1912.zones
 %ghost %config %{chroot_prefix}/etc/named.rfc1912.zones
 %ghost %config(noreplace) /etc/named.conf
 %ghost %config(noreplace) %{chroot_prefix}/etc/named.conf
-%defattr(-,named,named)
-%config /var/named/named.ca
+%config %verify(not link) /var/named/named.ca
 %ghost  %config %{chroot_prefix}/var/named/named.ca
-%config /var/named/named.local
+%config %verify(not link) /var/named/named.local
 %ghost  %config %{chroot_prefix}/var/named/named.local
-%config /var/named/localhost.zone
+%config %verify(not link) /var/named/localhost.zone
 %ghost  %config %{chroot_prefix}/var/named/localhost.zone
-%config /var/named/localdomain.zone
+%config %verify(not link) /var/named/localdomain.zone
 %ghost  %config %{chroot_prefix}/var/named/localdomain.zone
-%config /var/named/named.ip6.local
+%config %verify(not link) /var/named/named.ip6.local
 %ghost  %config %{chroot_prefix}/var/named/named.ip6.local
-%config /var/named/named.broadcast
+%config %verify(not link) /var/named/named.broadcast
 %ghost  %config %{chroot_prefix}/var/named/named.broadcast
-%config /var/named/named.zero
+%config %verify(not link) /var/named/named.zero
 %ghost  %config %{chroot_prefix}/var/named/named.zero
-%defattr(-,root,root)
+%defattr(0644,root,root,0755)
 %doc Copyright
 %doc rfc1912.txt
 
 %files chroot
-%defattr(-,root,root)
-%attr(750,root,named) %dir %prefix
-%attr(750,root,named) %dir %prefix/dev
-%attr(750,root,named) %dir %prefix/etc
-%attr(750,root,named) %dir %prefix/var
-%attr(770,root,named) %dir  %prefix/var/run
-%attr(770,named,named) %dir %prefix/var/tmp
-%attr(770,named,named) %dir %prefix/var/run/named
-%attr(750,root,named) %dir  %prefix/var/named
-%attr(770,named,named) %dir %prefix/var/named/slaves
-%attr(770,named,named) %dir %prefix/var/named/data
+%defattr(0640,root,named,0750)
+%dir %prefix
+%dir %prefix/dev
+%dir %prefix/etc
+%dir %prefix/var
+%dir  %prefix/var/run
+%dir  %prefix/var/named
 %ghost %config(noreplace) %prefix/etc/named.conf
 %ghost %config(noreplace) %prefix/etc/named.caching-nameserver.conf
 %ghost %config(noreplace) %prefix/etc/rndc.key
+%defattr(0660,named,named,0770)
+%dir %prefix/var/named/slaves
+%dir %prefix/var/named/data
+%dir %prefix/var/run/named
+%dir %prefix/var/tmp
 %ghost %prefix/dev/null
 %ghost %prefix/dev/random
+%ghost %prefix/dev/zero
+
 
 %if %{LIBBIND}
 
 %files libbind-devel
-%defattr(-,root,root)
-%{_libdir}/libbind.*
+%defattr(0755,root,root,0755)
+%{_libdir}/libbind.so*
+%defattr(0644,root,root,0755) 
+%{_libdir}/libbind.a
 %{_libdir}/pkgconfig/libbind.pc
 %{_includedir}/bind
 %{_mandir}/man3/libbind-*
@@ -633,12 +648,14 @@
 %if %{SDB}
 
 %files sdb
-%defattr(-,root,named)
+%defattr(0750,root,named,0755)
 %{_sbindir}/named_sdb
-%config /etc/openldap/schema/dnszone.schema
 %{_sbindir}/zone2ldap
 %{_sbindir}/ldap2zone
 %{_sbindir}/zonetodb
+%defattr(0640,root,named,0755)
+%config /etc/openldap/schema/dnszone.schema
+%defattr(0644,root,named,0755)
 %{_mandir}/man1/zone2ldap.1*
 %doc contrib/sdb/ldap/README.ldap contrib/sdb/ldap/INSTALL.ldap contrib/sdb/pgsql/README.sdb_pgsql
 
@@ -673,7 +690,7 @@
 
 %preun
 if [ "$1" = 0 ]; then
-   /etc/rc.d/init.d/named stop >/dev/null 2>&1 || :;
+   /sbin/service named stop >/dev/null 2>&1 || :;
    /sbin/chkconfig --del named || :;
 fi
 :;
@@ -681,7 +698,7 @@
 %postun
 /sbin/ldconfig
 if [ "$1" -ge 1 ]; then
-   /etc/rc.d/init.d/named condrestart >/dev/null 2>&1 || :;
+   /sbin/service named condrestart >/dev/null 2>&1 || :;
 fi;
 :;
 
@@ -704,14 +721,6 @@
 fi
 :;
 
-%postun utils
-if [ $1 = 0 ]; then
-   if [ -f /var/lock/subsys/named ]; then
-      /etc/rc.d/init.d/named stop >/dev/null  2>&1 || :;
-   fi;
-fi;
-:;
-
 
 %post libs -p /sbin/ldconfig
 
@@ -796,13 +805,26 @@
 :;
 
 %changelog
-* Mon Apr 03 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-16
+* Tue Apr 18 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-20
+- 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
+- rebuild for new gcc, glibc-kernheaders
+
+* Tue Apr 04 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-20
+- fix resolver.c ncache_adderesult segfault reported in addenda to bug 173961 
+  (upstream bugs #15642, #15528 ?)
+- allow named ability to generate core dumps after setuid (upstream bug #15753)
+
+* Mon Apr 03 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-18
+- fix bug 187529: make bind-chroot-admin deal with subdirectories properly
+
+* Thu Mar 30 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-16
 - fix bug 187286: 
      prevent host(1) printing duplicate 'is an alias for' messages
      for the default AAAA and MX lookups as well as for the A lookup
      (it now uses the CNAME returned for the A lookup for the AAAA and MX lookups).
      This is upstream bug #15702 fixed in the unreleased bind-9.3.3
-- fix bug 187529: make bind-chroot-admin deal with subdirectories properly
 - fix bug 187333: fix SOURCE24 and SOURCE25 transposition
 
 * Wed Mar 29 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-14



From fedora-cvs-commits at redhat.com  Wed Apr 19 14:42:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 10:42:29 -0400
Subject: rpms/isdn4k-utils/devel capi.init, NONE,
	1.1 isdn4k-utils-CVS-2006-02-13-cleanup.patch, NONE,
	1.1 isdn4k-utils-CVS-2006-02-13-redhat.patch, NONE,
	1.1 isdn4k-utils-capiinit.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 isdn4k-utils.spec, 1.55, 1.56 sources, 1.13,
	1.14 isdn4k-utils-CVS-2004-11-18-cleanup.patch, 1.1,
	NONE isdn4k-utils-CVS-2005-02-16-redhat.patch, 1.1,
	NONE isdn4k-utils-CVS-2005-03-09-pppd-2.4.3.patch, 1.1,
	NONE isdn4k-utils-isdnlog.patch, 1.1, NONE
Message-ID: <200604191442.k3JEgTOm017822@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore isdn4k-utils.spec sources 
Added Files:
	capi.init isdn4k-utils-CVS-2006-02-13-cleanup.patch 
	isdn4k-utils-CVS-2006-02-13-redhat.patch 
	isdn4k-utils-capiinit.patch 
Removed Files:
	isdn4k-utils-CVS-2004-11-18-cleanup.patch 
	isdn4k-utils-CVS-2005-02-16-redhat.patch 
	isdn4k-utils-CVS-2005-03-09-pppd-2.4.3.patch 
	isdn4k-utils-isdnlog.patch 
Log Message:
- update to CVS-2006-02-13
- add support capi #169902



--- NEW FILE capi.init ---
#! /bin/bash
#
# chkconfig: 2345 9 91
# description: start and stop capi services for passiv ISDN cards
#

PATH=/bin:/sbin:/usr/bin:/usr/sbin

# Source function library.
if [ -f /etc/init.d/functions ]; then
    . /etc/init.d/functions
elif [ -f /etc/rc.d/init.d/functions ] ; then
    . /etc/rc.d/init.d/functions
else
    exit 0
fi

[ -f /sbin/capiinit ] || exit 0
[ -f /etc/capi.conf ] || exit 0
RETVAL=0

function start()
{
    # don't start again if it's already started
    [ ! -f /var/lock/subsys/capi ] || exit 0
    action $"Starting capi4linux:" capiinit start
    RETVAL=$?
    if [ $RETVAL -eq 0 ] ; then
       touch /var/lock/subsys/capi
    fi
}

function stop()
{
    if [ -f /var/lock/subsys/capi ] ; then
       action $"Stopping capi4linux:" capiinit stop
       RETVAL=$?
       if [ $RETVAL -eq 0 ] ; then
          rm -f /var/lock/subsys/capi
       fi
    fi
}

function restart()
{
    stop
    start
}

function condrestart()
{
    if [ -f /var/lock/subsys/capi ] ; then
        restart
    fi
}

function status()
{
    capiinfo
}

case "$1" in 
    start)
       start
       ;;
    stop)
       stop
       ;;
    restart)
       restart
       ;;
    condrestart)
       condrestart
       ;;
    status)
       status
       ;;
    *)
       echo $"Usage: $0 {start|stop|restart|status|condrestart}"
       exit 1
esac

exit 0

isdn4k-utils-CVS-2006-02-13-cleanup.patch:
 ./icn/icnctrl.c               |    2 !!
 ./isdnlog/isdnlog/processor.c |    2 !!
 ./isdnlog/isdnrep/isdnbill.c  |    2 !!
 ./isdnlog/isdnrep/isdnrep.c   |    2 !!
 ./isdnlog/tools/zone.c        |    2 !!
 ./loop/loopctrl.c             |    2 !!
 eicon/eiconctrl.c             |    2 +-
 7 files changed, 1 insertion(+), 1 deletion(-), 12 modifications(!)

--- NEW FILE isdn4k-utils-CVS-2006-02-13-cleanup.patch ---
*** ./icn/icnctrl.c.old	2002-11-27 14:30:43.000000000 +0000
--- ./icn/icnctrl.c	2002-11-27 14:31:10.000000000 +0000
***************
*** 223,229 ****
  	icn_cdef newcard;
  
  	cmd = strrchr(argv[0], '/');
! 	cmd = (cmd == NULL) ? argv[0] : ++cmd;
  	if (argc > 1) {
  		if (!strcmp(argv[1], "-d")) {
  			strcpy(ioctl_s.drvid, argv[2]);
--- 223,229 ----
  	icn_cdef newcard;
  
  	cmd = strrchr(argv[0], '/');
! 	cmd = (cmd == NULL) ? argv[0] : (cmd + 1);
  	if (argc > 1) {
  		if (!strcmp(argv[1], "-d")) {
  			strcpy(ioctl_s.drvid, argv[2]);
*** ./isdnlog/isdnlog/processor.c.old	2002-11-27 14:27:28.000000000 +0000
--- ./isdnlog/isdnlog/processor.c	2002-11-27 14:27:41.000000000 +0000
***************
*** 3497,3503 ****
       isdn_net_ioctl_phone netdvX_phone;
  #endif
    }	   phone;
!   auto	   int rc, chan, l1, l2, lmin, lmax, ldiv, match;
  
    if ((iflst = fopen("/proc/net/dev", "r")) == NULL)
      return(-1);
--- 3497,3503 ----
       isdn_net_ioctl_phone netdvX_phone;
  #endif
    }	   phone;
!   auto	   int rc, chan = 0, l1, l2, lmin, lmax, ldiv, match;
  
    if ((iflst = fopen("/proc/net/dev", "r")) == NULL)
      return(-1);
*** ./isdnlog/isdnrep/isdnbill.c.old	2002-11-27 14:30:11.000000000 +0000
--- ./isdnlog/isdnrep/isdnbill.c	2002-11-27 14:30:22.000000000 +0000
***************
*** 874,880 ****
  #endif
    auto     char     s[BUFSIZ], sx[BUFSIZ];
    auto     int      i, l, col, day, lday = UNKNOWN, month, lmonth = UNKNOWN;
!   auto     double   dur;
    auto     char    *version;
    auto     char    *myname = basename(argv[0]);
    auto     int      opt, go, s0, indent;
--- 874,880 ----
  #endif
    auto     char     s[BUFSIZ], sx[BUFSIZ];
    auto     int      i, l, col, day, lday = UNKNOWN, month, lmonth = UNKNOWN;
!   auto     double   dur = 0.0;
    auto     char    *version;
    auto     char    *myname = basename(argv[0]);
    auto     int      opt, go, s0, indent;
*** ./isdnlog/isdnrep/isdnrep.c.old	2002-11-27 14:29:13.000000000 +0000
--- ./isdnlog/isdnrep/isdnrep.c	2002-11-27 14:29:50.000000000 +0000
***************
*** 2593,2599 ****
  {
    static char String[256];
    one_call *tmp_call;
!   int RetCode;
  
  
    if (bill)
--- 2593,2599 ----
  {
    static char String[256];
    one_call *tmp_call;
!   int RetCode = 0;
  
  
    if (bill)
*** ./isdnlog/tools/zone.c.old	2002-11-27 14:28:01.000000000 +0000
--- ./isdnlog/tools/zone.c	2002-11-27 14:28:11.000000000 +0000
***************
*** 531,537 ****
  			char *p = value.dptr;
  			char to[10];
  			US count;
! 			int ito;
  			unsigned char z=0;
  			if (sthp->cc) /* if areacodes */
  				/* here is since 1.00 a zero-terminated strring */
--- 531,537 ----
  			char *p = value.dptr;
  			char to[10];
  			US count;
! 			int ito = 0;
  			unsigned char z=0;
  			if (sthp->cc) /* if areacodes */
  				/* here is since 1.00 a zero-terminated strring */
*** ./loop/loopctrl.c.old	2002-11-27 14:32:08.000000000 +0000
--- ./loop/loopctrl.c	2002-11-27 14:32:23.000000000 +0000
***************
*** 175,181 ****
  	isdnloop_sdef startparm;
  
  	cmd = strrchr(argv[0], '/');
! 	cmd = (cmd == NULL) ? argv[0] : ++cmd;
  	if (argc > 1) {
  		if (!strcmp(argv[1], "-d")) {
  			strcpy(ioctl_s.drvid, argv[2]);
--- 175,181 ----
  	isdnloop_sdef startparm;
  
  	cmd = strrchr(argv[0], '/');
! 	cmd = (cmd == NULL) ? argv[0] : (cmd + 1);
  	if (argc > 1) {
  		if (!strcmp(argv[1], "-d")) {
  			strcpy(ioctl_s.drvid, argv[2]);
--- eicon/eiconctrl.c.orig	2006-04-19 16:16:02.000000000 +0200
+++ eicon/eiconctrl.c	2006-04-19 16:17:25.000000000 +0200
@@ -1970,7 +1970,7 @@
 				val = strtol(p, &q, 16);
 				p = q;
 				val = strtol(p, &q, 16);
-				(unsigned short) *buffer = (unsigned short) val;
+				*buffer = (unsigned short) val;
 				pos = 2;
 				while ((p != q) && (*q != 0)) {
 					p = q;

isdn4k-utils-CVS-2006-02-13-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-02-13-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. -I at CONFIG_KERNELDIR@/include -I at CONFIG_KERNELDIR@/drivers/isdn/act2000
 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. -I at CONFIG_KERNELDIR@/include -I at CONFIG_KERNELDIR@/drivers/isdn/divert
 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 -I at CONFIG_KERNELDIR@/include -I at CONFIG_KERNELDIR@/drivers/isdn/eicon
 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. -I at CONFIG_KERNELDIR@/include
 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. -I at CONFIG_KERNELDIR@/include -I at CONFIG_KERNELDIR@/drivers/isdn/icn
 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. -I at CONFIG_KERNELDIR@/include
 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) -I$(CONFIG_KERNELDIR)/include
 #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) -I at CONFIG_KERNELDIR@/include
 
 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. -I at CONFIG_KERNELDIR@/include
 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. -I at CONFIG_KERNELDIR@/include
 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. -I at CONFIG_KERNELDIR@/include -I at CONFIG_KERNELDIR@/drivers/isdn/loopctrl
 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 -I at CONFIG_KERNELDIR@/drivers/isdn/pcbit
 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-2.4'
 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) --with-kernel=$(RPM_BUILD_DIR)/isdn4k-utils/linux-2.4 --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

isdn4k-utils-capiinit.patch:
 capiinit/capi.conf                              |   10 +++++-----
 capiinit/capiinit.c                             |    1 +
 isdn4k-utils-CVS-2003-09-23/capiinit/capiinit.c |    4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

--- NEW FILE isdn4k-utils-capiinit.patch ---
--- isdn4k-utils.orig/capiinit/capiinit.c	2006-04-18 19:27:03.689945766 +0200
+++ isdn4k-utils/capiinit/capiinit.c	2006-04-18 19:36:53.130636890 +0200
@@ -1251,6 +1251,7 @@
 	if (check_procfs() < 0) return -1;
 	if (check_for_kernelcapi() < 0) return -1;
 	if (check_for_capi() < 0) return -1;
+	sleep(5); /* wait until the device node is created successfully by udev */
 	if (check_for_devcapi() < 0) return -1;
 	if (check_for_capifs() < 0) return 0; /* only warning */
 	if (check_for_capifs_mounted() < 0) return -1;
--- isdn4k-utils.orig/capiinit/capi.conf	2006-04-18 19:37:43.515250539 +0200
+++ isdn4k-utils/capiinit/capi.conf	2006-04-18 19:37:53.953559630 +0200
@@ -1,10 +1,10 @@
 # card		file	proto	io	irq	mem	cardnr	options
 #b1isa		b1.t4	DSS1	0x150	7	-	-	P2P
-b1pci		b1.t4	DSS1	-	-	-	-
-c4		c4.bin	DSS1	-	-	-	-
-c4		-	DSS1	-	-	-	-
-c4		-	DSS1	-	-	-	-	P2P
-c4		-	DSS1	-	-	-	-	P2P
+#b1pci		b1.t4	DSS1	-	-	-	-
+#c4		c4.bin	DSS1	-	-	-	-
+#c4		-	DSS1	-	-	-	-
+#c4		-	DSS1	-	-	-	-	P2P
+#c4		-	DSS1	-	-	-	-	P2P
 #c2		c2.bin	DSS1	-	-	-	-
 #c2		-	DSS1	-	-	-	-
 #t1isa		t1.t4	DSS1	0x340	9	-	0
--- isdn4k-utils-CVS-2003-09-23/capiinit/capiinit.c.capi	2006-04-18 20:53:22.437430551 +0200
+++ isdn4k-utils-CVS-2003-09-23/capiinit/capiinit.c	2006-04-19 11:50:56.385891286 +0200
@@ -1495,8 +1496,8 @@
 		unload_module("capiutil");
 		if ((mp = mounted("capifs")) != 0 && strcmp(mp, "/dev/capi") == 0)
 			system("umount /dev/capi");
-		if (filesystem_available("capifs"))
-			unload_filesystem("capifs");
+		/*if (filesystem_available("capifs"))
+			unload_filesystem("capifs"); */
 	}
 	if (cardname && cname[0] == 0) {
 		fprintf(stderr,"ERROR: card \"%s\"  not found\n", cardname);


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/isdn4k-utils/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	9 Mar 2005 17:54:04 -0000	1.12
+++ .cvsignore	19 Apr 2006 14:42:26 -0000	1.13
@@ -6,3 +6,4 @@
 isdn-header-1.tar.bz2
 isdn4k-utils-CVS-2005-02-16.tar.bz2
 isdn4k-utils-CVS-2005-03-09.tar.bz2
+isdn4k-utils-CVS-2006-02-13.tar.bz2


Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/isdn4k-utils/devel/isdn4k-utils.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- isdn4k-utils.spec	10 Apr 2006 14:23:07 -0000	1.55
+++ isdn4k-utils.spec	19 Apr 2006 14:42:26 -0000	1.56
@@ -1,6 +1,6 @@
 %define app_defaults_dir %{_datadir}/X11/app-defaults
 
-%define interver CVS-2005-03-09
+%define interver CVS-2006-02-13
 %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: 42
+Release: 43
 License: GPL
 Group: Applications/System
 
@@ -27,21 +27,23 @@
 Source5: isdnstatus
 Source6: isdnhangup
 Source7: isdn-header-1.tar.bz2
+Source8: capi.init
 
-Patch0: isdn4k-utils-CVS-2005-02-16-redhat.patch
+Patch0: isdn4k-utils-CVS-2006-02-13-redhat.patch
 Patch2: ibod-config.patch
 Patch3: isdn4k-utils-man.patch
 Patch4: isdn4k-utils-CVS-2004-11-18-autoconf25x.patch
 Patch5: isdn4k-utils-0202131200-true.patch
-Patch7: isdn4k-utils-CVS-2004-11-18-cleanup.patch
-Patch9: isdn4k-utils-isdnlog.patch
+Patch7: isdn4k-utils-CVS-2006-02-13-cleanup.patch
 Patch10: isdn4k-utils-CVS-2004-11-18-lib64.patch
 Patch11: isdn4k-utils-statfs.patch
 Patch12: isdn4k-utils-CVS-2005-03-09-xmon.patch
-Patch13: isdn4k-utils-CVS-2005-03-09-pppd-2.4.3.patch
+Patch13: isdn4k-utils-capiinit.patch
 
 BuildRoot: %{_tmppath}/%name-%{version}-%{release}-root
 
+Requires: udev >= 039-10.14.EL4
+Requires: hwdata >= 0.146.18.EL-1
 Requires: initscripts >= 5.92
 
 BuildPrereq: openjade
@@ -113,11 +115,10 @@
 %patch4 -p1 -b .ac25x
 %patch5 -p1 -b .true
 %patch7 -p0 -b .cleanup
-%patch9 -p1 -b .typo
 %patch10 -p1 -b .lib64
 %patch11 -p1 -b .statfs
 %patch12 -p1 -b .xmon
-%patch13 -p1 -b .ppp243
+%patch13 -p1 -b .capi
 
 for i in */configure; do
 	cd `dirname $i`
@@ -218,6 +219,7 @@
 # install isdn startup script
 mkdir -p %{buildroot}%{initdir}
 install -m755 %{SOURCE2} %{buildroot}%{initdir}/isdn
+install -m755 %{SOURCE8} %{buildroot}%{initdir}/capi
 
 # move some binaries into /sbin
 mkdir -p %{buildroot}/sbin
@@ -267,6 +269,9 @@
 
 rm -f %{buildroot}%{_sbindir}/{divalog,divalogd,divertctrl}
 
+mkdir -p $RPM_BUILD_ROOT/etc
+install -m 644 capiinit/capi.conf $RPM_BUILD_ROOT/etc
+
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add isdn
@@ -401,7 +406,9 @@
 %verify(not md5 size mtime) %config(noreplace) /etc/isdn/*
 %verify(not md5 size mtime) %config(noreplace) /etc/ppp/ioptions
 %config(noreplace) /etc/ppp/peers/*
+%config(noreplace) /etc/capi.conf
 %config %{initdir}/isdn
+%config %{initdir}/capi
 %{_libdir}/pppd
 %{_bindir}/*
 %{_libdir}/isdn
@@ -480,6 +487,10 @@
 %doc xmonisdn/README
 
 %changelog
+* Wed Apr 19 2006 Than Ngo <than at redhat.com> 3.2-43
+- update to CVS-2006-02-13
+- add support capi #169902
+
 * Thu Mar 30 2006 Than Ngo <than at redhat.com> 3.2-42
 - support pppd 2.4.3 #187218
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/isdn4k-utils/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	9 Mar 2005 17:54:04 -0000	1.13
+++ sources	19 Apr 2006 14:42:26 -0000	1.14
@@ -1,3 +1,3 @@
 38b45be27c0a82b38380f680fdee0aff  ibod-1.4-src.tar.gz
 f3363587ff8007ff3261dba9e877c36e  isdn-header-1.tar.bz2
-b09ec8549a0b681cbb1213e433b65c06  isdn4k-utils-CVS-2005-03-09.tar.bz2
+865d84dc643877ccc9a178a26f39bc45  isdn4k-utils-CVS-2006-02-13.tar.bz2


--- isdn4k-utils-CVS-2004-11-18-cleanup.patch DELETED ---


--- isdn4k-utils-CVS-2005-02-16-redhat.patch DELETED ---


--- isdn4k-utils-CVS-2005-03-09-pppd-2.4.3.patch DELETED ---


--- isdn4k-utils-isdnlog.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 19 14:50:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 10:50:44 -0400
Subject: rpms/gnome-terminal/devel gnome-terminal.spec,1.44,1.45
Message-ID: <200604191450.k3JEoiUK001951@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-terminal.spec 
Log Message:
- Require newer vte (bug 189341)



Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gnome-terminal.spec	18 Apr 2006 05:26:36 -0000	1.44
+++ gnome-terminal.spec	19 Apr 2006 14:50:40 -0000	1.45
@@ -5,7 +5,7 @@
 %define gtk2_version 2.6.0
 %define libgnomeui_version 2.3.0
 #%define libzvt_version 1.113.0
-%define vte_version 0.11.10
+%define vte_version 0.12.0-3
 %define desktop_file_utils_version 0.2.90
 %define startup_notification_version 0.8
 %define libbonobo_version 2.3.0
@@ -13,7 +13,7 @@
 Summary: GNOME Terminal
 Name: gnome-terminal
 Version: 2.14.1
-Release: 8
+Release: 9
 URL: http://www.gnome.org/
 Source0: gnome-terminal-%{version}.tar.bz2
 Source1: ne.po
@@ -103,6 +103,9 @@
 %{_libdir}/bonobo
 
 %changelog
+* Wed Apr 19 2006 Ray Strode <rstrode at redhat.com> 2.14.1-9
+- Require newer vte (bug 189341)
+
 * Tue Apr 18 2006 Kristian H??gsberg <krh at redhat.com> 2.14.1-8
 - Bump for rawhide build.
 



From fedora-cvs-commits at redhat.com  Wed Apr 19 15:09:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 11:09:56 -0400
Subject: rpms/php/FC-5 php-5.1.2-CVE-2006-0996.patch, NONE, 1.1 php.spec,
	1.108, 1.109
Message-ID: <200604191509.k3JF9unb006183@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	php.spec 
Added Files:
	php-5.1.2-CVE-2006-0996.patch 
Log Message:
* Wed Apr 19 2006 Joe Orton <jorton at redhat.com> 5.1.2-5.2
- add security fixes from upstream:
 * phpinfo() XSS with long input (CVE-2006-0996)
 * binary safeness in html_decode (CVE-2006-1490)


php-5.1.2-CVE-2006-0996.patch:
 info.c |   36 +++++++++++++++++-------------------
 1 files changed, 17 insertions(+), 19 deletions(-)

--- NEW FILE php-5.1.2-CVE-2006-0996.patch ---

Revision 1.249.2.8
Thu Mar 30 19:16:12 2006 UTC (2 weeks, 5 days ago) by iliaa
Branch: PHP_5_1
Changes since 1.249.2.7: +18 -20 lines

Fixed XSS inside phpinfo() with long inputs.

--- php-5.1.2/ext/standard/info.c.cve0996
+++ php-5.1.2/ext/standard/info.c
@@ -58,6 +58,21 @@
 
 PHPAPI extern char *php_ini_opened_path;
 PHPAPI extern char *php_ini_scanned_files;
+	
+static int php_info_write_wrapper(const char *str, uint str_length)
+{
+	TSRMLS_FETCH();
+
+	int new_len, written;
+	char *elem_esc = php_escape_html_entities((char *)str, str_length, &new_len, 0, ENT_QUOTES, NULL TSRMLS_CC);
+
+	written = php_body_write(elem_esc, new_len TSRMLS_CC);
+
+	efree(elem_esc);
+
+	return written;
+}
+
 
 /* {{{ _display_module_info
  */
@@ -135,30 +150,13 @@
 				PUTS(" => ");
 			}
 			if (Z_TYPE_PP(tmp) == IS_ARRAY) {
-				zval *tmp3;
-
-				MAKE_STD_ZVAL(tmp3);
-
 				if (!sapi_module.phpinfo_as_text) {
 					PUTS("<pre>");
-				}
-				php_start_ob_buffer(NULL, 4096, 1 TSRMLS_CC);
-				
-				zend_print_zval_r(*tmp, 0 TSRMLS_CC);
-				
-				php_ob_get_buffer(tmp3 TSRMLS_CC);
-				php_end_ob_buffer(0, 0 TSRMLS_CC);
-				
-				if (!sapi_module.phpinfo_as_text) {
-					elem_esc = php_info_html_esc(Z_STRVAL_P(tmp3) TSRMLS_CC);
-					PUTS(elem_esc);
-					efree(elem_esc);
+					zend_print_zval_ex((zend_write_func_t) php_info_write_wrapper, *tmp, 0 TSRMLS_CC);
 					PUTS("</pre>");
 				} else {
-					PUTS(Z_STRVAL_P(tmp3));
+					zend_print_zval_r(*tmp, 0 TSRMLS_CC);
 				}
-				zval_ptr_dtor(&tmp3);
-
 			} else if (Z_TYPE_PP(tmp) != IS_STRING) {
 				tmp2 = **tmp;
 				zval_copy_ctor(&tmp2);


Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/FC-5/php.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- php.spec	7 Apr 2006 10:09:33 -0000	1.108
+++ php.spec	19 Apr 2006 15:09:52 -0000	1.109
@@ -4,7 +4,7 @@
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
 Version: 5.1.2
-Release: 5.1
+Release: 5.2
 License: The PHP License
 Group: Development/Languages
 URL: http://www.php.net/
@@ -31,6 +31,10 @@
 Patch50: php-5.0.4-tests-dashn.patch
 Patch51: php-5.0.4-tests-wddx.patch
 
+# Security fixes
+Patch70: php-5.1.2-CVE-2006-0996.patch
+Patch71: php-5.1.2-CVE-2006-1490.patch
+
 BuildRoot: %{_tmppath}/%{name}-root
 
 BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, expat-devel
@@ -274,6 +278,9 @@
 %patch50 -p1 -b .tests-dashn
 %patch51 -p1 -b .tests-wddx
 
+%patch70 -p1 -b .cve0996
+%patch71 -p1 -b .cve1490
+
 # Prevent %%doc confusion over LICENSE files
 cp Zend/LICENSE Zend/ZEND_LICENSE
 cp TSRM/LICENSE TSRM_LICENSE
@@ -561,6 +568,11 @@
 %files pdo -f files.pdo
 
 %changelog
+* Wed Apr 19 2006 Joe Orton <jorton at redhat.com> 5.1.2-5.2
+- add security fixes from upstream:
+ * phpinfo() XSS with long input (CVE-2006-0996)
+ * binary safeness in html_decode (CVE-2006-1490)
+
 * Fri Apr  7 2006 Joe Orton <jorton at redhat.com> 5.1.2-5.1
 - fix use of LDAP on 64-bit platforms (#181518)
 



From fedora-cvs-commits at redhat.com  Wed Apr 19 15:10:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 11:10:37 -0400
Subject: rpms/php/FC-5 php-5.1.2-CVE-2006-1490.patch,NONE,1.1
Message-ID: <200604191510.k3JFAbsu006295@cvs.devel.redhat.com>

Author: jorton

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

Added Files:
	php-5.1.2-CVE-2006-1490.patch 
Log Message:
* Wed Apr 19 2006 Joe Orton <jorton at redhat.com> 5.1.2-5.2
- add security fixes from upstream:
 * phpinfo() XSS with long input (CVE-2006-0996)
 * binary safeness in html_decode (CVE-2006-1490)


php-5.1.2-CVE-2006-1490.patch:
 html.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE php-5.1.2-CVE-2006-1490.patch ---

  Modified files:              (Branch: PHP_4_4)
    /php-src/ext/standard       html.c
  Log:
  MFH - binary safety patch from Moriyoshi

http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/html.c?r1=1.63.2.23.2.1&r2=1.63.2.23.2.2&diff_format=u

--- php-5.1.2/ext/standard/html.c.cve1490
+++ php-5.1.2/ext/standard/html.c
@@ -884,7 +884,7 @@
 	unsigned char replacement[15];
 	int replacement_len;
 
-	ret = estrdup(old);
+	ret = estrndup(old, oldlen);
 	retlen = oldlen;
 	if (!retlen) {
 		goto empty_source;



From fedora-cvs-commits at redhat.com  Wed Apr 19 15:11:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 11:11:33 -0400
Subject: rpms/gtk2-engines/devel gtk-engines-2.7.4-copy.patch, NONE,
	1.1 gtk2-engines.spec, 1.39,
	1.40 gtk-engines-2.7.4-clone.patch, 1.1, NONE
Message-ID: <200604191511.k3JFBXCc006517@cvs.devel.redhat.com>

Author: sandmann

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

Modified Files:
	gtk2-engines.spec 
Added Files:
	gtk-engines-2.7.4-copy.patch 
Removed Files:
	gtk-engines-2.7.4-clone.patch 
Log Message:
* Mon Apr 19 2006 Soren Sandmann <sandmann at redhat.com> - 2.7.4-6
- It was in fact a missing copy method. See gnome bug 338826.



gtk-engines-2.7.4-copy.patch:
 clearlooks_style.c |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+)

--- NEW FILE gtk-engines-2.7.4-copy.patch ---
--- gtk-engines-2.7.4/engines/clearlooks/src/clearlooks_style.c.clone	2006-04-17 17:13:09.000000000 -0400
+++ gtk-engines-2.7.4/engines/clearlooks/src/clearlooks_style.c	2006-04-17 17:14:44.000000000 -0400
@@ -1482,6 +1482,26 @@
 static void
 clearlooks_style_init (ClearlooksStyle * style)
 {
+
+}
+
+static void
+clearlooks_style_copy (GtkStyle *style,
+                       GtkStyle *src)
+{
+       ClearlooksStyle *cl_style = CLEARLOOKS_STYLE (style);
+       ClearlooksStyle *cl_src = CLEARLOOKS_STYLE (src);
+ 
+	cl_style->colors = cl_src->colors;
+	cl_style->progressbarstyle = cl_src->progressbarstyle;
+	cl_style->menubarstyle = cl_src->menubarstyle;
+	cl_style->menuitemstyle = cl_src->menuitemstyle;
+	cl_style->listviewitemstyle = cl_src->listviewitemstyle;
+	cl_style->scrollbar_color = cl_src->scrollbar_color;
+	cl_style->has_scrollbar_color = cl_src->has_scrollbar_color;
+	cl_style->animation = cl_src->animation;
+
+       parent_class->copy (style, src);
 }
 
 static void
@@ -1493,6 +1512,7 @@
 
 	style_class->unrealize        = clearlooks_style_unrealize;
 	style_class->init_from_rc     = clearlooks_style_init_from_rc;
+	style_class->copy	      = clearlooks_style_copy;
 	style_class->draw_handle      = draw_handle;
 	style_class->draw_slider      = draw_slider;
 	style_class->draw_shadow_gap  = draw_shadow_gap;


Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gtk2-engines.spec	18 Apr 2006 18:52:03 -0000	1.39
+++ gtk2-engines.spec	19 Apr 2006 15:11:22 -0000	1.40
@@ -1,7 +1,7 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
 Version:        2.7.4
-Release:	5
+Release:	6
 License:        GPL
 Group:          System Environment/Libraries
 Source:         gtk-engines-%{version}.tar.bz2
@@ -9,8 +9,8 @@
 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 clone method in clearlooks engine
-Patch2:		gtk-engines-2.7.4-clone.patch
+# add missing copy method in clearlooks engine
+Patch2:		gtk-engines-2.7.4-copy.patch
 
 Requires:       gtk2 >= 2.2.0
 Conflicts:  	gnome-themes < 2.9.0
@@ -31,7 +31,7 @@
 %setup -q -n gtk-engines-%{version}
 %patch0 -p1 -b .fixes
 %patch1 -p1 -b .leaks
-%patch2 -p1 -b .clone
+%patch2 -p1 -b .copy
 
 %build
 %configure
@@ -69,6 +69,9 @@
 %{_datadir}/themes
 
 %changelog
+* Mon Apr 19 2006 Soren Sandmann <sandmann at redhat.com> - 2.7.4-6
+- It was in fact a missing copy method. See gnome bug 338826.
+
 * Tue Apr 18 2006 Kristian H??gsberg <krh at redhat.com> 2.7.4-5
 - Bump for fc5-blig repo build.
 


--- gtk-engines-2.7.4-clone.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 19 15:14:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 11:14:09 -0400
Subject: rpms/php/FC-5 php.spec,1.109,1.110
Message-ID: <200604191514.k3JFE97x006918@cvs.devel.redhat.com>

Author: jorton

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

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


Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/FC-5/php.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- php.spec	19 Apr 2006 15:09:52 -0000	1.109
+++ php.spec	19 Apr 2006 15:13:49 -0000	1.110
@@ -4,7 +4,7 @@
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
 Version: 5.1.2
-Release: 5.2
+Release: 5.3
 License: The PHP License
 Group: Development/Languages
 URL: http://www.php.net/
@@ -568,7 +568,7 @@
 %files pdo -f files.pdo
 
 %changelog
-* Wed Apr 19 2006 Joe Orton <jorton at redhat.com> 5.1.2-5.2
+* Wed Apr 19 2006 Joe Orton <jorton at redhat.com> 5.1.2-5.3
 - add security fixes from upstream:
  * phpinfo() XSS with long input (CVE-2006-0996)
  * binary safeness in html_decode (CVE-2006-1490)



From fedora-cvs-commits at redhat.com  Wed Apr 19 15:15:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 11:15:25 -0400
Subject: rpms/cups/devel cups-banners.patch,NONE,1.1 cups.spec,1.164,1.165
Message-ID: <200604191515.k3JFFPtD006986@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-banners.patch 
Log Message:
* Wed Apr 19 2006 Tim Waugh <twaugh at redhat.com>
- Ignore .rpmnew and .rpmsave banner files.


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

--- NEW FILE cups-banners.patch ---
--- cups-1.2rc2/scheduler/banners.c.banners	2006-04-19 16:12:07.000000000 +0100
+++ cups-1.2rc2/scheduler/banners.c	2006-04-19 16:12:42.000000000 +0100
@@ -119,6 +119,8 @@
     if ((ext = strrchr(dent->filename, '.')) != NULL)
       if (!strcmp(ext, ".bck") ||
           !strcmp(ext, ".bak") ||
+          !strcmp(ext, ".rpmnew") ||
+          !strcmp(ext, ".rpmsave") ||
 	  !strcmp(ext, ".sav"))
 	continue;
 


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- cups.spec	11 Apr 2006 17:06:44 -0000	1.164
+++ cups.spec	19 Apr 2006 15:15:06 -0000	1.165
@@ -28,6 +28,7 @@
 Patch4: cups-1.1.17-backend.patch
 Patch5: cups-ext.patch
 Patch6: cups-kde.patch
+Patch7: cups-banners.patch
 Patch8: cups-logfileperm.patch
 Patch9: cups-1.1.17-rcp.patch
 Patch10: cups-1.1.17-ppdsdat.patch
@@ -115,6 +116,7 @@
 %patch4 -p1 -b .backend
 %patch5 -p1 -b .ext
 %patch6 -p1 -b .kde
+%patch7 -p1 -b .banners
 %patch8 -p1 -b .logfileperm
 %patch9 -p1 -b .rcp
 %patch10 -p1 -b .ppdsdat
@@ -374,6 +376,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Apr 19 2006 Tim Waugh <twaugh at redhat.com>
+- Ignore .rpmnew and .rpmsave banner files.
+
 * Tue Apr 11 2006 Tim Waugh <twaugh at redhat.com>
 - Ship a /etc/cups/pdftops.conf file (bug #188583).
 



From fedora-cvs-commits at redhat.com  Wed Apr 19 15:20:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 11:20:56 -0400
Subject: rpms/cups/FC-5 cups-banners.patch,NONE,1.1 cups.spec,1.155,1.156
Message-ID: <200604191520.k3JFKuQZ022992@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-banners.patch 
Log Message:
* Wed Apr 19 2006 Tim Waugh <twaugh at redhat.com>
- Ignore .rpmnew and .rpmsave banner files.


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

--- NEW FILE cups-banners.patch ---
--- cups-1.2rc2/scheduler/banners.c.banners	2006-04-19 16:12:07.000000000 +0100
+++ cups-1.2rc2/scheduler/banners.c	2006-04-19 16:12:42.000000000 +0100
@@ -119,6 +119,8 @@
     if ((ext = strrchr(dent->filename, '.')) != NULL)
       if (!strcmp(ext, ".bck") ||
           !strcmp(ext, ".bak") ||
+          !strcmp(ext, ".rpmnew") ||
+          !strcmp(ext, ".rpmsave") ||
 	  !strcmp(ext, ".sav"))
 	continue;
 


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- cups.spec	11 Apr 2006 17:09:20 -0000	1.155
+++ cups.spec	19 Apr 2006 15:20:53 -0000	1.156
@@ -28,6 +28,7 @@
 Patch4: cups-1.1.17-backend.patch
 Patch5: cups-ext.patch
 Patch6: cups-kde.patch
+Patch7: cups-banners.patch
 Patch8: cups-logfileperm.patch
 Patch9: cups-1.1.17-rcp.patch
 Patch10: cups-1.1.17-ppdsdat.patch
@@ -120,6 +121,7 @@
 %patch4 -p1 -b .backend
 %patch5 -p1 -b .ext
 %patch6 -p1 -b .kde
+%patch7 -p1 -b .banners
 %patch8 -p1 -b .logfileperm
 %patch9 -p1 -b .rcp
 %patch10 -p1 -b .ppdsdat
@@ -379,6 +381,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Apr 19 2006 Tim Waugh <twaugh at redhat.com>
+- Ignore .rpmnew and .rpmsave banner files.
+
 * Tue Apr 11 2006 Tim Waugh <twaugh at redhat.com>
 - Ship a /etc/cups/pdftops.conf file (bug #188583).
 



From fedora-cvs-commits at redhat.com  Wed Apr 19 15:51:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 11:51:38 -0400
Subject: rpms/firefox/devel .cvsignore, 1.23, 1.24 firefox.spec, 1.116,
	1.117 sources, 1.26, 1.27
Message-ID: <200604191551.k3JFpcjt012299@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
* Wed Apr 19 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-4
- Really drop the broken langpacks this time.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	14 Apr 2006 06:46:41 -0000	1.23
+++ .cvsignore	19 Apr 2006 15:51:35 -0000	1.24
@@ -20,3 +20,4 @@
 firefox-langpacks-1.5.0.1-20060201.tar.bz2
 firefox-1.5.0.2-source.tar.bz2
 firefox-langpacks-1.5.0.2-20060413.tar.bz2
+firefox-langpacks-1.5.0.2-20060418.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- firefox.spec	18 Apr 2006 15:04:03 -0000	1.116
+++ firefox.spec	19 Apr 2006 15:51:35 -0000	1.117
@@ -9,7 +9,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.2
-Release:        3
+Release:        4
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -20,7 +20,7 @@
 %endif
 Source0:        %{tarball}
 Source1:        firefox-gnomestripe-0.1.tar.gz
-Source2:        firefox-langpacks-%{version}-20060417.tar.bz2
+Source2:        firefox-langpacks-%{version}-20060418.tar.bz2
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
 Source12:       firefox-redhat-default-bookmarks.html
@@ -266,6 +266,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Apr 19 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-4
+- Really drop the broken langpacks this time.
+
 * Tue Apr 18 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-3
 - Drop some broken langpacks
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	18 Apr 2006 15:04:17 -0000	1.26
+++ sources	19 Apr 2006 15:51:35 -0000	1.27
@@ -1,3 +1,3 @@
 b628d5f24a49ab15d1943b7d694edd90  firefox-gnomestripe-0.1.tar.gz
 6bd65d899e9bcb16c28225899cc61a1e  firefox-1.5.0.2-source.tar.bz2
-d8668d3fd1754eb56c56619bec039510  firefox-langpacks-1.5.0.2-20060417.tar.bz2
+b85e1666d88829dd2ad68e0c22527604  firefox-langpacks-1.5.0.2-20060418.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 19 15:55:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 11:55:03 -0400
Subject: rpms/firefox/FC-5 firefox.spec,1.112,1.113 sources,1.24,1.25
Message-ID: <200604191555.k3JFt37b013697@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	firefox.spec sources 
Log Message:
* Wed Apr 19 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-1.2.fc5
- Drop some broken language packs.



Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-5/firefox.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- firefox.spec	18 Apr 2006 04:32:46 -0000	1.112
+++ firefox.spec	19 Apr 2006 15:55:00 -0000	1.113
@@ -9,7 +9,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.2
-Release:        1.1.fc5
+Release:        1.2.fc5
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -20,7 +20,7 @@
 %endif
 Source0:        %{tarball}
 Source1:        firefox-gnomestripe-0.1.tar.gz
-Source2:        firefox-langpacks-%{version}-20060417.tar.bz2
+Source2:        firefox-langpacks-%{version}-20060418.tar.bz2
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
 Source12:       firefox-redhat-default-bookmarks.html
@@ -266,7 +266,10 @@
 #---------------------------------------------------------------------
 
 %changelog
-* Mon Apr 19 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-1.1.fc5
+* Wed Apr 19 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-1.2.fc5
+- Drop some broken language packs.
+
+* Mon Apr 17 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-1.1.fc5
 - Update to 1.5.0.2
 
 * Sat Mar 11 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-9


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-5/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	18 Apr 2006 04:32:46 -0000	1.24
+++ sources	19 Apr 2006 15:55:00 -0000	1.25
@@ -1,3 +1,3 @@
 b628d5f24a49ab15d1943b7d694edd90  firefox-gnomestripe-0.1.tar.gz
 6bd65d899e9bcb16c28225899cc61a1e  firefox-1.5.0.2-source.tar.bz2
-d8668d3fd1754eb56c56619bec039510  firefox-langpacks-1.5.0.2-20060417.tar.bz2
+b85e1666d88829dd2ad68e0c22527604  firefox-langpacks-1.5.0.2-20060418.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 19 16:05:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 12:05:47 -0400
Subject: rpms/m2crypto/devel m2crypto-0.15-Connection.patch, NONE,
	1.1 m2crypto.spec, 1.20, 1.21
Message-ID: <200604191605.k3JG5l4H015877@cvs.devel.redhat.com>

Author: mitr

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

Modified Files:
	m2crypto.spec 
Added Files:
	m2crypto-0.15-Connection.patch 
Log Message:
* Wed Apr 19 2006 Miloslav Trmac <mitr at redhat.com> - 0.15-4
- Fix SSL.Connection.accept (#188742)


m2crypto-0.15-Connection.patch:
 Connection.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE m2crypto-0.15-Connection.patch ---
--- m2crypto-0.15/M2Crypto/SSL/Connection.py.Connection	2006-04-19 17:55:18.000000000 +0200
+++ m2crypto-0.15/M2Crypto/SSL/Connection.py	2006-04-19 17:55:31.000000000 +0200
@@ -17,7 +17,7 @@
 #SSLError = getattr(__import__('M2Crypto.SSL', globals(), locals(), 'SSLError'), 'SSLError')
 from M2Crypto.SSL import SSLError
 
-def _serverPostConnectionCheck(peerX509, expectedHost):
+def _serverPostConnectionCheck(*args, **kw):
     return 1
 
 class Connection:
@@ -111,9 +111,9 @@
         ssl.setup_ssl()
         ssl.set_accept_state()
         ssl.accept_ssl()
-        check = getattr(self, 'postConnectionCheck', Connection.serverPostConnectionCheck)
+        check = getattr(self, 'postConnectionCheck', self.serverPostConnectionCheck)
         if check is not None:
-            if not check(self.get_peer_cert(), self.addr[0]):
+            if not check(self.get_peer_cert(), ssl.addr[0]):
                 raise Checker.SSLVerificationError, 'post connection check failed'
         return ssl, addr
 
@@ -129,7 +129,7 @@
         self.setup_ssl()
         self.set_connect_state()
         ret = self.connect_ssl()
-        check = getattr(self, 'postConnectionCheck', Connection.clientPostConnectionCheck)
+        check = getattr(self, 'postConnectionCheck', self.clientPostConnectionCheck)
         if check is not None:
             if not check(self.get_peer_cert(), self.addr[0]):
                 raise Checker.SSLVerificationError, 'post connection check failed'


Index: m2crypto.spec
===================================================================
RCS file: /cvs/dist/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- m2crypto.spec	11 Feb 2006 04:26:54 -0000	1.20
+++ m2crypto.spec	19 Apr 2006 16:05:25 -0000	1.21
@@ -3,10 +3,11 @@
 Summary: Support for using OpenSSL in python scripts.
 Name: m2crypto
 Version: 0.15
-Release: 3.2
+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
 License: BSDish
 Group: System Environment/Libraries
 URL: http://sandbox.rulemaker.net/ngps/m2
@@ -22,6 +23,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .SSLServer
+%patch1 -p1 -b .Connection
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" ; export CFLAGS
@@ -52,6 +54,9 @@
 %{_libdir}/python%{pythonver}/site-packages/M2Crypto
 
 %changelog
+* Wed Apr 19 2006 Miloslav Trmac <mitr at redhat.com> - 0.15-4
+- Fix SSL.Connection.accept (#188742)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.15-3.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Apr 19 16:13:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 12:13:20 -0400
Subject: rpms/m2crypto/FC-5 m2crypto.spec,1.20,1.21
Message-ID: <200604191613.k3JGDKAX016647@cvs.devel.redhat.com>

Author: mitr

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

Modified Files:
	m2crypto.spec 
Log Message:
* Wed Apr 19 2006 Miloslav Trmac <mitr at redhat.com> - 0.15-3.2.fc5.1
- Fix SSL.Connection.accept (#188742)



Index: m2crypto.spec
===================================================================
RCS file: /cvs/dist/rpms/m2crypto/FC-5/m2crypto.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- m2crypto.spec	11 Feb 2006 04:26:54 -0000	1.20
+++ m2crypto.spec	19 Apr 2006 16:13:16 -0000	1.21
@@ -3,10 +3,11 @@
 Summary: Support for using OpenSSL in python scripts.
 Name: m2crypto
 Version: 0.15
-Release: 3.2
+Release: 3.2.fc5.1
 # 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
 License: BSDish
 Group: System Environment/Libraries
 URL: http://sandbox.rulemaker.net/ngps/m2
@@ -22,6 +23,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .SSLServer
+%patch1 -p1 -b .Connection
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" ; export CFLAGS
@@ -52,6 +54,9 @@
 %{_libdir}/python%{pythonver}/site-packages/M2Crypto
 
 %changelog
+* Wed Apr 19 2006 Miloslav Trmac <mitr at redhat.com> - 0.15-3.2.fc5.1
+- Fix SSL.Connection.accept (#188742)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.15-3.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Apr 19 16:13:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 12:13:36 -0400
Subject: rpms/m2crypto/FC-5 m2crypto-0.15-Connection.patch,NONE,1.1
Message-ID: <200604191613.k3JGDZCY016778@cvs.devel.redhat.com>

Author: mitr

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

Added Files:
	m2crypto-0.15-Connection.patch 
Log Message:
* Wed Apr 19 2006 Miloslav Trmac <mitr at redhat.com> - 0.15-3.2.fc5.1
- Fix SSL.Connection.accept (#188742)


m2crypto-0.15-Connection.patch:
 Connection.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE m2crypto-0.15-Connection.patch ---
--- m2crypto-0.15/M2Crypto/SSL/Connection.py.Connection	2006-04-19 17:55:18.000000000 +0200
+++ m2crypto-0.15/M2Crypto/SSL/Connection.py	2006-04-19 17:55:31.000000000 +0200
@@ -17,7 +17,7 @@
 #SSLError = getattr(__import__('M2Crypto.SSL', globals(), locals(), 'SSLError'), 'SSLError')
 from M2Crypto.SSL import SSLError
 
-def _serverPostConnectionCheck(peerX509, expectedHost):
+def _serverPostConnectionCheck(*args, **kw):
     return 1
 
 class Connection:
@@ -111,9 +111,9 @@
         ssl.setup_ssl()
         ssl.set_accept_state()
         ssl.accept_ssl()
-        check = getattr(self, 'postConnectionCheck', Connection.serverPostConnectionCheck)
+        check = getattr(self, 'postConnectionCheck', self.serverPostConnectionCheck)
         if check is not None:
-            if not check(self.get_peer_cert(), self.addr[0]):
+            if not check(self.get_peer_cert(), ssl.addr[0]):
                 raise Checker.SSLVerificationError, 'post connection check failed'
         return ssl, addr
 
@@ -129,7 +129,7 @@
         self.setup_ssl()
         self.set_connect_state()
         ret = self.connect_ssl()
-        check = getattr(self, 'postConnectionCheck', Connection.clientPostConnectionCheck)
+        check = getattr(self, 'postConnectionCheck', self.clientPostConnectionCheck)
         if check is not None:
             if not check(self.get_peer_cert(), self.addr[0]):
                 raise Checker.SSLVerificationError, 'post connection check failed'



From fedora-cvs-commits at redhat.com  Wed Apr 19 16:22:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 12:22:35 -0400
Subject: rpms/ipsec-tools/devel ipsec-tools.spec,1.24,1.25
Message-ID: <200604191622.k3JGMZf6001033@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/ipsec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1003

Modified Files:
	ipsec-tools.spec 
Log Message:
* Tue Apr 18 2006 Dan Walsh <dwalsh at redhat.com> - 0.6.5-1
- Update to latest upstream version
- Add MLS Patch to allow use of labeled networks
- Patch provided by Joy Latten <latten at austin.ibm.com>



Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ipsec-tools.spec	18 Apr 2006 20:15:42 -0000	1.24
+++ ipsec-tools.spec	19 Apr 2006 16:22:32 -0000	1.25
@@ -1,6 +1,6 @@
 Name: ipsec-tools
-Version: 0.6.4
-Release: 2
+Version: 0.6.5
+Release: 1
 Summary: Tools for configuring and using IPSEC
 License: BSD
 Group: System Environment/Base
@@ -16,7 +16,9 @@
 Patch2: isakmp.c.diff
 Patch5: ipsec-tools-0.5-64bit.patch
 #Patch6: ipsec-tools-0.6.1-openssl-098.patch
-Patch7: ipsec-tools-0.6.5-mls.patch
+Patch7: ipsec-tools-0.6.5-context.patch
+Patch8: ipsec-tools-0.6.5-context2.patch
+
 BuildPrereq: openssl-devel, krb5-devel, bison, flex
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: initscripts >= 7.31.11.EL-1
@@ -39,6 +41,7 @@
 
 mkdir -p kernel-headers/linux
 cp %{SOURCE1} %{SOURCE2} %{SOURCE5} %{SOURCE6} kernel-headers/linux
+./bootstrap
 
 %build
 sed -i 's|-Werror||g' configure
@@ -92,7 +95,8 @@
 %config(noreplace) /etc/racoon/racoon.conf
 
 %changelog
-* Tue Apr 18 2006 Dan Walsh <dwalsh at redhat.com> - 0.6.4-2
+* Tue Apr 18 2006 Dan Walsh <dwalsh at redhat.com> - 0.6.5-1
+- Update to latest upstream version
 - Add MLS Patch to allow use of labeled networks
 - Patch provided by Joy Latten <latten at austin.ibm.com>
 



From fedora-cvs-commits at redhat.com  Wed Apr 19 17:07:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 13:07:57 -0400
Subject: rpms/device-mapper/devel device-mapper.1.02.05.tgz.asc, NONE,
	1.1 .cvsignore, 1.13, 1.14 device-mapper.spec, 1.28,
	1.29 sources, 1.15, 1.16 upstream, 1.9,
	1.10 device-mapper-1.02.02-libpaths.patch, 1.1,
	NONE device-mapper-1.02.02-pkg-config.patch, 1.3,
	NONE device-mapper-1.02.02-selinux.patch, 1.1,
	NONE device-mapper-mknod.patch, 1.3,
	NONE device-mapper.1.00.20.tgz.asc, 1.1,
	NONE device-mapper.1.00.21.tgz.asc, 1.2,
	NONE device-mapper.1.01.00.tgz.asc, 1.1,
	NONE device-mapper.1.01.01.tgz.asc, 1.1,
	NONE device-mapper.1.01.02.tgz.asc, 1.1,
	NONE device-mapper.1.01.03.tgz.asc, 1.1,
	NONE device-mapper.1.01.04.tgz.asc, 1.1,
	NONE device-mapper.1.01.05.tgz.asc, 1.1, NONE
Message-ID: <200604191707.k3JH7vGP028071@cvs.devel.redhat.com>

Author: agk

Update of /cvs/dist/rpms/device-mapper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28029

Modified Files:
	.cvsignore device-mapper.spec sources upstream 
Added Files:
	device-mapper.1.02.05.tgz.asc 
Removed Files:
	device-mapper-1.02.02-libpaths.patch 
	device-mapper-1.02.02-pkg-config.patch 
	device-mapper-1.02.02-selinux.patch device-mapper-mknod.patch 
	device-mapper.1.00.20.tgz.asc device-mapper.1.00.21.tgz.asc 
	device-mapper.1.01.00.tgz.asc device-mapper.1.01.01.tgz.asc 
	device-mapper.1.01.02.tgz.asc device-mapper.1.01.03.tgz.asc 
	device-mapper.1.01.04.tgz.asc device-mapper.1.01.05.tgz.asc 
Log Message:
New upstream release (incorporating patches).



--- NEW FILE device-mapper.1.02.05.tgz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQBERmtoIoGRwVZ+LBcRAm35AKC3vmZ4+M0zW8YfAgchNadeQTYrtwCcDowq
zqgyj2rT23Cat7Ztki+SocE=
=3aJS
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/device-mapper/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	26 Sep 2005 20:59:39 -0000	1.13
+++ .cvsignore	19 Apr 2006 17:07:41 -0000	1.14
@@ -1 +1,2 @@
 device-mapper.1.01.05.tgz
+device-mapper.1.02.05.tgz


Index: device-mapper.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper/devel/device-mapper.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- device-mapper.spec	11 Feb 2006 02:25:03 -0000	1.28
+++ device-mapper.spec	19 Apr 2006 17:07:41 -0000	1.29
@@ -1,14 +1,11 @@
 Summary: device mapper library
 Name: device-mapper
-Version: 1.02.02
-Release: 3.2
+Version: 1.02.05
+Release: 1.0
 License: GPL
 Group: System Environment/Base
 URL: http://sources.redhat.com/dm
 Source0: %{name}.%{version}.tgz
-Patch0: device-mapper-1.02.02-selinux.patch
-Patch1: device-mapper-1.02.02-libpaths.patch
-Patch2: device-mapper-1.02.02-pkg-config.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: libselinux-devel, libsepol-devel
 
@@ -20,13 +17,10 @@
 
 %prep
 %setup -q -n %{name}.%{version}
-%patch0 -p1 -b .selinux
-%patch1 -p1 -b .libpaths
-%patch2 -p1 -b .pkg-config
 
 %build
 autoconf
-%configure --enable-static_link --with-user= --with-group= --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-dmeventd
+%configure --enable-static_link --with-user= --with-group= --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-dmeventd --enable-pkgconfig
 make
 
 %install
@@ -56,6 +50,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Alasdair Kergon <agk at redhat.com> - 1.02.05-1.0
+- New upstream release (incorporates patches).
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.02.02-3.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/device-mapper/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	2 Dec 2005 21:44:49 -0000	1.15
+++ sources	19 Apr 2006 17:07:41 -0000	1.16
@@ -1,3 +1 @@
-a2562b57e7cca026faa425fa5da92bbc  device-mapper.1.00.21.tgz
-42dd0610e24d4b4f2409a32a04e6e37f  device-mapper.1.01.04.tgz
-6ddd9de8366f38322367bbe8414a05c3  device-mapper.1.02.02.tgz
+9874ce0737e270a11bd94272670f216b  device-mapper.1.02.05.tgz


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/device-mapper/devel/upstream,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- upstream	26 Sep 2005 20:59:39 -0000	1.9
+++ upstream	19 Apr 2006 17:07:41 -0000	1.10
@@ -1 +1 @@
-device-mapper.1.01.05.tgz
+device-mapper.1.02.05.tgz


--- device-mapper-1.02.02-libpaths.patch DELETED ---


--- device-mapper-1.02.02-pkg-config.patch DELETED ---


--- device-mapper-1.02.02-selinux.patch DELETED ---


--- device-mapper-mknod.patch DELETED ---


--- device-mapper.1.00.20.tgz.asc DELETED ---


--- device-mapper.1.00.21.tgz.asc DELETED ---


--- device-mapper.1.01.00.tgz.asc DELETED ---


--- device-mapper.1.01.01.tgz.asc DELETED ---


--- device-mapper.1.01.02.tgz.asc DELETED ---


--- device-mapper.1.01.03.tgz.asc DELETED ---


--- device-mapper.1.01.04.tgz.asc DELETED ---


--- device-mapper.1.01.05.tgz.asc DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 19 17:19:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 13:19:06 -0400
Subject: rpms/device-mapper/devel device-mapper.1.02.05.tgz.asc, 1.1,
	1.2 sources, 1.16, 1.17
Message-ID: <200604191719.k3JHJ6PY022189@cvs.devel.redhat.com>

Author: agk

Update of /cvs/dist/rpms/device-mapper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22134

Modified Files:
	device-mapper.1.02.05.tgz.asc sources 
Log Message:
fix build



Index: device-mapper.1.02.05.tgz.asc
===================================================================
RCS file: /cvs/dist/rpms/device-mapper/devel/device-mapper.1.02.05.tgz.asc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- device-mapper.1.02.05.tgz.asc	19 Apr 2006 17:07:41 -0000	1.1
+++ device-mapper.1.02.05.tgz.asc	19 Apr 2006 17:19:04 -0000	1.2
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.1 (GNU/Linux)
 
-iD8DBQBERmtoIoGRwVZ+LBcRAm35AKC3vmZ4+M0zW8YfAgchNadeQTYrtwCcDowq
-zqgyj2rT23Cat7Ztki+SocE=
-=3aJS
+iD8DBQBERnBXIoGRwVZ+LBcRAmJIAKCdJuDx11nzyjaKHTapPS2US0a3ggCbBeFW
+aXVbLbkg1LLXmdeCBKR4wSo=
+=Ihw1
 -----END PGP SIGNATURE-----


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/device-mapper/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	19 Apr 2006 17:07:41 -0000	1.16
+++ sources	19 Apr 2006 17:19:04 -0000	1.17
@@ -1 +1 @@
-9874ce0737e270a11bd94272670f216b  device-mapper.1.02.05.tgz
+57d53e35e4254bbede0ec675eaba7939  device-mapper.1.02.05.tgz



From fedora-cvs-commits at redhat.com  Wed Apr 19 17:27:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 13:27:33 -0400
Subject: rpms/device-mapper/devel device-mapper.1.02.05.tgz.asc, 1.2,
	1.3 sources, 1.17, 1.18
Message-ID: <200604191727.k3JHRXUZ025256@cvs.devel.redhat.com>

Author: agk

Update of /cvs/dist/rpms/device-mapper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25197

Modified Files:
	device-mapper.1.02.05.tgz.asc sources 
Log Message:
fix makefile



Index: device-mapper.1.02.05.tgz.asc
===================================================================
RCS file: /cvs/dist/rpms/device-mapper/devel/device-mapper.1.02.05.tgz.asc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- device-mapper.1.02.05.tgz.asc	19 Apr 2006 17:19:04 -0000	1.2
+++ device-mapper.1.02.05.tgz.asc	19 Apr 2006 17:27:31 -0000	1.3
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.1 (GNU/Linux)
 
-iD8DBQBERnBXIoGRwVZ+LBcRAmJIAKCdJuDx11nzyjaKHTapPS2US0a3ggCbBeFW
-aXVbLbkg1LLXmdeCBKR4wSo=
-=Ihw1
+iD8DBQBERnKhIoGRwVZ+LBcRAlGOAKDSBlFCwDFB/mCp2ldFrLX2xRzqNACdEO+h
+v9URNjpx7vJSoWMDaQasjDM=
+=RUKa
 -----END PGP SIGNATURE-----


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/device-mapper/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	19 Apr 2006 17:19:04 -0000	1.17
+++ sources	19 Apr 2006 17:27:31 -0000	1.18
@@ -1 +1 @@
-57d53e35e4254bbede0ec675eaba7939  device-mapper.1.02.05.tgz
+e270baeb5b450e1ecb73f20c7ce42b9e  device-mapper.1.02.05.tgz



From fedora-cvs-commits at redhat.com  Wed Apr 19 17:38:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 13:38:13 -0400
Subject: rpms/selinux-policy/devel booleans-targeted.conf, 1.7,
	1.8 policy-20060411.patch, 1.7, 1.8 selinux-policy.spec, 1.176,
	1.177
Message-ID: <200604191738.k3JHcDMn026571@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	booleans-targeted.conf policy-20060411.patch 
	selinux-policy.spec 
Log Message:
* Wed Apr 19 2006 Dan Walsh <dwalsh at redhat.com> 2.2.34-1
- Update to latest from upstream
- Allow selinux-policy to be removed and kernel not to crash



Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/booleans-targeted.conf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- booleans-targeted.conf	6 Apr 2006 19:08:54 -0000	1.7
+++ booleans-targeted.conf	19 Apr 2006 17:37:38 -0000	1.8
@@ -88,7 +88,7 @@
 
 # Run SSI execs in system CGI script domain.
 # 
-httpd_ssi_exec = true
+httpd_ssi_exec = false
 
 # Allow http daemon to communicate with the TTY
 # 

policy-20060411.patch:
 kernel/devices.if    |   20 ++++++++++++++++++++
 kernel/files.if      |   35 +++++++++++++++++++++++++++++++++++
 kernel/mls.te        |    1 +
 services/pegasus.te  |    8 ++++++++
 services/samba.te    |    2 +-
 system/init.te       |    1 +
 system/libraries.fc  |    2 +-
 system/sysnetwork.te |    2 ++
 system/unconfined.if |   18 ++++++++++++++++++
 system/userdomain.if |    1 +
 system/xen.if        |   18 ++++++++++++++++++
 system/xen.te        |    1 +
 12 files changed, 107 insertions(+), 2 deletions(-)

Index: policy-20060411.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060411.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- policy-20060411.patch	19 Apr 2006 11:55:43 -0000	1.7
+++ policy-20060411.patch	19 Apr 2006 17:37:38 -0000	1.8
@@ -1,21 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-2.2.33/policy/modules/apps/java.te
---- nsaserefpolicy/policy/modules/apps/java.te	2006-04-18 22:49:59.000000000 -0400
-+++ serefpolicy-2.2.33/policy/modules/apps/java.te	2006-04-18 23:10:07.000000000 -0400
-@@ -7,8 +7,11 @@
- #
- 
- type java_t;
-+domain_type(java_t)
-+
- type java_exec_t;
- init_system_domain(java_t,java_exec_t)
-+files_type(java_exec_t)
- 
- ########################################
- #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.33/policy/modules/kernel/devices.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.34/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2006-04-18 22:49:59.000000000 -0400
-+++ serefpolicy-2.2.33/policy/modules/kernel/devices.if	2006-04-18 23:10:07.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/kernel/devices.if	2006-04-19 12:56:26.000000000 -0400
 @@ -2874,3 +2874,23 @@
  
  	typeattribute $1 devices_unconfined_type;
@@ -40,9 +25,9 @@
 +	dontaudit $1 device_node:dir_file_class_set getattr;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.33/policy/modules/kernel/files.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.34/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-04-18 22:49:59.000000000 -0400
-+++ serefpolicy-2.2.33/policy/modules/kernel/files.if	2006-04-19 07:51:01.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/kernel/files.if	2006-04-19 12:56:26.000000000 -0400
 @@ -1268,6 +1268,26 @@
  
  ########################################
@@ -92,9 +77,9 @@
  ## <summary>
  ##	Read files in /etc that are dynamically
  ##	created on boot, such as mtab.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.33/policy/modules/kernel/mls.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.34/policy/modules/kernel/mls.te
 --- nsaserefpolicy/policy/modules/kernel/mls.te	2006-03-07 10:31:09.000000000 -0500
-+++ serefpolicy-2.2.33/policy/modules/kernel/mls.te	2006-04-18 23:10:07.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/kernel/mls.te	2006-04-19 12:56:26.000000000 -0400
 @@ -60,6 +60,7 @@
  
  ifdef(`enable_mls',`
@@ -103,44 +88,9 @@
  range_transition kernel_t init_exec_t s0 - s15:c0.c255;
  range_transition kernel_t lvm_exec_t s0 - s15:c0.c255;
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.2.33/policy/modules/services/cups.fc
---- nsaserefpolicy/policy/modules/services/cups.fc	2006-03-23 14:33:30.000000000 -0500
-+++ serefpolicy-2.2.33/policy/modules/services/cups.fc	2006-04-18 23:10:07.000000000 -0400
-@@ -35,7 +35,8 @@
- /usr/share/hplip/hpssd.py --	gen_context(system_u:object_r:hplip_exec_t,s0)
- 
- /var/cache/alchemist/printconf.* gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
--/var/cache/foomatic(/.*)? --	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
-+/var/cache/foomatic(/.*)? 	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
-+/var/cache/cups(/.*)? 		gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
- 
- /var/lib/cups/certs	-d	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
- /var/lib/cups/certs/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.2.33/policy/modules/services/ftp.te
---- nsaserefpolicy/policy/modules/services/ftp.te	2006-04-12 13:44:37.000000000 -0400
-+++ serefpolicy-2.2.33/policy/modules/services/ftp.te	2006-04-18 23:10:07.000000000 -0400
-@@ -126,6 +126,7 @@
- seutil_dontaudit_search_config(ftpd_t)
- 
- sysnet_read_config(ftpd_t)
-+sysnet_use_ldap(ftpd_t)
- 
- userdom_dontaudit_search_sysadm_home_dirs(ftpd_t)
- userdom_dontaudit_use_unpriv_user_fds(ftpd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.fc serefpolicy-2.2.33/policy/modules/services/pegasus.fc
---- nsaserefpolicy/policy/modules/services/pegasus.fc	2005-11-07 15:10:44.000000000 -0500
-+++ serefpolicy-2.2.33/policy/modules/services/pegasus.fc	2006-04-19 07:45:04.000000000 -0400
-@@ -3,6 +3,7 @@
- /etc/Pegasus/pegasus_current.conf	gen_context(system_u:object_r:pegasus_data_t,s0)
- 
- /usr/sbin/cimserver		--	gen_context(system_u:object_r:pegasus_exec_t,s0)
-+
- /usr/sbin/init_repository	-- 	gen_context(system_u:object_r:pegasus_exec_t,s0)
- 
- /var/lib/Pegasus(/.*)?	                gen_context(system_u:object_r:pegasus_data_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.33/policy/modules/services/pegasus.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.34/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.2.33/policy/modules/services/pegasus.te	2006-04-19 07:53:45.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/services/pegasus.te	2006-04-19 12:56:26.000000000 -0400
 @@ -79,11 +79,16 @@
  corenet_tcp_connect_pegasus_https_port(pegasus_t)
  corenet_tcp_connect_generic_port(pegasus_t)
@@ -175,56 +125,9 @@
  ')
  
  optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.33/policy/modules/services/postfix.te
---- nsaserefpolicy/policy/modules/services/postfix.te	2006-04-18 22:50:00.000000000 -0400
-+++ serefpolicy-2.2.33/policy/modules/services/postfix.te	2006-04-18 23:10:07.000000000 -0400
-@@ -315,6 +315,7 @@
- 
- kernel_read_kernel_sysctls(postfix_map_t)
- kernel_dontaudit_list_proc(postfix_map_t)
-+kernel_dontaudit_read_system_state(postfix_map_t)
- 
- corenet_tcp_sendrecv_all_if(postfix_map_t)
- corenet_udp_sendrecv_all_if(postfix_map_t)
-@@ -360,6 +361,7 @@
- ifdef(`targeted_policy',`
- 	# FIXME: would be better to use a run interface
- 	role system_r types postfix_map_t;
-+	term_dontaudit_use_generic_ptys(postfix_map_t)
- ')
- 
- tunable_policy(`read_default_t',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.if serefpolicy-2.2.33/policy/modules/services/postgresql.if
---- nsaserefpolicy/policy/modules/services/postgresql.if	2006-02-10 17:05:19.000000000 -0500
-+++ serefpolicy-2.2.33/policy/modules/services/postgresql.if	2006-04-18 23:10:07.000000000 -0400
-@@ -113,10 +113,12 @@
- #
- interface(`postgresql_stream_connect',`
- 	gen_require(`
--		type postgresql_t, postgresql_var_run_t;
-+		type postgresql_t, postgresql_var_run_t, postgresql_tmp_t;
- 	')
- 
- 	files_search_pids($1)
- 	allow $1 postgresql_t:unix_stream_socket connectto;
- 	allow $1 postgresql_var_run_t:sock_file write;
-+        # Some versions of postgresql put the sock file in /tmp
-+	allow $1 postgresql_tmp_t:sock_file write;
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.te serefpolicy-2.2.33/policy/modules/services/privoxy.te
---- nsaserefpolicy/policy/modules/services/privoxy.te	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.2.33/policy/modules/services/privoxy.te	2006-04-18 23:10:07.000000000 -0400
-@@ -50,6 +50,7 @@
- corenet_non_ipsec_sendrecv(privoxy_t)
- corenet_tcp_bind_http_cache_port(privoxy_t)
- corenet_tcp_connect_http_port(privoxy_t)
-+corenet_tcp_connect_http_cache_port(privoxy_t)
- corenet_tcp_connect_ftp_port(privoxy_t)
- corenet_tcp_connect_tor_port(privoxy_t)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.33/policy/modules/services/samba.te
---- nsaserefpolicy/policy/modules/services/samba.te	2006-04-18 22:50:00.000000000 -0400
-+++ serefpolicy-2.2.33/policy/modules/services/samba.te	2006-04-18 23:10:07.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.34/policy/modules/services/samba.te
+--- nsaserefpolicy/policy/modules/services/samba.te	2006-04-19 12:23:07.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/services/samba.te	2006-04-19 12:56:26.000000000 -0400
 @@ -106,8 +106,8 @@
  files_tmp_filetrans(samba_net_t, samba_net_tmp_t, { file dir })
  
@@ -235,94 +138,9 @@
  
  kernel_read_proc_symlinks(samba_net_t)
  
-@@ -160,8 +160,10 @@
- 	corenet_non_ipsec_sendrecv(samba_net_t)
- 	corenet_tcp_bind_all_nodes(samba_net_t)
- 	sysnet_read_config(samba_net_t)
-+        corenet_tcp_connect_ldap_port(samba_net_t)
- ')
- 
-+
- optional_policy(`
- 	nscd_socket_use(samba_net_t)
- ')
-@@ -269,6 +271,7 @@
- 
- init_use_fds(smbd_t)
- init_use_script_ptys(smbd_t)
-+init_rw_utmp(smbd_t)
- 
- libs_use_ld_so(smbd_t)
- libs_use_shared_libs(smbd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-2.2.33/policy/modules/services/spamassassin.fc
---- nsaserefpolicy/policy/modules/services/spamassassin.fc	2005-12-01 17:57:16.000000000 -0500
-+++ serefpolicy-2.2.33/policy/modules/services/spamassassin.fc	2006-04-18 23:10:07.000000000 -0400
-@@ -1,5 +1,5 @@
- 
--/usr/bin/sa-learn	--	gen_context(system_u:object_r:spamd_exec_t,s0)
-+/usr/bin/sa-learn	--	gen_context(system_u:object_r:spamc_exec_t,s0)
- /usr/bin/spamc		--	gen_context(system_u:object_r:spamc_exec_t,s0)
- /usr/bin/spamd		--	gen_context(system_u:object_r:spamd_exec_t,s0)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.33/policy/modules/services/xserver.if
---- nsaserefpolicy/policy/modules/services/xserver.if	2006-04-06 15:31:54.000000000 -0400
-+++ serefpolicy-2.2.33/policy/modules/services/xserver.if	2006-04-18 23:10:07.000000000 -0400
-@@ -1070,3 +1070,24 @@
- 
- 	dontaudit $1 xdm_xserver_t:tcp_socket { read write };
- ')
-+
-+########################################
-+## <summary>
-+##	Allow read and write to
-+##	a XDM X server socket.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain to allow
-+##	</summary>
-+## </param>
-+#
-+interface(`xserver_rw_xdm_sockets',`
-+	gen_require(`
-+		type xdm_xserver_tmp_t;
-+	')
-+
-+	allow $1 xdm_xserver_tmp_t:dir search;
-+	allow $1 xdm_xserver_tmp_t:sock_file { read write };
-+')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.33/policy/modules/system/authlogin.te
---- nsaserefpolicy/policy/modules/system/authlogin.te	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.2.33/policy/modules/system/authlogin.te	2006-04-18 23:10:07.000000000 -0400
-@@ -173,9 +173,13 @@
- dev_setattr_video_dev(pam_console_t)
- dev_getattr_xserver_misc_dev(pam_console_t)
- dev_setattr_xserver_misc_dev(pam_console_t)
-+dev_read_urand(pam_console_t)
- 
- fs_search_auto_mountpoints(pam_console_t)
- 
-+miscfiles_read_localization(pam_console_t)
-+miscfiles_read_certs(pam_console_t)
-+
- storage_getattr_fixed_disk_dev(pam_console_t)
- storage_setattr_fixed_disk_dev(pam_console_t)
- storage_getattr_removable_dev(pam_console_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.33/policy/modules/system/fstools.te
---- nsaserefpolicy/policy/modules/system/fstools.te	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.2.33/policy/modules/system/fstools.te	2006-04-18 23:10:07.000000000 -0400
-@@ -77,6 +77,7 @@
- dev_getattr_usbfs_dirs(fsadm_t)
- # Access to /dev/mapper/control
- dev_rw_lvm_control(fsadm_t)
-+dev_dontaudit_getattr_all_device_nodes(fsadm_t)
- 
- fs_search_auto_mountpoints(fsadm_t)
- fs_getattr_xattr_fs(fsadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.33/policy/modules/system/init.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.34/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2006-04-18 22:50:00.000000000 -0400
-+++ serefpolicy-2.2.33/policy/modules/system/init.te	2006-04-18 23:10:07.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/init.te	2006-04-19 12:56:26.000000000 -0400
 @@ -352,6 +352,7 @@
  files_mounton_isid_type_dirs(initrc_t)
  files_list_default(initrc_t)
@@ -331,94 +149,21 @@
  
  libs_rw_ld_so_cache(initrc_t)
  libs_use_ld_so(initrc_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.33/policy/modules/system/libraries.fc
---- nsaserefpolicy/policy/modules/system/libraries.fc	2006-04-18 22:50:00.000000000 -0400
-+++ serefpolicy-2.2.33/policy/modules/system/libraries.fc	2006-04-18 23:10:07.000000000 -0400
-@@ -83,7 +83,6 @@
- /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libGL(core)?\.so(\.[^/]*)*             --      	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libnvidia.*\.so(\.[^/]*)*              --      	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libXvMCNVIDIA\.so.*            --      	gen_context(system_u:object_r:textrel_shlib_t,s0)
--/usr/lib(64)?/vmware(.*/)?VmPerl\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
- /usr/(local/)?lib(64)?/wine/.*\.so  		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/(local/)?lib/libfame-.*\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -189,6 +188,8 @@
- 
- # vmware 
- /usr/lib(64)?/vmware/lib(/.*)?/libgdk-x11-.*\.so.*  -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/lib(64)?/vmware/lib(/.*)?/HConfig.so  -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/lib(64)?/vmware/(.*/)?VmPerl\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
- # Java, Sun Microsystems (JPackage SRPM)
- /usr/(.*/)?jre.*/libdeploy.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -223,3 +224,5 @@
- /var/spool/postfix/lib(64)?/lib.*\.so.*	--	gen_context(system_u:object_r:shlib_t,s0)
- /var/spool/postfix/lib(64)?/[^/]*/lib.*\.so.* -- gen_context(system_u:object_r:shlib_t,s0)
- /var/spool/postfix/lib(64)?/devfsd/.*\.so.* -- gen_context(system_u:object_r:shlib_t,s0)
-+/usr/NX/lib/libXcomp.so.*	--  gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/NX/lib/libjpeg.so.* 	--  gen_context(system_u:object_r:textrel_shlib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.if serefpolicy-2.2.33/policy/modules/system/mount.if
---- nsaserefpolicy/policy/modules/system/mount.if	2006-03-02 18:45:56.000000000 -0500
-+++ serefpolicy-2.2.33/policy/modules/system/mount.if	2006-04-18 23:10:07.000000000 -0400
-@@ -113,3 +113,25 @@
- 	allow $1 mount_t:udp_socket rw_socket_perms;
- ')
- 
-+########################################
-+## <summary>
-+##	Execute mount in the unconfined_mount domain.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	The type of the process performing this action.
-+##	</summary>
-+## </param>
-+#
-+interface(`unconfined_mount_domtrans',`
-+	gen_require(`
-+		type unconfined_mount_t, mount_exec_t;
-+	')
-+
-+	domain_auto_trans($1,mount_exec_t,unconfined_mount_t)
-+
-+	allow $1 unconfined_mount_t:fd use;
-+	allow unconfined_mount_t $1:fd use;
-+	allow unconfined_mount_t $1:fifo_file rw_file_perms;
-+	allow unconfined_mount_t $1:process sigchld;
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.33/policy/modules/system/mount.te
---- nsaserefpolicy/policy/modules/system/mount.te	2006-04-12 13:44:38.000000000 -0400
-+++ serefpolicy-2.2.33/policy/modules/system/mount.te	2006-04-18 23:10:07.000000000 -0400
-@@ -151,3 +151,12 @@
- optional_policy(`
- 	samba_domtrans_smbmount(mount_t)
- ')
-+
-+ifdef(`targeted_policy', `
-+	type unconfined_mount_t;
-+	domain_type(unconfined_mount_t)
-+	role system_r types unconfined_mount_t;
-+	domain_entry_file(unconfined_mount_t,mount_exec_t)
-+	files_manage_etc_runtime_files(unconfined_mount_t)
-+	unconfined_domain(unconfined_mount_t)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.33/policy/modules/system/selinuxutil.if
---- nsaserefpolicy/policy/modules/system/selinuxutil.if	2006-03-29 14:18:17.000000000 -0500
-+++ serefpolicy-2.2.33/policy/modules/system/selinuxutil.if	2006-04-18 23:10:07.000000000 -0400
-@@ -697,8 +697,8 @@
- 
- 	files_search_etc($1)
- 	allow $1 selinux_config_t:dir search;
--	allow $1 file_context_t:dir r_dir_perms;
--	allow $1 file_context_t:file rw_file_perms;
-+	allow $1 file_context_t:dir rw_dir_perms;
-+	allow $1 file_context_t:file create_file_perms;
- 	allow $1 file_context_t:lnk_file { getattr read };
- ')
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.2.33/policy/modules/system/sysnetwork.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.34/policy/modules/system/libraries.fc
+--- nsaserefpolicy/policy/modules/system/libraries.fc	2006-04-19 12:23:07.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/libraries.fc	2006-04-19 12:56:29.000000000 -0400
+@@ -113,7 +113,7 @@
+ /usr/lib(64)?/libstdc\+\+\.so\.2\.7\.2\.8 --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libg\+\+\.so\.2\.7\.2\.8	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libglide3\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/usr/lib(64)?/libglide-v[0-9]*\.so.* 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/libglide3-v[0-9]*\.so.* 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libdv\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/helix/plugins/oggfformat\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/helix/plugins/theorarend\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.2.34/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2006-03-24 11:15:53.000000000 -0500
-+++ serefpolicy-2.2.33/policy/modules/system/sysnetwork.te	2006-04-18 23:44:30.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/sysnetwork.te	2006-04-19 12:56:26.000000000 -0400
 @@ -248,6 +248,7 @@
  
  optional_policy(`
@@ -433,9 +178,9 @@
  	xen_append_log(ifconfig_t)
 +	xen_dontaudit_rw_unix_stream_sockets(ifconfig_t)
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.33/policy/modules/system/unconfined.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.34/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-04-12 13:44:38.000000000 -0400
-+++ serefpolicy-2.2.33/policy/modules/system/unconfined.if	2006-04-19 07:53:34.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/unconfined.if	2006-04-19 12:56:26.000000000 -0400
 @@ -224,6 +224,24 @@
  
  ########################################
@@ -461,37 +206,9 @@
  ##	Send generic signals to the unconfined domain.
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.33/policy/modules/system/unconfined.te
---- nsaserefpolicy/policy/modules/system/unconfined.te	2006-04-18 22:50:00.000000000 -0400
-+++ serefpolicy-2.2.33/policy/modules/system/unconfined.te	2006-04-18 23:10:07.000000000 -0400
-@@ -37,10 +37,13 @@
- 	logging_domtrans_auditctl(unconfined_t)
- 
- 	seutil_domtrans_restorecon(unconfined_t)
-+	seutil_domtrans_semanage(unconfined_t)
- 
- 	userdom_unconfined(unconfined_t)
- 	userdom_priveleged_home_dir_manager(unconfined_t)
- 
-+	unconfined_mount_domtrans(unconfined_t)
-+
- 	optional_policy(`
- 		ada_domtrans(unconfined_t)
- 	')
-@@ -140,10 +143,6 @@
- 	')
- 
- 	optional_policy(`
--		seutil_domtrans_semanage(unconfined_t)
--	')
--
--	optional_policy(`
- 		sysnet_domtrans_dhcpc(unconfined_t)
- 	')
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.33/policy/modules/system/userdomain.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.34/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-04-18 22:50:01.000000000 -0400
-+++ serefpolicy-2.2.33/policy/modules/system/userdomain.if	2006-04-18 23:10:07.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/userdomain.if	2006-04-19 12:56:26.000000000 -0400
 @@ -4171,6 +4171,7 @@
  		type user_home_dir_t;
  	')
@@ -500,9 +217,9 @@
  	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.33/policy/modules/system/xen.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.2.34/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2006-03-23 16:08:51.000000000 -0500
-+++ serefpolicy-2.2.33/policy/modules/system/xen.if	2006-04-18 23:44:30.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/xen.if	2006-04-19 12:56:26.000000000 -0400
 @@ -47,6 +47,24 @@
  
  ########################################
@@ -528,9 +245,9 @@
  ##	Connect to xenstored over an unix stream socket.
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.2.33/policy/modules/system/xen.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.2.34/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-04-18 22:50:01.000000000 -0400
-+++ serefpolicy-2.2.33/policy/modules/system/xen.te	2006-04-18 23:45:51.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/xen.te	2006-04-19 12:56:26.000000000 -0400
 @@ -125,6 +125,7 @@
  
  files_read_etc_files(xend_t)
@@ -539,15 +256,3 @@
  
  storage_raw_read_fixed_disk(xend_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.2.33/Rules.modular
---- nsaserefpolicy/Rules.modular	2006-03-23 14:33:29.000000000 -0500
-+++ serefpolicy-2.2.33/Rules.modular	2006-04-18 23:10:07.000000000 -0400
-@@ -208,7 +208,7 @@
- #
- $(APPDIR)/customizable_types: $(BASE_CONF)
- 	@mkdir -p $(APPDIR)
--	$(verbose) $(GREP) '^[[:blank:]]*type .*customizable' $< | cut -d',' -f1 | cut -d' ' -f2 | $(SORT) -u > $(TMPDIR)/customizable_types
-+	$(verbose) $(GREP) '^[[:blank:]]*type .*customizable' $< | cut -d';' -f1 | cut -d',' -f1 | cut -d' ' -f2 | $(SORT) -u > $(TMPDIR)/customizable_types
- 	$(verbose) install -m 644 $(TMPDIR)/customizable_types $@ 
- 
- ########################################


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- selinux-policy.spec	19 Apr 2006 11:55:43 -0000	1.176
+++ selinux-policy.spec	19 Apr 2006 17:37:38 -0000	1.177
@@ -15,7 +15,7 @@
 %define CHECKPOLICYVER 1.30.1-2
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.33
+Version: 2.2.34
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -233,6 +233,15 @@
 ">> /etc/selinux/config
 fi
 
+%postun
+setenforce 0 2> /dev/null
+if [ ! -s /etc/selinux/config ]; then
+	echo "SELINUX=disabled" > /etc/selinux/config
+else
+	sed -i 's/^SELINUX=.*/SELINUX=disabled/g' /etc/selinux/config
+fi
+
+
 %if %{BUILD_TARGETED}
 %package targeted
 Summary: SELinux targeted base policy
@@ -321,6 +330,10 @@
 %endif
 
 %changelog
+* Wed Apr 19 2006 Dan Walsh <dwalsh at redhat.com> 2.2.34-1
+- Update to latest from upstream
+- Allow selinux-policy to be removed and kernel not to crash
+
 * Tue Apr 18 2006 Dan Walsh <dwalsh at redhat.com> 2.2.33-1
 - Update to latest from upstream
 - Add James Antill patch for xen



From fedora-cvs-commits at redhat.com  Wed Apr 19 17:40:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 13:40:25 -0400
Subject: rpms/device-mapper/devel device-mapper.1.02.05.tgz.asc, 1.3,
	1.4 device-mapper.spec, 1.29, 1.30 sources, 1.18, 1.19
Message-ID: <200604191740.k3JHePnW026794@cvs.devel.redhat.com>

Author: agk

Update of /cvs/dist/rpms/device-mapper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26733

Modified Files:
	device-mapper.1.02.05.tgz.asc device-mapper.spec sources 
Log Message:
exclude dmeventd from build



Index: device-mapper.1.02.05.tgz.asc
===================================================================
RCS file: /cvs/dist/rpms/device-mapper/devel/device-mapper.1.02.05.tgz.asc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- device-mapper.1.02.05.tgz.asc	19 Apr 2006 17:27:31 -0000	1.3
+++ device-mapper.1.02.05.tgz.asc	19 Apr 2006 17:39:56 -0000	1.4
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.1 (GNU/Linux)
 
-iD8DBQBERnKhIoGRwVZ+LBcRAlGOAKDSBlFCwDFB/mCp2ldFrLX2xRzqNACdEO+h
-v9URNjpx7vJSoWMDaQasjDM=
-=RUKa
+iD8DBQBERnRZIoGRwVZ+LBcRAgAhAKDn+e/iwaW1lmarQHpGyBWYWnu56gCgxj/4
+eGYDs8Ca81ahd9CFvbcneW8=
+=Tlsd
 -----END PGP SIGNATURE-----


Index: device-mapper.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper/devel/device-mapper.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- device-mapper.spec	19 Apr 2006 17:07:41 -0000	1.29
+++ device-mapper.spec	19 Apr 2006 17:39:56 -0000	1.30
@@ -20,7 +20,7 @@
 
 %build
 autoconf
-%configure --enable-static_link --with-user= --with-group= --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-dmeventd --enable-pkgconfig
+%configure --enable-static_link --with-user= --with-group= --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig
 make
 
 %install
@@ -39,19 +39,17 @@
 %doc COPYING COPYING.LIB INSTALL INTRO README VERSION WHATS_NEW
 %{_libdir}/libdevmapper.so*
 %{_libdir}/libdevmapper.a*
-%{_libdir}/libdevmapper-event.so*
-%{_libdir}/libdevmapper-event.a*
 %{_sbindir}/dmsetup
 %{_sbindir}/dmsetup.static
 %{_mandir}/*/*
 %{_includedir}/libdevmapper.h
-%{_includedir}/libdevmapper-event.h
 /usr/%{_lib}/pkgconfig/*.pc
 
 
 %changelog
 * Wed Apr 19 2006 Alasdair Kergon <agk at redhat.com> - 1.02.05-1.0
 - New upstream release (incorporates patches).
+- Exclude dmeventd (no kernel support yet).
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.02.02-3.2
 - bump again for double-long bug on ppc(64)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/device-mapper/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	19 Apr 2006 17:27:31 -0000	1.18
+++ sources	19 Apr 2006 17:39:56 -0000	1.19
@@ -1 +1 @@
-e270baeb5b450e1ecb73f20c7ce42b9e  device-mapper.1.02.05.tgz
+e5cfc57a6e36af883dfedd9e9106f97e  device-mapper.1.02.05.tgz



From fedora-cvs-commits at redhat.com  Wed Apr 19 17:47:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 13:47:16 -0400
Subject: rpms/thunderbird/devel .cvsignore, 1.10, 1.11 sources, 1.13,
	1.14 thunderbird.spec, 1.69,
	1.70 firefox-1.5.0.1-dumpstack.patch, 1.1, NONE
Message-ID: <200604191747.k3JHlGXZ004938@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/thunderbird/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4391

Modified Files:
	.cvsignore sources thunderbird.spec 
Removed Files:
	firefox-1.5.0.1-dumpstack.patch 
Log Message:
* Wed Apr 19 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-2
- Update to 1.5.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	28 Jan 2006 06:15:15 -0000	1.10
+++ .cvsignore	19 Apr 2006 17:47:14 -0000	1.11
@@ -8,3 +8,5 @@
 thunderbird-1.5rc1-source.tar.bz2
 thunderbird-1.5-source.tar.bz2
 thunderbird-langpacks-20060127.tar.bz2
+thunderbird-langpacks-1.5.0.2-20060419.tar.bz2
+thunderbird-1.5.0.2-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	28 Jan 2006 06:15:16 -0000	1.13
+++ sources	19 Apr 2006 17:47:14 -0000	1.14
@@ -1,2 +1,2 @@
-781c1cd1a01583d9b666d8c2fe4288e6  thunderbird-1.5-source.tar.bz2
-df32df3b18b0f9af5687d8a0cab08782  thunderbird-langpacks-20060127.tar.bz2
+8e8a91c64ae69aec4fd472b74962f16f  thunderbird-langpacks-1.5.0.2-20060419.tar.bz2
+4b344a7b54f42a5f1259e074b8d93503  thunderbird-1.5.0.2-source.tar.bz2


Index: thunderbird.spec
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- thunderbird.spec	17 Mar 2006 04:46:56 -0000	1.69
+++ thunderbird.spec	19 Apr 2006 17:47:14 -0000	1.70
@@ -7,8 +7,8 @@
 
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
-Version:	1.5
-Release:	7
+Version:	1.5.0.2
+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-20060127.tar.bz2
+Source1:        thunderbird-langpacks-%{version}-20060419.tar.bz2
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
 Source12:       thunderbird-redhat-default-prefs.js
@@ -34,7 +34,6 @@
 Patch4:         firefox-1.5-with-system-nss.patch
 Patch5:         firefox-1.1-visibility.patch
 Patch6:         firefox-1.1-nss-system-nspr.patch
-Patch7:         firefox-1.5.0.1-dumpstack.patch
 
 Patch10:        thunderbird-0.7.3-psfonts.patch
 Patch11:        thunderbird-0.7.3-gnome-uriloader.patch
@@ -96,7 +95,6 @@
 %endif
 
 %patch6 -p1
-%patch7 -p0
 %patch10 -p1 -b .psfonts
 %patch11 -p1 -b .gnome-uriloader
 %patch24 -p1
@@ -217,6 +215,9 @@
 #===============================================================================
 
 %changelog
+* Wed Apr 19 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-2
+- Update to 1.5.0.2
+
 * Thu Mar 16 2006 Christopher Aillon <caillon at redhat.com> - 1.5-7
 - Bring the other arches back
 


--- firefox-1.5.0.1-dumpstack.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 19 18:19:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 14:19:25 -0400
Subject: rpms/thunderbird/FC-4 .cvsignore, 1.7,
	1.8 firefox-1.0-gcc4-compile.patch, 1.1, 1.2 sources, 1.9,
	1.10 thunderbird.spec, 1.39, 1.40
Message-ID: <200604191819.k3JIJPD5031205@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	.cvsignore firefox-1.0-gcc4-compile.patch sources 
	thunderbird.spec 
Log Message:
* Wed Apr 19 2006 Christopher Aillon <caillon at redhat.com> 1.0.8-1.1.fc4
- Update to 1.0.8



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Jul 2005 21:59:56 -0000	1.7
+++ .cvsignore	19 Apr 2006 18:19:21 -0000	1.8
@@ -4,3 +4,4 @@
 thunderbird-1.0rc-source.tar.bz2
 thunderbird-1.0-source.tar.bz2
 thunderbird-1.0.6-source.tar.bz2
+thunderbird-1.0.8-source.tar.bz2

firefox-1.0-gcc4-compile.patch:
 gfx/src/freetype/nsFreeType.cpp                   |    2 +-
 netwerk/protocol/http/src/nsHttpConnectionMgr.cpp |    4 ++--
 widget/src/gtk2/nsDragService.cpp                 |   10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

Index: firefox-1.0-gcc4-compile.patch
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/FC-4/firefox-1.0-gcc4-compile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-1.0-gcc4-compile.patch	6 Mar 2005 04:14:07 -0000	1.1
+++ firefox-1.0-gcc4-compile.patch	19 Apr 2006 18:19:21 -0000	1.2
@@ -32,39 +32,6 @@
  
      switch (name) {
      case MAX_CONNECTIONS:
-Index: security/nss/lib/pki1/oiddata.h
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/pki1/oiddata.h,v
-retrieving revision 1.1
-diff -u -r1.1 oiddata.h
---- security/nss/lib/pki1/oiddata.h	4 Jan 2002 05:22:07 -0000	1.1
-+++ security/nss/lib/pki1/oiddata.h	4 Mar 2005 19:59:58 -0000
-@@ -43,9 +43,6 @@
- #include "nsspki1t.h"
- #endif /* NSSPKI1T_H */
- 
--extern const NSSOID nss_builtin_oids[];
--extern const PRUint32 nss_builtin_oid_count;
--
- /*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
- /*extern const PRUint32 nss_attribute_type_alias_count;*/
- 
-Index: security/nss/lib/pki1/pki1.h
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/pki1/pki1.h,v
-retrieving revision 1.2
-diff -u -r1.2 pki1.h
---- security/nss/lib/pki1/pki1.h	19 Jul 2001 20:40:42 -0000	1.2
-+++ security/nss/lib/pki1/pki1.h	4 Mar 2005 19:59:59 -0000
-@@ -58,6 +58,8 @@
- /* fgmr 19990505 moved these here from oiddata.h */
- extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];
- extern const PRUint32 nss_attribute_type_alias_count;
-+extern const NSSOID nss_builtin_oids[];
-+extern const PRUint32 nss_builtin_oid_count;
- 
- /*
-  * NSSOID
 Index: widget/src/gtk2/nsDragService.cpp
 ===================================================================
 RCS file: /cvsroot/mozilla/widget/src/gtk2/nsDragService.cpp,v


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Sep 2005 02:46:23 -0000	1.9
+++ sources	19 Apr 2006 18:19:21 -0000	1.10
@@ -1 +1 @@
-e6388feb0ffcd189af779f165c124b4d  thunderbird-1.0.7-source.tar.bz2
+c8bbe2538f6238d72ad3521b9ccc3337  thunderbird-1.0.8-source.tar.bz2


Index: thunderbird.spec
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/FC-4/thunderbird.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- thunderbird.spec	30 Sep 2005 02:46:23 -0000	1.39
+++ thunderbird.spec	19 Apr 2006 18:19:21 -0000	1.40
@@ -7,7 +7,7 @@
 
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
-Version:	1.0.7
+Version:	1.0.8
 Release:	1.1.fc4
 Epoch:		0
 URL:		http://www.mozilla.org/projects/thunderbird/
@@ -198,6 +198,9 @@
 #===============================================================================
 
 %changelog
+* Wed Apr 19 2006 Christopher Aillon <caillon at redhat.com> 1.0.8-1.1.fc4
+- Update to 1.0.8
+
 * Thu Sep 29 2005 Christopher Aillon <caillon at redhat.com> 1.0.7-1.1.fc4
 - Update to 1.0.7, containing fixes for:
   CAN-2005-2701 CAN-2005-2702 CAN-2005-2703 CAN-2005-2704



From fedora-cvs-commits at redhat.com  Wed Apr 19 18:27:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 14:27:16 -0400
Subject: rpms/thunderbird/devel thunderbird.spec, 1.70,
	1.71 firefox-bug305970.patch, 1.1,
	NONE thunderbird-1.5-bug304720.patch, 1.1, NONE
Message-ID: <200604191827.k3JIRGZi001778@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/thunderbird/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1752

Modified Files:
	thunderbird.spec 
Removed Files:
	firefox-bug305970.patch thunderbird-1.5-bug304720.patch 
Log Message:
these got committed upstream finally.  yay.


Index: thunderbird.spec
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- thunderbird.spec	19 Apr 2006 17:47:14 -0000	1.70
+++ thunderbird.spec	19 Apr 2006 18:27:14 -0000	1.71
@@ -49,8 +49,6 @@
 Patch81:        firefox-nopangoxft.patch
 
 # patches from upstream (Patch100+)
-Patch100:       firefox-bug305970.patch
-Patch101:       thunderbird-1.5-bug304720.patch
 Patch102:       thunderbird-1.5-pango-start.patch
 
 
@@ -102,8 +100,6 @@
 %patch42 -p0
 %patch81 -p1
 
-%patch100 -p1
-%patch101 -p1
 %patch102 -p1
 
 %{__rm} -f .mozconfig


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


--- thunderbird-1.5-bug304720.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 19 18:55:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 14:55:18 -0400
Subject: rpms/kernel/FC-4 .cvsignore, 1.181, 1.182 kernel-2.6.spec, 1.1624,
	1.1625 sources, 1.165, 1.166 upstream, 1.106, 1.107
Message-ID: <200604191855.k3JItIBl021860@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Log Message:
.9



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/.cvsignore,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- .cvsignore	18 Apr 2006 03:50:57 -0000	1.181
+++ .cvsignore	19 Apr 2006 18:55:15 -0000	1.182
@@ -2,4 +2,4 @@
 temp-*
 kernel-2.6.16
 linux-2.6.16.tar.bz2
-patch-2.6.16.7.bz2
+patch-2.6.16.9.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1624
retrieving revision 1.1625
diff -u -r1.1624 -r1.1625
--- kernel-2.6.spec	18 Apr 2006 03:50:57 -0000	1.1624
+++ kernel-2.6.spec	19 Apr 2006 18:55:15 -0000	1.1625
@@ -192,7 +192,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16.7.bz2
+Patch1: patch-2.6.16.9.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1062,6 +1062,9 @@
 %endif
 
 %changelog
+* Tue Apr 18 2006 Dave Jones <davej at redhat.com> [2.6.16-1.2096_FC4]
+- 2.6.16.9
+
 * Tue Apr 18 2006 Dave Jones <davej at redhat.com> [2.6.16-1.2093_FC4]
 - 2.6.16.7
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/sources,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- sources	18 Apr 2006 03:50:58 -0000	1.165
+++ sources	19 Apr 2006 18:55:16 -0000	1.166
@@ -1,2 +1,2 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
-9520cf6badb80e2a8bb008e715533add  patch-2.6.16.7.bz2
+2424bb387b97c5f6950379173cddc05f  patch-2.6.16.9.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/upstream,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- upstream	18 Apr 2006 03:50:58 -0000	1.106
+++ upstream	19 Apr 2006 18:55:16 -0000	1.107
@@ -1,2 +1,2 @@
 linux-2.6.16.tar.bz2
-patch-2.6.16.7.bz2
+patch-2.6.16.9.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 19 18:56:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 14:56:41 -0400
Subject: rpms/kernel/FC-4 patch-2.6.16.9.bz2.sign, NONE,
	1.1 patch-2.6.16.7.bz2.sign, 1.1, NONE
Message-ID: <200604191856.k3JIuf8R022445@cvs.devel.redhat.com>

Author: davej

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

Added Files:
	patch-2.6.16.9.bz2.sign 
Removed Files:
	patch-2.6.16.7.bz2.sign 
Log Message:
sign



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

iD8DBQBEReIzyGugalF9Dw4RAlBVAJ9thQ/q4FQn1e2wdo418wfVzb3o2gCfeSdC
ASHqvU3yQBCXBQhxyU1Ndr4=
=ZLrI
-----END PGP SIGNATURE-----


--- patch-2.6.16.7.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 19 19:20:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 15:20:45 -0400
Subject: rpms/device-mapper/devel device-mapper.spec,1.30,1.31
Message-ID: <200604191920.k3JJKjLK008353@cvs.devel.redhat.com>

Author: agk

Update of /cvs/dist/rpms/device-mapper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8241

Modified Files:
	device-mapper.spec 
Log Message:
usrlibdir override



Index: device-mapper.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper/devel/device-mapper.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- device-mapper.spec	19 Apr 2006 17:39:56 -0000	1.30
+++ device-mapper.spec	19 Apr 2006 19:20:42 -0000	1.31
@@ -19,13 +19,12 @@
 %setup -q -n %{name}.%{version}
 
 %build
-autoconf
 %configure --enable-static_link --with-user= --with-group= --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+%makeinstall usrlibdir=$RPM_BUILD_ROOT/usr/%{_lib}
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From fedora-cvs-commits at redhat.com  Wed Apr 19 20:11:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 16:11:35 -0400
Subject: rpms/lvm2/devel LVM2.2.02.04.tgz.asc, NONE, 1.1 .cvsignore, 1.31,
	1.32 lvm2.spec, 1.61, 1.62 sources, 1.32, 1.33 upstream, 1.24,
	1.25 lvm2-static.patch, 1.5, NONE lvm2-xvd.patch, 1.1, NONE
Message-ID: <200604192011.k3JKBZXO001577@cvs.devel.redhat.com>

Author: agk

Update of /cvs/dist/rpms/lvm2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1526

Modified Files:
	.cvsignore lvm2.spec sources upstream 
Added Files:
	LVM2.2.02.04.tgz.asc 
Removed Files:
	lvm2-static.patch lvm2-xvd.patch 
Log Message:
New release upstream, including better handling of duplicated VG names.



--- NEW FILE LVM2.2.02.04.tgz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQBERoZ8IoGRwVZ+LBcRAuuSAKDX44PoGYY/UKbir+6eS4FJoGmmbQCg2mZn
hO3pskcmEMX+T6N+1EmHumI=
=YGif
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/lvm2/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	4 Aug 2005 02:12:45 -0000	1.31
+++ .cvsignore	19 Apr 2006 20:11:10 -0000	1.32
@@ -1 +1 @@
-LVM2.2.01.14.tgz
+LVM2.2.02.04.tgz


Index: lvm2.spec
===================================================================
RCS file: /cvs/dist/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- lvm2.spec	11 Feb 2006 04:26:16 -0000	1.61
+++ lvm2.spec	19 Apr 2006 20:11:10 -0000	1.62
@@ -1,19 +1,18 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
-Version: 2.02.01
-Release: 1.2.1
+Version: 2.02.04
+Release: 1.0
 License: GPL
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
 Source0: LVM2.%{version}.tgz
-Patch0: lvm2-static.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: device-mapper >= 1.02.02
 BuildRequires: libselinux-devel
 BuildRequires: libtermcap-devel
 BuildRequires: ncurses-devel
 BuildRequires: readline-devel
-Requires: device-mapper >= 1.02.02
+Requires: device-mapper >= 1.02.05
 Conflicts: lvm
 Obsoletes: lvm
 
@@ -29,7 +28,6 @@
 
 %prep
 %setup -q -n LVM2.%{version}
-%patch0 -p1
 
 %build
 %configure --enable-static_link --enable-readline --enable-lvm1_fallback --with-pool=internal --with-staticdir=/sbin --with-user= --with-group=
@@ -68,6 +66,9 @@
 /var/lock/lvm
 
 %changelog
+* Wed Apr 19 2006 Alasdair Kergon <agk at redhat.com> - 2.02.04-1.0
+- New release upstream, including better handling of duplicated VG names.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.02.01-1.2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/lvm2/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	2 Dec 2005 21:55:26 -0000	1.32
+++ sources	19 Apr 2006 20:11:10 -0000	1.33
@@ -1 +1 @@
-5514514bd7992fa0597406ca2f80d0e5  LVM2.2.02.01.tgz
+954c41c42d3cfa50f12562f197bdd1a0  LVM2.2.02.04.tgz


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/lvm2/devel/upstream,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- upstream	4 Aug 2005 02:12:45 -0000	1.24
+++ upstream	19 Apr 2006 20:11:22 -0000	1.25
@@ -1 +1 @@
-LVM2.2.01.14.tgz
+LVM2.2.02.04.tgz


--- lvm2-static.patch DELETED ---


--- lvm2-xvd.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 19 21:06:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 17:06:51 -0400
Subject: rpms/Pyrex/devel Pyrex-0.9.4-fix-indent.patch, NONE, 1.1 .cvsignore,
	1.5, 1.6 Pyrex.spec, 1.13, 1.14 sources, 1.5, 1.6
Message-ID: <200604192106.k3JL6oXd025934@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/Pyrex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25891

Modified Files:
	.cvsignore Pyrex.spec sources 
Added Files:
	Pyrex-0.9.4-fix-indent.patch 
Log Message:
- Update to upstream 0.9.4


Pyrex-0.9.4-fix-indent.patch:
 build_ext.py |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE Pyrex-0.9.4-fix-indent.patch ---
--- Pyrex-0.9.4/Pyrex/Distutils/build_ext.py.fix-indent	2006-04-19 16:52:58.000000000 -0400
+++ Pyrex-0.9.4/Pyrex/Distutils/build_ext.py	2006-04-19 16:53:44.000000000 -0400
@@ -65,7 +65,7 @@
     return [replace_suffix(src, suffix) for src in pyx_sources] + other_sources
 
   def pyrex_compile(self, source):
-  	options = CompilationOptions(default_options,
+    options = CompilationOptions(default_options,
   		include_path = self.include_dirs)
     result = compile(source, options)
     if result.num_errors <> 0:


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/Pyrex/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	30 Sep 2005 21:40:07 -0000	1.5
+++ .cvsignore	19 Apr 2006 21:06:47 -0000	1.6
@@ -1,2 +1,3 @@
 Pyrex-0.9.3.tar.gz
 Pyrex-0.9.3.1.tar.gz
+Pyrex-0.9.4.tar.gz


Index: Pyrex.spec
===================================================================
RCS file: /cvs/dist/rpms/Pyrex/devel/Pyrex.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Pyrex.spec	9 Dec 2005 22:39:30 -0000	1.13
+++ Pyrex.spec	19 Apr 2006 21:06:48 -0000	1.14
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           Pyrex
-Version:        0.9.3.1
-Release: 2.1
+Version:        0.9.4
+Release: 	1
 Epoch:		0
 BuildArch:	noarch
 Summary:        A compiler/language for writing Python extension modules.
@@ -11,6 +11,8 @@
 License:        Public Domain
 URL:            http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/
 Source0:        http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/Pyrex-%{version}.tar.gz
+
+Patch0:		Pyrex-0.9.4-fix-indent.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel 
@@ -32,6 +34,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix-indent
 
 %build
 python setup.py build 
@@ -70,6 +73,9 @@
 %exclude %{python_sitelib}/Pyrex/Mac
 
 %changelog
+* Wed Apr 19 2006 John (J5) Palmieri <johnp at redhat.com> - 0.9.4-1
+- Upgrade to upstream 0.9.4
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/Pyrex/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 Sep 2005 21:40:07 -0000	1.5
+++ sources	19 Apr 2006 21:06:48 -0000	1.6
@@ -1 +1 @@
-0415b95a023061679021323d9ce56fe0  Pyrex-0.9.3.1.tar.gz
+9afab3de2dd16da97f482b2dc16fdd46  Pyrex-0.9.4.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 19 21:11:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 17:11:55 -0400
Subject: rpms/kernel/devel linux-2.6-audit-git.patch, NONE,
	1.1.18.1 linux-2.6-execve.patch, NONE, 1.1.2.1 kernel-2.6.spec,
	1.2139, 1.2139.2.1
Message-ID: <200604192111.k3JLBt71026775@cvs.devel.redhat.com>

Author: sgrubb

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

Modified Files:
      Tag: private-lspp-18-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-lspp-18-branch
	linux-2.6-audit-git.patch linux-2.6-execve.patch 
Log Message:
* Wed Apr 19 2006 Steve Grubb <sgrubb at redhat.com>
- LSPP 18 kernel


linux-2.6-audit-git.patch:
 arch/i386/kernel/ptrace.c      |    7 
 arch/i386/kernel/vm86.c        |    2 
 arch/ia64/kernel/ptrace.c      |    4 
 arch/mips/kernel/ptrace.c      |    4 
 arch/powerpc/kernel/ptrace.c   |    5 
 arch/s390/kernel/ptrace.c      |    5 
 arch/sparc64/kernel/ptrace.c   |    5 
 arch/um/kernel/ptrace.c        |    6 
 arch/x86_64/kernel/ptrace.c    |    6 
 include/linux/audit.h          |   22 ++-
 include/linux/netlink.h        |    1 
 include/linux/security.h       |   16 --
 include/linux/selinux.h        |  177 +++++++++++++++++++++++++
 ipc/msg.c                      |   11 +
 ipc/sem.c                      |   11 +
 ipc/shm.c                      |   19 ++
 ipc/util.c                     |    7 
 kernel/audit.c                 |  160 ++++++++++++++++++----
 kernel/audit.h                 |   10 -
 kernel/auditfilter.c           |  289 ++++++++++++++++++++++++++++++++++++-----
 kernel/auditsc.c               |  269 +++++++++++++++++++-------------------
 kernel/exit.c                  |    3 
 kernel/fork.c                  |    2 
 net/netlink/af_netlink.c       |    2 
 net/socket.c                   |    2 
 security/dummy.c               |    6 
 security/selinux/Makefile      |    2 
 security/selinux/avc.c         |   13 -
 security/selinux/exports.c     |   74 ++++++++++
 security/selinux/hooks.c       |    8 -
 security/selinux/ss/mls.c      |   30 ++++
 security/selinux/ss/mls.h      |    4 
 security/selinux/ss/services.c |  235 +++++++++++++++++++++++++++++++++
 33 files changed, 1142 insertions(+), 275 deletions(-)

--- NEW FILE linux-2.6-audit-git.patch ---
diff --git a/arch/i386/kernel/ptrace.c b/arch/i386/kernel/ptrace.c
index 506462e..fd7eaf7 100644
--- a/arch/i386/kernel/ptrace.c
+++ b/arch/i386/kernel/ptrace.c
@@ -671,7 +671,7 @@ int do_syscall_trace(struct pt_regs *reg
 
 	if (unlikely(current->audit_context)) {
 		if (entryexit)
-			audit_syscall_exit(current, AUDITSC_RESULT(regs->eax),
+			audit_syscall_exit(AUDITSC_RESULT(regs->eax),
 						regs->eax);
 		/* Debug traps, when using PTRACE_SINGLESTEP, must be sent only
 		 * on the syscall exit path. Normally, when TIF_SYSCALL_AUDIT is
@@ -720,14 +720,13 @@ int do_syscall_trace(struct pt_regs *reg
 	ret = is_sysemu;
 out:
 	if (unlikely(current->audit_context) && !entryexit)
-		audit_syscall_entry(current, AUDIT_ARCH_I386, regs->orig_eax,
+		audit_syscall_entry(AUDIT_ARCH_I386, regs->orig_eax,
 				    regs->ebx, regs->ecx, regs->edx, regs->esi);
 	if (ret == 0)
 		return 0;
 
 	regs->orig_eax = -1; /* force skip of syscall restarting */
 	if (unlikely(current->audit_context))
-		audit_syscall_exit(current, AUDITSC_RESULT(regs->eax),
-				regs->eax);
+		audit_syscall_exit(AUDITSC_RESULT(regs->eax), regs->eax);
 	return 1;
 }
diff --git a/arch/i386/kernel/vm86.c b/arch/i386/kernel/vm86.c
index aee14fa..00e0118 100644
--- a/arch/i386/kernel/vm86.c
+++ b/arch/i386/kernel/vm86.c
@@ -312,7 +312,7 @@ static void do_sys_vm86(struct kernel_vm
 
 	/*call audit_syscall_exit since we do not exit via the normal paths */
 	if (unlikely(current->audit_context))
-		audit_syscall_exit(current, AUDITSC_RESULT(eax), eax);
+		audit_syscall_exit(AUDITSC_RESULT(eax), eax);
 
 	__asm__ __volatile__(
 		"movl %0,%%esp\n\t"
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c
index 9887c87..e61e15e 100644
--- a/arch/ia64/kernel/ptrace.c
+++ b/arch/ia64/kernel/ptrace.c
@@ -1644,7 +1644,7 @@ syscall_trace_enter (long arg0, long arg
 			arch = AUDIT_ARCH_IA64;
 		}
 
-		audit_syscall_entry(current, arch, syscall, arg0, arg1, arg2, arg3);
+		audit_syscall_entry(arch, syscall, arg0, arg1, arg2, arg3);
 	}
 
 }
@@ -1662,7 +1662,7 @@ syscall_trace_leave (long arg0, long arg
 
 		if (success != AUDITSC_SUCCESS)
 			result = -result;
-		audit_syscall_exit(current, success, result);
+		audit_syscall_exit(success, result);
 	}
 
 	if (test_thread_flag(TIF_SYSCALL_TRACE)
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
index f838b36..26ab8a9 100644
--- a/arch/mips/kernel/ptrace.c
+++ b/arch/mips/kernel/ptrace.c
@@ -469,7 +469,7 @@ static inline int audit_arch(void)
 asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit)
 {
 	if (unlikely(current->audit_context) && entryexit)
-		audit_syscall_exit(current, AUDITSC_RESULT(regs->regs[2]),
+		audit_syscall_exit(AUDITSC_RESULT(regs->regs[2]),
 		                   regs->regs[2]);
 
 	if (!(current->ptrace & PT_PTRACED))
@@ -493,7 +493,7 @@ asmlinkage void do_syscall_trace(struct 
 	}
  out:
 	if (unlikely(current->audit_context) && !entryexit)
-		audit_syscall_entry(current, audit_arch(), regs->regs[2],
+		audit_syscall_entry(audit_arch(), regs->regs[2],
 				    regs->regs[4], regs->regs[5],
 				    regs->regs[6], regs->regs[7]);
 }
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index bcb8357..4a677d1 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -538,7 +538,7 @@ void do_syscall_trace_enter(struct pt_re
 		do_syscall_trace();
 
 	if (unlikely(current->audit_context))
-		audit_syscall_entry(current,
+		audit_syscall_entry(
 #ifdef CONFIG_PPC32
 				    AUDIT_ARCH_PPC,
 #else
@@ -556,8 +556,7 @@ void do_syscall_trace_leave(struct pt_re
 #endif
 
 	if (unlikely(current->audit_context))
-		audit_syscall_exit(current,
-				   (regs->ccr&0x1000)?AUDITSC_FAILURE:AUDITSC_SUCCESS,
+		audit_syscall_exit((regs->ccr&0x1000)?AUDITSC_FAILURE:AUDITSC_SUCCESS,
 				   regs->result);
 
 	if ((test_thread_flag(TIF_SYSCALL_TRACE)
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index 37dfe33..8f36504 100644
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -734,7 +734,7 @@ asmlinkage void
 syscall_trace(struct pt_regs *regs, int entryexit)
 {
 	if (unlikely(current->audit_context) && entryexit)
-		audit_syscall_exit(current, AUDITSC_RESULT(regs->gprs[2]), regs->gprs[2]);
+		audit_syscall_exit(AUDITSC_RESULT(regs->gprs[2]), regs->gprs[2]);
 
 	if (!test_thread_flag(TIF_SYSCALL_TRACE))
 		goto out;
@@ -761,8 +761,7 @@ syscall_trace(struct pt_regs *regs, int 
 	}
  out:
 	if (unlikely(current->audit_context) && !entryexit)
-		audit_syscall_entry(current, 
-				    test_thread_flag(TIF_31BIT)?AUDIT_ARCH_S390:AUDIT_ARCH_S390X,
+		audit_syscall_entry(test_thread_flag(TIF_31BIT)?AUDIT_ARCH_S390:AUDIT_ARCH_S390X,
 				    regs->gprs[2], regs->orig_gpr2, regs->gprs[3],
 				    regs->gprs[4], regs->gprs[5]);
 }
diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c
index 49e6ded..d31975e 100644
--- a/arch/sparc64/kernel/ptrace.c
+++ b/arch/sparc64/kernel/ptrace.c
@@ -653,7 +653,7 @@ asmlinkage void syscall_trace(struct pt_
 		if (unlikely(tstate & (TSTATE_XCARRY | TSTATE_ICARRY)))
 			result = AUDITSC_FAILURE;
 
-		audit_syscall_exit(current, result, regs->u_regs[UREG_I0]);
+		audit_syscall_exit(result, regs->u_regs[UREG_I0]);
 	}
 
 	if (!(current->ptrace & PT_PTRACED))
@@ -677,8 +677,7 @@ asmlinkage void syscall_trace(struct pt_
 
 out:
 	if (unlikely(current->audit_context) && !syscall_exit_p)
-		audit_syscall_entry(current,
-				    (test_thread_flag(TIF_32BIT) ?
+		audit_syscall_entry((test_thread_flag(TIF_32BIT) ?
 				     AUDIT_ARCH_SPARC :
 				     AUDIT_ARCH_SPARC64),
 				    regs->u_regs[UREG_G1],
diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c
index 60d2eda..9a77fb3 100644
--- a/arch/um/kernel/ptrace.c
+++ b/arch/um/kernel/ptrace.c
@@ -275,15 +275,13 @@ void syscall_trace(union uml_pt_regs *re
 
 	if (unlikely(current->audit_context)) {
 		if (!entryexit)
-			audit_syscall_entry(current,
-                                            HOST_AUDIT_ARCH,
+			audit_syscall_entry(HOST_AUDIT_ARCH,
 					    UPT_SYSCALL_NR(regs),
 					    UPT_SYSCALL_ARG1(regs),
 					    UPT_SYSCALL_ARG2(regs),
 					    UPT_SYSCALL_ARG3(regs),
 					    UPT_SYSCALL_ARG4(regs));
-		else audit_syscall_exit(current,
-                                        AUDITSC_RESULT(UPT_SYSCALL_RET(regs)),
+		else audit_syscall_exit(AUDITSC_RESULT(UPT_SYSCALL_RET(regs)),
                                         UPT_SYSCALL_RET(regs));
 	}
 
diff --git a/arch/x86_64/kernel/ptrace.c b/arch/x86_64/kernel/ptrace.c
index da8e790..2d50024 100644
--- a/arch/x86_64/kernel/ptrace.c
+++ b/arch/x86_64/kernel/ptrace.c
@@ -600,12 +600,12 @@ asmlinkage void syscall_trace_enter(stru
 
 	if (unlikely(current->audit_context)) {
 		if (test_thread_flag(TIF_IA32)) {
-			audit_syscall_entry(current, AUDIT_ARCH_I386,
+			audit_syscall_entry(AUDIT_ARCH_I386,
 					    regs->orig_rax,
 					    regs->rbx, regs->rcx,
 					    regs->rdx, regs->rsi);
 		} else {
-			audit_syscall_entry(current, AUDIT_ARCH_X86_64,
+			audit_syscall_entry(AUDIT_ARCH_X86_64,
 					    regs->orig_rax,
 					    regs->rdi, regs->rsi,
 					    regs->rdx, regs->r10);
@@ -616,7 +616,7 @@ asmlinkage void syscall_trace_enter(stru
 asmlinkage void syscall_trace_leave(struct pt_regs *regs)
[...2062 lines suppressed...]
+		/* only 'equals' and 'not equals' fit user, role, and type */
+		if (op != AUDIT_EQUAL && op != AUDIT_NOT_EQUAL)
+			return -EINVAL;
+		break;
+	case AUDIT_SE_SEN:
+	case AUDIT_SE_CLR:
+		/* we do not allow a range, indicated by the presense of '-' */
+		if (strchr(rulestr, '-'))
+			return -EINVAL;
+		break;
+	default:
+		/* only the above fields are valid */
+		return -EINVAL;
+	}
+
+	tmprule = kzalloc(sizeof(struct selinux_audit_rule), GFP_KERNEL);
+	if (!tmprule)
+		return -ENOMEM;
+
+	context_init(&tmprule->au_ctxt);
+
+	POLICY_RDLOCK;
+
+	tmprule->au_seqno = latest_granting;
+
+	switch (field) {
+	case AUDIT_SE_USER:
+		userdatum = hashtab_search(policydb.p_users.table, rulestr);
+		if (!userdatum)
+			rc = -EINVAL;
+		else
+			tmprule->au_ctxt.user = userdatum->value;
+		break;
+	case AUDIT_SE_ROLE:
+		roledatum = hashtab_search(policydb.p_roles.table, rulestr);
+		if (!roledatum)
+			rc = -EINVAL;
+		else
+			tmprule->au_ctxt.role = roledatum->value;
+		break;
+	case AUDIT_SE_TYPE:
+		typedatum = hashtab_search(policydb.p_types.table, rulestr);
+		if (!typedatum)
+			rc = -EINVAL;
+		else
+			tmprule->au_ctxt.type = typedatum->value;
+		break;
+	case AUDIT_SE_SEN:
+	case AUDIT_SE_CLR:
+		rc = mls_from_string(rulestr, &tmprule->au_ctxt, GFP_ATOMIC);
+		break;
+	}
+
+	POLICY_RDUNLOCK;
+
+	if (rc) {
+		selinux_audit_rule_free(tmprule);
+		tmprule = NULL;
+	}
+
+	*rule = tmprule;
+
+	return rc;
+}
+
+int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op,
+                             struct selinux_audit_rule *rule,
+                             struct audit_context *actx)
+{
+	struct context *ctxt;
+	struct mls_level *level;
+	int match = 0;
+
+	if (!rule) {
+		audit_log(actx, GFP_ATOMIC, AUDIT_SELINUX_ERR,
+		          "selinux_audit_rule_match: missing rule\n");
+		return -ENOENT;
+	}
+
+	POLICY_RDLOCK;
+
+	if (rule->au_seqno < latest_granting) {
+		audit_log(actx, GFP_ATOMIC, AUDIT_SELINUX_ERR,
+		          "selinux_audit_rule_match: stale rule\n");
+		match = -ESTALE;
+		goto out;
+	}
+
+	ctxt = sidtab_search(&sidtab, ctxid);
+	if (!ctxt) {
+		audit_log(actx, GFP_ATOMIC, AUDIT_SELINUX_ERR,
+		          "selinux_audit_rule_match: unrecognized SID %d\n",
+		          ctxid);
+		match = -ENOENT;
+		goto out;
+	}
+
+	/* a field/op pair that is not caught here will simply fall through
+	   without a match */
+	switch (field) {
+	case AUDIT_SE_USER:
+		switch (op) {
+		case AUDIT_EQUAL:
+			match = (ctxt->user == rule->au_ctxt.user);
+			break;
+		case AUDIT_NOT_EQUAL:
+			match = (ctxt->user != rule->au_ctxt.user);
+			break;
+		}
+		break;
+	case AUDIT_SE_ROLE:
+		switch (op) {
+		case AUDIT_EQUAL:
+			match = (ctxt->role == rule->au_ctxt.role);
+			break;
+		case AUDIT_NOT_EQUAL:
+			match = (ctxt->role != rule->au_ctxt.role);
+			break;
+		}
+		break;
+	case AUDIT_SE_TYPE:
+		switch (op) {
+		case AUDIT_EQUAL:
+			match = (ctxt->type == rule->au_ctxt.type);
+			break;
+		case AUDIT_NOT_EQUAL:
+			match = (ctxt->type != rule->au_ctxt.type);
+			break;
+		}
+		break;
+	case AUDIT_SE_SEN:
+	case AUDIT_SE_CLR:
+		level = (op == AUDIT_SE_SEN ?
+		         &ctxt->range.level[0] : &ctxt->range.level[1]);
+		switch (op) {
+		case AUDIT_EQUAL:
+			match = mls_level_eq(&rule->au_ctxt.range.level[0],
+			                     level);
+			break;
+		case AUDIT_NOT_EQUAL:
+			match = !mls_level_eq(&rule->au_ctxt.range.level[0],
+			                      level);
+			break;
+		case AUDIT_LESS_THAN:
+			match = (mls_level_dom(&rule->au_ctxt.range.level[0],
+			                       level) &&
+			         !mls_level_eq(&rule->au_ctxt.range.level[0],
+			                       level));
+			break;
+		case AUDIT_LESS_THAN_OR_EQUAL:
+			match = mls_level_dom(&rule->au_ctxt.range.level[0],
+			                      level);
+			break;
+		case AUDIT_GREATER_THAN:
+			match = (mls_level_dom(level,
+			                      &rule->au_ctxt.range.level[0]) &&
+			         !mls_level_eq(level,
+			                       &rule->au_ctxt.range.level[0]));
+			break;
+		case AUDIT_GREATER_THAN_OR_EQUAL:
+			match = mls_level_dom(level,
+			                      &rule->au_ctxt.range.level[0]);
+			break;
+		}
+	}
+
+out:
+	POLICY_RDUNLOCK;
+	return match;
+}
+
+static int (*aurule_callback)(void) = NULL;
+
+static int aurule_avc_callback(u32 event, u32 ssid, u32 tsid,
+                               u16 class, u32 perms, u32 *retained)
+{
+	int err = 0;
+
+	if (event == AVC_CALLBACK_RESET && aurule_callback)
+		err = aurule_callback();
+	return err;
+}
+
+static int __init aurule_init(void)
+{
+	int err;
+
+	err = avc_add_callback(aurule_avc_callback, AVC_CALLBACK_RESET,
+	                       SECSID_NULL, SECSID_NULL, SECCLASS_NULL, 0);
+	if (err)
+		panic("avc_add_callback() failed, error %d\n", err);
+
+	return err;
+}
+__initcall(aurule_init);
+
+void selinux_audit_set_callback(int (*callback)(void))
+{
+	aurule_callback = callback;
+}

linux-2.6-execve.patch:
 fs/exec.c             |    6 +++++
 include/linux/audit.h |    6 ++++-
 kernel/audit.c        |    8 ++++---
 kernel/auditsc.c      |   51 ++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 67 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-execve.patch ---

diff --git a/fs/exec.c b/fs/exec.c
index 0291a68..6ceb46f 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -49,6 +49,7 @@
 #include <linux/rmap.h>
 #include <linux/acct.h>
 #include <linux/cn_proc.h>
+#include <linux/audit.h>
 
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
@@ -1095,6 +1096,11 @@ int search_binary_handler(struct linux_b
 	/* kernel module loader fixup */
 	/* so we don't try to load run modprobe in kernel space. */
 	set_fs(USER_DS);
+
+	retval = audit_bprm(bprm);
+	if (retval)
+		return retval;
+
 	retval = -ENOENT;
 	for (try=0; try<2; try++) {
 		read_lock(&binfmt_lock);
diff --git a/include/linux/audit.h b/include/linux/audit.h
index e552ac4..9c023ce 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -83,6 +83,7 @@
 #define AUDIT_CONFIG_CHANGE	1305	/* Audit system configuration change */
 #define AUDIT_SOCKADDR		1306	/* sockaddr copied as syscall arg */
 #define AUDIT_CWD		1307	/* Current working directory */
+#define AUDIT_EXECVE		1309	/* execve arguments */
 #define AUDIT_IPC_SET_PERM	1311	/* IPC new permissions record type */
 
 #define AUDIT_AVC		1400	/* SE Linux avc denial or grant */
@@ -284,6 +285,7 @@ struct audit_buffer;
 struct audit_context;
 struct inode;
 struct netlink_skb_parms;
+struct linux_binprm;
 
 #define AUDITSC_INVALID 0
 #define AUDITSC_SUCCESS 1
@@ -323,6 +325,7 @@ extern int  audit_set_loginuid(struct ta
 extern uid_t audit_get_loginuid(struct audit_context *ctx);
 extern int audit_ipc_obj(struct kern_ipc_perm *ipcp);
 extern int audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode, struct kern_ipc_perm *ipcp);
+extern int audit_bprm(struct linux_binprm *bprm);
 extern int audit_socketcall(int nargs, unsigned long *args);
 extern int audit_sockaddr(int len, void *addr);
 extern int audit_avc_path(struct dentry *dentry, struct vfsmount *mnt);
@@ -343,6 +346,7 @@ extern int audit_set_macxattr(const char
 #define audit_get_loginuid(c) ({ -1; })
 #define audit_ipc_obj(i) ({ 0; })
 #define audit_ipc_set_perm(q,u,g,m,i) ({ 0; })
+#define audit_bprm(p) ({ 0; })
 #define audit_socketcall(n,a) ({ 0; })
 #define audit_sockaddr(len, addr) ({ 0; })
 #define audit_avc_path(dentry, mnt) ({ 0; })
@@ -365,7 +369,7 @@ extern void		    audit_log_end(struct au
 extern void		    audit_log_hex(struct audit_buffer *ab,
 					  const unsigned char *buf,
 					  size_t len);
-extern void		    audit_log_untrustedstring(struct audit_buffer *ab,
+extern const char *	    audit_log_untrustedstring(struct audit_buffer *ab,
 						      const char *string);
 extern void		    audit_log_d_path(struct audit_buffer *ab,
 					     const char *prefix,
diff --git a/kernel/audit.c b/kernel/audit.c
index 35b2c6f..7addbf9 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -1001,18 +1001,20 @@ void audit_log_hex(struct audit_buffer *
  * or a space. Unescaped strings will start and end with a double quote mark.
  * Strings that are escaped are printed in hex (2 digits per char).
  */
-void audit_log_untrustedstring(struct audit_buffer *ab, const char *string)
+const char *audit_log_untrustedstring(struct audit_buffer *ab, const char *string)
 {
 	const unsigned char *p = string;
+	size_t len = strlen(string);
 
 	while (*p) {
 		if (*p == '"' || *p < 0x21 || *p > 0x7f) {
-			audit_log_hex(ab, string, strlen(string));
-			return;
+			audit_log_hex(ab, string, len);
+			return string + len + 1;
 		}
 		p++;
 	}
 	audit_log_format(ab, "\"%s\"", string);
+	return p + 1;
 }
 
 /* This is a helper-function to print the escaped d_path */
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 39e6d15..8d75f0d 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -59,6 +59,7 @@
 #include <linux/list.h>
 #include <linux/tty.h>
 #include <linux/selinux.h>
+#include <linux/binfmts.h>
 
 #include "audit.h"
 
@@ -110,6 +111,13 @@ struct audit_aux_data_ipcctl {
 	u32			osid;
 };
 
+struct audit_aux_data_execve {
+	struct audit_aux_data	d;
+	int argc;
+	int envc;
+	char mem[0];
+};
+
 struct audit_aux_data_socketcall {
 	struct audit_aux_data	d;
 	int			nargs;
@@ -689,6 +697,16 @@ static void audit_log_exit(struct audit_
 				kfree(ctx);
 			}
 			break; }
+		case AUDIT_EXECVE: {
+			struct audit_aux_data_execve *axi = (void *)aux;
+			int i;
+			char *p;
+			for (i = 0, p = axi->mem; i < axi->argc; i++) {
+				audit_log_format(ab, "a%d=", i);
+				p = audit_log_untrustedstring(ab, p);
+				audit_log_format(ab, "\n");
+			}
+			break; }
 
 		case AUDIT_SOCKETCALL: {
 			int i;
@@ -1236,6 +1254,39 @@ int audit_ipc_set_perm(unsigned long qby
 	return 0;
 }
 
+int audit_bprm(struct linux_binprm *bprm)
+{
+	struct audit_aux_data_execve *ax;
+	struct audit_context *context = current->audit_context;
+	unsigned long p, next;
+	void *to;
+
+	if (likely(!audit_enabled || !context))
+		return 0;
+
+	ax = kmalloc(sizeof(*ax) + PAGE_SIZE * MAX_ARG_PAGES - bprm->p,
+				GFP_KERNEL);
+	if (!ax)
+		return -ENOMEM;
+
+	ax->argc = bprm->argc;
+	ax->envc = bprm->envc;
+	for (p = bprm->p, to = ax->mem; p < MAX_ARG_PAGES*PAGE_SIZE; p = next) {
+		struct page *page = bprm->page[p / PAGE_SIZE];
+		void *kaddr = kmap(page);
+		next = (p + PAGE_SIZE) & ~(PAGE_SIZE - 1);
+		memcpy(to, kaddr + (p & (PAGE_SIZE - 1)), next - p);
+		to += next - p;
+		kunmap(page);
+	}
+
+	ax->d.type = AUDIT_EXECVE;
+	ax->d.next = context->aux;
+	context->aux = (void *)ax;
+	return 0;
+}
+
+
 /**
  * audit_socketcall - record audit data for sys_socketcall
  * @nargs: number of args



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2139
retrieving revision 1.2139.2.1
diff -u -r1.2139 -r1.2139.2.1
--- kernel-2.6.spec	19 Apr 2006 04:05:22 -0000	1.2139
+++ kernel-2.6.spec	19 Apr 2006 21:11:47 -0000	1.2139.2.1
@@ -9,10 +9,10 @@
 # Whether to apply the Xen patches, leave this enabled.
 %define includexen 0
 # Whether to build the Xen kernels, disable if you want.
-%define buildxen 1
+%define buildxen 0
 %define buildxenPAE 0
 %define builddoc 0
-%define buildkdump 1
+%define buildkdump 0
 
 # Versions of various parts
 
@@ -25,7 +25,7 @@
 %define sublevel 16
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
+%define rhbsys  .lspp.18
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC6%{rhbsys}
 %define signmodules 0
 %define make_target bzImage
@@ -386,6 +386,10 @@
 # Xen hypervisor patches
 Patch20000: xen-sched-sedf.patch
 
+# Audit & lspp patches
+Patch20100: linux-2.6-audit-git.patch
+Patch20101: linux-2.6-execve.patch
+
 
 # END OF PATCH DEFINITIONS
 
@@ -1013,6 +1017,10 @@
 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
 %patch10001 -p1
 
+# Audit patches
+%patch20100 -p1
+%patch20101 -p1
+
 
 # END OF PATCH APPLICATIONS
 
@@ -1027,6 +1035,7 @@
 for i in *.config
 do
   mv $i .config
+  echo "CONFIG_INOTIFY_USER=y" >> .config
   Arch=`head -1 .config | cut -b 3-`
 %if %{includexen}
   make ARCH=$Arch nonint_oldconfig > /dev/null
@@ -1651,6 +1660,9 @@
 %endif
 
 %changelog
+* Wed Apr 19 2006 Steve Grubb <sgrubb at redhat.com>
+- LSPP 18 kernel
+
 * Tue Apr 18 2006 Dave Jones <davej at redhat.com>
 - 2.6.17rc2
 - 2.6.17rc1-git13



From fedora-cvs-commits at redhat.com  Wed Apr 19 21:18:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 17:18:35 -0400
Subject: rpms/gnome-pilot/FC-5
	gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch,
	1.1, 1.2 gnome-pilot.spec, 1.37, 1.38
Message-ID: <200604192118.k3JLIZ2Y009867@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch 
	gnome-pilot.spec 
Log Message:
- apply patch to fix crash with pilot-link 0.11.8 #189294
  thanks to Matt Dave


gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch:
 backup_conduit.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

Index: gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/FC-5/gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch	27 Jun 2005 22:08:36 -0000	1.1
+++ gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch	19 Apr 2006 21:18:33 -0000	1.2
@@ -33,7 +33,7 @@
   db_close:
  	dlp_CloseDB (dbinfo->pilot_socket, dbinfo->db_handle);
   exit_and_free:
-+	pi_file_close (f);
++	if(f != NULL) pi_file_close (f);
  	g_free (name);
   exit:	
  	return result;	


Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/FC-5/gnome-pilot.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gnome-pilot.spec	11 Apr 2006 13:01:46 -0000	1.37
+++ gnome-pilot.spec	19 Apr 2006 21:18:33 -0000	1.38
@@ -2,7 +2,7 @@
 Summary: GNOME pilot programs
 Name: gnome-pilot
 Version: 2.0.13
-Release: 7.fc5.5
+Release: 7.fc5.6
 License: LGPL
 Group: Applications/Communications
 Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-pilot/2.0/%{name}-%{version}.tar.bz2
@@ -152,6 +152,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Apr 19 2006 Than Ngo <than at redhat.com> 2.0.13-7.fc5.6
+- apply patch to fix crash with pilot-link 0.11.8 #189294
+  thanks to Matt Dave
+
 * Tue Apr 11 2006 Than Ngo <than at redhat.com> 2.0.13-7.fc5.5
 - rebuilt against pilot-link-0.11.8
 



From fedora-cvs-commits at redhat.com  Wed Apr 19 21:21:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 17:21:06 -0400
Subject: rpms/fedora-release/devel fedora-release.spec,1.30,1.31
Message-ID: <200604192121.k3JLL6xO010820@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fedora-release/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10726

Modified Files:
	fedora-release.spec 
Log Message:
Added a changelog, removed dupe content.



Index: fedora-release.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-release/devel/fedora-release.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- fedora-release.spec	29 Mar 2006 23:44:06 -0000	1.30
+++ fedora-release.spec	19 Apr 2006 21:21:01 -0000	1.31
@@ -7,7 +7,7 @@
 Summary: Fedora Core release file
 Name: fedora-release
 Version: %{real_release_version}
-Release: rawhide
+Release: rawhide.1
 License: GFDL
 Group: System Environment/Base
 Source: fedora-release-%{real_release_version}.tar.gz
@@ -111,7 +111,6 @@
 %dir /etc/yum.repos.d
 %config(noreplace) /etc/sysconfig/rhn/sources
 %config(noreplace) /etc/yum.repos.d/*
-%doc R* stylesheet-images figs *.css
 %doc eula.txt GPL 
 %doc about
 %config %attr(0644,root,root) /etc/issue
@@ -123,3 +122,9 @@
 /etc/pki/rpm-gpg/*
 %{_datadir}/omf/fedora-release
 %{_datadir}/applications/*.desktop
+
+%changelog
+* Wed Apr 19 2006 Jesse Keating <jkeating at redhat.com> - 5.89-rawhide.1
+- Look, a changelog!
+- Removed duplicate html/css content from doc dir.
+



From fedora-cvs-commits at redhat.com  Wed Apr 19 21:21:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 17:21:16 -0400
Subject: rpms/kernel/devel patch-2.6.17-rc2-git1.bz2.sign, NONE,
	1.1 .cvsignore, 1.409, 1.410 kernel-2.6.spec, 1.2139,
	1.2140 sources, 1.351, 1.352 upstream, 1.322, 1.323
Message-ID: <200604192121.k3JLLG2j010895@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17-rc2-git1.bz2.sign 
Log Message:
git1



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

iD8DBQBERoksyGugalF9Dw4RAje+AJ9bRzxmqUFUqNw3Ehuf2kN3Ho2zDwCdH5bI
Q+QxAWToOXVCxbSAfuDX5AY=
=pWUp
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -r1.409 -r1.410
--- .cvsignore	19 Apr 2006 03:45:17 -0000	1.409
+++ .cvsignore	19 Apr 2006 21:21:13 -0000	1.410
@@ -4,3 +4,4 @@
 linux-2.6.16.tar.bz2
 xen-20060413.tar.bz2
 patch-2.6.17-rc2.bz2
+patch-2.6.17-rc2-git1.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2139
retrieving revision 1.2140
diff -u -r1.2139 -r1.2140
--- kernel-2.6.spec	19 Apr 2006 04:05:22 -0000	1.2139
+++ kernel-2.6.spec	19 Apr 2006 21:21:13 -0000	1.2140
@@ -213,6 +213,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.17-rc2.bz2
+Patch2: patch-2.6.17-rc2-git1.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -710,7 +711,7 @@
 
 # Update to latest upstream.
 %patch1 -p1
-#%patch2 -p1
+%patch2 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -1651,6 +1652,9 @@
 %endif
 
 %changelog
+* Wed Apr 19 2006 Dave Jones <davej at redhat.com>
+- 2.6.17rc2-git1
+
 * Tue Apr 18 2006 Dave Jones <davej at redhat.com>
 - 2.6.17rc2
 - 2.6.17rc1-git13


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- sources	19 Apr 2006 03:45:19 -0000	1.351
+++ sources	19 Apr 2006 21:21:13 -0000	1.352
@@ -1,3 +1,4 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 e8e055329db3aad40a010ded0f8bdcf9  xen-20060413.tar.bz2
 87c4ea50e1b25ad808b65ad3fb19a9b5  patch-2.6.17-rc2.bz2
+9eb20cf75a125fedb5d03c2bab17dd83  patch-2.6.17-rc2-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -r1.322 -r1.323
--- upstream	19 Apr 2006 03:45:19 -0000	1.322
+++ upstream	19 Apr 2006 21:21:13 -0000	1.323
@@ -1,2 +1,3 @@
 linux-2.6.16.tar.bz2
 patch-2.6.17-rc2.bz2
+patch-2.6.17-rc2-git1.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 19 21:24:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 17:24:19 -0400
Subject: rpms/kernel/devel linux-2.6-defaults-unicode-vt.patch, NONE,
	1.1 kernel-2.6.spec, 1.2140, 1.2141
Message-ID: <200604192124.k3JLOJAk012124@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-defaults-unicode-vt.patch 
Log Message:
Use unicode VTs by default.


linux-2.6-defaults-unicode-vt.patch:
 keyboard.c |    2 +-
 vt.c       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-defaults-unicode-vt.patch ---

Unicode by default. Join the 20th century.

--- linux-2.6.11/drivers/char/vt.c.foo	2005-06-06 22:53:13.000000000 -0400
+++ linux-2.6.11/drivers/char/vt.c	2005-06-06 22:53:42.000000000 -0400
@@ -1443,7 +1443,7 @@
 	vc->vc_charset		= 0;
 	vc->vc_need_wrap	= 0;
 	vc->vc_report_mouse	= 0;
-	vc->vc_utf		= 0;
+	vc->vc_utf		= 1;
 	vc->vc_utf_count	= 0;
 
 	vc->vc_disp_ctrl	= 0;
--- linux-2.6.11/drivers/char/keyboard.c.foo	2005-06-06 23:35:07.000000000 -0400
+++ linux-2.6.11/drivers/char/keyboard.c	2005-06-06 23:36:28.000000000 -0400
@@ -1241,7 +1241,7 @@
         kbd0.lockstate = KBD_DEFLOCK;
         kbd0.slockstate = 0;
         kbd0.modeflags = KBD_DEFMODE;
-        kbd0.kbdmode = VC_XLATE;
+        kbd0.kbdmode = VC_UNICODE;
 
         for (i = 0 ; i < MAX_NR_CONSOLES ; i++)
                 kbd_table[i] = kbd0;


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2140
retrieving revision 1.2141
diff -u -r1.2140 -r1.2141
--- kernel-2.6.spec	19 Apr 2006 21:21:13 -0000	1.2140
+++ kernel-2.6.spec	19 Apr 2006 21:24:16 -0000	1.2141
@@ -359,6 +359,7 @@
 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
 
 # SATA Bits
 Patch2200: linux-2.6-sata-promise-pata-ports.patch
@@ -979,6 +980,8 @@
 %patch2102 -p1
 # Change PHYSICAL_START
 %patch2103 -p1
+# Use unicode VT's by default.
+%patch2104 -p1
 
 # Enable PATA ports on Promise SATA.
 #%patch2200 -p1
@@ -1654,6 +1657,7 @@
 %changelog
 * Wed Apr 19 2006 Dave Jones <davej at redhat.com>
 - 2.6.17rc2-git1
+- Use unicode VTs by default.
 
 * Tue Apr 18 2006 Dave Jones <davej at redhat.com>
 - 2.6.17rc2



From fedora-cvs-commits at redhat.com  Wed Apr 19 21:28:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 17:28:38 -0400
Subject: rpms/gnome-pilot/FC-4
	gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch,
	1.1, 1.2 gnome-pilot.spec, 1.31, 1.32
Message-ID: <200604192128.k3JLScYj013955@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/gnome-pilot/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv13893

Modified Files:
	gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch 
	gnome-pilot.spec 
Log Message:
- apply patch to fix crash with pilot-link 0.11.8 #189294
  thanks to Matt Dave


gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch:
 backup_conduit.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

Index: gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/FC-4/gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch	27 Jun 2005 21:50:41 -0000	1.1
+++ gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch	19 Apr 2006 21:28:35 -0000	1.2
@@ -33,7 +33,7 @@
   db_close:
  	dlp_CloseDB (dbinfo->pilot_socket, dbinfo->db_handle);
   exit_and_free:
-+	pi_file_close (f);
++	if(f != NULL) pi_file_close (f);
  	g_free (name);
   exit:	
  	return result;	


Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/FC-4/gnome-pilot.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gnome-pilot.spec	12 Apr 2006 15:26:51 -0000	1.31
+++ gnome-pilot.spec	19 Apr 2006 21:28:35 -0000	1.32
@@ -2,7 +2,7 @@
 Summary: GNOME pilot programs
 Name: gnome-pilot
 Version: 2.0.13
-Release: 5.fc4.1
+Release: 5.fc4.2
 License: LGPL
 Group: Applications/Communications
 Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-pilot/2.0/%{name}-%{version}.tar.bz2
@@ -151,6 +151,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Apr 19 2006 Than Ngo <than at redhat.com> 2.0.13-5.fc4.2
+- apply patch to fix crash with pilot-link 0.11.8 #189294
+  thanks to Matt Dave
+
 * Wed Apr 12 2006 Than Ngo <than at redhat.com> 2.0.13-5.fc4.1
 - rebuilt against pilot-link-0.11.8
 



From fedora-cvs-commits at redhat.com  Wed Apr 19 21:48:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 17:48:57 -0400
Subject: rpms/gnome-pilot/devel
	gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch,
	1.1, 1.2 gnome-pilot.spec, 1.38, 1.39
Message-ID: <200604192148.k3JLmvk2031530@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch 
	gnome-pilot.spec 
Log Message:
- apply patch to fix crash with pilot-link 0.11.8 #189294
  thanks to Matt Dave


gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch:
 backup_conduit.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

Index: gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/devel/gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch	27 Jun 2005 22:08:36 -0000	1.1
+++ gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch	19 Apr 2006 21:48:54 -0000	1.2
@@ -33,7 +33,7 @@
   db_close:
  	dlp_CloseDB (dbinfo->pilot_socket, dbinfo->db_handle);
   exit_and_free:
-+	pi_file_close (f);
++	if(f != NULL) pi_file_close (f);
  	g_free (name);
   exit:	
  	return result;	


Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/devel/gnome-pilot.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gnome-pilot.spec	29 Mar 2006 22:02:44 -0000	1.38
+++ gnome-pilot.spec	19 Apr 2006 21:48:54 -0000	1.39
@@ -2,7 +2,7 @@
 Summary: GNOME pilot programs
 Name: gnome-pilot
 Version: 2.0.13
-Release: 8
+Release: 9
 License: LGPL
 Group: Applications/Communications
 Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-pilot/2.0/%{name}-%{version}.tar.bz2
@@ -150,6 +150,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Apr 19 2006 Than Ngo <than at redhat.com> 2.0.13-9 
+- apply patch to fix crash with pilot-link 0.11.8 #189294
+  thanks to Matt Dave
+
 * Wed Mar 29 2006 Than Ngo <than at redhat.com> 2.0.13-8 
 - rebuilt against pilot-link-0.11.8
 



From fedora-cvs-commits at redhat.com  Wed Apr 19 21:59:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 17:59:42 -0400
Subject: rpms/system-config-netboot/FC-5 .cvsignore, 1.27, 1.28 sources, 1.29,
	1.30 system-config-netboot.spec, 1.42, 1.43
Message-ID: <200604192159.k3JLxgSe003235@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/system-config-netboot/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3208

Modified Files:
	.cvsignore sources system-config-netboot.spec 
Log Message:
v0.1.40: provide  a way of configuring remote logging from the GUI; provide a means of disabling default snapshot directory generation


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-netboot/FC-5/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	1 Mar 2006 00:14:29 -0000	1.27
+++ .cvsignore	19 Apr 2006 21:59:39 -0000	1.28
@@ -13,3 +13,4 @@
 system-config-netboot-0.1.36.tar.gz
 system-config-netboot-0.1.37.tar.gz
 system-config-netboot-0.1.38.tar.gz
+system-config-netboot-0.1.40.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-netboot/FC-5/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	1 Mar 2006 00:14:29 -0000	1.29
+++ sources	19 Apr 2006 21:59:39 -0000	1.30
@@ -1 +1 @@
-b238d55f597fe992f7105f1c13a109a1  system-config-netboot-0.1.38.tar.gz
+9877de9c0f7807aeddd30864b1e00a35  system-config-netboot-0.1.40.tar.gz


Index: system-config-netboot.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-netboot/FC-5/system-config-netboot.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- system-config-netboot.spec	1 Mar 2006 00:14:29 -0000	1.42
+++ system-config-netboot.spec	19 Apr 2006 21:59:39 -0000	1.43
@@ -1,16 +1,16 @@
 # -*- RPM-SPEC -*-
-Summary: system-config-netboot is an network booting/install configuration utility
-Name: system-config-netboot
-Version: 0.1.38
-Release: 1
-URL: http://www.redhat.com/ 
-Source0: %{name}-%{version}.tar.gz
-Source1: pxelinux.0
-License: GPL
-Group: Applications/System
+Summary:   system-config-netboot is an network booting/install configuration utility
+Name: 	   system-config-netboot
+Version:   0.1.40
+Release:   1.FC5
+URL: 	   http://www.redhat.com/ 
+Source0:   %{name}-%{version}.tar.gz
+Source1:   pxelinux.0
+License:   GPL
+Group:     Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: gnome-python2, pygtk2, pygtk2-libglade, gnome-python2-canvas, rhpl, alchemist
-Requires: tftp-server >= 0.29-3
+Requires:  gnome-python2, pygtk2, pygtk2-libglade, gnome-python2-canvas, rhpl, alchemist
+Requires:  tftp-server >= 0.29-3
 Requires(post): hicolor-icon-theme
 #ExclusiveArch: i386 x86_64
 BuildArch: noarch
@@ -74,6 +74,11 @@
 %config %{_sysconfdir}/security/console.apps/system-config-netboot
 
 %changelog
+* Thu Apr 19 2006 Jason Vas Dias <jvdias at redhat.com> - 0.1.40-1
+- fix further issues reported by brian at chpc.utah.edu:
+  o should be a way of configuring remote logging from the GUI
+  o provide a means of disabling default snapshot directory generation
+
 * Tue Feb 14 2006 Jason Vas Dias <jvdias at redhat.com> - 0.1.38-1
 - further fix for f1 at micromemory.com problem (now bug 181365)
   deal with required binaries that have been replaced by scripts



From fedora-cvs-commits at redhat.com  Wed Apr 19 22:17:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 18:17:18 -0400
Subject: rpms/fedora-release/devel fedora-release.spec,1.31,1.32
Message-ID: <200604192217.k3JMHI92014073@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fedora-release/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11206

Modified Files:
	fedora-release.spec 
Log Message:
Added Lynx as a BuildReq.



Index: fedora-release.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-release/devel/fedora-release.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- fedora-release.spec	19 Apr 2006 21:21:01 -0000	1.31
+++ fedora-release.spec	19 Apr 2006 22:17:15 -0000	1.32
@@ -21,6 +21,7 @@
 BuildArchitectures: noarch
 BuildRequires: xmlto
 BuildRequires: desktop-file-utils
+BuildRequires: lynx
 
 %description
 Fedora Core release file
@@ -127,4 +128,5 @@
 * Wed Apr 19 2006 Jesse Keating <jkeating at redhat.com> - 5.89-rawhide.1
 - Look, a changelog!
 - Removed duplicate html/css content from doc dir.
+- Add lynx as a buildreq
 



From fedora-cvs-commits at redhat.com  Wed Apr 19 22:18:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 18:18:00 -0400
Subject: rpms/system-config-netboot/FC-4 .cvsignore, 1.24, 1.25 sources, 1.26,
	1.27 system-config-netboot.spec, 1.34, 1.35
Message-ID: <200604192218.k3JMI0Zb019196@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/system-config-netboot/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv19170

Modified Files:
	.cvsignore sources system-config-netboot.spec 
Log Message:
v0.1.40: provide  a way of configuring remote logging from the GUI; provide a means of disabling default snapshot directory generation


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-netboot/FC-4/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	1 Mar 2006 00:20:27 -0000	1.24
+++ .cvsignore	19 Apr 2006 22:17:57 -0000	1.25
@@ -13,3 +13,4 @@
 system-config-netboot-0.1.36.tar.gz
 system-config-netboot-0.1.37.tar.gz
 system-config-netboot-0.1.38.tar.gz
+system-config-netboot-0.1.40.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-netboot/FC-4/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	1 Mar 2006 00:20:27 -0000	1.26
+++ sources	19 Apr 2006 22:17:57 -0000	1.27
@@ -1 +1 @@
-b238d55f597fe992f7105f1c13a109a1  system-config-netboot-0.1.38.tar.gz
+9877de9c0f7807aeddd30864b1e00a35  system-config-netboot-0.1.40.tar.gz


Index: system-config-netboot.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-netboot/FC-4/system-config-netboot.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- system-config-netboot.spec	1 Mar 2006 00:38:38 -0000	1.34
+++ system-config-netboot.spec	19 Apr 2006 22:17:57 -0000	1.35
@@ -1,17 +1,17 @@
 # -*- RPM-SPEC -*-
-Summary: system-config-netboot is an network booting/install configuration utility
-Name: system-config-netboot
-Version: 0.1.38
-Release: 2_FC4
-URL: http://www.redhat.com/ 
-Source0: %{name}-%{version}.tar.gz
-Source1: pxelinux.0
-Source2: system-config-netboot.pam
-License: GPL
-Group: Applications/System
+Summary:   system-config-netboot is an network booting/install configuration utility
+Name: 	   system-config-netboot
+Version:   0.1.40
+Release:   1.FC4
+URL: 	   http://www.redhat.com/ 
+Source0:   %{name}-%{version}.tar.gz
+Source1:   pxelinux.0
+Source2:   system-config-netboot.pam
+License:   GPL
+Group:     Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: gnome-python2, pygtk2, pygtk2-libglade, gnome-python2-canvas, rhpl, alchemist
-Requires: tftp-server >= 0.29-3
+Requires:  gnome-python2, pygtk2, pygtk2-libglade, gnome-python2-canvas, rhpl, alchemist
+Requires:  tftp-server >= 0.29-3
 Requires(post): hicolor-icon-theme
 ExclusiveArch: i386 x86_64
 #BuildArch: noarch
@@ -77,6 +77,11 @@
 %config %{_sysconfdir}/security/console.apps/system-config-netboot
 
 %changelog
+* Thu Apr 19 2006 Jason Vas Dias <jvdias at redhat.com> - 0.1.40-1
+- fix further issues reported by brian at chpc.utah.edu:
+  o should be a way of configuring remote logging from the GUI
+  o provide a means of disabling default snapshot directory generation
+
 * Tue Feb 14 2006 Jason Vas Dias <jvdias at redhat.com> - 0.1.38-1
 - further fix for f1 at micromemory.com problem (now bug 181365)
   deal with required binaries that have been replaced by scripts



From fedora-cvs-commits at redhat.com  Wed Apr 19 23:00:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 19:00:12 -0400
Subject: rpms/system-config-netboot/devel .cvsignore, 1.27, 1.28 sources,
	1.29, 1.30 system-config-netboot.spec, 1.42, 1.43
Message-ID: <200604192300.k3JN0CIj011415@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	.cvsignore sources system-config-netboot.spec 
Log Message:
v0.1.40: provide  a way of configuring remote logging from the GUI; provide a means of disabling default snapshot directory generation


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-netboot/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	1 Mar 2006 00:14:29 -0000	1.27
+++ .cvsignore	19 Apr 2006 23:00:06 -0000	1.28
@@ -13,3 +13,4 @@
 system-config-netboot-0.1.36.tar.gz
 system-config-netboot-0.1.37.tar.gz
 system-config-netboot-0.1.38.tar.gz
+system-config-netboot-0.1.40.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-netboot/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	1 Mar 2006 00:14:29 -0000	1.29
+++ sources	19 Apr 2006 23:00:06 -0000	1.30
@@ -1 +1 @@
-b238d55f597fe992f7105f1c13a109a1  system-config-netboot-0.1.38.tar.gz
+9877de9c0f7807aeddd30864b1e00a35  system-config-netboot-0.1.40.tar.gz


Index: system-config-netboot.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-netboot/devel/system-config-netboot.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- system-config-netboot.spec	1 Mar 2006 00:14:29 -0000	1.42
+++ system-config-netboot.spec	19 Apr 2006 23:00:06 -0000	1.43
@@ -1,17 +1,18 @@
 # -*- RPM-SPEC -*-
-Summary: system-config-netboot is an network booting/install configuration utility
-Name: system-config-netboot
-Version: 0.1.38
-Release: 1
-URL: http://www.redhat.com/ 
-Source0: %{name}-%{version}.tar.gz
-Source1: pxelinux.0
-License: GPL
-Group: Applications/System
+Summary:   system-config-netboot is an network booting/install configuration utility
+Name: 	   system-config-netboot
+Version:   0.1.40
+Release:   1.FC6
+URL: 	   http://www.redhat.com/ 
+Source0:   %{name}-%{version}.tar.gz
+Source1:   pxelinux.0
+License:   GPL
+Group:     Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: gnome-python2, pygtk2, pygtk2-libglade, gnome-python2-canvas, rhpl, alchemist
-Requires: tftp-server >= 0.29-3
+Requires:  gnome-python2, pygtk2, pygtk2-libglade, gnome-python2-canvas, rhpl, alchemist
+Requires:  tftp-server >= 0.29-3
 Requires(post): hicolor-icon-theme
+BuildRequires: intltool, perl-XML-Parser
 #ExclusiveArch: i386 x86_64
 BuildArch: noarch
 Obsoletes: redhat-config-netboot
@@ -74,6 +75,11 @@
 %config %{_sysconfdir}/security/console.apps/system-config-netboot
 
 %changelog
+* Thu Apr 19 2006 Jason Vas Dias <jvdias at redhat.com> - 0.1.40-1
+- fix further issues reported by brian at chpc.utah.edu:
+  o should be a way of configuring remote logging from the GUI
+  o provide a means of disabling default snapshot directory generation
+
 * Tue Feb 14 2006 Jason Vas Dias <jvdias at redhat.com> - 0.1.38-1
 - further fix for f1 at micromemory.com problem (now bug 181365)
   deal with required binaries that have been replaced by scripts



From fedora-cvs-commits at redhat.com  Thu Apr 20 01:08:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 21:08:29 -0400
Subject: rpms/ruby/devel ruby-rubyprefix.patch, NONE, 1.1 ruby-multilib.patch,
	1.2, 1.3 ruby.spec, 1.56, 1.57
Message-ID: <200604200108.k3K18TsF009695@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9648

Modified Files:
	ruby-multilib.patch ruby.spec 
Added Files:
	ruby-rubyprefix.patch 
Log Message:
* Wed Apr 19 2006 Akira TAGOH <tagoh at redhat.com>
- ruby-rubyprefix.patch: moved all arch-independent modules to /usr/lib/ruby
  and keep arch-dependent modules  in /usr/lib64/ruby for 64bit arch.
  so 'rubylibdir', 'sitelibdir' and 'sitedir' on Config::CONFIG points to
  /usr/lib/ruby now. (#184199)

ruby-rubyprefix.patch:
 configure.in |   27 ++++++++++++++++++++++-----
 mkconfig.rb  |    8 ++++----
 2 files changed, 26 insertions(+), 9 deletions(-)

--- NEW FILE ruby-rubyprefix.patch ---
diff -ruN ruby-1.8.4.orig/configure.in ruby-1.8.4/configure.in
--- ruby-1.8.4.orig/configure.in	2006-04-19 21:54:44.000000000 +0900
+++ ruby-1.8.4/configure.in	2006-04-19 21:59:48.000000000 +0900
@@ -1433,6 +1433,13 @@
     rubyw_install_name="$RUBYW_INSTALL_NAME"
     ;;
 esac
+
+AC_ARG_WITH(ruby-prefix,
+	AC_HELP_STRING([--with-ruby-prefix], [build ruby with the special library prefix.])
+	,,
+	with_ruby_prefix=no)
+
+if test "x$with_ruby_prefix" = "x"; then
 case "$target_os" in
   cygwin*|mingw*|*djgpp*|os2-emx*)
     RUBY_LIB_PREFIX="/lib/ruby"
@@ -1441,21 +1448,30 @@
     RUBY_LIB_PREFIX="${prefix}/lib/ruby"
     ;;
 esac
+else
+	RUBY_LIB_PREFIX="${with_ruby_prefix}/ruby"
+fi
 RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
+RUBY_LIB_PATH2="${libdir}/ruby/${MAJOR}.${MINOR}"
 
 AC_ARG_WITH(sitedir,
 	    [  --with-sitedir=DIR      site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
             [sitedir=$withval],
             [sitedir='${prefix}/lib/ruby/site_ruby'])
-SITE_DIR="`eval \"echo ${sitedir}\"`"
+SITE_DIR="`eval \"echo ${sitedir}\" | sed -e s/lib64/lib/`"
+_fc_sitedir=${sitedir}
+SITE_DIR2="`eval \"echo ${_fc_sitedir}\"`"
+sitedir="`eval \"echo ${sitedir}\" | sed -e s/lib64/lib/`"
 case "$target_os" in
   cygwin*|mingw*|*djgpp*|os2-emx*)
     RUBY_SITE_LIB_PATH="`expr "$SITE_DIR" : "$prefix\(/.*\)"`" ||
     RUBY_SITE_LIB_PATH="$SITE_DIR";;
   *)
-    RUBY_SITE_LIB_PATH="$SITE_DIR";;
+    RUBY_SITE_LIB_PATH="$SITE_DIR";
+    RUBY_SITE_LIB_PATH2="$SITE_DIR2";;
 esac
+RUBY_SITE_LIB_PATH3="${RUBY_SITE_LIB_PATH2}/${MAJOR}.${MINOR}"
 RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
 
 AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
 AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
@@ -1464,6 +1480,7 @@
 AC_SUBST(arch)dnl
 AC_SUBST(sitearch)dnl
 AC_SUBST(sitedir)dnl
+AC_SUBST(_fc_sitedir)dnl
 
 configure_args=$ac_configure_args
 AC_SUBST(configure_args)dnl
@@ -1472,7 +1489,7 @@
     arch="fat-${target_os}"
 
     AC_DEFINE_UNQUOTED(RUBY_THIN_ARCHLIB,
-                 "${RUBY_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
+                 "${RUBY_LIB_PATH2}/" __ARCHITECTURE__ "-${target_os}")
 
     AC_DEFINE_UNQUOTED(RUBY_SITE_THIN_ARCHLIB,
                  "${RUBY_SITE_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
@@ -1487,8 +1504,8 @@
   *) sitearch="${arch}" ;;
 esac
 
-AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH}/${arch}")
-AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH2}/${sitearch}")
+AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH2}/${arch}")
+AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH3}/${sitearch}")
 
 AC_ARG_WITH(search-path,
 		[  --with-search-path=DIR specify the additional search path],
diff -ruN ruby-1.8.4.orig/mkconfig.rb ruby-1.8.4/mkconfig.rb
--- ruby-1.8.4.orig/mkconfig.rb	2005-11-11 08:22:03.000000000 +0900
+++ ruby-1.8.4/mkconfig.rb	2006-04-19 21:55:08.000000000 +0900
@@ -108,10 +108,10 @@
 print v_fast, v_others
 print <<EOS
   CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
-  CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"
-  CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
-  CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
-  CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
+  CONFIG["rubylibdir"] = "$(prefix)/lib/ruby/$(ruby_version)"
+  CONFIG["archdir"] = "$(libdir)/ruby/$(ruby_version)/$(arch)"
+  CONFIG["sitelibdir"] = "$(prefix)/lib/ruby/site_ruby/$(ruby_version)"
+  CONFIG["sitearchdir"] = "$(_fc_sitedir)/$(ruby_version)/$(sitearch)"
   CONFIG["topdir"] = File.dirname(__FILE__)
   MAKEFILE_CONFIG = {}
   CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}

ruby-multilib.patch:
 mkconfig.rb |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: ruby-multilib.patch
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby-multilib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ruby-multilib.patch	26 Sep 2005 08:58:25 -0000	1.2
+++ ruby-multilib.patch	20 Apr 2006 01:08:22 -0000	1.3
@@ -10,25 +10,3 @@
  print "  TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n"
  print "  DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n"
  print "  CONFIG = {}\n"
-diff -ruN ruby-1.8.3.orig/configure.in ruby-1.8.3/configure.in
---- ruby-1.8.3.orig/configure.in	2005-09-07 08:22:56.000000000 +0900
-+++ ruby-1.8.3/configure.in	2005-09-26 17:46:53.000000000 +0900
-@@ -1424,15 +1424,15 @@
-     RUBY_LIB_PREFIX="/lib/ruby"
-     ;;
-   *)
--    RUBY_LIB_PREFIX="${prefix}/lib/ruby"
-+    RUBY_LIB_PREFIX="${libdir}/ruby"
-     ;;
- esac
- RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
- 
- AC_ARG_WITH(sitedir,
--	    [  --with-sitedir=DIR      site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
-+	    [  --with-sitedir=DIR      site libraries in DIR [LIBDIR/ruby/site_ruby]],
-             [sitedir=$withval],
--            [sitedir='${prefix}/lib/ruby/site_ruby'])
-+            [sitedir='${libdir}/ruby/site_ruby'])
- SITE_DIR="`eval \"echo ${sitedir}\"`"
- case "$target_os" in
-   cygwin*|mingw*|*djgpp*|os2-emx*)


Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- ruby.spec	17 Apr 2006 05:12:03 -0000	1.56
+++ ruby.spec	20 Apr 2006 01:08:23 -0000	1.57
@@ -1,10 +1,11 @@
 %define manver		1.4.6
 %define	rubyxver	1.8
 %define	sitedir		%{_libdir}/ruby/site_ruby
+%define	sitedir2	%{_prefix}/lib/ruby/site_ruby
 
 Name:		ruby
 Version:	1.8.4
-Release:	4.fc6
+Release:	4.fc6.1
 License:	Distributable
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -21,10 +22,11 @@
 Source5:	irb.1
 Source10:	ruby-mode-init.el
 
-Patch1:		ruby-multilib.patch
-Patch3:		ruby-1.8.2-deadcode.patch
-Patch4:		ruby-tcltk-multilib.patch
-Patch5:		ruby-1.8.4-no-eaccess.patch
+Patch1:		ruby-1.8.2-deadcode.patch
+Patch2:		ruby-1.8.4-no-eaccess.patch
+Patch3:		ruby-rubyprefix.patch
+Patch4:		ruby-multilib.patch
+Patch5:		ruby-tcltk-multilib.patch
 
 Summary:	An interpreter of object-oriented scripting language
 Group:		Development/Languages
@@ -131,14 +133,13 @@
 tar fxz %{SOURCE2}
 popd
 pushd %{name}-%{version}
-%ifarch ppc64 s390x sparc64 x86_64
 %patch1 -p1
-%endif
+%patch2 -p1
 %patch3 -p1
 %ifarch ppc64 s390x sparc64 x86_64
 %patch4 -p1
-%endif
 %patch5 -p1
+%endif
 popd
 
 %build
@@ -161,7 +162,8 @@
   --enable-shared \
   --enable-ipv6 \
   --with-lookup-order-hack=INET \
-  --disable-rpath
+  --disable-rpath \
+  --with-ruby-prefix=%{_prefix}/lib
 
 make RUBY_INSTALL_NAME=ruby %{?_smp_mflags}
 %ifarch ia64
@@ -267,13 +269,21 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 cd ..
 
-# generate ri doc
 _cpu=`echo %{_target_cpu} | sed 's/^ppc/powerpc/'`
+
+%{__mkdir_p} $RPM_BUILD_ROOT%{sitedir2}/%{rubyxver}
+%{__mkdir_p} $RPM_BUILD_ROOT%{sitedir}/%{rubyxver}/$_cpu-%{_target_os}
+
+%ifarch ppc64 s390x sparc64 x86_64
+# move the arch-specific files to proper location
+mv $RPM_BUILD_ROOT%{_prefix}/lib/ruby/%{rubyxver}/$_cpu-%{_target_os}/* $RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os}/
+rmdir $RPM_BUILD_ROOT%{_prefix}/lib/ruby/%{rubyxver}/$_cpu-%{_target_os}
+%endif
+
+# generate ri doc
 DESTDIR=$RPM_BUILD_ROOT LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_bindir}/ruby -I $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} -I $RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os}/ -I $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}/lib $RPM_BUILD_ROOT%{_bindir}/rdoc --all --ri-system $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}
 
 # XXX: installing irb
-chmod 555 $RPM_BUILD_ROOT%{_bindir}/irb
-install %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man1/
 
 # installing ruby-mode
 cd %{name}-%{version}
@@ -323,8 +333,8 @@
 
 # for ruby-libs
 cp /dev/null ruby-libs.files
-(fgrep    '%{_libdir}' ruby-all.files; 
- fgrep -h '%{_libdir}' ruby-devel.files ruby-tcltk.files irb.files ri.files rdoc.files) | egrep -v "elc?$" | \
+(fgrep    '%{_prefix}/lib' ruby-all.files; 
+ fgrep -h '%{_prefix}/lib' ruby-devel.files ruby-tcltk.files irb.files ri.files rdoc.files) | egrep -v "elc?$" | \
  sort | uniq -u > ruby-libs.files
 
 # for ruby-mode
@@ -343,7 +353,6 @@
 cat <<__EOF__ >> ruby-libs.files
 %%dir %%{_libdir}/ruby/%%{rubyxver}/$arch
 %%dir %%{_libdir}/ruby/%%{rubyxver}/$arch/digest
-%%dir %%{sitedir}/%%{rubyxver}/$arch
 __EOF__
 
 %clean
@@ -381,13 +390,17 @@
 %doc %{name}-%{version}/ChangeLog
 %doc %{name}-%{version}/LEGAL
 %dir %{_libdir}/ruby
+%dir %{_prefix}/lib/ruby
 %dir %{_libdir}/ruby/%{rubyxver}
-%dir %{_libdir}/ruby/%{rubyxver}/cgi
-%dir %{_libdir}/ruby/%{rubyxver}/net
-%dir %{_libdir}/ruby/%{rubyxver}/shell
-%dir %{_libdir}/ruby/%{rubyxver}/uri
+%dir %{_prefix}/lib/ruby/%{rubyxver}
+%dir %{_prefix}/lib/ruby/%{rubyxver}/cgi
+%dir %{_prefix}/lib/ruby/%{rubyxver}/net
+%dir %{_prefix}/lib/ruby/%{rubyxver}/shell
+%dir %{_prefix}/lib/ruby/%{rubyxver}/uri
 %dir %{sitedir}
 %dir %{sitedir}/%{rubyxver}
+%dir %{sitedir2}
+%dir %{sitedir2}/%{rubyxver}
 
 %files tcltk -f ruby-tcltk.files
 %defattr(-, root, root)
@@ -401,9 +414,9 @@
 %files irb -f irb.files
 %defattr(-, root, root)
 %doc tmp-ruby-docs/irb/*
-%dir %{_libdir}/ruby/%{rubyxver}/irb
-%dir %{_libdir}/ruby/%{rubyxver}/irb/lc
-%dir %{_libdir}/ruby/%{rubyxver}/irb/lc/ja
+%dir %{_prefix}/lib/ruby/%{rubyxver}/irb
+%dir %{_prefix}/lib/ruby/%{rubyxver}/irb/lc
+%dir %{_prefix}/lib/ruby/%{rubyxver}/irb/lc/ja
 
 %files ri -f ri.files
 %defattr(-, root, root)
@@ -420,6 +433,12 @@
 %dir %{_datadir}/emacs/site-lisp/ruby-mode
 
 %changelog
+* Wed Apr 19 2006 Akira TAGOH <tagoh at redhat.com>
+- ruby-rubyprefix.patch: moved all arch-independent modules to /usr/lib/ruby
+  and keep arch-dependent modules  in /usr/lib64/ruby for 64bit arch.
+  so 'rubylibdir', 'sitelibdir' and 'sitedir' on Config::CONFIG points to
+  /usr/lib/ruby now. (#184199)
+
 * Mon Apr 17 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-4
 - correct sitelibdir. (#184198)
 



From fedora-cvs-commits at redhat.com  Thu Apr 20 03:09:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 23:09:21 -0400
Subject: rpms/kernel/FC-4/configs config-generic,1.56,1.57
Message-ID: <200604200309.k3K39LLj025252@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
enable MSI



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- config-generic	4 Apr 2006 18:37:08 -0000	1.56
+++ config-generic	20 Apr 2006 03:09:17 -0000	1.57
@@ -59,7 +59,7 @@
 #
 CONFIG_PCI=y
 # CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_MSI is not set
+CONFIG_PCI_MSI=y
 CONFIG_PCI_LEGACY_PROC=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=m



From fedora-cvs-commits at redhat.com  Thu Apr 20 03:09:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 23:09:21 -0400
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1625,1.1626
Message-ID: <200604200309.k3K39Lub025246@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
enable MSI



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1625
retrieving revision 1.1626
diff -u -r1.1625 -r1.1626
--- kernel-2.6.spec	19 Apr 2006 18:55:15 -0000	1.1625
+++ kernel-2.6.spec	20 Apr 2006 03:09:12 -0000	1.1626
@@ -1062,6 +1062,9 @@
 %endif
 
 %changelog
+* Wed Apr 19 2006 Dave Jones <davej at redhat.com>
+- Enable PCI MSI support.
+
 * Tue Apr 18 2006 Dave Jones <davej at redhat.com> [2.6.16-1.2096_FC4]
 - 2.6.16.9
 



From fedora-cvs-commits at redhat.com  Thu Apr 20 03:10:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 23:10:57 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2096,1.2097
Message-ID: <200604200310.k3K3Avwa025516@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Enable MSI



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2096
retrieving revision 1.2097
diff -u -r1.2096 -r1.2097
--- kernel-2.6.spec	19 Apr 2006 09:04:06 -0000	1.2096
+++ kernel-2.6.spec	20 Apr 2006 03:10:42 -0000	1.2097
@@ -1691,7 +1691,10 @@
 %endif
 
 %changelog
-* Wed Apr 19 2006 David Woodhouse <dwmw2 at redhat.com>
+* Wed Apr 19 2006 Dave Jones <davej at redhat.com>
+- Enable PCI MSI.
+
+* Wed Apr 19 2006 David Woodhouse <dwmw2 at redhat.com> [2.6.16-1.2096]
 - 2.6.16.9
 
 * Wed Apr 19 2006 David Woodhouse <dwmw2 at redhat.com>



From fedora-cvs-commits at redhat.com  Thu Apr 20 03:10:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 23:10:57 -0400
Subject: rpms/kernel/FC-5/configs config-generic,1.163,1.164
Message-ID: <200604200310.k3K3AvCJ025524@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
Enable MSI



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-generic,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- config-generic	4 Apr 2006 18:37:28 -0000	1.163
+++ config-generic	20 Apr 2006 03:10:43 -0000	1.164
@@ -58,7 +58,7 @@
 #
 CONFIG_PCI=y
 # CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_MSI is not set
+CONFIG_PCI_MSI=y
 CONFIG_PCI_LEGACY_PROC=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=m



From fedora-cvs-commits at redhat.com  Thu Apr 20 03:11:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 23:11:51 -0400
Subject: rpms/kernel/devel/configs config-i586,1.9,1.10
Message-ID: <200604200311.k3K3BpN1025727@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-i586 
Log Message:
dont disable MSI on 586 as its the installer kernel.




Index: config-i586
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-i586,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- config-i586	10 Apr 2006 19:14:07 -0000	1.9
+++ config-i586	20 Apr 2006 03:11:48 -0000	1.10
@@ -19,7 +19,6 @@
 # CONFIG_X86_SPEEDSTEP_SMI is not set
 # CONFIG_X86_P4_CLOCKMOD is not set
 # CONFIG_HOTPLUG_PCI_PCIE is not set
-# CONFIG_PCI_MSI is not set
 # CONFIG_HOTPLUG_PCI is not set
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_MTD is not set



From fedora-cvs-commits at redhat.com  Thu Apr 20 03:13:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Apr 2006 23:13:23 -0400
Subject: rpms/kernel/FC-5/configs config-i586, 1.9, 1.10 config-i586-smp, 1.3,
	1.4
Message-ID: <200604200313.k3K3DN7G026038@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-i586 config-i586-smp 
Log Message:
dont disable MSI on i586



Index: config-i586
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-i586,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- config-i586	29 Mar 2006 18:28:29 -0000	1.9
+++ config-i586	20 Apr 2006 03:13:20 -0000	1.10
@@ -19,7 +19,6 @@
 # CONFIG_X86_SPEEDSTEP_SMI is not set
 # CONFIG_X86_P4_CLOCKMOD is not set
 # CONFIG_HOTPLUG_PCI_PCIE is not set
-# CONFIG_PCI_MSI is not set
 # CONFIG_HOTPLUG_PCI is not set
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_MTD is not set


Index: config-i586-smp
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-i586-smp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-i586-smp	29 Mar 2006 18:28:29 -0000	1.3
+++ config-i586-smp	20 Apr 2006 03:13:20 -0000	1.4
@@ -21,7 +21,6 @@
 # CONFIG_X86_SPEEDSTEP_SMI is not set
 # CONFIG_X86_P4_CLOCKMOD is not set
 # CONFIG_HOTPLUG_PCI_PCIE is not set
-# CONFIG_PCI_MSI is not set
 # CONFIG_HOTPLUG_PCI is not set
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_MTD is not set



From fedora-cvs-commits at redhat.com  Thu Apr 20 04:35:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 00:35:23 -0400
Subject: rpms/ruby/devel ruby-deprecated-search-path.patch, NONE,
	1.1 ruby.spec, 1.57, 1.58
Message-ID: <200604200435.k3K4ZMpa000356@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv317

Modified Files:
	ruby.spec 
Added Files:
	ruby-deprecated-search-path.patch 
Log Message:
* Thu Apr 20 2006 Akira TAGOH <tagoh at redhat.com>
- ruby-deprecated-search-path.patch: added the deprecated installation paths
  to the search path for the backward compatibility.
- added a Provides: ruby(abi) to ruby-libs.

ruby-deprecated-search-path.patch:
 configure.in |    4 ++++
 ruby.c       |    9 +++++++++
 2 files changed, 13 insertions(+)

--- NEW FILE ruby-deprecated-search-path.patch ---
??????????????????????????????ruby-1.8.4.orig/.ruby.c.swp???ruby-1.8.4/.ruby.c.swp???????????????
diff -ruN ruby-1.8.4.orig/configure.in ruby-1.8.4/configure.in
--- ruby-1.8.4.orig/configure.in	2006-04-20 12:53:38.000000000 +0900
+++ ruby-1.8.4/configure.in	2006-04-20 13:06:07.000000000 +0900
@@ -1472,10 +1472,14 @@
 esac
 RUBY_SITE_LIB_PATH3="${RUBY_SITE_LIB_PATH2}/${MAJOR}.${MINOR}"
 RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
+RUBY_DEPRECATED_SITE_LIB_PATH="${SITE_DIR2}/${MAJOR}.${MINOR}"
 
 AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
 AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
 AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}")
+AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_LIB, "${RUBY_LIB_PATH2}")
+AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_SITE_LIB, "${SITE_DIR2}")
+AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_SITE_LIB2, "${RUBY_DEPRECATED_SITE_LIB_PATH}")
 
 AC_SUBST(arch)dnl
 AC_SUBST(sitearch)dnl
diff -ruN ruby-1.8.4.orig/ruby.c ruby-1.8.4/ruby.c
--- ruby-1.8.4.orig/ruby.c	2005-12-12 09:36:52.000000000 +0900
+++ ruby-1.8.4/ruby.c	2006-04-20 12:59:50.000000000 +0900
@@ -292,13 +292,22 @@
 #endif
 
     ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB2));
+#ifdef RUBY_DEPRECATED_SITE_LIB
+    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_SITE_LIB2));
+#endif
 #ifdef RUBY_SITE_THIN_ARCHLIB
     ruby_incpush(RUBY_RELATIVE(RUBY_SITE_THIN_ARCHLIB));
 #endif
     ruby_incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB));
     ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB));
+#ifdef RUBY_DEPRECATED_SITE_LIB
+    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_SITE_LIB));
+#endif
 
     ruby_incpush(RUBY_RELATIVE(RUBY_LIB));
+#ifdef RUBY_DEPRECATED_LIB
+    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_LIB));
+#endif
 #ifdef RUBY_THIN_ARCHLIB
     ruby_incpush(RUBY_RELATIVE(RUBY_THIN_ARCHLIB));
 #endif


Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- ruby.spec	20 Apr 2006 01:08:23 -0000	1.57
+++ ruby.spec	20 Apr 2006 04:35:04 -0000	1.58
@@ -5,7 +5,7 @@
 
 Name:		ruby
 Version:	1.8.4
-Release:	4.fc6.1
+Release:	4.fc6.2
 License:	Distributable
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -25,8 +25,9 @@
 Patch1:		ruby-1.8.2-deadcode.patch
 Patch2:		ruby-1.8.4-no-eaccess.patch
 Patch3:		ruby-rubyprefix.patch
-Patch4:		ruby-multilib.patch
-Patch5:		ruby-tcltk-multilib.patch
+Patch4:		ruby-deprecated-search-path.patch
+Patch5:		ruby-multilib.patch
+Patch6:		ruby-tcltk-multilib.patch
 
 Summary:	An interpreter of object-oriented scripting language
 Group:		Development/Languages
@@ -42,6 +43,7 @@
 %package libs
 Summary:	Libraries necessary to run Ruby.
 Group:		Development/Libraries
+Provides:	ruby(abi) = %{rubyxver}
 Provides:	libruby
 Obsoletes:	libruby
 
@@ -139,6 +141,7 @@
 %ifarch ppc64 s390x sparc64 x86_64
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 %endif
 popd
 
@@ -433,6 +436,11 @@
 %dir %{_datadir}/emacs/site-lisp/ruby-mode
 
 %changelog
+* Thu Apr 20 2006 Akira TAGOH <tagoh at redhat.com>
+- ruby-deprecated-search-path.patch: added the deprecated installation paths
+  to the search path for the backward compatibility.
+- added a Provides: ruby(abi) to ruby-libs.
+
 * Wed Apr 19 2006 Akira TAGOH <tagoh at redhat.com>
 - ruby-rubyprefix.patch: moved all arch-independent modules to /usr/lib/ruby
   and keep arch-dependent modules  in /usr/lib64/ruby for 64bit arch.



From fedora-cvs-commits at redhat.com  Thu Apr 20 09:19:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 05:19:47 -0400
Subject: rpms/ethereal/devel .cvsignore, 1.31, 1.32 ethereal.spec, 1.67,
	1.68 sources, 1.33, 1.34
Message-ID: <200604200919.k3K9JltG021696@cvs.devel.redhat.com>

Author: rvokal

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

Modified Files:
	.cvsignore ethereal.spec sources 
Log Message:
- 0.99.0 prerelease


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ethereal/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	29 Mar 2006 09:19:46 -0000	1.31
+++ .cvsignore	20 Apr 2006 09:19:43 -0000	1.32
@@ -1 +1 @@
-ethereal-0.10.14-SVN-17749.tar.gz
+ethereal-0.99.0-SVN-17918.tar.gz


Index: ethereal.spec
===================================================================
RCS file: /cvs/dist/rpms/ethereal/devel/ethereal.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- ethereal.spec	29 Mar 2006 09:19:46 -0000	1.67
+++ ethereal.spec	20 Apr 2006 09:19:43 -0000	1.68
@@ -1,10 +1,10 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define svn_version 17749
+%define svn_version 17918
 
 Summary: 	Network traffic analyzer
 Name: 		ethereal
-Version:	0.10.14
-Release: 	4.svn.1
+Version:	0.99.0
+Release: 	0.svn.1
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	http://www.ethereal.com/distribution/%{name}-%{version}-SVN-%{svn_version}.tar.gz
@@ -163,6 +163,9 @@
 
 
 %changelog
+* Thu Apr 20 2006 Radek Vok??l <rvokal at redhat.com> 0.99.0-0.svn.1
+- 0.99.0 prerelease
+
 * Wed Mar 29 2006 Radek Vok??l <rvokal at redhat.com> 0.10.14-4.svn.1
 - update to latest svn version
 - dumpcap


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ethereal/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	29 Mar 2006 09:19:46 -0000	1.33
+++ sources	20 Apr 2006 09:19:43 -0000	1.34
@@ -1 +1 @@
-f35a7337c8a97b597d0bb806f9cc8420  ethereal-0.10.14-SVN-17749.tar.gz
+be2679c335adf5b15d60ebbf7f4c0f1d  ethereal-0.99.0-SVN-17918.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 20 09:52:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 05:52:13 -0400
Subject: rpms/ruby/devel ruby-1.8.4-64bit-pack.patch, NONE, 1.1 ruby.spec,
	1.58, 1.59
Message-ID: <200604200952.k3K9qDHv009306@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9266

Modified Files:
	ruby.spec 
Added Files:
	ruby-1.8.4-64bit-pack.patch 
Log Message:
- ruby-1.8.4-64bit-pack.patch: backport patch to fix unpack(l) not working
  on 64bit arch and integer overflow on template w. (#189350)
- updated License tag to be more comfortable, and with a pointer to get more
  details, like Python package does. (#179933)

ruby-1.8.4-64bit-pack.patch:
 pack.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE ruby-1.8.4-64bit-pack.patch ---
diff -ruN ruby-1.8.4.orig/pack.c ruby-1.8.4/pack.c
--- ruby-1.8.4.orig/pack.c	2005-10-13 23:30:49.000000000 +0900
+++ ruby-1.8.4/pack.c	2006-04-20 13:50:25.000000000 +0900
@@ -347,11 +347,11 @@
     return 0;			/* not reached */
 }
 
-#if SIZEOF_LONG == SIZE32 || SIZEOF_INT == SIZE32
+#if SIZEOF_LONG == SIZE32
 # define EXTEND32(x) 
 #else
 /* invariant in modulo 1<<31 */
-# define EXTEND32(x) do {if (!natint) {(x) = (I32)(((1<<31)-1-(x))^~(~0<<31));}} while(0)
+# define EXTEND32(x) do { if (!natint) {(x) = (((1L<<31)-1-(x))^~(~0L<<31));}} while(0)
 #endif
 #if SIZEOF_SHORT == SIZE16
 # define EXTEND16(x) 
@@ -1951,7 +1951,7 @@
 	  case 'w':
 	    {
 		unsigned long ul = 0;
-		unsigned long ulmask = 0xfeL << ((sizeof(unsigned long) - 1) * 8);
+		unsigned long ulmask = 0xfeUL << ((sizeof(unsigned long) - 1UL) * 8UL);
 
 		while (len > 0 && s < send) {
 		    ul <<= 7;


Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- ruby.spec	20 Apr 2006 04:35:04 -0000	1.58
+++ ruby.spec	20 Apr 2006 09:52:09 -0000	1.59
@@ -6,7 +6,7 @@
 Name:		ruby
 Version:	1.8.4
 Release:	4.fc6.2
-License:	Distributable
+License:	Ruby License/GPL - see COPYING
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	readline readline-devel ncurses ncurses-devel gdbm gdbm-devel glibc-devel tcl-devel tk-devel libX11-devel autoconf gcc unzip openssl-devel db4-devel emacs
@@ -28,6 +28,7 @@
 Patch4:		ruby-deprecated-search-path.patch
 Patch5:		ruby-multilib.patch
 Patch6:		ruby-tcltk-multilib.patch
+Patch7:		ruby-1.8.4-64bit-pack.patch
 
 Summary:	An interpreter of object-oriented scripting language
 Group:		Development/Languages
@@ -142,6 +143,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 %endif
 popd
 
@@ -440,6 +442,10 @@
 - ruby-deprecated-search-path.patch: added the deprecated installation paths
   to the search path for the backward compatibility.
 - added a Provides: ruby(abi) to ruby-libs.
+- ruby-1.8.4-64bit-pack.patch: backport patch to fix unpack("l") not working
+  on 64bit arch and integer overflow on template "w". (#189350)
+- updated License tag to be more comfortable, and with a pointer to get more
+  details, like Python package does. (#179933)
 
 * Wed Apr 19 2006 Akira TAGOH <tagoh at redhat.com>
 - ruby-rubyprefix.patch: moved all arch-independent modules to /usr/lib/ruby



From fedora-cvs-commits at redhat.com  Thu Apr 20 11:05:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 07:05:47 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,
	NONE, 1.1 openoffice.org.spec, 1.664, 1.665
Message-ID: <200604201105.k3KB5lp4028064@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 
Log Message:
honour fontconfig hinting

openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch:
 inc/outfont.hxx                            |    0 
 inc/psprint/fontmanager.hxx                |    0 
 inc/vclenum.hxx                            |    0 
 psprint/inc/psprint/fontmanager.hxx        |   22 ++++++
 psprint/source/fontmanager/fontconfig.cxx  |   98 +++++++++++++++++++----------
 psprint/source/fontmanager/fontmanager.cxx |    8 ++
 source/fontmanager/fontconfig.cxx          |    0 
 source/fontmanager/fontmanager.cxx         |    0 
 source/glyphs/gcach_ftyp.cxx               |    0 
 source/glyphs/gcach_ftyp.hxx               |    0 
 unx/source/gdi/xlfd_extd.cxx               |    0 
 vcl/inc/outfont.hxx                        |    6 +
 vcl/inc/vclenum.hxx                        |   22 ++++++
 vcl/source/glyphs/gcach_ftyp.cxx           |   72 +++++++++++++++------
 vcl/source/glyphs/gcach_ftyp.hxx           |    6 +
 vcl/unx/source/gdi/xlfd_extd.cxx           |    4 +
 vcl/win/source/gdi/salgdi3.cxx             |    9 ++
 win/source/gdi/salgdi3.cxx                 |    0 
 18 files changed, 192 insertions(+), 55 deletions(-)

--- NEW FILE openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch ---
Index: inc/psprint/fontmanager.hxx
===================================================================
RCS file: /cvs/gsl/psprint/inc/psprint/fontmanager.hxx,v
retrieving revision 1.29
diff -u -r1.29 fontmanager.hxx
--- openoffice.org.orig/psprint/inc/psprint/fontmanager.hxx	29 Mar 2006 11:21:16 -0000	1.29
+++ openoffice.org/psprint/inc/psprint/fontmanager.hxx	20 Apr 2006 10:35:55 -0000
@@ -152,6 +152,17 @@
 };
 }
 
+namespace fchint
+{
+enum type {
+    Nohint = 0,
+    Slight = 1,
+    Medium = 2,
+    Full = 3
+};
+}
+
+
 /*
  *  the difference between FastPrintFontInfo and PrintFontInfo
  *  is that the information in FastPrintFontInfo can usually
@@ -179,6 +190,9 @@
     rtl_TextEncoding        			m_aEncoding;
     fcstatus::type                      m_eEmbeddedbitmap;
     fcstatus::type                      m_eAntialias;
+    fcstatus::type                      m_eAutoHint;
+    fcstatus::type                      m_eHinting;
+    fchint::type                        m_eHintStyle;
 
     FastPrintFontInfo() :
             m_nID( 0 ),
@@ -190,7 +204,10 @@
             m_ePitch( pitch::Unknown ),
             m_aEncoding( RTL_TEXTENCODING_DONTKNOW ),
             m_eEmbeddedbitmap( fcstatus::isunset ),
-            m_eAntialias( fcstatus::isunset )
+            m_eAntialias( fcstatus::isunset ),
+            m_eAutoHint( fcstatus::isunset ),
+            m_eHinting( fcstatus::isunset ),
+            m_eHintStyle( fchint::Full )
     {}
 };
 
@@ -307,6 +324,9 @@
 
         fcstatus::type                              m_eEmbeddedbitmap;
         fcstatus::type                              m_eAntialias;
+        fcstatus::type                              m_eAutoHint;
+        fcstatus::type                              m_eHinting;
+        fchint::type                                m_eHintStyle;
 
         std::map< sal_Unicode, sal_Int32 >			m_aEncodingVector;
         std::map< sal_Unicode, rtl::OString >		m_aNonEncoded;
Index: source/fontmanager/fontconfig.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/fontmanager/fontconfig.cxx,v
retrieving revision 1.17
diff -u -r1.17 fontconfig.cxx
--- openoffice.org.orig/psprint/source/fontmanager/fontconfig.cxx	29 Mar 2006 11:21:45 -0000	1.17
+++ openoffice.org/psprint/source/fontmanager/fontconfig.cxx	20 Apr 2006 10:36:06 -0000
@@ -334,9 +341,14 @@
                                                     FC_SLANT,
                                                     FC_WEIGHT,
                                                     FC_SPACING,
+                                                    FC_ANTIALIAS,
+                                                    FC_HINTING,
+                                                    FC_HINT_STYLE,
+                                                    FC_AUTOHINT,
                                                     FC_FILE,
-                                                    FC_OUTLINE,
                                                     FC_INDEX,
+                                                    FC_OUTLINE,
+                                                    FC_EMBEDDED_BITMAP,
                                                     (void *) NULL );
     FcPattern* pPattern = rWrapper.FcPatternCreate();
     FcFontSet* pFSet = rWrapper.FcFontList( pConfig, pPattern, pOSet );
@@ -355,35 +367,18 @@
             int weight = 0;
             int spacing = 0;
             int nCollectionEntry = -1;
-            FcBool outline = false, embitmap = true, antialias = true;
-            
-            FcResult eFileRes	= rWrapper.FcPatternGetString( pFSet->fonts[i], FC_FILE, 0, &file );
-            FcResult eFamilyRes	= rWrapper.FcPatternGetString( pFSet->fonts[i], FC_FAMILY, 0, &family );
-            FcResult eStyleRes	= rWrapper.FcPatternGetString( pFSet->fonts[i], FC_STYLE, 0, &style );
-            FcResult eSlantRes	= rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_SLANT, 0, &slant );
-            FcResult eWeightRes	= rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_WEIGHT, 0, &weight );
-            FcResult eSpacRes	= rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_SPACING, 0, &spacing );
-            FcResult eOutRes	= rWrapper.FcPatternGetBool( pFSet->fonts[i], FC_OUTLINE, 0, &outline );
-            FcResult eIndexRes = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_INDEX, 0, &nCollectionEntry );            
-
-            FcResult eEmbeddedBitmap = FcResultNoMatch;
-            FcResult eAntialias = FcResultNoMatch;
-
-			if (eFamilyRes == FcResultMatch)
-			{
-			    FcPattern *pMatch = rWrapper.FcPatternCreate();
-    			rWrapper.FcPatternAddString(pMatch, FC_FAMILY, family);
-    			rWrapper.FcConfigSubstitute( NULL, pMatch, FcMatchPattern );
-    			FcResult eResult;
-    			if (FcPattern* pResult = rWrapper.FcFontSetMatch( NULL, &pFSet, 1, pMatch, &eResult ))
-    			{
-                	eEmbeddedBitmap = rWrapper.FcPatternGetBool( pResult, FC_EMBEDDED_BITMAP, 0, &embitmap );
-    	            eAntialias = rWrapper.FcPatternGetBool( pResult, FC_ANTIALIAS, 0, &antialias );
-    				rWrapper.FcPatternDestroy(pResult);
-    			}
-    			rWrapper.FcPatternDestroy(pMatch);
-   			}
-            
+            FcBool outline = false, embitmap = true, antialias = true, autohint = true, hinting = true;
+            int hintstyle = FC_HINT_FULL;
+
+            FcResult eFileRes        = rWrapper.FcPatternGetString( pFSet->fonts[i], FC_FILE, 0, &file );
+            FcResult eFamilyRes      = rWrapper.FcPatternGetString( pFSet->fonts[i], FC_FAMILY, 0, &family );
+            FcResult eStyleRes       = rWrapper.FcPatternGetString( pFSet->fonts[i], FC_STYLE, 0, &style );
+            FcResult eSlantRes       = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_SLANT, 0, &slant );
+            FcResult eWeightRes      = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_WEIGHT, 0, &weight );
+            FcResult eSpacRes        = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_SPACING, 0, &spacing );
+            FcResult eOutRes         = rWrapper.FcPatternGetBool( pFSet->fonts[i], FC_OUTLINE, 0, &outline );
+            FcResult eIndexRes       = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_INDEX, 0, &nCollectionEntry );
+
             if( eFileRes != FcResultMatch || eFamilyRes != FcResultMatch || eOutRes != FcResultMatch )
                 continue;
 
@@ -404,6 +399,24 @@
             if( eOutRes == FcResultMatch && ! outline )
                 continue;
 
+	    rWrapper.FcConfigSubstitute( pConfig, pFSet->fonts[i], FcMatchFont );
+	    rWrapper.FcDefaultSubstitute( pFSet->fonts[i] );
+            FcResult eEmbeddedBitmap = rWrapper.FcPatternGetBool( pFSet->fonts[i], FC_EMBEDDED_BITMAP, 0, &embitmap );
+            FcResult eAntialias      = rWrapper.FcPatternGetBool( pFSet->fonts[i], FC_ANTIALIAS, 0, &antialias );
+    	    FcResult eAutoHint       = rWrapper.FcPatternGetBool( pFSet->fonts[i], FC_AUTOHINT, 0, &autohint );
+    	    FcResult eHinting        = rWrapper.FcPatternGetBool( pFSet->fonts[i], FC_HINTING, 0, &hinting );
+    	    FcResult eHintStyle      = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_HINT_STYLE, 0, &hintstyle );
+
+#ifdef HDU_DEBUG
+            fprintf( stderr, "   embeddedbitmap = %d, antialias = %d, autohint = %d, hinting = %d, hintstyle = %d\n"
+                     , eEmbeddedBitmap == FcResultMatch ? embitmap : -1
+                     , eAntialias == FcResultMatch ? antialias : -1
+                     , eAutoHint == FcResultMatch ? autohint : -1
+                     , eHinting == FcResultMatch ? hinting : -1
+                     , eHintStyle == FcResultMatch ? hintstyle : -1
+                     );
+#endif
+
             // see if this font is already cached
             // update attributes
             std::list< PrintFont* > aFonts;
@@ -526,8 +539,38 @@
                 {
                   pUpdate->m_eAntialias = antialias ? fcstatus::istrue : fcstatus::isfalse;
                 }
+                if( eAutoHint == FcResultMatch )
+                {
+                  pUpdate->m_eAutoHint = autohint ? fcstatus::istrue : fcstatus::isfalse;
+                }
+                if( eHinting == FcResultMatch )
+                {
+                  pUpdate->m_eHinting = hinting ? fcstatus::istrue : fcstatus::isfalse;
+                }
+                if (eHintStyle != FcResultMatch)
+                {
+                  pUpdate->m_eHintStyle = fchint::Full;
+                }
+                else
+                {
+                  switch (hintstyle)
+                  {
+                    case FC_HINT_NONE:
+                      pUpdate->m_eHintStyle = fchint::Nohint;
+                      break;
+                    case FC_HINT_SLIGHT:
+                      pUpdate->m_eHintStyle = fchint::Slight;
+                      break;
+                    case FC_HINT_MEDIUM:
+                      pUpdate->m_eHintStyle = fchint::Medium;
+                      break;
+                    case FC_HINT_FULL:
+                    default:
+                      pUpdate->m_eHintStyle = fchint::Full;
+                      break;
+                  }
+                }
 
-                
                 // update font cache
                 m_pFontCache->updateFontCacheEntry( pUpdate, false );
                 // sort into known fonts
Index: source/fontmanager/fontmanager.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/fontmanager/fontmanager.cxx,v
retrieving revision 1.67
diff -u -r1.67 fontmanager.cxx
--- openoffice.org.orig/psprint/source/fontmanager/fontmanager.cxx	7 Apr 2006 13:44:31 -0000	1.67
+++ openoffice.org/psprint/source/fontmanager/fontmanager.cxx	20 Apr 2006 10:36:18 -0000
@@ -381,7 +381,10 @@
         m_bHaveVerticalSubstitutedGlyphs( false ),
         m_bUserOverride( false ),
         m_eEmbeddedbitmap( fcstatus::isunset ),
-        m_eAntialias( fcstatus::isunset )
+        m_eAntialias( fcstatus::isunset ),
+        m_eAutoHint( fcstatus::isunset ),
+        m_eHinting( fcstatus::isunset ),
+        m_eHintStyle( fchint::Full )
 {
 }
 
@@ -2595,6 +2598,9 @@
     rInfo.m_aEncoding       = pFont->m_aEncoding;
     rInfo.m_eEmbeddedbitmap = pFont->m_eEmbeddedbitmap;
     rInfo.m_eAntialias      = pFont->m_eAntialias;
+    rInfo.m_eAutoHint       = pFont->m_eAutoHint;
+    rInfo.m_eHinting        = pFont->m_eHinting;
+    rInfo.m_eHintStyle      = pFont->m_eHintStyle;
     rInfo.m_aAliases.clear();
     for( ::std::list< int >::iterator it = pFont->m_aAliases.begin(); it != pFont->m_aAliases.end(); ++it )
         rInfo.m_aAliases.push_back( m_pAtoms->getString( ATOM_FAMILYNAME, *it ) );
Index: inc/outfont.hxx
===================================================================
RCS file: /cvs/gsl/vcl/inc/outfont.hxx,v
retrieving revision 1.21
diff -u -r1.21 outfont.hxx
--- openoffice.org.orig/vcl/inc/outfont.hxx	7 Apr 2006 15:27:27 -0000	1.21
+++ openoffice.org/vcl/inc/outfont.hxx	20 Apr 2006 10:32:09 -0000
@@ -120,6 +120,9 @@
     bool               IsSubsettable() const     { return mbSubsettable; }
     FontEmbeddedBitmap UseEmbeddedBitmap() const { return meEmbeddedBitmap; }
     FontAntiAlias      UseAntiAlias() const      { return meAntiAlias; }
+    FontHinting        UseHinting() const        { return meHinting; }
+    FontAutoHint       UseAutoHint() const       { return meAutoHint; }
+    FontHintStyle      GetHintStyle() const      { return meHintStyle; }
 
 public: // TODO: hide members behind accessor methods
     String             maMapNames;       // List of family name aliass separated with ';'
@@ -130,6 +133,9 @@
     bool               mbEmbeddable;     // true: the font can be embedded
     FontEmbeddedBitmap meEmbeddedBitmap; // whether the embedded bitmaps should be used
     FontAntiAlias      meAntiAlias;      // whether the font should be antialiased
+    FontAutoHint       meAutoHint;       // whether the font should be autohinted
+    FontHinting        meHinting;        // whether the font should be hinted
+    FontHintStyle      meHintStyle;      // type of font hinting to be used
 };
 
 // ----------------
Index: inc/vclenum.hxx
===================================================================
RCS file: /cvs/gsl/vcl/inc/vclenum.hxx,v
retrieving revision 1.7
diff -u -r1.7 vclenum.hxx
--- openoffice.org.orig/vcl/inc/vclenum.hxx	29 Mar 2006 11:24:50 -0000	1.7
+++ openoffice.org/vcl/inc/vclenum.hxx	20 Apr 2006 10:32:57 -0000
@@ -289,6 +289,28 @@
 
 #endif
 
+#ifndef ENUM_FONTAUTOHINT_DECLARED
+#define ENUM_FONTAUTOHINT_DECLARED
+
+enum FontAutoHint { AUTOHINT_DONTKNOW, AUTOHINT_FALSE, AUTOHINT_TRUE };
+
+#endif
+
+#ifndef ENUM_FONTHINTING_DECLARED
+#define ENUM_FONTHINTING_DECLARED
+
+enum FontHinting { HINTING_DONTKNOW, HINTING_FALSE, HINTING_TRUE };
+
+#endif
+
+#ifndef ENUM_FONTHINTSTYLE_DECLARED
+#define ENUM_FONTHINTSTYLE_DECLARED
+
+enum FontHintStyle { HINT_NONE, HINT_SLIGHT, HINT_MEDIUM, HINT_FULL };
+
+#endif
+
+
 // ------------------------------------------------------------
 
 #ifndef ENUM_KEYFUNCTYPE_DECLARED
Index: source/glyphs/gcach_ftyp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.cxx,v
retrieving revision 1.122
diff -u -r1.122 gcach_ftyp.cxx
--- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx	7 Apr 2006 15:33:10 -0000	1.122
+++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx	20 Apr 2006 10:35:25 -0000
@@ -387,6 +387,13 @@
     return mpExtraKernInfo->GetUnscaledKernValue( cLeftChar, cRightChar );
 }
 
+bool FtFontInfo::DontUseHinting() const
+{
+    return
+      (maDevFontAttributes.UseHinting() == HINTING_FALSE) ||
+      (maDevFontAttributes.GetHintStyle() == HINT_NONE);
+}
+
 // -----------------------------------------------------------------------
 
 static unsigned GetUInt( const unsigned char* p ) { return((p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]);}
@@ -684,6 +691,7 @@
 FreetypeServerFont::FreetypeServerFont( const ImplFontSelectData& rFSD, FtFontInfo* pFI )
 :   ServerFont( rFSD ),
     mnPrioEmbedded(nDefaultPrioEmbedded), mnPrioAntiAlias(nDefaultPrioAntiAlias),
+    mnPrioAutoHint(nDefaultPrioAutoHint),
     mpFontInfo( pFI ),
     maFaceFT( NULL ),
     maSizeFT( NULL ),
@@ -806,42 +814,64 @@
 
     mbArtItalic = (rFSD.meItalic != ITALIC_NONE && pFI->GetFontAttributes().GetSlant() == ITALIC_NONE);
     mbArtBold = (rFSD.meWeight > WEIGHT_MEDIUM && pFI->GetFontAttributes().GetWeight() <= WEIGHT_MEDIUM);
+    mbUseGamma = false;
+    if (mbArtBold)
+    {
+        static const int TT_CODEPAGE_RANGE_874  = (1L << 16); // Thai
+        static const int TT_CODEPAGE_RANGE_932  = (1L << 17); // JIS/Japan
+        static const int TT_CODEPAGE_RANGE_936  = (1L << 18); // Chinese: Simplified
+        static const int TT_CODEPAGE_RANGE_949  = (1L << 19); // Korean Wansung
+        static const int TT_CODEPAGE_RANGE_950  = (1L << 20); // Chinese: Traditional
+        static const int TT_CODEPAGE_RANGE_1361 = (1L << 21); // Korean Johab
+        static const int TT_CODEPAGE_RANGES1_CJKT = 0x3F0000; // all of the above
+        const TT_OS2* pOs2 = (const TT_OS2*)FT_Get_Sfnt_Table( maFaceFT, ft_sfnt_os2 );
+        if ((pOs2) && (pOs2->ulCodePageRange1 & TT_CODEPAGE_RANGES1_CJKT )
+	          && rFSD.mnHeight < 20)
+	    mbUseGamma = true;
+    }
+
+    FontAutoHint eHint = mpFontInfo->GetUseAutoHint();
+    if (eHint == AUTOHINT_DONTKNOW)
+        eHint = mbUseGamma ? AUTOHINT_TRUE : AUTOHINT_FALSE;
 
-    static const int TT_CODEPAGE_RANGE_874  = (1L << 16); // Thai
-    static const int TT_CODEPAGE_RANGE_932  = (1L << 17); // JIS/Japan
-    static const int TT_CODEPAGE_RANGE_936  = (1L << 18); // Chinese: Simplified
-    static const int TT_CODEPAGE_RANGE_949  = (1L << 19); // Korean Wansung
-    static const int TT_CODEPAGE_RANGE_950  = (1L << 20); // Chinese: Traditional
-    static const int TT_CODEPAGE_RANGE_1361 = (1L << 21); // Korean Johab
-    static const int TT_CODEPAGE_RANGES1_CJKT = 0x3F0000; // all of the above
-    const TT_OS2* pOs2 = (const TT_OS2*)FT_Get_Sfnt_Table( maFaceFT, ft_sfnt_os2 );
-    if ((pOs2) && (pOs2->ulCodePageRange1 & TT_CODEPAGE_RANGES1_CJKT )
-	      && rFSD.mnHeight < 20)
-	mbUseGamma = true;
-    else
-	mbUseGamma = false;
-
-    if (mbUseGamma)
+    if (eHint == AUTOHINT_TRUE)
 	mnLoadFlags |= FT_LOAD_FORCE_AUTOHINT;
 
     if( (mnSin != 0) && (mnCos != 0) ) // hinting for 0/90/180/270 degrees only
         mnLoadFlags |= FT_LOAD_NO_HINTING;
+
     mnLoadFlags |= FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; //#88334#
 
     if (mpFontInfo->DontUseAntiAlias())
         mnPrioAntiAlias = 0;
     if (mpFontInfo->DontUseEmbeddedBitmaps())
         mnPrioEmbedded = 0;
+    if (mpFontInfo->DontUseHinting())
+        mnPrioAutoHint = 0;
 
 #if (FTVERSION >= 2005) || defined(TT_CONFIG_OPTION_BYTECODE_INTERPRETER)
-    if( nDefaultPrioAutoHint <= 0 )
+    if( mnPrioAutoHint <= 0 )
 #endif
         mnLoadFlags |= FT_LOAD_NO_HINTING;
 
-#ifdef FT_LOAD_TARGET_LIGHT
+#if defined(FT_LOAD_TARGET_LIGHT) && defined(FT_LOAD_TARGET_NORMAL)
     // enable "light hinting" if available
     if( !(mnLoadFlags & FT_LOAD_NO_HINTING) && (nFTVERSION >= 2103))
-        mnLoadFlags |= FT_LOAD_TARGET_LIGHT;
+    {
+	switch (mpFontInfo->GetHintStyle())
+	{
+	    default:
+	    case HINT_SLIGHT:
+	    case HINT_MEDIUM:
+                mnLoadFlags |= FT_LOAD_TARGET_LIGHT;
+                break;
+	    case HINT_FULL:
+                mnLoadFlags |= FT_LOAD_TARGET_NORMAL;
+                break;
+	    case HINT_NONE:
+                break;
+	}
+    }
 #endif
 
     if( ((mnCos != 0) && (mnSin != 0)) || (mnPrioEmbedded <= 0) )
@@ -1300,11 +1330,11 @@
 #if (FTVERSION >= 2002)
     // for 0/90/180/270 degree fonts enable autohinting even if not advisable
     // non-hinted and non-antialiased bitmaps just look too ugly
-    if( (mnCos==0 || mnSin==0) && (nDefaultPrioAutoHint > 0) )
+    if( (mnCos==0 || mnSin==0) && (mnPrioAutoHint > 0) )
         nLoadFlags &= ~FT_LOAD_NO_HINTING;
 #endif
 
-    if( mnPrioEmbedded <= nDefaultPrioAutoHint )
+    if( mnPrioEmbedded <= mnPrioAutoHint )
         nLoadFlags |= FT_LOAD_NO_BITMAP;
 
     FT_Error rc = -1;
@@ -1451,7 +1481,7 @@
     // autohinting in FT<=2.0.4 makes antialiased glyphs look worse
     nLoadFlags |= FT_LOAD_NO_HINTING;
 #else
-    if( (nGlyphFlags & GF_UNHINTED) || (nDefaultPrioAutoHint < mnPrioAntiAlias) )
+    if( (nGlyphFlags & GF_UNHINTED) || (mnPrioAutoHint < mnPrioAntiAlias) )
         nLoadFlags |= FT_LOAD_NO_HINTING;
 #endif
 
Index: source/glyphs/gcach_ftyp.hxx
===================================================================
RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.hxx,v
retrieving revision 1.34
diff -u -r1.34 gcach_ftyp.hxx
--- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.hxx	29 Mar 2006 11:26:24 -0000	1.34
+++ openoffice.org/vcl/source/glyphs/gcach_ftyp.hxx	20 Apr 2006 10:35:25 -0000
@@ -92,11 +92,14 @@
     const ::rtl::OString* GetFontFileName() const   { return mpFontFile->GetFileName(); }
     int                   GetFaceNum() const        { return mnFaceNum; }
     int                   GetSynthetic() const      { return mnSynthetic; }
-    int                   GetFontId() const         { return mnFontId; }
+    int                   GetFontId() const         { return mnFontId; }
     bool                  DontUseAntiAlias() const  
         { return maDevFontAttributes.UseAntiAlias() == ANTIALIAS_FALSE; }
     bool                  DontUseEmbeddedBitmaps() const 
         { return maDevFontAttributes.UseEmbeddedBitmap() == EMBEDDEDBITMAP_FALSE; }
+    bool                  DontUseHinting() const;
+    FontAutoHint          GetUseAutoHint() const 	{ return maDevFontAttributes.UseAutoHint(); }
+    FontHintStyle         GetHintStyle() const 		{ return maDevFontAttributes.GetHintStyle(); }
     bool                  IsSymbolFont() const      { return maDevFontAttributes.IsSymbolFont(); }
     const ImplFontAttributes& GetFontAttributes() const { return maDevFontAttributes; }
 
@@ -212,6 +215,7 @@
     int                         mnWidth;
     int                         mnPrioEmbedded;
     int                         mnPrioAntiAlias;
+    int                         mnPrioAutoHint;
     FtFontInfo*                 mpFontInfo;
     FT_Int                      mnLoadFlags;
     double                      mfStretch;
Index: unx/source/gdi/xlfd_extd.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/gdi/xlfd_extd.cxx,v
retrieving revision 1.26
diff -u -r1.26 xlfd_extd.cxx
--- openoffice.org.orig/vcl/unx/source/gdi/xlfd_extd.cxx	29 Mar 2006 11:29:14 -0000	1.26
+++ openoffice.org/vcl/unx/source/gdi/xlfd_extd.cxx	20 Apr 2006 10:40:01 -0000
@@ -117,6 +117,10 @@
     meEmbeddedBitmap = EMBEDDEDBITMAP_DONTKNOW;
     meAntiAlias = ANTIALIAS_DONTKNOW;
 
+    meAutoHint = AUTOHINT_DONTKNOW;
+    meHinting = HINTING_DONTKNOW;
+    meHintStyle = HINT_FULL;
+
     mnQuality      = -1;
 }
 
Index: win/source/gdi/salgdi3.cxx
===================================================================
RCS file: /cvs/gsl/vcl/win/source/gdi/salgdi3.cxx,v
retrieving revision 1.77
diff -u -r1.77 salgdi3.cxx
--- openoffice.org.orig/vcl/win/source/gdi/salgdi3.cxx	29 Mar 2006 11:29:53 -0000	1.77
+++ openoffice.org/vcl/win/source/gdi/salgdi3.cxx	20 Apr 2006 10:40:39 -0000
@@ -411,6 +411,9 @@
 
     aDFA.meEmbeddedBitmap = EMBEDDEDBITMAP_DONTKNOW;
     aDFA.meAntiAlias = ANTIALIAS_DONTKNOW;
+    aDFA.meAutoHint = AUTOHINT_DONTKNOW;
+    aDFA.meHinting = HINTING_DONTKNOW;
+    aDFA.meHintStyle = HINT_FULL;
     
     // TODO: add alias names
 
@@ -493,6 +496,9 @@
 
     aDFA.meEmbeddedBitmap = EMBEDDEDBITMAP_DONTKNOW;
     aDFA.meAntiAlias = ANTIALIAS_DONTKNOW;
+    aDFA.meAutoHint = AUTOHINT_DONTKNOW;
+    aDFA.meHinting = HINTING_DONTKNOW;
+    aDFA.meHintStyle = HINT_FULL;
 
     // TODO: add alias names
     return aDFA;
@@ -1890,6 +1896,9 @@
     aDFA.mbEmbeddable = false;
     aDFA.meEmbeddedBitmap = EMBEDDEDBITMAP_DONTKNOW;
     aDFA.meAntiAlias = ANTIALIAS_DONTKNOW;
+    aDFA.meAutoHint = AUTOHINT_DONTKNOW;
+    aDFA.meHinting = HINTING_DONTKNOW;
+    aDFA.meHintStyle = HINT_FULL;
 
     /*
 	// TODO: improve ImplDevFontAttributes using "FONTRES:" from *.fot file


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.664
retrieving revision 1.665
diff -u -r1.664 -r1.665
--- openoffice.org.spec	18 Apr 2006 10:11:41 -0000	1.664
+++ openoffice.org.spec	20 Apr 2006 11:05:44 -0000	1.665
@@ -222,6 +222,7 @@
 %endif
 Patch39: openoffice.org-2.0.2.rh188467.printingdefaults.patch
 Patch40: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
+Patch41: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1136,6 +1137,7 @@
 %endif
 %patch39 -p1 -b .rh188467.printingdefaults.patch
 %patch40 -p1 -b .ooo64463.extensions.noxaw.patch
+%patch41 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -3685,6 +3687,7 @@
 * Tue Apr 18 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.10
 - ooo#64463# don't require Xaw for the use mozilla plugins (e.g flash)
   in OOo feature
+- ooo#64508#/rh#189061# honour fontconfig hinting settings
 
 * Wed Apr 12 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.9
 - rh#187939# not detecting changes to CUPS printers during execution



From fedora-cvs-commits at redhat.com  Thu Apr 20 11:28:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 07:28:54 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,
	1.1, 1.2
Message-ID: <200604201128.k3KBSsF3025135@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 
Log Message:
tweak a bit

openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch:
 inc/outfont.hxx                            |    0 
 inc/psprint/fontmanager.hxx                |    0 
 inc/vclenum.hxx                            |    0 
 psprint/inc/psprint/fontmanager.hxx        |   22 ++++++
 psprint/source/fontmanager/fontconfig.cxx  |   98 +++++++++++++++++++----------
 psprint/source/fontmanager/fontmanager.cxx |    8 ++
 source/fontmanager/fontconfig.cxx          |    0 
 source/fontmanager/fontmanager.cxx         |    0 
 source/glyphs/gcach_ftyp.cxx               |    0 
 source/glyphs/gcach_ftyp.hxx               |    0 
 unx/source/gdi/xlfd_extd.cxx               |    0 
 vcl/inc/outfont.hxx                        |    6 +
 vcl/inc/vclenum.hxx                        |   22 ++++++
 vcl/source/glyphs/gcach_ftyp.cxx           |   71 ++++++++++++++-------
 vcl/source/glyphs/gcach_ftyp.hxx           |    6 +
 vcl/unx/source/gdi/xlfd_extd.cxx           |    4 +
 vcl/win/source/gdi/salgdi3.cxx             |    9 ++
 win/source/gdi/salgdi3.cxx                 |    0 
 18 files changed, 191 insertions(+), 55 deletions(-)

Index: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	20 Apr 2006 11:05:44 -0000	1.1
+++ openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	20 Apr 2006 11:28:50 -0000	1.2
@@ -304,7 +304,7 @@
  // -----------------------------------------------------------------------
  
  static unsigned GetUInt( const unsigned char* p ) { return((p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]);}
-@@ -684,6 +691,7 @@
+@@ -691,6 +698,7 @@
  FreetypeServerFont::FreetypeServerFont( const ImplFontSelectData& rFSD, FtFontInfo* pFI )
  :   ServerFont( rFSD ),
      mnPrioEmbedded(nDefaultPrioEmbedded), mnPrioAntiAlias(nDefaultPrioAntiAlias),
@@ -312,10 +312,10 @@
      mpFontInfo( pFI ),
      maFaceFT( NULL ),
      maSizeFT( NULL ),
-@@ -806,42 +814,64 @@
+@@ -813,22 +821,27 @@
  
-     mbArtItalic = (rFSD.meItalic != ITALIC_NONE && pFI->GetFontAttributes().GetSlant() == ITALIC_NONE);
-     mbArtBold = (rFSD.meWeight > WEIGHT_MEDIUM && pFI->GetFontAttributes().GetWeight() <= WEIGHT_MEDIUM);
+     mbArtItalic = (rFSD.meItalic != ITALIC_NONE && rFSD.mpFontData->GetSlant() == ITALIC_NONE);
+     mbArtBold = (rFSD.meWeight > WEIGHT_MEDIUM && rFSD.mpFontData->GetWeight() <= WEIGHT_MEDIUM);
 +    mbUseGamma = false;
 +    if (mbArtBold)
 +    {
@@ -355,11 +355,7 @@
  	mnLoadFlags |= FT_LOAD_FORCE_AUTOHINT;
  
      if( (mnSin != 0) && (mnCos != 0) ) // hinting for 0/90/180/270 degrees only
-         mnLoadFlags |= FT_LOAD_NO_HINTING;
-+
-     mnLoadFlags |= FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; //#88334#
- 
-     if (mpFontInfo->DontUseAntiAlias())
+@@ -839,16 +852,32 @@
          mnPrioAntiAlias = 0;
      if (mpFontInfo->DontUseEmbeddedBitmaps())
          mnPrioEmbedded = 0;
@@ -378,24 +374,24 @@
      if( !(mnLoadFlags & FT_LOAD_NO_HINTING) && (nFTVERSION >= 2103))
 -        mnLoadFlags |= FT_LOAD_TARGET_LIGHT;
 +    {
-+	switch (mpFontInfo->GetHintStyle())
-+	{
-+	    default:
-+	    case HINT_SLIGHT:
-+	    case HINT_MEDIUM:
++      switch (mpFontInfo->GetHintStyle())
++      {
++          default:
++          case HINT_SLIGHT:
++          case HINT_MEDIUM:
 +                mnLoadFlags |= FT_LOAD_TARGET_LIGHT;
 +                break;
-+	    case HINT_FULL:
++          case HINT_FULL:
 +                mnLoadFlags |= FT_LOAD_TARGET_NORMAL;
 +                break;
-+	    case HINT_NONE:
++          case HINT_NONE:
 +                break;
-+	}
++      }
 +    }
  #endif
  
      if( ((mnCos != 0) && (mnSin != 0)) || (mnPrioEmbedded <= 0) )
-@@ -1300,11 +1330,11 @@
+@@ -1307,11 +1336,11 @@
  #if (FTVERSION >= 2002)
      // for 0/90/180/270 degree fonts enable autohinting even if not advisable
      // non-hinted and non-antialiased bitmaps just look too ugly
@@ -409,7 +405,7 @@
          nLoadFlags |= FT_LOAD_NO_BITMAP;
  
      FT_Error rc = -1;
-@@ -1451,7 +1481,7 @@
+@@ -1458,7 +1487,7 @@
      // autohinting in FT<=2.0.4 makes antialiased glyphs look worse
      nLoadFlags |= FT_LOAD_NO_HINTING;
  #else



From fedora-cvs-commits at redhat.com  Thu Apr 20 11:37:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 07:37:23 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,
	1.2, 1.3
Message-ID: <200604201137.k3KBbNax025986@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 
Log Message:
remove that thingy

openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch:
 inc/outfont.hxx                            |    0 
 inc/psprint/fontmanager.hxx                |    0 
 inc/vclenum.hxx                            |    0 
 psprint/inc/psprint/fontmanager.hxx        |   22 ++++++-
 psprint/source/fontmanager/fontconfig.cxx  |   91 +++++++++++++++++++----------
 psprint/source/fontmanager/fontmanager.cxx |    8 ++
 source/fontmanager/fontconfig.cxx          |    0 
 source/fontmanager/fontmanager.cxx         |    0 
 source/glyphs/gcach_ftyp.cxx               |    0 
 source/glyphs/gcach_ftyp.hxx               |    0 
 unx/source/gdi/xlfd_extd.cxx               |    0 
 vcl/inc/outfont.hxx                        |    6 +
 vcl/inc/vclenum.hxx                        |   22 +++++++
 vcl/source/glyphs/gcach_ftyp.cxx           |   71 +++++++++++++++-------
 vcl/source/glyphs/gcach_ftyp.hxx           |    6 +
 vcl/unx/source/gdi/xlfd_extd.cxx           |    4 +
 vcl/win/source/gdi/salgdi3.cxx             |    9 ++
 win/source/gdi/salgdi3.cxx                 |    0 
 18 files changed, 185 insertions(+), 54 deletions(-)

Index: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	20 Apr 2006 11:28:50 -0000	1.2
+++ openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	20 Apr 2006 11:37:19 -0000	1.3
@@ -62,22 +62,6 @@
 diff -u -r1.17 fontconfig.cxx
 --- openoffice.org.orig/psprint/source/fontmanager/fontconfig.cxx	29 Mar 2006 11:21:45 -0000	1.17
 +++ openoffice.org/psprint/source/fontmanager/fontconfig.cxx	20 Apr 2006 10:36:06 -0000
-@@ -334,9 +341,14 @@
-                                                     FC_SLANT,
-                                                     FC_WEIGHT,
-                                                     FC_SPACING,
-+                                                    FC_ANTIALIAS,
-+                                                    FC_HINTING,
-+                                                    FC_HINT_STYLE,
-+                                                    FC_AUTOHINT,
-                                                     FC_FILE,
--                                                    FC_OUTLINE,
-                                                     FC_INDEX,
-+                                                    FC_OUTLINE,
-+                                                    FC_EMBEDDED_BITMAP,
-                                                     (void *) NULL );
-     FcPattern* pPattern = rWrapper.FcPatternCreate();
-     FcFontSet* pFSet = rWrapper.FcFontList( pConfig, pPattern, pOSet );
 @@ -355,35 +367,18 @@
              int weight = 0;
              int spacing = 0;



From fedora-cvs-commits at redhat.com  Thu Apr 20 11:39:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 07:39:17 -0400
Subject: rpms/coreutils/devel coreutils-selinux.patch, 1.19,
	1.20 coreutils.spec, 1.109, 1.110
Message-ID: <200604201139.k3KBdH2p026231@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	coreutils-selinux.patch coreutils.spec 
Log Message:
* Thu Apr 20 2006 Tim Waugh <twaugh at redhat.com> 5.94-3
- Make 'ls -Z' output more consistent with other output formats.


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         |   49 ++++++
 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, 1691 insertions(+), 124 deletions(-)

Index: coreutils-selinux.patch
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-selinux.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- coreutils-selinux.patch	24 Mar 2006 13:48:34 -0000	1.19
+++ coreutils-selinux.patch	20 Apr 2006 11:39:12 -0000	1.20
@@ -1160,8 +1160,8 @@
 +  }
 +  return 1; /* can't reach this statement.... */
 +}
---- coreutils-5.94/src/ls.c.selinux	2006-03-24 13:23:38.000000000 +0000
-+++ coreutils-5.94/src/ls.c	2006-03-24 13:23:45.000000000 +0000
+--- 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
 @@ -135,6 +135,18 @@
  
  #define AUTHORS "Richard Stallman", "David MacKenzie"
@@ -1692,10 +1692,7 @@
        fputs (HELP_OPTION_DESCRIPTION, stdout);
        fputs (VERSION_OPTION_DESCRIPTION, stdout);
        fputs (_("\n\
-@@ -4244,3 +4403,83 @@
-     }
-   exit (status);
- }
+@@ -4246,0 +4406,67 @@
 +
 +#ifdef WITH_SELINUX
 +
@@ -1734,23 +1731,10 @@
 +
 +    /* print standard user and group */
 +
-+    user_name = f->stat_failed ? "?" :
-+	    (numeric_ids ? NULL : getuser (f->stat.st_uid));
-+    if (user_name)
-+      (void) sprintf (p, "%-8.8s ", user_name);
-+    else
-+      (void) sprintf (p, "%-8u ", (unsigned int) f->stat.st_uid);
-+    p += strlen (p);
-+
-+    if ( print_group ) {
-+      group_name = f->stat_failed ? "?" :
-+	      (numeric_ids ? NULL : getgroup (f->stat.st_gid));
-+      if (group_name)
-+	(void) sprintf (p, "%-8.8s ", group_name);
-+      else
-+	(void) sprintf (p, "%-8u ", (unsigned int) f->stat.st_gid);
-+      p += strlen (p);
-+    }
++    DIRED_FPUTS (buf, stdout, p - buf);
++    format_user (f->stat.st_uid, owner_width, f->stat_failed);
++    format_group (f->stat.st_gid, group_width, f->stat_failed);
++    p = buf;
 +  }
 +
 +  (void) sprintf (p, "%-32s ", f->scontext ?: "");


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- coreutils.spec	24 Mar 2006 13:48:34 -0000	1.109
+++ coreutils.spec	20 Apr 2006 11:39:12 -0000	1.110
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 5.94
-Release: 2
+Release: 3
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -261,6 +261,9 @@
 /sbin/runuser
 
 %changelog
+* Thu Apr 20 2006 Tim Waugh <twaugh at redhat.com> 5.94-3
+- Make 'ls -Z' output more consistent with other output formats.
+
 * Fri Mar 24 2006 Tim Waugh <twaugh at redhat.com> 5.94-2
 - 5.94.
 



From fedora-cvs-commits at redhat.com  Thu Apr 20 12:17:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 08:17:02 -0400
Subject: rpms/ipsec-tools/devel .cvsignore,1.9,1.10 sources,1.9,1.10
Message-ID: <200604201217.k3KCH22n027395@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/ipsec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27141

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Apr 18 2006 Dan Walsh <dwalsh at redhat.com> - 0.6.5-1
- Update to latest upstream version
- Add MLS Patch to allow use of labeled networks
- Patch provided by Joy Latten <latten at austin.ibm.com>



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ipsec-tools/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	7 Feb 2006 13:44:56 -0000	1.9
+++ .cvsignore	20 Apr 2006 12:17:00 -0000	1.10
@@ -1 +1,2 @@
 ipsec-tools-0.6.4.tar.bz2
+ipsec-tools-0.6.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ipsec-tools/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Feb 2006 13:44:56 -0000	1.9
+++ sources	20 Apr 2006 12:17:00 -0000	1.10
@@ -1 +1 @@
-d0242a943c82c0cbf28005966ff35e21  ipsec-tools-0.6.4.tar.bz2
+4593bd5e1117a10f2d0f4b656de36208  ipsec-tools-0.6.5.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 20 12:19:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 08:19:51 -0400
Subject: rpms/ipsec-tools/devel ipsec-tools.spec,1.25,1.26
Message-ID: <200604201219.k3KCJp36031651@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/ipsec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31628

Modified Files:
	ipsec-tools.spec 
Log Message:
* Tue Apr 18 2006 Dan Walsh <dwalsh at redhat.com> - 0.6.5-1
- Update to latest upstream version
- Add MLS Patch to allow use of labeled networks
- Patch provided by Joy Latten <latten at austin.ibm.com>



Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ipsec-tools.spec	19 Apr 2006 16:22:32 -0000	1.25
+++ ipsec-tools.spec	20 Apr 2006 12:19:49 -0000	1.26
@@ -16,8 +16,7 @@
 Patch2: isakmp.c.diff
 Patch5: ipsec-tools-0.5-64bit.patch
 #Patch6: ipsec-tools-0.6.1-openssl-098.patch
-Patch7: ipsec-tools-0.6.5-context.patch
-Patch8: ipsec-tools-0.6.5-context2.patch
+Patch7: ipsec-tools-0.6.5-mls.patch
 
 BuildPrereq: openssl-devel, krb5-devel, bison, flex
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root



From fedora-cvs-commits at redhat.com  Thu Apr 20 12:22:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 08:22:29 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,
	1.3, 1.4
Message-ID: <200604201222.k3KCMTrb032705@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 
Log Message:
bah

openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch:
 inc/outfont.hxx                            |    0 
 inc/psprint/fontmanager.hxx                |    0 
 inc/vclenum.hxx                            |    0 
 psprint/inc/psprint/fontmanager.hxx        |   22 ++++++-
 psprint/source/fontmanager/fontconfig.cxx  |   91 +++++++++++++++++++----------
 psprint/source/fontmanager/fontmanager.cxx |    8 ++
 source/fontmanager/fontconfig.cxx          |    0 
 source/fontmanager/fontmanager.cxx         |    0 
 source/glyphs/gcach_ftyp.cxx               |    0 
 source/glyphs/gcach_ftyp.hxx               |    0 
 unx/source/gdi/xlfd_extd.cxx               |    0 
 vcl/inc/outfont.hxx                        |    6 +
 vcl/inc/vclenum.hxx                        |   22 +++++++
 vcl/source/glyphs/gcach_ftyp.cxx           |   71 +++++++++++++++-------
 vcl/source/glyphs/gcach_ftyp.hxx           |    6 +
 vcl/unx/source/gdi/xlfd_extd.cxx           |    4 +
 vcl/win/source/gdi/salgdi3.cxx             |    9 ++
 win/source/gdi/salgdi3.cxx                 |    0 
 18 files changed, 185 insertions(+), 54 deletions(-)

Index: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	20 Apr 2006 11:37:19 -0000	1.3
+++ openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	20 Apr 2006 12:22:27 -0000	1.4
@@ -114,7 +114,7 @@
              if( eOutRes == FcResultMatch && ! outline )
                  continue;
  
-+	    rWrapper.FcConfigSubstitute( pConfig, pFSet->fonts[i], FcMatchFont );
++	    rWrapper.FcConfigSubstitute( rWrapper.getDefConfig(), pFSet->fonts[i], FcMatchFont );
 +	    rWrapper.FcDefaultSubstitute( pFSet->fonts[i] );
 +            FcResult eEmbeddedBitmap = rWrapper.FcPatternGetBool( pFSet->fonts[i], FC_EMBEDDED_BITMAP, 0, &embitmap );
 +            FcResult eAntialias      = rWrapper.FcPatternGetBool( pFSet->fonts[i], FC_ANTIALIAS, 0, &antialias );



From fedora-cvs-commits at redhat.com  Thu Apr 20 12:42:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 08:42:40 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.121.rh156677.other.cripplemenus.sysui.patch,
	NONE, 1.1 openoffice.org.spec, 1.665, 1.666
Message-ID: <200604201242.k3KCge6u004747@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.121.rh156677.other.cripplemenus.sysui.patch 
Log Message:
allow to be installed in parallel in menus

openoffice.org-1.9.121.rh156677.other.cripplemenus.sysui.patch:
 desktop/menus/base.desktop          |    0 
 desktop/menus/calc.desktop          |    0 
 desktop/menus/impress.desktop       |    0 
 desktop/menus/writer.desktop        |    0 
 sysui/desktop/menus/base.desktop    |    2 +-
 sysui/desktop/menus/calc.desktop    |    2 +-
 sysui/desktop/menus/impress.desktop |    2 +-
 sysui/desktop/menus/writer.desktop  |    2 +-
 8 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE openoffice.org-1.9.121.rh156677.other.cripplemenus.sysui.patch ---
Index: desktop/menus/base.desktop
===================================================================
RCS file: /cvs/gsl/sysui/desktop/menus/base.desktop,v
retrieving revision 1.6
diff -u -p -u -r1.6 base.desktop
--- openoffice.org.orig/sysui/desktop/menus/base.desktop	13 May 2005 09:27:14 -0000	1.6
+++ openoffice.org/sysui/desktop/menus/base.desktop	26 Jul 2005 12:53:41 -0000
@@ -8,5 +8,5 @@ InitialPreference=2
 Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;
 Exec=openoffice -base %U
 MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base
-Name=%PRODUCTNAME Base
+Name=Database Development
 Comment=Manage databases, create queries and reports to track and manage your information by using Base.
Index: desktop/menus/calc.desktop
===================================================================
RCS file: /cvs/gsl/sysui/desktop/menus/calc.desktop,v
retrieving revision 1.7
diff -u -p -u -r1.7 calc.desktop
--- openoffice.org.orig/sysui/desktop/menus/calc.desktop	24 Feb 2005 16:13:30 -0000	1.7
+++ openoffice.org/sysui/desktop/menus/calc.desktop	26 Jul 2005 12:53:41 -0000
@@ -8,5 +8,5 @@ InitialPreference=2
 Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;
 Exec=openoffice -calc %U
 MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel
-Name=%PRODUCTNAME Calc
+Name=OpenOffice.org 2 Spreadsheet
 Comment=Perform calculation, analyze information and manage lists in spreadsheets by using Calc.
Index: desktop/menus/impress.desktop
===================================================================
RCS file: /cvs/gsl/sysui/desktop/menus/impress.desktop,v
retrieving revision 1.8
diff -u -p -u -r1.8 impress.desktop
--- openoffice.org.orig/sysui/desktop/menus/impress.desktop	20 Apr 2005 11:35:17 -0000	1.8
+++ openoffice.org/sysui/desktop/menus/impress.desktop	26 Jul 2005 12:53:41 -0000
@@ -8,5 +8,5 @@ InitialPreference=2
 Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;
 Exec=openoffice -impress %U
 MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint
-Name=%PRODUCTNAME Impress
+Name=OpenOffice.org 2 Presentation
 Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
Index: desktop/menus/writer.desktop
===================================================================
RCS file: /cvs/gsl/sysui/desktop/menus/writer.desktop,v
retrieving revision 1.9
diff -u -p -u -r1.9 writer.desktop
--- openoffice.org.orig/sysui/desktop/menus/writer.desktop	20 Apr 2005 11:35:35 -0000	1.9
+++ openoffice.org/sysui/desktop/menus/writer.desktop	26 Jul 2005 12:53:41 -0000
@@ -8,5 +8,5 @@ InitialPreference=2
 Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;
 Exec=openoffice -writer %U
 MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/vnd.wordperfect;application/wordperfect
-Name=%PRODUCTNAME Writer
+Name=OpenOffice.org 2 Word Processor
 Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.665
retrieving revision 1.666
diff -u -r1.665 -r1.666
--- openoffice.org.spec	20 Apr 2006 11:05:44 -0000	1.665
+++ openoffice.org.spec	20 Apr 2006 12:42:37 -0000	1.666
@@ -185,7 +185,11 @@
 Patch3:  openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
 Patch4:  openoffice.org-1.9.97.rh156067.noversionedicons.patch
 Patch5:  openoffice.org-1.9.121.rh127576.gnomeprintui.patch
+%if %{obsoleteold}
 Patch6:  openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
+%else
+Patch6:  openoffice.org-1.9.121.rh156677.other.cripplemenus.sysui.patch
+%endif
 Patch7:  openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
 Patch8:  openoffice.org-2.0.1.rhXXXXX.extensions.defaulttoevo2.patch
 Patch9:  openoffice.org-2.0.2.ooo34909.dbaccess.patch
@@ -1090,7 +1094,11 @@
 %if %{gnomeprintui}
 %patch5  -p1 -b .rh127576.gnomeprintui.patch
 %endif
+%if %{obsoleteold}
 %patch6  -p1 -b .rh156677.cripplemenus.sysui.patch
+%else
+%patch6  -p1 -b .rh156677.other.cripplemenus.sysui.patch
+%endif
 %patch7  -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
 %patch8  -p1 -b .rhXXXXX.extensions.defaulttoevo2.patch
 %patch9  -p1 -b .ooo34909.dbaccess.patch



From fedora-cvs-commits at redhat.com  Thu Apr 20 12:57:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 08:57:02 -0400
Subject: rpms/gimp/devel gimp-2.2.11-gimptool.patch, NONE, 1.1 gimp.spec,
	1.93, 1.94
Message-ID: <200604201257.k3KCv2SY023697@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/gimp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23514

Modified Files:
	gimp.spec 
Added Files:
	gimp-2.2.11-gimptool.patch 
Log Message:
only use pkgconfig if needed in gimptool, require pkgconfig in devel subpackage (#189314, #189371)


gimp-2.2.11-gimptool.patch:
 gimptool-2.0.in |  103 +++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 61 insertions(+), 42 deletions(-)

--- NEW FILE gimp-2.2.11-gimptool.patch ---
--- gimp-2.2.11/gimptool-2.0.in.gimptool	2006-01-10 13:12:28.000000000 +0100
+++ gimp-2.2.11/gimptool-2.0.in	2006-04-20 14:45:18.000000000 +0200
@@ -91,54 +91,60 @@
   usage 1
 fi
 
-if test x${PKG_CONFIG+set} != xset ; then
-  PKG_CONFIG=pkg-config
-fi
+__gimptool_init__=0
+init() {
+    if [ "$__gimptool_init__" -eq 0 ]; then
+        if test x${PKG_CONFIG+set} != xset ; then
+          PKG_CONFIG=pkg-config
+        fi
 
-if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
-  gtk_cflags=`$PKG_CONFIG --cflags gtk+-2.0`
-  gtk_libs=`$PKG_CONFIG --libs gtk+-2.0`
-  glib_cflags=`$PKG_CONFIG --cflags glib-2.0`
-  glib_libs=`$PKG_CONFIG --libs glib-2.0`
-else
-  echo "*** pkg-config not found or too old; using paths from gimp compilation." 1>&2
-  gtk_cflags='@GTK_CFLAGS@'
-  gtk_libs='@GTK_LIBS@'
-  glib_cflags='@GLIB_CFLAGS@'
-  glib_libs='@GLIB_LIBS@'
-fi
+        if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
+          gtk_cflags=`$PKG_CONFIG --cflags gtk+-2.0`
+          gtk_libs=`$PKG_CONFIG --libs gtk+-2.0`
+          glib_cflags=`$PKG_CONFIG --cflags glib-2.0`
+          glib_libs=`$PKG_CONFIG --libs glib-2.0`
+        else
+          echo "*** pkg-config not found or too old; using paths from gimp compilation." 1>&2
+          gtk_cflags='@GTK_CFLAGS@'
+          gtk_libs='@GTK_LIBS@'
+          glib_cflags='@GLIB_CFLAGS@'
+          glib_libs='@GLIB_LIBS@'
+        fi
 
-if test x${INSTALL+set} != xset ; then
-  INSTALL='@INSTALL@'
-  if test "$INSTALL" = "./install-sh -c"; then
-    mydirname=`echo $0 | sed -e 's#\(.*\)/[^/].*$#\1#'`
-    INSTALL="$mydirname/gimpinstall"
-  fi
-fi
+        if test x${INSTALL+set} != xset ; then
+          INSTALL='@INSTALL@'
+          if test "$INSTALL" = "./install-sh -c"; then
+            mydirname=`echo $0 | sed -e 's#\(.*\)/[^/].*$#\1#'`
+            INSTALL="$mydirname/gimpinstall"
+          fi
+        fi
 
-if test x${CC+set} != xset ; then
-  cc='@CC@'
-else
-  cc="$CC"
-fi
+        if test x${CC+set} != xset ; then
+          cc='@CC@'
+        else
+          cc="$CC"
+        fi
 
-if test x${CFLAGS+set} != xset ; then
-  cflags='@CFLAGS@'
-else
-  cflags="$CFLAGS"
-fi
+        if test x${CFLAGS+set} != xset ; then
+          cflags='@CFLAGS@'
+        else
+          cflags="$CFLAGS"
+        fi
 
-if test x${LDFLAGS+set} != xset ; then
-  ldflags='@LDFLAGS@'
-else
-  ldflags="$LDFLAGS"
-fi
+        if test x${LDFLAGS+set} != xset ; then
+          ldflags='@LDFLAGS@'
+        else
+          ldflags="$LDFLAGS"
+        fi
 
-if test x${LIBS+set} != xset ; then
-  libs=""
-else
-  libs="$LIBS"
-fi
+        if test x${LIBS+set} != xset ; then
+          libs=""
+        else
+          libs="$LIBS"
+        fi
+        __gimptool_init__=1
+    fi
+}
 
 while test $# -gt 0; do
   case "$1" in
@@ -174,9 +180,17 @@
       exec_prefix_set=yes
       ;;
     --exec-prefix)
+      init
       echo $exec_prefix
       ;;
     --*dir)
+      case "$1" in
+        --gimp*dir)
+          ;;
+        *)
+          init
+          ;;
+      esac  
       dirname=\$`echo $1 | sed -e 's,^--,,'`
       dirname=`eval echo $dirname`
       test -z "$dirname" && exit 1
@@ -184,6 +198,7 @@
       exit 0
       ;;
     --cflags | --cflags-noui | --cflags-nogimpui)
+      init
       case $1 in
         --cflags | --cflags-nogimpui)
           my_gtk_cflags=$gtk_cflags ;;
@@ -194,6 +209,7 @@
       echo $includes $my_gtk_cflags
       ;;
     --libs | --libs-nogimpui)
+      init
       my_gtk_libs=
       libdirs=-L at libdir@
       for i in $gtk_libs ; do
@@ -213,6 +229,7 @@
       esac
       ;;
     --libs-noui)
+      init
       echo -L at libdir@ -lgimp- at GIMP_API_VERSION@ -lgimpcolor- at GIMP_API_VERSION@ -lgimpmath- at GIMP_API_VERSION@ -lgimpbase- at GIMP_API_VERSION@ $glib_libs $rt_libs
       ;;
     --install-bin | --install-admin-bin \
@@ -220,6 +237,7 @@
     | --install-script | --install-admin-script \
     | --uninstall-bin | --uninstall-admin-bin \
     | --uninstall-script | --uninstall-admin-script )
+      init
       case $1 in
         --*install-bin)
           install_cmd="@INSTALL_PROGRAM@"
@@ -292,6 +310,7 @@
     | --install-nogimpui-strip | --install-admin-nogimpui-strip \
     | --build-noui | --install-noui | --install-admin-noui \
     | --build-noui-strip | --install-noui-strip | --install-admin-noui-strip)
+      init
       opt=`echo $1 | sed 's/-strip$//'`
       if test "x$opt" != "x$1" ; then
         cflags=`echo $cflags | sed -e 's/-g //g' -e 's/ -g//g'`


Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- gimp.spec	19 Apr 2006 06:44:08 -0000	1.93
+++ gimp.spec	20 Apr 2006 12:56:59 -0000	1.94
@@ -19,7 +19,7 @@
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
 #define prever pre2
-Release: %{?prever:0.0.%{prever}.}2
+Release: %{?prever:0.0.%{prever}.}3
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -59,7 +59,6 @@
 %if %_with_lcms
 BuildRequires:	lcms-devel
 %endif
-Requires:   pkgconfig
 Requires:	desktop-file-utils >= 0.9
 Requires:	glib2 >= 2.4.8
 Requires: 	gtk2 >= 2.4.14
@@ -79,6 +78,7 @@
 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
 
 %description
 The GIMP (GNU Image Manipulation Program) is a powerful image
@@ -93,7 +93,10 @@
 %package devel
 Summary: GIMP plugin and extension development kit
 Group: 		Applications/Multimedia
-Requires: 	gtk2-devel, %{name} = %{epoch}:%{version}-%{release}
+Requires:   %{name} = %{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
@@ -108,6 +111,7 @@
 %patch3 -p1 -b .gcc4
 %patch4 -p1 -b .gifload
 %patch5 -p1 -b .htmlview
+%patch6 -p1 -b .gimptool
 
 %build
 libtoolize --copy --force
@@ -355,6 +359,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* 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)
+
 * Wed Apr 19 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-2
 - require pkgconfig (#189314)
 



From fedora-cvs-commits at redhat.com  Thu Apr 20 12:59:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 08:59:59 -0400
Subject: rpms/gimp/FC-5 gimp-2.2.11-gimptool.patch, NONE, 1.1 gimp.spec, 1.94,
	1.95
Message-ID: <200604201259.k3KCxxsv024850@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	gimp.spec 
Added Files:
	gimp-2.2.11-gimptool.patch 
Log Message:
only use pkgconfig if needed in gimptool, require pkgconfig in devel subpackage (#189314, #189371)


gimp-2.2.11-gimptool.patch:
 gimptool-2.0.in |  103 +++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 61 insertions(+), 42 deletions(-)

--- NEW FILE gimp-2.2.11-gimptool.patch ---
--- gimp-2.2.11/gimptool-2.0.in.gimptool	2006-01-10 13:12:28.000000000 +0100
+++ gimp-2.2.11/gimptool-2.0.in	2006-04-20 14:45:18.000000000 +0200
@@ -91,54 +91,60 @@
   usage 1
 fi
 
-if test x${PKG_CONFIG+set} != xset ; then
-  PKG_CONFIG=pkg-config
-fi
+__gimptool_init__=0
+init() {
+    if [ "$__gimptool_init__" -eq 0 ]; then
+        if test x${PKG_CONFIG+set} != xset ; then
+          PKG_CONFIG=pkg-config
+        fi
 
-if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
-  gtk_cflags=`$PKG_CONFIG --cflags gtk+-2.0`
-  gtk_libs=`$PKG_CONFIG --libs gtk+-2.0`
-  glib_cflags=`$PKG_CONFIG --cflags glib-2.0`
-  glib_libs=`$PKG_CONFIG --libs glib-2.0`
-else
-  echo "*** pkg-config not found or too old; using paths from gimp compilation." 1>&2
-  gtk_cflags='@GTK_CFLAGS@'
-  gtk_libs='@GTK_LIBS@'
-  glib_cflags='@GLIB_CFLAGS@'
-  glib_libs='@GLIB_LIBS@'
-fi
+        if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
+          gtk_cflags=`$PKG_CONFIG --cflags gtk+-2.0`
+          gtk_libs=`$PKG_CONFIG --libs gtk+-2.0`
+          glib_cflags=`$PKG_CONFIG --cflags glib-2.0`
+          glib_libs=`$PKG_CONFIG --libs glib-2.0`
+        else
+          echo "*** pkg-config not found or too old; using paths from gimp compilation." 1>&2
+          gtk_cflags='@GTK_CFLAGS@'
+          gtk_libs='@GTK_LIBS@'
+          glib_cflags='@GLIB_CFLAGS@'
+          glib_libs='@GLIB_LIBS@'
+        fi
 
-if test x${INSTALL+set} != xset ; then
-  INSTALL='@INSTALL@'
-  if test "$INSTALL" = "./install-sh -c"; then
-    mydirname=`echo $0 | sed -e 's#\(.*\)/[^/].*$#\1#'`
-    INSTALL="$mydirname/gimpinstall"
-  fi
-fi
+        if test x${INSTALL+set} != xset ; then
+          INSTALL='@INSTALL@'
+          if test "$INSTALL" = "./install-sh -c"; then
+            mydirname=`echo $0 | sed -e 's#\(.*\)/[^/].*$#\1#'`
+            INSTALL="$mydirname/gimpinstall"
+          fi
+        fi
 
-if test x${CC+set} != xset ; then
-  cc='@CC@'
-else
-  cc="$CC"
-fi
+        if test x${CC+set} != xset ; then
+          cc='@CC@'
+        else
+          cc="$CC"
+        fi
 
-if test x${CFLAGS+set} != xset ; then
-  cflags='@CFLAGS@'
-else
-  cflags="$CFLAGS"
-fi
+        if test x${CFLAGS+set} != xset ; then
+          cflags='@CFLAGS@'
+        else
+          cflags="$CFLAGS"
+        fi
 
-if test x${LDFLAGS+set} != xset ; then
-  ldflags='@LDFLAGS@'
-else
-  ldflags="$LDFLAGS"
-fi
+        if test x${LDFLAGS+set} != xset ; then
+          ldflags='@LDFLAGS@'
+        else
+          ldflags="$LDFLAGS"
+        fi
 
-if test x${LIBS+set} != xset ; then
-  libs=""
-else
-  libs="$LIBS"
-fi
+        if test x${LIBS+set} != xset ; then
+          libs=""
+        else
+          libs="$LIBS"
+        fi
+        __gimptool_init__=1
+    fi
+}
 
 while test $# -gt 0; do
   case "$1" in
@@ -174,9 +180,17 @@
       exec_prefix_set=yes
       ;;
     --exec-prefix)
+      init
       echo $exec_prefix
       ;;
     --*dir)
+      case "$1" in
+        --gimp*dir)
+          ;;
+        *)
+          init
+          ;;
+      esac  
       dirname=\$`echo $1 | sed -e 's,^--,,'`
       dirname=`eval echo $dirname`
       test -z "$dirname" && exit 1
@@ -184,6 +198,7 @@
       exit 0
       ;;
     --cflags | --cflags-noui | --cflags-nogimpui)
+      init
       case $1 in
         --cflags | --cflags-nogimpui)
           my_gtk_cflags=$gtk_cflags ;;
@@ -194,6 +209,7 @@
       echo $includes $my_gtk_cflags
       ;;
     --libs | --libs-nogimpui)
+      init
       my_gtk_libs=
       libdirs=-L at libdir@
       for i in $gtk_libs ; do
@@ -213,6 +229,7 @@
       esac
       ;;
     --libs-noui)
+      init
       echo -L at libdir@ -lgimp- at GIMP_API_VERSION@ -lgimpcolor- at GIMP_API_VERSION@ -lgimpmath- at GIMP_API_VERSION@ -lgimpbase- at GIMP_API_VERSION@ $glib_libs $rt_libs
       ;;
     --install-bin | --install-admin-bin \
@@ -220,6 +237,7 @@
     | --install-script | --install-admin-script \
     | --uninstall-bin | --uninstall-admin-bin \
     | --uninstall-script | --uninstall-admin-script )
+      init
       case $1 in
         --*install-bin)
           install_cmd="@INSTALL_PROGRAM@"
@@ -292,6 +310,7 @@
     | --install-nogimpui-strip | --install-admin-nogimpui-strip \
     | --build-noui | --install-noui | --install-admin-noui \
     | --build-noui-strip | --install-noui-strip | --install-admin-noui-strip)
+      init
       opt=`echo $1 | sed 's/-strip$//'`
       if test "x$opt" != "x$1" ; then
         cflags=`echo $cflags | sed -e 's/-g //g' -e 's/ -g//g'`


Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-5/gimp.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- gimp.spec	19 Apr 2006 06:46:36 -0000	1.94
+++ gimp.spec	20 Apr 2006 12:59:55 -0000	1.95
@@ -19,7 +19,7 @@
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
 #define prever pre2
-Release: 0.fc5.%{?prever:0.0.%{prever}.}2
+Release: 0.fc5.%{?prever:0.0.%{prever}.}3
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -59,7 +59,6 @@
 %if %_with_lcms
 BuildRequires:	lcms-devel
 %endif
-Requires:   pkgconfig
 Requires:	desktop-file-utils >= 0.9
 Requires:	glib2 >= 2.4.8
 Requires: 	gtk2 >= 2.4.14
@@ -79,6 +78,7 @@
 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
 
 %description
 The GIMP (GNU Image Manipulation Program) is a powerful image
@@ -93,7 +93,10 @@
 %package devel
 Summary: GIMP plugin and extension development kit
 Group: 		Applications/Multimedia
-Requires: 	gtk2-devel, %{name} = %{epoch}:%{version}-%{release}
+Requires:   %{name} = %{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
@@ -108,6 +111,7 @@
 %patch3 -p1 -b .gcc4
 %patch4 -p1 -b .gifload
 %patch5 -p1 -b .htmlview
+%patch6 -p1 -b .gimptool
 
 %build
 libtoolize --copy --force
@@ -355,10 +359,14 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Wed Apr 19 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-0.fc5.2
+* Thu Apr 20 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-0.fc5.3
+- only use pkgconfig if needed in gimptool, require pkgconfig in devel
+  subpackage (#189314, #189371)
+
+* Wed Apr 19 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-2
 - require pkgconfig (#189314)
 
-* Tue Apr 18 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-0.fc5.1
+* Tue Apr 18 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-1
 - version 2.2.11
 
 * Fri Mar 03 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.10-4



From fedora-cvs-commits at redhat.com  Thu Apr 20 13:06:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 09:06:46 -0400
Subject: rpms/vim/devel .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 vim-7.0-fstabsyntax.patch, 1.1, 1.2 vim.spec, 1.106,
	1.107 6.4.001, 1.1, NONE 6.4.002, 1.1, NONE 6.4.003, 1.1,
	NONE 6.4.004, 1.1, NONE 6.4.005, 1.1, NONE 6.4.006, 1.1,
	NONE 6.4.007, 1.1, NONE vim-4.2-speed_t.patch, 1.1,
	NONE vim-5.6a-paths.patch, 1.1, NONE vim-6.0-fixkeys.patch,
	1.3, NONE vim-6.0r-crv.patch, 1.3, NONE vim-6.1-syntax.patch,
	1.1, NONE vim-6.2-rclocation.patch, 1.1,
	NONE vim-6.4-fstabsyntax.patch, 1.1,
	NONE vim-6.4-tmpfile.patch, 1.1, NONE
Message-ID: <200604201306.k3KD6kYr025276@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25258

Modified Files:
	.cvsignore sources vim-7.0-fstabsyntax.patch vim.spec 
Removed Files:
	6.4.001 6.4.002 6.4.003 6.4.004 6.4.005 6.4.006 6.4.007 
	vim-4.2-speed_t.patch vim-5.6a-paths.patch 
	vim-6.0-fixkeys.patch vim-6.0r-crv.patch vim-6.1-syntax.patch 
	vim-6.2-rclocation.patch vim-6.4-fstabsyntax.patch 
	vim-6.4-tmpfile.patch 
Log Message:
- vim-7.0e BETA


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	11 Apr 2006 09:56:18 -0000	1.15
+++ .cvsignore	20 Apr 2006 13:06:24 -0000	1.16
@@ -1,4 +1,4 @@
-vim-7.0d-20060410.tar.bz2
-vim-7.0d-extra-20060410.tar.gz
-vim-7.0d-lang-20060410.tar.gz
+vim-7.0e-20060419.tar.bz2
+vim-7.0e-extra-20060419.tar.gz
+vim-7.0e-lang-20060419.tar.gz
 cvim.zip


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	11 Apr 2006 09:56:09 -0000	1.15
+++ sources	20 Apr 2006 13:06:24 -0000	1.16
@@ -1,4 +1,4 @@
-2cc3c386ce52049f47f100369cdc828f  vim-7.0d-20060410.tar.bz2
-42fedc22f0a8e76516a7de7b787e20ee  vim-7.0d-extra-20060410.tar.gz
-78d433a2c60088f5106ac1c6c8963ca0  vim-7.0d-lang-20060410.tar.gz
+7b0e99d26a5c0107639d249eb7b8e386  vim-7.0e-20060419.tar.bz2
+8de9267fe0deedc4bfa1ffeda25f4ac7  vim-7.0e-extra-20060419.tar.gz
+5810785a36048b94ac7c2a915dce28f6  vim-7.0e-lang-20060419.tar.gz
 1f17af2008ae94359a48be7e865b084f  cvim.zip

vim-7.0-fstabsyntax.patch:
 fstab.vim |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: vim-7.0-fstabsyntax.patch
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim-7.0-fstabsyntax.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vim-7.0-fstabsyntax.patch	23 Mar 2006 13:07:01 -0000	1.1
+++ vim-7.0-fstabsyntax.patch	20 Apr 2006 13:06:24 -0000	1.2
@@ -1,20 +1,11 @@
---- vim70aa/runtime/syntax/fstab.vim.orig	2006-03-14 15:57:25.000000000 +0100
-+++ vim70aa/runtime/syntax/fstab.vim	2006-03-14 16:01:05.000000000 +0100
-@@ -32,7 +32,7 @@
- " Type
- syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeError
- syn match fsTypeError /\s\+\zs\w\+/ contained
--syn keyword fsTypeKeyword contained adfs affs auto autofs cd9660 coda cramfs devfs devpts efs ext2 ext3 fdesc hfs hpfs iso9660 kernfs linprocfs mfs minix msdos ncpfs nfs ntfs nwfs null portal proc procfs qnx4 reiserfs romfs smbfs std sysv swap tmpfs udf ufs umap umsdos union usbfs vfat xfs
-+syn keyword fsTypeKeyword contained adfs affs auto autofs cd9660 coda cramfs devfs devpts efs ext2 ext3 fdesc hfs hpfs iso9660 kernfs linprocfs mfs minix msdos ncpfs nfs ntfs nwfs null portal proc procfs qnx4 reiserfs romfs smbfs std sysfs sysv swap tmpfs udf ufs umap umsdos union usbfs vfat xfs
- 
- " Options
- " -------
-@@ -44,7 +44,7 @@
+--- vim70e/runtime/syntax/fstab.vim.fstab	2006-04-20 13:30:57.000000000 +0200
++++ vim70e/runtime/syntax/fstab.vim	2006-04-20 13:31:24.000000000 +0200
+@@ -48,7 +48,7 @@
  syn keyword fsOptionsYesNo yes no
  syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck
  syn keyword fsOptionsSize 512 1024 2048
--syn keyword fsOptionsGeneral async atime auto current defaults dev exec force fstab noatime noauto noclusterr noclusterw nodev noexec nosuid nosymfollow nouser owner ro rdonly rw rq sw xx suid suiddir sync kudzu union update user supermount users loop
-+syn keyword fsOptionsGeneral async atime auto current defaults dev exec force fstab managed noatime noauto noclusterr noclusterw nodev noexec nosuid nosymfollow nouser owner pamconsole ro rdonly rw rq sw xx suid suiddir sync kudzu union update user supermount users loop
+-syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodiratime noexec nomand nosuid nosymfollow nouser owner rbind rdonly remount ro rq rw suid suiddir supermount sw sync union update user[s] xx
++syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devuid dirsync exec force fstab kudzu loop managed mand move noatime noauto noclusterr noclusterw nodev nodiratime noexec nomand nosuid nosymfollow nouser owner pamconsole rbind rdonly remount ro rq rw suid suiddir supermount sw sync union update user[s] xx
  syn match fsOptionsGeneral /_netdev/
  
  " Options: adfs


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- vim.spec	11 Apr 2006 09:55:50 -0000	1.106
+++ vim.spec	20 Apr 2006 13:06:24 -0000	1.107
@@ -1,4 +1,4 @@
-%define CVSDATE -20060410
+%define CVSDATE -20060419
 %define WITH_SELINUX 1
 %define desktop_file 1
 %if %{desktop_file}
@@ -6,13 +6,13 @@
 %endif
 
 # Set this to 1 if you're building the enterprise version
-%define enterprise 1
+%define enterprise 0
+%define withruby 0
 
 %if %{enterprise}
 # don't include ruby interpreter
-%define withruby 0
+%define withnetbeans 0
 %else
-%define withruby 0
 %define withnetbeans 1
 %endif
 
@@ -20,8 +20,8 @@
 
 
 %define baseversion 7.0
-%define beta d
-%define vimdir vim70d
+%define beta e
+%define vimdir vim70e
 %define patchlevel 001
 
 Summary: The VIM editor.
@@ -58,8 +58,8 @@
 Patch3003: vim-6.1-rh3.patch
 Patch3004: vim-7.0-rclocation.patch
 Patch3005: vim-6.2-rh4.patch
-Patch3006: vim-6.2-rh5.patch
-#Patch3008: vim-6.4-cvim.patch
+#Patch3006: vim-6.2-rh5.patch
+Patch3008: vim-6.4-cvim.patch
 Patch3009: vim-6.4-checkhl.patch
 Patch3010: vim-7.0-fstabsyntax.patch
 Patch3011: vim-6.4-lib64.patch
@@ -185,7 +185,7 @@
 %patch3003 -p1
 %patch3004 -p1
 %patch3005 -p1
-%patch3006 -p1
+#patch3006 -p1
 
 %patch3009 -p1
 %patch3010 -p1
@@ -237,7 +237,7 @@
 %configure --prefix=/usr --with-features=huge --enable-pythoninterp \
  --enable-perlinterp --disable-tclinterp --with-x=no \
  --enable-gui=no --exec-prefix=/usr --enable-multibyte \
- --disable-netbeans --enable-cscope --with-modified-by="<bugzilla at redhat.com>" \
+ --enable-cscope --with-modified-by="<bugzilla at redhat.com>" \
  --with-compiledby="<bugzilla at redhat.com>" \
 %if "%{withnetbeans}" == "1"
   --enable-netbeans \
@@ -504,6 +504,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Thu Apr 20 2006 Karsten Hopp <karsten at redhat.de> 7.0.e001-1
+- vim-7.0e BETA
+
 * Tue Apr 11 2006 Karsten Hopp <karsten at redhat.de> 7.0.d001-1
 - vim-7.0d BETA
 


--- 6.4.001 DELETED ---


--- 6.4.002 DELETED ---


--- 6.4.003 DELETED ---


--- 6.4.004 DELETED ---


--- 6.4.005 DELETED ---


--- 6.4.006 DELETED ---


--- 6.4.007 DELETED ---


--- vim-4.2-speed_t.patch DELETED ---


--- vim-5.6a-paths.patch DELETED ---


--- vim-6.0-fixkeys.patch DELETED ---


--- vim-6.0r-crv.patch DELETED ---


--- vim-6.1-syntax.patch DELETED ---


--- vim-6.2-rclocation.patch DELETED ---


--- vim-6.4-fstabsyntax.patch DELETED ---


--- vim-6.4-tmpfile.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 20 13:08:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 09:08:30 -0400
Subject: rpms/gimp/FC-4 gimp-2.2.11-gimptool.patch, NONE, 1.1 gimp.spec, 1.80,
	1.81
Message-ID: <200604201308.k3KD8UXF025345@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	gimp.spec 
Added Files:
	gimp-2.2.11-gimptool.patch 
Log Message:
only use pkgconfig if needed in gimptool, require pkgconfig in devel subpackage (#189314, #189371)


gimp-2.2.11-gimptool.patch:
 gimptool-2.0.in |  103 +++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 61 insertions(+), 42 deletions(-)

--- NEW FILE gimp-2.2.11-gimptool.patch ---
--- gimp-2.2.11/gimptool-2.0.in.gimptool	2006-01-10 13:12:28.000000000 +0100
+++ gimp-2.2.11/gimptool-2.0.in	2006-04-20 14:45:18.000000000 +0200
@@ -91,54 +91,60 @@
   usage 1
 fi
 
-if test x${PKG_CONFIG+set} != xset ; then
-  PKG_CONFIG=pkg-config
-fi
+__gimptool_init__=0
+init() {
+    if [ "$__gimptool_init__" -eq 0 ]; then
+        if test x${PKG_CONFIG+set} != xset ; then
+          PKG_CONFIG=pkg-config
+        fi
 
-if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
-  gtk_cflags=`$PKG_CONFIG --cflags gtk+-2.0`
-  gtk_libs=`$PKG_CONFIG --libs gtk+-2.0`
-  glib_cflags=`$PKG_CONFIG --cflags glib-2.0`
-  glib_libs=`$PKG_CONFIG --libs glib-2.0`
-else
-  echo "*** pkg-config not found or too old; using paths from gimp compilation." 1>&2
-  gtk_cflags='@GTK_CFLAGS@'
-  gtk_libs='@GTK_LIBS@'
-  glib_cflags='@GLIB_CFLAGS@'
-  glib_libs='@GLIB_LIBS@'
-fi
+        if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
+          gtk_cflags=`$PKG_CONFIG --cflags gtk+-2.0`
+          gtk_libs=`$PKG_CONFIG --libs gtk+-2.0`
+          glib_cflags=`$PKG_CONFIG --cflags glib-2.0`
+          glib_libs=`$PKG_CONFIG --libs glib-2.0`
+        else
+          echo "*** pkg-config not found or too old; using paths from gimp compilation." 1>&2
+          gtk_cflags='@GTK_CFLAGS@'
+          gtk_libs='@GTK_LIBS@'
+          glib_cflags='@GLIB_CFLAGS@'
+          glib_libs='@GLIB_LIBS@'
+        fi
 
-if test x${INSTALL+set} != xset ; then
-  INSTALL='@INSTALL@'
-  if test "$INSTALL" = "./install-sh -c"; then
-    mydirname=`echo $0 | sed -e 's#\(.*\)/[^/].*$#\1#'`
-    INSTALL="$mydirname/gimpinstall"
-  fi
-fi
+        if test x${INSTALL+set} != xset ; then
+          INSTALL='@INSTALL@'
+          if test "$INSTALL" = "./install-sh -c"; then
+            mydirname=`echo $0 | sed -e 's#\(.*\)/[^/].*$#\1#'`
+            INSTALL="$mydirname/gimpinstall"
+          fi
+        fi
 
-if test x${CC+set} != xset ; then
-  cc='@CC@'
-else
-  cc="$CC"
-fi
+        if test x${CC+set} != xset ; then
+          cc='@CC@'
+        else
+          cc="$CC"
+        fi
 
-if test x${CFLAGS+set} != xset ; then
-  cflags='@CFLAGS@'
-else
-  cflags="$CFLAGS"
-fi
+        if test x${CFLAGS+set} != xset ; then
+          cflags='@CFLAGS@'
+        else
+          cflags="$CFLAGS"
+        fi
 
-if test x${LDFLAGS+set} != xset ; then
-  ldflags='@LDFLAGS@'
-else
-  ldflags="$LDFLAGS"
-fi
+        if test x${LDFLAGS+set} != xset ; then
+          ldflags='@LDFLAGS@'
+        else
+          ldflags="$LDFLAGS"
+        fi
 
-if test x${LIBS+set} != xset ; then
-  libs=""
-else
-  libs="$LIBS"
-fi
+        if test x${LIBS+set} != xset ; then
+          libs=""
+        else
+          libs="$LIBS"
+        fi
+        __gimptool_init__=1
+    fi
+}
 
 while test $# -gt 0; do
   case "$1" in
@@ -174,9 +180,17 @@
       exec_prefix_set=yes
       ;;
     --exec-prefix)
+      init
       echo $exec_prefix
       ;;
     --*dir)
+      case "$1" in
+        --gimp*dir)
+          ;;
+        *)
+          init
+          ;;
+      esac  
       dirname=\$`echo $1 | sed -e 's,^--,,'`
       dirname=`eval echo $dirname`
       test -z "$dirname" && exit 1
@@ -184,6 +198,7 @@
       exit 0
       ;;
     --cflags | --cflags-noui | --cflags-nogimpui)
+      init
       case $1 in
         --cflags | --cflags-nogimpui)
           my_gtk_cflags=$gtk_cflags ;;
@@ -194,6 +209,7 @@
       echo $includes $my_gtk_cflags
       ;;
     --libs | --libs-nogimpui)
+      init
       my_gtk_libs=
       libdirs=-L at libdir@
       for i in $gtk_libs ; do
@@ -213,6 +229,7 @@
       esac
       ;;
     --libs-noui)
+      init
       echo -L at libdir@ -lgimp- at GIMP_API_VERSION@ -lgimpcolor- at GIMP_API_VERSION@ -lgimpmath- at GIMP_API_VERSION@ -lgimpbase- at GIMP_API_VERSION@ $glib_libs $rt_libs
       ;;
     --install-bin | --install-admin-bin \
@@ -220,6 +237,7 @@
     | --install-script | --install-admin-script \
     | --uninstall-bin | --uninstall-admin-bin \
     | --uninstall-script | --uninstall-admin-script )
+      init
       case $1 in
         --*install-bin)
           install_cmd="@INSTALL_PROGRAM@"
@@ -292,6 +310,7 @@
     | --install-nogimpui-strip | --install-admin-nogimpui-strip \
     | --build-noui | --install-noui | --install-admin-noui \
     | --build-noui-strip | --install-noui-strip | --install-admin-noui-strip)
+      init
       opt=`echo $1 | sed 's/-strip$//'`
       if test "x$opt" != "x$1" ; then
         cflags=`echo $cflags | sed -e 's/-g //g' -e 's/ -g//g'`


Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-4/gimp.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- gimp.spec	19 Apr 2006 06:44:55 -0000	1.80
+++ gimp.spec	20 Apr 2006 13:08:27 -0000	1.81
@@ -19,7 +19,7 @@
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
 #define prever pre2
-Release: 0.fc4.%{?prever:0.0.%{prever}.}2
+Release: 0.fc4.%{?prever:0.0.%{prever}.}3
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -59,7 +59,6 @@
 %if %_with_lcms
 BuildRequires:	lcms-devel
 %endif
-Requires:   pkgconfig
 Requires:	desktop-file-utils >= 0.9
 Requires:	glib2 >= 2.4.8
 Requires: 	gtk2 >= 2.4.14
@@ -79,6 +78,7 @@
 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
 
 %description
 The GIMP (GNU Image Manipulation Program) is a powerful image
@@ -93,7 +93,10 @@
 %package devel
 Summary: GIMP plugin and extension development kit
 Group: 		Applications/Multimedia
-Requires: 	gtk2-devel, %{name} = %{epoch}:%{version}-%{release}
+Requires:   %{name} = %{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
@@ -108,6 +111,7 @@
 %patch3 -p1 -b .gcc4
 %patch4 -p1 -b .gifload
 %patch5 -p1 -b .htmlview
+%patch6 -p1 -b .gimptool
 
 %build
 libtoolize --copy --force
@@ -349,6 +353,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* 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)
+
 * Wed Apr 19 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-0.fc4.2
 - require pkgconfig (#189314)
 



From fedora-cvs-commits at redhat.com  Thu Apr 20 13:50:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 09:50:23 -0400
Subject: rpms/gcc/devel gcc41-ppc64-ldouble-stdarg.patch, NONE,
	1.1 gcc41-pr25874.patch, NONE, 1.1 gcc41-pr25989.patch, NONE,
	1.1 gcc41-pr25996.patch, NONE, 1.1 gcc41-pr26171.patch, NONE,
	1.1 gcc41-pr26729.patch, NONE, 1.1 gcc41-pr26865.patch, NONE,
	1.1 gcc41-pr26913.patch, NONE, 1.1 gcc41-rh188944.patch, NONE,
	1.1 .cvsignore, 1.144, 1.145 gcc41.spec, 1.49, 1.50 sources,
	1.146, 1.147 gcc41-pr26823.patch, 1.1, NONE
Message-ID: <200604201350.k3KDoNS2029674@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	.cvsignore gcc41.spec sources 
Added Files:
	gcc41-ppc64-ldouble-stdarg.patch gcc41-pr25874.patch 
	gcc41-pr25989.patch gcc41-pr25996.patch gcc41-pr26171.patch 
	gcc41-pr26729.patch gcc41-pr26865.patch gcc41-pr26913.patch 
	gcc41-rh188944.patch 
Removed Files:
	gcc41-pr26823.patch 
Log Message:
4.1.0-9


gcc41-ppc64-ldouble-stdarg.patch:
 0 files changed

--- NEW FILE gcc41-ppc64-ldouble-stdarg.patch ---
2006-04-20  Alan Modra  <amodra at bigpond.net.au>

	* config/rs6000/rs6000.c (rs6000_gimplify_va_arg): Consume all
	fp regs if the last fp arg doesn't fit in regs.

	* gcc.dg/compat/scalar-by-value-5.c: New.
	* gcc.dg/compat/scalar-by-value-5_main.c: New.
	* gcc.dg/compat/scalar-by-value-5_x.c: New.
	* gcc.dg/compat/scalar-by-value-5_y.c: New.
	* gcc.dg/compat/scalar-by-value-6.c: New.
	* gcc.dg/compat/scalar-by-value-6_main.c: New.
	* gcc.dg/compat/scalar-by-value-6_x.c: New.
	* gcc.dg/compat/scalar-by-value-6_y.c: New.
	* gcc.dg/compat/scalar-by-value-x.h: New.
	* gcc.dg/compat/scalar-by-value-y.h: New.

--- gcc/config/rs6000/rs6000.c	(revision 113079)
+++ gcc/config/rs6000/rs6000.c	(working copy)
@@ -5960,7 +5973,7 @@ rs6000_gimplify_va_arg (tree valist, tre
       t = build1 (LABEL_EXPR, void_type_node, lab_false);
       append_to_statement_list (t, pre_p);
 
-      if (n_reg > 2)
+      if ((n_reg == 2 && reg != gpr) || n_reg > 2)
 	{
 	  /* Ensure that we don't find any more args in regs.
 	     Alignment has taken care of the n_reg == 2 case.  */
--- gcc/testsuite/gcc.dg/compat/scalar-by-value-5.c	(revision 0)
+++ gcc/testsuite/gcc.dg/compat/scalar-by-value-5.c	(revision 0)
@@ -0,0 +1,16 @@
+TEST_FUNCS (longlong_i, long long, int,
+	    1234LL, -987)
+TEST_FUNCS (longlong_d, long long, double,
+	    1234LL, -987.0)
+TEST_FUNCS (complexint_i, _Complex int, int,
+	    1234 + 567i, -987)
+TEST_FUNCS (complexint_d, _Complex int, double,
+	    1234 + 567i, -987.0)
+TEST_FUNCS (complexdouble_i, _Complex double, int,
+	    1234.0 + 567.0i, -987)
+TEST_FUNCS (complexdouble_d, _Complex double, double,
+	    1234.0 + 567.0i, -987.0)
+TEST_FUNCS (complexlonglong_i, _Complex long long, int,
+	    1234LL + 567LLi, -987)
+TEST_FUNCS (complexlonglong_d, _Complex long long, double,
+	    1234LL + 567LLi, -987.0)
--- gcc/testsuite/gcc.dg/compat/scalar-by-value-5_main.c	(revision 0)
+++ gcc/testsuite/gcc.dg/compat/scalar-by-value-5_main.c	(revision 0)
@@ -0,0 +1,30 @@
+/* Test that function args can be passed in various positions to both fixed
+   and variable arg functions.  */
+/* { dg-options "-O" } */
+
+extern void exit (int);
+extern void longlong_i_doit (void);
+extern void longlong_d_doit (void);
+extern void complexint_i_doit (void);
+extern void complexint_d_doit (void);
+extern void complexdouble_i_doit (void);
+extern void complexdouble_d_doit (void);
+extern void complexlonglong_i_doit (void);
+extern void complexlonglong_d_doit (void);
+
+int main (void)
+{
+  longlong_i_doit ();
+  longlong_d_doit ();
+#ifndef SKIP_COMPLEX_INT
+  complexint_i_doit ();
+  complexint_d_doit ();
+#endif
+  complexdouble_i_doit ();
+  complexdouble_d_doit ();
+#ifndef SKIP_COMPLEX_INT
+  complexlonglong_i_doit ();
+  complexlonglong_d_doit ();
+#endif
+  exit (0);
+}
--- gcc/testsuite/gcc.dg/compat/scalar-by-value-5_x.c	(revision 0)
+++ gcc/testsuite/gcc.dg/compat/scalar-by-value-5_x.c	(revision 0)
@@ -0,0 +1,2 @@
+#include "scalar-by-value-x.h"
+#include "scalar-by-value-5.c"
--- gcc/testsuite/gcc.dg/compat/scalar-by-value-5_y.c	(revision 0)
+++ gcc/testsuite/gcc.dg/compat/scalar-by-value-5_y.c	(revision 0)
@@ -0,0 +1,2 @@
+#include "scalar-by-value-y.h"
+#include "scalar-by-value-5.c"
--- gcc/testsuite/gcc.dg/compat/scalar-by-value-6.c	(revision 0)
+++ gcc/testsuite/gcc.dg/compat/scalar-by-value-6.c	(revision 0)
@@ -0,0 +1,4 @@
+TEST_FUNCS (longdouble_i, long double, int, d, -987)
+TEST_FUNCS (longdouble_d, long double, double, d, -987.0)
+TEST_FUNCS (complexlongdouble_i, _Complex long double, int, cd, -987)
+TEST_FUNCS (complexlongdouble_d, _Complex long double, double, cd, -987.0)
--- gcc/testsuite/gcc.dg/compat/scalar-by-value-6_main.c	(revision 0)
+++ gcc/testsuite/gcc.dg/compat/scalar-by-value-6_main.c	(revision 0)
@@ -0,0 +1,19 @@
+/* Test that function args can be passed in various positions to both fixed
+   and variable arg functions.  */
+/* { dg-options "-O" } */
+/* { dg-options "-O -mlong-double-128" { target powerpc*-*-* } } */
+
+extern void exit (int);
+extern void longdouble_i_doit (void);
+extern void longdouble_d_doit (void);
+extern void complexlongdouble_i_doit (void);
+extern void complexlongdouble_d_doit (void);
+
+int main (void)
+{
+  longdouble_i_doit ();
+  longdouble_d_doit ();
+  complexlongdouble_i_doit ();
+  complexlongdouble_d_doit ();
+  exit (0);
+}
--- gcc/testsuite/gcc.dg/compat/scalar-by-value-6_x.c	(revision 0)
+++ gcc/testsuite/gcc.dg/compat/scalar-by-value-6_x.c	(revision 0)
@@ -0,0 +1,6 @@
+#include "scalar-by-value-x.h"
+
+extern long double d;
+extern _Complex long double cd;
+
+#include "scalar-by-value-6.c"
--- gcc/testsuite/gcc.dg/compat/scalar-by-value-6_y.c	(revision 0)
+++ gcc/testsuite/gcc.dg/compat/scalar-by-value-6_y.c	(revision 0)
@@ -0,0 +1,7 @@
+#define USE_MEMCMP 1
+#include "scalar-by-value-y.h"
+
+long double d = 1234.0L + 0x0.abcdp-70L;
+_Complex long double cd = 234.0L + 0x0.abcp-70L + 567.0Li +0x0defp-70Li;
+
+#include "scalar-by-value-6.c"
--- gcc/testsuite/gcc.dg/compat/scalar-by-value-x.h	(revision 0)
+++ gcc/testsuite/gcc.dg/compat/scalar-by-value-x.h	(revision 0)
@@ -0,0 +1,77 @@
+#if DEBUG
+#include <stdio.h>
+#define DBG(x) fputs (x, stdout); fflush (stdout);
+#else
+#define DBG(x)
+#endif
+
+#define TEST_FUNCS(NAME, TYPE, PADT, VAL, VAL2) \
+extern void NAME##_f0 (TYPE a, PADT b);					\
+extern void NAME##_f1 (PADT z0, TYPE a, PADT b);			\
+extern void NAME##_f2 (PADT z0, PADT z1, TYPE a, PADT b);		\
+extern void NAME##_f3 (PADT z0, PADT z1, PADT z2, TYPE a, PADT b);	\
+extern void NAME##_f4 (PADT z0, PADT z1, PADT z2, PADT z3, TYPE a,	\
+		       PADT b);						\
+extern void NAME##_f5 (PADT z0, PADT z1, PADT z2, PADT z3, PADT z4,	\
+		       TYPE a, PADT b);					\
+extern void NAME##_f6 (PADT z0, PADT z1, PADT z2, PADT z3, PADT z4,	\
+		       PADT z5, TYPE a, PADT b);			\
+extern void NAME##_f7 (PADT z0, PADT z1, PADT z2, PADT z3, PADT z4,	\
+		       PADT z5, PADT z6, TYPE a, PADT b);		\
+extern void NAME##_f8 (PADT z0, PADT z1, PADT z2, PADT z3, PADT z4,	\
+		       PADT z5, PADT z6, PADT z7, TYPE a, PADT b);	\
+extern void NAME##_f9 (PADT z0, PADT z1, PADT z2, PADT z3, PADT z4,	\
+		       PADT z5, PADT z6, PADT z7, PADT z8, TYPE a,	\
+		       PADT b);						\
+extern void NAME##_fv (int n, ...);					\
+									\
+void NAME##_doit (void)							\
+{									\
+  NAME##_f0 (VAL, VAL2);						\
+  DBG (".");								\
+  NAME##_f1 ((PADT) 0, VAL, VAL2);					\
+  DBG (".");								\
+  NAME##_f2 ((PADT) 0, (PADT) 0, VAL, VAL2);				\
+  DBG (".");								\
+  NAME##_f3 ((PADT) 0, (PADT) 0, (PADT) 0, VAL, VAL2);			\
+  DBG (".");								\
+  NAME##_f4 ((PADT) 0, (PADT) 0, (PADT) 0, (PADT) 0, VAL, VAL2);	\
+  DBG (".");								\
+  NAME##_f5 ((PADT) 0, (PADT) 0, (PADT) 0, (PADT) 0, (PADT) 0,		\
+	     VAL, VAL2);						\
+  DBG (".");								\
+  NAME##_f6 ((PADT) 0, (PADT) 0, (PADT) 0, (PADT) 0, (PADT) 0,		\
+	     (PADT) 0, VAL, VAL2);					\
+  DBG (".");								\
+  NAME##_f7 ((PADT) 0, (PADT) 0, (PADT) 0, (PADT) 0, (PADT) 0,		\
+	     (PADT) 0, (PADT) 0, VAL, VAL2);				\
+  DBG (".");								\
+  NAME##_f8 ((PADT) 0, (PADT) 0, (PADT) 0, (PADT) 0, (PADT) 0,		\
+	     (PADT) 0, (PADT) 0, (PADT) 0, VAL, VAL2);			\
+  DBG (".");								\
+  NAME##_f9 ((PADT) 0, (PADT) 0, (PADT) 0, (PADT) 0, (PADT) 0,		\
+	     (PADT) 0, (PADT) 0, (PADT) 0, (PADT) 0, VAL, VAL2);	\
+  DBG (".");								\
+  NAME##_fv (0, VAL, VAL2);						\
+  DBG (".");								\
+  NAME##_fv (1, (PADT) 0, VAL, VAL2);					\
+  DBG (".");								\
+  NAME##_fv (2, (PADT) 0, (PADT) 0, VAL, VAL2);				\
+  DBG (".");								\
+  NAME##_fv (3, (PADT) 0, (PADT) 0, (PADT) 0, VAL, VAL2);		\
+  DBG (".");								\
+  NAME##_fv (4, (PADT) 0, (PADT) 0, (PADT) 0, (PADT) 0, VAL, VAL2);	\
+  DBG (".");								\
+  NAME##_fv (5, (PADT) 0, (PADT) 0, (PADT) 0, (PADT) 0, (PADT) 0,	\
+	     VAL, VAL2);						\
+  DBG (".");								\
+  NAME##_fv (6, (PADT) 0, (PADT) 0, (PADT) 0, (PADT) 0, (PADT) 0,	\
+	     (PADT) 0, VAL, VAL2);					\
+  DBG (".");								\
+  NAME##_fv (7, (PADT) 0, (PADT) 0, (PADT) 0, (PADT) 0, (PADT) 0,	\
+	     (PADT) 0, (PADT) 0, VAL, VAL2);				\
+  DBG (".");								\
+  NAME##_fv (8, (PADT) 0, (PADT) 0, (PADT) 0, (PADT) 0, (PADT) 0,	\
+	     (PADT) 0, (PADT) 0, (PADT) 0, VAL, VAL2);			\
+  DBG ("\n");								\
+}
--- gcc/testsuite/gcc.dg/compat/scalar-by-value-y.h	(revision 0)
+++ gcc/testsuite/gcc.dg/compat/scalar-by-value-y.h	(revision 0)
@@ -0,0 +1,267 @@
+extern void abort (void);
+
+#if USE_MEMCMP
+#define TEST_FUNCS(NAME, TYPE, PADT, VAL, VAL2) \
+void NAME##_f0 (TYPE a, PADT b)						\
+{									\
+  if (memcmp (&a, &VAL, sizeof (a)) != 0 || b != VAL2)			\
+    abort ();								\
+}									\
+									\
+void NAME##_f1 (PADT z0, TYPE a, PADT b)				\
+{									\
+  if (z0 != (PADT) 0							\
+      || memcmp (&a, &VAL, sizeof (a)) != 0 || b != VAL2)		\
+    abort ();								\
+}									\
+									\
+void NAME##_f2 (PADT z0, PADT z1, TYPE a, PADT b)			\
+{									\
+  if (z0 != (PADT) 0							\
+      || z1 != (PADT) 0							\
+      || memcmp (&a, &VAL, sizeof (a)) != 0 || b != VAL2)		\
+    abort ();								\
+}									\
+									\
+void NAME##_f3 (PADT z0, PADT z1, PADT z2, TYPE a, PADT b)		\
+{									\
+  if (z0 != (PADT) 0							\
+      || z1 != (PADT) 0							\
+      || z2 != (PADT) 0							\
+      || memcmp (&a, &VAL, sizeof (a)) != 0 || b != VAL2)		\
+    abort ();								\
+}									\
+									\
+void NAME##_f4 (PADT z0, PADT z1, PADT z2, PADT z3, TYPE a, PADT b)	\
+{									\
+  if (z0 != (PADT) 0							\
+      || z1 != (PADT) 0							\
+      || z2 != (PADT) 0							\
+      || z3 != (PADT) 0							\
+      || memcmp (&a, &VAL, sizeof (a)) != 0 || b != VAL2)		\
+    abort ();								\
+}									\
+									\
+void NAME##_f5 (PADT z0, PADT z1, PADT z2, PADT z3, PADT z4, TYPE a,	\
+		PADT b)							\
+{									\
+  if (z0 != (PADT) 0							\
+      || z1 != (PADT) 0							\
+      || z2 != (PADT) 0							\
+      || z3 != (PADT) 0							\
+      || z4 != (PADT) 0							\
+      || memcmp (&a, &VAL, sizeof (a)) != 0 || b != VAL2)		\
+    abort ();								\
+}									\
+									\
+void NAME##_f6 (PADT z0, PADT z1, PADT z2, PADT z3, PADT z4, PADT z5,	\
+		TYPE a, PADT b)						\
+{									\
+  if (z0 != (PADT) 0							\
+      || z1 != (PADT) 0							\
+      || z2 != (PADT) 0							\
+      || z3 != (PADT) 0							\
+      || z4 != (PADT) 0							\
+      || z5 != (PADT) 0							\
+      || memcmp (&a, &VAL, sizeof (a)) != 0 || b != VAL2)		\
+    abort ();								\
+}									\
+									\
+void NAME##_f7 (PADT z0, PADT z1, PADT z2, PADT z3, PADT z4, PADT z5,	\
+		PADT z6, TYPE a, PADT b)				\
+{									\
+  if (z0 != (PADT) 0							\
+      || z1 != (PADT) 0							\
+      || z2 != (PADT) 0							\
+      || z3 != (PADT) 0							\
+      || z4 != (PADT) 0							\
+      || z5 != (PADT) 0							\
+      || z6 != (PADT) 0							\
+      || memcmp (&a, &VAL, sizeof (a)) != 0 || b != VAL2)		\
+    abort ();								\
+}									\
+									\
+void NAME##_f8 (PADT z0, PADT z1, PADT z2, PADT z3, PADT z4, PADT z5,	\
+		PADT z6, PADT z7, TYPE a, PADT b)			\
+{									\
+  if (z0 != (PADT) 0							\
+      || z1 != (PADT) 0							\
+      || z2 != (PADT) 0							\
+      || z3 != (PADT) 0							\
+      || z4 != (PADT) 0							\
+      || z5 != (PADT) 0							\
+      || z6 != (PADT) 0							\
+      || z7 != (PADT) 0							\
+      || memcmp (&a, &VAL, sizeof (a)) != 0 || b != VAL2)		\
+    abort ();								\
+}									\
+									\
+void NAME##_f9 (PADT z0, PADT z1, PADT z2, PADT z3, PADT z4, PADT z5,	\
+		PADT z6, PADT z7, PADT z8, TYPE a, PADT b)		\
+{									\
+  if (z0 != (PADT) 0							\
+      || z1 != (PADT) 0							\
+      || z2 != (PADT) 0							\
+      || z3 != (PADT) 0							\
+      || z4 != (PADT) 0							\
+      || z5 != (PADT) 0							\
+      || z6 != (PADT) 0							\
+      || z7 != (PADT) 0							\
+      || z8 != (PADT) 0							\
+      || memcmp (&a, &VAL, sizeof (a)) != 0 || b != VAL2)		\
+    abort ();								\
+}									\
+									\
+void NAME##_fv (int n, ...)						\
+{									\
+  __builtin_va_list ap;							\
+  TYPE x;								\
+  __builtin_va_start (ap, n);						\
+									\
+  while (n-- != 0)							\
+    if (__builtin_va_arg (ap, PADT) != (PADT) 0)			\
+      abort ();								\
+									\
+  x = __builtin_va_arg (ap, TYPE);					\
+  if (memcmp (&x, &VAL, sizeof (x)) != 0 )				\
+    abort ();								\
+									\
+  if (__builtin_va_arg (ap, PADT) != VAL2)				\
+    abort ();								\
+									\
+  __builtin_va_end (ap);						\
+}
+
+#else
+
+#define TEST_FUNCS(NAME, TYPE, PADT, VAL, VAL2) \
+void NAME##_f0 (TYPE a, PADT b)						\
+{									\
+  if (a != VAL || b != VAL2)						\
+    abort ();								\
+}									\
+									\
+void NAME##_f1 (PADT z0, TYPE a, PADT b)				\
+{									\
+  if (z0 != (PADT) 0							\
+      || a != VAL || b != VAL2)						\
+    abort ();								\
+}									\
+									\
+void NAME##_f2 (PADT z0, PADT z1, TYPE a, PADT b)			\
+{									\
+  if (z0 != (PADT) 0							\
+      || z1 != (PADT) 0							\
+      || a != VAL || b != VAL2)						\
+    abort ();								\
+}									\
+									\
+void NAME##_f3 (PADT z0, PADT z1, PADT z2, TYPE a, PADT b)		\
+{									\
+  if (z0 != (PADT) 0							\
+      || z1 != (PADT) 0							\
+      || z2 != (PADT) 0							\
+      || a != VAL || b != VAL2)						\
+    abort ();								\
+}									\
+									\
+void NAME##_f4 (PADT z0, PADT z1, PADT z2, PADT z3, TYPE a, PADT b)	\
+{									\
+  if (z0 != (PADT) 0							\
+      || z1 != (PADT) 0							\
+      || z2 != (PADT) 0							\
+      || z3 != (PADT) 0							\
+      || a != VAL || b != VAL2)						\
+    abort ();								\
+}									\
+									\
+void NAME##_f5 (PADT z0, PADT z1, PADT z2, PADT z3, PADT z4, TYPE a,	\
+		PADT b)							\
+{									\
+  if (z0 != (PADT) 0							\
+      || z1 != (PADT) 0							\
+      || z2 != (PADT) 0							\
+      || z3 != (PADT) 0							\
+      || z4 != (PADT) 0							\
+      || a != VAL || b != VAL2)						\
+    abort ();								\
+}									\
+									\
+void NAME##_f6 (PADT z0, PADT z1, PADT z2, PADT z3, PADT z4, PADT z5,	\
+		TYPE a, PADT b)						\
+{									\
+  if (z0 != (PADT) 0							\
+      || z1 != (PADT) 0							\
+      || z2 != (PADT) 0							\
+      || z3 != (PADT) 0							\
+      || z4 != (PADT) 0							\
+      || z5 != (PADT) 0							\
+      || a != VAL || b != VAL2)						\
+    abort ();								\
+}									\
+									\
+void NAME##_f7 (PADT z0, PADT z1, PADT z2, PADT z3, PADT z4, PADT z5,	\
+		PADT z6, TYPE a, PADT b)				\
+{									\
+  if (z0 != (PADT) 0							\
+      || z1 != (PADT) 0							\
+      || z2 != (PADT) 0							\
+      || z3 != (PADT) 0							\
+      || z4 != (PADT) 0							\
+      || z5 != (PADT) 0							\
+      || z6 != (PADT) 0							\
+      || a != VAL || b != VAL2)						\
+    abort ();								\
+}									\
+									\
+void NAME##_f8 (PADT z0, PADT z1, PADT z2, PADT z3, PADT z4, PADT z5,	\
+		PADT z6, PADT z7, TYPE a, PADT b)			\
+{									\
+  if (z0 != (PADT) 0							\
+      || z1 != (PADT) 0							\
+      || z2 != (PADT) 0							\
+      || z3 != (PADT) 0							\
+      || z4 != (PADT) 0							\
+      || z5 != (PADT) 0							\
+      || z6 != (PADT) 0							\
+      || z7 != (PADT) 0							\
+      || a != VAL || b != VAL2)						\
+    abort ();								\
+}									\
+									\
+void NAME##_f9 (PADT z0, PADT z1, PADT z2, PADT z3, PADT z4, PADT z5,	\
+		PADT z6, PADT z7, PADT z8, TYPE a, PADT b)		\
+{									\
+  if (z0 != (PADT) 0							\
+      || z1 != (PADT) 0							\
+      || z2 != (PADT) 0							\
+      || z3 != (PADT) 0							\
+      || z4 != (PADT) 0							\
+      || z5 != (PADT) 0							\
+      || z6 != (PADT) 0							\
+      || z7 != (PADT) 0							\
+      || z8 != (PADT) 0							\
+      || a != VAL || b != VAL2)						\
+    abort ();								\
+}									\
+									\
+void NAME##_fv (int n, ...)						\
+{									\
+  __builtin_va_list ap;							\
+									\
+  __builtin_va_start (ap, n);						\
+									\
+  while (n-- != 0)							\
+    if (__builtin_va_arg (ap, PADT) != (PADT) 0)			\
+      abort ();								\
+									\
+  if (__builtin_va_arg (ap, TYPE) != VAL)				\
+    abort ();								\
+									\
+  if (__builtin_va_arg (ap, PADT) != VAL2)				\
+    abort ();								\
+									\
+  __builtin_va_end (ap);						\
+}
+
+#endif

gcc41-pr25874.patch:
 omp-low.c                       |   10 ++++++++++
 testsuite/g++.dg/gomp/pr25874.C |    2 ++
 testsuite/gcc.dg/gomp/pr25874.c |    2 ++
 3 files changed, 14 insertions(+)

--- NEW FILE gcc41-pr25874.patch ---
2006-04-18  Jakub Jelinek  <jakub at redhat.com>

	PR c++/25874
	* omp-low.c (expand_omp_parallel): If child_cfun->cfg, free dominators,
	post dominators and cleanup cfg before returning.

	* gcc.dg/gomp/pr25874.c: Add dg-options.
	* g++.dg/gomp/pr25874.C: Add dg-options.

--- gcc/omp-low.c.jj	2006-04-18 13:31:18.000000000 +0200
+++ gcc/omp-low.c	2006-04-18 13:57:03.000000000 +0200
@@ -2278,6 +2278,7 @@ expand_omp_parallel (struct omp_region *
   block_stmt_iterator si;
   tree entry_stmt;
   edge e;
+  bool do_cleanup_cfg = false;
 
   entry_stmt = last_stmt (region->entry);
   child_fn = OMP_PARALLEL_FN (entry_stmt);
@@ -2310,6 +2311,7 @@ expand_omp_parallel (struct omp_region *
       new_bb = entry_bb;
       remove_edge (entry_succ_e);
       make_edge (new_bb, exit_succ_e->dest, EDGE_FALLTHRU);
+      do_cleanup_cfg = true;
     }
   else
     {
@@ -2385,6 +2387,14 @@ expand_omp_parallel (struct omp_region *
 
   /* Emit a library call to launch the children threads.  */
   expand_parallel_call (region, new_bb, entry_stmt, ws_args);
+
+  if (do_cleanup_cfg)
+    {
+      /* Clean up the unreachable sub-graph we created above.  */
+      free_dominance_info (CDI_DOMINATORS);
+      free_dominance_info (CDI_POST_DOMINATORS);
+      cleanup_tree_cfg ();
+    }
 }
 
 
--- gcc/testsuite/gcc.dg/gomp/pr25874.c.jj	2006-01-30 09:01:58.000000000 +0100
+++ gcc/testsuite/gcc.dg/gomp/pr25874.c	2006-04-18 13:28:44.000000000 +0200
@@ -1,3 +1,5 @@
+/* { dg-options "-O -fopenmp" } */
+
 void foo();
 
 inline void bar()
--- gcc/testsuite/g++.dg/gomp/pr25874.C.jj	2006-03-12 09:51:23.000000000 +0100
+++ gcc/testsuite/g++.dg/gomp/pr25874.C	2006-04-18 13:29:11.000000000 +0200
@@ -1,3 +1,5 @@
+// { dg-options "-O -fopenmp" }
+
 int foo();
 
 struct wigner_d

gcc41-pr25989.patch:
 omp-low.c   |   10 +++-------
 tree-flow.h |    3 +++
 2 files changed, 6 insertions(+), 7 deletions(-)

--- NEW FILE gcc41-pr25989.patch ---
2006-04-18  Jakub Jelinek  <jakub at redhat.com>

	PR middle-end/25989
	* tree-flow.h (struct omp_region): Add sched_kind.
	* omp-low.c (expand_parallel_call): Use region->inner->sched_kind
	instead of extracting omp for data.
	(expand_omp_for): Save extracted sched_kind.

--- gcc/tree-flow.h.jj	2006-04-15 00:14:39.000000000 +0200
+++ gcc/tree-flow.h	2006-04-15 00:14:39.000000000 +0200
@@ -505,6 +505,9 @@ struct omp_region
   /* The code for the omp directive of this region.  */
   enum tree_code type;
 
+  /* Schedule kind, only used for OMP_FOR type regions.  */
+  enum omp_clause_schedule_kind sched_kind;
+
   /* True if this is a combined parallel+workshare region.  */
   bool is_combined_parallel;
 };
--- gcc/omp-low.c.jj	2006-04-14 10:23:07.000000000 +0200
+++ gcc/omp-low.c	2006-04-18 12:26:23.000000000 +0200
@@ -2032,13 +2032,8 @@ expand_parallel_call (struct omp_region 
       switch (region->inner->type)
 	{
 	case OMP_FOR:
-	  {
-	    tree stmt = last_stmt (region->inner->entry);
-	    struct omp_for_data fd;
-	    extract_omp_for_data (stmt, &fd);
-	    start_ix = BUILT_IN_GOMP_PARALLEL_LOOP_STATIC_START
-	      + fd.sched_kind;
-	  }
+	  start_ix = BUILT_IN_GOMP_PARALLEL_LOOP_STATIC_START
+		     + region->inner->sched_kind;
 	  break;
 	case OMP_SECTIONS:
 	  start_ix = BUILT_IN_GOMP_PARALLEL_SECTIONS_START;
@@ -2944,6 +2939,7 @@ expand_omp_for (struct omp_region *regio
   push_gimplify_context ();
 
   extract_omp_for_data (last_stmt (region->entry), &fd);
+  region->sched_kind = fd.sched_kind;
 
   if (fd.sched_kind == OMP_CLAUSE_SCHEDULE_STATIC && !fd.have_ordered)
     {

gcc41-pr25996.patch:
 c-parser.c                      |    2 +-
 testsuite/g++.dg/gomp/pr25996.C |   32 ++++++++++++++++++++++++++++++++
 testsuite/gcc.dg/gomp/pr25996.c |   32 ++++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 1 deletion(-)

--- NEW FILE gcc41-pr25996.patch ---
2006-04-19  Jakub Jelinek  <jakub at redhat.com>

	PR c/25996
	* c-parser.c (c_parser_omp_for_loop): Don't call c_finish_omp_for if
	either decl or init is error_mark_node.

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

--- gcc/c-parser.c.jj	2006-04-11 09:09:50.000000000 +0200
+++ gcc/c-parser.c	2006-04-19 11:44:30.000000000 +0200
@@ -7379,7 +7379,7 @@ c_parser_omp_for_loop (c_parser *parser)
 
   /* Only bother calling c_finish_omp_for if we havn't already generated
      an error from the initialization parsing.  */
-  if (decl != NULL)
+  if (decl != NULL && decl != error_mark_node && init != error_mark_node)
     return c_finish_omp_for (loc, decl, init, cond, incr, body, NULL);
   return NULL;
 
--- gcc/testsuite/gcc.dg/gomp/pr25996.c.jj	2006-04-19 11:46:59.000000000 +0200
+++ gcc/testsuite/gcc.dg/gomp/pr25996.c	2006-04-19 11:49:26.000000000 +0200
@@ -0,0 +1,32 @@
+/* PR c/25996 */
+
+void
+test1 (void)
+{
+#pragma omp for
+  for (i = 0; i < 1; ++i); /* { dg-error "undeclared|for each function" } */
+}
+
+void
+test2 (void)
+{
+  int i;
+#pragma omp for
+  for (i = j; i < 1; ++i); /* { dg-error "undeclared" } */
+}
+
+void
+test3 (void)
+{
+  int i;
+#pragma omp for
+  for (i = 0; i < j; ++i); /* { dg-error "undeclared|invalid controlling predicate" } */
+}
+
+void
+test4 (void)
+{
+  int i;
+#pragma omp for
+  for (i = 0; i < 10; i += j); /* { dg-error "undeclared|invalid increment expression" } */
+}
--- gcc/testsuite/g++.dg/gomp/pr25996.C.jj	2006-04-19 11:50:51.000000000 +0200
+++ gcc/testsuite/g++.dg/gomp/pr25996.C	2006-04-19 11:53:41.000000000 +0200
@@ -0,0 +1,32 @@
+// PR c/25996
+
+void
+test1 (void)
+{
+#pragma omp for
+  for (i = 0; i < 1; ++i); // { dg-error "not declared|expected iteration decl" }
+}
+
+void
+test2 (void)
+{
+  int i;
+#pragma omp for
+  for (i = j; i < 1; ++i); // { dg-error "not declared|expected iteration decl" }
+}
+
+void
+test3 (void)
+{
+  int i;
+#pragma omp for
+  for (i = 0; i < j; ++i); // { dg-error "not declared|invalid controlling predicate" }
+}
+
+void
+test4 (void)
+{
+  int i;
+#pragma omp for
+  for (i = 0; i < 10; i += j); // { dg-error "not declared|invalid increment expression" }
+}

gcc41-pr26171.patch:
 gcc/cgraph.c                          |    4 ++--
 libgomp/testsuite/libgomp.c/pr26171.c |   14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

--- NEW FILE gcc41-pr26171.patch ---
2006-04-18  Jakub Jelinek  <jakub at redhat.com>

	PR c/26171
	* cgraph.c (cgraph_varpool_finalize_decl): Don't call
	cgraph_varpool_assemble_pending_decls if -fopenmp, unless
	cgraph_global_info_ready.

--- gcc/cgraph.c.jj	2006-03-12 09:51:31.000000000 +0100
+++ gcc/cgraph.c	2006-04-18 16:15:52.000000000 +0200
@@ -886,7 +886,7 @@ cgraph_varpool_finalize_decl (tree decl)
      if this function has already run.  */
   if (node->finalized)
     {
-      if (cgraph_global_info_ready || !flag_unit_at_a_time)
+      if (cgraph_global_info_ready || (!flag_unit_at_a_time && !flag_openmp))
 	cgraph_varpool_assemble_pending_decls ();
       return;
     }
@@ -901,7 +901,7 @@ cgraph_varpool_finalize_decl (tree decl)
      there.  */
   else if (TREE_PUBLIC (decl) && !DECL_COMDAT (decl) && !DECL_EXTERNAL (decl))
     cgraph_varpool_mark_needed_node (node);
-  if (cgraph_global_info_ready || !flag_unit_at_a_time)
+  if (cgraph_global_info_ready || (!flag_unit_at_a_time && !flag_openmp))
     cgraph_varpool_assemble_pending_decls ();
 }
 
--- libgomp/testsuite/libgomp.c/pr26171.c.jj	2006-04-18 23:03:39.000000000 +0200
+++ libgomp/testsuite/libgomp.c/pr26171.c	2006-04-18 23:06:41.000000000 +0200
@@ -0,0 +1,14 @@
+/* PR c/26171 */
+/* { dg-do run } */
+/* { dg-options "-fopenmp" } */
+/* { dg-require-effective-target tls_runtime } */
+
+int thrv = 0;
+#pragma omp threadprivate (thrv)
+
+int
+main ()
+{
+  thrv = 1;
+  return 0;
+}

gcc41-pr26729.patch:
 convert.c                                    |   28 +++++++++++++++++++++++----
 testsuite/gcc.c-torture/execute/20060419-1.c |   17 ++++++++++++++++
 2 files changed, 41 insertions(+), 4 deletions(-)

--- NEW FILE gcc41-pr26729.patch ---
2006-04-19  Jakub Jelinek  <jakub at redhat.com>

	PR middle-end/26729
	* convert.c (convert_to_integer): Ignore integer overflows when
	truncating.

	* gcc.c-torture/execute/20060419-1.c: New test.

--- gcc/convert.c.jj	2006-04-19 16:23:13.000000000 +0200
+++ gcc/convert.c	2006-04-19 17:11:43.000000000 +0200
@@ -616,6 +616,7 @@ convert_to_integer (tree type, tree expr
 		   (Otherwise would recurse infinitely in convert.  */
 		if (TYPE_PRECISION (typex) != inprec)
 		  {
+		    tree carg0, carg1;
 		    /* Don't do unsigned arithmetic where signed was wanted,
 		       or vice versa.
 		       Exception: if both of the original operands were
@@ -648,10 +649,29 @@ convert_to_integer (tree type, tree expr
 		      typex = lang_hooks.types.unsigned_type (typex);
 		    else
 		      typex = lang_hooks.types.signed_type (typex);
-		    return convert (type,
-				    fold_build2 (ex_form, typex,
-						 convert (typex, arg0),
-						 convert (typex, arg1)));
+		    carg0 = convert (typex, arg0);
+		    carg1 = convert (typex, arg1);
+		    /* Ignore integer overflows caused by the downcasts.  */
+		    if (TREE_CODE (carg0) == INTEGER_CST
+			&& (TREE_OVERFLOW (carg0)
+			    || TREE_CONSTANT_OVERFLOW (carg0))
+			&& (!CONSTANT_CLASS_P (arg0)
+			    || (!TREE_OVERFLOW (arg0)
+				&& !TREE_CONSTANT_OVERFLOW (arg0))))
+		      carg0 = build_int_cst_wide (typex,
+						  TREE_INT_CST_LOW (carg0),
+						  TREE_INT_CST_HIGH (carg0));
+		    if (TREE_CODE (carg1) == INTEGER_CST
+			&& (TREE_OVERFLOW (carg1)
+			    || TREE_CONSTANT_OVERFLOW (carg1))
+			&& (!CONSTANT_CLASS_P (arg1)
+			    || (!TREE_OVERFLOW (arg1)
+				&& !TREE_CONSTANT_OVERFLOW (arg1))))
+		      carg1 = build_int_cst_wide (typex,
+						  TREE_INT_CST_LOW (carg1),
+						  TREE_INT_CST_HIGH (carg1));
+		    return convert (type, fold_build2 (ex_form, typex,
+						       carg0, carg1));
 		  }
 	      }
 	  }
--- gcc/testsuite/gcc.c-torture/execute/20060419-1.c.jj	2006-04-19 17:15:12.000000000 +0200
+++ gcc/testsuite/gcc.c-torture/execute/20060419-1.c	2006-04-19 17:16:13.000000000 +0200
@@ -0,0 +1,17 @@
+/* PR middle-end/26729 */
+
+void abort (void);
+
+int
+foo (unsigned short x)
+{
+  return (x & 0x1) && (((unsigned short) (x & 0x8000)) == 0x8000);
+}
+
+int
+main (void)
+{
+  if (! foo (0x8001))
+    abort ();
+  return 0;
+}

gcc41-pr26865.patch:
 testsuite/gcc.dg/pr26865.c |    8 ++++++++
 tree-ssa-structalias.c     |    3 +++
 2 files changed, 11 insertions(+)

--- NEW FILE gcc41-pr26865.patch ---
2006-04-20  Jakub Jelinek  <jakub at redhat.com>

	PR tree-optimization/26865
	* tree-ssa-structalias.c (find_func_aliases): Check that anyoffsetrhs
	type is pointer or array type.

	* gcc.dg/pr26865.c: New test.

--- gcc/tree-ssa-structalias.c.jj	2006-03-27 14:33:14.000000000 +0200
+++ gcc/tree-ssa-structalias.c	2006-04-19 18:09:10.000000000 +0200
@@ -2950,6 +2950,9 @@ find_func_aliases (tree t, struct alias_
 			   of the RHS.  */
 			if (need_anyoffset || (rhs.type == ADDRESSOF
 			    && !(get_varinfo (rhs.var)->is_special_var)
+			    && (POINTER_TYPE_P (TREE_TYPE (anyoffsetrhs))
+				|| TREE_CODE (TREE_TYPE (anyoffsetrhs))
+				   == ARRAY_TYPE)
 			    && AGGREGATE_TYPE_P (TREE_TYPE (TREE_TYPE (anyoffsetrhs)))))
 			  {
 			    rhs.var = anyoffset_id;
--- gcc/testsuite/gcc.dg/pr26865.c.jj	2006-04-19 18:11:07.000000000 +0200
+++ gcc/testsuite/gcc.dg/pr26865.c	2006-04-19 18:12:47.000000000 +0200
@@ -0,0 +1,8 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -std=c99" } */
+
+void
+foo (void)
+{
+  char *e = alloca (100); /* { dg-warning "implicit declaration|initialization makes" } */
+}

gcc41-pr26913.patch:
 testsuite/g++.dg/gomp/pr26913.C |   19 +++++++++++++++++++
 tree-cfg.c                      |    5 ++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

--- NEW FILE gcc41-pr26913.patch ---
2006-04-18  Jakub Jelinek  <jakub at redhat.com>

	PR middle-end/26913
	* tree-cfg.c (find_outermost_region_in_block): Handle RESX_EXPR.

	* g++.dg/gomp/pr26913.C: New test.

--- gcc/tree-cfg.c.jj	2006-04-15 08:53:08.000000000 +0200
+++ gcc/tree-cfg.c	2006-04-18 15:33:42.000000000 +0200
@@ -4744,7 +4744,10 @@ find_outermost_region_in_block (struct f
       tree stmt = bsi_stmt (si);
       int stmt_region;
 
-      stmt_region = lookup_stmt_eh_region_fn (src_cfun, stmt);
+      if (TREE_CODE (stmt) == RESX_EXPR)
+	stmt_region = TREE_INT_CST_LOW (TREE_OPERAND (stmt, 0));
+      else
+	stmt_region = lookup_stmt_eh_region_fn (src_cfun, stmt);
       if (stmt_region > 0)
 	{
 	  if (region < 0)
--- gcc/testsuite/g++.dg/gomp/pr26913.C.jj	2006-04-18 15:35:58.000000000 +0200
+++ gcc/testsuite/g++.dg/gomp/pr26913.C	2006-04-18 15:36:38.000000000 +0200
@@ -0,0 +1,19 @@
+// PR middle-end/26913
+
+struct A
+{
+  ~A () throw ();
+};
+
+void foo (A);
+
+A bar () throw ();
+
+void baz ()
+{
+#pragma omp parallel
+  {
+    A a;
+    foo (bar ());
+  }
+}

gcc41-rh188944.patch:
 c-pretty-print.c              |   11 ++++++++++-
 testsuite/gcc.dg/20060419-1.c |    4 ++++
 2 files changed, 14 insertions(+), 1 deletion(-)

--- NEW FILE gcc41-rh188944.patch ---
2006-04-19  Jakub Jelinek  <jakub at redhat.com>

	* c-pretty-print.c (pp_c_direct_abstract_declarator): Print
	TYPE_MAX_VALUE (TYPE_DOMAIN (t)) + 1 for ARRAY_TYPE rather
	than plain TYPE_MAX_VALUE (TYPE_DOMAIN (t)).

--- gcc/c-pretty-print.c.jj	2006-02-16 08:22:59.000000000 +0100
+++ gcc/c-pretty-print.c	2006-04-19 19:01:06.000000000 +0200
@@ -521,7 +521,16 @@ pp_c_direct_abstract_declarator (c_prett
     case ARRAY_TYPE:
       pp_c_left_bracket (pp);
       if (TYPE_DOMAIN (t) && TYPE_MAX_VALUE (TYPE_DOMAIN (t)))
-        pp_expression (pp, TYPE_MAX_VALUE (TYPE_DOMAIN (t)));
+	{
+	  tree maxval = TYPE_MAX_VALUE (TYPE_DOMAIN (t));
+	  tree type = TREE_TYPE (maxval);
+
+	  if (host_integerp (maxval, 0))
+	    pp_wide_integer (pp, tree_low_cst (maxval, 0) + 1);
+	  else
+	    pp_expression (pp, fold_build2 (PLUS_EXPR, type, maxval,
+					    build_int_cst (type, 1)));
+	}
       pp_c_right_bracket (pp);
       pp_direct_abstract_declarator (pp, TREE_TYPE (t));
       break;
--- gcc/testsuite/gcc.dg/20060419-1.c.jj	2006-04-19 19:04:58.000000000 +0200
+++ gcc/testsuite/gcc.dg/20060419-1.c	2006-04-19 19:05:50.000000000 +0200
@@ -0,0 +1,4 @@
+struct T {
+  unsigned char f[1] __attribute__((packed)); /* { dg-warning "ignored for field of type.*unsigned char\\\[1\\\]" } */
+  unsigned char g[14] __attribute__((packed)); /* { dg-warning "ignored for field of type.*unsigned char\\\[14\\\]" } */
+};


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- .cvsignore	14 Apr 2006 09:40:18 -0000	1.144
+++ .cvsignore	20 Apr 2006 13:50:21 -0000	1.145
@@ -1 +1 @@
-gcc-4.1.0-20060414.tar.bz2
+gcc-4.1.0-20060420.tar.bz2


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- gcc41.spec	14 Apr 2006 09:40:18 -0000	1.49
+++ gcc41.spec	20 Apr 2006 13:50:21 -0000	1.50
@@ -1,6 +1,6 @@
-%define DATE 20060414
+%define DATE 20060420
 %define gcc_version 4.1.0
-%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
@@ -113,10 +113,18 @@
 Patch16: gcc41-pr20297-test.patch
 Patch17: gcc41-java-pr13212.patch
 Patch18: gcc41-objc-rh185398.patch
-Patch19: gcc41-pr26823.patch
-Patch20: gcc41-pr22375.patch
-Patch21: gcc41-pr24685.patch
-Patch22: gcc41-rh188649-test.patch
+Patch19: gcc41-pr22375.patch
+Patch20: gcc41-pr24685.patch
+Patch21: gcc41-rh188649-test.patch
+Patch22: gcc41-ppc64-ldouble-stdarg.patch
+Patch23: gcc41-pr25874.patch
+Patch24: gcc41-pr25989.patch
+Patch25: gcc41-pr25996.patch
+Patch26: gcc41-pr26171.patch
+Patch27: gcc41-pr26729.patch
+Patch28: gcc41-pr26865.patch
+Patch29: gcc41-pr26913.patch
+Patch30: gcc41-rh188944.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -414,10 +422,18 @@
 %patch16 -p0 -E -b .pr20297-test~
 %patch17 -p0 -b .java-pr13212~
 %patch18 -p0 -b .objc-rh185398~
-%patch19 -p0 -b .pr26823~
-%patch20 -p0 -b .pr22375~
-%patch21 -p0 -b .pr24685~
-%patch22 -p0 -b .rh188649-test~
+%patch19 -p0 -b .pr22375~
+%patch20 -p0 -b .pr24685~
+%patch21 -p0 -b .rh188649-test~
+%patch22 -p0 -b .ppc64-ldouble-stdarg~
+%patch23 -p0 -b .pr25874~
+%patch24 -p0 -b .pr25989~
+%patch25 -p0 -b .pr25996~
+%patch26 -p0 -b .pr26171~
+%patch27 -p0 -b .pr26729~
+%patch28 -p0 -b .pr26865~
+%patch29 -p0 -b .pr26913~
+%patch30 -p0 -b .rh188944~
 
 sed -i -e 's/4\.1\.1/4.1.0/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1435,6 +1451,20 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Thu Apr 20 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-9
+- update from gcc-4_1-branch (-r)
+  - PRs c++/10385, c++/26036, c++/26365, c++/26558, classpath/27163,
+	fortran/26769, libgcj/27171, libgfortran/26766, libstdc++/27162,
+	middle-end/27095, middle-end/27134, target/27182,
+	tree-optimization/26643, tree-optimization/26821,
+	tree-optimization/26854, tree-optimization/27087
+- fix ppc32 va_arg bug (Alan Modra)
+- assorted gomp fixes (PRs c++/25874, middle-end/25989, c/25996, c/26171,
+  middle-end/26913)
+- fix pretty printing C array types (#188944)
+- fix ICE on unprototyped alloca (PR tree-optimization/26865)
+- fix truncation optimization overflow handling (PR middle-end/26729)
+
 * Fri Apr 14 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-8
 - update from gcc-4_1-branch (-r112825:112951)
   - PRs c++/26122, c++/26295, fortran/23634, fortran/25619, fortran/26257,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- sources	14 Apr 2006 09:40:18 -0000	1.146
+++ sources	20 Apr 2006 13:50:21 -0000	1.147
@@ -1 +1 @@
-3d39e406b849c2225ebb203a84013838  gcc-4.1.0-20060414.tar.bz2
+70ceb184a4d5a40a2eb8fb903aff3894  gcc-4.1.0-20060420.tar.bz2


--- gcc41-pr26823.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 20 13:50:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 09:50:59 -0400
Subject: rpms/gcc/devel gcc41.spec,1.50,1.51
Message-ID: <200604201350.k3KDoxul029967@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	gcc41.spec 
Log Message:
4.1.0-9



Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- gcc41.spec	20 Apr 2006 13:50:21 -0000	1.50
+++ gcc41.spec	20 Apr 2006 13:50:56 -0000	1.51
@@ -1452,7 +1452,7 @@
 
 %changelog
 * Thu Apr 20 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-9
-- update from gcc-4_1-branch (-r)
+- update from gcc-4_1-branch (-r112951:113110)
   - PRs c++/10385, c++/26036, c++/26365, c++/26558, classpath/27163,
 	fortran/26769, libgcj/27171, libgfortran/26766, libstdc++/27162,
 	middle-end/27095, middle-end/27134, target/27182,



From fedora-cvs-commits at redhat.com  Thu Apr 20 14:09:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 10:09:09 -0400
Subject: rpms/gcc/devel gcc41.spec,1.51,1.52
Message-ID: <200604201409.k3KE99iw011392@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	gcc41.spec 
Log Message:
4.1.0-9



Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- gcc41.spec	20 Apr 2006 13:50:56 -0000	1.51
+++ gcc41.spec	20 Apr 2006 14:09:06 -0000	1.52
@@ -568,6 +568,13 @@
 echo ====================TESTING=========================
 ( ../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
+  ln $i testlogs/ || :
+done
+tar cf - testlogs-%{_target_platform}-%{version}-%{release} | bzip2 -9c \
+  | uuencode testlogs-%{_target_platform}.tar.bz2 || :
+rm -rf testlogs-%{_target_platform}-%{version}-%{release}
 
 # Make protoize
 make -C gcc CC="./xgcc -B ./ -O2" proto
@@ -1464,6 +1471,7 @@
 - fix pretty printing C array types (#188944)
 - fix ICE on unprototyped alloca (PR tree-optimization/26865)
 - fix truncation optimization overflow handling (PR middle-end/26729)
+- uuencode dejagnu testsuite log files in rpmbuild output
 
 * Fri Apr 14 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-8
 - update from gcc-4_1-branch (-r112825:112951)



From fedora-cvs-commits at redhat.com  Thu Apr 20 14:17:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 10:17:27 -0400
Subject: rpms/tzdata/devel .cvsignore, 1.23, 1.24 sources, 1.25,
	1.26 tzdata.spec, 1.29, 1.30
Message-ID: <200604201417.k3KEHRY0021892@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/tzdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20732

Modified Files:
	.cvsignore sources tzdata.spec 
Log Message:
Upstream 2006d



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tzdata/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	6 Apr 2006 12:15:34 -0000	1.23
+++ .cvsignore	20 Apr 2006 14:17:25 -0000	1.24
@@ -1,3 +1,3 @@
-tzcode2006c.tar.gz
-tzdata2006c.tar.gz
+tzcode2006d.tar.gz
+tzdata2006d.tar.gz
 tzdata-base-0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tzdata/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	6 Apr 2006 12:15:34 -0000	1.25
+++ sources	20 Apr 2006 14:17:25 -0000	1.26
@@ -1,3 +1,3 @@
-2100d0b0c6f2ad320260290e5dc7e957  tzcode2006c.tar.gz
-420d97a09c9750839afc2703f6b8276f  tzdata2006c.tar.gz
+4ffb3a8c0b1f604cba0bae16d5d8c6b4  tzcode2006d.tar.gz
+553bfb094e823dc14ed97013c536b90d  tzdata2006d.tar.gz
 906a4c98cc5240f416524a256b039c42  tzdata-base-0.tar.bz2


Index: tzdata.spec
===================================================================
RCS file: /cvs/dist/rpms/tzdata/devel/tzdata.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- tzdata.spec	6 Apr 2006 12:15:34 -0000	1.29
+++ tzdata.spec	20 Apr 2006 14:17:25 -0000	1.30
@@ -1,6 +1,6 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2006c
+Version: 2006d
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -48,6 +48,13 @@
 %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html
 
 %changelog
+* Thu Apr 20 2006 Petr Machata <pmachata at redhat.com> - 2006d-1
+- Upstream 2006d
+  - Haiti observes DST
+  - Sri Lanka change actually took effect Apr/15
+  - All Canada is now scheduled for 2007 US DST rules
+  - Some historical fixes
+
 * Thu Apr  6 2006 Petr Machata <pmachata at redhat.com> - 2006c-1
 - Upstream 2006c
   - Time-related changes:



From fedora-cvs-commits at redhat.com  Thu Apr 20 14:37:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 10:37:04 -0400
Subject: rpms/tzdata/FC-5 .cvsignore, 1.22, 1.23 sources, 1.24,
	1.25 tzdata.spec, 1.28, 1.29
Message-ID: <200604201437.k3KEb4SI025923@cvs.devel.redhat.com>

Author: pmachata

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

Modified Files:
	.cvsignore sources tzdata.spec 
Log Message:
Upstream 2006d



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tzdata/FC-5/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	6 Apr 2006 12:30:53 -0000	1.22
+++ .cvsignore	20 Apr 2006 14:37:01 -0000	1.23
@@ -1,3 +1,3 @@
-tzcode2006c.tar.gz
-tzdata2006c.tar.gz
+tzcode2006d.tar.gz
+tzdata2006d.tar.gz
 tzdata-base-0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tzdata/FC-5/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	6 Apr 2006 12:30:53 -0000	1.24
+++ sources	20 Apr 2006 14:37:01 -0000	1.25
@@ -1,3 +1,3 @@
-2100d0b0c6f2ad320260290e5dc7e957  tzcode2006c.tar.gz
-420d97a09c9750839afc2703f6b8276f  tzdata2006c.tar.gz
+4ffb3a8c0b1f604cba0bae16d5d8c6b4  tzcode2006d.tar.gz
+553bfb094e823dc14ed97013c536b90d  tzdata2006d.tar.gz
 906a4c98cc5240f416524a256b039c42  tzdata-base-0.tar.bz2


Index: tzdata.spec
===================================================================
RCS file: /cvs/dist/rpms/tzdata/FC-5/tzdata.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- tzdata.spec	6 Apr 2006 12:30:53 -0000	1.28
+++ tzdata.spec	20 Apr 2006 14:37:01 -0000	1.29
@@ -1,6 +1,6 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2006c
+Version: 2006d
 Release: 1.fc5
 License: GPL
 Group: System Environment/Base
@@ -48,6 +48,13 @@
 %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html
 
 %changelog
+* Thu Apr 20 2006 Petr Machata <pmachata at redhat.com> - 2006d-1.fc5
+- Upstream 2006d
+  - Haiti observes DST
+  - Sri Lanka change actually took effect Apr/15
+  - All Canada is now scheduled for 2007 US DST rules
+  - Some historical fixes
+
 * Thu Apr  6 2006 Petr Machata <pmachata at redhat.com> - 2006c-1.fc5
 - Upstream 2006c
   - Time-related changes:



From fedora-cvs-commits at redhat.com  Thu Apr 20 14:52:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 10:52:44 -0400
Subject: rpms/php/FC-4 php-5.0.5-CVE-2005-3883.patch, NONE,
	1.1 php-5.0.5-CVE-2006-0207.patch, NONE,
	1.1 php-5.0.5-CVE-2006-0208.patch, NONE,
	1.1 php-5.0.5-CVE-2006-0996.patch, NONE,
	1.1 php-5.0.5-a2hfixes.patch, NONE,
	1.1 php-5.1.2-CVE-2006-1490.patch, NONE, 1.1 .cvsignore, 1.25,
	1.26 php.spec, 1.82, 1.83 sources, 1.26,
	1.27 php-4.3.6-umask.patch, 1.2, NONE
Message-ID: <200604201452.k3KEqikT021461@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	.cvsignore php.spec sources 
Added Files:
	php-5.0.5-CVE-2005-3883.patch php-5.0.5-CVE-2006-0207.patch 
	php-5.0.5-CVE-2006-0208.patch php-5.0.5-CVE-2006-0996.patch 
	php-5.0.5-a2hfixes.patch php-5.1.2-CVE-2006-1490.patch 
Removed Files:
	php-4.3.6-umask.patch 
Log Message:
* Thu Apr 20 2006 Joe Orton <jorton at redhat.com> 5.0.5-2.2
- add security fixes from upstream:
 * phpinfo XSS (CVE-2006-0996)
 * binary safeness fix for html_entity_decode (CVE-2006-1490)
 * session ID response splitting/XSS fix (CVE-2006-0207)
 * XSS issues in "html_errors" mode (CVE-2006-0208)
 * mbstring header validation (CVE-2005-3883)
- add apache2handler SAPI fixes (#168442)
- pear: update to XML_RPC-1.4.8


php-5.0.5-CVE-2005-3883.patch:
 mbstring.c |   64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 57 insertions(+), 7 deletions(-)

--- NEW FILE php-5.0.5-CVE-2005-3883.patch ---
--- php-5.0.5/ext/mbstring/mbstring.c.cve3883
+++ php-5.0.5/ext/mbstring/mbstring.c
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: mbstring.c,v 1.214.2.4 2005/02/21 15:15:08 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.214.2.8 2005/12/23 11:15:32 hirokawa Exp $ */
 
 /*
  * PHP 4 Multibyte String module "mbstring"
@@ -1736,6 +1736,11 @@
 		}
 	}
 
+	if (((MBSTRG(func_overload) & MB_OVERLOAD_STRING) == MB_OVERLOAD_STRING)
+		&& (from >= mbfl_strlen(&string))) {
+		RETURN_FALSE;
+	}
+
 	ret = mbfl_substr(&string, &result, from, len);
 	if (ret != NULL) {
 		RETVAL_STRINGL((char *)ret->val, ret->len, 0);		/* the string is already strdup()'ed */
@@ -2267,7 +2272,7 @@
 }
 /* }}} */
 
-/* {{{ proto string mb_encode_mimeheader(string str [, string charset [, string transfer-encoding [, string linefeed]]])
+/* {{{ proto string mb_encode_mimeheader(string str [, string charset [, string transfer-encoding [, string linefeed [, int indent]]]])
    Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= */
 PHP_FUNCTION(mb_encode_mimeheader)
 {
@@ -2279,12 +2284,13 @@
 	int trans_enc_name_len;
 	char *linefeed = "\r\n";
 	int linefeed_len;
+	int indent = 0;
 
 	mbfl_string_init(&string);
 	string.no_language = MBSTRG(current_language);
 	string.no_encoding = MBSTRG(current_internal_encoding);
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|sss", (char **)&string.val, &string.len, &charset_name, &charset_name_len, &trans_enc_name, &trans_enc_name_len, &linefeed, &linefeed_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|sssl", (char **)&string.val, &string.len, &charset_name, &charset_name_len, &trans_enc_name, &trans_enc_name_len, &linefeed, &linefeed_len, &indent) == FAILURE) {
 		return;
 	}
 
@@ -2314,7 +2320,7 @@
 	}
 
 	mbfl_string_init(&result);
-	ret = mbfl_mime_header_encode(&string, &result, charset, transenc, linefeed, 0);
+	ret = mbfl_mime_header_encode(&string, &result, charset, transenc, linefeed, indent);
 	if (ret != NULL) {
 		RETVAL_STRINGL((char *)ret->val, ret->len, 0)	/* the string is already strdup()'ed */
 	} else {
@@ -2770,6 +2776,15 @@
  */
 #if HAVE_SENDMAIL
 
+#define SKIP_LONG_HEADER_SEP_MBSTRING(str, pos)										\
+	if (str[pos] == '\r' && str[pos + 1] == '\n' && (str[pos + 2] == ' ' || str[pos + 2] == '\t')) {	\
+		pos += 3;											\
+		while (str[pos] == ' ' || str[pos] == '\t') {							\
+			pos++;											\
+		}												\
+		continue;											\
+	}
+
 #define APPEND_ONE_CHAR(ch) do { \
 	if (token.a > 0) { \
 		smart_str_appendc(&token, ch); \
@@ -2981,6 +2996,9 @@
 	int subject_len;
 	char *extra_cmd=NULL;
 	int extra_cmd_len;
+	int i;
+	char *to_r;
+	char *force_extra_parameters = INI_STR("mail.force_extra_parameters");
 	struct {
 		int cnt_type:1;
 		int cnt_trans_enc:1;
@@ -3086,7 +3104,30 @@
 	}
 
 	/* To: */
-	if (to == NULL || to_len <= 0) {
+	if (to != NULL) {
+        if (to_len > 0) {
+            to_r = estrndup(to, to_len);
+            for (; to_len; to_len--) {
+                if (!isspace((unsigned char) to_r[to_len - 1])) {
+                    break;
+                }
+                to_r[to_len - 1] = '\0';
+            }
+            for (i = 0; to_r[i]; i++) {
+			if (iscntrl((unsigned char) to_r[i])) {
+				/* According to RFC 822, section 3.1.1 long headers may be separated into
+				 * parts using CRLF followed at least one linear-white-space character ('\t' or ' ').
+				 * To prevent these separators from being replaced with a space, we use the
+				 * SKIP_LONG_HEADER_SEP_MBSTRING to skip over them.
+				 */
+				SKIP_LONG_HEADER_SEP_MBSTRING(to_r, i);
+				to_r[i] = ' ';
+			}
+            }
+        } else {
+            to_r = to;
+        }
+    } else {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Missing To: field");
 		err = 1;
 	}
@@ -3182,12 +3223,20 @@
 	mbfl_memory_device_output('\0', &device);
 	headers = (char *)device.buffer;
 
-	if (!err && php_mail(to, subject, message, headers, extra_cmd TSRMLS_CC)) {
+	if (force_extra_parameters) {
+		extra_cmd = estrdup(force_extra_parameters);
+	} else if (extra_cmd) {
+		extra_cmd = php_escape_shell_cmd(extra_cmd);
+	} 
+
+	if (!err && php_mail(to_r, subject, message, headers, extra_cmd TSRMLS_CC)) {
 		RETVAL_TRUE;
 	} else {
 		RETVAL_FALSE;
 	}
-
+	if (to_r != to) {
+		efree(to_r);
+	}
 	if (subject_buf) {
 		efree((void *)subject_buf);
 	}
@@ -3198,6 +3247,7 @@
 	zend_hash_destroy(&ht_headers);
 }
 
+#undef SKIP_LONG_HEADER_SEP_MBSTRING
 #undef APPEND_ONE_CHAR
 #undef SEPARATE_SMART_STR
 #undef PHP_MBSTR_MAIL_MIME_HEADER1

php-5.0.5-CVE-2006-0207.patch:
 SAPI.c |   13 +++++++++++++
 1 files changed, 13 insertions(+)

--- NEW FILE php-5.0.5-CVE-2006-0207.patch ---
iliaa		Mon Dec  5 22:40:10 2005 EDT

  Modified files:              (Branch: PHP_4_4)
    /php-src	NEWS 
    /php-src/main	SAPI.c 
  Log:
  MFH: Prevent header injection by limiting each header to a single line.
  
  
--- php-5.0.5/main/SAPI.c.cve0207
+++ php-5.0.5/main/SAPI.c
@@ -546,6 +546,19 @@
 	while(isspace(header_line[header_line_len-1])) 
 		  header_line[--header_line_len]='\0';
 	
+	/* new line safety check */
+	{
+		char *s = header_line, *e = header_line + header_line_len, *p;
+		while (s < e && (p = memchr(s, '\n', (e - s)))) {
+			if (*(p + 1) == ' ' || *(p + 1) == '\t') {
+				s = p + 1;
+				continue;
+			}
+			efree(header_line);
+			sapi_module.sapi_error(E_WARNING, "Header may not contain more then a single header, new line detected.");
+			return FAILURE;
+		}
+	}
 
 	sapi_header.header = header_line;
 	sapi_header.header_len = header_line_len;

php-5.0.5-CVE-2006-0208.patch:
 main.c |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

--- NEW FILE php-5.0.5-CVE-2006-0208.patch ---
--- php-5.0.5/main/main.c.cve0208
+++ php-5.0.5/main/main.c
@@ -515,7 +515,10 @@
 		}
 		/* display html formatted or only show the additional links */
 		if (PG(html_errors)) {
-			spprintf(&message, 0, "%s [<a href='%s%s%s'>%s</a>]: %s", origin, docref_root, docref, docref_target, docref, buffer);
+			int len;
+			char *replace = php_escape_html_entities(params, strlen(params), &len, 0, ENT_COMPAT, NULL TSRMLS_CC);
+			spprintf(&message, "%s(%s) [<a href='%s%s%s'>%s</a>]: %s", get_active_function_name(TSRMLS_C), replace, docref_root, docref, docref_target, docref, buffer);
+			efree(replace);
 		} else {
 			spprintf(&message, 0, "%s [%s%s%s]: %s", origin, docref_root, docref, docref_target, buffer);
 		}
@@ -730,10 +733,18 @@
 			} else {
 				char *prepend_string = INI_STR("error_prepend_string");
 				char *append_string = INI_STR("error_append_string");
-				char *error_format = PG(html_errors) ?
-					"%s<br />\n<b>%s</b>:  %s in <b>%s</b> on line <b>%d</b><br />\n%s"
-					: "%s\n%s: %s in %s on line %d\n%s";    
-				php_printf(error_format, STR_PRINT(prepend_string), error_type_str, buffer, error_filename, error_lineno, STR_PRINT(append_string));
+				if (PG(html_errors)) {
+					if (type == E_ERROR) {
+						int len;
+						char *buf = php_escape_html_entities(buffer, buffer_len, &len, 0, ENT_COMPAT, NULL TSRMLS_CC);
+						php_printf("%s<br />\n<b>%s</b>:  %s in <b>%s</b> on line <b>%d</b><br />\n%s", STR_PRINT(prepend_string), error_type_str, buf, error_filename, error_lineno, STR_PRINT(append_string));
+						efree(buf);
+					} else {
+						php_printf("%s<br />\n<b>%s</b>:  %s in <b>%s</b> on line <b>%d</b><br />\n%s", STR_PRINT(prepend_string), error_type_str, buffer, error_filename, error_lineno, STR_PRINT(append_string));
+					}
+				} else {
+					php_printf("%s\n%s: %s in %s on line %d\n%s", STR_PRINT(prepend_string), error_type_str, buffer, error_filename, error_lineno, STR_PRINT(append_string));
+				}
 			}
 		}
 #if ZEND_DEBUG

php-5.0.5-CVE-2006-0996.patch:
 info.c |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

--- NEW FILE php-5.0.5-CVE-2006-0996.patch ---
--- php-5.0.5/ext/standard/info.c.cve0996
+++ php-5.0.5/ext/standard/info.c
@@ -58,6 +58,21 @@
 
 PHPAPI extern char *php_ini_opened_path;
 PHPAPI extern char *php_ini_scanned_files;
+	
+static int php_info_write_wrapper(const char *str, uint str_length)
+{
+	TSRMLS_FETCH();
+
+	int new_len, written;
+	char *elem_esc = php_escape_html_entities((char *)str, str_length, &new_len, 0, ENT_QUOTES, NULL TSRMLS_CC);
+
+	written = php_body_write(elem_esc, new_len TSRMLS_CC);
+
+	efree(elem_esc);
+
+	return written;
+}
+
 
 /* {{{ _display_module_info
  */
@@ -135,28 +150,13 @@
 				PUTS(" => ");
 			}
 			if (Z_TYPE_PP(tmp) == IS_ARRAY) {
-				zval *tmp3;
-
-				MAKE_STD_ZVAL(tmp3);
-
 				if (!sapi_module.phpinfo_as_text) {
 					PUTS("<pre>");
-				}
-				php_start_ob_buffer(NULL, 4096, 1 TSRMLS_CC);
-				
-				zend_print_zval_r(*tmp, 0 TSRMLS_CC);
-				
-				php_ob_get_buffer(tmp3 TSRMLS_CC);
-				php_end_ob_buffer(0, 0 TSRMLS_CC);
-				
-				elem_esc = php_info_html_esc(Z_STRVAL_P(tmp3) TSRMLS_CC);
-				PUTS(elem_esc);
-				efree(elem_esc);
-				zval_ptr_dtor(&tmp3);
-
-				if (!sapi_module.phpinfo_as_text) {
+                    zend_print_zval_ex((zend_write_func_t) php_info_write_wrapper, *tmp, 0 TSRMLS_CC);
 					PUTS("</pre>");
-				}
+				} else {
+                    zend_print_zval_r(*tmp, 0 TSRMLS_CC);
+                }
 			} else if (Z_TYPE_PP(tmp) != IS_STRING) {
 				tmp2 = **tmp;
 				zval_copy_ctor(&tmp2);

php-5.0.5-a2hfixes.patch:
 php_functions.c |   51 ++++++++++++++++++----------
 sapi_apache2.c  |   99 ++++++++++++++++++++++++++++++++++++--------------------
 2 files changed, 98 insertions(+), 52 deletions(-)

--- NEW FILE php-5.0.5-a2hfixes.patch ---
--- php-5.0.5/sapi/apache2handler/sapi_apache2.c.a2hfixes
+++ php-5.0.5/sapi/apache2handler/sapi_apache2.c
@@ -86,7 +86,7 @@
 php_apache_sapi_header_handler(sapi_header_struct *sapi_header,sapi_headers_struct *sapi_headers TSRMLS_DC)
 {
 	php_struct *ctx;
-	char *val;
+	char *val, *ptr;
 
 	ctx = SG(server_context);
 
@@ -96,6 +96,7 @@
 		sapi_free_header(sapi_header);
 		return 0;
 	}
+	ptr = val;
 
 	*val = '\0';
 	
@@ -111,6 +112,7 @@
 	} else {
 		apr_table_add(ctx->r->headers_out, sapi_header->header, val);
 	}
+	*ptr = ':';
 	
 	return SAPI_HEADER_ADD;
 }
@@ -175,13 +177,13 @@
 	ctx->finfo.st_dev = ctx->r->finfo.device;
 	ctx->finfo.st_ino = ctx->r->finfo.inode;
 #if defined(NETWARE) && defined(CLIB_STAT_PATCH)
-	ctx->finfo.st_atime.tv_sec = ctx->r->finfo.atime/1000000;
-	ctx->finfo.st_mtime.tv_sec = ctx->r->finfo.mtime/1000000;
-	ctx->finfo.st_ctime.tv_sec = ctx->r->finfo.ctime/1000000;
+	ctx->finfo.st_atime.tv_sec = apr_time_sec(ctx->r->finfo.atime);
+	ctx->finfo.st_mtime.tv_sec = apr_time_sec(ctx->r->finfo.mtime);
+	ctx->finfo.st_ctime.tv_sec = apr_time_sec(ctx->r->finfo.ctime);
 #else
-	ctx->finfo.st_atime = ctx->r->finfo.atime/1000000;
-	ctx->finfo.st_mtime = ctx->r->finfo.mtime/1000000;
-	ctx->finfo.st_ctime = ctx->r->finfo.ctime/1000000;
+	ctx->finfo.st_atime = apr_time_sec(ctx->r->finfo.atime);
+	ctx->finfo.st_mtime = apr_time_sec(ctx->r->finfo.mtime);
+	ctx->finfo.st_ctime = apr_time_sec(ctx->r->finfo.ctime);
 #endif
 
 	ctx->finfo.st_size = ctx->r->finfo.size;
@@ -221,7 +223,7 @@
 	char *key, *val;
 	
 	APR_ARRAY_FOREACH_OPEN(arr, key, val)
-		if (!val) val = empty_string;
+		if (!val) val = "";
 		php_register_variable(key, val, track_vars_array TSRMLS_CC);
 	APR_ARRAY_FOREACH_CLOSE()
 		
@@ -278,6 +280,11 @@
 	}
 }
 
+static time_t php_apache_sapi_get_request_time(TSRMLS_D) {
+	php_struct *ctx = SG(server_context);
+	return apr_time_sec(ctx->r->request_time);
+}
+
 extern zend_module_entry php_apache_module;
 
 static int php_apache2_startup(sapi_module_struct *sapi_module)
@@ -314,6 +321,7 @@
 
 	php_apache_sapi_register_variables,
 	php_apache_sapi_log_message,			/* Log message */
+	php_apache_sapi_get_request_time,		/* Request Time */
 
 	STANDARD_SAPI_MODULE_PROPERTIES
 };
@@ -449,6 +445,18 @@
 	php_request_shutdown(NULL);
 }
 
+static void php_apache_ini_dtor(request_rec *r, request_rec *p TSRMLS_DC)
+{
+	if (strcmp(r->protocol, "INCLUDED")) {
+		zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try();
+	}
+	if (p) {
+		((php_struct *)SG(server_context))->r = p;
+	} else {
+		apr_pool_cleanup_run(r->pool, (void *)&SG(server_context), php_server_context_cleanup);
+	}
+}
+
 static int php_handler(request_rec *r)
 {
 	php_struct *ctx;
@@ -459,15 +467,32 @@
 	request_rec *parent_req = NULL;
 	TSRMLS_FETCH();
 
+#define PHPAP_INI_OFF php_apache_ini_dtor(r, parent_req TSRMLS_CC);
+
 	conf = ap_get_module_config(r->per_dir_config, &php5_module);
+
+	/* apply_config() needs r in some cases, so allocate server_context early */
+	ctx = SG(server_context);
+	if (ctx == NULL || (ctx && ctx->request_processed && !strcmp(r->protocol, "INCLUDED"))) {
+normal:
+		ctx = SG(server_context) = apr_pcalloc(r->pool, sizeof(*ctx));
+		/* register a cleanup so we clear out the SG(server_context)
+		 * after each request. Note: We pass in the pointer to the
+		 * server_context in case this is handled by a different thread.
+		 */
+		apr_pool_cleanup_register(r->pool, (void *)&SG(server_context), php_server_context_cleanup, apr_pool_cleanup_null);
+		ctx->r = r;
+		ctx = NULL; /* May look weird to null it here, but it is to catch the right case in the first_try later on */
+	} else {
+		parent_req = ctx->r;
+		ctx->r = r;
+	}
 	apply_config(conf);
 
 	if (strcmp(r->handler, PHP_MAGIC_TYPE) && strcmp(r->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(r->handler, PHP_SCRIPT)) {
 		/* Check for xbithack in this case. */
 		if (!AP2(xbithack) || strcmp(r->handler, "text/html") || !(r->finfo.protection & APR_UEXECUTE)) {
-			zend_try {
-				zend_ini_deactivate(TSRMLS_C);
-			} zend_end_try();
+			PHPAP_INI_OFF;
 			return DECLINED;
 		}
 	}
@@ -476,32 +501,24 @@
 	 * the configuration; default behaviour is to accept. */ 
 	if (r->used_path_info == AP_REQ_REJECT_PATH_INFO
 		&& r->path_info && r->path_info[0]) {
-		zend_try {
-			zend_ini_deactivate(TSRMLS_C);
-		} zend_end_try();
+		PHPAP_INI_OFF;
 		return HTTP_NOT_FOUND;
 	}
 
 	/* handle situations where user turns the engine off */
 	if (!AP2(engine)) {
-		zend_try {
-			zend_ini_deactivate(TSRMLS_C);
-		} zend_end_try();
+		PHPAP_INI_OFF;
 		return DECLINED;
 	}
 
 	if (r->finfo.filetype == 0) {
 		php_apache_sapi_log_message_ex("script '%s' not found or unable to stat", r);
-		zend_try {
-				zend_ini_deactivate(TSRMLS_C);
-		} zend_end_try();
+		PHPAP_INI_OFF;
 		return HTTP_NOT_FOUND;
 	}
 	if (r->finfo.filetype == APR_DIR) {
 		php_apache_sapi_log_message_ex("attempt to invoke directory '%s' as script", r);
-		zend_try {
-			zend_ini_deactivate(TSRMLS_C);
-		} zend_end_try();
+		PHPAP_INI_OFF;
 		return HTTP_FORBIDDEN;
 	}
 
@@ -517,25 +534,27 @@
 
 zend_first_try {
 
-	ctx = SG(server_context);
 	if (ctx == NULL) {
-normal:
-		ctx = SG(server_context) = apr_pcalloc(r->pool, sizeof(*ctx));
-		/* register a cleanup so we clear out the SG(server_context)
-		 * after each request. Note: We pass in the pointer to the
-		 * server_context in case this is handled by a different thread.
-		 */
-		apr_pool_cleanup_register(r->pool, (void *)&SG(server_context), php_server_context_cleanup, apr_pool_cleanup_null);
-
-		ctx->r = r;
 		brigade = apr_brigade_create(r->pool, r->connection->bucket_alloc);
+		ctx = SG(server_context);
 		ctx->brigade = brigade;
 
 		if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) {
 			zend_bailout();
 		}
 	} else {
-		parent_req = ctx->r;
+		if (!parent_req) {
+			parent_req = ctx->r;
+		}
+		if (parent_req && parent_req->handler && 
+				strcmp(parent_req->handler, PHP_MAGIC_TYPE) && 
+				strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && 
+				strcmp(parent_req->handler, PHP_SCRIPT)) {
+			if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) {
+				zend_bailout();
+			}
+		}
+		
 		/* check if comming due to ErrorDocument */
 		if (parent_req && parent_req->status != HTTP_OK) {
 			parent_req = NULL;
--- php-5.0.5/sapi/apache2handler/php_functions.c.a2hfixes
+++ php-5.0.5/sapi/apache2handler/php_functions.c
@@ -115,7 +115,7 @@
 #define ADD_LONG(name) \
 		add_property_long(return_value, #name, rr->name)
 #define ADD_TIME(name) \
-		add_property_long(return_value, #name, rr->name / APR_USEC_PER_SEC);
+		add_property_long(return_value, #name, apr_time_sec(rr->name));
 #define ADD_STRING(name) \
 		if (rr->name) add_property_string(return_value, #name, (char *) rr->name, 1)
 
@@ -161,7 +161,6 @@
 		ADD_LONG(allowed);
 		ADD_LONG(sent_bodyct);
 		ADD_LONG(bytes_sent);
-		ADD_LONG(request_time);
 		ADD_LONG(mtime);
 		ADD_TIME(request_time);
 
@@ -182,13 +181,17 @@
 	const apr_array_header_t *arr;
 	char *key, *val;
 
+	if (ZEND_NUM_ARGS()) {
+		WRONG_PARAM_COUNT;
+	}
+
 	array_init(return_value);
 	
 	ctx = SG(server_context);
 	arr = apr_table_elts(ctx->r->headers_in);
 
 	APR_ARRAY_FOREACH_OPEN(arr, key, val)
-		if (!val) val = empty_string;
+		if (!val) val = "";
 		add_assoc_string(return_value, key, val, 1);
 	APR_ARRAY_FOREACH_CLOSE()
 }
@@ -202,13 +205,17 @@
 	const apr_array_header_t *arr;
 	char *key, *val;
 
+	if (ZEND_NUM_ARGS()) {
+		WRONG_PARAM_COUNT;
+	}
+
 	array_init(return_value);
 	
 	ctx = SG(server_context);
 	arr = apr_table_elts(ctx->r->headers_out);
 
 	APR_ARRAY_FOREACH_OPEN(arr, key, val)
-		if (!val) val = empty_string;
+		if (!val) val = "";
 		add_assoc_string(return_value, key, val, 1);
 	APR_ARRAY_FOREACH_CLOSE()
 }
@@ -259,7 +266,7 @@
 	int arg_count = ZEND_NUM_ARGS();
 	request_rec *r;
 
-	if (arg_count<1 || arg_count>3 ||
+	if (arg_count < 2 || arg_count > 3 ||
 		zend_get_parameters_ex(arg_count, &variable, &string_val, &walk_to_top) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
@@ -267,10 +274,13 @@
 	ctx = SG(server_context);
 
 	r = ctx->r;
-	if (arg_count == 3 && Z_STRVAL_PP(walk_to_top)) {
-		while(r->prev) {
-			r = r->prev;
-		}	
+	if (arg_count == 3) {
+		convert_to_boolean_ex(walk_to_top);
+		if (Z_LVAL_PP(walk_to_top)) {
+			while(r->prev) {
+				r = r->prev;
+			}
+		}
 	}
 
 	convert_to_string_ex(variable);
@@ -303,10 +313,13 @@
 	ctx = SG(server_context);
 
 	r = ctx->r;
-	if (arg_count == 2 && Z_STRVAL_PP(walk_to_top)) {
-		while(r->prev) {
-			r = r->prev;
-		}	
+	if (arg_count == 2) {
+		convert_to_boolean_ex(walk_to_top);
+		if (Z_LVAL_PP(walk_to_top)) {
+			while(r->prev) {
+				r = r->prev;
+			}
+		}
 	}
 
 	convert_to_string_ex(variable);
@@ -407,7 +420,9 @@
 	sprintf(tmp, "Per Child: %d - Keep Alive: %s - Max Per Connection: %d", max_requests, (serv->keep_alive ? "on":"off"), serv->keep_alive_max);
 	php_info_print_table_row(2, "Max Requests", tmp);
 
-	sprintf(tmp, "Connection: %lld - Keep-Alive: %lld", (serv->timeout / 1000000), (serv->keep_alive_timeout / 1000000));
+	apr_snprintf(tmp, sizeof tmp,
+				 "Connection: %" APR_TIME_T_FMT " - Keep-Alive: %" APR_TIME_T_FMT, 
+				 apr_time_sec(serv->timeout), apr_time_sec(serv->keep_alive_timeout));
 	php_info_print_table_row(2, "Timeouts", tmp);
 	
 	php_info_print_table_row(2, "Virtual Server", (serv->is_virtual ? "Yes" : "No"));
@@ -428,7 +443,7 @@
 		php_info_print_table_header(2, "Variable", "Value");
 		APR_ARRAY_FOREACH_OPEN(arr, key, val)
 			if (!val) {
-				val = empty_string;
+				val = "";
 			}
 			php_info_print_table_row(2, key, val);
 		APR_ARRAY_FOREACH_CLOSE()
@@ -443,7 +458,7 @@
 		arr = apr_table_elts(((php_struct *) SG(server_context))->r->headers_in);
 		APR_ARRAY_FOREACH_OPEN(arr, key, val)
 			if (!val) {
-				val = empty_string;
+				val = "";
 			}
 		        php_info_print_table_row(2, key, val);
 		APR_ARRAY_FOREACH_CLOSE()
@@ -452,7 +467,7 @@
 		arr = apr_table_elts(((php_struct *) SG(server_context))->r->headers_out);
 		APR_ARRAY_FOREACH_OPEN(arr, key, val)
 			if (!val) {
-				val = empty_string;
+				val = "";
 			}
 		        php_info_print_table_row(2, key, val);
 		APR_ARRAY_FOREACH_CLOSE()
@@ -461,7 +476,7 @@
 	}
 }
 
-static function_entry apache_functions[] = {
+static zend_function_entry apache_functions[] = {
 	PHP_FE(apache_lookup_uri, NULL)
 	PHP_FE(virtual, NULL) 
 	PHP_FE(apache_request_headers, NULL)

php-5.1.2-CVE-2006-1490.patch:
 html.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE php-5.1.2-CVE-2006-1490.patch ---

  Modified files:              (Branch: PHP_4_4)
    /php-src/ext/standard       html.c
  Log:
  MFH - binary safety patch from Moriyoshi

http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/html.c?r1=1.63.2.23.2.1&r2=1.63.2.23.2.2&diff_format=u

--- php-5.1.2/ext/standard/html.c.cve1490
+++ php-5.1.2/ext/standard/html.c
@@ -884,7 +884,7 @@
 	unsigned char replacement[15];
 	int replacement_len;
 
-	ret = estrdup(old);
+	ret = estrndup(old, oldlen);
 	retlen = oldlen;
 	if (!retlen) {
 		goto empty_source;


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/php/FC-4/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	8 Sep 2005 10:52:57 -0000	1.25
+++ .cvsignore	20 Apr 2006 14:52:41 -0000	1.26
@@ -21,3 +21,6 @@
 HTTP-1.3.6.tgz
 Net_SMTP-1.2.7.tgz
 php-5.0.5.tar.gz
+XML_RPC-1.4.8.tgz
+php-5.0.5
+clog


Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/FC-4/php.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- php.spec	8 Sep 2005 10:49:07 -0000	1.82
+++ php.spec	20 Apr 2006 14:52:41 -0000	1.83
@@ -10,7 +10,7 @@
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
 Version: 5.0.5
-Release: 2.1
+Release: 2.2
 License: The PHP License
 Group: Development/Languages
 URL: http://www.php.net/
@@ -23,7 +23,7 @@
 Source23: http://pear.php.net/get/XML_Parser-1.2.6.tgz
 Source24: http://pear.php.net/get/Net_Socket-1.0.6.tgz
 Source25: http://pear.php.net/get/Net_SMTP-1.2.7.tgz
-Source26: http://pear.php.net/get/XML_RPC-1.4.1.tgz
+Source26: http://pear.php.net/get/XML_RPC-1.4.8.tgz
 Source50: php.conf
 
 Patch2: php-5.0.1-config.patch
@@ -32,12 +32,12 @@
 Patch5: php-4.3.3-install.patch
 Patch6: php-5.0.4-norpath.patch
 Patch7: php-4.3.2-libtool15.patch
-Patch9: php-4.3.6-umask.patch
 Patch10: php-5.0.2-gdnspace.patch
 Patch11: php-4.3.8-round.patch
 Patch13: php-5.0.2-phpize64.patch
 Patch14: php-5.0.3-sprintf.patch
 Patch16: php-5.0.3-gdheaders.patch
+Patch17: php-5.0.5-a2hfixes.patch
 
 # Fixes for extension modules
 Patch21: php-4.3.1-odbc.patch
@@ -55,6 +55,13 @@
 Patch51: php-5.0.4-tests-wddx.patch
 Patch52: php-5.0.4-tests-sunfunc.patch
 
+# Security fixes
+Patch70: php-5.0.5-CVE-2005-3883.patch
+Patch71: php-5.0.5-CVE-2006-0208.patch
+Patch72: php-5.0.5-CVE-2006-0996.patch
+Patch73: php-5.1.2-CVE-2006-1490.patch
+Patch74: php-5.0.5-CVE-2006-0207.patch
+
 BuildRoot: %{_tmppath}/%{name}-root
 
 BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, expat-devel
@@ -81,7 +88,7 @@
 %package devel
 Group: Development/Libraries
 Summary: Files needed for building PHP extensions.
-Requires: php = %{version}-%{release}
+Requires: php = %{version}-%{release}, autoconf, automake
 
 %description devel
 The php-devel package contains the files needed for building PHP
@@ -335,11 +342,11 @@
 %patch5 -p1 -b .install
 %patch6 -p1 -b .norpath
 %patch7 -p1 -b .libtool15
-%patch9 -p1 -b .umask
 %patch10 -p1 -b .gdnspace
 %patch11 -p1 -b .round
 %patch13 -p1 -b .phpize64
 %patch16 -p1 -b .gdheaders
+%patch17 -p1 -b .a2hfixes
 
 %patch21 -p1 -b .odbc
 %patch22 -p1 -b .shutdown
@@ -354,6 +361,12 @@
 %patch51 -p1 -b .tests-wddx
 %patch52 -p1 -b .tests-sunfunc
 
+%patch70 -p1 -b .cve3883
+%patch71 -p1 -b .cve0208
+%patch72 -p1 -b .cve0996
+%patch73 -p1 -b .cve1490
+%patch74 -p1 -b .cve0207
+
 # Prevent %%doc confusion over LICENSE files
 cp Zend/LICENSE Zend/ZEND_LICENSE
 cp TSRM/LICENSE TSRM_LICENSE
@@ -646,6 +659,16 @@
 %endif
 
 %changelog
+* Thu Apr 20 2006 Joe Orton <jorton at redhat.com> 5.0.5-2.2
+- add security fixes from upstream:
+ * phpinfo XSS (CVE-2006-0996)
+ * binary safeness fix for html_entity_decode (CVE-2006-1490)
+ * session ID response splitting/XSS fix (CVE-2006-0207)
+ * XSS issues in "html_errors" mode (CVE-2006-0208)
+ * mbstring header validation (CVE-2005-3883)
+- add apache2handler SAPI fixes (#168442)
+- pear: update to XML_RPC-1.4.8
+
 * Thu Sep  8 2005 Joe Orton <jorton at redhat.com> 5.0.5-2.1
 - update to 5.0.5
 - pear: update to HTTP-1.3.6, Mail-1.1.8, Net_SMTP-1.2.7, XML_RPC-1.4.1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/php/FC-4/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	8 Sep 2005 10:52:57 -0000	1.26
+++ sources	20 Apr 2006 14:52:41 -0000	1.27
@@ -1,8 +1,8 @@
 f961deffb093a58eb4c48478de1b27ed  Net_Socket-1.0.6.tgz
 96ebc0fc2f349249f1455389797e72a4  XML_Parser-1.2.6.tgz
 b5ff032f7e8873174e3e7fc21b7ec696  DB-1.7.6.tgz
-a646a20e20634442eda43c21ed3f08fd  XML_RPC-1.4.1.tgz
 69b1941019b686227123a879090241ab  Mail-1.1.8.tgz
 b166af8069febd24699df675cf0d5b0f  HTTP-1.3.6.tgz
 11c4de943b07206aab6193eefd8f328e  Net_SMTP-1.2.7.tgz
 ae36a2aa35cfaa58bdc5b9a525e6f451  php-5.0.5.tar.gz
+c2e94575bd14a4425de9e20976c65d43  XML_RPC-1.4.8.tgz


--- php-4.3.6-umask.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 20 14:59:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 10:59:22 -0400
Subject: rpms/tzdata/FC-4 .cvsignore, 1.17, 1.18 sources, 1.18,
	1.19 tzdata.spec, 1.20, 1.21
Message-ID: <200604201459.k3KExMWP024083@cvs.devel.redhat.com>

Author: pmachata

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

Modified Files:
	.cvsignore sources tzdata.spec 
Log Message:
Upstream 2006d



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tzdata/FC-4/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	6 Apr 2006 12:40:17 -0000	1.17
+++ .cvsignore	20 Apr 2006 14:59:19 -0000	1.18
@@ -1,3 +1,3 @@
-tzcode2006c.tar.gz
-tzdata2006c.tar.gz
+tzcode2006d.tar.gz
+tzdata2006d.tar.gz
 tzdata-base-0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tzdata/FC-4/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	6 Apr 2006 12:40:17 -0000	1.18
+++ sources	20 Apr 2006 14:59:19 -0000	1.19
@@ -1,3 +1,3 @@
-2100d0b0c6f2ad320260290e5dc7e957  tzcode2006c.tar.gz
-420d97a09c9750839afc2703f6b8276f  tzdata2006c.tar.gz
+4ffb3a8c0b1f604cba0bae16d5d8c6b4  tzcode2006d.tar.gz
+553bfb094e823dc14ed97013c536b90d  tzdata2006d.tar.gz
 906a4c98cc5240f416524a256b039c42  tzdata-base-0.tar.bz2


Index: tzdata.spec
===================================================================
RCS file: /cvs/dist/rpms/tzdata/FC-4/tzdata.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- tzdata.spec	6 Apr 2006 12:40:17 -0000	1.20
+++ tzdata.spec	20 Apr 2006 14:59:19 -0000	1.21
@@ -1,6 +1,6 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2006c
+Version: 2006d
 Release: 1.fc4
 License: GPL
 Group: System Environment/Base
@@ -48,6 +48,13 @@
 %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html
 
 %changelog
+* Thu Apr 20 2006 Petr Machata <pmachata at redhat.com> - 2006d-1.fc4
+- Upstream 2006d
+  - Haiti observes DST
+  - Sri Lanka change actually took effect Apr/15
+  - All Canada is now scheduled for 2007 US DST rules
+  - Some historical fixes
+
 * Thu Apr  6 2006 Petr Machata <pmachata at redhat.com> - 2006c-1.fc4
 - Upstream 2006c
   - Time-related changes:



From fedora-cvs-commits at redhat.com  Thu Apr 20 15:58:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 11:58:41 -0400
Subject: rpms/cman-kernel/FC-5 cman-kernel.spec,1.163,1.164
Message-ID: <200604201558.k3KFwfeP030440@cvs.devel.redhat.com>

Author: cfeist

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

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.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- cman-kernel.spec	31 Mar 2006 23:19:21 -0000	1.163
+++ cman-kernel.spec	20 Apr 2006 15:58:38 -0000	1.164
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.16-1.2080_FC5
+%define kernel_version 2.6.16-1.2096_FC5
 %define subversion 0
 %define tempversion 2.6.15
  
@@ -26,7 +26,7 @@
 
 Name: cman-kernel
 Version: 2.6.15.1
-Release: 0.FC5.18
+Release: 0.FC5.19
 License: GPL
 Group: System Environment/Kernel
 Summary: cman-kernel - The Cluster Manager kernel modules



From fedora-cvs-commits at redhat.com  Thu Apr 20 15:58:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 11:58:57 -0400
Subject: rpms/gnbd-kernel/FC-5 gnbd-kernel.spec,1.156,1.157
Message-ID: <200604201558.k3KFwvxB030564@cvs.devel.redhat.com>

Author: cfeist

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

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.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- gnbd-kernel.spec	31 Mar 2006 23:13:00 -0000	1.156
+++ gnbd-kernel.spec	20 Apr 2006 15:58:53 -0000	1.157
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.16-1.2080_FC5
+%define kernel_version 2.6.16-1.2096_FC5
 %define subversion 2
 
 %ifnarch i686
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15
-Release: 5.FC5.25
+Release: 5.FC5.26
 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 Apr 20 15:59:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 11:59:07 -0400
Subject: rpms/dlm-kernel/FC-5 dlm-kernel.spec,1.133,1.134
Message-ID: <200604201559.k3KFx7fR030690@cvs.devel.redhat.com>

Author: cfeist

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

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.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- dlm-kernel.spec	31 Mar 2006 23:20:15 -0000	1.133
+++ dlm-kernel.spec	20 Apr 2006 15:59:05 -0000	1.134
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.16-1.2080_FC5
+%define kernel_version 2.6.16-1.2096_FC5
 %define tempversion 2.6.15
 %define subversion 0
 
@@ -26,7 +26,7 @@
 
 Name: dlm-kernel
 Version: 2.6.15.1
-Release: 0.FC5.16
+Release: 0.FC5.17
 License: GPL
 Group: System Environment/Kernel
 Summary: dlm-kernel - The Distributed Lock Manager kernel modules.



From fedora-cvs-commits at redhat.com  Thu Apr 20 15:59:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 11:59:17 -0400
Subject: rpms/GFS-kernel/FC-5 GFS-kernel.spec,1.151,1.152
Message-ID: <200604201559.k3KFxHOx030812@cvs.devel.redhat.com>

Author: cfeist

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

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.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- GFS-kernel.spec	31 Mar 2006 23:20:55 -0000	1.151
+++ GFS-kernel.spec	20 Apr 2006 15:59:15 -0000	1.152
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.16-1.2080_FC5
+%define kernel_version 2.6.16-1.2096_FC5
 %define tempversion 2.6.15
 %define subversion 2
 
@@ -26,7 +26,7 @@
 
 Name: GFS-kernel
 Version: 2.6.15.1
-Release: 5.FC5.19
+Release: 5.FC5.20
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules



From fedora-cvs-commits at redhat.com  Thu Apr 20 16:03:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 12:03:51 -0400
Subject: rpms/gcalctool/devel gcalctool.spec,1.2,1.3
Message-ID: <200604201603.k3KG3p6C031352@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gcalctool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31310

Modified Files:
	gcalctool.spec 
Log Message:
Add preun to clean up schema.



Index: gcalctool.spec
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcalctool.spec	19 Apr 2006 16:07:08 -0000	1.2
+++ gcalctool.spec	20 Apr 2006 16:03:46 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gcalctool
 Version:        5.7.32
-Release: 4
+Release: 	5
 Summary:        A desktop calculator
 
 Group:          Applications/System
@@ -20,6 +20,7 @@
 Requires(post): scrollkeeper
 Requires(post): GConf2
 Requires(postun): scrollkeeper
+Requires(preun): GConf2
 
 Patch0: gcalctool-schemasdir.patch
 Patch1: gcalctool-flex-crap.patch
@@ -59,6 +60,12 @@
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gcalctool.schemas > /dev/null
 
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/gcalctool.schemas > /dev/null || :
+fi
 
 %postun
 scrollkeeper-update
@@ -81,6 +88,9 @@
 
 
 %changelog
+* Thu Apr 20 2006 Jesse Keating <jkeating at redhat.com> - 5.7.32-5
+- Add postun to clean up gconf schema.
+
 * Wed Apr 19 2006 Jeremy Katz <katzj at redhat.com> - 5.7.32-4
 - fix gconf scriptlet
 



From fedora-cvs-commits at redhat.com  Thu Apr 20 16:05:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 12:05:52 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.184,
	1.185 policycoreutils.spec, 1.261, 1.262
Message-ID: <200604201605.k3KG5qpa031477@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31432

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Thu Apr 20 2006 Dan Walsh <dwalsh at redhat.com> 1.30.6-3
- Fix check for "msg"


policycoreutils-rhat.patch:
 audit2allow/Makefile         |    4 
 audit2allow/audit2allow      |  474 ++-------------------------------------
 audit2allow/audit2allow.1    |    5 
 audit2allow/avc.py           |  519 +++++++++++++++++++++++++++++++++++++++++++
 restorecond/restorecond.conf |    2 
 semanage/semanage            |    2 
 semanage/seobject.py         |   14 -
 setsebool/setsebool.8        |    2 
 8 files changed, 579 insertions(+), 443 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- policycoreutils-rhat.patch	18 Apr 2006 20:53:54 -0000	1.184
+++ policycoreutils-rhat.patch	20 Apr 2006 16:05:33 -0000	1.185
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30.6/audit2allow/audit2allow
 --- nsapolicycoreutils/audit2allow/audit2allow	2006-03-29 15:35:22.000000000 -0500
-+++ policycoreutils-1.30.6/audit2allow/audit2allow	2006-04-14 15:07:36.000000000 -0400
++++ policycoreutils-1.30.6/audit2allow/audit2allow	2006-04-20 09:47:19.000000000 -0400
 @@ -24,431 +24,8 @@
  #                                        02111-1307  USA
  #
@@ -483,7 +483,13 @@
  					usage()
  				input=open("/var/log/messages", "r")
  				auditlogs=1
-@@ -551,9 +131,8 @@
+@@ -547,13 +127,14 @@
+ 				module=a
+ 				outfile=a+".te"
+ 				buildPP=1
++				if not os.path.exists("/usr/bin/checkmodule"):
++					errorExit("-M Requires the checkmodule command, you need to install the checkpolicy rpm package")
+ 				output=open(outfile, "w")
  			if o == "-r" or o == "--requires":
  				requires=1
  			if o == "-t" or o == "--tefile":
@@ -495,7 +501,7 @@
  			if o == "-R" or o == "--reference":
  				ref_ind=True
  				
-@@ -565,25 +144,38 @@
+@@ -565,25 +146,38 @@
  			if o == "-v" or o == "--verbose":
  				verbose=1
  				
@@ -541,7 +547,7 @@
  			cmd="checkmodule %s -m -o %s.mod %s.te" % (get_mls_flag(), module, module)
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-1.30.6/audit2allow/audit2allow.1
 --- nsapolicycoreutils/audit2allow/audit2allow.1	2006-03-10 09:48:04.000000000 -0500
-+++ policycoreutils-1.30.6/audit2allow/audit2allow.1	2006-04-14 13:50:16.000000000 -0400
++++ policycoreutils-1.30.6/audit2allow/audit2allow.1	2006-04-20 09:47:19.000000000 -0400
 @@ -98,6 +98,11 @@
  .PP
  .SH EXAMPLE
@@ -556,8 +562,8 @@
  $ cat /var/log/audit/audit.log | audit2allow >> domains/misc/local.te
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/avc.py policycoreutils-1.30.6/audit2allow/avc.py
 --- nsapolicycoreutils/audit2allow/avc.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.30.6/audit2allow/avc.py	2006-04-14 15:46:22.000000000 -0400
-@@ -0,0 +1,518 @@
++++ policycoreutils-1.30.6/audit2allow/avc.py	2006-04-20 11:53:56.000000000 -0400
+@@ -0,0 +1,519 @@
 +#! /usr/bin/env python
 +# Copyright (C) 2006 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -909,10 +915,10 @@
 +                            found=1
 +                        else:
 +                            dict.append(i)
-+                        if found:
-+                            self.translate(dict)
-+                            found=0
-+                            dict=[]
++                    if found:
++                        self.translate(dict)
++                        found=0
++                        dict=[]
 +                    line = input.readline()
 +				
 +
@@ -988,10 +994,11 @@
 +                key=("allow", scontext.type, tcontext.type, AVC["tclass"])
 +		if key not in self.seRules.keys():
 +			self.seRules[key]=serule(key)
-+                if "name" not in AVC.keys():
-+                    AVC["name"]=""
-+                if "comm" not in AVC.keys():
-+                    AVC["comm"]=""
++
++                avckeys=AVC.keys()
++	        for i in ( "name", "comm", "msg" ):
++ 	               if i not in avckeys:
++        	            AVC[i]=""
 +
 +                self.add_avc(AVC)
 +                self.seRules[key].add((AVC["access"], AVC["msg"], AVC["comm"], AVC["name"]))
@@ -1078,7 +1085,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-1.30.6/audit2allow/Makefile
 --- nsapolicycoreutils/audit2allow/Makefile	2005-01-21 09:01:35.000000000 -0500
-+++ policycoreutils-1.30.6/audit2allow/Makefile	2006-04-18 16:51:11.000000000 -0400
++++ policycoreutils-1.30.6/audit2allow/Makefile	2006-04-20 09:47:19.000000000 -0400
 @@ -3,6 +3,8 @@
  BINDIR ?= $(PREFIX)/bin
  MANDIR ?= $(PREFIX)/share/man
@@ -1099,7 +1106,7 @@
  
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.30.6/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2006-03-29 11:08:21.000000000 -0500
-+++ policycoreutils-1.30.6/restorecond/restorecond.conf	2006-04-14 13:50:16.000000000 -0400
++++ policycoreutils-1.30.6/restorecond/restorecond.conf	2006-04-20 09:47:19.000000000 -0400
 @@ -1,4 +1,6 @@
  /etc/resolv.conf
 +/etc/samba/secrets.tdb
@@ -1109,7 +1116,7 @@
 +~/.mozilla/plugins/libflashplayer.so
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.30.6/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2006-04-14 13:10:51.000000000 -0400
-+++ policycoreutils-1.30.6/semanage/semanage	2006-04-14 13:50:16.000000000 -0400
++++ policycoreutils-1.30.6/semanage/semanage	2006-04-20 09:47:19.000000000 -0400
 @@ -292,6 +292,8 @@
  		errorExit("Options Error " + error.msg)
  	except ValueError, error:
@@ -1121,7 +1128,7 @@
  	except KeyboardInterrupt, error:
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.30.6/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2006-04-14 13:10:51.000000000 -0400
-+++ policycoreutils-1.30.6/semanage/seobject.py	2006-04-14 13:52:19.000000000 -0400
++++ policycoreutils-1.30.6/semanage/seobject.py	2006-04-20 09:47:19.000000000 -0400
 @@ -455,6 +455,8 @@
  		semanage_user_free(u)
  
@@ -1161,7 +1168,7 @@
  
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setsebool/setsebool.8 policycoreutils-1.30.6/setsebool/setsebool.8
 --- nsapolicycoreutils/setsebool/setsebool.8	2005-11-04 15:37:49.000000000 -0500
-+++ policycoreutils-1.30.6/setsebool/setsebool.8	2006-04-14 13:50:16.000000000 -0400
++++ policycoreutils-1.30.6/setsebool/setsebool.8	2006-04-20 09:47:19.000000000 -0400
 @@ -17,7 +17,7 @@
  are not changed. 
  


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- policycoreutils.spec	18 Apr 2006 20:53:54 -0000	1.261
+++ policycoreutils.spec	20 Apr 2006 16:05:35 -0000	1.262
@@ -5,7 +5,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.6
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -106,10 +106,13 @@
 %config(noreplace) /etc/selinux/restorecond.conf
 
 %post
-/sbin/service restorecond condrestart
+[ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
-* Mon Apr 18 2006 Dan Walsh <dwalsh at redhat.com> 1.30.6-2
+* Thu Apr 20 2006 Dan Walsh <dwalsh at redhat.com> 1.30.6-3
+- Fix check for "msg"
+
+* Mon Apr 17 2006 Dan Walsh <dwalsh at redhat.com> 1.30.6-2
 - Ship avc.py
 
 * Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> 1.30.6-1



From fedora-cvs-commits at redhat.com  Thu Apr 20 16:07:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 12:07:00 -0400
Subject: rpms/pygtk2/devel .cvsignore, 1.24, 1.25 pygtk.spec, 1.45,
	1.46 sources, 1.24, 1.25
Message-ID: <200604201607.k3KG70RI031642@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/pygtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31575

Modified Files:
	.cvsignore pygtk.spec sources 
Log Message:
- Update to upstream 2.8.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	16 Jan 2006 01:34:07 -0000	1.24
+++ .cvsignore	20 Apr 2006 16:06:49 -0000	1.25
@@ -2,3 +2,4 @@
 pygtk-2.8.0.tar.bz2
 pygtk-2.8.2.tar.bz2
 pygtk-2.8.4.tar.bz2
+pygtk-2.8.6.tar.bz2


Index: pygtk.spec
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/pygtk.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- pygtk.spec	7 Feb 2006 13:38:49 -0000	1.45
+++ pygtk.spec	20 Apr 2006 16:06:49 -0000	1.46
@@ -2,8 +2,8 @@
 
 Summary: Python bindings for the GTK+ widget set.
 Name: pygtk2
-Version: 2.8.4
-Release: 1.1
+Version: 2.8.6
+Release: 1
 License: LGPL
 Group: Development/Languages
 Source: ftp://ftp.gtk.org/pub/gtk/python/pygtk-%{version}.tar.bz2
@@ -109,6 +109,9 @@
 %{_prefix}/share/pygtk/2.0/defs/pangocairo.override
 
 %changelog
+* Thu Apr 20 2006 John (J5) Palmieri <johnp at redhat.com> - 2.8.6-1
+- Update to upstream 2.8.6
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.8.4-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	16 Jan 2006 01:34:08 -0000	1.24
+++ sources	20 Apr 2006 16:06:49 -0000	1.25
@@ -1 +1 @@
-bc82fdb458754feef2336d5fe9b31370  pygtk-2.8.4.tar.bz2
+c69c2e5e86a8f21a5773df20e265fc3a  pygtk-2.8.6.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 20 16:17:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 12:17:23 -0400
Subject: rpms/gthumb/devel .cvsignore, 1.19, 1.20 gthumb.spec, 1.39,
	1.40 sources, 1.20, 1.21
Message-ID: <200604201617.k3KGHNSE007914@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gthumb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32597

Modified Files:
	.cvsignore gthumb.spec sources 
Log Message:
2.7.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gthumb/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	15 Feb 2006 06:03:08 -0000	1.19
+++ .cvsignore	20 Apr 2006 16:17:20 -0000	1.20
@@ -10,3 +10,4 @@
 gthumb-2.7.1.tar.bz2
 gthumb-2.7.2.tar.bz2
 gthumb-2.7.3.tar.bz2
+gthumb-2.7.6.tar.bz2


Index: gthumb.spec
===================================================================
RCS file: /cvs/dist/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gthumb.spec	24 Mar 2006 16:27:41 -0000	1.39
+++ gthumb.spec	20 Apr 2006 16:17:20 -0000	1.40
@@ -9,7 +9,7 @@
 
 Summary: Image viewer, editor, organizer
 Name: gthumb
-Version: 2.7.5.1
+Version: 2.7.6
 Release: 2
 URL: http://gthumb.sourceforge.net
 Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gthumb/2.4/%{name}-%{version}.tar.bz2
@@ -100,6 +100,9 @@
 %{_datadir}/pixmaps
 
 %changelog
+* Thu Apr 20 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.6-2  
+- Update to 2.7.6  
+
 * Fri Mar 24 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.5.1-2
 - Update to 2.7.5.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gthumb/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	24 Mar 2006 16:27:41 -0000	1.20
+++ sources	20 Apr 2006 16:17:20 -0000	1.21
@@ -1 +1 @@
-feefaead3582c0c3aa510bd3d2da93b1  gthumb-2.7.5.1.tar.bz2
+7ba4f37e4cbbc9e220a1a77af48f0449  gthumb-2.7.6.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 20 16:25:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 12:25:58 -0400
Subject: rpms/gthumb/devel gthumb.spec,1.40,1.41
Message-ID: <200604201625.k3KGPw9r017807@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gthumb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17739

Modified Files:
	gthumb.spec 
Log Message:
fix file lists



Index: gthumb.spec
===================================================================
RCS file: /cvs/dist/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gthumb.spec	20 Apr 2006 16:17:20 -0000	1.40
+++ gthumb.spec	20 Apr 2006 16:25:55 -0000	1.41
@@ -97,7 +97,6 @@
 %{_datadir}/application-registry
 %{_datadir}/man/man*/*
 %{_datadir}/omf
-%{_datadir}/pixmaps
 
 %changelog
 * Thu Apr 20 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.6-2  



From fedora-cvs-commits at redhat.com  Thu Apr 20 16:41:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 12:41:37 -0400
Subject: rpms/gthumb/devel gthumb.spec,1.41,1.42
Message-ID: <200604201641.k3KGfbD4020383@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gthumb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20341

Modified Files:
	gthumb.spec 
Log Message:
fix dependencies



Index: gthumb.spec
===================================================================
RCS file: /cvs/dist/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gthumb.spec	20 Apr 2006 16:25:55 -0000	1.41
+++ gthumb.spec	20 Apr 2006 16:41:26 -0000	1.42
@@ -20,7 +20,6 @@
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: nautilus >= %{nautilus_version}
-PreReq: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: libgnomeprint22-devel >= %{libgnomeprint_version}
 BuildRequires: libgnomeprintui22-devel >= %{libgnomeprintui_version}
 BuildRequires: libexif-devel
@@ -34,7 +33,12 @@
 BuildRequires: libjpeg-devel
 BuildRequires: libtiff-devel
 
-Requires: scrollkeeper
+Requires(post): scrollkeeper
+Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
+Requires(post): GConf2
+
+Requires(postun): scrollkeeper
+Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
 
 Patch0: gthumb-2.7.3-use-local-filename.patch
 
@@ -70,17 +74,22 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-update-desktop-database %{_datadir}/applications
-scrollkeeper-update
+scrollkeeper-update -q
+update-desktop-database -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="gthumb.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/gthumb.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
-scrollkeeper-update
-update-desktop-database %{_datadir}/applications
+scrollkeeper-update -q
+update-desktop-database -q
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -97,6 +106,7 @@
 %{_datadir}/application-registry
 %{_datadir}/man/man*/*
 %{_datadir}/omf
+%{_datadir}/icons/hicolor/*
 
 %changelog
 * Thu Apr 20 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.6-2  



From fedora-cvs-commits at redhat.com  Thu Apr 20 16:49:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 12:49:21 -0400
Subject: rpms/system-config-printer/devel .cvsignore, 1.59, 1.60 sources,
	1.62, 1.63 system-config-printer.spec, 1.4,
	1.5 pycups-threads.patch, 1.1, NONE
Message-ID: <200604201649.k3KGnLCA004209@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore sources system-config-printer.spec 
Removed Files:
	pycups-threads.patch 
Log Message:
* Thu Apr 20 2006 Tim Waugh <twaugh at redhat.com>
- Updated to pycups-1.9.8.  No longer need threads patch.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	15 Apr 2006 19:11:03 -0000	1.59
+++ .cvsignore	20 Apr 2006 16:49:19 -0000	1.60
@@ -39,3 +39,4 @@
 printconf-0.6.151.tar.bz2
 system-config-printer-0.7.4.tar.bz2
 pycups-1.9.7.tar.bz2
+pycups-1.9.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	15 Apr 2006 19:11:05 -0000	1.62
+++ sources	20 Apr 2006 16:49:19 -0000	1.63
@@ -1,2 +1,2 @@
 360a4428142d4cde6366509878c5cb32  system-config-printer-0.7.4.tar.bz2
-6a77867eae1a07cc4b119f2af5824d23  pycups-1.9.7.tar.bz2
+ea37d221e78f39afc5ad04a67e9ee15b  pycups-1.9.8.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- system-config-printer.spec	15 Apr 2006 19:11:05 -0000	1.4
+++ system-config-printer.spec	20 Apr 2006 16:49:19 -0000	1.5
@@ -1,4 +1,4 @@
-%define pycups_version 1.9.7
+%define pycups_version 1.9.8
 
 Summary: A printer administration tool
 Name: system-config-printer
@@ -9,8 +9,6 @@
 Source0: system-config-printer-%{version}.tar.bz2
 Source1: pycups-%{pycups_version}.tar.bz2
 
-Patch0: pycups-threads.patch
-
 %{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
 
 BuildRequires: cups-devel, python-devel
@@ -28,9 +26,6 @@
 
 %prep
 %setup -q -a 1
-pushd pycups-%{pycups_version}
-%patch0 -p1 -b .threads
-popd
 
 %build
 pushd pycups-%{pycups_version}
@@ -62,6 +57,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Thu Apr 20 2006 Tim Waugh <twaugh at redhat.com>
+- Updated to pycups-1.9.8.  No longer need threads patch.
+
 * Sat Apr 15 2006 Tim Waugh <twaugh at redhat.com>
 - Updated to pycups-1.9.7.
 


--- pycups-threads.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 20 16:51:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 12:51:00 -0400
Subject: rpms/system-config-printer/devel .cvsignore, 1.60, 1.61 sources,
	1.63, 1.64 system-config-printer.spec, 1.5, 1.6
Message-ID: <200604201651.k3KGp0ZI004855@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore sources system-config-printer.spec 
Log Message:
* Thu Apr 20 2006 Tim Waugh <twaugh at redhat.com> 0.7.5-1
- Updated to pycups-1.9.8.  No longer need threads patch.
- Updated to system-config-printer-0.7.5.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	20 Apr 2006 16:49:19 -0000	1.60
+++ .cvsignore	20 Apr 2006 16:50:57 -0000	1.61
@@ -40,3 +40,4 @@
 system-config-printer-0.7.4.tar.bz2
 pycups-1.9.7.tar.bz2
 pycups-1.9.8.tar.bz2
+system-config-printer-0.7.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	20 Apr 2006 16:49:19 -0000	1.63
+++ sources	20 Apr 2006 16:50:57 -0000	1.64
@@ -1,2 +1,2 @@
-360a4428142d4cde6366509878c5cb32  system-config-printer-0.7.4.tar.bz2
 ea37d221e78f39afc5ad04a67e9ee15b  pycups-1.9.8.tar.bz2
+6b05814337b6de3d75dc449e95e0a871  system-config-printer-0.7.5.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- system-config-printer.spec	20 Apr 2006 16:49:19 -0000	1.5
+++ system-config-printer.spec	20 Apr 2006 16:50:57 -0000	1.6
@@ -2,8 +2,8 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.4
-Release: 2
+Version: 0.7.5
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source0: system-config-printer-%{version}.tar.bz2
@@ -57,8 +57,9 @@
 %{_datadir}/%{name}
 
 %changelog
-* Thu Apr 20 2006 Tim Waugh <twaugh at redhat.com>
+* Thu Apr 20 2006 Tim Waugh <twaugh at redhat.com> 0.7.5-1
 - Updated to pycups-1.9.8.  No longer need threads patch.
+- Updated to system-config-printer-0.7.5.
 
 * Sat Apr 15 2006 Tim Waugh <twaugh at redhat.com>
 - Updated to pycups-1.9.7.



From fedora-cvs-commits at redhat.com  Thu Apr 20 16:53:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 12:53:05 -0400
Subject: rpms/gnome-user-share/devel .cvsignore, 1.5,
	1.6 gnome-user-share.spec, 1.10, 1.11 sources, 1.5, 1.6
Message-ID: <200604201653.k3KGr5Xm005660@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-user-share/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5621

Modified Files:
	.cvsignore gnome-user-share.spec sources 
Log Message:
0.10



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-share/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	22 Nov 2005 11:57:11 -0000	1.5
+++ .cvsignore	20 Apr 2006 16:53:02 -0000	1.6
@@ -2,3 +2,4 @@
 gnome-user-share-0.7.tar.gz
 gnome-user-share-0.8.tar.gz
 gnome-user-share-0.9.tar.gz
+gnome-user-share-0.10.tar.bz2


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome-user-share.spec	1 Mar 2006 12:33:29 -0000	1.10
+++ gnome-user-share.spec	20 Apr 2006 16:53:02 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
-Version: 0.9
-Release: 3
+Version: 0.10
+Release: 2
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org
@@ -62,6 +62,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Thu Apr 20 2006 Matthias Clasen <mclasen at redhat.com> 0.10-2
+- Update to 0.10
+
 * Wed Mar 01 2006 Karsten Hopp <karsten at redhat.de> 0.9-3
 - BuildRequires: gtk2-devel, libglade2-devel, libselinux-devel
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-share/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Nov 2005 11:57:11 -0000	1.5
+++ sources	20 Apr 2006 16:53:02 -0000	1.6
@@ -1 +1 @@
-6255e3e43af31e244b04fce42a61039f  gnome-user-share-0.9.tar.gz
+66d60061041e668e6ec7334d081bfc13  gnome-user-share-0.10.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 20 16:58:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 12:58:49 -0400
Subject: rpms/gnome-user-share/devel gnome-user-share.spec,1.11,1.12
Message-ID: <200604201658.k3KGwnDc007998@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-user-share/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7934

Modified Files:
	gnome-user-share.spec 
Log Message:
update to 0.10



Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnome-user-share.spec	20 Apr 2006 16:53:02 -0000	1.11
+++ gnome-user-share.spec	20 Apr 2006 16:58:47 -0000	1.12
@@ -5,8 +5,7 @@
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org
-Source0: %{name}-%{version}.tar.gz
-Patch1: gnome-user-share-httpd-2.2.patch
+Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: httpd >= 2.2.0
 BuildRequires: GConf2-devel avahi-glib-devel >= 0.6 pkgconfig
@@ -21,7 +20,6 @@
 
 %prep
 %setup -q
-%patch1 -p0  -b .httpd-2.2
 
 %build
 %configure



From fedora-cvs-commits at redhat.com  Thu Apr 20 17:07:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 13:07:24 -0400
Subject: rpms/gnome-user-share/FC-5 gnome-user-share.spec, 1.11, 1.12 sources,
	1.5, 1.6
Message-ID: <200604201707.k3KH7Ofv008888@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-user-share/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8874

Modified Files:
	gnome-user-share.spec sources 
Log Message:
0.10



Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-share/FC-5/gnome-user-share.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnome-user-share.spec	19 Apr 2006 09:06:11 -0000	1.11
+++ gnome-user-share.spec	20 Apr 2006 17:07:21 -0000	1.12
@@ -1,13 +1,11 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
-Version: 0.9
-Release: 4
+Version: 0.10
+Release: 1.fc5.1
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org
-Source0: %{name}-%{version}.tar.gz
-Source1: %{name}-dav_groupfile
-Patch1: gnome-user-share-httpd-2.2.patch
+Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: httpd >= 2.2.0
 BuildRequires: GConf2-devel avahi-glib-devel >= 0.6 pkgconfig
@@ -18,14 +16,10 @@
 Prereq: GConf2
 
 %description
-This programm allows GNOME users to share the files in their ~/Public folder
-directly through the WebDAV protocol. The existence of the DAV services is
-automatically announced on the local IP subnet through Avahi.
-Access can be configured to be readonly, read-write and authenticated.
+gnome-user-share 
 
 %prep
 %setup -q
-%patch1 -p0  -b .httpd-2.2
 
 %build
 %configure
@@ -38,8 +32,6 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-install -c -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/dav_groupfile
-
 desktop-file-install --vendor gnome --delete-original                   \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications			        \
   --add-only-show-in GNOME                                              \
@@ -68,9 +60,8 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
-* Wed Apr 19 2006 Alexander Larsson <alexl at redhat.com> - 0.9-4
-- Fix http 2.2 patch for password authentication
-- Patch from Veit Wahlich <cru at zodia.de>
+* Thu Apr 20 2006 Matthias Clasen <mclasen at redhat.com> 0.10-1.fc5.1
+- Update to 0.10
 
 * Wed Mar 01 2006 Karsten Hopp <karsten at redhat.de> 0.9-3
 - BuildRequires: gtk2-devel, libglade2-devel, libselinux-devel


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-share/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Nov 2005 11:57:11 -0000	1.5
+++ sources	20 Apr 2006 17:07:21 -0000	1.6
@@ -1 +1 @@
-6255e3e43af31e244b04fce42a61039f  gnome-user-share-0.9.tar.gz
+66d60061041e668e6ec7334d081bfc13  gnome-user-share-0.10.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 20 17:15:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 13:15:14 -0400
Subject: rpms/gnome-vfs2/devel .cvsignore, 1.30, 1.31 gnome-vfs2.spec, 1.102,
	1.103 sources, 1.30, 1.31
Message-ID: <200604201715.k3KHFEtZ009746@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-vfs2.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	13 Mar 2006 13:48:56 -0000	1.30
+++ .cvsignore	20 Apr 2006 17:15:11 -0000	1.31
@@ -17,3 +17,4 @@
 gnome-vfs-2.13.91.tar.bz2
 gnome-vfs-2.13.92.tar.bz2
 gnome-vfs-2.14.0.tar.bz2
+gnome-vfs-2.14.1.tar.bz2


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- gnome-vfs2.spec	15 Mar 2006 19:05:11 -0000	1.102
+++ gnome-vfs2.spec	20 Apr 2006 17:15:11 -0000	1.103
@@ -10,7 +10,7 @@
 
 Summary: The GNOME virtual file-system libraries.
 Name: gnome-vfs2
-Version: 2.14.0
+Version: 2.14.1
 Release: 2
 License: LGPL
 Group: System Environment/Libraries
@@ -182,6 +182,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Thu Apr 20 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
+- update to 2.14.1
+
 * Wed Mar 15 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-2
 - don't try to install a schema we don't ship anymore (bug 185549)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	13 Mar 2006 13:48:56 -0000	1.30
+++ sources	20 Apr 2006 17:15:11 -0000	1.31
@@ -1 +1 @@
-f45ff7d95f7adf49d5abe13f744f5545  gnome-vfs-2.14.0.tar.bz2
+d7ba7e667b46b5929b3e277a8b870868  gnome-vfs-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 20 17:15:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 13:15:19 -0400
Subject: rpms/pygtk2/FC-5 .cvsignore, 1.24, 1.25 pygtk.spec, 1.45,
	1.46 sources, 1.24, 1.25
Message-ID: <200604201715.k3KHFJBY009779@cvs.devel.redhat.com>

Author: johnp

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

Modified Files:
	.cvsignore pygtk.spec sources 
Log Message:
- update to upstrwam 2.8.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/FC-5/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	16 Jan 2006 01:34:07 -0000	1.24
+++ .cvsignore	20 Apr 2006 17:15:14 -0000	1.25
@@ -2,3 +2,4 @@
 pygtk-2.8.0.tar.bz2
 pygtk-2.8.2.tar.bz2
 pygtk-2.8.4.tar.bz2
+pygtk-2.8.6.tar.bz2


Index: pygtk.spec
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/FC-5/pygtk.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- pygtk.spec	7 Feb 2006 13:38:49 -0000	1.45
+++ pygtk.spec	20 Apr 2006 17:15:14 -0000	1.46
@@ -2,8 +2,8 @@
 
 Summary: Python bindings for the GTK+ widget set.
 Name: pygtk2
-Version: 2.8.4
-Release: 1.1
+Version: 2.8.6
+Release: 0.fc5.1 
 License: LGPL
 Group: Development/Languages
 Source: ftp://ftp.gtk.org/pub/gtk/python/pygtk-%{version}.tar.bz2
@@ -109,6 +109,9 @@
 %{_prefix}/share/pygtk/2.0/defs/pangocairo.override
 
 %changelog
+* Thu Apr 20 2006 John (J5) Palmieri <johnp at redhat.com> - 2.8.6-0.fc5.1
+- Update to upstream 2.8.6
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.8.4-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/FC-5/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	16 Jan 2006 01:34:08 -0000	1.24
+++ sources	20 Apr 2006 17:15:14 -0000	1.25
@@ -1 +1 @@
-bc82fdb458754feef2336d5fe9b31370  pygtk-2.8.4.tar.bz2
+c69c2e5e86a8f21a5773df20e265fc3a  pygtk-2.8.6.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 20 17:22:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 13:22:42 -0400
Subject: rpms/kernel/devel linux-2.6-xen.patch,1.11,1.12
Message-ID: <200604201722.k3KHMgE3026548@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	linux-2.6-xen.patch 
Log Message:
rebase with linux-2.6.tip-xen cset 27368

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   99 
 arch/i386/Kconfig.cpu                               |    2 
 arch/i386/Kconfig.debug                             |    1 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   30 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1170 ++++++++
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    5 
 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                        |  880 ++++++
 arch/i386/kernel/entry.S                            |    4 
 arch/i386/kernel/fixup.c                            |   96 
 arch/i386/kernel/head-xen.S                         |  171 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2744 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  122 
 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                      | 1176 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  344 ++
 arch/i386/kernel/process-xen.c                      |  824 ++++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1854 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  613 ++++
 arch/i386/kernel/swiotlb.c                          |  674 ++++
 arch/i386/kernel/sysenter.c                         |   90 
 arch/i386/kernel/time-xen.c                         | 1097 +++++++
 arch/i386/kernel/traps-xen.c                        | 1137 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/vm86.c                             |    8 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/kernel/vsyscall.S                         |    2 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |   49 
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  683 ++++
 arch/i386/mm/highmem-xen.c                          |  123 
 arch/i386/mm/hypervisor.c                           |  424 +++
 arch/i386/mm/init-xen.c                             |  882 ++++++
 arch/i386/mm/ioremap-xen.c                          |  486 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  652 ++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  441 +++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1205 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   51 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/sal.c                              |    3 
 arch/ia64/kernel/setup.c                            |   32 
 arch/ia64/xen/Makefile                              |    5 
 arch/ia64/xen/drivers/Makefile                      |   20 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/drivers/coreMakefile                  |   26 
 arch/ia64/xen/drivers/evtchn_ia64.c                 |  273 +
 arch/ia64/xen/drivers/patches/blkback.c.patch       |   33 
 arch/ia64/xen/drivers/patches/console.c.patch       |   11 
 arch/ia64/xen/drivers/patches/devmem.c.patch        |    2 
 arch/ia64/xen/drivers/patches/gnttab.c.patch        |   33 
 arch/ia64/xen/drivers/patches/privcmd.c.patch       |   30 
 arch/ia64/xen/drivers/xenia64_init.c                |   55 
 arch/ia64/xen/hypercall.S                           |  365 ++
 arch/ia64/xen/xen_ksyms.c                           |   12 
 arch/ia64/xen/xenconsole.c                          |   19 
 arch/ia64/xen/xenentry.S                            |  850 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2032 ++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  367 ++
 arch/ia64/xen/xenpal.S                              |   73 
 arch/ia64/xen/xensetup.S                            |   35 
 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                    |  725 +++++
 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                         |   20 
 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                       |  777 +++++
 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                       |  163 +
 arch/x86_64/kernel/head64-xen.c                     |  140 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2231 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   58 
 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                    | 1002 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  802 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1679 ++++++++++++
 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                      | 1025 +++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/x8664_ksyms-xen.c                |  155 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  644 ++++
 arch/x86_64/mm/init-xen.c                           | 1176 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  390 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   14 
 drivers/char/tpm/Makefile                           |    1 
 drivers/char/tpm/tpm.c                              |   44 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_atmel.c                        |  230 -
 drivers/char/tpm/tpm_nsc.c                          |  395 --
 drivers/char/tpm/tpm_xen.c                          |  536 +++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/pci/Kconfig                                 |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/video/Kconfig                               |    2 
 drivers/xen/Kconfig                                 |  223 +
 drivers/xen/Makefile                                |   22 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  592 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  597 ++++
 drivers/xen/blkback/common.h                        |  145 +
 drivers/xen/blkback/interface.c                     |  181 +
 drivers/xen/blkback/vbd.c                           |  126 
 drivers/xen/blkback/xenbus.c                        |  421 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  819 +++++
 drivers/xen/blkfront/block.h                        |  165 +
 drivers/xen/blkfront/vbd.c                          |  327 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         |  910 ++++++
 drivers/xen/blktap/common.h                         |  110 
 drivers/xen/blktap/interface.c                      |  143 +
 drivers/xen/blktap/xenbus.c                         |  233 +
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  192 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  648 ++++
 drivers/xen/console/xencons_ring.c                  |  151 +
 drivers/xen/core/Makefile                           |   11 
 drivers/xen/core/evtchn.c                           |  867 ++++++
 drivers/xen/core/features.c                         |   29 
 drivers/xen/core/gnttab.c                           |  471 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   57 
 drivers/xen/core/reboot.c                           |  381 ++
 drivers/xen/core/skbuff.c                           |  144 +
 drivers/xen/core/smpboot.c                          |  576 ++++
 drivers/xen/core/xen_proc.c                         |   29 
 drivers/xen/core/xen_sysfs.c                        |  311 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  464 +++
 drivers/xen/net_driver_util.c                       |   68 
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  133 
 drivers/xen/netback/interface.c                     |  328 ++
 drivers/xen/netback/loopback.c                      |  254 +
 drivers/xen/netback/netback.c                       |  864 ++++++
 drivers/xen/netback/xenbus.c                        |  366 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1522 +++++++++++
 drivers/xen/pciback/Makefile                        |   10 
 drivers/xen/pciback/conf_space.c                    |  345 ++
 drivers/xen/pciback/conf_space.h                    |   97 
 drivers/xen/pciback/conf_space_header.c             |  267 +
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  695 +++++
 drivers/xen/pciback/pciback.h                       |   78 
 drivers/xen/pciback/pciback_ops.c                   |   74 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  441 +++
 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                       |  303 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   91 
 drivers/xen/tpmback/interface.c                     |  192 +
 drivers/xen/tpmback/tpmback.c                       | 1055 +++++++
 drivers/xen/tpmback/xenbus.c                        |  329 ++
 drivers/xen/tpmfront/Makefile                       |    2 
 drivers/xen/tpmfront/tpmfront.c                     |  767 +++++
 drivers/xen/tpmfront/tpmfront.h                     |   40 
 drivers/xen/util.c                                  |   80 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  165 +
 drivers/xen/xenbus/xenbus_client.c                  |  284 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  218 +
 drivers/xen/xenbus/xenbus_comms.h                   |   53 
 drivers/xen/xenbus/xenbus_dev.c                     |  255 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1093 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  856 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/a.out.h                            |    2 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/asm-offsets.h                      |   48 
 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         |  156 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   81 
 include/asm-i386/mach-xen/asm/hw_irq.h              |   73 
 include/asm-i386/mach-xen/asm/hypercall.h           |  357 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  224 +
 include/asm-i386/mach-xen/asm/io.h                  |  390 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 include/asm-i386/mach-xen/asm/mmu.h                 |   21 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  105 
 include/asm-i386/mach-xen/asm/page.h                |  326 ++
 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      |   85 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  183 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  520 +++
 include/asm-i386/mach-xen/asm/processor.h           |  756 +++++
 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              |  576 ++++
 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         |   54 
 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/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hypercall.h                        |  274 +
 include/asm-ia64/hypervisor.h                       |  138 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/pal.h                              |    1 
 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/fixmap.h            |  114 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  141 +
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  357 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  328 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   33 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  134 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 include/asm-x86_64/mach-xen/asm/page.h              |  317 ++
 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       |   41 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/mm.h                                  |   13 
 include/linux/pfn.h                                 |    2 
 include/linux/skbuff.h                              |   13 
 include/xen/balloon.h                               |   73 
 include/xen/driver_util.h                           |   26 
 include/xen/evtchn.h                                |  126 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   40 
 include/xen/gnttab.h                                |  160 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  181 +
 include/xen/interface/acm_ops.h                     |   98 
 include/xen/interface/arch-ia64.h                   |  337 ++
 include/xen/interface/arch-x86_32.h                 |  200 +
 include/xen/interface/arch-x86_64.h                 |  273 +
 include/xen/interface/callback.h                    |   57 
 include/xen/interface/dom0_ops.h                    |  531 +++
 include/xen/interface/event_channel.h               |  211 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  311 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   94 
 include/xen/interface/hvm/vmx_assist.h              |   97 
 include/xen/interface/io/blkif.h                    |   85 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |   84 
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  265 +
 include/xen/interface/io/tpmif.h                    |   56 
 include/xen/interface/io/xenbus.h                   |   42 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  155 +
 include/xen/interface/nmi.h                         |   59 
 include/xen/interface/physdev.h                     |   71 
 include/xen/interface/sched.h                       |  100 
 include/xen/interface/sched_ctl.h                   |   64 
 include/xen/interface/trace.h                       |   86 
 include/xen/interface/vcpu.h                        |  119 
 include/xen/interface/version.h                     |   64 
 include/xen/interface/xen-compat.h                  |   31 
 include/xen/interface/xen.h                         |  461 +++
 include/xen/interface/xenoprof.h                    |   91 
 include/xen/net_driver_util.h                       |   58 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |  101 
 include/xen/public/privcmd.h                        |   94 
 include/xen/tpmfe.h                                 |   40 
 include/xen/xen_proc.h                              |   23 
 include/xen/xenbus.h                                |  306 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/irq/manage.c                                 |   24 
 lib/Kconfig.debug                                   |   31 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  116 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   51 
 net/core/skbuff.c                                   |   41 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    9 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |   12 
 scripts/Makefile.xen                                |   14 
 389 files changed, 80372 insertions(+), 856 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.11 -r 1.12 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6-xen.patch	19 Apr 2006 03:45:17 -0000	1.11
+++ linux-2.6-xen.patch	20 Apr 2006 17:22:37 -0000	1.12
@@ -1,7 +1,32 @@
-diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff src/linux-2.6.17-rc1/arch/i386/Kconfig tip2/arch/i386/Kconfig
---- src/linux-2.6.17-rc1/arch/i386/Kconfig	2006-04-12 22:59:33.000000000 +0200
-+++ tip2/arch/i386/Kconfig	2006-04-10 15:29:39.000000000 +0200
-@@ -62,6 +62,15 @@ config X86_PC
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --exclude=.hg ../hg/linux-2.6/arch/i386/boot-xen/Makefile i386/arch/i386/boot-xen/Makefile
+--- ../hg/linux-2.6/arch/i386/boot-xen/Makefile	1969-12-31 19:00:00.000000000 -0500
++++ i386/arch/i386/boot-xen/Makefile	2006-04-20 07:09:43.000000000 -0400
+@@ -0,0 +1,21 @@
++
++OBJCOPYFLAGS := -g --strip-unneeded
++
++vmlinuz: vmlinux-stripped FORCE
++	$(call if_changed,gzip)
++
++vmlinux-stripped: vmlinux FORCE
++	$(call if_changed,objcopy)
++
++INSTALL_ROOT := $(patsubst %/boot,%,$(INSTALL_PATH))
++
++XINSTALL_NAME ?= $(KERNELRELEASE)
++install:
++	mkdir -p $(INSTALL_ROOT)/boot
++	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
++	rm -f $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
++	install -m0644 vmlinuz $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
++	install -m0644 vmlinux $(INSTALL_ROOT)/boot/vmlinux-syms-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
++	install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
++	install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
++	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --exclude=.hg ../hg/linux-2.6/arch/i386/Kconfig i386/arch/i386/Kconfig
+--- ../hg/linux-2.6/arch/i386/Kconfig	2006-04-17 13:34:05.000000000 -0400
++++ i386/arch/i386/Kconfig	2006-04-20 07:09:43.000000000 -0400
+@@ -91,6 +91,15 @@ config X86_PC
  	help
  	  Choose this option if your computer is a standard PC or compatible.
  
@@ -17,7 +42,7 @@
  config X86_ELAN
  	bool "AMD Elan"
  	help
-@@ -164,6 +173,7 @@ source "arch/i386/Kconfig.cpu"
+@@ -193,6 +202,7 @@ source "arch/i386/Kconfig.cpu"
  
  config HPET_TIMER
  	bool "HPET Timer Support"
@@ -110,7 +135,7 @@
  source "drivers/firmware/Kconfig"
  
  choice
-@@ -572,7 +593,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
+@@ -578,7 +599,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
  
  config HIGHPTE
  	bool "Allocate 3rd-level pagetables from highmem"
@@ -119,7 +144,7 @@
  	help
  	  The VM uses one page table entry for each page of physical memory.
  	  For systems with a lot of RAM, this can be wasteful of precious
-@@ -581,6 +602,7 @@ config HIGHPTE
+@@ -587,6 +608,7 @@ config HIGHPTE
  
  config MATH_EMULATION
  	bool "Math emulation"
@@ -127,7 +152,7 @@
  	---help---
  	  Linux can emulate a math coprocessor (used for floating point
  	  operations) if you don't have one. 486DX and Pentium processors have
-@@ -606,6 +628,8 @@ config MATH_EMULATION
+@@ -612,6 +634,8 @@ config MATH_EMULATION
  
  config MTRR
  	bool "MTRR (Memory Type Range Register) support"
@@ -136,7 +161,7 @@
  	---help---
  	  On Intel P6 family processors (Pentium Pro, Pentium II and later)
  	  the Memory Type Range Registers (MTRRs) may be used to control
-@@ -640,7 +664,7 @@ config MTRR
+@@ -646,7 +670,7 @@ config MTRR
  
  config EFI
  	bool "Boot from EFI support (EXPERIMENTAL)"
@@ -145,7 +170,7 @@
  	default n
  	---help---
  	This enables the the kernel to boot on EFI platforms using
-@@ -658,7 +682,7 @@ config EFI
+@@ -664,7 +688,7 @@ config EFI
  
  config IRQBALANCE
   	bool "Enable kernel irq balancing"
@@ -154,7 +179,7 @@
  	default y
  	help
   	  The default yes will allow the kernel to do irq load balancing.
-@@ -706,7 +730,7 @@ source kernel/Kconfig.hz
+@@ -712,7 +736,7 @@ source kernel/Kconfig.hz
  
  config KEXEC
  	bool "kexec system call (EXPERIMENTAL)"
@@ -163,7 +188,7 @@
  	help
  	  kexec is a system call that implements the ability to shutdown your
  	  current kernel, and to start another kernel.  It is like a reboot
-@@ -750,7 +774,7 @@ config PHYSICAL_START
+@@ -756,7 +780,7 @@ config PHYSICAL_START
  
  config HOTPLUG_CPU
  	bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
@@ -172,7 +197,7 @@
  	---help---
  	  Say Y here to experiment with turning CPUs off and on.  CPUs
  	  can be controlled through /sys/devices/system/cpu.
-@@ -770,18 +795,20 @@ endmenu
+@@ -767,18 +791,20 @@ endmenu
  
  
  menu "Power management options (ACPI, APM)"
@@ -196,7 +221,7 @@
  	---help---
  	  APM is a BIOS specification for saving power using several different
  	  techniques. This is mostly useful for battery powered laptops with
-@@ -966,6 +993,7 @@ choice
+@@ -963,6 +989,7 @@ choice
  
  config PCI_GOBIOS
  	bool "BIOS"
@@ -204,7 +229,7 @@
  
  config PCI_GOMMCONFIG
  	bool "MMConfig"
-@@ -973,6 +1001,13 @@ config PCI_GOMMCONFIG
+@@ -970,6 +997,13 @@ config PCI_GOMMCONFIG
  config PCI_GODIRECT
  	bool "Direct"
  
@@ -218,7 +243,7 @@
  config PCI_GOANY
  	bool "Any"
  
-@@ -980,7 +1015,7 @@ endchoice
+@@ -977,7 +1011,7 @@ endchoice
  
  config PCI_BIOS
  	bool
@@ -227,7 +252,7 @@
  	default y
  
  config PCI_DIRECT
-@@ -993,6 +1028,18 @@ config PCI_MMCONFIG
+@@ -990,6 +1024,18 @@ config PCI_MMCONFIG
  	depends on PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)
  	default y
  
@@ -246,7 +271,7 @@
  source "drivers/pci/pcie/Kconfig"
  
  source "drivers/pci/Kconfig"
-@@ -1003,7 +1050,7 @@ config ISA_DMA_API
+@@ -1000,7 +1046,7 @@ config ISA_DMA_API
  
  config ISA
  	bool "ISA support"
@@ -255,7 +280,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
-@@ -1030,7 +1077,7 @@ config EISA
+@@ -1027,7 +1073,7 @@ config EISA
  source "drivers/eisa/Kconfig"
  
  config MCA
@@ -264,7 +289,7 @@
  	default y if X86_VOYAGER
  	help
  	  MicroChannel Architecture is found in some IBM PS/2 machines and
-@@ -1092,6 +1139,8 @@ source "security/Kconfig"
+@@ -1089,6 +1135,8 @@ source "security/Kconfig"
  
  source "crypto/Kconfig"
  
@@ -273,7 +298,7 @@
  source "lib/Kconfig"
  
  #
-@@ -1117,7 +1166,7 @@ config X86_SMP
+@@ -1114,7 +1162,7 @@ config X86_SMP
  
  config X86_HT
  	bool
@@ -282,7 +307,7 @@
  	default y
[...11954 lines suppressed...]
 @@ -0,0 +1,14 @@
 +
 +# cherrypickxen($1 = allobj)
@@ -83950,196 +84515,3 @@
 +	  )
 +# filterxen($1 = allobj, $2 = noobjs)
 +filterxen = $(filter-out $(2), $(1))
-diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff src/linux-2.6.17-rc1/include/xen/interface/version.h tip2/include/xen/interface/version.h
---- src/linux-2.6.17-rc1/include/xen/interface/version.h	1970-01-01 01:00:00.000000000 +0100
-+++ tip2/include/xen/interface/version.h	2006-04-10 15:30:55.000000000 +0200
-@@ -0,0 +1,64 @@
-+/******************************************************************************
-+ * version.h
-+ * 
-+ * Xen version, type, and compile information.
-+ * 
-+ * Copyright (c) 2005, Nguyen Anh Quynh <aquynh at gmail.com>
-+ * Copyright (c) 2005, Keir Fraser <keir at xensource.com>
-+ */
-+
-+#ifndef __XEN_PUBLIC_VERSION_H__
-+#define __XEN_PUBLIC_VERSION_H__
-+
-+/* NB. All ops return zero on success, except XENVER_version. */
-+
-+/* arg == NULL; returns major:minor (16:16). */
-+#define XENVER_version      0
-+
-+/* arg == xen_extraversion_t. */
-+#define XENVER_extraversion 1
-+typedef char xen_extraversion_t[16];
-+#define XEN_EXTRAVERSION_LEN (sizeof(xen_extraversion_t))
-+
-+/* arg == xen_compile_info_t. */
-+#define XENVER_compile_info 2
-+typedef struct xen_compile_info {
-+    char compiler[64];
-+    char compile_by[16];
-+    char compile_domain[32];
-+    char compile_date[32];
-+} xen_compile_info_t;
-+
-+#define XENVER_capabilities 3
-+typedef char xen_capabilities_info_t[1024];
-+#define XEN_CAPABILITIES_INFO_LEN (sizeof(xen_capabilities_info_t))
-+
-+#define XENVER_changeset 4
-+typedef char xen_changeset_info_t[64];
-+#define XEN_CHANGESET_INFO_LEN (sizeof(xen_changeset_info_t))
-+
-+#define XENVER_platform_parameters 5
-+typedef struct xen_platform_parameters {
-+    unsigned long virt_start;
-+} xen_platform_parameters_t;
-+
-+#define XENVER_get_features 6
-+typedef struct xen_feature_info {
-+    unsigned int submap_idx;    /* IN: which 32-bit submap to return */
-+    uint32_t     submap;        /* OUT: 32-bit submap */
-+} xen_feature_info_t;
-+
-+/* Declares the features reported by XENVER_get_features. */
-+#include "features.h"
-+
-+#endif /* __XEN_PUBLIC_VERSION_H__ */
-+
-+/*
-+ * Local variables:
-+ * mode: C
-+ * c-set-style: "BSD"
-+ * c-basic-offset: 4
-+ * tab-width: 4
-+ * indent-tabs-mode: nil
-+ * End:
-+ */
-diff -uNp linux-2.6.16.noarch/arch/x86_64/Makefile.orig linux-2.6.16.noarch/arch/x86_64/Makefile
---- linux-2.6.16.noarch/arch/x86_64/Makefile.orig	2006-04-13 13:51:16.000000000 +0200
-+++ linux-2.6.16.noarch/arch/x86_64/Makefile	2006-04-13 13:46:18.000000000 +0200
-@@ -31,6 +31,10 @@ cflags-$(CONFIG_MK8) += $(call cc-option
- cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona)
- cflags-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=generic)
- 
-+cppflags-$(CONFIG_XEN) += \
-+	-D__XEN_INTERFACE_VERSION__=$(CONFIG_XEN_INTERFACE_VERSION)
-+CPPFLAGS += $(cppflags-y)
-+
- cflags-y += -m64
- cflags-y += -mno-red-zone
- cflags-y += -mcmodel=kernel
-@@ -72,6 +76,21 @@ boot := arch/x86_64/boot
- PHONY += bzImage bzlilo install archmrproper \
- 	 fdimage fdimage144 fdimage288 isoimage archclean
- 
-+ifdef CONFIG_XEN
-+CPPFLAGS := -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(CPPFLAGS)
-+head-y := arch/x86_64/kernel/head-xen.o arch/x86_64/kernel/head64-xen.o arch/x86_64/kernel/init_task.o
-+LDFLAGS_vmlinux := -e _start
-+boot := arch/i386/boot-xen
-+.PHONY: vmlinuz
-+#Default target when executing "make"
-+all: vmlinuz
-+
-+vmlinuz: vmlinux
-+	$(Q)$(MAKE) $(build)=$(boot) $@
-+
-+install:
-+	$(Q)$(MAKE) $(build)=$(boot) XENGUEST=$(XENGUEST) $@
-+else
- #Default target when executing "make"
- all: bzImage
- 
-@@ -92,6 +111,7 @@ fdimage fdimage144 fdimage288 isoimage: 
- 
- install:
- 	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@ 
-+endif
- 
- archclean:
- 	$(Q)$(MAKE) $(clean)=$(boot)
-diff -uNp linux-2.6.16.noarch/arch/x86_64/ia32/Makefile.orig linux-2.6.16.noarch/arch/x86_64/ia32/Makefile
---- linux-2.6.16.noarch/arch/x86_64/ia32/Makefile.orig	2006-04-13 13:51:34.000000000 +0200
-+++ linux-2.6.16.noarch/arch/x86_64/ia32/Makefile	2006-04-13 13:48:11.000000000 +0200
-@@ -26,12 +26,28 @@ quiet_cmd_syscall = SYSCALL $@
- 			   -Wl,-soname=linux-gate.so.1 -o $@ \
- 			   -Wl,-T,$(filter-out FORCE,$^)
- 
-+$(obj)/vsyscall-int80.so \
- $(obj)/vsyscall-sysenter.so $(obj)/vsyscall-syscall.so: \
- $(obj)/vsyscall-%.so: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE
- 	$(call if_changed,syscall)
- 
--AFLAGS_vsyscall-sysenter.o = -m32
--AFLAGS_vsyscall-syscall.o = -m32
-+AFLAGS_vsyscall-sysenter.o = -m32 -Iarch/i386/kernel
-+AFLAGS_vsyscall-syscall.o = -m32 -Iarch/i386/kernel
-+
-+ifdef CONFIG_XEN
-+AFLAGS_vsyscall-int80.o = -m32 -Iarch/i386/kernel
-+CFLAGS_syscall32-xen.o += -DUSE_INT80
-+AFLAGS_syscall32_syscall-xen.o += -DUSE_INT80
-+
-+$(obj)/syscall32_syscall-xen.o: \
-+	$(foreach F,int80 sysenter syscall,$(obj)/vsyscall-$F.so)
-+
-+targets := $(foreach F,int80 sysenter syscall,vsyscall-$F.o vsyscall-$F.so)
-+
-+include $(srctree)/scripts/Makefile.xen
-+
-+obj-y := $(call cherrypickxen, $(obj-y))
-+endif
- AFLAGS_syscall32_syscall.o += -m64
- AFLAGS_ia32entry.o += -m64
- 
-diff -uNp linux-2.6.16.noarch/arch/x86_64/kernel/Makefile.orig linux-2.6.16.noarch/arch/x86_64/kernel/Makefile
---- linux-2.6.16.noarch/arch/x86_64/kernel/Makefile.orig	2006-04-17 22:41:11.000000000 +0200
-+++ linux-2.6.16.noarch/arch/x86_64/kernel/Makefile	2006-04-17 22:35:26.000000000 +0200
-@@ -20,11 +20,13 @@ obj-$(CONFIG_MICROCODE)		+= microcode.o
- obj-$(CONFIG_X86_CPUID)		+= cpuid.o
- obj-$(CONFIG_SMP)		+= smp.o smpboot.o trampoline.o
- obj-$(CONFIG_X86_LOCAL_APIC)	+= apic.o  nmi.o
-+obj-$(CONFIG_X86_XEN_GENAPIC)	+= genapic.o genapic_xen.o
- obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o mpparse.o \
- 		genapic.o genapic_cluster.o genapic_flat.o
- obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o crash.o
- obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o
--obj-$(CONFIG_PM)		+= suspend.o
-+obj-$(CONFIG_SOFTWARE_SUSPEND)	+= suspend.o
-+obj-$(CONFIG_ACPI_SLEEP)	+= suspend.o
- obj-$(CONFIG_SOFTWARE_SUSPEND)	+= suspend_asm.o
- obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
- obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
-@@ -49,3 +51,18 @@ intel_cacheinfo-y		+= ../../i386/kernel/
- quirks-y			+= ../../i386/kernel/quirks.o
- i8237-y				+= ../../i386/kernel/i8237.o
- msr-$(subst m,y,$(CONFIG_X86_MSR))  += ../../i386/kernel/msr.o
-+
-+ifdef CONFIG_XEN
-+time-y				+= ../../i386/kernel/time-xen.o
-+pci-dma-y			+= ../../i386/kernel/pci-dma-xen.o
-+microcode-$(subst m,y,$(CONFIG_MICROCODE))  := ../../i386/kernel/microcode-xen.o
-+quirks-y			:= ../../i386/kernel/quirks-xen.o
-+
-+n-obj-xen := i8259.o reboot.o i8237.o smpboot.o trampoline.o
-+
-+include $(srctree)/scripts/Makefile.xen
-+
-+obj-y := $(call filterxen, $(obj-y), $(n-obj-xen))
-+obj-y := $(call cherrypickxen, $(obj-y))
-+extra-y := $(call cherrypickxen, $(extra-y))
-+endif
---- linux-2.6.16.noarch/arch/i386/Kconfig.debug~	2006-04-18 22:40:38.000000000 -0500
-+++ linux-2.6.16.noarch/arch/i386/Kconfig.debug	2006-04-18 22:41:11.000000000 -0500
-@@ -84,6 +84,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



From fedora-cvs-commits at redhat.com  Thu Apr 20 17:32:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 13:32:31 -0400
Subject: rpms/selinux-policy/devel policy-20060411.patch,1.8,1.9
Message-ID: <200604201732.k3KHWVnQ029532@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20060411.patch 
Log Message:
* Wed Apr 19 2006 Dan Walsh <dwalsh at redhat.com> 2.2.34-1
- Update to latest from upstream
- Allow selinux-policy to be removed and kernel not to crash


policy-20060411.patch:
 config/appconfig-strict-mls/default_type |    1 
 policy/modules/admin/netutils.te         |    2 -
 policy/modules/admin/usermanage.te       |    1 
 policy/modules/kernel/corecommands.fc    |    1 
 policy/modules/kernel/devices.if         |   20 +++++++++++++++++
 policy/modules/kernel/domain.te          |    1 
 policy/modules/kernel/files.if           |   35 +++++++++++++++++++++++++++++++
 policy/modules/kernel/kernel.te          |    1 
 policy/modules/kernel/terminal.if        |    2 -
 policy/modules/services/pegasus.te       |    8 +++++++
 policy/modules/services/samba.te         |    2 -
 policy/modules/system/authlogin.te       |    2 +
 policy/modules/system/init.te            |    1 
 policy/modules/system/libraries.fc       |   20 +++--------------
 policy/modules/system/logging.te         |    4 +--
 policy/modules/system/sysnetwork.te      |    2 +
 policy/modules/system/unconfined.if      |   18 +++++++++++++++
 policy/modules/system/userdomain.te      |   24 +++++++++++++++++++--
 policy/modules/system/xen.if             |   18 +++++++++++++++
 policy/modules/system/xen.te             |    1 
 policy/rolemap                           |    1 
 policy/users                             |    6 ++---
 22 files changed, 145 insertions(+), 26 deletions(-)

Index: policy-20060411.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060411.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- policy-20060411.patch	19 Apr 2006 17:37:38 -0000	1.8
+++ policy-20060411.patch	20 Apr 2006 17:31:38 -0000	1.9
@@ -1,6 +1,48 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/default_type serefpolicy-2.2.34/config/appconfig-strict-mls/default_type
+--- nsaserefpolicy/config/appconfig-strict-mls/default_type	2006-01-06 17:55:17.000000000 -0500
++++ serefpolicy-2.2.34/config/appconfig-strict-mls/default_type	2006-04-20 09:56:58.000000000 -0400
+@@ -2,3 +2,4 @@
+ secadm_r:secadm_t
+ staff_r:staff_t
+ user_r:user_t
++auditadm_r:auditadm_t
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.2.34/policy/modules/admin/netutils.te
+--- nsaserefpolicy/policy/modules/admin/netutils.te	2006-04-06 14:05:24.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/admin/netutils.te	2006-04-20 09:56:58.000000000 -0400
+@@ -97,7 +97,7 @@
+ 
+ allow ping_t self:tcp_socket create_socket_perms;
+ allow ping_t self:udp_socket create_socket_perms;
+-allow ping_t self:rawip_socket { create ioctl read write bind getopt setopt };
++allow ping_t self:{ rawip_socket packet_socket } { create ioctl read write bind getopt setopt };
+ 
+ corenet_tcp_sendrecv_all_if(ping_t)
+ corenet_udp_sendrecv_all_if(ping_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.2.34/policy/modules/admin/usermanage.te
+--- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-04-18 22:49:59.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/admin/usermanage.te	2006-04-20 12:49:39.000000000 -0400
+@@ -514,6 +514,7 @@
+ # Add/remove user home directories
+ userdom_home_filetrans_generic_user_home_dir(useradd_t)
+ userdom_manage_generic_user_home_content_dirs(useradd_t)
++userdom_manage_generic_user_home_content_files(useradd_t)
+ userdom_manage_staff_home_dirs(useradd_t)
+ userdom_generic_user_home_dir_filetrans_generic_user_home_content(useradd_t,notdevfile_class_set)
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.2.34/policy/modules/kernel/corecommands.fc
+--- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-04-18 22:49:59.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/kernel/corecommands.fc	2006-04-20 11:28:21.000000000 -0400
+@@ -177,6 +177,7 @@
+ ifdef(`distro_redhat', `
+ /usr/lib/.*/program(/.*)?		gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/authconfig/authconfig-gtk\.py -- gen_context(system_u:object_r:bin_t,s0)
++/usr/share/authconfig/authconfig-tui\.py -- gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/cvs/contrib/rcs2log	--	gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/hwbrowser/hwbrowser -- gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/pwlib/make/ptlib-config --	gen_context(system_u:object_r:bin_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.34/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2006-04-18 22:49:59.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/kernel/devices.if	2006-04-19 12:56:26.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/kernel/devices.if	2006-04-20 09:56:58.000000000 -0400
 @@ -2874,3 +2874,23 @@
  
  	typeattribute $1 devices_unconfined_type;
@@ -25,37 +67,21 @@
 +	dontaudit $1 device_node:dir_file_class_set getattr;
 +')
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-2.2.34/policy/modules/kernel/domain.te
+--- nsaserefpolicy/policy/modules/kernel/domain.te	2006-04-20 08:17:36.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/kernel/domain.te	2006-04-20 09:56:58.000000000 -0400
+@@ -96,6 +96,7 @@
+ 	# workaround until role dominance is fixed in
+ 	# the module compiler
+ 	role secadm_r types domain;
++	role auditadm_r types domain;
+ 	role sysadm_r types domain;
+ 	role user_r types domain;
+ 	role staff_r types domain;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.34/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-04-18 22:49:59.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/kernel/files.if	2006-04-19 12:56:26.000000000 -0400
-@@ -1268,6 +1268,26 @@
- 
- ########################################
- ## <summary>
-+##     Read kernel files in the /boot directory.
-+## </summary>
-+## <param name="domain">
-+##     <summary>
-+##     Domain allowed access.
-+##     </summary>
-+## </param>
-+#
-+interface(`files_read_kernel_img',`
-+       gen_require(`
-+               type boot_t;
-+       ')
-+
-+       allow $1 boot_t:dir r_dir_perms;
-+       allow $1 boot_t:file { getattr read };
-+       allow $1 boot_t:lnk_file { getattr read };
-+')
-+
-+########################################
-+## <summary>
- ##	Install a kernel into the /boot directory.
- ## </summary>
- ## <param name="domain">
-@@ -1679,6 +1699,21 @@
++++ serefpolicy-2.2.34/policy/modules/kernel/files.if	2006-04-20 12:16:18.000000000 -0400
+@@ -1679,6 +1679,21 @@
  ')
  
  ########################################
@@ -77,20 +103,56 @@
  ## <summary>
  ##	Read files in /etc that are dynamically
  ##	created on boot, such as mtab.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.34/policy/modules/kernel/mls.te
---- nsaserefpolicy/policy/modules/kernel/mls.te	2006-03-07 10:31:09.000000000 -0500
-+++ serefpolicy-2.2.34/policy/modules/kernel/mls.te	2006-04-19 12:56:26.000000000 -0400
-@@ -60,6 +60,7 @@
+@@ -3905,3 +3920,23 @@
+ 
+ 	typeattribute $1 files_unconfined_type;
+ ')
++
++########################################
++## <summary>
++##     Read kernel files in the /boot directory.
++## </summary>
++## <param name="domain">
++##     <summary>
++##     Domain allowed access.
++##     </summary>
++## </param>
++#
++interface(`files_read_kernel_img',`
++       gen_require(`
++               type boot_t;
++       ')
++
++       allow $1 boot_t:dir r_dir_perms;
++       allow $1 boot_t:file { getattr read };
++       allow $1 boot_t:lnk_file { getattr read };
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.2.34/policy/modules/kernel/kernel.te
+--- nsaserefpolicy/policy/modules/kernel/kernel.te	2006-04-18 22:49:59.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/kernel/kernel.te	2006-04-20 09:56:58.000000000 -0400
+@@ -28,6 +28,7 @@
  
  ifdef(`enable_mls',`
- range_transition initrc_t auditd_exec_t s15:c0.c255;
-+range_transition secadm_t auditctl_exec_t s15:c0.c255;
- range_transition kernel_t init_exec_t s0 - s15:c0.c255;
- range_transition kernel_t lvm_exec_t s0 - s15:c0.c255;
+ 	role secadm_r;
++	role auditadm_r;
  ')
+ 
+ #
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.2.34/policy/modules/kernel/terminal.if
+--- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-02-13 17:05:45.000000000 -0500
++++ serefpolicy-2.2.34/policy/modules/kernel/terminal.if	2006-04-20 09:56:58.000000000 -0400
+@@ -174,7 +174,7 @@
+ 	')
+ 
+ 	dev_list_all_dev_nodes($1)
+-	allow $1 console_device_t:chr_file write;
++	allow $1 console_device_t:chr_file { getattr write append };
+ ')
+ 
+ ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.34/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/services/pegasus.te	2006-04-19 12:56:26.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/services/pegasus.te	2006-04-20 09:56:58.000000000 -0400
 @@ -79,11 +79,16 @@
  corenet_tcp_connect_pegasus_https_port(pegasus_t)
  corenet_tcp_connect_generic_port(pegasus_t)
@@ -127,7 +189,7 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.34/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2006-04-19 12:23:07.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/services/samba.te	2006-04-19 12:56:26.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/services/samba.te	2006-04-20 09:56:58.000000000 -0400
 @@ -106,8 +106,8 @@
  files_tmp_filetrans(samba_net_t, samba_net_tmp_t, { file dir })
  
@@ -138,10 +200,22 @@
  
  kernel_read_proc_symlinks(samba_net_t)
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.34/policy/modules/system/authlogin.te
+--- nsaserefpolicy/policy/modules/system/authlogin.te	2006-04-19 12:23:07.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/authlogin.te	2006-04-20 13:08:28.000000000 -0400
+@@ -188,6 +188,8 @@
+ storage_setattr_scsi_generic_dev(pam_console_t)
+ 
+ term_use_console(pam_console_t)
++term_use_all_user_ttys(pam_console_t)
++term_use_all_user_ptys(pam_console_t)
+ term_setattr_console(pam_console_t)
+ term_getattr_unallocated_ttys(pam_console_t)
+ term_setattr_unallocated_ttys(pam_console_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.34/policy/modules/system/init.te
---- nsaserefpolicy/policy/modules/system/init.te	2006-04-18 22:50:00.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/system/init.te	2006-04-19 12:56:26.000000000 -0400
-@@ -352,6 +352,7 @@
+--- nsaserefpolicy/policy/modules/system/init.te	2006-04-20 08:17:40.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/init.te	2006-04-20 09:56:58.000000000 -0400
+@@ -348,6 +348,7 @@
  files_mounton_isid_type_dirs(initrc_t)
  files_list_default(initrc_t)
  files_mounton_default(initrc_t)
@@ -151,8 +225,39 @@
  libs_use_ld_so(initrc_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.34/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-04-19 12:23:07.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/system/libraries.fc	2006-04-19 12:56:29.000000000 -0400
-@@ -113,7 +113,7 @@
++++ serefpolicy-2.2.34/policy/modules/system/libraries.fc	2006-04-20 13:25:18.000000000 -0400
+@@ -66,13 +66,8 @@
+ 
+ /usr/(.*/)?nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+-/usr/lib(64)?/pgsql/test/regress/.*\.so	--	gen_context(system_u:object_r:shlib_t,s0)
+-
+ /usr/lib/win32/.*			--	gen_context(system_u:object_r:shlib_t,s0)
+ 
+-/usr/lib(64)?/im/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
+-/usr/lib(64)?/iiim/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
+-
+ /usr/(.*/)?lib(64)?(/.*)?/nvidia/.*\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libsipphoneapi\.so.*	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
+ /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -86,7 +81,6 @@
+ 
+ /usr/(local/)?lib(64)?/wine/.*\.so  		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/(local/)?lib/libfame-.*\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/usr/local/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
+ 
+ /usr/NX/lib/libXcomp.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/NX/lib/libjpeg.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -99,8 +93,6 @@
+ /usr/lib(64)?/xorg/modules/extensions/nvidia(-[^/]*)?/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+ ifdef(`distro_redhat',`
+-/usr/lib(64)?/.*/program/.*\.so.*		gen_context(system_u:object_r:shlib_t,s0)
+-/usr/share/rhn/rhn_applet/eggtrayiconmodule\.so -- gen_context(system_u:object_r:shlib_t,s0)
+ 
+ # The following are libraries with text relocations in need of execmod permissions
+ # Some of them should be fixed and removed from this list
+@@ -113,7 +105,7 @@
  /usr/lib(64)?/libstdc\+\+\.so\.2\.7\.2\.8 --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libg\+\+\.so\.2\.7\.2\.8	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libglide3\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -161,9 +266,50 @@
  /usr/lib(64)?/libdv\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/helix/plugins/oggfformat\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/helix/plugins/theorarend\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -198,16 +190,12 @@
+ /usr/(.*/)?jre.*/libdeploy.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/(.*/)?jre.*/libjvm.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+-/usr/(.*/)?intellinux/nppdf\.so		--	gen_context(system_u:object_r:texrel_shlib_t,s0)
+-/usr/(.*/)?intellinux/lib/\.so		--	gen_context(system_u:object_r:texrel_shlib_t,s0)
+-/usr/(.*/)?intellinux/plug_ins/.*\.api	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
++/usr/(local/)?Adobe/(.*/)?intellinux/nppdf\.so	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
++/usr/(local/)?Adobe/(.*/)?lib/[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:texrel_shlib_t,s0)
++/usr/(local/)?Adobe/.*\.api	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
+ /usr/(.*/)?intellinux/SPPlugins/ADMPlugin\.apl -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ ') dnl end distro_redhat
+ 
+-ifdef(`distro_suse',`
+-/usr/lib(64)?/samba/classic/[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:shlib_t,s0)
+-')
+-
+ #
+ # /var
+ #
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.2.34/policy/modules/system/logging.te
+--- nsaserefpolicy/policy/modules/system/logging.te	2006-04-06 15:32:43.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/logging.te	2006-04-20 11:57:49.000000000 -0400
+@@ -140,7 +140,7 @@
+ init_use_fds(auditd_t)
+ init_exec(auditd_t)
+ init_write_initctl(auditd_t)
+-init_use_script_ptys(auditd_t)
++init_dontaudit_use_script_ptys(auditd_t)
+ 
+ logging_send_syslog_msg(auditd_t)
+ 
+@@ -293,7 +293,7 @@
+ 
+ fs_search_auto_mountpoints(syslogd_t)
+ 
+-term_dontaudit_use_console(syslogd_t)
++term_write_console(syslogd_t)
+ # Allow syslog to a terminal
+ term_write_unallocated_ttys(syslogd_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.2.34/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2006-03-24 11:15:53.000000000 -0500
-+++ serefpolicy-2.2.34/policy/modules/system/sysnetwork.te	2006-04-19 12:56:26.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/sysnetwork.te	2006-04-20 09:56:58.000000000 -0400
 @@ -248,6 +248,7 @@
  
  optional_policy(`
@@ -180,7 +326,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.34/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-04-12 13:44:38.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/system/unconfined.if	2006-04-19 12:56:26.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/unconfined.if	2006-04-20 09:56:58.000000000 -0400
 @@ -224,6 +224,24 @@
  
  ########################################
@@ -206,20 +352,99 @@
  ##	Send generic signals to the unconfined domain.
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.34/policy/modules/system/userdomain.if
---- nsaserefpolicy/policy/modules/system/userdomain.if	2006-04-18 22:50:01.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/system/userdomain.if	2006-04-19 12:56:26.000000000 -0400
-@@ -4171,6 +4171,7 @@
- 		type user_home_dir_t;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.34/policy/modules/system/userdomain.te
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2006-04-20 08:17:40.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/userdomain.te	2006-04-20 10:08:22.000000000 -0400
+@@ -6,6 +6,7 @@
+ 
+ 	ifdef(`enable_mls',`
+ 		role secadm_r;
++		role auditadm_r;
  	')
- 
-+	allow $1 user_home_dir_t:dir create_dir_perms;
- 	files_home_filetrans($1,user_home_dir_t,dir)
  ')
  
+@@ -67,6 +68,7 @@
+ 	# Define some type aliases to help with compatibility with
+ 	# macros and domains from the "strict" policy.
+ 	unconfined_alias_domain(secadm_t)
++	unconfined_alias_domain(auditadm_t)
+ 	unconfined_alias_domain(sysadm_t)
+ 
+ 	# User home directory type.
+@@ -82,6 +84,7 @@
+ 
+ 	# compatibility for switching from strict
+ #	dominance { role secadm_r { role system_r; }}
++#	dominance { role auditadm_r { role system_r; }}
+ #	dominance { role sysadm_r { role system_r; }}
+ #	dominance { role user_r { role system_r; }}
+ #	dominance { role staff_r { role system_r; }}
+@@ -105,9 +108,10 @@
+ 
+ 	ifdef(`enable_mls',`
+ 		allow secadm_r system_r;
++		allow auditadm_r system_r;
+ 		allow secadm_r user_r;
+-		allow user_r secadm_r;
+ 		allow staff_r secadm_r;
++		allow staff_r auditadm_r;
+ 	')
+ 
+ 	optional_policy(`
+@@ -128,8 +132,19 @@
+ 
+ 	ifdef(`enable_mls',`
+ 		admin_user_template(secadm)
++		admin_user_template(auditadm)
++
++		role_change(staff,auditadm)
+ 		role_change(staff,secadm)
++
+ 		role_change(sysadm,secadm)
++		role_change(sysadm,auditadm)
++
++		role_change(auditadm,secadm)
++		role_change(auditadm,sysadm)
++
++		role_change(secadm,auditadm)
++		role_change(secadm,sysadm)
+ 	')
+ 
+ 	# this should be tunable_policy, but
+@@ -179,10 +194,13 @@
+ 		mls_file_downgrade(secadm_t)
+ 		init_exec(secadm_t)
+ 		logging_read_audit_log(secadm_t)
+-		logging_run_auditctl(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
+ 		userdom_dontaudit_append_staff_home_content_files(secadm_t)
+ 		files_relabel_all_files(secadm_t)
+ 		auth_relabel_shadow(secadm_t)
++
++		corecmd_exec_shell(auditadm_t)
++		logging_read_audit_log(auditadm_t)
++		logging_run_auditctl(auditadm_t,auditadm_r,{ auditadm_tty_device_t auditadm_devpts_t })
+ 	', `
+ 		logging_read_audit_log(sysadm_t)
+ 		logging_run_auditctl(sysadm_t,sysadm_r,admin_terminal)
+@@ -236,6 +254,7 @@
+ 
+ 		ifdef(`enable_mls',`
+ 			consoletype_exec(secadm_t)
++			consoletype_exec(auditadm_t)
+ 		')
+ 	')
+ 
+@@ -248,6 +267,7 @@
+ 
+ 		ifdef(`enable_mls',`
+ 			dmesg_exec(secadm_t)
++			dmesg_exec(auditadm_t)
+ 		')
+ 	')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.2.34/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2006-03-23 16:08:51.000000000 -0500
-+++ serefpolicy-2.2.34/policy/modules/system/xen.if	2006-04-19 12:56:26.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/xen.if	2006-04-20 09:56:58.000000000 -0400
 @@ -47,6 +47,24 @@
  
  ########################################
@@ -247,7 +472,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.2.34/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-04-18 22:50:01.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/system/xen.te	2006-04-19 12:56:26.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/xen.te	2006-04-20 09:56:58.000000000 -0400
 @@ -125,6 +125,7 @@
  
  files_read_etc_files(xend_t)
@@ -256,3 +481,36 @@
  
  storage_raw_read_fixed_disk(xend_t)
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/rolemap serefpolicy-2.2.34/policy/rolemap
+--- nsaserefpolicy/policy/rolemap	2006-01-26 15:38:41.000000000 -0500
++++ serefpolicy-2.2.34/policy/rolemap	2006-04-20 09:56:58.000000000 -0400
+@@ -15,5 +15,6 @@
+ 
+ 	ifdef(`enable_mls',`
+ 		secadm_r secadm secadm_t
++		auditadm_t auditadm auditadm_t
+ 	')
+ ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.2.34/policy/users
+--- nsaserefpolicy/policy/users	2006-02-15 17:02:30.000000000 -0500
++++ serefpolicy-2.2.34/policy/users	2006-04-20 11:21:04.000000000 -0400
+@@ -29,7 +29,7 @@
+ gen_user(user_u, user, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255)
+ ',`
+ gen_user(user_u, user, user_r, s0, s0)
+-gen_user(staff_u, staff, staff_r sysadm_r ifdef(`enable_mls',`secadm_r'), s0, s0 - s15:c0.c255, c0.c255)
++gen_user(staff_u, staff, staff_r sysadm_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - s15:c0.c255, c0.c255)
+ gen_user(sysadm_u, sysadm, sysadm_r, s0, s0 - s15:c0.c255, c0.c255)
+ ')
+ 
+@@ -44,8 +44,8 @@
+ 	gen_user(root, user, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255)
+ ',`
+ 	ifdef(`direct_sysadm_daemon',`
+-		gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r') system_r, s0, s0 - s15:c0.c255, c0.c255)
++		gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - s15:c0.c255, c0.c255)
+ 	',`
+-		gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r'), s0, s0 - s15:c0.c255, c0.c255)
++		gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - s15:c0.c255, c0.c255)
+ 	')
+ ')



From fedora-cvs-commits at redhat.com  Thu Apr 20 17:43:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 13:43:22 -0400
Subject: rpms/selinux-policy/devel .cvsignore,1.57,1.58 sources,1.61,1.62
Message-ID: <200604201743.k3KHhMwq031113@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore sources 
Log Message:
* Wed Apr 19 2006 Dan Walsh <dwalsh at redhat.com> 2.2.34-1
- Update to latest from upstream
- Allow selinux-policy to be removed and kernel not to crash



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	19 Apr 2006 12:10:10 -0000	1.57
+++ .cvsignore	20 Apr 2006 17:43:20 -0000	1.58
@@ -58,3 +58,4 @@
 serefpolicy-2.2.31.tgz
 serefpolicy-2.2.32.tgz
 serefpolicy-2.2.33.tgz
+serefpolicy-2.2.34.tgz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	19 Apr 2006 12:10:10 -0000	1.61
+++ sources	20 Apr 2006 17:43:20 -0000	1.62
@@ -1 +1 @@
-0bbd9672d8ecd25b79dfd28adbc9b5e2  serefpolicy-2.2.33.tgz
+5c1fa51a13bdb35dcf053a9b68072ff5  serefpolicy-2.2.34.tgz



From fedora-cvs-commits at redhat.com  Thu Apr 20 18:49:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 14:49:32 -0400
Subject: rpms/tcl/devel tcl-8.4.13-autoconf.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 sources, 1.9, 1.10 tcl.spec, 1.19,
	1.20 tcl-8.4-autoconf.patch, 1.3, NONE tcl-8.4.12-relid.patch,
	1.1, NONE
Message-ID: <200604201849.k3KInW9c009179@cvs.devel.redhat.com>

Author: dcantrel

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

Modified Files:
	.cvsignore sources tcl.spec 
Added Files:
	tcl-8.4.13-autoconf.patch 
Removed Files:
	tcl-8.4-autoconf.patch tcl-8.4.12-relid.patch 
Log Message:
Upgraded to tcl-8.4.13.


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

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


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


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


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


--- tcl-8.4-autoconf.patch DELETED ---


--- tcl-8.4.12-relid.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 20 19:08:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 15:08:13 -0400
Subject: rpms/tk/devel tk-8.4.13-autoconf.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 sources, 1.9, 1.10 tk.spec, 1.19,
	1.20 tk-8.4-autoconf.patch, 1.1, NONE tk-8.4.12-relid.patch,
	1.1, NONE
Message-ID: <200604201908.k3KJ8DgL013611@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/tk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13583

Modified Files:
	.cvsignore sources tk.spec 
Added Files:
	tk-8.4.13-autoconf.patch 
Removed Files:
	tk-8.4-autoconf.patch tk-8.4.12-relid.patch 
Log Message:
Upgraded to Tk 8.4.13


tk-8.4.13-autoconf.patch:
 tcl.m4 |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE tk-8.4.13-autoconf.patch ---
--- tk8.4.13/unix/tcl.m4.ac123	2006-04-20 14:53:21.000000000 -0400
+++ tk8.4.13/unix/tcl.m4	2006-04-20 14:54:35.000000000 -0400
@@ -1123,7 +1123,7 @@
 
 	    # AIX v<=4.1 has some different flags than 4.2+
 	    if test "$system" = "AIX-4.1" -o "`uname -v`" -lt "4" ; then
-		LIBOBJS="$LIBOBJS tclLoadAix.o"
+		AC_LIBOBJ(tclLoadAix)
 		DL_LIBS="-lld"
 	    fi
 
@@ -1365,7 +1365,7 @@
 	    # is kind of overkill but it works.
 	    # Disable inlining only when one of the
 	    # files in compat/*.c is being linked in.
-	    if test x"${LIBOBJS}" != x ; then
+	    if test x"${LIB@&t at OBJS}" != x ; then
 	        CFLAGS="$CFLAGS -fno-inline"
 	    fi
 
@@ -2571,7 +2571,7 @@
 		}], tcl_cv_strtod_buggy=ok, tcl_cv_strtod_buggy=buggy,
 		    tcl_cv_strtod_buggy=buggy)])
 	if test "$tcl_cv_strtod_buggy" = buggy; then
-	    LIBOBJS="$LIBOBJS fixstrtod.o"
+	    AC_LIBOBJ(fixstrtod)
 	    AC_DEFINE(strtod, fixstrtod)
 	fi
     fi


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tk/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	2 Feb 2006 18:08:10 -0000	1.8
+++ .cvsignore	20 Apr 2006 19:07:51 -0000	1.9
@@ -1,2 +1,3 @@
 tk8.4.11-src.tar.gz
 tk8.4.12-src.tar.gz
+tk8.4.13-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tk/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	2 Feb 2006 18:10:20 -0000	1.9
+++ sources	20 Apr 2006 19:07:58 -0000	1.10
@@ -1 +1 @@
-316491cb82d898b434842353aed1f0d6  tk8.4.12-src.tar.gz
+0a16d4d9398e43cbb85784c85fb807a4  tk8.4.13-src.tar.gz


Index: tk.spec
===================================================================
RCS file: /cvs/dist/rpms/tk/devel/tk.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- tk.spec	11 Feb 2006 05:52:13 -0000	1.19
+++ tk.spec	20 Apr 2006 19:07:58 -0000	1.20
@@ -2,8 +2,8 @@
 
 Summary: Tk graphical toolkit for the Tcl scripting language
 Name: tk
-Version: %{majorver}.12
-Release: 1.2
+Version: %{majorver}.13
+Release: 1
 License: BSD
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
@@ -18,8 +18,7 @@
 Patch1: tk-8.3.5-tclm4-soname.patch
 Patch2: tk-8.4.4-lib-perm.patch
 Patch3: tk-8.4-no_rpath.patch
-Patch4: tk-8.4-autoconf.patch
-Patch5: tk-8.4.12-relid.patch
+Patch4: tk-8.4.13-autoconf.patch
 
 %description
 When paired with the Tcl scripting language, Tk provides a fast and powerful
@@ -46,7 +45,6 @@
 %patch2 -p1 -b .2-rolib
 %patch3 -p1 -b .3-rpath
 %patch4 -p1 -b .4-ac213
-%patch5 -p1 -b .5-relid
 
 # patch1 touches tcl.m4
 cd unix
@@ -117,6 +115,9 @@
 %{_mandir}/mann/*
 
 %changelog
+* Thu Apr 20 2006 David Cantrell <dcantrell at redhat.com> - 8.4.13-1
+- Upgraded to Tk 8.4.13
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 8.4.12-1.2
 - bump again for double-long bug on ppc(64)
 


--- tk-8.4-autoconf.patch DELETED ---


--- tk-8.4.12-relid.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 20 19:11:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 15:11:29 -0400
Subject: rpms/tclx/devel tclx.spec,1.11,1.12
Message-ID: <200604201911.k3KJBT1g014241@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/tclx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14142

Modified Files:
	tclx.spec 
Log Message:
Rebuild against Tcl/Tk 8.4.13



Index: tclx.spec
===================================================================
RCS file: /cvs/dist/rpms/tclx/devel/tclx.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tclx.spec	11 Feb 2006 05:47:56 -0000	1.11
+++ tclx.spec	20 Apr 2006 19:11:26 -0000	1.12
@@ -1,10 +1,10 @@
 %define major_ver 8.4
-%define tcltk_ver 8.4.12
+%define tcltk_ver 8.4.13
 
 Summary: Extensions for Tcl and Tk
 Name: tclx
 Version: %{major_ver}.0
-Release: 1.2
+Release: 2
 License: BSD
 Group: Development/Languages
 URL: http://tclx.sourceforge.net/
@@ -106,6 +106,9 @@
 %{_mandir}/man*
 
 %changelog
+* Thu Apr 20 2006 David Cantrell <dcantrell at redhat.com> - 8.4.0-2
+- Rebuild against Tcl/Tk 8.4.13
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 8.4.0-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Thu Apr 20 19:13:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 15:13:17 -0400
Subject: rpms/tix/devel tix.spec,1.14,1.15
Message-ID: <200604201913.k3KJDH40014820@cvs.devel.redhat.com>

Author: dcantrel

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

Modified Files:
	tix.spec 
Log Message:
Rebuild against Tcl/Tk 8.4.13



Index: tix.spec
===================================================================
RCS file: /cvs/dist/rpms/tix/devel/tix.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- tix.spec	3 Apr 2006 17:35:11 -0000	1.14
+++ tix.spec	20 Apr 2006 19:13:13 -0000	1.15
@@ -1,11 +1,11 @@
 %define tixmajor 8.4
-%define tcltkver 8.4.12
+%define tcltkver 8.4.13
 
 Summary: A set of extension widgets for Tk
 Name: tix
 Epoch: 1
 Version: %{tixmajor}.0
-Release: 7
+Release: 8
 License: BSD
 Group: Development/Languages
 URL: http://tix.sourceforge.net/
@@ -125,6 +125,9 @@
 %doc docs/*
 
 %changelog
+* Thu Apr 20 2006 David Cantrell <dcantrell at redhat.com> - 1:8.4.0-8
+- Rebuild against Tcl/Tk 8.4.13
+
 * Mon Apr 03 2006 David Cantrell <dcantrell at redhat.com> - 1:8.4.0-7
 - libTix8.4.so shared lib placement fixup (#187739)
 



From fedora-cvs-commits at redhat.com  Thu Apr 20 19:33:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 15:33:03 -0400
Subject: rpms/selinux-policy/devel policy-20060411.patch, 1.9,
	1.10 selinux-policy.spec, 1.177, 1.178
Message-ID: <200604201933.k3KJX39J002182@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20060411.patch selinux-policy.spec 
Log Message:
* Thu Apr 20 2006 Dan Walsh <dwalsh at redhat.com> 2.2.34-2
- Allow procmail to sendmail
- Allow nfs to share dosfs


policy-20060411.patch:
 config/appconfig-strict-mls/default_type |    1 
 policy/modules/admin/netutils.te         |    2 -
 policy/modules/admin/usermanage.te       |    1 
 policy/modules/kernel/corecommands.fc    |    1 
 policy/modules/kernel/domain.te          |    1 
 policy/modules/kernel/files.if           |   35 +++++++++++++++++++++++++++++++
 policy/modules/kernel/filesystem.if      |    6 ++---
 policy/modules/kernel/kernel.te          |    1 
 policy/modules/kernel/terminal.if        |    2 -
 policy/modules/services/cups.te          |    1 
 policy/modules/services/pegasus.te       |    8 +++++++
 policy/modules/services/procmail.te      |    2 -
 policy/modules/services/samba.te         |    2 -
 policy/modules/system/authlogin.te       |    2 +
 policy/modules/system/init.te            |    1 
 policy/modules/system/libraries.fc       |   18 +++------------
 policy/modules/system/logging.te         |    4 +--
 policy/modules/system/sysnetwork.te      |    2 +
 policy/modules/system/unconfined.if      |   18 +++++++++++++++
 policy/modules/system/userdomain.te      |   24 +++++++++++++++++++--
 policy/modules/system/xen.if             |   18 +++++++++++++++
 policy/modules/system/xen.te             |    1 
 policy/rolemap                           |    1 
 policy/users                             |    6 ++---
 24 files changed, 130 insertions(+), 28 deletions(-)

Index: policy-20060411.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060411.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- policy-20060411.patch	20 Apr 2006 17:31:38 -0000	1.9
+++ policy-20060411.patch	20 Apr 2006 19:32:26 -0000	1.10
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/default_type serefpolicy-2.2.34/config/appconfig-strict-mls/default_type
 --- nsaserefpolicy/config/appconfig-strict-mls/default_type	2006-01-06 17:55:17.000000000 -0500
-+++ serefpolicy-2.2.34/config/appconfig-strict-mls/default_type	2006-04-20 09:56:58.000000000 -0400
++++ serefpolicy-2.2.34/config/appconfig-strict-mls/default_type	2006-04-20 14:04:12.000000000 -0400
 @@ -2,3 +2,4 @@
  secadm_r:secadm_t
  staff_r:staff_t
@@ -8,7 +8,7 @@
 +auditadm_r:auditadm_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.2.34/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2006-04-06 14:05:24.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/admin/netutils.te	2006-04-20 09:56:58.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/admin/netutils.te	2006-04-20 14:04:12.000000000 -0400
 @@ -97,7 +97,7 @@
  
  allow ping_t self:tcp_socket create_socket_perms;
@@ -20,7 +20,7 @@
  corenet_udp_sendrecv_all_if(ping_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.2.34/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-04-18 22:49:59.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/admin/usermanage.te	2006-04-20 12:49:39.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/admin/usermanage.te	2006-04-20 14:04:12.000000000 -0400
 @@ -514,6 +514,7 @@
  # Add/remove user home directories
  userdom_home_filetrans_generic_user_home_dir(useradd_t)
@@ -31,7 +31,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.2.34/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-04-18 22:49:59.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/kernel/corecommands.fc	2006-04-20 11:28:21.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/kernel/corecommands.fc	2006-04-20 14:04:12.000000000 -0400
 @@ -177,6 +177,7 @@
  ifdef(`distro_redhat', `
  /usr/lib/.*/program(/.*)?		gen_context(system_u:object_r:bin_t,s0)
@@ -40,36 +40,9 @@
  /usr/share/cvs/contrib/rcs2log	--	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/hwbrowser/hwbrowser -- gen_context(system_u:object_r:bin_t,s0)
  /usr/share/pwlib/make/ptlib-config --	gen_context(system_u:object_r:bin_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.34/policy/modules/kernel/devices.if
---- nsaserefpolicy/policy/modules/kernel/devices.if	2006-04-18 22:49:59.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/kernel/devices.if	2006-04-20 09:56:58.000000000 -0400
-@@ -2874,3 +2874,23 @@
- 
- 	typeattribute $1 devices_unconfined_type;
- ')
-+
-+########################################
-+## <summary>
-+##	Dontaudit getattr on all device nodes.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain to not audit.
-+##	</summary>
-+## </param>
-+#
-+interface(`dev_dontaudit_getattr_all_device_nodes',`
-+	gen_require(`
-+		attribute device_node;
-+	')
-+
-+	dontaudit $1 device_t:dir_file_class_set getattr;
-+	dontaudit $1 device_node:dir_file_class_set getattr;
-+')
-+
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-2.2.34/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2006-04-20 08:17:36.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/kernel/domain.te	2006-04-20 09:56:58.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/kernel/domain.te	2006-04-20 14:04:12.000000000 -0400
 @@ -96,6 +96,7 @@
  	# workaround until role dominance is fixed in
  	# the module compiler
@@ -80,7 +53,7 @@
  	role staff_r types domain;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.34/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-04-18 22:49:59.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/kernel/files.if	2006-04-20 12:16:18.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/kernel/files.if	2006-04-20 14:04:12.000000000 -0400
 @@ -1679,6 +1679,21 @@
  ')
  
@@ -127,9 +100,39 @@
 +       allow $1 boot_t:file { getattr read };
 +       allow $1 boot_t:lnk_file { getattr read };
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.34/policy/modules/kernel/filesystem.if
+--- nsaserefpolicy/policy/modules/kernel/filesystem.if	2006-04-18 22:49:59.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/kernel/filesystem.if	2006-04-20 14:54:31.000000000 -0400
+@@ -609,7 +609,7 @@
+ 		attribute noxattrfs;
+ 	')
+ 
+-	allow $1 noxattrfs:dir search;
++	allow $1 noxattrfs:dir search_dir_perms;
+ 	allow $1 noxattrfs:file r_file_perms;
+ 
+ ')
+@@ -629,7 +629,7 @@
+ 		attribute noxattrfs;
+ 	')
+ 
+-	allow $1 noxattrfs:dir search;
++	allow $1 noxattrfs:dir search_dir_perms;
+ 	allow $1 noxattrfs:lnk_file r_file_perms;
+ ')
+ 
+@@ -1294,7 +1294,7 @@
+ 
+ ########################################
+ ## <summary>
+-##	Read files on a NFS filesystem.
++##	Write files on a NFS filesystem.
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.2.34/policy/modules/kernel/kernel.te
 --- nsaserefpolicy/policy/modules/kernel/kernel.te	2006-04-18 22:49:59.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/kernel/kernel.te	2006-04-20 09:56:58.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/kernel/kernel.te	2006-04-20 14:04:12.000000000 -0400
 @@ -28,6 +28,7 @@
  
  ifdef(`enable_mls',`
@@ -140,7 +143,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.2.34/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-02-13 17:05:45.000000000 -0500
-+++ serefpolicy-2.2.34/policy/modules/kernel/terminal.if	2006-04-20 09:56:58.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/kernel/terminal.if	2006-04-20 14:04:12.000000000 -0400
 @@ -174,7 +174,7 @@
  	')
  
@@ -150,9 +153,20 @@
  ')
  
  ########################################
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.34/policy/modules/services/cups.te
+--- nsaserefpolicy/policy/modules/services/cups.te	2006-04-12 13:44:36.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/services/cups.te	2006-04-20 15:02:03.000000000 -0400
+@@ -79,6 +79,7 @@
+ allow cupsd_t self:process { setsched signal_perms };
+ allow cupsd_t self:fifo_file rw_file_perms;
+ allow cupsd_t self:unix_stream_socket { create_stream_socket_perms connectto };
++allow cupsd_t self:socket create_socket_perms;
+ allow cupsd_t self:unix_dgram_socket create_socket_perms;
+ allow cupsd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
+ allow cupsd_t self:netlink_route_socket { r_netlink_socket_perms };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.34/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/services/pegasus.te	2006-04-20 09:56:58.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/services/pegasus.te	2006-04-20 14:04:12.000000000 -0400
 @@ -79,11 +79,16 @@
  corenet_tcp_connect_pegasus_https_port(pegasus_t)
  corenet_tcp_connect_generic_port(pegasus_t)
@@ -187,9 +201,27 @@
  ')
  
  optional_policy(`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.2.34/policy/modules/services/procmail.te
+--- nsaserefpolicy/policy/modules/services/procmail.te	2006-03-24 11:15:50.000000000 -0500
++++ serefpolicy-2.2.34/policy/modules/services/procmail.te	2006-04-20 15:06:02.000000000 -0400
+@@ -95,13 +95,13 @@
+ 
+ optional_policy(`
+ 	mta_read_config(procmail_t)
++	sendmail_domtrans(procmail_t)
+ 	sendmail_rw_tcp_sockets(procmail_t)
+ 	sendmail_rw_unix_stream_sockets(procmail_t)
+ ')
+ 
+ optional_policy(`
+ 	corenet_udp_bind_generic_port(procmail_t)
+-	corenet_tcp_connect_spamd_port(procmail_t)
+ 
+ 	files_getattr_tmp_dirs(procmail_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.34/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2006-04-19 12:23:07.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/services/samba.te	2006-04-20 09:56:58.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/services/samba.te	2006-04-20 14:04:12.000000000 -0400
 @@ -106,8 +106,8 @@
  files_tmp_filetrans(samba_net_t, samba_net_tmp_t, { file dir })
  
@@ -202,7 +234,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.34/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2006-04-19 12:23:07.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/system/authlogin.te	2006-04-20 13:08:28.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/authlogin.te	2006-04-20 14:04:12.000000000 -0400
 @@ -188,6 +188,8 @@
  storage_setattr_scsi_generic_dev(pam_console_t)
  
@@ -214,7 +246,7 @@
  term_setattr_unallocated_ttys(pam_console_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.34/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2006-04-20 08:17:40.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/system/init.te	2006-04-20 09:56:58.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/init.te	2006-04-20 14:04:12.000000000 -0400
 @@ -348,6 +348,7 @@
  files_mounton_isid_type_dirs(initrc_t)
  files_list_default(initrc_t)
@@ -225,7 +257,7 @@
  libs_use_ld_so(initrc_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.34/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-04-19 12:23:07.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/system/libraries.fc	2006-04-20 13:25:18.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/libraries.fc	2006-04-20 14:04:21.000000000 -0400
 @@ -66,13 +66,8 @@
  
  /usr/(.*/)?nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -240,24 +272,15 @@
  /usr/(.*/)?lib(64)?(/.*)?/nvidia/.*\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libsipphoneapi\.so.*	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
  /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -86,7 +81,6 @@
- 
- /usr/(local/)?lib(64)?/wine/.*\.so  		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/(local/)?lib/libfame-.*\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
--/usr/local/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
- 
- /usr/NX/lib/libXcomp.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/NX/lib/libjpeg.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -99,8 +93,6 @@
+@@ -99,7 +94,6 @@
  /usr/lib(64)?/xorg/modules/extensions/nvidia(-[^/]*)?/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  
  ifdef(`distro_redhat',`
 -/usr/lib(64)?/.*/program/.*\.so.*		gen_context(system_u:object_r:shlib_t,s0)
--/usr/share/rhn/rhn_applet/eggtrayiconmodule\.so -- gen_context(system_u:object_r:shlib_t,s0)
+ /usr/share/rhn/rhn_applet/eggtrayiconmodule\.so -- gen_context(system_u:object_r:shlib_t,s0)
  
  # The following are libraries with text relocations in need of execmod permissions
- # Some of them should be fixed and removed from this list
-@@ -113,7 +105,7 @@
+@@ -113,7 +107,7 @@
  /usr/lib(64)?/libstdc\+\+\.so\.2\.7\.2\.8 --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libg\+\+\.so\.2\.7\.2\.8	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libglide3\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -266,7 +289,7 @@
  /usr/lib(64)?/libdv\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/helix/plugins/oggfformat\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/helix/plugins/theorarend\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -198,16 +190,12 @@
+@@ -198,16 +192,12 @@
  /usr/(.*/)?jre.*/libdeploy.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/(.*/)?jre.*/libjvm.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
@@ -288,7 +311,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.2.34/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2006-04-06 15:32:43.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/system/logging.te	2006-04-20 11:57:49.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/logging.te	2006-04-20 14:04:12.000000000 -0400
 @@ -140,7 +140,7 @@
  init_use_fds(auditd_t)
  init_exec(auditd_t)
@@ -309,7 +332,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.2.34/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2006-03-24 11:15:53.000000000 -0500
-+++ serefpolicy-2.2.34/policy/modules/system/sysnetwork.te	2006-04-20 09:56:58.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/sysnetwork.te	2006-04-20 14:04:12.000000000 -0400
 @@ -248,6 +248,7 @@
  
  optional_policy(`
@@ -326,7 +349,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.34/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-04-12 13:44:38.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/system/unconfined.if	2006-04-20 09:56:58.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/unconfined.if	2006-04-20 14:04:12.000000000 -0400
 @@ -224,6 +224,24 @@
  
  ########################################
@@ -354,7 +377,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.34/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-04-20 08:17:40.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/system/userdomain.te	2006-04-20 10:08:22.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/userdomain.te	2006-04-20 14:04:12.000000000 -0400
 @@ -6,6 +6,7 @@
  
  	ifdef(`enable_mls',`
@@ -444,7 +467,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.2.34/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2006-03-23 16:08:51.000000000 -0500
-+++ serefpolicy-2.2.34/policy/modules/system/xen.if	2006-04-20 09:56:58.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/xen.if	2006-04-20 14:04:12.000000000 -0400
 @@ -47,6 +47,24 @@
  
  ########################################
@@ -472,7 +495,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.2.34/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-04-18 22:50:01.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/system/xen.te	2006-04-20 09:56:58.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/xen.te	2006-04-20 14:04:12.000000000 -0400
 @@ -125,6 +125,7 @@
  
  files_read_etc_files(xend_t)
@@ -483,7 +506,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/rolemap serefpolicy-2.2.34/policy/rolemap
 --- nsaserefpolicy/policy/rolemap	2006-01-26 15:38:41.000000000 -0500
-+++ serefpolicy-2.2.34/policy/rolemap	2006-04-20 09:56:58.000000000 -0400
++++ serefpolicy-2.2.34/policy/rolemap	2006-04-20 14:04:12.000000000 -0400
 @@ -15,5 +15,6 @@
  
  	ifdef(`enable_mls',`
@@ -493,7 +516,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.2.34/policy/users
 --- nsaserefpolicy/policy/users	2006-02-15 17:02:30.000000000 -0500
-+++ serefpolicy-2.2.34/policy/users	2006-04-20 11:21:04.000000000 -0400
++++ serefpolicy-2.2.34/policy/users	2006-04-20 14:04:12.000000000 -0400
 @@ -29,7 +29,7 @@
  gen_user(user_u, user, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255)
  ',`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- selinux-policy.spec	19 Apr 2006 17:37:38 -0000	1.177
+++ selinux-policy.spec	20 Apr 2006 19:32:44 -0000	1.178
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.34
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -330,7 +330,11 @@
 %endif
 
 %changelog
-* Wed Apr 19 2006 Dan Walsh <dwalsh at redhat.com> 2.2.34-1
+* Thu Apr 20 2006 Dan Walsh <dwalsh at redhat.com> 2.2.34-2
+- Allow procmail to sendmail
+- Allow nfs to share dosfs
+
+* Thu Apr 20 2006 Dan Walsh <dwalsh at redhat.com> 2.2.34-1
 - Update to latest from upstream
 - Allow selinux-policy to be removed and kernel not to crash
 



From fedora-cvs-commits at redhat.com  Thu Apr 20 19:54:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 15:54:44 -0400
Subject: rpms/dhcdbd/devel .cvsignore, 1.16, 1.17 dhcdbd.spec, 1.27,
	1.28 sources, 1.26, 1.27
Message-ID: <200604201954.k3KJsikE021359@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/dhcdbd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21330

Modified Files:
	.cvsignore dhcdbd.spec sources 
Log Message:
v1.14: fix bug 189529


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	17 Jan 2006 21:40:34 -0000	1.16
+++ .cvsignore	20 Apr 2006 19:54:41 -0000	1.17
@@ -13,3 +13,4 @@
 dhcdbd-1.10.tar.gz
 dhcdbd-1.11.tar.gz
 dhcdbd-1.12.tar.gz
+dhcdbd-1.14.tar.gz


Index: dhcdbd.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/dhcdbd.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- dhcdbd.spec	11 Feb 2006 02:25:24 -0000	1.27
+++ dhcdbd.spec	20 Apr 2006 19:54:41 -0000	1.28
@@ -1,6 +1,7 @@
 #  DHCP D-BUS Daemon 
 #
 %{?!DHCDBD_SETUID:%define DHCDBD_SETUID	0}
+%{?!NODEBUGINFO:%define   NODEBUGINFO   0}
 #
 #  If dhcdbd is to be run by the dbus-daemon's service activation service,
 #  then currently it MUST be installed setuid; else, it must have an 
@@ -8,8 +9,8 @@
 #
 Summary:   DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS, stores and presents DHCP options.
 Name: 	   dhcdbd
-Version:   1.12
-Release:   1.FC5.2
+Version:   1.14
+Release:   1.FC6
 License:   GPL
 Group:     System Environment/Daemons
 URL: 	   http://people.redhat.com/~jvdias/%{name}/%{name}-%{version}.tar.gz
@@ -33,13 +34,21 @@
   cp -fp %{_builddir}/%{name}.spec RedHat/;
 fi;
 
+%if %{NODEBUGINFO}
+%define debug_package %{nil}
+%endif
+
 %build
 %ifarch s390x x86_64 ppc64
 # every 64-bit arch EXCEPT ia64 has dbus arch. dep. includes in 
 # /usr/lib64/dbus-1.0/include
 export LIBDIR=lib64
 %endif
-CFLAGS="-Wall $RPM_OPT_FLAGS" CC='gcc' make
+%if %{NODEBUGINFO}
+CFLAGS=`echo $RPM_OPT_FLAGS | sed 's/-O2 -g/-g3 -gdwarf-2/'`' -Wall' CC='gcc' make
+%else
+CFLAGS="$RPM_OPT_FLAGS -Wall" CC='gcc' make
+%endif
 
 %install
 DESTDIR=$RPM_BUILD_ROOT make install
@@ -47,6 +56,10 @@
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 install -c -m 755 %SOURCE1 $RPM_BUILD_ROOT/etc/rc.d/init.d/dhcdbd
 %endif
+%if %{NODEBUGINFO}
+/usr/lib/rpm/brp-compress
+exit 0
+%endif
 
 %post
 if [ $1 -eq 1 ]; then
@@ -79,6 +92,11 @@
 %doc README LICENSE CHANGES dhcp_options.h dhcdbd.h dbus_service.h
 
 %changelog
+* Thu Apr 20 2006 Jason Vas Dias <jvdias at redhat.com> - 1.14-1.FC5
+- fix bug 189529: prevent potential memory corruption on hex string
+  options with single-byte non-ascii values
+- modify dhcp option types to be in line with latest ISC dhcp
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.12-1.FC5.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	17 Jan 2006 21:40:34 -0000	1.26
+++ sources	20 Apr 2006 19:54:41 -0000	1.27
@@ -1 +1 @@
-f84f00d10643193fb5e6ee08ccfc0b09  dhcdbd-1.12.tar.gz
+1180dee7a51a4384d55768650634cf93  dhcdbd-1.14.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 20 19:56:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 15:56:16 -0400
Subject: rpms/dhcdbd/FC-5 .cvsignore, 1.16, 1.17 dhcdbd.spec, 1.27,
	1.28 sources, 1.26, 1.27
Message-ID: <200604201956.k3KJuGm0022032@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	.cvsignore dhcdbd.spec sources 
Log Message:
v1.14: fix bug 189529


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/FC-5/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	17 Jan 2006 21:40:34 -0000	1.16
+++ .cvsignore	20 Apr 2006 19:56:13 -0000	1.17
@@ -13,3 +13,4 @@
 dhcdbd-1.10.tar.gz
 dhcdbd-1.11.tar.gz
 dhcdbd-1.12.tar.gz
+dhcdbd-1.14.tar.gz


Index: dhcdbd.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/FC-5/dhcdbd.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- dhcdbd.spec	11 Feb 2006 02:25:24 -0000	1.27
+++ dhcdbd.spec	20 Apr 2006 19:56:13 -0000	1.28
@@ -1,6 +1,7 @@
 #  DHCP D-BUS Daemon 
 #
 %{?!DHCDBD_SETUID:%define DHCDBD_SETUID	0}
+%{?!NODEBUGINFO:%define   NODEBUGINFO   0}
 #
 #  If dhcdbd is to be run by the dbus-daemon's service activation service,
 #  then currently it MUST be installed setuid; else, it must have an 
@@ -8,8 +9,8 @@
 #
 Summary:   DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS, stores and presents DHCP options.
 Name: 	   dhcdbd
-Version:   1.12
-Release:   1.FC5.2
+Version:   1.14
+Release:   1.FC6
 License:   GPL
 Group:     System Environment/Daemons
 URL: 	   http://people.redhat.com/~jvdias/%{name}/%{name}-%{version}.tar.gz
@@ -33,13 +34,21 @@
   cp -fp %{_builddir}/%{name}.spec RedHat/;
 fi;
 
+%if %{NODEBUGINFO}
+%define debug_package %{nil}
+%endif
+
 %build
 %ifarch s390x x86_64 ppc64
 # every 64-bit arch EXCEPT ia64 has dbus arch. dep. includes in 
 # /usr/lib64/dbus-1.0/include
 export LIBDIR=lib64
 %endif
-CFLAGS="-Wall $RPM_OPT_FLAGS" CC='gcc' make
+%if %{NODEBUGINFO}
+CFLAGS=`echo $RPM_OPT_FLAGS | sed 's/-O2 -g/-g3 -gdwarf-2/'`' -Wall' CC='gcc' make
+%else
+CFLAGS="$RPM_OPT_FLAGS -Wall" CC='gcc' make
+%endif
 
 %install
 DESTDIR=$RPM_BUILD_ROOT make install
@@ -47,6 +56,10 @@
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 install -c -m 755 %SOURCE1 $RPM_BUILD_ROOT/etc/rc.d/init.d/dhcdbd
 %endif
+%if %{NODEBUGINFO}
+/usr/lib/rpm/brp-compress
+exit 0
+%endif
 
 %post
 if [ $1 -eq 1 ]; then
@@ -79,6 +92,11 @@
 %doc README LICENSE CHANGES dhcp_options.h dhcdbd.h dbus_service.h
 
 %changelog
+* Thu Apr 20 2006 Jason Vas Dias <jvdias at redhat.com> - 1.14-1.FC5
+- fix bug 189529: prevent potential memory corruption on hex string
+  options with single-byte non-ascii values
+- modify dhcp option types to be in line with latest ISC dhcp
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.12-1.FC5.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/FC-5/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	17 Jan 2006 21:40:34 -0000	1.26
+++ sources	20 Apr 2006 19:56:13 -0000	1.27
@@ -1 +1 @@
-f84f00d10643193fb5e6ee08ccfc0b09  dhcdbd-1.12.tar.gz
+1180dee7a51a4384d55768650634cf93  dhcdbd-1.14.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 20 19:56:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 15:56:38 -0400
Subject: rpms/dhcdbd/FC-5 dhcdbd.spec,1.28,1.29
Message-ID: <200604201956.k3KJucdK022196@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	dhcdbd.spec 
Log Message:
v1.14: fix bug 189529


Index: dhcdbd.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/FC-5/dhcdbd.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- dhcdbd.spec	20 Apr 2006 19:56:13 -0000	1.28
+++ dhcdbd.spec	20 Apr 2006 19:56:35 -0000	1.29
@@ -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.14
-Release:   1.FC6
+Release:   1.FC5
 License:   GPL
 Group:     System Environment/Daemons
 URL: 	   http://people.redhat.com/~jvdias/%{name}/%{name}-%{version}.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 20 19:58:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 15:58:19 -0400
Subject: rpms/dhcdbd/FC-4 .cvsignore, 1.13, 1.14 dhcdbd.spec, 1.24,
	1.25 sources, 1.23, 1.24
Message-ID: <200604201958.k3KJwJt4022901@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	.cvsignore dhcdbd.spec sources 
Log Message:
v1.14: fix bug 189529


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/FC-4/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	6 Oct 2005 20:13:25 -0000	1.13
+++ .cvsignore	20 Apr 2006 19:58:16 -0000	1.14
@@ -10,3 +10,7 @@
 dhcdbd-1.8.tar.gz
 dhcdbd-1.9.tar.gz
 dhcdbd.spec
+dhcdbd-1.10.tar.gz
+dhcdbd-1.11.tar.gz
+dhcdbd-1.12.tar.gz
+dhcdbd-1.14.tar.gz


Index: dhcdbd.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/FC-4/dhcdbd.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- dhcdbd.spec	17 Oct 2005 20:40:42 -0000	1.24
+++ dhcdbd.spec	20 Apr 2006 19:58:16 -0000	1.25
@@ -1,6 +1,7 @@
 #  DHCP D-BUS Daemon 
 #
 %{?!DHCDBD_SETUID:%define DHCDBD_SETUID	0}
+%{?!NODEBUGINFO:%define   NODEBUGINFO   0}
 #
 #  If dhcdbd is to be run by the dbus-daemon's service activation service,
 #  then currently it MUST be installed setuid; else, it must have an 
@@ -8,7 +9,7 @@
 #
 Summary:   DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS, stores and presents DHCP options.
 Name: 	   dhcdbd
-Version:   1.9
+Version:   1.14
 Release:   1.FC4
 License:   GPL
 Group:     System Environment/Daemons
@@ -16,8 +17,8 @@
 Source0:   %{name}-%{version}.tar.gz
 Source1:   dhcdbd.init
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires:  dhclient >= 3.0.2-12, dbus >= 0.33
-BuildRequires: dbus-devel >= 0.33
+Requires:  dhclient >= 3.0.2-12, dbus >= 0.6
+BuildRequires: dbus-devel >= 0.6
 
 %description
 
@@ -33,13 +34,21 @@
   cp -fp %{_builddir}/%{name}.spec RedHat/;
 fi;
 
+%if %{NODEBUGINFO}
+%define debug_package %{nil}
+%endif
+
 %build
 %ifarch s390x x86_64 ppc64
 # every 64-bit arch EXCEPT ia64 has dbus arch. dep. includes in 
 # /usr/lib64/dbus-1.0/include
 export LIBDIR=lib64
 %endif
-CFLAGS="-Wall $RPM_OPT_FLAGS" CC='gcc' make
+%if %{NODEBUGINFO}
+CFLAGS=`echo $RPM_OPT_FLAGS | sed 's/-O2 -g/-g3 -gdwarf-2/'`' -Wall' CC='gcc' make
+%else
+CFLAGS="$RPM_OPT_FLAGS -Wall" CC='gcc' make
+%endif
 
 %install
 DESTDIR=$RPM_BUILD_ROOT make install
@@ -47,6 +56,10 @@
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 install -c -m 755 %SOURCE1 $RPM_BUILD_ROOT/etc/rc.d/init.d/dhcdbd
 %endif
+%if %{NODEBUGINFO}
+/usr/lib/rpm/brp-compress
+exit 0
+%endif
 
 %post
 if [ $1 -eq 1 ]; then
@@ -79,6 +92,34 @@
 %doc README LICENSE CHANGES dhcp_options.h dhcdbd.h dbus_service.h
 
 %changelog
+* Thu Apr 20 2006 Jason Vas Dias <jvdias at redhat.com> - 1.14-1.FC5
+- fix bug 189529: prevent potential memory corruption on hex string
+  options with single-byte non-ascii values
+- modify dhcp option types to be in line with latest ISC dhcp
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.12-1.FC5.2
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.12-1.FC5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Tue Jan 17 2006 Jason Vas Dias <jvdias at redhat.com> 1.12-1
+- Cleanup un-exercised code in dbus_service.c, lines 381 & 391
+  (pointed out by David Binderman<dcb314 at hotmail.com>)
+
+* Thu Dec 01 2005 Jason Vas Dias <jvdias at redhat.com> 1.11-1
+- Rebuild for new dbus-0.6 dependency; remove use of
+  DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT
+
+* Wed Nov 16 2005 Jason Vas Dias <jvdias at redhat.com> 1.10-1
+- Rebuild for FC-5 (version must compare > FC-4)
+- Change dhclient.leases directory to /var/lib/dhclient/ for bug 169164
+- fix Makefile to workaround bug 173431
+- apply patch contributed by Robert Love<rml at novell.com> :
+  o use daemon(3) to daemonize
+  o direct stdout/stderr to /dev/null, not console
+  o use dhclient -q option
+
 * Thu Oct 06 2005 Jason Vas Dias <jvdias at redhat.com> 1.9-1
 - fix bug 169937: do 'chkconfig --add dhcdbd' in %post 
 - Add CHANGES changelog file to %doc generated from this changelog


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/FC-4/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	6 Oct 2005 20:49:39 -0000	1.23
+++ sources	20 Apr 2006 19:58:16 -0000	1.24
@@ -1 +1 @@
-8534560a93e3f62694fffc04819829d8  dhcdbd-1.9.tar.gz
+1180dee7a51a4384d55768650634cf93  dhcdbd-1.14.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 20 20:14:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 16:14:45 -0400
Subject: rpms/initscripts/devel .cvsignore, 1.99, 1.100 initscripts.spec,
	1.113, 1.114 sources, 1.108, 1.109
Message-ID: <200604202014.k3KKEjXa024758@cvs.devel.redhat.com>

Author: notting

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- .cvsignore	10 Apr 2006 19:08:27 -0000	1.99
+++ .cvsignore	20 Apr 2006 20:14:24 -0000	1.100
@@ -1 +1 @@
-initscripts-8.32.tar.bz2
+initscripts-8.33.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- initscripts.spec	10 Apr 2006 19:08:27 -0000	1.113
+++ initscripts.spec	20 Apr 2006 20:14:24 -0000	1.114
@@ -1,6 +1,6 @@
 Summary: The inittab file and the /etc/init.d scripts.
 Name: initscripts
-Version: 8.32
+Version: 8.33
 License: GPL
 Group: System Environment/Base
 Release: 1
@@ -114,6 +114,7 @@
 %dir /etc/sysconfig/network-scripts
 %config(noreplace) %verify(not md5 mtime size) /etc/adjtime
 %config(noreplace) /etc/sysconfig/init
+%config(noreplace) /etc/sysconfig/readonly-root
 /etc/sysconfig/network-scripts/ifdown
 %config /sbin/ifdown
 %config /etc/sysconfig/network-scripts/ifdown-post
@@ -160,6 +161,8 @@
 %config /etc/sysconfig/network-scripts/ifup-ctc
 %config /etc/sysconfig/network-scripts/ifup-iucv
 %endif
+/etc/rwtab
+%dir /etc/rwtab.d
 /etc/udev/rules.d/*
 %config /etc/X11/prefdm
 %config(noreplace) /etc/inittab
@@ -204,11 +207,18 @@
 %config /etc/ppp/ipv6-down
 %config /etc/initlog.conf
 %doc sysconfig.txt sysvinitfiles ChangeLog static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6
+/var/lib/stateless
 %ghost %attr(0600,root,utmp) /var/log/btmp
 %ghost %attr(0664,root,utmp) /var/log/wtmp
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Thu Apr 20 2006 Bill Nottingham <notting at redhat.com> 8.33-1
+- support for readonly root
+- rc.sysinit: remove call to zfcpconf.sh - that should be udev rules
+- ifup*: add NETWORKDELAY and LINKDELAY (#176851, <mitr at redhat.com>)
+- rc.sysinit: remove obsolete initrd code (<pjones at redhat.com>)
+
 * Mon Apr 10 2006 Bill Nottingham <notting at redhat.com> 8.32-1
 - netfs: fix redirect (#187505)
 - rc.sysinit add forcequotacheck (#168118, <mitr at redhat.com>)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/sources,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- sources	10 Apr 2006 19:08:27 -0000	1.108
+++ sources	20 Apr 2006 20:14:25 -0000	1.109
@@ -1 +1 @@
-cc632f40d7335957e9d5f151dec36f77  initscripts-8.32.tar.bz2
+4002727c671554dccce078fff0c8d7e1  initscripts-8.33.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 20 20:15:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 16:15:34 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2141,1.2142
Message-ID: <200604202015.k3KKFYi0024891@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
fix make prep with stale deleteme's



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2141
retrieving revision 1.2142
diff -u -r1.2141 -r1.2142
--- kernel-2.6.spec	19 Apr 2006 21:24:16 -0000	1.2141
+++ kernel-2.6.spec	20 Apr 2006 20:15:30 -0000	1.2142
@@ -694,6 +694,7 @@
   # We already have a vanilla dir.
   cd kernel-%{kversion}
   if [ -d linux-%{kversion}.%{_target_cpu} ]; then
+     rm -rf deleteme
      mv linux-%{kversion}.%{_target_cpu} deleteme
      rm -rf deleteme &
   fi



From fedora-cvs-commits at redhat.com  Thu Apr 20 20:35:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 16:35:04 -0400
Subject: rpms/thunderbird/devel sources,1.14,1.15
Message-ID: <200604202035.k3KKZ4iA011939@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/thunderbird/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11799

Modified Files:
	sources 
Log Message:
Upstream fudged the source;
Here's the right tarball



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	19 Apr 2006 17:47:14 -0000	1.14
+++ sources	20 Apr 2006 20:34:40 -0000	1.15
@@ -1,2 +1,2 @@
 8e8a91c64ae69aec4fd472b74962f16f  thunderbird-langpacks-1.5.0.2-20060419.tar.bz2
-4b344a7b54f42a5f1259e074b8d93503  thunderbird-1.5.0.2-source.tar.bz2
+3f32b847330c9d58297147be19714962  thunderbird-1.5.0.2-source.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 20 21:57:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 17:57:27 -0400
Subject: rpms/kernel/devel patch-2.6.17-rc2-git3.bz2.sign, NONE,
	1.1 .cvsignore, 1.410, 1.411 kernel-2.6.spec, 1.2142,
	1.2143 sources, 1.352, 1.353 upstream, 1.323,
	1.324 patch-2.6.17-rc2-git1.bz2.sign, 1.1, NONE
Message-ID: <200604202157.k3KLvR3w023494@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23453

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17-rc2-git3.bz2.sign 
Removed Files:
	patch-2.6.17-rc2-git1.bz2.sign 
Log Message:
git3



--- NEW FILE patch-2.6.17-rc2-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBER9rnyGugalF9Dw4RAiNhAJ4r68vnRXg4dN+n1sbzBcYkbjNhQACfYjan
ybkTaS0+NjBpRtILP8yLKu8=
=SQTx
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -r1.410 -r1.411
--- .cvsignore	19 Apr 2006 21:21:13 -0000	1.410
+++ .cvsignore	20 Apr 2006 21:57:25 -0000	1.411
@@ -4,4 +4,4 @@
 linux-2.6.16.tar.bz2
 xen-20060413.tar.bz2
 patch-2.6.17-rc2.bz2
-patch-2.6.17-rc2-git1.bz2
+patch-2.6.17-rc2-git3.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2142
retrieving revision 1.2143
diff -u -r1.2142 -r1.2143
--- kernel-2.6.spec	20 Apr 2006 20:15:30 -0000	1.2142
+++ kernel-2.6.spec	20 Apr 2006 21:57:25 -0000	1.2143
@@ -213,7 +213,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.17-rc2.bz2
-Patch2: patch-2.6.17-rc2-git1.bz2
+Patch2: patch-2.6.17-rc2-git3.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1656,6 +1656,9 @@
 %endif
 
 %changelog
+* Thu Apr 20 2006 Dave Jones <davej at redhat.com>
+- 2.6.17rc2-git3
+
 * Wed Apr 19 2006 Dave Jones <davej at redhat.com>
 - 2.6.17rc2-git1
 - Use unicode VTs by default.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -r1.352 -r1.353
--- sources	19 Apr 2006 21:21:13 -0000	1.352
+++ sources	20 Apr 2006 21:57:25 -0000	1.353
@@ -1,4 +1,4 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 e8e055329db3aad40a010ded0f8bdcf9  xen-20060413.tar.bz2
 87c4ea50e1b25ad808b65ad3fb19a9b5  patch-2.6.17-rc2.bz2
-9eb20cf75a125fedb5d03c2bab17dd83  patch-2.6.17-rc2-git1.bz2
+5a437ea8f057b170e649cd321b6238f7  patch-2.6.17-rc2-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- upstream	19 Apr 2006 21:21:13 -0000	1.323
+++ upstream	20 Apr 2006 21:57:25 -0000	1.324
@@ -1,3 +1,3 @@
 linux-2.6.16.tar.bz2
 patch-2.6.17-rc2.bz2
-patch-2.6.17-rc2-git1.bz2
+patch-2.6.17-rc2-git3.bz2


--- patch-2.6.17-rc2-git1.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 20 22:37:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 18:37:20 -0400
Subject: rpms/procps/FC-5 procps-3.2.3-slabtop-man.patch, NONE,
	1.1 procps-3.2.6-cpu-steal.patch, NONE,
	1.1 procps-3.2.6-top-env-cpuloop.patch, NONE,
	1.1 procps-3.2.6-top-env-vmsize.patch, NONE,
	1.1 procps-3.2.5-top-remcpu.patch, 1.1, 1.2 procps.spec, 1.46,
	1.47 procps-3.2.1-top-vmsize-env.patch, 1.2, NONE
Message-ID: <200604202237.k3KMbKQT012839@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/procps/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv12798

Modified Files:
	procps-3.2.5-top-remcpu.patch procps.spec 
Added Files:
	procps-3.2.3-slabtop-man.patch procps-3.2.6-cpu-steal.patch 
	procps-3.2.6-top-env-cpuloop.patch 
	procps-3.2.6-top-env-vmsize.patch 
Removed Files:
	procps-3.2.1-top-vmsize-env.patch 
Log Message:
fc5 update

procps-3.2.3-slabtop-man.patch:
 slabtop.1 |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

--- NEW FILE procps-3.2.3-slabtop-man.patch ---
--- procps-3.2.3/slabtop.1.slabman	2006-04-18 13:39:21.000000000 +0200
+++ procps-3.2.3/slabtop.1	2006-04-18 14:05:41.000000000 +0200
@@ -109,14 +109,16 @@
 .IR /proc/slabinfo ).
 Kernel 2.2 should be supported in the future.
 
+The slabtop statistic header is tracking how many bytes of slabs are being used
+and it not a measure of physical memory. The 'Slab' field in the /proc/meminfo
+file is tracking information about used slab physical memory.
+
 .SH AUTHORS
 Written by Chris Rivera and Robert Love.
 
 .BR slabtop (1)
 was inspired by Martin Bligh's perl script,
 .BR vmtop .
+The procps package is maintained by Albert Cahalan <albert at users.sf.net>.
 
-The procps package is maintained by Robert Love and was created by Michael
-Johnson.
-
-Send bug reports to <procps-list at redhat.com>.
+Please send bug reports to <procps-feedback at lists.sf.net>.

procps-3.2.6-cpu-steal.patch:
 proc/sysinfo.c |    4 ++--
 proc/sysinfo.h |    2 +-
 top.c          |   23 ++++++++++++++++-------
 top.h          |    7 +++++--
 vmstat.8       |    1 +
 vmstat.c       |   37 +++++++++++++++++++++----------------
 6 files changed, 46 insertions(+), 28 deletions(-)

--- NEW FILE procps-3.2.6-cpu-steal.patch ---

 CPU steal time is the time during which the virtual cpu had runnable tasks,
 but was not scheduled to run itself.  In effect, time during which the virtual
 cpu was waiting on the physical processor.  This is the CPU equivalent of
 iowait time.
 
    04/21/2006 -- Karel Zak <kzak at redhat.com>


--- procps-3.2.6/vmstat.8.steal	2006-04-20 23:40:45.000000000 +0200
+++ procps-3.2.6/vmstat.8	2006-04-20 23:46:38.000000000 +0200
@@ -114,6 +114,7 @@
 sy: Time spent running kernel code. (system time)
 id: Time spent idle. Prior to Linux 2.5.41, this includes IO-wait time.
 wa: Time spent waiting for IO. Prior to Linux 2.5.41, shown as zero.
+st: Time spent the virtual CPU waiting for physical CPU.
 
 .PP
 .SH FIELD DESCRIPTION FOR DISK MODE 
--- procps-3.2.6/top.h.steal	2006-04-21 00:02:40.000000000 +0200
+++ procps-3.2.6/top.h	2006-04-21 00:01:47.000000000 +0200
@@ -216,8 +216,8 @@
 // calculations.  It exists primarily for SMP support but serves
 // all environments.
 typedef struct CPU_t {
-   TIC_t u, n, s, i, w, x, y;                             // as represented in /proc/stat
-   TIC_t u_sav, s_sav, n_sav, i_sav, w_sav, x_sav, y_sav; // in the order of our display
+   TIC_t u, n, s, i, w, x, y, z;                                  // as represented in /proc/stat
+   TIC_t u_sav, s_sav, n_sav, i_sav, w_sav, x_sav, y_sav, z_sav;  // in the order of our display
    unsigned id;  // the CPU ID number
 } CPU_t;
 
@@ -394,6 +394,9 @@
    " %#5.1f%% \02user,\03 %#5.1f%% \02system,\03 %#5.1f%% \02nice,\03 %#5.1f%% \02idle,\03 %#5.1f%% \02IO-wait\03\n"
 #define STATES_line2x6  "%s\03" \
    " %#4.1f%% \02us,\03 %#4.1f%% \02sy,\03 %#4.1f%% \02ni,\03 %#4.1f%% \02id,\03 %#4.1f%% \02wa,\03 %#4.1f%% \02hi,\03 %#4.1f%% \02si\03\n"
+#define STATES_line2x7  "%s\03" \
+   " %#4.1f%% \02us,\03 %#4.1f%% \02sy,\03 %#4.1f%% \02ni,\03 %#4.1f%% \02id,\03 %#4.1f%% \02wa,\03 %#4.1f%% \02hi,\03 %#4.1f%% \02si,\03 %#4.1f%% \02st\03\n"
+
 #ifdef CASEUP_SUMMK
 #define MEMORY_line1  "Mem: \03" \
    " %8uK \02total,\03 %8uK \02used,\03 %8uK \02free,\03 %8uK \02buffers\03\n"
--- procps-3.2.6/top.c.steal	2006-04-20 23:47:27.000000000 +0200
+++ procps-3.2.6/top.c	2006-04-20 23:57:49.000000000 +0200
@@ -940,14 +940,16 @@
    if (!fgets(buf, sizeof(buf), fp)) std_err("failed /proc/stat read");
    cpus[cpu_max].x = 0;  // FIXME: can't tell by kernel version number
    cpus[cpu_max].y = 0;  // FIXME: can't tell by kernel version number
-   num = sscanf(buf, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu",
+   cpus[cpu_max].z = 0;	 // FIXME: can't tell by kernel version number
+   num = sscanf(buf, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu",
       &cpus[cpu_max].u,
       &cpus[cpu_max].n,
       &cpus[cpu_max].s,
       &cpus[cpu_max].i,
       &cpus[cpu_max].w,
       &cpus[cpu_max].x,
-      &cpus[cpu_max].y
+      &cpus[cpu_max].y,
+      &cpus[Cpu_tot].z
    );
    if (num < 4)
          std_err("failed /proc/stat read");
@@ -957,9 +959,10 @@
       if (!fgets(buf, sizeof(buf), fp)) std_err("failed /proc/stat read");
       cpus[i].x = 0;  // FIXME: can't tell by kernel version number
       cpus[i].y = 0;  // FIXME: can't tell by kernel version number
-      num = sscanf(buf, "cpu%u %Lu %Lu %Lu %Lu %Lu %Lu %Lu",
+      cpus[i].y = 0;  // FIXME: can't tell by kernel version number
+      num = sscanf(buf, "cpu%u %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu",
          &cpus[i].id,
-         &cpus[i].u, &cpus[i].n, &cpus[i].s, &cpus[i].i, &cpus[i].w, &cpus[i].x, &cpus[i].y
+         &cpus[i].u, &cpus[i].n, &cpus[i].s, &cpus[i].i, &cpus[i].w, &cpus[i].x, &cpus[i].y, &cpus[i].z
       );
       if (num < 4) {
 	 Cpu_tot = i;
@@ -987,6 +990,7 @@
       cpus[0].w = cpus[1].w;
       cpus[0].x = cpus[1].x;
       cpus[0].y = cpus[1].y;
+      cpus[0].z = cpus[1].z;
    }
    
    return cpus;
@@ -1626,6 +1630,8 @@
       States_fmts = STATES_line2x5;
    if (linux_version_code >= LINUX_VERSION(2, 6, 0))  // grrr... only some 2.6.0-testX :-(
       States_fmts = STATES_line2x6;
+   if (linux_version_code >= LINUX_VERSION(2, 6, 7))
+      States_fmts = STATES_line2x7;
 
       /* get virtual page size -- nearing huge! */
    Page_size = getpagesize();
@@ -2897,7 +2903,7 @@
    // we'll trim to zero if we get negative time ticks,
    // which has happened with some SMP kernels (pre-2.4?)
 #define TRIMz(x)  ((tz = (SIC_t)(x)) < 0 ? 0 : tz)
-   SIC_t u_frme, s_frme, n_frme, i_frme, w_frme, x_frme, y_frme, tot_frme, tz;
+   SIC_t u_frme, s_frme, n_frme, i_frme, w_frme, x_frme, y_frme, z_frme, tot_frme, tz;
    float scale;
 
    u_frme = cpu->u - cpu->u_sav;
@@ -2907,7 +2913,8 @@
    w_frme = cpu->w - cpu->w_sav;
    x_frme = cpu->x - cpu->x_sav;
    y_frme = cpu->y - cpu->y_sav;
-   tot_frme = u_frme + s_frme + n_frme + i_frme + w_frme + x_frme + y_frme;
+   z_frme = cpu->z - cpu->z_sav;
+   tot_frme = u_frme + s_frme + n_frme + i_frme + w_frme + x_frme + y_frme + z_frme;
    if (tot_frme < 1) tot_frme = 1;
    scale = 100.0 / (float)tot_frme;
 
@@ -2924,7 +2931,8 @@
          (float)i_frme * scale,
          (float)w_frme * scale,
          (float)x_frme * scale,
-         (float)y_frme * scale
+         (float)y_frme * scale,
+	 (float)z_frme * scale
       )
    );
    Msg_row += 1;
@@ -2937,6 +2945,7 @@
    cpu->w_sav = cpu->w;
    cpu->x_sav = cpu->x;
    cpu->y_sav = cpu->y;
+   cpu->z_sav = cpu->z;
 
 #undef TRIMz
 }
--- procps-3.2.6/proc/sysinfo.c.steal	2006-04-20 18:22:38.000000000 +0200
+++ procps-3.2.6/proc/sysinfo.c	2006-04-20 18:36:43.000000000 +0200
@@ -361,7 +361,7 @@
 
 /***********************************************************************/
 
-void getstat(jiff *restrict cuse, jiff *restrict cice, jiff *restrict csys, jiff *restrict cide, jiff *restrict ciow, jiff *restrict cxxx, jiff *restrict cyyy,
+void getstat(jiff *restrict cuse, jiff *restrict cice, jiff *restrict csys, jiff *restrict cide, jiff *restrict ciow, jiff *restrict cxxx, jiff *restrict cyyy, jiff *restrict czzz,
 	     unsigned long *restrict pin, unsigned long *restrict pout, unsigned long *restrict s_in, unsigned long *restrict sout,
 	     unsigned *restrict intr, unsigned *restrict ctxt,
 	     unsigned int *restrict running, unsigned int *restrict blocked,
@@ -386,7 +386,7 @@
   *cyyy = 0;  /* not separated out until the 2.6.0-test4 kernel */
 
   b = strstr(buff, "cpu ");
-  if(b) sscanf(b,  "cpu  %Lu %Lu %Lu %Lu %Lu %Lu %Lu", cuse, cice, csys, cide, ciow, cxxx, cyyy);
+  if(b) sscanf(b,  "cpu  %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu", cuse, cice, csys, cide, ciow, cxxx, cyyy, czzz);
 
   b = strstr(buff, "page ");
   if(b) sscanf(b,  "page %lu %lu", pin, pout);
--- procps-3.2.6/proc/sysinfo.h.steal	2006-04-20 18:36:56.000000000 +0200
+++ procps-3.2.6/proc/sysinfo.h	2006-04-20 18:37:47.000000000 +0200
@@ -56,7 +56,7 @@
 
 #define BUFFSIZE (64*1024)
 typedef unsigned long long jiff;
-extern void getstat(jiff *restrict cuse, jiff *restrict cice, jiff *restrict csys, jiff *restrict cide, jiff *restrict ciow, jiff *restrict cxxx, jiff *restrict cyyy,
+extern void getstat(jiff *restrict cuse, jiff *restrict cice, jiff *restrict csys, jiff *restrict cide, jiff *restrict ciow, jiff *restrict cxxx, jiff *restrict cyyy, jiff *restrict czzz,
 	     unsigned long *restrict pin, unsigned long *restrict pout, unsigned long *restrict s_in, unsigned long *restrict sout,
 	     unsigned *restrict intr, unsigned *restrict ctxt,
 	     unsigned int *restrict running, unsigned int *restrict blocked,
--- procps-3.2.6/vmstat.c.steal	2006-04-20 18:47:01.000000000 +0200
+++ procps-3.2.6/vmstat.c	2006-04-20 23:54:25.000000000 +0200
@@ -150,15 +150,15 @@
 ////////////////////////////////////////////////////////////////////////////
 
 static void new_header(void){
-  printf("procs -----------memory---------- ---swap-- -----io---- --system-- ----cpu----\n");
+  printf("procs -----------memory---------- ---swap-- -----io---- --system-- -----cpu------\n");
   printf(
-    "%2s %2s %6s %6s %6s %6s %4s %4s %5s %5s %4s %5s %2s %2s %2s %2s\n",
+    "%2s %2s %6s %6s %6s %6s %4s %4s %5s %5s %4s %5s %2s %2s %2s %2s %2s\n",
     "r","b",
     "swpd", "free", a_option?"inact":"buff", a_option?"active":"cache",
     "si","so",
     "bi","bo",
     "in","cs",
-    "us","sy","id","wa"
+    "us","sy","id","wa","st"
   );
 }
 
@@ -173,13 +173,13 @@
 ////////////////////////////////////////////////////////////////////////////
 
 static void new_format(void) {
-  const char format[]="%2u %2u %6lu %6lu %6lu %6lu %4u %4u %5u %5u %4u %5u %2u %2u %2u %2u\n";
+  const char format[]="%2u %2u %6lu %6lu %6lu %6lu %4u %4u %5u %5u %4u %5u %2u %2u %2u %2u %2u\n";
   unsigned int tog=0; /* toggle switch for cleaner code */
   unsigned int i;
   unsigned int hz = Hertz;
   unsigned int running,blocked,dummy_1,dummy_2;
-  jiff cpu_use[2], cpu_nic[2], cpu_sys[2], cpu_idl[2], cpu_iow[2], cpu_xxx[2], cpu_yyy[2];
-  jiff duse, dsys, didl, diow, Div, divo2;
+  jiff cpu_use[2], cpu_nic[2], cpu_sys[2], cpu_idl[2], cpu_iow[2], cpu_xxx[2], cpu_yyy[2], cpu_zzz[2];
+  jiff duse, dsys, didl, diow, dstl, Div, divo2;
   unsigned long pgpgin[2], pgpgout[2], pswpin[2], pswpout[2];
   unsigned int intr[2], ctxt[2];
   unsigned int sleep_half; 
@@ -190,7 +190,7 @@
   new_header();
   meminfo();
 
-  getstat(cpu_use,cpu_nic,cpu_sys,cpu_idl,cpu_iow,cpu_xxx,cpu_yyy,
+  getstat(cpu_use,cpu_nic,cpu_sys,cpu_idl,cpu_iow,cpu_xxx,cpu_yyy,cpu_zzz,
 	  pgpgin,pgpgout,pswpin,pswpout,
 	  intr,ctxt,
 	  &running,&blocked,
@@ -200,7 +200,8 @@
   dsys= *cpu_sys + *cpu_xxx + *cpu_yyy;
   didl= *cpu_idl;
   diow= *cpu_iow;
-  Div= duse+dsys+didl+diow;
+  dstl= *cpu_zzz;
+  Div= duse+dsys+didl+diow+dstl;
   divo2= Div/2UL;
   printf(format,
 	 running, blocked,
@@ -216,7 +217,8 @@
 	 (unsigned)( (100*duse                    + divo2) / Div ),
 	 (unsigned)( (100*dsys                    + divo2) / Div ),
 	 (unsigned)( (100*didl                    + divo2) / Div ),
-	 (unsigned)( (100*diow                    + divo2) / Div )
+	 (unsigned)( (100*diow                    + divo2) / Div ),
+	 (unsigned)( (100*dstl                    + divo2) / Div )
   );
 
   for(i=1;i<num_updates;i++) { /* \\\\\\\\\\\\\\\\\\\\ main loop ////////////////// */
@@ -226,7 +228,7 @@
 
     meminfo();
 
-    getstat(cpu_use+tog,cpu_nic+tog,cpu_sys+tog,cpu_idl+tog,cpu_iow+tog,cpu_xxx+tog,cpu_yyy+tog,
+    getstat(cpu_use+tog,cpu_nic+tog,cpu_sys+tog,cpu_idl+tog,cpu_iow+tog,cpu_xxx+tog,cpu_yyy+tog,cpu_zzz+tog,
 	  pgpgin+tog,pgpgout+tog,pswpin+tog,pswpout+tog,
 	  intr+tog,ctxt+tog,
 	  &running,&blocked,
@@ -236,6 +238,7 @@
     dsys= cpu_sys[tog]-cpu_sys[!tog] + cpu_xxx[tog]-cpu_xxx[!tog] + cpu_yyy[tog]-cpu_yyy[!tog];
     didl= cpu_idl[tog]-cpu_idl[!tog];
     diow= cpu_iow[tog]-cpu_iow[!tog];
+    dstl= cpu_zzz[tog]-cpu_zzz[!tog];
 
     /* idle can run backwards for a moment -- kernel "feature" */
     if(debt){
@@ -247,7 +250,7 @@
       didl = 0;
     }
 
-    Div= duse+dsys+didl+diow;
+    Div= duse+dsys+didl+diow+dstl;
     divo2= Div/2UL;
     printf(format,
            running, blocked,
@@ -263,7 +266,8 @@
 	   (unsigned)( (100*duse+divo2)/Div ), /*us*/
 	   (unsigned)( (100*dsys+divo2)/Div ), /*sy*/
 	   (unsigned)( (100*didl+divo2)/Div ), /*id*/
-	   (unsigned)( (100*diow+divo2)/Div )  /*wa*/
+	   (unsigned)( (100*diow+divo2)/Div ), /*wa*/
+           (unsigned)( (100*dstl+divo2)/Div )  /*st*/
     );
   }
 }
@@ -504,13 +508,13 @@
 
 static void sum_format(void) {
   unsigned int running, blocked, btime, processes;
-  jiff cpu_use, cpu_nic, cpu_sys, cpu_idl, cpu_iow, cpu_xxx, cpu_yyy;
+  jiff cpu_use, cpu_nic, cpu_sys, cpu_idl, cpu_iow, cpu_xxx, cpu_yyy, cpu_zzz;
   unsigned long pgpgin, pgpgout, pswpin, pswpout;
   unsigned int intr, ctxt;
 
   meminfo();
 
-  getstat(&cpu_use, &cpu_nic, &cpu_sys, &cpu_idl, &cpu_iow, &cpu_xxx, &cpu_yyy,
+  getstat(&cpu_use, &cpu_nic, &cpu_sys, &cpu_idl, &cpu_iow, &cpu_xxx, &cpu_yyy, &cpu_zzz,
 	  &pgpgin, &pgpgout, &pswpin, &pswpout,
 	  &intr, &ctxt,
 	  &running, &blocked,
@@ -530,6 +534,7 @@
   printf("%13Lu nice user cpu ticks\n", cpu_nic);
   printf("%13Lu system cpu ticks\n", cpu_sys);
   printf("%13Lu idle cpu ticks\n", cpu_idl);
+  printf("%13Lu steal cpu ticks\n", cpu_zzz);
   printf("%13Lu IO-wait cpu ticks\n", cpu_iow);
   printf("%13Lu IRQ cpu ticks\n", cpu_xxx);
   printf("%13Lu softirq cpu ticks\n", cpu_yyy);
@@ -547,11 +552,11 @@
 
 static void fork_format(void) {
   unsigned int running, blocked, btime, processes;
-  jiff cpu_use, cpu_nic, cpu_sys, cpu_idl, cpu_iow, cpu_xxx, cpu_yyy;
+  jiff cpu_use, cpu_nic, cpu_sys, cpu_idl, cpu_iow, cpu_xxx, cpu_yyy, cpu_zzz;
   unsigned long pgpgin, pgpgout, pswpin, pswpout;
   unsigned int intr, ctxt;
 
-  getstat(&cpu_use, &cpu_nic, &cpu_sys, &cpu_idl, &cpu_iow, &cpu_xxx, &cpu_yyy,
+  getstat(&cpu_use, &cpu_nic, &cpu_sys, &cpu_idl, &cpu_iow, &cpu_xxx, &cpu_yyy, &cpu_zzz,
 	  &pgpgin, &pgpgout, &pswpin, &pswpout,
 	  &intr, &ctxt,
 	  &running, &blocked,

procps-3.2.6-top-env-cpuloop.patch:
 top.1 |    7 +++++++
 top.c |   27 +++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

--- NEW FILE procps-3.2.6-top-env-cpuloop.patch ---
--- procps-3.2.6/top.c.env-cpuloop	2006-04-19 19:42:22.000000000 +0200
+++ procps-3.2.6/top.c	2006-04-19 19:44:07.000000000 +0200
@@ -121,6 +121,7 @@
            Secure_mode = 0;     // set if some functionality restricted
 
 static int VIRT_vmsize = 0;	//use vm_size for VIRT 
+static int CPU_loop = 0;	// wait for reliable CPU data
 
         /* Some cap's stuff to reduce runtime calls --
            to accomodate 'Batch' mode, they begin life as empty strings */
@@ -1672,6 +1673,8 @@
    
    if (( getenv("STATSIZE")) && ( atoi(getenv("STATSIZE")) == 1 )) 
 	   VIRT_vmsize = 1;
+   if (( getenv("CPULOOP")) && ( atoi(getenv("CPULOOP")) == 1 )) 
+	   CPU_loop = 1;
 }
 
 
@@ -2949,6 +2952,7 @@
 {
    static proc_t **p_table = NULL;
    static CPU_t  *smpcpu = NULL;
+   static int first = 0;
 
    // whoa first time, gotta' prime the pump...
    if (!p_table) {
@@ -2996,6 +3000,27 @@
 
       smpcpu = cpus_refresh(smpcpu);
 
+      if (first==0 && CPU_loop)
+      {
+	 int i;
+	 CPU_t *cpu;
+	 for (i = 0; i < Cpu_tot; i++) {
+           cpu =  &smpcpu[i];
+	   cpu->u_sav = cpu->u;
+	   cpu->s_sav = cpu->s;
+	   cpu->n_sav = cpu->n;
+	   cpu->i_sav = cpu->i;
+	   cpu->w_sav = cpu->w;
+	   cpu->x_sav = cpu->x;
+	   cpu->y_sav = cpu->y;
+	 }
+         tv.tv_sec = Rc.delay_time;
+         tv.tv_usec = (Rc.delay_time - (int)Rc.delay_time) * 1000000;
+         select(0, NULL, NULL, NULL, &tv);
+
+	 smpcpu = cpus_refresh(smpcpu);
+      }
+
       if (CHKw(Curwin, View_CPUSUM)) {
          // display just the 1st /proc/stat line
          summaryhlp(&smpcpu[Cpu_tot], "Cpu(s):");
@@ -3021,6 +3046,8 @@
    }
 
    SETw(Curwin, NEWFRAM_cwo);
+
+   first = 1;
    return p_table;
 }
 
--- procps-3.2.6/top.1.env-cpuloop	2006-04-19 19:42:22.000000000 +0200
+++ procps-3.2.6/top.1	2006-04-19 19:42:22.000000000 +0200
@@ -1173,6 +1173,13 @@
 Send bug reports to:
    Albert D\. Cahalan, <albert at users.sf.net>
 
+The top command calculates Cpu(s) by looking at the change in CPU time values
+between samples. When you first run it, it has no previous sample to compare
+to, so these initial values are the percentages since boot. It means you need
+at least two loops or you have to ignore summary output from the first loop.
+This is problem for example for batch mode. There is a possible workaround if
+you define the CPULOOP=1 environment variable. The top command will be run one
+extra hidden loop for CPU data before standard output.
 
 .\" ----------------------------------------------------------------------
 .SH 8. HISTORY Former top

procps-3.2.6-top-env-vmsize.patch:
 top.1 |    3 ++-
 top.c |   11 ++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE procps-3.2.6-top-env-vmsize.patch ---
--- procps-3.2.6/top.1.env-vmsize	2006-04-19 16:50:37.000000000 +0200
+++ procps-3.2.6/top.1	2006-04-19 16:59:23.000000000 +0200
@@ -395,7 +395,8 @@
 o:\fB VIRT\fR \*(EM Virtual Image (kb)
 The total amount of \*(MV used by the task.
 It includes all code, data and shared libraries plus pages that have been
-swapped out.
+swapped out. (Note: you can define the STATSIZE=1 environment variable and the VIRT
+will be calculated from the /proc/#/state VmSize field.)
 
 VIRT = SWAP + RES.
 
--- procps-3.2.6/top.c.env-vmsize	2006-04-19 16:35:20.000000000 +0200
+++ procps-3.2.6/top.c	2006-04-19 16:50:25.000000000 +0200
@@ -120,6 +120,8 @@
            Loops = -1,          // number of iterations, -1 loops forever
            Secure_mode = 0;     // set if some functionality restricted
 
+static int VIRT_vmsize = 0;	//use vm_size for VIRT 
+
         /* Some cap's stuff to reduce runtime calls --
            to accomodate 'Batch' mode, they begin life as empty strings */
 static char  Cap_clr_eol    [CAPBUFSIZ],
@@ -1667,6 +1669,9 @@
       Fieldstab[P_PPD].fmts = pid_fmt;
       Fieldstab[P_PPD].head = "       PPID" + 10 - pid_digits;
    }
+   
+   if (( getenv("STATSIZE")) && ( atoi(getenv("STATSIZE")) == 1 )) 
+	   VIRT_vmsize = 1;
 }
 
 
@@ -2194,6 +2199,7 @@
    }
    if (!Frames_libflags) Frames_libflags = L_DEFAULT;
    if (selection_type=='p') Frames_libflags |= PROC_PID;
+   if (VIRT_vmsize) Frames_libflags |= L_status;
 }
 
 
@@ -3157,7 +3163,10 @@
             MKCOL(p->ruser);
             break;
          case P_VRT:
-            MKCOL(scale_num(PAGES_TO_KB(p->size), w, s));
+ 	    if (VIRT_vmsize) 
+		    MKCOL(scale_num(PAGES_TO_KB(p->vm_size), w, s));
+ 	    else
+		    MKCOL(scale_num(PAGES_TO_KB(p->size), w, s));
             break;
          case P_WCH:
             if (No_ksyms) {

procps-3.2.5-top-remcpu.patch:
 top.c |   61 +++++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 43 insertions(+), 18 deletions(-)

Index: procps-3.2.5-top-remcpu.patch
===================================================================
RCS file: /cvs/dist/rpms/procps/FC-5/procps-3.2.5-top-remcpu.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- procps-3.2.5-top-remcpu.patch	1 Nov 2005 10:37:33 -0000	1.1
+++ procps-3.2.5-top-remcpu.patch	20 Apr 2006 22:37:08 -0000	1.2
@@ -1,6 +1,6 @@
---- procps-3.2.5/top.c.remcpu	2005-10-12 14:11:22.000000000 +0200
-+++ procps-3.2.5/top.c	2005-10-12 14:49:59.000000000 +0200
-@@ -910,6 +910,7 @@
+--- procps-3.2.3/top.c.remcpu	2006-04-18 12:00:28.000000000 +0200
++++ procps-3.2.3/top.c	2006-04-18 12:20:04.000000000 +0200
+@@ -901,6 +901,7 @@
  static CPU_t *cpus_refresh (CPU_t *cpus)
  {
     static FILE *fp = NULL;
@@ -8,7 +8,7 @@
     int i;
     int num;
     // enough for a /proc/stat CPU line (not the intr line)
-@@ -924,34 +925,33 @@
+@@ -915,34 +916,33 @@
                 can hold tics representing the /proc/stat cpu summary (the first
                 line read) -- that slot supports our View_CPUSUM toggle */
        cpus = alloc_c((1 + Cpu_tot) * sizeof(CPU_t));
@@ -58,7 +58,7 @@
        if (!fgets(buf, sizeof(buf), fp)) std_err("failed /proc/stat read");
        cpus[i].x = 0;  // FIXME: can't tell by kernel version number
        cpus[i].y = 0;  // FIXME: can't tell by kernel version number
-@@ -959,9 +959,28 @@
+@@ -950,9 +950,34 @@
           &cpus[i].id,
           &cpus[i].u, &cpus[i].n, &cpus[i].s, &cpus[i].i, &cpus[i].w, &cpus[i].x, &cpus[i].y
        );
@@ -82,8 +82,14 @@
 +
 +   // and just in case we're 2.2.xx compiled without SMP support...
 +   if (Cpu_tot == 1) {
-+      cpus[1].id = 0;
-+      memcpy(cpus, &cpus[1], sizeof(CPU_t));
++      cpus[0].id = cpus[1].id = 0;
++      cpus[0].u = cpus[1].u;
++      cpus[0].n = cpus[1].n;
++      cpus[0].s = cpus[1].s;
++      cpus[0].i = cpus[1].i;
++      cpus[0].w = cpus[1].w;
++      cpus[0].x = cpus[1].x;
++      cpus[0].y = cpus[1].y;
 +   }
 +   
     return cpus;


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/FC-5/procps.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- procps.spec	11 Feb 2006 05:17:46 -0000	1.46
+++ procps.spec	20 Apr 2006 22:37:08 -0000	1.47
@@ -1,18 +1,18 @@
 Summary: System and process monitoring utilities.
 Name: procps
 Version: 3.2.6
-Release: 3.2
+Release: 3.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
+
 Patch1: procps-3.2.5-selinux.patch
 Patch2: procps-3.1.15-misc.patch
 Patch3: procps-3.2.3-FAQ.patch
 Patch4: procps-3.2.1-selinux-workaround.patch
-Patch5: procps-3.2.1-top-vmsize-env.patch
 Patch6: procps-3.2.3-noproc.patch
 Patch7: procps-3.2.3-pseudo.patch
 Patch8: procps-3.2.4-0x9b.patch
@@ -21,8 +21,18 @@
 # 161449 - "top" ignores user and system toprc
 Patch10: procps-3.2.5-top-rc.patch
 # 161303 - 'top' failed when remove cpus
+# 186017 - Top "Cpu0" line never updates on single processor machine
 Patch11: procps-3.2.5-top-remcpu.patch
+# Selinux
 Patch12: procps-3.2.6-libselinux.patch
+# 168444 - Memory usage conflicts with /proc/meminfo 
+Patch13: procps-3.2.3-slabtop-man.patch
+# 177453 - for VIRT use proc->vm_size rather then proc->size (workaround)
+Patch14: procps-3.2.6-top-env-vmsize.patch
+# 174619 - workaround for reliable Cpu(s) data in the first loop
+Patch15: procps-3.2.6-top-env-cpuloop.patch
+# 185299 ??? cpu steal time support
+Patch16: procps-3.2.6-cpu-steal.patch
 
 BuildRequires: ncurses-devel
 
@@ -54,7 +64,6 @@
 %patch2 -p1 -b .misc
 %patch3 -p1 -b .FAQ
 %patch4 -p1 -b .selinux-workaround
-%patch5 -p1 -b .top-vmsize-env
 %patch6 -p1 -b .noproc
 %patch7 -p1 -b .pseudo
 %patch8 -p1 -b .0x9b
@@ -62,6 +71,10 @@
 %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
 
 cp %SOURCE1 .
 
@@ -99,6 +112,13 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Wed Apr 19 2006 Karel Zak <kzak at redhat.com> - 3.2.6-3.3
+- fix #186017 - top "Cpu0" line never updates on single processor machine
+                (bugfix added to the 'remcpu' patch)
+- fix #168444 - memory usage conflicts with /proc/meminfo
+- fix #174619 - top reports wrong values for CPU(s) in batch mode
+- fix #185299 ??? cpu steal time support
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.2.6-3.2
 - bump again for double-long bug on ppc(64)
 


--- procps-3.2.1-top-vmsize-env.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 20 22:41:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 18:41:25 -0400
Subject: rpms/avahi/devel avahi-0.6.9-bz189427.patch, NONE, 1.1 avahi.spec,
	1.51, 1.52
Message-ID: <200604202241.k3KMfPrB013575@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13539

Modified Files:
	avahi.spec 
Added Files:
	avahi-0.6.9-bz189427.patch 
Log Message:
fix bug 189427: correct avahi-resolve --help typo

avahi-0.6.9-bz189427.patch:
 avahi-resolve.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE avahi-0.6.9-bz189427.patch ---
--- avahi-0.6.9/avahi-utils/avahi-resolve.c.bz189427	2005-11-16 17:34:54.000000000 -0500
+++ avahi-0.6.9/avahi-utils/avahi-resolve.c	2006-04-20 18:37:01.000000000 -0400
@@ -168,8 +168,8 @@
             "    -v --verbose         Enable verbose mode\n"
             "    -6                   Lookup IPv6 address\n"
             "    -4                   Lookup IPv4 address\n",
-            argv0, strstr(argv0, "address") ? "[-a]" : "-a",
-            argv0, strstr(argv0, "host-name") ? "[-n]" : "-n");
+            argv0, strstr(argv0, "host-name") ? "[-n]" : "-n",
+            argv0, strstr(argv0, "address") ? "[-a]" : "-a");
 }
 
 static int parse_command_line(Config *c, const char *argv0, int argc, char *argv[]) {


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- avahi.spec	14 Apr 2006 02:02:49 -0000	1.51
+++ avahi.spec	20 Apr 2006 22:41:22 -0000	1.52
@@ -4,7 +4,7 @@
 %endif
 Name:           avahi
 Version:        0.6.9
-Release: 	8.FC6
+Release: 	9.FC6
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -32,6 +32,7 @@
 Patch11:        avahi-0.6.5-bz179448.patch
 Patch12:	avahi-0.6.7-initscript.patch
 Patch13: 	avahi-0.6.9-bz185972.patch
+Patch14:	avahi-0.6.9-bz189427.patch
 
 %description
 Avahi is a system which facilitates service discovery on
@@ -141,6 +142,7 @@
 #^- this patch now upstream
 %patch12 -p1 -b .initscript
 %patch13 -p1 -b .bz185972
+%patch14 -p1 -b .bz189427
 
 %build
 # auto* update needed for avahi-0.5.2-fedora.patch
@@ -321,6 +323,9 @@
 %endif
 
 %changelog
+* Thu Apr 20 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.9-9.FC6
+- fix bug 189427: correct avahi-resolve --help typo
+
 * Mon Mar 20 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.9-8.FC6
 - fix bug 185972: remove ellipses in initscript
 - fix bug 185965: make chkconfigs unconditional



From fedora-cvs-commits at redhat.com  Thu Apr 20 23:27:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 19:27:50 -0400
Subject: rpms/procps/FC-5 procps.spec,1.47,1.48
Message-ID: <200604202327.k3KNRooE019808@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/procps/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19769

Modified Files:
	procps.spec 
Log Message:
remove non-ascii chars from spec file


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/FC-5/procps.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- procps.spec	20 Apr 2006 22:37:08 -0000	1.47
+++ procps.spec	20 Apr 2006 23:27:46 -0000	1.48
@@ -31,7 +31,7 @@
 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
+# 185299 - cpu steal time support
 Patch16: procps-3.2.6-cpu-steal.patch
 
 BuildRequires: ncurses-devel
@@ -117,7 +117,7 @@
                 (bugfix added to the 'remcpu' patch)
 - fix #168444 - memory usage conflicts with /proc/meminfo
 - fix #174619 - top reports wrong values for CPU(s) in batch mode
-- fix #185299 ??? cpu steal time support
+- fix #185299 - cpu steal time support
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.2.6-3.2
 - bump again for double-long bug on ppc(64)



From fedora-cvs-commits at redhat.com  Thu Apr 20 23:29:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 19:29:10 -0400
Subject: rpms/procinfo/FC-5 procinfo-18-cpu-steal.patch, NONE,
	1.1 procinfo.spec, 1.19, 1.20
Message-ID: <200604202329.k3KNTAbm020068@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/procinfo/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20037

Modified Files:
	procinfo.spec 
Added Files:
	procinfo-18-cpu-steal.patch 
Log Message:
add steal time

procinfo-18-cpu-steal.patch:
 procinfo.8 |    4 ++++
 procinfo.c |    5 +++++
 procinfo.h |    2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE procinfo-18-cpu-steal.patch ---
--- procinfo-18/procinfo.h.steal	2006-04-21 01:09:52.000000000 +0200
+++ procinfo-18/procinfo.h	2006-04-21 01:10:36.000000000 +0200
@@ -81,7 +81,7 @@
     unsigned long uptime;
     long m_to, m_us, m_fr, m_sh, m_bu, m_ca;
     long s_to, s_us, s_fr;
-    unsigned long cpu_user, cpu_nice, cpu_sys, cpu_idle;
+    unsigned long cpu_user, cpu_nice, cpu_sys, cpu_idle, cpu_steal;
     unsigned long cpu_iowait, cpu_irq, cpu_softirq;
     unsigned long disk[5];
     unsigned long disk_r[5];
--- procinfo-18/procinfo.8.steal	2006-04-21 01:22:58.000000000 +0200
+++ procinfo-18/procinfo.8	2006-04-21 01:24:01.000000000 +0200
@@ -61,6 +61,10 @@
 The amount of time spent doing nothing.
 
 .TP
+.BI steal:
+The amount of time spent the virtual CPU waiting for physical CPU.
+
+.TP
 .BI uptime:
 The time that the system has been up. The above four should more or
 less add up to this one.
--- procinfo-18/procinfo.c.steal	2006-04-21 01:10:58.000000000 +0200
+++ procinfo-18/procinfo.c	2006-04-21 01:22:25.000000000 +0200
@@ -252,6 +252,8 @@
 	    new.cpu_iowait = VAL;
 	    new.cpu_irq = VAL;
 	    new.cpu_softirq = VAL;
+	    new.cpu_steal = VAL;
+
 	    /*
 	     * according to bug #1959, sometimes the cpu_idle
 	     * seems to go backwards(!) on SMP boxes.  This may
@@ -400,6 +402,9 @@
     else
 	putchar ('\n');
 
+    printf ("steal : %s %s\n",
+	    hms (bDIFF (cpu_steal)), perc (bDIFF (cpu_steal), elapsed, nr_cpus));
+
     printf ("uptime: %s         context :%9lu", hms (new.uptime),
 	    bDIFF (ctxt));
     if (new.syscalls)	/* If we have this, we can use the old interrupts spot. */


Index: procinfo.spec
===================================================================
RCS file: /cvs/dist/rpms/procinfo/FC-5/procinfo.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- procinfo.spec	11 Feb 2006 05:16:29 -0000	1.19
+++ procinfo.spec	20 Apr 2006 23:29:06 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A tool for gathering and displaying system information.
 Name: procinfo
 Version: 18
-Release: 18.2.1
+Release: 18.2.2
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.cistron.nl/pub/people/svm/%{name}-%{version}.tar.bz2
@@ -13,6 +13,7 @@
 Patch8: procinfo-18-mharris-use-sysconf.patch
 Patch9: procinfo-18-maxdev.patch
 Patch10: procinfo-18-ranges.patch
+Patch11: procinfo-18-cpu-steal.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtermcap-devel
 
@@ -35,6 +36,7 @@
 %patch8 -p1 -b .mharris-use-sysconf
 %patch9 -p1 -b .maxdev
 %patch10 -p1 -b .ranges
+%patch11 -p1 -b .steal
 
 %build
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LDFLAGS=
@@ -59,6 +61,9 @@
 %{_mandir}/man8/socklist.8*
 
 %changelog
+* Fri Apr 21 2006 Karel Zak <kzak at redhat.com> - 18-18.2.2
+- fix #185300 - cpu steal time support
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 18-18.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Thu Apr 20 23:37:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 19:37:55 -0400
Subject: rpms/procinfo/devel procinfo-18-cpu-steal.patch, NONE,
	1.1 procinfo.spec, 1.19, 1.20
Message-ID: <200604202337.k3KNbtrD021139@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/procinfo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21103

Modified Files:
	procinfo.spec 
Added Files:
	procinfo-18-cpu-steal.patch 
Log Message:
add cpu steal

procinfo-18-cpu-steal.patch:
 procinfo.8 |    4 ++++
 procinfo.c |    5 +++++
 procinfo.h |    2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE procinfo-18-cpu-steal.patch ---
--- procinfo-18/procinfo.h.steal	2006-04-21 01:09:52.000000000 +0200
+++ procinfo-18/procinfo.h	2006-04-21 01:10:36.000000000 +0200
@@ -81,7 +81,7 @@
     unsigned long uptime;
     long m_to, m_us, m_fr, m_sh, m_bu, m_ca;
     long s_to, s_us, s_fr;
-    unsigned long cpu_user, cpu_nice, cpu_sys, cpu_idle;
+    unsigned long cpu_user, cpu_nice, cpu_sys, cpu_idle, cpu_steal;
     unsigned long cpu_iowait, cpu_irq, cpu_softirq;
     unsigned long disk[5];
     unsigned long disk_r[5];
--- procinfo-18/procinfo.8.steal	2006-04-21 01:22:58.000000000 +0200
+++ procinfo-18/procinfo.8	2006-04-21 01:24:01.000000000 +0200
@@ -61,6 +61,10 @@
 The amount of time spent doing nothing.
 
 .TP
+.BI steal:
+The amount of time spent the virtual CPU waiting for physical CPU.
+
+.TP
 .BI uptime:
 The time that the system has been up. The above four should more or
 less add up to this one.
--- procinfo-18/procinfo.c.steal	2006-04-21 01:10:58.000000000 +0200
+++ procinfo-18/procinfo.c	2006-04-21 01:22:25.000000000 +0200
@@ -252,6 +252,8 @@
 	    new.cpu_iowait = VAL;
 	    new.cpu_irq = VAL;
 	    new.cpu_softirq = VAL;
+	    new.cpu_steal = VAL;
+
 	    /*
 	     * according to bug #1959, sometimes the cpu_idle
 	     * seems to go backwards(!) on SMP boxes.  This may
@@ -400,6 +402,9 @@
     else
 	putchar ('\n');
 
+    printf ("steal : %s %s\n",
+	    hms (bDIFF (cpu_steal)), perc (bDIFF (cpu_steal), elapsed, nr_cpus));
+
     printf ("uptime: %s         context :%9lu", hms (new.uptime),
 	    bDIFF (ctxt));
     if (new.syscalls)	/* If we have this, we can use the old interrupts spot. */


Index: procinfo.spec
===================================================================
RCS file: /cvs/dist/rpms/procinfo/devel/procinfo.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- procinfo.spec	11 Feb 2006 05:16:29 -0000	1.19
+++ procinfo.spec	20 Apr 2006 23:37:51 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A tool for gathering and displaying system information.
 Name: procinfo
 Version: 18
-Release: 18.2.1
+Release: 18.3
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.cistron.nl/pub/people/svm/%{name}-%{version}.tar.bz2
@@ -13,6 +13,7 @@
 Patch8: procinfo-18-mharris-use-sysconf.patch
 Patch9: procinfo-18-maxdev.patch
 Patch10: procinfo-18-ranges.patch
+Patch11: procinfo-18-cpu-steal.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtermcap-devel
 
@@ -35,6 +36,7 @@
 %patch8 -p1 -b .mharris-use-sysconf
 %patch9 -p1 -b .maxdev
 %patch10 -p1 -b .ranges
+%patch11 -p1 -b .steal
 
 %build
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LDFLAGS=
@@ -59,6 +61,9 @@
 %{_mandir}/man8/socklist.8*
 
 %changelog
+* Fri Apr 21 2006 Karel Zak <kzak at redhat.com> - 18-18.2.3
+- fix #185300 - cpu steal time support
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 18-18.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Apr 21 01:48:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 21:48:24 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2144,1.2145
Message-ID: <200604210148.k3L1mOEc004646@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4597

Modified Files:
	kernel-2.6.spec 
Log Message:
test



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2144
retrieving revision 1.2145
diff -u -r1.2144 -r1.2145
--- kernel-2.6.spec	21 Apr 2006 00:11:20 -0000	1.2144
+++ kernel-2.6.spec	21 Apr 2006 01:48:20 -0000	1.2145
@@ -982,7 +982,7 @@
 # Change PHYSICAL_START
 %patch2103 -p1
 # Use unicode VT's by default.
-%patch2104 -p1
+#%patch2104 -p1
 
 # Enable PATA ports on Promise SATA.
 #%patch2200 -p1



From fedora-cvs-commits at redhat.com  Fri Apr 21 03:21:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 23:21:16 -0400
Subject: rpms/kernel/devel linux-2.6-sata-ahci-suspend.patch, NONE,
	1.1 kernel-2.6.spec, 1.2145, 1.2146
Message-ID: <200604210321.k3L3LG69004138@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4119

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-sata-ahci-suspend.patch 
Log Message:
fix ahci suspend


linux-2.6-sata-ahci-suspend.patch:
 ahci.c |  194 +++++++++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 141 insertions(+), 53 deletions(-)

--- NEW FILE linux-2.6-sata-ahci-suspend.patch ---
diff -ur linux-2.6.16.noarch/drivers/scsi/ahci.c linux-ahci.suspend/drivers/scsi/ahci.c
--- linux-2.6.16.noarch/drivers/scsi/ahci.c	2006-04-20 14:39:10.000000000 -0400
+++ linux-ahci.suspend/drivers/scsi/ahci.c	2006-04-20 22:57:54.000000000 -0400
@@ -44,6 +44,7 @@
 #include <linux/device.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_device.h>
 #include <linux/libata.h>
 #include <asm/io.h>
 
@@ -194,8 +195,14 @@
 static int ahci_probe_reset(struct ata_port *ap, unsigned int *classes);
 static void ahci_irq_clear(struct ata_port *ap);
 static void ahci_eng_timeout(struct ata_port *ap);
+static int ahci_scsi_device_suspend(struct scsi_device *sdev, pm_message_t state);
+static int ahci_scsi_device_resume(struct scsi_device *sdev);
 static int ahci_port_start(struct ata_port *ap);
+static void ahci_port_suspend(struct ata_port *ap);
+static void ahci_port_resume(struct ata_port *ap);
 static void ahci_port_stop(struct ata_port *ap);
+static void ahci_start_engine(struct ata_port *ap);
+static int ahci_stop_engine(struct ata_port *ap);
 static void ahci_tf_read(struct ata_port *ap, struct ata_taskfile *tf);
 static void ahci_qc_prep(struct ata_queued_cmd *qc);
 static u8 ahci_check_status(struct ata_port *ap);
@@ -217,6 +224,8 @@
 	.dma_boundary		= AHCI_DMA_BOUNDARY,
 	.slave_configure	= ata_scsi_slave_config,
 	.bios_param		= ata_std_bios_param,
+	.resume			= ahci_scsi_device_resume,
+	.suspend		= ahci_scsi_device_suspend,
 };
 
 static const struct ata_port_operations ahci_ops = {
@@ -305,6 +314,8 @@
 	.id_table		= ahci_pci_tbl,
 	.probe			= ahci_init_one,
 	.remove			= ahci_remove_one,
+	.suspend		= ata_pci_device_suspend,
+	.resume			= ata_pci_device_resume,
 };
 
 
@@ -321,10 +332,7 @@
 static int ahci_port_start(struct ata_port *ap)
 {
 	struct device *dev = ap->host_set->dev;
-	struct ahci_host_priv *hpriv = ap->host_set->private_data;
 	struct ahci_port_priv *pp;
-	void __iomem *mmio = ap->host_set->mmio_base;
-	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
 	void *mem;
 	dma_addr_t mem_dma;
 	int rc;
@@ -378,6 +386,22 @@
 
 	ap->private_data = pp;
 
+	/*
+	 * Internal structures are initialized,
+	 * we can now do a simple resume()
+	 */
+	ahci_port_resume(ap);
+
+	return 0;
+}
+
+static void ahci_port_resume(struct ata_port *ap)
+{
+	void *mmio = ap->host_set->mmio_base;
+	void *port_mmio = ahci_port_base(mmio, ap->port_no);
+	struct ahci_host_priv *hpriv = ap->host_set->private_data;
+	struct ahci_port_priv *pp = ap->private_data;
+
 	if (hpriv->cap & HOST_CAP_64)
 		writel((pp->cmd_slot_dma >> 16) >> 16, port_mmio + PORT_LST_ADDR_HI);
 	writel(pp->cmd_slot_dma & 0xffffffff, port_mmio + PORT_LST_ADDR);
@@ -389,31 +413,49 @@
 	readl(port_mmio + PORT_FIS_ADDR); /* flush */
 
 	writel(PORT_CMD_ICC_ACTIVE | PORT_CMD_FIS_RX |
-	       PORT_CMD_POWER_ON | PORT_CMD_SPIN_UP |
-	       PORT_CMD_START, port_mmio + PORT_CMD);
+	       PORT_CMD_POWER_ON | PORT_CMD_SPIN_UP,
+	       port_mmio + PORT_CMD);
 	readl(port_mmio + PORT_CMD); /* flush */
 
-	return 0;
+	ahci_start_engine(ap);
 }
 
-
-static void ahci_port_stop(struct ata_port *ap)
+static void ahci_port_suspend(struct ata_port *ap)
 {
-	struct device *dev = ap->host_set->dev;
-	struct ahci_port_priv *pp = ap->private_data;
-	void __iomem *mmio = ap->host_set->mmio_base;
-	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
+	void *mmio = ap->host_set->mmio_base;
+	void *port_mmio = ahci_port_base(mmio, ap->port_no);
 	u32 tmp;
+	int work;
 
+	ahci_stop_engine(ap);
+
+	/*
+	 * Disable FIS reception
+	 */
 	tmp = readl(port_mmio + PORT_CMD);
-	tmp &= ~(PORT_CMD_START | PORT_CMD_FIS_RX);
+	tmp &= ~(PORT_CMD_FIS_RX);
 	writel(tmp, port_mmio + PORT_CMD);
 	readl(port_mmio + PORT_CMD); /* flush */
 
-	/* spec says 500 msecs for each PORT_CMD_{START,FIS_RX} bit, so
-	 * this is slightly incorrect.
+	/*
+	 * Wait for HBA to acknowledge.
+	 * This could be as long as 500 msec
 	 */
-	msleep(500);
+	work = 1000;
+	while (work-- > 0) {
+		tmp = readl(port_mmio + PORT_CMD);
+		if ((tmp & PORT_CMD_FIS_ON) == 0)
+			break;
+		udelay(10);
+	}
+}
+
+static void ahci_port_stop(struct ata_port *ap)
+{
+	struct device *dev = ap->host_set->dev;
+	struct ahci_port_priv *pp = ap->private_data;
+
+	ahci_port_suspend(ap);
 
 	ap->private_data = NULL;
 	dma_free_coherent(dev, AHCI_PORT_PRIV_DMA_SZ,
@@ -456,43 +498,6 @@
 	writel(val, (void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4));
 }
 
-static int ahci_stop_engine(struct ata_port *ap)
-{
-	void __iomem *mmio = ap->host_set->mmio_base;
-	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
-	int work;
-	u32 tmp;
-
-	tmp = readl(port_mmio + PORT_CMD);
-	tmp &= ~PORT_CMD_START;
-	writel(tmp, port_mmio + PORT_CMD);
-
-	/* wait for engine to stop.  TODO: this could be
-	 * as long as 500 msec
-	 */
-	work = 1000;
-	while (work-- > 0) {
-		tmp = readl(port_mmio + PORT_CMD);
-		if ((tmp & PORT_CMD_LIST_ON) == 0)
-			return 0;
-		udelay(10);
-	}
-
-	return -EIO;
-}
-
-static void ahci_start_engine(struct ata_port *ap)
-{
-	void __iomem *mmio = ap->host_set->mmio_base;
-	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
-	u32 tmp;
-
-	tmp = readl(port_mmio + PORT_CMD);
-	tmp |= PORT_CMD_START;
-	writel(tmp, port_mmio + PORT_CMD);
-	readl(port_mmio + PORT_CMD); /* flush */
-}
-
 static unsigned int ahci_dev_classify(struct ata_port *ap)
 {
 	void __iomem *port_mmio = (void __iomem *) ap->ioaddr.cmd_addr;
@@ -772,6 +777,65 @@
 	ahci_fill_cmd_slot(pp, opts);
 }
 
+static void ahci_start_engine(struct ata_port *ap)
+{
+	void __iomem *mmio = ap->host_set->mmio_base;
+	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
+	u32 tmp;
+	int work;
+
+	tmp = readl(port_mmio + PORT_CMD);
+	/*
+	 * AHCI rev 1.1 section 10.3.1:
+	 * Software shall not set PxCMD.ST to ???1??? until it verifies
+	 * that PxCMD.CR is ???0??? and has set PxCMD.FRE to ???1???.
+	 */
+	if ((tmp & PORT_CMD_FIS_RX) == 0)
+		printk(KERN_WARNING "ata%d: dma not running\n",ap->id);
+	/* 
+	 * wait for engine to become idle.
+	 */
+	work = 1000;
+	while (work-- > 0) {
+		tmp = readl(port_mmio + PORT_CMD);
+		if ((tmp & PORT_CMD_LIST_ON) == 0)
+			break;
+		udelay(10);
+	}
+	
+	/*
+	 * Start DMA
+	 */
+	tmp |= PORT_CMD_START;
+	writel(tmp, port_mmio + PORT_CMD);
+	readl(port_mmio + PORT_CMD); /* flush */
+}
+
+static int ahci_stop_engine(struct ata_port *ap)
+{
+	void __iomem *mmio = ap->host_set->mmio_base;
+	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
+	int work;
+	u32 tmp;
+
+	tmp = readl(port_mmio + PORT_CMD);
+	tmp &= ~PORT_CMD_START;
+	writel(tmp, port_mmio + PORT_CMD);
+
+	/* 
+	 * wait for engine to become idle
+	 */
+	work = 1000;
+	while (work-- > 0) {
+		tmp = readl(port_mmio + PORT_CMD);
+		if ((tmp & PORT_CMD_LIST_ON) == 0)
+			return 0;
+		udelay(10);
+	}
+
+	return -EIO;
+}
+
 static void ahci_restart_port(struct ata_port *ap, u32 irq_stat)
 {
 	void __iomem *mmio = ap->host_set->mmio_base;
@@ -953,6 +1017,30 @@
 	return 0;
 }
 
+static int ahci_scsi_device_suspend(struct scsi_device *sdev, pm_message_t state)
+{
+	struct ata_port *ap = (struct ata_port *) &sdev->host->hostdata[0];
+	struct ata_device *dev = &ap->device[sdev->id];
+	int rc;
+
+	rc = ata_device_suspend(ap, dev, state);
+
+	if (!rc)
+		ahci_port_suspend(ap);
+
+	return rc;
+}
+
+static int ahci_scsi_device_resume(struct scsi_device *sdev)
+{
+	struct ata_port *ap = (struct ata_port *) &sdev->host->hostdata[0];
+	struct ata_device *dev = &ap->device[sdev->id];
+
+	ahci_port_resume(ap);
+
+	return ata_device_resume(ap, dev);
+}
+
 static void ahci_setup_port(struct ata_ioports *port, unsigned long base,
 			    unsigned int port_idx)
 {


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2145
retrieving revision 1.2146
diff -u -r1.2145 -r1.2146
--- kernel-2.6.spec	21 Apr 2006 01:48:20 -0000	1.2145
+++ kernel-2.6.spec	21 Apr 2006 03:21:12 -0000	1.2146
@@ -364,6 +364,7 @@
 # SATA Bits
 Patch2200: linux-2.6-sata-promise-pata-ports.patch
 Patch2201: linux-2.6-sata-silence-dumb-msg.patch
+Patch2202: linux-2.6-sata-ahci-suspend.patch
 
 # ACPI bits
 Patch2300: linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch
@@ -988,6 +989,8 @@
 #%patch2200 -p1
 # Silence silly SATA printk.
 %patch2201 -p1
+# Fix AHCI Suspend.
+%patch2202 -p1
 
 # ACPI patches
 # Silence more ACPI debug spew from suspend.
@@ -1662,6 +1665,7 @@
 %changelog
 * Thu Apr 20 2006 Dave Jones <davej at redhat.com>
 - 2.6.17rc2-git3
+- Make AHCI suspend/resume work.
 
 * Wed Apr 19 2006 Dave Jones <davej at redhat.com>
 - 2.6.17rc2-git1



From fedora-cvs-commits at redhat.com  Fri Apr 21 03:49:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Apr 2006 23:49:40 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2146,1.2147
Message-ID: <200604210349.k3L3neCm024731@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24684

Modified Files:
	kernel-2.6.spec 
Log Message:
turn back on



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2146
retrieving revision 1.2147
diff -u -r1.2146 -r1.2147
--- kernel-2.6.spec	21 Apr 2006 03:21:12 -0000	1.2146
+++ kernel-2.6.spec	21 Apr 2006 03:49:37 -0000	1.2147
@@ -983,7 +983,7 @@
 # Change PHYSICAL_START
 %patch2103 -p1
 # Use unicode VT's by default.
-#%patch2104 -p1
+%patch2104 -p1
 
 # Enable PATA ports on Promise SATA.
 #%patch2200 -p1



From fedora-cvs-commits at redhat.com  Fri Apr 21 04:39:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 00:39:33 -0400
Subject: rpms/kernel/devel linux-2.6-random-patches.patch,1.6,1.7
Message-ID: <200604210439.k3L4dXr6019493@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19455

Modified Files:
	linux-2.6-random-patches.patch 
Log Message:
warning cleanup


linux-2.6-random-patches.patch:
 linux-2.6.15.noarch/drivers/char/watchdog/machzwd.c        |    3 --
 linux-2.6.15.noarch/drivers/char/watchdog/sc1200wdt.c      |    2 -
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/av7110.c       |    2 -
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget-ci.c    |    2 -
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget-patch.c |    2 -
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget.c       |    5 ---
 linux-2.6.15/kernel/power/snapshot.c                       |    1 
 linux-2.6.16.noarch/drivers/net/dl2k.c                     |   17 ++++++-------
 linux-2.6.16.noarch/include/linux/dma-mapping.h            |    1 
 9 files changed, 17 insertions(+), 18 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-random-patches.patch	16 Apr 2006 22:58:48 -0000	1.6
+++ linux-2.6-random-patches.patch	21 Apr 2006 04:39:29 -0000	1.7
@@ -108,3 +108,92 @@
  	return 0;
  }
  
+
+drivers/net/dl2k.c:1803: warning: integer constant is too large for 'long' type
+drivers/net/dl2k.c:1813: warning: integer constant is too large for 'long' type
+drivers/net/dl2k.c:768: warning: integer constant is too large for 'long' type
+drivers/net/dl2k.c:896: warning: integer constant is too large for 'long' type
+drivers/net/dl2k.c:904: warning: integer constant is too large for 'long' type
+drivers/net/dl2k.c:916: warning: integer constant is too large for 'long' type
+
+Signed-off-by: Dave Jones <davej at redhat.com>
+
+--- linux-2.6.16.noarch/include/linux/dma-mapping.h~	2006-04-20 23:35:36.000000000 -0500
++++ linux-2.6.16.noarch/include/linux/dma-mapping.h	2006-04-20 23:36:12.000000000 -0500
+@@ -14,6 +14,7 @@ enum dma_data_direction {
+ };
+ 
+ #define DMA_64BIT_MASK	0xffffffffffffffffULL
++#define DMA_48BIT_MASK	0x0000ffffffffffffULL
+ #define DMA_40BIT_MASK	0x000000ffffffffffULL
+ #define DMA_39BIT_MASK	0x0000007fffffffffULL
+ #define DMA_32BIT_MASK	0x00000000ffffffffULL
+--- linux-2.6.16.noarch/drivers/net/dl2k.c~	2006-04-20 23:36:19.000000000 -0500
++++ linux-2.6.16.noarch/drivers/net/dl2k.c	2006-04-20 23:37:54.000000000 -0500
+@@ -52,8 +52,11 @@
+ #define DRV_NAME	"D-Link DL2000-based linux driver"
+ #define DRV_VERSION	"v1.17b"
+ #define DRV_RELDATE	"2006/03/10"
++
++#include <linux/dma-mapping.h>
+ #include "dl2k.h"
+ 
++
+ static char version[] __devinitdata =
+       KERN_INFO DRV_NAME " " DRV_VERSION " " DRV_RELDATE "\n";	
+ #define MAX_UNITS 8
+@@ -765,7 +768,7 @@ rio_free_tx (struct net_device *dev, int
+ 			break;
+ 		skb = np->tx_skbuff[entry];
+ 		pci_unmap_single (np->pdev,
+-				  np->tx_ring[entry].fraginfo & 0xffffffffffff,
++				  np->tx_ring[entry].fraginfo & DMA_48BIT_MASK,
+ 				  skb->len, PCI_DMA_TODEVICE);
+ 		if (irq)
+ 			dev_kfree_skb_irq (skb);
+@@ -893,15 +896,14 @@ receive_packet (struct net_device *dev)
+ 			/* Small skbuffs for short packets */
+ 			if (pkt_len > copy_thresh) {
+ 				pci_unmap_single (np->pdev,
+-						  desc->fraginfo & 0xffffffffffff,
++						  desc->fraginfo & DMA_48BIT_MASK,
+ 						  np->rx_buf_sz,
+ 						  PCI_DMA_FROMDEVICE);
+ 				skb_put (skb = np->rx_skbuff[entry], pkt_len);
+ 				np->rx_skbuff[entry] = NULL;
+ 			} else if ((skb = dev_alloc_skb (pkt_len + 2)) != NULL) {
+ 				pci_dma_sync_single_for_cpu(np->pdev,
+-				  			    desc->fraginfo & 
+-							    	0xffffffffffff,
++							    desc->fraginfo & DMA_48BIT_MASK,
+ 							    np->rx_buf_sz,
+ 							    PCI_DMA_FROMDEVICE);
+ 				skb->dev = dev;
+@@ -912,8 +914,7 @@ receive_packet (struct net_device *dev)
+ 						  pkt_len, 0);
+ 				skb_put (skb, pkt_len);
+ 				pci_dma_sync_single_for_device(np->pdev,
+-				  			       desc->fraginfo &
+-							       	 0xffffffffffff,
++							       desc->fraginfo & DMA_48BIT_MASK,
+ 							       np->rx_buf_sz,
+ 							       PCI_DMA_FROMDEVICE);
+ 			}
+@@ -1800,7 +1801,7 @@ rio_close (struct net_device *dev)
+ 		skb = np->rx_skbuff[i];
+ 		if (skb) {
+ 			pci_unmap_single(np->pdev, 
+-					 np->rx_ring[i].fraginfo & 0xffffffffffff,
++					 np->rx_ring[i].fraginfo & DMA_48BIT_MASK,
+ 					 skb->len, PCI_DMA_FROMDEVICE);
+ 			dev_kfree_skb (skb);
+ 			np->rx_skbuff[i] = NULL;
+@@ -1810,7 +1811,7 @@ rio_close (struct net_device *dev)
+ 		skb = np->tx_skbuff[i];
+ 		if (skb) {
+ 			pci_unmap_single(np->pdev, 
+-					 np->tx_ring[i].fraginfo & 0xffffffffffff,
++					 np->tx_ring[i].fraginfo & DMA_48BIT_MASK,
+ 					 skb->len, PCI_DMA_TODEVICE);
+ 			dev_kfree_skb (skb);
+ 			np->tx_skbuff[i] = NULL;



From fedora-cvs-commits at redhat.com  Fri Apr 21 04:42:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 00:42:58 -0400
Subject: rpms/kernel/devel linux-2.6-random-patches.patch,1.7,1.8
Message-ID: <200604210442.k3L4gwfm030390@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30298

Modified Files:
	linux-2.6-random-patches.patch 
Log Message:
drop bogon


linux-2.6-random-patches.patch:
 linux-2.6.15.noarch/drivers/char/watchdog/machzwd.c        |    3 --
 linux-2.6.15.noarch/drivers/char/watchdog/sc1200wdt.c      |    2 -
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/av7110.c       |    2 -
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget-ci.c    |    2 -
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget-patch.c |    2 -
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget.c       |    5 ---
 linux-2.6.16.noarch/drivers/net/dl2k.c                     |   17 ++++++-------
 linux-2.6.16.noarch/include/linux/dma-mapping.h            |    1 
 8 files changed, 16 insertions(+), 18 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-random-patches.patch	21 Apr 2006 04:39:29 -0000	1.7
+++ linux-2.6-random-patches.patch	21 Apr 2006 04:42:51 -0000	1.8
@@ -87,28 +87,6 @@
  	spin_lock_init(&sc1200wdt_lock);
  	sema_init(&open_sem, 1);
 
-Before:
-
-swsusp: Saving Highmem
-................................<7>swsusp: critical section:
-swsusp: Need to copy 60938 pages
-
-After:
-swsusp: Saving Highmem................................
-swsusp: critical section:
-swsusp: Need to copy 60938 pages
-
---- linux-2.6.15/kernel/power/snapshot.c~	2006-01-17 01:19:43.000000000 -0500
-+++ linux-2.6.15/kernel/power/snapshot.c	2006-01-17 01:21:46.000000000 -0500
-@@ -113,6 +113,7 @@ static int save_highmem_zone(struct zone
- 		kunmap_atomic(kaddr, KM_USER0);
- 		highmem_copy = save;
- 	}
-+	printk("\n");
- 	return 0;
- }
- 
-
 drivers/net/dl2k.c:1803: warning: integer constant is too large for 'long' type
 drivers/net/dl2k.c:1813: warning: integer constant is too large for 'long' type
 drivers/net/dl2k.c:768: warning: integer constant is too large for 'long' type



From fedora-cvs-commits at redhat.com  Fri Apr 21 04:45:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 00:45:29 -0400
Subject: rpms/kernel/devel/configs config-ia64-generic,1.25,1.26
Message-ID: <200604210445.k3L4jSri030752@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv30687/configs

Modified Files:
	config-ia64-generic 
Log Message:
dont build bcm on ia64



Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- config-ia64-generic	18 Apr 2006 21:09:21 -0000	1.25
+++ config-ia64-generic	21 Apr 2006 04:45:26 -0000	1.26
@@ -172,3 +172,5 @@
 
 CONFIG_NODES_SHIFT=8
 
+# CONFIG_BCM43XX is not set
+



From fedora-cvs-commits at redhat.com  Fri Apr 21 09:00:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 05:00:47 -0400
Subject: rpms/kdewebdev/FC-4 kdewebdev.spec,1.16,1.17
Message-ID: <200604210900.k3L90l4P000978@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdewebdev/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv843

Modified Files:
	kdewebdev.spec 
Log Message:
add Obsoletes: tidy




Index: kdewebdev.spec
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/FC-4/kdewebdev.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kdewebdev.spec	12 Apr 2006 10:29:38 -0000	1.16
+++ kdewebdev.spec	21 Apr 2006 09:00:40 -0000	1.17
@@ -12,7 +12,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.2
-Release: 0.1.fc4
+Release: 0.2.fc4
 Summary: WEB Development package for the K Desktop Environment.
 Name: kdewebdev
 Url: http://quanta.sourceforge.net/
@@ -40,6 +40,7 @@
 
 Obsoletes: WebMaker
 Obsoletes: quanta
+Obsoletes: tidy
 
 %description
 The kdewebdev package contains Quanta Plus and other applications, which are useful
@@ -154,6 +155,9 @@
 %{_includedir}/*
 
 %changelog
+* Fri Apr 21 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.2.fc4
+- add Obsoletes: tidy
+
 * Wed Apr 12 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc4
 - update to 3.5.2
 



From fedora-cvs-commits at redhat.com  Fri Apr 21 09:04:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 05:04:40 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.2.rhXXXXX.helpcontent2.baddb.patch, NONE,
	1.1 openoffice.org.spec, 1.666, 1.667
Message-ID: <200604210904.k3L94eH7001566@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1529

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.2.rhXXXXX.helpcontent2.baddb.patch 
Log Message:
workaround for broken db_java in RHEL-4

openoffice.org-2.0.2.rhXXXXX.helpcontent2.baddb.patch:
 target.pmk |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.2.rhXXXXX.helpcontent2.baddb.patch ---
--- openoffice.org.orig/helpcontent2/util/target.pmk	2006-04-21 09:54:49.000000000 +0100
+++ openoffice.org/helpcontent2/util/target.pmk	2006-04-21 09:55:53.000000000 +0100
@@ -41,7 +41,7 @@
 .ENDIF
 
 .IF "$(SYSTEM_DB)" != "YES"
-JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
+JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN) -Dsleepycat.db.libfile=$(SOLARSHAREDBIN)/libdb_java-4.2.so
 .ELSE
 .IF "$(JAVACACHE)" != ""
 CLASSPATH!:=$(my_cp)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.666
retrieving revision 1.667
diff -u -r1.666 -r1.667
--- openoffice.org.spec	20 Apr 2006 12:42:37 -0000	1.666
+++ openoffice.org.spec	21 Apr 2006 09:04:35 -0000	1.667
@@ -62,7 +62,7 @@
 %define xmlsecflags --with-system-xmlsec
 %endif
 %if %{internaljavabits}
-%define javabitsflags --without-system-hsqldb --without-system-beanshell --with-system-db --without-system-xml-apis --without-system-xerces --without-system-xalan
+%define javabitsflags --without-system-hsqldb --without-system-beanshell --without-system-db --without-system-xml-apis --without-system-xerces --without-system-xalan
 %define includingexternals 1
 %else
 %define javabitsflags --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan
@@ -166,8 +166,6 @@
 %if ! %{internaljavabits}
 BuildRequires:	db4-java >= 4.3.28-3, hsqldb >= 1.80.1, bsh >= 1.3.0, xalan-j2
 BuildRequires:	xerces-j2
-%else
-BuildRequires:	db4-java >= 4.2.0
 %endif
 %if ! %{internalicu}
 BuildRequires:  icu >= 3.4, libicu-devel >= 3.4
@@ -209,7 +207,11 @@
 Patch23: workspace.atkbridge.patch
 Patch24: workspace.jaxpapi.patch
 Patch25: workspace.systemjava.patch
+%if ! %{internaljavabits}
 Patch26: workspace.targetedaot.patch
+%else
+Patch26: openoffice.org-2.0.2.rhXXXXX.helpcontent2.baddb.patch
+%endif
 Patch27: openoffice.org-2.0.1.ooo58663.vcl.missingglyph.patch
 Patch28: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
 Patch29: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch
@@ -1122,8 +1124,10 @@
 %patch23 -p1 -b .workspace.atkbridge.patch
 %patch24 -p0 -b .workspace.jaxpapi.patch
 %patch25 -p1 -b .workspace.systemjava.patch
-%ifnarch ppc
+%if ! %{internaljavabits}
 %patch26 -p1 -b .workspace.targetedaot.patch
+%else
+%patch26 -p1 -b .rhXXXXX.helpcontent2.baddb.patch
 %endif
 %patch27 -p1 -b .ooo58663.vcl.missingglyph.patch
 %patch28 -p1 -b .ooo58606.sw.pre-edit.patch



From fedora-cvs-commits at redhat.com  Fri Apr 21 09:40:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 05:40:28 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.2.rhXXXXX.helpcontent2.baddb.patch, 1.1, 1.2
Message-ID: <200604210940.k3L9eSUM021565@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21523

Modified Files:
	openoffice.org-2.0.2.rhXXXXX.helpcontent2.baddb.patch 
Log Message:
foo

openoffice.org-2.0.2.rhXXXXX.helpcontent2.baddb.patch:
 target.pmk |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: openoffice.org-2.0.2.rhXXXXX.helpcontent2.baddb.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.2.rhXXXXX.helpcontent2.baddb.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.2.rhXXXXX.helpcontent2.baddb.patch	21 Apr 2006 09:04:35 -0000	1.1
+++ openoffice.org-2.0.2.rhXXXXX.helpcontent2.baddb.patch	21 Apr 2006 09:40:24 -0000	1.2
@@ -6,6 +6,6 @@
  .IF "$(SYSTEM_DB)" != "YES"
 -JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
 +JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN) -Dsleepycat.db.libfile=$(SOLARSHAREDBIN)/libdb_java-4.2.so
- .ELSE
- .IF "$(JAVACACHE)" != ""
- CLASSPATH!:=$(my_cp)
+ .ENDIF
+ 
+ .IF "$(JDK)" != "gcj"



From fedora-cvs-commits at redhat.com  Fri Apr 21 09:51:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 05:51:47 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch, 1.1,
	1.2 openoffice.org-1.9.121.rh156677.other.cripplemenus.sysui.patch,
	1.1, 1.2 openoffice.org.spec, 1.667, 1.668
Message-ID: <200604210951.k3L9plEn004852@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4826

Modified Files:
	openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch 
	openoffice.org-1.9.121.rh156677.other.cripplemenus.sysui.patch 
	openoffice.org.spec 
Log Message:
reorder

openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch:
 desktop/menus/base.desktop          |    0 
 desktop/menus/calc.desktop          |    0 
 desktop/menus/impress.desktop       |    0 
 desktop/menus/writer.desktop        |    0 
 sysui/desktop/menus/base.desktop    |    2 +-
 sysui/desktop/menus/calc.desktop    |    2 +-
 sysui/desktop/menus/impress.desktop |    2 +-
 sysui/desktop/menus/writer.desktop  |    2 +-
 8 files changed, 4 insertions(+), 4 deletions(-)

Index: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch	26 Jul 2005 14:51:42 -0000	1.1
+++ openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch	21 Apr 2006 09:51:42 -0000	1.2
@@ -50,7 +50,7 @@
 @@ -8,5 +8,5 @@ InitialPreference=2
  Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;
  Exec=openoffice -writer %U
- MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/vnd.wordperfect;application/wordperfect
+ MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;application/vnd.wordperfect;application/wordperfect
 -Name=%PRODUCTNAME Writer
 +Name=Word Processor
  Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.

openoffice.org-1.9.121.rh156677.other.cripplemenus.sysui.patch:
 desktop/menus/base.desktop          |    0 
 desktop/menus/calc.desktop          |    0 
 desktop/menus/impress.desktop       |    0 
 desktop/menus/writer.desktop        |    0 
 sysui/desktop/menus/base.desktop    |    2 +-
 sysui/desktop/menus/calc.desktop    |    2 +-
 sysui/desktop/menus/impress.desktop |    2 +-
 sysui/desktop/menus/writer.desktop  |    2 +-
 8 files changed, 4 insertions(+), 4 deletions(-)

Index: openoffice.org-1.9.121.rh156677.other.cripplemenus.sysui.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.121.rh156677.other.cripplemenus.sysui.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.121.rh156677.other.cripplemenus.sysui.patch	20 Apr 2006 12:42:37 -0000	1.1
+++ openoffice.org-1.9.121.rh156677.other.cripplemenus.sysui.patch	21 Apr 2006 09:51:42 -0000	1.2
@@ -50,7 +50,7 @@
 @@ -8,5 +8,5 @@ InitialPreference=2
  Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;
  Exec=openoffice -writer %U
- MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/vnd.wordperfect;application/wordperfect
+ MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;application/vnd.wordperfect;application/wordperfect
 -Name=%PRODUCTNAME Writer
 +Name=OpenOffice.org 2 Word Processor
  Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.667
retrieving revision 1.668
diff -u -r1.667 -r1.668
--- openoffice.org.spec	21 Apr 2006 09:04:35 -0000	1.667
+++ openoffice.org.spec	21 Apr 2006 09:51:42 -0000	1.668
@@ -1096,6 +1096,7 @@
 %if %{gnomeprintui}
 %patch5  -p1 -b .rh127576.gnomeprintui.patch
 %endif
+%patch29 -p1 -b .ooo59675.sysui.rtfmimetype.patch
 %if %{obsoleteold}
 %patch6  -p1 -b .rh156677.cripplemenus.sysui.patch
 %else
@@ -1131,7 +1132,6 @@
 %endif
 %patch27 -p1 -b .ooo58663.vcl.missingglyph.patch
 %patch28 -p1 -b .ooo58606.sw.pre-edit.patch
-%patch29 -p1 -b .ooo59675.sysui.rtfmimetype.patch
 %patch30 -p1 -b .ooo59997.sw.defaultbullets.patch
 %patch31 -p1 -b .ooo19976.framework.nofocussteal.patch
 %patch32 -p1 -b .ooo61875.sd.compile.patch



From fedora-cvs-commits at redhat.com  Fri Apr 21 10:05:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 06:05:46 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch, 1.2, 1.3
Message-ID: <200604211005.k3LA5jFq008338@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8309

Modified Files:
	openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch 
Log Message:
sigh

openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch:
 desktop/menus/writer.desktop       |    0 
 sysui/desktop/menus/writer.desktop |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

Index: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch	22 Dec 2005 21:33:10 -0000	1.2
+++ openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch	21 Apr 2006 10:05:40 -0000	1.3
@@ -11,5 +11,5 @@
  Exec=openoffice -writer %U
 -MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/vnd.wordperfect;application/wordperfect
 +MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;application/vnd.wordperfect;application/wordperfect
- Name=Word Processor
+ Name=%PRODUCTNAME Writer
  Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.



From fedora-cvs-commits at redhat.com  Fri Apr 21 10:50:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 06:50:57 -0400
Subject: rpms/beagle/FC-5 beagle-0.2.5-crawl.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 beagle.spec, 1.50, 1.51 sources, 1.11, 1.12
Message-ID: <200604211050.k3LAovTa012963@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/beagle/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11017

Modified Files:
	.cvsignore beagle.spec sources 
Added Files:
	beagle-0.2.5-crawl.patch 
Log Message:
* Fri Apr 21 2006 Alexander Larsson <alexl at redhat.com> - 0.2.5-1.fc5.1
- update to 0.2.5
- Contains fix for command line injection security problem (#189282)



beagle-0.2.5-crawl.patch:
 Makefile.am                     |    1 -
 Makefile.in                     |    1 -
 crawl-rules/crawl-applications  |    2 +-
 crawl-rules/crawl-documentation |    2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE beagle-0.2.5-crawl.patch ---
--- beagle-0.2.5/tools/crawl-rules/crawl-applications.crawl	2006-03-22 16:09:41.000000000 +0100
+++ beagle-0.2.5/tools/crawl-rules/crawl-applications	2006-04-21 09:23:26.000000000 +0200
@@ -2,7 +2,7 @@
 
 CRAWL_INDEX_NAME="applications"
 
-CRAWL_PATHS="/usr/share/applications /usr/local/share/applications /opt/gnome/share/applications /opt/kde3/share/applications"
+CRAWL_PATHS="/usr/share/applications /usr/local/share/applications" 
 
 CRAWL_RECURSIVE="yes"
 
--- beagle-0.2.5/tools/crawl-rules/crawl-documentation.crawl	2006-04-12 21:41:03.000000000 +0200
+++ beagle-0.2.5/tools/crawl-rules/crawl-documentation	2006-04-21 09:27:23.000000000 +0200
@@ -2,7 +2,7 @@
 
 CRAWL_INDEX_NAME="documentation"
 
-CRAWL_PATHS="/usr/share/doc /usr/local/share/doc /opt/kde3/share/doc /opt/gnome/share/gnome/help /usr/share/gnome/help"
+CRAWL_PATHS="/usr/share/doc /usr/local/share/doc /usr/share/gnome/help /usr/share/gnome/html"
 
 CRAWL_ALLOW_PATTERNS="*.xml,*.html,*.docbook"
 
--- beagle-0.2.5/tools/Makefile.am.crawl	2006-04-19 02:30:36.000000000 +0200
+++ beagle-0.2.5/tools/Makefile.am	2006-04-21 09:23:26.000000000 +0200
@@ -35,7 +35,6 @@
 	chmod +x $(CRAWL_WRAPPER)
 
 CRAWL_RULES = \
-	$(srcdir)/crawl-rules/crawl-windows		\
 	$(srcdir)/crawl-rules/crawl-applications	\
 	$(srcdir)/crawl-rules/crawl-documentation
 
--- beagle-0.2.5/tools/Makefile.in.crawl	2006-04-20 17:57:24.000000000 +0200
+++ beagle-0.2.5/tools/Makefile.in	2006-04-21 09:23:26.000000000 +0200
@@ -366,7 +366,6 @@
 CRAWL_WRAPPER = beagle-crawl-system
 CRAWL_WRAPPER_IN = $(CRAWL_WRAPPER).in
 CRAWL_RULES = \
-	$(srcdir)/crawl-rules/crawl-windows		\
 	$(srcdir)/crawl-rules/crawl-applications	\
 	$(srcdir)/crawl-rules/crawl-documentation
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/beagle/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	7 Mar 2006 15:48:12 -0000	1.8
+++ .cvsignore	21 Apr 2006 10:50:55 -0000	1.9
@@ -1 +1,2 @@
 beagle-0.2.2.tar.bz2
+beagle-0.2.5.tar.bz2


Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/FC-5/beagle.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- beagle.spec	8 Apr 2006 03:15:36 -0000	1.50
+++ beagle.spec	21 Apr 2006 10:50:55 -0000	1.51
@@ -1,5 +1,5 @@
 Name:           beagle
-Version:        0.2.4
+Version:        0.2.5
 Release:        1.fc5.1
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
@@ -7,7 +7,6 @@
 URL:            http://beagle-project.org/
 Source0:        %{name}-%{version}.tar.bz2
 Source1:	beagle.desktop
-Source2:	beagle-crawl-system.cron
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel mono-data mono-data-sqlite
@@ -23,9 +22,8 @@
 BuildRequires:  librsvg2-devel >= 2.0
 Requires: sqlite >= 3.3.1
 Requires: zip unzip sed grep mono-core poppler-utils
-Patch2: beagle-0.2.4-crawl.patch
+Patch2: beagle-0.2.5-crawl.patch
 Patch3: beagle-0.2.1-spew.patch
-Patch4: beagle-0.2.2-crawl-system-cron.patch
 
 # Mono only available on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
@@ -61,7 +59,6 @@
 %setup -q
 %patch2 -p1 -b .crawl
 %patch3 -p1 -b .spew
-%patch4 -p1 -b .crawl-system-cron
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -87,13 +84,6 @@
 #mkdir -p $RPM_BUILD_ROOT/etc/xdg/autostart
 #cp %{SOURCE1} $RPM_BUILD_ROOT/etc/xdg/autostart
 
-# use anacron instead of cron, so beagle-crawl-system has 
-# a reasonable chance to run
-rm -rf $RPM_BUILD_ROOT/etc/cron.d
-mkdir -p $RPM_BUILD_ROOT/etc/cron.daily
-cp %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/beagle-crawl-system.cron
-chmod +x $RPM_BUILD_ROOT/etc/cron.daily/beagle-crawl-system.cron
-
 # TODO: Isn't there a better place to install this?
 install -m 644 mozilla-extension/beagle.xpi $RPM_BUILD_ROOT%{_libdir}/beagle/
 
@@ -184,7 +174,6 @@
 %{_sysconfdir}/beagle
 %{_bindir}/*
 %{_sbindir}/*
-%{_libexecdir}/*
 %{_libdir}/pkgconfig/beagle*.pc
 %{_libdir}/beagle
 %{_datadir}/beagle
@@ -209,6 +198,10 @@
 %{_prefix}/lib/python*/site-packages/beagle.so
 
 %changelog
+* Fri Apr 21 2006 Alexander Larsson <alexl at redhat.com> - 0.2.5-1.fc5.1
+- update to 0.2.5
+- Contains fix for command line injection security problem (#189282)
+
 * Fri Apr  7 2006 Matthias Clasen <mclasen at redhat.com> 0.2.4-1.fc5.1
 - Update to 0.2.4
 - Update patches


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/beagle/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Apr 2006 03:15:37 -0000	1.11
+++ sources	21 Apr 2006 10:50:55 -0000	1.12
@@ -1,3 +1,2 @@
 6f0f121a9269662071eb5c260b54f86f  beagle.desktop
-777250265dc910964f5acd9da29cc64c  beagle-crawl-system.cron
-bd915b5f7de56c91dae2c26121c586fa  beagle-0.2.4.tar.bz2
+7a7965768643045f7e6f362f9bba1af4  beagle-0.2.5.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr 21 10:52:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 06:52:39 -0400
Subject: rpms/hplip/devel hplip-0.9.10-2.patch, NONE, 1.1 hplip.spec, 1.72,
	1.73 hplip-0.9.10-1.patch, 1.1, NONE hplip-strcasecmp.patch,
	1.3, NONE
Message-ID: <200604211052.k3LAqdBp013686@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13650

Modified Files:
	hplip.spec 
Added Files:
	hplip-0.9.10-2.patch 
Removed Files:
	hplip-0.9.10-1.patch hplip-strcasecmp.patch 
Log Message:
* Fri Apr 21 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-6
- Patchlevel 2.


hplip-0.9.10-2.patch:
 device.cpp |   30 ++++++------------------------
 1 files changed, 6 insertions(+), 24 deletions(-)

--- NEW FILE hplip-0.9.10-2.patch ---
diff -uNr hplip-0.9.10.old/io/hpiod/device.cpp hplip-0.9.10.new/io/hpiod/device.cpp
--- hplip-0.9.10.old/io/hpiod/device.cpp	2006-03-02 16:07:26.000000000 -0800
+++ hplip-0.9.10.new/io/hpiod/device.cpp	2006-04-20 08:27:57.243869888 -0700
@@ -118,7 +118,7 @@
  */
 int Device::Write(int fd, const void *buf, int size)
 {
-   int len=0, r, ep;
+   int len=-EIO, r, ep;
 
    if (FD[fd].pHD == NULL)
    {
@@ -145,10 +145,8 @@
       FD[fd].urb_write.number_of_packets = 0;
          
       if (usb_submit_urb_ex(FD[fd].pHD, &FD[fd].urb_write))
-      {
-         syslog(LOG_ERR, "invalid submit_urb %s: %m %s %d\n", URI, __FILE__, __LINE__);
          goto bugout;
-      }
+
       FD[fd].urb_write_active = 1;
    }
 
@@ -177,7 +175,7 @@
 int Device::Read(int fd, void *buf, int size, int usec)
 {
    struct timeval t1, t2;
-   int len=0, ep;
+   int len=-EIO, ep;
    int r, total_usec, tmo_usec=usec;
 
    if (FD[fd].pHD == NULL)
@@ -210,21 +208,17 @@
       FD[fd].urb_read.number_of_packets = 0;
          
       if (usb_submit_urb_ex(FD[fd].pHD, &FD[fd].urb_read))
-      {
-         syslog(LOG_ERR, "invalid submit_urb %s: %m %s %d\n", URI, __FILE__, __LINE__);
          goto bugout;
-      }
 
       r = usb_wait_urb_ex(FD[fd].pHD, &FD[fd].urb_read, tmo_usec/1000);
       if (r == -ETIMEDOUT)
       {
-         len = -1;
+         len = -ETIMEDOUT;
          usb_reap_urb_ex(FD[fd].pHD, &FD[fd].urb_read);  /* remove urb */
          goto bugout;
       }
       if (r < 0)
       {
-         len = -2;
          syslog(LOG_ERR, "invalid urb read completion %s: %m %s %d\n", URI, __FILE__, __LINE__);
          usb_reap_urb_ex(FD[fd].pHD, &FD[fd].urb_read);
          goto bugout;
@@ -239,7 +233,7 @@
          total_usec += (t2.tv_usec > t1.tv_usec) ? t2.tv_usec - t1.tv_usec : t1.tv_usec - t2.tv_usec;
          if (total_usec > usec)
          {
-            len = -1;   /* timeout */
+            len = -ETIMEDOUT;   /* timeout */
             break;
          }
          tmo_usec = usec - total_usec;    /* decrease timeout */
@@ -633,7 +627,7 @@
    pSys->GeneralizeModel(sz, gen, sizeof(gen));
 
    pSys->GetURIModel(uri, uriModel, sizeof(uriModel));
-   if (strcmp(uriModel, gen) != 0)
+   if (strcasecmp(uriModel, gen) != 0)
       goto bugout;
 
    if (usb_get_string_simple(hd, dev->descriptor.iSerialNumber, sz, sizeof(sz)) < 0)
@@ -846,8 +840,6 @@
 
 int Device::Open(char *sendBuf, int *result)
 {
-   char uriModel[128];
-   char model[128];
    int len=0;
    int config, interface, altset;
 
@@ -910,16 +902,6 @@
       }        
    }
 
-   /* Make sure uri model still matches device id model. */
-   pSys->GetURIModel(URI, uriModel, sizeof(uriModel));
-   pSys->GetModel(ID, model, sizeof(model));
-   if (strcmp(uriModel, model) != 0)
-   {
-      *result = R_INVALID_DEVICE_NODE;  /* found different device plugged in */  
-      syslog(LOG_ERR, "invalid model %s != %s Device::Open %s %d\n", uriModel, model, __FILE__, __LINE__);
-      goto blackout;
-   }
-
 blackout:
    pthread_mutex_unlock(&mutex);
 


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- hplip.spec	19 Apr 2006 09:18:55 -0000	1.72
+++ hplip.spec	21 Apr 2006 10:52:37 -0000	1.73
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 0.9.10
-Release: 5
+Release: 6
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -14,9 +14,8 @@
 Patch2: hplip-config.patch
 Patch3: hplip-quiet.patch
 Patch4: hplip-cups-backend.patch
-Patch5: hplip-strcasecmp.patch
 Patch6: hplip-revert-hpijs.patch
-Patch7: hplip-0.9.10-1.patch
+Patch7: hplip-0.9.10-2.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -75,15 +74,11 @@
 # Always use /usr/lib/cups/backend.
 %patch4 -p1 -b .cups-backend
 
-# Use case-insensitive matching.  0.9.10 gave all-uppercase in some
-# situations.
-%patch5 -p1 -b .strcasecmp
-
 # Last known working hpijs comes from 0.9.8, so use that.
 %patch6 -p1 -b .revert-hpijs
 
 # Patchlevel 1.
-%patch7 -p1 -b .0.9.10-1
+%patch7 -p1 -b .0.9.10-2
 
 autoconf # for patch4
 
@@ -183,6 +178,9 @@
 fi
 
 %changelog
+* Fri Apr 21 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-6
+- Patchlevel 2.
+
 * Wed Apr 19 2006 Tim Waugh <twaugh at redhat.com>
 - Don't package COPYING twice (bug #189162).
 


--- hplip-0.9.10-1.patch DELETED ---


--- hplip-strcasecmp.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 21 10:57:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 06:57:14 -0400
Subject: rpms/selinux-policy/devel policy-20060411.patch, 1.10,
	1.11 selinux-policy.spec, 1.178, 1.179
Message-ID: <200604211057.k3LAvE8s015421@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15386

Modified Files:
	policy-20060411.patch selinux-policy.spec 
Log Message:
* Fri Apr 21 2006 Dan Walsh <dwalsh at redhat.com> 2.2.34-3
- Allow mono to chat with unconfined


policy-20060411.patch:
 config/appconfig-strict-mls/default_type |    1 
 policy/modules/admin/netutils.te         |    2 -
 policy/modules/admin/usermanage.te       |    1 
 policy/modules/apps/mono.te              |    3 +-
 policy/modules/kernel/corecommands.fc    |    1 
 policy/modules/kernel/domain.te          |    1 
 policy/modules/kernel/files.if           |   35 +++++++++++++++++++++++++++
 policy/modules/kernel/filesystem.if      |    6 ++--
 policy/modules/kernel/kernel.te          |    1 
 policy/modules/kernel/terminal.if        |    2 -
 policy/modules/services/cups.te          |    1 
 policy/modules/services/pegasus.te       |    8 ++++++
 policy/modules/services/procmail.te      |    2 -
 policy/modules/services/samba.te         |    2 -
 policy/modules/system/authlogin.te       |    2 +
 policy/modules/system/init.te            |    1 
 policy/modules/system/libraries.fc       |   18 +++-----------
 policy/modules/system/logging.te         |    4 +--
 policy/modules/system/sysnetwork.te      |    2 +
 policy/modules/system/unconfined.if      |   39 +++++++++++++++++++++++++++++++
 policy/modules/system/userdomain.te      |   24 +++++++++++++++++--
 policy/modules/system/xen.if             |   18 ++++++++++++++
 policy/modules/system/xen.te             |    1 
 policy/rolemap                           |    1 
 policy/users                             |    6 ++--
 25 files changed, 153 insertions(+), 29 deletions(-)

Index: policy-20060411.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060411.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- policy-20060411.patch	20 Apr 2006 19:32:26 -0000	1.10
+++ policy-20060411.patch	21 Apr 2006 10:57:09 -0000	1.11
@@ -29,6 +29,20 @@
  userdom_manage_staff_home_dirs(useradd_t)
  userdom_generic_user_home_dir_filetrans_generic_user_home_content(useradd_t,notdevfile_class_set)
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.2.34/policy/modules/apps/mono.te
+--- nsaserefpolicy/policy/modules/apps/mono.te	2006-04-18 22:49:59.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/apps/mono.te	2006-04-21 06:40:33.000000000 -0400
+@@ -20,8 +20,9 @@
+ ifdef(`targeted_policy',`
+ 	allow mono_t self:process { execheap execmem };
+ 	unconfined_domain_noaudit(mono_t)
+-	role system_r types mono_t;
++	unconfined_dbus_chat(mono_t)
+ 
++	role system_r types mono_t;
+ 	init_dbus_chat_script(mono_t)
+ 
+ 	optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.2.34/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-04-18 22:49:59.000000000 -0400
 +++ serefpolicy-2.2.34/policy/modules/kernel/corecommands.fc	2006-04-20 14:04:12.000000000 -0400
@@ -349,7 +363,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.34/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-04-12 13:44:38.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/system/unconfined.if	2006-04-20 14:04:12.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/unconfined.if	2006-04-21 06:40:24.000000000 -0400
 @@ -224,6 +224,24 @@
  
  ########################################
@@ -375,6 +389,34 @@
  ##	Send generic signals to the unconfined domain.
  ## </summary>
  ## <param name="domain">
+@@ -363,6 +381,27 @@
+ 
+ ########################################
+ ## <summary>
++##	Send and receive messages from
++##	unconfined_t over dbus.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`unconfined_dbus_chat',`
++	gen_require(`
++		type unconfined_t;
++		class dbus send_msg;
++	')
++
++	allow $1 unconfined_t:dbus send_msg;
++	allow unconfined_t $1:dbus send_msg;
++')
++
++########################################
++## <summary>
+ ##	Add an alias type to the unconfined domain.
+ ## </summary>
+ ## <desc>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.34/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-04-20 08:17:40.000000000 -0400
 +++ serefpolicy-2.2.34/policy/modules/system/userdomain.te	2006-04-20 14:04:12.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- selinux-policy.spec	20 Apr 2006 19:32:44 -0000	1.178
+++ selinux-policy.spec	21 Apr 2006 10:57:09 -0000	1.179
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.34
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -330,6 +330,9 @@
 %endif
 
 %changelog
+* Fri Apr 21 2006 Dan Walsh <dwalsh at redhat.com> 2.2.34-3
+- Allow mono to chat with unconfined
+
 * Thu Apr 20 2006 Dan Walsh <dwalsh at redhat.com> 2.2.34-2
 - Allow procmail to sendmail
 - Allow nfs to share dosfs



From fedora-cvs-commits at redhat.com  Fri Apr 21 10:59:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 06:59:31 -0400
Subject: rpms/hplip/FC-5 hplip-0.9.10-2.patch, NONE, 1.1 hplip.spec, 1.66,
	1.67 hplip-0.9.10-1.patch, 1.1, NONE hplip-strcasecmp.patch,
	1.3, NONE
Message-ID: <200604211059.k3LAxV2N016395@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/hplip/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16347

Modified Files:
	hplip.spec 
Added Files:
	hplip-0.9.10-2.patch 
Removed Files:
	hplip-0.9.10-1.patch hplip-strcasecmp.patch 
Log Message:
* Fri Apr 21 2006 Tim Waugh <twaugh at redhat.com>
- Patchlevel 2.


hplip-0.9.10-2.patch:
 device.cpp |   30 ++++++------------------------
 1 files changed, 6 insertions(+), 24 deletions(-)

--- NEW FILE hplip-0.9.10-2.patch ---
diff -uNr hplip-0.9.10.old/io/hpiod/device.cpp hplip-0.9.10.new/io/hpiod/device.cpp
--- hplip-0.9.10.old/io/hpiod/device.cpp	2006-03-02 16:07:26.000000000 -0800
+++ hplip-0.9.10.new/io/hpiod/device.cpp	2006-04-20 08:27:57.243869888 -0700
@@ -118,7 +118,7 @@
  */
 int Device::Write(int fd, const void *buf, int size)
 {
-   int len=0, r, ep;
+   int len=-EIO, r, ep;
 
    if (FD[fd].pHD == NULL)
    {
@@ -145,10 +145,8 @@
       FD[fd].urb_write.number_of_packets = 0;
          
       if (usb_submit_urb_ex(FD[fd].pHD, &FD[fd].urb_write))
-      {
-         syslog(LOG_ERR, "invalid submit_urb %s: %m %s %d\n", URI, __FILE__, __LINE__);
          goto bugout;
-      }
+
       FD[fd].urb_write_active = 1;
    }
 
@@ -177,7 +175,7 @@
 int Device::Read(int fd, void *buf, int size, int usec)
 {
    struct timeval t1, t2;
-   int len=0, ep;
+   int len=-EIO, ep;
    int r, total_usec, tmo_usec=usec;
 
    if (FD[fd].pHD == NULL)
@@ -210,21 +208,17 @@
       FD[fd].urb_read.number_of_packets = 0;
          
       if (usb_submit_urb_ex(FD[fd].pHD, &FD[fd].urb_read))
-      {
-         syslog(LOG_ERR, "invalid submit_urb %s: %m %s %d\n", URI, __FILE__, __LINE__);
          goto bugout;
-      }
 
       r = usb_wait_urb_ex(FD[fd].pHD, &FD[fd].urb_read, tmo_usec/1000);
       if (r == -ETIMEDOUT)
       {
-         len = -1;
+         len = -ETIMEDOUT;
          usb_reap_urb_ex(FD[fd].pHD, &FD[fd].urb_read);  /* remove urb */
          goto bugout;
       }
       if (r < 0)
       {
-         len = -2;
          syslog(LOG_ERR, "invalid urb read completion %s: %m %s %d\n", URI, __FILE__, __LINE__);
          usb_reap_urb_ex(FD[fd].pHD, &FD[fd].urb_read);
          goto bugout;
@@ -239,7 +233,7 @@
          total_usec += (t2.tv_usec > t1.tv_usec) ? t2.tv_usec - t1.tv_usec : t1.tv_usec - t2.tv_usec;
          if (total_usec > usec)
          {
-            len = -1;   /* timeout */
+            len = -ETIMEDOUT;   /* timeout */
             break;
          }
          tmo_usec = usec - total_usec;    /* decrease timeout */
@@ -633,7 +627,7 @@
    pSys->GeneralizeModel(sz, gen, sizeof(gen));
 
    pSys->GetURIModel(uri, uriModel, sizeof(uriModel));
-   if (strcmp(uriModel, gen) != 0)
+   if (strcasecmp(uriModel, gen) != 0)
       goto bugout;
 
    if (usb_get_string_simple(hd, dev->descriptor.iSerialNumber, sz, sizeof(sz)) < 0)
@@ -846,8 +840,6 @@
 
 int Device::Open(char *sendBuf, int *result)
 {
-   char uriModel[128];
-   char model[128];
    int len=0;
    int config, interface, altset;
 
@@ -910,16 +902,6 @@
       }        
    }
 
-   /* Make sure uri model still matches device id model. */
-   pSys->GetURIModel(URI, uriModel, sizeof(uriModel));
-   pSys->GetModel(ID, model, sizeof(model));
-   if (strcmp(uriModel, model) != 0)
-   {
-      *result = R_INVALID_DEVICE_NODE;  /* found different device plugged in */  
-      syslog(LOG_ERR, "invalid model %s != %s Device::Open %s %d\n", uriModel, model, __FILE__, __LINE__);
-      goto blackout;
-   }
-
 blackout:
    pthread_mutex_unlock(&mutex);
 


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/hplip.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- hplip.spec	19 Apr 2006 09:18:13 -0000	1.66
+++ hplip.spec	21 Apr 2006 10:59:28 -0000	1.67
@@ -14,8 +14,8 @@
 Patch2: hplip-config.patch
 Patch3: hplip-quiet.patch
 Patch4: hplip-cups-backend.patch
-Patch5: hplip-strcasecmp.patch
-Patch6: hplip-revert-hpijs.patch
+Patch5: hplip-revert-hpijs.patch
+Patch6: hplip-0.9.10-2.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -74,12 +74,11 @@
 # Always use /usr/lib/cups/backend.
 %patch4 -p1 -b .cups-backend
 
-# Use case-insensitive matching.  0.9.10 gave all-uppercase in some
-# situations.
-%patch5 -p1 -b .strcasecmp
-
 # Last known working hpijs comes from 0.9.8, so use that.
-%patch6 -p1 -b .revert-hpijs
+%patch5 -p1 -b .revert-hpijs
+
+# Patchlevel 2.
+%patch6 -p1 -b .0.9.10-2
 
 autoconf # for patch4
 
@@ -193,6 +192,9 @@
 fi
 
 %changelog
+* Fri Apr 21 2006 Tim Waugh <twaugh at redhat.com>
+- Patchlevel 2.
+
 * Wed Apr 19 2006 Tim Waugh <twaugh at redhat.com>
 - Don't package COPYING twice (bug #189162).
 


--- hplip-0.9.10-1.patch DELETED ---


--- hplip-strcasecmp.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 21 10:59:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 06:59:43 -0400
Subject: rpms/hplip/devel hplip.spec,1.73,1.74
Message-ID: <200604211059.k3LAxhYp016494@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16457

Modified Files:
	hplip.spec 
Log Message:
Fixed typo.


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- hplip.spec	21 Apr 2006 10:52:37 -0000	1.73
+++ hplip.spec	21 Apr 2006 10:59:40 -0000	1.74
@@ -77,7 +77,7 @@
 # Last known working hpijs comes from 0.9.8, so use that.
 %patch6 -p1 -b .revert-hpijs
 
-# Patchlevel 1.
+# Patchlevel 2.
 %patch7 -p1 -b .0.9.10-2
 
 autoconf # for patch4



From fedora-cvs-commits at redhat.com  Fri Apr 21 11:02:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 07:02:21 -0400
Subject: rpms/selinux-policy/FC-5 .cvsignore, 1.50,
	1.51 policy-20060411.patch, 1.1, 1.2 selinux-policy.spec,
	1.164, 1.165 sources, 1.54, 1.55
Message-ID: <200604211102.k3LB2Lii016888@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16857

Modified Files:
	.cvsignore policy-20060411.patch selinux-policy.spec sources 
Log Message:
* Fri Apr 21 2006 Dan Walsh <dwalsh at redhat.com> 2.2.34-3.fc5
- Bump for fc5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	15 Apr 2006 10:33:31 -0000	1.50
+++ .cvsignore	21 Apr 2006 11:02:17 -0000	1.51
@@ -51,3 +51,4 @@
 serefpolicy-2.2.25.tgz
 serefpolicy-2.2.29.tgz
 serefpolicy-2.2.32.tgz
+serefpolicy-2.2.34.tgz

policy-20060411.patch:
 config/appconfig-strict-mls/default_type |    1 
 policy/modules/admin/netutils.te         |    2 -
 policy/modules/admin/usermanage.te       |    1 
 policy/modules/apps/mono.te              |    3 +-
 policy/modules/kernel/corecommands.fc    |    1 
 policy/modules/kernel/domain.te          |    1 
 policy/modules/kernel/files.if           |   35 +++++++++++++++++++++++++++
 policy/modules/kernel/filesystem.if      |    6 ++--
 policy/modules/kernel/kernel.te          |    1 
 policy/modules/kernel/terminal.if        |    2 -
 policy/modules/services/cups.te          |    1 
 policy/modules/services/pegasus.te       |    8 ++++++
 policy/modules/services/procmail.te      |    2 -
 policy/modules/services/samba.te         |    2 -
 policy/modules/system/authlogin.te       |    2 +
 policy/modules/system/init.te            |    1 
 policy/modules/system/libraries.fc       |   18 +++-----------
 policy/modules/system/logging.te         |    4 +--
 policy/modules/system/sysnetwork.te      |    2 +
 policy/modules/system/unconfined.if      |   39 +++++++++++++++++++++++++++++++
 policy/modules/system/userdomain.te      |   24 +++++++++++++++++--
 policy/modules/system/xen.if             |   18 ++++++++++++++
 policy/modules/system/xen.te             |    1 
 policy/rolemap                           |    1 
 policy/users                             |    6 ++--
 25 files changed, 153 insertions(+), 29 deletions(-)

Index: policy-20060411.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/policy-20060411.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- policy-20060411.patch	15 Apr 2006 10:34:16 -0000	1.1
+++ policy-20060411.patch	21 Apr 2006 11:02:17 -0000	1.2
@@ -1,399 +1,74 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.32/policy/mcs
---- nsaserefpolicy/policy/mcs	2006-03-29 11:23:41.000000000 -0500
-+++ serefpolicy-2.2.32/policy/mcs	2006-04-14 12:06:19.000000000 -0400
-@@ -134,14 +134,18 @@
- # the high range of the file.  We use the high range of the process so
- # that processes can always simply run at s0.
- #
--# Only files are constrained by MCS at this stage.
-+# Note that getattr on files is always permitted.
- #
- mlsconstrain file { write setattr append unlink link rename ioctl lock execute relabelfrom }
- 	( h1 dom h2 );
- 
-+# New filesystem object labels must be dominated by the relabeling subject
-+# clearance, also the objects are single-level.
- mlsconstrain file { create relabelto }
- 	(( h1 dom h2 ) and ( l2 eq h2 ));
- 
-+# At this time we do not restrict "ps" type operations via MCS.  This
-+# will probably change in future.
- mlsconstrain file { read }
- 	(( h1 dom h2 ) or ( t2 == domain ) or ( t1 == mlsfileread ));
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.2.32/policy/modules/admin/amanda.te
---- nsaserefpolicy/policy/modules/admin/amanda.te	2006-03-24 11:15:40.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/admin/amanda.te	2006-04-14 14:29:14.000000000 -0400
-@@ -9,6 +9,7 @@
- type amanda_t;
- type amanda_inetd_exec_t;
- inetd_udp_service_domain(amanda_t,amanda_inetd_exec_t)
-+inetd_tcp_service_domain(amanda_t,amanda_inetd_exec_t)
- role system_r types amanda_t;
- 
- type amanda_exec_t;
-@@ -141,6 +142,10 @@
- corenet_non_ipsec_sendrecv(amanda_t)
- corenet_tcp_bind_all_nodes(amanda_t)
- corenet_udp_bind_all_nodes(amanda_t)
-+corenet_tcp_bind_reserved_port(amanda_t)
-+corenet_udp_bind_reserved_port(amanda_t)
-+corenet_dontaudit_tcp_bind_all_reserved_ports(amanda_t)
-+corenet_dontaudit_udp_bind_all_reserved_ports(amanda_t)
- 
- dev_getattr_all_blk_files(amanda_t)
- dev_getattr_all_chr_files(amanda_t)
-@@ -183,13 +188,15 @@
- 
- optional_policy(`
- 	nscd_socket_use(amanda_t)
-+	nscd_socket_use(amanda_recover_t)
- ')
- 
- ########################################
- #
- # Amanda recover local policy
- 
--allow amanda_recover_t self:capability { fowner fsetid kill setgid setuid chown dac_override net_bind_service };
-+allow amanda_recover_t self:capability { fowner fsetid kill setgid setuid chown dac_override };
-+corenet_tcp_bind_reserved_port(amanda_recover_t)
- allow amanda_recover_t self:process { sigkill sigstop signal };
- allow amanda_recover_t self:fifo_file { getattr ioctl read write };
- allow amanda_recover_t self:unix_stream_socket { connect create read write };
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.32/policy/modules/admin/bootloader.te
---- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-04-04 18:06:37.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/admin/bootloader.te	2006-04-14 12:06:19.000000000 -0400
-@@ -84,6 +84,7 @@
- dev_read_sysfs(bootloader_t)
- # for reading BIOS data
- dev_read_raw_memory(bootloader_t)
-+mls_file_read_up(bootloader_t)
- 
- fs_getattr_xattr_fs(bootloader_t)
- fs_read_tmpfs_symlinks(bootloader_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.2.32/policy/modules/admin/rpm.fc
---- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-04-04 18:06:37.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/admin/rpm.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -10,6 +10,7 @@
- /usr/lib(64)?/rpm/rpmv		-- 	gen_context(system_u:object_r:bin_t,s0)
- 
- /usr/share/yumex/yumex		--	gen_context(system_u:object_r:rpm_exec_t,s0)
-+/usr/sbin/system-install-packages --	gen_context(system_u:object_r:rpm_exec_t,s0)
- 
- ifdef(`distro_redhat', `
- /usr/bin/fedora-rmdevelrpms	--	gen_context(system_u:object_r:rpm_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.fc serefpolicy-2.2.32/policy/modules/admin/su.fc
---- nsaserefpolicy/policy/modules/admin/su.fc	2006-03-23 14:33:29.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/admin/su.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -1,5 +1,5 @@
- 
- /bin/su			--	gen_context(system_u:object_r:su_exec_t,s0)
- 
--/usr(/local)?/bin/ksu	--	gen_context(system_u:object_r:su_exec_t,s0)
-+/usr/(local/)?bin/ksu	--	gen_context(system_u:object_r:su_exec_t,s0)
- /usr/bin/kdesu		--	gen_context(system_u:object_r:su_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.2.32/policy/modules/admin/usermanage.te
---- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/admin/usermanage.te	2006-04-14 12:06:19.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/default_type serefpolicy-2.2.34/config/appconfig-strict-mls/default_type
+--- nsaserefpolicy/config/appconfig-strict-mls/default_type	2006-01-06 17:55:17.000000000 -0500
++++ serefpolicy-2.2.34/config/appconfig-strict-mls/default_type	2006-04-20 14:04:12.000000000 -0400
+@@ -2,3 +2,4 @@
+ secadm_r:secadm_t
+ staff_r:staff_t
+ user_r:user_t
++auditadm_r:auditadm_t
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.2.34/policy/modules/admin/netutils.te
+--- nsaserefpolicy/policy/modules/admin/netutils.te	2006-04-06 14:05:24.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/admin/netutils.te	2006-04-20 14:04:12.000000000 -0400
+@@ -97,7 +97,7 @@
+ 
+ allow ping_t self:tcp_socket create_socket_perms;
+ allow ping_t self:udp_socket create_socket_perms;
+-allow ping_t self:rawip_socket { create ioctl read write bind getopt setopt };
++allow ping_t self:{ rawip_socket packet_socket } { create ioctl read write bind getopt setopt };
+ 
+ corenet_tcp_sendrecv_all_if(ping_t)
+ corenet_udp_sendrecv_all_if(ping_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.2.34/policy/modules/admin/usermanage.te
+--- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-04-18 22:49:59.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/admin/usermanage.te	2006-04-20 14:04:12.000000000 -0400
 @@ -514,6 +514,7 @@
  # Add/remove user home directories
  userdom_home_filetrans_generic_user_home_dir(useradd_t)
  userdom_manage_generic_user_home_content_dirs(useradd_t)
-+userdom_manage_staff_home_dir(useradd_t)
++userdom_manage_generic_user_home_content_files(useradd_t)
+ userdom_manage_staff_home_dirs(useradd_t)
  userdom_generic_user_home_dir_filetrans_generic_user_home_content(useradd_t,notdevfile_class_set)
  
- mta_manage_spool(useradd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.2.32/policy/modules/apps/java.fc
---- nsaserefpolicy/policy/modules/apps/java.fc	2006-04-12 13:44:36.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/apps/java.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -1,11 +1,8 @@
- #
--# /opt
--#
--/opt(/.*)?/bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
--
--#
- # /usr
- #
--/usr(/.*)?/bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
-+/usr/(.*/)?bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
-+/usr/lib(.*/)?bin/java([^/]*)? 	--	gen_context(system_u:object_r:java_exec_t,s0)
- /usr/bin/gcj-dbtool	--	gen_context(system_u:object_r:java_exec_t,s0)
- /usr/bin/gij		--	gen_context(system_u:object_r:java_exec_t,s0)
-+/opt/(.*/)?bin/java([^/]*)? 	--	gen_context(system_u:object_r:java_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-2.2.32/policy/modules/apps/java.te
---- nsaserefpolicy/policy/modules/apps/java.te	2006-04-12 13:44:36.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/apps/java.te	2006-04-14 12:06:19.000000000 -0400
-@@ -10,6 +10,7 @@
- domain_type(java_t)
- 
- type java_exec_t;
-+init_system_domain(java_t,java_exec_t)
- files_type(java_exec_t)
- 
- ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.2.32/policy/modules/apps/mono.te
---- nsaserefpolicy/policy/modules/apps/mono.te	2006-04-12 13:44:36.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/apps/mono.te	2006-04-14 12:06:19.000000000 -0400
-@@ -22,6 +22,8 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.2.34/policy/modules/apps/mono.te
+--- nsaserefpolicy/policy/modules/apps/mono.te	2006-04-18 22:49:59.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/apps/mono.te	2006-04-21 06:40:33.000000000 -0400
+@@ -20,8 +20,9 @@
+ ifdef(`targeted_policy',`
+ 	allow mono_t self:process { execheap execmem };
  	unconfined_domain_noaudit(mono_t)
- 	role system_r types mono_t;
- 
-+	init_dbus_chat_script(mono_t)
-+
- 	optional_policy(`
- 		avahi_dbus_chat(mono_t)
- 	')
-@@ -29,4 +31,8 @@
- 	optional_policy(`
- 		hal_dbus_chat(mono_t)
- 	')
-+	optional_policy(`
-+		networkmanager_dbus_chat(mono_t)
-+	')
-+
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.2.32/policy/modules/kernel/corecommands.fc
---- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-04-10 17:05:08.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/kernel/corecommands.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -2,7 +2,8 @@
- #
- # /bin
- #
--/bin(/.*)?				gen_context(system_u:object_r:bin_t,s0)
-+/bin				-d	gen_context(system_u:object_r:bin_t,s0)
-+/bin/.*					gen_context(system_u:object_r:bin_t,s0)
- /bin/d?ash			--	gen_context(system_u:object_r:shell_exec_t,s0)
- /bin/bash			--	gen_context(system_u:object_r:shell_exec_t,s0)
- /bin/bash2			--	gen_context(system_u:object_r:shell_exec_t,s0)
-@@ -86,27 +87,30 @@
- #
- # /sbin
- #
--/sbin(/.*)?				gen_context(system_u:object_r:sbin_t,s0)
-+/sbin				-d	gen_context(system_u:object_r:sbin_t,s0)
-+/sbin/.*				gen_context(system_u:object_r:sbin_t,s0)
- /sbin/mkfs\.cramfs		--	gen_context(system_u:object_r:sbin_t,s0)
- /sbin/insmod_ksymoops_clean	--	gen_context(system_u:object_r:sbin_t,s0)
- 
- #
- # /opt
- #
--/opt(/.*)?/bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
-+/opt/(.*/)?bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
- 
--/opt(/.*)?/libexec(/.*)?		gen_context(system_u:object_r:bin_t,s0)
-+/opt/(.*/)?libexec(/.*)?		gen_context(system_u:object_r:bin_t,s0)
+-	role system_r types mono_t;
++	unconfined_dbus_chat(mono_t)
  
--/opt(/.*)?/sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
-+/opt/(.*/)?sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
- 
- #
- # /usr
- #
--/usr(/.*)?/Bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
-+/usr/(.*/)?Bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
- 
--/usr(/.*)?/bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
-+/usr/(.*/)?bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
-+/usr/lib(.*/)?bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
- 
--/usr(/.*)?/sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
-+/usr/(.*/)?sbin(/.*)?			gen_context(system_u:object_r:sbin_t,s0)
-+/usr/lib(.*/)?sbin(/.*)?		gen_context(system_u:object_r:sbin_t,s0)
- 
- /usr/lib/ccache/bin(/.*)?		gen_context(system_u:object_r:bin_t,s0)
- /usr/lib/pgsql/test/regress/.*\.sh --	gen_context(system_u:object_r:bin_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.32/policy/modules/kernel/devices.fc
---- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-04-12 13:44:36.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/kernel/devices.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -1,5 +1,6 @@
- 
--/dev(/.*)?			gen_context(system_u:object_r:device_t,s0)
-+/dev			-d	gen_context(system_u:object_r:device_t,s0)
-+/dev/.*				gen_context(system_u:object_r:device_t,s0)
- 
- /dev/.*mouse.*		-c	gen_context(system_u:object_r:mouse_device_t,s0)
- /dev/adsp		-c	gen_context(system_u:object_r:sound_device_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.32/policy/modules/kernel/devices.if
---- nsaserefpolicy/policy/modules/kernel/devices.if	2006-04-12 13:44:36.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/kernel/devices.if	2006-04-14 12:06:19.000000000 -0400
-@@ -2701,7 +2701,7 @@
- 	')
- 
- 	allow $1 device_t:dir r_dir_perms;
--	allow $1 xen_device_t:chr_file r_file_perms;
-+	allow $1 xen_device_t:chr_file rw_file_perms;
- ')
- 
- ########################################
-@@ -2720,7 +2720,7 @@
- 	')
- 
- 	allow $1 device_t:dir r_dir_perms;
--	allow $1 xen_device_t:chr_file r_file_perms;
-+	allow $1 xen_device_t:chr_file manage_file_perms;
- ')
- 
- ########################################
-@@ -2874,3 +2874,23 @@
- 
- 	typeattribute $1 devices_unconfined_type;
- ')
-+
-+########################################
-+## <summary>
-+##	Dontaudit getattr on all device nodes.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain to not audit.
-+##	</summary>
-+## </param>
-+#
-+interface(`dev_dontaudit_getattr_all_device_nodes',`
-+	gen_require(`
-+		attribute device_node;
-+	')
-+
-+	dontaudit $1 device_t:dir_file_class_set getattr;
-+	dontaudit $1 device_node:dir_file_class_set getattr;
-+')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.32/policy/modules/kernel/files.fc
---- nsaserefpolicy/policy/modules/kernel/files.fc	2006-03-23 14:33:29.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/kernel/files.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -25,7 +25,8 @@
- #
- # /boot
- #
--/boot(/.*)?			gen_context(system_u:object_r:boot_t,s0)
-+/boot			-d	gen_context(system_u:object_r:boot_t,s0)
-+/boot/.*			gen_context(system_u:object_r:boot_t,s0)
- /boot/\.journal			<<none>>
- /boot/lost\+found	-d	gen_context(system_u:object_r:lost_found_t,s15:c0.c255)
- /boot/lost\+found/.*		<<none>>
-@@ -36,13 +37,15 @@
- #
- 
- ifdef(`distro_redhat',`
--/emul(/.*)?			gen_context(system_u:object_r:usr_t,s0)
-+/emul			-d	gen_context(system_u:object_r:usr_t,s0)
-+/emul/.*			gen_context(system_u:object_r:usr_t,s0)
- ')
++	role system_r types mono_t;
+ 	init_dbus_chat_script(mono_t)
  
- #
- # /etc
- #
--/etc(/.*)?			gen_context(system_u:object_r:etc_t,s0)
-+/etc			-d	gen_context(system_u:object_r:etc_t,s0)
-+/etc/.*				gen_context(system_u:object_r:etc_t,s0)
- /etc/\.fstab\.hal\..+	--	gen_context(system_u:object_r:etc_runtime_t,s0)
- /etc/asound\.state	--	gen_context(system_u:object_r:etc_runtime_t,s0)
- /etc/blkid(/.*)?		gen_context(system_u:object_r:etc_runtime_t,s0)
-@@ -104,7 +107,8 @@
- #
- # /lib(64)?
- #
--/lib(64)?/modules(/.*)?		gen_context(system_u:object_r:modules_object_t,s0)
-+/lib/modules(/.*)?		gen_context(system_u:object_r:modules_object_t,s0)
-+/lib64/modules(/.*)?		gen_context(system_u:object_r:modules_object_t,s0)
- 
- #
- # /lost+found
-@@ -139,29 +143,34 @@
- #
- # /opt
- #
--/opt(/.*)?			gen_context(system_u:object_r:usr_t,s0)
-+/opt			-d	gen_context(system_u:object_r:usr_t,s0)
-+/opt/.*				gen_context(system_u:object_r:usr_t,s0)
- 
--/opt(/.*)?/var/lib(64)?(/.*)?	gen_context(system_u:object_r:var_lib_t,s0)
-+/opt/(.*/)?var/lib(64)?(/.*)?	gen_context(system_u:object_r:var_lib_t,s0)
- 
- #
- # /proc
- #
--/proc(/.*)?                     <<none>>
-+/proc			-d	<<none>>
-+/proc/.*			<<none>>
- 
- #
- # /selinux
- #
--/selinux(/.*)?                  <<none>>
-+/selinux		-d	<<none>>
-+/selinux/.*			<<none>>
- 
- #
- # /srv
- #
--/srv(/.*)?			gen_context(system_u:object_r:var_t,s0)
-+/srv			-d	gen_context(system_u:object_r:var_t,s0)
-+/srv/.*				gen_context(system_u:object_r:var_t,s0)
- 
- #
- # /sys
- #
--/sys(/.*)?                      <<none>>
-+/sys			-d	<<none>>
-+/sys/.*				<<none>>
- 
- #
- # /tmp
-@@ -176,7 +185,8 @@
- #
- # /usr
- #
--/usr(/.*)?			gen_context(system_u:object_r:usr_t,s0)
-+/usr			-d	gen_context(system_u:object_r:usr_t,s0)
-+/usr/.*				gen_context(system_u:object_r:usr_t,s0)
- /usr/\.journal			<<none>>
- 
- /usr/doc(/.*)?/lib(/.*)?		gen_context(system_u:object_r:usr_t,s0)
-@@ -200,7 +210,7 @@
- /usr/share(/.*)?/lib(64)?(/.*)?	gen_context(system_u:object_r:usr_t,s0)
- 
- /usr/src(/.*)?			gen_context(system_u:object_r:src_t,s0)
--/usr/src(/.*)?/lib(/.*)?		gen_context(system_u:object_r:usr_t,s0)
-+/usr/src/kernels/.+/lib(/.*)?		gen_context(system_u:object_r:usr_t,s0)
- 
- /usr/tmp			-d	gen_context(system_u:object_r:tmp_t,s0-s15:c0.c255)
- /usr/tmp/.*			<<none>>
-@@ -208,7 +218,8 @@
- #
- # /var
- #
--/var(/.*)?			gen_context(system_u:object_r:var_t,s0)
-+/var			-d	gen_context(system_u:object_r:var_t,s0)
-+/var/.*				gen_context(system_u:object_r:var_t,s0)
- /var/\.journal			<<none>>
- 
- /var/db/.*\.db		--	gen_context(system_u:object_r:etc_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.32/policy/modules/kernel/files.if
---- nsaserefpolicy/policy/modules/kernel/files.if	2006-04-14 07:58:12.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/kernel/files.if	2006-04-14 12:06:19.000000000 -0400
-@@ -948,6 +948,18 @@
- 
- ########################################
- #
-+# files_stat_all_mountpoints(domain)
-+#
-+interface(`files_stat_all_mountpoints',`
-+	gen_require(`
-+		attribute mountpoint;
-+	')
-+
-+	allow $1 mountpoint:dir { getattr };
-+')
-+
-+########################################
-+#
- # files_list_root(domain)
- #
- interface(`files_list_root',`
-@@ -1661,6 +1673,21 @@
+ 	optional_policy(`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.2.34/policy/modules/kernel/corecommands.fc
+--- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-04-18 22:49:59.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/kernel/corecommands.fc	2006-04-20 14:04:12.000000000 -0400
+@@ -177,6 +177,7 @@
+ ifdef(`distro_redhat', `
+ /usr/lib/.*/program(/.*)?		gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/authconfig/authconfig-gtk\.py -- gen_context(system_u:object_r:bin_t,s0)
++/usr/share/authconfig/authconfig-tui\.py -- gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/cvs/contrib/rcs2log	--	gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/hwbrowser/hwbrowser -- gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/pwlib/make/ptlib-config --	gen_context(system_u:object_r:bin_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-2.2.34/policy/modules/kernel/domain.te
+--- nsaserefpolicy/policy/modules/kernel/domain.te	2006-04-20 08:17:36.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/kernel/domain.te	2006-04-20 14:04:12.000000000 -0400
+@@ -96,6 +96,7 @@
+ 	# workaround until role dominance is fixed in
+ 	# the module compiler
+ 	role secadm_r types domain;
++	role auditadm_r types domain;
+ 	role sysadm_r types domain;
+ 	role user_r types domain;
+ 	role staff_r types domain;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.34/policy/modules/kernel/files.if
+--- nsaserefpolicy/policy/modules/kernel/files.if	2006-04-18 22:49:59.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/kernel/files.if	2006-04-20 14:04:12.000000000 -0400
+@@ -1679,6 +1679,21 @@
  ')
  
  ########################################
@@ -415,378 +90,178 @@
  ## <summary>
  ##	Read files in /etc that are dynamically
  ##	created on boot, such as mtab.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.32/policy/modules/kernel/kernel.if
---- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-04-10 17:05:10.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/kernel/kernel.if	2006-04-14 12:06:19.000000000 -0400
-@@ -1148,7 +1148,8 @@
- 
- 	allow $1 proc_t:dir search;
- 	allow $1 sysctl_t:dir r_dir_perms;
--	allow $1 sysctl_vm_t:dir list_dir_perms;
-+#hal needs allow hald_t sysctl_vm_t:dir write;
-+	allow $1 sysctl_vm_t:dir rw_dir_perms;
- 	allow $1 sysctl_vm_t:file rw_file_perms;
- ')
+@@ -3905,3 +3920,23 @@
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mcs.te serefpolicy-2.2.32/policy/modules/kernel/mcs.te
---- nsaserefpolicy/policy/modules/kernel/mcs.te	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/kernel/mcs.te	2006-04-14 12:06:19.000000000 -0400
-@@ -32,6 +32,10 @@
- type xdm_exec_t;
- 
- ifdef(`enable_mcs',`
-+# The eventual plan is to have a range_transition to s0 for the daemon by
-+# default and have the daemons which need to run with all categories be
-+# exceptions.  But while range_transitions have to be in the base module
-+# this is not possible.
- range_transition getty_t login_exec_t s0 - s0:c0.c255;
- range_transition init_t xdm_exec_t s0 - s0:c0.c255;
- range_transition initrc_t crond_exec_t s0 - s0:c0.c255;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.32/policy/modules/kernel/mls.te
---- nsaserefpolicy/policy/modules/kernel/mls.te	2006-03-07 10:31:09.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/kernel/mls.te	2006-04-14 12:06:19.000000000 -0400
-@@ -60,6 +60,7 @@
- 
- ifdef(`enable_mls',`
- range_transition initrc_t auditd_exec_t s15:c0.c255;
-+range_transition secadm_t auditctl_exec_t s15:c0.c255;
- range_transition kernel_t init_exec_t s0 - s15:c0.c255;
- range_transition kernel_t lvm_exec_t s0 - s15:c0.c255;
+ 	typeattribute $1 files_unconfined_type;
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.2.32/policy/modules/services/avahi.te
---- nsaserefpolicy/policy/modules/services/avahi.te	2006-03-24 11:15:50.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/services/avahi.te	2006-04-14 12:06:19.000000000 -0400
-@@ -92,6 +92,7 @@
- 	dbus_system_bus_client_template(avahi,avahi_t)
- 	dbus_connect_system_bus(avahi_t)
- 	dbus_send_system_bus(avahi_t)
-+	init_dbus_chat_script(avahi_t)
- ')
- 
- optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.fc serefpolicy-2.2.32/policy/modules/services/bind.fc
---- nsaserefpolicy/policy/modules/services/bind.fc	2006-01-16 17:04:24.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/services/bind.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -29,6 +29,7 @@
- 
- ifdef(`distro_redhat',`
- /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)
- /var/named/data(/.*)?		gen_context(system_u:object_r:named_cache_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.2.32/policy/modules/services/ftp.te
---- nsaserefpolicy/policy/modules/services/ftp.te	2006-04-12 13:44:37.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/services/ftp.te	2006-04-14 13:41:32.000000000 -0400
-@@ -126,6 +126,7 @@
- seutil_dontaudit_search_config(ftpd_t)
- 
- sysnet_read_config(ftpd_t)
-+sysnet_use_ldap(ftpd_t)
- 
- userdom_dontaudit_search_sysadm_home_dirs(ftpd_t)
- userdom_dontaudit_use_unpriv_user_fds(ftpd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.32/policy/modules/services/hal.te
---- nsaserefpolicy/policy/modules/services/hal.te	2006-04-12 13:44:37.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/services/hal.te	2006-04-14 12:06:19.000000000 -0400
-@@ -103,6 +103,7 @@
- fs_getattr_all_fs(hald_t)
- fs_search_all(hald_t)
- fs_list_auto_mountpoints(hald_t)
-+files_stat_all_mountpoints(hald_t)
- 
- mls_file_read_up(hald_t)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.fc serefpolicy-2.2.32/policy/modules/services/kerberos.fc
---- nsaserefpolicy/policy/modules/services/kerberos.fc	2005-10-06 17:29:17.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/services/kerberos.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -5,8 +5,8 @@
- /etc/krb5kdc/kadm5.keytab 	--	gen_context(system_u:object_r:krb5_keytab_t,s0)
- /etc/krb5kdc/principal.*		gen_context(system_u:object_r:krb5kdc_principal_t,s0)
- 
--/usr(/local)?(/kerberos)?/sbin/krb5kdc -- gen_context(system_u:object_r:krb5kdc_exec_t,s0)
--/usr(/local)?(/kerberos)?/sbin/kadmind -- gen_context(system_u:object_r:kadmind_exec_t,s0)
-+/usr/(local/)?(kerberos/)?sbin/krb5kdc -- gen_context(system_u:object_r:krb5kdc_exec_t,s0)
-+/usr/(local/)?(kerberos/)?sbin/kadmind -- gen_context(system_u:object_r:kadmind_exec_t,s0)
- 
- /usr/local/var/krb5kdc(/.*)?		gen_context(system_u:object_r:krb5kdc_conf_t,s0)
- /usr/local/var/krb5kdc/principal.*	gen_context(system_u:object_r:krb5kdc_principal_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-2.2.32/policy/modules/services/mailman.if
---- nsaserefpolicy/policy/modules/services/mailman.if	2006-03-24 11:15:50.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/services/mailman.if	2006-04-14 12:06:19.000000000 -0400
-@@ -200,6 +200,44 @@
- 
- #######################################
- ## <summary>
-+##	Allow domain to to create mailman data files and write the directory
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`mailman_create_data_file',`
-+	gen_require(`
-+		type mailman_data_t;
-+	')
-+
-+	allow $1 mailman_data_t:dir rw_dir_perms;
-+	allow $1 mailman_data_t:file create_file_perms;
-+')
 +
-+#######################################
++########################################
 +## <summary>
-+##	Allow domain to to read mailman data files
++##     Read kernel files in the /boot directory.
 +## </summary>
 +## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
++##     <summary>
++##     Domain allowed access.
++##     </summary>
 +## </param>
 +#
-+interface(`mailman_read_data_file',`
-+	gen_require(`
-+		type mailman_data_t;
-+	')
-+
-+	allow $1 mailman_data_t:dir search_dir_perms;
-+	allow $1 mailman_data_t:file read_file_perms;
++interface(`files_read_kernel_img',`
++       gen_require(`
++               type boot_t;
++       ')
++
++       allow $1 boot_t:dir r_dir_perms;
++       allow $1 boot_t:file { getattr read };
++       allow $1 boot_t:lnk_file { getattr read };
 +')
-+
-+#######################################
-+## <summary>
- ##	List the contents of mailman data directories.
- ## </summary>
- ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.32/policy/modules/services/postfix.te
---- nsaserefpolicy/policy/modules/services/postfix.te	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/services/postfix.te	2006-04-14 14:54:13.000000000 -0400
-@@ -305,6 +305,7 @@
- 
- kernel_read_kernel_sysctls(postfix_map_t)
- kernel_dontaudit_list_proc(postfix_map_t)
-+kernel_dontaudit_read_system_state(postfix_map_t)
- 
- corenet_tcp_sendrecv_all_if(postfix_map_t)
- corenet_udp_sendrecv_all_if(postfix_map_t)
-@@ -350,6 +351,7 @@
- ifdef(`targeted_policy',`
- 	# FIXME: would be better to use a run interface
- 	role system_r types postfix_map_t;
-+	term_dontaudit_use_generic_ptys(postfix_map_t)
- ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.34/policy/modules/kernel/filesystem.if
+--- nsaserefpolicy/policy/modules/kernel/filesystem.if	2006-04-18 22:49:59.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/kernel/filesystem.if	2006-04-20 14:54:31.000000000 -0400
+@@ -609,7 +609,7 @@
+ 		attribute noxattrfs;
+ 	')
  
- tunable_policy(`read_default_t',`
-@@ -408,6 +410,9 @@
+-	allow $1 noxattrfs:dir search;
++	allow $1 noxattrfs:dir search_dir_perms;
+ 	allow $1 noxattrfs:file r_file_perms;
  
- optional_policy(`
- 	mailman_domtrans_queue(postfix_pipe_t)
-+#	for postalias
-+	mailman_create_data_file(postfix_master_t)
-+	mailman_read_data_file(postfix_local_t)
  ')
- 
- ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.if serefpolicy-2.2.32/policy/modules/services/postgresql.if
---- nsaserefpolicy/policy/modules/services/postgresql.if	2006-02-10 17:05:19.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/services/postgresql.if	2006-04-14 16:09:39.000000000 -0400
-@@ -113,10 +113,12 @@
- #
- interface(`postgresql_stream_connect',`
- 	gen_require(`
--		type postgresql_t, postgresql_var_run_t;
-+		type postgresql_t, postgresql_var_run_t, postgresql_tmp_t;
+@@ -629,7 +629,7 @@
+ 		attribute noxattrfs;
  	')
  
- 	files_search_pids($1)
- 	allow $1 postgresql_t:unix_stream_socket connectto;
- 	allow $1 postgresql_var_run_t:sock_file write;
-+        # Some versions of postgresql put the sock file in /tmp
-+	allow $1 postgresql_tmp_t:sock_file write;
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.2.32/policy/modules/services/rpc.te
---- nsaserefpolicy/policy/modules/services/rpc.te	2006-03-24 11:15:50.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/services/rpc.te	2006-04-14 12:06:19.000000000 -0400
-@@ -110,13 +110,13 @@
- portmap_udp_chat(nfsd_t)
- 
- tunable_policy(`nfs_export_all_rw',`
--	auth_read_all_dirs_except_shadow(nfsd_t) 
- 	fs_read_noxattr_fs_files(nfsd_t) 
-+	auth_manage_all_files_except_shadow(nfsd_t)
+-	allow $1 noxattrfs:dir search;
++	allow $1 noxattrfs:dir search_dir_perms;
+ 	allow $1 noxattrfs:lnk_file r_file_perms;
  ')
  
- tunable_policy(`nfs_export_all_ro',`
--	auth_read_all_dirs_except_shadow(nfsd_t) 
- 	fs_read_noxattr_fs_files(nfsd_t) 
-+	auth_read_all_files_except_shadow(nfsd_t)
- ')
+@@ -1294,7 +1294,7 @@
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-2.2.32/policy/modules/services/samba.if
---- nsaserefpolicy/policy/modules/services/samba.if	2006-02-21 14:35:36.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/services/samba.if	2006-04-14 12:06:19.000000000 -0400
-@@ -33,6 +33,7 @@
- 	')
- 
- 	tunable_policy(`samba_enable_home_dirs',`
-+		userdom_manage_user_home_content_dirs($1,smbd_t)
- 		userdom_manage_user_home_content_files($1,smbd_t)
- 		userdom_manage_user_home_content_symlinks($1,smbd_t)
- 		userdom_manage_user_home_content_sockets($1,smbd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.32/policy/modules/services/samba.te
---- nsaserefpolicy/policy/modules/services/samba.te	2006-04-12 13:44:37.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/services/samba.te	2006-04-14 13:42:57.000000000 -0400
-@@ -106,8 +106,8 @@
- files_tmp_filetrans(samba_net_t, samba_net_tmp_t, { file dir })
+ ## <summary>
+-##	Read files on a NFS filesystem.
++##	Write files on a NFS filesystem.
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.2.34/policy/modules/kernel/kernel.te
+--- nsaserefpolicy/policy/modules/kernel/kernel.te	2006-04-18 22:49:59.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/kernel/kernel.te	2006-04-20 14:04:12.000000000 -0400
+@@ -28,6 +28,7 @@
  
- allow samba_net_t samba_var_t:dir rw_dir_perms;
-+allow samba_net_t samba_var_t:file create_file_perms;
- allow samba_net_t samba_var_t:lnk_file create_lnk_perms;
--allow samba_net_t samba_var_t:file create_lnk_perms;
+ ifdef(`enable_mls',`
+ 	role secadm_r;
++	role auditadm_r;
+ ')
  
- kernel_read_proc_symlinks(samba_net_t)
+ #
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.2.34/policy/modules/kernel/terminal.if
+--- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-02-13 17:05:45.000000000 -0500
++++ serefpolicy-2.2.34/policy/modules/kernel/terminal.if	2006-04-20 14:04:12.000000000 -0400
+@@ -174,7 +174,7 @@
+ 	')
+ 
+ 	dev_list_all_dev_nodes($1)
+-	allow $1 console_device_t:chr_file write;
++	allow $1 console_device_t:chr_file { getattr write append };
+ ')
  
-@@ -160,8 +160,10 @@
- 	corenet_non_ipsec_sendrecv(samba_net_t)
- 	corenet_tcp_bind_all_nodes(samba_net_t)
- 	sysnet_read_config(samba_net_t)
-+        corenet_tcp_connect_ldap_port(samba_net_t)
+ ########################################
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.34/policy/modules/services/cups.te
+--- nsaserefpolicy/policy/modules/services/cups.te	2006-04-12 13:44:36.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/services/cups.te	2006-04-20 15:02:03.000000000 -0400
+@@ -79,6 +79,7 @@
+ allow cupsd_t self:process { setsched signal_perms };
+ allow cupsd_t self:fifo_file rw_file_perms;
+ allow cupsd_t self:unix_stream_socket { create_stream_socket_perms connectto };
++allow cupsd_t self:socket create_socket_perms;
+ allow cupsd_t self:unix_dgram_socket create_socket_perms;
+ allow cupsd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
+ allow cupsd_t self:netlink_route_socket { r_netlink_socket_perms };
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.34/policy/modules/services/pegasus.te
+--- nsaserefpolicy/policy/modules/services/pegasus.te	2006-04-04 18:06:38.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/services/pegasus.te	2006-04-20 14:04:12.000000000 -0400
+@@ -79,11 +79,16 @@
+ corenet_tcp_connect_pegasus_https_port(pegasus_t)
+ corenet_tcp_connect_generic_port(pegasus_t)
+ 
++corecmd_exec_sbin(pegasus_t)
++corecmd_exec_bin(pegasus_t)
++corecmd_exec_shell(pegasus_t)
++
+ dev_read_sysfs(pegasus_t)
+ dev_read_urand(pegasus_t)
+ 
+ fs_getattr_all_fs(pegasus_t)
+ fs_search_auto_mountpoints(pegasus_t)
++files_getattr_all_dirs(pegasus_t)
+ 
+ term_dontaudit_use_console(pegasus_t)
+ 
+@@ -98,6 +103,8 @@
+ files_read_var_lib_files(pegasus_t)
+ files_read_var_lib_symlinks(pegasus_t)
+ 
++hostname_exec(pegasus_t)
++
+ init_use_fds(pegasus_t)
+ init_use_script_ptys(pegasus_t)
+ init_rw_utmp(pegasus_t)
+@@ -116,6 +123,7 @@
+ 	term_dontaudit_use_unallocated_ttys(pegasus_t)
+ 	term_dontaudit_use_generic_ptys(pegasus_t)
+ 	files_dontaudit_read_root_files(pegasus_t)
++	unconfined_signull(pegasus_t)
  ')
  
-+
  optional_policy(`
- 	nscd_socket_use(samba_net_t)
- ')
-@@ -268,6 +270,7 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.2.34/policy/modules/services/procmail.te
+--- nsaserefpolicy/policy/modules/services/procmail.te	2006-03-24 11:15:50.000000000 -0500
++++ serefpolicy-2.2.34/policy/modules/services/procmail.te	2006-04-20 15:06:02.000000000 -0400
+@@ -95,13 +95,13 @@
  
- init_use_fds(smbd_t)
- init_use_script_ptys(smbd_t)
-+init_rw_utmp(smbd_t)
- 
- libs_use_ld_so(smbd_t)
- libs_use_shared_libs(smbd_t)
-@@ -333,6 +336,13 @@
+ optional_policy(`
+ 	mta_read_config(procmail_t)
++	sendmail_domtrans(procmail_t)
+ 	sendmail_rw_tcp_sockets(procmail_t)
+ 	sendmail_rw_unix_stream_sockets(procmail_t)
  ')
- allow smbd_t mtrr_device_t:file getattr;
  
-+# Support Samba sharing of NFS mount points
-+bool samba_share_nfs false;
-+if (samba_share_nfs) {
-+fs_manage_nfs_dirs(smbd_t)
-+fs_manage_nfs_files(smbd_t)
-+}
-+
- ########################################
- #
- # nmbd Local policy
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-2.2.32/policy/modules/services/spamassassin.fc
---- nsaserefpolicy/policy/modules/services/spamassassin.fc	2005-12-01 17:57:16.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/services/spamassassin.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -1,5 +1,5 @@
- 
--/usr/bin/sa-learn	--	gen_context(system_u:object_r:spamd_exec_t,s0)
-+/usr/bin/sa-learn	--	gen_context(system_u:object_r:spamc_exec_t,s0)
- /usr/bin/spamc		--	gen_context(system_u:object_r:spamc_exec_t,s0)
- /usr/bin/spamd		--	gen_context(system_u:object_r:spamd_exec_t,s0)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.fc serefpolicy-2.2.32/policy/modules/services/tftp.fc
---- nsaserefpolicy/policy/modules/services/tftp.fc	2005-10-06 17:29:17.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/services/tftp.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -2,4 +2,5 @@
- /usr/sbin/atftpd	--	gen_context(system_u:object_r:tftpd_exec_t,s0)
- /usr/sbin/in\.tftpd	--	gen_context(system_u:object_r:tftpd_exec_t,s0)
- 
--/tftpboot(/.*)?			gen_context(system_u:object_r:tftpdir_t,s0)
-+/tftpboot		-d	gen_context(system_u:object_r:tftpdir_t,s0)
-+/tftpboot/.*			gen_context(system_u:object_r:tftpdir_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.32/policy/modules/services/xserver.if
---- nsaserefpolicy/policy/modules/services/xserver.if	2006-04-06 15:31:54.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/services/xserver.if	2006-04-14 12:06:19.000000000 -0400
-@@ -1070,3 +1070,24 @@
+ optional_policy(`
+ 	corenet_udp_bind_generic_port(procmail_t)
+-	corenet_tcp_connect_spamd_port(procmail_t)
  
- 	dontaudit $1 xdm_xserver_t:tcp_socket { read write };
- ')
-+
-+########################################
-+## <summary>
-+##	Allow read and write to
-+##	a XDM X server socket.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain to allow
-+##	</summary>
-+## </param>
-+#
-+interface(`xserver_rw_xdm_sockets',`
-+	gen_require(`
-+		type xdm_xserver_tmp_t;
-+	')
-+
-+	allow $1 xdm_xserver_tmp_t:dir search;
-+	allow $1 xdm_xserver_tmp_t:sock_file { read write };
-+')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.fc serefpolicy-2.2.32/policy/modules/system/authlogin.fc
---- nsaserefpolicy/policy/modules/system/authlogin.fc	2006-01-19 17:48:34.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/system/authlogin.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -7,7 +7,8 @@
- /etc/passwd\.lock	--	gen_context(system_u:object_r:shadow_t,s0)
- /etc/shadow.*		--	gen_context(system_u:object_r:shadow_t,s0)
- 
--/lib(64)?/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:pam_exec_t,s0)
-+/lib/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:pam_exec_t,s0)
-+/lib64/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:pam_exec_t,s0)
- 
- /sbin/pam_console_apply	 --	gen_context(system_u:object_r:pam_console_exec_t,s0)
- /sbin/pam_timestamp_check --	gen_context(system_u:object_r:pam_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.32/policy/modules/system/authlogin.te
---- nsaserefpolicy/policy/modules/system/authlogin.te	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/system/authlogin.te	2006-04-14 12:06:19.000000000 -0400
-@@ -173,9 +173,13 @@
- dev_setattr_video_dev(pam_console_t)
- dev_getattr_xserver_misc_dev(pam_console_t)
- dev_setattr_xserver_misc_dev(pam_console_t)
-+dev_read_urand(pam_console_t)
+ 	files_getattr_tmp_dirs(procmail_t)
  
- fs_search_auto_mountpoints(pam_console_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.34/policy/modules/services/samba.te
+--- nsaserefpolicy/policy/modules/services/samba.te	2006-04-19 12:23:07.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/services/samba.te	2006-04-20 14:04:12.000000000 -0400
+@@ -106,8 +106,8 @@
+ files_tmp_filetrans(samba_net_t, samba_net_tmp_t, { file dir })
  
-+miscfiles_read_localization(pam_console_t)
-+miscfiles_read_certs(pam_console_t)
-+
- storage_getattr_fixed_disk_dev(pam_console_t)
- storage_setattr_fixed_disk_dev(pam_console_t)
- storage_getattr_removable_dev(pam_console_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/daemontools.fc serefpolicy-2.2.32/policy/modules/system/daemontools.fc
---- nsaserefpolicy/policy/modules/system/daemontools.fc	2006-04-05 11:35:09.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/system/daemontools.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -2,7 +2,8 @@
- # /service
- #
+ allow samba_net_t samba_var_t:dir rw_dir_perms;
++allow samba_net_t samba_var_t:file create_file_perms;
+ allow samba_net_t samba_var_t:lnk_file create_lnk_perms;
+-allow samba_net_t samba_var_t:file create_lnk_perms;
  
--/service(/.*)?			gen_context(system_u:object_r:svc_svc_t,s0)
-+/service		-d	gen_context(system_u:object_r:svc_svc_t,s0)
-+/service/.*			gen_context(system_u:object_r:svc_svc_t,s0)
+ kernel_read_proc_symlinks(samba_net_t)
  
- #
- # /usr
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.32/policy/modules/system/fstools.te
---- nsaserefpolicy/policy/modules/system/fstools.te	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/system/fstools.te	2006-04-14 12:06:19.000000000 -0400
-@@ -77,6 +77,7 @@
- dev_getattr_usbfs_dirs(fsadm_t)
- # Access to /dev/mapper/control
- dev_rw_lvm_control(fsadm_t)
-+dev_dontaudit_getattr_all_device_nodes(fsadm_t)
- 
- fs_search_auto_mountpoints(fsadm_t)
- fs_getattr_xattr_fs(fsadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.32/policy/modules/system/init.te
---- nsaserefpolicy/policy/modules/system/init.te	2006-04-06 15:32:43.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/system/init.te	2006-04-14 12:06:19.000000000 -0400
-@@ -352,6 +352,7 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.34/policy/modules/system/authlogin.te
+--- nsaserefpolicy/policy/modules/system/authlogin.te	2006-04-19 12:23:07.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/authlogin.te	2006-04-20 14:04:12.000000000 -0400
+@@ -188,6 +188,8 @@
+ storage_setattr_scsi_generic_dev(pam_console_t)
+ 
+ term_use_console(pam_console_t)
++term_use_all_user_ttys(pam_console_t)
++term_use_all_user_ptys(pam_console_t)
+ term_setattr_console(pam_console_t)
+ term_getattr_unallocated_ttys(pam_console_t)
+ term_setattr_unallocated_ttys(pam_console_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.34/policy/modules/system/init.te
+--- nsaserefpolicy/policy/modules/system/init.te	2006-04-20 08:17:40.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/init.te	2006-04-20 14:04:12.000000000 -0400
+@@ -348,6 +348,7 @@
  files_mounton_isid_type_dirs(initrc_t)
  files_list_default(initrc_t)
  files_mounton_default(initrc_t)
@@ -794,286 +269,313 @@
  
  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.32/policy/modules/system/libraries.fc
---- nsaserefpolicy/policy/modules/system/libraries.fc	2006-04-12 13:44:38.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/system/libraries.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -24,17 +24,22 @@
- #
- # /lib(64)?
- #
--/lib(64)?(/.*)?					gen_context(system_u:object_r:lib_t,s0)
-+/lib(/.*)?					gen_context(system_u:object_r:lib_t,s0)
-+/lib64(/.*)?					gen_context(system_u:object_r:lib_t,s0)
- /lib(64)?/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
- /lib(64)?(/.*)?/ld-[^/]*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:ld_so_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.34/policy/modules/system/libraries.fc
+--- nsaserefpolicy/policy/modules/system/libraries.fc	2006-04-19 12:23:07.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/libraries.fc	2006-04-20 14:04:21.000000000 -0400
+@@ -66,13 +66,8 @@
  
- #
- # /opt
- #
--/opt(/.*)?/lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
--/opt(/.*)?/lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
--/opt/.*/jre.*/libdeploy.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
--/opt/.*/jre.*/libjvm.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/opt/(.*/)?lib(/.*)?			gen_context(system_u:object_r:lib_t,s0)
-+/opt/(.*/)?lib64(/.*)?			gen_context(system_u:object_r:lib_t,s0)
-+/opt/(.*/)?lib/.*\.so		--	gen_context(system_u:object_r:shlib_t,s0)
-+/opt/(.*/)?lib/.*\.so\.[^/]*	--	gen_context(system_u:object_r:shlib_t,s0)
-+/opt/(.*/)?lib64/.*\.so		--	gen_context(system_u:object_r:shlib_t,s0)
-+/opt/(.*/)?lib64/.*\.so\.[^/]*	--	gen_context(system_u:object_r:shlib_t,s0)
-+/opt/(.*/)?jre.*/libdeploy.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/opt/(.*/)?jre.*/libjvm.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/(.*/)?nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
- #
- # /sbin
-@@ -44,18 +49,22 @@
- #
- # /usr
- #
--/usr(/.*)?/HelixPlayer/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/(.*/)?/HelixPlayer/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
--/usr(/.*)?/java/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
--/usr(/.*)?/java/.*\.jar			--	gen_context(system_u:object_r:shlib_t,s0)
--/usr(/.*)?/java/.*\.jsa			--	gen_context(system_u:object_r:shlib_t,s0)
-+/usr/(.*/)?java/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/(.*/)?java/.*\.jar			--	gen_context(system_u:object_r:shlib_t,s0)
-+/usr/(.*/)?java/.*\.jsa			--	gen_context(system_u:object_r:shlib_t,s0)
-+
-+/usr/(.*/)?lib(/.*)?			gen_context(system_u:object_r:lib_t,s0)
-+/usr/(.*/)?lib64(/.*)?			gen_context(system_u:object_r:lib_t,s0)
-+/usr/(.*/)?lib/.*\.so		--	gen_context(system_u:object_r:shlib_t,s0)
-+/usr/(.*/)?lib/.*\.so\.[^/]*	--	gen_context(system_u:object_r:shlib_t,s0)
-+/usr/(.*/)?lib64/.*\.so		--	gen_context(system_u:object_r:shlib_t,s0)
-+/usr/(.*/)?lib64/.*\.so\.[^/]*	--	gen_context(system_u:object_r:shlib_t,s0)
- 
--/usr(/.*)?/lib(64)?(/.*)?			gen_context(system_u:object_r:lib_t,s0)
--/usr(/.*)?/lib(64)?/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:shlib_t,s0)
-+/usr/(.*/)?lib(64)?(/.*)?/ld-[^/]*\.so(\.[^/]*)* gen_context(system_u:object_r:ld_so_t,s0)
- 
--/usr(/.*)?/lib(64)?(/.*)?/ld-[^/]*\.so(\.[^/]*)* gen_context(system_u:object_r:ld_so_t,s0)
+-/usr/lib(64)?/pgsql/test/regress/.*\.so	--	gen_context(system_u:object_r:shlib_t,s0)
 -
--/usr(/.*)?/nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/(.*/)?nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
- /usr/lib(64)?/pgsql/test/regress/.*\.so	--	gen_context(system_u:object_r:shlib_t,s0)
+ /usr/lib/win32/.*			--	gen_context(system_u:object_r:shlib_t,s0)
  
-@@ -64,7 +73,7 @@
- /usr/lib(64)?/im/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
- /usr/lib(64)?/iiim/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
- 
--/usr(/.*)?/lib(64)?(/.*)?/nvidia/.*\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/(.*/)?lib(64)?(/.*)?/nvidia/.*\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/usr/lib(64)?/im/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
+-/usr/lib(64)?/iiim/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
+-
+ /usr/(.*/)?lib(64)?(/.*)?/nvidia/.*\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libsipphoneapi\.so.*	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
  /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/libGLU\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -74,9 +83,8 @@
- /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libGL(core)?\.so(\.[^/]*)*             --      	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libnvidia.*\.so(\.[^/]*)*              --      	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libXvMCNVIDIA\.so.*            --      	gen_context(system_u:object_r:textrel_shlib_t,s0)
--/usr/lib(64)?/vmware(.*/)?/VmPerl\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
--/usr/(local/)?lib/wine/.*\.so  		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/(local/)?lib(64)?/wine/.*\.so  		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/(local/)?lib/libfame-.*\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/local/.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:shlib_t,s0)
- 
-@@ -127,7 +135,7 @@
- /usr/lib(64)?/.*/program/libsvx680li\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/.*/program/libcomphelp4gcc3\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/.*/program/libsoffice\.so  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
--/usr(/.*)?/pcsc/drivers(/.*)?/lib(cm2020|cm4000|SCR24x)\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/(.*/)?pcsc/drivers(/.*)?/lib(cm2020|cm4000|SCR24x)\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
- /usr/lib(64)?/firefox.*\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/mozilla.*\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -180,15 +188,17 @@
- 
- # vmware 
- /usr/lib(64)?/vmware/lib(/.*)?/libgdk-x11-.*\.so.*  -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/lib(64)?/vmware/lib(/.*)?/HConfig.so  -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/lib(64)?/vmware/(.*/)?VmPerl\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
- # Java, Sun Microsystems (JPackage SRPM)
--/usr/.*/jre.*/libdeploy.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
--/usr/.*/jre.*/libjvm.so			--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/(.*/)?jre.*/libdeploy.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/(.*/)?jre.*/libjvm.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
--/usr(/.*)?/intellinux/nppdf\.so		--	gen_context(system_u:object_r:texrel_shlib_t,s0)
--/usr(/.*)?/intellinux/lib/\.so		--	gen_context(system_u:object_r:texrel_shlib_t,s0)
--/usr(/.*)?/intellinux/plug_ins/.*\.api	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
--/usr(/.*)?/intellinux/SPPlugins/ADMPlugin\.apl -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/(.*/)?intellinux/nppdf\.so		--	gen_context(system_u:object_r:texrel_shlib_t,s0)
-+/usr/(.*/)?intellinux/lib/\.so		--	gen_context(system_u:object_r:texrel_shlib_t,s0)
-+/usr/(.*/)?intellinux/plug_ins/.*\.api	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
-+/usr/(.*/)?intellinux/SPPlugins/ADMPlugin\.apl -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -99,7 +94,6 @@
+ /usr/lib(64)?/xorg/modules/extensions/nvidia(-[^/]*)?/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+ ifdef(`distro_redhat',`
+-/usr/lib(64)?/.*/program/.*\.so.*		gen_context(system_u:object_r:shlib_t,s0)
+ /usr/share/rhn/rhn_applet/eggtrayiconmodule\.so -- gen_context(system_u:object_r:shlib_t,s0)
+ 
+ # The following are libraries with text relocations in need of execmod permissions
+@@ -113,7 +107,7 @@
+ /usr/lib(64)?/libstdc\+\+\.so\.2\.7\.2\.8 --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libg\+\+\.so\.2\.7\.2\.8	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libglide3\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/usr/lib(64)?/libglide-v[0-9]*\.so.* 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/libglide3-v[0-9]*\.so.* 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libdv\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/helix/plugins/oggfformat\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/helix/plugins/theorarend\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -198,16 +192,12 @@
+ /usr/(.*/)?jre.*/libdeploy.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/(.*/)?jre.*/libjvm.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+-/usr/(.*/)?intellinux/nppdf\.so		--	gen_context(system_u:object_r:texrel_shlib_t,s0)
+-/usr/(.*/)?intellinux/lib/\.so		--	gen_context(system_u:object_r:texrel_shlib_t,s0)
+-/usr/(.*/)?intellinux/plug_ins/.*\.api	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
++/usr/(local/)?Adobe/(.*/)?intellinux/nppdf\.so	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
++/usr/(local/)?Adobe/(.*/)?lib/[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:texrel_shlib_t,s0)
++/usr/(local/)?Adobe/.*\.api	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
+ /usr/(.*/)?intellinux/SPPlugins/ADMPlugin\.apl -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  ') dnl end distro_redhat
  
- ifdef(`distro_suse',`
-@@ -214,3 +224,5 @@
- /var/spool/postfix/lib(64)?/lib.*\.so.*	--	gen_context(system_u:object_r:shlib_t,s0)
- /var/spool/postfix/lib(64)?/[^/]*/lib.*\.so.* -- gen_context(system_u:object_r:shlib_t,s0)
- /var/spool/postfix/lib(64)?/devfsd/.*\.so.* -- gen_context(system_u:object_r:shlib_t,s0)
-+/usr/NX/lib/libXcomp.so.*	--  gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/NX/lib/libjpeg.so.* 	--  gen_context(system_u:object_r:textrel_shlib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.2.32/policy/modules/system/miscfiles.fc
---- nsaserefpolicy/policy/modules/system/miscfiles.fc	2005-10-27 14:57:47.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/system/miscfiles.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -7,7 +7,7 @@
+-ifdef(`distro_suse',`
+-/usr/lib(64)?/samba/classic/[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:shlib_t,s0)
+-')
+-
  #
- # /opt
+ # /var
  #
--/opt(/.*)?/man(/.*)?		gen_context(system_u:object_r:man_t,s0)
-+/opt/(.*/)?man(/.*)?		gen_context(system_u:object_r:man_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.2.34/policy/modules/system/logging.te
+--- nsaserefpolicy/policy/modules/system/logging.te	2006-04-06 15:32:43.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/logging.te	2006-04-20 14:04:12.000000000 -0400
+@@ -140,7 +140,7 @@
+ init_use_fds(auditd_t)
+ init_exec(auditd_t)
+ init_write_initctl(auditd_t)
+-init_use_script_ptys(auditd_t)
++init_dontaudit_use_script_ptys(auditd_t)
+ 
+ logging_send_syslog_msg(auditd_t)
+ 
+@@ -293,7 +293,7 @@
+ 
+ fs_search_auto_mountpoints(syslogd_t)
+ 
+-term_dontaudit_use_console(syslogd_t)
++term_write_console(syslogd_t)
+ # Allow syslog to a terminal
+ term_write_unallocated_ttys(syslogd_t)
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.2.34/policy/modules/system/sysnetwork.te
+--- nsaserefpolicy/policy/modules/system/sysnetwork.te	2006-03-24 11:15:53.000000000 -0500
++++ serefpolicy-2.2.34/policy/modules/system/sysnetwork.te	2006-04-20 14:04:12.000000000 -0400
+@@ -248,6 +248,7 @@
  
- #
- # /srv
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.fc serefpolicy-2.2.32/policy/modules/system/modutils.fc
---- nsaserefpolicy/policy/modules/system/modutils.fc	2005-10-06 17:29:17.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/system/modutils.fc	2006-04-14 12:06:19.000000000 -0400
-@@ -2,9 +2,11 @@
- /etc/modules\.conf.*	--	gen_context(system_u:object_r:modules_conf_t,s0)
- /etc/modprobe\.conf.*	--	gen_context(system_u:object_r:modules_conf_t,s0)
- 
--/lib(64)?/modules/[^/]+/modules\..+ -- gen_context(system_u:object_r:modules_dep_t,s0)
-+/lib/modules/[^/]+/modules\..+ -- gen_context(system_u:object_r:modules_dep_t,s0)
-+/lib64/modules/[^/]+/modules\..+ -- gen_context(system_u:object_r:modules_dep_t,s0)
- 
--/lib(64)?/modules/modprobe\.conf -- gen_context(system_u:object_r:modules_conf_t,s0)
-+/lib/modules/modprobe\.conf -- gen_context(system_u:object_r:modules_conf_t,s0)
-+/lib64/modules/modprobe\.conf -- gen_context(system_u:object_r:modules_conf_t,s0)
- 
- /sbin/depmod.*		--	gen_context(system_u:object_r:depmod_exec_t,s0)
- /sbin/generate-modprobe\.conf -- gen_context(system_u:object_r:update_modules_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.32/policy/modules/system/selinuxutil.if
---- nsaserefpolicy/policy/modules/system/selinuxutil.if	2006-03-29 14:18:17.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/system/selinuxutil.if	2006-04-14 12:06:19.000000000 -0400
-@@ -697,8 +697,8 @@
- 
- 	files_search_etc($1)
- 	allow $1 selinux_config_t:dir search;
--	allow $1 file_context_t:dir r_dir_perms;
--	allow $1 file_context_t:file rw_file_perms;
-+	allow $1 file_context_t:dir rw_dir_perms;
-+	allow $1 file_context_t:file create_file_perms;
- 	allow $1 file_context_t:lnk_file { getattr read };
+ optional_policy(`
+ 	xen_append_log(dhcpc_t)
++	xen_dontaudit_rw_unix_stream_sockets(dhcpc_t)
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.32/policy/modules/system/unconfined.te
---- nsaserefpolicy/policy/modules/system/unconfined.te	2006-04-12 13:44:38.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/system/unconfined.te	2006-04-14 12:06:19.000000000 -0400
-@@ -37,6 +37,7 @@
- 	logging_domtrans_auditctl(unconfined_t)
- 
- 	seutil_domtrans_restorecon(unconfined_t)
-+	seutil_domtrans_semanage(unconfined_t)
- 
- 	userdom_unconfined(unconfined_t)
- 	userdom_priveleged_home_dir_manager(unconfined_t)
-@@ -64,6 +65,8 @@
- 	optional_policy(`
- 		dbus_stub(unconfined_t)
+ ########################################
+@@ -346,4 +347,5 @@
+ 
+ optional_policy(`
+ 	xen_append_log(ifconfig_t)
++	xen_dontaudit_rw_unix_stream_sockets(ifconfig_t)
+ ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.34/policy/modules/system/unconfined.if
+--- nsaserefpolicy/policy/modules/system/unconfined.if	2006-04-12 13:44:38.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/unconfined.if	2006-04-21 06:40:24.000000000 -0400
+@@ -224,6 +224,24 @@
  
-+		init_dbus_chat_script(unconfined_t)
+ ########################################
+ ## <summary>
++##	Send a SIGNULL signal to the unconfined domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`unconfined_signull',`
++	gen_require(`
++		type unconfined_t;
++	')
 +
- 		optional_policy(`
- 			avahi_dbus_chat(unconfined_t)
- 		')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.32/policy/modules/system/userdomain.if
---- nsaserefpolicy/policy/modules/system/userdomain.if	2006-04-14 07:58:13.000000000 -0400
-+++ serefpolicy-2.2.32/policy/modules/system/userdomain.if	2006-04-14 12:06:19.000000000 -0400
-@@ -379,10 +379,6 @@
- 	')
++	allow $1 unconfined_t:process signull;
++')
++
++########################################
++## <summary>
+ ##	Send generic signals to the unconfined domain.
+ ## </summary>
+ ## <param name="domain">
+@@ -363,6 +381,27 @@
  
- 	optional_policy(`
--		jabber_tcp_connect($1_t)
--	')
--
--	optional_policy(`
- 		nis_use_ypbind($1_t)
+ ########################################
+ ## <summary>
++##	Send and receive messages from
++##	unconfined_t over dbus.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`unconfined_dbus_chat',`
++	gen_require(`
++		type unconfined_t;
++		class dbus send_msg;
++	')
++
++	allow $1 unconfined_t:dbus send_msg;
++	allow unconfined_t $1:dbus send_msg;
++')
++
++########################################
++## <summary>
+ ##	Add an alias type to the unconfined domain.
+ ## </summary>
+ ## <desc>
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.34/policy/modules/system/userdomain.te
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2006-04-20 08:17:40.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/userdomain.te	2006-04-20 14:04:12.000000000 -0400
+@@ -6,6 +6,7 @@
+ 
+ 	ifdef(`enable_mls',`
+ 		role secadm_r;
++		role auditadm_r;
  	')
+ ')
  
-@@ -408,10 +404,6 @@
+@@ -67,6 +68,7 @@
+ 	# Define some type aliases to help with compatibility with
+ 	# macros and domains from the "strict" policy.
+ 	unconfined_alias_domain(secadm_t)
++	unconfined_alias_domain(auditadm_t)
+ 	unconfined_alias_domain(sysadm_t)
+ 
+ 	# User home directory type.
+@@ -82,6 +84,7 @@
+ 
+ 	# compatibility for switching from strict
+ #	dominance { role secadm_r { role system_r; }}
++#	dominance { role auditadm_r { role system_r; }}
+ #	dominance { role sysadm_r { role system_r; }}
+ #	dominance { role user_r { role system_r; }}
+ #	dominance { role staff_r { role system_r; }}
+@@ -105,9 +108,10 @@
+ 
+ 	ifdef(`enable_mls',`
+ 		allow secadm_r system_r;
++		allow auditadm_r system_r;
+ 		allow secadm_r user_r;
+-		allow user_r secadm_r;
+ 		allow staff_r secadm_r;
++		allow staff_r auditadm_r;
  	')
  
  	optional_policy(`
--		perdition_tcp_connect($1_t)
--	')
--
--	optional_policy(`
- 		portmap_tcp_connect($1_t)
+@@ -128,8 +132,19 @@
+ 
+ 	ifdef(`enable_mls',`
+ 		admin_user_template(secadm)
++		admin_user_template(auditadm)
++
++		role_change(staff,auditadm)
+ 		role_change(staff,secadm)
++
+ 		role_change(sysadm,secadm)
++		role_change(sysadm,auditadm)
++
++		role_change(auditadm,secadm)
++		role_change(auditadm,sysadm)
++
++		role_change(secadm,auditadm)
++		role_change(secadm,sysadm)
+ 	')
+ 
+ 	# this should be tunable_policy, but
+@@ -179,10 +194,13 @@
+ 		mls_file_downgrade(secadm_t)
+ 		init_exec(secadm_t)
+ 		logging_read_audit_log(secadm_t)
+-		logging_run_auditctl(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
+ 		userdom_dontaudit_append_staff_home_content_files(secadm_t)
+ 		files_relabel_all_files(secadm_t)
+ 		auth_relabel_shadow(secadm_t)
++
++		corecmd_exec_shell(auditadm_t)
++		logging_read_audit_log(auditadm_t)
++		logging_run_auditctl(auditadm_t,auditadm_r,{ auditadm_tty_device_t auditadm_devpts_t })
+ 	', `
+ 		logging_read_audit_log(sysadm_t)
+ 		logging_run_auditctl(sysadm_t,sysadm_r,admin_terminal)
+@@ -236,6 +254,7 @@
+ 
+ 		ifdef(`enable_mls',`
+ 			consoletype_exec(secadm_t)
++			consoletype_exec(auditadm_t)
+ 		')
  	')
  
-@@ -4140,11 +4132,31 @@
- 		type user_home_dir_t;
+@@ -248,6 +267,7 @@
+ 
+ 		ifdef(`enable_mls',`
+ 			dmesg_exec(secadm_t)
++			dmesg_exec(auditadm_t)
+ 		')
  	')
  
-+	allow $1 user_home_dir_t:dir create_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.34/policy/modules/system/xen.if
+--- nsaserefpolicy/policy/modules/system/xen.if	2006-03-23 16:08:51.000000000 -0500
++++ serefpolicy-2.2.34/policy/modules/system/xen.if	2006-04-20 14:04:12.000000000 -0400
+@@ -47,6 +47,24 @@
  
  ########################################
  ## <summary>
-+##	Create staff home directories
-+##	with automatic file type transition.
++##     Don't audit leaked file descriptor.
 +## </summary>
 +## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
++##     <summary>
++##     Domain to don't audit.
++##     </summary>
 +## </param>
 +#
-+interface(`userdom_manage_staff_home_dir',`
-+	gen_require(`
-+		type staff_home_dir_t;
-+	')
++interface(`xen_dontaudit_rw_unix_stream_sockets',`
++       gen_require(`
++               type xend_t;
++       ')
 +
-+	allow $1 staff_home_dir_t:dir create_dir_perms;
++       dontaudit $1 xend_t:unix_stream_socket { read write };
 +')
 +
 +########################################
 +## <summary>
- ##	Search generic user home directories.
+ ##	Connect to xenstored over an unix stream socket.
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.2.32/policy/modules/system/xen.te
---- nsaserefpolicy/policy/modules/system/xen.te	2006-03-23 14:33:30.000000000 -0500
-+++ serefpolicy-2.2.32/policy/modules/system/xen.te	2006-04-14 12:06:19.000000000 -0400
-@@ -19,6 +19,8 @@
- # var/lib files
- type xend_var_lib_t;
- files_type(xend_var_lib_t)
-+# for mounting an NFS store
-+files_mountpoint(xend_var_lib_t)
- 
- # log files
- type xend_var_log_t;
-@@ -67,6 +69,8 @@
- allow xend_t self:tcp_socket create_stream_socket_perms;
- allow xend_t self:packet_socket create_socket_perms;
- 
-+files_read_kernel_symbol_table(xend_t)
-+
- # pid file
- allow xend_t xend_var_run_t:file manage_file_perms;
- allow xend_t xend_var_run_t:sock_file manage_file_perms;
-@@ -210,6 +214,7 @@
- dev_filetrans_xen(xenstored_t)
- 
- term_dontaudit_use_generic_ptys(xenstored_t)
-+dev_rw_xen(xenstored_t)
- 
- init_use_fds(xenstored_t)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.2.32/Rules.modular
---- nsaserefpolicy/Rules.modular	2006-03-23 14:33:29.000000000 -0500
-+++ serefpolicy-2.2.32/Rules.modular	2006-04-14 14:21:43.000000000 -0400
-@@ -208,7 +208,7 @@
- #
- $(APPDIR)/customizable_types: $(BASE_CONF)
- 	@mkdir -p $(APPDIR)
--	$(verbose) $(GREP) '^[[:blank:]]*type .*customizable' $< | cut -d',' -f1 | cut -d' ' -f2 | $(SORT) -u > $(TMPDIR)/customizable_types
-+	$(verbose) $(GREP) '^[[:blank:]]*type .*customizable' $< | cut -d';' -f1 | cut -d',' -f1 | cut -d' ' -f2 | $(SORT) -u > $(TMPDIR)/customizable_types
- 	$(verbose) install -m 644 $(TMPDIR)/customizable_types $@ 
- 
- ########################################
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.2.34/policy/modules/system/xen.te
+--- nsaserefpolicy/policy/modules/system/xen.te	2006-04-18 22:50:01.000000000 -0400
++++ serefpolicy-2.2.34/policy/modules/system/xen.te	2006-04-20 14:04:12.000000000 -0400
+@@ -125,6 +125,7 @@
+ 
+ files_read_etc_files(xend_t)
+ files_read_kernel_symbol_table(xend_t)
++files_read_kernel_img(xend_t)
+ 
+ storage_raw_read_fixed_disk(xend_t)
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/rolemap serefpolicy-2.2.34/policy/rolemap
+--- nsaserefpolicy/policy/rolemap	2006-01-26 15:38:41.000000000 -0500
++++ serefpolicy-2.2.34/policy/rolemap	2006-04-20 14:04:12.000000000 -0400
+@@ -15,5 +15,6 @@
+ 
+ 	ifdef(`enable_mls',`
+ 		secadm_r secadm secadm_t
++		auditadm_t auditadm auditadm_t
+ 	')
+ ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.2.34/policy/users
+--- nsaserefpolicy/policy/users	2006-02-15 17:02:30.000000000 -0500
++++ serefpolicy-2.2.34/policy/users	2006-04-20 14:04:12.000000000 -0400
+@@ -29,7 +29,7 @@
+ gen_user(user_u, user, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255)
+ ',`
+ gen_user(user_u, user, user_r, s0, s0)
+-gen_user(staff_u, staff, staff_r sysadm_r ifdef(`enable_mls',`secadm_r'), s0, s0 - s15:c0.c255, c0.c255)
++gen_user(staff_u, staff, staff_r sysadm_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - s15:c0.c255, c0.c255)
+ gen_user(sysadm_u, sysadm, sysadm_r, s0, s0 - s15:c0.c255, c0.c255)
+ ')
+ 
+@@ -44,8 +44,8 @@
+ 	gen_user(root, user, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255)
+ ',`
+ 	ifdef(`direct_sysadm_daemon',`
+-		gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r') system_r, s0, s0 - s15:c0.c255, c0.c255)
++		gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - s15:c0.c255, c0.c255)
+ 	',`
+-		gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r'), s0, s0 - s15:c0.c255, c0.c255)
++		gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - s15:c0.c255, c0.c255)
+ 	')
+ ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/selinux-policy.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- selinux-policy.spec	15 Apr 2006 10:33:31 -0000	1.164
+++ selinux-policy.spec	21 Apr 2006 11:02:17 -0000	1.165
@@ -15,8 +15,8 @@
 %define CHECKPOLICYVER 1.30.3-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.32
-Release: 1.fc5
+Version: 2.2.34
+Release: 3.fc5
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -321,6 +321,30 @@
 %endif
 
 %changelog
+* Fri Apr 21 2006 Dan Walsh <dwalsh at redhat.com> 2.2.34-3.fc5
+- Bump for fc5
+
+* Fri Apr 21 2006 Dan Walsh <dwalsh at redhat.com> 2.2.34-3
+- Allow mono to chat with unconfined
+
+* Thu Apr 20 2006 Dan Walsh <dwalsh at redhat.com> 2.2.34-2
+- Allow procmail to sendmail
+- Allow nfs to share dosfs
+
+* Thu Apr 20 2006 Dan Walsh <dwalsh at redhat.com> 2.2.34-1
+- Update to latest from upstream
+- Allow selinux-policy to be removed and kernel not to crash
+
+* Tue Apr 18 2006 Dan Walsh <dwalsh at redhat.com> 2.2.33-1
+- Update to latest from upstream
+- Add James Antill patch for xen
+- Many fixes for pegasus
+
+* Sat Apr 15 2006 Dan Walsh <dwalsh at redhat.com> 2.2.32-2
+- Add unconfined_mount_t
+- Allow privoxy to connect to httpd_cache
+- fix cups labeleing on /var/cache/cups
+
 * Sat Apr 15 2006 Dan Walsh <dwalsh at redhat.com> 2.2.32-1.fc5
 - Bump for fc5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	15 Apr 2006 10:33:31 -0000	1.54
+++ sources	21 Apr 2006 11:02:17 -0000	1.55
@@ -1 +1 @@
-7a3563e2478a4b18dc689de8561831b5  serefpolicy-2.2.32.tgz
+5c1fa51a13bdb35dcf053a9b68072ff5  serefpolicy-2.2.34.tgz



From fedora-cvs-commits at redhat.com  Fri Apr 21 11:03:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 07:03:46 -0400
Subject: rpms/beagle/FC-5 beagle.spec,1.51,1.52
Message-ID: <200604211103.k3LB3kAD017058@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/beagle/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv17028

Modified Files:
	beagle.spec 
Log Message:
fix python libdir issue




Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/FC-5/beagle.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- beagle.spec	21 Apr 2006 10:50:55 -0000	1.51
+++ beagle.spec	21 Apr 2006 11:03:43 -0000	1.52
@@ -195,7 +195,7 @@
 %{_libdir}/pkgconfig/libbeagle*.pc
 
 %files -n libbeagle-python
-%{_prefix}/lib/python*/site-packages/beagle.so
+%{_libdir}/python*/site-packages/beagle.so
 
 %changelog
 * Fri Apr 21 2006 Alexander Larsson <alexl at redhat.com> - 0.2.5-1.fc5.1



From fedora-cvs-commits at redhat.com  Fri Apr 21 11:07:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 07:07:37 -0400
Subject: rpms/beagle/FC-5 beagle.spec,1.52,1.53
Message-ID: <200604211107.k3LB7bi4017632@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/beagle/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv17586

Modified Files:
	beagle.spec 
Log Message:
Mark config files



Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/FC-5/beagle.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- beagle.spec	21 Apr 2006 11:03:43 -0000	1.52
+++ beagle.spec	21 Apr 2006 11:07:35 -0000	1.53
@@ -171,7 +171,7 @@
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_sysconfdir}/cron.daily/*
-%{_sysconfdir}/beagle
+%config(noreplace) %{_sysconfdir}/beagle
 %{_bindir}/*
 %{_sbindir}/*
 %{_libdir}/pkgconfig/beagle*.pc



From fedora-cvs-commits at redhat.com  Fri Apr 21 11:08:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 07:08:19 -0400
Subject: rpms/pilot-link/devel pilot-link-0.11.8-realpath.path, NONE,
	1.1 pilot-link.spec, 1.40, 1.41
Message-ID: <200604211108.k3LB8JSv017775@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/pilot-link/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17719

Modified Files:
	pilot-link.spec 
Added Files:
	pilot-link-0.11.8-realpath.path 
Log Message:
- fix pilot-xfer crash on missing device node #186779, #175334
- don't include unnecessary man page #185147




--- NEW FILE pilot-link-0.11.8-realpath.path ---
--- pilot-link-0.11.8/libpisock/connect.c.orig	2006-04-14 17:58:37.000000000 +0200
+++ pilot-link-0.11.8/libpisock/connect.c	2006-04-14 18:01:37.000000000 +0200
@@ -24,6 +24,12 @@
 #include <errno.h>
 #include <unistd.h>
 #include <sys/stat.h>
+#include <limits.h>
+
+/* PATH_MAX is not defined in limits.h on some platforms */
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
 
 #include "pi-socket.h"
 #include "pi-dlp.h"
@@ -106,7 +112,7 @@
 
 
 		if (portname) {
-			char realport[50];
+			char realport[PATH_MAX];
 			realpath(portname, realport);
 			errno = save_errno;
 


Index: pilot-link.spec
===================================================================
RCS file: /cvs/dist/rpms/pilot-link/devel/pilot-link.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- pilot-link.spec	29 Mar 2006 20:24:01 -0000	1.40
+++ pilot-link.spec	21 Apr 2006 11:08:15 -0000	1.41
@@ -4,7 +4,7 @@
 Summary: File transfer utilities between Linux and PalmPilots.
 Name: pilot-link
 Version: 0.11.8
-Release: 14
+Release: 15
 Source: pilot-link-%{version}.tar.bz2
 Url: http://www.pilot-link.org/
 Patch1: pilot-link-0.11.0-perlmd5.patch
@@ -15,6 +15,7 @@
 Patch7: pilot-link-0.11.8-readfile.patch
 Patch8: pilot-link-0.11.8-underquoted.patch
 Patch9: pilot-link-0.11.8-misc1.patch
+Patch10: pilot-link-0.11.8-realpath.path
 Epoch: 2
 License: GPL
 Group: Applications/Communications
@@ -69,9 +70,10 @@
 %patch7 -p1 -b .read
 %patch8 -p1 -b .underquoted
 %patch9 -p1 -b .misc1
+%patch10 -p1 -b .realpath
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %configure \
+CFLAGS="%{optflags}" %configure \
   --with-python=no \
   --with-itcl=no \
   --with-tk=no \
@@ -87,13 +89,13 @@
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %if %{support_perl}
 if test -f bindings/Perl/Makefile.PL ; then
    cd bindings/Perl
    perl -pi -e 's|^\$libdir =.*|\$libdir = "%{buildroot}%{_libdir}";|g' Makefile.PL
-   CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor
+   CFLAGS="%{optflags}" perl Makefile.PL PREFIX=%{buildroot}%{_prefix} INSTALLDIRS=vendor
    make
    cd ../..
 fi
@@ -106,10 +108,12 @@
   make install -C bindings/Perl
   rm -f %{buildroot}%{_libdir}/perl5/vendor_perl/%{perl_version}/*/auto/PDA/Pilot/Pilot.bs \
         %{buildroot}%{_libdir}/perl5/site_perl/*/*/*/PDA/Pilot/.packlist
+%else
+  rm -f %{buildroot}%{_mandir}/man1/ietf2datebook*
 %endif
 
 # remove files we don't want to include
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*.la
 
 # remove broken prog
 rm -f %{buildroot}%{_bindir}/pilot-prc
@@ -119,7 +123,7 @@
 %postun -p /sbin/ldconfig
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -141,6 +145,10 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* 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
+
 * Wed Mar 29 2006 Than Ngo <than at redhat.com> 2:0.11.8-14 
 - rebuild to get rid of libpisock.so.9
 



From fedora-cvs-commits at redhat.com  Fri Apr 21 11:11:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 07:11:07 -0400
Subject: rpms/foomatic/devel .cvsignore, 1.38, 1.39 foomatic.spec, 1.133,
	1.134 sources, 1.38, 1.39 foomatic-cleanup.patch, 1.1,
	NONE foomatic-default0.patch, 1.1, NONE
Message-ID: <200604211111.k3LBB7xk018327@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/foomatic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18229

Modified Files:
	.cvsignore foomatic.spec sources 
Removed Files:
	foomatic-cleanup.patch foomatic-default0.patch 
Log Message:
* Fri Apr 21 2006 Tim Waugh <twaugh at redhat.com>
- Updated db-engine to 3.0-20060421.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/foomatic/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	17 Jan 2006 13:50:45 -0000	1.38
+++ .cvsignore	21 Apr 2006 11:10:59 -0000	1.39
@@ -28,3 +28,4 @@
 foomatic-db-3.0-20060103.tar.gz
 foomatic-db-3.0-20060116.tar.gz
 foomatic-db-engine-3.0-20060117.tar.gz
+foomatic-db-engine-3.0-20060421.tar.gz


Index: foomatic.spec
===================================================================
RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- foomatic.spec	24 Mar 2006 18:01:09 -0000	1.133
+++ foomatic.spec	21 Apr 2006 11:11:03 -0000	1.134
@@ -1,5 +1,5 @@
 %define dbver 20060116
-%define enginever 3.0-20060117
+%define enginever 3.0-20060421
 %define filtersver 20051209
 %define hpijsver 1.5-20051209
 
@@ -54,12 +54,6 @@
 # Fix tag mismatch in db.
 Patch16: foomatic-badxml.patch
 
-# Handle PPDs with default option values of '0'.
-Patch17: foomatic-default0.patch
-
-# Fix foomatic-cleanupdrivers.
-Patch18: foomatic-cleanup.patch
-
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:	libxml2-devel
@@ -111,8 +105,6 @@
 %patch14 -p1 -b .ampathxml
 %patch10 -p1 -b .xml-cflags
 %patch15 -p1
-%patch17 -p1 -b .default0
-%patch18 -p1 -b .cleanup
 ./make_configure
 popd
 
@@ -278,6 +270,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Fri Apr 21 2006 Tim Waugh <twaugh at redhat.com>
+- Updated db-engine to 3.0-20060421.
+
 * Fri Mar 24 2006 Tim Waugh <twaugh at redhat.com> 3.0.2-34
 - Always use /usr/lib/cups/{backend,filter}.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/foomatic/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	17 Jan 2006 13:50:45 -0000	1.38
+++ sources	21 Apr 2006 11:11:03 -0000	1.39
@@ -3,4 +3,4 @@
 5876178c3aefd36102bc5eef575d3f9c  foomatic-filters-3.0-20051209.tar.gz
 8c217af8a570124d9ad7f8a4b1270ebe  foomatic-db-hpijs-1.5-20051209.tar.gz
 54ae910edbb0ed3816cebe05a0f0b605  foomatic-db-3.0-20060116.tar.gz
-d764bd043e47abc523ea9fbcd77659f1  foomatic-db-engine-3.0-20060117.tar.gz
+54e5a0daf74d9d0e851069f54f5b6995  foomatic-db-engine-3.0-20060421.tar.gz


--- foomatic-cleanup.patch DELETED ---


--- foomatic-default0.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 21 11:14:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 07:14:41 -0400
Subject: rpms/beagle/FC-5 beagle.spec,1.53,1.54
Message-ID: <200604211114.k3LBEfpf019019@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/beagle/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18957

Modified Files:
	beagle.spec 
Log Message:
More lib64 fixes



Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/FC-5/beagle.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- beagle.spec	21 Apr 2006 11:07:35 -0000	1.53
+++ beagle.spec	21 Apr 2006 11:14:38 -0000	1.54
@@ -110,8 +110,8 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/beagle/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
-rm -f $RPM_BUILD_ROOT%{_prefix}/lib/python*/site-packages/*.a
-rm -f $RPM_BUILD_ROOT%{_prefix}/lib/python*/site-packages/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la
 
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/beagle/*/*.dll
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/beagle/*.dll



From fedora-cvs-commits at redhat.com  Fri Apr 21 11:24:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 07:24:25 -0400
Subject: rpms/foomatic/FC-5 .cvsignore, 1.38,
	1.39 foomatic-db-engine-libdir.patch, 1.3, 1.4 foomatic.spec,
	1.133, 1.134 sources, 1.38, 1.39 foomatic-cleanup.patch, 1.1,
	NONE foomatic-default0.patch, 1.1, NONE
Message-ID: <200604211124.k3LBOPuQ013462@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/foomatic/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13446

Modified Files:
	.cvsignore foomatic-db-engine-libdir.patch foomatic.spec 
	sources 
Removed Files:
	foomatic-cleanup.patch foomatic-default0.patch 
Log Message:
* Fri Apr 21 2006 Tim Waugh <twaugh at redhat.com>
- Updated db-engine to 3.0-20060421.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/foomatic/FC-5/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	17 Jan 2006 13:50:45 -0000	1.38
+++ .cvsignore	21 Apr 2006 11:24:22 -0000	1.39
@@ -28,3 +28,4 @@
 foomatic-db-3.0-20060103.tar.gz
 foomatic-db-3.0-20060116.tar.gz
 foomatic-db-engine-3.0-20060117.tar.gz
+foomatic-db-engine-3.0-20060421.tar.gz

foomatic-db-engine-libdir.patch:
 configure.ac |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Index: foomatic-db-engine-libdir.patch
===================================================================
RCS file: /cvs/dist/rpms/foomatic/FC-5/foomatic-db-engine-libdir.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- foomatic-db-engine-libdir.patch	17 Jan 2006 13:50:45 -0000	1.3
+++ foomatic-db-engine-libdir.patch	21 Apr 2006 11:24:22 -0000	1.4
@@ -11,17 +11,6 @@
  PTALPIPESSEARCHPATH=/var/run:/var:/var/ptal:/usr/var/run:/usr/var:/usr/var/ptal:/usr/local/var/run:/usr/local/var:/usr/local/var/ptal:/dev:/dev/ptal
  MTINKPIPESSEARCHPATH=/var:/var/run:/usr/var/:/usr/var/run:/usr/local/var:/usr/local/var/run:/dev
  
-@@ -218,8 +218,8 @@
- AC_PATH_PROGS(CUPS_ADMIN,lpadmin,/usr/sbin/lpadmin,$SBINSEARCHPATH)
- AC_PATH_PROGS(CUPS_LPSTAT,lpstat,/usr/bin/lpstat,$BINSEARCHPATH)
- AC_PATH_DIRS(CUPS_PPDS,cups/model,/usr/share/cups/model,$DATASEARCHPATH)
--AC_PATH_DIRS(CUPS_FILTERS,cups/filter,/usr/lib/cups/filter,$DATASEARCHPATH)
--AC_PATH_DIRS(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$DATASEARCHPATH)
-+AC_PATH_DIRS(CUPS_FILTERS,cups/filter,$libdir/cups/filter,$DATASEARCHPATH)
-+AC_PATH_DIRS(CUPS_BACKENDS,cups/backend,$libdir/cups/backend,$DATASEARCHPATH)
- AC_PATH_PROGS(CUPS_PCONF,cups/printers.conf,$CUPS_ETC/printers.conf,$SYSCONFSEARCHPATH)
- AC_PATH_PROGS(CUPS_LPR,lpr-cups lpr,/usr/bin/lpr,$BINSEARCHPATH)
- AC_PATH_PROGS(CUPS_LPQ,lpq-cups lpq,/usr/bin/lpq,$BINSEARCHPATH)
 @@ -236,15 +236,15 @@
  AC_PATH_PROGS(CUPS_LPINFO,lpinfo,/usr/sbin/lpinfo,$SBINSEARCHPATH)
  


Index: foomatic.spec
===================================================================
RCS file: /cvs/dist/rpms/foomatic/FC-5/foomatic.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- foomatic.spec	24 Mar 2006 18:16:29 -0000	1.133
+++ foomatic.spec	21 Apr 2006 11:24:22 -0000	1.134
@@ -1,5 +1,5 @@
 %define dbver 20060116
-%define enginever 3.0-20060117
+%define enginever 3.0-20060421
 %define filtersver 20051209
 %define hpijsver 1.5-20051209
 
@@ -54,12 +54,6 @@
 # Fix tag mismatch in db.
 Patch16: foomatic-badxml.patch
 
-# Handle PPDs with default option values of '0'.
-Patch17: foomatic-default0.patch
-
-# Fix foomatic-cleanupdrivers.
-Patch18: foomatic-cleanup.patch
-
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:	libxml2-devel
@@ -111,8 +105,6 @@
 %patch14 -p1 -b .ampathxml
 %patch10 -p1 -b .xml-cflags
 %patch15 -p1
-%patch17 -p1 -b .default0
-%patch18 -p1 -b .cleanup
 ./make_configure
 popd
 
@@ -288,6 +280,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Fri Apr 21 2006 Tim Waugh <twaugh at redhat.com>
+- Updated db-engine to 3.0-20060421.
+
 * Fri Mar 24 2006 Tim Waugh <twaugh at redhat.com> 3.0.2-33.3
 - Use /usr/lib/cups/backend and /usr/lib/cups/filter.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/foomatic/FC-5/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	17 Jan 2006 13:50:45 -0000	1.38
+++ sources	21 Apr 2006 11:24:22 -0000	1.39
@@ -3,4 +3,4 @@
 5876178c3aefd36102bc5eef575d3f9c  foomatic-filters-3.0-20051209.tar.gz
 8c217af8a570124d9ad7f8a4b1270ebe  foomatic-db-hpijs-1.5-20051209.tar.gz
 54ae910edbb0ed3816cebe05a0f0b605  foomatic-db-3.0-20060116.tar.gz
-d764bd043e47abc523ea9fbcd77659f1  foomatic-db-engine-3.0-20060117.tar.gz
+54e5a0daf74d9d0e851069f54f5b6995  foomatic-db-engine-3.0-20060421.tar.gz


--- foomatic-cleanup.patch DELETED ---


--- foomatic-default0.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 21 11:38:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 07:38:32 -0400
Subject: rpms/policycoreutils/FC-5 policycoreutils-rhat.patch, 1.171,
	1.172 policycoreutils.spec, 1.244, 1.245 sources, 1.109, 1.110
Message-ID: <200604211138.k3LBcWpp013547@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13532

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec sources 
Log Message:
* Fri Apr 21 2006 Dan Walsh <dwalsh at redhat.com> 1.30.6-3.fc5
- Bump to build in FC5


policycoreutils-rhat.patch:
 audit2allow/Makefile         |    4 
 audit2allow/audit2allow      |  474 ++-------------------------------------
 audit2allow/audit2allow.1    |    5 
 audit2allow/avc.py           |  519 +++++++++++++++++++++++++++++++++++++++++++
 restorecond/restorecond.conf |    2 
 semanage/semanage            |    2 
 semanage/seobject.py         |   14 -
 setsebool/setsebool.8        |    2 
 8 files changed, 579 insertions(+), 443 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-5/policycoreutils-rhat.patch,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- policycoreutils-rhat.patch	5 Apr 2006 13:18:30 -0000	1.171
+++ policycoreutils-rhat.patch	21 Apr 2006 11:38:28 -0000	1.172
@@ -1,18 +1,553 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30.4/audit2allow/audit2allow
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30.6/audit2allow/audit2allow
 --- nsapolicycoreutils/audit2allow/audit2allow	2006-03-29 15:35:22.000000000 -0500
-+++ policycoreutils-1.30.4/audit2allow/audit2allow	2006-04-05 08:59:26.000000000 -0400
-@@ -577,7 +577,7 @@
++++ policycoreutils-1.30.6/audit2allow/audit2allow	2006-04-20 09:47:19.000000000 -0400
+@@ -24,431 +24,8 @@
+ #                                        02111-1307  USA
+ #
+ #  
+-import commands, sys, os, pwd, string, getopt, re, selinux
+-
+-obj="(\{[^\}]*\}|[^ \t:]*)"
+-allow_regexp="(allow|dontaudit)[ \t]+%s[ \t]*%s[ \t]*:[ \t]*%s[ \t]*%s" % (obj, obj, obj, obj)
+-awk_script='/^[[:blank:]]*interface[[:blank:]]*\(/ {\n\
+-        IFACEFILE=FILENAME\n\
+-	IFACENAME = gensub("^[[:blank:]]*interface[[:blank:]]*\\\\(\`?","","g",$0);\n\
+-	IFACENAME = gensub("\'?,.*$","","g",IFACENAME);\n\
+-}\n\
+-\n\
+-/^[[:blank:]]*(allow|dontaudit)[[:blank:]]+.*;[[:blank:]]*$/ {\n\
+-\n\
+-  if ((length(IFACENAME) > 0) && (IFACEFILE == FILENAME)){\n\
+-		ALLOW = gensub("^[[:blank:]]*","","g",$0)\n\
+-		ALLOW = gensub(";[[:blank:]]*$","","g",$0)\n\
+-		print FILENAME "\\t" IFACENAME "\\t" ALLOW;\n\
+-	}\n\
+-}\
+-'
+-
+-class accessTrans:
+-    def __init__(self):
+-        self.dict={}
+-	try:
+-		fd=open("/usr/share/selinux/devel/include/support/obj_perm_sets.spt")
+-	except IOError, error:
+-		raise IOError("Reference policy generation requires the policy development package.\n%s" % error)
+-        records=fd.read().split("\n")
+-        regexp="^define *\(`([^']*)' *, *` *\{([^}]*)}'"
+-        for r in records:
+-            m=re.match(regexp,r)
+-            if m!=None:
+-                self.dict[m.groups()[0]] = m.groups()[1].split()
+-        fd.close()
+-    def get(self, var):
+-        l=[]
+-        for v in var:
+-            if v in self.dict.keys():
+-                l += self.dict[v]
+-            else:
+-                if v not in ("{", "}"):
+-                    l.append(v)
+-        return l
+-
+-class interfaces:
+-    def __init__(self):
+-        self.dict={}
+-        trans=accessTrans()
+-	(input, output) = os.popen2("awk -f - /usr/share/selinux/devel/include/*/*.if 2> /dev/null")
+-	input.write(awk_script)
+-	input.close()
+-	records=output.read().split("\n")
+-	input.close()
+-        if len(records) > 0:
+-            regexp="([^ \t]*)[ \t]+([^ \t]*)[ \t]+%s" % allow_regexp
+-            for r in records:
+-                m=re.match(regexp,r)
+-                if m==None:
+-                    continue
+-                val=m.groups()
+-                file=os.path.basename(val[0]).split(".")[0]
+-                iface=val[1]
+-                Scon=val[3].split()
+-                Tcon=val[4].split()
+-                Class=val[5].split()
+-                Access=trans.get(val[6].split())
+-                for s in Scon:
+-                    for t in Tcon:
+-                        for c in Class:
+-                            if (s, t, c) not in self.dict.keys():
+-                                self.dict[(s, t, c)]=[]
+-                            self.dict[(s, t, c)].append((Access, file, iface))
+-    def out(self):
+-        keys=self.dict.keys()
+-        keys.sort()
+-        for k in keys:
+-            print k
+-            for i in self.dict[k]:
+-                print "\t", i
+-                
+-    def match(self, Scon, Tcon, Class, Access):
+-        keys=self.dict.keys()
+-        ret=[]
+-        if (Scon, Tcon, Class) in keys:
+-            for i in self.dict[(Scon, Tcon, Class)]:
+-                if Access in i[0]:
+-                    if i[2].find(Access) >= 0:
+-                        ret.insert(0, i)
+-                    else:
+-                        ret.append(i)
+-            return ret
+-        if ("$1", Tcon, Class) in keys:
+-            for i in self.dict[("$1", Tcon, Class)]:
+-                if Access in i[0]:
+-                    if i[2].find(Access) >= 0:
+-                        ret.insert(0, i)
+-                    else:
+-                        ret.append(i)
+-            return ret
+-        if (Scon, "$1", Class) in keys:
+-            for i in self.dict[(Scon, "$1", Class)]:
+-                if Access in i[0]:
+-                    if i[2].find(Access) >= 0:
+-                        ret.insert(0, i)
+-                    else:
+-                        ret.append(i)
+-            return ret
+-        else:
+-            return ret
+-        
+-
+-class serule:
+-	def __init__(self, type, source, target, seclass):
+-		self.type=type
+-		self.source=source
+-		self.target=target
+-		self.seclass=seclass
+-		self.avcinfo={}
+-		self.iface=None
+-		
+-	def add(self, avc):
+-		for a in avc[0]:
+-			if a not in self.avcinfo.keys():
+-				self.avcinfo[a]=[]
+-
+-			self.avcinfo[a].append(avc[1:])
+-
+-	def getAccess(self):
+-		if len(self.avcinfo.keys()) == 1:
+-			for i in self.avcinfo.keys():
+-				return i
+-		else:
+-			keys=self.avcinfo.keys()
+-			keys.sort()
+-			ret="{"
+-			for i in keys:
+-				ret=ret + " " + i				
+-			ret=ret+" }"
+-			return ret
+-	def out(self, verbose=0):
+-		ret=""
+-		ret=ret+"%s %s %s:%s %s;" % (self.type, self.source, self.gettarget(), self.seclass, self.getAccess())
+-		if verbose:
+-			keys=self.avcinfo.keys()
+-			keys.sort()
+-			for i in keys:
+-				for x in self.avcinfo[i]:
+-					ret=ret+"\n\t#TYPE=AVC  MSG=%s  " % x[0]
+-					if len(x[1]):
+-						ret=ret+"COMM=%s  " % x[1]
+-					if len(x[2]):
+-						ret=ret+"NAME=%s  " % x[2]
+-					ret=ret + " : " + i 
+-		return ret
+-		
+-	def gen_reference_policy(self, iface):
+-		ret=""
+-		Scon=self.source
+-		Tcon=self.gettarget()
+-		Class=self.seclass
+-		Access=self.getAccess()
+-		m=iface.match(Scon,Tcon,Class,Access)
+-		if len(m)==0:
+-			return self.out()
+-		else:
+-			file=m[0][1]
+-			ret="\n#%s\n"% self.out()
+-			ret += "optional_policy(`%s', `\n" % m[0][1]
+-			first=True
+-			for i in m:
+-				if file != i[1]:
+-					ret += "')\ngen_require(`%s', `\n" % i[1]
+-					file = i[1]
+-					first=True
+-				if first:
+-					ret += "\t%s(%s)\n" % (i[2], Scon)
+-					first=False
+-				else:
+-					ret += "#\t%s(%s)\n" % (i[2], Scon)
+-			ret += "');"
+-		return ret
+-		
+-	def gettarget(self):
+-		if self.source == self.target:
+-			return "self"
+-		else:
+-			return self.target
+-	
+-class seruleRecords:
+-	def __init__(self, input, last_reload=0, verbose=0, te_ind=0):
+-		self.last_reload=last_reload
+-                self.initialize()
+-		self.load(input, te_ind)
+-		self.gen_ref_policy = False
+-
+-        def initialize(self):
+-       		self.seRules={}
+-		self.seclasses={}
+-		self.types=[]
+-		self.roles=[]
+-
+-	def gen_reference_policy(self):
+-		self.gen_ref_policy = True
+-		self.iface=interfaces()
+-
+-	def warning(self, error):
+-		sys.stderr.write("%s: " % sys.argv[0])
+-		sys.stderr.write("%s\n" % error)
+-		sys.stderr.flush()
+-
+-	def load(self, input, te_ind=0):
+-		VALID_CMDS=("allow", "dontaudit", "auditallow", "role")
+-		
+-		avc=[]
+-		found=0
+-		line = input.readline()
+-		if te_ind:
+-			while line:
+-				rec=line.split()
+-				if len(rec) and rec[0] in VALID_CMDS:
+-					self.add_terule(line)
+-				line = input.readline()
+-					
+-		else:
+-			while line:
+-				rec=line.split()
+-				for i in rec:
+-					if i=="avc:" or i=="message=avc:" or i=="msg='avc:":
+-
+-						found=1
+-					else:
+-						avc.append(i)
+-				if found:
+-					self.add(avc)
+-					found=0
+-					avc=[]
+-				line = input.readline()
+-				
+-
+-	def get_target(self, i, rule):
+-		target=[]
+-		if rule[i][0] == "{":
+-			for t in rule[i].split("{"):
+-				if len(t):
+-					target.append(t)
+-			i=i+1
+-			for s in rule[i:]:
+-				if s.find("}") >= 0:
+-					for s1 in s.split("}"):
+-						if len(s1):
+-							target.append(s1)
+-						i=i+1
+-						return (i, target)
+-
+-				target.append(s)
+-				i=i+1
+-		else:
+-			if rule[i].find(";") >= 0:
+-				for s1 in rule[i].split(";"):
+-					if len(s1):
+-						target.append(s1)
+-			else:
+-				target.append(rule[i])
+-
+-		i=i+1
+-		return (i, target)
+-
+-	def rules_split(self, rules):
+-		(idx, target ) = self.get_target(0, rules)
+-		(idx, subject) = self.get_target(idx, rules)
+-		return (target, subject)
+-
+-	def add_terule(self, rule):
+-		rc = rule.split(":")
+-		rules=rc[0].split()
+-		type=rules[0]
+-		if type == "role":
+-			print type
+-		(sources, targets) = self.rules_split(rules[1:])
+-		rules=rc[1].split()
+-		(seclasses, access) = self.rules_split(rules)
+-		for scon in sources:
+-			for tcon in targets:
+-				for seclass in seclasses:
+-					self.add_rule(type, scon, tcon, seclass,access)
+-		
+-	def add_rule(self, rule_type, scon, tcon, seclass, access, msg="", comm="", name=""):
+-		self.add_seclass(seclass, access)
+-		self.add_type(tcon)
+-		self.add_type(scon)
+-		if (rule_type, scon, tcon, seclass) not in self.seRules.keys():
+-			self.seRules[(rule_type, scon, tcon, seclass)]=serule(rule_type, scon, tcon, seclass)
+-				
+-		self.seRules[(rule_type, scon, tcon, seclass)].add((access, msg, comm, name ))
+-
+-	def add(self,avc):
+-		scon=""
+-		tcon=""
+-		seclass=""
+-		comm=""
+-		name=""
+-		msg=""
+-		access=[]
+-		if "security_compute_sid" in avc:
+-			return
+-		
+-		if "load_policy" in avc and self.last_reload:
+-                        self.initialize()
+-
+-		if "granted" in avc:
+-			return
+-		try:
+-			for i in range (0, len(avc)):
+-				if avc[i]=="{":
+-					i=i+1
+-					while i<len(avc) and avc[i] != "}":
+-						access.append(avc[i])
+-						i=i+1
+-					continue
+-			
+-				t=avc[i].split('=')
+-				if len(t) < 2:
+-					continue
+-				if t[0]=="scontext":
+-					context=t[1].split(":")
+-					scon=context[2]
+-					srole=context[1]
+-					continue
+-				if t[0]=="tcontext":
+-					context=t[1].split(":")
+-					tcon=context[2]
+-					trole=context[1]
+-					continue
+-				if t[0]=="tclass":
+-					seclass=t[1]
+-					continue
+-				if t[0]=="comm":
+-					comm=t[1]
+-					continue
+-				if t[0]=="name":
+-					name=t[1]
+-					continue
+-				if t[0]=="msg":
+-					msg=t[1]
+-					continue
+-
+-			if scon=="" or tcon =="" or seclass=="":
+-				return
+-		except IndexError, e:
+-			self.warning("Bad AVC Line: %s" % avc)
+-			return
+-			
+-		self.add_role(srole)
+-		self.add_role(trole)
+-		self.add_rule("allow", scon, tcon, seclass, access, msg, comm, name)
+-
+-	def add_seclass(self,seclass, access):
+-		if seclass not in self.seclasses.keys():
+-				self.seclasses[seclass]=[]
+-		for a in access:
+-			if a not in self.seclasses[seclass]:
+-				self.seclasses[seclass].append(a)
+-				
+-	def add_role(self,role):
+-		if role not in self.roles:
+-				self.roles.append(role)
+-
+-	def add_type(self,type):
+-		if type not in self.types:
+-				self.types.append(type)
+-
+-	def gen_module(self, module):
+-            if self.gen_ref_policy:
+-		return "policy_module(%s, 1.0);" % module
+-            else:
+-		return "module %s 1.0;" % module
+-
+-	def gen_requires(self):
+-		self.roles.sort()
+-		self.types.sort()
+-		keys=self.seclasses.keys()
+-		keys.sort()
+-		rec="\n\nrequire {\n"
+-#		if len(self.roles) > 0:
+-#			for i in self.roles:
+-#				rec += "\trole %s; \n" % i
+-#			rec += "\n" 
+-#
+-		for i in keys:
+-			access=self.seclasses[i]
+-			if len(access) > 1:
+-				access.sort()
+-				rec += "\tclass %s {" % i
+-				for a in access:
+-					rec += " %s" % a
+-				rec += " }; \n"
+-			else:
+-				rec += "\tclass %s %s;\n" % (i, access[0])
+-				
+-		rec += "\n" 
+-			
+-		for i in self.types:
+-			rec += "\ttype %s; \n" % i
+-		rec += "};\n\n"
+-		return rec
+-	
+-	def out(self, require=0, module=""):
+-		rec=""
+-		if len(self.seRules.keys())==0:
+-		       raise(ValueError("No AVC messages found."))
+-		if module != "":
+-			rec += self.gen_module(module)
+-			rec += self.gen_requires()
+-		else:
+-			if requires:
+-				rec+=self.gen_requires()
+-
+-		keys=self.seRules.keys()
+-		keys.sort()
+-		for i in keys:
+-			if self.gen_ref_policy:
+-				rec += self.seRules[i].gen_reference_policy(self.iface)+"\n"
+-			else:
+-				rec += self.seRules[i].out(verbose)+"\n"
+-		return rec
++import commands, sys, os, getopt, selinux
++from avc import *
+ 
+ if __name__ == '__main__':
+ 
+@@ -469,10 +46,11 @@
+ 		-M               generate loadable module package, conflicts with -o\n\
+ 		-o, --output     append output to <outputfile>, conflicts with -M\n\
+ 		-r, --requires   generate require output \n\
+-		-t, --tefile     Indicates input is Existing Type Enforcement file\n\
++		-t, --tefile     Add input from Existing Type Enforcement file\n\
+ 		-f, --fcfile     Existing Type Enforcement file, requires -M\n\
+ 		-v, --verbose    verbose output\n\
+-		'
++                -A, --analyze    Analyze output\n\
++                '
+ 		if msg != "":
+ 			print msg
+ 		sys.exit(1)
+@@ -498,13 +76,15 @@
+ 		input_ind=0
+ 		output_ind=0
+ 		ref_ind=False
+-		te_ind=0
++		analyze=False
++		te_inputs=[]
+ 
+ 		fc_file=""
+ 		gopts, cmds = getopt.getopt(sys.argv[1:],
+-					    'adf:hi:lm:M:o:rtvR',
++					    'Aadf:hi:lm:M:o:rt:vR',
+ 					    ['all',
+-					     'dmesg',
++                                             'analyze',
++                                             'dmesg',
+ 					     'fcfile=',
+ 					     'help',
+ 					     'input=',
+@@ -513,12 +93,12 @@
+ 					     'output=',
+ 					     'requires',
+ 					     'reference',
+-					     'tefile',
++					     'tefile=',
+ 					     'verbose'
+ 					     ])
+ 		for o,a in gopts:
+ 			if o == "-a" or o == "--all":
+-				if input_ind or te_ind:
++				if input_ind:
+ 					usage()
+ 				input=open("/var/log/messages", "r")
+ 				auditlogs=1
+@@ -547,13 +127,14 @@
+ 				module=a
+ 				outfile=a+".te"
+ 				buildPP=1
++				if not os.path.exists("/usr/bin/checkmodule"):
++					errorExit("-M Requires the checkmodule command, you need to install the checkpolicy rpm package")
+ 				output=open(outfile, "w")
+ 			if o == "-r" or o == "--requires":
+ 				requires=1
+ 			if o == "-t" or o == "--tefile":
+-				if auditlogs:
+-					usage()
+-				te_ind=1
++				te_inputs.append(open(a, "r"))
++                                
+ 			if o == "-R" or o == "--reference":
+ 				ref_ind=True
+ 				
+@@ -565,25 +146,38 @@
+ 			if o == "-v" or o == "--verbose":
+ 				verbose=1
+ 				
++			if o == "-A" or o == "--analyze":
++				analyze=True
++				
+ 		if len(cmds) != 0:
+ 			usage()
+ 
+ 		if fc_file != "" and not buildPP:
+ 			usage("Error %s: Option -fc requires -M" % sys.argv[0])
+ 			
+-		out=seruleRecords(input, last_reload, verbose, te_ind)
++                serules=SERules(last_reload, verbose)
++
++                for i in te_inputs:
++                    te=TERules(serules)
++                    te.load(i)
++
++                serules.load(input)
+ 
+ 
  		if ref_ind:
- 			out.gen_reference_policy()
+-			out.gen_reference_policy()
++			serules.gen_reference_policy()
++
++		if analyze:
++			serules.analyze()
++			sys.exit(0)
  
 -		if auditlogs:
 +		if auditlogs and os.path.exists("/var/log/audit/audit.log"):
  			input=os.popen("ausearch -m avc")
- 			out.load(input)
+-			out.load(input)
++			serules.load(input)
  
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-1.30.4/audit2allow/audit2allow.1
+ 		if buildPP:
+ 			print ("Generating type enforcment file: %s.te" % module)
+-		output.write(out.out(requires, module))
++		output.write(serules.out(requires, module))
+ 		output.flush()
+ 		if buildPP:
+ 			cmd="checkmodule %s -m -o %s.mod %s.te" % (get_mls_flag(), module, module)
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-1.30.6/audit2allow/audit2allow.1
 --- nsapolicycoreutils/audit2allow/audit2allow.1	2006-03-10 09:48:04.000000000 -0500
-+++ policycoreutils-1.30.4/audit2allow/audit2allow.1	2006-04-05 09:09:05.000000000 -0400
++++ policycoreutils-1.30.6/audit2allow/audit2allow.1	2006-04-20 09:47:19.000000000 -0400
 @@ -98,6 +98,11 @@
  .PP
  .SH EXAMPLE
@@ -25,18 +560,564 @@
  .B Using audit2allow to generate monolithic (non-module) policy
  $ cd /etc/selinux/$SELINUXTYPE/src/policy
  $ cat /var/log/audit/audit.log | audit2allow >> domains/misc/local.te
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.30.4/restorecond/restorecond.conf
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/avc.py policycoreutils-1.30.6/audit2allow/avc.py
+--- nsapolicycoreutils/audit2allow/avc.py	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-1.30.6/audit2allow/avc.py	2006-04-20 11:53:56.000000000 -0400
+@@ -0,0 +1,519 @@
++#! /usr/bin/env python
++# Copyright (C) 2006 Red Hat 
++# see file 'COPYING' for use and warranty information
++#
++# avc.py is a plugin modules used by audit2allow and other objects to process
++# avc messages from the log files
++#
++# Based off original audit2allow perl script: which credits
++#    newrules.pl, Copyright (C) 2001 Justin R. Smith (jsmith at mcs.drexel.edu)
++#    2003 Oct 11: Add -l option by Yuichi Nakamura(ynakam at users.sourceforge.jp)
++#
++#    This program is free software; you can redistribute it and/or
++#    modify it under the terms of the GNU General Public License as
++#    published by the Free Software Foundation; either version 2 of
++#    the License, or (at your option) any later version.
++#
++#    This program is distributed in the hope that it will be useful,
++#    but WITHOUT ANY WARRANTY; without even the implied warranty of
++#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++#    GNU General Public License for more details.
++#
++#    You should have received a copy of the GNU General Public License
++#    along with this program; if not, write to the Free Software
++#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA     
++#                                        02111-1307  USA
++#
++#  
++import sys, os, pwd, string, re, selinux
++
++obj="(\{[^\}]*\}|[^ \t:]*)"
++allow_regexp="(allow|dontaudit)[ \t]+%s[ \t]*%s[ \t]*:[ \t]*%s[ \t]*%s" % (obj, obj, obj, obj)
++awk_script='/^[[:blank:]]*interface[[:blank:]]*\(/ {\n\
++        IFACEFILE=FILENAME\n\
++	IFACENAME = gensub("^[[:blank:]]*interface[[:blank:]]*\\\\(\`?","","g",$0);\n\
++	IFACENAME = gensub("\'?,.*$","","g",IFACENAME);\n\
++}\n\
++\n\
++/^[[:blank:]]*(allow|dontaudit)[[:blank:]]+.*;[[:blank:]]*$/ {\n\
++\n\
++  if ((length(IFACENAME) > 0) && (IFACEFILE == FILENAME)){\n\
++		ALLOW = gensub("^[[:blank:]]*","","g",$0)\n\
++		ALLOW = gensub(";[[:blank:]]*$","","g",$0)\n\
++		print FILENAME "\\t" IFACENAME "\\t" ALLOW;\n\
++	}\n\
++}\
++'
++
++class context:
++    def __init__(self, scontext):
++        self.scontext=scontext
++        con=scontext.split(":")
++        self.user=con[0]
++        self.role=con[1]
++        self.type=con[2]
++        if len(con) > 3:
++            self.mls=con[3]
++        else:
++            self.mls="s0"
++        
++    def __str__(self):
++        return self.scontext
++
++class accessTrans:
++    def __init__(self):
++        self.dict={}
++	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)
++        records=fd.read().split("\n")
++        regexp="^define *\(`([^']*)' *, *` *\{([^}]*)}'"
++        for r in records:
++            m=re.match(regexp,r)
++            if m!=None:
++                self.dict[m.groups()[0]] = m.groups()[1].split()
++        fd.close()
++    def get(self, var):
++        l=[]
++        for v in var:
++            if v in self.dict.keys():
++                l += self.dict[v]
++            else:
++                if v not in ("{", "}"):
++                    l.append(v)
++        return l
++
++class interfaces:
++    def __init__(self):
++        self.dict={}
++        trans=accessTrans()
++	(input, output) = os.popen2("awk -f - /usr/share/selinux/devel/include/*/*.if 2> /dev/null")
++	input.write(awk_script)
++	input.close()
++	records=output.read().split("\n")
++	input.close()
++        if len(records) > 0:
++            regexp="([^ \t]*)[ \t]+([^ \t]*)[ \t]+%s" % allow_regexp
++            for r in records:
++                m=re.match(regexp,r)
++                if m==None:
++                    continue
++                val=m.groups()
++                file=os.path.basename(val[0]).split(".")[0]
++                iface=val[1]
++                Scon=val[3].split()
++                Tcon=val[4].split()
++                Class=val[5].split()
++                Access=trans.get(val[6].split())
++                for s in Scon:
++                    for t in Tcon:
++                        for c in Class:
++                            if (s, t, c) not in self.dict.keys():
++                                self.dict[(s, t, c)]=[]
++                            self.dict[(s, t, c)].append((Access, file, iface))
++    def out(self):
++        keys=self.dict.keys()
++        keys.sort()
++        for k in keys:
++            print k
++            for i in self.dict[k]:
++                print "\t", i
++                
++    def match(self, Scon, Tcon, Class, Access):
++        keys=self.dict.keys()
++        ret=[]
++        if (Scon, Tcon, Class) in keys:
++            for i in self.dict[(Scon, Tcon, Class)]:
++                if Access in i[0]:
++                    if i[2].find(Access) >= 0:
++                        ret.insert(0, i)
++                    else:
++                        ret.append(i)
++            return ret
++        if ("$1", Tcon, Class) in keys:
++            for i in self.dict[("$1", Tcon, Class)]:
++                if Access in i[0]:
++                    if i[2].find(Access) >= 0:
++                        ret.insert(0, i)
++                    else:
++                        ret.append(i)
++            return ret
++        if (Scon, "$1", Class) in keys:
++            for i in self.dict[(Scon, "$1", Class)]:
++                if Access in i[0]:
++                    if i[2].find(Access) >= 0:
++                        ret.insert(0, i)
++                    else:
++                        ret.append(i)
++            return ret
++        else:
++            return ret
++
++import glob, imp
++pluginPath="/usr/share/selinux/plugins" 
++if not pluginPath in sys.path:
++    sys.path.append(pluginPath)
++
++class Analyze:
++	def __init__(self):
++            self.plugins=[]
++            for p in glob.glob("/usr/share/selinux/plugins/*.py"):
++                plugin=os.path.basename(p)[:-3]
++                self.plugins.append(imp.load_module(plugin, *imp.find_module(plugin)))
++                
++        def process(self, AVCS):
++            ret=[]
++            avcs=AVCS
++            for p in self.plugins:
++                if avcs == None:
++                    break;
++                r = p.analyze(avcs)
++                if len(r)==0:
++                    continue
++                avcs=r[1]
++                if len(r[0]) > 0:
++                    ret.append(r[0])
++            return ret
++                
++class serule:
++	def __init__(self, key):
++		self.type=key[0]
++		self.source=key[1]
++		self.target=key[2]
++		self.seclass=key[3]
++                self.access=[]
++		self.avcinfo={}
++		self.iface=None
++		
++	def add(self, avc):
++		for a in avc[0]:
++			if a not in self.avcinfo.keys():
++				self.avcinfo[a]=[]
++                                self.access.append(a)
++			self.avcinfo[a].append(avc[1:])
++
++	def getAccess(self):
++		if len(self.access) == 1:
++                        return self.access[0]
++		else:
++                        self.access.sort()
++			return "{ " + string.join(self.access) +" }"
++
++	def getName(self):
++            print self.avcinfo
++                    
++	def out(self, verbose=0):
++		ret=""
++		ret=ret+"%s %s %s:%s %s;" % (self.type, self.source, self.gettarget(), self.seclass, self.getAccess())
++		if verbose:
++			keys=self.avcinfo.keys()
++			keys.sort()
++			for i in keys:
++				for x in self.avcinfo[i]:
++					ret=ret+"\n\t#TYPE=AVC  MSG=%s  " % x[0]
++					if len(x[1]):
++						ret=ret+"COMM=%s  " % x[1]
++					if len(x[2]):
++						ret=ret+"NAME=%s  " % x[2]
++					ret=ret + " : " + i 
++		return ret
++		
++	def gen_reference_policy(self, iface):
++		ret=""
++		Scon=self.source
++		Tcon=self.gettarget()
++		Class=self.seclass
++		Access=self.getAccess()
++		m=iface.match(Scon,Tcon,Class,Access)
++		if len(m)==0:
++			return self.out()
++		else:
++			file=m[0][1]
++			ret="\n#%s\n"% self.out()
++			ret += "optional_policy(`%s', `\n" % m[0][1]
++			first=True
++			for i in m:
++				if file != i[1]:
++					ret += "')\ngen_require(`%s', `\n" % i[1]
++					file = i[1]
++					first=True
++				if first:
++					ret += "\t%s(%s)\n" % (i[2], Scon)
++					first=False
++				else:
++					ret += "#\t%s(%s)\n" % (i[2], Scon)
++			ret += "');"
++		return ret
++		
++	def gettarget(self):
++		if self.source == self.target:
++			return "self"
++		else:
++			return self.target
++
++def warning(error):
++    sys.stderr.write("%s: " % sys.argv[0])
++    sys.stderr.write("%s\n" % error)
++    sys.stderr.flush()
++
++
++class TERules:
++	def __init__(self, serules):
++		self.VALID_CMDS=("allow", "dontaudit", "auditallow")
++                self.serules=serules
++
++        def load(self, input):
++		line = input.readline()
++                while line:
++                    rec=line.split()
++                    if len(rec) and rec[0] in self.VALID_CMDS:
++                        self.add_terule(line)
++                    line = input.readline()
++
++	def add_terule(self, rule):
++		rc = rule.split(":")
++		rules=rc[0].split()
++		type=rules[0]
++		(sources, targets) = self.rules_split(rules[1:])
++		rules=rc[1].split()
++		(classes, access) = self.rules_split(rules)
++		for scon in sources:
++			for tcon in targets:
++				for seclass in classes:
++					self.serules.add_rule(type, scon, tcon, seclass,access)
++		
++	def rules_split(self, rules):
++		(idx, target ) = self.get_target(0, rules)
++		(idx, subject) = self.get_target(idx, rules)
++		return (target, subject)
++
++	def get_target(self, i, rule):
++		target=[]
++		if rule[i][0] == "{":
++			for t in rule[i].split("{"):
++				if len(t):
++					target.append(t)
++			i=i+1
++			for s in rule[i:]:
++				if s.find("}") >= 0:
++					for s1 in s.split("}"):
++						if len(s1):
++							target.append(s1)
++						i=i+1
++						return (i, target)
++
++				target.append(s)
++				i=i+1
++		else:
++			if rule[i].find(";") >= 0:
++				for s1 in rule[i].split(";"):
++					if len(s1):
++						target.append(s1)
++			else:
++				target.append(rule[i])
++
++		i=i+1
++		return (i, target)
++
++
++ALLOW=0
++STYPE=1
++TTYPE=2
++CLASS=3
++COMM=1
++NAME=3
++
++class SERules:
++	def __init__(self, last_reload=0, verbose=0):
++		self.last_reload=last_reload
++                self.initialize()
++		self.gen_ref_policy = False
++		self.verbose = verbose
++                self.AVCS=[]
++
++        def initialize(self):
++       		self.seRules={}
++		self.classes={}
++		self.types=[]
++		self.roles=[]
++
++	def load(self, input):
++		dict=[]
++		found=0
++		line = input.readline()
++                while line:
++                    rec=line.split()
++                    for i in rec:
++                        if i=="avc:" or i=="message=avc:" or i=="msg='avc:":
++                            found=1
++                        else:
++                            dict.append(i)
++                    if found:
++                        self.translate(dict)
++                        found=0
++                        dict=[]
++                    line = input.readline()
++				
++
++        def translate(self,dict):
++                AVC={}
++		AVC["access"]=[]
++		if "security_compute_sid" in dict:
++			return
++		
++		if "load_policy" in dict and self.last_reload:
++                        self.initialize()
++
++		if "granted" in dict:
++			return
++		try:
++			for i in range (0, len(dict)):
++				if dict[i]=="{":
++					i=i+1
++					while i<len(dict) and dict[i] != "}":
++						AVC["access"].append(dict[i])
++						i=i+1
++					continue
++			
++				t=dict[i].split('=')
++				if len(t) < 2:
++					continue
++                                AVC[t[0]]=t[1]
++
++                        for i in ("scontext", "tcontext", "tclass"):
++                            if i not in AVC.keys():
++                                return
++
++		except IndexError, e:
++			warning("Bad AVC Line: %s" % avc)
++			return
++			
++		self.add_allow(AVC)
++
++        def add_avc(self, AVC):
++            for a in self.AVCS:
++                if a["tclass"] == AVC["tclass"] and a["access"] == AVC["access"] and a["tcontext"] == AVC["tcontext"] and a["scontext"] == AVC["scontext"] and a["comm"] == AVC["comm"] and a["name"] == AVC["name"]:
++                    return
++            self.AVCS.append(AVC)
++                
++	def add_rule(self, rule_type, scon, tcon, tclass, access, msg="", comm="", name=""):
++                AVC={}
++                AVC["tclass"]=tclass
++                AVC["access"]=access
++                AVC["tcon"]=tcon
++                AVC["scon"]=scon
++                AVC["comm"]=comm
++                AVC["name"]=name
++                self.add_avc(AVC)
++
++		self.add_class(tclass, access)
++		self.add_type(tcon)
++		self.add_type(scon)
++                key=(rule_type, scon, tcon, seclass)
++		if key not in self.seRules.keys():
++			self.seRules[key]=serule(key)
++		self.seRules[key].add((access, msg, comm, name ))
++
++	def add_allow(self, AVC):
++		self.add_class(AVC["tclass"], AVC["access"])
++                tcontext=context(AVC["tcontext"])
++                scontext=context(AVC["scontext"])
++
++		self.add_type(tcontext.type)
++		self.add_type(scontext.type)
++
++		self.add_role(scontext.role)
++
++                key=("allow", scontext.type, tcontext.type, AVC["tclass"])
++		if key not in self.seRules.keys():
++			self.seRules[key]=serule(key)
++
++                avckeys=AVC.keys()
++	        for i in ( "name", "comm", "msg" ):
++ 	               if i not in avckeys:
++        	            AVC[i]=""
++
++                self.add_avc(AVC)
++                self.seRules[key].add((AVC["access"], AVC["msg"], AVC["comm"], AVC["name"]))
++
++        def add_class(self,seclass, access):
++		if seclass not in self.classes.keys():
++				self.classes[seclass]=[]
++		for a in access:
++			if a not in self.classes[seclass]:
++				self.classes[seclass].append(a)
++				
++	def add_role(self,role):
++		if role not in self.roles:
++				self.roles.append(role)
++
++	def add_type(self,type):
++		if type not in self.types:
++				self.types.append(type)
++
++	def gen_reference_policy(self):
++		self.gen_ref_policy = True
++		self.iface=interfaces()
++
++	def gen_module(self, module):
++            if self.gen_ref_policy:
++		return "policy_module(%s, 1.0);" % module
++            else:
++		return "module %s 1.0;" % module
++
++	def gen_requires(self):
++		self.roles.sort()
++		self.types.sort()
++		keys=self.classes.keys()
++		keys.sort()
++		rec="\n\nrequire {\n"
++#		if len(self.roles) > 0:
++#			for i in self.roles:
++#				rec += "\trole %s; \n" % i
++#			rec += "\n" 
++#
++		for i in keys:
++			access=self.classes[i]
++			if len(access) > 1:
++				access.sort()
++				rec += "\tclass %s {" % i
++				for a in access:
++					rec += " %s" % a
++				rec += " }; \n"
++			else:
++				rec += "\tclass %s %s;\n" % (i, access[0])
++				
++		rec += "\n" 
++			
++		for i in self.types:
++			rec += "\ttype %s; \n" % i
++		rec += "};\n\n"
++		return rec
++	
++	def analyze(self):
++            a=Analyze()
++            for i in a.process(self.AVCS):
++                print i[0][0]
++                print ""
++                
++	def out(self, require=0, module=""):
++		rec=""
++		if len(self.seRules.keys())==0:
++		       raise(ValueError("No AVC messages found."))
++		if module != "":
++			rec += self.gen_module(module)
++			rec += self.gen_requires()
++		else:
++			if require:
++				rec+=self.gen_requires()
++
++		keys=self.seRules.keys()
++		keys.sort()
++		for i in keys:
++			if self.gen_ref_policy:
++				rec += self.seRules[i].gen_reference_policy(self.iface)+"\n"
++			else:
++				rec += self.seRules[i].out(self.verbose)+"\n"
++		return rec
++
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-1.30.6/audit2allow/Makefile
+--- nsapolicycoreutils/audit2allow/Makefile	2005-01-21 09:01:35.000000000 -0500
++++ policycoreutils-1.30.6/audit2allow/Makefile	2006-04-20 09:47:19.000000000 -0400
+@@ -3,6 +3,8 @@
+ BINDIR ?= $(PREFIX)/bin
+ MANDIR ?= $(PREFIX)/share/man
+ LOCALEDIR ?= /usr/share/locale
++PYLIBVER ?= python2.4
++PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER)
+ 
+ TARGETS=audit2allow
+ 
+@@ -13,6 +15,8 @@
+ 	install -m 755 $(TARGETS) $(BINDIR)
+ 	-mkdir -p $(MANDIR)/man1
+ 	install -m 644 audit2allow.1 $(MANDIR)/man1/
++	test -d $(PYTHONLIBDIR)/site-packages || install -m 755 -d $(PYTHONLIBDIR)/site-packages
++	install -m 755 avc.py $(PYTHONLIBDIR)/site-packages
+ 
+ clean:
+ 
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.30.6/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2006-03-29 11:08:21.000000000 -0500
-+++ policycoreutils-1.30.4/restorecond/restorecond.conf	2006-04-03 11:57:26.000000000 -0400
-@@ -2,3 +2,4 @@
++++ policycoreutils-1.30.6/restorecond/restorecond.conf	2006-04-20 09:47:19.000000000 -0400
+@@ -1,4 +1,6 @@
+ /etc/resolv.conf
++/etc/samba/secrets.tdb
  /etc/mtab
  /var/run/utmp
  ~/public_html
 +~/.mozilla/plugins/libflashplayer.so
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.30.4/semanage/semanage
---- nsapolicycoreutils/semanage/semanage	2006-03-29 15:35:22.000000000 -0500
-+++ policycoreutils-1.30.4/semanage/semanage	2006-04-01 04:54:36.000000000 -0500
-@@ -286,6 +286,8 @@
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.30.6/semanage/semanage
+--- nsapolicycoreutils/semanage/semanage	2006-04-14 13:10:51.000000000 -0400
++++ policycoreutils-1.30.6/semanage/semanage	2006-04-20 09:47:19.000000000 -0400
+@@ -292,6 +292,8 @@
  		errorExit("Options Error " + error.msg)
  	except ValueError, error:
  		errorExit(error.args[0])
@@ -45,3 +1126,55 @@
  	except IOError, error:
  		errorExit(error.args[1])
  	except KeyboardInterrupt, error:
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.30.6/semanage/seobject.py
+--- nsapolicycoreutils/semanage/seobject.py	2006-04-14 13:10:51.000000000 -0400
++++ policycoreutils-1.30.6/semanage/seobject.py	2006-04-20 09:47:19.000000000 -0400
+@@ -455,6 +455,8 @@
+ 		semanage_user_free(u)
+ 
+ 	def modify(self, name, roles = [], selevel = "", serange = "", prefix = ""):
++		oldroles=""
++		newroles = string.join(roles, ' ');
+ 		try:
+ 			if prefix == "" and len(roles) == 0  and serange == "" and selevel == "":
+ 				if is_mls_enabled == 1:
+@@ -476,6 +478,13 @@
+ 			if rc < 0:
+ 				raise ValueError("Could not query user for %s" % name)
+ 
++			oldserange=semanage_user_get_mlsrange(u)
++			(rc, rlist)=semanage_user_get_roles(self.sh, u)
++			if rc >= 0:
++				oldroles = string.join(rlist, ' ');
++			newroles = newroles + ' ' + oldroles;
++
++
+ 			if serange != "":
+ 				semanage_user_set_mlsrange(self.sh, u, untranslate(serange))
+ 			if selevel != "":
+@@ -501,10 +510,11 @@
+ 				raise ValueError("Could not modify SELinux user %s" % name)
+ 
+ 		except ValueError, error:
+-			mylog.log(0,"modify SELinux user record", name, seuser, seroles, serange, oldseuser, oldseroles, olrserange)
++			mylog.log(0,"modify SELinux user record", name, "", newroles, serange, "", oldroles, oldserange)
+ 			raise error
+ 		
+-		mylog.log(1,"modify SELinux user record", name, seuser, seroles, serange, oldseuser, oldseroles, olrserange)
++		mylog.log(1,"modify SELinux user record", name, "", newroles, serange, "", oldroles, oldserange)
++
+ 		semanage_user_key_free(k)
+ 		semanage_user_free(u)
+ 
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setsebool/setsebool.8 policycoreutils-1.30.6/setsebool/setsebool.8
+--- nsapolicycoreutils/setsebool/setsebool.8	2005-11-04 15:37:49.000000000 -0500
++++ policycoreutils-1.30.6/setsebool/setsebool.8	2006-04-20 09:47:19.000000000 -0400
+@@ -17,7 +17,7 @@
+ are not changed. 
+ 
+ If the -P option is given, all pending values are written to
+-the boolean file on disk.
++the policy file on disk. So they will be persistant across reboots.
+ 
+ .SH AUTHOR	
+ This manual page was written by Dan Walsh <dwalsh at redhat.com>.


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-5/policycoreutils.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- policycoreutils.spec	5 Apr 2006 13:18:30 -0000	1.244
+++ policycoreutils.spec	21 Apr 2006 11:38:29 -0000	1.245
@@ -4,16 +4,17 @@
 %define libselinuxver 1.30-1
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.30.4
-Release: 2.fc5
+Version: 1.30.6
+Release: 3.fc5
 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} 
+BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver}  libcap-devel audit-libs-devel
 Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff
 Requires: libsepol >= %{libsepolver} libsemanage >= %{libsemanagever} libselinux-python coreutils audit-libs-python >=  %{libauditver} 
+Requires: initscripts
 BuildRoot: %{_tmppath}/%{name}-buildroot
 
 %description
@@ -100,13 +101,37 @@
 %config %{_sysconfdir}/pam.d/run_init
 %config(noreplace) %{_sysconfdir}/sestatus.conf
 %{_libdir}/python2.4/site-packages/seobject.py*
+%{_libdir}/python2.4/site-packages/avc.py*
 %attr(755,root,root) /etc/rc.d/init.d/restorecond
 %config(noreplace) /etc/selinux/restorecond.conf
 
 %post
-service restorecond condrestart
+[ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Fri Apr 21 2006 Dan Walsh <dwalsh at redhat.com> 1.30.6-3.fc5
+- Bump to build in FC5
+
+* Thu Apr 20 2006 Dan Walsh <dwalsh at redhat.com> 1.30.6-3
+- Fix check for "msg"
+
+* Mon Apr 17 2006 Dan Walsh <dwalsh at redhat.com> 1.30.6-2
+- Ship avc.py
+
+* Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> 1.30.6-1
+- Add /etc/samba/secrets.tdb to restorecond.conf
+- Update from upstream
+	* Merged semanage prefix support from Russell Coker.
+	* Added a test to setfiles to check that the spec file is
+	  a regular file.
+
+* Thu Apr 06 2006 Karsten Hopp <karsten at redhat.de> 1.30.4-4
+- added some missing buildrequires
+- added Requires: initscripts for /sbin/service
+
+* Thu Apr 06 2006 Karsten Hopp <karsten at redhat.de> 1.30.4-3
+- use absolute path /sbin/service
+
 * Wed Apr 5 2006 Dan Walsh <dwalsh at redhat.com> 1.30.4-2.fc5
 - Bump to build in FC5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-5/sources,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- sources	5 Apr 2006 13:18:30 -0000	1.109
+++ sources	21 Apr 2006 11:38:29 -0000	1.110
@@ -1 +1 @@
-4af18b5ace84c5cb075f5160ab51f86b  policycoreutils-1.30.4.tgz
+8debed023798b5de5252be47d5fd1b1b  policycoreutils-1.30.6.tgz



From fedora-cvs-commits at redhat.com  Fri Apr 21 11:43:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 07:43:23 -0400
Subject: rpms/beagle/devel beagle-0.2.5-crawl.patch, NONE, 1.1 .cvsignore,
	1.9, 1.10 beagle.spec, 1.48, 1.49 sources, 1.11,
	1.12 beagle-0.2.2-crawl-system-cron.patch, 1.1,
	NONE beagle-0.2.4-crawl.patch, 1.1, NONE
Message-ID: <200604211143.k3LBhNjm024634@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24590

Modified Files:
	.cvsignore beagle.spec sources 
Added Files:
	beagle-0.2.5-crawl.patch 
Removed Files:
	beagle-0.2.2-crawl-system-cron.patch beagle-0.2.4-crawl.patch 
Log Message:
* Fri Apr 21 2006 Alexander Larsson <alexl at redhat.com> - 0.2.5-2
- Update to 0.2.5
- Update patches



beagle-0.2.5-crawl.patch:
 Makefile.am                     |    1 -
 Makefile.in                     |    1 -
 crawl-rules/crawl-applications  |    2 +-
 crawl-rules/crawl-documentation |    2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE beagle-0.2.5-crawl.patch ---
--- beagle-0.2.5/tools/crawl-rules/crawl-applications.crawl	2006-03-22 16:09:41.000000000 +0100
+++ beagle-0.2.5/tools/crawl-rules/crawl-applications	2006-04-21 09:23:26.000000000 +0200
@@ -2,7 +2,7 @@
 
 CRAWL_INDEX_NAME="applications"
 
-CRAWL_PATHS="/usr/share/applications /usr/local/share/applications /opt/gnome/share/applications /opt/kde3/share/applications"
+CRAWL_PATHS="/usr/share/applications /usr/local/share/applications" 
 
 CRAWL_RECURSIVE="yes"
 
--- beagle-0.2.5/tools/crawl-rules/crawl-documentation.crawl	2006-04-12 21:41:03.000000000 +0200
+++ beagle-0.2.5/tools/crawl-rules/crawl-documentation	2006-04-21 09:27:23.000000000 +0200
@@ -2,7 +2,7 @@
 
 CRAWL_INDEX_NAME="documentation"
 
-CRAWL_PATHS="/usr/share/doc /usr/local/share/doc /opt/kde3/share/doc /opt/gnome/share/gnome/help /usr/share/gnome/help"
+CRAWL_PATHS="/usr/share/doc /usr/local/share/doc /usr/share/gnome/help /usr/share/gnome/html"
 
 CRAWL_ALLOW_PATTERNS="*.xml,*.html,*.docbook"
 
--- beagle-0.2.5/tools/Makefile.am.crawl	2006-04-19 02:30:36.000000000 +0200
+++ beagle-0.2.5/tools/Makefile.am	2006-04-21 09:23:26.000000000 +0200
@@ -35,7 +35,6 @@
 	chmod +x $(CRAWL_WRAPPER)
 
 CRAWL_RULES = \
-	$(srcdir)/crawl-rules/crawl-windows		\
 	$(srcdir)/crawl-rules/crawl-applications	\
 	$(srcdir)/crawl-rules/crawl-documentation
 
--- beagle-0.2.5/tools/Makefile.in.crawl	2006-04-20 17:57:24.000000000 +0200
+++ beagle-0.2.5/tools/Makefile.in	2006-04-21 09:23:26.000000000 +0200
@@ -366,7 +366,6 @@
 CRAWL_WRAPPER = beagle-crawl-system
 CRAWL_WRAPPER_IN = $(CRAWL_WRAPPER).in
 CRAWL_RULES = \
-	$(srcdir)/crawl-rules/crawl-windows		\
 	$(srcdir)/crawl-rules/crawl-applications	\
 	$(srcdir)/crawl-rules/crawl-documentation
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	8 Apr 2006 02:49:09 -0000	1.9
+++ .cvsignore	21 Apr 2006 11:43:19 -0000	1.10
@@ -1,2 +1,3 @@
 beagle-0.2.2.tar.bz2
+beagle-0.2.5.tar.bz2
 beagle-0.2.4.tar.bz2


Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- beagle.spec	8 Apr 2006 03:03:24 -0000	1.48
+++ beagle.spec	21 Apr 2006 11:43:19 -0000	1.49
@@ -1,5 +1,5 @@
 Name:           beagle
-Version:        0.2.4
+Version:        0.2.5
 Release:        2
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
@@ -7,7 +7,6 @@
 URL:            http://beagle-project.org/
 Source0:        %{name}-%{version}.tar.bz2
 Source1:	beagle.desktop
-Source2:	beagle-crawl-system.cron
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel mono-data mono-data-sqlite
@@ -23,9 +22,8 @@
 BuildRequires:  librsvg2-devel >= 2.0
 Requires: sqlite >= 3.3.1
 Requires: zip unzip sed grep mono-core poppler-utils
-Patch2: beagle-0.2.4-crawl.patch
+Patch2: beagle-0.2.5-crawl.patch
 Patch3: beagle-0.2.1-spew.patch
-Patch4: beagle-0.2.2-crawl-system-cron.patch
 
 # Mono only available on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
@@ -61,7 +59,6 @@
 %setup -q
 %patch2 -p1 -b .crawl
 %patch3 -p1 -b .spew
-%patch4 -p1 -b .crawl-system-cron
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -87,13 +84,6 @@
 #mkdir -p $RPM_BUILD_ROOT/etc/xdg/autostart
 #cp %{SOURCE1} $RPM_BUILD_ROOT/etc/xdg/autostart
 
-# use anacron instead of cron, so beagle-crawl-system has 
-# a reasonable chance to run
-rm -rf $RPM_BUILD_ROOT/etc/cron.d
-mkdir -p $RPM_BUILD_ROOT/etc/cron.daily
-cp %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/beagle-crawl-system.cron
-chmod +x $RPM_BUILD_ROOT/etc/cron.daily/beagle-crawl-system.cron
-
 # TODO: Isn't there a better place to install this?
 install -m 644 mozilla-extension/beagle.xpi $RPM_BUILD_ROOT%{_libdir}/beagle/
 
@@ -120,8 +110,8 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/beagle/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
-rm -f $RPM_BUILD_ROOT%{_prefix}/lib/python*/site-packages/*.a
-rm -f $RPM_BUILD_ROOT%{_prefix}/lib/python*/site-packages/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la
 
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/beagle/*/*.dll
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/beagle/*.dll
@@ -184,7 +174,6 @@
 %{_sysconfdir}/beagle
 %{_bindir}/*
 %{_sbindir}/*
-%{_libexecdir}/*
 %{_libdir}/pkgconfig/beagle*.pc
 %{_libdir}/beagle
 %{_datadir}/beagle
@@ -206,9 +195,13 @@
 %{_libdir}/pkgconfig/libbeagle*.pc
 
 %files -n libbeagle-python
-%{_prefix}/lib/python*/site-packages/beagle.so
+%{_libdir}/python*/site-packages/beagle.so
 
 %changelog
+* Fri Apr 21 2006 Alexander Larsson <alexl at redhat.com> - 0.2.5-2
+- Update to 0.2.5
+- Update patches
+
 * Fri Apr  7 2006 Matthias Clasen <mclasen at redhat.com> 0.2.4-2
 - Update to 0.2.4
 - Update patches


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Apr 2006 02:49:09 -0000	1.11
+++ sources	21 Apr 2006 11:43:19 -0000	1.12
@@ -1,3 +1,2 @@
 6f0f121a9269662071eb5c260b54f86f  beagle.desktop
-777250265dc910964f5acd9da29cc64c  beagle-crawl-system.cron
-bd915b5f7de56c91dae2c26121c586fa  beagle-0.2.4.tar.bz2
+7a7965768643045f7e6f362f9bba1af4  beagle-0.2.5.tar.bz2


--- beagle-0.2.2-crawl-system-cron.patch DELETED ---


--- beagle-0.2.4-crawl.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 21 11:48:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 07:48:19 -0400
Subject: rpms/file/devel file-4.17-oracle.patch, NONE, 1.1 file.spec, 1.48,
	1.49
Message-ID: <200604211148.k3LBmJ1p007106@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/file/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7064

Modified Files:
	file.spec 
Added Files:
	file-4.17-oracle.patch 
Log Message:
- add support for OCFS or ASM (#189017)

file-4.17-oracle.patch:
 filesystems |   13 +++++++++++++
 1 files changed, 13 insertions(+)

--- NEW FILE file-4.17-oracle.patch ---
--- file-4.17/magic/Magdir/filesystems.old	2006-03-02 23:13:28.000000000 +0100
+++ file-4.17/magic/Magdir/filesystems	2006-04-21 13:44:59.000000000 +0200
@@ -879,3 +879,16 @@
 >>>>>>>>&4      bedate          x                       on: %s
 >>>>>>>>&0      bedate          =0                      full dump
 >>>>>>>>&0      bedate          !0                      incremental since: %s
+
+# Oracle Clustered Filesystem - Aaron Botsis <redhat at digitalmafia.org>
+8       string          OracleCFS       Oracle Clustered Filesystem,
+>4      long            x               rev %d
+>0      long            x               \b.%d,
+>560    string          x               label: %.64s,
+>136    string          x               mountpoint: %.128s
+
+# Oracle ASM tagged volume - Aaron Botsis <redhat at digitalmafia.org>
+32      string          ORCLDISK        Oracle ASM Volume,
+>40     string          x               Disk Name: %0.12s
+32      string          ORCLCLRD        Oracle ASM Volume (cleared),
+>40     string          x               Disk Name: %0.12s


Index: file.spec
===================================================================
RCS file: /cvs/dist/rpms/file/devel/file.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- file.spec	14 Mar 2006 08:39:51 -0000	1.48
+++ file.spec	21 Apr 2006 11:48:16 -0000	1.49
@@ -3,7 +3,7 @@
 Summary: A utility for determining file types.
 Name: file
 Version: 4.17
-Release: 2
+Release: 3
 License: distributable
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -18,6 +18,7 @@
 Patch13: file-4.17-init-mem.patch
 Patch14: file-4.17-wctype-header.patch
 Patch15: file-4.17-mp3_flac.patch
+Patch16: file-4.17-oracle.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: zlib-devel
 
@@ -42,6 +43,7 @@
 %patch13 -p1 -b .mem
 %patch14 -p1 -b .wctype
 %patch15 -p1 -b .mp3
+%patch16 -p1 -b .oracle
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 mv doc/libmagic.man_ doc/libmagic.man
@@ -87,6 +89,9 @@
 %{_libdir}/libmagic.*
 
 %changelog
+* Fri Apr 21 2006 Radek Vok??l <rvokal at redhat.com> 4.17-3
+- add support for OCFS or ASM (#189017)
+
 * Tue Mar 14 2006 Radek Vok??l <rvokal at redhat.com> 4.17-2
 - fix segfault when compiling magic
 - add check for wctype.h



From fedora-cvs-commits at redhat.com  Fri Apr 21 12:20:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 08:20:11 -0400
Subject: rpms/ncompress/devel ncompress-4.2.4-zerobyteforce.patch, 1.1,
	1.2 ncompress.spec, 1.18, 1.19
Message-ID: <200604211220.k3LCKBOd028916@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/ncompress/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28838

Modified Files:
	ncompress-4.2.4-zerobyteforce.patch ncompress.spec 
Log Message:
fix problems with compressing zero-sized files (#189215, #189216)


ncompress-4.2.4-zerobyteforce.patch:
 compress42.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

Index: ncompress-4.2.4-zerobyteforce.patch
===================================================================
RCS file: /cvs/dist/rpms/ncompress/devel/ncompress-4.2.4-zerobyteforce.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ncompress-4.2.4-zerobyteforce.patch	22 Sep 2005 10:19:13 -0000	1.1
+++ ncompress-4.2.4-zerobyteforce.patch	21 Apr 2006 12:20:07 -0000	1.2
@@ -1,6 +1,6 @@
---- ncompress-4.2.4/compress42.c.zerobyteforce	2005-09-02 18:42:56.000000000 +0530
-+++ ncompress-4.2.4/compress42.c	2005-09-02 18:43:55.000000000 +0530
-@@ -1145,7 +1145,7 @@
+--- ncompress-4.2.4/compress42.c.zerobyteforce	2006-04-14 14:18:28.000000000 +0200
++++ ncompress-4.2.4/compress42.c	2006-04-14 14:20:15.000000000 +0200
+@@ -1145,10 +1145,12 @@
  			if (fdout != 1 && close(fdout))
  				write_error();
  
@@ -9,3 +9,16 @@
  			{
  				if (remove_ofname)
  				{
++					if(!quiet)
++						fprintf(stderr, "No compression -- %s unchanged\n", ifname);
+ 					if (unlink(ofname))	/* Remove input file */
+ 					{
+ 						fprintf(stderr, "\nunlink error (ignored) ");
+@@ -1157,6 +1159,7 @@
+ 					}
+ 		
+ 					remove_ofname = 0;
++					exit_code = 2;
+ 				}
+ 			}
+ 			else


Index: ncompress.spec
===================================================================
RCS file: /cvs/dist/rpms/ncompress/devel/ncompress.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ncompress.spec	11 Feb 2006 04:42:46 -0000	1.18
+++ ncompress.spec	21 Apr 2006 12:20:07 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Fast compression and decompression utilities.
 Name: ncompress
 Version: 4.2.4
-Release: 43.2.1
+Release: 44
 License: distributable
 Group: Applications/File
 Source: ftp://metalab.unc.edu/pub/Linux/utils/compress/ncompress-4.2.4.tar.Z
@@ -69,6 +69,9 @@
 %doc LZW.INFO README
 
 %changelog
+* Fri Apr 21 2006 Peter Vrabec <pvrabec at redhat.com> 4.2.4-44
+- fix problems with compressing zero-sized files (#189215, #189216)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.2.4-43.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Apr 21 12:43:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 08:43:10 -0400
Subject: rpms/util-linux/devel util-linux-2.13-nfsmount-fsc.patch, NONE,
	1.1.2.1 util-linux.spec, 1.112, 1.112.2.1
Message-ID: <200604211243.k3LChA2W002523@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2324

Modified Files:
      Tag: private-util-linux-2-13-0-20-nfsmount_fsc
	util-linux.spec 
Added Files:
      Tag: private-util-linux-2-13-0-20-nfsmount_fsc
	util-linux-2.13-nfsmount-fsc.patch 
Log Message:
Added the fsc nfs/nfs4 mounting option


util-linux-2.13-nfsmount-fsc.patch:
 nfs.5        |    8 ++++++++
 nfs4_mount.h |    1 +
 nfs4mount.c  |   29 +++++++++++++++++++++++++----
 nfs_mount4.h |    1 +
 nfsmount.c   |   31 +++++++++++++++++++++++++++++++
 5 files changed, 66 insertions(+), 4 deletions(-)

--- NEW FILE util-linux-2.13-nfsmount-fsc.patch ---
--- util-linux-2.13-pre6/mount/nfs_mount4.h.fsc	2006-04-21 08:22:13.000000000 -0400
+++ util-linux-2.13-pre6/mount/nfs_mount4.h	2006-04-21 08:23:08.000000000 -0400
@@ -57,6 +57,7 @@ struct nfs_mount_data {
 #define NFS_MOUNT_NONLM		0x0200	/* 3 */
 #define NFS_MOUNT_BROKEN_SUID	0x0400	/* 4 */
 #define NFS_MOUNT_SECFLAVOUR	0x2000	/* 5 */
+#define NFS_MOUNT_FSCACHE		0x4000
 
 /* security pseudoflavors */
 
--- util-linux-2.13-pre6/mount/nfsmount.c.fsc	2006-04-21 08:22:13.000000000 -0400
+++ util-linux-2.13-pre6/mount/nfsmount.c	2006-04-21 08:27:54.000000000 -0400
@@ -50,6 +50,7 @@
 #include <arpa/inet.h>
 #include <mntent.h>
 #include <paths.h>
+#include <asm/unistd.h>
 
 #include "sundries.h"
 #include "nfsmount.h"
@@ -130,6 +131,15 @@ void rpc_strerror()
 			fprintf(stderr, "System Error: %d (%s)\n", cf_errno, strerror(cf_errno));
 	}
 }
+#ifndef KEY_SPEC_THREAD_KEYRING
+#define KEY_SPEC_THREAD_KEYRING -1
+#endif
+int nfs_add_key(char *des, char *payload, size_t plen)
+{
+	return syscall(__NR_add_key, "user", 
+		des, payload, plen, KEY_SPEC_THREAD_KEYRING);
+}
+static char *fsctag = NULL;
 
 /* Define the order in which to probe for UDP/TCP services */
 static const u_int *
@@ -819,6 +829,15 @@ parse_options(char *old_opts, struct nfs
 					goto bad_parameter;
  				}
  				strncpy(data->context, context, NFS_MAX_CONTEXT_LEN);
+			 } else if (!strcmp(opt, "fsctag")) {
+ 				char *tmp = opteq + 1;
+ 				
+ 				if (strlen(tmp) > BUFSIZ) {
+ 					printf(_("fsctag parameter exceeds limit of %d\n"),
+ 						 BUFSIZ);
+					goto bad_parameter;
+ 				}
+ 				fsctag = strdup(tmp);
  			} else if (!sloppy)
 				goto bad_parameter;
 			sprintf(cbuf, "%s=%s,", opt, opteq+1);
@@ -836,6 +855,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)
@@ -1283,6 +1306,14 @@ noauth_flavours:
 				  "excessively long option argument\n"));
 		goto fail;
 	}
+	if (data.flags & NFS_MOUNT_FSCACHE) {
+		char *tmp = fsctag ? fsctag : node;
+
+		val = nfs_add_key("mount:nfs:fsctag", tmp, strlen(tmp)+1);
+		if (val < 0)
+			fprintf(stderr, "mount: Warning: Unable to set fsctag:"
+				"error: %d (%s)\n", errno, strerror(errno));
+	}
 
 	snprintf(cbuf, sizeof(cbuf)-1, "addr=%s", s);
 	strcat(new_opts, cbuf);
--- util-linux-2.13-pre6/mount/nfs4mount.c.fsc	2006-04-21 08:22:12.000000000 -0400
+++ util-linux-2.13-pre6/mount/nfs4mount.c	2006-04-21 08:23:45.000000000 -0400
@@ -77,7 +77,9 @@ char *GSSDLCK = DEFAULT_DIR "/rpcgssd";
 #endif
 
 extern int clnt_ping(struct sockaddr_in *, const u_long, const u_long, const u_int);
-extern void rpc_strerror();
+extern void rpc_strerror(void);
+extern int nfs_add_key(char *des, char *payload, size_t plen);
+static char *fsctag = NULL;
 
 struct {
 	char    *flavour;
@@ -205,10 +207,10 @@ int nfs4mount(const char *spec, const ch
 	char *hostname, *dirname, *old_opts;
 	char new_opts[1024];
 	char *opt, *opteq;
-	char *s;
+	char *s, *tmp;
 	int val;
 	int bg, soft, intr;
-	int nocto, noac;
+	int nocto, noac, fscache;
 	int retry;
 	int retval;
 
@@ -258,6 +260,7 @@ int nfs4mount(const char *spec, const ch
 	intr = NFS4_MOUNT_INTR;
 	nocto = 0;
 	noac = 0;
+	fscache = 0;
 	retry = 10000;		/* 10000 minutes ~ 1 week */
 
 	/*
@@ -314,6 +317,14 @@ int nfs4mount(const char *spec, const ch
 				num_flavour = parse_sec(opteq+1, pseudoflavour);
 				if (!num_flavour)
 					goto fail;
+			 } else if (!strcmp(opt, "fsctag")) {
+ 				tmp = opteq + 1;
+ 				if (strlen(tmp) > BUFSIZ) {
+ 					printf(_("fsctag parameter exceeds limit of %d\n"),
+ 						 BUFSIZ);
+					goto fail;
+ 				}
+ 				fsctag = strdup(tmp);
 			} else if (!strcmp(opt, "addr")) {
 				/* ignore */;
 			} else {
@@ -337,6 +348,8 @@ int nfs4mount(const char *spec, const ch
 				soft = !val;
 			else if (!strcmp(opt, "intr"))
 				intr = val;
+			else if (!strcmp(opt, "fsc"))
+				fscache = val;
 			else if (!strcmp(opt, "cto"))
 				nocto = !val;
 			else if (!strcmp(opt, "ac"))
@@ -354,7 +367,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
@@ -420,6 +434,13 @@ int nfs4mount(const char *spec, const ch
 		fprintf(stderr, "mount to NFS server '%s' failed.\n", data.hostname.data);
 		goto fail;
 	}
+	if (data.flags & NFS4_MOUNT_FSCACHE) {
+		tmp = fsctag ? fsctag : (char *)node;
+		val = nfs_add_key("mount:nfs4:fsctag", tmp, strlen(tmp)+1);
+		if (val < 0)
+			fprintf(stderr, "mount: Warning: Unable to set fsctag:"
+				"error: %d (%s)\n", errno, strerror(errno));
+	}
 
 	*mount_opts = (char *) &data;
 	/* clean up */
--- util-linux-2.13-pre6/mount/nfs4_mount.h.fsc	2006-04-21 08:22:12.000000000 -0400
+++ util-linux-2.13-pre6/mount/nfs4_mount.h	2006-04-21 08:23:08.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	0x2000	/* 1 */
 #define NFS4_MOUNT_FLAGMASK	0xFFFF
 
 /* pseudoflavors: */
--- util-linux-2.13-pre6/mount/nfs.5.fsc	2006-04-21 08:22:14.000000000 -0400
+++ util-linux-2.13-pre6/mount/nfs.5	2006-04-21 08:26:00.000000000 -0400
@@ -267,6 +267,10 @@ default UDP protocol.  Many NFS servers 
 .I udp
 Mount the NFS filesystem using the UDP protocol.  This
 is the default.
+.TP 1.5i
+.I fsc
+Unable the use of persistent caching to the local disk using 
+the FS-Cache facility for the given mount point. 
 .P
 All of the non-value options have corresponding nooption forms.
 For example, nointr means don't allow file operations to be
@@ -421,6 +425,10 @@ This extracts a
 server performance penalty but it allows two different NFS clients
 to get reasonable good results when both clients are actively
 writing to common filesystem on the server.
+.TP 1.5i
+.I fsc
+Unable the use of persistent caching to the local disk using 
+the FS-Cache facility for the given mount point. 
 .P
 All of the non-value options have corresponding nooption forms.
 For example, nointr means don't allow file operations to be


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.112
retrieving revision 1.112.2.1
diff -u -r1.112 -r1.112.2.1
--- util-linux.spec	9 Mar 2006 22:51:31 -0000	1.112
+++ util-linux.spec	21 Apr 2006 12:43:07 -0000	1.112.2.1
@@ -25,7 +25,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.20
+Release: 0.20.fsc
 License: distributable
 Group: System Environment/Base
 
@@ -181,6 +181,9 @@
 # 182553 - fdisk -l inside xen guest shows no disks
 Patch228: util-linux-2.13-fdisk-xvd.patch
 
+# Adds the -o fsc mount option to nfsmount
+Patch229: 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.
 ########### END upstreamable
@@ -260,6 +263,7 @@
 %patch226 -p1
 %patch227 -p1
 %patch228 -p1
+%patch229 -p1
 
 %build
 unset LINGUAS || :
@@ -644,6 +648,9 @@
 /sbin/losetup
 
 %changelog
+* Fri Apr 21 2006 Steve Dickson <steved at redhat.com> 2.13-0.20.fsc
+- Added the fsc nfs/nfs4 mounting option
+
 * Wed Mar  9 2006 Jesse Keating <jkeating at redhat.com> 2.13-0.20
 - Better calling of restorecon as suggested by Bill Nottingham
 - prereq restorecon to avoid ordering issues



From fedora-cvs-commits at redhat.com  Fri Apr 21 12:49:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 08:49:32 -0400
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.103,1.104
Message-ID: <200604211249.k3LCnWBT018223@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-vfs2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18142

Modified Files:
	gnome-vfs2.spec 
Log Message:
intltool pain



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- gnome-vfs2.spec	20 Apr 2006 17:15:11 -0000	1.103
+++ gnome-vfs2.spec	21 Apr 2006 12:49:30 -0000	1.104
@@ -101,6 +101,7 @@
 fi
 
 # auto* update needed for gnome-vfs-avahi.patch
+intltoolize --force
 libtoolize --force
 aclocal
 autoheader



From fedora-cvs-commits at redhat.com  Fri Apr 21 13:24:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 09:24:35 -0400
Subject: rpms/jwhois/FC-4 jwhois-3.2.2-ru.patch, NONE,
	1.1 jwhois-3.2.3-config-cvs.patch, NONE,
	1.1 jwhois-3.2.3-sigpipe.patch, NONE,
	1.1 jwhois-3.2.3.tar.gz.sig, NONE, 1.1 .cvsignore, 1.3,
	1.4 jwhois.spec, 1.15, 1.16 sources, 1.3,
	1.4 jwhois-3.2.2-arin.patch, 1.2,
	NONE jwhois-3.2.2-config-cvs.patch, 1.3,
	NONE jwhois-3.2.2-doublefree.patch, 1.1,
	NONE jwhois-3.2.2-update_2004.patch, 1.2,
	NONE jwhois-3.2.2-webbased.patch, 1.1, NONE
Message-ID: <200604211324.k3LDOZNt007682@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/jwhois/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv7573

Modified Files:
	.cvsignore jwhois.spec sources 
Added Files:
	jwhois-3.2.2-ru.patch jwhois-3.2.3-config-cvs.patch 
	jwhois-3.2.3-sigpipe.patch jwhois-3.2.3.tar.gz.sig 
Removed Files:
	jwhois-3.2.2-arin.patch jwhois-3.2.2-config-cvs.patch 
	jwhois-3.2.2-doublefree.patch jwhois-3.2.2-update_2004.patch 
	jwhois-3.2.2-webbased.patch 
Log Message:
Backport jwhois-3.2.3-3.3.fc5.1 to FC4.


jwhois-3.2.2-ru.patch:
 ru.po |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE jwhois-3.2.2-ru.patch ---
--- jwhois-3.2.2/po/ru.po.ru	2005-06-12 18:38:33.000000000 +0200
+++ jwhois-3.2.2/po/ru.po	2005-06-12 18:38:41.000000000 +0200
@@ -2,7 +2,6 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Dmitry Mastrukov <dmitry at taurussoft.org>, 2000.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: jwhois 2.4.1\n"

jwhois-3.2.3-config-cvs.patch:
 jwhois.conf |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE jwhois-3.2.3-config-cvs.patch ---
Note that this is not a pure CVS diff, a hunk adding the "connect-timeout"
option has been removed.

Index: example/jwhois.conf
===================================================================
RCS file: /sources/jwhois/jwhois/example/jwhois.conf,v
retrieving revision 1.119
retrieving revision 1.122
diff -u -r1.119 -r1.122
--- example/jwhois.conf	9 Jul 2005 18:31:51 -0000	1.119
+++ example/jwhois.conf	12 Apr 2006 14:23:40 -0000	1.122
@@ -180,7 +180,7 @@
 	"\\.cx$" = "whois.nic.cx";
 	"\\.cy$" = "whois.ripe.net";
 	"\\.cz$" = "whois.nic.cz";
-	"\\.de$" = "www.denic.de";
+	"\\.de$" = "whois.denic.de";
 	"\\.dk$" = "whois.dk-hostmaster.dk";
 	"\\.do$" = "whois.nic.do";
 	"\\.dz$" = "whois.ripe.net";
@@ -189,6 +189,7 @@
 	"\\.ee$" = "whois.eenet.ee";
 	"\\.eg$" = "whois.ripe.net";
 	"\\.es$" = "www.nic.es";
+	"\\.eu$" = "whois.eu";
 	"\\.fi$" = "whois.ficora.fi";
 	"\\.fj$" = "whois.usp.ac.fj";
 	"\\.fm$" = "www.dot.fm";
@@ -866,6 +867,10 @@
 		form-element = "domainname";
 		form-extra = "service=WhoisData&lang=en&submit=Accept";
 	}
+	"whois\\.denic\\.de" {
+		whois-server = "whois.denic.de";
+		query-format = "-C UTF-8 -T dn,ace $*";
+	}
 	"whois\\.nic\\.ad\\.jp" {
 		query-format = "$*/e";
 	}

jwhois-3.2.3-sigpipe.patch:
 http.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE jwhois-3.2.3-sigpipe.patch ---
--- jwhois-3.2.3/src/http.c.sigpipe        2005-08-05 15:06:34.000000000 +0200
+++ jwhois-3.2.3/src/http.c        2005-08-05 15:18:12.000000000 +0200
@@ -19,6 +19,7 @@
 
 #include <config.h>
 
+#include <signal.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -269,7 +270,8 @@
         /* Drats! */
         if (errno)
         {
-            printf("[HTTP: %s: %s]\n", _("Unable to run web browser"), strerror(errno));
+            printf("[HTTP: %s: %s: %s]\n", _("Unable to run web browser"),
+                   command[0], strerror(errno));
         }
         close(to_browser[0]);
         close(from_browser[1]);
@@ -287,6 +289,8 @@
 
         if (!isget && !post_as_file)
         {
+            struct sigaction sa, old_sa;
+
             /* Send POST data */
             if (format)
             {
@@ -301,7 +305,12 @@
                          element, wq->query,
                          extra ? "&" : "", extra ? extra : "");
             }
+            sa.sa_handler = SIG_IGN;
+            sigemptyset (&sa.sa_mask);
+            sa.sa_flags = 0;
+            sigaction (SIGPIPE, &sa, &old_sa);
             write(to_browser[1], data, strlen(data) + 1);
+            sigaction (SIGPIPE, &old_sa, NULL);
         }
 
         close(to_browser[1]);


--- NEW FILE jwhois-3.2.3.tar.gz.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jwhois/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Sep 2004 06:37:21 -0000	1.3
+++ .cvsignore	21 Apr 2006 13:24:31 -0000	1.4
@@ -1 +1 @@
-jwhois-3.2.2.tar.gz
+jwhois-3.2.3.tar.gz


Index: jwhois.spec
===================================================================
RCS file: /cvs/dist/rpms/jwhois/FC-4/jwhois.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jwhois.spec	30 Apr 2005 17:46:23 -0000	1.15
+++ jwhois.spec	21 Apr 2006 13:24:32 -0000	1.16
@@ -1,14 +1,13 @@
 Name: jwhois
-Version: 3.2.2
-Release: 14
+Version: 3.2.3
+Release: 3.3.fc4.1
 URL: http://www.gnu.org/software/jwhois/
 Source0: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz
-Patch0: jwhois-3.2.2-config-cvs.patch
-Patch1: jwhois-3.2.2-arin.patch
-Patch2: jwhois-3.2.2-doublefree.patch
-Patch3: jwhois-3.2.2-update_2004.patch
-Patch4: jwhois-3.2.2-webbased.patch
-Patch5: jwhois-3.2.2-afrinic.patch
+Source1: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz.sig
+Patch0: jwhois-3.2.3-config-cvs.patch
+Patch1: jwhois-3.2.2-afrinic.patch
+Patch2: jwhois-3.2.2-ru.patch
+Patch3: jwhois-3.2.3-sigpipe.patch
 License: GPL
 Group: Applications/Internet
 Summary: Internet whois/nicname client.
@@ -22,11 +21,9 @@
 %prep
 %setup -q
 %patch0 -p0 -b .config
-%patch1 -p1 -b .arin
-%patch2 -p1 -b .doublefree
-%patch3 -p1 -b .update_2004
-%patch4 -p1 -b .webbased
-%patch5 -p1 -b .afrinic
+%patch1 -p1 -b .afrinic
+%patch2 -p1 -b .ru
+%patch3 -p1 -b .sigpipe
 
 iconv -f iso-8859-1 -t utf-8 < doc/sv/jwhois.1 > doc/sv/jwhois.1_
 mv doc/sv/jwhois.1_ doc/sv/jwhois.1
@@ -37,10 +34,8 @@
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
-%makeinstall
-# Force compression of the info page so that the %%post knows its name.
-gzip $RPM_BUILD_ROOT/%{_infodir}/*.info*
-rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
+make install DESTDIR="$RPM_BUILD_ROOT"
+rm -f "$RPM_BUILD_ROOT"%{_infodir}/dir
 %find_lang jwhois
 
 # Make "whois" jwhois.
@@ -49,7 +44,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS COPYING NEWS README TODO
+%doc AUTHORS COPYING ChangeLog NEWS README TODO
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_mandir}/*/man1/jwhois.1*
@@ -57,17 +52,46 @@
 %config(noreplace) %{_sysconfdir}/jwhois.conf
 
 %post
-/sbin/install-info %{_infodir}/jwhois.info.gz %{_infodir}/dir
+/sbin/install-info %{_infodir}/jwhois.info %{_infodir}/dir
 
 %preun
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/jwhois.info.gz %{_infodir}/dir
+    /sbin/install-info --delete %{_infodir}/jwhois.info %{_infodir}/dir
 fi
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Wed Apr 19 2006 Miloslav Trmac <mitr at redhat.com> - 3.2.3-3.3.fc4.1
+- Update to upstream config as of Apr 19 2006 (#188366)
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.2.3-3.2.1
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.2.3-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+- rebuilt
+
+* Fri Nov 11 2005 Miloslav Trmac <mitr at redhat.com> - 3.2.3-3
+- Ship ChangeLog
+
+* Fri Aug  5 2005 Miloslav Trmac <mitr at redhat.com> - 3.2.3-2
+- Don't die on SIGPIPE if a browser is not present, improve the error message
+  (#165149)
+
+* Mon Aug  1 2005 Miloslav Trmac <mitr at redhat.com> - 3.2.3-1
+- Update to jwhois-3.2.3
+- Don't compress jwhois.info manually
+
+* Sun Jun 12 2005 Miloslav Trmac <mitr at redhat.com> - 3.2.2-16
+- Remove 'fuzzy' from ru.po header to make charset conversion work (#160165)
+
+* Sat Jun 11 2005 Miloslav Trmac <mitr at redhat.com> - 3.2.2-15
+- Update to upstream config as of Jun 11 2005, remove patches accepted upstream
+
 * Sat Apr 30 2005 Miloslav Trmac <mitr at redhat.com> - 3.2.2-14
 - Add an AfriNIC range (#156178)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jwhois/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Sep 2004 06:37:21 -0000	1.3
+++ sources	21 Apr 2006 13:24:32 -0000	1.4
@@ -1 +1 @@
-3ad57a8cfc4f32fe41b1131711d34a78  jwhois-3.2.2.tar.gz
+1232661cebd79a9772f416599d3f5929  jwhois-3.2.3.tar.gz


--- jwhois-3.2.2-arin.patch DELETED ---


--- jwhois-3.2.2-config-cvs.patch DELETED ---


--- jwhois-3.2.2-doublefree.patch DELETED ---


--- jwhois-3.2.2-update_2004.patch DELETED ---


--- jwhois-3.2.2-webbased.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 21 13:47:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 09:47:07 -0400
Subject: rpms/cups/devel cups.spec,1.165,1.166 cups-kde.patch,1.2,NONE
Message-ID: <200604211347.k3LDl7co015817@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15444

Modified Files:
	cups.spec 
Removed Files:
	cups-kde.patch 
Log Message:
* Fri Apr 21 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.4.rc2.2
- Updated to svn 5446.



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- cups.spec	19 Apr 2006 15:15:06 -0000	1.165
+++ cups.spec	21 Apr 2006 13:47:04 -0000	1.166
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2
-Release: 0.4.%{beta}.1
+Release: 0.4.%{beta}.2
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
@@ -22,12 +22,12 @@
 Source11: cups.conf
 Source12: cups.cron
 Source13: pdftops.conf
+Patch0: cups-rc2-5446.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-kde.patch
 Patch7: cups-banners.patch
 Patch8: cups-logfileperm.patch
 Patch9: cups-1.1.17-rcp.patch
@@ -110,12 +110,12 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{beta}
+%patch0 -p0 -b .rc2-5446
 %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 .kde
 %patch7 -p1 -b .banners
 %patch8 -p1 -b .logfileperm
 %patch9 -p1 -b .rcp
@@ -312,6 +312,7 @@
 %{_docdir}/cups-%{version}/images
 %{_docdir}/cups-%{version}/ja
 %{_docdir}/cups-%{version}/es
+%{_docdir}/cups-%{version}/sv
 %{_docdir}/cups-%{version}/*.css
 %{_docdir}/cups-%{version}/admin
 %{_docdir}/cups-%{version}/classes
@@ -376,6 +377,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Apr 21 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.4.rc2.2
+- Updated to svn 5446.
+
 * Wed Apr 19 2006 Tim Waugh <twaugh at redhat.com>
 - Ignore .rpmnew and .rpmsave banner files.
 


--- cups-kde.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 21 13:48:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 09:48:42 -0400
Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.6,
	1.7
Message-ID: <200604211348.k3LDmgtj027174@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/system-config-printer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27056

Modified Files:
	system-config-printer.spec 
Log Message:
* Fri Apr 21 2006 Tim Waugh <twaugh at redhat.com>
- Build requires CUPS 1.2.



Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- system-config-printer.spec	20 Apr 2006 16:50:57 -0000	1.6
+++ system-config-printer.spec	21 Apr 2006 13:48:40 -0000	1.7
@@ -11,7 +11,8 @@
 
 %{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
 
-BuildRequires: cups-devel, python-devel
+BuildRequires: cups-devel >= 1.2
+BuildRequires: python-devel
 PreReq: python, python-abi = %{pyver}
 PreReq: rhpl >= 0.81
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -57,6 +58,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Fri Apr 21 2006 Tim Waugh <twaugh at redhat.com>
+- Build requires CUPS 1.2.
+
 * Thu Apr 20 2006 Tim Waugh <twaugh at redhat.com> 0.7.5-1
 - Updated to pycups-1.9.8.  No longer need threads patch.
 - Updated to system-config-printer-0.7.5.



From fedora-cvs-commits at redhat.com  Fri Apr 21 13:48:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 09:48:51 -0400
Subject: rpms/cups/devel cups-rc2-5446.patch,NONE,1.1
Message-ID: <200604211348.k3LDmpp0027232@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25578

Added Files:
	cups-rc2-5446.patch 
Log Message:
Include the patch.

cups-rc2-5446.patch:
 CHANGES.txt                                      |   50 
 CREDITS.txt                                      |    5 
 backend/Dependencies                             |    5 
 backend/Makefile                                 |   13 
 backend/ieee1284.c                               |  359 ++
 backend/parallel.c                               |    2 
 backend/serial.c                                 |   59 
 backend/snmp.c                                   | 2182 +++++++++++++++++
 backend/snmp.txt                                 |  172 +
 cgi-bin/admin.c                                  |   71 
 cgi-bin/ipp-var.c                                |    4 
 conf/Makefile                                    |    3 
 conf/mime.convs                                  |    5 
 conf/mime.types                                  |    8 
 config-scripts/cups-defaults.m4                  |    2 
 configure.in                                     |   12 
 cups/Dependencies                                |   18 
 cups/Makefile                                    |    3 
 cups/custom.c                                    |   12 
 cups/getifaddrs.c                                |  275 ++
 cups/http-addr.c                                 |   23 
 cups/http-private.h                              |   44 
 cups/http.c                                      |  109 
 cups/ipp.c                                       |   69 
 cups/localize.c                                  |    2 
 cups/request.c                                   |   32 
 cups/testi18n.c                                  |   36 
 doc/Makefile                                     |    1 
 doc/help/api-ppd.html                            |  109 
 doc/help/ref-client-conf.html                    |   59 
 doc/help/ref-snmp-conf.html                      |  100 
 doc/sv/images/button-accept-jobs.gif             |    0 
 doc/sv/images/button-add-class.gif               |    0 
 doc/sv/images/button-add-printer.gif             |    0 
 doc/sv/images/button-add-this-printer.gif        |    0 
 doc/sv/images/button-cancel-all-jobs.gif         |    0 
 doc/sv/images/button-cancel-job.gif              |    0 
 doc/sv/images/button-change-settings.gif         |    0 
 doc/sv/images/button-clean-print-heads.gif       |    0 
 doc/sv/images/button-clear.gif                   |    0 
 doc/sv/images/button-continue.gif                |    0 
 doc/sv/images/button-delete-class.gif            |    0 
 doc/sv/images/button-delete-printer.gif          |    0 
 doc/sv/images/button-edit-configuration-file.gif |    0 
 doc/sv/images/button-export-samba.gif            |    0 
 doc/sv/images/button-help.gif                    |    0 
 doc/sv/images/button-hold-job.gif                |    0 
 doc/sv/images/button-manage-classes.gif          |    0 
 doc/sv/images/button-manage-jobs.gif             |    0 
 doc/sv/images/button-manage-printers.gif         |    0 
 doc/sv/images/button-manage-server.gif           |    0 
 doc/sv/images/button-modify-class.gif            |    0 
 doc/sv/images/button-modify-printer.gif          |    0 
 doc/sv/images/button-move-job.gif                |    0 
 doc/sv/images/button-move-jobs.gif               |    0 
 doc/sv/images/button-print-self-test-page.gif    |    0 
 doc/sv/images/button-print-test-page.gif         |    0 
 doc/sv/images/button-publish-printer.gif         |    0 
 doc/sv/images/button-reject-jobs.gif             |    0 
 doc/sv/images/button-release-job.gif             |    0 
 doc/sv/images/button-restart-job.gif             |    0 
 doc/sv/images/button-save-changes.gif            |    0 
 doc/sv/images/button-search.gif                  |    0 
 doc/sv/images/button-set-allowed-users.gif       |    0 
 doc/sv/images/button-set-as-default.gif          |    0 
 doc/sv/images/button-set-printer-options.gif     |    0 
 doc/sv/images/button-show-active.gif             |    0 
 doc/sv/images/button-show-all.gif                |    0 
 doc/sv/images/button-show-completed.gif          |    0 
 doc/sv/images/button-show-next.gif               |    0 
 doc/sv/images/button-show-previous.gif           |    0 
 doc/sv/images/button-sort-ascending.gif          |    0 
 doc/sv/images/button-sort-descending.gif         |    0 
 doc/sv/images/button-start-class.gif             |    0 
 doc/sv/images/button-start-printer.gif           |    0 
 doc/sv/images/button-stop-class.gif              |    0 
 doc/sv/images/button-stop-printer.gif            |    0 
 doc/sv/images/button-unpublish-printer.gif       |    0 
 doc/sv/images/button-use-default-config.gif      |    0 
 doc/sv/images/button-view-access-log.gif         |    0 
 doc/sv/images/button-view-error-log.gif          |    0 
 doc/sv/images/button-view-page-log.gif           |    0 
 doc/sv/images/button-view-printable-version.gif  |    0 
 doc/sv/index.html.in                             |  137 +
 driver/testdriver.c                              |  179 +
 locale/cups.pot                                  |    2 
 locale/cups_es.po                                |   13 
 locale/cups_ja.po                                |    9 
 locale/cups_sv.po                                | 2813 +++++++++++++++++++++++
 man/Makefile                                     |    1 
 man/cups-snmp.conf.man                           |   77 
 man/cupsaddsmb.man.in                            |   25 
 packaging/cups.list.in                           |   24 
 packaging/cups.spec.in                           |   20 
 scheduler/auth.c                                 |   16 
 scheduler/client.c                               |   90 
 scheduler/cups-driverd.c                         |    6 
 scheduler/ipp.c                                  |  166 -
 scheduler/job.c                                  |  161 -
 scheduler/job.h                                  |    5 
 scheduler/mime.c                                 |   18 
 scheduler/network.c                              |   43 
 standards/Makefile                               |    0 
 standards/X.690-0207.pdf                         |    0 
 standards/rfc1155.txt                            |    0 
 standards/rfc1157.txt                            |    0 
 standards/rfc2790.txt                            |    0 
 systemv/cupstestdsc.c                            |   15 
 systemv/cupstestppd.c                            |   60 
 templates/admin.tmpl                             |    6 
 templates/es/admin.tmpl                          |    8 
 templates/ja/admin.tmpl                          |    8 
 templates/ja/edit-config.tmpl.in                 |   90 
 templates/sv/add-class.tmpl                      |   33 
 templates/sv/add-printer.tmpl                    |   28 
 templates/sv/admin.tmpl                          |   77 
 templates/sv/choose-device.tmpl                  |   26 
 templates/sv/choose-make.tmpl                    |   42 
 templates/sv/choose-model.tmpl                   |   34 
 templates/sv/choose-serial.tmpl                  |   47 
 templates/sv/choose-uri.tmpl                     |   42 
 templates/sv/class-added.tmpl                    |    1 
 templates/sv/class-confirm.tmpl                  |    7 
 templates/sv/class-deleted.tmpl                  |    1 
 templates/sv/class-jobs-header.tmpl              |    1 
 templates/sv/class-modified.tmpl                 |    2 
 templates/sv/classes-header.tmpl                 |    1 
 templates/sv/classes.tmpl                        |   54 
 templates/sv/edit-config.tmpl.in                 |   90 
 templates/sv/error-op.tmpl                       |    3 
 templates/sv/error.tmpl                          |    3 
 templates/sv/header.tmpl.in                      |   63 
 templates/sv/help-header.tmpl                    |   47 
 templates/sv/help-printable.tmpl                 |   11 
 templates/sv/job-cancel.tmpl                     |    1 
 templates/sv/job-hold.tmpl                       |    1 
 templates/sv/job-move.tmpl                       |   22 
 templates/sv/job-moved.tmpl                      |    2 
 templates/sv/job-release.tmpl                    |    1 
 templates/sv/job-restart.tmpl                    |    1 
 templates/sv/jobs-header.tmpl                    |   15 
 templates/sv/jobs.tmpl                           |   42 
 templates/sv/maintenance.tmpl                    |    2 
 templates/sv/modify-class.tmpl                   |   34 
 templates/sv/modify-printer.tmpl                 |   29 
 templates/sv/option-boolean.tmpl                 |    6 
 templates/sv/option-conflict.tmpl                |    7 
 templates/sv/option-header.tmpl                  |    3 
 templates/sv/option-pickmany.tmpl                |    6 
 templates/sv/option-pickone.tmpl                 |    6 
 templates/sv/option-trailer.tmpl                 |    5 
 templates/sv/pager.tmpl                          |    7 
 templates/sv/printer-accept.tmpl                 |    3 
 templates/sv/printer-added.tmpl                  |    1 
 templates/sv/printer-configured.tmpl             |    1 
 templates/sv/printer-confirm.tmpl                |    7 
 templates/sv/printer-default.tmpl                |    7 
 templates/sv/printer-deleted.tmpl                |    1 
 templates/sv/printer-jobs-header.tmpl            |    1 
 templates/sv/printer-modified.tmpl               |    1 
 templates/sv/printer-purge.tmpl                  |    3 
 templates/sv/printer-reject.tmpl                 |    3 
 templates/sv/printer-start.tmpl                  |    3 
 templates/sv/printer-stop.tmpl                   |    3 
 templates/sv/printers-header.tmpl                |    1 
 templates/sv/printers.tmpl                       |   64 
 templates/sv/restart.tmpl                        |    1 
 templates/sv/samba-export.tmpl                   |   55 
 templates/sv/samba-exported.tmpl                 |    1 
 templates/sv/search.tmpl                         |   13 
 templates/sv/set-printer-options-header.tmpl     |    3 
 templates/sv/set-printer-options-trailer.tmpl    |    1 
 templates/sv/test-page.tmpl                      |    2 
 templates/sv/trailer.tmpl                        |   21 
 templates/sv/users.tmpl                          |   26 
 test/ipptest.c                                   |  109 
 176 files changed, 8299 insertions(+), 671 deletions(-)

--- NEW FILE cups-rc2-5446.patch ---
Index: packaging/cups.spec.in
===================================================================
--- packaging/cups.spec.in	(revision 5384)
+++ packaging/cups.spec.in	(working copy)
@@ -86,6 +86,11 @@
 Group: System Environment/Daemons
 Requires: %{name} = %{epoch}:%{version}
 
+%package sv
+Summary: Common UNIX Printing System - Swedish support
+Group: System Environment/Daemons
+Requires: %{name} = %{epoch}:%{version}
+
 %if %{?_with_php:1}%{!?_with_php:0}
 %package php
 Summary: Common UNIX Printing System - PHP support
@@ -120,6 +125,10 @@
 The Common UNIX Printing System provides a portable printing layer for 
 UNIX? operating systems. This package provides Japanese support.
 
+%description sv
+The Common UNIX Printing System provides a portable printing layer for 
+UNIX? operating systems. This package provides Swedish support.
+
 %if %{?_with_php:1}%{!?_with_php:0}
 %description php
 The Common UNIX Printing System provides a portable printing layer for 
@@ -230,6 +239,7 @@
 /usr/lib/cups/backend/parallel
 /usr/lib/cups/backend/scsi
 /usr/lib/cups/backend/serial
+/usr/lib/cups/backend/snmp
 /usr/lib/cups/backend/socket
 /usr/lib/cups/backend/usb
 %dir /usr/lib/cups/cgi-bin
@@ -372,6 +382,16 @@
 /usr/share/cups/templates/ja/*
 /usr/share/locale/ja/cups_ja.po
 
+%files sv
+%defattr(-,root,root)
+%dir /usr/share/doc/cups/sv
+/usr/share/doc/cups/sv/index.html
+%dir /usr/share/doc/cups/sv/images
+/usr/share/doc/cups/sv/images/*
+%dir /usr/share/cups/templates/sv
+/usr/share/cups/templates/sv/*
+/usr/share/locale/sv/cups_sv.po
+
 %if %{?_with_php:1}%{!?_with_php:0}
 %files php
 # PHP
Index: packaging/cups.list.in
===================================================================
--- packaging/cups.list.in	(revision 5384)
+++ packaging/cups.list.in	(working copy)
@@ -103,6 +103,9 @@
 %subpackage ja
 %description Common UNIX Printing System - Japanese support
 
+%subpackage sv
+%description Common UNIX Printing System - Swedish support
+
 %subpackage
 
 
@@ -190,12 +193,13 @@
 
 d 0755 root sys $SERVERBIN -
 d 0755 root sys $SERVERBIN/backend -
-f 0755 root sys $SERVERBIN/backend/ipp backend/ipp
-l 0755 root sys $SERVERBIN/backend/http ipp
-f 0755 root sys $SERVERBIN/backend/lpd backend/lpd
+f 0700 root sys $SERVERBIN/backend/ipp backend/ipp
+l 0700 root sys $SERVERBIN/backend/http ipp
+f 0700 root sys $SERVERBIN/backend/lpd backend/lpd
 f 0755 root sys $SERVERBIN/backend/parallel backend/parallel
 f 0755 root sys $SERVERBIN/backend/scsi backend/scsi
 f 0755 root sys $SERVERBIN/backend/serial backend/serial
+f 0755 root sys $SERVERBIN/backend/snmp backend/snmp
 f 0755 root sys $SERVERBIN/backend/socket backend/socket
 f 0755 root sys $SERVERBIN/backend/usb backend/usb
 d 0755 root sys $SERVERBIN/cgi-bin -
@@ -334,6 +338,8 @@
 f 0644 root sys $LOCALEDIR/es/cups_es.po locale/cups_es.po
 %subpackage ja
 f 0644 root sys $LOCALEDIR/ja/cups_ja.po locale/cups_ja.po
+%subpackage sv
+f 0644 root sys $LOCALEDIR/sv/cups_sv.po locale/cups_sv.po
 %subpackage
 
 d 0755 root sys $DATADIR -
@@ -395,6 +401,9 @@
 %subpackage ja
 d 0755 root sys $DATADIR/templates/ja
 f 0644 root sys $DATADIR/templates/ja templates/ja/*.tmpl
+%subpackage sv
+d 0755 root sys $DATADIR/templates/sv
+f 0644 root sys $DATADIR/templates/sv templates/sv/*.tmpl
 %subpackage
 
 # Config files
@@ -403,8 +412,8 @@
 d 0755 root $CUPS_GROUP $SERVERROOT/ppd -
 c $CUPS_PERM root $CUPS_GROUP $SERVERROOT conf/*.conf
 f $CUPS_PERM root $CUPS_GROUP $SERVERROOT/cupsd.conf.default conf/cupsd.conf
-f $CUPS_PERM root $CUPS_GROUP $SERVERROOT/mime.convs conf/mime.convs
-f $CUPS_PERM root $CUPS_GROUP $SERVERROOT/mime.types conf/mime.types
+f 0644 root $CUPS_GROUP $SERVERROOT/mime.convs conf/mime.convs
+f 0644 root $CUPS_GROUP $SERVERROOT/mime.types conf/mime.types
 
 %if PAMDIR
 d 0755 root sys $PAMDIR -
@@ -468,6 +477,11 @@
 f 0644 root sys $DOCDIR/ja doc/ja/*.html
 d 0755 root sys $DOCDIR/ja/images -
 f 0644 root sys $DOCDIR/ja/images doc/ja/images/*.gif
+%subpackage sv
+d 0755 root sys $DOCDIR/sv
+f 0644 root sys $DOCDIR/sv doc/sv/*.html
+d 0755 root sys $DOCDIR/sv/images -
+f 0644 root sys $DOCDIR/sv/images doc/sv/images/*.gif
 %subpackage
 
 # Man pages
Index: conf/mime.types
===================================================================
--- conf/mime.types	(revision 5384)
+++ conf/mime.types	(working copy)
@@ -147,7 +147,9 @@
 
 application/vnd.cups-command	string(0,'#CUPS-COMMAND')
 application/vnd.cups-form	string(0,"<CUPSFORM>")
+application/vnd.cups-pdf
 application/vnd.cups-postscript
+application/vnd.cups-ppd	ppd string(0,"*PPD-Adobe:")
 application/vnd.cups-raster	string(0,"RaSt") string(0,"tSaR")
 application/vnd.cups-raw	(string(0,<1B>E) + !string(2,<1B>%0B)) \
 				string(0,<1B>@) \
@@ -159,12 +161,10 @@
 #
 # Raw print file support...
 #
-# Uncomment the following type and the application/octet-stream
-# filter line in mime.convs to allow raw file printing without the
-# -oraw option.
+# Comment the following type to prevent raw file printing.
 #
 
-#application/octet-stream
+application/octet-stream
 
 #
 # End of "$Id$".
Index: conf/Makefile
===================================================================
--- conf/Makefile	(revision 5384)
+++ conf/Makefile	(working copy)
@@ -74,8 +74,7 @@
 		if test -r $(SERVERROOT)/$$file ; then \
 			$(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
 		fi ; \
-		$(INSTALL_CONFIG) $$file $(SERVERROOT) ; \
-		chgrp $(CUPS_GROUP) $(SERVERROOT)/$$file || true; \
+		$(INSTALL_DATA) $$file $(SERVERROOT) ; \
 	done
 	-if test x$(PAMDIR) != x; then \
 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \
Index: conf/mime.convs
===================================================================
--- conf/mime.convs	(revision 5384)
+++ conf/mime.convs	(working copy)
@@ -107,9 +107,8 @@
 #
 # Raw filter...
 #
-# Uncomment the following filter and the application/octet-stream type
-# in mime.types to allow printing of arbitrary files without the -oraw
-# option.
+# Uncomment the following filter to allow printing of arbitrary files
+# without the -oraw option.
 #
 
 #application/octet-stream	application/vnd.cups-raw	0	-
Index: backend/Dependencies
===================================================================
--- backend/Dependencies	(revision 5384)
+++ backend/Dependencies	(working copy)
@@ -19,6 +19,11 @@
 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
[...11057 lines suppressed...]
@@ -106,15 +115,6 @@
     mimeDeleteType(mime, type);
 
  /*
-  * Loop through filters and free them...
-  */
-
-  for (filter = (mime_filter_t *)cupsArrayFirst(mime->filters);
-       filter;
-       filter = (mime_filter_t *)cupsArrayNext(mime->filters))
-    mimeDeleteFilter(mime, filter);
-
- /*
   * Free the types and filters arrays, and then the MIME database structure.
   */
 
Index: driver/testdriver.c
===================================================================
--- driver/testdriver.c	(revision 0)
+++ driver/testdriver.c	(revision 5446)
@@ -0,0 +1,179 @@
+/*
+ * "$Id$"
+ *
+ *   Sample/test driver interface program for the Common UNIX Printing
+ *   System (CUPS).
+ *
+ *   This program handles listing and installing both static PPD files
+ *   in CUPS_DATADIR/model and dynamically generated PPD files using
+ *   the driver helper programs in CUPS_SERVERBIN/driver.
+ *
+ *   Copyright 1997-2006 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
+ *
+ * Contents:
+ *
+ *   main()      - Enumerate or display PPD files.
+ *   cat_ppd()   - Display a PPD file.
+ *   list_ppds() - List PPDs.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+
+/*
+ * Local functions...
+ */
+
+static int	cat_ppd(const char *uri);
+static int	list_ppds(const char *name);
+
+
+/*
+ * Sample data...
+ */
+
+static const char *models[][2] =
+		{
+		  { "foojet.ppd", "Foo Printer" },
+		  { "barjet.ppd", "Bar Printer" },
+		  { "foobar.ppd", "Foo/Bar Multifunction Printer" }
+		};
+
+
+/*
+ * 'main()' - Enumerate or display PPD files.
+ */
+
+int					/* O - Exit status */
+main(int  argc,				/* I - Number of command-line args */
+     char *argv[])			/* I - Command-line arguments */
+{
+  if (argc == 2 && !strcmp(argv[1], "list"))
+    return (list_ppds(argv[0]));
+  else if (argc == 3 && !strcmp(argv[1], "cat"))
+    return (cat_ppd(argv[2]));
+
+  fprintf(stderr, "ERROR: Usage: %s cat URI\n", argv[0]);
+  fprintf(stderr, "ERROR: Usage: %s list\n", argv[0]);
+  return (1);
+}
+
+
+/*
+ * 'cat_ppd()' - Display a PPD file.
+ */
+
+static int				/* O - Exit status */
+cat_ppd(const char *uri)		/* I - PPD URI */
+{
+  int		i;			/* Looping var */
+  const char	*name;			/* Pointer to name in URI */
+
+
+  if ((name = strchr(uri, ':')) == NULL)
+  {
+    fprintf(stderr, "ERROR: Bad URI \"%s\"!\n", uri);
+    return (1);
+  }
+
+  name ++;
+
+  for (i = 0 ; i < (int)(sizeof(models) / sizeof(models[0])); i ++)
+    if (!strcmp(name, models[i][0]))
+    {
+     /*
+      * Actually display the PPD file...
+      */
+      puts("*PPD-Adobe: \"4.3\"");
+
+      puts("*LanguageEncoding: ISOLatin1");
+      puts("*LanguageVersion: English");
+      puts("*Manufacturer: \"Test\"");
+      puts("*FileVersion: \"1.0\"");
+      puts("*FormatVersion: \"4.3\"");
+      puts("*PSVersion: \"(3010) 1\"");
+      printf("*PCFileName: \"%s\"\n", models[i][0]);
+
+      printf("*Product: \"(%s)\"\n", models[i][1]);
+      printf("*ModelName: \"Test %s\"\n", models[i][1]);
+      printf("*NickName: \"Test %s\"\n", models[i][1]);
+      printf("*ShortNickName: \"Test %s\"\n", models[i][1]);
+
+      puts("*OpenUI PageSize: PickOne"); 
+      puts("*OrderDependency: 10 AnySetup *PageSetup");
+      puts("*DefaultPageSize: Letter");
+      puts("*PageSize Letter: \"<</PageSize[612 792]>>setpagedevice\"");
+      puts("*PageSize A4: \"<</PageSize[585 842]>>setpagedevice\"");
+      puts("*CloseUI: *PageSize");
+
+      puts("*OpenUI PageRegion: PickOne"); 
+      puts("*OrderDependency: 10 AnySetup *PageRegion");
+      puts("*DefaultPageRegion: Letter");
+      puts("*PageRegion Letter: \"<</PageRegion[612 792]>>setpagedevice\"");
+      puts("*PageRegion A4: \"<</PageRegion[585 842]>>setpagedevice\"");
+      puts("*CloseUI: *PageRegion");
+
+      puts("*DefaultImageableArea: Letter");
+      puts("*ImageableArea Letter: \"0 0 612 792\"");
+      puts("*ImageableArea A4: \"0 0 595 842\"");
+
+      puts("*DefaultPaperDimension: Letter");
+      puts("*PaperDimension Letter: \"612 792\"");
+      puts("*PaperDimension A4: \"595 842\"");
+
+      return (0);
+    }
+
+  fprintf(stderr, "ERROR: Unknown URI \"%s\"!\n", uri);
+  return (1);
+}
+
+
+/*
+ * 'list_ppds()' - List PPDs.
+ */
+
+static int				/* O - Exit status */
+list_ppds(const char *name)		/* I - Program name */
+{
+  int		i;			/* Looping var */
+  const char	*base;			/* Base name of program */
+
+
+  if ((base = strrchr(name, '/')) != NULL)
+    base ++;
+  else
+    base = name;
+
+  for (i = 0; i < (int)(sizeof(models) / sizeof(models[0])); i ++)
+    printf("\"%s:%s\" en \"Test\" \"Test %s\" \"1284 device id\"\n",
+           base, models[i][0], models[i][1]);
+
+  return (0);
+}
+
+
+/*
+ * End of "$Id$".
+ */



From fedora-cvs-commits at redhat.com  Fri Apr 21 14:47:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 10:47:28 -0400
Subject: rpms/cscope/FC-5 cscope-15.5-inv-overflow.patch, NONE,
	1.1 cscope.spec, 1.21, 1.22
Message-ID: <200604211447.k3LElSOu010981@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/cscope/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv10966

Modified Files:
	cscope.spec 
Added Files:
	cscope-15.5-inv-overflow.patch 
Log Message:
updating FC 5 cscope with inverted index overflow patch

cscope-15.5-inv-overflow.patch:
 invlib.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE cscope-15.5-inv-overflow.patch ---
--- cscope-15.5/src/invlib.c.overflow	2003-06-20 03:46:03.000000000 -0400
+++ cscope-15.5/src/invlib.c	2006-04-21 10:28:06.000000000 -0400
@@ -47,7 +47,6 @@
 
 #define	DEBUG		0	/* debugging code and realloc messages */
 #define BLOCKSIZE	2 * BUFSIZ	/* logical block size */
-#define	LINEMAX		1000	/* sorted posting line max size */
 #define	POSTINC		10000	/* posting buffer size increment */
 #define SEP		' '	/* sorted posting field separator */
 #define	SETINC		100	/* posting set size increment */
@@ -112,7 +111,7 @@
 	long	fileindex = 0;	/* initialze, to avoid warning */
 	unsigned postsize = POSTINC * sizeof(POSTING);
 	unsigned long	*intptr;
-	char	line[LINEMAX];
+	char	line[TERMMAX];
 	long	tlong;
 	PARAM	param;
 	POSTING	posting;
@@ -177,7 +176,7 @@
 	lastinblk = sizeof(t_logicalblk);
 
 	/* now loop as long as more to read (till eof)  */
-	while (fgets(line, LINEMAX, infile) != NULL) {
+	while (fgets(line, TERMMAX, infile) != NULL) {
 #if DEBUG || STATS
 		++totpost;
 #endif


Index: cscope.spec
===================================================================
RCS file: /cvs/dist/rpms/cscope/FC-5/cscope.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- cscope.spec	11 Feb 2006 02:20:45 -0000	1.21
+++ cscope.spec	21 Apr 2006 14:47:26 -0000	1.22
@@ -20,6 +20,7 @@
 Patch4:cscope-15.5-inverted.patch
 Patch5:cscope-15.5-resize.patch
 Patch6:cscope-15.5-tempsec.patch
+Patch7:cscope-15.5-inv-overflow.patch
 
 %description
 cscope is a mature, ncurses based, C source code tree browsing tool.  It 
@@ -37,6 +38,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 %configure



From fedora-cvs-commits at redhat.com  Fri Apr 21 14:56:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 10:56:14 -0400
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.104,1.105
Message-ID: <200604211456.k3LEuEtC011089@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-vfs2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11076

Modified Files:
	gnome-vfs2.spec 
Log Message:
2.14.1



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- gnome-vfs2.spec	21 Apr 2006 12:49:30 -0000	1.104
+++ gnome-vfs2.spec	21 Apr 2006 14:56:12 -0000	1.105
@@ -8,7 +8,7 @@
 %define gnome_mount_version 0.4
 %define glib2_version 2.9.3
 
-Summary: The GNOME virtual file-system libraries.
+Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.14.1
 Release: 2
@@ -21,6 +21,7 @@
 Requires:      gnome-mime-data >= %{gnome_mime_data_version}
 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}
@@ -29,6 +30,9 @@
 BuildRequires: popt, bzip2-devel, ORBit2-devel, openjade
 BuildRequires: pkgconfig
 BuildRequires: /usr/bin/automake-1.9
+BuildRequires: libtool
+BuildRequires: intltool
+BuildRequires: autoconf
 BuildRequires: gtk-doc >= %{gtkdoc_version}
 BuildRequires: perl-XML-Parser >= %{perl_XML_Parser_version}
 BuildRequires: samba-common >= %{samba_version}
@@ -37,7 +41,6 @@
 BuildRequires: avahi-glib-devel >= 0.6
 BuildRequires: hal-devel >= 0.5.0
 BuildRequires: gnome-mount-devel >= %{gnome_mount_version} 
-Prereq: GConf2 >= %{gconf2_version}
 
 Patch3: gnome-vfs-2.9.90-modules-conf.patch
 
@@ -58,9 +61,9 @@
 library, and other features.
 
 %package devel
-Summary: Libraries and include files for developing GNOME VFS applications.
+Summary: Libraries and include files for developing GNOME VFS applications
 Group: Development/Libraries
-Requires:   %{name} = %{version}
+Requires:   %{name} = %{version}-%{release}
 Requires:   GConf2-devel >= %{gconf2_version}
 Requires:   libbonobo-devel >= %{libbonobo_version}
 Conflicts: bonobo-devel < 1.0.8
@@ -73,7 +76,7 @@
 %package smb
 Summary: Windows fileshare support for gnome-vfs
 Group: System Environment/Libraries
-Requires:   %{name} = %{version}
+Requires:   %{name} = %{version}-%release}
 Requires: samba-common >= %{samba_version}
 Obsoletes:     gnome-vfs2-extras
 Provides:     gnome-vfs2-extras
@@ -115,7 +118,7 @@
 make LIBTOOL=/usr/bin/libtool
 
 %install
-rm -fr %{buildroot}
+rm -fr $RPM_BUILD_ROOT
 
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 export tagname=CC
@@ -138,14 +141,13 @@
 rm -fr %{buildroot}
 
 %post
-
+/sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 SCHEMAS="system_http_proxy.schemas system_dns_sd.schemas system_smb.schemas desktop_gnome_url_handlers.schemas desktop_default_applications.schemas"
 for S in $SCHEMAS; do
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
 done
 
-/sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 



From fedora-cvs-commits at redhat.com  Fri Apr 21 14:57:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 10:57:41 -0400
Subject: rpms/cscope/FC-5 cscope.spec,1.22,1.23
Message-ID: <200604211457.k3LEvfM2011142@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/cscope/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11128

Modified Files:
	cscope.spec 
Log Message:
bumping release number for FC-5


Index: cscope.spec
===================================================================
RCS file: /cvs/dist/rpms/cscope/FC-5/cscope.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- cscope.spec	21 Apr 2006 14:47:26 -0000	1.22
+++ cscope.spec	21 Apr 2006 14:57:39 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: C source code tree search and browse tool 
 Name: cscope
 Version: 15.5
-Release: 13.2 
+Release: 13.3 
 Source0: http://unc.dl.sourceforge.net/sourceforge/cscope/cscope-15.5.tar.gz 
 URL: http://cscope.sourceforge.net
 License: BSD 



From fedora-cvs-commits at redhat.com  Fri Apr 21 15:13:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 11:13:52 -0400
Subject: rpms/cscope/devel cscope-15.5-inv-overflow.patch, NONE,
	1.1 cscope.spec, 1.21, 1.22
Message-ID: <200604211513.k3LFDqli022795@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/cscope/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22765

Modified Files:
	cscope.spec 
Added Files:
	cscope-15.5-inv-overflow.patch 
Log Message:
adding iverted index overflow patch

cscope-15.5-inv-overflow.patch:
 invlib.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE cscope-15.5-inv-overflow.patch ---
--- cscope-15.5/src/invlib.c.overflow	2003-06-20 03:46:03.000000000 -0400
+++ cscope-15.5/src/invlib.c	2006-04-21 10:28:06.000000000 -0400
@@ -47,7 +47,6 @@
 
 #define	DEBUG		0	/* debugging code and realloc messages */
 #define BLOCKSIZE	2 * BUFSIZ	/* logical block size */
-#define	LINEMAX		1000	/* sorted posting line max size */
 #define	POSTINC		10000	/* posting buffer size increment */
 #define SEP		' '	/* sorted posting field separator */
 #define	SETINC		100	/* posting set size increment */
@@ -112,7 +111,7 @@
 	long	fileindex = 0;	/* initialze, to avoid warning */
 	unsigned postsize = POSTINC * sizeof(POSTING);
 	unsigned long	*intptr;
-	char	line[LINEMAX];
+	char	line[TERMMAX];
 	long	tlong;
 	PARAM	param;
 	POSTING	posting;
@@ -177,7 +176,7 @@
 	lastinblk = sizeof(t_logicalblk);
 
 	/* now loop as long as more to read (till eof)  */
-	while (fgets(line, LINEMAX, infile) != NULL) {
+	while (fgets(line, TERMMAX, infile) != NULL) {
 #if DEBUG || STATS
 		++totpost;
 #endif


Index: cscope.spec
===================================================================
RCS file: /cvs/dist/rpms/cscope/devel/cscope.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- cscope.spec	11 Feb 2006 02:20:45 -0000	1.21
+++ cscope.spec	21 Apr 2006 15:13:48 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: C source code tree search and browse tool 
 Name: cscope
 Version: 15.5
-Release: 13.2 
+Release: 13.4 
 Source0: http://unc.dl.sourceforge.net/sourceforge/cscope/cscope-15.5.tar.gz 
 URL: http://cscope.sourceforge.net
 License: BSD 
@@ -20,6 +20,7 @@
 Patch4:cscope-15.5-inverted.patch
 Patch5:cscope-15.5-resize.patch
 Patch6:cscope-15.5-tempsec.patch
+Patch7:cscope-15.5-inv-overflow.patch
 
 %description
 cscope is a mature, ncurses based, C source code tree browsing tool.  It 
@@ -37,6 +38,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 %configure
@@ -85,6 +87,9 @@
 rm -f %{emacs_lisp_path}/xcscope.el
 
 %changelog
+* Fri Apr 21 2006 Neil Horman <nhorman at redhat.com> - 15.5-13.4
+- adding inverted index overflow patch
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 15.5-13.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Apr 21 15:16:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 11:16:57 -0400
Subject: rpms/cscope/FC-5 cscope.spec,1.23,1.24
Message-ID: <200604211516.k3LFGvU3001237@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/cscope/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv32371

Modified Files:
	cscope.spec 
Log Message:
updating changelog


Index: cscope.spec
===================================================================
RCS file: /cvs/dist/rpms/cscope/FC-5/cscope.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- cscope.spec	21 Apr 2006 14:57:39 -0000	1.23
+++ cscope.spec	21 Apr 2006 15:16:53 -0000	1.24
@@ -87,6 +87,9 @@
 rm -f %{emacs_lisp_path}/xcscope.el
 
 %changelog
+* Fri Apr 21 2006 Neil Horman <nhorman at redhat.com> - 15.5-13.3
+- Added inverted overflow fix
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 15.5-13.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Apr 21 15:40:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 11:40:36 -0400
Subject: rpms/cups/FC-5 cups-rc2-5446.patch, NONE, 1.1 cups.spec, 1.156,
	1.157 cups-kde.patch, 1.1, NONE
Message-ID: <200604211540.k3LFeaGV010043@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9924

Modified Files:
	cups.spec 
Added Files:
	cups-rc2-5446.patch 
Removed Files:
	cups-kde.patch 
Log Message:
* Fri Apr 21 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.3.rc2.2
- Updated to svn 5446.


cups-rc2-5446.patch:
 CHANGES.txt                                      |   50 
 CREDITS.txt                                      |    5 
 backend/Dependencies                             |    5 
 backend/Makefile                                 |   13 
 backend/ieee1284.c                               |  359 ++
 backend/parallel.c                               |    2 
 backend/serial.c                                 |   59 
 backend/snmp.c                                   | 2182 +++++++++++++++++
 backend/snmp.txt                                 |  172 +
 cgi-bin/admin.c                                  |   71 
 cgi-bin/ipp-var.c                                |    4 
 conf/Makefile                                    |    3 
 conf/mime.convs                                  |    5 
 conf/mime.types                                  |    8 
 config-scripts/cups-defaults.m4                  |    2 
 configure.in                                     |   12 
 cups/Dependencies                                |   18 
 cups/Makefile                                    |    3 
 cups/custom.c                                    |   12 
 cups/getifaddrs.c                                |  275 ++
 cups/http-addr.c                                 |   23 
 cups/http-private.h                              |   44 
 cups/http.c                                      |  109 
 cups/ipp.c                                       |   69 
 cups/localize.c                                  |    2 
 cups/request.c                                   |   32 
 cups/testi18n.c                                  |   36 
 doc/Makefile                                     |    1 
 doc/help/api-ppd.html                            |  109 
 doc/help/ref-client-conf.html                    |   59 
 doc/help/ref-snmp-conf.html                      |  100 
 doc/sv/images/button-accept-jobs.gif             |    0 
 doc/sv/images/button-add-class.gif               |    0 
 doc/sv/images/button-add-printer.gif             |    0 
 doc/sv/images/button-add-this-printer.gif        |    0 
 doc/sv/images/button-cancel-all-jobs.gif         |    0 
 doc/sv/images/button-cancel-job.gif              |    0 
 doc/sv/images/button-change-settings.gif         |    0 
 doc/sv/images/button-clean-print-heads.gif       |    0 
 doc/sv/images/button-clear.gif                   |    0 
 doc/sv/images/button-continue.gif                |    0 
 doc/sv/images/button-delete-class.gif            |    0 
 doc/sv/images/button-delete-printer.gif          |    0 
 doc/sv/images/button-edit-configuration-file.gif |    0 
 doc/sv/images/button-export-samba.gif            |    0 
 doc/sv/images/button-help.gif                    |    0 
 doc/sv/images/button-hold-job.gif                |    0 
 doc/sv/images/button-manage-classes.gif          |    0 
 doc/sv/images/button-manage-jobs.gif             |    0 
 doc/sv/images/button-manage-printers.gif         |    0 
 doc/sv/images/button-manage-server.gif           |    0 
 doc/sv/images/button-modify-class.gif            |    0 
 doc/sv/images/button-modify-printer.gif          |    0 
 doc/sv/images/button-move-job.gif                |    0 
 doc/sv/images/button-move-jobs.gif               |    0 
 doc/sv/images/button-print-self-test-page.gif    |    0 
 doc/sv/images/button-print-test-page.gif         |    0 
 doc/sv/images/button-publish-printer.gif         |    0 
 doc/sv/images/button-reject-jobs.gif             |    0 
 doc/sv/images/button-release-job.gif             |    0 
 doc/sv/images/button-restart-job.gif             |    0 
 doc/sv/images/button-save-changes.gif            |    0 
 doc/sv/images/button-search.gif                  |    0 
 doc/sv/images/button-set-allowed-users.gif       |    0 
 doc/sv/images/button-set-as-default.gif          |    0 
 doc/sv/images/button-set-printer-options.gif     |    0 
 doc/sv/images/button-show-active.gif             |    0 
 doc/sv/images/button-show-all.gif                |    0 
 doc/sv/images/button-show-completed.gif          |    0 
 doc/sv/images/button-show-next.gif               |    0 
 doc/sv/images/button-show-previous.gif           |    0 
 doc/sv/images/button-sort-ascending.gif          |    0 
 doc/sv/images/button-sort-descending.gif         |    0 
 doc/sv/images/button-start-class.gif             |    0 
 doc/sv/images/button-start-printer.gif           |    0 
 doc/sv/images/button-stop-class.gif              |    0 
 doc/sv/images/button-stop-printer.gif            |    0 
 doc/sv/images/button-unpublish-printer.gif       |    0 
 doc/sv/images/button-use-default-config.gif      |    0 
 doc/sv/images/button-view-access-log.gif         |    0 
 doc/sv/images/button-view-error-log.gif          |    0 
 doc/sv/images/button-view-page-log.gif           |    0 
 doc/sv/images/button-view-printable-version.gif  |    0 
 doc/sv/index.html.in                             |  137 +
 driver/testdriver.c                              |  179 +
 locale/cups.pot                                  |    2 
 locale/cups_es.po                                |   13 
 locale/cups_ja.po                                |    9 
 locale/cups_sv.po                                | 2813 +++++++++++++++++++++++
 man/Makefile                                     |    1 
 man/cups-snmp.conf.man                           |   77 
 man/cupsaddsmb.man.in                            |   25 
 packaging/cups.list.in                           |   24 
 packaging/cups.spec.in                           |   20 
 scheduler/auth.c                                 |   16 
 scheduler/client.c                               |   90 
 scheduler/cups-driverd.c                         |    6 
 scheduler/ipp.c                                  |  166 -
 scheduler/job.c                                  |  161 -
 scheduler/job.h                                  |    5 
 scheduler/mime.c                                 |   18 
 scheduler/network.c                              |   43 
 standards/Makefile                               |    0 
 standards/X.690-0207.pdf                         |    0 
 standards/rfc1155.txt                            |    0 
 standards/rfc1157.txt                            |    0 
 standards/rfc2790.txt                            |    0 
 systemv/cupstestdsc.c                            |   15 
 systemv/cupstestppd.c                            |   60 
 templates/admin.tmpl                             |    6 
 templates/es/admin.tmpl                          |    8 
 templates/ja/admin.tmpl                          |    8 
 templates/ja/edit-config.tmpl.in                 |   90 
 templates/sv/add-class.tmpl                      |   33 
 templates/sv/add-printer.tmpl                    |   28 
 templates/sv/admin.tmpl                          |   77 
 templates/sv/choose-device.tmpl                  |   26 
 templates/sv/choose-make.tmpl                    |   42 
 templates/sv/choose-model.tmpl                   |   34 
 templates/sv/choose-serial.tmpl                  |   47 
 templates/sv/choose-uri.tmpl                     |   42 
 templates/sv/class-added.tmpl                    |    1 
 templates/sv/class-confirm.tmpl                  |    7 
 templates/sv/class-deleted.tmpl                  |    1 
 templates/sv/class-jobs-header.tmpl              |    1 
 templates/sv/class-modified.tmpl                 |    2 
 templates/sv/classes-header.tmpl                 |    1 
 templates/sv/classes.tmpl                        |   54 
 templates/sv/edit-config.tmpl.in                 |   90 
 templates/sv/error-op.tmpl                       |    3 
 templates/sv/error.tmpl                          |    3 
 templates/sv/header.tmpl.in                      |   63 
 templates/sv/help-header.tmpl                    |   47 
 templates/sv/help-printable.tmpl                 |   11 
 templates/sv/job-cancel.tmpl                     |    1 
 templates/sv/job-hold.tmpl                       |    1 
 templates/sv/job-move.tmpl                       |   22 
 templates/sv/job-moved.tmpl                      |    2 
 templates/sv/job-release.tmpl                    |    1 
 templates/sv/job-restart.tmpl                    |    1 
 templates/sv/jobs-header.tmpl                    |   15 
 templates/sv/jobs.tmpl                           |   42 
 templates/sv/maintenance.tmpl                    |    2 
 templates/sv/modify-class.tmpl                   |   34 
 templates/sv/modify-printer.tmpl                 |   29 
 templates/sv/option-boolean.tmpl                 |    6 
 templates/sv/option-conflict.tmpl                |    7 
 templates/sv/option-header.tmpl                  |    3 
 templates/sv/option-pickmany.tmpl                |    6 
 templates/sv/option-pickone.tmpl                 |    6 
 templates/sv/option-trailer.tmpl                 |    5 
 templates/sv/pager.tmpl                          |    7 
 templates/sv/printer-accept.tmpl                 |    3 
 templates/sv/printer-added.tmpl                  |    1 
 templates/sv/printer-configured.tmpl             |    1 
 templates/sv/printer-confirm.tmpl                |    7 
 templates/sv/printer-default.tmpl                |    7 
 templates/sv/printer-deleted.tmpl                |    1 
 templates/sv/printer-jobs-header.tmpl            |    1 
 templates/sv/printer-modified.tmpl               |    1 
 templates/sv/printer-purge.tmpl                  |    3 
 templates/sv/printer-reject.tmpl                 |    3 
 templates/sv/printer-start.tmpl                  |    3 
 templates/sv/printer-stop.tmpl                   |    3 
 templates/sv/printers-header.tmpl                |    1 
 templates/sv/printers.tmpl                       |   64 
 templates/sv/restart.tmpl                        |    1 
 templates/sv/samba-export.tmpl                   |   55 
 templates/sv/samba-exported.tmpl                 |    1 
 templates/sv/search.tmpl                         |   13 
 templates/sv/set-printer-options-header.tmpl     |    3 
 templates/sv/set-printer-options-trailer.tmpl    |    1 
 templates/sv/test-page.tmpl                      |    2 
 templates/sv/trailer.tmpl                        |   21 
 templates/sv/users.tmpl                          |   26 
 test/ipptest.c                                   |  109 
 176 files changed, 8299 insertions(+), 671 deletions(-)

--- NEW FILE cups-rc2-5446.patch ---
Index: packaging/cups.spec.in
===================================================================
--- packaging/cups.spec.in	(revision 5384)
+++ packaging/cups.spec.in	(working copy)
@@ -86,6 +86,11 @@
 Group: System Environment/Daemons
 Requires: %{name} = %{epoch}:%{version}
 
+%package sv
+Summary: Common UNIX Printing System - Swedish support
+Group: System Environment/Daemons
+Requires: %{name} = %{epoch}:%{version}
+
 %if %{?_with_php:1}%{!?_with_php:0}
 %package php
 Summary: Common UNIX Printing System - PHP support
@@ -120,6 +125,10 @@
 The Common UNIX Printing System provides a portable printing layer for 
 UNIX? operating systems. This package provides Japanese support.
 
+%description sv
+The Common UNIX Printing System provides a portable printing layer for 
+UNIX? operating systems. This package provides Swedish support.
+
 %if %{?_with_php:1}%{!?_with_php:0}
 %description php
 The Common UNIX Printing System provides a portable printing layer for 
@@ -230,6 +239,7 @@
 /usr/lib/cups/backend/parallel
 /usr/lib/cups/backend/scsi
 /usr/lib/cups/backend/serial
+/usr/lib/cups/backend/snmp
 /usr/lib/cups/backend/socket
 /usr/lib/cups/backend/usb
 %dir /usr/lib/cups/cgi-bin
@@ -372,6 +382,16 @@
 /usr/share/cups/templates/ja/*
 /usr/share/locale/ja/cups_ja.po
 
+%files sv
+%defattr(-,root,root)
+%dir /usr/share/doc/cups/sv
+/usr/share/doc/cups/sv/index.html
+%dir /usr/share/doc/cups/sv/images
+/usr/share/doc/cups/sv/images/*
+%dir /usr/share/cups/templates/sv
+/usr/share/cups/templates/sv/*
+/usr/share/locale/sv/cups_sv.po
+
 %if %{?_with_php:1}%{!?_with_php:0}
 %files php
 # PHP
Index: packaging/cups.list.in
===================================================================
--- packaging/cups.list.in	(revision 5384)
+++ packaging/cups.list.in	(working copy)
@@ -103,6 +103,9 @@
 %subpackage ja
 %description Common UNIX Printing System - Japanese support
 
+%subpackage sv
+%description Common UNIX Printing System - Swedish support
+
 %subpackage
 
 
@@ -190,12 +193,13 @@
 
 d 0755 root sys $SERVERBIN -
 d 0755 root sys $SERVERBIN/backend -
-f 0755 root sys $SERVERBIN/backend/ipp backend/ipp
-l 0755 root sys $SERVERBIN/backend/http ipp
-f 0755 root sys $SERVERBIN/backend/lpd backend/lpd
+f 0700 root sys $SERVERBIN/backend/ipp backend/ipp
+l 0700 root sys $SERVERBIN/backend/http ipp
+f 0700 root sys $SERVERBIN/backend/lpd backend/lpd
 f 0755 root sys $SERVERBIN/backend/parallel backend/parallel
 f 0755 root sys $SERVERBIN/backend/scsi backend/scsi
 f 0755 root sys $SERVERBIN/backend/serial backend/serial
+f 0755 root sys $SERVERBIN/backend/snmp backend/snmp
 f 0755 root sys $SERVERBIN/backend/socket backend/socket
 f 0755 root sys $SERVERBIN/backend/usb backend/usb
 d 0755 root sys $SERVERBIN/cgi-bin -
@@ -334,6 +338,8 @@
 f 0644 root sys $LOCALEDIR/es/cups_es.po locale/cups_es.po
 %subpackage ja
 f 0644 root sys $LOCALEDIR/ja/cups_ja.po locale/cups_ja.po
+%subpackage sv
+f 0644 root sys $LOCALEDIR/sv/cups_sv.po locale/cups_sv.po
 %subpackage
 
 d 0755 root sys $DATADIR -
@@ -395,6 +401,9 @@
 %subpackage ja
 d 0755 root sys $DATADIR/templates/ja
 f 0644 root sys $DATADIR/templates/ja templates/ja/*.tmpl
+%subpackage sv
+d 0755 root sys $DATADIR/templates/sv
+f 0644 root sys $DATADIR/templates/sv templates/sv/*.tmpl
 %subpackage
 
 # Config files
@@ -403,8 +412,8 @@
 d 0755 root $CUPS_GROUP $SERVERROOT/ppd -
 c $CUPS_PERM root $CUPS_GROUP $SERVERROOT conf/*.conf
 f $CUPS_PERM root $CUPS_GROUP $SERVERROOT/cupsd.conf.default conf/cupsd.conf
-f $CUPS_PERM root $CUPS_GROUP $SERVERROOT/mime.convs conf/mime.convs
-f $CUPS_PERM root $CUPS_GROUP $SERVERROOT/mime.types conf/mime.types
+f 0644 root $CUPS_GROUP $SERVERROOT/mime.convs conf/mime.convs
+f 0644 root $CUPS_GROUP $SERVERROOT/mime.types conf/mime.types
 
 %if PAMDIR
 d 0755 root sys $PAMDIR -
@@ -468,6 +477,11 @@
 f 0644 root sys $DOCDIR/ja doc/ja/*.html
 d 0755 root sys $DOCDIR/ja/images -
 f 0644 root sys $DOCDIR/ja/images doc/ja/images/*.gif
+%subpackage sv
+d 0755 root sys $DOCDIR/sv
+f 0644 root sys $DOCDIR/sv doc/sv/*.html
+d 0755 root sys $DOCDIR/sv/images -
+f 0644 root sys $DOCDIR/sv/images doc/sv/images/*.gif
 %subpackage
 
 # Man pages
Index: conf/mime.types
===================================================================
--- conf/mime.types	(revision 5384)
+++ conf/mime.types	(working copy)
@@ -147,7 +147,9 @@
 
 application/vnd.cups-command	string(0,'#CUPS-COMMAND')
 application/vnd.cups-form	string(0,"<CUPSFORM>")
+application/vnd.cups-pdf
 application/vnd.cups-postscript
+application/vnd.cups-ppd	ppd string(0,"*PPD-Adobe:")
 application/vnd.cups-raster	string(0,"RaSt") string(0,"tSaR")
 application/vnd.cups-raw	(string(0,<1B>E) + !string(2,<1B>%0B)) \
 				string(0,<1B>@) \
@@ -159,12 +161,10 @@
 #
 # Raw print file support...
 #
-# Uncomment the following type and the application/octet-stream
-# filter line in mime.convs to allow raw file printing without the
-# -oraw option.
+# Comment the following type to prevent raw file printing.
 #
 
-#application/octet-stream
+application/octet-stream
 
 #
 # End of "$Id$".
Index: conf/Makefile
===================================================================
--- conf/Makefile	(revision 5384)
+++ conf/Makefile	(working copy)
@@ -74,8 +74,7 @@
 		if test -r $(SERVERROOT)/$$file ; then \
 			$(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
 		fi ; \
-		$(INSTALL_CONFIG) $$file $(SERVERROOT) ; \
-		chgrp $(CUPS_GROUP) $(SERVERROOT)/$$file || true; \
+		$(INSTALL_DATA) $$file $(SERVERROOT) ; \
 	done
 	-if test x$(PAMDIR) != x; then \
 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \
Index: conf/mime.convs
===================================================================
--- conf/mime.convs	(revision 5384)
+++ conf/mime.convs	(working copy)
@@ -107,9 +107,8 @@
 #
 # Raw filter...
 #
-# Uncomment the following filter and the application/octet-stream type
-# in mime.types to allow printing of arbitrary files without the -oraw
-# option.
+# Uncomment the following filter to allow printing of arbitrary files
+# without the -oraw option.
 #
 
 #application/octet-stream	application/vnd.cups-raw	0	-
Index: backend/Dependencies
===================================================================
--- backend/Dependencies	(revision 5384)
+++ backend/Dependencies	(working copy)
@@ -19,6 +19,11 @@
 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
[...11057 lines suppressed...]
@@ -106,15 +115,6 @@
     mimeDeleteType(mime, type);
 
  /*
-  * Loop through filters and free them...
-  */
-
-  for (filter = (mime_filter_t *)cupsArrayFirst(mime->filters);
-       filter;
-       filter = (mime_filter_t *)cupsArrayNext(mime->filters))
-    mimeDeleteFilter(mime, filter);
-
- /*
   * Free the types and filters arrays, and then the MIME database structure.
   */
 
Index: driver/testdriver.c
===================================================================
--- driver/testdriver.c	(revision 0)
+++ driver/testdriver.c	(revision 5446)
@@ -0,0 +1,179 @@
+/*
+ * "$Id$"
+ *
+ *   Sample/test driver interface program for the Common UNIX Printing
+ *   System (CUPS).
+ *
+ *   This program handles listing and installing both static PPD files
+ *   in CUPS_DATADIR/model and dynamically generated PPD files using
+ *   the driver helper programs in CUPS_SERVERBIN/driver.
+ *
+ *   Copyright 1997-2006 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
+ *
+ * Contents:
+ *
+ *   main()      - Enumerate or display PPD files.
+ *   cat_ppd()   - Display a PPD file.
+ *   list_ppds() - List PPDs.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+
+/*
+ * Local functions...
+ */
+
+static int	cat_ppd(const char *uri);
+static int	list_ppds(const char *name);
+
+
+/*
+ * Sample data...
+ */
+
+static const char *models[][2] =
+		{
+		  { "foojet.ppd", "Foo Printer" },
+		  { "barjet.ppd", "Bar Printer" },
+		  { "foobar.ppd", "Foo/Bar Multifunction Printer" }
+		};
+
+
+/*
+ * 'main()' - Enumerate or display PPD files.
+ */
+
+int					/* O - Exit status */
+main(int  argc,				/* I - Number of command-line args */
+     char *argv[])			/* I - Command-line arguments */
+{
+  if (argc == 2 && !strcmp(argv[1], "list"))
+    return (list_ppds(argv[0]));
+  else if (argc == 3 && !strcmp(argv[1], "cat"))
+    return (cat_ppd(argv[2]));
+
+  fprintf(stderr, "ERROR: Usage: %s cat URI\n", argv[0]);
+  fprintf(stderr, "ERROR: Usage: %s list\n", argv[0]);
+  return (1);
+}
+
+
+/*
+ * 'cat_ppd()' - Display a PPD file.
+ */
+
+static int				/* O - Exit status */
+cat_ppd(const char *uri)		/* I - PPD URI */
+{
+  int		i;			/* Looping var */
+  const char	*name;			/* Pointer to name in URI */
+
+
+  if ((name = strchr(uri, ':')) == NULL)
+  {
+    fprintf(stderr, "ERROR: Bad URI \"%s\"!\n", uri);
+    return (1);
+  }
+
+  name ++;
+
+  for (i = 0 ; i < (int)(sizeof(models) / sizeof(models[0])); i ++)
+    if (!strcmp(name, models[i][0]))
+    {
+     /*
+      * Actually display the PPD file...
+      */
+      puts("*PPD-Adobe: \"4.3\"");
+
+      puts("*LanguageEncoding: ISOLatin1");
+      puts("*LanguageVersion: English");
+      puts("*Manufacturer: \"Test\"");
+      puts("*FileVersion: \"1.0\"");
+      puts("*FormatVersion: \"4.3\"");
+      puts("*PSVersion: \"(3010) 1\"");
+      printf("*PCFileName: \"%s\"\n", models[i][0]);
+
+      printf("*Product: \"(%s)\"\n", models[i][1]);
+      printf("*ModelName: \"Test %s\"\n", models[i][1]);
+      printf("*NickName: \"Test %s\"\n", models[i][1]);
+      printf("*ShortNickName: \"Test %s\"\n", models[i][1]);
+
+      puts("*OpenUI PageSize: PickOne"); 
+      puts("*OrderDependency: 10 AnySetup *PageSetup");
+      puts("*DefaultPageSize: Letter");
+      puts("*PageSize Letter: \"<</PageSize[612 792]>>setpagedevice\"");
+      puts("*PageSize A4: \"<</PageSize[585 842]>>setpagedevice\"");
+      puts("*CloseUI: *PageSize");
+
+      puts("*OpenUI PageRegion: PickOne"); 
+      puts("*OrderDependency: 10 AnySetup *PageRegion");
+      puts("*DefaultPageRegion: Letter");
+      puts("*PageRegion Letter: \"<</PageRegion[612 792]>>setpagedevice\"");
+      puts("*PageRegion A4: \"<</PageRegion[585 842]>>setpagedevice\"");
+      puts("*CloseUI: *PageRegion");
+
+      puts("*DefaultImageableArea: Letter");
+      puts("*ImageableArea Letter: \"0 0 612 792\"");
+      puts("*ImageableArea A4: \"0 0 595 842\"");
+
+      puts("*DefaultPaperDimension: Letter");
+      puts("*PaperDimension Letter: \"612 792\"");
+      puts("*PaperDimension A4: \"595 842\"");
+
+      return (0);
+    }
+
+  fprintf(stderr, "ERROR: Unknown URI \"%s\"!\n", uri);
+  return (1);
+}
+
+
+/*
+ * 'list_ppds()' - List PPDs.
+ */
+
+static int				/* O - Exit status */
+list_ppds(const char *name)		/* I - Program name */
+{
+  int		i;			/* Looping var */
+  const char	*base;			/* Base name of program */
+
+
+  if ((base = strrchr(name, '/')) != NULL)
+    base ++;
+  else
+    base = name;
+
+  for (i = 0; i < (int)(sizeof(models) / sizeof(models[0])); i ++)
+    printf("\"%s:%s\" en \"Test\" \"Test %s\" \"1284 device id\"\n",
+           base, models[i][0], models[i][1]);
+
+  return (0);
+}
+
+
+/*
+ * End of "$Id$".
+ */


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- cups.spec	19 Apr 2006 15:20:53 -0000	1.156
+++ cups.spec	21 Apr 2006 15:40:33 -0000	1.157
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2
-Release: 0.3.%{beta}.1
+Release: 0.3.%{beta}.2
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
@@ -22,12 +22,12 @@
 Source11: cups.conf
 Source12: cups.cron
 Source13: pdftops.conf
+Patch0: cups-rc2-5446.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-kde.patch
 Patch7: cups-banners.patch
 Patch8: cups-logfileperm.patch
 Patch9: cups-1.1.17-rcp.patch
@@ -115,12 +115,12 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{beta}
+%patch0 -p0 -b .rc2-5446
 %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 .kde
 %patch7 -p1 -b .banners
 %patch8 -p1 -b .logfileperm
 %patch9 -p1 -b .rcp
@@ -317,6 +317,7 @@
 %{_docdir}/cups-%{version}/images
 %{_docdir}/cups-%{version}/ja
 %{_docdir}/cups-%{version}/es
+%{_docdir}/cups-%{version}/sv
 %{_docdir}/cups-%{version}/*.css
 %{_docdir}/cups-%{version}/admin
 %{_docdir}/cups-%{version}/classes
@@ -381,6 +382,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Apr 21 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.3.rc2.2
+- Updated to svn 5446.
+
 * Wed Apr 19 2006 Tim Waugh <twaugh at redhat.com>
 - Ignore .rpmnew and .rpmsave banner files.
 


--- cups-kde.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 21 15:46:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 11:46:31 -0400
Subject: rpms/lvm2/devel LVM2.2.02.05.tgz.asc, NONE, 1.1 .cvsignore, 1.32,
	1.33 lvm2.spec, 1.62, 1.63 sources, 1.33, 1.34 upstream, 1.25, 1.26
Message-ID: <200604211546.k3LFkVpl016521@cvs.devel.redhat.com>

Author: agk

Update of /cvs/dist/rpms/lvm2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11484

Modified Files:
	.cvsignore lvm2.spec sources upstream 
Added Files:
	LVM2.2.02.05.tgz.asc 
Log Message:
Fix VG uuid comparisons.



--- NEW FILE LVM2.2.02.05.tgz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQBESPxjIoGRwVZ+LBcRAltkAJ9UR2QQAuYKOtgtfe+WYxXwQic0YwCglL5u
ijZarnu5pFHmAiVFiBGEY5U=
=TeI3
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/lvm2/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	19 Apr 2006 20:11:10 -0000	1.32
+++ .cvsignore	21 Apr 2006 15:46:27 -0000	1.33
@@ -1 +1 @@
-LVM2.2.02.04.tgz
+LVM2.2.02.05.tgz


Index: lvm2.spec
===================================================================
RCS file: /cvs/dist/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- lvm2.spec	19 Apr 2006 20:11:10 -0000	1.62
+++ lvm2.spec	21 Apr 2006 15:46:27 -0000	1.63
@@ -1,6 +1,6 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
-Version: 2.02.04
+Version: 2.02.05
 Release: 1.0
 License: GPL
 Group: System Environment/Base
@@ -66,6 +66,9 @@
 /var/lock/lvm
 
 %changelog
+* Fri Apr 21 2006 Alasdair Kergon <agk at redhat.com> - 2.02.05-1.0
+- Fix VG uuid comparisons.
+
 * Wed Apr 19 2006 Alasdair Kergon <agk at redhat.com> - 2.02.04-1.0
 - New release upstream, including better handling of duplicated VG names.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/lvm2/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	19 Apr 2006 20:11:10 -0000	1.33
+++ sources	21 Apr 2006 15:46:27 -0000	1.34
@@ -1 +1 @@
-954c41c42d3cfa50f12562f197bdd1a0  LVM2.2.02.04.tgz
+87d8615a655b9a6c1a0e234eab2485bf  LVM2.2.02.05.tgz


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/lvm2/devel/upstream,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- upstream	19 Apr 2006 20:11:22 -0000	1.25
+++ upstream	21 Apr 2006 15:46:27 -0000	1.26
@@ -1 +1 @@
-LVM2.2.02.04.tgz
+LVM2.2.02.05.tgz



From fedora-cvs-commits at redhat.com  Fri Apr 21 16:02:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 12:02:34 -0400
Subject: rpms/lvm2/devel lvm2.spec,1.63,1.64
Message-ID: <200604211602.k3LG2YN1031007@cvs.devel.redhat.com>

Author: agk

Update of /cvs/dist/rpms/lvm2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30914

Modified Files:
	lvm2.spec 
Log Message:
build fails without the new dm package



Index: lvm2.spec
===================================================================
RCS file: /cvs/dist/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- lvm2.spec	21 Apr 2006 15:46:27 -0000	1.63
+++ lvm2.spec	21 Apr 2006 16:02:13 -0000	1.64
@@ -7,7 +7,7 @@
 URL: http://sources.redhat.com/lvm2
 Source0: LVM2.%{version}.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: device-mapper >= 1.02.02
+BuildRequires: device-mapper >= 1.02.05
 BuildRequires: libselinux-devel
 BuildRequires: libtermcap-devel
 BuildRequires: ncurses-devel



From fedora-cvs-commits at redhat.com  Fri Apr 21 16:09:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 12:09:51 -0400
Subject: rpms/device-mapper/devel device-mapper.spec,1.31,1.32
Message-ID: <200604211609.k3LG9ppU031415@cvs.devel.redhat.com>

Author: agk

Update of /cvs/dist/rpms/device-mapper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31363

Modified Files:
	device-mapper.spec 
Log Message:
rebuild to try and workaround buildroot dependency



Index: device-mapper.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper/devel/device-mapper.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- device-mapper.spec	19 Apr 2006 19:20:42 -0000	1.31
+++ device-mapper.spec	21 Apr 2006 16:09:46 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: device mapper library
 Name: device-mapper
 Version: 1.02.05
-Release: 1.0
+Release: 1.1
 License: GPL
 Group: System Environment/Base
 URL: http://sources.redhat.com/dm
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Fri Apr 21 2006 Alasdair Kergon <agk at redhat.com> - 1.02.05-1.1
+- Rebuild.
+
 * Wed Apr 19 2006 Alasdair Kergon <agk at redhat.com> - 1.02.05-1.0
 - New upstream release (incorporates patches).
 - Exclude dmeventd (no kernel support yet).



From fedora-cvs-commits at redhat.com  Fri Apr 21 16:16:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 12:16:12 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.668,1.669
Message-ID: <200604211616.k3LGGCE4001786@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1433

Modified Files:
	openoffice.org.spec 
Log Message:
little more


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.668
retrieving revision 1.669
diff -u -r1.668 -r1.669
--- openoffice.org.spec	21 Apr 2006 09:51:42 -0000	1.668
+++ openoffice.org.spec	21 Apr 2006 16:15:57 -0000	1.669
@@ -1486,8 +1486,10 @@
 rm -rf $RPM_BUILD_ROOT/%{instdir}/readmes
 rm -rf $RPM_BUILD_ROOT/%{instdir}/licenses
 
+%if %{gnomeprintui}
 mkdir -p $RPM_BUILD_ROOT/%{instdir}/share/psprint/driver
 cp -r psprint_config/configuration/ppds/SGENPRT.PS $RPM_BUILD_ROOT/%{instdir}/share/psprint/driver/SGENPRT.PS
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From fedora-cvs-commits at redhat.com  Fri Apr 21 17:09:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 13:09:55 -0400
Subject: rpms/bluez-utils/devel bluez-utils-2.25-invalid-timeval.patch, NONE,
	1.1 bluez-utils.spec, 1.42, 1.43
Message-ID: <200604211709.k3LH9t7O009518@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/bluez-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9480

Modified Files:
	bluez-utils.spec 
Added Files:
	bluez-utils-2.25-invalid-timeval.patch 
Log Message:
fix invalid timeval

bluez-utils-2.25-invalid-timeval.patch:
 dbus.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE bluez-utils-2.25-invalid-timeval.patch ---
--- bluez-utils-2.25/hcid/dbus.c~	2006-01-08 02:03:05.000000000 +0000
+++ bluez-utils-2.25/hcid/dbus.c	2006-04-21 18:07:41.000000000 +0100
@@ -54,7 +54,7 @@ static DBusConnection *connection;
 static int default_dev = -1;
 
 #define TIMEOUT				(30 * 1000)		/* 30 seconds */
-#define DBUS_RECONNECT_TIMER		(5 * 1000 * 1000)	/* 5 sec */
+#define DBUS_RECONNECT_TIMER		5			/* 5 sec */
 #define MAX_PATH_LENGTH			64
 #define MAX_CONN_NUMBER			10
 
@@ -1262,12 +1262,12 @@ static void reconnect_timer_start(void)
 	sigaction(SIGALRM, &sa, NULL);
 
 	/* expire after X  msec... */
-	timer.it_value.tv_sec = 0;
-	timer.it_value.tv_usec = DBUS_RECONNECT_TIMER;
+	timer.it_value.tv_sec = DBUS_RECONNECT_TIMER;
+	timer.it_value.tv_usec = 0;
 
 	/* ... and every x msec after that. */
-	timer.it_interval.tv_sec = 0;
-	timer.it_interval.tv_usec = DBUS_RECONNECT_TIMER;
+	timer.it_interval.tv_sec = DBUS_RECONNECT_TIMER;
+	timer.it_interval.tv_usec = 0;
 
 	setitimer(ITIMER_REAL, &timer, NULL);
 }


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- bluez-utils.spec	18 Apr 2006 01:08:13 -0000	1.42
+++ bluez-utils.spec	21 Apr 2006 17:09:43 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
 Version: 2.25
-Release: 6
+Release: 7
 License: GPL
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -15,6 +15,7 @@
 Source9: bluetooth.conf
 Patch0: bluez-utils-2.3-conf.patch
 Patch1: bluez-utils-2.25-poll-timeout.patch
+Patch2: bluez-utils-2.25-invalid-timeval.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
 BuildRequires: bluez-libs-devel >= %{version}
@@ -54,6 +55,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 aclocal
@@ -119,6 +121,9 @@
 %{_libdir}/cups/backend/bluetooth
 
 %changelog
+* Fri Apr 21 2006 David Woodhouse <dwmw2 at redhat.com> - 2.25-7
+- Fix invalid timeval in reconnect_timer_start()
+
 * Mon Apr 17 2006 Peter Jones <pjones at redhat.com> - 2.25-6
 - Clean up initscripts.
 - Clean up specfile.



From fedora-cvs-commits at redhat.com  Fri Apr 21 17:42:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 13:42:18 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2147,
	1.2148 linux-2.6-sata-promise-pata-ports.patch, 1.1, 1.2
Message-ID: <200604211742.k3LHgIFN031340@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31261

Modified Files:
	kernel-2.6.spec linux-2.6-sata-promise-pata-ports.patch 
Log Message:
make pata on promise-sata work again



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2147
retrieving revision 1.2148
diff -u -r1.2147 -r1.2148
--- kernel-2.6.spec	21 Apr 2006 03:49:37 -0000	1.2147
+++ kernel-2.6.spec	21 Apr 2006 17:42:16 -0000	1.2148
@@ -986,7 +986,7 @@
 %patch2104 -p1
 
 # Enable PATA ports on Promise SATA.
-#%patch2200 -p1
+%patch2200 -p1
 # Silence silly SATA printk.
 %patch2201 -p1
 # Fix AHCI Suspend.
@@ -1663,6 +1663,9 @@
 %endif
 
 %changelog
+* Fri Apr 21 2006 Dave Jones <davej at redhat.com>
+- Make Promise PATA on SATA work again (thanks Jim Bevier)
+
 * Thu Apr 20 2006 Dave Jones <davej at redhat.com>
 - 2.6.17rc2-git3
 - Make AHCI suspend/resume work.

linux-2.6-sata-promise-pata-ports.patch:
 drivers/scsi/libata-core.c  |    1 
 drivers/scsi/sata_promise.c |   52 ++++++++++++++++++++++++++++++++++++++------
 include/linux/libata.h      |    1 
 3 files changed, 48 insertions(+), 6 deletions(-)

Index: linux-2.6-sata-promise-pata-ports.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-sata-promise-pata-ports.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-sata-promise-pata-ports.patch	2 Mar 2006 04:47:18 -0000	1.1
+++ linux-2.6-sata-promise-pata-ports.patch	21 Apr 2006 17:42:16 -0000	1.2
@@ -22,7 +22,7 @@
 diff -Nru a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
 --- a/drivers/scsi/sata_promise.c	2006-02-08 10:08:08.000000000 -0700
 +++ b/drivers/scsi/sata_promise.c	2006-02-08 11:26:47.000000000 -0700
-@@ -165,7 +165,7 @@
+@@ -172,7 +172,7 @@
  	/* board_2037x */
  	{
  		.sht		= &pdc_ata_sht,
@@ -31,7 +31,7 @@
  		.pio_mask	= 0x1f, /* pio0-4 */
  		.mwdma_mask	= 0x07, /* mwdma0-2 */
  		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */
-@@ -322,15 +322,34 @@
+@@ -360,15 +360,34 @@
  
  static void pdc_sata_phy_reset(struct ata_port *ap)
  {
@@ -70,7 +70,7 @@
  
  	pdc_reset_port(ap);
  	ata_port_probe(ap);
-@@ -646,6 +665,7 @@
+@@ -673,6 +692,7 @@
  	unsigned int board_idx = (unsigned int) ent->driver_data;
  	int pci_dev_busy = 0;
  	int rc;
@@ -78,7 +78,7 @@
  
  	if (!printed_version++)
  		dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
-@@ -705,6 +725,9 @@
+@@ -741,6 +761,9 @@
  	probe_ent->port[0].scr_addr = base + 0x400;
  	probe_ent->port[1].scr_addr = base + 0x500;
  
@@ -88,7 +88,7 @@
  	/* notice 4-port boards */
  	switch (board_idx) {
  	case board_20319:
-@@ -715,9 +738,23 @@
+@@ -755,13 +778,27 @@
  
  		probe_ent->port[2].scr_addr = base + 0x600;
  		probe_ent->port[3].scr_addr = base + 0x700;
@@ -96,6 +96,10 @@
 +		probe_ent->port_flags[2] = ATA_FLAG_SATA;	/* pata fix */
 +		probe_ent->port_flags[3] = ATA_FLAG_SATA;	/* pata fix */
  		break;
+	case board_2057x:
+		/* Override hotplug offset for SATAII150 */
+		hp->hotplug_offset = PDC2_SATA_PLUG_CSR;
+		/* Fall through */
  	case board_2037x:
 -		probe_ent->n_ports = 2;
 +/*		probe_ent->n_ports = 2; */			/* pata fix */
@@ -113,7 +117,7 @@
  		break;
  	case board_20771:
  		probe_ent->n_ports = 2;
-@@ -730,6 +767,9 @@
+@@ -774,6 +811,9 @@
  
  		probe_ent->port[2].scr_addr = base + 0x600;
  		probe_ent->port[3].scr_addr = base + 0x700;
@@ -126,11 +130,12 @@
 diff -Nru a/include/linux/libata.h b/include/linux/libata.h
 --- a/include/linux/libata.h	2006-02-08 11:40:54.000000000 -0700
 +++ b/include/linux/libata.h	2006-02-08 11:45:02.000000000 -0700
-@@ -237,6 +237,7 @@
+@@ -281,6 +281,7 @@
  	unsigned long		irq;
  	unsigned int		irq_flags;
  	unsigned long		host_flags;
 +	unsigned long		port_flags[ATA_MAX_PORTS];	/* pata fix */
+	unsigned long		host_set_flags;
  	void __iomem		*mmio_base;
  	void			*private_data;
  };



From fedora-cvs-commits at redhat.com  Fri Apr 21 18:11:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 14:11:10 -0400
Subject: rpms/kernel/devel patch-2.6.17-rc2-git4.bz2.sign, NONE,
	1.1 .cvsignore, 1.411, 1.412 kernel-2.6.spec, 1.2148,
	1.2149 sources, 1.353, 1.354 upstream, 1.324,
	1.325 linux-2.6-softmac-assoc-events.patch, 1.1,
	NONE patch-2.6.17-rc2-git3.bz2.sign, 1.1, NONE
Message-ID: <200604211811.k3LIBA1q028155@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28141

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17-rc2-git4.bz2.sign 
Removed Files:
	linux-2.6-softmac-assoc-events.patch 
	patch-2.6.17-rc2-git3.bz2.sign 
Log Message:
git4



--- NEW FILE patch-2.6.17-rc2-git4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBESIOnyGugalF9Dw4RAu4oAJ9pc7AYs4QpeCJ56lUjNmQWbSsNEQCfTwg1
XO9r1RgSETniUnbbMjnnL7k=
=tpHe
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -r1.411 -r1.412
--- .cvsignore	20 Apr 2006 21:57:25 -0000	1.411
+++ .cvsignore	21 Apr 2006 18:11:03 -0000	1.412
@@ -4,4 +4,4 @@
 linux-2.6.16.tar.bz2
 xen-20060413.tar.bz2
 patch-2.6.17-rc2.bz2
-patch-2.6.17-rc2-git3.bz2
+patch-2.6.17-rc2-git4.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2148
retrieving revision 1.2149
diff -u -r1.2148 -r1.2149
--- kernel-2.6.spec	21 Apr 2006 17:42:16 -0000	1.2148
+++ kernel-2.6.spec	21 Apr 2006 18:11:05 -0000	1.2149
@@ -213,7 +213,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.17-rc2.bz2
-Patch2: patch-2.6.17-rc2-git3.bz2
+Patch2: patch-2.6.17-rc2-git4.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -372,7 +372,6 @@
 
 # Broadcom wireless driver
 Patch5001: linux-2.6-bcm43xx-assoc-on-startup.patch
-Patch5002: linux-2.6-softmac-assoc-events.patch
 
 #
 # 10000 to 20000 is for stuff that has to come last due to the
@@ -1005,9 +1004,6 @@
 
 # Attempt to associate when the link is brought up
 %patch5001 -p1
-# Send standard events on {dis,}association
-%patch5002 -p1
-
 
 #
 # final stuff
@@ -1665,6 +1661,7 @@
 %changelog
 * Fri Apr 21 2006 Dave Jones <davej at redhat.com>
 - Make Promise PATA on SATA work again (thanks Jim Bevier)
+- 2.6.17rc2-git4
 
 * Thu Apr 20 2006 Dave Jones <davej at redhat.com>
 - 2.6.17rc2-git3


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- sources	20 Apr 2006 21:57:25 -0000	1.353
+++ sources	21 Apr 2006 18:11:06 -0000	1.354
@@ -1,4 +1,4 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 e8e055329db3aad40a010ded0f8bdcf9  xen-20060413.tar.bz2
 87c4ea50e1b25ad808b65ad3fb19a9b5  patch-2.6.17-rc2.bz2
-5a437ea8f057b170e649cd321b6238f7  patch-2.6.17-rc2-git3.bz2
+099f428dd7e24a7ee5203b693c1d9b55  patch-2.6.17-rc2-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -r1.324 -r1.325
--- upstream	20 Apr 2006 21:57:25 -0000	1.324
+++ upstream	21 Apr 2006 18:11:06 -0000	1.325
@@ -1,3 +1,3 @@
 linux-2.6.16.tar.bz2
 patch-2.6.17-rc2.bz2
-patch-2.6.17-rc2-git3.bz2
+patch-2.6.17-rc2-git4.bz2


--- linux-2.6-softmac-assoc-events.patch DELETED ---


--- patch-2.6.17-rc2-git3.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 21 18:16:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 14:16:14 -0400
Subject: rpms/gnome-vfs2/FC-5 gnome-vfs2.spec,1.102,1.103 sources,1.30,1.31
Message-ID: <200604211816.k3LIGELV030780@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-vfs2/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv28475

Modified Files:
	gnome-vfs2.spec sources 
Log Message:
2.14.1



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/FC-5/gnome-vfs2.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- gnome-vfs2.spec	15 Mar 2006 19:05:11 -0000	1.102
+++ gnome-vfs2.spec	21 Apr 2006 18:16:12 -0000	1.103
@@ -8,10 +8,10 @@
 %define gnome_mount_version 0.4
 %define glib2_version 2.9.3
 
-Summary: The GNOME virtual file-system libraries.
+Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
-Version: 2.14.0
-Release: 2
+Version: 2.14.1
+Release: 1.fc5.1
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -21,6 +21,7 @@
 Requires:      gnome-mime-data >= %{gnome_mime_data_version}
 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}
@@ -29,6 +30,9 @@
 BuildRequires: popt, bzip2-devel, ORBit2-devel, openjade
 BuildRequires: pkgconfig
 BuildRequires: /usr/bin/automake-1.9
+BuildRequires: libtool
+BuildRequires: intltool
+BuildRequires: autoconf
 BuildRequires: gtk-doc >= %{gtkdoc_version}
 BuildRequires: perl-XML-Parser >= %{perl_XML_Parser_version}
 BuildRequires: samba-common >= %{samba_version}
@@ -37,7 +41,6 @@
 BuildRequires: avahi-glib-devel >= 0.6
 BuildRequires: hal-devel >= 0.5.0
 BuildRequires: gnome-mount-devel >= %{gnome_mount_version} 
-Prereq: GConf2 >= %{gconf2_version}
 
 Patch3: gnome-vfs-2.9.90-modules-conf.patch
 
@@ -58,9 +61,9 @@
 library, and other features.
 
 %package devel
-Summary: Libraries and include files for developing GNOME VFS applications.
+Summary: Libraries and include files for developing GNOME VFS applications
 Group: Development/Libraries
-Requires:   %{name} = %{version}
+Requires:   %{name} = %{version}-%{release}
 Requires:   GConf2-devel >= %{gconf2_version}
 Requires:   libbonobo-devel >= %{libbonobo_version}
 Conflicts: bonobo-devel < 1.0.8
@@ -73,7 +76,7 @@
 %package smb
 Summary: Windows fileshare support for gnome-vfs
 Group: System Environment/Libraries
-Requires:   %{name} = %{version}
+Requires:   %{name} = %{version}-%release}
 Requires: samba-common >= %{samba_version}
 Obsoletes:     gnome-vfs2-extras
 Provides:     gnome-vfs2-extras
@@ -101,6 +104,7 @@
 fi
 
 # auto* update needed for gnome-vfs-avahi.patch
+intltoolize --force
 libtoolize --force
 aclocal
 autoheader
@@ -114,7 +118,7 @@
 make LIBTOOL=/usr/bin/libtool
 
 %install
-rm -fr %{buildroot}
+rm -fr $RPM_BUILD_ROOT
 
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 export tagname=CC
@@ -137,14 +141,13 @@
 rm -fr %{buildroot}
 
 %post
-
+/sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 SCHEMAS="system_http_proxy.schemas system_dns_sd.schemas system_smb.schemas desktop_gnome_url_handlers.schemas desktop_default_applications.schemas"
 for S in $SCHEMAS; do
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
 done
 
-/sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
@@ -182,6 +185,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Thu Apr 20 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
+- update to 2.14.1
+
 * Wed Mar 15 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-2
 - don't try to install a schema we don't ship anymore (bug 185549)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/FC-5/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	13 Mar 2006 13:48:56 -0000	1.30
+++ sources	21 Apr 2006 18:16:12 -0000	1.31
@@ -1 +1 @@
-f45ff7d95f7adf49d5abe13f744f5545  gnome-vfs-2.14.0.tar.bz2
+d7ba7e667b46b5929b3e277a8b870868  gnome-vfs-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr 21 19:46:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 15:46:24 -0400
Subject: rpms/lftp/devel .cvsignore, 1.24, 1.25 lftp.spec, 1.44, 1.45 sources,
	1.24, 1.25
Message-ID: <200604211946.k3LJkOmQ004139@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/lftp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3688

Modified Files:
	.cvsignore lftp.spec sources 
Log Message:
upgrade to upstream version 3.4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	16 Mar 2006 23:32:00 -0000	1.24
+++ .cvsignore	21 Apr 2006 19:46:22 -0000	1.25
@@ -14,3 +14,4 @@
 lftp-3.4.2.tar.bz2
 lftp-3.4.3.tar.gz
 lftp-3.4.3.tar.bz2
+lftp-3.4.4.tar.bz2


Index: lftp.spec
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- lftp.spec	16 Mar 2006 23:32:00 -0000	1.44
+++ lftp.spec	21 Apr 2006 19:46:22 -0000	1.45
@@ -1,6 +1,6 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
-Version: 	3.4.3
+Version: 	3.4.4
 Release: 	1
 License: 	GPL
 Group: 		Applications/Internet
@@ -84,6 +84,9 @@
 %{_libdir}/lftp/%{version}/proto-sftp.so
 
 %changelog
+* Fri Apr 21 2006 Jason Vas Dias <jvdias at redhat.com> - 3.4.4-1
+- Upgrade to upstream version 3.4.4
+
 * Thu Mar 16 2006 Jason Vas Dias <jvdias at redhat.com> - 3.4.3-1
 - Upgrade to upstream version 3.4.3
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	16 Mar 2006 23:32:00 -0000	1.24
+++ sources	21 Apr 2006 19:46:22 -0000	1.25
@@ -1,3 +1 @@
-a572a3ab4490a58bb10b51ef97ef5c30  lftp-3.4.2.tar.bz2
-23ba6191cf33b749a99c236733f8ba7f  lftp-3.4.3.tar.gz
-87c58c1b94f5d5095c24dbf235ad0aef  lftp-3.4.3.tar.bz2
+84af5617bba109b18b5d5f28f55d26e9  lftp-3.4.4.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr 21 19:48:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 15:48:30 -0400
Subject: rpms/lftp/devel lftp.spec,1.45,1.46
Message-ID: <200604211948.k3LJmUCZ014467@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/lftp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14439

Modified Files:
	lftp.spec 
Log Message:
upgrade to upstream version 3.4.4


Index: lftp.spec
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- lftp.spec	21 Apr 2006 19:46:22 -0000	1.45
+++ lftp.spec	21 Apr 2006 19:48:27 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
 Version: 	3.4.4
-Release: 	1
+Release: 	1.FC6
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	http://ftp.yars.free.net/lftp/lftp-%{version}.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr 21 20:12:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 16:12:16 -0400
Subject: rpms/lftp/FC-5 .cvsignore, 1.23, 1.24 lftp.spec, 1.43, 1.44 sources,
	1.23, 1.24
Message-ID: <200604212012.k3LKCGvY019787@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/lftp/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19740

Modified Files:
	.cvsignore lftp.spec sources 
Log Message:
upgrade to upstream version 3.4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/lftp/FC-5/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	8 Feb 2006 16:19:09 -0000	1.23
+++ .cvsignore	21 Apr 2006 20:12:12 -0000	1.24
@@ -12,3 +12,6 @@
 lftp-3.4.0.tar.bz2.asc
 lftp-3.4.1.tar.bz2
 lftp-3.4.2.tar.bz2
+lftp-3.4.3.tar.gz
+lftp-3.4.3.tar.bz2
+lftp-3.4.4.tar.bz2


Index: lftp.spec
===================================================================
RCS file: /cvs/dist/rpms/lftp/FC-5/lftp.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- lftp.spec	10 Mar 2006 06:03:08 -0000	1.43
+++ lftp.spec	21 Apr 2006 20:12:12 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
-Version: 	3.4.2
-Release: 	5
+Version: 	3.4.4
+Release: 	1.FC5
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	http://ftp.yars.free.net/lftp/lftp-%{version}.tar.bz2
@@ -13,8 +13,6 @@
 Patch2:		lftp-3.4.1-dont_core.patch
 Patch181694:    lftp-3.4.2-fix-redirect-coredump.patch
 
-#%define debug_package %{nil}
-
 %description
 LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job
 control and uses the readline library for input. It has bookmarks, built-in
@@ -27,7 +25,8 @@
 #^- now fixed upstream
 #%patch2 -p1 -b .dont_core
 #^- now fixed upstream
-%patch181694 -p1 -b .bz181694
+#%patch181694 -p1 -b .bz181694
+#^- now fixed upstream
 
 %build
 if pkg-config openssl ; then
@@ -39,6 +38,11 @@
 export tagname=CC
 make LIBTOOL=%{_bindir}/libtool
 
+%{?!DEBUG:  %define DEBUG 0}
+%if %{DEBUG}
+%define debug_package %{nil}
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 export tagname=CC
@@ -49,8 +53,11 @@
 # Remove files from $RPM_BUILD_ROOT that we aren't shipping.
 rm -f $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.a
 %find_lang %{name}
-#/usr/lib/rpm/brp-compress
-#exit 0
+%if %{DEBUG}
+/usr/lib/rpm/brp-compress
+exit 0
+%endif
+:;
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -77,6 +84,12 @@
 %{_libdir}/lftp/%{version}/proto-sftp.so
 
 %changelog
+* Fri Apr 21 2006 Jason Vas Dias <jvdias at redhat.com> - 3.4.4-1
+- Upgrade to upstream version 3.4.4
+
+* Thu Mar 16 2006 Jason Vas Dias <jvdias at redhat.com> - 3.4.3-1
+- Upgrade to upstream version 3.4.3
+
 * Fri Mar 10 2006 Bill Nottingham <notting at redhat.com> - 3.4.2-5
 - rebuild for ppc TLS issue (#184446)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/lftp/FC-5/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	8 Feb 2006 16:19:09 -0000	1.23
+++ sources	21 Apr 2006 20:12:12 -0000	1.24
@@ -1 +1 @@
-a572a3ab4490a58bb10b51ef97ef5c30  lftp-3.4.2.tar.bz2
+84af5617bba109b18b5d5f28f55d26e9  lftp-3.4.4.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr 21 20:45:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 16:45:41 -0400
Subject: rpms/gcc/devel gcc41-pr26769.patch, NONE, 1.1 gcc41-rh137200.patch,
	NONE, 1.1 gcc41-rh187450.patch, NONE, 1.1 gcc41-tests.patch,
	NONE, 1.1 .cvsignore, 1.145, 1.146 gcc41-ada-pr18302.patch,
	1.2, 1.3 gcc41-ppc64-ldouble-stdarg.patch, 1.1, 1.2 gcc41.spec,
	1.52, 1.53 sources, 1.147, 1.148 gcc41-pr24685.patch, 1.1,
	NONE gcc41-rh188649-test.patch, 1.1, NONE
Message-ID: <200604212045.k3LKjfbp009551@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9452

Modified Files:
	.cvsignore gcc41-ada-pr18302.patch 
	gcc41-ppc64-ldouble-stdarg.patch gcc41.spec sources 
Added Files:
	gcc41-pr26769.patch gcc41-rh137200.patch gcc41-rh187450.patch 
	gcc41-tests.patch 
Removed Files:
	gcc41-pr24685.patch gcc41-rh188649-test.patch 
Log Message:
4.1.0-10


gcc41-pr26769.patch:
 gcc/fortran/iresolve.c                |    7 
 libgfortran/Makefile.am               |    2 
 libgfortran/Makefile.in               |   16 +-
 libgfortran/generated/reshape_r16.c   |  268 ++++++++++++++++++++++++++++++++++
 libgfortran/generated/transpose_r16.c |  104 +++++++++++++
 5 files changed, 390 insertions(+), 7 deletions(-)

--- NEW FILE gcc41-pr26769.patch ---
2006-04-21  Jakub Jelinek  <jakub at redhat.com>

	PR fortran/26769
	* iresolve.c (gfc_resolve_reshape): Use reshape_r16 for real(16).
	(gfc_resolve_transpose): Use transpose_r16 for real(16).

	* Makefile.am (i_transpose_c): Add generated/transpose_r16.c.
	(i_reshape_c): Add generated/reshape_r16.c.
	* Makefile.in: Regenerated.
	* generated/transpose_r16.c: Generated new file.
	* generated/redhape_r16.c: Generated new file.

--- gcc/fortran/iresolve.c.jj	2006-04-03 11:47:08.000000000 +0200
+++ gcc/fortran/iresolve.c	2006-04-21 12:42:02.000000000 +0200
@@ -1520,7 +1520,7 @@ gfc_resolve_reshape (gfc_expr * f, gfc_e
 	f->value.function.name =
 	  gfc_get_string (PREFIX("reshape_%c%d"),
 			  gfc_type_letter (BT_COMPLEX), source->ts.kind);
-      else if (source->ts.type == BT_REAL && kind == 10)
+      else if (source->ts.type == BT_REAL && (kind == 10 || kind == 16))
 	f->value.function.name =
 	  gfc_get_string (PREFIX("reshape_%c%d"),
 			  gfc_type_letter (BT_REAL), source->ts.kind);
@@ -1994,9 +1994,10 @@ gfc_resolve_transpose (gfc_expr * f, gfc
           break;
 
         case BT_REAL:
-	  /* There is no kind=10 integer type.  We need to
+	  /* There is no kind=10 integer type and on 32-bit targets
+	     there is usually no kind=16 integer type.  We need to
 	     call the real version.  */
-	  if (kind == 10)
+	  if (kind == 10 || kind == 16)
 	    {
 	      f->value.function.name =
 		gfc_get_string (PREFIX("transpose_r%d"), kind);
--- libgfortran/Makefile.am.jj	2006-03-27 14:21:37.000000000 +0200
+++ libgfortran/Makefile.am	2006-04-21 12:16:26.000000000 +0200
@@ -313,6 +313,7 @@ generated/transpose_i4.c \
 generated/transpose_i8.c \
 generated/transpose_i16.c \
 generated/transpose_r10.c \
+generated/transpose_r16.c \
 generated/transpose_c4.c \
 generated/transpose_c8.c \
 generated/transpose_c10.c \
@@ -328,6 +329,7 @@ generated/reshape_i4.c \
 generated/reshape_i8.c \
 generated/reshape_i16.c \
 generated/reshape_r10.c \
+generated/reshape_r16.c \
 generated/reshape_c4.c \
 generated/reshape_c8.c \
 generated/reshape_c10.c \
--- libgfortran/Makefile.in.jj	2006-03-27 14:21:37.000000000 +0200
+++ libgfortran/Makefile.in	2006-04-21 12:18:43.000000000 +0200
@@ -123,15 +123,15 @@ am__objects_16 = matmul_i4.lo matmul_i8.
 	matmul_c8.lo matmul_c10.lo matmul_c16.lo
 am__objects_17 = matmul_l4.lo matmul_l8.lo matmul_l16.lo
 am__objects_18 = transpose_i4.lo transpose_i8.lo transpose_i16.lo \
-	transpose_r10.lo transpose_c4.lo transpose_c8.lo \
-	transpose_c10.lo transpose_c16.lo
+	transpose_r10.lo transpose_r16.lo transpose_c4.lo \
+	transpose_c8.lo transpose_c10.lo transpose_c16.lo
 am__objects_19 = shape_i4.lo shape_i8.lo shape_i16.lo
 am__objects_20 = eoshift1_4.lo eoshift1_8.lo eoshift1_16.lo
 am__objects_21 = eoshift3_4.lo eoshift3_8.lo eoshift3_16.lo
 am__objects_22 = cshift1_4.lo cshift1_8.lo cshift1_16.lo
 am__objects_23 = reshape_i4.lo reshape_i8.lo reshape_i16.lo \
-	reshape_r10.lo reshape_c4.lo reshape_c8.lo reshape_c10.lo \
-	reshape_c16.lo
+	reshape_r10.lo reshape_r16.lo reshape_c4.lo reshape_c8.lo \
+	reshape_c10.lo reshape_c16.lo
 am__objects_24 = in_pack_i4.lo in_pack_i8.lo in_pack_i16.lo \
 	in_pack_c4.lo in_pack_c8.lo in_pack_c10.lo in_pack_c16.lo
 am__objects_25 = in_unpack_i4.lo in_unpack_i8.lo in_unpack_i16.lo \
@@ -661,6 +661,7 @@ generated/transpose_i4.c \
 generated/transpose_i8.c \
 generated/transpose_i16.c \
 generated/transpose_r10.c \
+generated/transpose_r16.c \
 generated/transpose_c4.c \
 generated/transpose_c8.c \
 generated/transpose_c10.c \
@@ -676,6 +677,7 @@ generated/reshape_i4.c \
 generated/reshape_i8.c \
 generated/reshape_i16.c \
 generated/reshape_r10.c \
+generated/reshape_r16.c \
 generated/reshape_c4.c \
 generated/reshape_c8.c \
 generated/reshape_c10.c \
@@ -1935,6 +1937,9 @@ transpose_i16.lo: generated/transpose_i1
 transpose_r10.lo: generated/transpose_r10.c
 	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o transpose_r10.lo `test -f 'generated/transpose_r10.c' || echo '$(srcdir)/'`generated/transpose_r10.c
 
+transpose_r16.lo: generated/transpose_r16.c
+	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o transpose_r16.lo `test -f 'generated/transpose_r16.c' || echo '$(srcdir)/'`generated/transpose_r16.c
+
 transpose_c4.lo: generated/transpose_c4.c
 	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o transpose_c4.lo `test -f 'generated/transpose_c4.c' || echo '$(srcdir)/'`generated/transpose_c4.c
 
@@ -1995,6 +2000,9 @@ reshape_i16.lo: generated/reshape_i16.c
 reshape_r10.lo: generated/reshape_r10.c
 	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reshape_r10.lo `test -f 'generated/reshape_r10.c' || echo '$(srcdir)/'`generated/reshape_r10.c
 
+reshape_r16.lo: generated/reshape_r16.c
+	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reshape_r16.lo `test -f 'generated/reshape_r16.c' || echo '$(srcdir)/'`generated/reshape_r16.c
+
 reshape_c4.lo: generated/reshape_c4.c
 	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reshape_c4.lo `test -f 'generated/reshape_c4.c' || echo '$(srcdir)/'`generated/reshape_c4.c
 
--- libgfortran/generated/transpose_r16.c.jj	2006-04-21 12:22:52.000000000 +0200
+++ libgfortran/generated/transpose_r16.c	2006-04-21 12:21:48.000000000 +0200
@@ -0,0 +1,104 @@
+/* Implementation of the TRANSPOSE intrinsic
+   Copyright 2003, 2005 Free Software Foundation, Inc.
+   Contributed by Tobias Schl?ter
+
+This file is part of the GNU Fortran 95 runtime library (libgfortran).
+
+Libgfortran 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.
+
+In addition to the permissions in the GNU General Public License, the
+Free Software Foundation gives you unlimited permission to link the
+compiled version of this file into combinations with other programs,
+and to distribute those combinations without any restriction coming
+from the use of this file.  (The General Public License restrictions
+do apply in other respects; for example, they cover modification of
+the file, and distribution when not linked into a combine
+executable.)
+
+Libgfortran 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 libgfortran; see the file COPYING.  If not,
+write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#include "config.h"
+#include <assert.h>
+#include "libgfortran.h"
+
+#if defined (HAVE_GFC_REAL_16)
+
+extern void transpose_r16 (gfc_array_r16 * const restrict ret, 
+	gfc_array_r16 * const restrict source);
+export_proto(transpose_r16);
+
+void
+transpose_r16 (gfc_array_r16 * const restrict ret, 
+	gfc_array_r16 * const restrict source)
+{
+  /* r.* indicates the return array.  */
+  index_type rxstride, rystride;
+  GFC_REAL_16 *rptr;
+  /* s.* indicates the source array.  */
+  index_type sxstride, systride;
+  const GFC_REAL_16 *sptr;
+
+  index_type xcount, ycount;
+  index_type x, y;
+
+  assert (GFC_DESCRIPTOR_RANK (source) == 2);
+
+  if (ret->data == NULL)
+    {
+      assert (GFC_DESCRIPTOR_RANK (ret) == 2);
+      assert (ret->dtype == source->dtype);
+
+      ret->dim[0].lbound = 0;
+      ret->dim[0].ubound = source->dim[1].ubound - source->dim[1].lbound;
+      ret->dim[0].stride = 1;
+
+      ret->dim[1].lbound = 0;
+      ret->dim[1].ubound = source->dim[0].ubound - source->dim[0].lbound;
+      ret->dim[1].stride = ret->dim[0].ubound+1;
+
+      ret->data = internal_malloc_size (sizeof (GFC_REAL_16) * size0 ((array_t *) ret));
+      ret->offset = 0;
+    }
+
+  if (ret->dim[0].stride == 0)
+    ret->dim[0].stride = 1;
+  if (source->dim[0].stride == 0)
+    source->dim[0].stride = 1;
+
+  sxstride = source->dim[0].stride;
+  systride = source->dim[1].stride;
+  xcount = source->dim[0].ubound + 1 - source->dim[0].lbound;
+  ycount = source->dim[1].ubound + 1 - source->dim[1].lbound;
+
+  rxstride = ret->dim[0].stride;
+  rystride = ret->dim[1].stride;
+
+  rptr = ret->data;
+  sptr = source->data;
+
+  for (y=0; y < ycount; y++)
+    {
+      for (x=0; x < xcount; x++)
+        {
+          *rptr = *sptr;
+
+          sptr += sxstride;
+          rptr += rystride;
+        }
+        sptr += systride - (sxstride * xcount);
+        rptr += rxstride - (rystride * xcount);
+    }
+}
+
+#endif
--- libgfortran/generated/reshape_r16.c.jj	2006-04-21 12:23:01.000000000 +0200
+++ libgfortran/generated/reshape_r16.c	2006-04-21 12:20:48.000000000 +0200
@@ -0,0 +1,268 @@
+/* Implementation of the RESHAPE
+   Copyright 2002 Free Software Foundation, Inc.
+   Contributed by Paul Brook <paul at nowt.org>
+
+This file is part of the GNU Fortran 95 runtime library (libgfortran).
+
+Libgfortran 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.
+
+In addition to the permissions in the GNU General Public License, the
+Free Software Foundation gives you unlimited permission to link the
+compiled version of this file into combinations with other programs,
+and to distribute those combinations without any restriction coming
+from the use of this file.  (The General Public License restrictions
+do apply in other respects; for example, they cover modification of
+the file, and distribution when not linked into a combine
+executable.)
+
+Libgfortran 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 libgfortran; see the file COPYING.  If not,
+write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#include "config.h"
+#include <stdlib.h>
+#include <assert.h>
+#include "libgfortran.h"
+
+#if defined (HAVE_GFC_REAL_16)
+
+typedef GFC_ARRAY_DESCRIPTOR(1, index_type) shape_type;
+
+/* The shape parameter is ignored. We can currently deduce the shape from the
+   return array.  */
+
+extern void reshape_r16 (gfc_array_r16 * const restrict, 
+	gfc_array_r16 * const restrict, 
+	shape_type * const restrict,
+	gfc_array_r16 * const restrict, 
+	shape_type * const restrict);
+export_proto(reshape_r16);
+
+void
+reshape_r16 (gfc_array_r16 * const restrict ret, 
+	gfc_array_r16 * const restrict source, 
+	shape_type * const restrict shape,
+	gfc_array_r16 * const restrict pad, 
+	shape_type * const restrict order)
+{
+  /* r.* indicates the return array.  */
+  index_type rcount[GFC_MAX_DIMENSIONS];
+  index_type rextent[GFC_MAX_DIMENSIONS];
+  index_type rstride[GFC_MAX_DIMENSIONS];
+  index_type rstride0;
+  index_type rdim;
+  index_type rsize;
+  index_type rs;
+  index_type rex;
+  GFC_REAL_16 *rptr;
+  /* s.* indicates the source array.  */
+  index_type scount[GFC_MAX_DIMENSIONS];
+  index_type sextent[GFC_MAX_DIMENSIONS];
+  index_type sstride[GFC_MAX_DIMENSIONS];
+  index_type sstride0;
+  index_type sdim;
+  index_type ssize;
+  const GFC_REAL_16 *sptr;
+  /* p.* indicates the pad array.  */
+  index_type pcount[GFC_MAX_DIMENSIONS];
+  index_type pextent[GFC_MAX_DIMENSIONS];
+  index_type pstride[GFC_MAX_DIMENSIONS];
+  index_type pdim;
+  index_type psize;
+  const GFC_REAL_16 *pptr;
+
+  const GFC_REAL_16 *src;
+  int n;
+  int dim;
+
+  if (source->dim[0].stride == 0)
+    source->dim[0].stride = 1;
+  if (shape->dim[0].stride == 0)
+    shape->dim[0].stride = 1;
+  if (pad && pad->dim[0].stride == 0)
+    pad->dim[0].stride = 1;
+  if (order && order->dim[0].stride == 0)
+    order->dim[0].stride = 1;
+
+  if (ret->data == NULL)
+    {
+      rdim = shape->dim[0].ubound - shape->dim[0].lbound + 1;
+      rs = 1;
+      for (n=0; n < rdim; n++)
+	{
+	  ret->dim[n].lbound = 0;
+	  rex = shape->data[n * shape->dim[0].stride];
+	  ret->dim[n].ubound =  rex - 1;
+	  ret->dim[n].stride = rs;
+	  rs *= rex;
+	}
+      ret->offset = 0;
+      ret->data = internal_malloc_size ( rs * sizeof (GFC_REAL_16));
+      ret->dtype = (source->dtype & ~GFC_DTYPE_RANK_MASK) | rdim;
+    }
+  else
+    {
+      rdim = GFC_DESCRIPTOR_RANK (ret);
+      if (ret->dim[0].stride == 0)
+	ret->dim[0].stride = 1;
+    }
+
+  rsize = 1;
+  for (n = 0; n < rdim; n++)
+    {
+      if (order)
+        dim = order->data[n * order->dim[0].stride] - 1;
+      else
+        dim = n;
+
+      rcount[n] = 0;
+      rstride[n] = ret->dim[dim].stride;
+      rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
+
+      if (rextent[n] != shape->data[dim * shape->dim[0].stride])
+        runtime_error ("shape and target do not conform");
+
+      if (rsize == rstride[n])
+        rsize *= rextent[n];
+      else
+        rsize = 0;
+      if (rextent[n] <= 0)
+        return;
+    }
+
+  sdim = GFC_DESCRIPTOR_RANK (source);
+  ssize = 1;
+  for (n = 0; n < sdim; n++)
+    {
+      scount[n] = 0;
+      sstride[n] = source->dim[n].stride;
+      sextent[n] = source->dim[n].ubound + 1 - source->dim[n].lbound;
+      if (sextent[n] <= 0)
+        abort ();
+
+      if (ssize == sstride[n])
+        ssize *= sextent[n];
+      else
+        ssize = 0;
+    }
+
+  if (pad)
+    {
+      pdim = GFC_DESCRIPTOR_RANK (pad);
+      psize = 1;
+      for (n = 0; n < pdim; n++)
+        {
+          pcount[n] = 0;
+          pstride[n] = pad->dim[n].stride;
+          pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound;
+          if (pextent[n] <= 0)
+            abort ();
+          if (psize == pstride[n])
+            psize *= pextent[n];
+          else
+            psize = 0;
+        }
+      pptr = pad->data;
+    }
+  else
+    {
+      pdim = 0;
+      psize = 1;
+      pptr = NULL;
+    }
+
+  if (rsize != 0 && ssize != 0 && psize != 0)
+    {
+      rsize *= sizeof (GFC_REAL_16);
+      ssize *= sizeof (GFC_REAL_16);
+      psize *= sizeof (GFC_REAL_16);
+      reshape_packed ((char *)ret->data, rsize, (char *)source->data,
+		      ssize, pad ? (char *)pad->data : NULL, psize);
+      return;
+    }
+  rptr = ret->data;
+  src = sptr = source->data;
+  rstride0 = rstride[0];
+  sstride0 = sstride[0];
+
+  while (rptr)
+    {
+      /* Select between the source and pad arrays.  */
+      *rptr = *src;
+      /* Advance to the next element.  */
+      rptr += rstride0;
+      src += sstride0;
+      rcount[0]++;
+      scount[0]++;
+      /* Advance to the next destination element.  */
+      n = 0;
+      while (rcount[n] == rextent[n])
+        {
+          /* When we get to the end of a dimension, reset it and increment
+             the next dimension.  */
+          rcount[n] = 0;
+          /* We could precalculate these products, but this is a less
+             frequently used path so proabably not worth it.  */
+          rptr -= rstride[n] * rextent[n];
+          n++;
+          if (n == rdim)
+            {
+              /* Break out of the loop.  */
+              rptr = NULL;
+              break;
+            }
+          else
+            {
+              rcount[n]++;
+              rptr += rstride[n];
+            }
+        }
+      /* Advance to the next source element.  */
+      n = 0;
+      while (scount[n] == sextent[n])
+        {
+          /* When we get to the end of a dimension, reset it and increment
+             the next dimension.  */
+          scount[n] = 0;
+          /* We could precalculate these products, but this is a less
+             frequently used path so proabably not worth it.  */
+          src -= sstride[n] * sextent[n];
+          n++;
+          if (n == sdim)
+            {
+              if (sptr && pad)
+                {
+                  /* Switch to the pad array.  */
+                  sptr = NULL;
+                  sdim = pdim;
+                  for (dim = 0; dim < pdim; dim++)
+                    {
+                      scount[dim] = pcount[dim];
+                      sextent[dim] = pextent[dim];
+                      sstride[dim] = pstride[dim];
+                      sstride0 = sstride[0];
+                    }
+                }
+              /* We now start again from the beginning of the pad array.  */
+              src = pptr;
+              break;
+            }
+          else
+            {
+              scount[n]++;
+              src += sstride[n];
+            }
+        }
+    }
+}
+
+#endif

gcc41-rh137200.patch:
 gcc.c    |   69 +++++++++++++++++++--------
 prefix.c |  160 ++++++++++++++++++++++++++++++++++++++++-----------------------
 2 files changed, 153 insertions(+), 76 deletions(-)

--- NEW FILE gcc41-rh137200.patch ---
2005-11-30  Alexandre Oliva  <aoliva at redhat.com>

	* gcc.c (find_a_file): Use update_path before access tests.
	Mostly from Thomas Walker <thomas.walker at morganstanley.com>
	* prefix.c (update_path): Move dir/../-stripping code to...
	(maybe_strip_dotdots): New function.  Reorganize.

--- gcc/gcc.c.jj	2006-02-02 16:46:21.000000000 +0100
+++ gcc/gcc.c	2006-04-21 19:34:50.000000000 +0200
@@ -2450,7 +2450,7 @@ static char *
 find_a_file (struct path_prefix *pprefix, const char *name, int mode,
 	     int multilib)
 {
-  char *temp;
+  char *temp, *temp2;
   const char *const file_suffix =
     ((mode & X_OK) != 0 ? HOST_EXECUTABLE_SUFFIX : "");
   struct prefix_list *pl;
@@ -2486,19 +2486,18 @@ find_a_file (struct path_prefix *pprefix
 				    NULL));
     }
 
-  temp = xmalloc (len);
-
   /* Determine the filename to execute (special case for absolute paths).  */
 
   if (IS_ABSOLUTE_PATH (name))
     {
-      if (access (name, mode) == 0)
-	{
-	  strcpy (temp, name);
-	  return temp;
-	}
+      /* IS_ABSOLUTE_PATHNAME lets anything through that starts with '/'  */
+      temp = update_path (name, NULL);
+      if (access (temp, mode) == 0)
+	return temp;
     }
   else
+  {
+    temp = xmalloc (len);
     for (pl = pprefix->plist; pl; pl = pl->next)
       {
 	const char *this_name
@@ -2514,16 +2513,26 @@ find_a_file (struct path_prefix *pprefix
 		strcat (temp, machine_suffix);
 		strcat (temp, multilib_name);
 		strcat (temp, file_suffix);
-		if (access_check (temp, mode) == 0)
-		  return temp;
+		temp2 = update_path (temp, NULL);
+		if (access_check (temp2, mode) == 0)
+		  {
+		    free (temp);
+		    return temp2;
+		  }
+		free (temp2);
 	      }
 
 	    /* Now try just the multilib_name.  */
 	    strcpy (temp, pl->prefix);
 	    strcat (temp, machine_suffix);
 	    strcat (temp, multilib_name);
-	    if (access_check (temp, mode) == 0)
-	      return temp;
+	    temp2 = update_path (temp, NULL);
+	    if (access_check (temp2, mode) == 0)
+	      {
+		free (temp);
+		return temp2;
+	      }
+	    free (temp2);
 	  }
 
 	/* Certain prefixes are tried with just the machine type,
@@ -2538,15 +2547,25 @@ find_a_file (struct path_prefix *pprefix
 		strcat (temp, just_machine_suffix);
 		strcat (temp, multilib_name);
 		strcat (temp, file_suffix);
-		if (access_check (temp, mode) == 0)
-		  return temp;
+		temp2 = update_path (temp, NULL);
+		if (access_check (temp2, mode) == 0)
+		  {
+		    free (temp);
+		    return temp2;
+		  }
+		free (temp2);
 	      }
 
 	    strcpy (temp, pl->prefix);
 	    strcat (temp, just_machine_suffix);
 	    strcat (temp, multilib_name);
-	    if (access_check (temp, mode) == 0)
-	      return temp;
+	    temp2 = update_path (temp, NULL);
+	    if (access_check (temp2, mode) == 0)
+	      {
+		free (temp);
+		return temp2;
+	      }
+	    free (temp2);
 	  }
 
 	/* Certain prefixes can't be used without the machine suffix
@@ -2560,14 +2579,24 @@ find_a_file (struct path_prefix *pprefix
 		strcpy (temp, pl->prefix);
 		strcat (temp, this_name);
 		strcat (temp, file_suffix);
-		if (access_check (temp, mode) == 0)
-		  return temp;
+		temp2 = update_path (temp, NULL);
+		if (access_check (temp2, mode) == 0)
+		  {
+		    free (temp);
+		    return temp2;
+		  }
+		free (temp2);
 	      }
 
 	    strcpy (temp, pl->prefix);
 	    strcat (temp, this_name);
-	    if (access_check (temp, mode) == 0)
-	      return temp;
+	    temp2 = update_path (temp, NULL);
+	    if (access_check (temp2, mode) == 0)
+	      {
+		free (temp);
+		return temp2;
+	      }
+	    free (temp2);
 	  }
       }
 
--- gcc/prefix.c.jj	2005-10-28 23:06:47.000000000 +0200
+++ gcc/prefix.c	2006-04-21 19:36:22.000000000 +0200
@@ -242,6 +242,105 @@ tr (char *string, int c1, int c2)
   while (*string++);
 }
 
+/* Strip dir/.. from a pathname when it makes sense, e.g., when this
+   would turn an inaccessible pathname into an accessible one.
+
+   We short-circuit dir/.. when dir does not exist, and when
+   some/dir/../thing does not exist but some/thing does.  In case
+   there are multiple possible dir/../ stripping possibilities that
+   would turn an inaccessible pathname into an accessible one, the one
+   closer to the end of the pathname is preferred.
+
+   RESULT is the pathname that might contain such dotdot sequences to
+   be stripped.  P points into RESULT, and indicates the location
+   where we should start looking for ../ sequences.
+
+   Even though RESULT is const, P is not, and that's because
+   characters in it may be temporarily overwritten, so RESULT must not
+   be in read-only storage.
+
+   The returned value is either a newly-allocated memory area, holding
+   a string that is the result of dotdot-stripping from the original
+   input strip, or RESULT itself, in which case any modifications made
+   to the string will have been undone.  */
+
+static const char *
+maybe_strip_dotdots (const char *result, char *p)
+{
+  char *temp;
+  const char *path, *before, *after;
+  size_t len;
+
+  while (1)
+    {
+      p = strchr (p, '.');
+      if (p == NULL)
+	return result;
+      /* Look for `/../'  */
+      if (p[1] == '.'
+	  && IS_DIR_SEPARATOR (p[2])
+	  && (p != result && IS_DIR_SEPARATOR (p[-1])))
+	break;
+      else
+	++p;
+    }
+
+  *p = 0;
+  if (access (result, X_OK) == 0)
+    {
+      *p = '.';
+
+      path = maybe_strip_dotdots (result, p + 3);
+      if (access (path, F_OK) == 0)
+	return path;
+      if (path != result)
+	free ((char *) path);
+    }
+  else
+    *p = '.';
+
+  /* If we couldn't access the dir, or if recursion resulted in a
+     non-accessible pathname, we try stripping out dir/../.  If `dir'
+     turns out to be `.', strip one more path component.  */
+  before = p;
+  do
+    {
+      --before;
+      while (before != result && IS_DIR_SEPARATOR (*before))
+	--before;
+      while (before != result && !IS_DIR_SEPARATOR (before[-1]))
+	--before;
+    }
+  while (before != result && *before == '.'
+	 && IS_DIR_SEPARATOR (*(before + 1)));
+  /* If we have something like `./..' or `/..', don't
+     strip anything more.  */
+  if (*before == '.' || IS_DIR_SEPARATOR (*before))
+    return result;
+
+  after = p + 3;
+  while (IS_DIR_SEPARATOR (*after))
+    ++after;
+
+  len = (after - result) + strlen (after);
+
+  temp = xmalloc (len + 1 - (after - before));
+  memcpy (temp, result, before - result);
+  memcpy (temp + (before - result), after, len + 1 - (after - result));
+
+  path = maybe_strip_dotdots (temp, temp + (before - result));
+
+  if (path != temp)
+    free (temp);
+
+  if (access (path, F_OK) == 0)
+    result = path;
+  else if (path != result)
+    free ((char *) path);
+
+  return result;
+}
+
 /* Update PATH using KEY if PATH starts with PREFIX as a directory.
    The returned string is always malloc-ed, and the caller is
    responsible for freeing it.  */
@@ -249,7 +348,7 @@ tr (char *string, int c1, int c2)
 char *
 update_path (const char *path, const char *key)
 {
-  char *result, *p;
+  char *result, *temp;
   const int len = strlen (std_prefix);
 
   if (! strncmp (path, std_prefix, len)
@@ -273,62 +372,11 @@ update_path (const char *path, const cha
   else
     result = xstrdup (path);
 
-#ifndef ALWAYS_STRIP_DOTDOT
-#define ALWAYS_STRIP_DOTDOT 0
-#endif
+  temp = result;
+  result = (char *) maybe_strip_dotdots (temp, temp);
 
-  p = result;
-  while (1)
-    {
-      char *src, *dest;
-
-      p = strchr (p, '.');
-      if (p == NULL)
-	break;
-      /* Look for `/../'  */
-      if (p[1] == '.'
-	  && IS_DIR_SEPARATOR (p[2])
-	  && (p != result && IS_DIR_SEPARATOR (p[-1])))
-	{
-	  *p = 0;
-	  if (!ALWAYS_STRIP_DOTDOT && access (result, X_OK) == 0)
-	    {
-	      *p = '.';
-	      break;
-	    }
-	  else
-	    {
-	      /* We can't access the dir, so we won't be able to
-		 access dir/.. either.  Strip out `dir/../'.  If `dir'
-		 turns out to be `.', strip one more path component.  */
-	      dest = p;
-	      do
-		{
-		  --dest;
-		  while (dest != result && IS_DIR_SEPARATOR (*dest))
-		    --dest;
-		  while (dest != result && !IS_DIR_SEPARATOR (dest[-1]))
-		    --dest;
-		}
-	      while (dest != result && *dest == '.');
-	      /* If we have something like `./..' or `/..', don't
-		 strip anything more.  */
-	      if (*dest == '.' || IS_DIR_SEPARATOR (*dest))
-		{
-		  *p = '.';
-		  break;
-		}
-	      src = p + 3;
-	      while (IS_DIR_SEPARATOR (*src))
-		++src;
-	      p = dest;
-	      while ((*dest++ = *src++) != 0)
-		;
-	    }
-	}
-      else
-	++p;
-    }
+  if (result != temp)
+    free (temp);
 
 #ifdef UPDATE_PATH_HOST_CANONICALIZE
   /* Perform host dependent canonicalization when needed.  */

gcc41-rh187450.patch:
 0 files changed

--- NEW FILE gcc41-rh187450.patch ---
2006-02-21  Alexandre Oliva  <aoliva at redhat.com>

	* config/i386/sse.md (vec_extractv2df_1_sse): New.
	(vec_extractv2df_0_sse): New.

2006-01-13  Alexandre Oliva  <aoliva at redhat.com>

	* config/i386/sse.md (*vec_extractv2di_1_sse2): Reorder
	alternatives to match style of other entries.
	(*vec_extractv2di_1_sse): Likewise.  Fix mode attr.

2006-01-09  Alexandre Oliva  <aoliva at redhat.com>

	* config/i386/sse.md (*vec_extractv2di_1_sse2): New.
	(*vec_extractv2di_1_sse): New.

--- gcc/config/i386/sse.md	(revision 109200)
+++ gcc/config/i386/sse.md	(revision 113136)
@@ -2289,6 +2289,36 @@ (define_split
   operands[0] = adjust_address (operands[0], DFmode, 8);
 })
 
+;; Not sure these two are ever used, but it doesn't hurt to have
+;; them. -aoliva
+(define_insn "*vec_extractv2df_1_sse"
+  [(set (match_operand:DF 0 "nonimmediate_operand" "=m,x,x")
+	(vec_select:DF
+	  (match_operand:V2DF 1 "nonimmediate_operand" "x,x,o")
+	  (parallel [(const_int 1)])))]
+  "!TARGET_SSE2 && TARGET_SSE
+   && !(MEM_P (operands[0]) && MEM_P (operands[1]))"
+  "@
+   movhps\t{%1, %0|%0, %1}
+   movhlps\t{%1, %0|%0, %1}
+   movlps\t{%H1, %0|%0, %H1}"
+  [(set_attr "type" "ssemov")
+   (set_attr "mode" "V2SF,V4SF,V2SF")])
+
+(define_insn "*vec_extractv2df_0_sse"
+  [(set (match_operand:DF 0 "nonimmediate_operand" "=m,x,x")
+	(vec_select:DF
+	  (match_operand:V2DF 1 "nonimmediate_operand" "x,x,m")
+	  (parallel [(const_int 0)])))]
+  "!TARGET_SSE2 && TARGET_SSE
+   && !(MEM_P (operands[0]) && MEM_P (operands[1]))"
+  "@
+   movlps\t{%1, %0|%0, %1}
+   movaps\t{%1, %0|%0, %1}
+   movlps\t{%1, %0|%0, %1}"
+  [(set_attr "type" "ssemov")
+   (set_attr "mode" "V2SF,V4SF,V2SF")])
+
 (define_insn "sse2_movsd"
   [(set (match_operand:V2DF 0 "nonimmediate_operand"   "=x,x,m,x,x,o")
 	(vec_merge:V2DF
@@ -3464,6 +3536,34 @@ (define_split
   operands[1] = gen_rtx_REG (DImode, REGNO (operands[1]));
 })
 
+(define_insn "*vec_extractv2di_1_sse2"
+  [(set (match_operand:DI 0 "nonimmediate_operand" "=m,x,x")
+	(vec_select:DI
+	  (match_operand:V2DI 1 "nonimmediate_operand" "x,0,o")
+	  (parallel [(const_int 1)])))]
+  "TARGET_SSE2 && !(MEM_P (operands[0]) && MEM_P (operands[1]))"
+  "@
+   movhps\t{%1, %0|%0, %1}
+   psrldq\t{$4, %0|%0, 4}
+   movq\t{%H1, %0|%0, %H1}"
+  [(set_attr "type" "ssemov,sseishft,ssemov")
+   (set_attr "mode" "V2SF,TI,TI")])
+
+;; Not sure this is ever used, but it doesn't hurt to have it. -aoliva
+(define_insn "*vec_extractv2di_1_sse"
+  [(set (match_operand:DI 0 "nonimmediate_operand" "=m,x,x")
+	(vec_select:DI
+	  (match_operand:V2DI 1 "nonimmediate_operand" "x,x,o")
+	  (parallel [(const_int 1)])))]
+  "!TARGET_SSE2 && TARGET_SSE
+   && !(MEM_P (operands[0]) && MEM_P (operands[1]))"
+  "@
+   movhps\t{%1, %0|%0, %1}
+   movhlps\t{%1, %0|%0, %1}
+   movlps\t{%H1, %0|%0, %H1}"
+  [(set_attr "type" "ssemov")
+   (set_attr "mode" "V2SF,V4SF,V2SF")])
+
 (define_insn "*vec_dupv4si"
   [(set (match_operand:V4SI 0 "register_operand" "=Y,x")
 	(vec_duplicate:V4SI

gcc41-tests.patch:
 gcc.c-torture/execute/20060412-1.c |   33 +++++++++++++++++
 gcc.c-torture/execute/20060420-1.c |   71 +++++++++++++++++++++++++++++++++++++
 gcc.target/powerpc/altivec-23.c    |   25 +++++++++++++
 3 files changed, 129 insertions(+)

--- NEW FILE gcc41-tests.patch ---
2006-04-20  Jakub Jelinek  <jakub at redhat.com>

	* gcc.c-torture/execute/20060420-1.c: New test.

2006-04-12  Jakub Jelinek  <jakub at redhat.com>

	* gcc.c-torture/execute/20060412-1.c: New test.

2006-02-25  Alexandre Oliva  <aoliva at redhat.com>

	* gcc.target/powerpc/altivec-23.c: New test.

--- gcc/testsuite/gcc.target/powerpc/altivec-23.c	1970-01-01 00:00:00.000000000 +0000
+++ gcc/testsuite/gcc.target/powerpc/altivec-23.c	2006-02-25 04:10:36.000000000 -0300
@@ -0,0 +1,25 @@
+/* Verify that it is possible to define variables of composite types
+   containing vector types.  We used to crash handling the
+   initializer of automatic ones.  */
+
+/* { dg-do compile } */
+/* { dg-xfail-if "" { "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
+/* { dg-options "-maltivec -mabi=altivec" } */
+
+#include <altivec.h>
+
+typedef int bt;
+typedef vector bt vt;
+typedef struct { vt x; bt y[sizeof(vt) / sizeof (bt)]; } st;
+#define INIT { 1, 2, 3, 4 }
+
+void f ()
+{
+  vt x = INIT;
+  vt y[1] = { INIT };
+  st s = { INIT, INIT };
+}
+
+vt x = INIT;
+vt y[1] = { INIT };
+st s = { INIT, INIT };
--- gcc/testsuite/gcc.c-torture/execute/20060420-1.c.jj	2006-04-20 18:47:19.000000000 +0200
+++ gcc/testsuite/gcc.c-torture/execute/20060420-1.c	2006-04-20 19:07:20.000000000 +0200
@@ -0,0 +1,71 @@
+extern void abort (void);
+
+typedef float v4flt __attribute__ ((vector_size (16)));
+
+void __attribute__ ((noinline)) foo (float *dst, float **src, int a, int n)
+{
+  int i, j;
+  int z = sizeof (v4flt) / sizeof (float);
+  unsigned m = sizeof (v4flt) - 1;
+
+  for (j = 0; j < n && (((unsigned long) dst + j) & m); ++j)
+    {
+      float t = src[0][j];
+      for (i = 1; i < a; ++i)
+	t += src[i][j];
+      dst[j] = t;
+    }
+
+  for (; j < (n - (4 * z - 1)); j += 4 * z)
+    {
+      v4flt t0 = *(v4flt *) (src[0] + j + 0 * z);
+      v4flt t1 = *(v4flt *) (src[0] + j + 1 * z);
+      v4flt t2 = *(v4flt *) (src[0] + j + 2 * z);
+      v4flt t3 = *(v4flt *) (src[0] + j + 3 * z);
+      for (i = 1; i < a; ++i)
+	{
+	  t0 += *(v4flt *) (src[i] + j + 0 * z);
+	  t1 += *(v4flt *) (src[i] + j + 1 * z);
+	  t2 += *(v4flt *) (src[i] + j + 2 * z);
+	  t3 += *(v4flt *) (src[i] + j + 3 * z);
+	}
+      *(v4flt *) (dst + j + 0 * z) = t0;
+      *(v4flt *) (dst + j + 1 * z) = t1;
+      *(v4flt *) (dst + j + 2 * z) = t2;
+      *(v4flt *) (dst + j + 3 * z) = t3;
+    }
+  for (; j < n; ++j)
+    {
+      float t = src[0][j];
+      for (i = 1; i < a; ++i)
+	t += src[i][j];
+      dst[j] = t;
+    }
+}
+
+float buffer[64];
+
+int
+main (void)
+{
+  int i;
+  float *dst, *src[2];
+
+  dst = buffer;
+  dst += (-(long int) buffer & (16 * sizeof (float) - 1)) / sizeof (float);
+  src[0] = dst + 16;
+  src[1] = dst + 32;
+  for (i = 0; i < 16; ++i)
+    {
+      src[0][i] = (float) i + 11 * (float) i;
+      src[1][i] = (float) i + 12 * (float) i;
+    }
+  foo (dst, src, 2, 16);
+  for (i = 0; i < 16; ++i)
+    {
+      float e = (float) i + 11 * (float) i + (float) i + 12 * (float) i;
+      if (dst[i] != e)
+	abort ();
+    }
+  return 0;
+}
--- gcc/testsuite/gcc.c-torture/execute/20060412-1.c.jj	2006-04-03 11:04:53.758553500 +0200
+++ gcc/testsuite/gcc.c-torture/execute/20060412-1.c	2006-04-12 10:54:20.000000000 +0200
@@ -0,0 +1,33 @@
+extern void abort (void);
+
+struct S
+{
+  long o;
+};
+
+struct T
+{
+  long o;
+  struct S m[82];
+};
+
+struct T t;
+
+int
+main ()
+{
+  struct S *p, *q;
+
+  p = (struct S *) &t;
+  p = &((struct T *) p)->m[0];
+  q = p + 82;
+  while (--q > p)
+    q->o = -1;
+  q->o = 0;
+
+  if (q > p)
+    abort ();
+  if (q - p > 0)
+    abort ();
+  return 0;
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- .cvsignore	20 Apr 2006 13:50:21 -0000	1.145
+++ .cvsignore	21 Apr 2006 20:45:38 -0000	1.146
@@ -1 +1 @@
-gcc-4.1.0-20060420.tar.bz2
+gcc-4.1.0-20060421.tar.bz2

gcc41-ada-pr18302.patch:
 run_all.sh |    7 +++++++
 1 files changed, 7 insertions(+)

Index: gcc41-ada-pr18302.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-ada-pr18302.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcc41-ada-pr18302.patch	10 Feb 2006 15:29:19 -0000	1.2
+++ gcc41-ada-pr18302.patch	21 Apr 2006 20:45:38 -0000	1.3
@@ -1,75 +1,19 @@
-gcc/ada/
-2004-11-28  James A. Morrison  <ja2morri at csclub.uwaterloo.ca>
-
-	PR ada/18302
-	* Make-lang.in (check-gnat): Set EXPECT environment variable.
-
-testsuite/
-2005-05-18  Jakub Jelinek  <jakub at redhat.com>
-
-	* ada/acats/run_all.sh: Filter out spawn line from target_bit.
-
-2004-11-28  James A. Morrison  <ja2morri at csclub.uwaterloo.ca>
-
-	PR ada/18302
-	* ada/acats/run_all.sh (target_run): Run test through run_test.expect.
-	* ada/acats/run_test.expect: Expect script for ACATS tests.
-
---- gcc/testsuite/ada/acats/run_all.sh	(.../gcc-4_0-branch)	(revision 107266)
-+++ gcc/testsuite/ada/acats/run_all.sh	(.../redhat/gcc-4_0-branch)	(revision 107414)
-@@ -13,7 +13,8 @@
+--- gcc/testsuite/ada/acats/run_all.sh	26 Apr 2004 21:15:54 -0000	1.18
++++ gcc/testsuite/ada/acats/run_all.sh	17 Feb 2005 14:24:49 -0000
+@@ -11,9 +11,16 @@
+ 
+ gccflags="-O2"
  gnatflags="-gnatws"
++timeout=120
  
  target_run () {
--$*
-+  LD_LIBRARY_PATH=$ADA_INCLUDE_PATH${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} \
-+    $EXPECT -f $testdir/run_test.exp $1 > $2
++  sh -c "(sleep $timeout; kill \$\$) &
++x=\$!
+ $*
++s=\$?
++kill \$x
++exit \$s
++"
  }
  
  # End of customization section.
-@@ -92,8 +93,8 @@
- 
- # Find out the size in bit of an address on the target
- target_gnatmake $testdir/support/impbit.adb >> $dir/acats.log 2>&1
--target_run $dir/support/impbit > $dir/support/impbit.out 2>&1
--target_bit=`cat $dir/support/impbit.out`
-+target_run $dir/support/impbit $dir/support/impbit.out 2>/dev/null
-+target_bit=`egrep -v -e ^spawn $dir/support/impbit.out`
- echo target_bit="$target_bit" >> $dir/acats.log
- 
- # Find out a suitable asm statement
-@@ -259,7 +260,7 @@
-       if [ ! -x $dir/tests/$chapter/$i/$binmain ]; then
-          sync
-       fi
--      target_run $dir/tests/$chapter/$i/$binmain > $dir/tests/$chapter/$i/${i}.log 2>&1
-+      target_run $dir/tests/$chapter/$i/$binmain $dir/tests/$chapter/$i/${i}.log 2>&1
-       cd $dir/tests/$chapter/$i
-       cat ${i}.log >> $dir/acats.log
-       egrep -e '(==== |\+\+\+\+ |\!\!\!\! )' ${i}.log > /dev/null 2>&1
---- gcc/testsuite/ada/acats/run_test.exp	(.../gcc-4_0-branch)	(revision 0)
-+++ gcc/testsuite/ada/acats/run_test.exp	(.../redhat/gcc-4_0-branch)	(revision 107414)
-@@ -0,0 +1,13 @@
-+#!/usr/bin/expect -f
-+
-+if {[info exists env(DEJAGNU_TIMEOUT)]} {
-+  set timeout $env(DEJAGNU_TIMEOUT)
-+} else {
-+  set timeout 300
-+}
-+
-+spawn $argv
-+expect timeout {
-+	send_user "Program timed out.\n"
-+	exit 1
-+}
---- gcc/ada/Make-lang.in	(.../gcc-4_0-branch)	(revision 107266)
-+++ gcc/ada/Make-lang.in	(.../redhat/gcc-4_0-branch)	(revision 107414)
-@@ -809,6 +809,7 @@
- check-gnat:
- 	test -d $(ACATSDIR) || mkdir -p $(ACATSDIR)
- 	testdir=`cd ${srcdir}/${ACATSDIR}; ${PWD_COMMAND}`; \
-+	EXPECT=${EXPECT} ; export EXPECT ; \
- 	export testdir; cd $(ACATSDIR); $(SHELL) $${testdir}/run_acats $(CHAPTERS)
- 
- .PHONY: check-gnat

gcc41-ppc64-ldouble-stdarg.patch:
 0 files changed

Index: gcc41-ppc64-ldouble-stdarg.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-ppc64-ldouble-stdarg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-ppc64-ldouble-stdarg.patch	20 Apr 2006 13:50:21 -0000	1.1
+++ gcc41-ppc64-ldouble-stdarg.patch	21 Apr 2006 20:45:38 -0000	1.2
@@ -127,8 +127,7 @@
 +#include "scalar-by-value-6.c"
 --- gcc/testsuite/gcc.dg/compat/scalar-by-value-6_y.c	(revision 0)
 +++ gcc/testsuite/gcc.dg/compat/scalar-by-value-6_y.c	(revision 0)
-@@ -0,0 +1,7 @@
-+#define USE_MEMCMP 1
+@@ -0,0 +1,6 @@
 +#include "scalar-by-value-y.h"
 +
 +long double d = 1234.0L + 0x0.abcdp-70L;


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gcc41.spec	20 Apr 2006 14:09:06 -0000	1.52
+++ gcc41.spec	21 Apr 2006 20:45:38 -0000	1.53
@@ -1,6 +1,6 @@
-%define DATE 20060420
+%define DATE 20060421
 %define gcc_version 4.1.0
-%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
@@ -114,8 +114,8 @@
 Patch17: gcc41-java-pr13212.patch
 Patch18: gcc41-objc-rh185398.patch
 Patch19: gcc41-pr22375.patch
-Patch20: gcc41-pr24685.patch
-Patch21: gcc41-rh188649-test.patch
+Patch20: gcc41-tests.patch
+Patch21: gcc41-pr26769.patch
 Patch22: gcc41-ppc64-ldouble-stdarg.patch
 Patch23: gcc41-pr25874.patch
 Patch24: gcc41-pr25989.patch
@@ -125,6 +125,8 @@
 Patch28: gcc41-pr26865.patch
 Patch29: gcc41-pr26913.patch
 Patch30: gcc41-rh188944.patch
+Patch31: gcc41-rh137200.patch
+Patch32: gcc41-rh187450.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -423,8 +425,8 @@
 %patch17 -p0 -b .java-pr13212~
 %patch18 -p0 -b .objc-rh185398~
 %patch19 -p0 -b .pr22375~
-%patch20 -p0 -b .pr24685~
-%patch21 -p0 -b .rh188649-test~
+%patch20 -p0 -b .tests~
+%patch21 -p0 -b .pr26769~
 %patch22 -p0 -b .ppc64-ldouble-stdarg~
 %patch23 -p0 -b .pr25874~
 %patch24 -p0 -b .pr25989~
@@ -434,6 +436,8 @@
 %patch28 -p0 -b .pr26865~
 %patch29 -p0 -b .pr26913~
 %patch30 -p0 -b .rh188944~
+%patch31 -p0 -b .rh137200~
+%patch32 -p0 -b .rh187450~
 
 sed -i -e 's/4\.1\.1/4.1.0/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -570,7 +574,7 @@
 echo ====================TESTING END=====================
 mkdir testlogs-%{_target_platform}-%{version}-%{release}
 for i in `find . -name \*.log | grep testsuite/ | grep -v 'config.log\|acats\|ada'`; do
-  ln $i testlogs/ || :
+  ln $i testlogs-%{_target_platform}-%{version}-%{release}/ || :
 done
 tar cf - testlogs-%{_target_platform}-%{version}-%{release} | bzip2 -9c \
   | uuencode testlogs-%{_target_platform}.tar.bz2 || :
@@ -1458,6 +1462,19 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Apr 21 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-10
+- update from gcc-4_1-branch (-r113110:113149)
+  - PRs libgcj/21941, libgcj/27170, libgcj/27231, libgfortran/27138,
+	libstdc++/26424, mudflap/26789
+- improve dir/../-stripping code to support /usr/lib64 and /usr/lib in
+  separate AFS mountpoints (Alexandre Oliva, #137200)
+- fix fortran real(16) transpose and reshape on 32-bit architectures
+  (PR fortran/26769)
+- fix i?86/x86_64 vector extraction (Alexandre Oliva, #187450)
+- fix testcase for ppc32 va_arg bug
+- fix testsuite log uuencoding
+- fix acats timeout framework
+
 * Thu Apr 20 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-9
 - update from gcc-4_1-branch (-r112951:113110)
   - PRs c++/10385, c++/26036, c++/26365, c++/26558, classpath/27163,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- sources	20 Apr 2006 13:50:21 -0000	1.147
+++ sources	21 Apr 2006 20:45:38 -0000	1.148
@@ -1 +1 @@
-70ceb184a4d5a40a2eb8fb903aff3894  gcc-4.1.0-20060420.tar.bz2
+19e1f84413aad25f18300a7dfe37c4b8  gcc-4.1.0-20060421.tar.bz2


--- gcc41-pr24685.patch DELETED ---


--- gcc41-rh188649-test.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 21 21:07:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 17:07:52 -0400
Subject: rpms/gcc/devel gcc41-rh137200.patch,1.1,1.2
Message-ID: <200604212107.k3LL7qWu029405@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29369

Modified Files:
	gcc41-rh137200.patch 
Log Message:
4.1.0-10


gcc41-rh137200.patch:
 gcc.c    |   70 +++++++++++++++++++--------
 prefix.c |  160 ++++++++++++++++++++++++++++++++++++++++-----------------------
 2 files changed, 154 insertions(+), 76 deletions(-)

Index: gcc41-rh137200.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-rh137200.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-rh137200.patch	21 Apr 2006 20:45:38 -0000	1.1
+++ gcc41-rh137200.patch	21 Apr 2006 21:07:22 -0000	1.2
@@ -103,7 +103,7 @@
  	  }
  
  	/* Certain prefixes can't be used without the machine suffix
-@@ -2560,14 +2579,24 @@ find_a_file (struct path_prefix *pprefix
+@@ -2560,14 +2579,25 @@ find_a_file (struct path_prefix *pprefix
  		strcpy (temp, pl->prefix);
  		strcat (temp, this_name);
  		strcat (temp, file_suffix);
@@ -131,6 +131,7 @@
 +	    free (temp2);
  	  }
        }
++  }
  
 --- gcc/prefix.c.jj	2005-10-28 23:06:47.000000000 +0200
 +++ gcc/prefix.c	2006-04-21 19:36:22.000000000 +0200



From fedora-cvs-commits at redhat.com  Fri Apr 21 21:21:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Apr 2006 17:21:09 -0400
Subject: rpms/system-config-kickstart/devel .cvsignore, 1.26, 1.27 sources,
	1.33, 1.34 system-config-kickstart.spec, 1.37, 1.38
Message-ID: <200604212121.k3LLL9Cg013761@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/system-config-kickstart/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13668

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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	27 Mar 2006 19:25:29 -0000	1.26
+++ .cvsignore	21 Apr 2006 21:21:06 -0000	1.27
@@ -19,3 +19,4 @@
 system-config-kickstart-2.6.6.tar.bz2
 system-config-kickstart-2.6.7.tar.bz2
 system-config-kickstart-2.6.8.tar.bz2
+system-config-kickstart-2.6.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	27 Mar 2006 19:25:29 -0000	1.33
+++ sources	21 Apr 2006 21:21:06 -0000	1.34
@@ -1 +1 @@
-36cc96e06f416ad37c01793819d6cdd9  system-config-kickstart-2.6.8.tar.bz2
+b32736a7b2bc8a1036b2fd9556dee48b  system-config-kickstart-2.6.9.tar.bz2


Index: system-config-kickstart.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/devel/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:25:29 -0000	1.37
+++ system-config-kickstart.spec	21 Apr 2006 21:21:06 -0000	1.38
@@ -1,6 +1,6 @@
 Summary: A graphical interface for making kickstart files.
 Name: system-config-kickstart
-Version: 2.6.8
+Version: 2.6.9
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -78,6 +78,10 @@
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png
 
 %changelog
+* Fri Apr 21 2006 Chris Lumens <clumens at redhat.com> 2.6.9-1
+- Add support for more device names.
+- Display a progress bar while yum is working (#187435).
+
 * Mon Mar 27 2006 Chris Lumens <clumens at redhat.com> 2.6.8-1 
 - Fix loading kickstart files (#186944).
 



From fedora-cvs-commits at redhat.com  Sat Apr 22 08:51:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Apr 2006 04:51:08 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.669,1.670
Message-ID: <200604220851.k3M8p8dS027427@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27397

Modified Files:
	openoffice.org.spec 
Log Message:
more bits


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.669
retrieving revision 1.670
diff -u -r1.669 -r1.670
--- openoffice.org.spec	21 Apr 2006 16:15:57 -0000	1.669
+++ openoffice.org.spec	22 Apr 2006 08:51:05 -0000	1.670
@@ -2704,6 +2704,10 @@
 %{instdir}/program/libcppuhelpergcc3.so.3
 %{instdir}/program/libctl680*.so
 %{instdir}/program/libcui680*.so
+%if %{internaljavabits}
+%{instdir}/program/libdb-4.2.so
+%{instdir}/program/libdb_java-4.2.so
+%endif
 %{instdir}/program/libdba680*.so
 %{instdir}/program/libdbacfg680*.so
 %{instdir}/program/libdbase680*.so



From fedora-cvs-commits at redhat.com  Sat Apr 22 17:21:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Apr 2006 13:21:45 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.670,
	1.671 workspace.targetedaot.patch, 1.3, 1.4
Message-ID: <200604221721.k3MHLjOg015786@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15699

Modified Files:
	openoffice.org.spec workspace.targetedaot.patch 
Log Message:
whack targetedaot into shape


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.670
retrieving revision 1.671
diff -u -r1.670 -r1.671
--- openoffice.org.spec	22 Apr 2006 08:51:05 -0000	1.670
+++ openoffice.org.spec	22 Apr 2006 17:21:41 -0000	1.671
@@ -86,7 +86,7 @@
 %endif
 
 %if %{build_rhel4}
-%define extraflags %{javabitsflags} %{xmlsecflags} %{libwpdflags} %{icuflags} %{aggflags} %{stlflags} --with-ant-home=$MY_ANT_HOME
+%define extraflags %{javabitsflags} %{xmlsecflags} %{libwpdflags} %{icuflags} %{aggflags} %{stlflags} --with-ant-home=$MY_ANT_HOME --with-java=%{gij}
 %else
 %define extraflags %{javabitsflags} %{xmlsecflags} %{libwpdflags} %{icuflags} %{aggflags} %{stlflags}
 %endif
@@ -1194,7 +1194,7 @@
 export CC=gcc4
 export CXX=g++4
 %endif
-%configure --with-java=%{gij} --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-symbols --enable-openldap --enable-evolution2 --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --without-system-mspack --without-fonts --without-nas --without-gpc --without-ppds --without-afms --enable-atkbridge --with-images=industrial %{extraflags} %{withlang}
+%configure --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-gcjaot --enable-symbols --enable-openldap --enable-atkbridge --enable-evolution2 --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --without-system-mspack --without-fonts --without-nas --without-gpc --without-ppds --without-afms --with-images=industrial %{extraflags} %{withlang}
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
@@ -1229,13 +1229,15 @@
 done
 export ARCH_FLAGS
 
-
+%if %{build_rhel4}
 # gcc#19870# gcj access problems, monsterous hack to force all java through
 # a sed script which replaces private and protected with public, shudder!
+# ecj is not available on rhel4
 cp %{SOURCE7} solenv/bin/gcj
 chmod u+x solenv/bin/gcj
 export TRUEJAVACOMPILER=$JAVACOMPILER
 export JAVACOMPILER=`pwd`/solenv/bin/gcj
+%endif
 
 %if %{internaljavabits}
 export ARCH_FLAGS="$ARCH_FLAGS -fno-strict-aliasing"

workspace.targetedaot.patch:
 bin/deliver.pl                                |    0 
 config_office/gconfigure.in                   |   59 ++++++++++++++++----------
 config_office/gset_soenv.in                   |    7 ---
 filter/gsource/config/fragments/makefile.mk   |    4 +
 filter/gsource/config/tools/merge/makefile.mk |    3 +
 helpcontent2/gutil/target.pmk                 |    4 +
 inc/settings.mk                               |    0 
 inc/target.mk                                 |    0 
 inc/tg_jar.mk                                 |    0 
 prj/d.lst                                     |    0 
 solenv/gbin/deliver.pl                        |   19 --------
 solenv/ginc/settings.mk                       |    4 -
 solenv/ginc/target.mk                         |    6 ++
 solenv/ginc/tg_jar.mk                         |   14 ++++++
 source/com/sun/star/help/makefile.mk          |    0 
 source/config/fragments/makefile.mk           |    0 
 source/config/tools/merge/makefile.mk         |    0 
 util/target.pmk                               |    0 
 xmlhelp/gprj/d.lst                            |    1 
 xmlhelp/gsource/com/sun/star/help/makefile.mk |    3 +
 20 files changed, 75 insertions(+), 49 deletions(-)

Index: workspace.targetedaot.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.targetedaot.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- workspace.targetedaot.patch	10 Mar 2006 18:54:59 -0000	1.3
+++ workspace.targetedaot.patch	22 Apr 2006 17:21:41 -0000	1.4
@@ -1,29 +1,165 @@
+Index: configure.in
+===================================================================
+RCS file: /cvs/tools/config_office/configure.in,v
+retrieving revision 1.161
+diff -u -r1.161 configure.in
+--- openoffice.org.orig/config_office/gconfigure.in	29 Mar 2006 12:47:51 -0000	1.161
++++ openoffice.org/config_office/gconfigure.in	22 Apr 2006 16:24:12 -0000
+@@ -340,6 +340,15 @@
+                           or XML filters. Use --with-java=gij to enable gij/gcj
+                           as java/javac replacements
+ ], if test "$withval" = "yes"; then WITH_JAVA=java; else WITH_JAVA=$withval; fi, WITH_JAVA=java)
++AC_ARG_ENABLE(gcjaot,
++[  --enable-gcjaot        Build with[[out]] using Ahead of Time java compilation support. 
++                          If you have gcj installed then --with-aot will enable gcj ahead of time
++                          support for a (hopefully) faster build. This does not require you to
++                          use gcj to compile the java code contained in OpenOffice.org, this is an 
++                          additional step taken to compile to native binaries the java helpers used 
++                          during buildtime which have already been built to bytecode from the compiler 
++                          used in --with-java
++],,)
+ AC_ARG_WITH(ant-home,
+ [  --with-ant-home         If you have installed Jakarta Ant on your system,
+                           please supply the path here.
+@@ -386,7 +395,7 @@
+ [  --with-nmake-path       For MS Visual Toolkit compiler users, please supply
+                           the path pointing to the nmake.exe. The Platform SDK
+                           provides one in the Win64 directory, usually something
+-                          like: /cygdrive/c/Programme/Microsoft SDK/Bin/Win64"
++                          like: "/cygdrive/c/Programme/Microsoft SDK/Bin/Win64"
+  
+                           Usage: --with-nmake-path=<absolute path to nmake.exe>
+ ],,)
+@@ -2102,33 +2111,41 @@
+ fi
+ 
+ dnl ===================================================================
+-dnl Check for optional gcj-dbtool, use if compiler is gcj
++dnl Check for optional gcj for AOT
+ dnl ===================================================================
+-if test `$JAVACOMPILER --version 2>&1 | grep -c "gcj"` -gt 0; then
+-   if test `echo $WITH_JAVA | grep -c "gij"` -eq 0; then
+-      javacache="gcj-dbtool"
+-   else
+-      javacache=`echo $WITH_JAVA | $SED -e "s/gij/gcj-dbtool/g"`
+-   fi
+-   if test -z "$with_jdk_home"; then
+-      AC_PATH_PROG(JAVACACHE, $javacache)
+-   else
+-      _javac_path="$with_jdk_home/bin/$javacache"
+-      dnl Check if there is a gcj-dbtool at all.
+-      if test -x "$_javac_path"; then
+-         JAVACACHE=$_javac_path
+-      fi
+-   fi
+-   if test -z "$JAVACACHE"; then
+-      AC_MSG_WARN([$javacache not found set with_jdk_home])
+-   fi
++if test "$SOLAR_JAVA" != ""; then
++  AC_MSG_CHECKING([whether to enable gcj aot compilation])
++  if test -n "$enable_gcjaot" && test "$enable_gcjaot" != "no"; then
++     AC_MSG_RESULT([yes])
++     if test `echo $WITH_JAVA | grep -c "gij"` -eq 0; then
++        gcjaot="gcj"
++     else
++        gcjaot=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g"`
++     fi
++     AC_MSG_RESULT([$gcjaot])
++     if test -n "$with_jdk_home"; then
++        _javac_path="$with_jdk_home/bin/$gcjaot"
++        dnl Check if there is a gcj-dbtool at all.
++        if test -x "$_javac_path"; then
++           JAVAAOTCOMPILER=$_javac_path
++        fi
++     fi
++     if test -z "$JAVAAOTCOMPILER"; then
++        AC_PATH_PROG(JAVAAOTCOMPILER, $gcjaot)
++     fi
++     if test -z "$JAVAAOTCOMPILER,"; then
++        AC_MSG_WARN([$gcjaot not found, set with_jdk_home])
++     fi
++  else
++     AC_MSG_RESULT([no])
++  fi
+ fi
+ 
+ AC_SUBST(JAVA_HOME)
+ AC_SUBST(JDK)
+ AC_SUBST(JAVAINTERPRETER)
+ AC_SUBST(JAVACOMPILER)
+-AC_SUBST(JAVACACHE)
++AC_SUBST(JAVAAOTCOMPILER)
+ AC_SUBST(JAVADOC)
+ 
+ if test "$NEEDXSLTPROC" = "no" && test -z "$enable_xsltproc"; then
+Index: set_soenv.in
+===================================================================
+RCS file: /cvs/tools/config_office/set_soenv.in,v
+retrieving revision 1.97
+diff -u -r1.97 set_soenv.in
+--- openoffice.org.orig/config_office/gset_soenv.in	7 Apr 2006 08:02:29 -0000	1.97
++++ openoffice.org/config_office/gset_soenv.in	22 Apr 2006 16:24:14 -0000
+@@ -78,7 +78,7 @@
+      $UPD, $SOLARUPD, $WORK_STAMP, $TF_UCB, 
+      $SOLARROOT, $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV, 
+      $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI, 
+-     $STAR_REGISTRY, $STAR_RESOURCEPATH, $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, $GCJ_DATABASE,
++     $STAR_REGISTRY, $STAR_RESOURCEPATH, $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH,
+      $MSPDB_PATH, $MIDL_PATH, $CSC_PATH, $NMAKE_PATH, 
+      $LD_LIBRARY_PATH, $PATH, $SOLARDEF, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, 
+      $SOLARINC, $LOCALINI, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
+@@ -895,8 +895,6 @@
+ # Location of the JDK supported standard classes.zip file.
+ # see above for why the change
+ $XCLASSPATH           = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$ps.'.';
+-# Location of gcj cache
+-$GCJ_DATABASE = '$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.$ds."openoffice.org.gcjdb";
+ 
+ # Paths to run time shared libraries.
+ if ($platform =~ m/solaris/) 
+@@ -1655,8 +1653,6 @@
+    ToFile( "XCLASSPATH",        $XCLASSPATH,        "e" );
+ }
+ else {
+-   ToFile( "GCJ_DATABASE",     $GCJ_DATABASE,       "e" );
+-   ToFile( "JAVACACHE",        '@JAVACACHE@',       "e" );
+    ToFile( "AWTLIB",           '@AWTLIB@',          "e" );
+ }
+ if ( '@JDK@' ne '' )
+@@ -1664,6 +1660,7 @@
+    ToFile( "JDK",             "@JDK@",           "e" );
+    ToFile( "JAVAINTERPRETER", "@JAVAINTERPRETER@","e" );
+    ToFile( "JAVACOMPILER",    "@JAVACOMPILER@",  "e" );
++   ToFile( "JAVAAOTCOMPILER", '@JAVAAOTCOMPILER@',"e" );
+    ToFile( "JAVADOC",         "@JAVADOC@",       "e" );
+ }
+ if ( $platform =~ m/darwin/ )
 Index: source/config/fragments/makefile.mk
 ===================================================================
 RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
-retrieving revision 1.16.16.1
-diff -u -r1.16.16.1 makefile.mk
---- openoffice.org.orig/filter/source/config/fragments/makefile.mk	17 Jan 2006 11:03:31 -0000	1.16.16.1
-+++ openoffice.org/filter/source/config/fragments/makefile.mk	26 Jan 2006 11:09:31 -0000
+retrieving revision 1.17
+diff -u -r1.17 makefile.mk
+--- openoffice.org.orig/filter/gsource/config/fragments/makefile.mk	16 Mar 2006 11:08:21 -0000	1.17
++++ openoffice.org/filter/gsource/config/fragments/makefile.mk	22 Apr 2006 16:28:44 -0000
 @@ -155,7 +155,11 @@
  #cmc, hack to workaround the java build requirement
  MERGE:=python ../tools/merge/pyAltFCFGMerge
  .ELSE
-+.IF "$(JAVACACHE)" != ""
++.IF "$(JAVAAOTCOMPILER)" != ""
 +MERGE    := $(BIN)$/FCFGMerge
 +.ELSE
  MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
 +.ENDIF
- XALAN_JAR*=$(SOLARBINDIR)$/xalan.jar
- PACKLANG := $(JAVAI) $(JAVACPS) $(XALAN_JAR) org.apache.xalan.xslt.Process -XSL langfilter.xsl
+ PACKLANG := $(JAVAI) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
  .ENDIF
+ 
 Index: source/config/tools/merge/makefile.mk
 ===================================================================
 RCS file: /cvs/framework/filter/source/config/tools/merge/makefile.mk,v
 retrieving revision 1.5
 diff -u -r1.5 makefile.mk
---- openoffice.org.orig/filter/source/config/tools/merge/makefile.mk	8 Sep 2005 21:35:57 -0000	1.5
-+++ openoffice.org/filter/source/config/tools/merge/makefile.mk	26 Jan 2006 11:09:33 -0000
+--- openoffice.org.orig/filter/gsource/config/tools/merge/makefile.mk	8 Sep 2005 21:35:57 -0000	1.5
++++ openoffice.org/filter/gsource/config/tools/merge/makefile.mk	22 Apr 2006 16:29:21 -0000
 @@ -75,6 +75,9 @@
  
  JARTARGET       =   $(TARGET).jar
@@ -37,39 +173,27 @@
 Index: util/target.pmk
 ===================================================================
 RCS file: /cvs/documentation/helpcontent2/util/target.pmk,v
-retrieving revision 1.12
-diff -u -r1.12 target.pmk
---- openoffice.org.orig/helpcontent2/util/target.pmk	5 Jan 2006 14:44:39 -0000	1.12
-+++ openoffice.org/helpcontent2/util/target.pmk	26 Jan 2006 11:11:17 -0000
-@@ -42,6 +42,11 @@
- 
- .IF "$(SYSTEM_DB)" != "YES"
- JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
-+.ELSE
-+.IF "$(JAVACACHE)" != ""
-+CLASSPATH!:=$(my_cp)
-+.EXPORT : CLASSPATH
-+.ENDIF
- .ENDIF
- 
- .IF "$(JDK)" != "gcj"
-@@ -50,5 +55,8 @@
+retrieving revision 1.13
+diff -u -r1.13 target.pmk
+--- openoffice.org.orig/helpcontent2/gutil/target.pmk	16 Mar 2006 11:10:20 -0000	1.13
++++ openoffice.org/helpcontent2/gutil/target.pmk	22 Apr 2006 16:37:36 -0000
+@@ -50,5 +50,9 @@
  
  $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag
  	@+-$(MKDIR) -p $(@:d)
-+.IF "$(JAVACACHE)" != ""
++.IF "$(JAVAAOTCOMPILER)" != ""
 +	HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
-+.ELSE
- 	$(JAVAI) $(JAVA_VM_HEAP_SIZE) $(JAVA_LIBRARY_PATH) -cp $(my_cp) com.sun.star.help.HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
--
++ .ELSE
+ 	$(JAVAI) $(JAVA_VM_HEAP_SIZE) $(JAVA_LIBRARY_PATH) -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl -cp $(my_cp) com.sun.star.help.HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
 +.ENDIF
+ 
 Index: bin/deliver.pl
 ===================================================================
 RCS file: /cvs/tools/solenv/bin/deliver.pl,v
 retrieving revision 1.98
 diff -u -r1.98 deliver.pl
---- openoffice.org.orig/solenv/bin/deliver.pl	13 Jan 2006 16:36:04 -0000	1.98
-+++ openoffice.org/solenv/bin/deliver.pl	26 Jan 2006 11:09:09 -0000
+--- openoffice.org.orig/solenv/gbin/deliver.pl	13 Jan 2006 16:36:04 -0000	1.98
++++ openoffice.org/solenv/gbin/deliver.pl	22 Apr 2006 16:38:19 -0000
 @@ -744,19 +744,6 @@
      return $rc;
  };
@@ -113,39 +237,41 @@
 Index: inc/settings.mk
 ===================================================================
 RCS file: /cvs/tools/solenv/inc/settings.mk,v
-retrieving revision 1.184
-diff -u -r1.184 settings.mk
---- openoffice.org.orig/solenv/inc/settings.mk	13 Jan 2006 16:36:21 -0000	1.184
-+++ openoffice.org/solenv/inc/settings.mk	26 Jan 2006 11:09:10 -0000
-@@ -188,7 +188,7 @@
+retrieving revision 1.188
+diff -u -r1.188 settings.mk
+--- openoffice.org.orig/solenv/ginc/settings.mk	9 Mar 2006 14:01:40 -0000	1.188
++++ openoffice.org/solenv/ginc/settings.mk	22 Apr 2006 16:39:26 -0000
+@@ -188,10 +188,6 @@
  #required arguments
- .IF "$(JAVACACHE)" != ""
- JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -O2 -fno-assert -Wno-deprecated -C
--JAVAI=$(JAVAINTERPRETER) -Dgnu.gcj.precompiled.db.path=$(GCJ_DATABASE)
-+JAVAI=$(JAVAINTERPRETER)
- .ELSE
  JAVAC=$(JAVACOMPILER)
  JAVAI=$(JAVAINTERPRETER)
+-.IF "$(JAVACACHE)" != ""
+-JAVAC+=--encoding=UTF-8 -O2 -fno-assert -Wno-deprecated -C
+-JAVAI+=-Dgnu.gcj.precompiled.db.path=$(GCJ_DATABASE)
+-.ENDIF
+ 
+ #classpath and response
+ .IF "$(JDK)" == "J++"
 Index: inc/target.mk
 ===================================================================
 RCS file: /cvs/tools/solenv/inc/target.mk,v
-retrieving revision 1.162
-diff -u -r1.162 target.mk
---- openoffice.org.orig/solenv/inc/target.mk	14 Dec 2005 15:37:20 -0000	1.162
-+++ openoffice.org/solenv/inc/target.mk	26 Jan 2006 11:09:12 -0000
+retrieving revision 1.165
+diff -u -r1.165 target.mk
+--- openoffice.org.orig/solenv/ginc/target.mk	7 Apr 2006 08:01:46 -0000	1.165
++++ openoffice.org/solenv/ginc/target.mk	22 Apr 2006 16:39:29 -0000
 @@ -437,6 +437,11 @@
  JARTARGETDEP=$(JARTARGET).dep
  JARTARGETDEPN=$(MISC)$/$(JARTARGET).dep
  .ENDIF			# "$(NOJARDEP)$(NEW_JAR_PACK)"==""
 +.IF "$(AOTTARGET)"!=""
-+.IF "$(JAVACACHE)" != ""
++.IF "$(JAVAAOTCOMPILER)" != ""
 +AOTTARGETN=$(SOLARBINDIR)$/$(AOTTARGET)
-+.ENDIF			# "$(JAVACACHE)" != ""
++.ENDIF			# "$(JAVAAOTCOMPILER)" != ""
 +.ENDIF			# "$(AOTTARGET)"!=""
  .ENDIF			# "$(JARTARGET)"!=""
  .ELSE			# "$(SOLAR_JAVA)"!=""
  JAVACLASSFILES:=
-@@ -1791,6 +1796,7 @@
+@@ -1790,6 +1795,7 @@
  		$(APP1TARGETN)	$(APP2TARGETN)	$(APP3TARGETN)		\
  		$(APP4TARGETN)	$(APP5TARGETN)	$(APP6TARGETN)		\
  		$(APP7TARGETN)	$(APP8TARGETN)	$(APP9TARGETN)		\
@@ -158,9 +284,9 @@
 RCS file: /cvs/tools/solenv/inc/tg_jar.mk,v
 retrieving revision 1.18
 diff -u -r1.18 tg_jar.mk
---- openoffice.org.orig/solenv/inc/tg_jar.mk	14 Dec 2005 15:37:35 -0000	1.18
-+++ openoffice.org/solenv/inc/tg_jar.mk	26 Jan 2006 11:09:12 -0000
-@@ -90,5 +108,19 @@
+--- openoffice.org.orig/solenv/ginc/tg_jar.mk	14 Dec 2005 15:37:35 -0000	1.18
++++ openoffice.org/solenv/ginc/tg_jar.mk	22 Apr 2006 16:39:30 -0000
+@@ -90,5 +90,19 @@
  	+cd $(CLASSDIR)$/$(TARGET) && zip -u -rX ..$/$(@:f) $(subst,$(CLASSDIR)$/$(TARGET)$/, $(JARMANIFEST)) $(CHECKZIPRESULT)
  .ENDIF			# "$(JARMANIFEST)"!=""
  	+cd $(CLASSDIR) && zip -u -rX $(@:f) $(subst,\,/ $(JARCLASSDIRS)) $(CHECKZIPRESULT)
@@ -170,10 +296,10 @@
 +AOTLINKFLAGS=$(subst,.so, $(subst,$(SOLARLIBDIR)$/lib,-l $(AOTFILES)))
 +
 +$(SOLARLIBDIR)$/lib%.jar.so : $(SOLARBINDIR)$/%.jar
-+	$(JAVACOMPILER) -shared -fPIC -Wl,-Bsymbolic -O2 --no-bounds-check -fno-store-check -findirect-dispatch -fjni -o $@ $<
++	$(JAVAAOTCOMPILER) -shared -fPIC -Wl,-Bsymbolic -O2 --no-bounds-check -fno-store-check -findirect-dispatch -fjni -o $@ $<
 +
 +$(AOTTARGETN) : $(JARTARGETN) $(AOTFILES)
-+	$(JAVACOMPILER) --main=$(AOTCLASSNAME) -o $(BIN)$/$(AOTTARGET) \
++	$(JAVAAOTCOMPILER) --main=$(AOTCLASSNAME) -o $(BIN)$/$(AOTTARGET) \
 +		-Wl,-Bsymbolic -O2 --no-bounds-check -fno-store-check -findirect-dispatch -fjni \
 +		$(JAVACPS) $(CLASSPATH) $(JARTARGETN) $(SOLARLIB) -L$(LB) \
 +		$(AOTLINKFLAGS)
@@ -185,8 +311,8 @@
 RCS file: /cvs/util/xmlhelp/prj/d.lst,v
 retrieving revision 1.13
 diff -u -r1.13 d.lst
---- openoffice.org.orig/xmlhelp/prj/d.lst	16 Jan 2006 12:34:13 -0000	1.13
-+++ openoffice.org/xmlhelp/prj/d.lst	26 Jan 2006 10:57:58 -0000
+--- openoffice.org.orig/xmlhelp/gprj/d.lst	16 Jan 2006 12:34:13 -0000	1.13
++++ openoffice.org/xmlhelp/gprj/d.lst	22 Apr 2006 16:40:37 -0000
 @@ -1,4 +1,5 @@
  ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.*
 +..\%__SRC%\bin\HelpLinker %_DEST%\bin%_EXT%\HelpLinker
@@ -196,10 +322,10 @@
 Index: source/com/sun/star/help/makefile.mk
 ===================================================================
 RCS file: /cvs/util/xmlhelp/source/com/sun/star/help/makefile.mk,v
-retrieving revision 1.21.2.1
-diff -u -r1.21.2.1 makefile.mk
---- openoffice.org.orig/xmlhelp/source/com/sun/star/help/makefile.mk	19 Jan 2006 14:48:36 -0000	1.21.2.1
-+++ openoffice.org/xmlhelp/source/com/sun/star/help/makefile.mk	26 Jan 2006 10:57:59 -0000
+retrieving revision 1.22
+diff -u -r1.22 makefile.mk
+--- openoffice.org.orig/xmlhelp/gsource/com/sun/star/help/makefile.mk	16 Mar 2006 11:17:16 -0000	1.22
++++ openoffice.org/xmlhelp/gsource/com/sun/star/help/makefile.mk	22 Apr 2006 16:40:45 -0000
 @@ -96,6 +96,9 @@
  JARCOMPRESS 	= TRUE
  CUSTOMMANIFESTFILE = manifest



From fedora-cvs-commits at redhat.com  Sat Apr 22 17:43:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Apr 2006 13:43:02 -0400
Subject: rpms/openoffice.org/devel workspace.targetedaot.patch,1.4,1.5
Message-ID: <200604221743.k3MHh2BG022466@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22439

Modified Files:
	workspace.targetedaot.patch 
Log Message:
bad foo

workspace.targetedaot.patch:
 bin/deliver.pl                               |    0 
 config_office/configure.in                   |   59 +++++++++++++++++----------
 config_office/set_soenv.in                   |    7 ---
 filter/source/config/fragments/makefile.mk   |    4 +
 filter/source/config/tools/merge/makefile.mk |    3 +
 helpcontent2/util/target.pmk                 |    4 +
 inc/settings.mk                              |    0 
 inc/target.mk                                |    0 
 inc/tg_jar.mk                                |    0 
 prj/d.lst                                    |    0 
 solenv/bin/deliver.pl                        |   19 --------
 solenv/inc/settings.mk                       |    4 -
 solenv/inc/target.mk                         |    6 ++
 solenv/inc/tg_jar.mk                         |   14 ++++++
 source/com/sun/star/help/makefile.mk         |    0 
 source/config/fragments/makefile.mk          |    0 
 source/config/tools/merge/makefile.mk        |    0 
 util/target.pmk                              |    0 
 xmlhelp/prj/d.lst                            |    1 
 xmlhelp/source/com/sun/star/help/makefile.mk |    3 +
 20 files changed, 75 insertions(+), 49 deletions(-)

Index: workspace.targetedaot.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.targetedaot.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- workspace.targetedaot.patch	22 Apr 2006 17:21:41 -0000	1.4
+++ workspace.targetedaot.patch	22 Apr 2006 17:43:00 -0000	1.5
@@ -3,8 +3,8 @@
 RCS file: /cvs/tools/config_office/configure.in,v
 retrieving revision 1.161
 diff -u -r1.161 configure.in
---- openoffice.org.orig/config_office/gconfigure.in	29 Mar 2006 12:47:51 -0000	1.161
-+++ openoffice.org/config_office/gconfigure.in	22 Apr 2006 16:24:12 -0000
+--- openoffice.org.orig/config_office/configure.in	29 Mar 2006 12:47:51 -0000	1.161
++++ openoffice.org/config_office/configure.in	22 Apr 2006 16:24:12 -0000
 @@ -340,6 +340,15 @@
                            or XML filters. Use --with-java=gij to enable gij/gcj
                            as java/javac replacements
@@ -97,8 +97,8 @@
 RCS file: /cvs/tools/config_office/set_soenv.in,v
 retrieving revision 1.97
 diff -u -r1.97 set_soenv.in
---- openoffice.org.orig/config_office/gset_soenv.in	7 Apr 2006 08:02:29 -0000	1.97
-+++ openoffice.org/config_office/gset_soenv.in	22 Apr 2006 16:24:14 -0000
+--- openoffice.org.orig/config_office/set_soenv.in	7 Apr 2006 08:02:29 -0000	1.97
++++ openoffice.org/config_office/set_soenv.in	22 Apr 2006 16:24:14 -0000
 @@ -78,7 +78,7 @@
       $UPD, $SOLARUPD, $WORK_STAMP, $TF_UCB, 
       $SOLARROOT, $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV, 
@@ -139,8 +139,8 @@
 RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
 retrieving revision 1.17
 diff -u -r1.17 makefile.mk
---- openoffice.org.orig/filter/gsource/config/fragments/makefile.mk	16 Mar 2006 11:08:21 -0000	1.17
-+++ openoffice.org/filter/gsource/config/fragments/makefile.mk	22 Apr 2006 16:28:44 -0000
+--- openoffice.org.orig/filter/source/config/fragments/makefile.mk	16 Mar 2006 11:08:21 -0000	1.17
++++ openoffice.org/filter/source/config/fragments/makefile.mk	22 Apr 2006 16:28:44 -0000
 @@ -155,7 +155,11 @@
  #cmc, hack to workaround the java build requirement
  MERGE:=python ../tools/merge/pyAltFCFGMerge
@@ -158,8 +158,8 @@
 RCS file: /cvs/framework/filter/source/config/tools/merge/makefile.mk,v
 retrieving revision 1.5
 diff -u -r1.5 makefile.mk
---- openoffice.org.orig/filter/gsource/config/tools/merge/makefile.mk	8 Sep 2005 21:35:57 -0000	1.5
-+++ openoffice.org/filter/gsource/config/tools/merge/makefile.mk	22 Apr 2006 16:29:21 -0000
+--- openoffice.org.orig/filter/source/config/tools/merge/makefile.mk	8 Sep 2005 21:35:57 -0000	1.5
++++ openoffice.org/filter/source/config/tools/merge/makefile.mk	22 Apr 2006 16:29:21 -0000
 @@ -75,6 +75,9 @@
  
  JARTARGET       =   $(TARGET).jar
@@ -175,8 +175,8 @@
 RCS file: /cvs/documentation/helpcontent2/util/target.pmk,v
 retrieving revision 1.13
 diff -u -r1.13 target.pmk
---- openoffice.org.orig/helpcontent2/gutil/target.pmk	16 Mar 2006 11:10:20 -0000	1.13
-+++ openoffice.org/helpcontent2/gutil/target.pmk	22 Apr 2006 16:37:36 -0000
+--- openoffice.org.orig/helpcontent2/util/target.pmk	16 Mar 2006 11:10:20 -0000	1.13
++++ openoffice.org/helpcontent2/util/target.pmk	22 Apr 2006 16:37:36 -0000
 @@ -50,5 +50,9 @@
  
  $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag
@@ -192,8 +192,8 @@
 RCS file: /cvs/tools/solenv/bin/deliver.pl,v
 retrieving revision 1.98
 diff -u -r1.98 deliver.pl
---- openoffice.org.orig/solenv/gbin/deliver.pl	13 Jan 2006 16:36:04 -0000	1.98
-+++ openoffice.org/solenv/gbin/deliver.pl	22 Apr 2006 16:38:19 -0000
+--- openoffice.org.orig/solenv/bin/deliver.pl	13 Jan 2006 16:36:04 -0000	1.98
++++ openoffice.org/solenv/bin/deliver.pl	22 Apr 2006 16:38:19 -0000
 @@ -744,19 +744,6 @@
      return $rc;
  };
@@ -239,8 +239,8 @@
 RCS file: /cvs/tools/solenv/inc/settings.mk,v
 retrieving revision 1.188
 diff -u -r1.188 settings.mk
---- openoffice.org.orig/solenv/ginc/settings.mk	9 Mar 2006 14:01:40 -0000	1.188
-+++ openoffice.org/solenv/ginc/settings.mk	22 Apr 2006 16:39:26 -0000
+--- openoffice.org.orig/solenv/inc/settings.mk	9 Mar 2006 14:01:40 -0000	1.188
++++ openoffice.org/solenv/inc/settings.mk	22 Apr 2006 16:39:26 -0000
 @@ -188,10 +188,6 @@
  #required arguments
  JAVAC=$(JAVACOMPILER)
@@ -257,8 +257,8 @@
 RCS file: /cvs/tools/solenv/inc/target.mk,v
 retrieving revision 1.165
 diff -u -r1.165 target.mk
---- openoffice.org.orig/solenv/ginc/target.mk	7 Apr 2006 08:01:46 -0000	1.165
-+++ openoffice.org/solenv/ginc/target.mk	22 Apr 2006 16:39:29 -0000
+--- openoffice.org.orig/solenv/inc/target.mk	7 Apr 2006 08:01:46 -0000	1.165
++++ openoffice.org/solenv/inc/target.mk	22 Apr 2006 16:39:29 -0000
 @@ -437,6 +437,11 @@
  JARTARGETDEP=$(JARTARGET).dep
  JARTARGETDEPN=$(MISC)$/$(JARTARGET).dep
@@ -284,8 +284,8 @@
 RCS file: /cvs/tools/solenv/inc/tg_jar.mk,v
 retrieving revision 1.18
 diff -u -r1.18 tg_jar.mk
---- openoffice.org.orig/solenv/ginc/tg_jar.mk	14 Dec 2005 15:37:35 -0000	1.18
-+++ openoffice.org/solenv/ginc/tg_jar.mk	22 Apr 2006 16:39:30 -0000
+--- openoffice.org.orig/solenv/inc/tg_jar.mk	14 Dec 2005 15:37:35 -0000	1.18
++++ openoffice.org/solenv/inc/tg_jar.mk	22 Apr 2006 16:39:30 -0000
 @@ -90,5 +90,19 @@
  	+cd $(CLASSDIR)$/$(TARGET) && zip -u -rX ..$/$(@:f) $(subst,$(CLASSDIR)$/$(TARGET)$/, $(JARMANIFEST)) $(CHECKZIPRESULT)
  .ENDIF			# "$(JARMANIFEST)"!=""
@@ -311,8 +311,8 @@
 RCS file: /cvs/util/xmlhelp/prj/d.lst,v
 retrieving revision 1.13
 diff -u -r1.13 d.lst
---- openoffice.org.orig/xmlhelp/gprj/d.lst	16 Jan 2006 12:34:13 -0000	1.13
-+++ openoffice.org/xmlhelp/gprj/d.lst	22 Apr 2006 16:40:37 -0000
+--- openoffice.org.orig/xmlhelp/prj/d.lst	16 Jan 2006 12:34:13 -0000	1.13
++++ openoffice.org/xmlhelp/prj/d.lst	22 Apr 2006 16:40:37 -0000
 @@ -1,4 +1,5 @@
  ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.*
 +..\%__SRC%\bin\HelpLinker %_DEST%\bin%_EXT%\HelpLinker
@@ -324,8 +324,8 @@
 RCS file: /cvs/util/xmlhelp/source/com/sun/star/help/makefile.mk,v
 retrieving revision 1.22
 diff -u -r1.22 makefile.mk
---- openoffice.org.orig/xmlhelp/gsource/com/sun/star/help/makefile.mk	16 Mar 2006 11:17:16 -0000	1.22
-+++ openoffice.org/xmlhelp/gsource/com/sun/star/help/makefile.mk	22 Apr 2006 16:40:45 -0000
+--- openoffice.org.orig/xmlhelp/source/com/sun/star/help/makefile.mk	16 Mar 2006 11:17:16 -0000	1.22
++++ openoffice.org/xmlhelp/source/com/sun/star/help/makefile.mk	22 Apr 2006 16:40:45 -0000
 @@ -96,6 +96,9 @@
  JARCOMPRESS 	= TRUE
  CUSTOMMANIFESTFILE = manifest



From fedora-cvs-commits at redhat.com  Sat Apr 22 17:48:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Apr 2006 13:48:34 -0400
Subject: rpms/kernel/devel/configs config-xen-generic,1.15,1.16
Message-ID: <200604221748.k3MHmYb0005442@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv5293/configs

Modified Files:
	config-xen-generic 
Log Message:
rebase xen & enable it


Index: config-xen-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-generic,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- config-xen-generic	14 Apr 2006 18:34:18 -0000	1.15
+++ config-xen-generic	22 Apr 2006 17:48:29 -0000	1.16
@@ -19,6 +19,7 @@
 # CONFIG_XEN_PCIDEV_FRONTEND is not set
 # CONFIG_XEN_PCIDEV_FE_DEBUG is not set
 CONFIG_XEN_NETDEV_LOOPBACK=y
+CONFIG_XEN_BACKEND=y
 
 #
 # X86 Processor Configuration
@@ -124,3 +125,4 @@
 # CONFIG_PCI_GOANY is not set
 CONFIG_PCI_DIRECT=y
 CONFIG_PCIEPORTBUS=y
+# CONFIG_TCG_TPM is not set



From fedora-cvs-commits at redhat.com  Sat Apr 22 17:48:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Apr 2006 13:48:33 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2149,
	1.2150 linux-2.6-devmem-xen.patch, 1.2,
	1.3 linux-2.6-xen-compile-fixes.patch, 1.7,
	1.8 linux-2.6-xen.patch, 1.12, 1.13
Message-ID: <200604221748.k3MHmXtT005432@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5293

Modified Files:
	kernel-2.6.spec linux-2.6-devmem-xen.patch 
	linux-2.6-xen-compile-fixes.patch linux-2.6-xen.patch 
Log Message:
rebase xen & enable it


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2149
retrieving revision 1.2150
diff -u -r1.2149 -r1.2150
--- kernel-2.6.spec	21 Apr 2006 18:11:05 -0000	1.2149
+++ kernel-2.6.spec	22 Apr 2006 17:48:28 -0000	1.2150
@@ -7,7 +7,7 @@
 %define buildsmp 0
 %define buildpae 0
 # Whether to apply the Xen patches, leave this enabled.
-%define includexen 0
+%define includexen 1
 # Whether to build the Xen kernels, disable if you want.
 %define buildxen 1
 %define buildxenPAE 0
@@ -781,8 +781,9 @@
 #
 # ... and back out all the ia64-specific sections, as they currently prevent
 # non-xen builds from working.
+# Now also with tpm
 #
-for f in `find arch/ia64/ include/asm-ia64/ include/xen/interface/arch-ia64.h* -type f -name "*.p.xen"` ; do \
+for f in `find drivers/char/tpm arch/ia64/ include/asm-ia64/ include/xen/interface/arch-ia64.h* -type f -name "*.p.xen"` ; do \
     g=`dirname $f`/`basename $f .p.xen`; \
     mv "$f" "$g"; \
     if [ ! -s "$g" ] ; then rm -f "$g" ; fi; \
@@ -1659,6 +1660,11 @@
 %endif
 
 %changelog
+* Sat Apr 22 2006 Juan Quintela <quintela at redhat.com>
+- rebase xen.
+- fix x86_64 xen (thanks chris).
+- enable xen again.
+
 * Fri Apr 21 2006 Dave Jones <davej at redhat.com>
 - Make Promise PATA on SATA work again (thanks Jim Bevier)
 - 2.6.17rc2-git4

linux-2.6-devmem-xen.patch:
 arch/i386/mm/init-xen.c                |   11 +++++++++++
 arch/x86_64/mm/init-xen.c              |   26 ++++++++++++++++++++++++++
 include/asm-i386/mach-xen/asm/page.h   |    1 +
 include/asm-x86_64/mach-xen/asm/page.h |    4 ++++
 4 files changed, 42 insertions(+)

Index: linux-2.6-devmem-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/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	14 Apr 2006 18:11:39 -0000	1.2
+++ linux-2.6-devmem-xen.patch	22 Apr 2006 17:48:28 -0000	1.3
@@ -19,22 +19,6 @@
  #ifdef CONFIG_HIGHMEM
  pte_t *kmap_pte;
  pgprot_t kmap_prot;
-@@ -734,6 +745,7 @@ void __init mem_init(void)
-  * Specifically, in the case of x86, we will always add
-  * memory to the highmem for now.
-  */
-+#ifdef CONFIG_HOTPLUG_MEMORY
- #ifndef CONFIG_NEED_MULTIPLE_NODES
- int add_memory(u64 start, u64 size)
- {
-@@ -750,6 +762,7 @@ int remove_memory(u64 start, u64 size)
- 	return -EINVAL;
- }
- #endif
-+#endif
- 
- kmem_cache_t *pgd_cache;
- kmem_cache_t *pmd_cache;
 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

linux-2.6-xen-compile-fixes.patch:
 arch/i386/kernel/acpi/boot-xen.c                             |    3 +-
 arch/x86_64/kernel/head-xen.S                                |    1 
 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.16.work/arch/x86_64/ia32/Makefile                  |    2 -
 16 files changed, 49 insertions(+), 11 deletions(-)

Index: linux-2.6-xen-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-compile-fixes.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-xen-compile-fixes.patch	14 Apr 2006 20:49:32 -0000	1.7
+++ linux-2.6-xen-compile-fixes.patch	22 Apr 2006 17:48:28 -0000	1.8
@@ -1,14 +1,3 @@
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/i386/mm/init-xen.c linux-2.6.15.xen/arch/i386/mm/init-xen.c
---- linux-2.6.15.orig/arch/i386/mm/init-xen.c	2006-02-22 15:56:24.000000000 +0100
-+++ linux-2.6.15.xen/arch/i386/mm/init-xen.c	2006-02-22 18:56:27.000000000 +0100
-@@ -34,6 +34,7 @@
- #include <asm/system.h>
- #include <asm/uaccess.h>
- #include <asm/pgtable.h>
-+#include <asm-i386/mach-xen/asm/swiotlb.h>
- #include <asm/dma.h>
- #include <asm/fixmap.h>
- #include <asm/e820.h>
 diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/x86_64/kernel/process-xen.c linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c
 --- linux-2.6.15.orig/arch/x86_64/kernel/process-xen.c	2006-02-22 15:56:20.000000000 +0100
 +++ linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c	2006-02-22 18:32:50.000000000 +0100
@@ -170,19 +159,6 @@
  /* This decides where the kernel will search for a free chunk of vm
   * space during mmap's.
   */
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/i386/kernel/Makefile linux-2.6.15.xen/arch/i386/kernel/Makefile
---- linux-2.6.15.orig/arch/i386/kernel/Makefile	2006-02-22 15:56:20.000000000 +0100
-+++ linux-2.6.15.xen/arch/i386/kernel/Makefile	2006-02-22 17:08:31.000000000 +0100
-@@ -83,8 +83,7 @@ $(obj)/built-in.o: ld_flags += -R $(obj)
- 
- SYSCFLAGS_vsyscall-syms.o = -r
- $(obj)/vsyscall-syms.o: $(src)/vsyscall.lds \
--			$(foreach F,$(VSYSCALL_TYPES-y),$(obj)/vsyscall-$F.o) \
--			$(obj)/$(vsyscall_note) FORCE
-+			$(obj)/vsyscall-sysenter.o $(obj)/$(vsyscall_note) FORCE
- 	$(call if_changed,syscall)
- 
- ifdef CONFIG_XEN
 diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/i386/kernel/smp-xen.c linux-2.6.15.xen/arch/i386/kernel/smp-xen.c
 --- linux-2.6.15.orig/arch/i386/kernel/smp-xen.c	2006-02-22 15:56:21.000000000 +0100
 +++ linux-2.6.15.xen/arch/i386/kernel/smp-xen.c	2006-02-22 18:29:12.000000000 +0100
@@ -194,16 +170,6 @@
  #if 0
  #include <mach_apic.h>
  #endif
---- linux-2.6.15.ia64/fs/Kconfig~	2006-02-24 14:14:42.000000000 -0500
-+++ linux-2.6.15.ia64/fs/Kconfig	2006-02-24 14:38:17.000000000 -0500
-@@ -841,7 +841,6 @@
- config HUGETLBFS
- 	bool "HugeTLB file system support"
- 	depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN
--	depends !XEN
- 
- config HUGETLB_PAGE
- 	def_bool HUGETLBFS
 diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff kernel-2.6.15/linux-2.6.15.noarch/arch/x86_64/kernel/pmtimer.c linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c
 --- kernel-2.6.15/linux-2.6.15.noarch/arch/x86_64/kernel/pmtimer.c	2006-02-28 22:47:11.000000000 +0100
 +++ linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c	2006-02-28 22:37:45.000000000 +0100
@@ -231,92 +197,6 @@
  	return 0;
  }
  
-diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.works/arch/x86_64/ia32/ia32entry-xen.S linux-2.6.16.noarch/arch/x86_64/ia32/ia32entry-xen.S
---- linux-2.6.16.works/arch/x86_64/ia32/ia32entry-xen.S	2006-04-13 14:19:58.000000000 +0200
-+++ linux-2.6.16.noarch/arch/x86_64/ia32/ia32entry-xen.S	2006-04-13 20:12:17.000000000 +0200
-@@ -17,6 +17,8 @@
- 
- #define __XEN_X86_64 1
- 	
-+#define IA32_NR_syscalls ((ia32_syscall_end - ia32_sys_call_table)/8)
-+
- 	.macro IA32_ARG_FIXUP noebp=0
- 	movl	%edi,%r8d
- 	.if \noebp
-@@ -127,8 +129,8 @@ ENTRY(ia32_sysenter_target)
- 	CFI_REMEMBER_STATE
- 	jnz  sysenter_tracesys
- sysenter_do_call:	
--	cmpl	$(IA32_NR_syscalls),%eax
--	jae	ia32_badsys
-+	cmpl	$(IA32_NR_syscalls-1),%eax
-+	ja	ia32_badsys
- 	IA32_ARG_FIXUP 1
- 	call	*ia32_sys_call_table(,%rax,8)
- 	movq	%rax,RAX-ARGOFFSET(%rsp)
-@@ -231,8 +233,8 @@ ENTRY(ia32_cstar_target)
- 	CFI_REMEMBER_STATE
- 	jnz   cstar_tracesys
- cstar_do_call:	
--	cmpl $IA32_NR_syscalls,%eax
--	jae  ia32_badsys
-+	cmpl $IA32_NR_syscalls-1,%eax
-+	ja  ia32_badsys
- 	IA32_ARG_FIXUP 1
- 	call *ia32_sys_call_table(,%rax,8)
- 	movq %rax,RAX-ARGOFFSET(%rsp)
-@@ -323,8 +325,8 @@ ENTRY(ia32_syscall)
- 	testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP),threadinfo_flags(%r10)
- 	jnz ia32_tracesys
- ia32_do_syscall:	
--	cmpl $(IA32_NR_syscalls),%eax
--	jae  ia32_badsys
-+	cmpl $(IA32_NR_syscalls-1),%eax
-+	ja  ia32_badsys
- 	IA32_ARG_FIXUP
- 	call *ia32_sys_call_table(,%rax,8) # xxx: rip relative
- ia32_sysret:
-@@ -718,6 +720,3 @@ ia32_sys_call_table:
- 	.quad compat_sys_set_robust_list
- 	.quad compat_sys_get_robust_list
- ia32_syscall_end:		
--	.rept IA32_NR_syscalls-(ia32_syscall_end-ia32_sys_call_table)/8
--		.quad ni_syscall
--	.endr
-diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.i686/net/ipv4/netfilter/ip_nat_proto_tcp.c linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_tcp.c
---- linux-2.6.16.i686/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-04-13 23:58:07.000000000 +0200
-+++ linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-04-14 19:39:59.000000000 +0200
-@@ -129,9 +129,12 @@ tcp_manip_pkt(struct sk_buff **pskb,
- 	if (hdrsize < sizeof(*hdr))
- 		return 1;
- 
-+#ifdef CONFIG_XEN
- 	if ((*pskb)->proto_csum_blank) {
- 		hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
-+	} else 
-+#endif
-+	{
--	} else {
- 		hdr->check = ip_nat_cheat_check(~oldip, newip,
- 					ip_nat_cheat_check(oldport ^ 0xFFFF,
- 							   newport,
-diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.i686/net/ipv4/netfilter/ip_nat_proto_udp.c linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_udp.c
---- linux-2.6.16.i686/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-04-13 23:58:39.000000000 +0200
-+++ linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-04-14 19:39:59.000000000 +0200
-@@ -114,9 +114,12 @@ udp_manip_pkt(struct sk_buff **pskb,
- 		portptr = &hdr->dest;
- 	}
- 	if (hdr->check) { /* 0 is a special case meaning no checksum */
-+#ifdef CONFIG_XEN
- 		if ((*pskb)->proto_csum_blank) {
- 			hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
-+		} else 
-+#endif
-+		{
--		} else {
- 			hdr->check = ip_nat_cheat_check(~oldip, newip,
- 					ip_nat_cheat_check(*portptr ^ 0xFFFF,
- 							   newport,
 diff linux-2.6.16.nowork/include/asm-x86_64/ipi.h linux-2.6.16.noarch/include/asm-x86_64/ipi.h
 --- linux-2.6.16.nowork/include/asm-x86_64/ipi.h	2006-03-20 06:53:29.000000000 +0100
 +++ linux-2.6.16.noarch/include/asm-x86_64/ipi.h	2006-04-14 21:46:59.000000000 +0200
@@ -335,3 +215,26 @@
 +#endif
  
  #endif /* __ASM_IPI_H */
+diff -r c68722b17299 arch/x86_64/kernel/head-xen.S
+--- a/arch/x86_64/kernel/head-xen.S	Wed Apr 19 11:47:47 2006 +0100
++++ b/arch/x86_64/kernel/head-xen.S	Fri Apr 21 19:32:49 2006 -0400
+@@ -23,6 +23,7 @@
+ #include <asm/cache.h>
+ 
+ 	.text
++	.section .bootstrap.text
+ 	.code64
+ 	.globl startup_64
+ startup_64:
+diff -urNp --exclude-from=/home/quintela/old/config/misc/dontdiff linux-2.6.16.noarch/arch/x86_64/ia32/Makefile linux-2.6.16.work/arch/x86_64/ia32/Makefile
+--- linux-2.6.16.noarch/arch/x86_64/ia32/Makefile	2006-04-22 19:19:42.000000000 +0200
++++ linux-2.6.16.work/arch/x86_64/ia32/Makefile	2006-04-21 19:36:31.000000000 +0200
+@@ -26,7 +26,7 @@ quiet_cmd_syscall = SYSCALL $@
+ 			   -Wl,-soname=linux-gate.so.1 -o $@ \
+ 			   -Wl,-T,$(filter-out FORCE,$^)
+ 
+-$(obj)/vsyscall-int80.so
++$(obj)/vsyscall-int80.so \
+ $(obj)/vsyscall-sysenter.so $(obj)/vsyscall-syscall.so: \
+ $(obj)/vsyscall-%.so: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE
+ 	$(call if_changed,syscall)

linux-2.6-xen.patch:
 i386/arch/i386/Kconfig                                   |   99 
 i386/arch/i386/Kconfig.cpu                               |    2 
 i386/arch/i386/Kconfig.debug                             |    1 
 i386/arch/i386/Makefile                                  |   24 
 i386/arch/i386/boot-xen/Makefile                         |   21 
 i386/arch/i386/kernel/Makefile                           |   30 
 i386/arch/i386/kernel/acpi/Makefile                      |    4 
 i386/arch/i386/kernel/acpi/boot-xen.c                    | 1170 ++++++
 i386/arch/i386/kernel/apic-xen.c                         |  160 
 i386/arch/i386/kernel/asm-offsets.c                      |    5 
 i386/arch/i386/kernel/cpu/Makefile                       |    5 
 i386/arch/i386/kernel/cpu/common-xen.c                   |  732 ++++
 i386/arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 i386/arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 i386/arch/i386/kernel/early_printk-xen.c                 |    2 
 i386/arch/i386/kernel/entry-xen.S                        |  880 ++++
 i386/arch/i386/kernel/entry.S                            |    4 
 i386/arch/i386/kernel/fixup.c                            |   96 
 i386/arch/i386/kernel/head-xen.S                         |  171 
 i386/arch/i386/kernel/init_task-xen.c                    |   51 
 i386/arch/i386/kernel/io_apic-xen.c                      | 2744 +++++++++++++++
 i386/arch/i386/kernel/ioport-xen.c                       |  122 
 i386/arch/i386/kernel/irq-xen.c                          |  306 +
 i386/arch/i386/kernel/irq.c                              |    4 
 i386/arch/i386/kernel/ldt-xen.c                          |  269 +
 i386/arch/i386/kernel/microcode-xen.c                    |  148 
 i386/arch/i386/kernel/mpparse-xen.c                      | 1176 ++++++
 i386/arch/i386/kernel/pci-dma-xen.c                      |  344 +
 i386/arch/i386/kernel/process-xen.c                      |  824 ++++
 i386/arch/i386/kernel/quirks-xen.c                       |   48 
 i386/arch/i386/kernel/setup-xen.c                        | 1854 ++++++++++
 i386/arch/i386/kernel/smp-xen.c                          |  613 +++
 i386/arch/i386/kernel/swiotlb.c                          |  674 +++
 i386/arch/i386/kernel/sysenter.c                         |   90 
 i386/arch/i386/kernel/time-xen.c                         | 1097 +++++
 i386/arch/i386/kernel/traps-xen.c                        | 1137 ++++++
 i386/arch/i386/kernel/traps.c                            |    9 
 i386/arch/i386/kernel/vm86.c                             |    8 
 i386/arch/i386/kernel/vsyscall-note-xen.S                |   32 
 i386/arch/i386/kernel/vsyscall.S                         |    2 
 i386/arch/i386/mach-xen/Makefile                         |    5 
 i386/arch/i386/mach-xen/setup.c                          |   49 
 i386/arch/i386/mm/Makefile                               |    8 
 i386/arch/i386/mm/fault-xen.c                            |  683 +++
 i386/arch/i386/mm/highmem-xen.c                          |  123 
 i386/arch/i386/mm/hypervisor.c                           |  424 ++
 i386/arch/i386/mm/init-xen.c                             |  882 ++++
 i386/arch/i386/mm/ioremap-xen.c                          |  486 ++
 i386/arch/i386/mm/pageattr.c                             |    2 
 i386/arch/i386/mm/pgtable-xen.c                          |  652 +++
 i386/arch/i386/mm/pgtable.c                              |   12 
 i386/arch/i386/oprofile/Makefile                         |    4 
 i386/arch/i386/oprofile/xenoprof.c                       |  441 ++
 i386/arch/i386/pci/Makefile                              |    9 
 i386/arch/i386/pci/irq-xen.c                             | 1205 ++++++
 i386/arch/i386/pci/pcifront.c                            |   55 
 i386/arch/i386/power/Makefile                            |    4 
 i386/arch/ia64/Kconfig                                   |   51 
 i386/arch/ia64/Makefile                                  |   16 
 i386/arch/ia64/hp/sim/Makefile                           |    2 
 i386/arch/ia64/kernel/entry.S                            |   32 
 i386/arch/ia64/kernel/head.S                             |    6 
 i386/arch/ia64/kernel/pal.S                              |    5 
 i386/arch/ia64/kernel/sal.c                              |    3 
 i386/arch/ia64/kernel/setup.c                            |   32 
 i386/arch/ia64/xen/Makefile                              |    5 
 i386/arch/ia64/xen/drivers/Makefile                      |   20 
 i386/arch/ia64/xen/drivers/README                        |    2 
 i386/arch/ia64/xen/drivers/coreMakefile                  |   26 
 i386/arch/ia64/xen/drivers/evtchn_ia64.c                 |  273 +
 i386/arch/ia64/xen/drivers/patches/blkback.c.patch       |   33 
 i386/arch/ia64/xen/drivers/patches/console.c.patch       |   11 
 i386/arch/ia64/xen/drivers/patches/devmem.c.patch        |    2 
 i386/arch/ia64/xen/drivers/patches/gnttab.c.patch        |   33 
 i386/arch/ia64/xen/drivers/patches/privcmd.c.patch       |   30 
 i386/arch/ia64/xen/drivers/xenia64_init.c                |   55 
 i386/arch/ia64/xen/hypercall.S                           |  365 +
 i386/arch/ia64/xen/xen_ksyms.c                           |   12 
 i386/arch/ia64/xen/xenconsole.c                          |   19 
 i386/arch/ia64/xen/xenentry.S                            |  850 ++++
 i386/arch/ia64/xen/xenhpski.c                            |   19 
 i386/arch/ia64/xen/xenivt.S                              | 2032 +++++++++++
 i386/arch/ia64/xen/xenminstate.h                         |  367 ++
 i386/arch/ia64/xen/xenpal.S                              |   73 
 i386/arch/ia64/xen/xensetup.S                            |   35 
 i386/arch/um/kernel/physmem.c                            |    4 
 i386/arch/x86_64/Kconfig                                 |   60 
 i386/arch/x86_64/Makefile                                |   20 
 i386/arch/x86_64/ia32/ia32entry-xen.S                    |  725 +++
 i386/arch/x86_64/ia32/syscall32-xen.c                    |  128 
 i386/arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 i386/arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 i386/arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 i386/arch/x86_64/kernel/Makefile                         |   20 
 i386/arch/x86_64/kernel/acpi/Makefile                    |    1 
 i386/arch/x86_64/kernel/apic-xen.c                       |  198 +
 i386/arch/x86_64/kernel/asm-offsets.c                    |    2 
 i386/arch/x86_64/kernel/e820-xen.c                       |  777 ++++
 i386/arch/x86_64/kernel/early_printk-xen.c               |  304 +
 i386/arch/x86_64/kernel/entry-xen.S                      | 1141 ++++++
 i386/arch/x86_64/kernel/entry.S                          |    2 
 i386/arch/x86_64/kernel/genapic-xen.c                    |  144 
 i386/arch/x86_64/kernel/genapic_xen.c                    |  162 
 i386/arch/x86_64/kernel/head-xen.S                       |  163 
 i386/arch/x86_64/kernel/head64-xen.c                     |  140 
 i386/arch/x86_64/kernel/init_task.c                      |    3 
 i386/arch/x86_64/kernel/io_apic-xen.c                    | 2231 ++++++++++++
 i386/arch/x86_64/kernel/ioport-xen.c                     |   58 
 i386/arch/x86_64/kernel/irq-xen.c                        |  163 
 i386/arch/x86_64/kernel/irq.c                            |    4 
 i386/arch/x86_64/kernel/ldt-xen.c                        |  282 +
 i386/arch/x86_64/kernel/mpparse-xen.c                    | 1002 +++++
 i386/arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 i386/arch/x86_64/kernel/process-xen.c                    |  802 ++++
 i386/arch/x86_64/kernel/setup-xen.c                      | 1679 +++++++++
 i386/arch/x86_64/kernel/setup64-xen.c                    |  360 +
 i386/arch/x86_64/kernel/smp-xen.c                        |  596 +++
 i386/arch/x86_64/kernel/smp.c                            |    4 
 i386/arch/x86_64/kernel/traps-xen.c                      | 1025 +++++
 i386/arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 i386/arch/x86_64/kernel/x8664_ksyms-xen.c                |  155 
 i386/arch/x86_64/kernel/xen_entry.S                      |   40 
 i386/arch/x86_64/mm/Makefile                             |   10 
 i386/arch/x86_64/mm/fault-xen.c                          |  644 +++
 i386/arch/x86_64/mm/init-xen.c                           | 1176 ++++++
 i386/arch/x86_64/mm/pageattr-xen.c                       |  390 ++
 i386/arch/x86_64/oprofile/Makefile                       |    5 
 i386/arch/x86_64/pci/Makefile                            |   12 
 i386/drivers/Makefile                                    |    1 
 i386/drivers/acpi/Kconfig                                |    3 
 i386/drivers/char/mem.c                                  |    6 
 i386/drivers/char/tpm/Kconfig                            |   14 
 i386/drivers/char/tpm/Makefile                           |    1 
 i386/drivers/char/tpm/tpm.c                              |   44 
 i386/drivers/char/tpm/tpm.h                              |    7 
 i386/drivers/char/tpm/tpm_atmel.c                        |  230 -
 i386/drivers/char/tpm/tpm_nsc.c                          |  395 --
 i386/drivers/char/tpm/tpm_xen.c                          |  536 ++
 i386/drivers/char/tty_io.c                               |    7 
 i386/drivers/firmware/Kconfig                            |    2 
 i386/drivers/pci/Kconfig                                 |    1 
 i386/drivers/serial/Kconfig                              |    1 
 i386/drivers/video/Kconfig                               |    2 
 i386/drivers/xen/Kconfig                                 |  223 +
 i386/drivers/xen/Makefile                                |   22 
 i386/drivers/xen/balloon/Makefile                        |    2 
 i386/drivers/xen/balloon/balloon.c                       |  592 +++
 i386/drivers/xen/blkback/Makefile                        |    3 
 i386/drivers/xen/blkback/blkback.c                       |  597 +++
 i386/drivers/xen/blkback/common.h                        |  145 
 i386/drivers/xen/blkback/interface.c                     |  181 
 i386/drivers/xen/blkback/vbd.c                           |  126 
 i386/drivers/xen/blkback/xenbus.c                        |  421 ++
 i386/drivers/xen/blkfront/Kconfig                        |    6 
 i386/drivers/xen/blkfront/Makefile                       |    5 
 i386/drivers/xen/blkfront/blkfront.c                     |  819 ++++
 i386/drivers/xen/blkfront/block.h                        |  165 
 i386/drivers/xen/blkfront/vbd.c                          |  327 +
 i386/drivers/xen/blktap/Makefile                         |    3 
 i386/drivers/xen/blktap/blktap.c                         |  910 ++++
 i386/drivers/xen/blktap/common.h                         |  110 
 i386/drivers/xen/blktap/interface.c                      |  143 
 i386/drivers/xen/blktap/xenbus.c                         |  233 +
 i386/drivers/xen/char/Makefile                           |    2 
 i386/drivers/xen/char/mem.c                              |  192 +
 i386/drivers/xen/console/Makefile                        |    2 
 i386/drivers/xen/console/console.c                       |  648 +++
 i386/drivers/xen/console/xencons_ring.c                  |  151 
 i386/drivers/xen/core/Makefile                           |   11 
 i386/drivers/xen/core/evtchn.c                           |  867 ++++
 i386/drivers/xen/core/features.c                         |   29 
 i386/drivers/xen/core/gnttab.c                           |  471 ++
 i386/drivers/xen/core/hypervisor_sysfs.c                 |   57 
 i386/drivers/xen/core/reboot.c                           |  381 ++
 i386/drivers/xen/core/skbuff.c                           |  144 
 i386/drivers/xen/core/smpboot.c                          |  576 +++
 i386/drivers/xen/core/xen_proc.c                         |   29 
 i386/drivers/xen/core/xen_sysfs.c                        |  311 +
 i386/drivers/xen/evtchn/Makefile                         |    2 
 i386/drivers/xen/evtchn/evtchn.c                         |  464 ++
 i386/drivers/xen/net_driver_util.c                       |   68 
 i386/drivers/xen/netback/Makefile                        |    5 
 i386/drivers/xen/netback/common.h                        |  133 
 i386/drivers/xen/netback/interface.c                     |  328 +
 i386/drivers/xen/netback/loopback.c                      |  254 +
 i386/drivers/xen/netback/netback.c                       |  864 ++++
 i386/drivers/xen/netback/xenbus.c                        |  366 ++
 i386/drivers/xen/netfront/Kconfig                        |    6 
 i386/drivers/xen/netfront/Makefile                       |    4 
 i386/drivers/xen/netfront/netfront.c                     | 1522 ++++++++
 i386/drivers/xen/pciback/Makefile                        |   10 
 i386/drivers/xen/pciback/conf_space.c                    |  345 +
 i386/drivers/xen/pciback/conf_space.h                    |   97 
 i386/drivers/xen/pciback/conf_space_header.c             |  267 +
 i386/drivers/xen/pciback/passthrough.c                   |  157 
 i386/drivers/xen/pciback/pci_stub.c                      |  695 +++
 i386/drivers/xen/pciback/pciback.h                       |   78 
 i386/drivers/xen/pciback/pciback_ops.c                   |   74 
 i386/drivers/xen/pciback/vpci.c                          |  204 +
 i386/drivers/xen/pciback/xenbus.c                        |  441 ++
 i386/drivers/xen/pcifront/Makefile                       |    7 
 i386/drivers/xen/pcifront/pci.c                          |   46 
 i386/drivers/xen/pcifront/pci_op.c                       |  272 +
 i386/drivers/xen/pcifront/pcifront.h                     |   40 
 i386/drivers/xen/pcifront/xenbus.c                       |  294 +
 i386/drivers/xen/privcmd/Makefile                        |    2 
 i386/drivers/xen/privcmd/privcmd.c                       |  303 +
 i386/drivers/xen/tpmback/Makefile                        |    4 
 i386/drivers/xen/tpmback/common.h                        |   91 
 i386/drivers/xen/tpmback/interface.c                     |  192 +
 i386/drivers/xen/tpmback/tpmback.c                       | 1055 +++++
 i386/drivers/xen/tpmback/xenbus.c                        |  329 +
 i386/drivers/xen/tpmfront/Makefile                       |    2 
 i386/drivers/xen/tpmfront/tpmfront.c                     |  767 ++++
 i386/drivers/xen/tpmfront/tpmfront.h                     |   40 
 i386/drivers/xen/util.c                                  |   80 
 i386/drivers/xen/xenbus/Makefile                         |   12 
 i386/drivers/xen/xenbus/xenbus_backend_client.c          |  165 
 i386/drivers/xen/xenbus/xenbus_client.c                  |  284 +
 i386/drivers/xen/xenbus/xenbus_comms.c                   |  218 +
 i386/drivers/xen/xenbus/xenbus_comms.h                   |   53 
 i386/drivers/xen/xenbus/xenbus_dev.c                     |  255 +
 i386/drivers/xen/xenbus/xenbus_probe.c                   | 1093 +++++
 i386/drivers/xen/xenbus/xenbus_xs.c                      |  856 ++++
 i386/fs/Kconfig                                          |    1 
 i386/include/asm-i386/a.out.h                            |    2 
 i386/include/asm-i386/apic.h                             |    2 
 i386/include/asm-i386/asm-offsets.h                      |   48 
 i386/include/asm-i386/elf.h                              |    7 
 i386/include/asm-i386/fixmap.h                           |   13 
 i386/include/asm-i386/mach-default/mach_traps.h          |   12 
 i386/include/asm-i386/mach-xen/asm/agp.h                 |   37 
 i386/include/asm-i386/mach-xen/asm/desc.h                |  164 
 i386/include/asm-i386/mach-xen/asm/dma-mapping.h         |  156 
 i386/include/asm-i386/mach-xen/asm/fixmap.h              |  156 
 i386/include/asm-i386/mach-xen/asm/floppy.h              |  147 
 i386/include/asm-i386/mach-xen/asm/highmem.h             |   81 
 i386/include/asm-i386/mach-xen/asm/hw_irq.h              |   73 
 i386/include/asm-i386/mach-xen/asm/hypercall.h           |  357 +
 i386/include/asm-i386/mach-xen/asm/hypervisor.h          |  224 +
 i386/include/asm-i386/mach-xen/asm/io.h                  |  390 ++
 i386/include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 i386/include/asm-i386/mach-xen/asm/mmu.h                 |   21 
 i386/include/asm-i386/mach-xen/asm/mmu_context.h         |  105 
 i386/include/asm-i386/mach-xen/asm/page.h                |  326 +
 i386/include/asm-i386/mach-xen/asm/param.h               |   24 
 i386/include/asm-i386/mach-xen/asm/pci.h                 |  154 
 i386/include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 i386/include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 i386/include/asm-i386/mach-xen/asm/pgtable-2level.h      |   85 
 i386/include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 i386/include/asm-i386/mach-xen/asm/pgtable-3level.h      |  183 +
 i386/include/asm-i386/mach-xen/asm/pgtable.h             |  520 ++
 i386/include/asm-i386/mach-xen/asm/processor.h           |  756 ++++
 i386/include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 i386/include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 i386/include/asm-i386/mach-xen/asm/segment.h             |  117 
 i386/include/asm-i386/mach-xen/asm/setup.h               |   64 
 i386/include/asm-i386/mach-xen/asm/smp.h                 |  104 
 i386/include/asm-i386/mach-xen/asm/spinlock.h            |  200 +
 i386/include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 i386/include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 
 i386/include/asm-i386/mach-xen/asm/system.h              |  576 +++
 i386/include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 i386/include/asm-i386/mach-xen/asm/vga.h                 |   20 
 i386/include/asm-i386/mach-xen/irq_vectors.h             |  125 
 i386/include/asm-i386/mach-xen/mach_traps.h              |   33 
 i386/include/asm-i386/mach-xen/setup_arch_post.h         |   54 
 i386/include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 i386/include/asm-i386/page.h                             |    4 
 i386/include/asm-i386/pgtable-2level-defs.h              |    2 
 i386/include/asm-i386/pgtable-3level-defs.h              |    2 
 i386/include/asm-ia64/fixmap.h                           |    2 
 i386/include/asm-ia64/gcc_intrin.h                       |   60 
 i386/include/asm-ia64/hypercall.h                        |  274 +
 i386/include/asm-ia64/hypervisor.h                       |  138 
 i386/include/asm-ia64/intel_intrin.h                     |   68 
 i386/include/asm-ia64/meminit.h                          |    5 
 i386/include/asm-ia64/pal.h                              |    1 
 i386/include/asm-ia64/privop.h                           |   59 
 i386/include/asm-ia64/processor.h                        |    1 
 i386/include/asm-ia64/synch_bitops.h                     |   61 
 i386/include/asm-ia64/system.h                           |    4 
 i386/include/asm-ia64/xen/privop.h                       |  277 +
 i386/include/asm-um/page.h                               |    2 
 i386/include/asm-x86_64/apic.h                           |    2 
 i386/include/asm-x86_64/hw_irq.h                         |    2 
 i386/include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 i386/include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 i386/include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 i386/include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 +
 i386/include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 i386/include/asm-x86_64/mach-xen/asm/fixmap.h            |  114 
 i386/include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 i386/include/asm-x86_64/mach-xen/asm/hw_irq.h            |  141 
 i386/include/asm-x86_64/mach-xen/asm/hypercall.h         |  357 +
 i386/include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 i386/include/asm-x86_64/mach-xen/asm/io.h                |  328 +
 i386/include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 i386/include/asm-x86_64/mach-xen/asm/mmu.h               |   33 
 i386/include/asm-x86_64/mach-xen/asm/mmu_context.h       |  134 
 i386/include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 i386/include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 i386/include/asm-x86_64/mach-xen/asm/page.h              |  317 +
 i386/include/asm-x86_64/mach-xen/asm/param.h             |   23 
 i386/include/asm-x86_64/mach-xen/asm/pci.h               |  174 
 i386/include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 i386/include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 +++
 i386/include/asm-x86_64/mach-xen/asm/processor.h         |  494 ++
 i386/include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 i386/include/asm-x86_64/mach-xen/asm/smp.h               |  153 
 i386/include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 i386/include/asm-x86_64/mach-xen/asm/system.h            |  428 ++
 i386/include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 i386/include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 i386/include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 i386/include/asm-x86_64/mach-xen/asm/xor.h               |  328 +
 i386/include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 i386/include/asm-x86_64/mach-xen/mach_time.h             |  111 
 i386/include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 i386/include/asm-x86_64/mach-xen/setup_arch_post.h       |   41 
 i386/include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 i386/include/linux/gfp.h                                 |    6 
 i386/include/linux/highmem.h                             |    6 
 i386/include/linux/mm.h                                  |   13 
 i386/include/linux/pfn.h                                 |    2 
 i386/include/linux/skbuff.h                              |   13 
 i386/include/xen/balloon.h                               |   73 
 i386/include/xen/driver_util.h                           |   26 
 i386/include/xen/evtchn.h                                |  126 
 i386/include/xen/features.h                              |   20 
 i386/include/xen/foreign_page.h                          |   40 
 i386/include/xen/gnttab.h                                |  160 
 i386/include/xen/hypervisor_sysfs.h                      |   32 
 i386/include/xen/interface/acm.h                         |  181 
 i386/include/xen/interface/acm_ops.h                     |   98 
 i386/include/xen/interface/arch-ia64.h                   |  337 +
 i386/include/xen/interface/arch-x86_32.h                 |  200 +
 i386/include/xen/interface/arch-x86_64.h                 |  273 +
 i386/include/xen/interface/callback.h                    |   57 
 i386/include/xen/interface/dom0_ops.h                    |  531 ++
 i386/include/xen/interface/event_channel.h               |  211 +
 i386/include/xen/interface/features.h                    |   53 
 i386/include/xen/interface/grant_table.h                 |  311 +
 i386/include/xen/interface/hvm/hvm_info_table.h          |   24 
 i386/include/xen/interface/hvm/ioreq.h                   |   94 
 i386/include/xen/interface/hvm/vmx_assist.h              |   97 
 i386/include/xen/interface/io/blkif.h                    |   85 
 i386/include/xen/interface/io/console.h                  |   33 
 i386/include/xen/interface/io/netif.h                    |   84 
 i386/include/xen/interface/io/pciif.h                    |   55 
 i386/include/xen/interface/io/ring.h                     |  265 +
 i386/include/xen/interface/io/tpmif.h                    |   56 
 i386/include/xen/interface/io/xenbus.h                   |   42 
 i386/include/xen/interface/io/xs_wire.h                  |   97 
 i386/include/xen/interface/memory.h                      |  155 
 i386/include/xen/interface/nmi.h                         |   59 
 i386/include/xen/interface/physdev.h                     |   71 
 i386/include/xen/interface/sched.h                       |  100 
 i386/include/xen/interface/sched_ctl.h                   |   64 
 i386/include/xen/interface/trace.h                       |   86 
 i386/include/xen/interface/vcpu.h                        |  119 
 i386/include/xen/interface/version.h                     |   64 
 i386/include/xen/interface/xen-compat.h                  |   31 
 i386/include/xen/interface/xen.h                         |  461 ++
 i386/include/xen/interface/xenoprof.h                    |   91 
 i386/include/xen/net_driver_util.h                       |   58 
 i386/include/xen/pcifront.h                              |   39 
 i386/include/xen/public/evtchn.h                         |  101 
 i386/include/xen/public/privcmd.h                        |   94 
 i386/include/xen/tpmfe.h                                 |   40 
 i386/include/xen/xen_proc.h                              |   23 
 i386/include/xen/xenbus.h                                |  306 +
 i386/include/xen/xencons.h                               |   14 
 i386/kernel/Kconfig.preempt                              |    1 
 i386/kernel/irq/manage.c                                 |   24 
 i386/lib/Kconfig.debug                                   |   31 
 i386/lib/Makefile                                        |    3 
 i386/mm/Kconfig                                          |    3 
 i386/mm/highmem.c                                        |   11 
 i386/mm/memory.c                                         |  116 
 i386/mm/mmap.c                                           |    4 
 i386/mm/page_alloc.c                                     |    6 
 i386/net/core/dev.c                                      |   51 
 i386/net/core/skbuff.c                                   |   41 
 i386/net/ipv4/netfilter/ip_nat_proto_tcp.c               |    9 
 i386/net/ipv4/netfilter/ip_nat_proto_udp.c               |   12 
 i386/scripts/Makefile.xen                                |   14 
 linux-2.6.16.noarch/arch/x86_64/ia32/Makefile            |   20 
 389 files changed, 80372 insertions(+), 856 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6-xen.patch	20 Apr 2006 17:22:37 -0000	1.12
+++ linux-2.6-xen.patch	22 Apr 2006 17:48:28 -0000	1.13
@@ -26394,20 +26394,22 @@
 +	.quad sys_sync_file_range
 +	.quad sys_tee
 +ia32_syscall_end:		
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --exclude=.hg ../hg/linux-2.6/arch/x86_64/ia32/Makefile i386/arch/x86_64/ia32/Makefile
---- ../hg/linux-2.6/arch/x86_64/ia32/Makefile	2006-04-17 13:34:09.000000000 -0400
-+++ i386/arch/x86_64/ia32/Makefile	2006-04-20 07:09:46.000000000 -0400
-@@ -23,9 +23,25 @@ quiet_cmd_syscall = SYSCALL $@
+diff -uNp linux-2.6.16.noarch/arch/x86_64/ia32/Makefile.orig linux-2.6.16.noarch/arch/x86_64/ia32/Makefile
+--- linux-2.6.16.noarch/arch/x86_64/ia32/Makefile.orig	2006-04-20 19:32:34.000000000 +0200
++++ linux-2.6.16.noarch/arch/x86_64/ia32/Makefile	2006-04-20 19:32:39.000000000 +0200
+@@ -26,12 +26,28 @@ quiet_cmd_syscall = SYSCALL $@
  			   -Wl,-soname=linux-gate.so.1 -o $@ \
  			   -Wl,-T,$(filter-out FORCE,$^)
  
-+$(obj)/vsyscall-int80.so \
++$(obj)/vsyscall-int80.so
  $(obj)/vsyscall-sysenter.so $(obj)/vsyscall-syscall.so: \
  $(obj)/vsyscall-%.so: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE
  	$(call if_changed,syscall)
  
 -AFLAGS_vsyscall-sysenter.o = -m32
 -AFLAGS_vsyscall-syscall.o = -m32
+ AFLAGS_syscall32_syscall.o += -m64
+ AFLAGS_ia32entry.o += -m64
 +AFLAGS_vsyscall-sysenter.o = -m32 -Iarch/i386/kernel
 +AFLAGS_vsyscall-syscall.o = -m32 -Iarch/i386/kernel
 +
@@ -26425,6 +26427,7 @@
 +
 +obj-y := $(call cherrypickxen, $(obj-y))
 +endif
+ 
 diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --exclude=.hg ../hg/linux-2.6/arch/x86_64/ia32/syscall32_syscall-xen.S i386/arch/x86_64/ia32/syscall32_syscall-xen.S
 --- ../hg/linux-2.6/arch/x86_64/ia32/syscall32_syscall-xen.S	1969-12-31 19:00:00.000000000 -0500
 +++ i386/arch/x86_64/ia32/syscall32_syscall-xen.S	2006-04-20 07:09:46.000000000 -0400



From fedora-cvs-commits at redhat.com  Sat Apr 22 18:04:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Apr 2006 14:04:20 -0400
Subject: rpms/device-mapper/devel device-mapper.spec,1.32,1.33
Message-ID: <200604221804.k3MI4Kfc010344@cvs.devel.redhat.com>

Author: agk

Update of /cvs/dist/rpms/device-mapper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10283

Modified Files:
	device-mapper.spec 
Log Message:
Exclude archs with stuck builds.



Index: device-mapper.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper/devel/device-mapper.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- device-mapper.spec	21 Apr 2006 16:09:46 -0000	1.32
+++ device-mapper.spec	22 Apr 2006 18:04:17 -0000	1.33
@@ -1,13 +1,14 @@
 Summary: device mapper library
 Name: device-mapper
 Version: 1.02.05
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: System Environment/Base
 URL: http://sources.redhat.com/dm
 Source0: %{name}.%{version}.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: libselinux-devel, libsepol-devel
+ExcludeArch: s390, s390x
 
 %define _exec_prefix /
 
@@ -46,6 +47,9 @@
 
 
 %changelog
+* Sat Apr 22 2006 Alasdair Kergon <agk at redhat.com> - 1.02.05-1.2
+- Exclude s390/s390x in order to rebuild.
+
 * Fri Apr 21 2006 Alasdair Kergon <agk at redhat.com> - 1.02.05-1.1
 - Rebuild.
 



From fedora-cvs-commits at redhat.com  Sat Apr 22 18:11:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Apr 2006 14:11:56 -0400
Subject: rpms/openoffice.org/devel workspace.targetedaot.patch,1.5,1.6
Message-ID: <200604221811.k3MIBuS9011244@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11222

Modified Files:
	workspace.targetedaot.patch 
Log Message:
rejig for OOB680

workspace.targetedaot.patch:
 bin/deliver.pl                               |    0 
 config_office/configure.in                   |   59 +++++++++++++++++----------
 config_office/set_soenv.in                   |    7 ---
 filter/source/config/fragments/makefile.mk   |    4 +
 filter/source/config/tools/merge/makefile.mk |    3 +
 helpcontent2/util/target.pmk                 |    5 +-
 inc/settings.mk                              |    0 
 inc/target.mk                                |    0 
 inc/tg_jar.mk                                |    0 
 prj/d.lst                                    |    0 
 solenv/bin/deliver.pl                        |   19 --------
 solenv/inc/settings.mk                       |    5 --
 solenv/inc/target.mk                         |    6 ++
 solenv/inc/tg_jar.mk                         |   14 ++++++
 source/com/sun/star/help/makefile.mk         |    0 
 source/config/fragments/makefile.mk          |    0 
 source/config/tools/merge/makefile.mk        |    0 
 util/target.pmk                              |    0 
 xmlhelp/prj/d.lst                            |    1 
 xmlhelp/source/com/sun/star/help/makefile.mk |    3 +
 20 files changed, 75 insertions(+), 51 deletions(-)

Index: workspace.targetedaot.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.targetedaot.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- workspace.targetedaot.patch	22 Apr 2006 17:43:00 -0000	1.5
+++ workspace.targetedaot.patch	22 Apr 2006 18:11:49 -0000	1.6
@@ -150,9 +150,9 @@
 +.ELSE
  MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
 +.ENDIF
- PACKLANG := $(JAVAI) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
- .ENDIF
- 
+ .IF "$(JDK)" == "gcj"
+ XALANCLASS=$(SOLARBINDIR)/xalan.jar
+ CLASSPATH:=$(CLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(XALANCLASS:s/ /%Z*Z%/))}
 Index: source/config/tools/merge/makefile.mk
 ===================================================================
 RCS file: /cvs/framework/filter/source/config/tools/merge/makefile.mk,v
@@ -177,16 +177,16 @@
 diff -u -r1.13 target.pmk
 --- openoffice.org.orig/helpcontent2/util/target.pmk	16 Mar 2006 11:10:20 -0000	1.13
 +++ openoffice.org/helpcontent2/util/target.pmk	22 Apr 2006 16:37:36 -0000
-@@ -50,5 +50,9 @@
+@@ -50,5 +50,8 @@
  
  $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag
  	@+-$(MKDIR) -p $(@:d)
 +.IF "$(JAVAAOTCOMPILER)" != ""
+ 	$(JAVAI) $(JAVA_VM_HEAP_SIZE) $(JAVA_LIBRARY_PATH) -cp $(my_cp) com.sun.star.help.HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
+-
++.ELSE
 +	HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
-+ .ELSE
- 	$(JAVAI) $(JAVA_VM_HEAP_SIZE) $(JAVA_LIBRARY_PATH) -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl -cp $(my_cp) com.sun.star.help.HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
 +.ENDIF
- 
 Index: bin/deliver.pl
 ===================================================================
 RCS file: /cvs/tools/solenv/bin/deliver.pl,v
@@ -241,13 +241,16 @@
 diff -u -r1.188 settings.mk
 --- openoffice.org.orig/solenv/inc/settings.mk	9 Mar 2006 14:01:40 -0000	1.188
 +++ openoffice.org/solenv/inc/settings.mk	22 Apr 2006 16:39:26 -0000
-@@ -188,10 +188,6 @@
+@@ -186,13 +186,8 @@
+ .ENDIF
+ 
  #required arguments
+-.IF "$(JAVACACHE)" != ""
+-JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -O2 -fno-assert -Wno-deprecated -C
+-JAVAI=$(JAVAINTERPRETER) -Dgnu.gcj.precompiled.db.path=$(GCJ_DATABASE)
+-.ELSE
  JAVAC=$(JAVACOMPILER)
  JAVAI=$(JAVAINTERPRETER)
--.IF "$(JAVACACHE)" != ""
--JAVAC+=--encoding=UTF-8 -O2 -fno-assert -Wno-deprecated -C
--JAVAI+=-Dgnu.gcj.precompiled.db.path=$(GCJ_DATABASE)
 -.ENDIF
  
  #classpath and response



From fedora-cvs-commits at redhat.com  Sat Apr 22 18:18:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Apr 2006 14:18:00 -0400
Subject: rpms/lvm2/devel lvm2.spec,1.64,1.65
Message-ID: <200604221818.k3MII0eb024745@cvs.devel.redhat.com>

Author: agk

Update of /cvs/dist/rpms/lvm2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23232

Modified Files:
	lvm2.spec 
Log Message:
exclude archs that aren't building



Index: lvm2.spec
===================================================================
RCS file: /cvs/dist/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- lvm2.spec	21 Apr 2006 16:02:13 -0000	1.64
+++ lvm2.spec	22 Apr 2006 18:17:56 -0000	1.65
@@ -1,7 +1,7 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
 Version: 2.02.05
-Release: 1.0
+Release: 1.1
 License: GPL
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -15,6 +15,7 @@
 Requires: device-mapper >= 1.02.05
 Conflicts: lvm
 Obsoletes: lvm
+ExcludeArch: s390 s390x
 
 %define _exec_prefix /usr
 
@@ -66,6 +67,9 @@
 /var/lock/lvm
 
 %changelog
+* Sat Apr 22 2006 Alasdair Kergon <agk at redhat.com> - 2.02.05-1.1
+- Exclude archs that aren't building.
+
 * Fri Apr 21 2006 Alasdair Kergon <agk at redhat.com> - 2.02.05-1.0
 - Fix VG uuid comparisons.
 



From fedora-cvs-commits at redhat.com  Sat Apr 22 18:29:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Apr 2006 14:29:35 -0400
Subject: rpms/openoffice.org/devel workspace.targetedaot.patch,1.6,1.7
Message-ID: <200604221829.k3MITZ3a030595@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30563

Modified Files:
	workspace.targetedaot.patch 
Log Message:
see if that'll work

workspace.targetedaot.patch:
 bin/deliver.pl                               |    0 
 config_office/configure.in                   |   59 +++++++++++++++++----------
 config_office/set_soenv.in                   |    7 ---
 filter/source/config/fragments/makefile.mk   |    4 +
 filter/source/config/tools/merge/makefile.mk |    3 +
 helpcontent2/util/target.pmk                 |    5 +-
 inc/settings.mk                              |    0 
 inc/target.mk                                |    0 
 inc/tg_jar.mk                                |    0 
 prj/d.lst                                    |    0 
 solenv/bin/deliver.pl                        |   19 --------
 solenv/inc/settings.mk                       |    5 --
 solenv/inc/target.mk                         |    6 ++
 solenv/inc/tg_jar.mk                         |   14 ++++++
 source/com/sun/star/help/makefile.mk         |    0 
 source/config/fragments/makefile.mk          |    0 
 source/config/tools/merge/makefile.mk        |    0 
 util/target.pmk                              |    0 
 xmlhelp/prj/d.lst                            |    1 
 xmlhelp/source/com/sun/star/help/makefile.mk |    3 +
 20 files changed, 75 insertions(+), 51 deletions(-)

Index: workspace.targetedaot.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.targetedaot.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- workspace.targetedaot.patch	22 Apr 2006 18:11:49 -0000	1.6
+++ workspace.targetedaot.patch	22 Apr 2006 18:29:31 -0000	1.7
@@ -141,7 +141,7 @@
 diff -u -r1.17 makefile.mk
 --- openoffice.org.orig/filter/source/config/fragments/makefile.mk	16 Mar 2006 11:08:21 -0000	1.17
 +++ openoffice.org/filter/source/config/fragments/makefile.mk	22 Apr 2006 16:28:44 -0000
-@@ -155,7 +155,11 @@
+@@ -155,5 +155,9 @@
  #cmc, hack to workaround the java build requirement
  MERGE:=python ../tools/merge/pyAltFCFGMerge
  .ELSE
@@ -150,9 +150,7 @@
 +.ELSE
  MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
 +.ENDIF
- .IF "$(JDK)" == "gcj"
- XALANCLASS=$(SOLARBINDIR)/xalan.jar
- CLASSPATH:=$(CLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(XALANCLASS:s/ /%Z*Z%/))}
+ XALAN_JAR*=$(SOLARBINDIR)$/xalan.jar
 Index: source/config/tools/merge/makefile.mk
 ===================================================================
 RCS file: /cvs/framework/filter/source/config/tools/merge/makefile.mk,v



From fedora-cvs-commits at redhat.com  Sat Apr 22 18:10:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Apr 2006 14:10:58 -0400
Subject: rpms/device-mapper/devel device-mapper.spec,1.33,1.34
Message-ID: <200604221810.k3MIAw7K011110@cvs.devel.redhat.com>

Author: agk

Update of /cvs/dist/rpms/device-mapper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11034

Modified Files:
	device-mapper.spec 
Log Message:
remove comma



Index: device-mapper.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper/devel/device-mapper.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- device-mapper.spec	22 Apr 2006 18:04:17 -0000	1.33
+++ device-mapper.spec	22 Apr 2006 18:10:55 -0000	1.34
@@ -8,7 +8,7 @@
 Source0: %{name}.%{version}.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: libselinux-devel, libsepol-devel
-ExcludeArch: s390, s390x
+ExcludeArch: s390 s390x
 
 %define _exec_prefix /
 



From fedora-cvs-commits at redhat.com  Sat Apr 22 18:53:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Apr 2006 14:53:45 -0400
Subject: rpms/openoffice.org/devel workspace.targetedaot.patch,1.7,1.8
Message-ID: <200604221853.k3MIrjOd019138@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19110

Modified Files:
	workspace.targetedaot.patch 
Log Message:
more would be needed

workspace.targetedaot.patch:
 bin/deliver.pl                               |    0 
 config_office/configure.in                   |   59 +++++++++++++++++----------
 config_office/set_soenv.in                   |    7 ---
 filter/source/config/fragments/makefile.mk   |    4 +
 filter/source/config/tools/merge/makefile.mk |    3 +
 helpcontent2/util/target.pmk                 |    5 +-
 inc/antsettings.mk                           |    0 
 inc/settings.mk                              |    0 
 inc/target.mk                                |    0 
 inc/tg_jar.mk                                |    0 
 prj/d.lst                                    |    0 
 solenv/bin/deliver.pl                        |   19 --------
 solenv/inc/antsettings.mk                    |    8 ---
 solenv/inc/settings.mk                       |    5 --
 solenv/inc/target.mk                         |    6 ++
 solenv/inc/tg_jar.mk                         |   14 ++++++
 source/com/sun/star/help/makefile.mk         |    0 
 source/config/fragments/makefile.mk          |    0 
 source/config/tools/merge/makefile.mk        |    0 
 util/target.pmk                              |    0 
 xmlhelp/prj/d.lst                            |    1 
 xmlhelp/source/com/sun/star/help/makefile.mk |    3 +
 22 files changed, 76 insertions(+), 58 deletions(-)

Index: workspace.targetedaot.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.targetedaot.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- workspace.targetedaot.patch	22 Apr 2006 18:29:31 -0000	1.7
+++ workspace.targetedaot.patch	22 Apr 2006 18:53:42 -0000	1.8
@@ -337,3 +337,30 @@
  
  # --- Targets ------------------------------------------------------
  
+Index: inc/antsettings.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/antsettings.mk,v
+retrieving revision 1.2
+diff -u -r1.2 antsettings.mk
+--- openoffice.org.orig/solenv/inc/antsettings.mk	31 Jan 2006 18:48:27 -0000	1.2
++++ openoffice.org/solenv/inc/antsettings.mk	22 Apr 2006 18:49:44 -0000
+@@ -72,18 +72,12 @@
+ .IF "$(JDK)"=="gcj"
+ JAVA_HOME=
+ .EXPORT : JAVA_HOME
+-ANT_FLAGS!:=-Dbuild.compiler=gcj -Dprj=$(PRJ) -Dprjname=$(PRJNAME) -Ddebug=$(ANT_DEBUG) \
+- -Doptimize=$(ANT_OPT) -Dtarget=$(TARGET) -Dsolar.update=on -Dout=$(OUT) -Dinpath=$(INPATH) \
+- -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) -Dsolar.jar=$(SOLARBINDIR) \
+- -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
+- -Dcommon.doc=$(SOLARCOMMONDOCDIR) -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs
+-.ELSE
++.ENDIF
+ ANT_FLAGS!:=-Dprj=$(PRJ) -Dprjname=$(PRJNAME) -Ddebug=$(ANT_DEBUG) -Doptimize=$(ANT_OPT) \
+  -Dtarget=$(TARGET) -Dsolar.update=on -Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" \
+  -Dsolar.bin=$(SOLARBINDIR) -Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) \
+  -Dcommon.jar=$(SOLARCOMMONBINDIR) -Dcommon.doc=$(SOLARCOMMONDOCDIR) \
+  -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs
+-.ENDIF
+ .ELSE # No java
+ ANT=
+ ANT_FLAGS=



From fedora-cvs-commits at redhat.com  Sat Apr 22 23:46:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Apr 2006 19:46:22 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2150,
	1.2151 linux-2.6-sata-ahci-suspend.patch, 1.1, 1.2
Message-ID: <200604222346.k3MNkMqa008217@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5009

Modified Files:
	kernel-2.6.spec linux-2.6-sata-ahci-suspend.patch 
Log Message:
SATA S3 fix. Jeff doesn't like this, but it makes stuff work for the time-being.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2150
retrieving revision 1.2151
diff -u -r1.2150 -r1.2151
--- kernel-2.6.spec	22 Apr 2006 17:48:28 -0000	1.2150
+++ kernel-2.6.spec	22 Apr 2006 23:46:16 -0000	1.2151
@@ -1660,6 +1660,9 @@
 %endif
 
 %changelog
+* Sat Apr 22 2006 Dave Jones <davej at redhat.com>
+- Ugly SATA suspend/resume hack de jour.
+
 * Sat Apr 22 2006 Juan Quintela <quintela at redhat.com>
 - rebase xen.
 - fix x86_64 xen (thanks chris).

linux-2.6-sata-ahci-suspend.patch:
 linux-2.6.16.noarch/drivers/scsi/libata-core.c |    1 
 linux-ahci.suspend/drivers/scsi/ahci.c         |  194 ++++++++++++++++++-------
 2 files changed, 142 insertions(+), 53 deletions(-)

Index: linux-2.6-sata-ahci-suspend.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-sata-ahci-suspend.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-sata-ahci-suspend.patch	21 Apr 2006 03:21:12 -0000	1.1
+++ linux-2.6-sata-ahci-suspend.patch	22 Apr 2006 23:46:16 -0000	1.2
@@ -280,3 +280,13 @@
  static void ahci_setup_port(struct ata_ioports *port, unsigned long base,
  			    unsigned int port_idx)
  {
+--- linux-2.6.16.noarch/drivers/scsi/libata-core.c~	2006-04-22 18:43:24.000000000 -0500
++++ linux-2.6.16.noarch/drivers/scsi/libata-core.c	2006-04-22 18:43:39.000000000 -0500
+@@ -4288,6 +4288,7 @@ int ata_device_resume(struct ata_port *a
+ {
+ 	if (ap->flags & ATA_FLAG_SUSPENDED) {
+ 		ap->flags &= ~ATA_FLAG_SUSPENDED;
++		ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT);
+ 		ata_set_mode(ap);
+ 	}
+ 	if (!ata_dev_present(dev))



From fedora-cvs-commits at redhat.com  Sun Apr 23 03:45:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Apr 2006 23:45:39 -0400
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.105,1.106
Message-ID: <200604230345.k3N3jd6E011174@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-vfs2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11108

Modified Files:
	gnome-vfs2.spec 
Log Message:
fix a typo



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- gnome-vfs2.spec	21 Apr 2006 14:56:12 -0000	1.105
+++ gnome-vfs2.spec	23 Apr 2006 03:45:36 -0000	1.106
@@ -11,7 +11,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.14.1
-Release: 2
+Release: 3
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -76,7 +76,7 @@
 %package smb
 Summary: Windows fileshare support for gnome-vfs
 Group: System Environment/Libraries
-Requires:   %{name} = %{version}-%release}
+Requires:   %{name} = %{version}-%{release}
 Requires: samba-common >= %{samba_version}
 Obsoletes:     gnome-vfs2-extras
 Provides:     gnome-vfs2-extras
@@ -185,6 +185,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Sat Apr 22 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-3
+- fix a typo
+
 * Thu Apr 20 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
 - update to 2.14.1
 



From fedora-cvs-commits at redhat.com  Sun Apr 23 03:55:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Apr 2006 23:55:49 -0400
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.106,1.107
Message-ID: <200604230355.k3N3tnHm028772@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-vfs2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28721

Modified Files:
	gnome-vfs2.spec 
Log Message:
bump rev



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- gnome-vfs2.spec	23 Apr 2006 03:45:36 -0000	1.106
+++ gnome-vfs2.spec	23 Apr 2006 03:55:46 -0000	1.107
@@ -11,7 +11,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.14.1
-Release: 3
+Release: 4
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -185,7 +185,7 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
-* Sat Apr 22 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-3
+* Sat Apr 22 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-4
 - fix a typo
 
 * Thu Apr 20 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2



From fedora-cvs-commits at redhat.com  Sun Apr 23 04:12:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Apr 2006 00:12:43 -0400
Subject: rpms/gnome-vfs2/FC-5 gnome-vfs2.spec,1.103,1.104
Message-ID: <200604230412.k3N4ChPB032011@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-vfs2/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31970

Modified Files:
	gnome-vfs2.spec 
Log Message:
fix a typo



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/FC-5/gnome-vfs2.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- gnome-vfs2.spec	21 Apr 2006 18:16:12 -0000	1.103
+++ gnome-vfs2.spec	23 Apr 2006 04:12:26 -0000	1.104
@@ -11,7 +11,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.14.1
-Release: 1.fc5.1
+Release: 1.fc5.2
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -76,7 +76,7 @@
 %package smb
 Summary: Windows fileshare support for gnome-vfs
 Group: System Environment/Libraries
-Requires:   %{name} = %{version}-%release}
+Requires:   %{name} = %{version}-%{release}
 Requires: samba-common >= %{samba_version}
 Obsoletes:     gnome-vfs2-extras
 Provides:     gnome-vfs2-extras
@@ -185,6 +185,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Sun Apr 23 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.2
+- fix a typo
+
 * Thu Apr 20 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
 - update to 2.14.1
 



From fedora-cvs-commits at redhat.com  Sun Apr 23 13:45:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Apr 2006 09:45:27 -0400
Subject: rpms/openoffice.org/devel workspace.targetedaot.patch,1.8,1.9
Message-ID: <200604231345.k3NDjR28022459@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22399

Modified Files:
	workspace.targetedaot.patch 
Log Message:
logic the wrong way around

workspace.targetedaot.patch:
 bin/deliver.pl                               |    0 
 config_office/configure.in                   |   59 +++++++++++++++++----------
 config_office/set_soenv.in                   |    7 ---
 filter/source/config/fragments/makefile.mk   |    4 +
 filter/source/config/tools/merge/makefile.mk |    3 +
 helpcontent2/util/target.pmk                 |    5 +-
 inc/antsettings.mk                           |    0 
 inc/settings.mk                              |    0 
 inc/target.mk                                |    0 
 inc/tg_jar.mk                                |    0 
 prj/d.lst                                    |    0 
 solenv/bin/deliver.pl                        |   19 --------
 solenv/inc/antsettings.mk                    |    8 ---
 solenv/inc/settings.mk                       |    5 --
 solenv/inc/target.mk                         |    6 ++
 solenv/inc/tg_jar.mk                         |   14 ++++++
 source/com/sun/star/help/makefile.mk         |    0 
 source/config/fragments/makefile.mk          |    0 
 source/config/tools/merge/makefile.mk        |    0 
 util/target.pmk                              |    0 
 xmlhelp/prj/d.lst                            |    1 
 xmlhelp/source/com/sun/star/help/makefile.mk |    3 +
 22 files changed, 76 insertions(+), 58 deletions(-)

Index: workspace.targetedaot.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.targetedaot.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- workspace.targetedaot.patch	22 Apr 2006 18:53:42 -0000	1.8
+++ workspace.targetedaot.patch	23 Apr 2006 13:45:10 -0000	1.9
@@ -179,7 +179,7 @@
  
  $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag
  	@+-$(MKDIR) -p $(@:d)
-+.IF "$(JAVAAOTCOMPILER)" != ""
++.IF "$(JAVAAOTCOMPILER)" == ""
  	$(JAVAI) $(JAVA_VM_HEAP_SIZE) $(JAVA_LIBRARY_PATH) -cp $(my_cp) com.sun.star.help.HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
 -
 +.ELSE



From fedora-cvs-commits at redhat.com  Mon Apr 24 01:17:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Apr 2006 21:17:35 -0400
Subject: rpms/anthy/devel .cvsignore, 1.11, 1.12 anthy.spec, 1.19,
	1.20 sources, 1.11, 1.12 anthy-2832.patch, 1.1,
	NONE anthy-2834.patch, 1.1, NONE
Message-ID: <200604240117.k3O1HZpG027654@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/anthy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27326

Modified Files:
	.cvsignore anthy.spec sources 
Removed Files:
	anthy-2832.patch anthy-2834.patch 
Log Message:
* Mon Apr 24 2006 Akira TAGOH <tagoh at redhat.com> 7622-1
- New upstream snapshot release.
  - removed unnecessary patches:
    - anthy-2832.patch
    - anthy-2834.patch


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anthy/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	17 Mar 2006 13:32:32 -0000	1.11
+++ .cvsignore	24 Apr 2006 01:17:32 -0000	1.12
@@ -14,3 +14,4 @@
 anthy-7029.tar.gz
 anthy-7100b.tar.gz
 anthy-7500.tar.gz
+anthy-7622.tar.gz


Index: anthy.spec
===================================================================
RCS file: /cvs/dist/rpms/anthy/devel/anthy.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- anthy.spec	17 Mar 2006 13:32:32 -0000	1.19
+++ anthy.spec	24 Apr 2006 01:17:32 -0000	1.20
@@ -1,4 +1,4 @@
-%define	version		7500
+%define	version		7622
 %define	gcanna_ver	20051002
 %{expand: %%define build_with_xemacs %{?_with_xemacs:1}%{!?_with_xemacs:0}}
 
@@ -14,8 +14,6 @@
 Source0:	http://prdownloads.sourceforge.jp/anthy/9723/anthy-%{version}.tar.gz
 Source1:	anthy-init.el
 Source2:	http://www.geocities.jp/ep3797/snapshot/tmp/anthy_gcanna_ut-%{gcanna_ver}.tar.bz2
-Patch0:		anthy-2832.patch
-Patch1:		anthy-2834.patch
 Patch2:		anthy-gcanna-nakaguro.patch
 
 Summary:	Japanese character set input library
@@ -58,8 +56,6 @@
 
 %prep
 %setup -q -a 2
-%patch0 -p1
-%patch1 -p1
 %patch2 -p1
 
 %build
@@ -123,6 +119,12 @@
 %endif
 
 %changelog
+* Mon Apr 24 2006 Akira TAGOH <tagoh at redhat.com> 7622-1
+- New upstream snapshot release.
+  - removed unnecessary patches:
+    - anthy-2832.patch
+    - anthy-2834.patch
+
 * Fri Mar 17 2006 Akira TAGOH <tagoh at redhat.com> 7500-1
 - New upstream release.
   - larning words works now. (#178764)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anthy/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	17 Mar 2006 13:32:32 -0000	1.11
+++ sources	24 Apr 2006 01:17:32 -0000	1.12
@@ -1,2 +1,2 @@
 d0f6128b6e000e85764abbc030399db7  anthy_gcanna_ut-20051002.tar.bz2
-c086a19b7590caa2a08406459eb577f8  anthy-7500.tar.gz
+648c6ecf0101585348e7a255a72d6055  anthy-7622.tar.gz


--- anthy-2832.patch DELETED ---


--- anthy-2834.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 24 01:39:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Apr 2006 21:39:02 -0400
Subject: rpms/kernel/devel/configs config-generic,1.178,1.179
Message-ID: <200604240139.k3O1d2fc007512@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv7397/configs

Modified Files:
	config-generic 
Log Message:
git5



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- config-generic	18 Apr 2006 21:09:21 -0000	1.178
+++ config-generic	24 Apr 2006 01:38:58 -0000	1.179
@@ -1413,6 +1413,7 @@
 # CONFIG_FTAPE is not set
 # CONFIG_IBM_ASM is not set
 CONFIG_TCG_TPM=m
+CONFIG_TCG_TIS=m
 CONFIG_TCG_NSC=m
 CONFIG_TCG_ATMEL=m
 # CONFIG_TCG_INFINEON is not set



From fedora-cvs-commits at redhat.com  Mon Apr 24 01:39:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Apr 2006 21:39:02 -0400
Subject: rpms/kernel/devel patch-2.6.17-rc2-git5.bz2.sign, NONE,
	1.1 .cvsignore, 1.412, 1.413 kernel-2.6.spec, 1.2151,
	1.2152 linux-2.6-compile-fixes.patch, 1.68, 1.69 sources,
	1.354, 1.355 upstream, 1.325,
	1.326 patch-2.6.17-rc2-git4.bz2.sign, 1.1, NONE
Message-ID: <200604240139.k3O1d2Rk007503@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7397

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch 
	sources upstream 
Added Files:
	patch-2.6.17-rc2-git5.bz2.sign 
Removed Files:
	patch-2.6.17-rc2-git4.bz2.sign 
Log Message:
git5



--- NEW FILE patch-2.6.17-rc2-git5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBES88ryGugalF9Dw4RAuE6AJ9Og5ayblvVhN5T5cAn66P4KZdCswCeNds5
vNm6DpYwetnG0jb/xPKyaws=
=Jt+w
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -r1.412 -r1.413
--- .cvsignore	21 Apr 2006 18:11:03 -0000	1.412
+++ .cvsignore	24 Apr 2006 01:38:57 -0000	1.413
@@ -4,4 +4,4 @@
 linux-2.6.16.tar.bz2
 xen-20060413.tar.bz2
 patch-2.6.17-rc2.bz2
-patch-2.6.17-rc2-git4.bz2
+patch-2.6.17-rc2-git5.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2151
retrieving revision 1.2152
diff -u -r1.2151 -r1.2152
--- kernel-2.6.spec	22 Apr 2006 23:46:16 -0000	1.2151
+++ kernel-2.6.spec	24 Apr 2006 01:38:57 -0000	1.2152
@@ -7,7 +7,7 @@
 %define buildsmp 0
 %define buildpae 0
 # Whether to apply the Xen patches, leave this enabled.
-%define includexen 1
+%define includexen 0
 # Whether to build the Xen kernels, disable if you want.
 %define buildxen 1
 %define buildxenPAE 0
@@ -157,7 +157,8 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x
+#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -213,7 +214,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.17-rc2.bz2
-Patch2: patch-2.6.17-rc2-git4.bz2
+Patch2: patch-2.6.17-rc2-git5.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -228,7 +229,6 @@
 Patch205: linux-2.6-x86_64-smp-on-uphw-cpucount.patch
 Patch206: linux-2.6-x86-hp-reboot.patch
 Patch207: linux-2.6-x86-cpu_index-false.patch
-Patch208: linux-2.6-x86_64-vdso-compile-m32.patch
 
 # 300 - 399   ppc(64)
 Patch301: linux-2.6-cell-numa-init.patch
@@ -751,8 +751,6 @@
 %patch206 -p1
 # cpu_index >= NR_CPUS becomming always false.
 %patch207 -p1
-# Fix broken x86-64 32bit vDSO (#186924)
-%patch208 -p1
 
 #
 # ppc64
@@ -1013,7 +1011,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
@@ -1660,6 +1658,9 @@
 %endif
 
 %changelog
+* Sun Apr 23 2006 Dave Jones <davej at redhat.com>
+- 2.6.17rc2-git5
+
 * Sat Apr 22 2006 Dave Jones <davej at redhat.com>
 - Ugly SATA suspend/resume hack de jour.
 

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.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- linux-2.6-compile-fixes.patch	16 Apr 2006 23:07:34 -0000	1.68
+++ linux-2.6-compile-fixes.patch	24 Apr 2006 01:38:57 -0000	1.69
@@ -1,10 +0,0 @@
---- linux-2.6.16.noarch/arch/powerpc/platforms/cell/spu_callbacks.c~	2006-04-16 18:06:07.000000000 -0500
-+++ linux-2.6.16.noarch/arch/powerpc/platforms/cell/spu_callbacks.c	2006-04-16 18:07:12.000000000 -0500
-@@ -317,6 +317,7 @@ void *spu_syscall_table[] = {
- 	[__NR_ppoll]			sys_ni_syscall, /* sys_ppoll */
- 	[__NR_unshare]			sys_unshare,
- 	[__NR_splice]			sys_splice,
-+	[__NR_tee]			sys_tee,
- };
- 
- long spu_sys_callback(struct spu_syscall_block *s)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -r1.354 -r1.355
--- sources	21 Apr 2006 18:11:06 -0000	1.354
+++ sources	24 Apr 2006 01:38:57 -0000	1.355
@@ -1,4 +1,4 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 e8e055329db3aad40a010ded0f8bdcf9  xen-20060413.tar.bz2
 87c4ea50e1b25ad808b65ad3fb19a9b5  patch-2.6.17-rc2.bz2
-099f428dd7e24a7ee5203b693c1d9b55  patch-2.6.17-rc2-git4.bz2
+6c72c7e1f04f04f5d5e1532107c1f81a  patch-2.6.17-rc2-git5.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -r1.325 -r1.326
--- upstream	21 Apr 2006 18:11:06 -0000	1.325
+++ upstream	24 Apr 2006 01:38:57 -0000	1.326
@@ -1,3 +1,3 @@
 linux-2.6.16.tar.bz2
 patch-2.6.17-rc2.bz2
-patch-2.6.17-rc2-git4.bz2
+patch-2.6.17-rc2-git5.bz2


--- patch-2.6.17-rc2-git4.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 24 01:42:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Apr 2006 21:42:53 -0400
Subject: rpms/anthy/FC-5 .cvsignore, 1.11, 1.12 anthy.spec, 1.19,
	1.20 sources, 1.11, 1.12 anthy-2832.patch, 1.1,
	NONE anthy-2834.patch, 1.1, NONE
Message-ID: <200604240142.k3O1grqc008456@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/anthy/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8419

Modified Files:
	.cvsignore anthy.spec sources 
Removed Files:
	anthy-2832.patch anthy-2834.patch 
Log Message:
* Mon Apr 24 2006 Akira TAGOH <tagoh at redhat.com> 7500b-1
- New upstream release.
  - removed unnecessary patches:
    - anthy-2832.patch
    - anthy-2834.patch


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anthy/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	22 Mar 2006 04:28:00 -0000	1.11
+++ .cvsignore	24 Apr 2006 01:42:50 -0000	1.12
@@ -14,3 +14,4 @@
 anthy-7029.tar.gz
 anthy-7100b.tar.gz
 anthy-7500.tar.gz
+anthy-7500b.tar.gz


Index: anthy.spec
===================================================================
RCS file: /cvs/dist/rpms/anthy/FC-5/anthy.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- anthy.spec	22 Mar 2006 04:25:12 -0000	1.19
+++ anthy.spec	24 Apr 2006 01:42:50 -0000	1.20
@@ -1,4 +1,4 @@
-%define	version		7500
+%define	version		7500b
 %define	gcanna_ver	20051002
 %{expand: %%define build_with_xemacs %{?_with_xemacs:1}%{!?_with_xemacs:0}}
 
@@ -14,8 +14,6 @@
 Source0:	http://prdownloads.sourceforge.jp/anthy/9723/anthy-%{version}.tar.gz
 Source1:	anthy-init.el
 Source2:	http://www.geocities.jp/ep3797/snapshot/tmp/anthy_gcanna_ut-%{gcanna_ver}.tar.bz2
-Patch0:		anthy-2832.patch
-Patch1:		anthy-2834.patch
 Patch2:		anthy-gcanna-nakaguro.patch
 
 Summary:	Japanese character set input library
@@ -58,8 +56,6 @@
 
 %prep
 %setup -q -a 2
-%patch0 -p1
-%patch1 -p1
 %patch2 -p1
 
 %build
@@ -123,6 +119,12 @@
 %endif
 
 %changelog
+* Mon Apr 24 2006 Akira TAGOH <tagoh at redhat.com> 7500b-1
+- New upstream release.
+  - removed unnecessary patches:
+    - anthy-2832.patch
+    - anthy-2834.patch
+
 * Fri Mar 17 2006 Akira TAGOH <tagoh at redhat.com> 7500-1
 - New upstream release.
   - larning words works now. (#178764)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anthy/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	22 Mar 2006 04:28:00 -0000	1.11
+++ sources	24 Apr 2006 01:42:50 -0000	1.12
@@ -1,2 +1,2 @@
 d0f6128b6e000e85764abbc030399db7  anthy_gcanna_ut-20051002.tar.bz2
-c086a19b7590caa2a08406459eb577f8  anthy-7500.tar.gz
+ed3ce5d4332751ee3f4befe843c8ebb8  anthy-7500b.tar.gz


--- anthy-2832.patch DELETED ---


--- anthy-2834.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 24 03:11:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Apr 2006 23:11:11 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2152,
	1.2153 linux-2.6-compile-fixes.patch, 1.69, 1.70
Message-ID: <200604240311.k3O3BBID006640@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6588

Modified Files:
	kernel-2.6.spec linux-2.6-compile-fixes.patch 
Log Message:
cifs build fix



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2152
retrieving revision 1.2153
diff -u -r1.2152 -r1.2153
--- kernel-2.6.spec	24 Apr 2006 01:38:57 -0000	1.2152
+++ kernel-2.6.spec	24 Apr 2006 03:10:57 -0000	1.2153
@@ -1011,7 +1011,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:
 connect.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 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.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- linux-2.6-compile-fixes.patch	24 Apr 2006 01:38:57 -0000	1.69
+++ linux-2.6-compile-fixes.patch	24 Apr 2006 03:10:57 -0000	1.70
@@ -0,0 +1,24 @@
+
+fs/cifs/connect.c: In function 'cifs_setup_session':
+fs/cifs/connect.c:3451: error: implicit declaration of function 'CIFS_SessSetup'
+
+Signed-off-by: Dave Jones <davej at redhat.com>
+
+--- linux-2.6.16.noarch/fs/cifs/connect.c~	2006-04-23 23:08:32.000000000 -0400
++++ linux-2.6.16.noarch/fs/cifs/connect.c	2006-04-23 23:09:45.000000000 -0400
+@@ -3447,10 +3447,13 @@ int cifs_setup_session(unsigned int xid,
+ 			pSesInfo->server->secMode,
+ 			pSesInfo->server->capabilities,
+ 			pSesInfo->server->timeZone));
++#ifdef CONFIG_CIFS_EXPERIMENTAL
+ 		if(experimEnabled > 1)
+ 			rc = CIFS_SessSetup(xid, pSesInfo, CIFS_NTLM /* type */,
+-					    &ntlmv2_flag, nls_info);	
+-		else if (extended_security
++					    &ntlmv2_flag, nls_info);
++		else
++#endif
++			if (extended_security
+ 				&& (pSesInfo->capabilities & CAP_EXTENDED_SECURITY)
+ 				&& (pSesInfo->server->secType == NTLMSSP)) {
+ 			cFYI(1, ("New style sesssetup"));



From fedora-cvs-commits at redhat.com  Mon Apr 24 07:36:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 03:36:33 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.671, 1.672 sources,
	1.165, 1.166
Message-ID: <200604240736.k3O7aX7D016211@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16197

Modified Files:
	openoffice.org.spec sources 
Log Message:
ooo#64063# tamil translations


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.671
retrieving revision 1.672
diff -u -r1.671 -r1.672
--- openoffice.org.spec	22 Apr 2006 17:21:41 -0000	1.671
+++ openoffice.org.spec	24 Apr 2006 07:36:30 -0000	1.672
@@ -1,6 +1,6 @@
 %define oootag OOB680
 %define ooomilestone 5
-%define rh_rpm_release 10
+%define rh_rpm_release 11
 
 %define build_fc6 1
 %define build_rhel4 0
@@ -3704,6 +3704,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Mon Apr 24 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.11
+- ooo#64063# Finally 2.0.X Tamil translation updates
+
 * Tue Apr 18 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.10
 - ooo#64463# don't require Xaw for the use mozilla plugins (e.g flash)
   in OOo feature


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- sources	14 Apr 2006 15:43:13 -0000	1.165
+++ sources	24 Apr 2006 07:36:30 -0000	1.166
@@ -1,4 +1,3 @@
-a66c6ab52b2eb2deaa7ff85595276b15  GSI_ta-IN.sdf
 a4a22f6b80a4f02c01bbe0400e131e57  RegisterAndLicence.xcu
 1825a3b182fd46e08075a42257cfc6aa  gcj-sed.sh
 16cb79cb018c6311e9797e85bd2461b2  evolocal.odb
@@ -10,3 +9,4 @@
 8d8c4222654f718436c234582c8fd529  GSI_ga.sdf
 bfa60acd8b0c30a1a6d14165da45c1dd  openoffice.org-myspell-contrib.tar.gz
 afe937f8dd4c3aa10e9bda068059cdfd  opens___.ttf
+008752c97e7cd0edbb7f6589ae61e498  GSI_ta-IN.sdf



From fedora-cvs-commits at redhat.com  Mon Apr 24 08:13:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 04:13:25 -0400
Subject: rpms/openoffice.org/devel sources,1.166,1.167
Message-ID: <200604240813.k3O8DPQU016883@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16852

Modified Files:
	sources 
Log Message:
update irish translations


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- sources	24 Apr 2006 07:36:30 -0000	1.166
+++ sources	24 Apr 2006 08:13:18 -0000	1.167
@@ -6,7 +6,7 @@
 1b4d9a03ebb4c864015620153afb77c6  Tigert-templates.tar.gz
 20789fc643e2b857291e1973075fccb0  OOB680_m5.tar.bz2
 67ba19cf8ac46671799ff63a48901e8b  openoffice.org-simple-crash_report.sh
-8d8c4222654f718436c234582c8fd529  GSI_ga.sdf
 bfa60acd8b0c30a1a6d14165da45c1dd  openoffice.org-myspell-contrib.tar.gz
 afe937f8dd4c3aa10e9bda068059cdfd  opens___.ttf
 008752c97e7cd0edbb7f6589ae61e498  GSI_ta-IN.sdf
+7f31494f6d929e03b1e29408d8083d19  GSI_ga.sdf



From fedora-cvs-commits at redhat.com  Mon Apr 24 09:37:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 05:37:14 -0400
Subject: rpms/libstdc++so7/FC-5 libstdc++7.spec,1.3,1.4
Message-ID: <200604240937.k3O9bEsS013712@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/libstdc++so7/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13669

Modified Files:
	libstdc++7.spec 
Log Message:
- use ppc64 as target for ppc like gcc does (#188446)
  - define and use gcc_target_platform from gcc41.spec



Index: libstdc++7.spec
===================================================================
RCS file: /cvs/dist/rpms/libstdc++so7/FC-5/libstdc++7.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libstdc++7.spec	10 Mar 2006 06:02:33 -0000	1.3
+++ libstdc++7.spec	24 Apr 2006 09:36:44 -0000	1.4
@@ -3,7 +3,7 @@
 Summary: libstdc++.so.7 preview
 Name: libstdc++so7
 Version: 4.2.0
-Release: 0.3.%{datestamp}.2
+Release: 0.3.%{datestamp}.3
 License: GPL
 Group: System Environment/Libraries
 Source0: gcc_stub-4.1-20060118.tar.bz2
@@ -15,6 +15,15 @@
 AutoReq: true
 
 %define _gnu %{nil}
+%ifarch sparc
+%define gcc_target_platform sparc64-%{_vendor}-%{_target_os}
+%endif
+%ifarch ppc
+%define gcc_target_platform ppc64-%{_vendor}-%{_target_os}
+%endif
+%ifnarch sparc ppc
+%define gcc_target_platform %{_target_platform}
+%endif
 
 %description
 The libstdc++so7 package contains a preview of the GNU Standard C++
@@ -46,7 +55,7 @@
 mkdir obj
 cd obj
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ../configure \
-  --enable-languages=c,c++ --disable-multilib %{_target_platform}
+  --enable-languages=c,c++ --disable-multilib %{gcc_target_platform}
 mkdir gcc
 cp -a ../copy_to_gcc/* gcc/
 gccdir=`cd $(gcc $RPM_OPT_FLAGS -print-file-name=include)/..; pwd`
@@ -84,10 +93,10 @@
   $RPM_BUILD_ROOT%{_libdir}/libstdc++-%{datestamp}.so.7
 
 # links for shared library
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/gcc/%{_target_platform}/$libversion
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/gcc/%{gcc_target_platform}/$libversion
 mv $RPM_BUILD_ROOT%{_libdir}/*.a \
-  $RPM_BUILD_ROOT%{_prefix}/lib/gcc/%{_target_platform}/$libversion/
-pushd $RPM_BUILD_ROOT%{_prefix}/lib/gcc/%{_target_platform}/$libversion/
+  $RPM_BUILD_ROOT%{_prefix}/lib/gcc/%{gcc_target_platform}/$libversion/
+pushd $RPM_BUILD_ROOT%{_prefix}/lib/gcc/%{gcc_target_platform}/$libversion/
 if [ "%{_lib}" = lib64 ]; then
   ln -sf ../../../../lib64/libstdc++*.so.7 libstdc++.so
 else
@@ -142,7 +151,7 @@
 esac
 %endif
 %ifnarch %{ix86} x86_64 ppc ppc64 s390 s390x sparc sparc64
-T=%{_target_platform}
+T=%{gcc_target_platform}
 %endif
 exec /usr/bin/g++ \
      -D__FLT_HAS_DENORM__=__FLT_DENORM_MIN__ \
@@ -171,10 +180,14 @@
 %files devel
 %{_prefix}/bin/g++-libstdc++-so_7
 %dir %{_prefix}/lib/gcc
-%{_prefix}/lib/gcc/%{_target_platform}/4.2.0-*
+%{_prefix}/lib/gcc/%{gcc_target_platform}/4.2.0-*
 %{_prefix}/include/c++/4.2.0-*
 
 %changelog
+* Mon Apr 24 2006 Jens Petersen <petersen at redhat.com> - 4.2.0-0.3.20060203.3
+- use ppc64 as target for ppc like gcc does (#188446)
+  - define and use gcc_target_platform from gcc41.spec
+
 * Fri Mar 10 2006 Bill Nottingham <notting at redhat.com> - 4.2.0-0.3.20060203.2
 - rebuild for ppc TLS issue (#184446)
 



From fedora-cvs-commits at redhat.com  Mon Apr 24 10:05:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 06:05:09 -0400
Subject: rpms/star/devel .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 star.spec,
	1.25, 1.26
Message-ID: <200604241005.k3OA59gA002699@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/star/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2666

Modified Files:
	.cvsignore sources star.spec 
Log Message:
upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/star/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	22 Mar 2006 11:14:20 -0000	1.14
+++ .cvsignore	24 Apr 2006 10:04:36 -0000	1.15
@@ -1 +1 @@
-star-1.5a73.tar.bz2
+star-1.5a74.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/star/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	22 Mar 2006 11:14:20 -0000	1.14
+++ sources	24 Apr 2006 10:04:51 -0000	1.15
@@ -1 +1 @@
-ad8c110aa016670d8f55fd7f13cb7114  star-1.5a73.tar.bz2
+c6310fe00d90db74af8652a22cc2ec70  star-1.5a74.tar.bz2


Index: star.spec
===================================================================
RCS file: /cvs/dist/rpms/star/devel/star.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- star.spec	22 Mar 2006 11:14:20 -0000	1.25
+++ star.spec	24 Apr 2006 10:04:51 -0000	1.26
@@ -3,7 +3,7 @@
 %endif
 Summary:  An archiving tool with ACL support
 Name: star
-Version: 1.5a73
+Version: 1.5a74
 Release: 1
 URL: http://cdrecord.berlios.de/old/private/star.html
 Source: ftp://ftp.berlios.de/pub/star/alpha/%{name}-%{version}.tar.bz2
@@ -97,6 +97,9 @@
 %{_mandir}/man1/spax.1*
 
 %changelog
+* Mon Apr 24 2006 Peter Vrabec <pvrabec at redhat.com> 1.5a74-1
+- upgrade
+
 * Wed Mar 22 2006 Peter Vrabec <pvrabec at redhat.com> 1.5a73-1
 - upgrade
 



From fedora-cvs-commits at redhat.com  Mon Apr 24 10:15:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 06:15:11 -0400
Subject: rpms/gimp-help/devel .cvsignore, 1.6, 1.7 gimp-help.spec, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <200604241015.k3OAFBki004449@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/gimp-help/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4400

Modified Files:
	.cvsignore gimp-help.spec sources 
Log Message:
version 2-0.10



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gimp-help/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Oct 2005 10:21:17 -0000	1.6
+++ .cvsignore	24 Apr 2006 10:14:51 -0000	1.7
@@ -1 +1 @@
-gimp-help-2-0.9.tar.gz
+gimp-help-2-0.10.tar.gz


Index: gimp-help.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp-help/devel/gimp-help.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gimp-help.spec	9 Dec 2005 22:40:34 -0000	1.8
+++ gimp-help.spec	24 Apr 2006 10:14:51 -0000	1.9
@@ -1,14 +1,14 @@
-%define gimphelpver 2-0.9
+%define gimphelpver 2-0.10
 %define gimpsubver 2.0
 
 Summary: Help files for the GIMP.
 Name: gimp-help
 Version: %(echo %gimphelpver|cut -d- -f1)
-Release: 0.1.%(echo %gimphelpver|cut -d- -f2).1.1
+Release: 0.1.%(echo %gimphelpver|cut -d- -f2).1
 License: GNU FDL
 Group: Applications/Multimedia
 URL: http://wiki.gimp.org/gimp/GimpDocs
-Source: ftp://ftp.gimp.org/pub/gimp/help/testing/gimp-help-%{gimphelpver}.tar.gz
+Source: ftp://ftp.gimp.org/pub/gimp/help/gimp-help-%{gimphelpver}.tar.gz
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libxslt
@@ -40,6 +40,9 @@
 %{_datadir}/gimp/%{gimpsubver}/help
 
 %changelog
+* Mon Apr 24 2006 Nils Philippsen <nphilipp at redhat.com>
+- version 2-0.10
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gimp-help/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Oct 2005 10:21:17 -0000	1.6
+++ sources	24 Apr 2006 10:14:51 -0000	1.7
@@ -1 +1 @@
-c2f5c20cc5d861e7d403dda8e46d1c97  gimp-help-2-0.9.tar.gz
+22a1e10c314c5547fe8721c4f6f0b30a  gimp-help-2-0.10.tar.gz



From fedora-cvs-commits at redhat.com  Mon Apr 24 10:24:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 06:24:24 -0400
Subject: rpms/ltrace/devel ltrace-opd.patch, NONE, 1.1 ltrace-testsuite.patch,
	1.4, 1.5 ltrace.spec, 1.29, 1.30
Message-ID: <200604241024.k3OAOOs6029988@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/ltrace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29971

Modified Files:
	ltrace-testsuite.patch ltrace.spec 
Added Files:
	ltrace-opd.patch 
Log Message:
- turn off opd translation on ia64, GElf already gives us function
  address.
- turn on main-internal test, it should pass now.



ltrace-opd.patch:
 elf.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE ltrace-opd.patch ---
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;
 
+#ifdef __ia64__
+	/* XXX: On Itaniums, gelf seems to return function address
+	   instead of address of function descriptor. */
+	ret_val = (GElf_Addr)addr;
+#else
 	base = (long)lte->opd->d_buf;
 	offset = (long)addr - (long)lte->opd_addr;
 	if (offset > lte->opd_size)
 		error(EXIT_FAILURE, 0, "static plt not in .opd");
 
 	ret_val = (GElf_Addr) * (long *)(base + offset);
+#endif
 	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;

ltrace-testsuite.patch:
 ChangeLog                                            |   58 +++
 Makefile.in                                          |   10 
 configure                                            |    2 
 configure.ac                                         |    5 
 testsuite/Makefile.in                                |   72 ++++
 testsuite/README                                     |  244 ++++++++++++++++
 testsuite/config/unix.exp                            |    1 
 testsuite/lib/compiler.c                             |   58 +++
 testsuite/lib/compiler.cc                            |   45 +++
 testsuite/lib/ltrace.exp                             |  277 +++++++++++++++++++
 testsuite/ltrace.main/Makefile.in                    |   34 ++
 testsuite/ltrace.main/main-internal-1.c              |    8 
 testsuite/ltrace.main/main-internal.c                |   19 +
 testsuite/ltrace.main/main-internal.exp              |   33 ++
 testsuite/ltrace.main/main-lib.c                     |    7 
 testsuite/ltrace.main/main.c                         |   21 +
 testsuite/ltrace.main/main.exp                       |   39 ++
 testsuite/ltrace.main/signals.c                      |   48 +++
 testsuite/ltrace.main/signals.exp                    |   39 ++
 testsuite/ltrace.main/system_calls.c                 |   68 ++++
 testsuite/ltrace.main/system_calls.exp               |   67 ++++
 testsuite/ltrace.minor/Makefile.in                   |   37 ++
 testsuite/ltrace.minor/attach-process.c              |   16 +
 testsuite/ltrace.minor/attach-process.exp            |   38 ++
 testsuite/ltrace.minor/count-record.c                |   51 +++
 testsuite/ltrace.minor/count-record.exp              |   77 +++++
 testsuite/ltrace.minor/demangle-lib.cpp              |   97 ++++++
 testsuite/ltrace.minor/demangle.cpp                  |  121 ++++++++
 testsuite/ltrace.minor/demangle.exp                  |   63 ++++
 testsuite/ltrace.minor/demangle.h                    |   36 ++
 testsuite/ltrace.minor/print-instruction-pointer.c   |   11 
 testsuite/ltrace.minor/print-instruction-pointer.exp |   42 ++
 testsuite/ltrace.minor/time-record-T.exp             |   84 +++++
 testsuite/ltrace.minor/time-record-tt.exp            |  107 +++++++
 testsuite/ltrace.minor/time-record-ttt.exp           |  112 +++++++
 testsuite/ltrace.minor/time-record.c                 |   23 +
 testsuite/ltrace.minor/trace-clone.c                 |   43 ++
 testsuite/ltrace.minor/trace-clone.exp               |   44 +++
 testsuite/ltrace.minor/trace-fork.c                  |   33 ++
 testsuite/ltrace.minor/trace-fork.exp                |   40 ++
 testsuite/ltrace.torture/Makefile.in                 |   34 ++
 testsuite/ltrace.torture/signals.c                   |   44 +++
 testsuite/ltrace.torture/signals.exp                 |   37 ++
 testsuite/run-my-tests.sh                            |   43 ++
 44 files changed, 2382 insertions(+), 6 deletions(-)

Index: ltrace-testsuite.patch
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace-testsuite.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ltrace-testsuite.patch	12 Apr 2006 15:23:26 -0000	1.4
+++ ltrace-testsuite.patch	24 Apr 2006 10:24:21 -0000	1.5
@@ -1184,7 +1184,7 @@
 +}
 +
 +set pattern "display"
-+#ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 12 
++ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 12 
 Index: testsuite/ltrace.main/main-lib.c
 ===================================================================
 --- testsuite/ltrace.main/main-lib.c	(revision 0)


Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ltrace.spec	12 Apr 2006 15:23:26 -0000	1.29
+++ ltrace.spec	24 Apr 2006 10:24:21 -0000	1.30
@@ -1,10 +1,11 @@
 Summary: Tracks runtime library calls from dynamically linked executables.
 Name: ltrace
 Version: 0.4
-Release: 1.3
+Release: 1.4
 Source: ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_%{version}.orig.tar.gz
 Patch0: ltrace-opt_x.patch
 Patch1: ltrace-testsuite.patch
+Patch2: ltrace-opd.patch
 License: GPL
 Group: Development/Debuggers
 ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 s390 s390x alpha sparc
@@ -26,11 +27,13 @@
 %setup -q
 %patch0 -p0
 %patch1 -p0
+%patch2 -p1
 sed -i -e 's/-o root -g root//' Makefile.in
 
 %build
-export CC="gcc`echo $RPM_OPT_FLAGS | sed -n 's/^.*\(-m[36][124]\).*$/ \1/p'`"
-%configure CC="$CC"
+#export CC="gcc`echo $RPM_OPT_FLAGS | sed -n 's/^.*\(-m[36][124]\).*$/ \1/p'`"
+%configure
+#CC="$CC"
 make
 
 %install
@@ -52,6 +55,11 @@
 %config /etc/ltrace.conf
 
 %changelog
+* Mon Apr 24 2006 Petr Machata <pmachata at redhat.com> - 0.4-1.4
+- turn off opd translation on ia64, GElf already gives us function
+  address.
+- turn on main-internal test, it should pass now.
+
 * Wed Apr 12 2006 Petr Machata <pmachata at redhat.com> - 0.4-1.2
 - svn fix for opt_x patch
 - patches for testsuite for s390{,x}



From fedora-cvs-commits at redhat.com  Mon Apr 24 10:47:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 06:47:11 -0400
Subject: rpms/evolution-data-server/FC-5
	evolution-data-server-1.2.0-vcrap.patch, NONE,
	1.1.4.1 evolution-data-server-1.5.91-check-only-active-folders.patch,
	NONE, 1.1.4.1 evolution-data-server.spec, 1.90, 1.90.2.1
Message-ID: <200604241047.k3OAlBfp019899@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/evolution-data-server/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16269

Modified Files:
      Tag: private-1_6_1-check-only-active-folders-branch
	evolution-data-server.spec 
Added Files:
      Tag: private-1_6_1-check-only-active-folders-branch
	evolution-data-server-1.2.0-vcrap.patch 
	evolution-data-server-1.5.91-check-only-active-folders.patch 
Log Message:
Update bug fix branch


evolution-data-server-1.2.0-vcrap.patch:
 camel-imap-provider.c |    6 +++++-
 camel-imap-store.c    |    5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE evolution-data-server-1.2.0-vcrap.patch ---
--- evolution-data-server-1.2.0/camel/providers/imap/camel-imap-provider.c~	2005-03-16 08:44:11.000000000 -0700
+++ evolution-data-server-1.2.0/camel/providers/imap/camel-imap-provider.c	2005-03-16 10:12:13.000000000 -0700
@@ -64,9 +64,13 @@ CamelProviderConfEntry imap_conf_entries
 	  N_("Namespace") },
 	{ CAMEL_PROVIDER_CONF_SECTION_END },
 	{ CAMEL_PROVIDER_CONF_SECTION_START, "general", NULL, N_("Options") },
+	{ CAMEL_PROVIDER_CONF_CHECKBOX, "display_trash", NULL,
+	  N_("Display Trash folder"), "1" },
+	{ CAMEL_PROVIDER_CONF_CHECKBOX, "display_junk", NULL,
+	  N_("Display Junk folder"), "1" },
 	{ CAMEL_PROVIDER_CONF_CHECKBOX, "filter", NULL,
 	  N_("_Apply filters to new messages in INBOX on this server"), "0" },
-	{ CAMEL_PROVIDER_CONF_CHECKBOX, "filter_junk", NULL,
+	{ CAMEL_PROVIDER_CONF_CHECKBOX, "filter_junk", "display_junk",
 	  N_("Check new messages for _Junk contents"), "0" },
 	{ CAMEL_PROVIDER_CONF_CHECKBOX, "filter_junk_inbox", "filter_junk",
 	  N_("Only check for Junk messa_ges in the INBOX folder"), "0" },
--- evolution-data-server-1.2.0/camel/providers/imap/camel-imap-store.c~	2005-03-16 08:44:11.000000000 -0700
+++ evolution-data-server-1.2.0/camel/providers/imap/camel-imap-store.c	2005-03-16 10:06:08.000000000 -0700
@@ -277,6 +277,11 @@ construct (CamelService *service, CamelS
 	if (camel_url_get_param (url, "filter_junk_inbox"))
 		imap_store->parameters |= IMAP_PARAM_FILTER_JUNK_INBOX;
 
+	if (!camel_url_get_param (url, "display_trash"))
+		store->flags &= ~CAMEL_STORE_VTRASH;
+	if (!camel_url_get_param (url, "display_junk"))
+		store->flags &= ~CAMEL_STORE_VJUNK;
+
 	/* setup/load the store summary */
 	tmp = alloca(strlen(imap_store->storage_path)+32);
 	sprintf(tmp, "%s/.ev-store-summary", imap_store->storage_path);

evolution-data-server-1.5.91-check-only-active-folders.patch:
 camel-imap-provider.c |    3 +++
 camel-imap-store.c    |   11 +++++++++++
 camel-imap-store.h    |    3 +++
 3 files changed, 17 insertions(+)

--- NEW FILE evolution-data-server-1.5.91-check-only-active-folders.patch ---
--- evolution-data-server-1.5.91/camel/providers/imap/camel-imap-provider.c~	2006-02-27 14:05:10.000000000 +0000
+++ evolution-data-server-1.5.91/camel/providers/imap/camel-imap-provider.c	2006-02-27 16:43:47.000000000 +0000
@@ -40,8 +40,11 @@ static gint imap_url_equal (gconstpointe
 CamelProviderConfEntry imap_conf_entries[] = {
 	{ CAMEL_PROVIDER_CONF_SECTION_START, "mailcheck", NULL,
 	  N_("Checking for New Mail") },
+	/* FIXME: Ideally we want a list here: Check for mail in: {No folders / INBOX only / subscribed / all} */
 	{ CAMEL_PROVIDER_CONF_CHECKBOX, "check_all", NULL,
 	  N_("C_heck for new messages in all folders"), "1" },
+	{ CAMEL_PROVIDER_CONF_CHECKBOX, "check_subscribed", NULL,
+	  N_("C_heck for new messages in all active folders"), "0" },
 	{ CAMEL_PROVIDER_CONF_SECTION_END },
 #ifndef G_OS_WIN32
 	{ CAMEL_PROVIDER_CONF_SECTION_START, "cmdsection", NULL,
--- evolution-data-server-1.5.91/camel/providers/imap/camel-imap-store.c~	2006-02-27 14:05:10.000000000 +0000
+++ evolution-data-server-1.5.91/camel/providers/imap/camel-imap-store.c	2006-02-27 16:44:51.000000000 +0000
@@ -287,6 +287,8 @@ construct (CamelService *service, CamelS
 	}
 	if (camel_url_get_param (url, "check_all"))
 		imap_store->parameters |= IMAP_PARAM_CHECK_ALL;
+	if (camel_url_get_param (url, "check_subscribed"))
+		imap_store->parameters |= IMAP_PARAM_CHECK_SUBSCRIBED;
 	if (camel_url_get_param (url, "filter")) {
 		imap_store->parameters |= IMAP_PARAM_FILTER_INBOX;
 		store->flags |= CAMEL_STORE_FILTER_INBOX;
@@ -372,6 +374,12 @@ imap_setv (CamelObject *object, CamelExc
 			store->parameters = flags;
 			/* no need to reconnect for this option to take effect... */
 			break;
+		case CAMEL_IMAP_STORE_CHECK_SUBSCRIBED:
+			flags = args->argv[i].ca_int ? IMAP_PARAM_CHECK_SUBSCRIBED : 0;
+			flags |= (store->parameters & ~IMAP_PARAM_CHECK_SUBSCRIBED);
+			store->parameters = flags;
+			/* no need to reconnect for this option to take effect... */
+			break;
 		case CAMEL_IMAP_STORE_FILTER_INBOX:
 			flags = args->argv[i].ca_int ? IMAP_PARAM_FILTER_INBOX : 0;
 			flags |= (store->parameters & ~IMAP_PARAM_FILTER_INBOX);
@@ -427,6 +435,9 @@ imap_getv (CamelObject *object, CamelExc
 		case CAMEL_IMAP_STORE_CHECK_ALL:
 			*args->argv[i].ca_int = store->parameters & IMAP_PARAM_CHECK_ALL ? TRUE : FALSE;
 			break;
+		case CAMEL_IMAP_STORE_CHECK_SUBSCRIBED:
+			*args->argv[i].ca_int = store->parameters & IMAP_PARAM_CHECK_SUBSCRIBED ? TRUE : FALSE;
+			break;
 		case CAMEL_IMAP_STORE_FILTER_INBOX:
 			*args->argv[i].ca_int = store->parameters & IMAP_PARAM_FILTER_INBOX ? TRUE : FALSE;
 			break;
--- evolution-data-server-1.5.91/camel/providers/imap/camel-imap-store.h~	2005-09-02 15:37:44.000000000 +0100
+++ evolution-data-server-1.5.91/camel/providers/imap/camel-imap-store.h	2006-02-27 16:45:26.000000000 +0000
@@ -64,6 +64,7 @@ enum {
 	CAMEL_IMAP_STORE_ARG_NAMESPACE,
 	CAMEL_IMAP_STORE_ARG_OVERRIDE_NAMESPACE,
 	CAMEL_IMAP_STORE_ARG_CHECK_ALL,
+	CAMEL_IMAP_STORE_ARG_CHECK_SUBSCRIBED,
 	CAMEL_IMAP_STORE_ARG_FILTER_INBOX,
 	CAMEL_IMAP_STORE_ARG_FILTER_JUNK,
 	CAMEL_IMAP_STORE_ARG_FILTER_JUNK_INBOX,
@@ -72,6 +73,7 @@ enum {
 #define CAMEL_IMAP_STORE_NAMESPACE           (CAMEL_IMAP_STORE_ARG_NAMESPACE | CAMEL_ARG_STR)
 #define CAMEL_IMAP_STORE_OVERRIDE_NAMESPACE  (CAMEL_IMAP_STORE_ARG_OVERRIDE_NAMESPACE | CAMEL_ARG_INT)
 #define CAMEL_IMAP_STORE_CHECK_ALL           (CAMEL_IMAP_STORE_ARG_CHECK_ALL | CAMEL_ARG_INT)
+#define CAMEL_IMAP_STORE_CHECK_SUBSCRIBED    (CAMEL_IMAP_STORE_ARG_CHECK_SUBSCRIBED | CAMEL_ARG_INT)
 #define CAMEL_IMAP_STORE_FILTER_INBOX        (CAMEL_IMAP_STORE_ARG_FILTER_INBOX | CAMEL_ARG_INT)
 #define CAMEL_IMAP_STORE_FILTER_JUNK         (CAMEL_IMAP_STORE_ARG_FILTER_JUNK | CAMEL_ARG_BOO)
 #define CAMEL_IMAP_STORE_FILTER_JUNK_INBOX   (CAMEL_IMAP_STORE_ARG_FILTER_JUNK_INBOX | CAMEL_ARG_BOO)
@@ -104,6 +106,7 @@ typedef enum {
 #define IMAP_PARAM_FILTER_JUNK			(1 << 3)
 #define IMAP_PARAM_FILTER_JUNK_INBOX		(1 << 4)
 #define IMAP_PARAM_SUBSCRIPTIONS		(1 << 5)
+#define IMAP_PARAM_CHECK_SUBSCRIBED		(1 << 6)
 
 struct _CamelImapStore {
 	CamelDiscoStore parent_object;	


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/FC-5/evolution-data-server.spec,v
retrieving revision 1.90
retrieving revision 1.90.2.1
diff -u -r1.90 -r1.90.2.1
--- evolution-data-server.spec	11 Apr 2006 02:34:20 -0000	1.90
+++ evolution-data-server.spec	24 Apr 2006 10:47:07 -0000	1.90.2.1
@@ -13,7 +13,7 @@
 
 %define use_gtk_doc 0
 
-%define support_imap4_provider 0
+%define support_imap4_provider 1
 
 %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
@@ -21,7 +21,7 @@
 Summary: Backend data server for evolution
 Name: evolution-data-server
 Version: 1.6.1
-Release: 1.fc5.2
+Release: 1.fc5.2.dwmw2.1
 License: LGPL
 Group: System Environment/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
@@ -45,6 +45,9 @@
 
 Patch300: evolution-data-server-1.5.4-make_imap4_optional.patch
 
+Patch400: evolution-data-server-1.5.91-check-only-active-folders.patch
+Patch401: evolution-data-server-1.2.0-vcrap.patch
+
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: libsoup >= %{soup_version}
 Requires: ORBit2 >= %{orbit2_version}
@@ -121,6 +124,10 @@
 %patch201 -p0 -b .fix-comp-ref-leak
 %patch300 -p1 -b .make_imap4_optional
 
+%patch400 -p1 -b .checksub
+%patch401 -p1 -b .vcrap
+
+
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
 mkdir -p krb5-fakeprefix/%{_lib}



From fedora-cvs-commits at redhat.com  Mon Apr 24 10:51:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 06:51:15 -0400
Subject: rpms/evolution/FC-5
	evolution-2.5.91-check-only-active-folders.patch, NONE,
	1.1.6.1 evolution.spec, 1.136, 1.136.2.1
Message-ID: <200604241051.k3OApFet025289@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/evolution/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv25228

Modified Files:
      Tag: private-2_6_1-check-only-active-folders-branch
	evolution.spec 
Added Files:
      Tag: private-2_6_1-check-only-active-folders-branch
	evolution-2.5.91-check-only-active-folders.patch 
Log Message:
Update bug-fix branch


evolution-2.5.91-check-only-active-folders.patch:
 mail-send-recv.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE evolution-2.5.91-check-only-active-folders.patch ---
--- evolution-2.5.91/mail/mail-send-recv.c~	2006-01-16 11:12:25.000000000 +0000
+++ evolution-2.5.91/mail/mail-send-recv.c	2006-02-27 16:41:46.000000000 +0000
@@ -762,6 +762,8 @@ get_folders(CamelStore *store, GPtrArray
 		   controls this refresh process.
 		   TODO: add virtual camel_store_refresh_info() which does this ... */
 		if (camel_url_get_param(((CamelService *)store)->url, "check_all") != NULL
+		    || (camel_url_get_param(((CamelService *)store)->url, "check_subscribed") != NULL
+			&& info->flags & CAMEL_FOLDER_SUBSCRIBED)
 		    || (strcmp(((CamelService *)store)->url->protocol, "imap") != 0
 			&& strcmp(((CamelService *)store)->url->protocol, "groupwise") != 0
 			&& strcmp(((CamelService *)store)->url->protocol, "scalix") != 0)


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/evolution.spec,v
retrieving revision 1.136
retrieving revision 1.136.2.1
diff -u -r1.136 -r1.136.2.1
--- evolution.spec	12 Apr 2006 13:34:28 -0000	1.136
+++ evolution.spec	24 Apr 2006 10:51:12 -0000	1.136.2.1
@@ -39,7 +39,7 @@
 
 Name: evolution
 Version: 2.6.1
-Release: 1.fc5.2
+Release: 1.fc5.2.dwmw2.1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -102,6 +102,8 @@
 Patch808: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
 Patch809: evolution-2.6.0-prototypes.patch
 
+Patch1000: evolution-2.5.91-check-only-active-folders.patch
+
 Summary: GNOME's next-generation groupware suite
 Group: Applications/Productivity
 
@@ -247,6 +249,8 @@
 %patch808 -p1 -b .fix-missing-declarations-2.5.5.1
 %patch809 -p1 -b .prototypes
 
+%patch1000 -p1 -b .checksum
+
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
 mkdir -p krb5-fakeprefix/%{_lib}



From fedora-cvs-commits at redhat.com  Mon Apr 24 11:22:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 07:22:20 -0400
Subject: rpms/glibc/devel .cvsignore, 1.144, 1.145 glibc-fedora.patch, 1.147,
	1.148 glibc.spec, 1.233, 1.234 sources, 1.168, 1.169
Message-ID: <200604241122.k3OBMK6t014405@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14366/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec sources 
Log Message:
auto-import glibc-2.4-6 on branch devel from glibc-2.4-6.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- .cvsignore	28 Mar 2006 10:15:50 -0000	1.144
+++ .cvsignore	24 Apr 2006 11:22:15 -0000	1.145
@@ -1,2 +1,2 @@
-glibc-20060328T0900.tar.bz2
-glibc-fedora-20060328T0900.tar.bz2
+glibc-20060424T0820.tar.bz2
+glibc-fedora-20060424T0820.tar.bz2

glibc-fedora.patch:
 ChangeLog                                                   |   96 +++
 ChangeLog.11                                                |   21 
 ChangeLog.12                                                |   12 
 ChangeLog.15                                                |   45 +
 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 
 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                                          |   15 
 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/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 +
 55 files changed, 1377 insertions(+), 630 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- glibc-fedora.patch	28 Mar 2006 10:15:50 -0000	1.147
+++ glibc-fedora.patch	24 Apr 2006 11:22:15 -0000	1.148
@@ -1,6 +1,6 @@
---- glibc-20060328T0900/ChangeLog	28 Mar 2006 04:31:31 -0000	1.10076
-+++ glibc-20060328T0900-fedora/ChangeLog	28 Mar 2006 09:36:21 -0000	1.8782.2.175
-@@ -206,6 +206,34 @@
+--- glibc-20060424T0820/ChangeLog	24 Apr 2006 04:24:01 -0000	1.10128
++++ glibc-20060424T0820-fedora/ChangeLog	24 Apr 2006 08:55:37 -0000	1.8782.2.176
+@@ -722,6 +722,34 @@
  	_SC_CPUTIME and _SC_THREAD_CPUTIME here.
  	* sysdeps/unix/sysv/linux/x86_64/sysconf.c (__sysconf): Likewise.
  
@@ -35,7 +35,7 @@
  2006-03-05  Roland McGrath  <roland at redhat.com>
  
  	* malloc/malloc.c (MALLOC_ALIGNMENT): Revert to (2 * SIZE_SZ) value.
-@@ -1218,6 +1246,11 @@
+@@ -1734,6 +1762,11 @@
  	(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
  	followed by __THROW.
  
@@ -47,7 +47,7 @@
  2006-02-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/unix/sysv/linux/futimesat.c [__NR_futimesat]
-@@ -1277,6 +1310,11 @@
+@@ -1793,6 +1826,11 @@
  	* sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo.
  	* sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps.
  
@@ -59,7 +59,7 @@
  2006-01-19  Thomas Schwinge  <tschwinge at gnu.org>
  
  	* libio/genops.c: Include <stdbool.h>.
-@@ -3703,6 +3741,10 @@
+@@ -4219,6 +4257,10 @@
  
  	* elf/order2mod2.c (init): Cast ignored value to void.
  
@@ -70,7 +70,7 @@
  2005-12-27  Ulrich Drepper  <drepper at redhat.com>
  
  	* elf/tst-tls13.c (do_test): Avoid using the library path when
-@@ -3986,6 +4028,26 @@
+@@ -4502,6 +4544,26 @@
  	* sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined,
  	use sysdeps/unix/time.c implementation.
  
@@ -97,7 +97,7 @@
  2005-12-19  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #1955]
-@@ -7104,6 +7166,11 @@
+@@ -7620,6 +7682,11 @@
  	R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32,
  	R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros.
  
@@ -109,7 +109,7 @@
  2005-10-03  Roland McGrath  <roland at redhat.com>
  
  	* sysdeps/powerpc/nofpu: Directory removed, saved in ports repository.
-@@ -8098,6 +8165,12 @@
+@@ -8614,6 +8681,12 @@
  	* argp/argp-help.c (__argp_error): __asprintf -> vasprintf.
  	(__argp_failure): Likewise.
  
@@ -122,7 +122,7 @@
  2005-08-08  Ulrich Drepper  <drepper at redhat.com>
  
  	* nscd/cache.c (cache_add): Commit hash table and header to disk.
-@@ -8222,6 +8295,17 @@
+@@ -8738,6 +8811,17 @@
  	__syslog_chk.
  	* misc/Versions: Export __syslog_chk and __vsyslog_chk.
  
@@ -140,7 +140,7 @@
  2005-07-28  Thomas Schwinge  <schwinge at nic-nac-project.de>
  
  	[BZ #1137]
-@@ -11282,6 +11366,18 @@
+@@ -11798,6 +11882,18 @@
  
  	* scripts/soversions.awk: Fix default version set handling.
  
@@ -159,8 +159,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20060328T0900/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20060328T0900-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060424T0820/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
++++ glibc-20060424T0820-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.
@@ -210,8 +210,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-20060328T0900/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20060328T0900-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060424T0820/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
++++ glibc-20060424T0820-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.
@@ -238,8 +238,8 @@
  2001-01-02  Franz Sirl	<Franz.Sirl-kernel at lauterbach.com>
  
  	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
---- glibc-20060328T0900/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20060328T0900-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
+--- glibc-20060424T0820/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20060424T0820-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>
@@ -320,8 +320,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20060328T0900/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20060328T0900-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20060424T0820/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20060424T0820-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;
@@ -346,8 +346,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20060328T0900/debug/tst-chk1.c	22 Aug 2005 15:12:34 -0000	1.14
-+++ glibc-20060328T0900-fedora/debug/tst-chk1.c	24 Aug 2005 07:23:26 -0000	1.1.2.15
+--- glibc-20060424T0820/debug/tst-chk1.c	22 Aug 2005 15:12:34 -0000	1.14
++++ glibc-20060424T0820-fedora/debug/tst-chk1.c	24 Aug 2005 07:23:26 -0000	1.1.2.15
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -376,8 +376,8 @@
  # define O 0
  #else
  # define O 1
---- glibc-20060328T0900/elf/ldconfig.c	6 Mar 2006 08:40:11 -0000	1.53
-+++ glibc-20060328T0900-fedora/elf/ldconfig.c	6 Mar 2006 13:15:14 -0000	1.47.2.8
+--- glibc-20060424T0820/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
++++ glibc-20060424T0820-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
 @@ -964,17 +964,19 @@ search_dirs (void)
  
  
@@ -459,8 +459,8 @@
      }
  
    search_dirs ();
---- glibc-20060328T0900/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20060328T0900-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20060424T0820/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20060424T0820-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;
@@ -485,8 +485,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060328T0900/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
-+++ glibc-20060328T0900-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
+--- glibc-20060424T0820/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
++++ glibc-20060424T0820-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)
@@ -563,8 +563,8 @@
    /* Open the output file.  */
    if (output_file == NULL)
      {
---- glibc-20060328T0900/include/features.h	5 Jan 2006 12:25:35 -0000	1.42
-+++ glibc-20060328T0900-fedora/include/features.h	6 Jan 2006 09:23:23 -0000	1.35.2.11
+--- glibc-20060424T0820/include/features.h	5 Jan 2006 12:25:35 -0000	1.42
++++ glibc-20060424T0820-fedora/include/features.h	6 Jan 2006 09:23:23 -0000	1.35.2.11
 @@ -275,7 +275,13 @@
  #endif
  
@@ -580,16 +580,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20060328T0900/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060328T0900-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060424T0820/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060424T0820-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-20060328T0900/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060328T0900-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060424T0820/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060424T0820-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-20060328T0900/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20060328T0900-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20060424T0820/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20060424T0820-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
@@ -599,8 +599,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20060328T0900/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
-+++ glibc-20060328T0900-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
+--- glibc-20060424T0820/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
++++ glibc-20060424T0820-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.  */
@@ -614,8 +614,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20060328T0900/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
-+++ glibc-20060328T0900-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
+--- glibc-20060424T0820/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
++++ glibc-20060424T0820-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);
@@ -646,8 +646,8 @@
  
  #endif
  
---- glibc-20060328T0900/locale/iso-4217.def	23 Sep 2005 19:07:54 -0000	1.18
-+++ glibc-20060328T0900-fedora/locale/iso-4217.def	3 Oct 2005 20:44:15 -0000	1.15.2.3
+--- glibc-20060424T0820/locale/iso-4217.def	23 Sep 2005 19:07:54 -0000	1.18
++++ glibc-20060424T0820-fedora/locale/iso-4217.def	3 Oct 2005 20:44:15 -0000	1.15.2.3
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -739,8 +739,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20060328T0900/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
-+++ glibc-20060328T0900-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
+--- glibc-20060424T0820/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
++++ glibc-20060424T0820-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,
  	}
      }
@@ -784,8 +784,8 @@
  #endif
  
  #ifndef NO_FINALIZE
---- glibc-20060328T0900/localedata/Makefile	25 Sep 2005 17:01:12 -0000	1.102
-+++ glibc-20060328T0900-fedora/localedata/Makefile	3 Oct 2005 20:44:15 -0000	1.101.2.2
+--- glibc-20060424T0820/localedata/Makefile	25 Sep 2005 17:01:12 -0000	1.102
++++ glibc-20060424T0820-fedora/localedata/Makefile	3 Oct 2005 20:44:15 -0000	1.101.2.2
 @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -794,9 +794,9 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20060328T0900/localedata/SUPPORTED	5 Nov 2005 16:25:49 -0000	1.87
-+++ glibc-20060328T0900-fedora/localedata/SUPPORTED	15 Nov 2005 08:21:56 -0000	1.71.2.8
-@@ -69,6 +69,7 @@ cy_GB.UTF-8/UTF-8 \
+--- glibc-20060424T0820/localedata/SUPPORTED	24 Apr 2006 07:06:44 -0000	1.90
++++ glibc-20060424T0820-fedora/localedata/SUPPORTED	24 Apr 2006 08:55:41 -0000	1.71.2.9
+@@ -75,6 +75,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
  da_DK/ISO-8859-1 \
@@ -804,7 +804,7 @@
  de_AT.UTF-8/UTF-8 \
  de_AT/ISO-8859-1 \
  de_AT at euro/ISO-8859-15 \
-@@ -96,6 +97,7 @@ en_DK.UTF-8/UTF-8 \
+@@ -102,6 +103,7 @@ en_DK.UTF-8/UTF-8 \
  en_DK/ISO-8859-1 \
  en_GB.UTF-8/UTF-8 \
  en_GB/ISO-8859-1 \
@@ -812,7 +812,7 @@
  en_HK.UTF-8/UTF-8 \
  en_HK/ISO-8859-1 \
  en_IE.UTF-8/UTF-8 \
-@@ -110,6 +112,7 @@ en_SG.UTF-8/UTF-8 \
+@@ -116,6 +118,7 @@ en_SG.UTF-8/UTF-8 \
  en_SG/ISO-8859-1 \
  en_US.UTF-8/UTF-8 \
  en_US/ISO-8859-1 \
@@ -820,16 +820,16 @@
  en_ZA.UTF-8/UTF-8 \
  en_ZA/ISO-8859-1 \
  en_ZW.UTF-8/UTF-8 \
-@@ -263,6 +266,8 @@ nl_NL/ISO-8859-1 \
+@@ -269,6 +272,8 @@ nl_NL/ISO-8859-1 \
  nl_NL at euro/ISO-8859-15 \
  nn_NO.UTF-8/UTF-8 \
  nn_NO/ISO-8859-1 \
 +no_NO.UTF-8/UTF-8 \
 +no_NO/ISO-8859-1 \
+ nr_ZA/UTF-8 \
  nso_ZA/UTF-8 \
  oc_FR.UTF-8/UTF-8 \
- oc_FR/ISO-8859-1 \
-@@ -311,6 +316,7 @@ sv_FI/ISO-8859-1 \
+@@ -319,6 +324,7 @@ sv_FI/ISO-8859-1 \
  sv_FI at euro/ISO-8859-15 \
  sv_SE.UTF-8/UTF-8 \
  sv_SE/ISO-8859-1 \
@@ -837,8 +837,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20060328T0900/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20060328T0900-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20060424T0820/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20060424T0820-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>"
@@ -853,8 +853,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20060328T0900/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
-+++ glibc-20060328T0900-fedora/localedata/locales/en_GB	2 Nov 2004 12:25:47 -0000	1.10.2.2
+--- glibc-20060424T0820/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
++++ glibc-20060424T0820-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>"
@@ -866,8 +866,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-20060328T0900/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060328T0900-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20060424T0820/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20060424T0820-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -938,8 +938,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20060328T0900/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20060328T0900-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20060424T0820/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20060424T0820-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -967,8 +967,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20060328T0900/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
-+++ glibc-20060328T0900-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
+--- glibc-20060424T0820/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
++++ glibc-20060424T0820-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>
@@ -1044,8 +1044,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20060328T0900/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
-+++ glibc-20060328T0900-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20060424T0820/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
++++ glibc-20060424T0820-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)
@@ -1101,9 +1101,9 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20060328T0900/nptl/ChangeLog	28 Mar 2006 04:22:18 -0000	1.881
-+++ glibc-20060328T0900-fedora/nptl/ChangeLog	28 Mar 2006 09:36:22 -0000	1.706.2.84
-@@ -763,6 +763,15 @@
+--- glibc-20060424T0820/nptl/ChangeLog	9 Apr 2006 02:45:24 -0000	1.887
++++ glibc-20060424T0820-fedora/nptl/ChangeLog	24 Apr 2006 08:55:42 -0000	1.706.2.85
+@@ -798,6 +798,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1119,7 +1119,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -1499,6 +1508,11 @@
+@@ -1534,6 +1543,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1131,7 +1131,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -3573,6 +3587,11 @@
+@@ -3608,6 +3622,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1143,8 +1143,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20060328T0900/nptl/Makefile	28 Mar 2006 04:13:27 -0000	1.180
-+++ glibc-20060328T0900-fedora/nptl/Makefile	28 Mar 2006 09:36:22 -0000	1.157.2.20
+--- glibc-20060424T0820/nptl/Makefile	28 Mar 2006 04:13:27 -0000	1.180
++++ glibc-20060424T0820-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
@@ -1167,8 +1167,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20060328T0900/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20060328T0900-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20060424T0820/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20060424T0820-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;
@@ -1193,8 +1193,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060328T0900/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060328T0900-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20060424T0820/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060424T0820-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>
 +
@@ -1202,8 +1202,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20060328T0900/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	17 Feb 2006 08:05:32 -0000	1.29
-+++ glibc-20060328T0900-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	6 Mar 2006 07:34:44 -0000	1.25.2.4
+--- glibc-20060424T0820/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	9 Apr 2006 02:42:29 -0000	1.30
++++ glibc-20060424T0820-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")
  
@@ -1486,7 +1486,7 @@
  			      : "i" (FUTEX_WAITERS), "m" (futex)	      \
  			      : "memory"); })
 @@ -401,16 +491,17 @@ extern int lll_unlock_wake_cb (int *__fu
- 			      "je,pt 0f\n\t"				      \
+ 			      "je 0f\n\t"				      \
  			      "lock\n"					      \
  			      "0:\tcmpxchgl %1, %2\n\t"			      \
 -			      "jnz _L_mutex_lock_%=\n\t"		      \
@@ -1513,7 +1513,7 @@
  		                "i" (offsetof (tcbhead_t, multiple_threads))  \
 @@ -422,17 +513,18 @@ extern int lll_unlock_wake_cb (int *__fu
              __asm __volatile ("cmpl $0, %%gs:%P3\n\t"			      \
- 			      "je,pt 0f\n\t"				      \
+ 			      "je 0f\n\t"				      \
  			      "lock\n"					      \
 -			      "0:\tsubl $1,%0\n\t"		      \
 -			      "jne _L_mutex_unlock_%=\n\t"		      \
@@ -1539,8 +1539,8 @@
  			      : "=m" (futex), "=&a" (ignore)		      \
  			      : "m" (futex),				      \
  				"i" (offsetof (tcbhead_t, multiple_threads))  \
---- glibc-20060328T0900/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	1 Oct 2004 10:30:44 -0000	1.14
-+++ glibc-20060328T0900-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	6 Mar 2006 07:34:44 -0000	1.13.2.2
+--- glibc-20060424T0820/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
++++ glibc-20060424T0820-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.
@@ -1565,7 +1565,7 @@
  	movl	$2, %edx
  	movl	%ecx, %ebx
 @@ -63,9 +70,16 @@ __lll_mutex_lock_wait:
- 	jnz,pn	1b
+ 	jnz	1b
  
  	popl	%esi
 +	cfi_adjust_cfa_offset(-4)
@@ -1686,8 +1686,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060328T0900/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
-+++ glibc-20060328T0900-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
+--- glibc-20060424T0820/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
++++ glibc-20060424T0820-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
@@ -1788,8 +1788,8 @@
 -	ret
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060328T0900/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
-+++ glibc-20060328T0900-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
+--- glibc-20060424T0820/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
++++ glibc-20060424T0820-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.
@@ -1931,8 +1931,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060328T0900/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	17 Feb 2006 08:06:14 -0000	1.26
-+++ glibc-20060328T0900-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	6 Mar 2006 07:33:30 -0000	1.23.2.3
+--- glibc-20060424T0820/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	17 Feb 2006 08:06:14 -0000	1.26
++++ glibc-20060424T0820-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")
  
@@ -2320,8 +2320,8 @@
  			      : "=m" (futex), "=&D" (ignore)		      \
  			      : "m" (futex)				      \
  			      : "ax", "cx", "r11", "cc", "memory"); })
---- glibc-20060328T0900/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
-+++ glibc-20060328T0900-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
+--- glibc-20060424T0820/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
++++ glibc-20060424T0820-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
@@ -2416,9 +2416,9 @@
 -	retq
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060328T0900/nscd/connections.c	3 Jan 2006 21:26:28 -0000	1.82
-+++ glibc-20060328T0900-fedora/nscd/connections.c	4 Jan 2006 07:58:21 -0000	1.55.2.19
-@@ -1873,3 +1873,18 @@ finish_drop_privileges (void)
+--- glibc-20060424T0820/nscd/connections.c	1 Apr 2006 18:49:53 -0000	1.83
++++ glibc-20060424T0820-fedora/nscd/connections.c	24 Apr 2006 08:55:43 -0000	1.55.2.20
+@@ -1879,3 +1879,18 @@ finish_drop_privileges (void)
        exit (4);
      }
  }
@@ -2437,8 +2437,8 @@
 +    prune_cache (&dbs[hstdb], LONG_MAX);
 +}
 +
---- glibc-20060328T0900/nscd/nscd.c	1 Jan 2006 19:15:56 -0000	1.51
-+++ glibc-20060328T0900-fedora/nscd/nscd.c	2 Jan 2006 10:52:53 -0000	1.38.2.11
+--- glibc-20060424T0820/nscd/nscd.c	6 Apr 2006 22:55:50 -0000	1.52
++++ glibc-20060424T0820-fedora/nscd/nscd.c	24 Apr 2006 08:55:43 -0000	1.38.2.12
 @@ -119,6 +119,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -2457,8 +2457,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20060328T0900/nscd/nscd.conf	23 Aug 2005 23:17:32 -0000	1.11
-+++ glibc-20060328T0900-fedora/nscd/nscd.conf	24 Aug 2005 07:23:30 -0000	1.8.2.3
+--- glibc-20060424T0820/nscd/nscd.conf	23 Aug 2005 23:17:32 -0000	1.11
++++ glibc-20060424T0820-fedora/nscd/nscd.conf	24 Aug 2005 07:23:30 -0000	1.8.2.3
 @@ -32,8 +32,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
@@ -2470,8 +2470,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20060328T0900/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
-+++ glibc-20060328T0900-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
+--- glibc-20060424T0820/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
++++ glibc-20060424T0820-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
@@ -2512,8 +2512,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20060328T0900/posix/Makefile	8 Jan 2006 09:39:15 -0000	1.188
-+++ glibc-20060328T0900-fedora/posix/Makefile	9 Jan 2006 21:55:00 -0000	1.171.2.16
+--- glibc-20060424T0820/posix/Makefile	15 Apr 2006 21:41:25 -0000	1.189
++++ glibc-20060424T0820-fedora/posix/Makefile	24 Apr 2006 08:55:43 -0000	1.171.2.17
 @@ -107,7 +107,8 @@ generated := $(addprefix wordexp-test-re
  	     bug-regex21-mem bug-regex21.mtrace \
  	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
@@ -2547,8 +2547,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
---- glibc-20060328T0900/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060328T0900-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20060424T0820/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060424T0820-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 =
@@ -2565,8 +2565,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20060328T0900/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20060328T0900-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20060424T0820/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20060424T0820-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
@@ -2582,8 +2582,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-20060328T0900/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20060328T0900-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20060424T0820/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20060424T0820-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))
@@ -2595,8 +2595,8 @@
  endif
  endif
  
---- glibc-20060328T0900/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20060328T0900-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20060424T0820/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20060424T0820-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.  */
@@ -2948,8 +2948,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20060328T0900/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060328T0900-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060424T0820/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060424T0820-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.
@@ -3035,8 +3035,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20060328T0900/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
-+++ glibc-20060328T0900-fedora/sysdeps/unix/nice.c	22 Sep 2004 21:21:08 -0000	1.6.2.1
+--- glibc-20060424T0820/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
++++ glibc-20060424T0820-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);
      }
@@ -3051,8 +3051,8 @@
    if (result != -1)
      return getpriority (PRIO_PROCESS, 0);
    else
---- glibc-20060328T0900/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Jan 2006 08:21:15 -0000	1.22
-+++ glibc-20060328T0900-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	9 Jan 2006 21:55:08 -0000	1.14.2.8
+--- glibc-20060424T0820/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Jan 2006 08:21:15 -0000	1.22
++++ glibc-20060424T0820-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.  */
  
@@ -3101,8 +3101,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20060328T0900/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20060328T0900-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20060424T0820/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20060424T0820-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;
@@ -3145,8 +3145,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20060328T0900/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20060328T0900-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20060424T0820/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20060424T0820-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"
@@ -3156,8 +3156,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20060328T0900/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20060328T0900-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20060424T0820/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20060424T0820-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;
@@ -3203,30 +3203,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20060328T0900/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h	24 Mar 2006 16:36:38 -0000	1.20
-+++ glibc-20060328T0900-fedora/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h	20 Jun 2005 15:58:39 -0000	1.18.2.1
-@@ -1,5 +1,5 @@
- /* O_*, F_*, FD_* bit values for Linux.
--   Copyright (C) 1995-2000, 2004, 2005, 2006 Free Software Foundation, Inc.
-+   Copyright (C) 1995-1999, 2000, 2004, 2005 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -173,12 +173,6 @@ struct flock64
- # define POSIX_FADV_NOREUSE	5 /* Data will be accessed once.  */
- #endif
- 
--/* Linux-specific operations for posix_fadvise.  */
--#ifdef __USE_GNU
--# define LINUX_FADV_ASYNC_WRITE	32 /* Start writeout on range.  */
--# define LINUX_FADV_WRITE_WAIT	33 /* Wait upon writeout to range.  */
--#endif
--
- __BEGIN_DECLS
- 
- /* Provide kernel hint to read ahead.  */
---- glibc-20060328T0900/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060328T0900-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060424T0820/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060424T0820-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.
@@ -3287,30 +3265,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20060328T0900/sysdeps/unix/sysv/linux/i386/bits/fcntl.h	24 Mar 2006 16:36:38 -0000	1.14
-+++ glibc-20060328T0900-fedora/sysdeps/unix/sysv/linux/i386/bits/fcntl.h	23 Aug 2004 07:28:44 -0000	1.13
-@@ -1,5 +1,5 @@
- /* O_*, F_*, FD_* bit values for Linux.
--   Copyright (C) 1995, 1996, 1997, 1998, 2000, 2004, 2006
-+   Copyright (C) 1995, 1996, 1997, 1998, 2000, 2004
-    Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-@@ -180,12 +180,6 @@ struct flock64
- # define POSIX_FADV_NOREUSE	5 /* Data will be accessed once.  */
- #endif
- 
--/* Linux-specific operations for posix_fadvise.  */
--#ifdef __USE_GNU
--# define LINUX_FADV_ASYNC_WRITE	32 /* Start writeout on range.  */
--# define LINUX_FADV_WRITE_WAIT	33 /* Wait upon writeout to range.  */
--#endif
--
- __BEGIN_DECLS
- 
- /* Provide kernel hint to read ahead.  */
---- glibc-20060328T0900/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20060328T0900-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20060424T0820/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20060424T0820-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)
@@ -3343,156 +3299,24 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20060328T0900/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060328T0900-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060424T0820/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060424T0820-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-20060328T0900/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060328T0900-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060424T0820/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060424T0820-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-20060328T0900/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20060328T0900-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20060424T0820/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20060424T0820-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- glibc-20060328T0900/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h	24 Mar 2006 16:36:38 -0000	1.9
-+++ glibc-20060328T0900-fedora/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h	23 Aug 2004 07:28:44 -0000	1.8
-@@ -1,5 +1,5 @@
- /* O_*, F_*, FD_* bit values for Linux/IA64.
--   Copyright (C) 1999, 2000, 2004, 2006 Free Software Foundation, Inc.
-+   Copyright (C) 1999, 2000, 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
-@@ -174,12 +174,6 @@ struct flock64
- # define POSIX_FADV_NOREUSE	5 /* Data will be accessed once.  */
- #endif
- 
--/* Linux-specific operations for posix_fadvise.  */
--#ifdef __USE_GNU
--# define LINUX_FADV_ASYNC_WRITE	32 /* Start writeout on range.  */
--# define LINUX_FADV_WRITE_WAIT	33 /* Wait upon writeout to range.  */
--#endif
--
- __BEGIN_DECLS
- 
- /* Provide kernel hint to read ahead.  */
---- glibc-20060328T0900/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h	24 Mar 2006 16:36:38 -0000	1.13
-+++ glibc-20060328T0900-fedora/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h	23 Aug 2004 07:28:45 -0000	1.12
-@@ -1,5 +1,5 @@
- /* O_*, F_*, FD_* bit values for Linux/PowerPC.
--   Copyright (C) 1995, 1996, 1997, 1998, 2000, 2003, 2004, 2006
-+   Copyright (C) 1995, 1996, 1997, 1998, 2000, 2003, 2004
-    Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-@@ -180,12 +180,6 @@ struct flock64
- # define POSIX_FADV_NOREUSE	5 /* Data will be accessed once.  */
- #endif
- 
--/* Linux-specific operations for posix_fadvise.  */
--#ifdef __USE_GNU
--# define LINUX_FADV_ASYNC_WRITE	32 /* Start writeout on range.  */
--# define LINUX_FADV_WRITE_WAIT	33 /* Wait upon writeout to range.  */
--#endif
--
- __BEGIN_DECLS
- 
- /* Provide kernel hint to read ahead.  */
---- glibc-20060328T0900/sysdeps/unix/sysv/linux/s390/bits/fcntl.h	24 Mar 2006 16:36:38 -0000	1.10
-+++ glibc-20060328T0900-fedora/sysdeps/unix/sysv/linux/s390/bits/fcntl.h	23 Aug 2004 07:28:45 -0000	1.9
-@@ -1,5 +1,5 @@
- /* O_*, F_*, FD_* bit values for Linux.
--   Copyright (C) 2000, 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
-+   Copyright (C) 2000, 2001, 2002, 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
-@@ -199,12 +199,6 @@ struct flock64
- # endif
- #endif
- 
--/* Linux-specific operations for posix_fadvise.  */
--#ifdef __USE_GNU
--# define LINUX_FADV_ASYNC_WRITE	32 /* Start writeout on range.  */
--# define LINUX_FADV_WRITE_WAIT	33 /* Wait upon writeout to range.  */
--#endif
--
- __BEGIN_DECLS
- 
- /* Provide kernel hint to read ahead.  */
---- glibc-20060328T0900/sysdeps/unix/sysv/linux/sh/bits/fcntl.h	24 Mar 2006 16:36:38 -0000	1.7
-+++ glibc-20060328T0900-fedora/sysdeps/unix/sysv/linux/sh/bits/fcntl.h	1 Mar 2006 06:55:56 -0000	1.5.2.1
-@@ -1,5 +1,5 @@
- /* O_*, F_*, FD_* bit values for Linux.
--   Copyright (C) 1995, 1996, 1997, 1998, 2000, 2004, 2006
-+   Copyright (C) 1995, 1996, 1997, 1998, 2000, 2004
-    Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-@@ -180,12 +180,6 @@ struct flock64
- # define POSIX_FADV_NOREUSE	5 /* Data will be accessed once.  */
- #endif
- 
--/* Linux-specific operations for posix_fadvise.  */
--#ifdef __USE_GNU
--# define LINUX_FADV_ASYNC_WRITE	32 /* Start writeout on range.  */
--# define LINUX_FADV_WRITE_WAIT	33 /* Wait upon writeout to range.  */
--#endif
--
- __BEGIN_DECLS
- 
- /* Provide kernel hint to read ahead.  */
---- glibc-20060328T0900/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h	24 Mar 2006 16:36:38 -0000	1.23
-+++ glibc-20060328T0900-fedora/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h	23 Aug 2004 07:28:46 -0000	1.22
-@@ -1,5 +1,5 @@
- /* O_*, F_*, FD_* bit values for Linux/SPARC.
--   Copyright (C) 1995, 1996, 1997, 1998, 2000, 2003, 2004, 2006
-+   Copyright (C) 1995, 1996, 1997, 1998, 2000, 2003, 2004
-    Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-@@ -199,12 +199,6 @@ struct flock64
- # define POSIX_FADV_NOREUSE	5 /* Data will be accessed once.  */
- #endif
- 
--/* Linux-specific operations for posix_fadvise.  */
--#ifdef __USE_GNU
--# define LINUX_FADV_ASYNC_WRITE	32 /* Start writeout on range.  */
--# define LINUX_FADV_WRITE_WAIT	33 /* Wait upon writeout to range.  */
--#endif
--
- __BEGIN_DECLS
- 
- /* Provide kernel hint to read ahead.  */
---- glibc-20060328T0900/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h	24 Mar 2006 16:36:37 -0000	1.7
-+++ glibc-20060328T0900-fedora/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h	23 Aug 2004 07:28:46 -0000	1.6
-@@ -1,5 +1,5 @@
- /* O_*, F_*, FD_* bit values for Linux/x86-64.
--   Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
-+   Copyright (C) 2001, 2002, 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
-@@ -194,12 +194,6 @@ struct flock64
- # define POSIX_FADV_NOREUSE	5 /* Data will be accessed once.  */
- #endif
- 
--/* Linux-specific operations for posix_fadvise.  */
--#ifdef __USE_GNU
--# define LINUX_FADV_ASYNC_WRITE	32 /* Start writeout on range.  */
--# define LINUX_FADV_WRITE_WAIT	33 /* Wait upon writeout to range.  */
--#endif
--
- __BEGIN_DECLS
- 
- /* Provide kernel hint to read ahead.  */


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- glibc.spec	28 Mar 2006 10:15:50 -0000	1.233
+++ glibc.spec	24 Apr 2006 11:22:15 -0000	1.234
@@ -1,9 +1,9 @@
-%define glibcdate 20060328T0900
+%define glibcdate 20060424T0820
 %define glibcname glibc
-%define glibcsrcdir glibc-20060328T0900
+%define glibcsrcdir glibc-20060424T0820
 %define glibc_release_tarballs 0
 %define glibcversion 2.4
-%define glibcrelease 5
+%define glibcrelease 6
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define xenarches i686 athlon
@@ -300,7 +300,6 @@
 #define __NR_mknodat		297
 #define __NR_fchownat		298
 #define __NR_futimesat		299
-#define __NR_fstatat64		300
 #define __NR_unlinkat		301
 #define __NR_renameat		302
 #define __NR_linkat		303
@@ -309,6 +308,9 @@
 #define __NR_fchmodat		306
 #define __NR_faccessat		307
 #endif
+#ifndef __NR_fstatat64
+#define __NR_fstatat64		300
+#endif
 #ifndef __NR_pselect6
 #define __NR_pselect6		308
 #define __NR_ppoll		309
@@ -316,6 +318,19 @@
 #ifndef __NR_unshare
 #define __NR_unshare		310
 #endif
+#ifndef __NR_set_robust_list
+#define __NR_set_robust_list	311
+#define __NR_get_robust_list	312
+#endif
+#ifndef __NR_splice
+#define __NR_splice		313
+#endif
+#ifndef __NR_sync_file_range
+#define __NR_sync_file_range	314
+#endif
+#ifndef __NR_tee
+#define __NR_tee		315
+#endif
 %endif
 %ifarch ia64
 #ifndef __NR_timer_create
@@ -369,6 +384,19 @@
 #ifndef __NR_unshare
 #define __NR_unshare		1296
 #endif
+#ifndef __NR_splice
+#define __NR_splice		1297
+#endif
+#ifndef __NR_set_robust_list
+#define __NR_set_robust_list	1298
+#define __NR_get_robust_list	1299
+#endif
+#ifndef __NR_sync_file_range
+#define __NR_sync_file_range	1300
+#endif
+#ifndef __NR_tee
+#define __NR_tee		1301
+#endif
 %endif
 %ifarch ppc
 #ifndef __NR_utimes
@@ -404,6 +432,12 @@
 #ifndef __NR_unshare
 #define __NR_unshare		282
 #endif
+#ifndef __NR_splice
+#define __NR_splice		283
+#endif
+#ifndef __NR_tee
+#define __NR_tee		284
+#endif
 %endif
 %ifarch ppc64
 #ifndef __NR_utimes
@@ -432,6 +466,12 @@
 #ifndef __NR_unshare
 #define __NR_unshare		282
 #endif
+#ifndef __NR_splice
+#define __NR_splice		283
+#endif
+#ifndef __NR_tee
+#define __NR_tee		284
+#endif
 %endif
 %ifarch s390
 #ifndef __NR_timer_create
@@ -626,6 +666,19 @@
 #ifndef __NR_unshare
 #define __NR_unshare		272
 #endif
+#ifndef __NR_set_robust_list
+#define __NR_set_robust_list	273
+#define __NR_get_robust_list	274
+#endif
+#ifndef __NR_splice
+#define __NR_splice		275
+#endif
+#ifndef __NR_tee
+#define __NR_tee		276
+#endif
+#ifndef __NR_sync_file_range
+#define __NR_sync_file_range	277
+#endif
 %endif
 %ifnarch %{ix86} x86_64
 /* FIXME: Reenable it when the kernel side is more stable.  */
@@ -1341,6 +1394,12 @@
 %endif
 
 %changelog
+* Mon Apr 24 2006 Jakub Jelinek <jakub at redhat.com> 2.4-6
+- update from CVS
+  - NIS+ fixes
+  - don't segfault on too large argp key values (#189545)
+  - getaddrinfo fixes for RFC3484 (#188364)
+
 * Tue Mar 28 2006 Jakub Jelinek <jakub at redhat.com> 2.4-5
 - update from CVS
   - pshared robust mutex support


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- sources	28 Mar 2006 10:15:50 -0000	1.168
+++ sources	24 Apr 2006 11:22:15 -0000	1.169
@@ -1,2 +1,2 @@
-76218e49e12649e83d18f0cb82395ede  glibc-20060328T0900.tar.bz2
-f691b4f8f607db7bfbf75dc766651856  glibc-fedora-20060328T0900.tar.bz2
+b204050c663bb31e395f1b1f9dc4cae8  glibc-20060424T0820.tar.bz2
+057fcbfb83989dbd50def2a5f05ba3ca  glibc-fedora-20060424T0820.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 24 11:32:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 07:32:45 -0400
Subject: rpms/ltrace/devel ltrace.spec,1.30,1.31
Message-ID: <200604241132.k3OBWjDs017605@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/ltrace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17568

Modified Files:
	ltrace.spec 
Log Message:
- re-enabling gcc compilation command adjustment



Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ltrace.spec	24 Apr 2006 10:24:21 -0000	1.30
+++ ltrace.spec	24 Apr 2006 11:32:26 -0000	1.31
@@ -31,9 +31,8 @@
 sed -i -e 's/-o root -g root//' Makefile.in
 
 %build
-#export CC="gcc`echo $RPM_OPT_FLAGS | sed -n 's/^.*\(-m[36][124]\).*$/ \1/p'`"
-%configure
-#CC="$CC"
+export CC="gcc`echo $RPM_OPT_FLAGS | sed -n 's/^.*\(-m[36][124]\).*$/ \1/p'`"
+%configure CC="$CC"
 make
 
 %install



From fedora-cvs-commits at redhat.com  Mon Apr 24 11:42:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 07:42:09 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,
	1.4, 1.5
Message-ID: <200604241142.k3OBg9s6019200@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19143

Modified Files:
	openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 
Log Message:
rh#189742# I hate fontconfig

openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch:
 inc/outfont.hxx                            |    0 
 inc/psprint/fontmanager.hxx                |    0 
 inc/vclenum.hxx                            |    0 
 psprint/inc/psprint/fontmanager.hxx        |   22 ++++++
 psprint/source/fontmanager/fontconfig.cxx  |  100 ++++++++++++++++++++---------
 psprint/source/fontmanager/fontmanager.cxx |    8 ++
 source/fontmanager/fontconfig.cxx          |    0 
 source/fontmanager/fontmanager.cxx         |    0 
 source/glyphs/gcach_ftyp.cxx               |    0 
 source/glyphs/gcach_ftyp.hxx               |    0 
 unx/source/gdi/xlfd_extd.cxx               |    0 
 vcl/inc/outfont.hxx                        |    6 +
 vcl/inc/vclenum.hxx                        |   22 ++++++
 vcl/source/glyphs/gcach_ftyp.cxx           |   71 ++++++++++++++------
 vcl/source/glyphs/gcach_ftyp.hxx           |    6 +
 vcl/unx/source/gdi/xlfd_extd.cxx           |    4 +
 vcl/win/source/gdi/salgdi3.cxx             |    9 ++
 win/source/gdi/salgdi3.cxx                 |    0 
 18 files changed, 194 insertions(+), 54 deletions(-)

Index: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	20 Apr 2006 12:22:27 -0000	1.4
+++ openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	24 Apr 2006 11:42:07 -0000	1.5
@@ -62,6 +62,41 @@
 diff -u -r1.17 fontconfig.cxx
 --- openoffice.org.orig/psprint/source/fontmanager/fontconfig.cxx	29 Mar 2006 11:21:45 -0000	1.17
 +++ openoffice.org/psprint/source/fontmanager/fontconfig.cxx	20 Apr 2006 10:36:06 -0000
+@@ -88,6 +88,7 @@
+     FcConfig*		(*m_pFcConfigGetCurrent)();
+     FcObjectSet*	(*m_pFcObjectSetVaBuild)(const char*,va_list);
+     void			(*m_pFcObjectSetDestroy)(FcObjectSet* pSet);
++    FcPattern*		(*m_pFcPatternDuplicate)(const FcPattern*);
+     FcPattern*		(*m_pFcPatternCreate)();
+     void			(*m_pFcPatternDestroy)(FcPattern*);
+     FcFontSet*		(*m_pFcFontList)(FcConfig*,FcPattern*,FcObjectSet*);
+@@ -143,6 +144,9 @@
+     FcPattern* FcPatternCreate()
+     { return m_pFcPatternCreate(); }
+ 
++    FcPattern* FcPatternDuplicate(const FcPattern *p)
++    { return m_pFcPatternDuplicate(p); }
++
+     void FcPatternDestroy( FcPattern* pPattern )
+     { m_pFcPatternDestroy( pPattern ); }
+     
+@@ -238,6 +242,8 @@
+         loadSymbol( "FcObjectSetDestroy" );
+     m_pFcPatternCreate = (FcPattern*(*)())
+         loadSymbol( "FcPatternCreate" );
++    m_pFcPatternDuplicate= (FcPattern*(*)(const FcPattern*))
++        loadSymbol( "FcPatternDuplicate" );
+     m_pFcPatternDestroy = (void(*)(FcPattern*))
+         loadSymbol( "FcPatternDestroy" );
+     m_pFcFontList = (FcFontSet*(*)(FcConfig*,FcPattern*,FcObjectSet*))
+@@ -283,6 +289,7 @@
+             m_pFcObjectSetVaBuild			&&
+             m_pFcObjectSetDestroy			&&
+             m_pFcPatternCreate				&&
++            m_pFcPatternDuplicate			&&
+             m_pFcPatternDestroy				&&
+             m_pFcFontList					&&
+             m_pFcConfigGetFonts             &&
 @@ -355,35 +367,18 @@
              int weight = 0;
              int spacing = 0;
@@ -110,17 +145,19 @@
              if( eFileRes != FcResultMatch || eFamilyRes != FcResultMatch || eOutRes != FcResultMatch )
                  continue;
  
-@@ -404,6 +399,24 @@
+@@ -404,6 +399,26 @@
              if( eOutRes == FcResultMatch && ! outline )
                  continue;
  
-+	    rWrapper.FcConfigSubstitute( rWrapper.getDefConfig(), pFSet->fonts[i], FcMatchFont );
-+	    rWrapper.FcDefaultSubstitute( pFSet->fonts[i] );
-+            FcResult eEmbeddedBitmap = rWrapper.FcPatternGetBool( pFSet->fonts[i], FC_EMBEDDED_BITMAP, 0, &embitmap );
-+            FcResult eAntialias      = rWrapper.FcPatternGetBool( pFSet->fonts[i], FC_ANTIALIAS, 0, &antialias );
-+    	    FcResult eAutoHint       = rWrapper.FcPatternGetBool( pFSet->fonts[i], FC_AUTOHINT, 0, &autohint );
-+    	    FcResult eHinting        = rWrapper.FcPatternGetBool( pFSet->fonts[i], FC_HINTING, 0, &hinting );
-+    	    FcResult eHintStyle      = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_HINT_STYLE, 0, &hintstyle );
++	    FcPattern *tempfont = rWrapper.FcPatternDuplicate( pFSet->fonts[i] );
++	    rWrapper.FcConfigSubstitute( rWrapper.getDefConfig(), tempfont, FcMatchFont );
++	    rWrapper.FcDefaultSubstitute( tempfont );
++            FcResult eEmbeddedBitmap = rWrapper.FcPatternGetBool( tempfont, FC_EMBEDDED_BITMAP, 0, &embitmap );
++            FcResult eAntialias      = rWrapper.FcPatternGetBool( tempfont, FC_ANTIALIAS, 0, &antialias );
++    	    FcResult eAutoHint       = rWrapper.FcPatternGetBool( tempfont, FC_AUTOHINT, 0, &autohint );
++    	    FcResult eHinting        = rWrapper.FcPatternGetBool( tempfont, FC_HINTING, 0, &hinting );
++    	    FcResult eHintStyle      = rWrapper.FcPatternGetInteger( tempfont, FC_HINT_STYLE, 0, &hintstyle );
++    	    rWrapper.FcPatternDestroy( tempfont );
 +
 +#ifdef HDU_DEBUG
 +            fprintf( stderr, "   embeddedbitmap = %d, antialias = %d, autohint = %d, hinting = %d, hintstyle = %d\n"



From fedora-cvs-commits at redhat.com  Mon Apr 24 11:52:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 07:52:38 -0400
Subject: rpms/openoffice.org/devel workspace.targetedaot.patch,1.9,1.10
Message-ID: <200604241152.k3OBqcQ1003973@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3944

Modified Files:
	workspace.targetedaot.patch 
Log Message:
tum to tum

workspace.targetedaot.patch:
 bin/deliver.pl                               |    0 
 config_office/configure.in                   |   59 +++++++++++++++++----------
 config_office/set_soenv.in                   |    7 ---
 filter/source/config/fragments/makefile.mk   |    4 +
 filter/source/config/tools/merge/makefile.mk |    3 +
 helpcontent2/util/target.pmk                 |   10 ++++
 inc/antsettings.mk                           |    0 
 inc/settings.mk                              |    0 
 inc/target.mk                                |    0 
 inc/tg_jar.mk                                |    0 
 prj/d.lst                                    |    0 
 solenv/bin/deliver.pl                        |   19 --------
 solenv/inc/antsettings.mk                    |    8 ---
 solenv/inc/settings.mk                       |    5 --
 solenv/inc/target.mk                         |    6 ++
 solenv/inc/tg_jar.mk                         |   14 ++++++
 source/com/sun/star/help/makefile.mk         |    0 
 source/config/fragments/makefile.mk          |    0 
 source/config/tools/merge/makefile.mk        |    0 
 util/target.pmk                              |    0 
 xmlhelp/prj/d.lst                            |    1 
 xmlhelp/source/com/sun/star/help/makefile.mk |    3 +
 22 files changed, 81 insertions(+), 58 deletions(-)

Index: workspace.targetedaot.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.targetedaot.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- workspace.targetedaot.patch	23 Apr 2006 13:45:10 -0000	1.9
+++ workspace.targetedaot.patch	24 Apr 2006 11:52:36 -0000	1.10
@@ -175,15 +175,22 @@
 diff -u -r1.13 target.pmk
 --- openoffice.org.orig/helpcontent2/util/target.pmk	16 Mar 2006 11:10:20 -0000	1.13
 +++ openoffice.org/helpcontent2/util/target.pmk	22 Apr 2006 16:37:36 -0000
-@@ -50,5 +50,8 @@
+@@ -48,7 +48,15 @@
+ JAVA_VM_HEAP_SIZE = -Xms256m -Xmx256m
+ .ENDIF
  
++.IF "$(JAVAAOTCOMPILER)" != ""
++CLASSPATH!:=$(my_cp)
++.EXPORT : CLASSPATH
++.ENDIF
++
  $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag
  	@+-$(MKDIR) -p $(@:d)
-+.IF "$(JAVAAOTCOMPILER)" == ""
++.IF "$(JAVAAOTCOMPILER)" != ""
++	HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
++.ELSE
  	$(JAVAI) $(JAVA_VM_HEAP_SIZE) $(JAVA_LIBRARY_PATH) -cp $(my_cp) com.sun.star.help.HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
 -
-+.ELSE
-+	HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
 +.ENDIF
 Index: bin/deliver.pl
 ===================================================================



From fedora-cvs-commits at redhat.com  Mon Apr 24 12:07:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 08:07:56 -0400
Subject: rpms/cups/devel cups.spec,1.166,1.167
Message-ID: <200604241207.k3OC7u9e007043@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7014

Modified Files:
	cups.spec 
Log Message:
* Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com>
- Ship an snmp.conf.



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- cups.spec	21 Apr 2006 13:47:04 -0000	1.166
+++ cups.spec	24 Apr 2006 12:07:28 -0000	1.167
@@ -213,6 +213,13 @@
 EOF
 done
 
+cat >$RPM_BUILD_ROOT%{_sysconfdir}/cups/snmp.conf <<"EOF"
+#Address @LOCAL
+#Community public
+#DebugLevel 0
+#HostNameLookups off
+EOF
+
 # Ship pstoraster (bug #69573).
 install -c -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{cups_serverbin}/filter
 install -c -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/cups
@@ -300,6 +307,7 @@
 %config(noreplace) %attr(0644,root,nobody) /etc/cups/client.conf
 %config(noreplace) %attr(0600,root,nobody) /etc/cups/printers.conf
 %config(noreplace) %attr(0644,root,nobody) /etc/cups/pdftops.conf
+%config(noreplace) %attr(0644,root,nobody) /etc/cups/snmp.conf
 /etc/cups/interfaces
 %config(noreplace) /etc/cups/mime.types
 %config(noreplace) /etc/cups/mime.convs
@@ -377,6 +385,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com>
+- Ship an snmp.conf.
+
 * Fri Apr 21 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.4.rc2.2
 - Updated to svn 5446.
 



From fedora-cvs-commits at redhat.com  Mon Apr 24 12:24:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 08:24:21 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch, NONE,
	1.1 openoffice.org.spec, 1.672, 1.673
Message-ID: <200604241224.k3OCOL4M025533@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25506

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch 
Log Message:
recover the set Red Hat colours patch

openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch:
 standard.soc |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch ---
--- openoffice.org.orig/extras/source/palettes/standard.soc	2004-09-14 11:15:39.147812605 -0400
+++ openoffice.org/extras/source/palettes/standard.soc	2004-09-14 11:20:51.940313307 -0400
@@ -88,8 +88,9 @@
  <draw:color draw:name="Dark violet" draw:color="#660066"/>
  <draw:color draw:name="Salmon" draw:color="#ff8080"/>
  <draw:color draw:name="Sea blue" draw:color="#0066cc"/>
- <draw:color draw:name="Sun 1" draw:color="#333366"/>
- <draw:color draw:name="Sun 2" draw:color="#666699"/>
- <draw:color draw:name="Sun 3" draw:color="#9999cc"/>
- <draw:color draw:name="Sun 4" draw:color="#ccccff"/>
-</office:color-table>
\ No newline at end of file
+ <draw:color draw:name="Red Hat 1" draw:color="#cc0000"/>
+ <draw:color draw:name="Red Hat 2" draw:color="#0093d9"/>
+ <draw:color draw:name="Red Hat 3" draw:color="#ff8d00"/>
+ <draw:color draw:name="Red Hat 4" draw:color="#abb400"/>
+ <draw:color draw:name="Red Hat 5" draw:color="#4e376b"/>
+</office:color-table>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.672
retrieving revision 1.673
diff -u -r1.672 -r1.673
--- openoffice.org.spec	24 Apr 2006 07:36:30 -0000	1.672
+++ openoffice.org.spec	24 Apr 2006 12:24:18 -0000	1.673
@@ -183,52 +183,53 @@
 Patch3:  openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
 Patch4:  openoffice.org-1.9.97.rh156067.noversionedicons.patch
 Patch5:  openoffice.org-1.9.121.rh127576.gnomeprintui.patch
+Patch6:  openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch
 %if %{obsoleteold}
-Patch6:  openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
+Patch7:  openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
 %else
-Patch6:  openoffice.org-1.9.121.rh156677.other.cripplemenus.sysui.patch
+Patch7:  openoffice.org-1.9.121.rh156677.other.cripplemenus.sysui.patch
 %endif
-Patch7:  openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
-Patch8:  openoffice.org-2.0.1.rhXXXXX.extensions.defaulttoevo2.patch
-Patch9:  openoffice.org-2.0.2.ooo34909.dbaccess.patch
-Patch10: workspace.evo2fixes.patch
-Patch11: openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch
-Patch12: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
-Patch13: openoffice.org-1.9.129.ooo54603.fontconfig.patch
-Patch14: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
-Patch15: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
-Patch16: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
-Patch17: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch18: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
-Patch19: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
-Patch20: workspace.dmake43p01.patch
-Patch21: openoffice.org-1.9.128.ooo54479.systemicu.patch
-Patch22: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
-Patch23: workspace.atkbridge.patch
-Patch24: workspace.jaxpapi.patch
-Patch25: workspace.systemjava.patch
+Patch8:  openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
+Patch9:  openoffice.org-2.0.1.rhXXXXX.extensions.defaulttoevo2.patch
+Patch10: openoffice.org-2.0.2.ooo34909.dbaccess.patch
+Patch11: workspace.evo2fixes.patch
+Patch12: openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch
+Patch13: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
+Patch14: openoffice.org-1.9.129.ooo54603.fontconfig.patch
+Patch15: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
+Patch16: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
+Patch17: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
+Patch18: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch19: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
+Patch20: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
+Patch21: workspace.dmake43p01.patch
+Patch22: openoffice.org-1.9.128.ooo54479.systemicu.patch
+Patch23: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
+Patch24: workspace.atkbridge.patch
+Patch25: workspace.jaxpapi.patch
+Patch26: workspace.systemjava.patch
 %if ! %{internaljavabits}
-Patch26: workspace.targetedaot.patch
+Patch27: workspace.targetedaot.patch
 %else
-Patch26: openoffice.org-2.0.2.rhXXXXX.helpcontent2.baddb.patch
+Patch27: openoffice.org-2.0.2.rhXXXXX.helpcontent2.baddb.patch
 %endif
-Patch27: openoffice.org-2.0.1.ooo58663.vcl.missingglyph.patch
-Patch28: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch29: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch
-Patch30: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch
-Patch31: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
-Patch32: openoffice.org-2.0.2.ooo61875.sd.compile.patch
-Patch33: openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch
-Patch34: openoffice.org-2.0.2.ooo62030.solenv._version.patch
-Patch35: openoffice.org-2.0.2.oooXXXXX.config_office.noppds.patch
-Patch36: openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch
+Patch28: openoffice.org-2.0.1.ooo58663.vcl.missingglyph.patch
+Patch29: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch30: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch
+Patch31: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch
+Patch32: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
+Patch33: openoffice.org-2.0.2.ooo61875.sd.compile.patch
+Patch34: openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch
+Patch35: openoffice.org-2.0.2.ooo62030.solenv._version.patch
+Patch36: openoffice.org-2.0.2.oooXXXXX.config_office.noppds.patch
+Patch37: openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch
 %if %{build_rhel4}
-Patch37: openoffice.org-1.9.74.ArchiveZip.patch
-Patch38: openoffice.org-2.0.1.gij4ant.patch
+Patch38: openoffice.org-1.9.74.ArchiveZip.patch
+Patch39: openoffice.org-2.0.1.gij4ant.patch
 %endif
-Patch39: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch40: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
-Patch41: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch40: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch41: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
+Patch42: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1093,63 +1094,64 @@
 %patch2  -p1 -b .rh151357.setlangtolocale.patch
 %patch3  -p1 -b .rh151356.usetwodotzeropath.patch
 %patch4  -p1 -b .rh156067.noversionedicons.patch
+%patch5  -p1 -b .rhXXXXXX.redhatcolours.extras.patch
 %if %{gnomeprintui}
-%patch5  -p1 -b .rh127576.gnomeprintui.patch
+%patch6  -p1 -b .rh127576.gnomeprintui.patch
 %endif
-%patch29 -p1 -b .ooo59675.sysui.rtfmimetype.patch
+%patch30 -p1 -b .ooo59675.sysui.rtfmimetype.patch
 %if %{obsoleteold}
-%patch6  -p1 -b .rh156677.cripplemenus.sysui.patch
+%patch7  -p1 -b .rh156677.cripplemenus.sysui.patch
 %else
-%patch6  -p1 -b .rh156677.other.cripplemenus.sysui.patch
+%patch7  -p1 -b .rh156677.other.cripplemenus.sysui.patch
 %endif
-%patch7  -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
-%patch8  -p1 -b .rhXXXXX.extensions.defaulttoevo2.patch
-%patch9  -p1 -b .ooo34909.dbaccess.patch
-%patch10 -p1 -b .workspace.evo2fixes.patch
-%patch11  -p1 -b .ooo45725.lingucomponent.contribdict.patch
-%patch12 -p1 -b .ooo48256.nolongname.sysui.patch
-%patch13 -p1 -b .ooo54603.fontconfig.patch
-%patch14 -p1 -b .ooo51931.systemxmlsec.patch
-%patch15 -p1 -b .ooo52428.execshield.bridges.patch
+%patch8  -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
+%patch9  -p1 -b .rhXXXXX.extensions.defaulttoevo2.patch
+%patch10 -p1 -b .ooo34909.dbaccess.patch
+%patch11 -p1 -b .workspace.evo2fixes.patch
+%patch12  -p1 -b .ooo45725.lingucomponent.contribdict.patch
+%patch13 -p1 -b .ooo48256.nolongname.sysui.patch
+%patch14 -p1 -b .ooo54603.fontconfig.patch
+%patch15 -p1 -b .ooo51931.systemxmlsec.patch
+%patch16 -p1 -b .ooo52428.execshield.bridges.patch
 %if ! %{internaljavabits}
-%patch16 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
+%patch17 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
 %endif
-%patch17 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch18 -p1 -b .ooo53723.bulletexport.vcl.patch
-%patch19 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
-%patch20 -p1 -b .dmake43p01.patch
+%patch18 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch19 -p1 -b .ooo53723.bulletexport.vcl.patch
+%patch20 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
+%patch21 -p1 -b .dmake43p01.patch
 %if ! %{internalicu}
-%patch21 -p1 -b .ooo54479.systemicu.patch
+%patch22 -p1 -b .ooo54479.systemicu.patch
 %endif
-%patch22 -p1 -b .ooo54959.negativeindent.sw.patch
-%patch23 -p1 -b .workspace.atkbridge.patch
-%patch24 -p0 -b .workspace.jaxpapi.patch
-%patch25 -p1 -b .workspace.systemjava.patch
+%patch23 -p1 -b .ooo54959.negativeindent.sw.patch
+%patch24 -p1 -b .workspace.atkbridge.patch
+%patch25 -p0 -b .workspace.jaxpapi.patch
+%patch26 -p1 -b .workspace.systemjava.patch
 %if ! %{internaljavabits}
-%patch26 -p1 -b .workspace.targetedaot.patch
+%patch27 -p1 -b .workspace.targetedaot.patch
 %else
-%patch26 -p1 -b .rhXXXXX.helpcontent2.baddb.patch
+%patch27 -p1 -b .rhXXXXX.helpcontent2.baddb.patch
 %endif
-%patch27 -p1 -b .ooo58663.vcl.missingglyph.patch
-%patch28 -p1 -b .ooo58606.sw.pre-edit.patch
-%patch30 -p1 -b .ooo59997.sw.defaultbullets.patch
-%patch31 -p1 -b .ooo19976.framework.nofocussteal.patch
-%patch32 -p1 -b .ooo61875.sd.compile.patch
-%patch33 -p1 -b .ooo61841.vcl.honourfontconfigoverrides.patch
-%patch34 -p1 -b .ooo62030.solenv._version.patch
-%patch35 -p1 -b .oooXXXXX.config_office.noppds.patch
-%patch36 -p1 -b .ooo63155.sfx2.badscript.patch
+%patch28 -p1 -b .ooo58663.vcl.missingglyph.patch
+%patch29 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch31 -p1 -b .ooo59997.sw.defaultbullets.patch
+%patch32 -p1 -b .ooo19976.framework.nofocussteal.patch
+%patch33 -p1 -b .ooo61875.sd.compile.patch
+%patch34 -p1 -b .ooo61841.vcl.honourfontconfigoverrides.patch
+%patch35 -p1 -b .ooo62030.solenv._version.patch
+%patch36 -p1 -b .oooXXXXX.config_office.noppds.patch
+%patch37 -p1 -b .ooo63155.sfx2.badscript.patch
 %if %{build_rhel4}
-%patch37 -p1 -b .rhXXXXXX.config_office.archivezip.patch
+%patch38 -p1 -b .rhXXXXXX.config_office.archivezip.patch
 tar xjf %{SOURCE12}
-%patch38 -p0 -b .gij4ant.patch
+%patch39 -p0 -b .gij4ant.patch
 cd solenv/bin
 tar xzf %{SOURCE13} Archive-Zip-1.13/lib
 cd ../..
 %endif
-%patch39 -p1 -b .rh188467.printingdefaults.patch
-%patch40 -p1 -b .ooo64463.extensions.noxaw.patch
-%patch41 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch40 -p1 -b .rh188467.printingdefaults.patch
+%patch41 -p1 -b .ooo64463.extensions.noxaw.patch
+%patch42 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
 
 %if %{includingexternals}
 #start ludicrous workaround



From fedora-cvs-commits at redhat.com  Mon Apr 24 12:41:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 08:41:29 -0400
Subject: rpms/cups/FC-5 cups.spec,1.157,1.158
Message-ID: <200604241241.k3OCfTE5029071@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv29016

Modified Files:
	cups.spec 
Log Message:
* Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com>
- Ship an snmp.conf.



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- cups.spec	21 Apr 2006 15:40:33 -0000	1.157
+++ cups.spec	24 Apr 2006 12:41:26 -0000	1.158
@@ -218,6 +218,13 @@
 EOF
 done
 
+cat >$RPM_BUILD_ROOT%{_sysconfdir}/cups/snmp.conf <<"EOF"
+#Address @LOCAL
+#Community public
+#DebugLevel 0
+#HostNameLookups off
+EOF
+
 # Ship pstoraster (bug #69573).
 install -c -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{cups_serverbin}/filter
 install -c -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/cups
@@ -305,6 +312,7 @@
 %config(noreplace) %attr(0644,root,nobody) /etc/cups/client.conf
 %config(noreplace) %attr(0600,root,nobody) /etc/cups/printers.conf
 %config(noreplace) %attr(0644,root,nobody) /etc/cups/pdftops.conf
+%config(noreplace) %attr(0644,root,nobody) /etc/cups/snmp.conf
 /etc/cups/interfaces
 %config(noreplace) /etc/cups/mime.types
 %config(noreplace) /etc/cups/mime.convs
@@ -382,6 +390,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com>
+- Ship an snmp.conf.
+
 * Fri Apr 21 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.3.rc2.2
 - Updated to svn 5446.
 



From fedora-cvs-commits at redhat.com  Mon Apr 24 12:59:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 08:59:16 -0400
Subject: rpms/gnome-games/devel .cvsignore, 1.36, 1.37 gnome-games.spec, 1.70,
	1.71 sources, 1.39, 1.40
Message-ID: <200604241259.k3OCxGrH016803@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-games/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16742

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
update extra data



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	10 Apr 2006 14:49:43 -0000	1.36
+++ .cvsignore	24 Apr 2006 12:59:14 -0000	1.37
@@ -6,3 +6,4 @@
 gnome-games-2.13.8.tar.bz2
 gnome-games-2.14.0.tar.bz2
 gnome-games-2.14.1.tar.bz2
+gnome-games-extra-data-2.14.0.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- gnome-games.spec	10 Apr 2006 14:49:43 -0000	1.70
+++ gnome-games.spec	24 Apr 2006 12:59:14 -0000	1.71
@@ -6,17 +6,17 @@
 %define libgnomeui_version 2.5.0
 %define desktop_file_utils_version 0.2.90
 
-%define gnome_games_extra_data_version 2.12.0
+%define gnome_games_extra_data_version 2.14.0
 
 Summary: GNOME games.
 Name: gnome-games
 Version: 2.14.1
-Release: 2
+Release: 3
 Epoch: 1
 License: LGPL
 Group: Amusements/Games
 Source: gnome-games-%{version}.tar.bz2
-Source2: gnome-games-extra-data-no-windows-%{gnome_games_extra_data_version}.tar.bz2
+Source2: gnome-games-extra-data-%{gnome_games_extra_data_version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Obsoletes: gnome-games-devel
@@ -177,6 +177,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-3
+- Update the extra data to 2.14.0
+
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
 - Update to 2.14.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	10 Apr 2006 14:49:43 -0000	1.39
+++ sources	24 Apr 2006 12:59:14 -0000	1.40
@@ -1,2 +1,2 @@
-19b2d6dbca182fb426a0bd86d322a2ac  gnome-games-extra-data-no-windows-2.12.0.tar.bz2
 9893da6c2f8eecdbc596cec9a017a8b2  gnome-games-2.14.1.tar.bz2
+01464739e83449288c6a58685604f86e  gnome-games-extra-data-2.14.0.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 24 13:10:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 09:10:12 -0400
Subject: rpms/gnome-games/devel gnome-games.spec,1.71,1.72
Message-ID: <200604241310.k3ODACYp017609@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-games/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17465

Modified Files:
	gnome-games.spec 
Log Message:
2.14.1-3



Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- gnome-games.spec	24 Apr 2006 12:59:14 -0000	1.71
+++ gnome-games.spec	24 Apr 2006 13:09:58 -0000	1.72
@@ -22,15 +22,15 @@
 Obsoletes: gnome-games-devel
 URL: http://www.gnome.org
 
-Requires:         scrollkeeper >= 0.1.4
-Requires:         GConf2
-Requires:         /usr/bin/gconftool-2
-
-BuildRequires:  glib2-devel >= %{glib2_version}
-BuildRequires:  pango-devel >= %{pango_version}
-BuildRequires:  gtk2-devel >= %{gtk2_version}
-BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
-BuildRequires:  desktop-file-utils >= %{desktop_file_utils_version}
+Requires(post): scrollkeeper >= 0.1.4
+Requires(post): GConf2
+Requires(postun): scrollkeeper >= 0.1.4
+
+BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: pango-devel >= %{pango_version}
+BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
+BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: scrollkeeper
 BuildRequires: librsvg2-devel
 BuildRequires: guile-devel >= 1.6.5
@@ -39,6 +39,7 @@
 BuildRequires: gettext
 # Needed by intltool
 BuildRequires: perl-XML-Parser
+BuildRequires: autoconf
 
 %description
 
@@ -123,7 +124,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-scrollkeeper-update
+scrollkeeper-update -q
 
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 SCHEMAS="aisleriot.schemas gataxx.schemas gnect.schemas gnobots2.schemas gnometris.schemas gnotravex.schemas iagno.schemas same-gnome.schemas blackjack.schemas glines.schemas gnibbles.schemas gnomine.schemas gtali.schemas mahjongg.schemas"
@@ -132,7 +133,7 @@
 done
 
 %postun
-scrollkeeper-update
+scrollkeeper-update -q
 
 %files -f %{gettext_package}.lang
 %defattr(-, root, root)
@@ -149,7 +150,7 @@
 %{_datadir}/gnibbles
 %{_datadir}/sol-games
 %{_datadir}/blackjack
-%{_datadir}/omf
+%{_datadir}/omf/gnome-games
 %{_sysconfdir}/gconf/schemas/*
 %config %{_sysconfdir}/sound/events/*
 %config(noreplace) %attr(664, games, games) /var/lib/games/*



From fedora-cvs-commits at redhat.com  Mon Apr 24 13:11:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 09:11:46 -0400
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders-2.4-unistd.patch, 1.4,
	1.5 glibc-kernheaders.spec, 1.105, 1.106
Message-ID: <200604241311.k3ODBk15017869@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17830

Modified Files:
	glibc-kernheaders-2.4-unistd.patch glibc-kernheaders.spec 
Log Message:
3.0-7


glibc-kernheaders-2.4-unistd.patch:
 asm-alpha/unistd.h  |   32 ++++++++++++++++++++++++++------
 asm-i386/unistd.h   |   33 +++++++++++++++++++++++++++++++++
 asm-ia64/unistd.h   |   37 +++++++++++++++++++++++++++++++++++--
 asm-ppc/unistd.h    |   27 +++++++++++++++++++++++++--
 asm-ppc64/unistd.h  |   29 +++++++++++++++++++++++++++--
 asm-s390/unistd.h   |   30 ++++++++++++++++++++++++++++--
 asm-s390x/unistd.h  |   31 +++++++++++++++++++++++++++++--
 asm-x86_64/unistd.h |   36 ++++++++++++++++++++++++++++++++++--
 8 files changed, 237 insertions(+), 18 deletions(-)

Index: glibc-kernheaders-2.4-unistd.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders-2.4-unistd.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glibc-kernheaders-2.4-unistd.patch	7 Apr 2006 13:07:53 -0000	1.4
+++ glibc-kernheaders-2.4-unistd.patch	24 Apr 2006 13:11:41 -0000	1.5
@@ -1,5 +1,5 @@
---- glibc-kernheaders-2.4/usr/include/asm-alpha/unistd.h~	2004-07-29 09:41:03.000000000 +0100
-+++ glibc-kernheaders-2.4/usr/include/asm-alpha/unistd.h	2005-04-15 17:12:34.000000000 +0100
+--- glibc-kernheaders-2.4/usr/include/asm-alpha/unistd.h.jj	2004-07-29 04:41:03.000000000 -0400
++++ glibc-kernheaders-2.4/usr/include/asm-alpha/unistd.h	2006-04-24 08:49:48.000000000 -0400
 @@ -286,8 +286,8 @@
  #define __NR_pciconfig_write		346
  #define __NR_query_module		347
@@ -47,7 +47,7 @@
  #define __NR_tgkill			424
  #define __NR_stat64			425
  #define __NR_lstat64			426
-@@ -363,5 +363,15 @@
+@@ -363,5 +373,15 @@
  #define __NR_mq_timedreceive		435
  #define __NR_mq_notify			436
  #define __NR_mq_getsetattr		437
@@ -63,9 +63,9 @@
 +#define __NR_inotify_rm_watch		446
  
  #endif /* _ALPHA_UNISTD_H */
---- glibc-kernheaders-2.4/usr/include/asm-i386/unistd.h~	2004-04-16 22:07:05.000000000 +0100
-+++ glibc-kernheaders-2.4/usr/include/asm-i386/unistd.h	2005-04-15 17:11:56.000000000 +0100
-@@ -288,5 +288,32 @@
+--- glibc-kernheaders-2.4/usr/include/asm-i386/unistd.h.jj	2004-04-16 17:07:05.000000000 -0400
++++ glibc-kernheaders-2.4/usr/include/asm-i386/unistd.h	2006-04-24 08:51:40.000000000 -0400
+@@ -288,5 +288,38 @@
  #define __NR_mq_timedreceive	(__NR_mq_open+3)
  #define __NR_mq_notify		(__NR_mq_open+4)
  #define __NR_mq_getsetattr	(__NR_mq_open+5)
@@ -86,7 +86,7 @@
 +#define __NR_mknodat		297
 +#define __NR_fchownat		298
 +#define __NR_futimesat		299
-+#define __NR_fstat64		300
++#define __NR_fstatat64		300
 +#define __NR_unlinkat		301
 +#define __NR_renameat		302
 +#define __NR_linkat		303
@@ -96,10 +96,16 @@
 +#define __NR_faccessat		307
 +#define __NR_pselect6		308
 +#define __NR_ppoll		309
++#define __NR_unshare		310
++#define __NR_set_robust_list	311
++#define __NR_get_robust_list	312
++#define __NR_splice		313
++#define __NR_sync_file_range	314
++#define __NR_tee		315
  
  #endif /* _ASM_I386_UNISTD_H_ */
---- glibc-kernheaders-2.4/usr/include/asm-ia64/unistd.h~	2004-07-29 09:41:03.000000000 +0100
-+++ glibc-kernheaders-2.4/usr/include/asm-ia64/unistd.h	2005-04-15 17:11:30.000000000 +0100
+--- glibc-kernheaders-2.4/usr/include/asm-ia64/unistd.h.jj	2004-07-29 04:41:03.000000000 -0400
++++ glibc-kernheaders-2.4/usr/include/asm-ia64/unistd.h	2006-04-24 08:59:05.000000000 -0400
 @@ -137,8 +137,8 @@
  #define __NR_flock			1145
  #define __NR_readv			1146
@@ -120,7 +126,7 @@
  #define __NR_mbind			1259
  #define __NR_get_mempolicy		1260
  #define __NR_set_mempolicy		1261
-@@ -256,5 +256,16 @@
+@@ -256,5 +258,36 @@
  #define __NR_mq_notify			1266
  #define __NR_mq_getsetattr		1267
  #define __NR_vserver			1269
@@ -135,11 +141,31 @@
 +#define __NR_inotify_add_watch		1278
 +#define __NR_inotify_rm_watch		1279
 +#define __NR_migrate_pages		1280
++#define __NR_openat			1281
++#define __NR_mkdirat			1282
++#define __NR_mknodat			1283
++#define __NR_fchownat			1284
++#define __NR_futimesat			1285
++#define __NR_newfstatat			1286
++#define __NR_unlinkat			1287
++#define __NR_renameat			1288
++#define __NR_linkat			1289
++#define __NR_symlinkat			1290
++#define __NR_readlinkat			1291
++#define __NR_fchmodat			1292
++#define __NR_faccessat			1293
++/* 1294, 1295 reserved for pselect/ppoll */
++#define __NR_unshare			1296
++#define __NR_splice			1297
++#define __NR_set_robust_list		1298
++#define __NR_get_robust_list		1299
++#define __NR_sync_file_range		1300
++#define __NR_tee			1301
  
  #endif /* _ASM_IA64_UNISTD_H */
---- glibc-kernheaders-2.4/usr/include/asm-ppc/unistd.h~	2004-04-21 17:44:25.000000000 +0100
-+++ glibc-kernheaders-2.4/usr/include/asm-ppc/unistd.h	2005-04-15 17:11:03.000000000 +0100
-@@ -188,8 +189,8 @@
+--- glibc-kernheaders-2.4/usr/include/asm-ppc/unistd.h.jj	2004-04-21 12:44:25.000000000 -0400
++++ glibc-kernheaders-2.4/usr/include/asm-ppc/unistd.h	2006-04-24 08:59:44.000000000 -0400
+@@ -186,8 +186,8 @@
  #define __NR_rt_sigtimedwait	176
  #define __NR_rt_sigqueueinfo	177
  #define __NR_rt_sigsuspend	178
@@ -150,14 +176,7 @@
  #define __NR_chown		181
  #define __NR_getcwd		182
  #define __NR_capget		183
-@@ -257,18 +265,38 @@
- #define __NR_clock_gettime	246
- #define __NR_clock_getres	247
- #define __NR_clock_nanosleep	248
- #define __NR_swapcontext	249
- #define __NR_tgkill		250
- #define __NR_utimes		251
- #define __NR_statfs64		252
+@@ -263,11 +263,34 @@
  #define __NR_fstatfs64		253
  #define __NR_fadvise64_64	254
  #define __NR_rtas		255
@@ -187,11 +206,14 @@
 +#define __NR_spu_create		279
 +#define __NR_pselect6		280
 +#define __NR_ppoll		281
++#define __NR_unshare		282
++#define __NR_splice		283
++#define __NR_tee		284
  
  #endif /* _ASM_PPC_UNISTD_H_ */
---- glibc-kernheaders-2.4/usr/include/asm-ppc64/unistd.h~	2004-04-21 17:44:25.000000000 +0100
-+++ glibc-kernheaders-2.4/usr/include/asm-ppc64/unistd.h	2005-04-15 17:11:14.000000000 +0100
-@@ -186,8 +189,8 @@
+--- glibc-kernheaders-2.4/usr/include/asm-ppc64/unistd.h.jj	2004-04-21 12:44:25.000000000 -0400
++++ glibc-kernheaders-2.4/usr/include/asm-ppc64/unistd.h	2006-04-24 09:00:13.000000000 -0400
+@@ -188,8 +188,8 @@
  #define __NR_rt_sigtimedwait	176
  #define __NR_rt_sigqueueinfo	177
  #define __NR_rt_sigsuspend	178
@@ -202,7 +224,9 @@
  #define __NR_chown		181
  #define __NR_getcwd		182
  #define __NR_capget		183
-@@ -261,10 +270,32 @@
+@@ -259,12 +259,37 @@
+ #define __NR_clock_nanosleep	248
+ #define __NR_tgkill		250
  #define __NR_utimes		251
 +#define __NR_statfs64		252
 +#define __NR_fstatfs64		253
@@ -233,11 +257,14 @@
 +#define __NR_spu_create		279
 +#define __NR_pselect6		280
 +#define __NR_ppoll		281
++#define __NR_unshare		282
++#define __NR_splice		283
++#define __NR_tee		284
  
  #endif /* _ASM_PPC_UNISTD_H_ */
---- glibc-kernheaders-2.4/usr/include/asm-s390/unistd.h~	2004-04-16 22:07:05.000000000 +0100
-+++ glibc-kernheaders-2.4/usr/include/asm-s390/unistd.h	2005-04-15 17:10:27.000000000 +0100
-@@ -170,8 +172,8 @@
+--- glibc-kernheaders-2.4/usr/include/asm-s390/unistd.h.jj	2004-04-16 17:07:05.000000000 -0400
++++ glibc-kernheaders-2.4/usr/include/asm-s390/unistd.h	2006-04-24 09:05:57.000000000 -0400
+@@ -170,8 +170,8 @@
  #define __NR_rt_sigtimedwait    177
  #define __NR_rt_sigqueueinfo    178
  #define __NR_rt_sigsuspend      179
@@ -248,7 +275,7 @@
  #define __NR_chown              182
  #define __NR_getcwd             183
  #define __NR_capget             184
-@@ -271,5 +271,15 @@
+@@ -271,5 +271,31 @@
  #define __NR_mq_timedreceive	274
  #define __NR_mq_notify		275
  #define __NR_mq_getsetattr	276
@@ -262,11 +289,27 @@
 +#define __NR_inotify_init	284
 +#define __NR_inotify_add_watch	285
 +#define __NR_inotify_rm_watch	286
++#define __NR_openat		288
++#define __NR_mkdirat		289
++#define __NR_mknodat		290
++#define __NR_fchownat		291
++#define __NR_futimesat		292
++#define __NR_fstatat64		293
++#define __NR_unlinkat		294
++#define __NR_renameat		295
++#define __NR_linkat		296
++#define __NR_symlinkat		297
++#define __NR_readlinkat		298
++#define __NR_fchmodat		299
++#define __NR_faccessat		300
++#define __NR_pselect6		301
++#define __NR_ppoll		302
++#define __NR_unshare		303
  
  #endif /* _ASM_S390_UNISTD_H_ */
---- glibc-kernheaders-2.4/usr/include/asm-s390x/unistd.h~	2004-04-16 22:07:05.000000000 +0100
-+++ glibc-kernheaders-2.4/usr/include/asm-s390x/unistd.h	2005-04-15 17:10:12.000000000 +0100
-@@ -170,7 +172,8 @@
+--- glibc-kernheaders-2.4/usr/include/asm-s390x/unistd.h.jj	2004-04-16 17:07:05.000000000 -0400
++++ glibc-kernheaders-2.4/usr/include/asm-s390x/unistd.h	2006-04-24 09:06:34.000000000 -0400
+@@ -147,8 +147,9 @@
  #define __NR_rt_sigtimedwait    177
  #define __NR_rt_sigqueueinfo    178
  #define __NR_rt_sigsuspend      179
@@ -277,7 +320,8 @@
 +#define __NR_chown              182
  #define __NR_getcwd             183
  #define __NR_capget             184
-@@ -238,5 +238,15 @@
+ #define __NR_capset             185
+@@ -238,5 +239,31 @@
  #define __NR_mq_timedreceive	274
  #define __NR_mq_notify		275
  #define __NR_mq_getsetattr	276
@@ -291,11 +335,27 @@
 +#define __NR_inotify_init	284
 +#define __NR_inotify_add_watch	285
 +#define __NR_inotify_rm_watch	286
++#define __NR_openat		288
++#define __NR_mkdirat		289
++#define __NR_mknodat		290
++#define __NR_fchownat		291
++#define __NR_futimesat		292
++#define __NR_newfstatat		293
++#define __NR_unlinkat		294
++#define __NR_renameat		295
++#define __NR_linkat		296
++#define __NR_symlinkat		297
++#define __NR_readlinkat		298
++#define __NR_fchmodat		299
++#define __NR_faccessat		300
++#define __NR_pselect6		301
++#define __NR_ppoll		302
++#define __NR_unshare		303
  
  #endif /* _ASM_S390_UNISTD_H_ */
---- glibc-kernheaders-2.4/usr/include/asm-x86_64/unistd.h~	2005-04-15 17:06:55.000000000 +0100
-+++ glibc-kernheaders-2.4/usr/include/asm-x86_64/unistd.h	2005-04-15 17:09:35.000000000 +0100
-@@ -27,8 +29,8 @@
+--- glibc-kernheaders-2.4/usr/include/asm-x86_64/unistd.h.jj	2006-04-24 08:49:48.000000000 -0400
++++ glibc-kernheaders-2.4/usr/include/asm-x86_64/unistd.h	2006-04-24 08:52:30.000000000 -0400
+@@ -27,8 +27,8 @@
  #define __NR_rt_sigreturn                       15
  
  #define __NR_ioctl                              16
@@ -306,7 +366,7 @@
  #define __NR_readv                              19
  #define __NR_writev                             20
  #define __NR_access                             21
-@@ -283,6 +283,32 @@
+@@ -283,6 +283,38 @@
  #define __NR_mq_timedreceive	243
  #define __NR_mq_notify		244
  #define __NR_mq_getsetattr	245
@@ -336,6 +396,12 @@
 +#define __NR_faccessat		269
 +#define __NR_pselect6		270
 +#define __NR_ppoll		271
++#define __NR_unshare		272
++#define __NR_set_robust_list	273
++#define __NR_get_robust_list	274
++#define __NR_splice		275
++#define __NR_tee		276
++#define __NR_sync_file_range	277
  
  #define __NR_syscall_max	__NR_mq_getsetattr
  


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- glibc-kernheaders.spec	7 Apr 2006 13:07:54 -0000	1.105
+++ glibc-kernheaders.spec	24 Apr 2006 13:11:41 -0000	1.106
@@ -1,7 +1,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -176,6 +176,10 @@
 
 
 %changelog
+* Mon Apr 24 2006 Jakub Jelinek <jakub at redhat.com> - 3.0-7
+- fix typo in the i386 fstatat64 change
+- Add new syscalls up to 2006-04-24
+
 * Fri Apr 07 2006 David Woodhouse <dwmw2 at redhat.com> - 3.0-6
 - Fix fstatat64 on i386 (it's not newfstatat)
 



From fedora-cvs-commits at redhat.com  Mon Apr 24 13:17:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 09:17:25 -0400
Subject: rpms/strace/devel strace.spec,1.35,1.36
Message-ID: <200604241317.k3ODHP7q024357@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/strace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23942/devel

Modified Files:
	strace.spec 
Log Message:
.


Index: strace.spec
===================================================================
RCS file: /cvs/dist/rpms/strace/devel/strace.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- strace.spec	11 Feb 2006 05:44:29 -0000	1.35
+++ strace.spec	24 Apr 2006 13:17:22 -0000	1.36
@@ -8,6 +8,8 @@
 Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-root
 
+Patch0: strace-4.5.14-rlimit32.patch
+
 %define strace64_arches ppc64
 
 %description
@@ -41,6 +43,7 @@
 
 %prep
 %setup -q
+%patch0
 
 %build
 %configure



From fedora-cvs-commits at redhat.com  Mon Apr 24 13:20:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 09:20:00 -0400
Subject: rpms/strace/devel strace.spec,1.36,1.37
Message-ID: <200604241320.k3ODK0b4000660@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/strace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv524

Modified Files:
	strace.spec 
Log Message:
Oops.


Index: strace.spec
===================================================================
RCS file: /cvs/dist/rpms/strace/devel/strace.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- strace.spec	24 Apr 2006 13:17:22 -0000	1.36
+++ strace.spec	24 Apr 2006 13:19:57 -0000	1.37
@@ -8,8 +8,6 @@
 Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-root
 
-Patch0: strace-4.5.14-rlimit32.patch
-
 %define strace64_arches ppc64
 
 %description
@@ -43,7 +41,6 @@
 
 %prep
 %setup -q
-%patch0
 
 %build
 %configure



From fedora-cvs-commits at redhat.com  Mon Apr 24 13:37:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 09:37:25 -0400
Subject: rpms/gnome-games/devel gnome-games.spec,1.72,1.73
Message-ID: <200604241337.k3ODbPGt012063@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-games/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12048

Modified Files:
	gnome-games.spec 
Log Message:
fix some small rpmlint issues



Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- gnome-games.spec	24 Apr 2006 13:09:58 -0000	1.72
+++ gnome-games.spec	24 Apr 2006 13:37:21 -0000	1.73
@@ -8,7 +8,7 @@
 
 %define gnome_games_extra_data_version 2.14.0
 
-Summary: GNOME games.
+Summary: GNOME games
 Name: gnome-games
 Version: 2.14.1
 Release: 3
@@ -178,7 +178,7 @@
 
 
 %changelog
-* Mon Apr 24 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-3
+* Mon Apr 24 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.14.1-3
 - Update the extra data to 2.14.0
 
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2



From fedora-cvs-commits at redhat.com  Mon Apr 24 13:37:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 09:37:47 -0400
Subject: rpms/tar/devel tar-1.15.1-optionsOrder.patch, NONE, 1.1 tar.spec,
	1.34, 1.35
Message-ID: <200604241337.k3ODblWV012084@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/tar/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12049

Modified Files:
	tar.spec 
Added Files:
	tar-1.15.1-optionsOrder.patch 
Log Message:
- fix problem when options at the end of command line were
  not recognized (#188707)


tar-1.15.1-optionsOrder.patch:
 tar.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE tar-1.15.1-optionsOrder.patch ---
--- tar-1.15.1/src/tar.c.optionsOrder	2006-04-24 15:25:55.000000000 +0200
+++ tar-1.15.1/src/tar.c	2006-04-24 15:27:01.000000000 +0200
@@ -617,9 +617,9 @@
   
   switch (key)
     {
-      case 1:
+      case ARGP_KEY_ARG:
 	/* File name or non-parsed option, because of ARGP_IN_ORDER */
-	name_add (optarg);
+	name_add (arg);
 	args->input_files++;
 	break;
 


Index: tar.spec
===================================================================
RCS file: /cvs/dist/rpms/tar/devel/tar.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- tar.spec	13 Apr 2006 13:45:34 -0000	1.34
+++ tar.spec	24 Apr 2006 13:37:44 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: A GNU file archiving program.
 Name: tar
 Version: 1.15.1
-Release: 15
+Release: 16
 License: GPL
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -19,6 +19,7 @@
 Patch15: tar-1.15.1-vfatTruncate.patch
 Patch16: tar-1.15.1-heapOverflow.patch
 Patch17: tar-1.15.1-hugeSparse.patch
+Patch18: tar-1.15.1-optionsOrder.patch
 
 Prereq: info
 BuildRequires: autoconf automake gzip
@@ -49,6 +50,7 @@
 %patch15 -p1 -b .vfatTruncate
 %patch16 -p0 -b .heapOverflow
 %patch17 -p1 -b .hugeSparse
+%patch18 -p1 -b .optionsOrder
 
 %build
 
@@ -119,6 +121,10 @@
 %{_infodir}/tar.info*
 
 %changelog
+* Mon Apr 24 2006 Peter Vrabec <pvrabec at redhat.com> 1.15.1-16
+- fix problem when options at the end of command line were 
+  not recognized (#188707)
+
 * Thu Apr 13 2006 Peter Vrabec <pvrabec at redhat.com> 1.15.1-15
 - fix segmentation faul introduced with hugeSparse.patch
 



From fedora-cvs-commits at redhat.com  Mon Apr 24 13:43:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 09:43:28 -0400
Subject: rpms/gnome-games/FC-5 gnome-games.spec,1.71,1.72 sources,1.39,1.40
Message-ID: <200604241343.k3ODhSXI012282@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-games/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv12262

Modified Files:
	gnome-games.spec sources 
Log Message:
update extra data



Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/FC-5/gnome-games.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- gnome-games.spec	17 Apr 2006 15:53:24 -0000	1.71
+++ gnome-games.spec	24 Apr 2006 13:43:15 -0000	1.72
@@ -6,31 +6,31 @@
 %define libgnomeui_version 2.5.0
 %define desktop_file_utils_version 0.2.90
 
-%define gnome_games_extra_data_version 2.12.0
+%define gnome_games_extra_data_version 2.14.0
 
-Summary: GNOME games.
+Summary: GNOME games
 Name: gnome-games
 Version: 2.14.1
-Release: 1.fc5.2
+Release: 1.fc5.3
 Epoch: 1
 License: LGPL
 Group: Amusements/Games
 Source: gnome-games-%{version}.tar.bz2
-Source2: gnome-games-extra-data-no-windows-%{gnome_games_extra_data_version}.tar.bz2
+Source2: gnome-games-extra-data-%{gnome_games_extra_data_version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Obsoletes: gnome-games-devel
 URL: http://www.gnome.org
 
-Requires:         scrollkeeper >= 0.1.4
-Requires:         GConf2
-Requires:         /usr/bin/gconftool-2
-
-BuildRequires:  glib2-devel >= %{glib2_version}
-BuildRequires:  pango-devel >= %{pango_version}
-BuildRequires:  gtk2-devel >= %{gtk2_version}
-BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
-BuildRequires:  desktop-file-utils >= %{desktop_file_utils_version}
+Requires(post): scrollkeeper >= 0.1.4
+Requires(post): GConf2
+Requires(postun): scrollkeeper >= 0.1.4
+
+BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: pango-devel >= %{pango_version}
+BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
+BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: scrollkeeper
 BuildRequires: librsvg2-devel
 BuildRequires: guile-devel >= 1.6.5
@@ -39,6 +39,7 @@
 BuildRequires: gettext
 # Needed by intltool
 BuildRequires: perl-XML-Parser
+BuildRequires: autoconf
 
 Patch0: gnome-games-2.14.1-fix-schema.patch
 
@@ -126,7 +127,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-scrollkeeper-update
+scrollkeeper-update -q
 
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 SCHEMAS="aisleriot.schemas gataxx.schemas gnect.schemas gnobots2.schemas gnometris.schemas gnotravex.schemas iagno.schemas same-gnome.schemas blackjack.schemas glines.schemas gnibbles.schemas gnomine.schemas gtali.schemas mahjongg.schemas"
@@ -135,7 +136,7 @@
 done
 
 %postun
-scrollkeeper-update
+scrollkeeper-update -q
 
 %files -f %{gettext_package}.lang
 %defattr(-, root, root)
@@ -152,7 +153,7 @@
 %{_datadir}/gnibbles
 %{_datadir}/sol-games
 %{_datadir}/blackjack
-%{_datadir}/omf
+%{_datadir}/omf/gnome-games
 %{_sysconfdir}/gconf/schemas/*
 %config %{_sysconfdir}/sound/events/*
 %config(noreplace) %attr(664, games, games) /var/lib/games/*
@@ -180,6 +181,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.14.1-1.fc5.3
+- Update the extra data to 2.14.0
+
 * Mon Apr 17 2006 Ray Strode <rstrode at redhat.com> - 2.14.1-1.fc5.2
 - Fix schema install bug. Reported by Dawid Gajownik <gajownik at fedora.pl>
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/FC-5/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	10 Apr 2006 14:51:52 -0000	1.39
+++ sources	24 Apr 2006 13:43:15 -0000	1.40
@@ -1,2 +1,2 @@
-19b2d6dbca182fb426a0bd86d322a2ac  gnome-games-extra-data-no-windows-2.12.0.tar.bz2
 9893da6c2f8eecdbc596cec9a017a8b2  gnome-games-2.14.1.tar.bz2
+01464739e83449288c6a58685604f86e  gnome-games-extra-data-2.14.0.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 24 13:48:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 09:48:44 -0400
Subject: rpms/gimp-help/FC-5 .cvsignore, 1.6, 1.7 gimp-help.spec, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <200604241348.k3ODmiKr026158@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/gimp-help/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26143

Modified Files:
	.cvsignore gimp-help.spec sources 
Log Message:
version 2-0.10



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gimp-help/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Oct 2005 10:21:17 -0000	1.6
+++ .cvsignore	24 Apr 2006 13:48:42 -0000	1.7
@@ -1 +1 @@
-gimp-help-2-0.9.tar.gz
+gimp-help-2-0.10.tar.gz


Index: gimp-help.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp-help/FC-5/gimp-help.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gimp-help.spec	9 Dec 2005 22:40:34 -0000	1.8
+++ gimp-help.spec	24 Apr 2006 13:48:42 -0000	1.9
@@ -1,14 +1,14 @@
-%define gimphelpver 2-0.9
+%define gimphelpver 2-0.10
 %define gimpsubver 2.0
 
 Summary: Help files for the GIMP.
 Name: gimp-help
 Version: %(echo %gimphelpver|cut -d- -f1)
-Release: 0.1.%(echo %gimphelpver|cut -d- -f2).1.1
+Release: 0.1.%(echo %gimphelpver|cut -d- -f2).0.fc5.1
 License: GNU FDL
 Group: Applications/Multimedia
 URL: http://wiki.gimp.org/gimp/GimpDocs
-Source: ftp://ftp.gimp.org/pub/gimp/help/testing/gimp-help-%{gimphelpver}.tar.gz
+Source: ftp://ftp.gimp.org/pub/gimp/help/gimp-help-%{gimphelpver}.tar.gz
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libxslt
@@ -40,6 +40,9 @@
 %{_datadir}/gimp/%{gimpsubver}/help
 
 %changelog
+* Mon Apr 24 2006 Nils Philippsen <nphilipp at redhat.com>
+- version 2-0.10
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gimp-help/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Oct 2005 10:21:17 -0000	1.6
+++ sources	24 Apr 2006 13:48:42 -0000	1.7
@@ -1 +1 @@
-c2f5c20cc5d861e7d403dda8e46d1c97  gimp-help-2-0.9.tar.gz
+22a1e10c314c5547fe8721c4f6f0b30a  gimp-help-2-0.10.tar.gz



From fedora-cvs-commits at redhat.com  Mon Apr 24 13:49:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 09:49:50 -0400
Subject: rpms/gimp-help/FC-4 .cvsignore, 1.6, 1.7 gimp-help.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <200604241349.k3ODno4J026228@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/gimp-help/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv26212

Modified Files:
	.cvsignore gimp-help.spec sources 
Log Message:
version 2-0.10



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gimp-help/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Oct 2005 10:37:21 -0000	1.6
+++ .cvsignore	24 Apr 2006 13:49:48 -0000	1.7
@@ -1 +1 @@
-gimp-help-2-0.9.tar.gz
+gimp-help-2-0.10.tar.gz


Index: gimp-help.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp-help/FC-4/gimp-help.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gimp-help.spec	21 Oct 2005 10:37:21 -0000	1.7
+++ gimp-help.spec	24 Apr 2006 13:49:48 -0000	1.8
@@ -1,4 +1,4 @@
-%define gimphelpver 2-0.9
+%define gimphelpver 2-0.10
 %define gimpsubver 2.0
 
 Summary: Help files for the GIMP.
@@ -8,7 +8,7 @@
 License: GNU FDL
 Group: Applications/Multimedia
 URL: http://wiki.gimp.org/gimp/GimpDocs
-Source: ftp://ftp.gimp.org/pub/gimp/help/testing/gimp-help-%{gimphelpver}.tar.gz
+Source: ftp://ftp.gimp.org/pub/gimp/help/gimp-help-%{gimphelpver}.tar.gz
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libxslt
@@ -40,6 +40,12 @@
 %{_datadir}/gimp/%{gimpsubver}/help
 
 %changelog
+* Mon Apr 24 2006 Nils Philippsen <nphilipp at redhat.com>
+- version 2-0.10
+
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+- rebuilt
+
 * Fri Oct 21 2005 Nils Philippsen <nphilipp at redhat.com>
 - version 2-0.9
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gimp-help/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Oct 2005 10:37:21 -0000	1.6
+++ sources	24 Apr 2006 13:49:48 -0000	1.7
@@ -1 +1 @@
-c2f5c20cc5d861e7d403dda8e46d1c97  gimp-help-2-0.9.tar.gz
+22a1e10c314c5547fe8721c4f6f0b30a  gimp-help-2-0.10.tar.gz



From fedora-cvs-commits at redhat.com  Mon Apr 24 14:06:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 10:06:56 -0400
Subject: rpms/autofs/FC-5 autofs-4.1.3-ldap-auto-master.patch, NONE,
	1.1 autofs-4.1.4-auto_net-escape-hash.patch, NONE, 1.1
Message-ID: <200604241406.k3OE6uGE026620@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26607

Added Files:
	autofs-4.1.3-ldap-auto-master.patch 
	autofs-4.1.4-auto_net-escape-hash.patch 
Log Message:
Oops forget to add autofs-4.1.3-ldap-auto-master.patch and autofs-4.1.4-auto_net-escape-hash.patch


autofs-4.1.3-ldap-auto-master.patch:
 redhat/autofs.sysconfig |    4 ++++
 samples/rc.autofs.in    |    3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE autofs-4.1.3-ldap-auto-master.patch ---
diff -Nurp autofs-4.1.4.orig/redhat/autofs.sysconfig autofs-4.1.4/redhat/autofs.sysconfig
--- autofs-4.1.4.orig/redhat/autofs.sysconfig	2005-01-17 09:53:17.000000000 -0500
+++ autofs-4.1.4/redhat/autofs.sysconfig	2006-04-11 07:17:34.000000000 -0400
@@ -19,3 +19,7 @@ DISABLE_DIRECT=1
 # this value.
 DAEMON_EXIT_WAIT=10
 
+# LDAPAUTOMASTER contains command line arguments for the
+# /usr/lib/autofs/autofs-ldap-auto-master program
+# Run the program with --help to see available options
+LDAPAUTOMASTER=""
diff -Nurp autofs-4.1.4.orig/samples/rc.autofs.in autofs-4.1.4/samples/rc.autofs.in
--- autofs-4.1.4.orig/samples/rc.autofs.in	2006-04-11 07:05:00.000000000 -0400
+++ autofs-4.1.4/samples/rc.autofs.in	2006-04-11 07:15:03.000000000 -0400
@@ -85,6 +85,7 @@ if [ "$system" = "redhat" ]; then
 	DISABLE_DIRECT=1
 	DAEMON_EXIT_WAIT=20
 	ONE_AUTO_MASTER=0
+	LDAPAUTOMASTER=""
 
 	[ -f /etc/sysconfig/autofs ] && . /etc/sysconfig/autofs
 
@@ -165,7 +166,7 @@ function getnismounts()
 function getldapmounts()
 {
     if [ -x @@autofslibdir@@/autofs-ldap-auto-master ]; then
-        @@autofslibdir@@/autofs-ldap-auto-master 2> /dev/null
+        @@autofslibdir@@/autofs-ldap-auto-master $LDAPAUTOMASTER 2> /dev/null
     fi
 }
 

autofs-4.1.4-auto_net-escape-hash.patch:
 auto.net |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE autofs-4.1.4-auto_net-escape-hash.patch ---
diff -Nurp autofs-4.1.4.orig/samples/auto.net autofs-4.1.4/samples/auto.net
--- autofs-4.1.4.orig/samples/auto.net	2006-04-11 09:24:17.000000000 -0400
+++ autofs-4.1.4/samples/auto.net	2006-04-11 09:27:24.000000000 -0400
@@ -42,4 +42,4 @@ $SHOWMOUNT | LC_ALL=C sort -k 1 | \
 	BEGIN	{ ORS=""; first=1 }
 		{ if (first) { print opts; first=0 }; print " \\\n\t" $1, key ":" $1 }
 	END	{ if (!first) print "\n"; else exit 1 }
-	'
+	' | sed 's/#/\\#/g'



From fedora-cvs-commits at redhat.com  Mon Apr 24 15:03:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 11:03:45 -0400
Subject: rpms/hal/devel hal.spec,1.88,1.89
Message-ID: <200604241503.k3OF3jhl014374@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14317

Modified Files:
	hal.spec 
Log Message:
- ifnarch the pm-utils requires for s390 and s390x



Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- hal.spec	19 Apr 2006 04:43:31 -0000	1.88
+++ hal.spec	24 Apr 2006 15:03:08 -0000	1.89
@@ -20,7 +20,7 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.7
-Release: 4
+Release: 5 
 URL: http://www.freedesktop.org/Software/hal
 Source0: %{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
@@ -48,7 +48,9 @@
 Requires: libselinux >= %{libselinux_version}
 Requires: initscripts >= %{initscripts_version}
 Requires: cryptsetup-luks >= %{cryptsetup_luks_version}
+%ifnarch s390 s390x
 Requires: pm-utils >= %{pm_utils_version}
+%endif 
 Conflicts: kernel < %{kernel_version}
 %ifnarch s390 s390x
 Requires: libusb >= %{libusb_version}
@@ -123,7 +125,7 @@
 /sbin/ldconfig
 #if [ "$1" -ge "1" ]; then
 #  service haldaemon condrestart > /dev/null 2>&1
-#fi
+z#fi
 
 %triggerpostun -- hal < 0.5.7-3
 #remove lingering fstab-sync entries from /etc/fstab
@@ -193,6 +195,9 @@
 %{_bindir}/hal-device-manager
 
 %changelog
+* Mon Apr 24 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7-5
+- ifnarch the pm-utils requires for s390 and s390x
+
 * Wed Apr 19 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.7-4
 - Add Requires on pm-utils >= 0.10-1 (#185134, Andrew Overholt)
 



From fedora-cvs-commits at redhat.com  Mon Apr 24 16:08:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 12:08:45 -0400
Subject: rpms/ghostscript/devel espgs-str1570.patch, NONE,
	1.1 ghostscript.spec, 1.109, 1.110
Message-ID: <200604241608.k3OG8jSs024449@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24411

Modified Files:
	ghostscript.spec 
Added Files:
	espgs-str1570.patch 
Log Message:
* Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com>
- Fix emacs interaction (bug #189321, STR #1570).


espgs-str1570.patch:
 0 files changed

--- NEW FILE espgs-str1570.patch ---
--- lib/gs_setpd.ps	(revision 134)
+++ lib/gs_setpd.ps	(revision 135)
@@ -242,6 +242,7 @@
   /PageCount dup
   /Colors dup
   /BitsPerPixel dup
+  /ManualFeed dup
   /ColorValues dup
 .dicttomark readonly def
 /.makecurrentpagedevice {	% - .makecurrentpagedevice <dict>


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- ghostscript.spec	10 Apr 2006 10:39:03 -0000	1.109
+++ ghostscript.spec	24 Apr 2006 16:08:42 -0000	1.110
@@ -28,6 +28,7 @@
 Patch10: ghostscript-big-cmap-post.patch
 Patch11: ghostscript-krgb.patch
 Patch12: espgs-pdfwrite.patch
+Patch13: espgs-str1570.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: libjpeg-devel, libXt-devel
@@ -114,6 +115,9 @@
 # Fix pdfwrite (bug #187834).
 %patch12 -p1 -b .pdfwrite
 
+# Fix emacs interaction (bug #189321, STR #1570).
+%patch13 -p0 -b .str1570
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -273,6 +277,9 @@
 %{_libdir}/libijs.*a
 
 %changelog
+* Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com>
+- Fix emacs interaction (bug #189321, STR #1570).
+
 * Mon Apr 10 2006 Tim Waugh <twaugh at redhat.com> 8.15.1-9
 - Add %%{_datadir}/fonts/japanese to font path (bug #188448).
 - Spec file cleanups (bug #188066).



From fedora-cvs-commits at redhat.com  Mon Apr 24 16:09:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 12:09:24 -0400
Subject: rpms/ghostscript/devel ghostscript.spec,1.110,1.111
Message-ID: <200604241609.k3OG9OWI024575@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24531

Modified Files:
	ghostscript.spec 
Log Message:
8.15.1-10


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- ghostscript.spec	24 Apr 2006 16:08:42 -0000	1.110
+++ ghostscript.spec	24 Apr 2006 16:09:21 -0000	1.111
@@ -5,7 +5,7 @@
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 9
+Release: 10
 
 License: GPL
 URL: http://www.cups.org/espgs/
@@ -277,7 +277,7 @@
 %{_libdir}/libijs.*a
 
 %changelog
-* Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com>
+* Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com> 8.15.1-10
 - Fix emacs interaction (bug #189321, STR #1570).
 
 * Mon Apr 10 2006 Tim Waugh <twaugh at redhat.com> 8.15.1-9



From fedora-cvs-commits at redhat.com  Mon Apr 24 16:33:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 12:33:31 -0400
Subject: rpms/ghostscript/FC-5 espgs-str1570.patch, NONE,
	1.1 ghostscript.spec, 1.105, 1.106
Message-ID: <200604241633.k3OGXVpp012834@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/ghostscript/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv12795

Modified Files:
	ghostscript.spec 
Added Files:
	espgs-str1570.patch 
Log Message:
* Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com>
- Fix emacs interaction (bug #189321, STR #1570).


espgs-str1570.patch:
 0 files changed

--- NEW FILE espgs-str1570.patch ---
--- lib/gs_setpd.ps	(revision 134)
+++ lib/gs_setpd.ps	(revision 135)
@@ -242,6 +242,7 @@
   /PageCount dup
   /Colors dup
   /BitsPerPixel dup
+  /ManualFeed dup
   /ColorValues dup
 .dicttomark readonly def
 /.makecurrentpagedevice {	% - .makecurrentpagedevice <dict>


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/FC-5/ghostscript.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- ghostscript.spec	10 Apr 2006 10:40:57 -0000	1.105
+++ ghostscript.spec	24 Apr 2006 16:33:12 -0000	1.106
@@ -28,6 +28,7 @@
 Patch10: ghostscript-big-cmap-post.patch
 Patch11: ghostscript-krgb.patch
 Patch12: espgs-pdfwrite.patch
+Patch13: espgs-str1570.patch
 
 Requires: zlib, libpng, glib2
 Requires: urw-fonts >= 1.1, ghostscript-fonts
@@ -114,6 +115,9 @@
 # Fix pdfwrite (bug #187834).
 %patch12 -p1 -b .pdfwrite
 
+# Fix emacs interaction (bug #189321, STR #1570).
+%patch13 -p0 -b .str1570
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -290,6 +294,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com>
+- Fix emacs interaction (bug #189321, STR #1570).
+
 * Mon Apr 10 2006 Tim Waugh <twaugh at redhat.com> 8.15.1-7.2
 - Add %%{_datadir}/fonts/japanese to font path (bug #188448).
 



From fedora-cvs-commits at redhat.com  Mon Apr 24 16:49:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 12:49:08 -0400
Subject: rpms/cups/devel .cvsignore, 1.17, 1.18 cups.spec, 1.167,
	1.168 sources, 1.18, 1.19 cups-rc2-5446.patch, 1.1, NONE
Message-ID: <200604241649.k3OGn8W9030316@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30261

Modified Files:
	.cvsignore cups.spec sources 
Removed Files:
	cups-rc2-5446.patch 
Log Message:
* Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.5.rc3.1
- 1.2rc3.
- Ship an snmp.conf.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	7 Apr 2006 21:52:23 -0000	1.17
+++ .cvsignore	24 Apr 2006 16:49:05 -0000	1.18
@@ -8,3 +8,4 @@
 cups-1.1.23-source.tar.bz2
 cups-1.2rc1-source.tar.bz2
 cups-1.2rc2-source.tar.bz2
+cups-1.2rc3-source.tar.bz2


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- cups.spec	24 Apr 2006 12:07:28 -0000	1.167
+++ cups.spec	24 Apr 2006 16:49:05 -0000	1.168
@@ -1,13 +1,13 @@
 %define initdir /etc/rc.d/init.d
 %define use_alternatives 1
 %define build_as_pie 1
-%define beta rc2
+%define beta rc3
 %define cups_serverbin %{_exec_prefix}/lib/cups
 
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2
-Release: 0.4.%{beta}.2
+Release: 0.5.%{beta}.1
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
@@ -22,7 +22,6 @@
 Source11: cups.conf
 Source12: cups.cron
 Source13: pdftops.conf
-Patch0: cups-rc2-5446.patch
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
@@ -110,7 +109,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{beta}
-%patch0 -p0 -b .rc2-5446
 %patch1 -p1 -b .noinit
 %patch2 -p1 -b .no-gzip-man
 %patch3 -p1 -b .system-auth
@@ -321,6 +319,7 @@
 %{_docdir}/cups-%{version}/ja
 %{_docdir}/cups-%{version}/es
 %{_docdir}/cups-%{version}/sv
+%{_docdir}/cups-%{version}/pl
 %{_docdir}/cups-%{version}/*.css
 %{_docdir}/cups-%{version}/admin
 %{_docdir}/cups-%{version}/classes
@@ -385,7 +384,8 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com>
+* Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.5.rc3.1
+- 1.2rc3.
 - Ship an snmp.conf.
 
 * Fri Apr 21 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.4.rc2.2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	7 Apr 2006 21:52:23 -0000	1.18
+++ sources	24 Apr 2006 16:49:05 -0000	1.19
@@ -1,2 +1,3 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
 a16f213bfa43e85c6076d6e0d9f6db3e  cups-1.2rc2-source.tar.bz2
+730b77b994d1be29e5bf1f884424e9ae  cups-1.2rc3-source.tar.bz2


--- cups-rc2-5446.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 24 16:53:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 12:53:43 -0400
Subject: rpms/cups/FC-5 .cvsignore, 1.15, 1.16 cups.spec, 1.158,
	1.159 sources, 1.17, 1.18 cups-rc2-5446.patch, 1.1, NONE
Message-ID: <200604241653.k3OGrh0x009406@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9391

Modified Files:
	.cvsignore cups.spec sources 
Removed Files:
	cups-rc2-5446.patch 
Log Message:
* Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.3.3.rc3.1
- 1.2rc3.
- Ship an snmp.conf.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	4 Jan 2005 12:24:50 -0000	1.15
+++ .cvsignore	24 Apr 2006 16:53:41 -0000	1.16
@@ -6,3 +6,4 @@
 cups-1.1.22-source.tar.bz2
 cups-1.1.23rc1-source.tar.bz2
 cups-1.1.23-source.tar.bz2
+cups-1.2rc3-source.tar.bz2


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- cups.spec	24 Apr 2006 12:41:26 -0000	1.158
+++ cups.spec	24 Apr 2006 16:53:41 -0000	1.159
@@ -1,13 +1,13 @@
 %define initdir /etc/rc.d/init.d
 %define use_alternatives 1
 %define build_as_pie 1
-%define beta rc2
+%define beta rc3
 %define cups_serverbin %{_exec_prefix}/lib/cups
 
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2
-Release: 0.3.%{beta}.2
+Release: 0.3.3.%{beta}.1
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
@@ -22,7 +22,6 @@
 Source11: cups.conf
 Source12: cups.cron
 Source13: pdftops.conf
-Patch0: cups-rc2-5446.patch
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
@@ -115,7 +114,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{beta}
-%patch0 -p0 -b .rc2-5446
 %patch1 -p1 -b .noinit
 %patch2 -p1 -b .no-gzip-man
 %patch3 -p1 -b .system-auth
@@ -390,7 +388,8 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com>
+* Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.3.3.rc3.1
+- 1.2rc3.
 - Ship an snmp.conf.
 
 * Fri Apr 21 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.3.rc2.2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	7 Apr 2006 22:03:12 -0000	1.17
+++ sources	24 Apr 2006 16:53:41 -0000	1.18
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-a16f213bfa43e85c6076d6e0d9f6db3e  cups-1.2rc2-source.tar.bz2
+730b77b994d1be29e5bf1f884424e9ae  cups-1.2rc3-source.tar.bz2


--- cups-rc2-5446.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 24 16:58:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 12:58:39 -0400
Subject: rpms/cups/FC-5 cups.spec,1.159,1.160
Message-ID: <200604241658.k3OGwd4R009492@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9479

Modified Files:
	cups.spec 
Log Message:
Try different n-v-r


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- cups.spec	24 Apr 2006 16:53:41 -0000	1.159
+++ cups.spec	24 Apr 2006 16:58:36 -0000	1.160
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2
-Release: 0.3.3.%{beta}.1
+Release: 0.3.4.%{beta}.1
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
@@ -388,7 +388,7 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.3.3.rc3.1
+* Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.3.4.rc3.1
 - 1.2rc3.
 - Ship an snmp.conf.
 



From fedora-cvs-commits at redhat.com  Mon Apr 24 17:00:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 13:00:41 -0400
Subject: rpms/cups/FC-5 cups.spec,1.160,1.161
Message-ID: <200604241700.k3OH0fYV009610@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9595

Modified Files:
	cups.spec 
Log Message:
Try different n-v-r


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- cups.spec	24 Apr 2006 16:58:36 -0000	1.160
+++ cups.spec	24 Apr 2006 17:00:37 -0000	1.161
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2
-Release: 0.3.4.%{beta}.1
+Release: 0.4.1.%{beta}.1
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
@@ -388,7 +388,7 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.3.4.rc3.1
+* Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.4.1.rc3.1
 - 1.2rc3.
 - Ship an snmp.conf.
 



From fedora-cvs-commits at redhat.com  Mon Apr 24 17:09:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 13:09:28 -0400
Subject: rpms/cups/FC-5 cups.spec,1.161,1.162
Message-ID: <200604241709.k3OH9SQe009755@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9741

Modified Files:
	cups.spec 
Log Message:
Include Polish translation.


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- cups.spec	24 Apr 2006 17:00:37 -0000	1.161
+++ cups.spec	24 Apr 2006 17:09:26 -0000	1.162
@@ -324,6 +324,7 @@
 %{_docdir}/cups-%{version}/ja
 %{_docdir}/cups-%{version}/es
 %{_docdir}/cups-%{version}/sv
+%{_docdir}/cups-%{version}/pl
 %{_docdir}/cups-%{version}/*.css
 %{_docdir}/cups-%{version}/admin
 %{_docdir}/cups-%{version}/classes



From fedora-cvs-commits at redhat.com  Mon Apr 24 18:35:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 14:35:33 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.0.99.901-render-x4a4-crash.patch, NONE,
	1.1 xorg-x11-server.spec, 1.56, 1.57
Message-ID: <200604241835.k3OIZX5n018852@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18783

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.0.99.901-render-x4a4-crash.patch 
Log Message:
- Backport a Render crash fix from HEAD.


xorg-x11-server-1.0.99.901-render-x4a4-crash.patch:
 fb/fbcompose.c   |   25 ++++++++++++++++++++++++-
 render/picture.c |    8 ++++++--
 render/picture.h |    9 +++++++++
 3 files changed, 39 insertions(+), 3 deletions(-)

--- NEW FILE xorg-x11-server-1.0.99.901-render-x4a4-crash.patch ---
--- ./render/picture.c.render-x4a4-crash	2006-03-08 01:19:37.000000000 -0500
+++ ./render/picture.c	2006-04-24 13:43:57.000000000 -0400
@@ -234,10 +234,14 @@
     formats[nformats].format = PICT_a1;
     formats[nformats].depth = 1;
     nformats++;
-    formats[nformats].format = PICT_a8;
+    formats[nformats].format = PICT_FORMAT(BitsPerPixel(8),
+					   PICT_TYPE_A,
+					   8, 0, 0, 0);
     formats[nformats].depth = 8;
     nformats++;
-    formats[nformats].format = PICT_a4;
+    formats[nformats].format = PICT_FORMAT(BitsPerPixel(4),
+					   PICT_TYPE_A,
+					   4, 0, 0, 0);
     formats[nformats].depth = 4;
     nformats++;
     formats[nformats].format = PICT_a8r8g8b8;
--- ./render/picture.h.render-x4a4-crash	2005-08-24 07:18:33.000000000 -0400
+++ ./render/picture.h	2006-04-24 13:43:57.000000000 -0400
@@ -100,6 +100,15 @@
 #define PICT_c8		PICT_FORMAT(8,PICT_TYPE_COLOR,0,0,0,0)
 #define PICT_g8		PICT_FORMAT(8,PICT_TYPE_GRAY,0,0,0,0)
 
+#define PICT_x4a4	PICT_FORMAT(8,PICT_TYPE_A,4,0,0,0)
+#define PICT_x4r1g2b1	PICT_FORMAT(8,PICT_TYPE_ARGB,0,1,2,1)
+#define PICT_x4b1g2r1	PICT_FORMAT(8,PICT_TYPE_ABGR,0,1,2,1)
+#define PICT_x4a1r1g1b1	PICT_FORMAT(8,PICT_TYPE_ARGB,1,1,1,1)
+#define PICT_x4a1b1g1r1	PICT_FORMAT(8,PICT_TYPE_ABGR,1,1,1,1)
+				    
+#define PICT_x4c4	PICT_FORMAT(8,PICT_TYPE_COLOR,0,0,0,0)
+#define PICT_x4g4	PICT_FORMAT(8,PICT_TYPE_GRAY,0,0,0,0)
+
 /* 4bpp formats */
 #define PICT_a4		PICT_FORMAT(4,PICT_TYPE_A,4,0,0,0)
 #define PICT_r1g2b1	PICT_FORMAT(4,PICT_TYPE_ARGB,0,1,2,1)
--- ./fb/fbcompose.c.render-x4a4-crash	2006-02-10 17:00:21.000000000 -0500
+++ ./fb/fbcompose.c	2006-04-24 13:43:57.000000000 -0400
@@ -385,6 +385,17 @@
     }
 }
 
+static FASTCALL void
+fbFetch_x4a4 (const FbBits *bits, int x, int width, CARD32 *buffer, miIndexedPtr indexed)
+{
+    const CARD8 *pixel = (const CARD8 *)bits + x;
+    const CARD8 *end = pixel + width;
+    while (pixel < end) {
+	CARD8 p = (*pixel++) & 0xf;
+        *buffer++ = (p | (p << 4)) << 24;
+    }
+}
+
 #define Fetch8(l,o)    (((CARD8 *) (l))[(o) >> 2])
 #if IMAGE_BYTE_ORDER == MSBFirst
 #define Fetch4(l,o)    ((o) & 2 ? Fetch8(l,o) & 0xf : Fetch8(l,o) >> 4)
@@ -548,7 +559,8 @@
     case PICT_a2b2g2r2: return fbFetch_a2b2g2r2;
     case PICT_c8: return  fbFetch_c8;
     case PICT_g8: return  fbFetch_c8;
-
+    case PICT_x4a4: return fbFetch_x4a4;
+    
         /* 4bpp formats */
     case PICT_a4: return  fbFetch_a4;
     case PICT_r1g2b1: return fbFetch_r1g2b1;
@@ -1261,6 +1273,16 @@
     }
 }
 
+static FASTCALL void
+fbStore_x4a4 (FbBits *bits, const CARD32 *values, int x, int width, miIndexedPtr indexed)
+{
+    int i;
+    CARD8   *pixel = ((CARD8 *) bits) + x;
+    for (i = 0; i < width; ++i) {
+        *pixel++ = values[i] >> 28;
+    }
+}
+
 #define Store8(l,o,v)  (((CARD8 *) l)[(o) >> 3] = (v))
 #if IMAGE_BYTE_ORDER == MSBFirst
 #define Store4(l,o,v)  Store8(l,o,((o) & 4 ? \
@@ -1412,6 +1434,7 @@
     case PICT_a2r2g2b2: return fbStore_a2r2g2b2;
     case PICT_c8: return  fbStore_c8;
     case PICT_g8: return  fbStore_c8;
+    case PICT_x4a4: return fbStore_x4a4;
 
         /* 4bpp formats */
     case PICT_a4: return  fbStore_a4;


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- xorg-x11-server.spec	14 Apr 2006 03:21:31 -0000	1.56
+++ xorg-x11-server.spec	24 Apr 2006 18:34:51 -0000	1.57
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.0.99.901
-Release:   5
+Release:   6
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -23,8 +23,11 @@
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=181292.  hacky patch
 Patch7:    xorg-x11-server-1.0.1-fpic-libxf86config.patch
 
-# REMOVE ME FOR 1.0.99.902
+# REMOVE ME: backports from branch tip, remove on next snapshot
+# TODO: After .902, start these at Patch50
 Patch8:	   xorg-x11-server-1.0.99.901-cow-fix.patch
+Patch9:    xorg-x11-server-1.0.99.901-render-x4a4-crash.patch
+# END REMOVE ME
 
 # Spiffiffity feature/optimization patches.
 Patch100:  xorg-server-1.0.99.2-spiffiffity.patch
@@ -259,7 +262,11 @@
 %patch4 -p0 -b .composite-fastpath-fdo4320
 %patch6 -p1 -b .randrsdk
 %patch7 -p1 -b .xf86configfpic
+
+# REMOVE ME
 %patch8 -p0 -b .cow-fix
+%patch9 -p0 -b .render-x4a4-crash
+# END REMOVE ME
 
 %patch100 -p0 -b .spiffiffity
 
@@ -566,6 +573,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Apr 24 2006 Adam Jackson <ajackson at redhat.com> 1.0.99.901-6
+- Backport a Render crash fix from HEAD.
+
 * Thu Apr 13 2006 Kristian H??gsberg <krh at redhat.com> 1.0.99.901-5
 - Update spiffiffity patch to only suppress move damage events for
   manually redirected windows.



From fedora-cvs-commits at redhat.com  Mon Apr 24 19:04:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 15:04:20 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2153,1.2154
Message-ID: <200604241904.k3OJ4KLj008150@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8104

Modified Files:
	kernel-2.6.spec 
Log Message:
s390 came back



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2153
retrieving revision 1.2154
diff -u -r1.2153 -r1.2154
--- kernel-2.6.spec	24 Apr 2006 03:10:57 -0000	1.2153
+++ kernel-2.6.spec	24 Apr 2006 19:04:04 -0000	1.2154
@@ -157,8 +157,7 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0



From fedora-cvs-commits at redhat.com  Mon Apr 24 19:10:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 15:10:44 -0400
Subject: rpms/xorg-x11-server/FC-5
	xorg-x11-server-1.0.99.901-render-x4a4-crash.patch, NONE,
	1.1 xorg-x11-server.spec, 1.47, 1.48
Message-ID: <200604241910.k3OJAia3008423@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8364

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.0.99.901-render-x4a4-crash.patch 
Log Message:
- Backport a Render crash fix from HEAD


xorg-x11-server-1.0.99.901-render-x4a4-crash.patch:
 fb/fbcompose.c   |   25 ++++++++++++++++++++++++-
 render/picture.c |    8 ++++++--
 render/picture.h |    9 +++++++++
 3 files changed, 39 insertions(+), 3 deletions(-)

--- NEW FILE xorg-x11-server-1.0.99.901-render-x4a4-crash.patch ---
--- ./render/picture.c.render-x4a4-crash	2006-03-08 01:19:37.000000000 -0500
+++ ./render/picture.c	2006-04-24 13:43:57.000000000 -0400
@@ -234,10 +234,14 @@
     formats[nformats].format = PICT_a1;
     formats[nformats].depth = 1;
     nformats++;
-    formats[nformats].format = PICT_a8;
+    formats[nformats].format = PICT_FORMAT(BitsPerPixel(8),
+					   PICT_TYPE_A,
+					   8, 0, 0, 0);
     formats[nformats].depth = 8;
     nformats++;
-    formats[nformats].format = PICT_a4;
+    formats[nformats].format = PICT_FORMAT(BitsPerPixel(4),
+					   PICT_TYPE_A,
+					   4, 0, 0, 0);
     formats[nformats].depth = 4;
     nformats++;
     formats[nformats].format = PICT_a8r8g8b8;
--- ./render/picture.h.render-x4a4-crash	2005-08-24 07:18:33.000000000 -0400
+++ ./render/picture.h	2006-04-24 13:43:57.000000000 -0400
@@ -100,6 +100,15 @@
 #define PICT_c8		PICT_FORMAT(8,PICT_TYPE_COLOR,0,0,0,0)
 #define PICT_g8		PICT_FORMAT(8,PICT_TYPE_GRAY,0,0,0,0)
 
+#define PICT_x4a4	PICT_FORMAT(8,PICT_TYPE_A,4,0,0,0)
+#define PICT_x4r1g2b1	PICT_FORMAT(8,PICT_TYPE_ARGB,0,1,2,1)
+#define PICT_x4b1g2r1	PICT_FORMAT(8,PICT_TYPE_ABGR,0,1,2,1)
+#define PICT_x4a1r1g1b1	PICT_FORMAT(8,PICT_TYPE_ARGB,1,1,1,1)
+#define PICT_x4a1b1g1r1	PICT_FORMAT(8,PICT_TYPE_ABGR,1,1,1,1)
+				    
+#define PICT_x4c4	PICT_FORMAT(8,PICT_TYPE_COLOR,0,0,0,0)
+#define PICT_x4g4	PICT_FORMAT(8,PICT_TYPE_GRAY,0,0,0,0)
+
 /* 4bpp formats */
 #define PICT_a4		PICT_FORMAT(4,PICT_TYPE_A,4,0,0,0)
 #define PICT_r1g2b1	PICT_FORMAT(4,PICT_TYPE_ARGB,0,1,2,1)
--- ./fb/fbcompose.c.render-x4a4-crash	2006-02-10 17:00:21.000000000 -0500
+++ ./fb/fbcompose.c	2006-04-24 13:43:57.000000000 -0400
@@ -385,6 +385,17 @@
     }
 }
 
+static FASTCALL void
+fbFetch_x4a4 (const FbBits *bits, int x, int width, CARD32 *buffer, miIndexedPtr indexed)
+{
+    const CARD8 *pixel = (const CARD8 *)bits + x;
+    const CARD8 *end = pixel + width;
+    while (pixel < end) {
+	CARD8 p = (*pixel++) & 0xf;
+        *buffer++ = (p | (p << 4)) << 24;
+    }
+}
+
 #define Fetch8(l,o)    (((CARD8 *) (l))[(o) >> 2])
 #if IMAGE_BYTE_ORDER == MSBFirst
 #define Fetch4(l,o)    ((o) & 2 ? Fetch8(l,o) & 0xf : Fetch8(l,o) >> 4)
@@ -548,7 +559,8 @@
     case PICT_a2b2g2r2: return fbFetch_a2b2g2r2;
     case PICT_c8: return  fbFetch_c8;
     case PICT_g8: return  fbFetch_c8;
-
+    case PICT_x4a4: return fbFetch_x4a4;
+    
         /* 4bpp formats */
     case PICT_a4: return  fbFetch_a4;
     case PICT_r1g2b1: return fbFetch_r1g2b1;
@@ -1261,6 +1273,16 @@
     }
 }
 
+static FASTCALL void
+fbStore_x4a4 (FbBits *bits, const CARD32 *values, int x, int width, miIndexedPtr indexed)
+{
+    int i;
+    CARD8   *pixel = ((CARD8 *) bits) + x;
+    for (i = 0; i < width; ++i) {
+        *pixel++ = values[i] >> 28;
+    }
+}
+
 #define Store8(l,o,v)  (((CARD8 *) l)[(o) >> 3] = (v))
 #if IMAGE_BYTE_ORDER == MSBFirst
 #define Store4(l,o,v)  Store8(l,o,((o) & 4 ? \
@@ -1412,6 +1434,7 @@
     case PICT_a2r2g2b2: return fbStore_a2r2g2b2;
     case PICT_c8: return  fbStore_c8;
     case PICT_g8: return  fbStore_c8;
+    case PICT_x4a4: return fbStore_x4a4;
 
         /* 4bpp formats */
     case PICT_a4: return  fbStore_a4;


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/FC-5/xorg-x11-server.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- xorg-x11-server.spec	9 Apr 2006 16:26:07 -0000	1.47
+++ xorg-x11-server.spec	24 Apr 2006 19:10:21 -0000	1.48
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.0.1
-Release:   9.fc5
+Release:   9.fc5.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -33,6 +33,7 @@
 # Patches taken from xserver/xorg CVS HEAD, post-1.0.1
 Patch100:  xorg-x11-server-1.0.1-fbpict-fix-rounding.patch
 Patch101:  xorg-x11-server-1.0.1-SEGV-on-null-interface.patch
+Patch102:  xorg-x11-server-1.0.99.901-render-x4a4-crash.patch
 
 Patch1000:  xorg-redhat-die-ugly-pattern-die-die-die.patch
 Patch1001:  xorg-x11-server-1.0.1-Red-Hat-extramodes.patch
@@ -252,6 +253,7 @@
 
 %patch100 -p2 -b .fbpict-fix-rounding
 %patch101 -p2 -b .SEGV-on-null-interface
+%patch102 -p0 -b .render-x4a4-crash
 
 %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
 %patch1001 -p1 -b .Red-Hat-extramodes
@@ -528,6 +530,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Apr 24 2006 Adam Jackson <ajackson at redhat.com> - 1.0.1-9.fc5.1
+- Backport a Render crash fix from HEAD
+
 * Sun Apr  9 2006 Ray Strode <rstrode at redhat.com> - 1.0.1-9.fc5
 - Fix small overflow that causes crash on vt switch on ppc.
   Patch by David Woodhouse (bug 187083).



From fedora-cvs-commits at redhat.com  Mon Apr 24 20:53:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 16:53:17 -0400
Subject: rpms/tar/devel tar-1.15.90.tar.gz.sig, NONE, 1.1 .cvsignore, 1.7,
	1.8 sources, 1.8, 1.9 tar.spec, 1.35,
	1.36 tar-1.15.1-gcc4.patch, 1.1,
	NONE tar-1.15.1-heapOverflow.patch, 1.1,
	NONE tar-1.15.1-hugeSparse.patch, 1.2,
	NONE tar-1.15.1-lseek.patch, 1.1,
	NONE tar-1.15.1-makeCheck.patch, 1.2,
	NONE tar-1.15.1-newerOption.patch, 1.1,
	NONE tar-1.15.1-optionsOrder.patch, 1.1,
	NONE tar-1.15.1-padCorrectly.patch, 1.1,
	NONE tar-1.15.1-sparseTotals.patch, 1.1,
	NONE tar-1.15.1.tar.gz.sig, 1.1, NONE
Message-ID: <200604242053.k3OKrHWq010344@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/tar/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10245

Modified Files:
	.cvsignore sources tar.spec 
Added Files:
	tar-1.15.90.tar.gz.sig 
Removed Files:
	tar-1.15.1-gcc4.patch tar-1.15.1-heapOverflow.patch 
	tar-1.15.1-hugeSparse.patch tar-1.15.1-lseek.patch 
	tar-1.15.1-makeCheck.patch tar-1.15.1-newerOption.patch 
	tar-1.15.1-optionsOrder.patch tar-1.15.1-padCorrectly.patch 
	tar-1.15.1-sparseTotals.patch tar-1.15.1.tar.gz.sig 
Log Message:
upgrade



--- NEW FILE tar-1.15.90.tar.gz.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tar/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Jan 2005 11:03:00 -0000	1.7
+++ .cvsignore	24 Apr 2006 20:53:15 -0000	1.8
@@ -1 +1 @@
-tar-1.15.1.tar.gz
+tar-1.15.90.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tar/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Sep 2005 14:54:30 -0000	1.8
+++ sources	24 Apr 2006 20:53:15 -0000	1.9
@@ -1,2 +1,2 @@
-d87021366fe6488e9dc398fcdcb6ed7d  tar-1.15.1.tar.gz
+f7009caa98f15ed4efa2b2f7c4d702e0  tar-1.15.90.tar.gz
 ecf87e839c91a75ea9a84307455c0255  tar.1


Index: tar.spec
===================================================================
RCS file: /cvs/dist/rpms/tar/devel/tar.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- tar.spec	24 Apr 2006 13:37:44 -0000	1.35
+++ tar.spec	24 Apr 2006 20:53:15 -0000	1.36
@@ -1,25 +1,16 @@
 Summary: A GNU file archiving program.
 Name: tar
-Version: 1.15.1
-Release: 16
+Version: 1.15.90
+Release: 1
 License: GPL
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
 Source0: ftp://ftp.gnu.org/pub/gnu/tar/tar-%{version}.tar.gz
 Source1: ftp://ftp.gnu.org/pub/gnu/tar/tar-%{version}.tar.gz.sig
 Source2: tar.1
-Patch6: tar-1.14-nolibrt.patch
-Patch8: tar-1.14-loneZeroWarning.patch
-Patch9: tar-1.15.1-makeCheck.patch
-Patch10: tar-1.15.1-gcc4.patch
-Patch11: tar-1.15.1-lseek.patch
-Patch12: tar-1.15.1-sparseTotals.patch
-Patch13: tar-1.15.1-newerOption.patch
-Patch14: tar-1.15.1-padCorrectly.patch
-Patch15: tar-1.15.1-vfatTruncate.patch
-Patch16: tar-1.15.1-heapOverflow.patch
-Patch17: tar-1.15.1-hugeSparse.patch
-Patch18: tar-1.15.1-optionsOrder.patch
+Patch1: tar-1.14-nolibrt.patch
+Patch2: tar-1.14-loneZeroWarning.patch
+Patch3: tar-1.15.1-vfatTruncate.patch
 
 Prereq: info
 BuildRequires: autoconf automake gzip
@@ -39,18 +30,9 @@
 
 %prep
 %setup -q
-%patch6 -p1 -b .nolibrt
-%patch8 -p1 -b .loneZeroWarning
-%patch9 -p1 -b .makeCheck
-%patch10 -p1 -b .gcc4
-%patch11 -p1 -b .lseek
-%patch12 -p1 -b .sparseTotals
-%patch13 -p1 -b .newerOption
-%patch14 -p1 -b .padCorrectly
-%patch15 -p1 -b .vfatTruncate
-%patch16 -p0 -b .heapOverflow
-%patch17 -p1 -b .hugeSparse
-%patch18 -p1 -b .optionsOrder
+#%patch1 -p1 -b .nolibrt
+%patch2 -p1 -b .loneZeroWarning
+%patch3 -p1 -b .vfatTruncate
 
 %build
 
@@ -121,6 +103,9 @@
 %{_infodir}/tar.info*
 
 %changelog
+* Tue Apr 25 2006 Peter Vrabec <pvrabec at redhat.com> 1.15.90-1
+- upgrade
+
 * Mon Apr 24 2006 Peter Vrabec <pvrabec at redhat.com> 1.15.1-16
 - fix problem when options at the end of command line were 
   not recognized (#188707)


--- tar-1.15.1-gcc4.patch DELETED ---


--- tar-1.15.1-heapOverflow.patch DELETED ---


--- tar-1.15.1-hugeSparse.patch DELETED ---


--- tar-1.15.1-lseek.patch DELETED ---


--- tar-1.15.1-makeCheck.patch DELETED ---


--- tar-1.15.1-newerOption.patch DELETED ---


--- tar-1.15.1-optionsOrder.patch DELETED ---


--- tar-1.15.1-padCorrectly.patch DELETED ---


--- tar-1.15.1-sparseTotals.patch DELETED ---


--- tar-1.15.1.tar.gz.sig DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 24 21:22:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 17:22:06 -0400
Subject: rpms/kernel/FC-5 patch-2.6.16.11.bz2.sign, NONE, 1.1 .cvsignore,
	1.390, 1.391 kernel-2.6.spec, 1.2097, 1.2098 sources, 1.331,
	1.332 upstream, 1.304, 1.305 patch-2.6.16.9.bz2.sign, 1.1, NONE
Message-ID: <200604242122.k3OLM6B0031177@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv30995

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16.11.bz2.sign 
Removed Files:
	patch-2.6.16.9.bz2.sign 
Log Message:
.11



--- NEW FILE patch-2.6.16.11.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBETTUQyGugalF9Dw4RAr2/AJ0WJpJJ0X0J32G1b2pct7DCG/oaowCcDeYG
jkZKlZPnETAdH1pRTEHMFoE=
=qfzP
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -r1.390 -r1.391
--- .cvsignore	19 Apr 2006 09:04:06 -0000	1.390
+++ .cvsignore	24 Apr 2006 21:22:03 -0000	1.391
@@ -3,4 +3,4 @@
 kernel-2.6.16
 xen-20060301.tar.bz2
 linux-2.6.16.tar.bz2
-patch-2.6.16.9.bz2
+patch-2.6.16.11.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2097
retrieving revision 1.2098
diff -u -r1.2097 -r1.2098
--- kernel-2.6.spec	20 Apr 2006 03:10:42 -0000	1.2097
+++ kernel-2.6.spec	24 Apr 2006 21:22:03 -0000	1.2098
@@ -214,7 +214,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16.9.bz2
+Patch1: patch-2.6.16.11.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1691,6 +1691,9 @@
 %endif
 
 %changelog
+* Mon Apr 24 2006 Dave Jones <davej at redhat.com>
+- 2.6.16.11
+
 * Wed Apr 19 2006 Dave Jones <davej at redhat.com>
 - Enable PCI MSI.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -r1.331 -r1.332
--- sources	19 Apr 2006 09:04:07 -0000	1.331
+++ sources	24 Apr 2006 21:22:03 -0000	1.332
@@ -1,3 +1,3 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 cdfde609af8adcf58d7ff626599b2d90  xen-20060301.tar.bz2
-2424bb387b97c5f6950379173cddc05f  patch-2.6.16.9.bz2
+1d136b87d4e3ca239a55bcd72b78dae9  patch-2.6.16.11.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -r1.304 -r1.305
--- upstream	19 Apr 2006 09:04:07 -0000	1.304
+++ upstream	24 Apr 2006 21:22:03 -0000	1.305
@@ -1,2 +1,2 @@
 linux-2.6.16.tar.bz2
-patch-2.6.16.9.bz2
+patch-2.6.16.11.bz2


--- patch-2.6.16.9.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 24 21:28:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 17:28:32 -0400
Subject: rpms/kernel/devel/configs config-rhel-generic,1.4,1.5
Message-ID: <200604242128.k3OLSW5N001100@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv1059/configs

Modified Files:
	config-rhel-generic 
Log Message:
drop decnet/raw



Index: config-rhel-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-rhel-generic,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-rhel-generic	17 Nov 2005 22:48:01 -0000	1.4
+++ config-rhel-generic	24 Apr 2006 21:28:30 -0000	1.5
@@ -192,4 +192,5 @@
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_I2C_PCA_ISA is not set
-CONFIG_RAW_DRIVER=y
+# CONFIG_DECNET is not set
+



From fedora-cvs-commits at redhat.com  Mon Apr 24 21:38:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 17:38:03 -0400
Subject: rpms/kernel/FC-4 patch-2.6.16.11.bz2.sign, NONE, 1.1 .cvsignore,
	1.182, 1.183 kernel-2.6.spec, 1.1626, 1.1627 sources, 1.166,
	1.167 upstream, 1.107, 1.108 patch-2.6.16.9.bz2.sign, 1.1, NONE
Message-ID: <200604242138.k3OLc3xI002863@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv2791

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16.11.bz2.sign 
Removed Files:
	patch-2.6.16.9.bz2.sign 
Log Message:
.11



--- NEW FILE patch-2.6.16.11.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBETTUQyGugalF9Dw4RAr2/AJ0WJpJJ0X0J32G1b2pct7DCG/oaowCcDeYG
jkZKlZPnETAdH1pRTEHMFoE=
=qfzP
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/.cvsignore,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- .cvsignore	19 Apr 2006 18:55:15 -0000	1.182
+++ .cvsignore	24 Apr 2006 21:37:59 -0000	1.183
@@ -2,4 +2,4 @@
 temp-*
 kernel-2.6.16
 linux-2.6.16.tar.bz2
-patch-2.6.16.9.bz2
+patch-2.6.16.11.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1626
retrieving revision 1.1627
diff -u -r1.1626 -r1.1627
--- kernel-2.6.spec	20 Apr 2006 03:09:12 -0000	1.1626
+++ kernel-2.6.spec	24 Apr 2006 21:37:59 -0000	1.1627
@@ -192,7 +192,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16.9.bz2
+Patch1: patch-2.6.16.11.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1062,6 +1062,9 @@
 %endif
 
 %changelog
+* Mon Apr 24 2006 Dave Jones <davej at redhat.com>
+- 2.6.16.11
+
 * Wed Apr 19 2006 Dave Jones <davej at redhat.com>
 - Enable PCI MSI support.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/sources,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- sources	19 Apr 2006 18:55:16 -0000	1.166
+++ sources	24 Apr 2006 21:38:01 -0000	1.167
@@ -1,2 +1,2 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
-2424bb387b97c5f6950379173cddc05f  patch-2.6.16.9.bz2
+1d136b87d4e3ca239a55bcd72b78dae9  patch-2.6.16.11.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/upstream,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- upstream	19 Apr 2006 18:55:16 -0000	1.107
+++ upstream	24 Apr 2006 21:38:01 -0000	1.108
@@ -1,2 +1,2 @@
 linux-2.6.16.tar.bz2
-patch-2.6.16.9.bz2
+patch-2.6.16.11.bz2


--- patch-2.6.16.9.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 24 21:38:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 17:38:48 -0400
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1627,1.1628
Message-ID: <200604242138.k3OLcmqn002993@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv2927

Modified Files:
	kernel-2.6.spec 
Log Message:
bump






From fedora-cvs-commits at redhat.com  Mon Apr 24 22:13:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 18:13:53 -0400
Subject: rpms/kernel/devel/configs config-i586, 1.10,
	1.11 config-powerpc64-iseries, 1.10, 1.11 config-x86-generic,
	1.50, 1.51
Message-ID: <200604242213.k3OMDrxU024278@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv24212/configs

Modified Files:
	config-i586 config-powerpc64-iseries config-x86-generic 
Log Message:
turn on rocketport



Index: config-i586
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-i586,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- config-i586	20 Apr 2006 03:11:48 -0000	1.10
+++ config-i586	24 Apr 2006 22:13:50 -0000	1.11
@@ -28,7 +28,6 @@
 # CONFIG_ATM is not set
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_GAMEPORT is not set
-# CONFIG_ROCKETPORT is not set
 # CONFIG_SYNCLINK is not set
 # CONFIG_SYNCLINKMP is not set
 # CONFIG_N_HDLC is not set


Index: config-powerpc64-iseries
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64-iseries,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- config-powerpc64-iseries	13 Jan 2006 03:02:22 -0000	1.10
+++ config-powerpc64-iseries	24 Apr 2006 22:13:50 -0000	1.11
@@ -46,7 +46,6 @@
 # CONFIG_ATM_FIRESTREAM is not set
 # CONFIG_SCHED_SMT is not set
 # CONFIG_XMON is not set
-# CONFIG_ROCKETPORT is not set
 # CONFIG_WINDFARM is not set
 CONFIG_LPARCFG=y
 CONFIG_HOTPLUG_PCI=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- config-x86-generic	18 Apr 2006 21:09:21 -0000	1.50
+++ config-x86-generic	24 Apr 2006 22:13:50 -0000	1.51
@@ -89,6 +89,7 @@
 #
 # x86 specific drivers
 #
+CONFIG_ROCKETPORT=m
 CONFIG_SYNCLINK_CS=m
 CONFIG_SYNCLINK=m
 CONFIG_SYNCLINKMP=m



From fedora-cvs-commits at redhat.com  Mon Apr 24 22:24:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 18:24:12 -0400
Subject: rpms/kernel/devel linux-2.6-audit-pending.patch, NONE,
	1.1.2.1 kernel-2.6.spec, 1.2139.2.1, 1.2139.2.2
Message-ID: <200604242224.k3OMOC2h008173@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8015

Modified Files:
      Tag: private-lspp-18-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-lspp-18-branch
	linux-2.6-audit-pending.patch 
Log Message:
Add watches to lspp kernel


linux-2.6-audit-pending.patch:
 fs/Kconfig               |   24 -
 fs/Makefile              |    1 
 fs/exec.c                |    6 
 fs/inotify.c             |  966 ++++++++++++-----------------------------------
 fs/inotify_user.c        |  708 ++++++++++++++++++++++++++++++++++
 include/linux/audit.h    |    7 
 include/linux/fsnotify.h |   29 -
 include/linux/inotify.h  |   85 +++-
 include/linux/sched.h    |    2 
 init/Kconfig             |    3 
 kernel/audit.c           |   27 -
 kernel/audit.h           |   22 -
 kernel/auditfilter.c     |  673 ++++++++++++++++++++++++++++++--
 kernel/auditsc.c         |  116 ++++-
 kernel/sysctl.c          |    4 
 kernel/user.c            |    2 
 16 files changed, 1867 insertions(+), 808 deletions(-)

--- NEW FILE linux-2.6-audit-pending.patch ---
diff --git a/fs/Kconfig b/fs/Kconfig
index 2524629..74b957c 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -393,18 +393,30 @@ config INOTIFY
 	bool "Inotify file change notification support"
 	default y
 	---help---
-	  Say Y here to enable inotify support and the associated system
-	  calls.  Inotify is a file change notification system and a
-	  replacement for dnotify.  Inotify fixes numerous shortcomings in
-	  dnotify and introduces several new features.  It allows monitoring
-	  of both files and directories via a single open fd.  Other features
-	  include multiple file events, one-shot support, and unmount
+	  Say Y here to enable inotify support.  Inotify is a file change
+	  notification system and a replacement for dnotify.  Inotify fixes
+	  numerous shortcomings in dnotify and introduces several new features
+	  including multiple file events, one-shot support, and unmount
 	  notification.
 
 	  For more information, see Documentation/filesystems/inotify.txt
 
 	  If unsure, say Y.
 
+config INOTIFY_USER
+	bool "Inotify support for userspace"
+	depends on INOTIFY
+	default y
+	---help---
+	  Say Y here to enable inotify support for userspace, including the
+	  associated system calls.  Inotify allows monitoring of both files and
+	  directories via a single open fd.  Events are read from the file
+	  descriptor, which is also select()- and poll()-able.
+
+	  For more information, see Documentation/filesystems/inotify.txt
+
+	  If unsure, say Y.
+
 config QUOTA
 	bool "Quota support"
 	help
diff --git a/fs/Makefile b/fs/Makefile
index 83bf478..6d7b4be 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -13,6 +13,7 @@ obj-y :=	open.o read_write.o file_table.
 		ioprio.o pnode.o drop_caches.o splice.o sync.o
 
 obj-$(CONFIG_INOTIFY)		+= inotify.o
+obj-$(CONFIG_INOTIFY_USER)	+= inotify_user.o
 obj-$(CONFIG_EPOLL)		+= eventpoll.o
 obj-$(CONFIG_COMPAT)		+= compat.o compat_ioctl.o
 
diff --git a/fs/exec.c b/fs/exec.c
index 4121bb5..9260a16 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -49,6 +49,7 @@
 #include <linux/rmap.h>
 #include <linux/acct.h>
 #include <linux/cn_proc.h>
+#include <linux/audit.h>
 
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
@@ -1085,6 +1086,11 @@ int search_binary_handler(struct linux_b
 	/* kernel module loader fixup */
 	/* so we don't try to load run modprobe in kernel space. */
 	set_fs(USER_DS);
+
+	retval = audit_bprm(bprm);
+	if (retval)
+		return retval;
+
 	retval = -ENOENT;
 	for (try=0; try<2; try++) {
 		read_lock(&binfmt_lock);
diff --git a/fs/inotify.c b/fs/inotify.c
index 1f50302..a97f861 100644
--- a/fs/inotify.c
+++ b/fs/inotify.c
@@ -20,35 +20,17 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/spinlock.h>
 #include <linux/idr.h>
 #include <linux/slab.h>
 #include <linux/fs.h>
-#include <linux/file.h>
-#include <linux/mount.h>
-#include <linux/namei.h>
-#include <linux/poll.h>
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/writeback.h>
 #include <linux/inotify.h>
-#include <linux/syscalls.h>
-
-#include <asm/ioctls.h>
 
 static atomic_t inotify_cookie;
 
-static kmem_cache_t *watch_cachep __read_mostly;
-static kmem_cache_t *event_cachep __read_mostly;
-
-static struct vfsmount *inotify_mnt __read_mostly;
-
-/* these are configurable via /proc/sys/fs/inotify/ */
-int inotify_max_user_instances __read_mostly;
-int inotify_max_user_watches __read_mostly;
-int inotify_max_queued_events __read_mostly;
-
 /*
  * Lock ordering:
  *
@@ -56,128 +38,62 @@ int inotify_max_queued_events __read_mos
  * iprune_mutex (synchronize shrink_icache_memory())
  * 	inode_lock (protects the super_block->s_inodes list)
  * 	inode->inotify_mutex (protects inode->inotify_watches and watches->i_list)
- * 		inotify_dev->mutex (protects inotify_device and watches->d_list)
+ * 		inotify_handle->mutex (protects inotify_handle and watches->h_list)
+ *
+ * The inode->inotify_mutex and inotify_handle->mutex and held during execution
+ * of a caller's event callback.  Thus, the caller must not hold any locks
+ * taking during callback processing while calling any of the published inotify
+ * routines, i.e.
+ *	inotify_init
+ *	inotify_destroy
+ *	inotify_find_watch
+ *	inotify_find_update_watch
+ *	inotify_add_watch
+ *	inotify_rm_wd
+ *	inotify_rm_watch
  */
 
 /*
- * Lifetimes of the three main data structures--inotify_device, inode, and
+ * Lifetimes of the three main data structures--inotify_handle, inode, and
  * inotify_watch--are managed by reference count.
  *
- * inotify_device: Lifetime is from inotify_init() until release.  Additional
- * references can bump the count via get_inotify_dev() and drop the count via
- * put_inotify_dev().
- *
- * inotify_watch: Lifetime is from create_watch() to destory_watch().
- * Additional references can bump the count via get_inotify_watch() and drop
- * the count via put_inotify_watch().
+ * inotify_handle: Lifetime is from inotify_init() to inotify_destroy().
+ * Additional references can bump the count via get_inotify_handle() and drop
+ * the count via put_inotify_handle().
+ *
+ * inotify_watch: Lifetime is from inotify_add_watch() to
+ * remove_watch_no_event().  Additional references can bump the count via
+ * get_inotify_watch() and drop the count via put_inotify_watch().
  *
  * inode: Pinned so long as the inode is associated with a watch, from
- * create_watch() to put_inotify_watch().
+ * inotify_add_watch() to the final put_inotify_watch().
  */
 
 /*
- * struct inotify_device - represents an inotify instance
+ * struct inotify_handle - represents an inotify instance
  *
  * This structure is protected by the mutex 'mutex'.
  */
-struct inotify_device {
-	wait_queue_head_t 	wq;		/* wait queue for i/o */
+struct inotify_handle {
 	struct idr		idr;		/* idr mapping wd -> watch */
 	struct mutex		mutex;		/* protects this bad boy */
-	struct list_head 	events;		/* list of queued events */
 	struct list_head	watches;	/* list of watches */
 	atomic_t		count;		/* reference count */
-	struct user_struct	*user;		/* user who opened this dev */
-	unsigned int		queue_size;	/* size of the queue (bytes) */
-	unsigned int		event_count;	/* number of pending events */
-	unsigned int		max_events;	/* maximum number of events */
 	u32			last_wd;	/* the last wd allocated */
+	void (*callback)(struct inotify_watch *, u32, u32, u32, const char *,
+			 struct inode *);	/* event callback */
 };
 
-/*
- * struct inotify_kernel_event - An inotify event, originating from a watch and
- * queued for user-space.  A list of these is attached to each instance of the
- * device.  In read(), this list is walked and all events that can fit in the
- * buffer are returned.
- *
- * Protected by dev->mutex of the device in which we are queued.
- */
-struct inotify_kernel_event {
-	struct inotify_event	event;	/* the user-space event */
-	struct list_head        list;	/* entry in inotify_device's list */
-	char			*name;	/* filename, if any */
-};
-
[...3156 lines suppressed...]
 #include <linux/tty.h>
 #include <linux/selinux.h>
+#include <linux/binfmts.h>
 
 #include "audit.h"
 
@@ -110,6 +111,13 @@ struct audit_aux_data_ipcctl {
 	u32			osid;
 };
 
+struct audit_aux_data_execve {
+	struct audit_aux_data	d;
+	int argc;
+	int envc;
+	char mem[0];
+};
+
 struct audit_aux_data_socketcall {
 	struct audit_aux_data	d;
 	int			nargs;
@@ -160,6 +168,27 @@ struct audit_context {
 #endif
 };
 
+/* Determine if any context name data matches a rule's watch data */
+static inline int audit_match_watch(struct audit_context *ctx,
+				    struct audit_watch *watch)
+{
+	int i;
+
+	if (!ctx)
+		return  0;
+
+	if (watch->ino == (unsigned long)-1)
+		return  0;
+
+	for (i = 0; i < ctx->name_count; i++) {
+		if (ctx->names[i].dev == watch->dev &&
+		    (ctx->names[i].ino == watch->ino ||
+		     ctx->names[i].pino == watch->ino))
+			return 1;
+	}
+
+	return 0;
+}
 
 /* Compare a task_struct with an audit_rule.  Return 1 on match, 0
  * otherwise. */
@@ -254,6 +283,9 @@ static int audit_filter_rules(struct tas
 				}
 			}
 			break;
+		case AUDIT_WATCH:
+			result = audit_match_watch(ctx, rule->watch);
+			break;
 		case AUDIT_LOGINUID:
 			result = 0;
 			if (ctx)
@@ -667,6 +699,16 @@ static void audit_log_exit(struct audit_
 				kfree(ctx);
 			}
 			break; }
+		case AUDIT_EXECVE: {
+			struct audit_aux_data_execve *axi = (void *)aux;
+			int i;
+			char *p;
+			for (i = 0, p = axi->mem; i < axi->argc; i++) {
+				audit_log_format(ab, "a%d=", i);
+				p = audit_log_untrustedstring(ab, p);
+				audit_log_format(ab, "\n");
+			}
+			break; }
 
 		case AUDIT_SOCKETCALL: {
 			int i;
@@ -1061,37 +1103,20 @@ void __audit_inode_child(const char *dna
 		return;
 
 	/* determine matching parent */
-	if (dname)
-		for (idx = 0; idx < context->name_count; idx++)
-			if (context->names[idx].pino == pino) {
-				const char *n;
-				const char *name = context->names[idx].name;
-				int dlen = strlen(dname);
-				int nlen = name ? strlen(name) : 0;
-
-				if (nlen < dlen)
-					continue;
-				
-				/* disregard trailing slashes */
-				n = name + nlen - 1;
-				while ((*n == '/') && (n > name))
-					n--;
-
-				/* find last path component */
-				n = n - dlen + 1;
-				if (n < name)
-					continue;
-				else if (n > name) {
-					if (*--n != '/')
-						continue;
-					else
-						n++;
-				}
+	if (!dname)
+		goto no_match;
+	for (idx = 0; idx < context->name_count; idx++)
+		if (context->names[idx].pino == pino) {
+			const char *name = context->names[idx].name;
 
-				if (strncmp(n, dname, dlen) == 0)
-					goto update_context;
-			}
+			if (!name)
+				continue;
 
+			if (audit_compare_dname_path(dname, name) == 0)
+				goto update_context;
+		}
+
+no_match:
 	/* catch-all in case match not found */
 	idx = context->name_count++;
 	context->names[idx].name  = NULL;
@@ -1231,6 +1256,39 @@ int audit_ipc_set_perm(unsigned long qby
 	return 0;
 }
 
+int audit_bprm(struct linux_binprm *bprm)
+{
+	struct audit_aux_data_execve *ax;
+	struct audit_context *context = current->audit_context;
+	unsigned long p, next;
+	void *to;
+
+	if (likely(!audit_enabled || !context))
+		return 0;
+
+	ax = kmalloc(sizeof(*ax) + PAGE_SIZE * MAX_ARG_PAGES - bprm->p,
+				GFP_KERNEL);
+	if (!ax)
+		return -ENOMEM;
+
+	ax->argc = bprm->argc;
+	ax->envc = bprm->envc;
+	for (p = bprm->p, to = ax->mem; p < MAX_ARG_PAGES*PAGE_SIZE; p = next) {
+		struct page *page = bprm->page[p / PAGE_SIZE];
+		void *kaddr = kmap(page);
+		next = (p + PAGE_SIZE) & ~(PAGE_SIZE - 1);
+		memcpy(to, kaddr + (p & (PAGE_SIZE - 1)), next - p);
+		to += next - p;
+		kunmap(page);
+	}
+
+	ax->d.type = AUDIT_EXECVE;
+	ax->d.next = context->aux;
+	context->aux = (void *)ax;
+	return 0;
+}
+
+
 /**
  * audit_socketcall - record audit data for sys_socketcall
  * @nargs: number of args
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index e82726f..0d656e6 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -150,7 +150,7 @@ extern ctl_table random_table[];
 #ifdef CONFIG_UNIX98_PTYS
 extern ctl_table pty_table[];
 #endif
-#ifdef CONFIG_INOTIFY
+#ifdef CONFIG_INOTIFY_USER
 extern ctl_table inotify_table[];
 #endif
 
@@ -1028,7 +1028,7 @@ static ctl_table fs_table[] = {
 		.mode		= 0644,
 		.proc_handler	= &proc_doulongvec_minmax,
 	},
-#ifdef CONFIG_INOTIFY
+#ifdef CONFIG_INOTIFY_USER
 	{
 		.ctl_name	= FS_INOTIFY,
 		.procname	= "inotify",
diff --git a/kernel/user.c b/kernel/user.c
index 2116642..4b1eb74 100644
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -140,7 +140,7 @@ struct user_struct * alloc_uid(uid_t uid
 		atomic_set(&new->processes, 0);
 		atomic_set(&new->files, 0);
 		atomic_set(&new->sigpending, 0);
-#ifdef CONFIG_INOTIFY
+#ifdef CONFIG_INOTIFY_USER
 		atomic_set(&new->inotify_watches, 0);
 		atomic_set(&new->inotify_devs, 0);
 #endif


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2139.2.1
retrieving revision 1.2139.2.2
diff -u -r1.2139.2.1 -r1.2139.2.2
--- kernel-2.6.spec	19 Apr 2006 21:11:47 -0000	1.2139.2.1
+++ kernel-2.6.spec	24 Apr 2006 22:24:10 -0000	1.2139.2.2
@@ -25,7 +25,7 @@
 %define sublevel 16
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define rhbsys  .lspp.18
+%define rhbsys  .lspp.19
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC6%{rhbsys}
 %define signmodules 0
 %define make_target bzImage
@@ -388,7 +388,7 @@
 
 # Audit & lspp patches
 Patch20100: linux-2.6-audit-git.patch
-Patch20101: linux-2.6-execve.patch
+Patch20101: linux-2.6-audit-pending.patch
 
 
 # END OF PATCH DEFINITIONS



From fedora-cvs-commits at redhat.com  Mon Apr 24 22:42:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 18:42:52 -0400
Subject: rpms/kernel/devel/configs config-ia64-generic,1.26,1.27
Message-ID: <200604242242.k3OMgqpi012668@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv12575/configs

Modified Files:
	config-ia64-generic 
Log Message:
bump ai64 nr uarts



Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- config-ia64-generic	21 Apr 2006 04:45:26 -0000	1.26
+++ config-ia64-generic	24 Apr 2006 22:42:49 -0000	1.27
@@ -43,6 +43,7 @@
 CONFIG_IA64_PALINFO=y
 CONFIG_EFI_VARS=y
 CONFIG_SERIAL_8250_ACPI=y
+CONFIG_SERIAL_8250_RUNTIME_UARTS=16
 CONFIG_EFI_PCDP=y
 #
 # Block devices



From fedora-cvs-commits at redhat.com  Mon Apr 24 23:33:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Apr 2006 19:33:55 -0400
Subject: rpms/kernel/devel linux-2.6-sched-up-migration-cost.patch,1.1,1.2
Message-ID: <200604242333.k3ONXtK9023092@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23078

Modified Files:
	linux-2.6-sched-up-migration-cost.patch 
Log Message:
fix bogon.


linux-2.6-sched-up-migration-cost.patch:
 sched.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

Index: linux-2.6-sched-up-migration-cost.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-sched-up-migration-cost.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-sched-up-migration-cost.patch	12 Feb 2006 23:59:49 -0000	1.1
+++ linux-2.6-sched-up-migration-cost.patch	24 Apr 2006 23:33:41 -0000	1.2
@@ -1,12 +1,24 @@
---- linux-2.6/kernel/sched.c~	2006-02-10 17:15:29.000000000 -0500
-+++ linux-2.6/kernel/sched.c	2006-02-10 17:18:19.000000000 -0500
-@@ -5459,7 +5459,8 @@ static void calibrate_migration_costs(co
+--- linux-2.6.16.noarch/kernel/sched.c~	2006-04-24 19:30:13.000000000 -0400
++++ linux-2.6.16.noarch/kernel/sched.c	2006-04-24 19:32:49.000000000 -0400
+@@ -5518,13 +5518,15 @@ static void calibrate_migration_costs(co
  #endif
  		);
  	if (system_state == SYSTEM_BOOTING) {
 -		printk("migration_cost=");
-+		if (num_online_cpus() > 1)
+-		for (distance = 0; distance <= max_distance; distance++) {
+-			if (distance)
+-				printk(",");
+-			printk("%ld", (long)migration_cost[distance] / 1000);
++		if (num_online_cpus() > 1) {
 +			printk("migration_cost=");
- 		for (distance = 0; distance <= max_distance; distance++) {
- 			if (distance)
- 				printk(",");
++			for (distance = 0; distance <= max_distance; distance++) {
++				if (distance)
++					printk(",");
++				printk("%ld", (long)migration_cost[distance] / 1000);
++			}
++			printk("\n");
+ 		}
+-		printk("\n");
+ 	}
+ 	j1 = jiffies;
+ 	if (migration_debug)



From fedora-cvs-commits at redhat.com  Tue Apr 25 04:07:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 00:07:50 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2098,1.2099
Message-ID: <200604250407.k3P47nrF013132@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13090

Modified Files:
	kernel-2.6.spec 
Log Message:
* Tue Apr 25 2006 Dave Jones <davej at redhat.com>
- Enable DVB in the 586 kernel. (#188227)



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2098
retrieving revision 1.2099
diff -u -r1.2098 -r1.2099
--- kernel-2.6.spec	24 Apr 2006 21:22:03 -0000	1.2098
+++ kernel-2.6.spec	25 Apr 2006 04:07:39 -0000	1.2099
@@ -1691,6 +1691,9 @@
 %endif
 
 %changelog
+* Tue Apr 25 2006 Dave Jones <davej at redhat.com>
+- Enable DVB in the 586 kernel. (#188227)
+
 * Mon Apr 24 2006 Dave Jones <davej at redhat.com>
 - 2.6.16.11
 



From fedora-cvs-commits at redhat.com  Tue Apr 25 04:07:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 00:07:50 -0400
Subject: rpms/kernel/FC-5/configs config-i586,1.10,1.11
Message-ID: <200604250407.k3P47nGV013141@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv13090/configs

Modified Files:
	config-i586 
Log Message:
* Tue Apr 25 2006 Dave Jones <davej at redhat.com>
- Enable DVB in the 586 kernel. (#188227)



Index: config-i586
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-i586,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- config-i586	20 Apr 2006 03:13:20 -0000	1.10
+++ config-i586	25 Apr 2006 04:07:41 -0000	1.11
@@ -41,7 +41,6 @@
 # CONFIG_W1 is not set
 # CONFIG_SENSORS_HDAPS is not set
 # CONFIG_IBM_ASM is not set
-# CONFIG_DVB is not set
 # CONFIG_MMC is not set
 # CONFIG_INFINIBAND is not set
 # CONFIG_AGP_ATI is not set



From fedora-cvs-commits at redhat.com  Tue Apr 25 04:08:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 00:08:39 -0400
Subject: rpms/kernel/devel/configs config-i586,1.11,1.12
Message-ID: <200604250408.k3P48dHi013323@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv13271/configs

Modified Files:
	config-i586 
Log Message:
enable DVB in 586



Index: config-i586
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-i586,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- config-i586	24 Apr 2006 22:13:50 -0000	1.11
+++ config-i586	25 Apr 2006 04:08:36 -0000	1.12
@@ -41,7 +41,6 @@
 # CONFIG_W1 is not set
 # CONFIG_SENSORS_HDAPS is not set
 # CONFIG_IBM_ASM is not set
-# CONFIG_DVB is not set
 # CONFIG_MMC is not set
 # CONFIG_INFINIBAND is not set
 # CONFIG_KPROBES is not set



From fedora-cvs-commits at redhat.com  Tue Apr 25 04:30:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 00:30:54 -0400
Subject: rpms/kernel/FC-5 linux-2.6-usb-unusual-devices.patch, NONE,
	1.1 kernel-2.6.spec, 1.2099, 1.2100
Message-ID: <200604250430.k3P4UsWE030537@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv30388

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-usb-unusual-devices.patch 
Log Message:
Fix up SCSI errors with mymusix usb mp3 player (#186187)


linux-2.6-usb-unusual-devices.patch:
 unusual_devs.h |    6 ++++++
 1 files changed, 6 insertions(+)

--- NEW FILE linux-2.6-usb-unusual-devices.patch ---
--- linux-2.6.15/drivers/usb/storage/unusual_devs.h~	2006-02-20 21:36:07.000000000 -0500
+++ linux-2.6.15/drivers/usb/storage/unusual_devs.h	2006-02-20 21:36:24.000000000 -0500
@@ -113,6 +113,12 @@ UNUSUAL_DEV(  0x0419, 0xaaf6, 0x0100, 0x
 		US_SC_DEVICE, US_PR_DEVICE, NULL,
 		US_FL_IGNORE_RESIDUE ),
 
+/* Reported by Pete Zaitcev <zaitcev at redhat.com>, bz#176584 */
+UNUSUAL_DEV(  0x0420, 0x0001, 0x0100, 0x0100,
+		"GENERIC", "MP3 PLAYER", /* MyMusix PD-205 on the outside. */
+		US_SC_DEVICE, US_PR_DEVICE, NULL,
+		US_FL_IGNORE_RESIDUE ),
+
 /* Reported by Olaf Hering <olh at suse.de> from novell bug #105878 */
 UNUSUAL_DEV(  0x0424, 0x0fdc, 0x0210, 0x0210,
 		"SMSC",


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2099
retrieving revision 1.2100
diff -u -r1.2099 -r1.2100
--- kernel-2.6.spec	25 Apr 2006 04:07:39 -0000	1.2099
+++ kernel-2.6.spec	25 Apr 2006 04:30:17 -0000	1.2100
@@ -372,6 +372,7 @@
 Patch1760: linux-2.6-suspend-slab-warnings.patch
 Patch1770: linux-2.6-optimise-spinlock-debug.patch
 Patch1780: linux-2.6-cpufreq-acpi-sticky.patch
+Patch1790: linux-2.6-usb-unusual-devices.patch
 
 # SELinux/audit patches.
 Patch1800: linux-2.6-selinux-hush.patch
@@ -1008,6 +1009,8 @@
 %patch1770 -p1
 # Make acpi-cpufreq sticky.
 %patch1780 -p1
+# unusual USB device quirks
+%patch1790 -p1
 
 # Silence some selinux messages.
 %patch1800 -p1
@@ -1693,6 +1696,7 @@
 %changelog
 * Tue Apr 25 2006 Dave Jones <davej at redhat.com>
 - Enable DVB in the 586 kernel. (#188227)
+- Fix up SCSI errors with mymusix usb mp3 player (#186187)
 
 * Mon Apr 24 2006 Dave Jones <davej at redhat.com>
 - 2.6.16.11



From fedora-cvs-commits at redhat.com  Tue Apr 25 04:33:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 00:33:00 -0400
Subject: rpms/kernel/FC-4 linux-2.6-usb-unusual-devices.patch, 1.2,
	1.3 kernel-2.6.spec, 1.1628, 1.1629
Message-ID: <200604250433.k3P4X032030790@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv30730

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-usb-unusual-devices.patch 
Log Message:
Fix up SCSI errors with mymusix usb mp3 player (#186187)


linux-2.6-usb-unusual-devices.patch:
 unusual_devs.h |    6 ++++++
 1 files changed, 6 insertions(+)

Index: linux-2.6-usb-unusual-devices.patch
===================================================================
RCS file: linux-2.6-usb-unusual-devices.patch
diff -N linux-2.6-usb-unusual-devices.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-usb-unusual-devices.patch	25 Apr 2006 04:32:56 -0000	1.3
@@ -0,0 +1,15 @@
+--- linux-2.6.15/drivers/usb/storage/unusual_devs.h~	2006-02-20 21:36:07.000000000 -0500
++++ linux-2.6.15/drivers/usb/storage/unusual_devs.h	2006-02-20 21:36:24.000000000 -0500
+@@ -113,6 +113,12 @@ UNUSUAL_DEV(  0x0419, 0xaaf6, 0x0100, 0x
+ 		US_SC_DEVICE, US_PR_DEVICE, NULL,
+ 		US_FL_IGNORE_RESIDUE ),
+ 
++/* Reported by Pete Zaitcev <zaitcev at redhat.com>, bz#176584 */
++UNUSUAL_DEV(  0x0420, 0x0001, 0x0100, 0x0100,
++		"GENERIC", "MP3 PLAYER", /* MyMusix PD-205 on the outside. */
++		US_SC_DEVICE, US_PR_DEVICE, NULL,
++		US_FL_IGNORE_RESIDUE ),
++
+ /* Reported by Olaf Hering <olh at suse.de> from novell bug #105878 */
+ UNUSUAL_DEV(  0x0424, 0x0fdc, 0x0210, 0x0210,
+ 		"SMSC",


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1628
retrieving revision 1.1629
diff -u -r1.1628 -r1.1629
--- kernel-2.6.spec	24 Apr 2006 21:38:45 -0000	1.1628
+++ kernel-2.6.spec	25 Apr 2006 04:32:51 -0000	1.1629
@@ -1062,6 +1062,9 @@
 %endif
 
 %changelog
+* Tue Apr 25 2006 Dave Jones <davej at redhat.com>
+- Fix up SCSI errors with mymusix usb mp3 player (#186187)
+
 * Mon Apr 24 2006 Dave Jones <davej at redhat.com>
 - 2.6.16.11
 



From fedora-cvs-commits at redhat.com  Tue Apr 25 04:42:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 00:42:44 -0400
Subject: rpms/gcalctool/devel .cvsignore, 1.2, 1.3 gcalctool.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200604250442.k3P4ghXb032234@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gcalctool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32206

Modified Files:
	.cvsignore gcalctool.spec sources 
Log Message:
5.8.8



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Apr 2006 15:34:52 -0000	1.2
+++ .cvsignore	25 Apr 2006 04:42:32 -0000	1.3
@@ -1 +1,2 @@
 gcalctool-5.7.32.tar.bz2
+gcalctool-5.8.8.tar.bz2


Index: gcalctool.spec
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gcalctool.spec	20 Apr 2006 16:03:46 -0000	1.3
+++ gcalctool.spec	25 Apr 2006 04:42:32 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gcalctool
-Version:        5.7.32
-Release: 	5
+Version:        5.8.8
+Release:        2
 Summary:        A desktop calculator
 
 Group:          Applications/System
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Tue Apr 25 2006 Matthias Clasen <mclasen at redhat.com> 5.8.8-2
+- Update to 5.8.8
+
 * Thu Apr 20 2006 Jesse Keating <jkeating at redhat.com> - 5.7.32-5
 - Add postun to clean up gconf schema.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Apr 2006 15:34:52 -0000	1.2
+++ sources	25 Apr 2006 04:42:32 -0000	1.3
@@ -1 +1 @@
-c0712ee651c74104cdcc3205f4c57881  gcalctool-5.7.32.tar.bz2
+9aa3ae6d8a32de26980fdcd9463bd463  gcalctool-5.8.8.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 25 04:52:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 00:52:46 -0400
Subject: rpms/gcalctool/devel gcalctool.spec,1.4,1.5
Message-ID: <200604250452.k3P4qkAZ015267@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gcalctool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15201

Modified Files:
	gcalctool.spec 
Log Message:
fix source



Index: gcalctool.spec
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gcalctool.spec	25 Apr 2006 04:42:32 -0000	1.4
+++ gcalctool.spec	25 Apr 2006 04:52:42 -0000	1.5
@@ -6,7 +6,7 @@
 Group:          Applications/System
 License:        GPL
 URL:            http://directory.fsf.org/gcalctool.html
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/gcalctool/5.7/gcalctool-5.7.32.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/gcalctool/5.8/gcalctool-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: atk-devel >= 1.5



From fedora-cvs-commits at redhat.com  Tue Apr 25 05:04:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 01:04:45 -0400
Subject: rpms/icon-naming-utils/devel icon-naming-utils.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200604250504.k3P54jF0018413@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/icon-naming-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18383

Modified Files:
	icon-naming-utils.spec sources 
Log Message:
0.7.1



Index: icon-naming-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/icon-naming-utils/devel/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	25 Apr 2006 05:04:17 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           icon-naming-utils
-Version:        0.6.7
+Version:        0.7.1
 Release:        1
 Summary: 	A script to handle icon names in desktop icon themes
 
@@ -47,6 +47,9 @@
 %{_datadir}/pkgconfig/icon-naming-utils.pc
 
 %changelog
+* Tue Apr 25 2006 Matthias Clasen <mclasen at redhat.com> - 0.7.1-1
+- Update to 0.7.1
+
 * 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/devel/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	25 Apr 2006 05:04:28 -0000	1.3
@@ -1 +1 @@
-46443ee6ac3ee85b1a72b2abc55a770a  icon-naming-utils-0.6.7.tar.gz
+ce18b5b2fd7aca8ad5ad12af61e0827f  icon-naming-utils-0.7.1.tar.gz



From fedora-cvs-commits at redhat.com  Tue Apr 25 05:03:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 01:03:59 -0400
Subject: rpms/gcalctool/devel gcalctool.spec,1.5,1.6
Message-ID: <200604250503.k3P53xgJ018367@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gcalctool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18295

Modified Files:
	gcalctool.spec 
Log Message:
drop a patch



Index: gcalctool.spec
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gcalctool.spec	25 Apr 2006 04:52:42 -0000	1.5
+++ gcalctool.spec	25 Apr 2006 05:03:45 -0000	1.6
@@ -22,7 +22,6 @@
 Requires(postun): scrollkeeper
 Requires(preun): GConf2
 
-Patch0: gcalctool-schemasdir.patch
 Patch1: gcalctool-flex-crap.patch
 
 %description
@@ -32,7 +31,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .schemasdir
 %patch1 -p1 -b .flex-crap
 
 



From fedora-cvs-commits at redhat.com  Tue Apr 25 07:24:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 03:24:25 -0400
Subject: rpms/beagle/devel beagle.spec,1.49,1.50
Message-ID: <200604250724.k3P7OPmc006359@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6298

Modified Files:
	beagle.spec 
Log Message:
Bump version



Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- beagle.spec	21 Apr 2006 11:43:19 -0000	1.49
+++ beagle.spec	25 Apr 2006 07:24:23 -0000	1.50
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.5
-Release:        2
+Release:        3
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 License:        LGPL
@@ -198,7 +198,7 @@
 %{_libdir}/python*/site-packages/beagle.so
 
 %changelog
-* Fri Apr 21 2006 Alexander Larsson <alexl at redhat.com> - 0.2.5-2
+* Fri Apr 21 2006 Alexander Larsson <alexl at redhat.com> - 0.2.5-3
 - Update to 0.2.5
 - Update patches
 



From fedora-cvs-commits at redhat.com  Tue Apr 25 07:53:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 03:53:03 -0400
Subject: rpms/ethereal/devel ethereal-column.patch, NONE, 1.1 ethereal.spec,
	1.68, 1.69
Message-ID: <200604250753.k3P7r3Em027701@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/ethereal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27662

Modified Files:
	ethereal.spec 
Added Files:
	ethereal-column.patch 
Log Message:
 - fix crash when tuning columns (#189428)

ethereal-column.patch:
 column_prefs.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE ethereal-column.patch ---
--- ethereal-0.99.0-SVN-17918/gtk/column_prefs.c.old	2006-04-20 01:53:02.000000000 +0200
+++ ethereal-0.99.0-SVN-17918/gtk/column_prefs.c	2006-04-25 02:14:52.000000000 +0200
@@ -1,7 +1,7 @@
 /* column_prefs.c
  * Dialog box for column preferences
  *
- * $Id: column_prefs.c 15465 2005-08-20 12:09:48Z ulfl $
+ * $Id: column_prefs.c 17983 2006-04-24 21:27:12Z jake $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald at ethereal.com>
@@ -638,6 +638,7 @@
                 return;
             }
         }
+        clp1 = g_list_find(prefs.col_list, cfmt);
         gtk_tree_model_get(model, &iter2, 0, &title2, 1, &format2, 2,
                            &clp2, -1);
         gtk_list_store_set(GTK_LIST_STORE(model), &iter2, 0, title1, 1,
@@ -645,7 +646,7 @@
         gtk_list_store_set(GTK_LIST_STORE(model), &iter1, 0, title2, 1,
                            format2, 2, clp2, -1);
         gtk_tree_selection_select_iter(sel, &iter2);
-        /* clp1 = g_list_find(prefs.col_list, cfmt); */
+
         column_set_arrow_button_sensitivity(clp1);
 
         /* free strings read from the TreeModel */


Index: ethereal.spec
===================================================================
RCS file: /cvs/dist/rpms/ethereal/devel/ethereal.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- ethereal.spec	20 Apr 2006 09:19:43 -0000	1.68
+++ ethereal.spec	25 Apr 2006 07:53:00 -0000	1.69
@@ -4,7 +4,7 @@
 Summary: 	Network traffic analyzer
 Name: 		ethereal
 Version:	0.99.0
-Release: 	0.svn.1
+Release: 	0.svn.2
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	http://www.ethereal.com/distribution/%{name}-%{version}-SVN-%{svn_version}.tar.gz
@@ -14,6 +14,7 @@
 Source4:	ethereal.png
 Patch1:		ethereal-0.10.13-pie.patch
 Patch3:		ethereal-0.10.14-nfsv4-opts.patch
+Patch4:		ethereal-column.patch
 Url: 		http://www.ethereal.com/
 BuildRoot: 	%{_tmppath}/%{name}-root
 Requires: 	libpcap >= 0.6
@@ -52,6 +53,8 @@
 %setup -q -n %{name}-%{version}-SVN-%{svn_version}
 %patch1 -p1 -b .pie
 %patch3 -p1 
+#fixed upstream
+%patch4 -p1 -b .column
 
 %build
 %ifarch s390 s390x
@@ -163,6 +166,9 @@
 
 
 %changelog
+* Tue Apr 25 2006 Radek Vok??l <rvokal at redhat.com> 0.99.0-0.svn.2
+- fix crash when tuning columns (#189428)
+
 * Thu Apr 20 2006 Radek Vok??l <rvokal at redhat.com> 0.99.0-0.svn.1
 - 0.99.0 prerelease
 



From fedora-cvs-commits at redhat.com  Tue Apr 25 08:53:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 04:53:57 -0400
Subject: rpms/ethereal/FC-5 ethereal-column.patch, NONE, 1.1 ethereal.spec,
	1.66, 1.67
Message-ID: <200604250853.k3P8rv0v013908@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/ethereal/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13894

Modified Files:
	ethereal.spec 
Added Files:
	ethereal-column.patch 
Log Message:
 - fix crash when tuning columns (#189428)

ethereal-column.patch:
 column_prefs.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE ethereal-column.patch ---
--- ethereal-0.99.0-SVN-17918/gtk/column_prefs.c.old	2006-04-20 01:53:02.000000000 +0200
+++ ethereal-0.99.0-SVN-17918/gtk/column_prefs.c	2006-04-25 02:14:52.000000000 +0200
@@ -1,7 +1,7 @@
 /* column_prefs.c
  * Dialog box for column preferences
  *
- * $Id: column_prefs.c 15465 2005-08-20 12:09:48Z ulfl $
+ * $Id: column_prefs.c 17983 2006-04-24 21:27:12Z jake $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald at ethereal.com>
@@ -638,6 +638,7 @@
                 return;
             }
         }
+        clp1 = g_list_find(prefs.col_list, cfmt);
         gtk_tree_model_get(model, &iter2, 0, &title2, 1, &format2, 2,
                            &clp2, -1);
         gtk_list_store_set(GTK_LIST_STORE(model), &iter2, 0, title1, 1,
@@ -645,7 +646,7 @@
         gtk_list_store_set(GTK_LIST_STORE(model), &iter1, 0, title2, 1,
                            format2, 2, clp2, -1);
         gtk_tree_selection_select_iter(sel, &iter2);
-        /* clp1 = g_list_find(prefs.col_list, cfmt); */
+
         column_set_arrow_button_sensitivity(clp1);
 
         /* free strings read from the TreeModel */


Index: ethereal.spec
===================================================================
RCS file: /cvs/dist/rpms/ethereal/FC-5/ethereal.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- ethereal.spec	11 Feb 2006 02:40:15 -0000	1.66
+++ ethereal.spec	25 Apr 2006 08:53:55 -0000	1.67
@@ -4,7 +4,7 @@
 Summary: 	Network traffic analyzer
 Name: 		ethereal
 Version:	0.10.14
-Release: 	3.2
+Release: 	4
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	http://www.ethereal.com/distribution/%{name}-%{version}.tar.bz2
@@ -15,6 +15,7 @@
 Patch1:		ethereal-0.10.13-pie.patch
 Patch2:		ethereal-gtk-dialog.patch
 Patch3:		ethereal-0.10.14-nfsv4-opts.patch
+Patch4:		ethereal-column.patch
 Url: 		http://www.ethereal.com/
 BuildRoot: 	%{_tmppath}/%{name}-root
 Requires: 	libpcap >= 0.6
@@ -54,6 +55,7 @@
 %patch1 -p1 -b .pie
 %patch2 -p0 -b .gtk
 %patch3 -p1 
+%patch4 -p1
 
 %build
 %ifarch s390 s390x
@@ -163,6 +165,9 @@
 
 
 %changelog
+* Tue Apr 25 2006 Radek Vok??l <rvokal at redhat.com> 0.10.14-4
+- fix crash when tuning columns (#189428)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.10.14-3.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Apr 25 08:56:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 04:56:41 -0400
Subject: rpms/tar/devel tar-1.15.90-makeCheck.patch, NONE, 1.1 tar.spec, 1.36,
	1.37
Message-ID: <200604250856.k3P8ufCJ014026@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/tar/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14007

Modified Files:
	tar.spec 
Added Files:
	tar-1.15.90-makeCheck.patch 
Log Message:
- exclude listed02.at from testsuite again, because it
  still fails on s390


tar-1.15.90-makeCheck.patch:
 testsuite.at |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE tar-1.15.90-makeCheck.patch ---
--- tar-1.15.90/tests/testsuite.at.makeCheck	2006-04-25 10:51:26.000000000 +0200
+++ tar-1.15.90/tests/testsuite.at	2006-04-25 10:51:38.000000000 +0200
@@ -93,7 +93,7 @@
 m4_include([link01.at])
 
 m4_include([listed01.at])
-m4_include([listed02.at])
+#m4_include([listed02.at])
 
 m4_include([longv7.at])
 m4_include([long01.at])


Index: tar.spec
===================================================================
RCS file: /cvs/dist/rpms/tar/devel/tar.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- tar.spec	24 Apr 2006 20:53:15 -0000	1.36
+++ tar.spec	25 Apr 2006 08:56:39 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: A GNU file archiving program.
 Name: tar
 Version: 1.15.90
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -11,6 +11,7 @@
 Patch1: tar-1.14-nolibrt.patch
 Patch2: tar-1.14-loneZeroWarning.patch
 Patch3: tar-1.15.1-vfatTruncate.patch
+Patch4: tar-1.15.90-makeCheck.patch
 
 Prereq: info
 BuildRequires: autoconf automake gzip
@@ -33,6 +34,7 @@
 #%patch1 -p1 -b .nolibrt
 %patch2 -p1 -b .loneZeroWarning
 %patch3 -p1 -b .vfatTruncate
+%patch4 -p1 -b .makeCheck
 
 %build
 
@@ -103,6 +105,10 @@
 %{_infodir}/tar.info*
 
 %changelog
+* Tue Apr 25 2006 Peter Vrabec <pvrabec at redhat.com> 1.15.90-2
+- exclude listed02.at from testsuite again, because it 
+  still fails on s390
+
 * Tue Apr 25 2006 Peter Vrabec <pvrabec at redhat.com> 1.15.90-1
 - upgrade
 



From fedora-cvs-commits at redhat.com  Tue Apr 25 09:27:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 05:27:47 -0400
Subject: rpms/nut/FC-5 .cvsignore, 1.11, 1.12 nut.spec, 1.31, 1.32 sources,
	1.11, 1.12 nut-2.0.2-buffer.patch, 1.1, NONE
Message-ID: <200604250927.k3P9Rlah010929@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/nut/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv10867

Modified Files:
	.cvsignore nut.spec sources 
Removed Files:
	nut-2.0.2-buffer.patch 
Log Message:
- update to 2.0.3
- drop nut-2.0.2-buffer.patch, it's included in new upstream
- add udev rule #189674, #187105



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nut/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	20 Jul 2005 13:24:19 -0000	1.11
+++ .cvsignore	25 Apr 2006 09:27:45 -0000	1.12
@@ -1,3 +1,4 @@
 nut-2.0.0.tar.gz
 nut-2.0.1.tar.gz
 nut-2.0.2.tar.gz
+nut-2.0.3.tar.gz


Index: nut.spec
===================================================================
RCS file: /cvs/dist/rpms/nut/FC-5/nut.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- nut.spec	11 Feb 2006 04:48:37 -0000	1.31
+++ nut.spec	25 Apr 2006 09:27:45 -0000	1.32
@@ -10,8 +10,8 @@
 
 Summary: Network UPS Tools
 Name: nut
-Version: 2.0.2
-Release: 6.2
+Version: 2.0.3
+Release: 0.1.fc5
 Group: Applications/System
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -24,7 +24,6 @@
 Patch1: nut-0.45.0-conffiles.patch
 Patch2: nut-0.45.4-conf.patch
 Patch3: nut-2.0.1-bad.patch
-Patch4: nut-2.0.2-buffer.patch
 
 Requires: nut-client
 
@@ -90,7 +89,6 @@
 %patch1 -p1 -b .conf
 %patch2 -p1 -b .conf1
 %patch3 -p1 -b .bad
-%patch4 -p1 -b .buffer
 
 iconv -f iso-8859-1 -t utf-8 < man/newhidups.8 > man/newhidups.8_
 mv man/newhidups.8_ man/newhidups.8
@@ -118,6 +116,7 @@
 
 mkdir -p %{buildroot}%{modeldir} \
          %{buildroot}%{_sysconfdir}/sysconfig \
+         %{buildroot}%{_sysconfdir}/udev/rules.d \
          %{buildroot}%{piddir} \
          %{buildroot}%{_localstatedir}/lib/ups \
          %{buildroot}%{initdir}
@@ -135,6 +134,8 @@
 install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/ups
 install -m 755 %{SOURCE1} %{buildroot}%{initdir}/ups
 
+install -m 644 scripts/hotplug-ng/nut-usbups.rules %{buildroot}%{_sysconfdir}/udev/rules.d
+
 # rename
 for file in %{buildroot}%{_sysconfdir}/ups/*.sample
 do
@@ -181,11 +182,12 @@
 
 %files
 %defattr(-,root,root)
-%doc COPYING CREDITS CHANGES README docs UPGRADING
+%doc COPYING CREDITS CHANGES README docs UPGRADING INSTALL NEWS
 %config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/ups.conf
 %config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.conf
 %config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.users
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/ups
+%config(noreplace) %attr(644,root,root) %{_sysconfdir}/udev/rules.d/*
 %{modeldir}/*
 %{_sbindir}/upsd
 %{_bindir}/upslog
@@ -232,6 +234,9 @@
 %{_mandir}/man8/bcmxcp.8*
 %{_mandir}/man8/solis.8*
 %{_mandir}/man8/upscode2.8*
+%{_mandir}/man8/bcmxcp_usb.8.gz
+%{_mandir}/man8/gamatronic.8.gz
+%{_mandir}/man8/tripplite_usb.8.gz
 %files client
 %defattr(-,root,root)
 %attr(755,root,root) %{initdir}/ups
@@ -270,6 +275,11 @@
 %{_mandir}/man8/upsset.cgi.8.gz
 
 %changelog
+* Tue Apr 25 2006 Than Ngo <than at redhat.com> 2.0.3-0.1.fc5
+- update to 2.0.3
+- drop nut-2.0.2-buffer.patch, it's included in new upstream
+- add udev rule #189674, #187105
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0.2-6.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nut/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	20 Jul 2005 13:24:19 -0000	1.11
+++ sources	25 Apr 2006 09:27:45 -0000	1.12
@@ -1 +1 @@
-6560df8d0a42f0f585d34ed1ae8c6f67  nut-2.0.2.tar.gz
+ed2d3104d021a6ddb864f23d8cbd1cf6  nut-2.0.3.tar.gz


--- nut-2.0.2-buffer.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 25 09:39:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 05:39:32 -0400
Subject: rpms/nut/FC-4 nut.spec,1.23,1.24
Message-ID: <200604250939.k3P9dWOE013187@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/nut/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv13138

Modified Files:
	nut.spec 
Log Message:
add udev rule #189674, #187105




Index: nut.spec
===================================================================
RCS file: /cvs/dist/rpms/nut/FC-4/nut.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- nut.spec	6 Mar 2006 16:14:14 -0000	1.23
+++ nut.spec	25 Apr 2006 09:39:28 -0000	1.24
@@ -11,11 +11,11 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.0.3
-Release: 0.fc4.1
+Release: 0.fc4.2
 Group: Applications/System
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Url: http://wwww.networkupstools.org/
+Url: http://www.networkupstools.org/
 Source: http://www.networkupstools.org/source/2.0/%{name}-%{version}.tar.gz
 Source1: ups.init
 Source2: ups.sysconfig
@@ -117,10 +117,10 @@
 
 mkdir -p %{buildroot}%{modeldir} \
          %{buildroot}%{_sysconfdir}/sysconfig \
+         %{buildroot}%{_sysconfdir}/udev/rules.d \
          %{buildroot}%{piddir} \
          %{buildroot}%{_localstatedir}/lib/ups \
-         %{buildroot}%{initdir} \
-         %{buildroot}%{_sysconfdir}/hotplug/usb
+         %{buildroot}%{initdir}
 
 make install install-conf \
      install-cgi-conf \
@@ -135,9 +135,8 @@
 install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/ups
 install -m 755 %{SOURCE1} %{buildroot}%{initdir}/ups
 
-# hotplug scripts
-install -m 755 scripts/hotplug/libhidups %{buildroot}%{_sysconfdir}/hotplug/usb/
-install -m 644 scripts/hotplug/libhid.usermap %{buildroot}%{_sysconfdir}/hotplug/usb/
+# udev
+install -m 644 scripts/hotplug-ng/nut-usbups.rules %{buildroot}%{_sysconfdir}/udev/rules.d
 
 # rename
 for file in %{buildroot}%{_sysconfdir}/ups/*.sample
@@ -185,12 +184,13 @@
 
 %files
 %defattr(-,root,root)
-%doc COPYING CREDITS CHANGES README docs UPGRADING
+%doc COPYING CREDITS CHANGES README docs UPGRADING INSTALL NEWS
 %config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/ups.conf
 %config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.conf
 %config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.users
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/ups
 %{_sysconfdir}/hotplug/usb/*
+%config(noreplace) %attr(644,root,root) %{_sysconfdir}/udev/rules.d/*
 %{modeldir}/*
 %{_sbindir}/upsd
 %{_bindir}/upslog
@@ -270,7 +270,7 @@
 %config(noreplace) %attr(600,nut,root) %{_sysconfdir}/ups/upsset.conf
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/ups/upsstats.html
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/ups/upsstats-single.html
-%{cgidir}
+%{cgidir}/*
 %{_mandir}/man5/hosts.conf.5.gz
 %{_mandir}/man5/upsstats.html.5.gz
 %{_mandir}/man5/upsset.conf.5.gz
@@ -279,6 +279,9 @@
 %{_mandir}/man8/upsset.cgi.8.gz
 
 %changelog
+* Tue Apr 25 2006 Than Ngo <than at redhat.com> 2.0.3-0.fc4.2
+- add udev rule #189674, #187105
+
 * Mon Mar 06 2006 Than Ngo <than at redhat.com> 2.0.3-0.fc4.1
 - update to 2.0.3, #182089
 - fix nut default setting #175615



From fedora-cvs-commits at redhat.com  Tue Apr 25 10:09:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 06:09:08 -0400
Subject: rpms/nut/FC-4 nut.spec,1.24,1.25
Message-ID: <200604251009.k3PA97wg002654@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/nut/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv2552

Modified Files:
	nut.spec 
Log Message:
fix rpm file list



Index: nut.spec
===================================================================
RCS file: /cvs/dist/rpms/nut/FC-4/nut.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- nut.spec	25 Apr 2006 09:39:28 -0000	1.24
+++ nut.spec	25 Apr 2006 10:08:53 -0000	1.25
@@ -189,7 +189,6 @@
 %config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.conf
 %config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.users
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/ups
-%{_sysconfdir}/hotplug/usb/*
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/udev/rules.d/*
 %{modeldir}/*
 %{_sbindir}/upsd



From fedora-cvs-commits at redhat.com  Tue Apr 25 10:12:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 06:12:56 -0400
Subject: rpms/nut/FC-5 nut-2.0.2-warning.patch,NONE,1.1 nut.spec,1.32,1.33
Message-ID: <200604251012.k3PACtQV003530@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/nut/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2900

Modified Files:
	nut.spec 
Added Files:
	nut-2.0.2-warning.patch 
Log Message:
- don't show debug messages 


nut-2.0.2-warning.patch:
 hidups.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

--- NEW FILE nut-2.0.2-warning.patch ---
--- nut-2.0.2/drivers/hidups.c.orig	2005-10-04 11:00:48.000000000 +0200
+++ nut-2.0.2/drivers/hidups.c	2005-10-04 11:37:57.000000000 +0200
@@ -108,15 +108,16 @@
 
 	/* XXX: deal with bogosity by throwing it out */
 	if (ev->value > 3000000) {
-		upslogx(LOG_INFO, "Ignoring bogus event 0x%x (%d)",
-			ev->hid, ev->value);
+		/* upslogx(LOG_INFO, "Ignoring bogus event 0x%x (%d)",
+			ev->hid, ev->value); */
 		return;
 	}
 
 	/* x86 page == ups-specific, ignore these for now */
 	if ((ev->hid & 0x860000) == 0x860000) {
-		upslogx(LOG_INFO, "Ignoring x86 page event 0x%x (%d)",
-			ev->hid, ev->value);
+
+		/* upslogx(LOG_INFO, "Ignoring x86 page event 0x%x (%d)",
+			ev->hid, ev->value); */
 		return;
 	}
 
@@ -176,8 +177,9 @@
 			break;
 
 		default:
-			upslogx(LOG_INFO, "Unhandled event: 0x%x (%d)",
-				ev->hid, ev->value);
+			/* upslogx(LOG_INFO, "Unhandled event: 0x%x (%d)",
+				ev->hid, ev->value); */
+			break;
 	}
 
 	/* deal with any status changes */


Index: nut.spec
===================================================================
RCS file: /cvs/dist/rpms/nut/FC-5/nut.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- nut.spec	25 Apr 2006 09:27:45 -0000	1.32
+++ nut.spec	25 Apr 2006 10:12:52 -0000	1.33
@@ -24,6 +24,7 @@
 Patch1: nut-0.45.0-conffiles.patch
 Patch2: nut-0.45.4-conf.patch
 Patch3: nut-2.0.1-bad.patch
+Patch5: nut-2.0.2-warning.patch
 
 Requires: nut-client
 
@@ -89,6 +90,7 @@
 %patch1 -p1 -b .conf
 %patch2 -p1 -b .conf1
 %patch3 -p1 -b .bad
+%patch5 -p1 -b .warning
 
 iconv -f iso-8859-1 -t utf-8 < man/newhidups.8 > man/newhidups.8_
 mv man/newhidups.8_ man/newhidups.8



From fedora-cvs-commits at redhat.com  Tue Apr 25 10:23:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 06:23:28 -0400
Subject: rpms/gcc/devel gcc41-pr27218.patch, 1.1, 1.2 gcc41-pr27285.patch,
	1.1, 1.2
Message-ID: <200604251023.k3PANSU4020670@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20588

Modified Files:
	gcc41-pr27218.patch gcc41-pr27285.patch 
Log Message:
4.1.0-11


gcc41-pr27218.patch:
 0 files changed

Index: gcc41-pr27218.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-pr27218.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-pr27218.patch	25 Apr 2006 10:16:22 -0000	1.1
+++ gcc41-pr27218.patch	25 Apr 2006 10:23:24 -0000	1.2
@@ -7,6 +7,16 @@
 
 	* g++.dg/tree-ssa/pr27218.C: New testcase.
 
+--- gcc/tree-inline.c	(revision 113217)
++++ gcc/tree-inline.c	(revision 113218)
+@@ -2073,6 +2073,7 @@ expand_call_inline (basic_block bb, tree
+       if (CALL_EXPR_RETURN_SLOT_OPT (t))
+ 	{
+ 	  return_slot_addr = build_fold_addr_expr (modify_dest);
++	  STRIP_USELESS_TYPE_CONVERSION (return_slot_addr);
+ 	  modify_dest = NULL;
+ 	}
+     }
 --- gcc/testsuite/g++.dg/tree-ssa/pr27218.C	(revision 0)
 +++ gcc/testsuite/g++.dg/tree-ssa/pr27218.C	(revision 113218)
 @@ -0,0 +1,17 @@
@@ -27,13 +37,3 @@
 +{
 +    new Point (f());
 +}
---- gcc/tree-inline.c	(revision 113217)
-+++ gcc/tree-inline.c	(revision 113218)
-@@ -2073,6 +2073,7 @@ expand_call_inline (basic_block bb, tree
-       if (CALL_EXPR_RETURN_SLOT_OPT (t))
- 	{
- 	  return_slot_addr = build_fold_addr_expr (modify_dest);
-+	  STRIP_USELESS_TYPE_CONVERSION (return_slot_addr);
- 	  modify_dest = NULL;
- 	}
-     }

gcc41-pr27285.patch:
 pr27285.c |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 46 insertions(+)

Index: gcc41-pr27285.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-pr27285.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-pr27285.patch	25 Apr 2006 10:16:22 -0000	1.1
+++ gcc41-pr27285.patch	25 Apr 2006 10:23:24 -0000	1.2
@@ -18,8 +18,8 @@
 
 	* gcc.c-torture/execute/pr27285.c: New test.
 
---- tree-ssa-loop-niter.c	(revision 112483)
-+++ tree-ssa-loop-niter.c	(revision 112484)
+--- gcc/tree-ssa-loop-niter.c	(revision 112483)
++++ gcc/tree-ssa-loop-niter.c	(revision 112484)
 @@ -129,9 +129,9 @@ inverse (tree x, tree mask)
  /* Determines number of iterations of loop whose ending condition
     is IV <> FINAL.  TYPE is the type of the iv.  The number of



From fedora-cvs-commits at redhat.com  Tue Apr 25 10:16:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 06:16:40 -0400
Subject: rpms/gcc/devel gcc41-pr27218.patch, NONE, 1.1 gcc41-pr27236.patch,
	NONE, 1.1 gcc41-pr27285.patch, NONE, 1.1 .cvsignore, 1.146,
	1.147 gcc41.spec, 1.53, 1.54 sources, 1.148,
	1.149 gcc41-pr26769.patch, 1.1, NONE
Message-ID: <200604251016.k3PAGe7J006043@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4396

Modified Files:
	.cvsignore gcc41.spec sources 
Added Files:
	gcc41-pr27218.patch gcc41-pr27236.patch gcc41-pr27285.patch 
Removed Files:
	gcc41-pr26769.patch 
Log Message:
4.1.0-11


gcc41-pr27218.patch:
 0 files changed

--- NEW FILE gcc41-pr27218.patch ---
2006-04-24  Andrew Pinski  <pinskia at gcc.gnu.org>
	Richard Guenther  <rguenther at suse.de>

	PR tree-optimization/27218
	* tree-inline.c (expand_call_inline): Strip useless type
	conversions for the return slot address.

	* g++.dg/tree-ssa/pr27218.C: New testcase.

--- gcc/testsuite/g++.dg/tree-ssa/pr27218.C	(revision 0)
+++ gcc/testsuite/g++.dg/tree-ssa/pr27218.C	(revision 113218)
@@ -0,0 +1,17 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+struct Vector
+{
+    double _x, _y;
+};
+typedef Vector Point;
+Vector d;
+static inline Vector f(void)
+{
+  return d;
+}
+void add_duck (void)
+{
+    new Point (f());
+}
--- gcc/tree-inline.c	(revision 113217)
+++ gcc/tree-inline.c	(revision 113218)
@@ -2073,6 +2073,7 @@ expand_call_inline (basic_block bb, tree
       if (CALL_EXPR_RETURN_SLOT_OPT (t))
 	{
 	  return_slot_addr = build_fold_addr_expr (modify_dest);
+	  STRIP_USELESS_TYPE_CONVERSION (return_slot_addr);
 	  modify_dest = NULL;
 	}
     }

gcc41-pr27236.patch:
 0 files changed

--- NEW FILE gcc41-pr27236.patch ---
2006-04-24  Andrew Pinski  <pinskia at gcc.gnu.org>
	Richard Guenther  <rguenther at suse.de>

	PR tree-optimization/27236
	* tree-inline.c (copy_body_r): Make sure to copy
	TREE_THIS_VOLATILE flag.

	* gcc.dg/tree-ssa/pr27236.c: New testcase.

--- gcc/tree-inline.c	(revision 113220)
+++ gcc/tree-inline.c	(revision 113221)
@@ -590,6 +590,7 @@ copy_body_r (tree *tp, int *walk_subtree
 	  if (n)
 	    {
 	      tree new;
+	      tree old;
 	      /* If we happen to get an ADDR_EXPR in n->value, strip
 	         it manually here as we'll eventually get ADDR_EXPRs
 		 which lie about their types pointed to.  In this case
@@ -598,13 +599,17 @@ copy_body_r (tree *tp, int *walk_subtree
 	         does other useful transformations, try that first, though.  */
 	      tree type = TREE_TYPE (TREE_TYPE ((tree)n->value));
 	      new = unshare_expr ((tree)n->value);
+	      old = *tp;
 	      *tp = fold_indirect_ref_1 (type, new);
 	      if (! *tp)
 	        {
 		  if (TREE_CODE (new) == ADDR_EXPR)
 		    *tp = TREE_OPERAND (new, 0);
 	          else
-	            *tp = build1 (INDIRECT_REF, type, new);
+		    {
+	              *tp = build1 (INDIRECT_REF, type, new);
+		      TREE_THIS_VOLATILE (*tp) = TREE_THIS_VOLATILE (old);
+		    }
 		}
 	      *walk_subtrees = 0;
 	      return NULL;
--- gcc/testsuite/gcc.dg/tree-ssa/pr27236.c	(revision 0)
+++ gcc/testsuite/gcc.dg/tree-ssa/pr27236.c	(revision 113221)
@@ -0,0 +1,19 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-tree-optimized" } */
+
+static inline int inline_read(volatile int *mem)
+{
+        return *mem;
+}
+int foo_read(volatile int *mem)
+{
+        return inline_read(mem);
+}
+unsigned int foo(volatile int *mem)
+{
+        foo_read(mem);
+        return foo_read(mem);
+}
+
+/* { dg-final { scan-tree-dump-times "foo_read" 5 "optimized" } } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */

gcc41-pr27285.patch:
 pr27285.c |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 46 insertions(+)

--- NEW FILE gcc41-pr27285.patch ---
2006-04-25  Jakub Jelinek  <jakub at redhat.com>

	PR tree-optimization/27285

	Backport from mainline:

	2006-03-28  Zdenek Dvorak  <dvorakz at suse.cz>

	PR tree-optimization/25985
	* tree-ssa-loop-niter.c (number_of_iterations_le,
	number_of_iterations_ne): Make comments more precise.
	(number_of_iterations_cond): Add only_exit argument.  Use the
	fact that signed variables do not overflow only when only_exit
	is true.
	(loop_only_exit_p): New.
	(number_of_iterations_exit): Pass result of loop_only_exit_p to
	number_of_iterations_cond.

	* gcc.c-torture/execute/pr27285.c: New test.

--- tree-ssa-loop-niter.c	(revision 112483)
+++ tree-ssa-loop-niter.c	(revision 112484)
@@ -129,9 +129,9 @@ inverse (tree x, tree mask)
 /* Determines number of iterations of loop whose ending condition
    is IV <> FINAL.  TYPE is the type of the iv.  The number of
    iterations is stored to NITER.  NEVER_INFINITE is true if
-   we know that the loop cannot be infinite (we derived this
-   earlier, and possibly set NITER->assumptions to make sure this
-   is the case.  */
+   we know that the exit must be taken eventually, i.e., that the IV
+   ever reaches the value FINAL (we derived this earlier, and possibly set
+   NITER->assumptions to make sure this is the case).  */
 
 static bool
 number_of_iterations_ne (tree type, affine_iv *iv, tree final,
@@ -492,9 +492,9 @@ number_of_iterations_lt (tree type, affi
 /* Determines number of iterations of loop whose ending condition
    is IV0 <= IV1.  TYPE is the type of the iv.  The number of
    iterations is stored to NITER.  NEVER_INFINITE is true if
-   we know that the loop cannot be infinite (we derived this
+   we know that this condition must eventually become false (we derived this
    earlier, and possibly set NITER->assumptions to make sure this
-   is the case.  */
+   is the case).  */
 
 static bool
 number_of_iterations_le (tree type, affine_iv *iv0, affine_iv *iv1,
@@ -538,6 +538,11 @@ number_of_iterations_le (tree type, affi
    is IV0, the right-hand side is IV1.  Both induction variables must have
    type TYPE, which must be an integer or pointer type.  The steps of the
    ivs must be constants (or NULL_TREE, which is interpreted as constant zero).
+
+   ONLY_EXIT is true if we are sure this is the only way the loop could be
+   exited (including possibly non-returning function calls, exceptions, etc.)
+   -- in this case we can use the information whether the control induction
+   variables can overflow or not in a more efficient way.
    
    The results (number of iterations and assumptions as described in
    comments at struct tree_niter_desc in tree-flow.h) are stored to NITER.
@@ -546,7 +551,8 @@ number_of_iterations_le (tree type, affi
 
 static bool
 number_of_iterations_cond (tree type, affine_iv *iv0, enum tree_code code,
-			   affine_iv *iv1, struct tree_niter_desc *niter)
+			   affine_iv *iv1, struct tree_niter_desc *niter,
+			   bool only_exit)
 {
   bool never_infinite;
 
@@ -572,13 +578,30 @@ number_of_iterations_cond (tree type, af
       code = swap_tree_comparison (code);
     }
 
+  if (!only_exit)
+    {
+      /* If this is not the only possible exit from the loop, the information
+	 that the induction variables cannot overflow as derived from
+	 signedness analysis cannot be relied upon.  We use them e.g. in the
+	 following way:  given loop for (i = 0; i <= n; i++), if i is
+	 signed, it cannot overflow, thus this loop is equivalent to
+	 for (i = 0; i < n + 1; i++);  however, if n == MAX, but the loop
+	 is exited in some other way before i overflows, this transformation
+	 is incorrect (the new loop exits immediately).  */
+      iv0->no_overflow = false;
+      iv1->no_overflow = false;
+    }
+
   if (POINTER_TYPE_P (type))
     {
       /* Comparison of pointers is undefined unless both iv0 and iv1 point
 	 to the same object.  If they do, the control variable cannot wrap
 	 (as wrap around the bounds of memory will never return a pointer
 	 that would be guaranteed to point to the same object, even if we
-	 avoid undefined behavior by casting to size_t and back).  */
+	 avoid undefined behavior by casting to size_t and back).  The
+	 restrictions on pointer arithmetics and comparisons of pointers
+	 ensure that using the no-overflow assumptions is correct in this
+	 case even if ONLY_EXIT is false.  */
       iv0->no_overflow = true;
       iv1->no_overflow = true;
     }
@@ -963,6 +986,37 @@ simplify_using_outer_evolutions (struct 
   return expr;
 }
 
+/* Returns true if EXIT is the only possible exit from LOOP.  */
+
+static bool
+loop_only_exit_p (struct loop *loop, edge exit)
+{
+  basic_block *body;
+  block_stmt_iterator bsi;
+  unsigned i;
+  tree call;
+
+  if (exit != loop->single_exit)
+    return false;
+
+  body = get_loop_body (loop);
+  for (i = 0; i < loop->num_nodes; i++)
+    {
+      for (bsi = bsi_start (body[0]); !bsi_end_p (bsi); bsi_next (&bsi))
+	{
+	  call = get_call_expr_in (bsi_stmt (bsi));
+	  if (call && TREE_SIDE_EFFECTS (call))
+	    {
+	      free (body);
+	      return false;
+	    }
+	}
+    }
+
+  free (body);
+  return true;
+}
+
 /* Stores description of number of iterations of LOOP derived from
    EXIT (an exit edge of the LOOP) in NITER.  Returns true if some
    useful information could be derived (and fields of NITER has
@@ -1023,7 +1077,8 @@ number_of_iterations_exit (struct loop *
 
   iv0.base = expand_simple_operations (iv0.base);
   iv1.base = expand_simple_operations (iv1.base);
-  if (!number_of_iterations_cond (type, &iv0, code, &iv1, niter))
+  if (!number_of_iterations_cond (type, &iv0, code, &iv1, niter,
+				  loop_only_exit_p (loop, exit)))
     return false;
 
   if (optimize >= 3)
--- gcc/testsuite/gcc.c-torture/execute/pr27285.c	2006-04-19 19:21:31.748476000 +0200
+++ gcc/testsuite/gcc.c-torture/execute/pr27285.c	2006-04-24 17:00:35.000000000 +0200
@@ -0,0 +1,46 @@
+/* PR tree-optimization/27285 */
+
+extern void abort (void);
+
+struct S { unsigned char a, b, c, d[16]; };
+
+void __attribute__ ((noinline))
+foo (struct S *x, struct S *y)
+{
+  int a, b;
+  unsigned char c, *d, *e;
+
+  b = x->b;
+  d = x->d;
+  e = y->d;
+  a = 0;
+  while (b)
+    {
+      if (b >= 8)
+	{
+	  c = 0xff;
+	  b -= 8;
+	}
+      else
+	{
+	  c = 0xff << (8 - b);
+	  b = 0;
+	}
+
+      e[a] = d[a] & c;
+      a++;
+    }
+}
+
+int
+main (void)
+{
+  struct S x = { 0, 25, 0, { 0xaa, 0xbb, 0xcc, 0xdd }};
+  struct S y = { 0, 0, 0, { 0 }};
+
+  foo (&x, &y);
+  if (x.d[0] != y.d[0] || x.d[1] != y.d[1]
+      || x.d[2] != y.d[2] || (x.d[3] & 0x80) != y.d[3])
+    abort ();
+   return 0;
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- .cvsignore	21 Apr 2006 20:45:38 -0000	1.146
+++ .cvsignore	25 Apr 2006 10:16:22 -0000	1.147
@@ -1 +1 @@
-gcc-4.1.0-20060421.tar.bz2
+gcc-4.1.0-20060425.tar.bz2


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gcc41.spec	21 Apr 2006 20:45:38 -0000	1.53
+++ gcc41.spec	25 Apr 2006 10:16:22 -0000	1.54
@@ -1,6 +1,6 @@
-%define DATE 20060421
+%define DATE 20060425
 %define gcc_version 4.1.0
-%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
@@ -115,7 +115,7 @@
 Patch18: gcc41-objc-rh185398.patch
 Patch19: gcc41-pr22375.patch
 Patch20: gcc41-tests.patch
-Patch21: gcc41-pr26769.patch
+Patch21: gcc41-pr27218.patch
 Patch22: gcc41-ppc64-ldouble-stdarg.patch
 Patch23: gcc41-pr25874.patch
 Patch24: gcc41-pr25989.patch
@@ -127,6 +127,8 @@
 Patch30: gcc41-rh188944.patch
 Patch31: gcc41-rh137200.patch
 Patch32: gcc41-rh187450.patch
+Patch33: gcc41-pr27236.patch
+Patch34: gcc41-pr27285.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -426,7 +428,7 @@
 %patch18 -p0 -b .objc-rh185398~
 %patch19 -p0 -b .pr22375~
 %patch20 -p0 -b .tests~
-%patch21 -p0 -b .pr26769~
+%patch21 -p0 -b .pr27218~
 %patch22 -p0 -b .ppc64-ldouble-stdarg~
 %patch23 -p0 -b .pr25874~
 %patch24 -p0 -b .pr25989~
@@ -438,6 +440,8 @@
 %patch30 -p0 -b .rh188944~
 %patch31 -p0 -b .rh137200~
 %patch32 -p0 -b .rh187450~
+%patch33 -p0 -b .pr27236~
+%patch34 -p0 -b .pr27285~
 
 sed -i -e 's/4\.1\.1/4.1.0/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1462,6 +1466,19 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Tue Apr 25 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-11
+- update from gcc-4_1-branch (-r113149:113242)
+  - PRs c/25875, c/26774, fortran/18803, fortran/25597, fortran/25669,
+	fortran/26787, fortran/26822, fortran/26834, fortran/27089,
+	fortran/27113, fortran/27122, fortran/27124, target/21283,
+	target/26961
+- fix number of iterations computation (Zdenek Dvorak, #189376,
+  PR tree-optimization/27285)
+- fix handling of volatile in the inliner (Andrew Pinski, Richard Guenther,
+  PR tree-optimization/27236)
+- strip useless type conversions in the inliner (Andrew Pinski,
+  Richard Guenther, PR tree-optimization/27218)
+
 * Fri Apr 21 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-10
 - update from gcc-4_1-branch (-r113110:113149)
   - PRs libgcj/21941, libgcj/27170, libgcj/27231, libgfortran/27138,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- sources	21 Apr 2006 20:45:38 -0000	1.148
+++ sources	25 Apr 2006 10:16:22 -0000	1.149
@@ -1 +1 @@
-19e1f84413aad25f18300a7dfe37c4b8  gcc-4.1.0-20060421.tar.bz2
+128037919d9a93d4e2270b4cf8b8b862  gcc-4.1.0-20060425.tar.bz2


--- gcc41-pr26769.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 25 10:59:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 06:59:36 -0400
Subject: rpms/selinux-policy/devel .cvsignore,1.58,1.59 sources,1.62,1.63
Message-ID: <200604251059.k3PAxa67012361@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12331

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Apr 24 2006 Dan Walsh <dwalsh at redhat.com> 2.2.35-1
- Update to upstream
- Fix postun to only disable selinux on full removal of the packages



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	20 Apr 2006 17:43:20 -0000	1.58
+++ .cvsignore	25 Apr 2006 10:59:33 -0000	1.59
@@ -59,3 +59,4 @@
 serefpolicy-2.2.32.tgz
 serefpolicy-2.2.33.tgz
 serefpolicy-2.2.34.tgz
+selinux-policy-2.2.35-1.src.rpm


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	20 Apr 2006 17:43:20 -0000	1.62
+++ sources	25 Apr 2006 10:59:33 -0000	1.63
@@ -1 +1 @@
-5c1fa51a13bdb35dcf053a9b68072ff5  serefpolicy-2.2.34.tgz
+ed410c660b1006bdde6279eaf5c00e48  selinux-policy-2.2.35-1.src.rpm



From fedora-cvs-commits at redhat.com  Tue Apr 25 11:03:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 07:03:29 -0400
Subject: rpms/selinux-policy/devel .cvsignore,1.59,1.60 sources,1.63,1.64
Message-ID: <200604251103.k3PB3TZd012858@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12830

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Apr 24 2006 Dan Walsh <dwalsh at redhat.com> 2.2.35-1
- Update to upstream
- Fix postun to only disable selinux on full removal of the packages



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	25 Apr 2006 10:59:33 -0000	1.59
+++ .cvsignore	25 Apr 2006 11:03:01 -0000	1.60
@@ -60,3 +60,4 @@
 serefpolicy-2.2.33.tgz
 serefpolicy-2.2.34.tgz
 selinux-policy-2.2.35-1.src.rpm
+serefpolicy-2.2.35.tgz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	25 Apr 2006 10:59:33 -0000	1.63
+++ sources	25 Apr 2006 11:03:12 -0000	1.64
@@ -1 +1 @@
-ed410c660b1006bdde6279eaf5c00e48  selinux-policy-2.2.35-1.src.rpm
+103190de6de2c1ec076d4ebec1e9d758  serefpolicy-2.2.35.tgz



From fedora-cvs-commits at redhat.com  Tue Apr 25 11:08:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 07:08:08 -0400
Subject: rpms/gcc/devel gcc41-fortran-merge-glitch.patch, NONE,
	1.1 gcc41.spec, 1.54, 1.55
Message-ID: <200604251108.k3PB8819013352@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13288

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-fortran-merge-glitch.patch 
Log Message:
4.1.0-11


gcc41-fortran-merge-glitch.patch:
 trans-decl.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE gcc41-fortran-merge-glitch.patch ---
Fix a merge glitch.

--- gcc/fortran/trans-decl.c	2006-04-25 11:49:11.000000000 +0200
+++ gcc/fortran/trans-decl.c	2006-04-25 12:58:00.000000000 +0200
@@ -2504,7 +2504,8 @@ gfc_trans_deferred_vars (gfc_symbol * pr
 	  /* An automatic character length, pointer array result.  */
 	  if (proc_sym->ts.type == BT_CHARACTER
 		&& TREE_CODE (proc_sym->ts.cl->backend_decl) == VAR_DECL)
-	    fnbody = gfc_trans_dummy_character (proc_sym->ts.cl, fnbody);
+	    fnbody = gfc_trans_dummy_character (proc_sym, proc_sym->ts.cl,
+						fnbody);
 	}
       else if (proc_sym->ts.type == BT_CHARACTER)
 	{


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gcc41.spec	25 Apr 2006 10:16:22 -0000	1.54
+++ gcc41.spec	25 Apr 2006 11:08:06 -0000	1.55
@@ -129,6 +129,7 @@
 Patch32: gcc41-rh187450.patch
 Patch33: gcc41-pr27236.patch
 Patch34: gcc41-pr27285.patch
+Patch35: gcc41-fortran-merge-glitch.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -442,6 +443,7 @@
 %patch32 -p0 -b .rh187450~
 %patch33 -p0 -b .pr27236~
 %patch34 -p0 -b .pr27285~
+%patch35 -p0 -b .fortran-merge-glitch~
 
 sed -i -e 's/4\.1\.1/4.1.0/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c



From fedora-cvs-commits at redhat.com  Tue Apr 25 10:58:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 06:58:02 -0400
Subject: rpms/selinux-policy/devel policy-20060411.patch, 1.11,
	1.12 selinux-policy.spec, 1.179, 1.180
Message-ID: <200604251058.k3PAw2C9011698@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11649

Modified Files:
	policy-20060411.patch selinux-policy.spec 
Log Message:
* Mon Apr 24 2006 Dan Walsh <dwalsh at redhat.com> 2.2.35-1
- Update to upstream
- Fix postun to only disable selinux on full removal of the packages


policy-20060411.patch:
 config/appconfig-strict-mls/default_type |    1 
 policy/modules/admin/netutils.te         |    2 -
 policy/modules/admin/usermanage.te       |    1 
 policy/modules/apps/mono.te              |    3 +-
 policy/modules/kernel/corecommands.fc    |    1 
 policy/modules/kernel/domain.te          |    1 
 policy/modules/kernel/files.if           |   35 +++++++++++++++++++++++++++
 policy/modules/kernel/filesystem.if      |    6 ++--
 policy/modules/kernel/kernel.te          |    1 
 policy/modules/kernel/terminal.if        |    2 -
 policy/modules/services/cups.te          |    1 
 policy/modules/services/pegasus.te       |    8 ++++++
 policy/modules/services/procmail.te      |    2 -
 policy/modules/services/samba.te         |    2 -
 policy/modules/system/authlogin.te       |    2 +
 policy/modules/system/init.te            |    1 
 policy/modules/system/libraries.fc       |   18 +++-----------
 policy/modules/system/logging.te         |    4 +--
 policy/modules/system/sysnetwork.te      |    3 ++
 policy/modules/system/unconfined.if      |   39 +++++++++++++++++++++++++++++++
 policy/modules/system/userdomain.te      |   24 +++++++++++++++++--
 policy/modules/system/xen.if             |   18 ++++++++++++++
 policy/modules/system/xen.te             |    1 
 policy/rolemap                           |    1 
 policy/users                             |    6 ++--
 25 files changed, 154 insertions(+), 29 deletions(-)

Index: policy-20060411.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060411.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- policy-20060411.patch	21 Apr 2006 10:57:09 -0000	1.11
+++ policy-20060411.patch	25 Apr 2006 10:57:57 -0000	1.12
@@ -1,14 +1,14 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/default_type serefpolicy-2.2.34/config/appconfig-strict-mls/default_type
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/default_type serefpolicy-2.2.35/config/appconfig-strict-mls/default_type
 --- nsaserefpolicy/config/appconfig-strict-mls/default_type	2006-01-06 17:55:17.000000000 -0500
-+++ serefpolicy-2.2.34/config/appconfig-strict-mls/default_type	2006-04-20 14:04:12.000000000 -0400
++++ serefpolicy-2.2.35/config/appconfig-strict-mls/default_type	2006-04-24 20:16:38.000000000 -0400
 @@ -2,3 +2,4 @@
  secadm_r:secadm_t
  staff_r:staff_t
  user_r:user_t
 +auditadm_r:auditadm_t
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.2.34/policy/modules/admin/netutils.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.2.35/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2006-04-06 14:05:24.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/admin/netutils.te	2006-04-20 14:04:12.000000000 -0400
++++ serefpolicy-2.2.35/policy/modules/admin/netutils.te	2006-04-24 20:16:38.000000000 -0400
 @@ -97,7 +97,7 @@
  
  allow ping_t self:tcp_socket create_socket_perms;
@@ -18,9 +18,9 @@
  
  corenet_tcp_sendrecv_all_if(ping_t)
  corenet_udp_sendrecv_all_if(ping_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.2.34/policy/modules/admin/usermanage.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.2.35/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-04-18 22:49:59.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/admin/usermanage.te	2006-04-20 14:04:12.000000000 -0400
++++ serefpolicy-2.2.35/policy/modules/admin/usermanage.te	2006-04-24 20:16:38.000000000 -0400
 @@ -514,6 +514,7 @@
  # Add/remove user home directories
  userdom_home_filetrans_generic_user_home_dir(useradd_t)
@@ -29,9 +29,9 @@
  userdom_manage_staff_home_dirs(useradd_t)
  userdom_generic_user_home_dir_filetrans_generic_user_home_content(useradd_t,notdevfile_class_set)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.2.34/policy/modules/apps/mono.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.2.35/policy/modules/apps/mono.te
 --- nsaserefpolicy/policy/modules/apps/mono.te	2006-04-18 22:49:59.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/apps/mono.te	2006-04-21 06:40:33.000000000 -0400
++++ serefpolicy-2.2.35/policy/modules/apps/mono.te	2006-04-24 20:16:38.000000000 -0400
 @@ -20,8 +20,9 @@
  ifdef(`targeted_policy',`
  	allow mono_t self:process { execheap execmem };
@@ -43,9 +43,9 @@
  	init_dbus_chat_script(mono_t)
  
  	optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.2.34/policy/modules/kernel/corecommands.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.2.35/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-04-18 22:49:59.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/kernel/corecommands.fc	2006-04-20 14:04:12.000000000 -0400
++++ serefpolicy-2.2.35/policy/modules/kernel/corecommands.fc	2006-04-24 20:16:38.000000000 -0400
 @@ -177,6 +177,7 @@
  ifdef(`distro_redhat', `
  /usr/lib/.*/program(/.*)?		gen_context(system_u:object_r:bin_t,s0)
@@ -54,9 +54,9 @@
  /usr/share/cvs/contrib/rcs2log	--	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/hwbrowser/hwbrowser -- gen_context(system_u:object_r:bin_t,s0)
  /usr/share/pwlib/make/ptlib-config --	gen_context(system_u:object_r:bin_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-2.2.34/policy/modules/kernel/domain.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-2.2.35/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2006-04-20 08:17:36.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/kernel/domain.te	2006-04-20 14:04:12.000000000 -0400
++++ serefpolicy-2.2.35/policy/modules/kernel/domain.te	2006-04-24 20:16:38.000000000 -0400
 @@ -96,6 +96,7 @@
  	# workaround until role dominance is fixed in
  	# the module compiler
@@ -65,9 +65,9 @@
  	role sysadm_r types domain;
  	role user_r types domain;
  	role staff_r types domain;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.34/policy/modules/kernel/files.if
---- nsaserefpolicy/policy/modules/kernel/files.if	2006-04-18 22:49:59.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/kernel/files.if	2006-04-20 14:04:12.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.35/policy/modules/kernel/files.if
+--- nsaserefpolicy/policy/modules/kernel/files.if	2006-04-24 20:14:39.000000000 -0400
++++ serefpolicy-2.2.35/policy/modules/kernel/files.if	2006-04-24 20:16:38.000000000 -0400
 @@ -1679,6 +1679,21 @@
  ')
  
@@ -114,9 +114,9 @@
 +       allow $1 boot_t:file { getattr read };
 +       allow $1 boot_t:lnk_file { getattr read };
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.34/policy/modules/kernel/filesystem.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.35/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2006-04-18 22:49:59.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/kernel/filesystem.if	2006-04-20 14:54:31.000000000 -0400
++++ serefpolicy-2.2.35/policy/modules/kernel/filesystem.if	2006-04-24 20:16:38.000000000 -0400
 @@ -609,7 +609,7 @@
  		attribute noxattrfs;
  	')
@@ -144,9 +144,9 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.2.34/policy/modules/kernel/kernel.te
---- nsaserefpolicy/policy/modules/kernel/kernel.te	2006-04-18 22:49:59.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/kernel/kernel.te	2006-04-20 14:04:12.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.2.35/policy/modules/kernel/kernel.te
+--- nsaserefpolicy/policy/modules/kernel/kernel.te	2006-04-24 20:14:39.000000000 -0400
++++ serefpolicy-2.2.35/policy/modules/kernel/kernel.te	2006-04-24 20:16:38.000000000 -0400
 @@ -28,6 +28,7 @@
  
  ifdef(`enable_mls',`
@@ -155,9 +155,9 @@
  ')
  
  #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.2.34/policy/modules/kernel/terminal.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.2.35/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-02-13 17:05:45.000000000 -0500
-+++ serefpolicy-2.2.34/policy/modules/kernel/terminal.if	2006-04-20 14:04:12.000000000 -0400
++++ serefpolicy-2.2.35/policy/modules/kernel/terminal.if	2006-04-24 20:16:38.000000000 -0400
 @@ -174,7 +174,7 @@
  	')
  
@@ -167,9 +167,9 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.34/policy/modules/services/cups.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.35/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-04-12 13:44:36.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/services/cups.te	2006-04-20 15:02:03.000000000 -0400
++++ serefpolicy-2.2.35/policy/modules/services/cups.te	2006-04-24 20:16:38.000000000 -0400
 @@ -79,6 +79,7 @@
  allow cupsd_t self:process { setsched signal_perms };
  allow cupsd_t self:fifo_file rw_file_perms;
@@ -178,9 +178,9 @@
  allow cupsd_t self:unix_dgram_socket create_socket_perms;
  allow cupsd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
  allow cupsd_t self:netlink_route_socket { r_netlink_socket_perms };
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.34/policy/modules/services/pegasus.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.35/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/services/pegasus.te	2006-04-20 14:04:12.000000000 -0400
++++ serefpolicy-2.2.35/policy/modules/services/pegasus.te	2006-04-24 20:16:38.000000000 -0400
 @@ -79,11 +79,16 @@
  corenet_tcp_connect_pegasus_https_port(pegasus_t)
  corenet_tcp_connect_generic_port(pegasus_t)
@@ -215,9 +215,9 @@
  ')
  
  optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.2.34/policy/modules/services/procmail.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.2.35/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2006-03-24 11:15:50.000000000 -0500
-+++ serefpolicy-2.2.34/policy/modules/services/procmail.te	2006-04-20 15:06:02.000000000 -0400
++++ serefpolicy-2.2.35/policy/modules/services/procmail.te	2006-04-24 20:16:38.000000000 -0400
 @@ -95,13 +95,13 @@
  
  optional_policy(`
@@ -233,9 +233,9 @@
  
  	files_getattr_tmp_dirs(procmail_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.34/policy/modules/services/samba.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.35/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2006-04-19 12:23:07.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/services/samba.te	2006-04-20 14:04:12.000000000 -0400
++++ serefpolicy-2.2.35/policy/modules/services/samba.te	2006-04-24 20:16:38.000000000 -0400
 @@ -106,8 +106,8 @@
  files_tmp_filetrans(samba_net_t, samba_net_tmp_t, { file dir })
  
@@ -246,9 +246,9 @@
  
  kernel_read_proc_symlinks(samba_net_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.34/policy/modules/system/authlogin.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.35/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2006-04-19 12:23:07.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/system/authlogin.te	2006-04-20 14:04:12.000000000 -0400
++++ serefpolicy-2.2.35/policy/modules/system/authlogin.te	2006-04-24 20:16:38.000000000 -0400
 @@ -188,6 +188,8 @@
  storage_setattr_scsi_generic_dev(pam_console_t)
  
@@ -258,9 +258,9 @@
  term_setattr_console(pam_console_t)
  term_getattr_unallocated_ttys(pam_console_t)
  term_setattr_unallocated_ttys(pam_console_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.34/policy/modules/system/init.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.35/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2006-04-20 08:17:40.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/system/init.te	2006-04-20 14:04:12.000000000 -0400
++++ serefpolicy-2.2.35/policy/modules/system/init.te	2006-04-24 20:16:38.000000000 -0400
 @@ -348,6 +348,7 @@
  files_mounton_isid_type_dirs(initrc_t)
  files_list_default(initrc_t)
@@ -269,10 +269,10 @@
  
  libs_rw_ld_so_cache(initrc_t)
  libs_use_ld_so(initrc_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.34/policy/modules/system/libraries.fc
---- nsaserefpolicy/policy/modules/system/libraries.fc	2006-04-19 12:23:07.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/system/libraries.fc	2006-04-20 14:04:21.000000000 -0400
-@@ -66,13 +66,8 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.35/policy/modules/system/libraries.fc
+--- nsaserefpolicy/policy/modules/system/libraries.fc	2006-04-24 20:14:40.000000000 -0400
++++ serefpolicy-2.2.35/policy/modules/system/libraries.fc	2006-04-24 20:16:38.000000000 -0400
+@@ -71,13 +71,8 @@
  
  /usr/(.*/)?nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
@@ -286,7 +286,7 @@
  /usr/(.*/)?lib(64)?(/.*)?/nvidia/.*\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libsipphoneapi\.so.*	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
  /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -99,7 +94,6 @@
+@@ -104,7 +99,6 @@
  /usr/lib(64)?/xorg/modules/extensions/nvidia(-[^/]*)?/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  
  ifdef(`distro_redhat',`
@@ -294,7 +294,7 @@
  /usr/share/rhn/rhn_applet/eggtrayiconmodule\.so -- gen_context(system_u:object_r:shlib_t,s0)
  
  # The following are libraries with text relocations in need of execmod permissions
-@@ -113,7 +107,7 @@
+@@ -118,7 +112,7 @@
  /usr/lib(64)?/libstdc\+\+\.so\.2\.7\.2\.8 --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libg\+\+\.so\.2\.7\.2\.8	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libglide3\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -303,7 +303,7 @@
  /usr/lib(64)?/libdv\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/helix/plugins/oggfformat\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/helix/plugins/theorarend\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -198,16 +192,12 @@
+@@ -203,16 +197,12 @@
  /usr/(.*/)?jre.*/libdeploy.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/(.*/)?jre.*/libjvm.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
@@ -323,9 +323,9 @@
  #
  # /var
  #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.2.34/policy/modules/system/logging.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.2.35/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2006-04-06 15:32:43.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/system/logging.te	2006-04-20 14:04:12.000000000 -0400
++++ serefpolicy-2.2.35/policy/modules/system/logging.te	2006-04-24 20:16:38.000000000 -0400
 @@ -140,7 +140,7 @@
  init_use_fds(auditd_t)
  init_exec(auditd_t)
@@ -344,9 +344,9 @@
  # Allow syslog to a terminal
  term_write_unallocated_ttys(syslogd_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.2.34/policy/modules/system/sysnetwork.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.2.35/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2006-03-24 11:15:53.000000000 -0500
-+++ serefpolicy-2.2.34/policy/modules/system/sysnetwork.te	2006-04-20 14:04:12.000000000 -0400
++++ serefpolicy-2.2.35/policy/modules/system/sysnetwork.te	2006-04-24 20:36:46.000000000 -0400
 @@ -248,6 +248,7 @@
  
  optional_policy(`
@@ -355,15 +355,23 @@
  ')
  
  ########################################
-@@ -346,4 +347,5 @@
+@@ -285,6 +286,7 @@
+ kernel_read_system_state(ifconfig_t)
+ kernel_read_network_state(ifconfig_t)
+ kernel_search_network_sysctl(ifconfig_t)
++kernel_rw_net_sysctls(ifconfig_t)
+ 
+ corenet_rw_tun_tap_dev(ifconfig_t)
+ 
+@@ -346,4 +348,5 @@
  
  optional_policy(`
  	xen_append_log(ifconfig_t)
 +	xen_dontaudit_rw_unix_stream_sockets(ifconfig_t)
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.34/policy/modules/system/unconfined.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.35/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-04-12 13:44:38.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/system/unconfined.if	2006-04-21 06:40:24.000000000 -0400
++++ serefpolicy-2.2.35/policy/modules/system/unconfined.if	2006-04-24 20:16:38.000000000 -0400
 @@ -224,6 +224,24 @@
  
  ########################################
@@ -417,9 +425,9 @@
  ##	Add an alias type to the unconfined domain.
  ## </summary>
  ## <desc>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.34/policy/modules/system/userdomain.te
---- nsaserefpolicy/policy/modules/system/userdomain.te	2006-04-20 08:17:40.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/system/userdomain.te	2006-04-20 14:04:12.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.35/policy/modules/system/userdomain.te
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2006-04-24 20:14:40.000000000 -0400
++++ serefpolicy-2.2.35/policy/modules/system/userdomain.te	2006-04-24 20:16:38.000000000 -0400
 @@ -6,6 +6,7 @@
  
  	ifdef(`enable_mls',`
@@ -491,7 +499,7 @@
  	', `
  		logging_read_audit_log(sysadm_t)
  		logging_run_auditctl(sysadm_t,sysadm_r,admin_terminal)
-@@ -236,6 +254,7 @@
+@@ -240,6 +258,7 @@
  
  		ifdef(`enable_mls',`
  			consoletype_exec(secadm_t)
@@ -499,7 +507,7 @@
  		')
  	')
  
-@@ -248,6 +267,7 @@
+@@ -252,6 +271,7 @@
  
  		ifdef(`enable_mls',`
  			dmesg_exec(secadm_t)
@@ -507,9 +515,9 @@
  		')
  	')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.2.34/policy/modules/system/xen.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.2.35/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2006-03-23 16:08:51.000000000 -0500
-+++ serefpolicy-2.2.34/policy/modules/system/xen.if	2006-04-20 14:04:12.000000000 -0400
++++ serefpolicy-2.2.35/policy/modules/system/xen.if	2006-04-24 20:16:38.000000000 -0400
 @@ -47,6 +47,24 @@
  
  ########################################
@@ -535,9 +543,9 @@
  ##	Connect to xenstored over an unix stream socket.
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.2.34/policy/modules/system/xen.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.2.35/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-04-18 22:50:01.000000000 -0400
-+++ serefpolicy-2.2.34/policy/modules/system/xen.te	2006-04-20 14:04:12.000000000 -0400
++++ serefpolicy-2.2.35/policy/modules/system/xen.te	2006-04-24 20:16:38.000000000 -0400
 @@ -125,6 +125,7 @@
  
  files_read_etc_files(xend_t)
@@ -546,9 +554,9 @@
  
  storage_raw_read_fixed_disk(xend_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/rolemap serefpolicy-2.2.34/policy/rolemap
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/rolemap serefpolicy-2.2.35/policy/rolemap
 --- nsaserefpolicy/policy/rolemap	2006-01-26 15:38:41.000000000 -0500
-+++ serefpolicy-2.2.34/policy/rolemap	2006-04-20 14:04:12.000000000 -0400
++++ serefpolicy-2.2.35/policy/rolemap	2006-04-24 20:16:38.000000000 -0400
 @@ -15,5 +15,6 @@
  
  	ifdef(`enable_mls',`
@@ -556,9 +564,9 @@
 +		auditadm_t auditadm auditadm_t
  	')
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.2.34/policy/users
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.2.35/policy/users
 --- nsaserefpolicy/policy/users	2006-02-15 17:02:30.000000000 -0500
-+++ serefpolicy-2.2.34/policy/users	2006-04-20 14:04:12.000000000 -0400
++++ serefpolicy-2.2.35/policy/users	2006-04-24 20:16:38.000000000 -0400
 @@ -29,7 +29,7 @@
  gen_user(user_u, user, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255)
  ',`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- selinux-policy.spec	21 Apr 2006 10:57:09 -0000	1.179
+++ selinux-policy.spec	25 Apr 2006 10:57:57 -0000	1.180
@@ -15,8 +15,8 @@
 %define CHECKPOLICYVER 1.30.1-2
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.34
-Release: 3
+Version: 2.2.35
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -234,11 +234,13 @@
 fi
 
 %postun
-setenforce 0 2> /dev/null
-if [ ! -s /etc/selinux/config ]; then
-	echo "SELINUX=disabled" > /etc/selinux/config
-else
-	sed -i 's/^SELINUX=.*/SELINUX=disabled/g' /etc/selinux/config
+if [ $1 = 0 ]; then
+	setenforce 0 2> /dev/null
+	if [ ! -s /etc/selinux/config ]; then
+		echo "SELINUX=disabled" > /etc/selinux/config
+	else
+		sed -i 's/^SELINUX=.*/SELINUX=disabled/g' /etc/selinux/config
+	fi
 fi
 
 
@@ -330,6 +332,10 @@
 %endif
 
 %changelog
+* Mon Apr 24 2006 Dan Walsh <dwalsh at redhat.com> 2.2.35-1
+- Update to upstream
+- Fix postun to only disable selinux on full removal of the packages
+
 * Fri Apr 21 2006 Dan Walsh <dwalsh at redhat.com> 2.2.34-3
 - Allow mono to chat with unconfined
 



From fedora-cvs-commits at redhat.com  Tue Apr 25 12:22:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 08:22:07 -0400
Subject: rpms/tar/FC-5 tar-1.15.90-makeCheck.patch, NONE,
	1.1 tar-1.15.90.tar.gz.sig, NONE, 1.1 .cvsignore, 1.7,
	1.8 sources, 1.8, 1.9 tar.spec, 1.32,
	1.33 tar-1.15.1-gcc4.patch, 1.1,
	NONE tar-1.15.1-heapOverflow.patch, 1.1,
	NONE tar-1.15.1-lseek.patch, 1.1,
	NONE tar-1.15.1-makeCheck.patch, 1.2,
	NONE tar-1.15.1-newerOption.patch, 1.1,
	NONE tar-1.15.1-padCorrectly.patch, 1.1,
	NONE tar-1.15.1-sparseTotals.patch, 1.1,
	NONE tar-1.15.1.tar.gz.sig, 1.1, NONE
Message-ID: <200604251222.k3PCM7Zi023358@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/tar/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23271

Modified Files:
	.cvsignore sources tar.spec 
Added Files:
	tar-1.15.90-makeCheck.patch tar-1.15.90.tar.gz.sig 
Removed Files:
	tar-1.15.1-gcc4.patch tar-1.15.1-heapOverflow.patch 
	tar-1.15.1-lseek.patch tar-1.15.1-makeCheck.patch 
	tar-1.15.1-newerOption.patch tar-1.15.1-padCorrectly.patch 
	tar-1.15.1-sparseTotals.patch tar-1.15.1.tar.gz.sig 
Log Message:
upgrade


tar-1.15.90-makeCheck.patch:
 testsuite.at |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE tar-1.15.90-makeCheck.patch ---
--- tar-1.15.90/tests/testsuite.at.makeCheck	2006-04-25 10:51:26.000000000 +0200
+++ tar-1.15.90/tests/testsuite.at	2006-04-25 10:51:38.000000000 +0200
@@ -93,7 +93,7 @@
 m4_include([link01.at])
 
 m4_include([listed01.at])
-m4_include([listed02.at])
+#m4_include([listed02.at])
 
 m4_include([longv7.at])
 m4_include([long01.at])


--- NEW FILE tar-1.15.90.tar.gz.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tar/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Jan 2005 11:03:00 -0000	1.7
+++ .cvsignore	25 Apr 2006 12:22:04 -0000	1.8
@@ -1 +1,2 @@
-tar-1.15.1.tar.gz
+tar-1.15.90.tar.gz
+tar.1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tar/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Sep 2005 14:54:30 -0000	1.8
+++ sources	25 Apr 2006 12:22:04 -0000	1.9
@@ -1,2 +1,2 @@
-d87021366fe6488e9dc398fcdcb6ed7d  tar-1.15.1.tar.gz
+f7009caa98f15ed4efa2b2f7c4d702e0  tar-1.15.90.tar.gz
 ecf87e839c91a75ea9a84307455c0255  tar.1


Index: tar.spec
===================================================================
RCS file: /cvs/dist/rpms/tar/FC-5/tar.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- tar.spec	17 Feb 2006 10:52:23 -0000	1.32
+++ tar.spec	25 Apr 2006 12:22:04 -0000	1.33
@@ -1,24 +1,17 @@
 Summary: A GNU file archiving program.
 Name: tar
-Version: 1.15.1
-Release: 13
+Version: 1.15.90
+Release: 1.FC5
 License: GPL
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
 Source0: ftp://ftp.gnu.org/pub/gnu/tar/tar-%{version}.tar.gz
 Source1: ftp://ftp.gnu.org/pub/gnu/tar/tar-%{version}.tar.gz.sig
 Source2: tar.1
-Patch6: tar-1.14-nolibrt.patch
-Patch8: tar-1.14-loneZeroWarning.patch
-Patch9: tar-1.15.1-makeCheck.patch
-Patch10: tar-1.15.1-gcc4.patch
-Patch11: tar-1.15.1-lseek.patch
-Patch12: tar-1.15.1-sparseTotals.patch
-Patch13: tar-1.15.1-newerOption.patch
-Patch14: tar-1.15.1-padCorrectly.patch
-Patch15: tar-1.15.1-vfatTruncate.patch
-Patch16: tar-1.15.1-heapOverflow.patch
-
+Patch1: tar-1.14-nolibrt.patch
+Patch2: tar-1.14-loneZeroWarning.patch
+Patch3: tar-1.15.1-vfatTruncate.patch
+Patch4: tar-1.15.90-makeCheck.patch
 Prereq: info
 BuildRequires: autoconf automake gzip
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -37,16 +30,10 @@
 
 %prep
 %setup -q
-%patch6 -p1 -b .nolibrt
-%patch8 -p1 -b .loneZeroWarning
-%patch9 -p1 -b .makeCheck
-%patch10 -p1 -b .gcc4
-%patch11 -p1 -b .lseek
-%patch12 -p1 -b .sparseTotals
-%patch13 -p1 -b .newerOption
-%patch14 -p1 -b .padCorrectly
-%patch15 -p1 -b .vfatTruncate
-%patch16 -p0 -b .heapOverflow
+#%patch1 -p1 -b .nolibrt
+%patch2 -p1 -b .loneZeroWarning
+%patch3 -p1 -b .vfatTruncate
+%patch4 -p1 -b .makeCheck
 
 %build
 
@@ -117,6 +104,9 @@
 %{_infodir}/tar.info*
 
 %changelog
+* Tue Apr 25 2006 Peter Vrabec <pvrabec at redhat.com> 1.15.90-1.FC5
+- upgrade
+
 * Fri Feb 17 2006 Peter Vrabec <pvrabec at redhat.com> 1.15.1-13
 - fix heap overlfow bug CVE-2006-0300 (#181773)
 


--- tar-1.15.1-gcc4.patch DELETED ---


--- tar-1.15.1-heapOverflow.patch DELETED ---


--- tar-1.15.1-lseek.patch DELETED ---


--- tar-1.15.1-makeCheck.patch DELETED ---


--- tar-1.15.1-newerOption.patch DELETED ---


--- tar-1.15.1-padCorrectly.patch DELETED ---


--- tar-1.15.1-sparseTotals.patch DELETED ---


--- tar-1.15.1.tar.gz.sig DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 25 12:22:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 08:22:49 -0400
Subject: rpms/kernel/FC-5 linux-2.6-ppc32-check-legacy-io.patch, NONE,
	1.1 kernel-2.6.spec, 1.2100, 1.2101
Message-ID: <200604251222.k3PCMn6S023674@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23637

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-ppc32-check-legacy-io.patch 
Log Message:
Don't poke at legacy I/O on Mac32

linux-2.6-ppc32-check-legacy-io.patch:
 arch/powerpc/kernel/setup-common.c |    8 ++++++++
 arch/powerpc/kernel/setup_64.c     |    8 --------
 drivers/block/floppy.c             |    2 +-
 drivers/input/serio/i8042-io.h     |    4 ++--
 include/asm-powerpc/io.h           |    6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

--- NEW FILE linux-2.6-ppc32-check-legacy-io.patch ---
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 1d93e73..684ab1d 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -469,3 +469,11 @@ static int __init early_xmon(char *p)
 }
 early_param("xmon", early_xmon);
 #endif
+
+int check_legacy_ioport(unsigned long base_port)
+{
+	if (ppc_md.check_legacy_ioport == NULL)
+		return 0;
+	return ppc_md.check_legacy_ioport(base_port);
+}
+EXPORT_SYMBOL(check_legacy_ioport);
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 13e91c4..4467c49 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -594,14 +594,6 @@ void ppc64_terminate_msg(unsigned int sr
 	printk("[terminate]%04x %s\n", src, msg);
 }
 
-int check_legacy_ioport(unsigned long base_port)
-{
-	if (ppc_md.check_legacy_ioport == NULL)
-		return 0;
-	return ppc_md.check_legacy_ioport(base_port);
-}
-EXPORT_SYMBOL(check_legacy_ioport);
-
 void cpu_die(void)
 {
 	if (ppc_md.cpu_die)
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index bedb689..dff1e67 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4301,7 +4301,7 @@ #endif
 	}
 
 	use_virtual_dma = can_use_virtual_dma & 1;
-#if defined(CONFIG_PPC64)
+#if defined(CONFIG_PPC_MERGE)
 	if (check_legacy_ioport(FDC1)) {
 		del_timer(&fd_timeout);
 		err = -ENODEV;
diff --git a/drivers/input/serio/i8042-io.h b/drivers/input/serio/i8042-io.h
index 9a92216..cc21914 100644
--- a/drivers/input/serio/i8042-io.h
+++ b/drivers/input/serio/i8042-io.h
@@ -67,14 +67,14 @@ static inline int i8042_platform_init(vo
  * On some platforms touching the i8042 data register region can do really
  * bad things. Because of this the region is always reserved on such boxes.
  */
-#if !defined(__sh__) && !defined(__alpha__) && !defined(__mips__) && !defined(CONFIG_PPC64)
+#if !defined(__sh__) && !defined(__alpha__) && !defined(__mips__) && !defined(CONFIG_PPC_MERGE)
 	if (!request_region(I8042_DATA_REG, 16, "i8042"))
 		return -EBUSY;
 #endif
 
         i8042_reset = 1;
 
-#if defined(CONFIG_PPC64)
+#if defined(CONFIG_PPC_MERGE)
 	if (check_legacy_ioport(I8042_DATA_REG))
 		return -EBUSY;
 	if (!request_region(I8042_DATA_REG, 16, "i8042"))
diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h
index 68efbea..f1c2469 100644
--- a/include/asm-powerpc/io.h
+++ b/include/asm-powerpc/io.h
@@ -9,6 +9,9 @@ #ifdef __KERNEL__
  * 2 of the License, or (at your option) any later version.
  */
 
+/* Check of existence of legacy devices */
+extern int check_legacy_ioport(unsigned long base_port);
+
 #ifndef CONFIG_PPC64
 #include <asm-ppc/io.h>
 #else
@@ -437,9 +440,6 @@ #define dma_cache_inv(_start,_size)		do 
 #define dma_cache_wback(_start,_size)		do { } while (0)
 #define dma_cache_wback_inv(_start,_size)	do { } while (0)
 
-/* Check of existence of legacy devices */
-extern int check_legacy_ioport(unsigned long base_port);
-
 
 /*
  * Convert a physical pointer to a virtual kernel pointer for /dev/mem


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2100
retrieving revision 1.2101
diff -u -r1.2100 -r1.2101
--- kernel-2.6.spec	25 Apr 2006 04:30:17 -0000	1.2100
+++ kernel-2.6.spec	25 Apr 2006 12:22:46 -0000	1.2101
@@ -241,6 +241,7 @@
 Patch313: linux-2.6-hvc-rtas-console.patch
 Patch314: linux-2.6-ppc-rtas-check.patch
 Patch317: linux-2.6-ppc-iseries-input-layer.patch
+Patch318: linux-2.6-ppc32-check-legacy-io.patch
 
 # 400 - 499   ia64
 # 500 - 599   s390(x)
@@ -786,6 +787,8 @@
 %patch314 -p1
 # No input layer on iseries
 %patch317 -p1
+# check_legacy_ioport() on ppc32
+%patch318 -p1
 
 #
 # Xen
@@ -1694,6 +1697,9 @@
 %endif
 
 %changelog
+* Tue Apr 25 2006 David Woodhouse <dwmw2 at redhat.com>
+- Use check_legacy_ioport() even on 32-bit PPC kernel
+
 * Tue Apr 25 2006 Dave Jones <davej at redhat.com>
 - Enable DVB in the 586 kernel. (#188227)
 - Fix up SCSI errors with mymusix usb mp3 player (#186187)



From fedora-cvs-commits at redhat.com  Tue Apr 25 12:38:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 08:38:58 -0400
Subject: rpms/cups/devel cups-includeifexists.patch, NONE, 1.1 cups.spec,
	1.168, 1.169 pdftops.conf, 1.1, 1.2
Message-ID: <200604251238.k3PCcws1027483@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27431

Modified Files:
	cups.spec pdftops.conf 
Added Files:
	cups-includeifexists.patch 
Log Message:
* Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com>
- Patch pdftops to understand 'includeifexists', and use that in the
  pdftops.conf file (bug #189809).


cups-includeifexists.patch:
 GlobalParams.cxx |   11 +++++++++++
 1 files changed, 11 insertions(+)

--- NEW FILE cups-includeifexists.patch ---
--- cups-1.2rc3/pdftops/GlobalParams.cxx.includeifexists	2006-04-25 13:19:09.000000000 +0100
+++ cups-1.2rc3/pdftops/GlobalParams.cxx	2006-04-25 13:19:12.000000000 +0100
@@ -536,6 +536,17 @@
 	  error(-1, "Bad 'include' config file command (%s:%d)",
 		fileName->getCString(), line);
 	}
+      } else if (!cmd->cmp("includeifexists")) {
+	if (tokens->getLength() == 2) {
+	  incFile = (GString *)tokens->get(1);
+	  if ((f2 = fopen(incFile->getCString(), "r"))) {
+	    parseFile(incFile, f2);
+	    fclose(f2);
+	  }
+	} else {
+	  error(-1, "Bad 'includeifexists' config file command (%s:%d)",
+		fileName->getCString(), line);
+	}
       } else if (!cmd->cmp("nameToUnicode")) {
 	parseNameToUnicode(tokens, fileName, line);
       } else if (!cmd->cmp("cidToUnicode")) {


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- cups.spec	24 Apr 2006 16:49:05 -0000	1.168
+++ cups.spec	25 Apr 2006 12:38:48 -0000	1.169
@@ -27,6 +27,7 @@
 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
 Patch8: cups-logfileperm.patch
 Patch9: cups-1.1.17-rcp.patch
@@ -114,6 +115,7 @@
 %patch3 -p1 -b .system-auth
 %patch4 -p1 -b .backend
 %patch5 -p1 -b .ext
+%patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
 %patch8 -p1 -b .logfileperm
 %patch9 -p1 -b .rcp
@@ -384,6 +386,10 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com>
+- Patch pdftops to understand 'includeifexists', and use that in the
+  pdftops.conf file (bug #189809).
+
 * Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.5.rc3.1
 - 1.2rc3.
 - Ship an snmp.conf.


Index: pdftops.conf
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/pdftops.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pdftops.conf	11 Apr 2006 17:06:44 -0000	1.1
+++ pdftops.conf	25 Apr 2006 12:38:48 -0000	1.2
@@ -1,4 +1,4 @@
-include /usr/share/xpdf/japanese/add-to-xpdfrc
-include /usr/share/xpdf/korean/add-to-xpdfrc
-include /usr/share/xpdf/chinese-simplified/add-to-xpdfrc
-include /usr/share/xpdf/chinese-traditional/add-to-xpdfrc
+includeifexists /usr/share/xpdf/japanese/add-to-xpdfrc
+includeifexists /usr/share/xpdf/korean/add-to-xpdfrc
+includeifexists /usr/share/xpdf/chinese-simplified/add-to-xpdfrc
+includeifexists /usr/share/xpdf/chinese-traditional/add-to-xpdfrc



From fedora-cvs-commits at redhat.com  Tue Apr 25 11:53:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 07:53:46 -0400
Subject: rpms/sane-backends/devel sane-backends-1.0.17-newmodels.patch, NONE,
	1.1 sane-backends.spec, 1.61, 1.62
Message-ID: <200604251153.k3PBrkjB028242@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/sane-backends/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28227

Modified Files:
	sane-backends.spec 
Added Files:
	sane-backends-1.0.17-newmodels.patch 
Log Message:
add support for Canon Lide 60 scanner (#189726)


sane-backends-1.0.17-newmodels.patch:
 libsane.usermap |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE sane-backends-1.0.17-newmodels.patch ---
--- sane-backends-1.0.17/tools/hotplug/libsane.usermap.newmodels	2005-12-06 16:12:36.000000000 +0100
+++ sane-backends-1.0.17/tools/hotplug/libsane.usermap	2006-04-25 13:49:57.000000000 +0200
@@ -225,6 +225,8 @@
 libusbscanner             0x0003      0x04a9   0x2213    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
 # Canon Inc.|CanoScan 3000
 libusbscanner             0x0003      0x04a9   0x2215    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
+# Canon Inc.|LIDE 60
+libusbscanner             0x0003      0x04a9   0x221c    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
 # Canon Inc.|LIDE 25
 libusbscanner             0x0003      0x04a9   0x2220    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
 # Canon Inc.|FS4000US


Index: sane-backends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sane-backends.spec	5 Apr 2006 08:32:37 -0000	1.61
+++ sane-backends.spec	25 Apr 2006 11:53:44 -0000	1.62
@@ -4,14 +4,15 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.17
-Release: 8
+Release: 9
 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
 Source1: sane.png
 Patch1: sane-backends-1.0.11-rpath.patch
-Patch3: sane-backends-1.0.12-badcode.patch
-Patch5: sane-backends-multilib.patch
+Patch2: sane-backends-1.0.12-badcode.patch
+Patch3: sane-backends-multilib.patch
+Patch4: sane-backends-1.0.17-newmodels.patch
 URL: http://www.sane-project.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
 BuildRequires: tetex-latex libusb-devel libieee1284-devel libjpeg-devel
@@ -65,8 +66,9 @@
 %setup -q
 
 %patch1 -p1 -b .rpath
-%patch3 -p1 -b .badcode
-%patch5 -p1 -b .multilib
+%patch2 -p1 -b .badcode
+%patch3 -p1 -b .multilib
+%patch4 -p1 -b .newmodels
 
 # Fix bug #62847.
 perl -pi -e 's,/dev/usbscanner0?,/dev/usb/scanner0,' backend/*.conf
@@ -155,6 +157,9 @@
 %{_docdir}/%{name}-%{version}/sane.ps
 
 %changelog
+* Tue Apr 25 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-9
+- add support for Canon Lide 60 scanner (#189726)
+
 * Wed Apr 05 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-8
 - don't use automake
 



From fedora-cvs-commits at redhat.com  Tue Apr 25 12:38:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 08:38:16 -0400
Subject: rpms/cups/FC-5 cups-includeifexists.patch, NONE, 1.1 cups.spec,
	1.162, 1.163 pdftops.conf, 1.1, 1.2
Message-ID: <200604251238.k3PCcG5v027358@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27320

Modified Files:
	cups.spec pdftops.conf 
Added Files:
	cups-includeifexists.patch 
Log Message:
* Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com>
- Patch pdftops to understand 'includeifexists', and use that in the
  pdftops.conf file (bug #189809).


cups-includeifexists.patch:
 GlobalParams.cxx |   11 +++++++++++
 1 files changed, 11 insertions(+)

--- NEW FILE cups-includeifexists.patch ---
--- cups-1.2rc3/pdftops/GlobalParams.cxx.includeifexists	2006-04-25 13:19:09.000000000 +0100
+++ cups-1.2rc3/pdftops/GlobalParams.cxx	2006-04-25 13:19:12.000000000 +0100
@@ -536,6 +536,17 @@
 	  error(-1, "Bad 'include' config file command (%s:%d)",
 		fileName->getCString(), line);
 	}
+      } else if (!cmd->cmp("includeifexists")) {
+	if (tokens->getLength() == 2) {
+	  incFile = (GString *)tokens->get(1);
+	  if ((f2 = fopen(incFile->getCString(), "r"))) {
+	    parseFile(incFile, f2);
+	    fclose(f2);
+	  }
+	} else {
+	  error(-1, "Bad 'includeifexists' config file command (%s:%d)",
+		fileName->getCString(), line);
+	}
       } else if (!cmd->cmp("nameToUnicode")) {
 	parseNameToUnicode(tokens, fileName, line);
       } else if (!cmd->cmp("cidToUnicode")) {


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- cups.spec	24 Apr 2006 17:09:26 -0000	1.162
+++ cups.spec	25 Apr 2006 12:38:12 -0000	1.163
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2
-Release: 0.4.1.%{beta}.1
+Release: 0.4.1.%{beta}.1.0.1
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
@@ -27,6 +27,7 @@
 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
 Patch8: cups-logfileperm.patch
 Patch9: cups-1.1.17-rcp.patch
@@ -119,6 +120,7 @@
 %patch3 -p1 -b .system-auth
 %patch4 -p1 -b .backend
 %patch5 -p1 -b .ext
+%patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
 %patch8 -p1 -b .logfileperm
 %patch9 -p1 -b .rcp
@@ -389,6 +391,10 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com>
+- Patch pdftops to understand 'includeifexists', and use that in the
+  pdftops.conf file (bug #189809).
+
 * Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.4.1.rc3.1
 - 1.2rc3.
 - Ship an snmp.conf.


Index: pdftops.conf
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/pdftops.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pdftops.conf	11 Apr 2006 17:09:20 -0000	1.1
+++ pdftops.conf	25 Apr 2006 12:38:12 -0000	1.2
@@ -1,4 +1,4 @@
-include /usr/share/xpdf/japanese/add-to-xpdfrc
-include /usr/share/xpdf/korean/add-to-xpdfrc
-include /usr/share/xpdf/chinese-simplified/add-to-xpdfrc
-include /usr/share/xpdf/chinese-traditional/add-to-xpdfrc
+includeifexists /usr/share/xpdf/japanese/add-to-xpdfrc
+includeifexists /usr/share/xpdf/korean/add-to-xpdfrc
+includeifexists /usr/share/xpdf/chinese-simplified/add-to-xpdfrc
+includeifexists /usr/share/xpdf/chinese-traditional/add-to-xpdfrc



From fedora-cvs-commits at redhat.com  Tue Apr 25 13:20:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 09:20:56 -0400
Subject: rpms/sane-backends/FC-5 sane-backends-1.0.17-newmodels.patch, NONE,
	1.1 sane-backends.spec, 1.59, 1.60
Message-ID: <200604251320.k3PDKuiD001037@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/sane-backends/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19494

Modified Files:
	sane-backends.spec 
Added Files:
	sane-backends-1.0.17-newmodels.patch 
Log Message:
add support for Canon Lide 60 scanner (#189726)


sane-backends-1.0.17-newmodels.patch:
 libsane.usermap |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE sane-backends-1.0.17-newmodels.patch ---
--- sane-backends-1.0.17/tools/hotplug/libsane.usermap.newmodels	2005-12-06 16:12:36.000000000 +0100
+++ sane-backends-1.0.17/tools/hotplug/libsane.usermap	2006-04-25 13:49:57.000000000 +0200
@@ -225,6 +225,8 @@
 libusbscanner             0x0003      0x04a9   0x2213    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
 # Canon Inc.|CanoScan 3000
 libusbscanner             0x0003      0x04a9   0x2215    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
+# Canon Inc.|LIDE 60
+libusbscanner             0x0003      0x04a9   0x221c    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
 # Canon Inc.|LIDE 25
 libusbscanner             0x0003      0x04a9   0x2220    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
 # Canon Inc.|FS4000US


Index: sane-backends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/FC-5/sane-backends.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sane-backends.spec	5 Apr 2006 08:34:27 -0000	1.59
+++ sane-backends.spec	25 Apr 2006 13:20:52 -0000	1.60
@@ -4,14 +4,15 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.17
-Release: 5.fc5.8
+Release: 5.fc5.9
 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
 Source1: sane.png
 Patch1: sane-backends-1.0.11-rpath.patch
-Patch3: sane-backends-1.0.12-badcode.patch
-Patch5: sane-backends-multilib.patch
+Patch2: sane-backends-1.0.12-badcode.patch
+Patch3: sane-backends-multilib.patch
+Patch4: sane-backends-1.0.17-newmodels.patch
 URL: http://www.sane-project.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
 BuildRequires: tetex-latex libusb-devel libieee1284-devel libjpeg-devel
@@ -65,8 +66,9 @@
 %setup -q
 
 %patch1 -p1 -b .rpath
-%patch3 -p1 -b .badcode
-%patch5 -p1 -b .multilib
+%patch2 -p1 -b .badcode
+%patch3 -p1 -b .multilib
+%patch4 -p1 -b .newmodels
 
 # Fix bug #62847.
 perl -pi -e 's,/dev/usbscanner0?,/dev/usb/scanner0,' backend/*.conf
@@ -155,7 +157,10 @@
 %{_docdir}/%{name}-%{version}/sane.ps
 
 %changelog
-* Wed Apr 05 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-5.fc5.8
+* Tue Apr 25 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-5.fc5.9
+- add support for Canon Lide 60 scanner (#189726)
+
+* Wed Apr 05 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-8
 - don't use automake
 
 * Tue Apr 04 2006 Nils Philippsen <nphilipp at redhat.com>



From fedora-cvs-commits at redhat.com  Tue Apr 25 13:23:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 09:23:36 -0400
Subject: rpms/ethereal/devel .cvsignore, 1.32, 1.33 ethereal.spec, 1.69,
	1.70 sources, 1.34, 1.35
Message-ID: <200604251323.k3PDNaJ0001724@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/ethereal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1684

Modified Files:
	.cvsignore ethereal.spec sources 
Log Message:
- update to 0.99.0


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ethereal/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	20 Apr 2006 09:19:43 -0000	1.32
+++ .cvsignore	25 Apr 2006 13:23:33 -0000	1.33
@@ -1 +1 @@
-ethereal-0.99.0-SVN-17918.tar.gz
+ethereal-0.99.0.tar.bz2


Index: ethereal.spec
===================================================================
RCS file: /cvs/dist/rpms/ethereal/devel/ethereal.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- ethereal.spec	25 Apr 2006 07:53:00 -0000	1.69
+++ ethereal.spec	25 Apr 2006 13:23:33 -0000	1.70
@@ -1,13 +1,13 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define svn_version 17918
+#%define svn_version 17918
 
 Summary: 	Network traffic analyzer
 Name: 		ethereal
 Version:	0.99.0
-Release: 	0.svn.2
+Release: 	1
 License: 	GPL
 Group: 		Applications/Internet
-Source0: 	http://www.ethereal.com/distribution/%{name}-%{version}-SVN-%{svn_version}.tar.gz
+Source0: 	http://www.ethereal.com/distribution/%{name}-%{version}.tar.bz2
 Source1:	ethereal.pam
 Source2:	ethereal.console
 Source3:	ethereal.desktop
@@ -50,7 +50,8 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-SVN-%{svn_version}
+#%setup -q -n %{name}-%{version}-SVN-%{svn_version}
+%setup -q -n %{name}-%{version}
 %patch1 -p1 -b .pie
 %patch3 -p1 
 #fixed upstream
@@ -166,6 +167,9 @@
 
 
 %changelog
+* Tue Apr 25 2006 Radek Vok??l <rvokal at redhat.com> 0.99.0-1
+- update to 0.99.0
+
 * Tue Apr 25 2006 Radek Vok??l <rvokal at redhat.com> 0.99.0-0.svn.2
 - fix crash when tuning columns (#189428)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ethereal/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	20 Apr 2006 09:19:43 -0000	1.34
+++ sources	25 Apr 2006 13:23:33 -0000	1.35
@@ -1 +1 @@
-be2679c335adf5b15d60ebbf7f4c0f1d  ethereal-0.99.0-SVN-17918.tar.gz
+f9905b9d347acdc05af664a7553f7f76  ethereal-0.99.0.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 25 13:24:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 09:24:25 -0400
Subject: rpms/ethereal/FC-5 .cvsignore, 1.30, 1.31 ethereal.spec, 1.67,
	1.68 sources, 1.32, 1.33
Message-ID: <200604251324.k3PDOPsQ002033@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/ethereal/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1997

Modified Files:
	.cvsignore ethereal.spec sources 
Log Message:
 - update to 0.99.0


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ethereal/FC-5/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	29 Dec 2005 11:10:40 -0000	1.30
+++ .cvsignore	25 Apr 2006 13:24:23 -0000	1.31
@@ -1 +1 @@
-ethereal-0.10.14.tar.bz2
+ethereal-0.99.0.tar.bz2


Index: ethereal.spec
===================================================================
RCS file: /cvs/dist/rpms/ethereal/FC-5/ethereal.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- ethereal.spec	25 Apr 2006 08:53:55 -0000	1.67
+++ ethereal.spec	25 Apr 2006 13:24:23 -0000	1.68
@@ -1,10 +1,9 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define svn_version 16880
 
 Summary: 	Network traffic analyzer
 Name: 		ethereal
-Version:	0.10.14
-Release: 	4
+Version:	0.99.0
+Release: 	fc5.1
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	http://www.ethereal.com/distribution/%{name}-%{version}.tar.bz2
@@ -13,7 +12,6 @@
 Source3:	ethereal.desktop
 Source4:	ethereal.png
 Patch1:		ethereal-0.10.13-pie.patch
-Patch2:		ethereal-gtk-dialog.patch
 Patch3:		ethereal-0.10.14-nfsv4-opts.patch
 Patch4:		ethereal-column.patch
 Url: 		http://www.ethereal.com/
@@ -53,7 +51,6 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch1 -p1 -b .pie
-%patch2 -p0 -b .gtk
 %patch3 -p1 
 %patch4 -p1
 
@@ -141,6 +138,7 @@
 %{_sbindir}/dftest
 %{_sbindir}/capinfos
 %{_sbindir}/randpkt
+%{_sbindir}/dumpcap
 %{python_sitelib}/*
 %{_libdir}/lib*
 %{_mandir}/man1/editcap.*
@@ -149,6 +147,7 @@
 %{_mandir}/man1/mergecap.*
 %{_mandir}/man1/text2pcap.*
 %{_mandir}/man1/capinfos.*
+%{_mandir}/man1/dumpcap.*
 %{_mandir}/man4/ethereal-filter.*
 %{_libdir}/ethereal
 %{_sysconfdir}/pam.d/ethereal
@@ -165,6 +164,9 @@
 
 
 %changelog
+* Tue Apr 25 2006 Radek Vok??l <rvokal at redhat.com> 0.99.0-fc5.1
+- update to 0.99.0
+
 * Tue Apr 25 2006 Radek Vok??l <rvokal at redhat.com> 0.10.14-4
 - fix crash when tuning columns (#189428)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ethereal/FC-5/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	29 Dec 2005 11:10:40 -0000	1.32
+++ sources	25 Apr 2006 13:24:23 -0000	1.33
@@ -1 +1 @@
-297f678c037f88429250830e924b8fa0  ethereal-0.10.14.tar.bz2
+f9905b9d347acdc05af664a7553f7f76  ethereal-0.99.0.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 25 12:40:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 08:40:03 -0400
Subject: rpms/cups/devel cups.spec,1.169,1.170
Message-ID: <200604251240.k3PCe3Cl027841@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27779

Modified Files:
	cups.spec 
Log Message:
1:1.2-0.5.rc3.2


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- cups.spec	25 Apr 2006 12:38:48 -0000	1.169
+++ cups.spec	25 Apr 2006 12:40:00 -0000	1.170
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2
-Release: 0.5.%{beta}.1
+Release: 0.5.%{beta}.2
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
@@ -386,7 +386,7 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com>
+* Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.5.rc3.2
 - Patch pdftops to understand 'includeifexists', and use that in the
   pdftops.conf file (bug #189809).
 



From fedora-cvs-commits at redhat.com  Tue Apr 25 14:09:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 10:09:43 -0400
Subject: rpms/cups/devel cups.spec,1.170,1.171
Message-ID: <200604251409.k3PE9h2H026972@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26928

Modified Files:
	cups.spec 
Log Message:
* Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com>
- Own /var/run/cups (bug #189561).



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- cups.spec	25 Apr 2006 12:40:00 -0000	1.170
+++ cups.spec	25 Apr 2006 14:09:40 -0000	1.171
@@ -301,6 +301,7 @@
 %files
 %defattr(-,root,root)
 %dir %attr(0755,root,nobody) /etc/cups
+%dir %attr(0755,root,lp) /var/run/cups
 %dir %attr(0511,lp,sys) /var/run/cups/certs
 %config(noreplace) %attr(0640,root,nobody) /etc/cups/cupsd.conf
 %attr(0640,root,nobody) /etc/cups/cupsd.conf.default
@@ -386,6 +387,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com>
+- Own /var/run/cups (bug #189561).
+
 * Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.5.rc3.2
 - Patch pdftops to understand 'includeifexists', and use that in the
   pdftops.conf file (bug #189809).



From fedora-cvs-commits at redhat.com  Tue Apr 25 14:09:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 10:09:54 -0400
Subject: rpms/wpa_supplicant/devel wpa_supplicant-ctrl-iface-hide-keys.patch,
	1.1, 1.2 wpa_supplicant.spec, 1.14, 1.15
Message-ID: <200604251409.k3PE9sWx027072@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/wpa_supplicant/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26995

Modified Files:
	wpa_supplicant-ctrl-iface-hide-keys.patch wpa_supplicant.spec 
Log Message:
* Tue Apr 11 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-8
- Fix control interface key obfuscation a bit



wpa_supplicant-ctrl-iface-hide-keys.patch:
 ctrl_iface.c |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

Index: wpa_supplicant-ctrl-iface-hide-keys.patch
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/devel/wpa_supplicant-ctrl-iface-hide-keys.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wpa_supplicant-ctrl-iface-hide-keys.patch	28 Feb 2006 05:03:44 -0000	1.1
+++ wpa_supplicant-ctrl-iface-hide-keys.patch	25 Apr 2006 14:09:50 -0000	1.2
@@ -14,8 +14,8 @@
  	*name++ = '\0';
  
 +	/* Only show passwords and keys if requested */
-+	if (!strncmp (name, "wep_key", 7) || !strcmp (name, "psk")
-+		|| !strcmp (name, "password") || !strcmp (name, "pin")) {
++	if (!strncmp (name, "wep_key", 7) || !strncmp (name, "psk", 3)
++		|| !strncmp (name, "password", 8) || !strncmp (name, "pin", 3)) {
 +		show_value = wpa_s->global->params.wpa_debug_show_keys;
 +	}
 +


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wpa_supplicant.spec	2 Apr 2006 15:05:15 -0000	1.14
+++ wpa_supplicant.spec	25 Apr 2006 14:09:50 -0000	1.15
@@ -2,7 +2,7 @@
 Name: wpa_supplicant
 Epoch: 1
 Version: 0.4.8
-Release: 7.fc6
+Release: 8.fc6
 License: GPL
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -127,6 +127,9 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* Tue Apr 11 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-8
+- Fix control interface key obfuscation a bit
+
 * Sun Apr  2 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-7
 - Work around older & incorrect drivers that return null-terminated SSIDs
 



From fedora-cvs-commits at redhat.com  Tue Apr 25 14:10:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 10:10:39 -0400
Subject: rpms/cups/FC-5 cups.spec,1.163,1.164
Message-ID: <200604251410.k3PEAdc9027225@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27167

Modified Files:
	cups.spec 
Log Message:
Restore release.


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- cups.spec	25 Apr 2006 12:38:12 -0000	1.163
+++ cups.spec	25 Apr 2006 14:10:36 -0000	1.164
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2
-Release: 0.4.1.%{beta}.1.0.1
+Release: 0.4.1.%{beta}.1
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 25 14:11:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 10:11:59 -0400
Subject: rpms/cups/FC-5 cups.spec,1.164,1.165
Message-ID: <200604251411.k3PEBxe3027463@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27393

Modified Files:
	cups.spec 
Log Message:
- Own /var/run/cups (bug #189561).


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- cups.spec	25 Apr 2006 14:10:36 -0000	1.164
+++ cups.spec	25 Apr 2006 14:11:48 -0000	1.165
@@ -306,6 +306,7 @@
 %files
 %defattr(-,root,root)
 %dir %attr(0755,root,nobody) /etc/cups
+%dir %attr(0755,root,lp) /var/run/cups
 %dir %attr(0511,lp,sys) /var/run/cups/certs
 %config(noreplace) %attr(0640,root,nobody) /etc/cups/cupsd.conf
 %attr(0640,root,nobody) /etc/cups/cupsd.conf.default
@@ -392,6 +393,7 @@
 
 %changelog
 * Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com>
+- Own /var/run/cups (bug #189561).
 - Patch pdftops to understand 'includeifexists', and use that in the
   pdftops.conf file (bug #189809).
 



From fedora-cvs-commits at redhat.com  Tue Apr 25 14:17:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 10:17:03 -0400
Subject: rpms/wpa_supplicant/devel wpa_supplicant.config, 1.2,
	1.3 wpa_supplicant.spec, 1.15, 1.16
Message-ID: <200604251417.k3PEH3iw004086@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/wpa_supplicant/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1042

Modified Files:
	wpa_supplicant.config wpa_supplicant.spec 
Log Message:
* Tue Apr 25 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-9
- Enable Wired driver, PKCS12, and Smartcard options (#rh189805#)




Index: wpa_supplicant.config
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/devel/wpa_supplicant.config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wpa_supplicant.config	27 Mar 2006 19:06:52 -0000	1.2
+++ wpa_supplicant.config	25 Apr 2006 14:17:01 -0000	1.3
@@ -6,6 +6,7 @@
 CONFIG_DRIVER_WEXT=y
 CONFIG_DRIVER_NDISWRAPPER=y
 CONFIG_DRIVER_PRISM54=y
+CONFIG_DRIVER_WIRED=y
 //CONFIG_DRIVER_BROADCOM=y
 //CONFIG_DRIVER_IPW=y
 //CONFIG_DRIVER_BSD=y
@@ -25,3 +26,5 @@
 CONFIG_EAP_PAX=y
 CONFIG_EAP_LEAP=y
 //CONFIG_PCSC=y
+CONFIG_PKCS12=y
+CONFIG_SMARTCARD=y


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wpa_supplicant.spec	25 Apr 2006 14:09:50 -0000	1.15
+++ wpa_supplicant.spec	25 Apr 2006 14:17:01 -0000	1.16
@@ -2,7 +2,7 @@
 Name: wpa_supplicant
 Epoch: 1
 Version: 0.4.8
-Release: 8.fc6
+Release: 9.fc6
 License: GPL
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -127,6 +127,9 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* Tue Apr 25 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-9
+- Enable Wired driver, PKCS12, and Smartcard options (#rh189805#)
+
 * Tue Apr 11 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-8
 - Fix control interface key obfuscation a bit
 



From fedora-cvs-commits at redhat.com  Tue Apr 25 14:17:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 10:17:57 -0400
Subject: rpms/kdebase/devel kdebase.spec,1.163,1.164
Message-ID: <200604251417.k3PEHv2q010489@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10411

Modified Files:
	kdebase.spec 
Log Message:
fix #189790, kcheckpass cannot authenticate users using a LDAP directory



Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- kdebase.spec	13 Apr 2006 08:18:07 -0000	1.163
+++ kdebase.spec	25 Apr 2006 14:17:54 -0000	1.164
@@ -20,7 +20,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.2
-Release: 3
+Release: 4
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -211,7 +211,6 @@
 install -m 755 mailsettings $RPM_BUILD_ROOT%{_bindir}
 
 # Fix up permissions on some things
-chmod 755 $RPM_BUILD_ROOT%{_bindir}/kcheckpass
 chmod 755 $RPM_BUILD_ROOT%{_bindir}/kdesud
 
 # install pam configuration file
@@ -380,6 +379,8 @@
 %dir %{_libdir}/mozilla
 %dir %{_libdir}/mozilla/plugins
 %{_bindir}/*
+%exclude %{_bindir}/kcheckpass
+%attr(4755,root,root) %{_bindir}/kcheckpass
 %{_libdir}/*.??*
 %{_libdir}/kde3/*
 %{_libdir}/kconf_update_bin
@@ -422,6 +423,9 @@
 %{_includedir}/kde/ksplash/*
 
 %changelog
+* Tue Apr 25 2006 Than Ngo <than at redhat.com> 6:3.5.2-4
+- fix #189790, kcheckpass cannot authenticate users using a LDAP directory
+
 * Thu Apr 13 2006 Than Ngo <than at redhat.com> 6:3.5.2-3
 - fix startkde to look in /usr and /etc/kde for env/ and shutdown/
 



From fedora-cvs-commits at redhat.com  Tue Apr 25 14:29:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 10:29:28 -0400
Subject: rpms/pm-utils/devel pm-utils.spec,1.32,1.33
Message-ID: <200604251429.k3PETSQC015056@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/pm-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14967

Modified Files:
	pm-utils.spec 
Log Message:
- ogg smash (update to 0.18-1)



Index: pm-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- pm-utils.spec	18 Apr 2006 01:17:54 -0000	1.32
+++ pm-utils.spec	25 Apr 2006 14:29:25 -0000	1.33
@@ -1,7 +1,7 @@
 Name: pm-utils
 Summary: Power management utilities and scripts for Fedora Core
 License: GPL
-Version: 0.17
+Version: 0.18
 Release: 1
 Group: System Environment/Base
 ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64
@@ -71,17 +71,26 @@
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
+%pre
+if [ -f /etc/sysconfig/pm ]; then
+	mkdir -p /etc/pm
+	cp -a /etc/sysconfig/pm /etc/pm/config
+fi
+
 %files
 %defattr(-,root,root)
 /etc/pm
+%config(noreplace) /etc/pm/config
 /etc/security/console.apps/*
 /etc/pam.d/*
-%config(noreplace) /etc/sysconfig/pm
 %{_bindir}/*
 %{_sbindir}/*
 %{_mandir}/man*/*
 
 %changelog
+* Tue Apr 25 2006 Peter Jones <pjones at redhat.com> - 0.18-1
+- Make it work cross-distro
+
 * Mon Apr 17 2006 Peter Jones <pjones at redhat.com> - 0.17-1
 - add more helper functions
 - rework things that were forking an extra subshell



From fedora-cvs-commits at redhat.com  Tue Apr 25 14:32:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 10:32:04 -0400
Subject: rpms/pm-utils/devel .cvsignore,1.19,1.20 sources,1.23,1.24
Message-ID: <200604251432.k3PEW4EI015408@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/pm-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15304

Modified Files:
	.cvsignore sources 
Log Message:
- update tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	18 Apr 2006 04:46:30 -0000	1.19
+++ .cvsignore	25 Apr 2006 14:31:41 -0000	1.20
@@ -1,3 +1,3 @@
 vbetool_0.5-1.tar.gz
 radeontool-1.5.tar.gz
-pm-utils-0.17.tar.gz
+pm-utils-0.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	18 Apr 2006 04:46:30 -0000	1.23
+++ sources	25 Apr 2006 14:31:43 -0000	1.24
@@ -1,3 +1,3 @@
 8065eebe5a2b163e43b40461bfe49a56  radeontool-1.5.tar.gz
 950a87f99d17bc4f4ced73cec7103859  vbetool_0.5-1.tar.gz
-e0a0e71885e1339dde1ba25da204a34e  pm-utils-0.17.tar.gz
+1dba0a22ca8ccd235ee40de0ed59442a  pm-utils-0.18.tar.gz



From fedora-cvs-commits at redhat.com  Tue Apr 25 14:52:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 10:52:14 -0400
Subject: rpms/selinux-policy/devel policygentool,1.5,1.6
Message-ID: <200604251452.k3PEqExd010215@cvs.devel.redhat.com>

Author: jantill

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22193

Modified Files:
	policygentool 
Log Message:
 Fix summary doc output.



Index: policygentool
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policygentool,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- policygentool	21 Mar 2006 19:46:10 -0000	1.5
+++ policygentool	25 Apr 2006 14:52:11 -0000	1.6
@@ -32,7 +32,9 @@
 ##	Execute a domain transition to run TEMPLATETYPE.
 ## </summary>
 ## <param name=\"domain\">
+## <summary>
 ##	Domain allowed to transition.
+## </summary>
 ## </param>
 #
 interface(`TEMPLATETYPE_domtrans',`



From fedora-cvs-commits at redhat.com  Tue Apr 25 14:53:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 10:53:42 -0400
Subject: rpms/pam/devel pam_namespace-7.patch, NONE,
	1.1 pam_namespace-have-unshare.patch, NONE,
	1.1 pam_namespace-no-mans.patch, NONE, 1.1 .cvsignore, 1.33,
	1.34 pam.spec, 1.105, 1.106 sources, 1.35,
	1.36 pam-0.99.3.0-pie.patch, 1.1, NONE
Message-ID: <200604251453.k3PErgP0011685@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/pam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11669

Modified Files:
	.cvsignore pam.spec sources 
Added Files:
	pam_namespace-7.patch pam_namespace-have-unshare.patch 
	pam_namespace-no-mans.patch 
Removed Files:
	pam-0.99.3.0-pie.patch 
Log Message:
* Tue Apr 25 2006 Tomas Mraz <tmraz at redhat.com> 0.99.3.0-3
- added pam_namespace module written by Janak Desai (per-user /tmp
support)
- new pam-redhat modules version


pam_namespace-7.patch:
 config.h.in                                |    3 
 configure.in                               |    4 
 modules/Makefile.am                        |    3 
 modules/pam_namespace/Makefile.am          |   27 
 modules/pam_namespace/README               |  100 ++
 modules/pam_namespace/namespace.conf       |   15 
 modules/pam_namespace/namespace.conf.5.xml |  137 ++
 modules/pam_namespace/pam_namespace.8.xml  |  221 ++++
 modules/pam_namespace/pam_namespace.c      | 1326 +++++++++++++++++++++++++++++
 9 files changed, 1835 insertions(+), 1 deletion(-)

--- NEW FILE pam_namespace-7.patch ---
--- Linux-PAM-0.99.3.0/config.h.in.namespace	2006-01-13 22:04:47.000000000 +0100
+++ Linux-PAM-0.99.3.0/config.h.in	2006-04-25 16:41:28.000000000 +0200
@@ -248,6 +248,9 @@
 /* Version number of package */
 #undef VERSION
 
+/* Defined if SE Linux support is compiled in */
+#undef WITH_SELINUX
+
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
 #undef WORDS_BIGENDIAN
--- /dev/null	2006-04-25 10:12:36.092931750 +0200
+++ Linux-PAM-0.99.3.0/modules/pam_namespace/README	2006-04-25 16:41:28.000000000 +0200
@@ -0,0 +1,100 @@
+
+pam_namespace module:
+Setup a private namespace with polyinstantiated directories.
+
+THEORY OF OPERATION:
+The pam namespace module consults /etc/security/namespace.conf 
+configuration file and sets up a private namespace with polyinstantiated
+directories for a session managed by PAM. A skeleton namespace.conf
+installed by default provides example for polyinstantiating /tmp 
+and users' home directory.
+
+Each line in namespace.conf describes a limit for a user in the form:
+
+<polydir>  <instance_prefix>  <method>  <list_of_uids>
+
+Where:
+<polydir> - is the absolute pathname of the directory to polyinstantiate
+      Special entry $HOME is supported to designate user's home directory.
+      This field cannot be blank.
+
+<instance_prefix> - is the string prefix used to build the pathname for the
+	instantiation of <polydir>. The directory security context, or
+	optionally its md5sum string (32 hex characters), is appended to
+        the prefix to generate the final instance directory path.
+        This directory is created if it did not exist already, and is then
+	bind mounted on the <polydir> to provide an instance of <polydir>
+	based on the <method> column. The special string $HOME is replaced with 
+	the user's home directory, and $USER with the username.
+	This field cannot be blank.
+
+<method> - is the method used for polyinstantiation. It can take 3 different
+	values; "user" for polyinstantiation based on user name, "context"
+	for polyinstantiation based on process security context, and "both"
+	for polyinstantiation based on both user name and security context.
+	Methods "context" and "both" are only available with SELinux. This
+	field cannot be blank.
+
+<list_of_uids> - is a comma separated list of user names for whom the
+	polyinstantiation is not performed. If left blank, polyinstantiation
+	will be performed for all users.
+
+EXAMPLE /etc/security/namespace.conf configuration file:
+=======================================================
+# Following three lines will polyinstantiate /tmp, /var/tmp and user's home
+# directories. /tmp and /var/tmp will be polyinstantiated based on both
+# security context as well as user name, whereas home directory will
+# be polyinstantiated based on security context only. Polyinstantiation
+# will not be performed for user root and adm for directories /tmp and
+# /var/tmp, whereas home directories will be polyinstantiated for all
+# users.
+#
+/tmp     /tmp/tmp.inst-$USER-       both      root,adm
+/var/tmp /var/tmp/tmp.inst-$USER-   both      root,adm
+$HOME    $HOME.inst-                context
+    
+ARGUMENTS RECOGNIZED:
+    debug		Verbose logging by syslog
+
+    unmnt_remnt		For programs such as su and newrole, the login
+			session has already setup a polyinstantiated 
+			namespace. For these programs, polyinstantiation
+			is performed based on new user id or security
+			context, however the command first needs to 
+			undo the polyinstantiation performed by login.
+			This argument instructs the command to 
+			first undo previous polyinstantiation before
+			proceeding with new polyinstantiation based on
+			new id/context.
+
+    unmnt_only		For trusted programs that want to undo any
+			existing bind mounts and process instance 
+			directories on their own, this argument allows
+			them to unmount currently mounted instance
+			directories.
+
+    require_selinux	If selinux is not enabled, return failure.
+
+    gen_hash		Instead of using the security context string
+			for the instance name, generate and use its
+			md5 hash.
+
+    ignore_config_error	If a line in the configuration file corresponding
+			to a polyinstantiated directory contains format
+			error, skip that line process the next line.
+			Without this option, pam will return an error
+			to the calling program resulting in termination
+			of the session.
+
+
+MODULE SERVICES PROVIDED:
+	session            _open_session and _close_session (blank)
+
+USAGE:
+	For the <service>s you need polyinstantiation (login for example)
+	put the following line in /etc/pam.d/<service> as the last line for 
+	session group:
+
+	session  required  pam_namespace.so [arguments]
+
+	This module also depends on pam_selinux.so setting the context.
--- /dev/null	2006-04-25 10:12:36.092931750 +0200
+++ Linux-PAM-0.99.3.0/modules/pam_namespace/pam_namespace.c	2006-04-25 16:41:28.000000000 +0200
@@ -0,0 +1,1326 @@
+/******************************************************************************
+ * A module for Linux-PAM that will set the default namespace after 
+ * establishing a session via PAM.
+ *
+ * (C) Copyright IBM Corporation 2005
+ * (C) Copyright Red Hat 2006
+ * All Rights Reserved.
+ *
+ * Written by: Janak Desai <janak at us.ibm.com>
+ * With Revisions by: Steve Grubb <sgrubb at redhat.com>
+ * Derived from a namespace setup patch by Chad Sellers <cdselle at tycho.nsa.gov>
+ *
+ * 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
+ * IBM AND/OR THEIR SUPPLIERS 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.
+ */
+
+#if !(defined(linux))
+#error THIS CODE IS KNOWN TO WORK ONLY ON LINUX !!!
+#endif
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdio_ext.h>
+#include <unistd.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <syslog.h>
+#include <dlfcn.h>
+#include <stdarg.h>
+#include <pwd.h>
+#include <limits.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/resource.h>
+#include <sys/mount.h>
+#include <sys/wait.h>
+#include <openssl/md5.h>
+#include <libgen.h>
+#include <fcntl.h>
+#include <sched.h>
+#include "security/pam_modules.h"
+#include "security/pam_modutil.h"
+#include "security/pam_ext.h"
+
+#ifdef WITH_SELINUX
+#include <selinux/selinux.h>
+#endif
+
+#ifndef CLONE_NEWNS
+#define CLONE_NEWNS 0x00020000 /* Flag to create new namespace */
+#endif
+
+/*
+ * Module defines
+ */
+#define MD5_DIGEST_LENGTH 16
+#ifndef PAM_NAMESPACE_CONFIG
+#define PAM_NAMESPACE_CONFIG "/etc/security/namespace.conf"
+#endif
+
+#ifndef INST_INIT_SCRIPT
+#define INST_INIT_SCRIPT "inst_init_script.sh"
+#endif
+
+#define PAMNS_DEBUG           0x00000100 /* Running in debug mode */
+#define PAMNS_SELINUX_ENABLED 0x00000400 /* SELinux is enabled */
+#define PAMNS_CTXT_BASED_INST 0x00000800 /* Context based instance needed */
+#define PAMNS_GEN_HASH        0x00002000 /* Generate md5 hash for inst names */
+#define PAMNS_IGN_CONFIG_ERR  0x00004000 /* Ignore format error in conf file */
+
+/*
+ * Polyinstantiation method options, based on user, security context
+ * or both
+ */
+enum polymethod {
+    USER,
+    CONTEXT,
+    BOTH,
+};
+
+/*
+ * Depending on the application using this namespace module, we
+ * may need to unmount priviously bind mounted instance directory.
+ * Applications such as login and sshd, that establish a new 
+ * session unmount of instance directory is not needed. For applications
+ * such as su and newrole, that switch the identity, this module 
+ * has to unmount previous instance directory first and re-mount
+ * based on the new indentity. For other trusted applications that
+ * just want to undo polyinstantiation, only unmount of previous
+ * instance directory is needed.
+ */
+enum unmnt_op {
+    NO_UNMNT,
+    UNMNT_REMNT,
+    UNMNT_ONLY,
+};
+
+/*
+ * Structure that holds information about a directory to polyinstantiate
+ */
+struct polydir_s {
+    char dir[PATH_MAX];    	       	/* directory to polyinstantiate */
+    char instance_prefix[PATH_MAX];	/* prefix for instance dir path name */
+    enum polymethod method;		/* method used to polyinstantiate */
+    unsigned int num_uids;		/* number of override uids */
+    uid_t *uid;				/* list of override uids */
+    struct polydir_s *next;		/* pointer to the next polydir entry */
+};
+
+struct instance_data {
+    pam_handle_t *pamh;		/* The pam handle for this instance */
+    struct polydir_s *polydirs_ptr; /* The linked list pointer */
+    char user[LOGIN_NAME_MAX];	/* User name */
+    uid_t uid;			/* The uid of the user */
+    unsigned long flags;		/* Flags for debug, selinux etc */
+};
+
+/*
+ * Adds an entry for a polyinstantiated directory to the linked list of
+ * polyinstantiated directories. It is called from process_line() while
+ * parsing the namespace configuration file.
+ */
+static int add_polydir_entry(struct instance_data *idata, 
+	const struct polydir_s *ent)
+{
+    struct polydir_s *pent;
+    unsigned int i;
+
+    /*
+     * Allocate an entry to hold information about a directory to
+     * polyinstantiate, populate it with information from 2nd argument
+     * and add the entry to the linked list of polyinstantiated
+     * directories.
+     */
+    pent = (struct polydir_s *) malloc(sizeof(struct polydir_s));
+    if (!pent) 
+        return -1;
+
+    /* Make copy */
+    strcpy(pent->dir, ent->dir);
+    strcpy(pent->instance_prefix, ent->instance_prefix);
+    pent->method = ent->method;
+    pent->num_uids = ent->num_uids;
+    if (ent->num_uids) {
+        uid_t *pptr, *eptr;
+
+        pent->uid = (uid_t *) malloc(ent->num_uids * sizeof(uid_t));
+        if (!(pent->uid)) {
+            free(pent);
+            return -1;
+        }
+        for (i = 0, pptr = pent->uid, eptr = ent->uid; i < ent->num_uids;
+                 i++, eptr++, pptr++)
+             *pptr = *eptr;
+    } else 
+        pent->uid = NULL;
+
+    /* Now attach to linked list */
+    pent->next = NULL;
+    if (idata->polydirs_ptr == NULL)
+        idata->polydirs_ptr = pent;
+    else {
+        struct polydir_s *tail;
+
+        tail = idata->polydirs_ptr;
+        while (tail->next)
+            tail = tail->next;
+        tail->next = pent;
+    }
+
+    return 0;
+}
+
+
+/*
+ * Deletes all the entries in the linked list.
+ */
+static void del_polydir_list(struct polydir_s *polydirs_ptr)
+{
+        struct polydir_s *dptr = polydirs_ptr;
+
+	while (dptr) {
+        	struct polydir_s *tptr = dptr;
+		dptr = dptr->next;
+            	free(tptr->uid);
+		free(tptr);
+	}
+}
+
+
+/*
+ * Called from parse_config_file, this function processes a single line
+ * of the namespace configuration file. It skips over comments and incomplete
+ * or malformed lines. It processes a valid line with information on
+ * polyinstantiating a directory by populating appropriate fields of a
+ * polyinstatiated directory structure and then calling add_polydir_entry to
+ * add that entry to the linked list of polyinstantiated directories.
+ */
+static int process_line(char *line, const char *home, 
+			struct instance_data *idata)
+{
+    const char *dir, *instance_prefix;
+    const char *method, *uids;
+    char *tptr;
+    struct polydir_s poly;
+    int retval = 0;
+
+    poly.uid = NULL;
+    poly.num_uids = 0;
+
+    /*
+     * skip the leading white space
+     */
+    while (*line && isspace(*line))
+        line++;
+
+    /*
+     * Rip off the comments
+     */
+    tptr = strchr(line,'#');
+    if (tptr)
+        *tptr = '\0';
+
+    /*
+     * Rip off the newline char
+     */
+    tptr = strchr(line,'\n');
+    if (tptr)
+        *tptr = '\0';
+
+    /*
+     * Anything left ?
+     */
+    if (line[0] == 0)
+        return 0;
+
+    /*
+     * Initialize and scan the five strings from the line from the
+     * namespace configuration file.
+     */
+    dir = strtok_r(line, " \t", &tptr);
+    if (dir == NULL) {
+        pam_syslog(idata->pamh, LOG_NOTICE, "Invalid line missing polydir");
+        goto skipping;
+    }
+    instance_prefix = strtok_r(NULL, " \t", &tptr);
+    if (instance_prefix == NULL) {
+        pam_syslog(idata->pamh, LOG_NOTICE, "Invalid line missing instance_prefix");
+        goto skipping;
+    }
+    method = strtok_r(NULL, " \t", &tptr);
+    if (method == NULL) {
+        pam_syslog(idata->pamh, LOG_NOTICE, "Invalid line missing method");
+        goto skipping;
+    }
+
+    /*
+     * Only the uids field is allowed to be blank, to indicate no
+     * override users for polyinstantiation of that directory. If
+     * any of the other fields are blank, the line is incomplete so
+     * skip it.
+     */
+    uids = strtok_r(NULL, " \t", &tptr);
+
+    /*
+     * If the directory being polyinstantiated is the home directory
+     * of the user who is establishing a session, we have to swap
+     * the "$HOME" string with the user's home directory that is
+     * passed in as an argument.
+     */
+    if (strcmp(dir, "$HOME") == 0) {
+	dir = home;
+    }
+
+    /*
+     * Expand $HOME and $USER in instance dir prefix
+     */
+    if ((tptr = strstr(instance_prefix, "$USER")) != 0) {
+	/* FIXME: should only support this if method is USER or BOTH */
+	char *expanded = alloca(strlen(idata->user) + strlen(instance_prefix)-5+1);
+	*tptr = 0;
+	sprintf(expanded, "%s%s%s", instance_prefix, idata->user, tptr+5);
+	instance_prefix = expanded;
+    }
+    if ((tptr = strstr(instance_prefix, "$HOME")) != 0) {
+	char *expanded = alloca(strlen(home)+strlen(instance_prefix)-5+1);
+	*tptr = 0;
+	sprintf(expanded, "%s%s%s", instance_prefix, home, tptr+5);
+	instance_prefix = expanded;
+    }
+
+    /*
+     * Ensure that all pathnames are absolute path names.
+     */
+    if ((dir[0] != '/') || (instance_prefix[0] != '/')) {
+        pam_syslog(idata->pamh, LOG_NOTICE,"Pathnames must start with '/'");
+        goto skipping;
+    }
+    if (strstr(dir, "..") || strstr(instance_prefix, "..")) {
+        pam_syslog(idata->pamh, LOG_NOTICE,"Pathnames must not contain '..'");
+        goto skipping;
+    }
+
+    /*
+     * Populate polyinstantiated directory structure with appropriate
+     * pathnames and the method with which to polyinstantiate.
+     */
+    if (strlen(dir) >= sizeof(poly.dir)
+	|| strlen(instance_prefix) >= sizeof(poly.instance_prefix)) {
+	pam_syslog(idata->pamh, LOG_NOTICE, "Pathnames too long");
+    }
+    strcpy(poly.dir, dir);
+    strcpy(poly.instance_prefix, instance_prefix);
+    if (strcmp(method, "user") == 0)
+        poly.method = USER;
+#ifdef WITH_SELINUX
+    else if (strcmp(method, "context") == 0) {
+        if (idata->flags & PAMNS_CTXT_BASED_INST)
+            poly.method = CONTEXT;
+	else
+            poly.method = USER;
+    } else if (strcmp(method, "both") == 0) {
+        if (idata->flags & PAMNS_CTXT_BASED_INST)
+            poly.method = BOTH;
+	else
+            poly.method = USER;
+    }
+
+#endif
+    else {
+        pam_syslog(idata->pamh, LOG_NOTICE, "Illegal method");
+        goto skipping;
+    }
+
+    /*
+     * If the line in namespace.conf for a directory to polyinstantiate
+     * contains a list of override users (users for whom polyinstantiation
+     * is not performed), read the user ids, convert names into uids, and
+     * add to polyinstantiated directory structure.
+     */
+    if (uids) {
+        uid_t *uidptr;
+        const char *ustr, *sstr;
+        int count, i;
+
+        for (count = 0, ustr = sstr = uids; sstr; ustr = sstr + 1, count++)
+           sstr = strchr(ustr, ',');
+
+        poly.num_uids = count;
+        poly.uid = (uid_t *) malloc(count * sizeof (uid_t));
+        uidptr = poly.uid;
+        if (uidptr == NULL) {
+            pam_syslog(idata->pamh, LOG_NOTICE, "out of memory");
+            goto skipping;
+        }
+
+        ustr = uids;
+        for (i = 0; i < count; i++) {
+            struct passwd *pwd;
+
+            tptr = strchr(ustr, ',');
+            if (tptr)
+                *tptr = '\0';
+
+            pwd = getpwnam(ustr);
+            *uidptr = pwd->pw_uid;
+            if (i < count - 1) {
+                ustr = tptr + 1;
+                uidptr++;
+            }
+        }
+    }
+
+    /*
+     * Add polyinstantiated directory structure to the linked list
+     * of all polyinstantiated directory structures.
+     */
+    if (add_polydir_entry(idata, &poly) < 0) {
+        pam_syslog(idata->pamh, LOG_ERR, "Allocation Error");
+        retval = PAM_SERVICE_ERR;
+    }
+    free(poly.uid);
+
+    goto out;
+
+skipping:
+    if (idata->flags & PAMNS_IGN_CONFIG_ERR)
+        retval = 0;
+    else
+        retval = PAM_SERVICE_ERR;
+out:
+    return retval;
+}
+
+
+/*
+ * Parses /etc/security/namespace.conf file to build a linked list of
+ * polyinstantiated directory structures of type polydir_s. Each entry
+ * in the linked list contains information needed to polyinstantiate
+ * one directory.
+ */
+static int parse_config_file(struct instance_data *idata)
+{
+    FILE *fil;
+    char *home;
+    struct passwd *cpwd;
+    char *line = NULL;
+    int retval;
+    size_t len = 0;
+
+    if (idata->flags & PAMNS_DEBUG)
+        pam_syslog(idata->pamh, LOG_DEBUG, "Parsing config file %s", 
+		PAM_NAMESPACE_CONFIG);
+
+    /*
+     * Extract the user's home directory to resolve $HOME entries
+     * in the namespace configuration file.
+     */
+    cpwd = getpwnam(idata->user);
+    if (!cpwd) {
+        pam_syslog(idata->pamh, LOG_ERR,
+               "Error getting home dir for '%s'", idata->user);
+        return PAM_SESSION_ERR;
+    }
+    home = strdupa(cpwd->pw_dir);
+
+    /*
+     * Open configuration file, read one line at a time and call
+     * process_line to process each line.
+     */
+    fil = fopen(PAM_NAMESPACE_CONFIG, "r");
+    if (fil == NULL) {
+        pam_syslog(idata->pamh, LOG_ERR, "Error opening config file");
+        return PAM_SERVICE_ERR;
+    }
+
+    /* Use unlocked IO */
+    __fsetlocking(fil, FSETLOCKING_BYCALLER);
+
+    /* loop reading the file */
+    while (getline(&line, &len, fil) > 0) {
+        retval = process_line(line, home, idata);
+        if (retval) {
+            pam_syslog(idata->pamh, LOG_ERR,
+		"Error processing conf file line %s", line);
+            fclose(fil);
+            free(line);
+            return PAM_SERVICE_ERR;
+        }
+    }
+    fclose(fil);
+    free(line);
+
+    /* All done...just some debug stuff */
+    if (idata->flags & PAMNS_DEBUG) {
+        struct polydir_s *dptr = idata->polydirs_ptr;
+        uid_t *iptr;
+
+        pam_syslog(idata->pamh, LOG_DEBUG,
+    	    dptr?"Configured poly dirs:":"No configured poly dirs");
+        while (dptr) {
+            pam_syslog(idata->pamh, LOG_DEBUG, "dir='%s' iprefix='%s' meth=%d",
+		   dptr->dir, dptr->instance_prefix, dptr->method);
+            for (i = 0, iptr = dptr->uid; i < dptr->num_uids; i++, iptr++)
+                pam_syslog(idata->pamh, LOG_DEBUG, "override user %d ", *iptr);
+            dptr = dptr->next;
+        }
+    }
+
+    return PAM_SUCCESS;
+}
+
+
+/*
+ * This funtion returns true if a given uid is present in the polyinstantiated
+ * directory's list of override uids. If the uid is one of the override
+ * uids for the polyinstantiated directory, polyinstantiation is not
+ * performed for that user for that directory.
+ */
+static int ns_override(struct polydir_s *polyptr, struct instance_data *idata)
+{
+    unsigned int i;
+
+    if (idata->flags & PAMNS_DEBUG)
+    	pam_syslog(idata->pamh, LOG_DEBUG,
+		"Checking for ns override in dir %s for uid %d",
+		polyptr->dir, idata->uid);
+
+    for (i = 0; i < polyptr->num_uids; i++) {
+        if (idata->uid == polyptr->uid[i]) {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+
+/*
+ * poly_name returns the name of the polyinstantiated instance directory
+ * based on the method used for polyinstantiation (user, context or both)
+ * In addition, the function also returns the security contexts of the
+ * original directory to polyinstantiate and the polyinstantiated instance
+ * directory.
+ */
+#ifdef WITH_SELINUX
+static int poly_name(const struct polydir_s *polyptr, char **i_name,
+	security_context_t *i_context, security_context_t *origcon,
+        struct instance_data *idata)
+#else
+static int poly_name(const struct polydir_s *polyptr, char **i_name, 
+	struct instance_data *idata)
+#endif
+{
+#ifdef WITH_SELINUX
+    security_context_t scon = NULL;
+    security_class_t tclass;
+#endif
+    int rc;
+
+# ifdef WITH_SELINUX
+    /*
+     * Get the security context of the directory to polyinstantiate.
+     */
+    rc = getfilecon(polyptr->dir, origcon);
+    if (rc < 0 || *origcon == NULL) {
+       pam_syslog(idata->pamh, LOG_ERR,
+		"Error getting poly dir context, %m");
+       return PAM_SESSION_ERR;
+    }
+
+    /*
+     * If polyinstantiating based on security context, get current
+     * process security context, get security class for directories,
+     * and ask the policy to provide security context of the
+     * polyinstantiated instance directory.
+     */
+    if ((polyptr->method == CONTEXT) || (polyptr->method == BOTH)) {
+        rc = getexeccon(&scon);
+        if (rc < 0 || scon == NULL) {
+            pam_syslog(idata->pamh, LOG_ERR, 
+		"Error getting exec context, %m");
+            return PAM_SESSION_ERR;
+	}
+        tclass = string_to_security_class("dir");
+
+        if (security_compute_member(scon, *origcon, tclass,
+						i_context) < 0) {
+    	    pam_syslog(idata->pamh, LOG_ERR,
+                       "Error computing poly dir member context");
+	    freecon(scon);
+    	    return PAM_SESSION_ERR;
+        } else if (idata->flags & PAMNS_DEBUG)
+    	    pam_syslog(idata->pamh, LOG_DEBUG, 
+		    "member context returned by policy %s", *i_context);
+	freecon(scon);
+    }
+#endif
+    rc = PAM_SUCCESS;
+
+    /*
+     * Set the name of the polyinstantiated instance dir based on the
+     * polyinstantiation method.
+     */
+    switch (polyptr->method) {
+        case USER:
+	    if (asprintf(i_name, "%s", idata->user) < 0)
+		*i_name = NULL;
+		rc = PAM_SESSION_ERR;
+    	    break;
+
+#ifdef WITH_SELINUX
+        case CONTEXT:
+	    if (asprintf(i_name, "%s", *i_context) < 0)
+		*i_name = NULL;
+		rc = PAM_SESSION_ERR;
+    	    break;
+
+    	case BOTH:
+	    if (asprintf(i_name, "%s_%s", *i_context, idata->user) < 0)
+		*i_name = NULL;
+		rc = PAM_SESSION_ERR;
+    	    break;
+#endif /* WITH_SELINUX */
+
+    	default:
+    	    if (idata->flags & PAMNS_DEBUG)
+    	        pam_syslog(idata->pamh, LOG_ERR, "Unknown method");
+    	    rc = PAM_SESSION_ERR;
+    }
+
+    if ((idata->flags & PAMNS_DEBUG) && rc == PAM_SUCCESS)
+        pam_syslog(idata->pamh, LOG_DEBUG, "poly_name %s", *i_name);
+
+    return rc;
+}
+
+
+/*
+ * Create polyinstantiated instance directory (ipath).
+ */
+#ifdef WITH_SELINUX
+static int create_dirs(const struct polydir_s *polyptr, char *ipath, 
+        security_context_t icontext, security_context_t ocontext,
+	struct instance_data *idata)
+#else
+static int create_dirs(const struct polydir_s *polyptr, char *ipath,
+	struct instance_data *idata)
+#endif
+{
+    struct stat statbuf, newstatbuf;
+    int fd, pid, status;
+    char *inst_init_script = NULL;
+
+    /*
+     * stat the directory to polyinstantiate, so its owner-group-mode
+     * can be propagated to instance directory
+     */
+    if (stat(polyptr->dir, &statbuf) < 0) {
+        pam_syslog(idata->pamh, LOG_ERR, "Error stating %s, %m",
+		polyptr->dir);
+        return PAM_SESSION_ERR;
+    }
+
+    /*
+     * Make sure we are dealing with a directory
+     */
+    if (!S_ISDIR(statbuf.st_mode)) {
+	pam_syslog(idata->pamh, LOG_ERR, "poly dir %s is not a dir",
+		polyptr->dir);
+        return PAM_SESSION_ERR;
+    }
+
+    /*
+     * Create instance directory and set its security context to the context
+     * returned by the security policy. Set its mode and ownership
+     * attributes to match that of the original directory that is being
+     * polyinstantiated.
+     */
+    if (mkdir(ipath, S_IRUSR) < 0) {
+        if (errno == EEXIST)
+            return PAM_SUCCESS;
+        else {
+            pam_syslog(idata->pamh, LOG_ERR, "Error creating %s, %m",
+			ipath);
+            return PAM_SESSION_ERR;
+        }
+    }
+
+    /* Open a descriptor to it to prevent races */
+    fd = open(ipath, O_DIRECTORY | O_RDONLY);
+    if (fd < 0) {
+	pam_syslog(idata->pamh, LOG_ERR, "Error opening %s, %m", ipath);
+	return PAM_SESSION_ERR;
+    }
+#ifdef WITH_SELINUX
+    /* If SE Linux is disabled, no need to label it */
+    if (idata->flags & PAMNS_SELINUX_ENABLED) {
+        /* If method is USER, icontext is NULL */
+        if (icontext) {
+            if (fsetfilecon(fd, icontext) < 0) {
+                pam_syslog(idata->pamh, LOG_ERR, 
+			"Error setting context of %s to %s", ipath, icontext);
+                close(fd);
+                return PAM_SESSION_ERR;
+            }
+        } else {
+            if (fsetfilecon(fd, ocontext) < 0) {
+                pam_syslog(idata->pamh, LOG_ERR,
+			"Error setting context of %s to %s", ipath, ocontext);
+		close(fd);
+                return PAM_SESSION_ERR;
+            }
+        }
+    }
+#endif
+    if (fstat(fd, &newstatbuf) < 0) {
+        pam_syslog(idata->pamh, LOG_ERR, "Error stating %s, %m",
+		ipath);
+        return PAM_SESSION_ERR;
+    }
+    if (newstatbuf.st_uid != statbuf.st_uid ||
+			 newstatbuf.st_gid != statbuf.st_gid) {
+        if (fchown(fd, statbuf.st_uid, statbuf.st_gid) < 0) {
+            pam_syslog(idata->pamh, LOG_ERR,
+			"Error changing owner for %s, %m",
+			ipath);
+	    close(fd);
+            return PAM_SESSION_ERR;
+        }
+    }
+    if (fchmod(fd, statbuf.st_mode & 07777) < 0) {
+        pam_syslog(idata->pamh, LOG_ERR, "Error changing mode for %s, %m",
+			ipath);
+	close(fd);
+        return PAM_SESSION_ERR;
+    }
+    close(fd);
+
+    /*
+     * Check to see if there is an instance initialization script in
+     * the polyinstantiated directory. If such a script exists
+     * execute it.
+     */
+    if (asprintf(&inst_init_script, "%s/%s", polyptr->dir,
+                 INST_INIT_SCRIPT) < 0) {
+        pam_syslog(idata->pamh, LOG_ERR, "Error allocating string for a path");
+        return PAM_SESSION_ERR;
+    }
+
+    if (access(inst_init_script, F_OK) == 0) {
+        if (access(inst_init_script, X_OK) < 0) {
+            if (idata->flags & PAMNS_DEBUG)
+                pam_syslog(idata->pamh, LOG_ERR,
+                           "Inst init script not executable");
+            return PAM_SESSION_ERR;
+        } else {
+            pid = fork();
+	    if (pid == 0) {
+		/*
+                 * Change current directory to the instance directory
+                 * before executing the instance initialization script.
+                 */
+                if (chdir(ipath) < 0) {
+                    pam_syslog(idata->pamh, LOG_ERR, "Can't chdir to %s, %m",
+                               ipath);
+                    exit(1);
+                }
+	        if (execl(inst_init_script, inst_init_script, (char *)NULL) < 0)
+                    exit(1);
+            } else if (pid > 0) {
+	        while (waitpid (pid, &status, 0) != pid);
+	        if (!WIFEXITED(status) || WEXITSTATUS(status) > 0) {
+                    pam_syslog(idata->pamh, LOG_ERR,
+                               "Error initializing instance");
+                    free(inst_init_script);
+                    return PAM_SESSION_ERR;
+                }
+	    } else if (pid < 0) {
+                pam_syslog(idata->pamh, LOG_ERR,
+                           "Cannot fork to run instance init script, %m");
+                if (inst_init_script)
+                    free(inst_init_script);
+                return PAM_SESSION_ERR;
+	    }
+        }
+    }
+
+    return PAM_SUCCESS;
+}
+
+
+/*
+ * md5hash generates a hash of the passed in instance directory name.
+ */
+static int md5hash(char **instname, struct instance_data *idata)
+{
+    int i;
+    char *md5inst = NULL;
+    char *to;
+    unsigned char inst_digest[MD5_DIGEST_LENGTH];
+
+    /*
+     * Create MD5 hashes for instance pathname.
+     */
+
+    if (MD5(*instname, strlen(*instname),
+		inst_digest) == NULL) {
+        pam_syslog(idata->pamh, LOG_ERR,
+		"Unable to generate hash for instname");
+        return PAM_SESSION_ERR;
+    }
+
+    if ((md5inst = malloc(MD5_DIGEST_LENGTH * 2 + 1)) == NULL) {
+        pam_syslog(idata->pamh, LOG_ERR, "Unable to allocate buffer");
+        return PAM_SESSION_ERR;
+    }
+
+    to = md5inst;
+    for (i = 0; i < MD5_DIGEST_LENGTH; i++) {
+        snprintf(to, 3, "%02x", (unsigned int)inst_digest[i]);
+        to += 3;
+    }
+
+    free(*instname);
+    *instname = md5inst;
+
+    return PAM_SUCCESS;
+}
+
+/*
+ * This function performs the namespace setup for a particular directory
+ * that is being polyinstantiated. It creates an MD5 hash of instance 
+ * directory, calls create_dirs to create it with appropriate
+ * security attributes, and performs bind mount to setup the process
+ * namespace.
+ */
+static int ns_setup(const struct polydir_s *polyptr,
+	struct instance_data *idata)
+{
+    int retval = 0;
+    char *inst_dir = NULL;
+    char *instname = NULL;
+    char *dir;
+#ifdef WITH_SELINUX
+    security_context_t instcontext = NULL, origcontext = NULL;
+#endif
+
+    if (idata->flags & PAMNS_DEBUG)
+        pam_syslog(idata->pamh, LOG_DEBUG,
+               "Set namespace for directory %s", polyptr->dir);
+
+    dir = strrchr(polyptr->dir, '/');
+    if (dir && strlen(dir) > 1)
+        dir++;
+
+    /*
+     * Obtain the name of instance pathname based on the
+     * polyinstantiation method and instance context returned by
+     * security policy.
+     */
+#ifdef WITH_SELINUX
+    retval = poly_name(polyptr, &instname, &instcontext,
+			&origcontext, idata);
+#else
+    retval = poly_name(polyptr, &instname, idata);
+#endif
+
+    if (retval) {
+        pam_syslog(idata->pamh, LOG_ERR, "Error getting instance name");
+        goto error_out;
+    } else {
+#ifdef WITH_SELINUX
+        if ((idata->flags & PAMNS_DEBUG) &&
+            (idata->flags & PAMNS_SELINUX_ENABLED))
+            pam_syslog(idata->pamh, LOG_DEBUG, "Inst context %s Orig context %s",
+		 instcontext, origcontext);
+#endif
+    }
+
+    if (idata->flags & PAMNS_GEN_HASH) {
+        retval = md5hash(&instname, idata);
+        if (retval < 0) {
+            pam_syslog(idata->pamh, LOG_ERR, "Error generating md5 hash");
+            goto error_out;
+        }
+    }
+
+    if (asprintf(&inst_dir, "%s%s", polyptr->instance_prefix, instname) < 0)
+	goto error_out;
+
+    if (idata->flags & PAMNS_DEBUG)
+        pam_syslog(idata->pamh, LOG_DEBUG, "instance_dir %s",
+		inst_dir);
+
+    /*
+     * Create instance directory with appropriate security
+     * contexts, owner, group and mode bits.
+     */
+#ifdef WITH_SELINUX
+    retval = create_dirs(polyptr, inst_dir, instcontext,
+			 origcontext, idata);
+#else
+    retval = create_dirs(polyptr, inst_dir, idata);
+#endif
+
+    if (retval < 0) {
+        pam_syslog(idata->pamh, LOG_ERR, "Error creating instance dir");
+        goto error_out;
+    }
+
+    /*
+     * Bind mount instance directory on top of the polyinstantiated
+     * directory to provide an instance of polyinstantiated directory
+     * based on polyinstantiated method.
+     */
+    if (mount(inst_dir, polyptr->dir, NULL, MS_BIND, NULL) < 0) {
+        pam_syslog(idata->pamh, LOG_ERR, "Error mounting %s on %s, %m",
+                   inst_dir, polyptr->dir);
+        goto error_out;
+    }
+
+    goto cleanup;
+
+    /*
+     * various error exit points. Free allocated memory and set return
+     * value to indicate a pam session error.
+     */
+error_out:
+    retval = PAM_SESSION_ERR;
+
+cleanup:
+    free(inst_dir);
+    free(instname);
+#ifdef WITH_SELINUX
+    freecon(instcontext);
+    freecon(origcontext);
+#endif
+    return retval;
+}
+
+
+/*
+ * This function checks to see if the current working directory is
+ * inside the directory passed in as the first argument.
+ */
+static int cwd_in(char *dir, struct instance_data *idata)
+{
+    int retval = 0;
+    char cwd[PATH_MAX];
+
+    if (getcwd(cwd, PATH_MAX) == NULL) {
+        pam_syslog(idata->pamh, LOG_ERR, "Can't get current dir, %m");
+        return -1;
+    }
+
+    if (strncmp(cwd, dir, strlen(dir)) == 0) {
+        if (idata->flags & PAMNS_DEBUG)
+            pam_syslog(idata->pamh, LOG_DEBUG, "cwd is inside %s", dir);
+        retval = 1;
+    } else {
+        if (idata->flags & PAMNS_DEBUG)
+            pam_syslog(idata->pamh, LOG_DEBUG, "cwd is outside %s", dir);
+    }
+
+    return retval;
+}
+
+
+/*
+ * This function checks to see if polyinstantiation is needed for any
+ * of the directories listed in the configuration file. If needed,
+ * cycles through all polyinstantiated directory entries and calls
+ * ns_setup to setup polyinstantiation for each one of them.
+ */
+static int setup_namespace(struct instance_data *idata, enum unmnt_op unmnt)
+{
+    int retval = 0, need_poly = 0, changing_dir = 0;
+    char *cptr, *fptr, poly_parent[PATH_MAX];
+    struct polydir_s *pptr;
+
+    if (idata->flags & PAMNS_DEBUG)
+        pam_syslog(idata->pamh, LOG_DEBUG, "Set up namespace for pid %d",
+		getpid());
+
+    /*
+     * Cycle through all polyinstantiated directory entries to see if
+     * polyinstantiation is needed at all.
+     */
+    for (pptr = idata->polydirs_ptr; pptr; pptr = pptr->next) {
+        if (ns_override(pptr, idata)) {
+            if (idata->flags & PAMNS_DEBUG)
+                pam_syslog(idata->pamh, LOG_DEBUG, 
+			"Overriding poly for user %d for dir %s",
+			idata->uid, pptr->dir);
+            continue;
+        } else {
+            if (idata->flags & PAMNS_DEBUG)
+                pam_syslog(idata->pamh, LOG_DEBUG, 
+			"Need poly ns for user %d for dir %s",
+			idata->uid, pptr->dir);
+            need_poly = 1;
+            break;
+        }
+    }
+
+    /*
+     * If polyinstnatiation is needed, call the unshare system call to
+     * disassociate from the parent namespace.
+     */
+    if (need_poly) {
+        if (unshare(CLONE_NEWNS) < 0) {
+            pam_syslog(idata->pamh, LOG_ERR,
+		"Unable to unshare from parent namespace, %m");
+            return PAM_SESSION_ERR;
+        }
+    } else
+        return PAM_SUCCESS;
+
+    /*
+     * Again cycle through all polyinstantiated directories, this time,
+     * call ns_setup to setup polyinstantiation for a particular entry.
+     */
+    for (pptr = idata->polydirs_ptr; pptr; pptr = pptr->next) {
+        if (ns_override(pptr, idata))
+            continue;
+        else {
+            if (idata->flags & PAMNS_DEBUG)
+                pam_syslog(idata->pamh, LOG_DEBUG,
+			"Setting poly ns for user %d for dir %s",
+                      idata->uid, pptr->dir);
+
+            if ((unmnt == UNMNT_REMNT) || (unmnt == UNMNT_ONLY)) {
+                /*
+                 * Check to see if process current directory is in the
+                 * bind mounted instance_parent directory that we are trying to
+                 * umount
+                 */
+                if ((changing_dir = cwd_in(pptr->dir, idata)) < 0) {
+                    return PAM_SESSION_ERR;
+                } else if (changing_dir) {
+                    if (idata->flags & PAMNS_DEBUG)
+                        pam_syslog(idata->pamh, LOG_DEBUG, "changing cwd");
+
+                    /*
+                     * Change current working directory to the parent of
+                     * the mount point, that is parent of the orig
+                     * directory where original contents of the polydir
+                     * are available from
+                     */
+                    strcpy(poly_parent, pptr->dir);
+    	            fptr = strchr(poly_parent, '/');
+        	    cptr = strrchr(poly_parent, '/');
+        	    if (fptr && cptr && (fptr == cptr))
+        	        strcpy(poly_parent, "/");
+        	    else if (cptr)
+        	        *cptr = '\0';
+                    if (chdir(poly_parent) < 0) {
+                        pam_syslog(idata->pamh, LOG_ERR, 
+				"Can't chdir to %s, %m", poly_parent);
+                    }
+                }
+
+                if (umount(pptr->dir) < 0) {
+            	    int saved_errno = errno;
+            	    pam_syslog(idata->pamh, LOG_ERR, "Unmount of %s failed, %m",
+                    	pptr->dir);
+            	    if (saved_errno != EINVAL)
+                	return PAM_SESSION_ERR;
+                } else if (idata->flags & PAMNS_DEBUG)
+                    pam_syslog(idata->pamh, LOG_DEBUG, "Umount succeeded %s",
+				pptr->dir);
+            }
+
+	    if (unmnt != UNMNT_ONLY) {
+                retval = ns_setup(pptr, idata);
+                if (retval != PAM_SUCCESS) 
+                     break;
+	    }
+        }
+    }
+
+    return retval;
+}
+
+
+/*
+ * Orig namespace. This function is called from when closing a pam
+ * session. If authorized, it unmounts instance directory.
+ */
+static int orig_namespace(struct instance_data *idata)
+{
+    struct polydir_s *pptr;
+
+    if (idata->flags & PAMNS_DEBUG)
+        pam_syslog(idata->pamh, LOG_DEBUG, "orig namespace for pid %d", 
+		getpid());
+
+    /*
+     * Cycle through all polyinstantiated directories from the namespace
+     * configuration file to see if polyinstantiation was performed for
+     * this user for each of the entry. If it was, try and unmount
+     * appropriate polyinstantiated instance directories.
+     */
+    for (pptr = idata->polydirs_ptr; pptr; pptr = pptr->next) {
+        if (ns_override(pptr, idata))
+            continue;
+        else {
+            if (idata->flags & PAMNS_DEBUG)
+                pam_syslog(idata->pamh, LOG_DEBUG, 
+			"Unmounting instance dir for user %d & dir %s",
+                       idata->uid, pptr->dir);
+
+            if (umount(pptr->dir) < 0) {
+                pam_syslog(idata->pamh, LOG_ERR, "Unmount of %s failed, %m",
+                       pptr->dir);
+                return PAM_SESSION_ERR;
+            } else if (idata->flags & PAMNS_DEBUG)
+                pam_syslog(idata->pamh, LOG_DEBUG, "Unmount of %s succeeded",
+			pptr->dir);
+        }
+    }
+    return 0;
+}
+
+
+#ifdef WITH_SELINUX
+/*
+ * This function checks if the calling program has requested context
+ * change by calling setexeccon(). If context change is not requested
+ * then it does not make sense to polyinstantiate based on context.
+ * The return value from this function is used when selecting the 
+ * polyinstantiation method. If context change is not requested then
+ * the polyinstantiation method is set to USER, even if the configuration
+ * file lists the method as "context" or "both".
+ */
+static int ctxt_based_inst_needed(void)
+{
+    security_context_t scon = NULL;
+    int rc = 0;
+
+    rc = getexeccon(&scon);
+    if (rc < 0 || scon == NULL)
+        return 0;
+    else {
+        freecon(scon);
+        return 1;
+    }
+}
+#endif
+
+
+/*
+ * Entry point from pam_open_session call.
+ */
+PAM_EXTERN int pam_sm_open_session(pam_handle_t *pamh, int flags UNUSED,
+                                   int argc, const char **argv)
+{
+    int i, retval;
+    struct instance_data idata;
+    char *user_name;
+    struct passwd *pwd;
+    enum unmnt_op unmnt = NO_UNMNT;
+
+    /* init instance data */
+    idata.flags = 0;
+    idata.polydirs_ptr = NULL;
+    idata.pamh = pamh;
+#ifdef WITH_SELINUX
+    if (is_selinux_enabled())
+        idata.flags |= PAMNS_SELINUX_ENABLED;
+    if (ctxt_based_inst_needed())
+        idata.flags |= PAMNS_CTXT_BASED_INST;
+#endif
+
+    /* Parse arguments. */
+    for (i = 0; i < argc; i++) {
+        if (strcmp(argv[i], "debug") == 0)
+            idata.flags |= PAMNS_DEBUG;
+        if (strcmp(argv[i], "gen_hash") == 0)
+            idata.flags |= PAMNS_GEN_HASH;
+        if (strcmp(argv[i], "ignore_config_error") == 0)
+            idata.flags |= PAMNS_IGN_CONFIG_ERR;
+        if (strcmp(argv[i], "unmnt_remnt") == 0)
+            unmnt = UNMNT_REMNT;
+        if (strcmp(argv[i], "unmnt_only") == 0)
+            unmnt = UNMNT_ONLY;
+	if (strcmp(argv[i], "require_selinux") == 0) {
+		if (~(idata.flags & PAMNS_SELINUX_ENABLED)) {
+        		pam_syslog(idata.pamh, LOG_ERR, 
+		    "selinux_required option given and selinux is disabled");
+			return PAM_SESSION_ERR;
+		}
+	}
+    }
+    if (idata.flags & PAMNS_DEBUG)
+        pam_syslog(idata.pamh, LOG_DEBUG, "open_session - start");
+
+    /* 
+     * Lookup user and fill struct items
+     */
+    retval = pam_get_item(idata.pamh, PAM_USER, (void*) &user_name );
+    if ( user_name == NULL || retval != PAM_SUCCESS ) {
+        pam_syslog(idata.pamh, LOG_ERR, "Error recovering pam user name");
+        return PAM_SESSION_ERR;
+    }
+
+    pwd = getpwnam(user_name);
+    if (!pwd) {
+        pam_syslog(idata.pamh, LOG_ERR, "user unknown '%s'", user_name);
+        return PAM_SESSION_ERR;
+    }
+
+    /*
+     * Add the user info to the instance data so we can refer to them later.
+     */
+    idata.user[0] = 0;
+    strncat(idata.user, user_name, sizeof(idata.user));
+    idata.uid = pwd->pw_uid;
+
+    /*
+     * Parse namespace configuration file which lists directories to
+     * polyinstantiate, directory where instance directories are to
+     * be created and the method used for polyinstantiation.
+     */
+    retval = parse_config_file(&idata);
+    if (retval != PAM_SUCCESS) {
+	del_polydir_list(idata.polydirs_ptr);
+        return PAM_SESSION_ERR;
+    }
+
+    if (idata.polydirs_ptr) {
+        retval = setup_namespace(&idata, unmnt);
+        if (idata.flags & PAMNS_DEBUG) {
+            if (retval)
+                pam_syslog(idata.pamh, LOG_DEBUG,
+			"namespace setup failed for pid %d", getpid());
+            else
+                pam_syslog(idata.pamh, LOG_DEBUG,
+			"namespace setup ok for pid %d", getpid());
+        }
+    } else if (idata.flags & PAMNS_DEBUG)
+        pam_syslog(idata.pamh, LOG_DEBUG, "Nothing to polyinstantiate");
+
+    del_polydir_list(idata.polydirs_ptr);
+    return retval;
+}
+
+
+/*
+ * Entry point from pam_close_session call.
+ */
+PAM_EXTERN int pam_sm_close_session(pam_handle_t *pamh, int flags UNUSED,
+                                    int argc, const char **argv)
+{
+    int i, retval;
+    struct instance_data idata;
+    char *user_name;
+    struct passwd *pwd;
+
+    /* init instance data */
+    idata.flags = 0;
+    idata.polydirs_ptr = NULL;
+    idata.pamh = pamh;
+#ifdef WITH_SELINUX
+    if (is_selinux_enabled())
+        idata.flags |= PAMNS_SELINUX_ENABLED;
+    if (ctxt_based_inst_needed())
+        idata.flags |= PAMNS_CTXT_BASED_INST;
+#endif
+
+    /* Parse arguments. */
+    for (i = 0; i < argc; i++) {
+        if (strcmp(argv[i], "debug") == 0) 
+            idata.flags |= PAMNS_DEBUG;
+        if (strcmp(argv[i], "ignore_config_error") == 0)
+            idata.flags |= PAMNS_IGN_CONFIG_ERR;
+    }
+
+    if (idata.flags & PAMNS_DEBUG)
+        pam_syslog(idata.pamh, LOG_DEBUG, "close_session - start");
+
+    /* 
+     * Lookup user and fill struct items
+     */
+    retval = pam_get_item(idata.pamh, PAM_USER, (void*) &user_name );
+    if ( user_name == NULL || retval != PAM_SUCCESS ) {
+        pam_syslog(idata.pamh, LOG_ERR, "Error recovering pam user name");
+        return PAM_SESSION_ERR;
+    }
+
+    pwd = getpwnam(user_name);
+    if (!pwd) {
+        pam_syslog(idata.pamh, LOG_ERR, "user unknown '%s'", user_name);
+        return PAM_SESSION_ERR;
+    }
+
+    /*
+     * Add the user info to the instance data so we can refer to them later.
+     */
+    idata.user[0] = 0;
+    strncat(idata.user, user_name, sizeof(idata.user));
+    idata.uid = pwd->pw_uid;
+
+    /*
+     * Parse namespace configuration file which lists directories that
+     * are polyinstantiated, directories where instance directories are
+     * created and the method used for polyinstantiation.
+     */
+    retval = parse_config_file(&idata);
+    if ((retval != PAM_SUCCESS) || !idata.polydirs_ptr) {
+	del_polydir_list(idata.polydirs_ptr);
+        return PAM_SESSION_ERR;
+    }
+
+    if (idata.flags & PAMNS_DEBUG)
+        pam_syslog(idata.pamh, LOG_DEBUG, "Resetting namespace for pid %d",
+		getpid());
+
+    retval = orig_namespace(&idata);
+    if (idata.flags & PAMNS_DEBUG) {
+        if (retval) 
+            pam_syslog(idata.pamh, LOG_DEBUG,
+		"resetting namespace failed for pid %d", getpid());
+        else 
+            pam_syslog(idata.pamh, LOG_DEBUG, 
+		"resetting namespace ok for pid %d", getpid());
+    }
+    del_polydir_list(idata.polydirs_ptr);
+    return PAM_SUCCESS;
+}
+
+#ifdef PAM_STATIC
+
+/* static module data */
+
+struct pam_module _pam_namespace_modstruct = {
+     "pam_namespace",
+     NULL,
+     NULL,
+     NULL,
+     pam_sm_open_session,
+     pam_sm_close_session,
+     NULL
+};
+#endif
+
--- /dev/null	2006-04-25 10:12:36.092931750 +0200
+++ Linux-PAM-0.99.3.0/modules/pam_namespace/Makefile.am	2006-04-25 16:41:28.000000000 +0200
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2006 Red Hat, Inc. 
+#
+
+CLEANFILES = *~
+MAN5 = namespace.conf.5
+MAN8 = pam_namespace.8
+
+man_MANS = $(MAN5) $(MAN8)
+
+EXTRA_DIST = README namespace.conf $(man_MANS)
+
+securelibdir = $(SECUREDIR)
+secureconfdir = $(SCONFIGDIR)
+
+AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
+        -DPAM_NAMESPACE_CONFIG=\"$(SCONFIGDIR)/namespace.conf\"
+AM_LDFLAGS =  -no-undefined -avoid-version -module \
+        -L$(top_builddir)/libpam -lpam -lssl @LIBSELINUX@
+if HAVE_VERSIONING
+  AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
+endif
+
+securelib_LTLIBRARIES = pam_namespace.la
+
+secureconf_DATA = namespace.conf
+
--- /dev/null	2006-04-25 10:12:36.092931750 +0200
+++ Linux-PAM-0.99.3.0/modules/pam_namespace/pam_namespace.8.xml	2006-04-25 16:41:28.000000000 +0200
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+                   "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+
+<refentry id='pam_namespace'>
+
+  <refmeta>
+    <refentrytitle>pam_namespace</refentrytitle>
+    <manvolnum>8</manvolnum>
+    <refmiscinfo class='setdesc'>Linux-PAM Manual</refmiscinfo>
+  </refmeta>
+
+  <refnamediv id='pam_namespace-name'>
+    <refname>pam_namespace</refname>
+    <refpurpose>
+      PAM module for configuring namespace for a session
+    </refpurpose>
+  </refnamediv>
+
+<!-- body begins here -->
+
+  <refsynopsisdiv>
+    <cmdsynopsis id="pam_namespace-cmdsynopsis">
+      <command>pam_namespace.so</command>
+      <arg choice="opt">
+        debug
+      </arg>
+      <arg choice="opt">
+        unmnt_remnt
+      </arg>
+      <arg choice="opt">
+        unmnt_only
+      </arg>
+      <arg choice="opt">
+        require_selinux
+      </arg>
+      <arg choice="opt">
+        gen_hash
+      </arg>
+      <arg choice="opt">
+        ignore_config_error
+      </arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+
+  <refsect1 id="pam_namespace-description">
+    <title>DESCRIPTION</title>
+    <para>
+      The pam_namespace PAM module sets up a private namespace for a
+      session with polyinstantiated directories. A polyinstantiated
+      directory provides a different instance of itself based on user
+      name, or when using SELinux, user name, security context or both.
+  </refsect1>
+
+  <refsect1 id="pam_namespace-options">
+    <title>OPTIONS</title>
+    <variablelist>
+
+      <varlistentry>
+        <term>
+          <option>debug</option>
+        </term>
+        <listitem>
+          <para>
+            A lot of debug informations is logged using syslog
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <option>unmnt_remnt</option>
+        </term>
+        <listitem>
+          <para>
+            For programs such as su and newrole, the login
+            session has already setup a polyinstantiated
+            namespace. For these programs, polyinstantiation
+            is performed based on new user id or security
+            context, however the command first needs to
+            undo the polyinstantiation performed by login.
+            This argument instructs the command to
+            first undo previous polyinstantiation before
+            proceeding with new polyinstantiation based on
+            new id/context
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <option>unmnt_only</option>
+        </term>
+        <listitem>
+          <para>
+            For trusted programs that want to undo any
+            existing bind mounts and process instance
+            directories on their own, this argument allows
+            them to unmount currently mounted instance
+            directories
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <option>require_selinux</option>
+        </term>
+        <listitem>
+          <para>
+            If selinux is not enabled, return failure
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <option>gen_hash</option>
+        </term>
+        <listitem>
+          <para>
+            Instead of using the security context string
+            for the instance name, generate and use its
+            md5 hash.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <option>ignore_config_error</option>
+        </term>
+        <listitem>
+          <para>
+            If a line in the configuration file corresponding
+            to a polyinstantiated directory contains format
+            error, skip that line process the next line.
+            Without this option, pam will return an error
+            to the calling program resulting in termination
+            of the session.
+          </para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+  </refsect1>
+
+  <refsect1 id="pam_namespace-services">
+    <title>MODULE SERVICES PROVIDED</title>
+    <para>
+      The <option>session</option> service is supported.
+    </para>
+  </refsect1>
+
+  <refsect1 id="pam_namespace-return_values">
+    <title>RETURN VALUES</title>
+    <variablelist>
+      <varlistentry>
+        <term>PAM_SUCCESS</term>
+        <listitem>
+           <para>
+             Namespace setup was successful.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>PAM_SERVICE_ERR</term>
+        <listitem>
+           <para>
+             Unexpected system error occurred while setting up namespace.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>PAM_SESSION_ERR</term>
+        <listitem>
+           <para>
+             Unexpected namespace configuration error occurred.
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1 id="pam_namespace-files">
+    <title>FILES</title>
+    <variablelist>
+      <varlistentry>
+        <term><filename>/etc/security/namespace.conf</filename></term>
+        <listitem>
+          <para>Configuration file</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1 id="pam_namespace-see_also">
+    <title>SEE ALSO</title>
+    <para>
+      <citerefentry>
+        <refentrytitle>namespace.conf</refentrytitle><manvolnum>5</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+        <refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+        <refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
+      </citerefentry>.
+    </para>
+  </refsect1>
+
+  <refsect1 id="pam_namespace-authors">
+    <title>AUTHORS</title>
+    <para>
+      The namespace setup scheme was designed by Stephen Smalley, Janak Desai
+      and Chad Sellers.
+      The pam_namespace PAM module was developed by Janak Desai &lt;janak at us.ibm.com&gt;, Chad Sellers &lt;csellers at tresys.com&gt; and Steve Grubb &lt;sgrubb at redhat.com&gt.
+    </para>
+  </refsect1>
+</refentry>
--- /dev/null	2006-04-25 10:12:36.092931750 +0200
+++ Linux-PAM-0.99.3.0/modules/pam_namespace/namespace.conf	2006-04-25 16:41:28.000000000 +0200
@@ -0,0 +1,15 @@
+# /etc/security/namespace.conf
+#
+# See /usr/share/doc/pam-*/txts/README.pam_namespace for more information.
+# 
+# Uncommenting the following three lines will polyinstantiate
+# /tmp, /var/tmp and user's home directories. /tmp and /var/tmp will
+# be polyinstantiated based on both security context as well as user
+# name, whereas home directory will be polyinstantiated based on
+# security context only. Polyinstantion will not be performed for
+# user root and adm for directories /tmp and /var/tmp, whereas home
+# directories will be polyinstantiated for all users.
+#
+#/tmp     /tmp/tmp.inst-$USER-       both      adm
+#/var/tmp /var/tmp/tmp.inst-$USER-   both      adm
+#$HOME    $HOME/$USER.inst-          context
--- /dev/null	2006-04-25 10:12:36.092931750 +0200
+++ Linux-PAM-0.99.3.0/modules/pam_namespace/namespace.conf.5.xml	2006-04-25 16:41:28.000000000 +0200
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding='UTF-8'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+        "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+
+<refentry id="namespace.conf">
+
+  <refmeta>
+    <refentrytitle>namespace.conf</refentrytitle>
+    <manvolnum>5</manvolnum>
+    <refmiscinfo class="sectdesc">Linux-PAM Manual</refmiscinfo>
+  </refmeta>
+
+  <refnamediv>
+    <refname>namespace.conf</refname>
+    <refpurpose>the namespace configuration file</refpurpose>
+  </refnamediv>
+
+
+  <refsect1 id='namespace.conf-description'>
+    <title>DESCRIPTION</title>
+
+    <para>
+      This module allows setup of private namespaces with polyinstantiated
+      directories. Directories can be polyinstantiated based on user name
+      or, in the case of SELinux, user name, security context or both.
+    </para>
+
+    <para>
+      The <filename>/etc/security/namespace.conf</filename> file specifies
+      which directories are polyinstantiated, how they are polyinstantiated,
+      how instance directories would be named, and any users for whom
+      polyinstantiation would not be performed.
+    </para>
+
+    <para>
+      When someone logs in, the file <filename>namespace.conf</filename> is
+      scanned where each non comment line represents one polyinstantiated
+      directory with space separated fields as follows:
+   </para>
+
+    <para>
+      <replaceable>polydir</replaceable> <replaceable>instance_prefex</replaceable> <replaceable>method</replaceable> <replaceable>list_of_uids</replaceable>
+    </para>
+
+    <para>
+      The first field, <replaceable>polydir</replaceable>, is the absolute
+      pathname of the directory to polyinstantiate. Special entry $HOME is
+      supported to designate user's home directory. This field cannot be
+      blank.
+    </para>
+
+    <para>
+      The second field, <replaceable>instance_prefix</replaceable> is
+      the string prefix used to build the pathname for the instantiation
+      of &lt;polydir&gt;. The directory security context, or optionally its
+      md5sum string (32 hex characters), is appended to the prefix to
+      generate the final instance directory path. This directory is
+      created if it did not exist already, and is then bind mounted on
+      the &lt;polydir&gt; to provide an instance of &lt;polydir&gt; based on the
+      &lt;method&gt; column. The special string $HOME is replaced with the
+      user's home directory, and $USER with the username. This field
+      cannot be blank.
+    </para>
+
+    <para>
+      The third field, <replaceable>method</replaceable>, is the method
+      used for polyinstantiation. It can take 3 different values; "user"
+      for polyinstantiation based on user name, "context" for
+      polyinstantiation based on process security context, and "both"
+      for polyinstantiation based on both user name and security context.
+      Methods "context" and "both" are only available with SELinux. This
+      field cannot be blank.
+    </para>
+
+    <para>
+      The fourth field, <replaceable>list_of_uids</replaceable>, is
+      a comma separated list of user names for whom the polyinstantiation
+      is not performed. If left blank, polyinstantiation will be performed
+      for all users.
+    </para>
+
+  </refsect1>
+
+  <refsect1 id="namespace.conf-examples">
+    <title>EXAMPLES</title>
+    <para>
+      These are some example lines which might be specified in
+      <filename>/etc/security/namespace.conf</filename>.
+    </para>
+
+    <para>
+      # The following three lines will polyinstantiate /tmp,
+      # /var/tmp and user's home directories. /tmp and /var/tmp
+      # will be polyinstantiated based on both security context as well
+      # as user name, whereas home directory will be polyinstantiated
+      # based on security context only. Polyinstantiation will not be
+      # performed for user root and adm for directories /tmp and
+      # /var/tmp, whereas home directories will be polyinstantiated for
+      # all users.
+      #
+      /tmp     /tmp/tmp.inst-$USER-       both      root,adm
+      /var/tmp /var/tmp/tmp.inst-$USER-   both      root,adm
+      $HOME    $HOME.inst-                context
+    </para>
+
+    <para>
+      For the &lt;service&gt;s you need polyinstantiation (login for example)
+      put the following line in /etc/pam.d/&lt;service&gt; as the last line for
+      session group:
+    </para>
+
+    <para>
+      session  required  pam_namespace.so [arguments]
+    </para>
+
+    <para>
+      This module also depends on pam_selinux.so setting the context.
+    </para>
+
+  </refsect1>
+
+  <refsect1 id="namespace.conf-see_also">
+    <title>SEE ALSO</title>
+    <para>
+      <citerefentry><refentrytitle>pam_namespace</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+    </para>
+  </refsect1>
+
+  <refsect1 id="namespace.conf-author">
+    <title>AUTHORS</title>
+    <para>
+      The namespace.conf manual page was written by Janak Desai &lt;janak at us.ibm.com&gt;.
+    </para>
+  </refsect1>
+</refentry>
--- Linux-PAM-0.99.3.0/modules/Makefile.am.namespace	2006-04-25 16:41:28.000000000 +0200
+++ Linux-PAM-0.99.3.0/modules/Makefile.am	2006-04-25 16:41:28.000000000 +0200
@@ -5,7 +5,8 @@
 SUBDIRS = pam_access pam_cracklib pam_debug pam_deny pam_echo \
 	pam_env pam_filter pam_ftp pam_group pam_issue pam_lastlog \
 	pam_limits pam_listfile pam_localuser pam_mail pam_mkhomedir \
-	pam_motd pam_nologin pam_permit pam_pwdb pam_rhosts pam_rootok \
+	pam_motd pam_namespace pam_nologin pam_permit pam_pwdb \
+	pam_rhosts pam_rootok \
 	pam_securetty pam_selinux pam_shells pam_stress pam_succeed_if \
 	pam_tally pam_time pam_umask pam_unix pam_userdb pam_warn \
 	pam_wheel pam_xauth \
--- Linux-PAM-0.99.3.0/configure.in.namespace	2006-04-25 16:41:28.000000000 +0200
+++ Linux-PAM-0.99.3.0/configure.in	2006-04-25 16:41:28.000000000 +0200
@@ -348,6 +348,9 @@
 LIBS=$BACKUP_LIBS
 AC_SUBST(LIBSELINUX)
 AM_CONDITIONAL([HAVE_LIBSELINUX], [test ! -z "$LIBSELINUX"])
+if test ! -z "$LIBSELINUX" ; then
+    AC_DEFINE([WITH_SELINUX], 1, [Defined if SE Linux support is compiled in])
+fi
 
 dnl Checks for Libcap
 BACKUP_LIBS=$LIBS
@@ -454,6 +457,7 @@
 	modules/pam_limits/Makefile modules/pam_listfile/Makefile \
 	modules/pam_localuser/Makefile modules/pam_mail/Makefile \
 	modules/pam_mkhomedir/Makefile modules/pam_motd/Makefile \
+	modules/pam_namespace/Makefile \
 	modules/pam_nologin/Makefile modules/pam_permit/Makefile \
 	modules/pam_pwdb/Makefile modules/pam_rhosts/Makefile \
 	modules/pam_rootok/Makefile \

pam_namespace-have-unshare.patch:
 config.h.in                       |    3 +++
 configure.in                      |    2 ++
 modules/pam_namespace/Makefile.am |    3 ++-
 3 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE pam_namespace-have-unshare.patch ---
--- Linux-PAM-0.99.3.0/configure.in.have-unshare	2006-04-20 15:33:07.000000000 +0200
+++ Linux-PAM-0.99.3.0/configure.in	2006-04-20 15:57:54.000000000 +0200
@@ -402,6 +402,8 @@
 AC_CHECK_FUNCS(strcspn strdup strspn strstr strtol uname)
 AC_CHECK_FUNCS(getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r)
 AC_CHECK_FUNCS(getgrouplist getline getdelim)
+AC_CHECK_FUNCS(unshare, [UNSHARE=yes], [UNSHARE=no])
+AM_CONDITIONAL([HAVE_UNSHARE], [test "$UNSHARE" = yes])
 
 dnl Checks for programs/utilities
 AC_CHECK_PROG(SGML2PS, sgml2ps, yes, no)
--- Linux-PAM-0.99.3.0/config.h.in.have-unshare	2006-04-20 15:33:07.000000000 +0200
+++ Linux-PAM-0.99.3.0/config.h.in	2006-04-20 15:33:07.000000000 +0200
@@ -188,6 +188,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to 1 if you have the `unshare' function. */
+#undef HAVE_UNSHARE
+
 /* Define to 1 if you have the <utmpx.h> header file. */
 #undef HAVE_UTMPX_H
 
--- Linux-PAM-0.99.3.0/modules/pam_namespace/Makefile.am.have-unshare	2006-04-20 15:33:07.000000000 +0200
+++ Linux-PAM-0.99.3.0/modules/pam_namespace/Makefile.am	2006-04-20 15:33:07.000000000 +0200
@@ -21,7 +21,8 @@
   AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
 endif
 
+if HAVE_UNSHARE
 securelib_LTLIBRARIES = pam_namespace.la
 
 secureconf_DATA = namespace.conf
-
+endif

pam_namespace-no-mans.patch:
 Makefile.am |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pam_namespace-no-mans.patch ---
--- Linux-PAM-0.99.3.0/modules/pam_namespace/Makefile.am.no-mans	2006-04-20 12:58:35.000000000 +0200
+++ Linux-PAM-0.99.3.0/modules/pam_namespace/Makefile.am	2006-04-20 14:28:23.000000000 +0200
@@ -6,7 +6,7 @@
 MAN5 = namespace.conf.5
 MAN8 = pam_namespace.8
 
-man_MANS = $(MAN5) $(MAN8)
+#man_MANS = $(MAN5) $(MAN8)
 
 EXTRA_DIST = README namespace.conf $(man_MANS)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	3 Feb 2006 12:41:29 -0000	1.33
+++ .cvsignore	25 Apr 2006 14:53:39 -0000	1.34
@@ -1,3 +1,3 @@
 Linux-PAM-0.99.3.0.tar.bz2
 db-4.3.29.tar.gz
-pam-redhat-0.99.3-1.tar.bz2
+pam-redhat-0.99.4-1.tar.bz2


Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- pam.spec	24 Feb 2006 10:46:47 -0000	1.105
+++ pam.spec	25 Apr 2006 14:53:39 -0000	1.106
@@ -6,12 +6,12 @@
 %define pwdb_version 0.62
 %define db_version 4.3.29
 %define db_conflicting_version 4.4.0
-%define pam_redhat_version 0.99.3-1
+%define pam_redhat_version 0.99.4-1
 
 Summary: A security tool which provides authentication for applications.
 Name: pam
 Version: 0.99.3.0
-Release: 2
+Release: 3
 License: GPL or BSD
 Group: System Environment/Base
 Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
@@ -29,23 +29,27 @@
 Patch28: pam-0.75-sgml2latex.patch
 Patch34: pam-0.99.2.1-dbpam.patch
 Patch70: pam-0.99.2.1-selinux-nofail.patch
-Patch72: pam-0.99.3.0-pie.patch
 Patch80: pam-0.99.2.1-selinux-drop-multiple.patch
 Patch81: pam-0.99.3.0-cracklib-try-first-pass.patch
+Patch90: pam_namespace-7.patch
+Patch91: pam_namespace-no-mans.patch
+Patch92: pam_namespace-have-unshare.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: cracklib, cracklib-dicts >= 2.8
 Obsoletes: pamconfig
 Prereq: grep, mktemp, sed, coreutils, /sbin/ldconfig
-BuildPrereq: autoconf, bison, flex, glib2-devel, sed
+BuildPrereq: autoconf, automake, bison, flex, glib2-devel, sed
 BuildPrereq: cracklib, cracklib-dicts >= 2.8
-BuildPrereq: perl, pkgconfig
+BuildPrereq: perl, pkgconfig, openssl-devel
 %if %{WITH_AUDIT}
 BuildPrereq: audit-libs-devel >= 1.0.8
 Requires: audit-libs >= 1.0.8
 %endif
 BuildPrereq: libselinux-devel >= 1.27.7
 Requires: libselinux >= 1.27.7
+BuildPrereq: glibc >= 2.3.90-37
+Requires: glibc >= 2.3.90-37
 # Following deps are necessary only to build the pam library documentation.
 # They can be safely removed if the documentation is not needed.
 BuildPrereq: linuxdoc-tools
@@ -85,9 +89,11 @@
 %patch28 -p1 -b .doc
 %patch34 -p1 -b .dbpam
 %patch70 -p1 -b .nofail
-%patch72 -p1 -b .pie
 %patch80 -p1 -b .drop-multiple
 %patch81 -p1 -b .try-first-pass
+%patch90 -p1 -b .namespace
+%patch91 -p1 -b .no-mans
+%patch92 -p1 -b .have-unshare
 
 for readme in modules/pam_*/README ; do
 	cp -f ${readme} doc/txts/README.`dirname ${readme} | sed -e 's|^modules/||'`
@@ -300,6 +306,7 @@
 /%{_lib}/security/pam_mail.so
 /%{_lib}/security/pam_mkhomedir.so
 /%{_lib}/security/pam_motd.so
+/%{_lib}/security/pam_namespace.so
 /%{_lib}/security/pam_nologin.so
 /%{_lib}/security/pam_permit.so
 /%{_lib}/security/pam_postgresok.so
@@ -334,6 +341,7 @@
 %config(noreplace) %{_sysconfdir}/security/console.handlers
 %config(noreplace) %{_sysconfdir}/security/group.conf
 %config(noreplace) %{_sysconfdir}/security/limits.conf
+%config(noreplace) %{_sysconfdir}/security/namespace.conf
 %config(noreplace) %{_sysconfdir}/security/pam_env.conf
 %config(noreplace) %{_sysconfdir}/security/time.conf
 %config(noreplace) %{_sysconfdir}/security/opasswd
@@ -353,6 +361,11 @@
 %{_libdir}/libpam_misc.so
 
 %changelog
+* Tue Apr 25 2006 Tomas Mraz <tmraz at redhat.com> 0.99.3.0-3
+- added pam_namespace module written by Janak Desai (per-user /tmp
+support)
+- new pam-redhat modules version
+
 * Fri Feb 24 2006 Tomas Mraz <tmraz at redhat.com> 0.99.3.0-2
 - added try_first_pass option to pam_cracklib
 - use try_first_pass for pam_unix and pam_cracklib in


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	3 Feb 2006 12:41:29 -0000	1.35
+++ sources	25 Apr 2006 14:53:39 -0000	1.36
@@ -1,3 +1,3 @@
 aabed0543f57dc3e4eebbb0779daf898  Linux-PAM-0.99.3.0.tar.bz2
 13585a20ce32f113b8e8cdb57f52e3bb  db-4.3.29.tar.gz
-d1a3f1190c8c9b7ce3cf27660f59a2ab  pam-redhat-0.99.3-1.tar.bz2
+754c2bd7c117aa898f477478b8bfb727  pam-redhat-0.99.4-1.tar.bz2


--- pam-0.99.3.0-pie.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 25 15:07:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 11:07:27 -0400
Subject: rpms/ethereal/FC-4 ethereal-column.patch, NONE, 1.1 .cvsignore, 1.25,
	1.26 ethereal.spec, 1.41, 1.42 sources, 1.28, 1.29
Message-ID: <200604251507.k3PF7RrR012021@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/ethereal/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv12005

Modified Files:
	.cvsignore ethereal.spec sources 
Added Files:
	ethereal-column.patch 
Log Message:
 - update to 0.99.0
 - fix segfault when rearranging columns



ethereal-column.patch:
 column_prefs.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE ethereal-column.patch ---
--- ethereal-0.99.0-SVN-17918/gtk/column_prefs.c.old	2006-04-20 01:53:02.000000000 +0200
+++ ethereal-0.99.0-SVN-17918/gtk/column_prefs.c	2006-04-25 02:14:52.000000000 +0200
@@ -1,7 +1,7 @@
 /* column_prefs.c
  * Dialog box for column preferences
  *
- * $Id: column_prefs.c 15465 2005-08-20 12:09:48Z ulfl $
+ * $Id: column_prefs.c 17983 2006-04-24 21:27:12Z jake $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald at ethereal.com>
@@ -638,6 +638,7 @@
                 return;
             }
         }
+        clp1 = g_list_find(prefs.col_list, cfmt);
         gtk_tree_model_get(model, &iter2, 0, &title2, 1, &format2, 2,
                            &clp2, -1);
         gtk_list_store_set(GTK_LIST_STORE(model), &iter2, 0, title1, 1,
@@ -645,7 +646,7 @@
         gtk_list_store_set(GTK_LIST_STORE(model), &iter1, 0, title2, 1,
                            format2, 2, clp2, -1);
         gtk_tree_selection_select_iter(sel, &iter2);
-        /* clp1 = g_list_find(prefs.col_list, cfmt); */
+
         column_set_arrow_button_sensitivity(clp1);
 
         /* free strings read from the TreeModel */


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ethereal/FC-4/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	29 Dec 2005 22:17:26 -0000	1.25
+++ .cvsignore	25 Apr 2006 15:07:25 -0000	1.26
@@ -1 +1 @@
-ethereal-0.10.14.tar.bz2
+ethereal-0.99.0.tar.bz2


Index: ethereal.spec
===================================================================
RCS file: /cvs/dist/rpms/ethereal/FC-4/ethereal.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ethereal.spec	29 Dec 2005 22:17:27 -0000	1.41
+++ ethereal.spec	25 Apr 2006 15:07:25 -0000	1.42
@@ -2,8 +2,8 @@
 
 Summary: 	Network traffic analyzer
 Name: 		ethereal
-Version:	0.10.14
-Release: 	1.FC4.1
+Version:	0.99.0
+Release: 	fc4.1
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	http://www.ethereal.com/distribution/%{name}-%{version}.tar.bz2
@@ -12,6 +12,7 @@
 Source3:	ethereal.desktop
 Source4:	ethereal.png
 Patch4:		ethereal-0.10.13-pie.patch
+Patch5:		ethereal-column.patch
 Url: 		http://www.ethereal.com/
 BuildRoot: 	%{_tmppath}/%{name}-root
 Requires: 	libpcap >= 0.6
@@ -132,6 +133,7 @@
 %{_sbindir}/dftest
 %{_sbindir}/capinfos
 %{_sbindir}/randpkt
+%{_sbindir}/dumpcap
 %{python_sitelib}/*
 %{_libdir}/lib*
 %{_mandir}/man1/editcap.*
@@ -140,6 +142,7 @@
 %{_mandir}/man1/mergecap.*
 %{_mandir}/man1/text2pcap.*
 %{_mandir}/man1/capinfos.*
+%{_mandir}/man1/dumpcap.*
 %{_mandir}/man4/ethereal-filter.*
 %{_libdir}/ethereal
 %{_sysconfdir}/pam.d/ethereal
@@ -156,6 +159,10 @@
 
 
 %changelog
+* Tue Apr 25 2006 Radek Vok??l <rvokal at redhat.com> 0.99.0-fc4.1
+- update to 0.99.0
+- fix segfault when rearranging columns
+
 * Thu Dec 29 2005 Radek Vokal <rvokal at redhat.com> 0.10.14-1.FC4.1
 - upgrade to 0.10.14
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ethereal/FC-4/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	29 Dec 2005 22:17:27 -0000	1.28
+++ sources	25 Apr 2006 15:07:25 -0000	1.29
@@ -1 +1 @@
-297f678c037f88429250830e924b8fa0  ethereal-0.10.14.tar.bz2
+f9905b9d347acdc05af664a7553f7f76  ethereal-0.99.0.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 25 15:19:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 11:19:53 -0400
Subject: rpms/selinux-policy/devel xm.patch, NONE, 1.1 selinux-policy.spec,
	1.180, 1.181
Message-ID: <200604251519.k3PFJrK1006666@cvs.devel.redhat.com>

Author: jantill

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6633

Modified Files:
	selinux-policy.spec 
Added Files:
	xm.patch 
Log Message:
* Tue Apr 25 2006 James Antill <jantill at redhat.com> 2.2.35-2
- Add xm policy
- Fix policygentool


xm.patch:
 policy/modules/system/xen.if                    |   63 ++++++++++++++++++++++++
 policy/modules/system/xen.te                    |   52 +++++++++++++++++++
 serefpolicy-2.2.35/policy/modules/system/xen.fc |    1 
 3 files changed, 116 insertions(+)

--- NEW FILE xm.patch ---
diff -ru serefpolicy-2.2.35-orig/policy/modules/system/xen.fc serefpolicy-2.2.35/policy/modules/system/xen.fc
--- serefpolicy-2.2.35-orig/policy/modules/system/xen.fc	2006-04-24 20:14:54.000000000 -0400
+++ serefpolicy-2.2.35/policy/modules/system/xen.fc	2006-04-25 11:01:03.000000000 -0400
@@ -14,3 +14,4 @@
 /var/run/xend\.pid	--      gen_context(system_u:object_r:xend_var_run_t,s0)
 /var/run/xenstore\.pid	--	gen_context(system_u:object_r:xenstored_var_run_t,s0)
 /var/run/xenstored(/.*)?	gen_context(system_u:object_r:xenstored_var_run_t,s0)
+/usr/sbin/xm		--	gen_context(system_u:object_r:xm_exec_t,s0)
--- serefpolicy-2.2.35-orig/policy/modules/system/xen.if	2006-04-25 10:27:36.000000000 -0400
+++ serefpolicy-2.2.35/policy/modules/system/xen.if	2006-04-25 11:03:07.000000000 -0400
@@ -83,3 +83,66 @@
 	allow $1 xenstored_var_run_t:sock_file { getattr write };
 	allow $1 xenstored_t:unix_stream_socket connectto;
 ')
+
+########################################
+## <summary>
+##	Connect to xend over an unix stream socket.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`xen_connect',`
+	gen_require(`
+		type xend_t, xend_var_run_t;
+	')
+
+	files_search_pids($1)
+	allow $1 xend_var_run_t:dir search;
+	allow $1 xend_var_run_t:sock_file getattr;
+	allow $1 xend_t:unix_stream_socket connectto;
+')
+
+########################################
+## <summary>
+##	Write to xend over an unix stream socket.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`xen_writeto',`
+	gen_require(`
+		type xend_var_run_t;
+	')
+
+	allow $1 xend_var_run_t:sock_file write;
+')
+
+
+########################################
+## <summary>
+##	Execute a domain transition to run xm.
+## </summary>
+## <param name="domain">
+## <summary>
+##	Domain allowed to transition.
+## </summary>
+## </param>
+#
+interface(`xm_domtrans',`
+	gen_requires(`
+		type xm_t, xm_exec_t;
+	')
+
+	domain_auto_trans($1,xm_exec_t,xm_t)
+
+	allow $1 xm_t:fd use;
+	allow xm_t $1:fd use;
+	allow xm_t:$1:fifo_file rw_file_perms;
+	allow xm_t $1:process sigchld;
+')
Only in serefpolicy-2.2.35/policy/modules/system: xen.if~
--- serefpolicy-2.2.35-orig/policy/modules/system/xen.te	2006-04-25 10:27:36.000000000 -0400
+++ serefpolicy-2.2.35/policy/modules/system/xen.te	2006-04-25 11:01:03.000000000 -0400
@@ -224,3 +224,55 @@
 miscfiles_read_localization(xenstored_t)
 
 xen_append_log(xenstored_t)
+
+########################################
+#
+# Declarations
+#
+
+type xm_t;
+type xm_exec_t;
+domain_type(xm_t)
+init_daemon_domain(xm_t, xm_exec_t)
+
+########################################
+#
+# xm 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(xm_t)
+libs_use_ld_so(xm_t)
+libs_use_shared_libs(xm_t)
+miscfiles_read_localization(xm_t)
+# 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;
+
+
+# james -- aujdit2allow
+
+corecmd_exec_bin(xm_t)
+corecmd_exec_sbin(xm_t)
+
+kernel_read_system_state(xm_t)
+kernel_read_kernel_sysctls(xm_t)
+kernel_read_xen_state(xm_t)
+kernel_write_xen_state(xm_t)
+term_use_all_terms(xm_t)
+
+dev_read_urand(xm_t)
+
+xen_append_log(xm_t)
+xen_connect(xm_t)
+xen_writeto(xm_t)
+
+xen_stream_connect_xenstore(xm_t)
+allow xm_t self:capability dac_override;
+
+
+# allow xm_t root_t:dir search;
+# Need to relabel files for xen
+auth_read_all_files_except_shadow(xm_t)
+


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- selinux-policy.spec	25 Apr 2006 10:57:57 -0000	1.180
+++ selinux-policy.spec	25 Apr 2006 15:19:51 -0000	1.181
@@ -16,11 +16,12 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.35
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
 patch: policy-20060411.patch
+patch2: xm.patch
 Source1: modules-targeted.conf
 Source2: booleans-targeted.conf
 Source3: Makefile.devel
@@ -150,6 +151,7 @@
 %prep 
 %setup -q -n serefpolicy-%{version}
 %patch -p1
+%patch2 -p1
 
 %install
 # Build targeted policy
@@ -332,6 +334,10 @@
 %endif
 
 %changelog
+* Tue Apr 25 2006 James Antill <jantill at redhat.com> 2.2.35-2
+- Add xm policy
+- Fix policygentool
+
 * Mon Apr 24 2006 Dan Walsh <dwalsh at redhat.com> 2.2.35-1
 - Update to upstream
 - Fix postun to only disable selinux on full removal of the packages



From fedora-cvs-commits at redhat.com  Tue Apr 25 15:27:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 11:27:09 -0400
Subject: rpms/wpa_supplicant/FC-5 wpa_supplicant-ctrl-iface-hide-keys.patch,
	1.1, 1.2 wpa_supplicant-ssid-len-fix.patch, 1.1,
	1.2 wpa_supplicant.config, 1.2, 1.3 wpa_supplicant.spec, 1.14, 1.15
Message-ID: <200604251527.k3PFR90Z009484@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/wpa_supplicant/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16163

Modified Files:
	wpa_supplicant-ctrl-iface-hide-keys.patch 
	wpa_supplicant-ssid-len-fix.patch wpa_supplicant.config 
	wpa_supplicant.spec 
Log Message:
Update from devel branch:

* Tue Apr 25 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-9
- Enable Wired driver, PKCS12, and Smartcard options (#rh189805#)

* Tue Apr 11 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-8
- Fix control interface key obfuscation a bit



wpa_supplicant-ctrl-iface-hide-keys.patch:
 ctrl_iface.c |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

Index: wpa_supplicant-ctrl-iface-hide-keys.patch
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/FC-5/wpa_supplicant-ctrl-iface-hide-keys.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wpa_supplicant-ctrl-iface-hide-keys.patch	28 Feb 2006 05:03:44 -0000	1.1
+++ wpa_supplicant-ctrl-iface-hide-keys.patch	25 Apr 2006 15:27:04 -0000	1.2
@@ -14,8 +14,8 @@
  	*name++ = '\0';
  
 +	/* Only show passwords and keys if requested */
-+	if (!strncmp (name, "wep_key", 7) || !strcmp (name, "psk")
-+		|| !strcmp (name, "password") || !strcmp (name, "pin")) {
++	if (!strncmp (name, "wep_key", 7) || !strncmp (name, "psk", 3)
++		|| !strncmp (name, "password", 8) || !strncmp (name, "pin", 3)) {
 +		show_value = wpa_s->global->params.wpa_debug_show_keys;
 +	}
 +

wpa_supplicant-ssid-len-fix.patch:
 wpa_supplicant.c |    8 ++++++++
 1 files changed, 8 insertions(+)

Index: wpa_supplicant-ssid-len-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/FC-5/wpa_supplicant-ssid-len-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wpa_supplicant-ssid-len-fix.patch	2 Apr 2006 15:09:47 -0000	1.1
+++ wpa_supplicant-ssid-len-fix.patch	25 Apr 2006 15:27:04 -0000	1.2
@@ -1,9 +1,14 @@
 --- wpa_supplicant-0.4.8/wpa_supplicant.c.ssid-len-fix	2006-04-01 15:02:58.000000000 -0500
 +++ wpa_supplicant-0.4.8/wpa_supplicant.c	2006-04-01 15:03:02.000000000 -0500
-@@ -1425,6 +1425,9 @@
+@@ -1425,6 +1425,14 @@
  		return NULL;
  	}
  
++	/* Older/incorrect drivers return null-terminated SSIDs with
++	 * the null included in the length.  wpa_supplicant does memcmp()
++	 * with driver-reported SSIDs and SSIDs from the config file, which
++	 * don't include the null in their length.  Badness.
++	 */
 +	if ((ssid_len > 0) && (ssid[ssid_len-1] == '\0'))
 +		ssid_len--;
 +


Index: wpa_supplicant.config
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/FC-5/wpa_supplicant.config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wpa_supplicant.config	27 Mar 2006 19:10:21 -0000	1.2
+++ wpa_supplicant.config	25 Apr 2006 15:27:04 -0000	1.3
@@ -6,6 +6,7 @@
 CONFIG_DRIVER_WEXT=y
 CONFIG_DRIVER_NDISWRAPPER=y
 CONFIG_DRIVER_PRISM54=y
+CONFIG_DRIVER_WIRED=y
 //CONFIG_DRIVER_BROADCOM=y
 //CONFIG_DRIVER_IPW=y
 //CONFIG_DRIVER_BSD=y
@@ -25,3 +26,5 @@
 CONFIG_EAP_PAX=y
 CONFIG_EAP_LEAP=y
 //CONFIG_PCSC=y
+CONFIG_PKCS12=y
+CONFIG_SMARTCARD=y


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/FC-5/wpa_supplicant.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wpa_supplicant.spec	2 Apr 2006 15:09:47 -0000	1.14
+++ wpa_supplicant.spec	25 Apr 2006 15:27:04 -0000	1.15
@@ -2,7 +2,7 @@
 Name: wpa_supplicant
 Epoch: 1
 Version: 0.4.8
-Release: 7.fc5
+Release: 9.fc5
 License: GPL
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -127,6 +127,12 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* Tue Apr 25 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-9
+- Enable Wired driver, PKCS12, and Smartcard options (#rh189805#)
+
+* Tue Apr 11 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-8
+- Fix control interface key obfuscation a bit
+
 * Sun Apr  2 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-7
 - Work around older & incorrect drivers that return null-terminated SSIDs
 



From fedora-cvs-commits at redhat.com  Tue Apr 25 15:43:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 11:43:03 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.2.ooo64743.vcl.adjustonlevel1.patch, NONE,
	1.1 .cvsignore, 1.101, 1.102 openoffice.org.spec, 1.673,
	1.674 sources, 1.167, 1.168
Message-ID: <200604251543.k3PFh3co012569@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12538

Modified Files:
	.cvsignore openoffice.org.spec sources 
Added Files:
	openoffice.org-2.0.2.ooo64743.vcl.adjustonlevel1.patch 
Log Message:
lets go, hay ho

openoffice.org-2.0.2.ooo64743.vcl.adjustonlevel1.patch:
 source/gdi/sallayout.cxx     |    0 
 vcl/source/gdi/sallayout.cxx |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.2.ooo64743.vcl.adjustonlevel1.patch ---
Index: source/gdi/sallayout.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/gdi/sallayout.cxx,v
retrieving revision 1.75
diff -u -r1.75 sallayout.cxx
--- openoffice.org.orig/vcl/source/gdi/sallayout.cxx	26 Jan 2006 18:09:48 -0000	1.75
+++ openoffice.org/vcl/source/gdi/sallayout.cxx	25 Apr 2006 11:42:27 -0000
@@ -1560,7 +1560,7 @@
     for( n = 0; n < nLevel; ++n )
         maFallbackRuns[n].ResetPos();
     int nActiveCharPos = nCharPos[0];
-    while( nValid[0] && (nLevel > 1))
+    while( nValid[0] && (nLevel > 0))
     {
         // find best fallback level
         for( n = 0; n < nLevel; ++n )


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- .cvsignore	22 Mar 2006 11:53:38 -0000	1.101
+++ .cvsignore	25 Apr 2006 15:43:00 -0000	1.102
@@ -162,3 +162,4 @@
 OOB680_m4.tar.bz2
 OOB680_m5.tar.bz2
 openoffice.org-dict-cs_CZ.tar.gz
+ooo64726.sdf


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.673
retrieving revision 1.674
diff -u -r1.673 -r1.674
--- openoffice.org.spec	24 Apr 2006 12:24:18 -0000	1.673
+++ openoffice.org.spec	25 Apr 2006 15:43:00 -0000	1.674
@@ -1,6 +1,6 @@
 %define oootag OOB680
 %define ooomilestone 5
-%define rh_rpm_release 11
+%define rh_rpm_release 12
 
 %define build_fc6 1
 %define build_rhel4 0
@@ -140,6 +140,7 @@
 Source12:       apache-ant-1.6.5-bin.tar.bz2
 Source13:       Archive-Zip-1.13.tar.gz
 %endif
+Source14:       ooo64726.sdf
 %if ! %{build_rhel4}
 BuildRequires:  ant, perl-Archive-Zip
 %endif
@@ -230,6 +231,7 @@
 Patch40: openoffice.org-2.0.2.rh188467.printingdefaults.patch
 Patch41: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
 Patch42: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch43: openoffice.org-2.0.2.ooo64743.vcl.adjustonlevel1.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1152,6 +1154,7 @@
 %patch40 -p1 -b .rh188467.printingdefaults.patch
 %patch41 -p1 -b .ooo64463.extensions.noxaw.patch
 %patch42 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch43 -p1 -b .ooo64743.vcl.adjustonlevel1.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -1251,6 +1254,7 @@
 deliver -link
 localize -m -x -l ta-IN -f %{SOURCE2}
 localize -m -x -l ga -f %{SOURCE6}
+localize -m -x -l bn -f %{SOURCE14}
 cd ../..
 
 cd instsetoo_native/util
@@ -3706,6 +3710,11 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Tue Apr 25 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.12
+- ooo#64743# continuing my epic battle with CJK and Indic glyph
+  fallback (rh#189760#)
+- ooo#64726# "untranslate" bengali keyboard shortcuts (rh#189760#)
+
 * Mon Apr 24 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.11
 - ooo#64063# Finally 2.0.X Tamil translation updates
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- sources	24 Apr 2006 08:13:18 -0000	1.167
+++ sources	25 Apr 2006 15:43:00 -0000	1.168
@@ -10,3 +10,4 @@
 afe937f8dd4c3aa10e9bda068059cdfd  opens___.ttf
 008752c97e7cd0edbb7f6589ae61e498  GSI_ta-IN.sdf
 7f31494f6d929e03b1e29408d8083d19  GSI_ga.sdf
+05a906513ef89af5e189097fa0c50681  ooo64726.sdf



From fedora-cvs-commits at redhat.com  Tue Apr 25 15:55:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 11:55:59 -0400
Subject: rpms/pam/devel pam_namespace-7.patch,1.1,1.2
Message-ID: <200604251555.k3PFtxuB031103@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/pam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30902

Modified Files:
	pam_namespace-7.patch 
Log Message:
- missing declaration


pam_namespace-7.patch:
 config.h.in                                |    3 
 configure.in                               |    4 
 modules/Makefile.am                        |    3 
 modules/pam_namespace/Makefile.am          |   27 
 modules/pam_namespace/README               |  100 ++
 modules/pam_namespace/namespace.conf       |   15 
 modules/pam_namespace/namespace.conf.5.xml |  137 ++
 modules/pam_namespace/pam_namespace.8.xml  |  221 ++++
 modules/pam_namespace/pam_namespace.c      | 1327 +++++++++++++++++++++++++++++
 9 files changed, 1836 insertions(+), 1 deletion(-)

Index: pam_namespace-7.patch
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam_namespace-7.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pam_namespace-7.patch	25 Apr 2006 14:53:39 -0000	1.1
+++ pam_namespace-7.patch	25 Apr 2006 15:55:57 -0000	1.2
@@ -115,7 +115,7 @@
 +	This module also depends on pam_selinux.so setting the context.
 --- /dev/null	2006-04-25 10:12:36.092931750 +0200
 +++ Linux-PAM-0.99.3.0/modules/pam_namespace/pam_namespace.c	2006-04-25 16:41:28.000000000 +0200
-@@ -0,0 +1,1326 @@
+@@ -0,0 +1,1327 @@
 +/******************************************************************************
 + * A module for Linux-PAM that will set the default namespace after 
 + * establishing a session via PAM.
@@ -592,6 +592,7 @@
 +    if (idata->flags & PAMNS_DEBUG) {
 +        struct polydir_s *dptr = idata->polydirs_ptr;
 +        uid_t *iptr;
++        int i;
 +
 +        pam_syslog(idata->pamh, LOG_DEBUG,
 +    	    dptr?"Configured poly dirs:":"No configured poly dirs");
@@ -901,7 +902,7 @@
 +     * Create MD5 hashes for instance pathname.
 +     */
 +
-+    if (MD5(*instname, strlen(*instname),
++    if (MD5((unsigned char *)*instname, strlen(*instname),
 +		inst_digest) == NULL) {
 +        pam_syslog(idata->pamh, LOG_ERR,
 +		"Unable to generate hash for instname");



From fedora-cvs-commits at redhat.com  Tue Apr 25 16:20:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 12:20:43 -0400
Subject: rpms/ghostscript/devel .cvsignore, 1.19,
	1.20 ghostscript-big-cmap-post.patch, 1.1,
	1.2 ghostscript.spec, 1.111, 1.112 sources, 1.23,
	1.24 espgs-pdfwrite.patch, 1.1, NONE espgs-str1570.patch, 1.1,
	NONE ghostscript-build.patch, 1.4, NONE ghostscript-krgb.patch,
	1.1, NONE
Message-ID: <200604251620.k3PGKhTZ018134@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18075

Modified Files:
	.cvsignore ghostscript-big-cmap-post.patch ghostscript.spec 
	sources 
Removed Files:
	espgs-pdfwrite.patch espgs-str1570.patch 
	ghostscript-build.patch ghostscript-krgb.patch 
Log Message:
* Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com> 8.15.2-2
- 8.15.2.
- No longer need build, krgb, pdfwrite, str1570 patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	30 Jan 2006 17:54:59 -0000	1.19
+++ .cvsignore	25 Apr 2006 16:20:39 -0000	1.20
@@ -15,3 +15,4 @@
 espgs-8.15rc4-source.tar.bz2
 espgs-8.15.1-source.tar.bz2
 adobe-cmaps-200406.tar.gz
+espgs-8.15.2-source.tar.bz2

ghostscript-big-cmap-post.patch:
 gs_ttf.ps |  115 +++++++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 85 insertions(+), 30 deletions(-)

Index: ghostscript-big-cmap-post.patch
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript-big-cmap-post.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ghostscript-big-cmap-post.patch	27 Jan 2006 11:47:44 -0000	1.1
+++ ghostscript-big-cmap-post.patch	25 Apr 2006 16:20:39 -0000	1.2
@@ -1,6 +1,5 @@
-diff -ruN espgs-8.15.1.orig/lib/gs_ttf.ps espgs-8.15.1/lib/gs_ttf.ps
---- espgs-8.15.1.orig/lib/gs_ttf.ps	2005-08-12 04:57:14.000000000 +0900
-+++ espgs-8.15.1/lib/gs_ttf.ps	2006-01-26 13:28:18.000000000 +0900
+--- espgs-8.15.2/lib/gs_ttf.ps.big-cmap-post	2005-09-22 22:31:58.000000000 +0100
++++ espgs-8.15.2/lib/gs_ttf.ps	2006-04-25 16:49:58.000000000 +0100
 @@ -261,6 +261,54 @@
    } for pop exch pop
  } bind def
@@ -146,10 +145,10 @@
    (OS/2) 1 index
 -  (post) 1 index
 +  (post) { .readbigtable }
-   (vhea) 1 index
- 	% Big tables
-   (glyf) { .readbigtable }
-@@ -860,10 +908,17 @@
+   %(vhea) 1 index
+   systemdict /DEVICE .knownget { (pdfwrite) ne } {true} ifelse {
+   (vhea) 1 index  % better to be ignored for vertical writing in pdfwrite
+@@ -867,10 +915,17 @@
    } ifelse
  		% Stack: ... /FontInfo mark key1 value1 ...
    post null ne {
@@ -171,7 +170,7 @@
    } if
    counttomark 0 ne { .dicttomark } { pop pop } ifelse
    /XUID [orgXUID 42 curxuid]
-@@ -922,22 +977,22 @@
+@@ -929,22 +984,22 @@
      } if
      tabdict /cmap get                                   % bool [] i PlatID SpecID (cmap)
      dup /cmaptab exch def % temporary


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- ghostscript.spec	24 Apr 2006 16:09:21 -0000	1.111
+++ ghostscript.spec	25 Apr 2006 16:20:39 -0000	1.112
@@ -1,11 +1,11 @@
-%define gs_ver 8.15.1
+%define gs_ver 8.15.2
 %define gs_dot_ver 8.15
 %{expand: %%define build_with_freetype %{?_with_freetype:1}%{!?_with_freetype:0}}
 Summary: A PostScript(TM) interpreter and renderer.
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 10
+Release: 2
 
 License: GPL
 URL: http://www.cups.org/espgs/
@@ -16,7 +16,6 @@
 Source3: acro5-cmaps-2001.tar.gz
 Source4: cidfmap
 
-Patch1: ghostscript-build.patch
 Patch2: ghostscript-gtk2.patch
 Patch3: ghostscript-scripts.patch
 Patch4: ghostscript-ps2epsi.patch
@@ -26,9 +25,6 @@
 Patch8: ghostscript-use-external-freetype.patch
 Patch9: ghostscript-split-font-configuration.patch
 Patch10: ghostscript-big-cmap-post.patch
-Patch11: ghostscript-krgb.patch
-Patch12: espgs-pdfwrite.patch
-Patch13: espgs-str1570.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: libjpeg-devel, libXt-devel
@@ -83,7 +79,6 @@
 %setup -q -n espgs-%{gs_ver}%{?gs_rc:%gs_rc}
 
 # Make it build.
-%patch1 -p1 -b .build
 %patch2 -p1 -b .gtk2
 
 # Fix some shell scripts
@@ -109,15 +104,6 @@
 # Support reading a big cmap/post table from a TrueType font.
 %patch10 -p1 -b .big-cmap-post
 
-# Updated KRGB patch for gdevijs.
-%patch11 -p1 -b .krgb
-
-# Fix pdfwrite (bug #187834).
-%patch12 -p1 -b .pdfwrite
-
-# Fix emacs interaction (bug #189321, STR #1570).
-%patch13 -p0 -b .str1570
-
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -275,8 +261,13 @@
 %{_includedir}/ijs/*
 %{_bindir}/ijs-config
 %{_libdir}/libijs.*a
+%{_libdir}/pkgconfig/ijs.pc
 
 %changelog
+* Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com> 8.15.2-2
+- 8.15.2.
+- No longer need build, krgb, pdfwrite, str1570 patches.
+
 * Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com> 8.15.1-10
 - Fix emacs interaction (bug #189321, STR #1570).
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	30 Jan 2006 17:54:59 -0000	1.23
+++ sources	25 Apr 2006 16:20:39 -0000	1.24
@@ -1,3 +1,3 @@
 2fbae60417d42779f6488ab897dcaaf6  acro5-cmaps-2001.tar.gz
-2a21136953c3559e6088522753b06b1f  espgs-8.15.1-source.tar.bz2
 dfc93dd2aaaf2b86d2fd55f654c13261  adobe-cmaps-200406.tar.gz
+66180d4c0aa44c4c51ea58e13b08f2ae  espgs-8.15.2-source.tar.bz2


--- espgs-pdfwrite.patch DELETED ---


--- espgs-str1570.patch DELETED ---


--- ghostscript-build.patch DELETED ---


--- ghostscript-krgb.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 25 16:23:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 12:23:15 -0400
Subject: rpms/ghostscript/FC-5 .cvsignore, 1.19,
	1.20 ghostscript-big-cmap-post.patch, 1.1,
	1.2 ghostscript.spec, 1.106, 1.107 sources, 1.23,
	1.24 espgs-pdfwrite.patch, 1.1, NONE espgs-str1570.patch, 1.1,
	NONE ghostscript-build.patch, 1.4, NONE ghostscript-krgb.patch,
	1.1, NONE
Message-ID: <200604251623.k3PGNFAx019062@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/ghostscript/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19005

Modified Files:
	.cvsignore ghostscript-big-cmap-post.patch ghostscript.spec 
	sources 
Removed Files:
	espgs-pdfwrite.patch espgs-str1570.patch 
	ghostscript-build.patch ghostscript-krgb.patch 
Log Message:
* Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com> 8.15.2-1.1
- 8.15.2.
- No longer need build, krgb, pdfwrite, str1570 patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/FC-5/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	30 Jan 2006 17:54:59 -0000	1.19
+++ .cvsignore	25 Apr 2006 16:23:10 -0000	1.20
@@ -15,3 +15,4 @@
 espgs-8.15rc4-source.tar.bz2
 espgs-8.15.1-source.tar.bz2
 adobe-cmaps-200406.tar.gz
+espgs-8.15.2-source.tar.bz2

ghostscript-big-cmap-post.patch:
 gs_ttf.ps |  115 +++++++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 85 insertions(+), 30 deletions(-)

Index: ghostscript-big-cmap-post.patch
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/FC-5/ghostscript-big-cmap-post.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ghostscript-big-cmap-post.patch	27 Jan 2006 11:47:44 -0000	1.1
+++ ghostscript-big-cmap-post.patch	25 Apr 2006 16:23:10 -0000	1.2
@@ -1,6 +1,5 @@
-diff -ruN espgs-8.15.1.orig/lib/gs_ttf.ps espgs-8.15.1/lib/gs_ttf.ps
---- espgs-8.15.1.orig/lib/gs_ttf.ps	2005-08-12 04:57:14.000000000 +0900
-+++ espgs-8.15.1/lib/gs_ttf.ps	2006-01-26 13:28:18.000000000 +0900
+--- espgs-8.15.2/lib/gs_ttf.ps.big-cmap-post	2005-09-22 22:31:58.000000000 +0100
++++ espgs-8.15.2/lib/gs_ttf.ps	2006-04-25 16:49:58.000000000 +0100
 @@ -261,6 +261,54 @@
    } for pop exch pop
  } bind def
@@ -146,10 +145,10 @@
    (OS/2) 1 index
 -  (post) 1 index
 +  (post) { .readbigtable }
-   (vhea) 1 index
- 	% Big tables
-   (glyf) { .readbigtable }
-@@ -860,10 +908,17 @@
+   %(vhea) 1 index
+   systemdict /DEVICE .knownget { (pdfwrite) ne } {true} ifelse {
+   (vhea) 1 index  % better to be ignored for vertical writing in pdfwrite
+@@ -867,10 +915,17 @@
    } ifelse
  		% Stack: ... /FontInfo mark key1 value1 ...
    post null ne {
@@ -171,7 +170,7 @@
    } if
    counttomark 0 ne { .dicttomark } { pop pop } ifelse
    /XUID [orgXUID 42 curxuid]
-@@ -922,22 +977,22 @@
+@@ -929,22 +984,22 @@
      } if
      tabdict /cmap get                                   % bool [] i PlatID SpecID (cmap)
      dup /cmaptab exch def % temporary


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/FC-5/ghostscript.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- ghostscript.spec	24 Apr 2006 16:33:12 -0000	1.106
+++ ghostscript.spec	25 Apr 2006 16:23:10 -0000	1.107
@@ -1,11 +1,11 @@
-%define gs_ver 8.15.1
+%define gs_ver 8.15.2
 %define gs_dot_ver 8.15
 %{expand: %%define build_with_freetype %{?_with_freetype:1}%{!?_with_freetype:0}}
 Summary: A PostScript(TM) interpreter and renderer.
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 7.2
+Release: 1.1
 
 License: GPL
 URL: http://www.cups.org/espgs/
@@ -16,7 +16,6 @@
 Source3: acro5-cmaps-2001.tar.gz
 Source4: cidfmap
 
-Patch1: ghostscript-build.patch
 Patch2: ghostscript-gtk2.patch
 Patch3: ghostscript-scripts.patch
 Patch4: ghostscript-ps2epsi.patch
@@ -26,9 +25,6 @@
 Patch8: ghostscript-use-external-freetype.patch
 Patch9: ghostscript-split-font-configuration.patch
 Patch10: ghostscript-big-cmap-post.patch
-Patch11: ghostscript-krgb.patch
-Patch12: espgs-pdfwrite.patch
-Patch13: espgs-str1570.patch
 
 Requires: zlib, libpng, glib2
 Requires: urw-fonts >= 1.1, ghostscript-fonts
@@ -83,7 +79,6 @@
 %setup -q -n espgs-%{gs_ver}%{?gs_rc:%gs_rc}
 
 # Make it build.
-%patch1 -p1 -b .build
 %patch2 -p1 -b .gtk2
 
 # Fix some shell scripts
@@ -109,15 +104,6 @@
 # Support reading a big cmap/post table from a TrueType font.
 %patch10 -p1 -b .big-cmap-post
 
-# Updated KRGB patch for gdevijs.
-%patch11 -p1 -b .krgb
-
-# Fix pdfwrite (bug #187834).
-%patch12 -p1 -b .pdfwrite
-
-# Fix emacs interaction (bug #189321, STR #1570).
-%patch13 -p0 -b .str1570
-
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -288,13 +274,20 @@
 %{_includedir}/ijs/*
 %{_bindir}/ijs-config
 %{_libdir}/libijs.*a
+%{_libdir}/pkgconfig/ijs.pc
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com> 8.15.2-1.1
+- 8.15.2.
+- No longer need build, krgb, pdfwrite, str1570 patches.
+
 * Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com>
+- 8.15.2.
+
 - Fix emacs interaction (bug #189321, STR #1570).
 
 * Mon Apr 10 2006 Tim Waugh <twaugh at redhat.com> 8.15.1-7.2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/FC-5/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	30 Jan 2006 17:54:59 -0000	1.23
+++ sources	25 Apr 2006 16:23:10 -0000	1.24
@@ -1,3 +1,3 @@
 2fbae60417d42779f6488ab897dcaaf6  acro5-cmaps-2001.tar.gz
-2a21136953c3559e6088522753b06b1f  espgs-8.15.1-source.tar.bz2
 dfc93dd2aaaf2b86d2fd55f654c13261  adobe-cmaps-200406.tar.gz
+66180d4c0aa44c4c51ea58e13b08f2ae  espgs-8.15.2-source.tar.bz2


--- espgs-pdfwrite.patch DELETED ---


--- espgs-str1570.patch DELETED ---


--- ghostscript-build.patch DELETED ---


--- ghostscript-krgb.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 25 16:35:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 12:35:49 -0400
Subject: rpms/ghostscript/devel ghostscript.spec,1.112,1.113
Message-ID: <200604251635.k3PGZn1r021901@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21865

Modified Files:
	ghostscript.spec 
Log Message:
Fix pkgconfig confusion.


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- ghostscript.spec	25 Apr 2006 16:20:39 -0000	1.112
+++ ghostscript.spec	25 Apr 2006 16:34:58 -0000	1.113
@@ -196,9 +196,8 @@
 install -m0644 src/errors.h $RPM_BUILD_ROOT%{_includedir}/ghostscript
 install -m0644 src/gdevdsp.h $RPM_BUILD_ROOT%{_includedir}/ghostscript
 
-# Don't ship pkgconfig files.  Note: this always gets installed in /usr/lib
-# regardless of multilib.
-rm -f $RPM_BUILD_ROOT/usr/lib/pkgconfig/ijs.pc
+# Don't ship pkgconfig files.
+rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/ijs.pc
 
 # Don't ship ijs example client or server
 rm -f $RPM_BUILD_ROOT%{_bindir}/ijs_{client,server}_example
@@ -261,7 +260,6 @@
 %{_includedir}/ijs/*
 %{_bindir}/ijs-config
 %{_libdir}/libijs.*a
-%{_libdir}/pkgconfig/ijs.pc
 
 %changelog
 * Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com> 8.15.2-2



From fedora-cvs-commits at redhat.com  Tue Apr 25 16:36:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 12:36:08 -0400
Subject: rpms/ghostscript/FC-5 ghostscript.spec,1.107,1.108
Message-ID: <200604251636.k3PGa8Cg021919@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/ghostscript/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21875

Modified Files:
	ghostscript.spec 
Log Message:
Fix pkgconfig confusion.


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/FC-5/ghostscript.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- ghostscript.spec	25 Apr 2006 16:23:10 -0000	1.107
+++ ghostscript.spec	25 Apr 2006 16:35:49 -0000	1.108
@@ -196,9 +196,8 @@
 install -m0644 src/errors.h $RPM_BUILD_ROOT%{_includedir}/ghostscript
 install -m0644 src/gdevdsp.h $RPM_BUILD_ROOT%{_includedir}/ghostscript
 
-# Don't ship pkgconfig files.  Note: this always gets installed in /usr/lib
-# regardless of multilib.
-rm -f $RPM_BUILD_ROOT/usr/lib/pkgconfig/ijs.pc
+# Don't ship pkgconfig files.
+rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/ijs.pc
 
 # Don't ship ijs example client or server
 rm -f $RPM_BUILD_ROOT%{_bindir}/ijs_{client,server}_example
@@ -274,7 +273,6 @@
 %{_includedir}/ijs/*
 %{_bindir}/ijs-config
 %{_libdir}/libijs.*a
-%{_libdir}/pkgconfig/ijs.pc
 
 %post -p /sbin/ldconfig
 



From fedora-cvs-commits at redhat.com  Tue Apr 25 17:41:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 13:41:26 -0400
Subject: rpms/cairo/devel cairo-1.1.2-embedded-bitmaps.patch, NONE,
	1.1 cairo.spec, 1.35,
	1.36 cairo-1.0.2-chunk-glyphs-CVE-2006-0528.patch, 1.1,
	NONE cairo-1.0.2-embedded-bitmaps.patch, 1.1,
	NONE cairo-1.0.2-fix-build.patch, 1.1, NONE
Message-ID: <200604251741.k3PHfQYO000845@cvs.devel.redhat.com>

Author: cworth

Update of /cvs/dist/rpms/cairo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv821

Modified Files:
	cairo.spec 
Added Files:
	cairo-1.1.2-embedded-bitmaps.patch 
Removed Files:
	cairo-1.0.2-chunk-glyphs-CVE-2006-0528.patch 
	cairo-1.0.2-embedded-bitmaps.patch cairo-1.0.2-fix-build.patch 
Log Message:
Update for new upstream cairo 1.1.2 snapshot

cairo-1.1.2-embedded-bitmaps.patch:
 cairo-ft-font.c |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

--- NEW FILE cairo-1.1.2-embedded-bitmaps.patch ---
commit fe8bf47afc11b12034fd2c92caf424c8911d630b
Author: Zhe Su <james.su at gmail.com>
Date:   Tue Apr 25 10:20:42 2006 -0700

    Support fontconfig embeddedbitmap option/handle transformation issue as well.

diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index a23388a..eb6ccd1 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -1227,7 +1227,9 @@ const cairo_scaled_font_backend_t cairo_
 static cairo_ft_options_t
 _get_pattern_ft_options (FcPattern *pattern)
 {
-    FcBool antialias, vertical_layout, hinting, autohint;
+    FcBool antialias, vertical_layout, hinting, autohint, bitmap;
+    FcBool transform;
+    FcMatrix *font_matrix;
     cairo_ft_options_t ft_options;
     int rgba;
 #ifdef FC_HINT_STYLE    
@@ -1237,15 +1239,31 @@ #endif    
 
     ft_options.load_flags = 0;
     ft_options.extra_flags = 0;
+
+#ifndef FC_EMBEDDED_BITMAP
+#define FC_EMBEDDED_BITMAP "embeddedbitmap"
+#endif
+
+    if (FcPatternGetMatrix (pattern,
+			    FC_MATRIX, 0, &font_matrix) != FcResultMatch)
+	font_matrix = NULL;
+
+    transform = (font_matrix && (font_matrix->xx != 1 || font_matrix->xy != 0 ||
+				 font_matrix->yx != 0 || font_matrix->yy != 1));
+
+    /* Check whether to force use of embedded bitmaps */
+    if (FcPatternGetBool (pattern,
+			  FC_EMBEDDED_BITMAP, 0, &bitmap) != FcResultMatch)
+	bitmap = FcFalse;
     
     /* disable antialiasing if requested */
     if (FcPatternGetBool (pattern,
 			  FC_ANTIALIAS, 0, &antialias) != FcResultMatch)
 	antialias = FcTrue;
 
-    if (antialias)
+    if ((!bitmap && antialias) || transform)
 	ft_options.load_flags |= FT_LOAD_NO_BITMAP;
-    else
+    else if (!antialias)
 	ft_options.load_flags |= FT_LOAD_MONOCHROME;
     
     /* disable hinting if requested */


Index: cairo.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- cairo.spec	15 Mar 2006 19:26:01 -0000	1.35
+++ cairo.spec	25 Apr 2006 17:41:23 -0000	1.36
@@ -3,7 +3,7 @@
 
 Summary:   A vector graphics library
 Name:      cairo
-Version:   1.0.4
+Version:   1.1.2
 Release:   1
 URL:       http://cairographics.org
 Source0:   %{name}-%{version}.tar.gz
@@ -23,7 +23,7 @@
 BuildRequires: freetype-devel >= %{freetype_version}
 BuildRequires: fontconfig-devel >= %{fontconfig_version}
 
-Patch0: cairo-1.0.2-embedded-bitmaps.patch
+Patch0: cairo-1.1.2-embedded-bitmaps.patch
 
 %description 
 Cairo is a vector graphics library designed to provide high-quality
@@ -85,6 +85,12 @@
 %{_datadir}/gtk-doc/*
 
 %changelog
+* Tue Apr 25 2006 Carl Worth <cworth at redhat.com> - 1.1.2-1
+- Update to new upstream 1.1.2
+- Port forward the embedded bitmaps patch (now committed upstream to
+  1.1.3)
+- Drop build-fix and chunk-glyphs patches which now come from upstream
+
 * Wed Mar 15 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.4-1
 - Update to 1.0.4
 - Drop upstreamed patches


--- cairo-1.0.2-chunk-glyphs-CVE-2006-0528.patch DELETED ---


--- cairo-1.0.2-embedded-bitmaps.patch DELETED ---


--- cairo-1.0.2-fix-build.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 25 17:44:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 13:44:14 -0400
Subject: rpms/netdump/devel .cvsignore, 1.17, 1.18 netdump.spec, 1.25,
	1.26 sources, 1.17, 1.18
Message-ID: <200604251744.k3PHiE82002002@cvs.devel.redhat.com>

Author: tgraf

Update of /cvs/dist/rpms/netdump/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1885

Modified Files:
	.cvsignore netdump.spec sources 
Log Message:
update to version 0.7.16



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/netdump/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	4 Oct 2005 19:16:34 -0000	1.17
+++ .cvsignore	25 Apr 2006 17:44:11 -0000	1.18
@@ -2,3 +2,4 @@
 netdump-0.7.11.tar.gz
 netdump-0.7.12.tar.gz
 netdump-0.7.14.tar.gz
+netdump-0.7.16.tar.gz


Index: netdump.spec
===================================================================
RCS file: /cvs/dist/rpms/netdump/devel/netdump.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- netdump.spec	4 Apr 2006 16:42:18 -0000	1.25
+++ netdump.spec	25 Apr 2006 17:44:11 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Client setup for network kernel message logging and crash dumps
 Name: netdump
-Version: 0.7.14
-Release: 5
+Version: 0.7.16
+Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Daemons
@@ -97,6 +97,9 @@
 %doc example_scripts
 
 %changelog
+* Tue Apr 25 2006 Thomas Graf <tgraf at redhat.com> - 0.7.16-1
+- update to version 0.7.16
+
 * Tue Apr  4 2006 Bill Nottingham <notting at redhat.com> - 0.7.14-5
 - build against glib2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/netdump/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	4 Oct 2005 19:16:34 -0000	1.17
+++ sources	25 Apr 2006 17:44:11 -0000	1.18
@@ -1 +1 @@
-94cbecb0b9b232ac7e905e472753c279  netdump-0.7.14.tar.gz
+af9acda8b85aebe5664dd9a47a41ac96  netdump-0.7.16.tar.gz



From fedora-cvs-commits at redhat.com  Tue Apr 25 17:49:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 13:49:24 -0400
Subject: rpms/cairo/devel sources,1.11,1.12
Message-ID: <200604251749.k3PHnOxl013760@cvs.devel.redhat.com>

Author: cworth

Update of /cvs/dist/rpms/cairo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10639

Modified Files:
	sources 
Log Message:
Update source for cairo-1.1.2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	15 Mar 2006 19:22:34 -0000	1.11
+++ sources	25 Apr 2006 17:49:21 -0000	1.12
@@ -1 +1 @@
-9002b0e69b3f94831a22d3f2a7735ce2  cairo-1.0.4.tar.gz
+fa311ae12985a3ee75565cb002733022  cairo-1.1.2.tar.gz



From fedora-cvs-commits at redhat.com  Tue Apr 25 17:57:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 13:57:44 -0400
Subject: rpms/cairo/devel .cvsignore,1.11,1.12
Message-ID: <200604251757.k3PHvi4W027563@cvs.devel.redhat.com>

Author: cworth

Update of /cvs/dist/rpms/cairo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27550

Modified Files:
	.cvsignore 
Log Message:
Properly uploaded new source file this time.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	15 Mar 2006 19:22:34 -0000	1.11
+++ .cvsignore	25 Apr 2006 17:57:42 -0000	1.12
@@ -1,2 +1 @@
-cairo-1.0.2.tar.gz
-cairo-1.0.4.tar.gz
+cairo-1.1.2.tar.gz



From fedora-cvs-commits at redhat.com  Tue Apr 25 18:33:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 14:33:57 -0400
Subject: rpms/dbus/devel dbus-0.61.dbus-connection.c.backport.patch, NONE,
	1.1 dbus.spec, 1.75, 1.76
Message-ID: <200604251833.k3PIXvnM026530@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26444

Modified Files:
	dbus.spec 
Added Files:
	dbus-0.61.dbus-connection.c.backport.patch 
Log Message:
* Tue Apr 25 2006 John (J5) Palmieri <johnp at redhat.com> - 0.61-4
- Backport patch from dbus-connection.c
  - Allows interfaces to be NULL in the message header as per the spec
  - Fixes a problem with pendings calls blocking on a data starved socket



dbus-0.61.dbus-connection.c.backport.patch:
 dbus-connection.c |   67 +++++++++++++++++++++++++++++++++---------------------
 1 files changed, 42 insertions(+), 25 deletions(-)

--- NEW FILE dbus-0.61.dbus-connection.c.backport.patch ---
--- dbus-0.61/dbus/dbus-connection.c.backport	2006-04-25 14:26:31.000000000 -0400
+++ dbus-0.61/dbus/dbus-connection.c	2006-04-25 14:26:54.000000000 -0400
@@ -2257,8 +2257,7 @@
   _dbus_return_if_fail (message != NULL);
   _dbus_return_if_fail (preallocated->connection == connection);
   _dbus_return_if_fail (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_METHOD_CALL ||
-                        (dbus_message_get_interface (message) != NULL &&
-                         dbus_message_get_member (message) != NULL));
+                        dbus_message_get_member (message) != NULL);
   _dbus_return_if_fail (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_SIGNAL ||
                         (dbus_message_get_interface (message) != NULL &&
                          dbus_message_get_member (message) != NULL));
@@ -2533,6 +2532,36 @@
   return NULL;
 }
 
+static dbus_bool_t
+check_for_reply_and_update_dispatch_unlocked (DBusPendingCall *pending)
+{
+  DBusMessage *reply;
+  DBusDispatchStatus status;
+  DBusConnection *connection;
+
+  connection = pending->connection;
+
+  reply = check_for_reply_unlocked (connection, pending->reply_serial);
+  if (reply != NULL)
+    {
+      _dbus_verbose ("%s checked for reply\n", _DBUS_FUNCTION_NAME);
+
+      _dbus_verbose ("dbus_connection_send_with_reply_and_block(): got reply\n");
+
+      _dbus_pending_call_complete_and_unlock (pending, reply);
+      dbus_message_unref (reply);
+
+      CONNECTION_LOCK (connection);
+      status = _dbus_connection_get_dispatch_status_unlocked (connection);
+      _dbus_connection_update_dispatch_status_and_unlock (connection, status);
+      dbus_pending_call_unref (pending);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
 /**
  * When a function that blocks has been called with a timeout, and we
  * run out of memory, the time to wait for memory is based on the
@@ -2616,6 +2645,11 @@
                  start_tv_sec, start_tv_usec,
                  end_tv_sec, end_tv_usec);
 
+  /* check to see if we already got the data off the socket */
+  /* from another blocked pending call */
+  if (check_for_reply_and_update_dispatch_unlocked (pending))
+    return;
+
   /* Now we wait... */
   /* always block at least once as we know we don't have the reply yet */
   _dbus_connection_do_iteration_unlocked (connection,
@@ -2645,27 +2679,8 @@
     }
   
   if (status == DBUS_DISPATCH_DATA_REMAINS)
-    {
-      DBusMessage *reply;
-      
-      reply = check_for_reply_unlocked (connection, client_serial);
-      if (reply != NULL)
-        {
-          _dbus_verbose ("%s checked for reply\n", _DBUS_FUNCTION_NAME);
-
-          _dbus_verbose ("dbus_connection_send_with_reply_and_block(): got reply\n");
-          
-          _dbus_pending_call_complete_and_unlock (pending, reply);
-          dbus_message_unref (reply);
-
-          CONNECTION_LOCK (connection);
-          status = _dbus_connection_get_dispatch_status_unlocked (connection);
-          _dbus_connection_update_dispatch_status_and_unlock (connection, status);
-          dbus_pending_call_unref (pending);
-          
-          return;
-        }
-    }
+    if (check_for_reply_and_update_dispatch_unlocked (pending))
+      return;  
   
   _dbus_get_current_time (&tv_sec, &tv_usec);
   
@@ -2874,8 +2889,6 @@
   DBusDispatchStatus dstatus;
   dbus_bool_t dispatched_disconnected;
   
-  _dbus_return_val_if_fail (connection != NULL, FALSE);
-  _dbus_return_val_if_fail (timeout_milliseconds >= 0 || timeout_milliseconds == -1, FALSE);
   dstatus = dbus_connection_get_dispatch_status (connection);
 
   if (dispatch && dstatus == DBUS_DISPATCH_DATA_REMAINS)
@@ -2947,6 +2960,8 @@
 dbus_connection_read_write_dispatch (DBusConnection *connection,
                                      int             timeout_milliseconds)
 {
+  _dbus_return_val_if_fail (connection != NULL, FALSE);
+  _dbus_return_val_if_fail (timeout_milliseconds >= 0 || timeout_milliseconds == -1, FALSE);
    return _dbus_connection_read_write_dispatch(connection, timeout_milliseconds, TRUE);
 }
 
@@ -2970,6 +2985,8 @@
 dbus_connection_read_write (DBusConnection *connection, 
                             int             timeout_milliseconds) 
 { 
+  _dbus_return_val_if_fail (connection != NULL, FALSE);
+  _dbus_return_val_if_fail (timeout_milliseconds >= 0 || timeout_milliseconds == -1, FALSE);
    return _dbus_connection_read_write_dispatch(connection, timeout_milliseconds, FALSE);
 }
 


Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- dbus.spec	17 Apr 2006 22:16:40 -0000	1.75
+++ dbus.spec	25 Apr 2006 18:33:13 -0000	1.76
@@ -49,6 +49,7 @@
 Patch1: dbus-0.32-selinux_chroot_workaround.patch
 Patch2: dbus-0.61-selinux-avc-audit.patch
 Patch3: dbus-0.60-start-early.patch
+Patch4: dbus-0.61.dbus-connection.c.backport.patch
 
 #make sure we take this out if ABI changes
 Patch4: dbus-0.61-mono-no-abi-version-change.patch 
@@ -138,6 +139,7 @@
 %patch1 -p1 -b .selinux_chroot_workaround
 %patch2 -p1 -b .selinux-avc-audit
 %patch3 -p1 -b .start-early
+%patch4 -p1 -b .backport
 
 #make sure we take this out if ABI changes
 %patch4 -p1 -b .mono-no-abi-version-change
@@ -342,6 +344,11 @@
 %endif
 
 %changelog
+* Tue Apr 25 2006 John (J5) Palmieri <johnp at redhat.com> - 0.61-4
+- Backport patch from dbus-connection.c
+  - Allows interfaces to be NULL in the message header as per the spec
+  - Fixes a problem with pendings calls blocking on a data starved socket
+
 * Mon Apr 17 2006 John (J5) Palmieri <johnp at redhat.com> 0.61-4
 - New audit patch
 



From fedora-cvs-commits at redhat.com  Tue Apr 25 18:36:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 14:36:05 -0400
Subject: rpms/dbus/devel dbus.spec,1.76,1.77
Message-ID: <200604251836.k3PIa5UN026615@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26579

Modified Files:
	dbus.spec 
Log Message:
- bump the release



Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- dbus.spec	25 Apr 2006 18:33:13 -0000	1.76
+++ dbus.spec	25 Apr 2006 18:35:37 -0000	1.77
@@ -19,7 +19,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 0.61
-Release: 4 
+Release: 5 
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL/GPL
@@ -344,7 +344,7 @@
 %endif
 
 %changelog
-* Tue Apr 25 2006 John (J5) Palmieri <johnp at redhat.com> - 0.61-4
+* Tue Apr 25 2006 John (J5) Palmieri <johnp at redhat.com> - 0.61-5
 - Backport patch from dbus-connection.c
   - Allows interfaces to be NULL in the message header as per the spec
   - Fixes a problem with pendings calls blocking on a data starved socket



From fedora-cvs-commits at redhat.com  Tue Apr 25 18:40:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 14:40:01 -0400
Subject: rpms/rhythmbox/devel .cvsignore, 1.22, 1.23 rhythmbox.spec, 1.57,
	1.58 sources, 1.24, 1.25
Message-ID: <200604251840.k3PIe1dn026995@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/rhythmbox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26954

Modified Files:
	.cvsignore rhythmbox.spec sources 
Log Message:
0.9.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	17 Apr 2006 16:23:37 -0000	1.22
+++ .cvsignore	25 Apr 2006 18:39:52 -0000	1.23
@@ -7,3 +7,4 @@
 rhythmbox-0.9.3.tar.bz2
 rhythmbox-0.9.3.1.tar.bz2
 rhythmbox-0.9.4.tar.bz2
+rhythmbox-0.9.4.1.tar.bz2


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- rhythmbox.spec	17 Apr 2006 17:07:34 -0000	1.57
+++ rhythmbox.spec	25 Apr 2006 18:39:52 -0000	1.58
@@ -2,7 +2,7 @@
 
 Name: rhythmbox
 Summary: Music Management Application 
-Version: 0.9.4
+Version: 0.9.4.1
 Release: 2
 License: GPL
 Group: Applications/Multimedia
@@ -13,7 +13,13 @@
 Requires: libgnomeui >= 2.6.0
 Requires: eel2 >= 2.0.0
 Requires: libgpod 
-Requires: scrollkeeper
+Requires(post): scrollkeeper
+Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
+Requires(post): GConf2
+Requires(preun): GConf2
+Requires(postun): scrollkeeper
+Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
+
 BuildRequires: libgpod-devel
 BuildRequires: libgnomeui-devel >= 2.6.0
 BuildRequires: nautilus-cd-burner-devel
@@ -25,7 +31,7 @@
 BuildRequires: libmusicbrainz-devel >= 2.1.0
 BuildRequires: dbus-devel >= 0.60
 BuildRequires: libnotify-devel
-PreReq: desktop-file-utils >= %{desktop_file_utils_version}
+
 # no nautilus-cd-burner on s390
 ExcludeArch: s390 s390x
 Patch2: rhythmbox-0.9.3.1-use-icon-name.patch
@@ -78,17 +84,21 @@
 %post 
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="rhythmbox.schemas"
-for S in $SCHEMAS; do 
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null
-done
-update-desktop-database %{_datadir}/applications
-scrollkeeper-update
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/rhythmbox.schemas >/dev/null
+update-desktop-database -q
+scrollkeeper-update -q
+
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/rhythmbox.schemas > /dev/null || :
+fi
 
 %postun
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications
-scrollkeeper-update
+update-desktop-database -q
+scrollkeeper-update -q
 
 %files -f %{name}.lang
 %defattr(-, root, root)
@@ -110,6 +120,9 @@
 %{_libexecdir}/rhythmbox-metadata
 
 %changelog
+* Mon Apr 25 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.4.1-2
+- Update to 0.9.4.1
+
 * Mon Apr 17 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.4-2
 - Update to 0.9.4
 - Drop upstreamed patches


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	17 Apr 2006 16:23:37 -0000	1.24
+++ sources	25 Apr 2006 18:39:52 -0000	1.25
@@ -1 +1 @@
-0d335864738d6de0d0e6acc2964f8bc4  rhythmbox-0.9.4.tar.bz2
+d725eb7134d1997efe28285715ebc05e  rhythmbox-0.9.4.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 25 09:47:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 05:47:03 -0400
Subject: rpms/glibc/devel .cvsignore, 1.145, 1.146 glibc-fedora.patch, 1.148,
	1.149 glibc.spec, 1.234, 1.235 sources, 1.169, 1.170
Message-ID: <200604250947.k3P9l32R019135@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18668/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec sources 
Log Message:
auto-import glibc-2.4.90-1 on branch devel from glibc-2.4.90-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- .cvsignore	24 Apr 2006 11:22:15 -0000	1.145
+++ .cvsignore	25 Apr 2006 09:47:00 -0000	1.146
@@ -1,2 +1,2 @@
-glibc-20060424T0820.tar.bz2
-glibc-fedora-20060424T0820.tar.bz2
+glibc-20060425T0903.tar.bz2
+glibc-fedora-20060425T0903.tar.bz2

glibc-fedora.patch:
 ChangeLog                                                   |   96 +++
 ChangeLog.11                                                |   21 
 ChangeLog.12                                                |   12 
 ChangeLog.15                                                |   45 +
 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 
 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                                          |   15 
 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/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 +
 55 files changed, 1377 insertions(+), 630 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- glibc-fedora.patch	24 Apr 2006 11:22:15 -0000	1.148
+++ glibc-fedora.patch	25 Apr 2006 09:47:00 -0000	1.149
@@ -1,6 +1,6 @@
---- glibc-20060424T0820/ChangeLog	24 Apr 2006 04:24:01 -0000	1.10128
-+++ glibc-20060424T0820-fedora/ChangeLog	24 Apr 2006 08:55:37 -0000	1.8782.2.176
-@@ -722,6 +722,34 @@
+--- glibc-20060425T0903/ChangeLog	24 Apr 2006 23:02:03 -0000	1.10135
++++ glibc-20060425T0903-fedora/ChangeLog	25 Apr 2006 09:20:26 -0000	1.8782.2.178
+@@ -759,6 +759,34 @@
  	_SC_CPUTIME and _SC_THREAD_CPUTIME here.
  	* sysdeps/unix/sysv/linux/x86_64/sysconf.c (__sysconf): Likewise.
  
@@ -35,7 +35,7 @@
  2006-03-05  Roland McGrath  <roland at redhat.com>
  
  	* malloc/malloc.c (MALLOC_ALIGNMENT): Revert to (2 * SIZE_SZ) value.
-@@ -1734,6 +1762,11 @@
+@@ -1771,6 +1799,11 @@
  	(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
  	followed by __THROW.
  
@@ -47,7 +47,7 @@
  2006-02-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/unix/sysv/linux/futimesat.c [__NR_futimesat]
-@@ -1793,6 +1826,11 @@
+@@ -1830,6 +1863,11 @@
  	* sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo.
  	* sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps.
  
@@ -59,7 +59,7 @@
  2006-01-19  Thomas Schwinge  <tschwinge at gnu.org>
  
  	* libio/genops.c: Include <stdbool.h>.
-@@ -4219,6 +4257,10 @@
+@@ -4256,6 +4294,10 @@
  
  	* elf/order2mod2.c (init): Cast ignored value to void.
  
@@ -70,7 +70,7 @@
  2005-12-27  Ulrich Drepper  <drepper at redhat.com>
  
  	* elf/tst-tls13.c (do_test): Avoid using the library path when
-@@ -4502,6 +4544,26 @@
+@@ -4539,6 +4581,26 @@
  	* sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined,
  	use sysdeps/unix/time.c implementation.
  
@@ -97,7 +97,7 @@
  2005-12-19  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #1955]
-@@ -7620,6 +7682,11 @@
+@@ -7657,6 +7719,11 @@
  	R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32,
  	R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros.
  
@@ -109,7 +109,7 @@
  2005-10-03  Roland McGrath  <roland at redhat.com>
  
  	* sysdeps/powerpc/nofpu: Directory removed, saved in ports repository.
-@@ -8614,6 +8681,12 @@
+@@ -8651,6 +8718,12 @@
  	* argp/argp-help.c (__argp_error): __asprintf -> vasprintf.
  	(__argp_failure): Likewise.
  
@@ -122,7 +122,7 @@
  2005-08-08  Ulrich Drepper  <drepper at redhat.com>
  
  	* nscd/cache.c (cache_add): Commit hash table and header to disk.
-@@ -8738,6 +8811,17 @@
+@@ -8775,6 +8848,17 @@
  	__syslog_chk.
  	* misc/Versions: Export __syslog_chk and __vsyslog_chk.
  
@@ -140,7 +140,7 @@
  2005-07-28  Thomas Schwinge  <schwinge at nic-nac-project.de>
  
  	[BZ #1137]
-@@ -11798,6 +11882,18 @@
+@@ -11835,6 +11919,18 @@
  
  	* scripts/soversions.awk: Fix default version set handling.
  
@@ -159,8 +159,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20060424T0820/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20060424T0820-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060425T0903/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
++++ glibc-20060425T0903-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.
@@ -210,8 +210,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-20060424T0820/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20060424T0820-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060425T0903/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
++++ glibc-20060425T0903-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.
@@ -238,8 +238,8 @@
  2001-01-02  Franz Sirl	<Franz.Sirl-kernel at lauterbach.com>
  
  	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
---- glibc-20060424T0820/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20060424T0820-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
+--- glibc-20060425T0903/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20060425T0903-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>
@@ -320,8 +320,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20060424T0820/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20060424T0820-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20060425T0903/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20060425T0903-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;
@@ -346,8 +346,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20060424T0820/debug/tst-chk1.c	22 Aug 2005 15:12:34 -0000	1.14
-+++ glibc-20060424T0820-fedora/debug/tst-chk1.c	24 Aug 2005 07:23:26 -0000	1.1.2.15
+--- glibc-20060425T0903/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
++++ glibc-20060425T0903-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.  */
@@ -376,8 +376,8 @@
  # define O 0
  #else
  # define O 1
---- glibc-20060424T0820/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
-+++ glibc-20060424T0820-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
+--- glibc-20060425T0903/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
++++ glibc-20060425T0903-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
 @@ -964,17 +964,19 @@ search_dirs (void)
  
  
@@ -459,8 +459,8 @@
      }
  
    search_dirs ();
---- glibc-20060424T0820/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20060424T0820-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20060425T0903/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20060425T0903-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;
@@ -485,8 +485,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060424T0820/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
-+++ glibc-20060424T0820-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
+--- glibc-20060425T0903/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
++++ glibc-20060425T0903-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)
@@ -563,8 +563,8 @@
    /* Open the output file.  */
    if (output_file == NULL)
      {
---- glibc-20060424T0820/include/features.h	5 Jan 2006 12:25:35 -0000	1.42
-+++ glibc-20060424T0820-fedora/include/features.h	6 Jan 2006 09:23:23 -0000	1.35.2.11
+--- glibc-20060425T0903/include/features.h	5 Jan 2006 12:25:35 -0000	1.42
++++ glibc-20060425T0903-fedora/include/features.h	6 Jan 2006 09:23:23 -0000	1.35.2.11
 @@ -275,7 +275,13 @@
  #endif
  
@@ -580,16 +580,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20060424T0820/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060424T0820-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060425T0903/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060425T0903-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-20060424T0820/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060424T0820-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060425T0903/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060425T0903-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-20060424T0820/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20060424T0820-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20060425T0903/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20060425T0903-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
@@ -599,8 +599,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20060424T0820/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
-+++ glibc-20060424T0820-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
+--- glibc-20060425T0903/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
++++ glibc-20060425T0903-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.  */
@@ -614,8 +614,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20060424T0820/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
-+++ glibc-20060424T0820-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
+--- glibc-20060425T0903/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
++++ glibc-20060425T0903-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);
@@ -646,8 +646,8 @@
  
  #endif
  
---- glibc-20060424T0820/locale/iso-4217.def	23 Sep 2005 19:07:54 -0000	1.18
-+++ glibc-20060424T0820-fedora/locale/iso-4217.def	3 Oct 2005 20:44:15 -0000	1.15.2.3
+--- glibc-20060425T0903/locale/iso-4217.def	23 Sep 2005 19:07:54 -0000	1.18
++++ glibc-20060425T0903-fedora/locale/iso-4217.def	3 Oct 2005 20:44:15 -0000	1.15.2.3
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -739,8 +739,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20060424T0820/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
-+++ glibc-20060424T0820-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
+--- glibc-20060425T0903/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
++++ glibc-20060425T0903-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,
  	}
      }
@@ -784,8 +784,8 @@
  #endif
  
  #ifndef NO_FINALIZE
---- glibc-20060424T0820/localedata/Makefile	25 Sep 2005 17:01:12 -0000	1.102
-+++ glibc-20060424T0820-fedora/localedata/Makefile	3 Oct 2005 20:44:15 -0000	1.101.2.2
+--- glibc-20060425T0903/localedata/Makefile	25 Sep 2005 17:01:12 -0000	1.102
++++ glibc-20060425T0903-fedora/localedata/Makefile	3 Oct 2005 20:44:15 -0000	1.101.2.2
 @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -794,8 +794,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20060424T0820/localedata/SUPPORTED	24 Apr 2006 07:06:44 -0000	1.90
-+++ glibc-20060424T0820-fedora/localedata/SUPPORTED	24 Apr 2006 08:55:41 -0000	1.71.2.9
+--- glibc-20060425T0903/localedata/SUPPORTED	24 Apr 2006 07:06:44 -0000	1.90
++++ glibc-20060425T0903-fedora/localedata/SUPPORTED	24 Apr 2006 08:55:41 -0000	1.71.2.9
 @@ -75,6 +75,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -837,8 +837,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20060424T0820/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20060424T0820-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20060425T0903/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20060425T0903-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>"
@@ -853,8 +853,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20060424T0820/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
-+++ glibc-20060424T0820-fedora/localedata/locales/en_GB	2 Nov 2004 12:25:47 -0000	1.10.2.2
+--- glibc-20060425T0903/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
++++ glibc-20060425T0903-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>"
@@ -866,8 +866,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-20060424T0820/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060424T0820-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20060425T0903/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20060425T0903-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -938,8 +938,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20060424T0820/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20060424T0820-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20060425T0903/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20060425T0903-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -967,8 +967,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20060424T0820/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
-+++ glibc-20060424T0820-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
+--- glibc-20060425T0903/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
++++ glibc-20060425T0903-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>
@@ -1044,8 +1044,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20060424T0820/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
-+++ glibc-20060424T0820-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20060425T0903/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
++++ glibc-20060425T0903-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)
@@ -1101,8 +1101,8 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20060424T0820/nptl/ChangeLog	9 Apr 2006 02:45:24 -0000	1.887
-+++ glibc-20060424T0820-fedora/nptl/ChangeLog	24 Apr 2006 08:55:42 -0000	1.706.2.85
+--- glibc-20060425T0903/nptl/ChangeLog	9 Apr 2006 02:45:24 -0000	1.887
++++ glibc-20060425T0903-fedora/nptl/ChangeLog	24 Apr 2006 08:55:42 -0000	1.706.2.85
 @@ -798,6 +798,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -1143,8 +1143,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20060424T0820/nptl/Makefile	28 Mar 2006 04:13:27 -0000	1.180
-+++ glibc-20060424T0820-fedora/nptl/Makefile	28 Mar 2006 09:36:22 -0000	1.157.2.20
+--- glibc-20060425T0903/nptl/Makefile	28 Mar 2006 04:13:27 -0000	1.180
++++ glibc-20060425T0903-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
@@ -1167,8 +1167,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20060424T0820/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20060424T0820-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20060425T0903/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20060425T0903-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;
@@ -1193,8 +1193,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060424T0820/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060424T0820-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20060425T0903/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060425T0903-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>
 +
@@ -1202,8 +1202,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20060424T0820/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	9 Apr 2006 02:42:29 -0000	1.30
-+++ glibc-20060424T0820-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	24 Apr 2006 08:55:42 -0000	1.25.2.5
+--- glibc-20060425T0903/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	9 Apr 2006 02:42:29 -0000	1.30
++++ glibc-20060425T0903-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")
  
@@ -1539,8 +1539,8 @@
  			      : "=m" (futex), "=&a" (ignore)		      \
  			      : "m" (futex),				      \
  				"i" (offsetof (tcbhead_t, multiple_threads))  \
---- glibc-20060424T0820/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
-+++ glibc-20060424T0820-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	24 Apr 2006 08:55:43 -0000	1.13.2.3
+--- glibc-20060425T0903/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
++++ glibc-20060425T0903-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.
@@ -1686,8 +1686,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060424T0820/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
-+++ glibc-20060424T0820-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
+--- glibc-20060425T0903/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
++++ glibc-20060425T0903-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
@@ -1788,8 +1788,8 @@
 -	ret
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060424T0820/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
-+++ glibc-20060424T0820-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
+--- glibc-20060425T0903/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
++++ glibc-20060425T0903-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.
@@ -1931,8 +1931,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060424T0820/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	17 Feb 2006 08:06:14 -0000	1.26
-+++ glibc-20060424T0820-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	6 Mar 2006 07:33:30 -0000	1.23.2.3
+--- glibc-20060425T0903/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	17 Feb 2006 08:06:14 -0000	1.26
++++ glibc-20060425T0903-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")
  
@@ -2320,8 +2320,8 @@
  			      : "=m" (futex), "=&D" (ignore)		      \
  			      : "m" (futex)				      \
  			      : "ax", "cx", "r11", "cc", "memory"); })
---- glibc-20060424T0820/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
-+++ glibc-20060424T0820-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
+--- glibc-20060425T0903/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
++++ glibc-20060425T0903-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
@@ -2416,8 +2416,8 @@
 -	retq
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060424T0820/nscd/connections.c	1 Apr 2006 18:49:53 -0000	1.83
-+++ glibc-20060424T0820-fedora/nscd/connections.c	24 Apr 2006 08:55:43 -0000	1.55.2.20
+--- glibc-20060425T0903/nscd/connections.c	1 Apr 2006 18:49:53 -0000	1.83
++++ glibc-20060425T0903-fedora/nscd/connections.c	24 Apr 2006 08:55:43 -0000	1.55.2.20
 @@ -1879,3 +1879,18 @@ finish_drop_privileges (void)
        exit (4);
      }
@@ -2437,8 +2437,8 @@
 +    prune_cache (&dbs[hstdb], LONG_MAX);
 +}
 +
---- glibc-20060424T0820/nscd/nscd.c	6 Apr 2006 22:55:50 -0000	1.52
-+++ glibc-20060424T0820-fedora/nscd/nscd.c	24 Apr 2006 08:55:43 -0000	1.38.2.12
+--- glibc-20060425T0903/nscd/nscd.c	6 Apr 2006 22:55:50 -0000	1.52
++++ glibc-20060425T0903-fedora/nscd/nscd.c	24 Apr 2006 08:55:43 -0000	1.38.2.12
 @@ -119,6 +119,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -2457,8 +2457,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20060424T0820/nscd/nscd.conf	23 Aug 2005 23:17:32 -0000	1.11
-+++ glibc-20060424T0820-fedora/nscd/nscd.conf	24 Aug 2005 07:23:30 -0000	1.8.2.3
+--- glibc-20060425T0903/nscd/nscd.conf	23 Aug 2005 23:17:32 -0000	1.11
++++ glibc-20060425T0903-fedora/nscd/nscd.conf	24 Aug 2005 07:23:30 -0000	1.8.2.3
 @@ -32,8 +32,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
@@ -2470,8 +2470,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20060424T0820/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
-+++ glibc-20060424T0820-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
+--- glibc-20060425T0903/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
++++ glibc-20060425T0903-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
@@ -2512,8 +2512,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20060424T0820/posix/Makefile	15 Apr 2006 21:41:25 -0000	1.189
-+++ glibc-20060424T0820-fedora/posix/Makefile	24 Apr 2006 08:55:43 -0000	1.171.2.17
+--- glibc-20060425T0903/posix/Makefile	15 Apr 2006 21:41:25 -0000	1.189
++++ glibc-20060425T0903-fedora/posix/Makefile	24 Apr 2006 08:55:43 -0000	1.171.2.17
 @@ -107,7 +107,8 @@ generated := $(addprefix wordexp-test-re
  	     bug-regex21-mem bug-regex21.mtrace \
  	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
@@ -2547,8 +2547,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
---- glibc-20060424T0820/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060424T0820-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20060425T0903/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060425T0903-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 =
@@ -2565,8 +2565,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20060424T0820/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20060424T0820-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20060425T0903/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20060425T0903-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
@@ -2582,8 +2582,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-20060424T0820/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20060424T0820-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20060425T0903/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20060425T0903-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))
@@ -2595,8 +2595,8 @@
  endif
  endif
  
---- glibc-20060424T0820/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20060424T0820-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20060425T0903/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20060425T0903-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.  */
@@ -2948,8 +2948,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20060424T0820/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060424T0820-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060425T0903/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060425T0903-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.
@@ -3035,8 +3035,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20060424T0820/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
-+++ glibc-20060424T0820-fedora/sysdeps/unix/nice.c	22 Sep 2004 21:21:08 -0000	1.6.2.1
+--- glibc-20060425T0903/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
++++ glibc-20060425T0903-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);
      }
@@ -3051,8 +3051,8 @@
    if (result != -1)
      return getpriority (PRIO_PROCESS, 0);
    else
---- glibc-20060424T0820/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Jan 2006 08:21:15 -0000	1.22
-+++ glibc-20060424T0820-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	9 Jan 2006 21:55:08 -0000	1.14.2.8
+--- glibc-20060425T0903/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Jan 2006 08:21:15 -0000	1.22
++++ glibc-20060425T0903-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.  */
  
@@ -3101,8 +3101,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20060424T0820/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20060424T0820-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20060425T0903/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20060425T0903-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;
@@ -3145,8 +3145,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20060424T0820/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20060424T0820-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20060425T0903/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20060425T0903-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"
@@ -3156,8 +3156,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20060424T0820/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20060424T0820-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20060425T0903/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20060425T0903-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;
@@ -3203,8 +3203,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20060424T0820/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060424T0820-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060425T0903/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060425T0903-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.
@@ -3265,8 +3265,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20060424T0820/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20060424T0820-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20060425T0903/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20060425T0903-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)
@@ -3299,24 +3299,24 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20060424T0820/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060424T0820-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060425T0903/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060425T0903-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-20060424T0820/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060424T0820-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060425T0903/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060425T0903-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-20060424T0820/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20060424T0820-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20060425T0903/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20060425T0903-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.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- glibc.spec	24 Apr 2006 11:22:15 -0000	1.234
+++ glibc.spec	25 Apr 2006 09:47:01 -0000	1.235
@@ -1,9 +1,9 @@
-%define glibcdate 20060424T0820
+%define glibcdate 20060425T0903
 %define glibcname glibc
-%define glibcsrcdir glibc-20060424T0820
+%define glibcsrcdir glibc-20060425T0903
 %define glibc_release_tarballs 0
-%define glibcversion 2.4
-%define glibcrelease 6
+%define glibcversion 2.4.90
+%define glibcrelease 1
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define xenarches i686 athlon
@@ -1394,6 +1394,9 @@
 %endif
 
 %changelog
+* Tue Apr 25 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-1
+- update from CVS
+
 * Mon Apr 24 2006 Jakub Jelinek <jakub at redhat.com> 2.4-6
 - update from CVS
   - NIS+ fixes


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- sources	24 Apr 2006 11:22:15 -0000	1.169
+++ sources	25 Apr 2006 09:47:01 -0000	1.170
@@ -1,2 +1,2 @@
-b204050c663bb31e395f1b1f9dc4cae8  glibc-20060424T0820.tar.bz2
-057fcbfb83989dbd50def2a5f05ba3ca  glibc-fedora-20060424T0820.tar.bz2
+16b5f16a0ed4fcf5ea751ad2702ae25e  glibc-20060425T0903.tar.bz2
+7edb61eb2991b5c7e1351123f251f485  glibc-fedora-20060425T0903.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 25 18:50:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 14:50:29 -0400
Subject: rpms/rhythmbox/FC-5 rhythmbox.spec,1.55,1.56 sources,1.24,1.25
Message-ID: <200604251850.k3PIoTRp006076@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/rhythmbox/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5232

Modified Files:
	rhythmbox.spec sources 
Log Message:
0.9.4.1



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/FC-5/rhythmbox.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- rhythmbox.spec	17 Apr 2006 17:36:12 -0000	1.55
+++ rhythmbox.spec	25 Apr 2006 18:50:16 -0000	1.56
@@ -2,7 +2,7 @@
 
 Name: rhythmbox
 Summary: Music Management Application 
-Version: 0.9.4
+Version: 0.9.4.1
 Release: 1.fc5.1
 License: GPL
 Group: Applications/Multimedia
@@ -13,7 +13,13 @@
 Requires: libgnomeui >= 2.6.0
 Requires: eel2 >= 2.0.0
 Requires: libgpod 
-Requires: scrollkeeper
+Requires(post): scrollkeeper
+Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
+Requires(post): GConf2
+Requires(preun): GConf2
+Requires(postun): scrollkeeper
+Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
+
 BuildRequires: libgpod-devel
 BuildRequires: libgnomeui-devel >= 2.6.0
 BuildRequires: nautilus-cd-burner-devel
@@ -25,7 +31,7 @@
 BuildRequires: libmusicbrainz-devel >= 2.1.0
 BuildRequires: dbus-devel >= 0.60
 BuildRequires: libnotify-devel
-PreReq: desktop-file-utils >= %{desktop_file_utils_version}
+
 # no nautilus-cd-burner on s390
 ExcludeArch: s390 s390x
 Patch2: rhythmbox-0.9.3.1-use-icon-name.patch
@@ -78,17 +84,21 @@
 %post 
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="rhythmbox.schemas"
-for S in $SCHEMAS; do 
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null
-done
-update-desktop-database %{_datadir}/applications
-scrollkeeper-update
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/rhythmbox.schemas >/dev/null
+update-desktop-database -q
+scrollkeeper-update -q
+
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/rhythmbox.schemas > /dev/null || :
+fi
 
 %postun
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications
-scrollkeeper-update
+update-desktop-database -q
+scrollkeeper-update -q
 
 %files -f %{name}.lang
 %defattr(-, root, root)
@@ -110,7 +120,10 @@
 %{_libexecdir}/rhythmbox-metadata
 
 %changelog
-* Mon Apr 17 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.4-1.fc5.1
+* Mon Apr 25 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.4.1-1.fc5.1
+- Update to 0.9.4.1
+
+* Mon Apr 17 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.4-2
 - Update to 0.9.4
 - Drop upstreamed patches
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/FC-5/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	17 Apr 2006 17:36:12 -0000	1.24
+++ sources	25 Apr 2006 18:50:16 -0000	1.25
@@ -1 +1 @@
-0d335864738d6de0d0e6acc2964f8bc4  rhythmbox-0.9.4.tar.bz2
+d725eb7134d1997efe28285715ebc05e  rhythmbox-0.9.4.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 25 19:01:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 15:01:52 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2154,
	1.2155 linux-2.6-bzimage.patch, 1.4, NONE
Message-ID: <200604251901.k3PJ1qIe014070@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14050

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-bzimage.patch 
Log Message:
no more bzImage


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2154
retrieving revision 1.2155
diff -u -r1.2154 -r1.2155
--- kernel-2.6.spec	24 Apr 2006 19:04:04 -0000	1.2154
+++ kernel-2.6.spec	25 Apr 2006 19:01:38 -0000	1.2155
@@ -92,20 +92,28 @@
 %ifarch s390
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-s390*.config
 %define image_install_path boot
+%define make_target image
+%define kernel_image image
 %endif
 
 %ifarch s390x
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-s390x.config
 %define image_install_path boot
+%define make_target image
+%define kernel_image image
 %endif
 
 %ifarch sparc
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-sparc.config
+%define make_target image
+%define kernel_image image
 %endif
 
 %ifarch sparc64
 %define buildsmp 1
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-sparc64*.config
+%define make_target image
+%define kernel_image image
 %endif
 
 %ifarch ppc
@@ -120,6 +128,8 @@
 %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
 %endif
 
 #
@@ -216,7 +226,6 @@
 Patch2: patch-2.6.17-rc2-git5.bz2
 
 # Patches 100 through 500 are meant for architecture patches
-Patch100: linux-2.6-bzimage.patch
 
 # 200 - 299   x86(-64)
 
@@ -725,7 +734,6 @@
 #
 # Architecture patches
 #
-%patch100 -p1
 
 #
 # x86(-64)
@@ -1657,6 +1665,9 @@
 %endif
 
 %changelog
+* Tue Apr 25 2005 David Woodhouse <dwmw2 at redhat.com>
+- Drop the last remnants of the 'make bzImage on all arches' silliness
+
 * Sun Apr 23 2006 Dave Jones <davej at redhat.com>
 - 2.6.17rc2-git5
 


--- linux-2.6-bzimage.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 25 19:02:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 15:02:50 -0400
Subject: rpms/gnome-power-manager/FC-5 .cvsignore, 1.16,
	1.17 gnome-power-manager.spec, 1.36, 1.37 sources, 1.16, 1.17
Message-ID: <200604251902.k3PJ2oUY014183@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-power-manager/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14103

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
2.14.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/FC-5/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	9 Apr 2006 17:52:28 -0000	1.16
+++ .cvsignore	25 Apr 2006 19:02:33 -0000	1.17
@@ -1 +1,2 @@
 gnome-power-manager-2.14.1.tar.bz2
+gnome-power-manager-2.14.2.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/FC-5/gnome-power-manager.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gnome-power-manager.spec	9 Apr 2006 17:52:28 -0000	1.36
+++ gnome-power-manager.spec	25 Apr 2006 19:02:33 -0000	1.37
@@ -4,7 +4,7 @@
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.14.1
+Version: 2.14.2
 Release: 1
 License: GPL
 Group: Applications/System
@@ -19,12 +19,16 @@
 BuildPrereq: libnotify-devel
 BuildRequires: scrollkeeper
 BuildRequires: gnome-doc-utils >= 0.3.2
+BuildRequires: desktop-file-utils
 Requires: gnome-mime-data
 Requires: gnome-icon-theme
 Requires: hal >= %{hal_version}
 Requires: dbus-glib >= %{dbus_version}
 Requires: dbus-x11 >= %{dbus_version}
-Requires: scrollkeeper
+Requires(post): scrollkeeper
+Requires(post): GConf2
+Requires(preun): GConf2
+Requires(postun): scrollkeeper
 
 %description
 GNOME Power Manager uses the information and facilities provided by HAL 
@@ -60,19 +64,23 @@
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="gnome-power-manager.schemas"
-for S in $SCHEMAS; do
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null
-done
-scrollkeeper-update
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnome-power-manager.schemas >/dev/null
+scrollkeeper-update -q
 
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
     gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/gnome-power-manager.schemas > /dev/null || :
+fi
+
 %postun
-scrollkeeper-update
+scrollkeeper-update -q
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -90,6 +98,9 @@
 %{_datadir}/icons/hicolor/24x24/apps/*
 
 %changelog
+* Tue Apr 25 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1
+- Update to 2.14.2
+
 * Sun Apr  9 2006 Ray Strode <rstrode at redhat.com> - 2.14.1-1
 - Update to 2.14.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/FC-5/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	9 Apr 2006 17:52:28 -0000	1.16
+++ sources	25 Apr 2006 19:02:33 -0000	1.17
@@ -1 +1 @@
-c1e392128c8f619390d28d719a0b9109  gnome-power-manager-2.14.1.tar.bz2
+c831d74fc578f40613d4cac326b0b3a2  gnome-power-manager-2.14.2.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 25 19:05:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 15:05:48 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2155,1.2156
Message-ID: <200604251905.k3PJ5mfw014629@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14598

Modified Files:
	kernel-2.6.spec 
Log Message:
it's 2006


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2155
retrieving revision 1.2156
diff -u -r1.2155 -r1.2156
--- kernel-2.6.spec	25 Apr 2006 19:01:38 -0000	1.2155
+++ kernel-2.6.spec	25 Apr 2006 19:05:44 -0000	1.2156
@@ -1665,7 +1665,7 @@
 %endif
 
 %changelog
-* Tue Apr 25 2005 David Woodhouse <dwmw2 at redhat.com>
+* Tue Apr 25 2006 David Woodhouse <dwmw2 at redhat.com>
 - Drop the last remnants of the 'make bzImage on all arches' silliness
 
 * Sun Apr 23 2006 Dave Jones <davej at redhat.com>



From fedora-cvs-commits at redhat.com  Tue Apr 25 19:08:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 15:08:28 -0400
Subject: rpms/dbus/devel dbus.spec,1.77,1.78
Message-ID: <200604251908.k3PJ8SLA015063@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14961

Modified Files:
	dbus.spec 
Log Message:
- Fix patch numbering



Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- dbus.spec	25 Apr 2006 18:35:37 -0000	1.77
+++ dbus.spec	25 Apr 2006 19:08:15 -0000	1.78
@@ -49,11 +49,11 @@
 Patch1: dbus-0.32-selinux_chroot_workaround.patch
 Patch2: dbus-0.61-selinux-avc-audit.patch
 Patch3: dbus-0.60-start-early.patch
-Patch4: dbus-0.61.dbus-connection.c.backport.patch
-
 #make sure we take this out if ABI changes
 Patch4: dbus-0.61-mono-no-abi-version-change.patch 
 
+Patch5: dbus-0.61.dbus-connection.c.backport.patch
+
 %description
 
 D-BUS is a system for sending messages between applications. It is
@@ -139,11 +139,12 @@
 %patch1 -p1 -b .selinux_chroot_workaround
 %patch2 -p1 -b .selinux-avc-audit
 %patch3 -p1 -b .start-early
-%patch4 -p1 -b .backport
 
 #make sure we take this out if ABI changes
 %patch4 -p1 -b .mono-no-abi-version-change
 
+%patch5 -p1 -b .backport
+
 autoreconf -f -i
 
 %build



From fedora-cvs-commits at redhat.com  Tue Apr 25 19:08:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 15:08:47 -0400
Subject: rpms/gnome-power-manager/devel .cvsignore, 1.16,
	1.17 gnome-power-manager.spec, 1.37, 1.38 sources, 1.16, 1.17
Message-ID: <200604251908.k3PJ8lFn015121@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15001

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
2.15.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	7 Apr 2006 05:33:53 -0000	1.16
+++ .cvsignore	25 Apr 2006 19:08:35 -0000	1.17
@@ -1 +1 @@
-gnome-power-manager-2.15.0.tar.bz2
+gnome-power-manager-2.15.1.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gnome-power-manager.spec	7 Apr 2006 05:55:47 -0000	1.37
+++ gnome-power-manager.spec	25 Apr 2006 19:08:35 -0000	1.38
@@ -4,7 +4,7 @@
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.15.0
+Version: 2.15.1
 Release: 1
 License: GPL
 Group: Applications/System
@@ -24,7 +24,10 @@
 Requires: hal >= %{hal_version}
 Requires: dbus-glib >= %{dbus_version}
 Requires: dbus-x11 >= %{dbus_version}
-Requires: scrollkeeper
+Requires(post): scrollkeeper
+Requires(post): GConf2
+Requires(preun): GConf2
+Requires(postun): scrollkeeper
 
 %description
 GNOME Power Manager uses the information and facilities provided by HAL 
@@ -60,19 +63,26 @@
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="gnome-power-manager.schemas"
-for S in $SCHEMAS; do
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null
-done
-scrollkeeper-update
-
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnome-power-manager.schemas >/dev/null
+scrollkeeper-update -q
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
     gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/gnome-power-manager.schemas > /dev/null || :
+fi
+
 %postun
-scrollkeeper-update
+scrollkeeper-update -q
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -90,6 +100,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Apr 25 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.1-1
+- Update to 2.15.1
+
 * Fri Apr  7 2006 Ray Strode <rstrode at redhat.com> - 2.15.0-1
 - update to 2.15.0 to get the cool new runtime analysis
   graphs.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	7 Apr 2006 05:33:53 -0000	1.16
+++ sources	25 Apr 2006 19:08:35 -0000	1.17
@@ -1 +1 @@
-9f818d810f84fa5c17403bd593e8936a  gnome-power-manager-2.15.0.tar.bz2
+32eab30596b95bad18c236b52f1fb93f  gnome-power-manager-2.15.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 25 19:34:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 15:34:41 -0400
Subject: rpms/kde-i18n/devel .cvsignore, 1.33, 1.34 kde-i18n.spec, 1.58,
	1.59 sources, 1.35, 1.36 subdirs-kde-i18n, 1.8, 1.9
Message-ID: <200604251934.k3PJYfHr000677@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kde-i18n/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv626

Modified Files:
	.cvsignore kde-i18n.spec sources subdirs-kde-i18n 
Log Message:
add kde-i18n-Lithuanian



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	3 Apr 2006 21:24:45 -0000	1.33
+++ .cvsignore	25 Apr 2006 19:34:25 -0000	1.34
@@ -257,3 +257,4 @@
 kde-i18n-uk-3.5.2.tar.bz2
 kde-i18n-zh_CN-3.5.2.tar.bz2
 kde-i18n-zh_TW-3.5.2.tar.bz2
+kde-i18n-lt-3.5.2.tar.bz2


Index: kde-i18n.spec
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/devel/kde-i18n.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- kde-i18n.spec	13 Apr 2006 13:39:44 -0000	1.58
+++ kde-i18n.spec	25 Apr 2006 19:34:25 -0000	1.59
@@ -4,7 +4,7 @@
 
 Name: kde-i18n
 Version: 3.5.2
-Release: 2
+Release: 3
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Epoch: 1
@@ -939,11 +939,9 @@
 %lang(lo) %doc %{_docdir}/HTML/lo
 %endif
 
-%if %{buildall}
 %files Lithuanian
 %defattr(-,root,root)
 %lang(lt) %{_datadir}/locale/lt/*
-%endif
 
 %if %{buildall}
 %files Latvian
@@ -1150,6 +1148,9 @@
 %lang(zh_TW) %doc %{_docdir}/HTML/zh_TW
 
 %changelog
+* Tue Apr 25 2006 Than Ngo <than at redhat.com> 1:3.5.2-3
+- add kde-i18n-Lithuanian 
+
 * Thu Apr 13 2006 Than Ngo <than at redhat.com> 1:3.5.2-2 
 - fix file conflict
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	3 Apr 2006 21:24:45 -0000	1.35
+++ sources	25 Apr 2006 19:34:25 -0000	1.36
@@ -35,3 +35,4 @@
 da83d2460f25478a61cf8eb09dd2540e  kde-i18n-uk-3.5.2.tar.bz2
 d451f1d96fd2bcdf7c432b6c9b0e5963  kde-i18n-zh_CN-3.5.2.tar.bz2
 2371a7ff043e9944e091ac30a48bcc07  kde-i18n-zh_TW-3.5.2.tar.bz2
+0b22decd3114c381a207c9bb9b0e0b77  kde-i18n-lt-3.5.2.tar.bz2


Index: subdirs-kde-i18n
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/devel/subdirs-kde-i18n,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- subdirs-kde-i18n	8 Mar 2006 15:19:17 -0000	1.8
+++ subdirs-kde-i18n	25 Apr 2006 19:34:25 -0000	1.9
@@ -17,6 +17,7 @@
 is
 it
 ja
+lt
 nb
 nl
 nn



From fedora-cvs-commits at redhat.com  Tue Apr 25 19:46:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 15:46:14 -0400
Subject: rpms/isdn4k-utils/devel isdn4k-utils.spec,1.56,1.57
Message-ID: <200604251946.k3PJkE7T002823@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/isdn4k-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2751

Modified Files:
	isdn4k-utils.spec 
Log Message:
add capi service




Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/isdn4k-utils/devel/isdn4k-utils.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- isdn4k-utils.spec	19 Apr 2006 14:42:26 -0000	1.56
+++ isdn4k-utils.spec	25 Apr 2006 19:46:10 -0000	1.57
@@ -15,7 +15,7 @@
 Summary: Utilities for configuring an ISDN subsystem.
 Name: isdn4k-utils
 Version: 3.2
-Release: 43
+Release: 44
 License: GPL
 Group: Applications/System
 
@@ -275,12 +275,16 @@
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add isdn
+/sbin/chkconfig --add capi
+/sbin/chkconfig capi off
 exit 0
 
 %preun
 if [ "$1" = "0" ]; then
    /sbin/service isdn stop > /dev/null 2>&1
+   /sbin/service capi stop > /dev/null 2>&1
    /sbin/chkconfig --del isdn
+   /sbin/chkconfig --del capi
 fi
 exit 0
 
@@ -288,6 +292,7 @@
 /sbin/ldconfig
 if [ "$1" -ge "1" ]; then
    /sbin/service isdn condrestart > /dev/null 2>&1
+   /sbin/service capi condrestart > /dev/null 2>&1
 fi
 exit 0
 
@@ -487,6 +492,9 @@
 %doc xmonisdn/README
 
 %changelog
+* Tue Apr 25 2006 Than Ngo <than at redhat.com> 3.2-44
+- add capi service
+
 * Wed Apr 19 2006 Than Ngo <than at redhat.com> 3.2-43
 - update to CVS-2006-02-13
 - add support capi #169902



From fedora-cvs-commits at redhat.com  Tue Apr 25 20:18:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 16:18:01 -0400
Subject: rpms/kde-i18n/devel kde-i18n.spec,1.60,1.61
Message-ID: <200604252018.k3PKI14a025649@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kde-i18n/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24864

Modified Files:
	kde-i18n.spec 
Log Message:
add kde-i18n-lt



Index: kde-i18n.spec
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/devel/kde-i18n.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- kde-i18n.spec	25 Apr 2006 19:50:31 -0000	1.60
+++ kde-i18n.spec	25 Apr 2006 20:17:55 -0000	1.61
@@ -49,6 +49,7 @@
 Source34: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-uk-%{version}.tar.bz2
 Source35: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_CN-%{version}.tar.bz2
 Source36: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_TW-%{version}.tar.bz2
+Source37: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-lt-%{version}.tar.bz2
 Source1000: subdirs-kde-i18n
 
 Requires: kdelibs >= 6:%{version}



From fedora-cvs-commits at redhat.com  Tue Apr 25 20:18:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 16:18:24 -0400
Subject: rpms/gnome-terminal/devel
	gnome-terminal-2.14.1-real-transparency.patch, 1.3,
	1.4 gnome-terminal.spec, 1.45, 1.46
Message-ID: <200604252018.k3PKIIQf025894@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/gnome-terminal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25776

Modified Files:
	gnome-terminal-2.14.1-real-transparency.patch 
	gnome-terminal.spec 
Log Message:
* Tue Apr 25 2006 Kristian H??gsberg <krh at redhat.com> - 2.14.1-10
- Fix selection atom name intialization (patch from Kjartan Maaras).


gnome-terminal-2.14.1-real-transparency.patch:
 terminal-screen.c     |   22 ++++++++++++++++------
 terminal-screen.h     |    2 ++
 terminal-widget-vte.c |    9 +++++++++
 terminal-widget.h     |    3 +++
 terminal-window.c     |   41 +++++++++++++++++++++++++++++++++++++++++
 terminal-window.h     |    2 ++
 terminal.c            |    2 ++
 7 files changed, 75 insertions(+), 6 deletions(-)

Index: gnome-terminal-2.14.1-real-transparency.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal-2.14.1-real-transparency.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-terminal-2.14.1-real-transparency.patch	18 Apr 2006 05:22:51 -0000	1.3
+++ gnome-terminal-2.14.1-real-transparency.patch	25 Apr 2006 20:18:03 -0000	1.4
@@ -1,5 +1,5 @@
---- ./src/terminal-screen.c.real-transparency	2006-04-18 00:29:10.000000000 -0400
-+++ ./src/terminal-screen.c	2006-04-18 00:29:10.000000000 -0400
+--- ./src/terminal-screen.c.real-transparency	2006-04-25 15:02:21.000000000 -0400
++++ ./src/terminal-screen.c	2006-04-25 15:02:21.000000000 -0400
 @@ -119,8 +119,6 @@
  
  static void terminal_screen_setup_dnd                (TerminalScreen *screen);
@@ -69,7 +69,7 @@
    if (screen->priv->profile)
      g_signal_emit (G_OBJECT (screen), signals[PROFILE_SET], 0);
 --- ./src/terminal-screen.h.real-transparency	2006-01-20 13:05:42.000000000 -0500
-+++ ./src/terminal-screen.h	2006-04-18 00:29:10.000000000 -0400
++++ ./src/terminal-screen.h	2006-04-25 15:02:21.000000000 -0400
 @@ -74,6 +74,8 @@
                                    TerminalProfile *profile);
  TerminalProfile* terminal_screen_get_profile (TerminalScreen *screen);
@@ -80,7 +80,7 @@
                                                     char           **argv);
  const char** terminal_screen_get_override_command (TerminalScreen  *screen);
 --- ./src/terminal-widget-vte.c.real-transparency	2006-01-20 13:05:42.000000000 -0500
-+++ ./src/terminal-widget-vte.c	2006-04-18 00:29:10.000000000 -0400
++++ ./src/terminal-widget-vte.c	2006-04-25 15:02:21.000000000 -0400
 @@ -351,6 +351,7 @@
  terminal_widget_set_background_transparent (GtkWidget *widget,
  					    gboolean   setting)
@@ -105,7 +105,7 @@
  					gboolean   setting)
  {
 --- ./src/terminal-widget.h.real-transparency	2006-01-20 13:05:43.000000000 -0500
-+++ ./src/terminal-widget.h	2006-04-18 00:29:10.000000000 -0400
++++ ./src/terminal-widget.h	2006-04-25 15:02:21.000000000 -0400
 @@ -90,6 +90,9 @@
  /* 0.0 = normal bg, 1.0 = all black bg, 0.5 = half darkened */
  void       terminal_widget_set_background_darkness    (GtkWidget            *widget,
@@ -117,7 +117,7 @@
                                                         gboolean              setting);
  void       terminal_widget_set_normal_gdk_font        (GtkWidget            *widget,
 --- ./src/terminal-window.c.real-transparency	2006-03-04 01:21:01.000000000 -0500
-+++ ./src/terminal-window.c	2006-04-18 00:58:59.000000000 -0400
++++ ./src/terminal-window.c	2006-04-25 16:13:42.000000000 -0400
 @@ -85,6 +85,9 @@
     * event-driven while GTK doesn't support _NET_WM_STATE_FULLSCREEN
     */
@@ -128,7 +128,7 @@
  };
  
  enum {
-@@ -750,6 +753,47 @@
+@@ -750,6 +753,42 @@
  }
  
  static void
@@ -137,22 +137,17 @@
 +  GdkScreen *screen;
 +  GdkColormap *colormap;
 +  char *atom_name;
-+  Display *display;
-+  GdkDisplay *gdk_display;
-+  int atom;
++  GdkAtom atom;
 +
-+  gdk_display = gtk_widget_get_display (GTK_WIDGET (window));
-+  display = gdk_x11_display_get_xdisplay (gdk_display);
++  screen = gtk_widget_get_screen (GTK_WIDGET (window));
 +
 +  atom_name = g_strdup_printf ("_NET_WM_CM_S%d",
 +			       gdk_screen_get_number (screen));
-+  atom = gdk_x11_get_xatom_by_name (atom_name);
++  atom = gdk_atom_intern (atom_name, FALSE);
 +  g_free (atom_name);
-+  
-+  screen = gtk_widget_get_screen (GTK_WIDGET (window));
-+  colormap = gdk_screen_get_rgba_colormap (screen);
 +
-+  if (colormap != NULL && XGetSelectionOwner (display, atom) != None)
++  colormap = gdk_screen_get_rgba_colormap (screen);
++  if (colormap != NULL && gdk_selection_owner_get (atom) != None)
 +    {
 +      /* Set RGBA colormap if possible so VTE can use real alpha
 +       * channels for transparency. */
@@ -176,7 +171,7 @@
  terminal_window_init (TerminalWindow *window)
  {
    GtkWidget *mi;
-@@ -781,6 +825,8 @@
+@@ -781,6 +820,8 @@
    window->priv->use_mnemonics = TRUE;
    window->priv->using_mnemonics = FALSE;
  
@@ -185,17 +180,8 @@
    /* force gtk to construct its GtkClipboard; otherwise our UI is very slow the first time we need it */
    window->priv->clipboard = gtk_clipboard_get_for_display (gtk_widget_get_display (GTK_WIDGET (window)), GDK_NONE);
  
-@@ -1233,6 +1279,8 @@
- void terminal_window_realized_callback (GtkWidget *window,
-                                         gpointer   user_data)
- {
-+  TerminalWindow *terminal_window = (TerminalWindow *) window;
-+
-   gdk_window_set_group (window->window, window->window);
-   g_signal_handlers_disconnect_by_func (window, terminal_window_realized_callback, NULL);
- }
 --- ./src/terminal-window.h.real-transparency	2005-11-20 10:06:34.000000000 -0500
-+++ ./src/terminal-window.h	2006-04-18 00:29:10.000000000 -0400
++++ ./src/terminal-window.h	2006-04-25 15:02:21.000000000 -0400
 @@ -98,6 +98,8 @@
  void terminal_window_set_startup_id (TerminalWindow *window,
                                       const char     *startup_id);
@@ -206,7 +192,7 @@
  
  #endif /* TERMINAL_WINDOW_H */
 --- ./src/terminal.c.real-transparency	2006-03-04 01:10:54.000000000 -0500
-+++ ./src/terminal.c	2006-04-18 00:29:10.000000000 -0400
++++ ./src/terminal.c	2006-04-25 15:02:21.000000000 -0400
 @@ -1966,6 +1966,8 @@
      
        terminal_window_add_screen (window, screen);


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gnome-terminal.spec	19 Apr 2006 14:50:40 -0000	1.45
+++ gnome-terminal.spec	25 Apr 2006 20:18:08 -0000	1.46
@@ -13,7 +13,7 @@
 Summary: GNOME Terminal
 Name: gnome-terminal
 Version: 2.14.1
-Release: 9
+Release: 10
 URL: http://www.gnome.org/
 Source0: gnome-terminal-%{version}.tar.bz2
 Source1: ne.po
@@ -103,6 +103,9 @@
 %{_libdir}/bonobo
 
 %changelog
+* Tue Apr 25 2006 Kristian H??gsberg <krh at redhat.com> - 2.14.1-10
+- Fix selection atom name intialization (patch from Kjartan Maaras).
+
 * Wed Apr 19 2006 Ray Strode <rstrode at redhat.com> 2.14.1-9
 - Require newer vte (bug 189341)
 



From fedora-cvs-commits at redhat.com  Tue Apr 25 20:25:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 16:25:55 -0400
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders-2.4-unistd.patch, 1.5,
	1.6
Message-ID: <200604252025.k3PKPtFb005990@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5967

Modified Files:
	glibc-kernheaders-2.4-unistd.patch 
Log Message:
Remove a chunk which only inserted an unintended tab.

glibc-kernheaders-2.4-unistd.patch:
 asm-alpha/unistd.h  |   30 +++++++++++++++++++++++++-----
 asm-i386/unistd.h   |   33 +++++++++++++++++++++++++++++++++
 asm-ia64/unistd.h   |   37 +++++++++++++++++++++++++++++++++++--
 asm-ppc/unistd.h    |   27 +++++++++++++++++++++++++--
 asm-ppc64/unistd.h  |   29 +++++++++++++++++++++++++++--
 asm-s390/unistd.h   |   30 ++++++++++++++++++++++++++++--
 asm-s390x/unistd.h  |   31 +++++++++++++++++++++++++++++--
 asm-x86_64/unistd.h |   36 ++++++++++++++++++++++++++++++++++--
 8 files changed, 236 insertions(+), 17 deletions(-)

Index: glibc-kernheaders-2.4-unistd.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders-2.4-unistd.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- glibc-kernheaders-2.4-unistd.patch	24 Apr 2006 13:11:41 -0000	1.5
+++ glibc-kernheaders-2.4-unistd.patch	25 Apr 2006 20:25:50 -0000	1.6
@@ -11,15 +11,6 @@
  #define __NR_rt_sigreturn		351
  #define __NR_rt_sigaction		352
  #define __NR_rt_sigprocmask		353
-@@ -332,7 +332,7 @@
- #define __NR_lremovexattr		392
- #define __NR_fremovexattr		393
- #define __NR_futex			394
--#define __NR_sched_setaffinity		395
-+#define __NR_sched_setaffinity		395     
- #define __NR_sched_getaffinity		396
- #define __NR_tuxcall			397
- #define __NR_io_setup			398
 @@ -342,13 +342,23 @@
  #define __NR_io_cancel			402
  #define __NR_exit_group			405



From fedora-cvs-commits at redhat.com  Tue Apr 25 20:41:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 16:41:03 -0400
Subject: rpms/gnome-terminal/devel gnome-terminal.spec,1.46,1.47
Message-ID: <200604252041.k3PKf33d008668@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/gnome-terminal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8636

Modified Files:
	gnome-terminal.spec 
Log Message:
Lower vte requirement to 0.12.0-2.


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gnome-terminal.spec	25 Apr 2006 20:18:08 -0000	1.46
+++ gnome-terminal.spec	25 Apr 2006 20:40:59 -0000	1.47
@@ -5,7 +5,7 @@
 %define gtk2_version 2.6.0
 %define libgnomeui_version 2.3.0
 #%define libzvt_version 1.113.0
-%define vte_version 0.12.0-3
+%define vte_version 0.12.0-2
 %define desktop_file_utils_version 0.2.90
 %define startup_notification_version 0.8
 %define libbonobo_version 2.3.0
@@ -105,6 +105,7 @@
 %changelog
 * Tue Apr 25 2006 Kristian H??gsberg <krh at redhat.com> - 2.14.1-10
 - Fix selection atom name intialization (patch from Kjartan Maaras).
+- Lower vte requirement to 0.12.0-2 which is what fc5-bling has.
 
 * Wed Apr 19 2006 Ray Strode <rstrode at redhat.com> 2.14.1-9
 - Require newer vte (bug 189341)



From fedora-cvs-commits at redhat.com  Tue Apr 25 20:46:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 16:46:44 -0400
Subject: rpms/gnome-terminal/devel gnome-terminal.spec,1.47,1.48
Message-ID: <200604252046.k3PKkiEp009961@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/gnome-terminal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9786

Modified Files:
	gnome-terminal.spec 
Log Message:
* Tue Apr 25 2006 Kristian H??gsberg <krh at redhat.com> 2.14.1-11
- Bump for rawhide build.



Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- gnome-terminal.spec	25 Apr 2006 20:40:59 -0000	1.47
+++ gnome-terminal.spec	25 Apr 2006 20:46:41 -0000	1.48
@@ -13,7 +13,7 @@
 Summary: GNOME Terminal
 Name: gnome-terminal
 Version: 2.14.1
-Release: 10
+Release: 11
 URL: http://www.gnome.org/
 Source0: gnome-terminal-%{version}.tar.bz2
 Source1: ne.po
@@ -103,6 +103,9 @@
 %{_libdir}/bonobo
 
 %changelog
+* Tue Apr 25 2006 Kristian H??gsberg <krh at redhat.com> 2.14.1-11
+- Bump for rawhide build.
+
 * Tue Apr 25 2006 Kristian H??gsberg <krh at redhat.com> - 2.14.1-10
 - Fix selection atom name intialization (patch from Kjartan Maaras).
 - Lower vte requirement to 0.12.0-2 which is what fc5-bling has.



From fedora-cvs-commits at redhat.com  Tue Apr 25 21:22:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 17:22:00 -0400
Subject: rpms/rpm/devel rpm-4.4.2-trust.patch,NONE,1.1 rpm.spec,1.198,1.199
Message-ID: <200604252122.k3PLM032013343@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13314

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.4.2-trust.patch 
Log Message:
add --trust

rpm-4.4.2-trust.patch:
 poptQV.c |   30 ++++++++++++++++++++++--------
 rpmcli.h |    1 +
 2 files changed, 23 insertions(+), 8 deletions(-)

--- NEW FILE rpm-4.4.2-trust.patch ---
--- rpm-4.4.2/lib/poptQV.c.trust	2006-04-24 17:42:20.000000000 -0400
+++ rpm-4.4.2/lib/poptQV.c	2006-04-24 17:44:05.000000000 -0400
@@ -31,6 +31,10 @@
 #define POPT_HDLIST		-1011
 #define POPT_FTSWALK		-1012
 
+/* -1025 thrugh -1032 are common in rpmcli.h. */
+#define POPT_TARGETPLATFORM     -1036
+#define POPT_TRUST              -1037
+
 /* ========== Query/Verify/Signature source args */
 static void rpmQVSourceArgCallback( /*@unused@*/ poptContext con,
 		/*@unused@*/ enum poptCallbackReason reason,
@@ -87,6 +91,15 @@
 	qva->qva_source |= RPMQV_DBOFFSET; 
 	qva->qva_sourceCount++;
 	break;
+
+    /* XXX perhaps POPT_ARG_INT instead of callback. */
+    case POPT_TRUST:
+    {	char * end = NULL;
+	long trust = (int) strtol(arg, &end, 0);
+	/* XXX range checks on trust. */
+	/* XXX if (end && *end) argerror(_("non-numeric trust metric.")); */
+	qva->trust = trust;
+    }	break;
     }
 }
 
@@ -376,14 +389,6 @@
         N_("don't verify package signature(s)"), NULL },
 #endif
 
-/** @todo Add --nogpg/--nopgp aliases to rpmpopt, eliminate. */
- { "nogpg", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
-	&rpmQVKArgs.qva_flags, VERIFY_SIGNATURE,
-        N_("don't verify GPG V3 DSA signature(s)"), NULL },
- { "nopgp", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
-	&rpmQVKArgs.qva_flags, VERIFY_SIGNATURE,
-        N_("don't verify PGP V3 RSA/MD5 signature(s)"), NULL },
-
     POPT_TABLEEND
 };
 
@@ -408,6 +413,15 @@
 	N_("sign package(s) (identical to --addsign)"), NULL },
  { "sign", '\0', POPT_ARGFLAG_DOC_HIDDEN, &rpmQVKArgs.sign, 0,
 	N_("generate signature"), NULL },
+ /* XXX perhaps POPT_ARG_INT instead of callback. */
+ { "trust", '\0', POPT_ARG_STRING|POPT_ARGFLAG_DOC_HIDDEN, 0,  POPT_TRUST,
+        N_("specify trust metric"), "TRUST" },
+ { "trusted", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN,
+	&rpmQVKArgs.trust, 1,
+        N_("set ultimate trust when importing pubkey(s)"), NULL },
+ { "untrusted", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN,
+	&rpmQVKArgs.trust, -1,
+        N_("unset ultimate trust when importing pubkey(s)"), NULL },
 
  { "nodigest", '\0', POPT_BIT_SET, &rpmQVKArgs.qva_flags, VERIFY_DIGEST,
         N_("don't verify package digest(s)"), NULL },
--- rpm-4.4.2/lib/rpmcli.h.trust	2006-04-24 17:42:28.000000000 -0400
+++ rpm-4.4.2/lib/rpmcli.h	2006-04-24 17:42:33.000000000 -0400
@@ -280,6 +280,7 @@
 /*@only@*/ /*@null@*/
     const char * qva_queryFormat;/*!< Format for headerSprintf(). */
     int sign;			/*!< Is a passphrase needed? */
+    int trust;			/*!< Trust metric when importing pubkeys. */
 /*@observer@*/
     const char * passPhrase;	/*!< Pass phrase. */
 /*@observer@*/ /*@null@*/


Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- rpm.spec	12 Apr 2006 18:42:16 -0000	1.198
+++ rpm.spec	25 Apr 2006 21:21:57 -0000	1.199
@@ -20,7 +20,7 @@
 %define version 4.4.2
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 18
+Release: 19
 Group: System Environment/Base
 Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz
 Source1: mono-find-provides
@@ -49,6 +49,7 @@
 Patch21: rpm-4.4.2-userlock.patch
 Patch22: rpm-4.4.2-vercmp.patch
 Patch23: rpm-4.4.2-doxy.patch
+Patch24: rpm-4.4.2-trust.patch
 License: GPL
 Conflicts: patch < 2.5
 %ifos linux
@@ -182,6 +183,7 @@
 %patch21 -p1 -b .userlock
 %patch22 -p1 -b .vercmp
 %patch23 -p1 -b .doxy
+%patch24 -p1 -b .trust
 
 %build
 
@@ -574,6 +576,9 @@
 %{__includedir}/popt.h
 
 %changelog
+* Tue Apr 25 2006 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-19
+- Add --trusted stubs from upstream
+
 * Wed Apr 12 2006 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-18
 - Resurrect doxygen (#187714)
 



From fedora-cvs-commits at redhat.com  Tue Apr 25 21:22:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 17:22:30 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2156,1.2157
Message-ID: <200604252122.k3PLMUHp013563@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13526

Modified Files:
	kernel-2.6.spec 
Log Message:
image in arch/s390/boot/


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2156
retrieving revision 1.2157
diff -u -r1.2156 -r1.2157
--- kernel-2.6.spec	25 Apr 2006 19:05:44 -0000	1.2156
+++ kernel-2.6.spec	25 Apr 2006 21:22:27 -0000	1.2157
@@ -93,14 +93,14 @@
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-s390*.config
 %define image_install_path boot
 %define make_target image
-%define kernel_image image
+%define kernel_image arch/s390/boot/image
 %endif
 
 %ifarch s390x
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-s390x.config
 %define image_install_path boot
 %define make_target image
-%define kernel_image image
+%define kernel_image arch/s390/boot/image
 %endif
 
 %ifarch sparc



From fedora-cvs-commits at redhat.com  Tue Apr 25 21:55:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 17:55:35 -0400
Subject: rpms/xorg-x11-server-utils/devel xset-1.0.1-spurious-xprint.patch,
	NONE, 1.1 xorg-x11-server-utils.spec, 1.14, 1.15
Message-ID: <200604252155.k3PLtZxI007578@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7564

Modified Files:
	xorg-x11-server-utils.spec 
Added Files:
	xset-1.0.1-spurious-xprint.patch 
Log Message:
- Eliminate a spurious Xprint dependency from xset.


xset-1.0.1-spurious-xprint.patch:
 configure.ac |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

--- NEW FILE xset-1.0.1-spurious-xprint.patch ---
--- xset-1.0.1/configure.ac.xprint	2006-04-25 17:41:21.000000000 -0400
+++ xset-1.0.1/configure.ac	2006-04-25 17:41:46.000000000 -0400
@@ -62,14 +62,8 @@
 	AC_CHECK_HEADERS([X11/extensions/fontcache.h X11/extensions/fontcacheP.h],,,[#include <X11/Xlib.h>])
 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
 
-PKG_CHECK_MODULES(SET_XPRINT, xp, 
-	[SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $SET_XPRINT_CFLAGS $SET_X11_CFLAGS"
-	AC_CHECK_HEADERS([X11/extensions/Print.h],,,[#include <X11/Xlib.h>])
-	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-
-XSET_CFLAGS="$XSET_CFLAGS $SET_XEXT_CFLAGS $SET_XKB_CFLAGS $SET_XF86MISC_CFLAGS $SET_FONTCACHE_CFLAGS $SET_XPRINT_CFLAGS"
-XSET_LIBS="$XSET_LIBS $SET_XEXT_LIBS $SET_XKB_LIBS $SET_XF86MISC_LIBS $SET_FONTCACHE_LIBS $SET_XPRINT_LIBS"
+XSET_CFLAGS="$XSET_CFLAGS $SET_XEXT_CFLAGS $SET_XKB_CFLAGS $SET_XF86MISC_CFLAGS $SET_FONTCACHE_CFLAGS"
+XSET_LIBS="$XSET_LIBS $SET_XEXT_LIBS $SET_XKB_LIBS $SET_XF86MISC_LIBS $SET_FONTCACHE_LIBS"
 
 AC_SUBST(XSET_CFLAGS)
 AC_SUBST(XSET_LIBS)


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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-server-utils.spec	15 Apr 2006 00:24:48 -0000	1.14
+++ xorg-x11-server-utils.spec	25 Apr 2006 21:55:33 -0000	1.15
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 2
+Release: 3
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -36,6 +36,8 @@
 
 # rgb section
 Patch1100: rgb-1.0.0-datadir-rgbpath-fix.patch
+# xset section
+Patch1200: xset-1.0.1-spurious-xprint.patch
 # xvidtune section
 #Patch1700: xvidtune-0.99.1-datadir-app-defaults-fix.patch
 
@@ -75,7 +77,7 @@
 %setup -q -c %{name}-%{version} -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17
 
 %patch1100 -p0 -b .datadir-rgbpath-fix
-
+%patch1200 -p0 -b .xprint
 #%patch1700 -p0 -b .datadir-app-defaults-fix
 
 %build
@@ -94,6 +96,13 @@
             autoconf
             %configure ;# --with-rgb-db=%{_datadir}/X11
             ;;
+	 xset-*)
+	    # FIXME: run autotools junk to kick in our patch
+	    aclocal --force
+	    automake -f
+	    autoconf
+	    %configure
+	    ;;
          xvidtune-*)
             # FIXME: run autotools junk to kick in our patch
             aclocal --force
@@ -186,6 +195,9 @@
 %{_mandir}/man1/xvidtune.1x*
 
 %changelog
+* Tue Apr 25 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-3
+- Eliminate a spurious Xprint dependency from xset.
+
 * Fri Apr 14 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-2
 - Drop lbxproxy, LBX is deprecated upstream
 - Update to xhost 1.0.1



From fedora-cvs-commits at redhat.com  Tue Apr 25 22:22:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 18:22:44 -0400
Subject: rpms/kernel/devel/configs config-ia64-generic,1.27,1.28
Message-ID: <200604252222.k3PMMisu002019@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv1935/configs

Modified Files:
	config-ia64-generic 
Log Message:
git7



Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- config-ia64-generic	24 Apr 2006 22:42:49 -0000	1.27
+++ config-ia64-generic	25 Apr 2006 22:22:40 -0000	1.28
@@ -130,7 +130,8 @@
 CONFIG_HOTPLUG_PCI=y
 # CONFIG_HPET is not set
 # CONFIG_HOTPLUG_PCI_FAKE is not set
-# CONFIG_HOTPLUG_PCI_ACPI is not set
+CONFIG_HOTPLUG_PCI_ACPI=m
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_SHPC=m
 CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y



From fedora-cvs-commits at redhat.com  Tue Apr 25 22:22:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 18:22:44 -0400
Subject: rpms/kernel/devel patch-2.6.17-rc2-git7.bz2.sign, NONE,
	1.1 .cvsignore, 1.413, 1.414 kernel-2.6.spec, 1.2157,
	1.2158 linux-2.6-compile-fixes.patch, 1.70, 1.71 sources,
	1.355, 1.356 upstream, 1.326,
	1.327 patch-2.6.17-rc2-git5.bz2.sign, 1.1, NONE
Message-ID: <200604252222.k3PMMi41002011@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1935

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch 
	sources upstream 
Added Files:
	patch-2.6.17-rc2-git7.bz2.sign 
Removed Files:
	patch-2.6.17-rc2-git5.bz2.sign 
Log Message:
git7



--- NEW FILE patch-2.6.17-rc2-git7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBETnIsyGugalF9Dw4RAsIEAJ9HbKDXW9jSMxHQqE+YPQip1qY/tACgiXa8
tBPTPubLGqteHvEQ8tJtt8U=
=MYQn
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -r1.413 -r1.414
--- .cvsignore	24 Apr 2006 01:38:57 -0000	1.413
+++ .cvsignore	25 Apr 2006 22:22:38 -0000	1.414
@@ -4,4 +4,4 @@
 linux-2.6.16.tar.bz2
 xen-20060413.tar.bz2
 patch-2.6.17-rc2.bz2
-patch-2.6.17-rc2-git5.bz2
+patch-2.6.17-rc2-git7.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2157
retrieving revision 1.2158
diff -u -r1.2157 -r1.2158
--- kernel-2.6.spec	25 Apr 2006 21:22:27 -0000	1.2157
+++ kernel-2.6.spec	25 Apr 2006 22:22:39 -0000	1.2158
@@ -223,7 +223,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.17-rc2.bz2
-Patch2: patch-2.6.17-rc2-git5.bz2
+Patch2: patch-2.6.17-rc2-git7.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -1665,6 +1665,9 @@
 %endif
 
 %changelog
+* Tue Apr 25 2006 Dave Jones <davej at redhat.com>
+- 2.6.17rc2-git7
+
 * Tue Apr 25 2006 David Woodhouse <dwmw2 at redhat.com>
 - Drop the last remnants of the 'make bzImage on all arches' silliness
 

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.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- linux-2.6-compile-fixes.patch	24 Apr 2006 03:10:57 -0000	1.70
+++ linux-2.6-compile-fixes.patch	25 Apr 2006 22:22:40 -0000	1.71
@@ -1,24 +0,0 @@
-
-fs/cifs/connect.c: In function 'cifs_setup_session':
-fs/cifs/connect.c:3451: error: implicit declaration of function 'CIFS_SessSetup'
-
-Signed-off-by: Dave Jones <davej at redhat.com>
-
---- linux-2.6.16.noarch/fs/cifs/connect.c~	2006-04-23 23:08:32.000000000 -0400
-+++ linux-2.6.16.noarch/fs/cifs/connect.c	2006-04-23 23:09:45.000000000 -0400
-@@ -3447,10 +3447,13 @@ int cifs_setup_session(unsigned int xid,
- 			pSesInfo->server->secMode,
- 			pSesInfo->server->capabilities,
- 			pSesInfo->server->timeZone));
-+#ifdef CONFIG_CIFS_EXPERIMENTAL
- 		if(experimEnabled > 1)
- 			rc = CIFS_SessSetup(xid, pSesInfo, CIFS_NTLM /* type */,
--					    &ntlmv2_flag, nls_info);	
--		else if (extended_security
-+					    &ntlmv2_flag, nls_info);
-+		else
-+#endif
-+			if (extended_security
- 				&& (pSesInfo->capabilities & CAP_EXTENDED_SECURITY)
- 				&& (pSesInfo->server->secType == NTLMSSP)) {
- 			cFYI(1, ("New style sesssetup"));


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- sources	24 Apr 2006 01:38:57 -0000	1.355
+++ sources	25 Apr 2006 22:22:40 -0000	1.356
@@ -1,4 +1,4 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 e8e055329db3aad40a010ded0f8bdcf9  xen-20060413.tar.bz2
 87c4ea50e1b25ad808b65ad3fb19a9b5  patch-2.6.17-rc2.bz2
-6c72c7e1f04f04f5d5e1532107c1f81a  patch-2.6.17-rc2-git5.bz2
+5f475c41a119c619d0132d65bc98dff5  patch-2.6.17-rc2-git7.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -r1.326 -r1.327
--- upstream	24 Apr 2006 01:38:57 -0000	1.326
+++ upstream	25 Apr 2006 22:22:40 -0000	1.327
@@ -1,3 +1,3 @@
 linux-2.6.16.tar.bz2
 patch-2.6.17-rc2.bz2
-patch-2.6.17-rc2-git5.bz2
+patch-2.6.17-rc2-git7.bz2


--- patch-2.6.17-rc2-git5.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 25 22:30:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 18:30:19 -0400
Subject: rpms/cups/devel cups-svn.patch,NONE,1.1 cups.spec,1.171,1.172
Message-ID: <200604252230.k3PMUJbk004414@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4332

Modified Files:
	cups.spec 
Added Files:
	cups-svn.patch 
Log Message:
- Sync from svn5460 to svn5462.

cups-svn.patch:
 0 files changed

--- NEW FILE cups-svn.patch ---
only in patch2:
--- backend/snmp.c	(revision 5460)
+++ backend/snmp.c	(working copy)
@@ -1436 +1436 @@
-      printf("network %s \"%s\" \"%s\" \"%s\"\n",
+      printf("network %s \"%s\" \"%s %s\" \"%s\"\n",
@@ -1438,0 +1439 @@
+	     cache->make_and_model ? cache->make_and_model : "Unknown",
only in patch2:
--- CHANGES.txt	(revision 5460)
+++ CHANGES.txt	(working copy)
@@ -1 +1 @@
-CHANGES.txt - 2006-04-24
+CHANGES.txt - 2006-04-25
@@ -3,0 +4,9 @@
+CHANGES IN CUPS V1.2
+
+	- Printer names containing "+" were not quoted properly in
+	  the web interface (STR #1600)
+	- The SNMP backend now reports the make and model in the
+	  information string so that the auto-generated printer
+	  name is more useful than just an IP address.
+
+
only in patch2:
--- templates/ja/classes.tmpl	(revision 5460)
+++ templates/ja/classes.tmpl	(working copy)
@@ -22 +22 @@
-<A HREF="{admin_uri}?op=start-class&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=start-class&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -25 +25 @@
-<A HREF="{admin_uri}?op=stop-class&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=stop-class&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -29 +29 @@
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -32 +32 @@
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -35 +35 @@
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -38 +38 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1&amp;is_class=Y">
@@ -41 +41 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0&amp;is_class=Y">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=modify-class&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-class&amp;printer_name={%printer_name}">
@@ -46 +46 @@
-<A HREF="{admin_uri}?op=delete-class&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-class&amp;printer_name={%printer_name}">
@@ -48 +48 @@
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -50 +50 @@
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
only in patch2:
--- templates/ja/printers.tmpl	(revision 5460)
+++ templates/ja/printers.tmpl	(working copy)
@@ -22 +22 @@
-<A HREF="{admin_uri}?op=start-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=start-printer&amp;printer_name={%printer_name}">
@@ -25 +25 @@
-<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={%printer_name}">
@@ -29 +29 @@
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}">
@@ -32 +32 @@
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}">
@@ -35 +35 @@
-<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={printer_name}">
+<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={%printer_name}">
@@ -37 +37 @@
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}">
@@ -40 +40 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1">
@@ -43 +43 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0">
@@ -46 +46 @@
-<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={%printer_name}">
@@ -48 +48 @@
-<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={%printer_name}">
@@ -50 +50 @@
-<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={%printer_name}">
@@ -52 +52 @@
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}">
@@ -54 +54 @@
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
only in patch2:
--- templates/classes.tmpl	(revision 5460)
+++ templates/classes.tmpl	(working copy)
@@ -20 +20 @@
-<A HREF="{admin_uri}?op=start-class&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=start-class&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -23 +23 @@
-<A HREF="{admin_uri}?op=stop-class&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=stop-class&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -27 +27 @@
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -30 +30 @@
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -33 +33 @@
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -36 +36 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1&amp;is_class=Y">
@@ -39 +39 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0&amp;is_class=Y">
@@ -42 +42 @@
-<A HREF="{admin_uri}?op=modify-class&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-class&amp;printer_name={%printer_name}">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=delete-class&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-class&amp;printer_name={%printer_name}">
@@ -46 +46 @@
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -48 +48 @@
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
only in patch2:
--- templates/printers.tmpl	(revision 5460)
+++ templates/printers.tmpl	(working copy)
@@ -26 +26 @@
-<A HREF="{admin_uri}?op=start-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=start-printer&amp;printer_name={%printer_name}">
@@ -29 +29 @@
-<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={%printer_name}">
@@ -33 +33 @@
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}">
@@ -36 +36 @@
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}">
@@ -39 +39 @@
-<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={printer_name}">
+<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={%printer_name}">
@@ -41 +41 @@
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1">
@@ -47 +47 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0">
@@ -50 +50 @@
-<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={%printer_name}">
@@ -52 +52 @@
-<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={%printer_name}">
@@ -54 +54 @@
-<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={%printer_name}">
@@ -56 +56 @@
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}">
@@ -58 +58 @@
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
only in patch2:
--- templates/sv/classes.tmpl	(revision 5460)
+++ templates/sv/classes.tmpl	(working copy)
@@ -20 +20 @@
-<A HREF="{admin_uri}?op=start-class&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=start-class&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -23 +23 @@
-<A HREF="{admin_uri}?op=stop-class&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=stop-class&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -27 +27 @@
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -30 +30 @@
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -33 +33 @@
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -36 +36 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1&amp;is_class=Y">
@@ -39 +39 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0&amp;is_class=Y">
@@ -42 +42 @@
-<A HREF="{admin_uri}?op=modify-class&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-class&amp;printer_name={%printer_name}">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=delete-class&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-class&amp;printer_name={%printer_name}">
@@ -46 +46 @@
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -48 +48 @@
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
only in patch2:
--- templates/sv/printers.tmpl	(revision 5460)
+++ templates/sv/printers.tmpl	(working copy)
@@ -26 +26 @@
-<A HREF="{admin_uri}?op=start-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=start-printer&amp;printer_name={%printer_name}">
@@ -29 +29 @@
-<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={%printer_name}">
@@ -33 +33 @@
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}">
@@ -36 +36 @@
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}">
@@ -39 +39 @@
-<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={printer_name}">
+<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={%printer_name}">
@@ -41 +41 @@
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1">
@@ -47 +47 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0">
@@ -50 +50 @@
-<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={%printer_name}">
@@ -52 +52 @@
-<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={%printer_name}">
@@ -54 +54 @@
-<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={%printer_name}">
@@ -56 +56 @@
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}">
@@ -58 +58 @@
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
only in patch2:
--- templates/pl/classes.tmpl	(revision 5460)
+++ templates/pl/classes.tmpl	(working copy)
@@ -20 +20 @@
-<A HREF="{admin_uri}?op=start-class&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=start-class&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -23 +23 @@
-<A HREF="{admin_uri}?op=stop-class&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=stop-class&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -27 +27 @@
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -30 +30 @@
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -33 +33 @@
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -36 +36 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1&amp;is_class=Y">
@@ -39 +39 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0&amp;is_class=Y">
@@ -42 +42 @@
-<A HREF="{admin_uri}?op=modify-class&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-class&amp;printer_name={%printer_name}">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=delete-class&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-class&amp;printer_name={%printer_name}">
@@ -46 +46 @@
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -48 +48 @@
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
only in patch2:
--- templates/pl/printers.tmpl	(revision 5460)
+++ templates/pl/printers.tmpl	(working copy)
@@ -26 +26 @@
-<A HREF="{admin_uri}?op=start-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=start-printer&amp;printer_name={%printer_name}">
@@ -29 +29 @@
-<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={%printer_name}">
@@ -33 +33 @@
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}">
@@ -36 +36 @@
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}">
@@ -39 +39 @@
-<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={printer_name}">
+<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={%printer_name}">
@@ -41 +41 @@
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1">
@@ -47 +47 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0">
@@ -50 +50 @@
-<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={%printer_name}">
@@ -52 +52 @@
-<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={%printer_name}">
@@ -54 +54 @@
-<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={%printer_name}">
@@ -56 +56 @@
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}">
@@ -58 +58 @@
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
only in patch2:
--- templates/es/classes.tmpl	(revision 5460)
+++ templates/es/classes.tmpl	(working copy)
@@ -20 +20 @@
-<A HREF="{admin_uri}?op=start-class&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=start-class&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -23 +23 @@
-<A HREF="{admin_uri}?op=stop-class&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=stop-class&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -27 +27 @@
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -30 +30 @@
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -33 +33 @@
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -36 +36 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1&amp;is_class=Y">
@@ -39 +39 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0&amp;is_class=Y">
@@ -42 +42 @@
-<A HREF="{admin_uri}?op=modify-class&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-class&amp;printer_name={%printer_name}">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=delete-class&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-class&amp;printer_name={%printer_name}">
@@ -46 +46 @@
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -48 +48 @@
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
only in patch2:
--- templates/es/printers.tmpl	(revision 5460)
+++ templates/es/printers.tmpl	(working copy)
@@ -26 +26 @@
-<A HREF="{admin_uri}?op=start-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=start-printer&amp;printer_name={%printer_name}">
@@ -29 +29 @@
-<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={%printer_name}">
@@ -33 +33 @@
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}">
@@ -36 +36 @@
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}">
@@ -39 +39 @@
-<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={printer_name}">
+<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={%printer_name}">
@@ -41 +41 @@
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1">
@@ -47 +47 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0">
@@ -50 +50 @@
-<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={%printer_name}">
@@ -52 +52 @@
-<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={%printer_name}">
@@ -54 +54 @@
-<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={%printer_name}">
@@ -56 +56 @@
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}">
@@ -58 +58 @@
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
only in patch2:
--- cgi-bin/template.c	(revision 5460)
+++ cgi-bin/template.c	(working copy)
@@ -46,0 +47 @@
+static void	cgi_puturi(const char *s, FILE *out);
@@ -237,0 +239 @@
+  int		uriencode;		/* Encode as URI */
@@ -255,0 +258,2 @@
+      uriencode = 0;
+
@@ -258,0 +263,2 @@
+	else if (s == name && ch == '%')
+	  uriencode = 1;
@@ -402 +408,6 @@
-	  cgi_puts(outptr, out);
+	{
+	  if (uriencode)
+	    cgi_puturi(outptr, out);
+	  else
+	    cgi_puts(outptr, out);
+        }
@@ -640,0 +652,20 @@
+ * 'cgi_puturi()' - Put a URI string to the output file, quoting as needed...
+ */
+
+static void
+cgi_puturi(const char *s,		/* I - String to output */
+           FILE       *out)		/* I - Output file */
+{
+  while (*s)
+  {
+    if (strchr("%&+ <>#=", *s) || *s & 128)
+      fprintf(out, "%%%02X", *s & 255);
+    else
+      putc(*s, out);
+
+    s ++;
+  }
+}
+
+
+/*


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- cups.spec	25 Apr 2006 14:09:40 -0000	1.171
+++ cups.spec	25 Apr 2006 22:30:02 -0000	1.172
@@ -22,6 +22,7 @@
 Source11: cups.conf
 Source12: cups.cron
 Source13: pdftops.conf
+Patch0: cups-svn.patch
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
@@ -110,6 +111,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{beta}
+%patch0 -p0 -b .svn
 %patch1 -p1 -b .noinit
 %patch2 -p1 -b .no-gzip-man
 %patch3 -p1 -b .system-auth
@@ -389,6 +391,7 @@
 %changelog
 * Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com>
 - Own /var/run/cups (bug #189561).
+- Sync from svn5460 to svn5462.
 
 * Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.5.rc3.2
 - Patch pdftops to understand 'includeifexists', and use that in the



From fedora-cvs-commits at redhat.com  Tue Apr 25 22:32:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 18:32:42 -0400
Subject: rpms/cups/FC-5 cups-svn.patch,NONE,1.1 cups.spec,1.165,1.166
Message-ID: <200604252232.k3PMWgRp004671@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv4593

Modified Files:
	cups.spec 
Added Files:
	cups-svn.patch 
Log Message:
- Sync from svn5460 to svn5462.

cups-svn.patch:
 0 files changed

--- NEW FILE cups-svn.patch ---
only in patch2:
--- backend/snmp.c	(revision 5460)
+++ backend/snmp.c	(working copy)
@@ -1436 +1436 @@
-      printf("network %s \"%s\" \"%s\" \"%s\"\n",
+      printf("network %s \"%s\" \"%s %s\" \"%s\"\n",
@@ -1438,0 +1439 @@
+	     cache->make_and_model ? cache->make_and_model : "Unknown",
only in patch2:
--- CHANGES.txt	(revision 5460)
+++ CHANGES.txt	(working copy)
@@ -1 +1 @@
-CHANGES.txt - 2006-04-24
+CHANGES.txt - 2006-04-25
@@ -3,0 +4,9 @@
+CHANGES IN CUPS V1.2
+
+	- Printer names containing "+" were not quoted properly in
+	  the web interface (STR #1600)
+	- The SNMP backend now reports the make and model in the
+	  information string so that the auto-generated printer
+	  name is more useful than just an IP address.
+
+
only in patch2:
--- templates/ja/classes.tmpl	(revision 5460)
+++ templates/ja/classes.tmpl	(working copy)
@@ -22 +22 @@
-<A HREF="{admin_uri}?op=start-class&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=start-class&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -25 +25 @@
-<A HREF="{admin_uri}?op=stop-class&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=stop-class&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -29 +29 @@
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -32 +32 @@
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -35 +35 @@
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -38 +38 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1&amp;is_class=Y">
@@ -41 +41 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0&amp;is_class=Y">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=modify-class&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-class&amp;printer_name={%printer_name}">
@@ -46 +46 @@
-<A HREF="{admin_uri}?op=delete-class&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-class&amp;printer_name={%printer_name}">
@@ -48 +48 @@
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -50 +50 @@
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
only in patch2:
--- templates/ja/printers.tmpl	(revision 5460)
+++ templates/ja/printers.tmpl	(working copy)
@@ -22 +22 @@
-<A HREF="{admin_uri}?op=start-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=start-printer&amp;printer_name={%printer_name}">
@@ -25 +25 @@
-<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={%printer_name}">
@@ -29 +29 @@
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}">
@@ -32 +32 @@
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}">
@@ -35 +35 @@
-<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={printer_name}">
+<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={%printer_name}">
@@ -37 +37 @@
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}">
@@ -40 +40 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1">
@@ -43 +43 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0">
@@ -46 +46 @@
-<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={%printer_name}">
@@ -48 +48 @@
-<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={%printer_name}">
@@ -50 +50 @@
-<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={%printer_name}">
@@ -52 +52 @@
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}">
@@ -54 +54 @@
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
only in patch2:
--- templates/classes.tmpl	(revision 5460)
+++ templates/classes.tmpl	(working copy)
@@ -20 +20 @@
-<A HREF="{admin_uri}?op=start-class&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=start-class&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -23 +23 @@
-<A HREF="{admin_uri}?op=stop-class&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=stop-class&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -27 +27 @@
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -30 +30 @@
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -33 +33 @@
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -36 +36 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1&amp;is_class=Y">
@@ -39 +39 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0&amp;is_class=Y">
@@ -42 +42 @@
-<A HREF="{admin_uri}?op=modify-class&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-class&amp;printer_name={%printer_name}">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=delete-class&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-class&amp;printer_name={%printer_name}">
@@ -46 +46 @@
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -48 +48 @@
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
only in patch2:
--- templates/printers.tmpl	(revision 5460)
+++ templates/printers.tmpl	(working copy)
@@ -26 +26 @@
-<A HREF="{admin_uri}?op=start-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=start-printer&amp;printer_name={%printer_name}">
@@ -29 +29 @@
-<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={%printer_name}">
@@ -33 +33 @@
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}">
@@ -36 +36 @@
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}">
@@ -39 +39 @@
-<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={printer_name}">
+<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={%printer_name}">
@@ -41 +41 @@
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1">
@@ -47 +47 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0">
@@ -50 +50 @@
-<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={%printer_name}">
@@ -52 +52 @@
-<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={%printer_name}">
@@ -54 +54 @@
-<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={%printer_name}">
@@ -56 +56 @@
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}">
@@ -58 +58 @@
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
only in patch2:
--- templates/sv/classes.tmpl	(revision 5460)
+++ templates/sv/classes.tmpl	(working copy)
@@ -20 +20 @@
-<A HREF="{admin_uri}?op=start-class&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=start-class&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -23 +23 @@
-<A HREF="{admin_uri}?op=stop-class&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=stop-class&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -27 +27 @@
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -30 +30 @@
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -33 +33 @@
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -36 +36 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1&amp;is_class=Y">
@@ -39 +39 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0&amp;is_class=Y">
@@ -42 +42 @@
-<A HREF="{admin_uri}?op=modify-class&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-class&amp;printer_name={%printer_name}">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=delete-class&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-class&amp;printer_name={%printer_name}">
@@ -46 +46 @@
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -48 +48 @@
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
only in patch2:
--- templates/sv/printers.tmpl	(revision 5460)
+++ templates/sv/printers.tmpl	(working copy)
@@ -26 +26 @@
-<A HREF="{admin_uri}?op=start-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=start-printer&amp;printer_name={%printer_name}">
@@ -29 +29 @@
-<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={%printer_name}">
@@ -33 +33 @@
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}">
@@ -36 +36 @@
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}">
@@ -39 +39 @@
-<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={printer_name}">
+<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={%printer_name}">
@@ -41 +41 @@
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1">
@@ -47 +47 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0">
@@ -50 +50 @@
-<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={%printer_name}">
@@ -52 +52 @@
-<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={%printer_name}">
@@ -54 +54 @@
-<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={%printer_name}">
@@ -56 +56 @@
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}">
@@ -58 +58 @@
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
only in patch2:
--- templates/pl/classes.tmpl	(revision 5460)
+++ templates/pl/classes.tmpl	(working copy)
@@ -20 +20 @@
-<A HREF="{admin_uri}?op=start-class&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=start-class&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -23 +23 @@
-<A HREF="{admin_uri}?op=stop-class&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=stop-class&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -27 +27 @@
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -30 +30 @@
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -33 +33 @@
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -36 +36 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1&amp;is_class=Y">
@@ -39 +39 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0&amp;is_class=Y">
@@ -42 +42 @@
-<A HREF="{admin_uri}?op=modify-class&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-class&amp;printer_name={%printer_name}">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=delete-class&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-class&amp;printer_name={%printer_name}">
@@ -46 +46 @@
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -48 +48 @@
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
only in patch2:
--- templates/pl/printers.tmpl	(revision 5460)
+++ templates/pl/printers.tmpl	(working copy)
@@ -26 +26 @@
-<A HREF="{admin_uri}?op=start-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=start-printer&amp;printer_name={%printer_name}">
@@ -29 +29 @@
-<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={%printer_name}">
@@ -33 +33 @@
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}">
@@ -36 +36 @@
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}">
@@ -39 +39 @@
-<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={printer_name}">
+<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={%printer_name}">
@@ -41 +41 @@
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1">
@@ -47 +47 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0">
@@ -50 +50 @@
-<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={%printer_name}">
@@ -52 +52 @@
-<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={%printer_name}">
@@ -54 +54 @@
-<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={%printer_name}">
@@ -56 +56 @@
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}">
@@ -58 +58 @@
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
only in patch2:
--- templates/es/classes.tmpl	(revision 5460)
+++ templates/es/classes.tmpl	(working copy)
@@ -20 +20 @@
-<A HREF="{admin_uri}?op=start-class&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=start-class&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -23 +23 @@
-<A HREF="{admin_uri}?op=stop-class&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=stop-class&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -27 +27 @@
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -30 +30 @@
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -33 +33 @@
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -36 +36 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1&amp;is_class=Y">
@@ -39 +39 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0&amp;is_class=Y">
@@ -42 +42 @@
-<A HREF="{admin_uri}?op=modify-class&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-class&amp;printer_name={%printer_name}">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=delete-class&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-class&amp;printer_name={%printer_name}">
@@ -46 +46 @@
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -48 +48 @@
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}&amp;is_class=Y">
+<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
only in patch2:
--- templates/es/printers.tmpl	(revision 5460)
+++ templates/es/printers.tmpl	(working copy)
@@ -26 +26 @@
-<A HREF="{admin_uri}?op=start-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=start-printer&amp;printer_name={%printer_name}">
@@ -29 +29 @@
-<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={%printer_name}">
@@ -33 +33 @@
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}">
@@ -36 +36 @@
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}">
@@ -39 +39 @@
-<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={printer_name}">
+<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={%printer_name}">
@@ -41 +41 @@
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}">
@@ -44 +44 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1">
@@ -47 +47 @@
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0">
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0">
@@ -50 +50 @@
-<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={%printer_name}">
@@ -52 +52 @@
-<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={%printer_name}">
@@ -54 +54 @@
-<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={%printer_name}">
@@ -56 +56 @@
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}">
@@ -58 +58 @@
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}">
+<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
only in patch2:
--- cgi-bin/template.c	(revision 5460)
+++ cgi-bin/template.c	(working copy)
@@ -46,0 +47 @@
+static void	cgi_puturi(const char *s, FILE *out);
@@ -237,0 +239 @@
+  int		uriencode;		/* Encode as URI */
@@ -255,0 +258,2 @@
+      uriencode = 0;
+
@@ -258,0 +263,2 @@
+	else if (s == name && ch == '%')
+	  uriencode = 1;
@@ -402 +408,6 @@
-	  cgi_puts(outptr, out);
+	{
+	  if (uriencode)
+	    cgi_puturi(outptr, out);
+	  else
+	    cgi_puts(outptr, out);
+        }
@@ -640,0 +652,20 @@
+ * 'cgi_puturi()' - Put a URI string to the output file, quoting as needed...
+ */
+
+static void
+cgi_puturi(const char *s,		/* I - String to output */
+           FILE       *out)		/* I - Output file */
+{
+  while (*s)
+  {
+    if (strchr("%&+ <>#=", *s) || *s & 128)
+      fprintf(out, "%%%02X", *s & 255);
+    else
+      putc(*s, out);
+
+    s ++;
+  }
+}
+
+
+/*


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- cups.spec	25 Apr 2006 14:11:48 -0000	1.165
+++ cups.spec	25 Apr 2006 22:32:28 -0000	1.166
@@ -22,6 +22,7 @@
 Source11: cups.conf
 Source12: cups.cron
 Source13: pdftops.conf
+Patch0: cups-svn.patch
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
@@ -115,6 +116,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{beta}
+%patch0 -p0 -b .svn
 %patch1 -p1 -b .noinit
 %patch2 -p1 -b .no-gzip-man
 %patch3 -p1 -b .system-auth
@@ -396,6 +398,7 @@
 - Own /var/run/cups (bug #189561).
 - Patch pdftops to understand 'includeifexists', and use that in the
   pdftops.conf file (bug #189809).
+- Sync from svn5460 to svn5462.
 
 * Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.4.1.rc3.1
 - 1.2rc3.



From fedora-cvs-commits at redhat.com  Tue Apr 25 22:43:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 18:43:21 -0400
Subject: rpms/xorg-x11-utils/devel xdpyinfo-1.0.1-spurious-xprint.patch, NONE,
	1.1 xorg-x11-utils.spec, 1.10, 1.11
Message-ID: <200604252243.k3PMhL9u006676@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6602

Modified Files:
	xorg-x11-utils.spec 
Added Files:
	xdpyinfo-1.0.1-spurious-xprint.patch 
Log Message:
- Remove a spurious Xprint dependency from xdpyinfo.


xdpyinfo-1.0.1-spurious-xprint.patch:
 configure.ac |    6 ------
 1 files changed, 6 deletions(-)

--- NEW FILE xdpyinfo-1.0.1-spurious-xprint.patch ---
--- xdpyinfo-1.0.1/configure.ac.xprint	2006-04-25 18:08:03.000000000 -0400
+++ xdpyinfo-1.0.1/configure.ac	2006-04-25 18:08:18.000000000 -0400
@@ -97,12 +97,6 @@
 	AC_CHECK_HEADERS([X11/extensions/dmxext.h],,,[#include <X11/Xlib.h>])
 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
 
-PKG_CHECK_MODULES(DPY_XPRINT, xp, 
-	[SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $DPY_XPRINT_CFLAGS $DPY_X11_CFLAGS"
-	AC_CHECK_HEADERS([X11/extensions/Print.h],,,[#include <X11/Xlib.h>])
-	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-
 PKG_CHECK_MODULES(DPY_XTST, xtst, 
 	[SAVE_CPPFLAGS="$CPPFLAGS"
 	CPPFLAGS="$CPPFLAGS $DPY_XTST_CFLAGS $DPY_X11_CFLAGS"


Index: xorg-x11-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-utils/devel/xorg-x11-utils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-utils.spec	1 Mar 2006 06:43:42 -0000	1.10
+++ xorg-x11-utils.spec	25 Apr 2006 22:43:18 -0000	1.11
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X client utilities
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1.2
+Release: 2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -20,6 +20,8 @@
 Source9:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xvinfo-1.0.1.tar.bz2
 Source10: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xwininfo-1.0.1.tar.bz2
 
+Patch0: xdpyinfo-1.0.1-spurious-xprint.patch
+
 %define applist xdpyinfo xdriinfo xev xfd xfontsel xlsatoms xlsclients xlsfonts xprop xvinfo xwininfo
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,11 +44,23 @@
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10
 
+%patch0 -p0 -b .xprint
+
 %build
 # Build all apps
 {
    for app in * ; do
       pushd $app
+      case $app in
+         xdpyinfo-*)
+	    # FIXME: run autotools junk to kick in our patch
+	    aclocal --force
+	    automake -f
+	    autoconf
+	    ;;
+	 *)
+	    ;;
+      esac
       %configure
       make
       popd
@@ -99,6 +113,9 @@
 %{_mandir}/man1/xwininfo.1x*
 
 %changelog
+* Tue Apr 25 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-2
+- Remove a spurious Xprint dependency from xdpyinfo.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Apr 26 00:07:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 20:07:45 -0400
Subject: rpms/kernel/FC-5/configs config-generic,1.163,1.163.2.1
Message-ID: <200604260007.k3Q07jw1006502@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-5/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv6393/configs

Modified Files:
      Tag: private-linville-netdev-fc5-2-branch
	config-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-generic,v
retrieving revision 1.163
retrieving revision 1.163.2.1
diff -u -r1.163 -r1.163.2.1
--- config-generic	4 Apr 2006 18:37:28 -0000	1.163
+++ config-generic	26 Apr 2006 00:07:40 -0000	1.163.2.1
@@ -621,6 +621,8 @@
 
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
@@ -642,13 +644,16 @@
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_STATE=m
@@ -671,7 +676,7 @@
 CONFIG_IP_NF_MATCH_RECENT=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_DSCP=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
+CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_MATCH_OWNER=m
 CONFIG_IP_NF_MATCH_ADDRTYPE=m
@@ -713,6 +718,7 @@
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_NETBIOS_NS=m
 CONFIG_IP_NF_PPTP=m
+CONFIG_IP_NF_H323=m
 
 #
 # IPv6: Netfilter Configuration
@@ -726,7 +732,7 @@
 CONFIG_IP6_NF_MATCH_MULTIPORT=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AHESP=m
+CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_MATCH_POLICY=m
 CONFIG_IP6_NF_FILTER=m
@@ -789,6 +795,7 @@
 CONFIG_WAN_ROUTER=m
 CONFIG_IP_DCCP=m
 CONFIG_IP_DCCP_CCID3=m
+CONFIG_IP_DCCP_CCID2=m
 # CONFIG_IP_DCCP_DEBUG is not set
 CONFIG_IP_DCCP_UNLOAD_HACK=y
 
@@ -1023,6 +1030,7 @@
 # Wireless LAN (non-hamradio)
 #
 CONFIG_NET_RADIO=y
+CONFIG_NET_WIRELESS_RTNETLINK=y
 
 #
 # Obsolete Wireless cards support (pre-802.11)
@@ -1051,6 +1059,7 @@
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2200_DEBUG is not set
+# CONFIG_IPW_QOS is not set
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1060,8 +1069,12 @@
 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
 
 #
 # Wireless 802.11b Pcmcia/Cardbus cards support
@@ -1138,6 +1151,7 @@
 CONFIG_TEKRAM_DONGLE=m
 CONFIG_IRPORT_SIR=m
 # CONFIG_DONGLE_OLD is not set
+CONFIG_TOIM3232_DONGLE=m
 CONFIG_LITELINK_DONGLE=m
 CONFIG_MA600_DONGLE=m
 CONFIG_GIRBIL_DONGLE=m
@@ -1367,7 +1381,7 @@
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_UINPUT=m 
 CONFIG_INPUT_WISTRON_BTNS=m
 
 #



From fedora-cvs-commits at redhat.com  Wed Apr 26 00:34:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 20:34:08 -0400
Subject: rpms/imake/devel xorg-cf-files-1.0.1-xprint.patch, NONE,
	1.1 imake.spec, 1.20, 1.21
Message-ID: <200604260034.k3Q0Y8gj027505@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/imake/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27430

Modified Files:
	imake.spec 
Added Files:
	xorg-cf-files-1.0.1-xprint.patch 
Log Message:
- Fix ExtraXawReqs to reflect reality (libXp is unneeded)


xorg-cf-files-1.0.1-xprint.patch:
 X11.tmpl |   18 +++---------------
 1 files changed, 3 insertions(+), 15 deletions(-)

--- NEW FILE xorg-cf-files-1.0.1-xprint.patch ---
--- xorg-cf-files-1.0.1/X11.tmpl.xprint	2005-10-01 12:45:48.000000000 -0400
+++ xorg-cf-files-1.0.1/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: imake.spec
===================================================================
RCS file: /cvs/dist/rpms/imake/devel/imake.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- imake.spec	7 Mar 2006 00:41:51 -0000	1.20
+++ imake.spec	26 Apr 2006 00:33:48 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: imake source code configuration and build system
 Name: imake
 Version: 1.0.1
-Release: 3
+Release: 4
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -16,6 +16,7 @@
 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
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
@@ -38,6 +39,7 @@
 #%patch0 -p0 -b .imake
 #%patch1 -p0 -b .ProjectRoot
 %patch2 -p0 -b .redhat
+%patch3 -p0 -b .xprint
 
 %build
 # Build everything
@@ -115,6 +117,9 @@
 %{_mandir}/man1/xmkmf.1x*
 
 %changelog
+* Tue Apr 25 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-4
+- Fix ExtraXawReqs to reflect reality (libXp is unneeded)
+
 * Mon Mar 06 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
 - Updated xorg-cf-files-1.0.1-redhat.patch with fix for (#178177)
 



From fedora-cvs-commits at redhat.com  Wed Apr 26 00:42:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 20:42:06 -0400
Subject: rpms/xfig/devel xfig.spec,1.35,1.36
Message-ID: <200604260042.k3Q0g6Sb029217@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29093

Modified Files:
	xfig.spec 
Log Message:
- Rebuild for updated imake build rules



Index: xfig.spec
===================================================================
RCS file: /cvs/dist/rpms/xfig/devel/xfig.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- xfig.spec	4 Apr 2006 17:33:58 -0000	1.35
+++ xfig.spec	26 Apr 2006 00:42:04 -0000	1.36
@@ -3,7 +3,7 @@
 Summary: An X Window System tool for drawing basic vector graphics.
 Name: xfig
 Version: 3.2.4
-Release: 18
+Release: 19
 License: Freeware
 Group: Applications/Multimedia
 URL: http://www.xfig.org/
@@ -107,6 +107,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Apr 25 2006 Adam Jackson <ajackson at redhat.com> 3.2.4-19
+- Rebuild for updated imake build rules
+
 * Tue Apr 04 2006 Than Ngo <than at redhat.com> 3.2.4-18
 - no parameter negotiation for xfig, fix #187902
 



From fedora-cvs-commits at redhat.com  Wed Apr 26 00:46:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 20:46:10 -0400
Subject: rpms/Xaw3d/devel Xaw3d.spec,1.27,1.28
Message-ID: <200604260046.k3Q0kAfr030297@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/Xaw3d/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30238

Modified Files:
	Xaw3d.spec 
Log Message:
- Rebuild for new imake build rules



Index: Xaw3d.spec
===================================================================
RCS file: /cvs/dist/rpms/Xaw3d/devel/Xaw3d.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Xaw3d.spec	28 Feb 2006 12:07:07 -0000	1.27
+++ Xaw3d.spec	26 Apr 2006 00:46:07 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: A version of the MIT Athena widget set for X.
 Name: Xaw3d
 Version: 1.5E
-Release: 7
+Release: 8
 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
@@ -98,6 +98,9 @@
 %{_includedir}/X11/Xaw3d
 
 %changelog
+* Tue Apr 25 2006 Adam Jackson <ajackson at redhat.com> 1.5E-8
+- Rebuild for new imake build rules
+
 * Tue Feb 28 2006 Than Ngo <than at redhat.com> 1.5E-7
 - update Url  #183314
 



From fedora-cvs-commits at redhat.com  Wed Apr 26 01:12:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Apr 2006 21:12:15 -0400
Subject: rpms/isdn4k-utils/devel isdn4k-utils.spec,1.57,1.58
Message-ID: <200604260112.k3Q1CFoP001823@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/isdn4k-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1746

Modified Files:
	isdn4k-utils.spec 
Log Message:
- Rebuild for updated imake build rules



Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/isdn4k-utils/devel/isdn4k-utils.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- isdn4k-utils.spec	25 Apr 2006 19:46:10 -0000	1.57
+++ isdn4k-utils.spec	26 Apr 2006 01:12:12 -0000	1.58
@@ -15,7 +15,7 @@
 Summary: Utilities for configuring an ISDN subsystem.
 Name: isdn4k-utils
 Version: 3.2
-Release: 44
+Release: 45
 License: GPL
 Group: Applications/System
 
@@ -492,6 +492,9 @@
 %doc xmonisdn/README
 
 %changelog
+* Tue Apr 25 2006 Adam Jackson <ajackson at redhat.com> 3.2-45
+- Rebuild for updated imake build rules
+
 * Tue Apr 25 2006 Than Ngo <than at redhat.com> 3.2-44
 - add capi service
 



From fedora-cvs-commits at redhat.com  Wed Apr 26 04:33:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 00:33:44 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2158,1.2159
Message-ID: <200604260433.k3Q4Xijw000789@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv739

Modified Files:
	kernel-2.6.spec 
Log Message:
Mmmm 9 5's.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2158
retrieving revision 1.2159
diff -u -r1.2158 -r1.2159
--- kernel-2.6.spec	25 Apr 2006 22:22:39 -0000	1.2158
+++ kernel-2.6.spec	26 Apr 2006 04:33:40 -0000	1.2159
@@ -167,7 +167,8 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries
+#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0



From fedora-cvs-commits at redhat.com  Wed Apr 26 04:41:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 00:41:13 -0400
Subject: rpms/gcalctool/devel .cvsignore, 1.3, 1.4 gcalctool.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200604260441.k3Q4fDxU002126@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gcalctool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2055

Modified Files:
	.cvsignore gcalctool.spec sources 
Log Message:
5.8.9



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Apr 2006 04:42:32 -0000	1.3
+++ .cvsignore	26 Apr 2006 04:41:10 -0000	1.4
@@ -1,2 +1 @@
-gcalctool-5.7.32.tar.bz2
-gcalctool-5.8.8.tar.bz2
+gcalctool-5.8.9.tar.bz2


Index: gcalctool.spec
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gcalctool.spec	25 Apr 2006 05:03:45 -0000	1.6
+++ gcalctool.spec	26 Apr 2006 04:41:10 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           gcalctool
-Version:        5.8.8
+Version:        5.8.9
 Release:        2
 Summary:        A desktop calculator
 
@@ -86,8 +86,8 @@
 
 
 %changelog
-* Tue Apr 25 2006 Matthias Clasen <mclasen at redhat.com> 5.8.8-2
-- Update to 5.8.8
+* Wed Apr 26 2006 Matthias Clasen <mclasen at redhat.com> 5.8.9-2
+- Update to 5.8.9
 
 * Thu Apr 20 2006 Jesse Keating <jkeating at redhat.com> - 5.7.32-5
 - Add postun to clean up gconf schema.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Apr 2006 04:42:32 -0000	1.3
+++ sources	26 Apr 2006 04:41:10 -0000	1.4
@@ -1 +1 @@
-9aa3ae6d8a32de26980fdcd9463bd463  gcalctool-5.8.8.tar.bz2
+062b53fe53d9fa1bca68afd28e812411  gcalctool-5.8.9.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 26 04:42:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 00:42:27 -0400
Subject: rpms/gcalctool/devel gcalctool.spec,1.7,1.8
Message-ID: <200604260442.k3Q4gRRP002488@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gcalctool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2458

Modified Files:
	gcalctool.spec 
Log Message:
bump rev



Index: gcalctool.spec
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gcalctool.spec	26 Apr 2006 04:41:10 -0000	1.7
+++ gcalctool.spec	26 Apr 2006 04:42:24 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gcalctool
 Version:        5.8.9
-Release:        2
+Release:        1
 Summary:        A desktop calculator
 
 Group:          Applications/System
@@ -86,7 +86,7 @@
 
 
 %changelog
-* Wed Apr 26 2006 Matthias Clasen <mclasen at redhat.com> 5.8.9-2
+* Wed Apr 26 2006 Matthias Clasen <mclasen at redhat.com> 5.8.9-1
 - Update to 5.8.9
 
 * Thu Apr 20 2006 Jesse Keating <jkeating at redhat.com> - 5.7.32-5



From fedora-cvs-commits at redhat.com  Wed Apr 26 04:46:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 00:46:49 -0400
Subject: rpms/gcalctool/devel gcalctool.spec,1.8,1.9
Message-ID: <200604260446.k3Q4knWU006775@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gcalctool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5881

Modified Files:
	gcalctool.spec 
Log Message:
disable scrollkeeper



Index: gcalctool.spec
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gcalctool.spec	26 Apr 2006 04:42:24 -0000	1.8
+++ gcalctool.spec	26 Apr 2006 04:46:43 -0000	1.9
@@ -35,7 +35,7 @@
 
 
 %build
-%configure 
+%configure --disable-scrollkeeper
 make %{?_smp_mflags}
 
 



From fedora-cvs-commits at redhat.com  Wed Apr 26 04:52:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 00:52:11 -0400
Subject: rpms/gcalctool/devel gcalctool.spec,1.9,1.10
Message-ID: <200604260452.k3Q4qB8J017791@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gcalctool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17690

Modified Files:
	gcalctool.spec 
Log Message:
tame scrollkeeper



Index: gcalctool.spec
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gcalctool.spec	26 Apr 2006 04:46:43 -0000	1.9
+++ gcalctool.spec	26 Apr 2006 04:52:08 -0000	1.10
@@ -50,11 +50,14 @@
   --add-only-show-in GNOME                                  \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
+# delete this crap
+rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
+
 %find_lang gcalctool
 
 
 %post
-scrollkeeper-update
+scrollkeeper-update -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gcalctool.schemas > /dev/null
 
@@ -66,7 +69,7 @@
 fi
 
 %postun
-scrollkeeper-update
+scrollkeeper-update -q
 
 
 %clean



From fedora-cvs-commits at redhat.com  Wed Apr 26 04:59:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 00:59:17 -0400
Subject: rpms/gnome-power-manager/FC-5 .cvsignore, 1.17,
	1.18 gnome-power-manager.spec, 1.37, 1.38 sources, 1.17, 1.18
Message-ID: <200604260459.k3Q4xHMT020252@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-power-manager/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20208

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
2.14.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/FC-5/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	25 Apr 2006 19:02:33 -0000	1.17
+++ .cvsignore	26 Apr 2006 04:59:14 -0000	1.18
@@ -1,2 +1 @@
-gnome-power-manager-2.14.1.tar.bz2
-gnome-power-manager-2.14.2.tar.bz2
+gnome-power-manager-2.14.3.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/FC-5/gnome-power-manager.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gnome-power-manager.spec	25 Apr 2006 19:02:33 -0000	1.37
+++ gnome-power-manager.spec	26 Apr 2006 04:59:14 -0000	1.38
@@ -4,7 +4,7 @@
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.14.2
+Version: 2.14.3
 Release: 1
 License: GPL
 Group: Applications/System
@@ -98,8 +98,8 @@
 %{_datadir}/icons/hicolor/24x24/apps/*
 
 %changelog
-* Tue Apr 25 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1
-- Update to 2.14.2
+* Wed Apr 26 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-1
+- Update to 2.14.3
 
 * Sun Apr  9 2006 Ray Strode <rstrode at redhat.com> - 2.14.1-1
 - Update to 2.14.1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/FC-5/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	25 Apr 2006 19:02:33 -0000	1.17
+++ sources	26 Apr 2006 04:59:14 -0000	1.18
@@ -1 +1 @@
-c831d74fc578f40613d4cac326b0b3a2  gnome-power-manager-2.14.2.tar.bz2
+431448b680b47df68a42f233cc2699fe  gnome-power-manager-2.14.3.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 26 05:23:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 01:23:30 -0400
Subject: rpms/gdm/devel .cvsignore, 1.25, 1.26 gdm.spec, 1.146, 1.147 sources,
	1.27, 1.28
Message-ID: <200604260523.k3Q5NUDH006768@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6719

Modified Files:
	.cvsignore gdm.spec sources 
Log Message:
2.14.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	11 Apr 2006 13:15:00 -0000	1.25
+++ .cvsignore	26 Apr 2006 05:23:27 -0000	1.26
@@ -1,2 +1 @@
-gdm-2.14.0.tar.bz2
-gdm-2.14.1.tar.bz2
+gdm-2.14.4.tar.bz2


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- gdm.spec	12 Apr 2006 22:15:36 -0000	1.146
+++ gdm.spec	26 Apr 2006 05:23:27 -0000	1.147
@@ -14,8 +14,8 @@
 
 Summary: The GNOME Display Manager.
 Name: gdm
-Version: 2.14.1
-Release: 4
+Version: 2.14.4
+Release: 2
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -318,6 +318,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Wed Apr 26 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.14.4-2
+- Update to 2.14.4
+
 * Wed Apr 12 2006 Ray Strode <rstrode at redhat.com> - 1:2.14.1-4
 - fix libexecdir substitution problem in configuration file
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	11 Apr 2006 13:15:00 -0000	1.27
+++ sources	26 Apr 2006 05:23:27 -0000	1.28
@@ -1 +1 @@
-5bafb764f36d7caf5d2217de0b6ceba5  gdm-2.14.1.tar.bz2
+04cbd92e0c264787328e3373da3ebc11  gdm-2.14.4.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 26 05:27:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 01:27:39 -0400
Subject: rpms/gdm/FC-5 gdm.spec,1.145,1.146 sources,1.27,1.28
Message-ID: <200604260527.k3Q5RdSY008440@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gdm/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8380

Modified Files:
	gdm.spec sources 
Log Message:
2.14.4



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/FC-5/gdm.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- gdm.spec	12 Apr 2006 22:34:59 -0000	1.145
+++ gdm.spec	26 Apr 2006 05:27:35 -0000	1.146
@@ -14,8 +14,8 @@
 
 Summary: The GNOME Display Manager.
 Name: gdm
-Version: 2.14.1
-Release: 1.fc5.2
+Version: 2.14.4
+Release: 1.fc5.1
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -318,10 +318,16 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
-* Wed Apr 12 2006 Ray Strode <rstrode at redhat.com> - 1:2.14.1-1.fc5.2
-- Fix libexecdir substitution bug in config file
+* Wed Apr 26 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.14.4-1.fc5.1
+- Update to 2.14.4
 
-* Tue Apr 11 2006 Ray Strode <rstrode at redhat.com> - 1:2.14.1-1.fc5.1
+* Wed Apr 12 2006 Ray Strode <rstrode at redhat.com> - 1:2.14.1-4
+- fix libexecdir substitution problem in configuration file
+
+* Tue Apr 11 2006 Ray Strode <rstrode at redhat.com> - 1:2.14.1-3
+- Add gdmthemetester.in to the mix (upstream bug 338079)
+
+* Tue Apr 11 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.14.1-2
 - Update to 2.14.1
 - fixes CVE-2006-1057 (bug 188303)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gdm/FC-5/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	11 Apr 2006 13:57:59 -0000	1.27
+++ sources	26 Apr 2006 05:27:35 -0000	1.28
@@ -1 +1 @@
-5bafb764f36d7caf5d2217de0b6ceba5  gdm-2.14.1.tar.bz2
+04cbd92e0c264787328e3373da3ebc11  gdm-2.14.4.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 26 08:36:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 04:36:07 -0400
Subject: rpms/openoffice.org/FC-5
	openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,
	NONE, 1.1 openoffice.org-2.0.2.ooo64743.vcl.adjustonlevel1.patch,
	NONE, 1.1 openoffice.org-2.0.2.rh188467.printingdefaults.patch,
	NONE, 1.1 .cvsignore, 1.100,
	1.101 openoffice.org-1.9.121.rh127576.gnomeprintui.patch, 1.11,
	1.12 openoffice.org.spec, 1.652, 1.653 sources, 1.162,
	1.163 openoffice.org-2.0.2.ooo63583.sd.accessibility.patch,
	1.2, NONE
Message-ID: <200604260836.k3Q8a756020531@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20505

Modified Files:
	.cvsignore openoffice.org-1.9.121.rh127576.gnomeprintui.patch 
	openoffice.org.spec sources 
Added Files:
	openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 
	openoffice.org-2.0.2.ooo64743.vcl.adjustonlevel1.patch 
	openoffice.org-2.0.2.rh188467.printingdefaults.patch 
Removed Files:
	openoffice.org-2.0.2.ooo63583.sd.accessibility.patch 
Log Message:
the outstanding FC-5 top problems

openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch:
 inc/outfont.hxx                            |    0 
 inc/psprint/fontmanager.hxx                |    0 
 inc/vclenum.hxx                            |    0 
 psprint/inc/psprint/fontmanager.hxx        |   22 ++++++
 psprint/source/fontmanager/fontconfig.cxx  |  100 ++++++++++++++++++++---------
 psprint/source/fontmanager/fontmanager.cxx |    8 ++
 source/fontmanager/fontconfig.cxx          |    0 
 source/fontmanager/fontmanager.cxx         |    0 
 source/glyphs/gcach_ftyp.cxx               |    0 
 source/glyphs/gcach_ftyp.hxx               |    0 
 unx/source/gdi/xlfd_extd.cxx               |    0 
 vcl/inc/outfont.hxx                        |    6 +
 vcl/inc/vclenum.hxx                        |   22 ++++++
 vcl/source/glyphs/gcach_ftyp.cxx           |   71 ++++++++++++++------
 vcl/source/glyphs/gcach_ftyp.hxx           |    6 +
 vcl/unx/source/gdi/xlfd_extd.cxx           |    4 +
 vcl/win/source/gdi/salgdi3.cxx             |    9 ++
 win/source/gdi/salgdi3.cxx                 |    0 
 18 files changed, 194 insertions(+), 54 deletions(-)

--- NEW FILE openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch ---
Index: inc/psprint/fontmanager.hxx
===================================================================
RCS file: /cvs/gsl/psprint/inc/psprint/fontmanager.hxx,v
retrieving revision 1.29
diff -u -r1.29 fontmanager.hxx
--- openoffice.org.orig/psprint/inc/psprint/fontmanager.hxx	29 Mar 2006 11:21:16 -0000	1.29
+++ openoffice.org/psprint/inc/psprint/fontmanager.hxx	20 Apr 2006 10:35:55 -0000
@@ -152,6 +152,17 @@
 };
 }
 
+namespace fchint
+{
+enum type {
+    Nohint = 0,
+    Slight = 1,
+    Medium = 2,
+    Full = 3
+};
+}
+
+
 /*
  *  the difference between FastPrintFontInfo and PrintFontInfo
  *  is that the information in FastPrintFontInfo can usually
@@ -179,6 +190,9 @@
     rtl_TextEncoding        			m_aEncoding;
     fcstatus::type                      m_eEmbeddedbitmap;
     fcstatus::type                      m_eAntialias;
+    fcstatus::type                      m_eAutoHint;
+    fcstatus::type                      m_eHinting;
+    fchint::type                        m_eHintStyle;
 
     FastPrintFontInfo() :
             m_nID( 0 ),
@@ -190,7 +204,10 @@
             m_ePitch( pitch::Unknown ),
             m_aEncoding( RTL_TEXTENCODING_DONTKNOW ),
             m_eEmbeddedbitmap( fcstatus::isunset ),
-            m_eAntialias( fcstatus::isunset )
+            m_eAntialias( fcstatus::isunset ),
+            m_eAutoHint( fcstatus::isunset ),
+            m_eHinting( fcstatus::isunset ),
+            m_eHintStyle( fchint::Full )
     {}
 };
 
@@ -307,6 +324,9 @@
 
         fcstatus::type                              m_eEmbeddedbitmap;
         fcstatus::type                              m_eAntialias;
+        fcstatus::type                              m_eAutoHint;
+        fcstatus::type                              m_eHinting;
+        fchint::type                                m_eHintStyle;
 
         std::map< sal_Unicode, sal_Int32 >			m_aEncodingVector;
         std::map< sal_Unicode, rtl::OString >		m_aNonEncoded;
Index: source/fontmanager/fontconfig.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/fontmanager/fontconfig.cxx,v
retrieving revision 1.17
diff -u -r1.17 fontconfig.cxx
--- openoffice.org.orig/psprint/source/fontmanager/fontconfig.cxx	29 Mar 2006 11:21:45 -0000	1.17
+++ openoffice.org/psprint/source/fontmanager/fontconfig.cxx	20 Apr 2006 10:36:06 -0000
@@ -88,6 +88,7 @@
     FcConfig*		(*m_pFcConfigGetCurrent)();
     FcObjectSet*	(*m_pFcObjectSetVaBuild)(const char*,va_list);
     void			(*m_pFcObjectSetDestroy)(FcObjectSet* pSet);
+    FcPattern*		(*m_pFcPatternDuplicate)(const FcPattern*);
     FcPattern*		(*m_pFcPatternCreate)();
     void			(*m_pFcPatternDestroy)(FcPattern*);
     FcFontSet*		(*m_pFcFontList)(FcConfig*,FcPattern*,FcObjectSet*);
@@ -143,6 +144,9 @@
     FcPattern* FcPatternCreate()
     { return m_pFcPatternCreate(); }
 
+    FcPattern* FcPatternDuplicate(const FcPattern *p)
+    { return m_pFcPatternDuplicate(p); }
+
     void FcPatternDestroy( FcPattern* pPattern )
     { m_pFcPatternDestroy( pPattern ); }
     
@@ -238,6 +242,8 @@
         loadSymbol( "FcObjectSetDestroy" );
     m_pFcPatternCreate = (FcPattern*(*)())
         loadSymbol( "FcPatternCreate" );
+    m_pFcPatternDuplicate= (FcPattern*(*)(const FcPattern*))
+        loadSymbol( "FcPatternDuplicate" );
     m_pFcPatternDestroy = (void(*)(FcPattern*))
         loadSymbol( "FcPatternDestroy" );
     m_pFcFontList = (FcFontSet*(*)(FcConfig*,FcPattern*,FcObjectSet*))
@@ -283,6 +289,7 @@
             m_pFcObjectSetVaBuild			&&
             m_pFcObjectSetDestroy			&&
             m_pFcPatternCreate				&&
+            m_pFcPatternDuplicate			&&
             m_pFcPatternDestroy				&&
             m_pFcFontList					&&
             m_pFcConfigGetFonts             &&
@@ -355,35 +367,18 @@
             int weight = 0;
             int spacing = 0;
             int nCollectionEntry = -1;
-            FcBool outline = false, embitmap = true, antialias = true;
-            
-            FcResult eFileRes	= rWrapper.FcPatternGetString( pFSet->fonts[i], FC_FILE, 0, &file );
-            FcResult eFamilyRes	= rWrapper.FcPatternGetString( pFSet->fonts[i], FC_FAMILY, 0, &family );
-            FcResult eStyleRes	= rWrapper.FcPatternGetString( pFSet->fonts[i], FC_STYLE, 0, &style );
-            FcResult eSlantRes	= rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_SLANT, 0, &slant );
-            FcResult eWeightRes	= rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_WEIGHT, 0, &weight );
-            FcResult eSpacRes	= rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_SPACING, 0, &spacing );
-            FcResult eOutRes	= rWrapper.FcPatternGetBool( pFSet->fonts[i], FC_OUTLINE, 0, &outline );
-            FcResult eIndexRes = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_INDEX, 0, &nCollectionEntry );            
-
-            FcResult eEmbeddedBitmap = FcResultNoMatch;
-            FcResult eAntialias = FcResultNoMatch;
-
-			if (eFamilyRes == FcResultMatch)
-			{
-			    FcPattern *pMatch = rWrapper.FcPatternCreate();
-    			rWrapper.FcPatternAddString(pMatch, FC_FAMILY, family);
-    			rWrapper.FcConfigSubstitute( NULL, pMatch, FcMatchPattern );
-    			FcResult eResult;
-    			if (FcPattern* pResult = rWrapper.FcFontSetMatch( NULL, &pFSet, 1, pMatch, &eResult ))
-    			{
-                	eEmbeddedBitmap = rWrapper.FcPatternGetBool( pResult, FC_EMBEDDED_BITMAP, 0, &embitmap );
-    	            eAntialias = rWrapper.FcPatternGetBool( pResult, FC_ANTIALIAS, 0, &antialias );
-    				rWrapper.FcPatternDestroy(pResult);
-    			}
-    			rWrapper.FcPatternDestroy(pMatch);
-   			}
-            
+            FcBool outline = false, embitmap = true, antialias = true, autohint = true, hinting = true;
+            int hintstyle = FC_HINT_FULL;
+
+            FcResult eFileRes        = rWrapper.FcPatternGetString( pFSet->fonts[i], FC_FILE, 0, &file );
+            FcResult eFamilyRes      = rWrapper.FcPatternGetString( pFSet->fonts[i], FC_FAMILY, 0, &family );
+            FcResult eStyleRes       = rWrapper.FcPatternGetString( pFSet->fonts[i], FC_STYLE, 0, &style );
+            FcResult eSlantRes       = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_SLANT, 0, &slant );
+            FcResult eWeightRes      = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_WEIGHT, 0, &weight );
+            FcResult eSpacRes        = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_SPACING, 0, &spacing );
+            FcResult eOutRes         = rWrapper.FcPatternGetBool( pFSet->fonts[i], FC_OUTLINE, 0, &outline );
+            FcResult eIndexRes       = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_INDEX, 0, &nCollectionEntry );
+
             if( eFileRes != FcResultMatch || eFamilyRes != FcResultMatch || eOutRes != FcResultMatch )
                 continue;
 
@@ -404,6 +399,26 @@
             if( eOutRes == FcResultMatch && ! outline )
                 continue;
 
+	    FcPattern *tempfont = rWrapper.FcPatternDuplicate( pFSet->fonts[i] );
+	    rWrapper.FcConfigSubstitute( rWrapper.getDefConfig(), tempfont, FcMatchFont );
+	    rWrapper.FcDefaultSubstitute( tempfont );
+            FcResult eEmbeddedBitmap = rWrapper.FcPatternGetBool( tempfont, FC_EMBEDDED_BITMAP, 0, &embitmap );
+            FcResult eAntialias      = rWrapper.FcPatternGetBool( tempfont, FC_ANTIALIAS, 0, &antialias );
+    	    FcResult eAutoHint       = rWrapper.FcPatternGetBool( tempfont, FC_AUTOHINT, 0, &autohint );
+    	    FcResult eHinting        = rWrapper.FcPatternGetBool( tempfont, FC_HINTING, 0, &hinting );
+    	    FcResult eHintStyle      = rWrapper.FcPatternGetInteger( tempfont, FC_HINT_STYLE, 0, &hintstyle );
+    	    rWrapper.FcPatternDestroy( tempfont );
+
+#ifdef HDU_DEBUG
+            fprintf( stderr, "   embeddedbitmap = %d, antialias = %d, autohint = %d, hinting = %d, hintstyle = %d\n"
+                     , eEmbeddedBitmap == FcResultMatch ? embitmap : -1
+                     , eAntialias == FcResultMatch ? antialias : -1
+                     , eAutoHint == FcResultMatch ? autohint : -1
+                     , eHinting == FcResultMatch ? hinting : -1
+                     , eHintStyle == FcResultMatch ? hintstyle : -1
+                     );
+#endif
+
             // see if this font is already cached
             // update attributes
             std::list< PrintFont* > aFonts;
@@ -526,8 +539,38 @@
                 {
                   pUpdate->m_eAntialias = antialias ? fcstatus::istrue : fcstatus::isfalse;
                 }
+                if( eAutoHint == FcResultMatch )
+                {
+                  pUpdate->m_eAutoHint = autohint ? fcstatus::istrue : fcstatus::isfalse;
+                }
+                if( eHinting == FcResultMatch )
+                {
+                  pUpdate->m_eHinting = hinting ? fcstatus::istrue : fcstatus::isfalse;
+                }
+                if (eHintStyle != FcResultMatch)
+                {
+                  pUpdate->m_eHintStyle = fchint::Full;
+                }
+                else
+                {
+                  switch (hintstyle)
+                  {
+                    case FC_HINT_NONE:
+                      pUpdate->m_eHintStyle = fchint::Nohint;
+                      break;
+                    case FC_HINT_SLIGHT:
+                      pUpdate->m_eHintStyle = fchint::Slight;
+                      break;
+                    case FC_HINT_MEDIUM:
+                      pUpdate->m_eHintStyle = fchint::Medium;
+                      break;
+                    case FC_HINT_FULL:
+                    default:
+                      pUpdate->m_eHintStyle = fchint::Full;
+                      break;
+                  }
+                }
 
-                
                 // update font cache
                 m_pFontCache->updateFontCacheEntry( pUpdate, false );
                 // sort into known fonts
Index: source/fontmanager/fontmanager.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/fontmanager/fontmanager.cxx,v
retrieving revision 1.67
diff -u -r1.67 fontmanager.cxx
--- openoffice.org.orig/psprint/source/fontmanager/fontmanager.cxx	7 Apr 2006 13:44:31 -0000	1.67
+++ openoffice.org/psprint/source/fontmanager/fontmanager.cxx	20 Apr 2006 10:36:18 -0000
@@ -381,7 +381,10 @@
         m_bHaveVerticalSubstitutedGlyphs( false ),
         m_bUserOverride( false ),
         m_eEmbeddedbitmap( fcstatus::isunset ),
-        m_eAntialias( fcstatus::isunset )
+        m_eAntialias( fcstatus::isunset ),
+        m_eAutoHint( fcstatus::isunset ),
+        m_eHinting( fcstatus::isunset ),
+        m_eHintStyle( fchint::Full )
 {
 }
 
@@ -2595,6 +2598,9 @@
     rInfo.m_aEncoding       = pFont->m_aEncoding;
     rInfo.m_eEmbeddedbitmap = pFont->m_eEmbeddedbitmap;
     rInfo.m_eAntialias      = pFont->m_eAntialias;
+    rInfo.m_eAutoHint       = pFont->m_eAutoHint;
+    rInfo.m_eHinting        = pFont->m_eHinting;
+    rInfo.m_eHintStyle      = pFont->m_eHintStyle;
     rInfo.m_aAliases.clear();
     for( ::std::list< int >::iterator it = pFont->m_aAliases.begin(); it != pFont->m_aAliases.end(); ++it )
         rInfo.m_aAliases.push_back( m_pAtoms->getString( ATOM_FAMILYNAME, *it ) );
Index: inc/outfont.hxx
===================================================================
RCS file: /cvs/gsl/vcl/inc/outfont.hxx,v
retrieving revision 1.21
diff -u -r1.21 outfont.hxx
--- openoffice.org.orig/vcl/inc/outfont.hxx	7 Apr 2006 15:27:27 -0000	1.21
+++ openoffice.org/vcl/inc/outfont.hxx	20 Apr 2006 10:32:09 -0000
@@ -120,6 +120,9 @@
     bool               IsSubsettable() const     { return mbSubsettable; }
     FontEmbeddedBitmap UseEmbeddedBitmap() const { return meEmbeddedBitmap; }
     FontAntiAlias      UseAntiAlias() const      { return meAntiAlias; }
+    FontHinting        UseHinting() const        { return meHinting; }
+    FontAutoHint       UseAutoHint() const       { return meAutoHint; }
+    FontHintStyle      GetHintStyle() const      { return meHintStyle; }
 
 public: // TODO: hide members behind accessor methods
     String             maMapNames;       // List of family name aliass separated with ';'
@@ -130,6 +133,9 @@
     bool               mbEmbeddable;     // true: the font can be embedded
     FontEmbeddedBitmap meEmbeddedBitmap; // whether the embedded bitmaps should be used
     FontAntiAlias      meAntiAlias;      // whether the font should be antialiased
+    FontAutoHint       meAutoHint;       // whether the font should be autohinted
+    FontHinting        meHinting;        // whether the font should be hinted
+    FontHintStyle      meHintStyle;      // type of font hinting to be used
 };
 
 // ----------------
Index: inc/vclenum.hxx
===================================================================
RCS file: /cvs/gsl/vcl/inc/vclenum.hxx,v
retrieving revision 1.7
diff -u -r1.7 vclenum.hxx
--- openoffice.org.orig/vcl/inc/vclenum.hxx	29 Mar 2006 11:24:50 -0000	1.7
+++ openoffice.org/vcl/inc/vclenum.hxx	20 Apr 2006 10:32:57 -0000
@@ -289,6 +289,28 @@
 
 #endif
 
+#ifndef ENUM_FONTAUTOHINT_DECLARED
+#define ENUM_FONTAUTOHINT_DECLARED
+
+enum FontAutoHint { AUTOHINT_DONTKNOW, AUTOHINT_FALSE, AUTOHINT_TRUE };
+
+#endif
+
+#ifndef ENUM_FONTHINTING_DECLARED
+#define ENUM_FONTHINTING_DECLARED
+
+enum FontHinting { HINTING_DONTKNOW, HINTING_FALSE, HINTING_TRUE };
+
+#endif
+
+#ifndef ENUM_FONTHINTSTYLE_DECLARED
+#define ENUM_FONTHINTSTYLE_DECLARED
+
+enum FontHintStyle { HINT_NONE, HINT_SLIGHT, HINT_MEDIUM, HINT_FULL };
+
+#endif
+
+
 // ------------------------------------------------------------
 
 #ifndef ENUM_KEYFUNCTYPE_DECLARED
Index: source/glyphs/gcach_ftyp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.cxx,v
retrieving revision 1.122
diff -u -r1.122 gcach_ftyp.cxx
--- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx	7 Apr 2006 15:33:10 -0000	1.122
+++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx	20 Apr 2006 10:35:25 -0000
@@ -387,6 +387,13 @@
     return mpExtraKernInfo->GetUnscaledKernValue( cLeftChar, cRightChar );
 }
 
+bool FtFontInfo::DontUseHinting() const
+{
+    return
+      (maDevFontAttributes.UseHinting() == HINTING_FALSE) ||
+      (maDevFontAttributes.GetHintStyle() == HINT_NONE);
+}
+
 // -----------------------------------------------------------------------
 
 static unsigned GetUInt( const unsigned char* p ) { return((p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]);}
@@ -691,6 +698,7 @@
 FreetypeServerFont::FreetypeServerFont( const ImplFontSelectData& rFSD, FtFontInfo* pFI )
 :   ServerFont( rFSD ),
     mnPrioEmbedded(nDefaultPrioEmbedded), mnPrioAntiAlias(nDefaultPrioAntiAlias),
+    mnPrioAutoHint(nDefaultPrioAutoHint),
     mpFontInfo( pFI ),
     maFaceFT( NULL ),
     maSizeFT( NULL ),
@@ -813,22 +821,27 @@
 
     mbArtItalic = (rFSD.meItalic != ITALIC_NONE && rFSD.mpFontData->GetSlant() == ITALIC_NONE);
     mbArtBold = (rFSD.meWeight > WEIGHT_MEDIUM && rFSD.mpFontData->GetWeight() <= WEIGHT_MEDIUM);
+    mbUseGamma = false;
+    if (mbArtBold)
+    {
+        static const int TT_CODEPAGE_RANGE_874  = (1L << 16); // Thai
+        static const int TT_CODEPAGE_RANGE_932  = (1L << 17); // JIS/Japan
+        static const int TT_CODEPAGE_RANGE_936  = (1L << 18); // Chinese: Simplified
+        static const int TT_CODEPAGE_RANGE_949  = (1L << 19); // Korean Wansung
+        static const int TT_CODEPAGE_RANGE_950  = (1L << 20); // Chinese: Traditional
+        static const int TT_CODEPAGE_RANGE_1361 = (1L << 21); // Korean Johab
+        static const int TT_CODEPAGE_RANGES1_CJKT = 0x3F0000; // all of the above
+        const TT_OS2* pOs2 = (const TT_OS2*)FT_Get_Sfnt_Table( maFaceFT, ft_sfnt_os2 );
+        if ((pOs2) && (pOs2->ulCodePageRange1 & TT_CODEPAGE_RANGES1_CJKT )
+	          && rFSD.mnHeight < 20)
+	    mbUseGamma = true;
+    }
+
+    FontAutoHint eHint = mpFontInfo->GetUseAutoHint();
+    if (eHint == AUTOHINT_DONTKNOW)
+        eHint = mbUseGamma ? AUTOHINT_TRUE : AUTOHINT_FALSE;
 
-    static const int TT_CODEPAGE_RANGE_874  = (1L << 16); // Thai
-    static const int TT_CODEPAGE_RANGE_932  = (1L << 17); // JIS/Japan
-    static const int TT_CODEPAGE_RANGE_936  = (1L << 18); // Chinese: Simplified
-    static const int TT_CODEPAGE_RANGE_949  = (1L << 19); // Korean Wansung
-    static const int TT_CODEPAGE_RANGE_950  = (1L << 20); // Chinese: Traditional
-    static const int TT_CODEPAGE_RANGE_1361 = (1L << 21); // Korean Johab
-    static const int TT_CODEPAGE_RANGES1_CJKT = 0x3F0000; // all of the above
-    const TT_OS2* pOs2 = (const TT_OS2*)FT_Get_Sfnt_Table( maFaceFT, ft_sfnt_os2 );
-    if ((pOs2) && (pOs2->ulCodePageRange1 & TT_CODEPAGE_RANGES1_CJKT )
-	      && rFSD.mnHeight < 20)
-	mbUseGamma = true;
-    else
-	mbUseGamma = false;
-
-    if (mbUseGamma)
+    if (eHint == AUTOHINT_TRUE)
 	mnLoadFlags |= FT_LOAD_FORCE_AUTOHINT;
 
     if( (mnSin != 0) && (mnCos != 0) ) // hinting for 0/90/180/270 degrees only
@@ -839,16 +852,32 @@
         mnPrioAntiAlias = 0;
     if (mpFontInfo->DontUseEmbeddedBitmaps())
         mnPrioEmbedded = 0;
+    if (mpFontInfo->DontUseHinting())
+        mnPrioAutoHint = 0;
 
 #if (FTVERSION >= 2005) || defined(TT_CONFIG_OPTION_BYTECODE_INTERPRETER)
-    if( nDefaultPrioAutoHint <= 0 )
+    if( mnPrioAutoHint <= 0 )
 #endif
         mnLoadFlags |= FT_LOAD_NO_HINTING;
 
-#ifdef FT_LOAD_TARGET_LIGHT
+#if defined(FT_LOAD_TARGET_LIGHT) && defined(FT_LOAD_TARGET_NORMAL)
     // enable "light hinting" if available
     if( !(mnLoadFlags & FT_LOAD_NO_HINTING) && (nFTVERSION >= 2103))
-        mnLoadFlags |= FT_LOAD_TARGET_LIGHT;
+    {
+      switch (mpFontInfo->GetHintStyle())
+      {
+          default:
+          case HINT_SLIGHT:
+          case HINT_MEDIUM:
+                mnLoadFlags |= FT_LOAD_TARGET_LIGHT;
+                break;
+          case HINT_FULL:
+                mnLoadFlags |= FT_LOAD_TARGET_NORMAL;
+                break;
+          case HINT_NONE:
+                break;
+      }
+    }
 #endif
 
     if( ((mnCos != 0) && (mnSin != 0)) || (mnPrioEmbedded <= 0) )
@@ -1307,11 +1336,11 @@
 #if (FTVERSION >= 2002)
     // for 0/90/180/270 degree fonts enable autohinting even if not advisable
     // non-hinted and non-antialiased bitmaps just look too ugly
-    if( (mnCos==0 || mnSin==0) && (nDefaultPrioAutoHint > 0) )
+    if( (mnCos==0 || mnSin==0) && (mnPrioAutoHint > 0) )
         nLoadFlags &= ~FT_LOAD_NO_HINTING;
 #endif
 
-    if( mnPrioEmbedded <= nDefaultPrioAutoHint )
+    if( mnPrioEmbedded <= mnPrioAutoHint )
         nLoadFlags |= FT_LOAD_NO_BITMAP;
 
     FT_Error rc = -1;
@@ -1458,7 +1487,7 @@
     // autohinting in FT<=2.0.4 makes antialiased glyphs look worse
     nLoadFlags |= FT_LOAD_NO_HINTING;
 #else
-    if( (nGlyphFlags & GF_UNHINTED) || (nDefaultPrioAutoHint < mnPrioAntiAlias) )
+    if( (nGlyphFlags & GF_UNHINTED) || (mnPrioAutoHint < mnPrioAntiAlias) )
         nLoadFlags |= FT_LOAD_NO_HINTING;
 #endif
 
Index: source/glyphs/gcach_ftyp.hxx
===================================================================
RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.hxx,v
retrieving revision 1.34
diff -u -r1.34 gcach_ftyp.hxx
--- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.hxx	29 Mar 2006 11:26:24 -0000	1.34
+++ openoffice.org/vcl/source/glyphs/gcach_ftyp.hxx	20 Apr 2006 10:35:25 -0000
@@ -92,11 +92,14 @@
     const ::rtl::OString* GetFontFileName() const   { return mpFontFile->GetFileName(); }
     int                   GetFaceNum() const        { return mnFaceNum; }
     int                   GetSynthetic() const      { return mnSynthetic; }
-    int                   GetFontId() const         { return mnFontId; }
+    int                   GetFontId() const         { return mnFontId; }
     bool                  DontUseAntiAlias() const  
         { return maDevFontAttributes.UseAntiAlias() == ANTIALIAS_FALSE; }
     bool                  DontUseEmbeddedBitmaps() const 
         { return maDevFontAttributes.UseEmbeddedBitmap() == EMBEDDEDBITMAP_FALSE; }
+    bool                  DontUseHinting() const;
+    FontAutoHint          GetUseAutoHint() const 	{ return maDevFontAttributes.UseAutoHint(); }
+    FontHintStyle         GetHintStyle() const 		{ return maDevFontAttributes.GetHintStyle(); }
     bool                  IsSymbolFont() const      { return maDevFontAttributes.IsSymbolFont(); }
     const ImplFontAttributes& GetFontAttributes() const { return maDevFontAttributes; }
 
@@ -212,6 +215,7 @@
     int                         mnWidth;
     int                         mnPrioEmbedded;
     int                         mnPrioAntiAlias;
+    int                         mnPrioAutoHint;
     FtFontInfo*                 mpFontInfo;
     FT_Int                      mnLoadFlags;
     double                      mfStretch;
Index: unx/source/gdi/xlfd_extd.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/gdi/xlfd_extd.cxx,v
retrieving revision 1.26
diff -u -r1.26 xlfd_extd.cxx
--- openoffice.org.orig/vcl/unx/source/gdi/xlfd_extd.cxx	29 Mar 2006 11:29:14 -0000	1.26
+++ openoffice.org/vcl/unx/source/gdi/xlfd_extd.cxx	20 Apr 2006 10:40:01 -0000
@@ -117,6 +117,10 @@
     meEmbeddedBitmap = EMBEDDEDBITMAP_DONTKNOW;
     meAntiAlias = ANTIALIAS_DONTKNOW;
 
+    meAutoHint = AUTOHINT_DONTKNOW;
+    meHinting = HINTING_DONTKNOW;
+    meHintStyle = HINT_FULL;
+
     mnQuality      = -1;
 }
 
Index: win/source/gdi/salgdi3.cxx
===================================================================
RCS file: /cvs/gsl/vcl/win/source/gdi/salgdi3.cxx,v
retrieving revision 1.77
diff -u -r1.77 salgdi3.cxx
--- openoffice.org.orig/vcl/win/source/gdi/salgdi3.cxx	29 Mar 2006 11:29:53 -0000	1.77
+++ openoffice.org/vcl/win/source/gdi/salgdi3.cxx	20 Apr 2006 10:40:39 -0000
@@ -411,6 +411,9 @@
 
     aDFA.meEmbeddedBitmap = EMBEDDEDBITMAP_DONTKNOW;
     aDFA.meAntiAlias = ANTIALIAS_DONTKNOW;
+    aDFA.meAutoHint = AUTOHINT_DONTKNOW;
+    aDFA.meHinting = HINTING_DONTKNOW;
+    aDFA.meHintStyle = HINT_FULL;
     
     // TODO: add alias names
 
@@ -493,6 +496,9 @@
 
     aDFA.meEmbeddedBitmap = EMBEDDEDBITMAP_DONTKNOW;
     aDFA.meAntiAlias = ANTIALIAS_DONTKNOW;
+    aDFA.meAutoHint = AUTOHINT_DONTKNOW;
+    aDFA.meHinting = HINTING_DONTKNOW;
+    aDFA.meHintStyle = HINT_FULL;
 
     // TODO: add alias names
     return aDFA;
@@ -1890,6 +1896,9 @@
     aDFA.mbEmbeddable = false;
     aDFA.meEmbeddedBitmap = EMBEDDEDBITMAP_DONTKNOW;
     aDFA.meAntiAlias = ANTIALIAS_DONTKNOW;
+    aDFA.meAutoHint = AUTOHINT_DONTKNOW;
+    aDFA.meHinting = HINTING_DONTKNOW;
+    aDFA.meHintStyle = HINT_FULL;
 
     /*
 	// TODO: improve ImplDevFontAttributes using "FONTRES:" from *.fot file

openoffice.org-2.0.2.ooo64743.vcl.adjustonlevel1.patch:
 source/gdi/sallayout.cxx     |    0 
 vcl/source/gdi/sallayout.cxx |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.2.ooo64743.vcl.adjustonlevel1.patch ---
Index: source/gdi/sallayout.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/gdi/sallayout.cxx,v
retrieving revision 1.75
diff -u -r1.75 sallayout.cxx
--- openoffice.org.orig/vcl/source/gdi/sallayout.cxx	26 Jan 2006 18:09:48 -0000	1.75
+++ openoffice.org/vcl/source/gdi/sallayout.cxx	25 Apr 2006 11:42:27 -0000
@@ -1560,7 +1560,7 @@
     for( n = 0; n < nLevel; ++n )
         maFallbackRuns[n].ResetPos();
     int nActiveCharPos = nCharPos[0];
-    while( nValid[0] && (nLevel > 1))
+    while( nValid[0] && (nLevel > 0))
     {
         // find best fallback level
         for( n = 0; n < nLevel; ++n )

openoffice.org-2.0.2.rh188467.printingdefaults.patch:
 configuration/ppds/SGENPRT.PS                |    0 
 configuration/psprint.conf                   |    0 
 psprint_config/configuration/ppds/SGENPRT.PS |    1 +
 psprint_config/configuration/psprint.conf    |    4 ++--
 4 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-2.0.2.rh188467.printingdefaults.patch ---
Index: configuration/ppds/SGENPRT.PS
===================================================================
RCS file: /cvs/external/psprint_config/configuration/ppds/SGENPRT.PS,v
retrieving revision 1.3
diff -u -p -u -r1.3 SGENPRT.PS
--- openoffice.org.orig/psprint_config/configuration/ppds/SGENPRT.PS	26 Nov 2004 16:10:35 -0000	1.3
+++ openoffice.org/psprint_config/configuration/ppds/SGENPRT.PS	30 Aug 2005 11:17:51 -0000
@@ -58,6 +58,7 @@
 *ColorDevice: True
 *DefaultColorSpace: RGB
 *LanguageLevel: "2"
+*TTRasterizer: Type42
 
 *% --- For None Color or old PostScript(R) printers use following lines ---
 *% *ColorDevice: False
Index: configuration/psprint.conf
===================================================================
RCS file: /cvs/external/psprint_config/configuration/psprint.conf,v
retrieving revision 1.2
diff -u -p -u -r1.2 psprint.conf
--- openoffice.org.orig/psprint_config/configuration/psprint.conf	9 Nov 2004 16:38:35 -0000	1.2
+++ openoffice.org/psprint_config/configuration/psprint.conf	30 Aug 2005 11:17:50 -0000
@@ -48,7 +48,7 @@
 ;         defaults for newly added printers.
 ; PerformFontSubstitution: wether to replace downloadable fonts
 ;         with resident fonts or not
-PerformFontSubstitution=true
+PerformFontSubstitution=false
 
 ; SubstFont_<downloadable font>: the resident font to replace
 ;         <downloadable font> if PerformFontSubstitution is true
@@ -84,7 +84,7 @@
 
 ; PerformFontSubstitution: wether to replace downloadable fonts
 ;         with resident fonts or not
-PerformFontSubstitution=true
+PerformFontSubstitution=false
 
 ; SubstFont_<downloadable font>: the resident font to replace
 ;         <downloadable font> if PerformFontSubstitution is true


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/.cvsignore,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- .cvsignore	25 Feb 2006 13:49:16 -0000	1.100
+++ .cvsignore	26 Apr 2006 08:36:03 -0000	1.101
@@ -161,3 +161,4 @@
 OOB680_m3.tar.bz2
 OOB680_m4.tar.bz2
 OOB680_m5.tar.bz2
+ooo64726.sdf

openoffice.org-1.9.121.rh127576.gnomeprintui.patch:
 configuration/ppds/SGENPRT.PS                |    0 
 configuration/psprint.conf                   |    0 
 inc/jobset.hxx                               |    0 
 inc/print.hxx                                |    0 
 psprint/source/printer/cupsmgr.cxx           |   19 
 psprint/source/printer/makefile.mk           |    2 
 psprint/util/makefile.mk                     |    4 
 psprint_config/configuration/ppds/SGENPRT.PS |    2 
 psprint_config/configuration/psprint.conf    |    2 
 source/dialogs/makefile.mk                   |    0 
 source/dialogs/printdlg.cxx                  |    0 
 source/gdi/jobset.cxx                        |    0 
 source/printer/cupsmgr.cxx                   |    0 
 svtools/source/dialogs/makefile.mk           |    4 
 svtools/source/dialogs/printdlg.cxx          |  525 ++++++++++++++++++++++++++-
 svtools/util/makefile.mk                     |    8 
 util/makefile.mk                             |    0 
 vcl/inc/jobset.hxx                           |    1 
 vcl/inc/print.hxx                            |    1 
 vcl/source/gdi/jobset.cxx                    |  194 +++++++++
 20 files changed, 757 insertions(+), 5 deletions(-)

Index: openoffice.org-1.9.121.rh127576.gnomeprintui.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org-1.9.121.rh127576.gnomeprintui.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openoffice.org-1.9.121.rh127576.gnomeprintui.patch	29 Mar 2006 10:48:48 -0000	1.11
+++ openoffice.org-1.9.121.rh127576.gnomeprintui.patch	26 Apr 2006 08:36:03 -0000	1.12
@@ -5,6 +5,32 @@
 diff -u -p -u -r1.12 cupsmgr.cxx
 --- openoffice.org.orig/psprint/source/printer/cupsmgr.cxx	6 Jun 2005 16:07:42 -0000	1.12
 +++ openoffice.org/psprint/source/printer/cupsmgr.cxx	25 Jul 2005 15:02:37 -0000
+@@ -52,6 +52,16 @@
+ 
+ #include <algorithm>
+ 
++#define WE_ARE_LIBGNOMEPRINT_INTERNALS
++#include <libgnomeprint/private/gpa-utils.h>
++#include <libgnomeprint/gnome-print-config.h>
++#include <libgnomeprint/gnome-print.h>
++#include <libgnomeprint/private/gpa-printer.h>
++#include <libgnomeprint/private/gpa-key.h>
++#include <libgnomeprint/private/gpa-node.h>
++#include <libgnomeprint/private/gpa-state.h>
++#include <libgnomeprint/private/gpa-root.h>
++
+ namespace psp
+ {
+ class CUPSWrapper
+@@ -409,6 +419,8 @@
+ #if OSL_DEBUG_LEVEL > 1
+     fprintf( stderr, "starting cupsGetDests\n" );
+ #endif
++    if (!gpa_initialized())
++    	gpa_init();
+     int nDests = 0;
+     cups_dest_t* pDests = NULL;
+     nDests = m_pCUPSWrapper->cupsGetDests( &pDests );
 @@ -475,9 +487,10 @@ void CUPSManager::initialize()
  
      // clear old stuff
@@ -528,12 +554,13 @@
  short PrintDialog::Execute()
  {
  	if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
-@@ -647,6 +832,343 @@ short PrintDialog::Execute()
+@@ -647,6 +832,345 @@ short PrintDialog::Execute()
  	ImplInitControls();
  	ImplModifyControlHdl( NULL );
  
 +#if 1
 +	static GPAList *pKnownPrinters;
++	gulong id = 0;
 +	if (!pKnownPrinters)
 +	{
 +		if (!gpa_initialized())
@@ -795,6 +822,7 @@
 +	}
 +
 +	gtk_widget_destroy( pDialog );
++	if (id) g_signal_handler_disconnect (GPA_NODE(pKnownPrinters), id);
 +	g_object_unref (pConfig);
 +	g_object_unref (pJob);
 +
@@ -917,11 +945,23 @@
  *PCFileName: "SGENPRT.PPD"
  
  
-@@ -58,6 +58,7 @@
- *ColorDevice: True
- *DefaultColorSpace: RGB
- *LanguageLevel: "2"
-+*TTRasterizer: Type42
+--- openoffice.org.orig/psprint/util/makefile.mk	2006-04-10 16:10:36.000000000 +0100
++++ openoffice.org/psprint/util/makefile.mk	2006-04-11 17:31:45.000000000 +0100
+@@ -89,5 +89,9 @@
  
- *% --- For None Color or old PostScript(R) printers use following lines ---
- *% *ColorDevice: False
+ # --- Targets ------------------------------------------------------------
+ 
++PKGCONFIG_MODULES=libgnomeprint-2.2
++.INCLUDE: pkg_config.mk
++
++SHL1STDLIBS+=$(PKGCONFIG_LIBS)
+ 
+ .INCLUDE :	target.mk
+--- openoffice.org.orig/psprint/source/printer/makefile.mk	2006-04-10 16:10:35.000000000 +0100
++++ openoffice.org/psprint/source/printer/makefile.mk	2006-04-11 17:30:25.000000000 +0100
+@@ -75,3 +75,5 @@
+ 
+ $(SLO)$/cupsmgr.obj : $(INCCOM)$/rtsname.hxx
+ 
++PKGCONFIG_MODULES=libgnomeprint-2.2
++.INCLUDE: pkg_config.mk


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.652
retrieving revision 1.653
diff -u -r1.652 -r1.653
--- openoffice.org.spec	10 Apr 2006 13:25:30 -0000	1.652
+++ openoffice.org.spec	26 Apr 2006 08:36:04 -0000	1.653
@@ -93,6 +93,7 @@
 Source9:	Tigert-templates.tar.gz
 Source10:	documentation.openoffice.org-templates.tar.gz
 Source11:	redhat-templates.tar.gz
+Source12:	ooo64726.sdf
 BuildRequires:	tcsh, perl, sed, zip, bzip2, unzip, tar, findutils, prelink
 BuildRequires:	autoconf, make >= 3.79.1, ant, flex, bison, perl-Compress-Zlib
 BuildRequires:	gcc >= 3.4.3, gcc-c++ >= 3.4.3, binutils, perl-Archive-Zip
@@ -159,6 +160,9 @@
 Patch34: openoffice.org-2.0.2.ooo62030.solenv._version.patch
 Patch35: openoffice.org-2.0.2.oooXXXXX.config_office.noppds.patch
 Patch36: openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch
+Patch37: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch38: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch39: openoffice.org-2.0.2.ooo64743.vcl.adjustonlevel1.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -804,6 +808,9 @@
 %patch34 -p1 -b .ooo62030.solenv._version.patch
 %patch35 -p1 -b .oooXXXXX.config_office.noppds.patch
 %patch36 -p1 -b .ooo63155.sfx2.badscript.patch
+%patch37 -p1 -b .rh188467.printingdefaults.patch
+%patch38 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch39 -p1 -b .ooo64743.vcl.adjustonlevel1.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -894,6 +901,7 @@
 deliver -link
 localize -m -x -l ta-IN -f %{SOURCE2}
 localize -m -x -l ga -f %{SOURCE6}
+localize -m -x -l bn -f %{SOURCE12}
 cd ../..
 
 cd instsetoo_native/util
@@ -3243,8 +3251,14 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Mon Apr 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.8
-- rh#188053# a11y fixes
+* Wed Apr 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.8
+- rh#187939# mispatch between gnomeprint vs OOo printer detect
+- rh#188467# set better printing defaults
+- rh#189061# honour fontconfig autohint/hinting settings
+- rh#189761# multilevel glyph fallback fix
+- rh#188053# a11y + impress crash
+- rh#189760# Bengali short-cut keys are not available easly from the keyboard
+- upgrade to 2.0.X Tamil translations
 
 * Wed Mar 29 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.7
 - ooo#59997# replacement opens___.ttf updated


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/sources,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- sources	20 Mar 2006 10:28:10 -0000	1.162
+++ sources	26 Apr 2006 08:36:04 -0000	1.163
@@ -1,4 +1,3 @@
-a66c6ab52b2eb2deaa7ff85595276b15  GSI_ta-IN.sdf
 a4a22f6b80a4f02c01bbe0400e131e57  RegisterAndLicence.xcu
 1825a3b182fd46e08075a42257cfc6aa  gcj-sed.sh
 16cb79cb018c6311e9797e85bd2461b2  evolocal.odb
@@ -7,6 +6,8 @@
 1b4d9a03ebb4c864015620153afb77c6  Tigert-templates.tar.gz
 20789fc643e2b857291e1973075fccb0  OOB680_m5.tar.bz2
 67ba19cf8ac46671799ff63a48901e8b  openoffice.org-simple-crash_report.sh
-1fb6d1fc0b5c6f4425b3cd779727b30c  opens___.ttf
-8d8c4222654f718436c234582c8fd529  GSI_ga.sdf
 bfa60acd8b0c30a1a6d14165da45c1dd  openoffice.org-myspell-contrib.tar.gz
+afe937f8dd4c3aa10e9bda068059cdfd  opens___.ttf
+7f31494f6d929e03b1e29408d8083d19  GSI_ga.sdf
+008752c97e7cd0edbb7f6589ae61e498  GSI_ta-IN.sdf
+05a906513ef89af5e189097fa0c50681  ooo64726.sdf


--- openoffice.org-2.0.2.ooo63583.sd.accessibility.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 26 11:02:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 07:02:45 -0400
Subject: rpms/coreutils/devel coreutils-selinux.patch, 1.20,
	1.21 coreutils.spec, 1.110, 1.111
Message-ID: <200604261102.k3QB2jKU012871@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12801

Modified Files:
	coreutils-selinux.patch coreutils.spec 
Log Message:
* Wed Apr 26 2006 Tim Waugh <twaugh at redhat.com> 5.94-4
- Fix 'cp -Z' when the destination exists (bug #189967).


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         |   68 ++++++++
 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, 1710 insertions(+), 124 deletions(-)

Index: coreutils-selinux.patch
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-selinux.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- coreutils-selinux.patch	20 Apr 2006 11:39:12 -0000	1.20
+++ coreutils-selinux.patch	26 Apr 2006 11:02:22 -0000	1.21
@@ -2245,8 +2245,8 @@
 +  }
 +#endif
  }
---- coreutils-5.94/src/copy.c.selinux	2006-03-24 13:23:39.000000000 +0000
-+++ coreutils-5.94/src/copy.c	2006-03-24 13:23:45.000000000 +0000
+--- coreutils-5.94/src/copy.c	2006-03-24 13:23:45.000000000 +0000
++++ coreutils-5.94/src/copy.c	2006-04-26 14:06:02.000000000 +1000
 @@ -51,6 +51,11 @@
  #include "xreadlink.h"
  #include "yesno.h"
@@ -2259,7 +2259,33 @@
  #ifndef HAVE_FCHMOD
  # define HAVE_FCHMOD false
  #endif
-@@ -1416,6 +1421,32 @@
+@@ -238,6 +243,25 @@
+     {
+       dest_desc = open (dst_name, O_WRONLY | O_TRUNC | O_BINARY, dst_mode);
+ 
++#ifdef WITH_SELINUX
++      if (dest_desc >= 0)
++	{
++	  security_context_t con;
++	  if(getfscreatecon(&con) == -1)
++	    {
++	      return_val = false;
++	      goto close_src_desc;
++	    }
++	  if(fsetfilecon(dest_desc, con) == -1)
++	    {
++	      return_val = false;
++	      freecon(con);
++	      goto close_src_desc;
++	    }
++	  freecon(con);
++	}
++#endif
++
+       if (dest_desc < 0 && x->unlink_dest_after_failed_open)
+ 	{
+ 	  if (unlink (dst_name) != 0)
+@@ -1416,6 +1440,32 @@
       In such cases, set this variable to zero.  */
    preserve_metadata = true;
  
@@ -2292,7 +2318,7 @@
    if (S_ISDIR (src_mode))
      {
        struct dir_list *dir;
-@@ -1486,7 +1517,13 @@
+@@ -1486,7 +1536,13 @@
  
        /* Are we crossing a file system boundary?  */
        if (x->one_file_system && device != 0 && device != src_sb.st_dev)
@@ -2307,7 +2333,7 @@
  
        /* Copy the contents of the directory.  */
  
-@@ -1622,6 +1659,11 @@
+@@ -1622,6 +1678,11 @@
  	    }
  	}
  
@@ -2319,7 +2345,7 @@
        /* There's no need to preserve timestamps or permissions.  */
        preserve_metadata = false;
  
-@@ -1760,6 +1802,11 @@
+@@ -1760,6 +1821,11 @@
  
  un_backup:
  


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- coreutils.spec	20 Apr 2006 11:39:12 -0000	1.110
+++ coreutils.spec	26 Apr 2006 11:02:25 -0000	1.111
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 5.94
-Release: 3
+Release: 4
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -261,6 +261,9 @@
 /sbin/runuser
 
 %changelog
+* Wed Apr 26 2006 Tim Waugh <twaugh at redhat.com> 5.94-4
+- Fix 'cp -Z' when the destination exists (bug #189967).
+
 * Thu Apr 20 2006 Tim Waugh <twaugh at redhat.com> 5.94-3
 - Make 'ls -Z' output more consistent with other output formats.
 



From fedora-cvs-commits at redhat.com  Wed Apr 26 11:13:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 07:13:50 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2159,
	1.2160 linux-2.6-execshield.patch, 1.17,
	1.18 linux-2.6-xen-compile-fixes.patch, 1.8,
	1.9 linux-2.6-xen-move-vdso-fixmap.patch, 1.2,
	1.3 linux-2.6-xen-vsyscall_base.patch, 1.2,
	1.3 linux-2.6-xen.patch, 1.13, 1.14
Message-ID: <200604261113.k3QBDoor014831@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14644

Modified Files:
	kernel-2.6.spec linux-2.6-execshield.patch 
	linux-2.6-xen-compile-fixes.patch 
	linux-2.6-xen-move-vdso-fixmap.patch 
	linux-2.6-xen-vsyscall_base.patch linux-2.6-xen.patch 
Log Message:
merge with linux-2.6 & linux-2.6-xen


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2159
retrieving revision 1.2160
diff -u -r1.2159 -r1.2160
--- kernel-2.6.spec	26 Apr 2006 04:33:40 -0000	1.2159
+++ kernel-2.6.spec	26 Apr 2006 11:13:46 -0000	1.2160
@@ -7,7 +7,7 @@
 %define buildsmp 0
 %define buildpae 0
 # Whether to apply the Xen patches, leave this enabled.
-%define includexen 0
+%define includexen 1
 # Whether to build the Xen kernels, disable if you want.
 %define buildxen 1
 %define buildxenPAE 0
@@ -1666,6 +1666,10 @@
 %endif
 
 %changelog
+* Wed Apr 26 2006 Juan Quintela <quintela at redhat.com>
+- rebase with last linux-2.6-xen.
+- enable xen again.
+
 * Tue Apr 25 2006 Dave Jones <davej at redhat.com>
 - 2.6.17rc2-git7
 

linux-2.6-execshield.patch:
 linux-2.6.16.noarch/arch/i386/kernel/sysenter.c |  123 ++++++++--------
 linux-2.6.16.noarch/include/asm-powerpc/elf.h   |    3 
 linux/arch/i386/kernel/asm-offsets.c            |    1 
 linux/arch/i386/kernel/cpu/common.c             |    7 
 linux/arch/i386/kernel/entry.S                  |    8 -
 linux/arch/i386/kernel/process.c                |   59 +++++++
 linux/arch/i386/kernel/signal.c                 |    4 
 linux/arch/i386/kernel/smp.c                    |    3 
 linux/arch/i386/kernel/traps.c                  |   93 +++++++++++-
 linux/arch/i386/kernel/vsyscall-sysenter.S      |    6 
 linux/arch/i386/kernel/vsyscall.lds.S           |    4 
 linux/arch/i386/mm/init.c                       |    6 
 linux/arch/i386/mm/mmap.c                       |    6 
 linux/arch/ia64/ia32/binfmt_elf32.c             |    2 
 linux/arch/powerpc/kernel/vdso.c                |    3 
 linux/arch/x86_64/ia32/ia32_binfmt.c            |    6 
 linux/arch/x86_64/ia32/syscall32.c              |    4 
 linux/arch/x86_64/kernel/process.c              |    6 
 linux/arch/x86_64/kernel/setup64.c              |   23 ---
 linux/arch/x86_64/mm/fault.c                    |    2 
 linux/arch/x86_64/mm/mmap.c                     |   99 ++++++++++--
 linux/drivers/char/random.c                     |    7 
 linux/fs/binfmt_elf.c                           |  151 +++++++++++++++----
 linux/fs/proc/array.c                           |    8 -
 linux/fs/proc/base.c                            |    8 -
 linux/fs/proc/task_mmu.c                        |   34 +++-
 linux/include/asm-i386/a.out.h                  |    2 
 linux/include/asm-i386/desc.h                   |   14 +
 linux/include/asm-i386/elf.h                    |   50 ++++--
 linux/include/asm-i386/mmu.h                    |    6 
 linux/include/asm-i386/page.h                   |    5 
 linux/include/asm-i386/pgalloc.h                |    1 
 linux/include/asm-i386/processor.h              |    8 -
 linux/include/asm-i386/thread_info.h            |    1 
 linux/include/asm-ia64/pgalloc.h                |    4 
 linux/include/asm-powerpc/pgalloc.h             |    5 
 linux/include/asm-ppc/pgalloc.h                 |    5 
 linux/include/asm-s390/pgalloc.h                |    4 
 linux/include/asm-sparc/pgalloc.h               |    4 
 linux/include/asm-sparc64/pgalloc.h             |    4 
 linux/include/asm-x86_64/pgalloc.h              |    7 
 linux/include/asm-x86_64/pgtable.h              |    2 
 linux/include/linux/mm.h                        |   16 +-
 linux/include/linux/resource.h                  |    5 
 linux/include/linux/sched.h                     |    9 +
 linux/include/linux/sysctl.h                    |    3 
 linux/kernel/signal.c                           |   38 ++++
 linux/kernel/sysctl.c                           |   57 +++++++
 linux/mm/fremap.c                               |   16 +-
 linux/mm/mmap.c                                 |  183 ++++++++++++++++++++++--
 linux/mm/mprotect.c                             |    5 
 linux/mm/mremap.c                               |    4 
 52 files changed, 919 insertions(+), 215 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- linux-2.6-execshield.patch	1 Apr 2006 21:26:06 -0000	1.17
+++ linux-2.6-execshield.patch	26 Apr 2006 11:13:46 -0000	1.18
@@ -164,44 +164,102 @@
  
  	if (!cpu_isset(cpu, flush_cpumask))
  		goto out;
-Index: linux/arch/i386/kernel/sysenter.c
-===================================================================
---- linux.orig/arch/i386/kernel/sysenter.c
-+++ linux/arch/i386/kernel/sysenter.c
-@@ -13,7 +13,9 @@
- #include <linux/gfp.h>
+diff -uNp linux-2.6.16.noarch/arch/i386/kernel/sysenter.c.orig linux-2.6.16.noarch/arch/i386/kernel/sysenter.c
+--- linux-2.6.16.noarch/arch/i386/kernel/sysenter.c.orig	2006-04-25 14:25:11.000000000 +0200
++++ linux-2.6.16.noarch/arch/i386/kernel/sysenter.c	2006-04-25 14:50:26.000000000 +0200
+@@ -14,7 +14,9 @@
  #include <linux/string.h>
  #include <linux/elf.h>
+ #include <linux/mm.h>
 +#include <linux/mman.h>
  
 +#include <asm/a.out.h>
  #include <asm/cpufeature.h>
  #include <asm/msr.h>
  #include <asm/pgtable.h>
-@@ -46,11 +48,13 @@ void enable_sep_cpu(void)
+@@ -52,11 +54,13 @@ void enable_sep_cpu(void)
+  */
  extern const char vsyscall_int80_start, vsyscall_int80_end;
  extern const char vsyscall_sysenter_start, vsyscall_sysenter_end;
- 
+-static void *syscall_page;
 +static struct page *sysenter_pages[2];
-+
+ 
  int __init sysenter_setup(void)
  {
- 	void *page = (void *)get_zeroed_page(GFP_ATOMIC);
- 
--	__set_fixmap(FIX_VSYSCALL, __pa(page), PAGE_READONLY_EXEC);
+-	syscall_page = (void *)get_zeroed_page(GFP_ATOMIC);
++  	void *page = (void *)get_zeroed_page(GFP_ATOMIC);
++
 +	sysenter_pages[0] = virt_to_page(page);
  
- 	if (!boot_cpu_has(X86_FEATURE_SEP)) {
- 		memcpy(page,
-@@ -65,3 +69,78 @@ int __init sysenter_setup(void)
+ #ifdef CONFIG_XEN
+ 	if (boot_cpu_has(X86_FEATURE_SEP)) {
+@@ -71,73 +75,82 @@ int __init sysenter_setup(void)
+ #endif
+ 
+ 	if (boot_cpu_has(X86_FEATURE_SEP)) {
+-		memcpy(syscall_page,
++		memcpy(page,
+ 		       &vsyscall_sysenter_start,
+ 		       &vsyscall_sysenter_end - &vsyscall_sysenter_start);
+ 		return 0;
+ 	}
+ 
+-	memcpy(syscall_page,
++	memcpy(page,
+ 	       &vsyscall_int80_start,
+ 	       &vsyscall_int80_end - &vsyscall_int80_start);
  
  	return 0;
  }
-+
+ 
+-static struct page*
+-syscall_nopage(struct vm_area_struct *vma, unsigned long adr, int *type)
+-{
+-	struct page *p = virt_to_page(adr - vma->vm_start + syscall_page);
+-	get_page(p);
+-	return p;
+-}
+-
+-/* Prevent VMA merging */
+-static void syscall_vma_close(struct vm_area_struct *vma)
+-{
+-}
 +extern void SYSENTER_RETURN_OFFSET;
 +
 +unsigned int vdso_enabled = 1;
-+
+ 
+-static struct vm_operations_struct syscall_vm_ops = {
+-	.close = syscall_vma_close,
+-	.nopage = syscall_nopage,
+-};
+-
+-/* Setup a VMA at program startup for the vsyscall page */
+-int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
+-{
+-	struct vm_area_struct *vma;
+-	struct mm_struct *mm = current->mm;
+-	int ret;
+-
+-	vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
+-	if (!vma)
+-		return -ENOMEM;
+-
+-	memset(vma, 0, sizeof(struct vm_area_struct));
+-	/* Could randomize here */
+-	vma->vm_start = VSYSCALL_BASE;
+-	vma->vm_end = VSYSCALL_BASE + PAGE_SIZE;
+-	/* MAYWRITE to allow gdb to COW and set breakpoints */
+-	vma->vm_flags = VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYEXEC|VM_MAYWRITE;
+-	vma->vm_flags |= mm->def_flags;
+-	vma->vm_page_prot = protection_map[vma->vm_flags & 7];
+-	vma->vm_ops = &syscall_vm_ops;
+-	vma->vm_mm = mm;
+-
+-	down_write(&mm->mmap_sem);
+-	if ((ret = insert_vm_struct(mm, vma))) {
+-		up_write(&mm->mmap_sem);
+-		kmem_cache_free(vm_area_cachep, vma);
+-		return ret;
 +/*
 + * This is called from binfmt_elf, we create the special vma for the
 + * vDSO and insert it into the mm struct tree.
@@ -227,7 +285,10 @@
 +	if (0==exec_shield) { /* off; %cs limit off */
 +		addr = STACK_TOP;  /* minimal interference with anybody */
 +		flags = MAP_PRIVATE | MAP_FIXED;
-+	}
+ 	}
+-	mm->total_vm++;
+-	up_write(&mm->mmap_sem);
+-	return 0;
 +	else if ((3<<2) & exec_shield) { /* vdso just below .text */
 +		addr = (((2<<2) & exec_shield) && interp_map_address) ?
 +			interp_map_address : start_code;
@@ -256,22 +317,26 @@
 +	}
 +	up_write(&current->mm->mmap_sem);
 +	return err;
-+}
-+
+ }
+ 
+-struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
 +int in_gate_area_no_task(unsigned long addr)
-+{
-+	return 0;
-+}
-+
-+int in_gate_area(struct task_struct *task, unsigned long addr)
-+{
+ {
+-	return NULL;
 +	return 0;
-+}
-+
+ }
+ 
+ int in_gate_area(struct task_struct *task, unsigned long addr)
+@@ -145,7 +158,7 @@ int in_gate_area(struct task_struct *tas
+ 	return 0;
+ }
+ 
+-int in_gate_area_no_task(unsigned long addr)
 +struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
-+{
+ {
+-	return 0;
 +	return NULL;
-+}
+ }
 Index: linux/arch/i386/kernel/traps.c
 ===================================================================
 --- linux.orig/arch/i386/kernel/traps.c

linux-2.6-xen-compile-fixes.patch:
 arch/i386/kernel/acpi/boot-xen.c                             |    3 +-
 linux-2.6.15.xen/arch/i386/kernel/smp-xen.c                  |    1 
 linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c                |    2 +
 linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c            |    6 ----
 linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c                  |    2 -
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h        |   14 +++++++++++
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/mmu.h         |    7 +++++
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h     |    1 
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/processor.h   |    7 ++++-
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/swiotlb.h     |    1 
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgalloc.h   |    7 +++++
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgtable.h   |    2 -
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/processor.h |    2 +
 linux-2.6.16.noarch/include/asm-x86_64/ipi.h                 |    2 +
 14 files changed, 47 insertions(+), 10 deletions(-)

Index: linux-2.6-xen-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-compile-fixes.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-xen-compile-fixes.patch	22 Apr 2006 17:48:28 -0000	1.8
+++ linux-2.6-xen-compile-fixes.patch	26 Apr 2006 11:13:46 -0000	1.9
@@ -215,26 +215,3 @@
 +#endif
  
  #endif /* __ASM_IPI_H */
-diff -r c68722b17299 arch/x86_64/kernel/head-xen.S
---- a/arch/x86_64/kernel/head-xen.S	Wed Apr 19 11:47:47 2006 +0100
-+++ b/arch/x86_64/kernel/head-xen.S	Fri Apr 21 19:32:49 2006 -0400
-@@ -23,6 +23,7 @@
- #include <asm/cache.h>
- 
- 	.text
-+	.section .bootstrap.text
- 	.code64
- 	.globl startup_64
- startup_64:
-diff -urNp --exclude-from=/home/quintela/old/config/misc/dontdiff linux-2.6.16.noarch/arch/x86_64/ia32/Makefile linux-2.6.16.work/arch/x86_64/ia32/Makefile
---- linux-2.6.16.noarch/arch/x86_64/ia32/Makefile	2006-04-22 19:19:42.000000000 +0200
-+++ linux-2.6.16.work/arch/x86_64/ia32/Makefile	2006-04-21 19:36:31.000000000 +0200
-@@ -26,7 +26,7 @@ quiet_cmd_syscall = SYSCALL $@
- 			   -Wl,-soname=linux-gate.so.1 -o $@ \
- 			   -Wl,-T,$(filter-out FORCE,$^)
- 
--$(obj)/vsyscall-int80.so
-+$(obj)/vsyscall-int80.so \
- $(obj)/vsyscall-sysenter.so $(obj)/vsyscall-syscall.so: \
- $(obj)/vsyscall-%.so: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE
- 	$(call if_changed,syscall)

linux-2.6-xen-move-vdso-fixmap.patch:
 arch/i386/mm/pgtable-xen.c             |    1 -
 include/asm-i386/a.out.h               |    2 +-
 include/asm-i386/elf.h                 |    7 ++++++-
 include/asm-i386/fixmap.h              |    9 ---------
 include/asm-i386/mach-xen/asm/fixmap.h |    9 ---------
 include/asm-i386/mach-xen/asm/page.h   |    2 ++
 include/asm-i386/page.h                |    2 ++
 7 files changed, 11 insertions(+), 21 deletions(-)

Index: linux-2.6-xen-move-vdso-fixmap.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-move-vdso-fixmap.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-xen-move-vdso-fixmap.patch	6 Mar 2006 16:31:48 -0000	1.2
+++ linux-2.6-xen-move-vdso-fixmap.patch	26 Apr 2006 11:13:46 -0000	1.3
@@ -1,3 +1,6 @@
+
+This has been heavily hand edited (Juan Quintela)
+
 # HG changeset patch
 # User cl349 at firebug.cl.cam.ac.uk
 # Node ID 822a27d28afeab1ffdf8ca8e8e8a11de5e7c7aec
@@ -8,131 +11,6 @@
 From: Gerd Hoffmann <kraxel at suse.de>
 Signed-off-by: Christian Limpach <Christian.Limpach at cl.cam.ac.uk>
 
-diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/arch/i386/kernel/asm-offsets.c
---- a/linux-2.6-xen-sparse/arch/i386/kernel/asm-offsets.c	Thu Feb 23 15:22:17 2006 +0000
-+++ b/linux-2.6-xen-sparse/arch/i386/kernel/asm-offsets.c	Thu Feb 23 15:22:19 2006 +0000
-@@ -13,6 +13,7 @@
- #include <asm/fixmap.h>
- #include <asm/processor.h>
- #include <asm/thread_info.h>
-+#include <asm/elf.h>
- 
- #define DEFINE(sym, val) \
-         asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-@@ -70,5 +71,5 @@ void foo(void)
- #endif
- 
- 	DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
--	DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL));
-+	DEFINE(VSYSCALL_BASE, VSYSCALL_BASE);
- }
-diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/arch/i386/kernel/sysenter.c
---- a/linux-2.6-xen-sparse/arch/i386/kernel/sysenter.c	Thu Feb 23 15:22:17 2006 +0000
-+++ b/linux-2.6-xen-sparse/arch/i386/kernel/sysenter.c	Thu Feb 23 15:22:19 2006 +0000
-@@ -13,6 +13,7 @@
- #include <linux/gfp.h>
- #include <linux/string.h>
- #include <linux/elf.h>
-+#include <linux/mm.h>
- 
- #include <asm/cpufeature.h>
- #include <asm/msr.h>
-@@ -47,25 +48,90 @@ void enable_sep_cpu(void)
-  */
- extern const char vsyscall_int80_start, vsyscall_int80_end;
- extern const char vsyscall_sysenter_start, vsyscall_sysenter_end;
-+static void *syscall_page;
- 
- int __init sysenter_setup(void)
- {
--	void *page = (void *)get_zeroed_page(GFP_ATOMIC);
--
--	__set_fixmap(FIX_VSYSCALL, __pa(page), PAGE_READONLY_EXEC);
-+	syscall_page = (void *)get_zeroed_page(GFP_ATOMIC);
- 
- #ifdef CONFIG_X86_SYSENTER
- 	if (boot_cpu_has(X86_FEATURE_SEP)) {
--		memcpy(page,
-+		memcpy(syscall_page,
- 		       &vsyscall_sysenter_start,
- 		       &vsyscall_sysenter_end - &vsyscall_sysenter_start);
- 		return 0;
- 	}
- #endif
- 
--	memcpy(page,
-+	memcpy(syscall_page,
- 	       &vsyscall_int80_start,
- 	       &vsyscall_int80_end - &vsyscall_int80_start);
- 
- 	return 0;
- }
-+
-+static struct page*
-+syscall_nopage(struct vm_area_struct *vma, unsigned long adr, int *type)
-+{
-+	struct page *p = virt_to_page(adr - vma->vm_start + syscall_page);
-+	get_page(p);
-+	return p;
-+}
-+
-+/* Prevent VMA merging */
-+static void syscall_vma_close(struct vm_area_struct *vma)
-+{
-+}
-+
-+static struct vm_operations_struct syscall_vm_ops = {
-+	.close = syscall_vma_close,
-+	.nopage = syscall_nopage,
-+};
-+
-+/* Setup a VMA at program startup for the vsyscall page */
-+int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
-+{
-+	struct vm_area_struct *vma;
-+	struct mm_struct *mm = current->mm;
-+	int ret;
-+
-+	vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
-+	if (!vma)
-+		return -ENOMEM;
-+
-+	memset(vma, 0, sizeof(struct vm_area_struct));
-+	/* Could randomize here */
-+	vma->vm_start = VSYSCALL_BASE;
-+	vma->vm_end = VSYSCALL_BASE + PAGE_SIZE;
-+	/* MAYWRITE to allow gdb to COW and set breakpoints */
-+	vma->vm_flags = VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYEXEC|VM_MAYWRITE;
-+	vma->vm_flags |= mm->def_flags;
-+	vma->vm_page_prot = protection_map[vma->vm_flags & 7];
-+	vma->vm_ops = &syscall_vm_ops;
-+	vma->vm_mm = mm;
-+
-+	down_write(&mm->mmap_sem);
-+	if ((ret = insert_vm_struct(mm, vma))) {
-+		up_write(&mm->mmap_sem);
-+		kmem_cache_free(vm_area_cachep, vma);
-+		return ret;
-+	}
-+	mm->total_vm++;
-+	up_write(&mm->mmap_sem);
-+	return 0;
-+}
-+
-+struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
-+{
-+	return NULL;
-+}
-+
-+int in_gate_area(struct task_struct *task, unsigned long addr)
-+{
-+	return 0;
-+}
-+
-+int in_gate_area_no_task(unsigned long addr)
-+{
-+	return 0;
-+}
 diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/arch/i386/mm/pgtable-xen.c
 --- a/linux-2.6-xen-sparse/arch/i386/mm/pgtable-xen.c	Thu Feb 23 15:22:17 2006 +0000
 +++ b/linux-2.6-xen-sparse/arch/i386/mm/pgtable-xen.c	Thu Feb 23 15:22:19 2006 +0000

linux-2.6-xen-vsyscall_base.patch:
 asm-offsets.c |    1 -
 1 files changed, 1 deletion(-)

Index: linux-2.6-xen-vsyscall_base.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-vsyscall_base.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-xen-vsyscall_base.patch	6 Mar 2006 16:31:49 -0000	1.2
+++ linux-2.6-xen-vsyscall_base.patch	26 Apr 2006 11:13:46 -0000	1.3
@@ -14,5 +14,5 @@
  #endif
  
  	DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
--	DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL));
+-	DEFINE(VSYSCALL_BASE, VSYSCALL_BASE);
  }

linux-2.6-xen.patch:
 arch/x86_64/kernel/head-xen.S                           |    1 
 new/arch/i386/Kconfig                                   |   94 
 new/arch/i386/Kconfig.cpu                               |    2 
 new/arch/i386/Kconfig.debug                             |    1 
 new/arch/i386/Makefile                                  |   24 
 new/arch/i386/boot-xen/Makefile                         |   21 
 new/arch/i386/kernel/Makefile                           |   22 
 new/arch/i386/kernel/acpi/Makefile                      |    4 
 new/arch/i386/kernel/acpi/boot-xen.c                    | 1170 ++++++
 new/arch/i386/kernel/apic-xen.c                         |  160 
 new/arch/i386/kernel/asm-offsets.c                      |   10 
 new/arch/i386/kernel/cpu/Makefile                       |    5 
 new/arch/i386/kernel/cpu/common-xen.c                   |  732 ++++
 new/arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 new/arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 new/arch/i386/kernel/early_printk-xen.c                 |    2 
 new/arch/i386/kernel/entry-xen.S                        |  903 +++++
 new/arch/i386/kernel/entry.S                            |   10 
 new/arch/i386/kernel/fixup.c                            |   96 
 new/arch/i386/kernel/head-xen.S                         |  171 
 new/arch/i386/kernel/init_task-xen.c                    |   51 
 new/arch/i386/kernel/io_apic-xen.c                      | 2748 ++++++++++++++++
 new/arch/i386/kernel/ioport-xen.c                       |  122 
 new/arch/i386/kernel/irq-xen.c                          |  306 +
 new/arch/i386/kernel/irq.c                              |    4 
 new/arch/i386/kernel/ldt-xen.c                          |  269 +
 new/arch/i386/kernel/microcode-xen.c                    |  148 
 new/arch/i386/kernel/mpparse-xen.c                      | 1176 ++++++
 new/arch/i386/kernel/pci-dma-xen.c                      |  344 ++
 new/arch/i386/kernel/process-xen.c                      |  824 ++++
 new/arch/i386/kernel/quirks-xen.c                       |   48 
 new/arch/i386/kernel/setup-xen.c                        | 1854 ++++++++++
 new/arch/i386/kernel/smp-xen.c                          |  613 +++
 new/arch/i386/kernel/swiotlb.c                          |  674 +++
 new/arch/i386/kernel/sysenter.c                         |  102 
 new/arch/i386/kernel/time-xen.c                         | 1097 ++++++
 new/arch/i386/kernel/traps-xen.c                        | 1137 ++++++
 new/arch/i386/kernel/traps.c                            |    9 
 new/arch/i386/kernel/vm86.c                             |    8 
 new/arch/i386/kernel/vsyscall-note-xen.S                |   32 
 new/arch/i386/mach-xen/Makefile                         |    5 
 new/arch/i386/mach-xen/setup.c                          |   49 
 new/arch/i386/mm/Makefile                               |    8 
 new/arch/i386/mm/fault-xen.c                            |  683 +++
 new/arch/i386/mm/highmem-xen.c                          |  123 
 new/arch/i386/mm/hypervisor.c                           |  424 ++
 new/arch/i386/mm/init-xen.c                             |  855 ++++
 new/arch/i386/mm/ioremap-xen.c                          |  486 ++
 new/arch/i386/mm/pageattr.c                             |    2 
 new/arch/i386/mm/pgtable-xen.c                          |  652 +++
 new/arch/i386/mm/pgtable.c                              |   12 
 new/arch/i386/oprofile/Makefile                         |    4 
 new/arch/i386/oprofile/xenoprof.c                       |  441 ++
 new/arch/i386/pci/Makefile                              |    9 
 new/arch/i386/pci/irq-xen.c                             | 1205 +++++++
 new/arch/i386/pci/pcifront.c                            |   55 
 new/arch/i386/power/Makefile                            |    4 
 new/arch/ia64/Kconfig                                   |   51 
 new/arch/ia64/Makefile                                  |   16 
 new/arch/ia64/hp/sim/Makefile                           |    2 
 new/arch/ia64/kernel/entry.S                            |   32 
 new/arch/ia64/kernel/head.S                             |    6 
 new/arch/ia64/kernel/pal.S                              |    5 
 new/arch/ia64/kernel/sal.c                              |    3 
 new/arch/ia64/kernel/setup.c                            |   32 
 new/arch/ia64/xen/Makefile                              |    5 
 new/arch/ia64/xen/drivers/Makefile                      |   20 
 new/arch/ia64/xen/drivers/README                        |    2 
 new/arch/ia64/xen/drivers/coreMakefile                  |   26 
 new/arch/ia64/xen/drivers/evtchn_ia64.c                 |  273 +
 new/arch/ia64/xen/drivers/patches/blkback.c.patch       |   33 
 new/arch/ia64/xen/drivers/patches/console.c.patch       |   11 
 new/arch/ia64/xen/drivers/patches/devmem.c.patch        |    2 
 new/arch/ia64/xen/drivers/patches/gnttab.c.patch        |   33 
 new/arch/ia64/xen/drivers/patches/privcmd.c.patch       |   30 
 new/arch/ia64/xen/drivers/xenia64_init.c                |   55 
 new/arch/ia64/xen/hypercall.S                           |  365 ++
 new/arch/ia64/xen/xen_ksyms.c                           |   12 
 new/arch/ia64/xen/xenconsole.c                          |   19 
 new/arch/ia64/xen/xenentry.S                            |  850 ++++
 new/arch/ia64/xen/xenhpski.c                            |   19 
 new/arch/ia64/xen/xenivt.S                              | 2032 +++++++++++
 new/arch/ia64/xen/xenminstate.h                         |  367 ++
 new/arch/ia64/xen/xenpal.S                              |   73 
 new/arch/ia64/xen/xensetup.S                            |   35 
 new/arch/um/kernel/physmem.c                            |    4 
 new/arch/x86_64/Kconfig                                 |   60 
 new/arch/x86_64/Makefile                                |   20 
 new/arch/x86_64/ia32/Makefile                           |   20 
 new/arch/x86_64/ia32/ia32entry-xen.S                    |  725 ++++
 new/arch/x86_64/ia32/syscall32-xen.c                    |  128 
 new/arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 new/arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 new/arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 new/arch/x86_64/kernel/Makefile                         |   19 
 new/arch/x86_64/kernel/acpi/Makefile                    |    1 
 new/arch/x86_64/kernel/apic-xen.c                       |  198 +
 new/arch/x86_64/kernel/asm-offsets.c                    |    2 
 new/arch/x86_64/kernel/e820-xen.c                       |  777 ++++
 new/arch/x86_64/kernel/early_printk-xen.c               |  304 +
 new/arch/x86_64/kernel/entry-xen.S                      | 1141 ++++++
 new/arch/x86_64/kernel/entry.S                          |    2 
 new/arch/x86_64/kernel/genapic-xen.c                    |  144 
 new/arch/x86_64/kernel/genapic_xen.c                    |  162 
 new/arch/x86_64/kernel/head-xen.S                       |  163 
 new/arch/x86_64/kernel/head64-xen.c                     |  140 
 new/arch/x86_64/kernel/init_task.c                      |    3 
 new/arch/x86_64/kernel/io_apic-xen.c                    | 2229 ++++++++++++
 new/arch/x86_64/kernel/ioport-xen.c                     |   58 
 new/arch/x86_64/kernel/irq-xen.c                        |  163 
 new/arch/x86_64/kernel/irq.c                            |    4 
 new/arch/x86_64/kernel/ldt-xen.c                        |  282 +
 new/arch/x86_64/kernel/mpparse-xen.c                    | 1002 +++++
 new/arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 new/arch/x86_64/kernel/process-xen.c                    |  802 ++++
 new/arch/x86_64/kernel/setup-xen.c                      | 1679 +++++++++
 new/arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 new/arch/x86_64/kernel/smp-xen.c                        |  596 +++
 new/arch/x86_64/kernel/smp.c                            |    4 
 new/arch/x86_64/kernel/traps-xen.c                      | 1025 +++++
 new/arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 new/arch/x86_64/kernel/x8664_ksyms-xen.c                |  155 
 new/arch/x86_64/kernel/xen_entry.S                      |   40 
 new/arch/x86_64/mm/Makefile                             |   10 
 new/arch/x86_64/mm/fault-xen.c                          |  644 +++
 new/arch/x86_64/mm/init-xen.c                           | 1176 ++++++
 new/arch/x86_64/mm/pageattr-xen.c                       |  390 ++
 new/arch/x86_64/oprofile/Makefile                       |    5 
 new/arch/x86_64/pci/Makefile                            |   12 
 new/drivers/Makefile                                    |    1 
 new/drivers/acpi/Kconfig                                |    3 
 new/drivers/char/mem.c                                  |    6 
 new/drivers/char/tpm/Kconfig                            |   14 
 new/drivers/char/tpm/Makefile                           |    1 
 new/drivers/char/tpm/tpm.c                              |   44 
 new/drivers/char/tpm/tpm.h                              |    7 
 new/drivers/char/tpm/tpm_xen.c                          |  536 +++
 new/drivers/char/tty_io.c                               |    7 
 new/drivers/firmware/Kconfig                            |    2 
 new/drivers/pci/Kconfig                                 |    1 
 new/drivers/serial/Kconfig                              |    1 
 new/drivers/video/Kconfig                               |    2 
 new/drivers/xen/Kconfig                                 |  223 +
 new/drivers/xen/Makefile                                |   22 
 new/drivers/xen/balloon/Makefile                        |    2 
 new/drivers/xen/balloon/balloon.c                       |  592 +++
 new/drivers/xen/blkback/Makefile                        |    3 
 new/drivers/xen/blkback/blkback.c                       |  597 +++
 new/drivers/xen/blkback/common.h                        |  145 
 new/drivers/xen/blkback/interface.c                     |  181 +
 new/drivers/xen/blkback/vbd.c                           |  126 
 new/drivers/xen/blkback/xenbus.c                        |  421 ++
 new/drivers/xen/blkfront/Kconfig                        |    6 
 new/drivers/xen/blkfront/Makefile                       |    5 
 new/drivers/xen/blkfront/blkfront.c                     |  819 ++++
 new/drivers/xen/blkfront/block.h                        |  165 
 new/drivers/xen/blkfront/vbd.c                          |  327 +
 new/drivers/xen/blktap/Makefile                         |    3 
 new/drivers/xen/blktap/blktap.c                         |  910 +++++
 new/drivers/xen/blktap/common.h                         |  110 
 new/drivers/xen/blktap/interface.c                      |  143 
 new/drivers/xen/blktap/xenbus.c                         |  233 +
 new/drivers/xen/char/Makefile                           |    2 
 new/drivers/xen/char/mem.c                              |  192 +
 new/drivers/xen/console/Makefile                        |    2 
 new/drivers/xen/console/console.c                       |  648 +++
 new/drivers/xen/console/xencons_ring.c                  |  151 
 new/drivers/xen/core/Makefile                           |   11 
 new/drivers/xen/core/evtchn.c                           |  867 +++++
 new/drivers/xen/core/features.c                         |   29 
 new/drivers/xen/core/gnttab.c                           |  471 ++
 new/drivers/xen/core/hypervisor_sysfs.c                 |   57 
 new/drivers/xen/core/reboot.c                           |  381 ++
 new/drivers/xen/core/skbuff.c                           |  144 
 new/drivers/xen/core/smpboot.c                          |  576 +++
 new/drivers/xen/core/xen_proc.c                         |   29 
 new/drivers/xen/core/xen_sysfs.c                        |  311 +
 new/drivers/xen/evtchn/Makefile                         |    2 
 new/drivers/xen/evtchn/evtchn.c                         |  464 ++
 new/drivers/xen/net_driver_util.c                       |   68 
 new/drivers/xen/netback/Makefile                        |    5 
 new/drivers/xen/netback/common.h                        |  133 
 new/drivers/xen/netback/interface.c                     |  328 +
 new/drivers/xen/netback/loopback.c                      |  254 +
 new/drivers/xen/netback/netback.c                       |  864 +++++
 new/drivers/xen/netback/xenbus.c                        |  366 ++
 new/drivers/xen/netfront/Kconfig                        |    6 
 new/drivers/xen/netfront/Makefile                       |    4 
 new/drivers/xen/netfront/netfront.c                     | 1522 ++++++++
 new/drivers/xen/pciback/Makefile                        |   10 
 new/drivers/xen/pciback/conf_space.c                    |  345 ++
 new/drivers/xen/pciback/conf_space.h                    |   97 
 new/drivers/xen/pciback/conf_space_header.c             |  267 +
 new/drivers/xen/pciback/passthrough.c                   |  157 
 new/drivers/xen/pciback/pci_stub.c                      |  695 ++++
 new/drivers/xen/pciback/pciback.h                       |   78 
 new/drivers/xen/pciback/pciback_ops.c                   |   74 
 new/drivers/xen/pciback/vpci.c                          |  204 +
 new/drivers/xen/pciback/xenbus.c                        |  441 ++
 new/drivers/xen/pcifront/Makefile                       |    7 
 new/drivers/xen/pcifront/pci.c                          |   46 
 new/drivers/xen/pcifront/pci_op.c                       |  272 +
 new/drivers/xen/pcifront/pcifront.h                     |   40 
 new/drivers/xen/pcifront/xenbus.c                       |  294 +
 new/drivers/xen/privcmd/Makefile                        |    2 
 new/drivers/xen/privcmd/privcmd.c                       |  303 +
 new/drivers/xen/tpmback/Makefile                        |    4 
 new/drivers/xen/tpmback/common.h                        |   92 
 new/drivers/xen/tpmback/interface.c                     |  193 +
 new/drivers/xen/tpmback/tpmback.c                       | 1061 ++++++
 new/drivers/xen/tpmback/xenbus.c                        |  316 +
 new/drivers/xen/tpmfront/Makefile                       |    2 
 new/drivers/xen/tpmfront/tpmfront.c                     |  767 ++++
 new/drivers/xen/tpmfront/tpmfront.h                     |   40 
 new/drivers/xen/util.c                                  |   80 
 new/drivers/xen/xenbus/Makefile                         |   12 
 new/drivers/xen/xenbus/xenbus_backend_client.c          |  165 
 new/drivers/xen/xenbus/xenbus_client.c                  |  284 +
 new/drivers/xen/xenbus/xenbus_comms.c                   |  218 +
 new/drivers/xen/xenbus/xenbus_comms.h                   |   53 
 new/drivers/xen/xenbus/xenbus_dev.c                     |  255 +
 new/drivers/xen/xenbus/xenbus_probe.c                   | 1093 ++++++
 new/drivers/xen/xenbus/xenbus_xs.c                      |  856 ++++
 new/fs/Kconfig                                          |    1 
 new/include/asm-i386/a.out.h                            |    2 
 new/include/asm-i386/apic.h                             |    2 
 new/include/asm-i386/elf.h                              |    7 
 new/include/asm-i386/fixmap.h                           |   13 
 new/include/asm-i386/mach-default/mach_traps.h          |   12 
 new/include/asm-i386/mach-xen/asm/agp.h                 |   37 
 new/include/asm-i386/mach-xen/asm/desc.h                |  164 
 new/include/asm-i386/mach-xen/asm/dma-mapping.h         |  156 
 new/include/asm-i386/mach-xen/asm/fixmap.h              |  156 
 new/include/asm-i386/mach-xen/asm/floppy.h              |  147 
 new/include/asm-i386/mach-xen/asm/highmem.h             |   81 
 new/include/asm-i386/mach-xen/asm/hw_irq.h              |   73 
 new/include/asm-i386/mach-xen/asm/hypercall.h           |  357 ++
 new/include/asm-i386/mach-xen/asm/hypervisor.h          |  224 +
 new/include/asm-i386/mach-xen/asm/io.h                  |  390 ++
 new/include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 new/include/asm-i386/mach-xen/asm/mmu.h                 |   21 
 new/include/asm-i386/mach-xen/asm/mmu_context.h         |  105 
 new/include/asm-i386/mach-xen/asm/page.h                |  326 +
 new/include/asm-i386/mach-xen/asm/param.h               |   24 
 new/include/asm-i386/mach-xen/asm/pci.h                 |  154 
 new/include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 new/include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 new/include/asm-i386/mach-xen/asm/pgtable-2level.h      |   85 
 new/include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 new/include/asm-i386/mach-xen/asm/pgtable-3level.h      |  183 +
 new/include/asm-i386/mach-xen/asm/pgtable.h             |  520 +++
 new/include/asm-i386/mach-xen/asm/processor.h           |  754 ++++
 new/include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 new/include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 new/include/asm-i386/mach-xen/asm/segment.h             |  117 
 new/include/asm-i386/mach-xen/asm/setup.h               |   64 
 new/include/asm-i386/mach-xen/asm/smp.h                 |  104 
 new/include/asm-i386/mach-xen/asm/spinlock.h            |  200 +
 new/include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 new/include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 
 new/include/asm-i386/mach-xen/asm/system.h              |  576 +++
 new/include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 new/include/asm-i386/mach-xen/asm/vga.h                 |   20 
 new/include/asm-i386/mach-xen/irq_vectors.h             |  125 
 new/include/asm-i386/mach-xen/mach_traps.h              |   33 
 new/include/asm-i386/mach-xen/setup_arch_post.h         |   69 
 new/include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 new/include/asm-i386/page.h                             |    4 
 new/include/asm-i386/pgtable-2level-defs.h              |    2 
 new/include/asm-i386/pgtable-3level-defs.h              |    2 
 new/include/asm-ia64/fixmap.h                           |    2 
 new/include/asm-ia64/gcc_intrin.h                       |   60 
 new/include/asm-ia64/hypercall.h                        |  274 +
 new/include/asm-ia64/hypervisor.h                       |  138 
 new/include/asm-ia64/intel_intrin.h                     |   68 
 new/include/asm-ia64/meminit.h                          |    5 
 new/include/asm-ia64/pal.h                              |    1 
 new/include/asm-ia64/privop.h                           |   59 
 new/include/asm-ia64/processor.h                        |    1 
 new/include/asm-ia64/synch_bitops.h                     |   61 
 new/include/asm-ia64/system.h                           |    4 
 new/include/asm-ia64/xen/privop.h                       |  277 +
 new/include/asm-um/page.h                               |    2 
 new/include/asm-x86_64/apic.h                           |    2 
 new/include/asm-x86_64/hw_irq.h                         |    2 
 new/include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 new/include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 new/include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 new/include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 +
 new/include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 new/include/asm-x86_64/mach-xen/asm/fixmap.h            |  114 
 new/include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 new/include/asm-x86_64/mach-xen/asm/hw_irq.h            |  141 
 new/include/asm-x86_64/mach-xen/asm/hypercall.h         |  357 ++
 new/include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 new/include/asm-x86_64/mach-xen/asm/io.h                |  328 +
 new/include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 new/include/asm-x86_64/mach-xen/asm/mmu.h               |   33 
 new/include/asm-x86_64/mach-xen/asm/mmu_context.h       |  134 
 new/include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 new/include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 new/include/asm-x86_64/mach-xen/asm/page.h              |  317 +
 new/include/asm-x86_64/mach-xen/asm/param.h             |   23 
 new/include/asm-x86_64/mach-xen/asm/pci.h               |  174 +
 new/include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 new/include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 +++
 new/include/asm-x86_64/mach-xen/asm/processor.h         |  494 ++
 new/include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 new/include/asm-x86_64/mach-xen/asm/smp.h               |  153 
 new/include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 new/include/asm-x86_64/mach-xen/asm/system.h            |  428 ++
 new/include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 new/include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 new/include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 new/include/asm-x86_64/mach-xen/asm/xor.h               |  328 +
 new/include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 new/include/asm-x86_64/mach-xen/mach_time.h             |  111 
 new/include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 new/include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 new/include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 new/include/linux/gfp.h                                 |    6 
 new/include/linux/highmem.h                             |    6 
 new/include/linux/mm.h                                  |   13 
 new/include/linux/pfn.h                                 |    2 
 new/include/linux/skbuff.h                              |   13 
 new/include/xen/balloon.h                               |   73 
 new/include/xen/driver_util.h                           |   26 
 new/include/xen/evtchn.h                                |  126 
 new/include/xen/features.h                              |   20 
 new/include/xen/foreign_page.h                          |   40 
 new/include/xen/gnttab.h                                |  160 
 new/include/xen/hypervisor_sysfs.h                      |   32 
 new/include/xen/interface/acm.h                         |  187 +
 new/include/xen/interface/acm_ops.h                     |   98 
 new/include/xen/interface/arch-ia64.h                   |  337 +
 new/include/xen/interface/arch-x86_32.h                 |  200 +
 new/include/xen/interface/arch-x86_64.h                 |  273 +
 new/include/xen/interface/callback.h                    |   63 
 new/include/xen/interface/dom0_ops.h                    |  533 +++
 new/include/xen/interface/event_channel.h               |  211 +
 new/include/xen/interface/features.h                    |   53 
 new/include/xen/interface/grant_table.h                 |  311 +
 new/include/xen/interface/hvm/hvm_info_table.h          |   24 
 new/include/xen/interface/hvm/ioreq.h                   |   94 
 new/include/xen/interface/hvm/vmx_assist.h              |   97 
 new/include/xen/interface/io/blkif.h                    |   85 
 new/include/xen/interface/io/console.h                  |   33 
 new/include/xen/interface/io/netif.h                    |   84 
 new/include/xen/interface/io/pciif.h                    |   55 
 new/include/xen/interface/io/ring.h                     |  265 +
 new/include/xen/interface/io/tpmif.h                    |   56 
 new/include/xen/interface/io/xenbus.h                   |   42 
 new/include/xen/interface/io/xs_wire.h                  |   97 
 new/include/xen/interface/memory.h                      |  155 
 new/include/xen/interface/nmi.h                         |   59 
 new/include/xen/interface/physdev.h                     |   71 
 new/include/xen/interface/sched.h                       |  100 
 new/include/xen/interface/sched_ctl.h                   |   64 
 new/include/xen/interface/trace.h                       |   86 
 new/include/xen/interface/vcpu.h                        |  119 
 new/include/xen/interface/version.h                     |   64 
 new/include/xen/interface/xen-compat.h                  |   31 
 new/include/xen/interface/xen.h                         |  461 ++
 new/include/xen/interface/xenoprof.h                    |   91 
 new/include/xen/net_driver_util.h                       |   58 
 new/include/xen/pcifront.h                              |   39 
 new/include/xen/public/evtchn.h                         |  101 
 new/include/xen/public/privcmd.h                        |   94 
 new/include/xen/tpmfe.h                                 |   40 
 new/include/xen/xen_proc.h                              |   23 
 new/include/xen/xenbus.h                                |  306 +
 new/include/xen/xencons.h                               |   14 
 new/kernel/Kconfig.preempt                              |    1 
 new/kernel/irq/manage.c                                 |   24 
 new/lib/Kconfig.debug                                   |   31 
 new/lib/Makefile                                        |    3 
 new/mm/Kconfig                                          |    3 
 new/mm/highmem.c                                        |   11 
 new/mm/memory.c                                         |  116 
 new/mm/mmap.c                                           |    4 
 new/mm/page_alloc.c                                     |    6 
 new/net/core/dev.c                                      |   63 
 new/net/core/skbuff.c                                   |   41 
 new/net/ipv4/netfilter/ip_nat_proto_tcp.c               |    9 
 new/net/ipv4/netfilter/ip_nat_proto_udp.c               |   12 
 new/net/ipv4/xfrm4_output.c                             |    6 
 new/scripts/Makefile.xen                                |   14 
 387 files changed, 80387 insertions(+), 231 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.13 -r 1.14 linux-2.6-xen.patch
Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linux-2.6-xen.patch	22 Apr 2006 17:48:28 -0000	1.13
+++ linux-2.6-xen.patch	26 Apr 2006 11:13:46 -0000	1.14
@@ -1,6 +1,6 @@
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --exclude=.hg ../hg/linux-2.6/arch/i386/boot-xen/Makefile i386/arch/i386/boot-xen/Makefile
---- ../hg/linux-2.6/arch/i386/boot-xen/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ i386/arch/i386/boot-xen/Makefile	2006-04-20 07:09:43.000000000 -0400
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/boot-xen/Makefile new/arch/i386/boot-xen/Makefile
+--- ../upstream/hg/linux-2.6/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ new/arch/i386/boot-xen/Makefile	2006-04-24 23:54:19.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-from=/home/quintela/config/misc/dontdiff --exclude=.hg ../hg/linux-2.6/arch/i386/Kconfig i386/arch/i386/Kconfig
---- ../hg/linux-2.6/arch/i386/Kconfig	2006-04-17 13:34:05.000000000 -0400
-+++ i386/arch/i386/Kconfig	2006-04-20 07:09:43.000000000 -0400
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/Kconfig new/arch/i386/Kconfig
+--- ../upstream/hg/linux-2.6/arch/i386/Kconfig	2006-04-14 19:01:33.000000000 +0200
++++ new/arch/i386/Kconfig	2006-04-24 23:54:19.000000000 +0200
 @@ -91,6 +91,15 @@ config X86_PC
  	help
  	  Choose this option if your computer is a standard PC or compatible.
@@ -307,7 +307,7 @@
  	default y
  
  config X86_BIOS_REBOOT
-@@ -1127,6 +1175,21 @@ config X86_TRAMPOLINE
+@@ -1127,6 +1175,16 @@ config X86_TRAMPOLINE
  	depends on X86_SMP || (X86_VOYAGER && SMP)
  	default y
  
@@ -316,11 +316,6 @@
 +	depends on X86_XEN
 +	default y
 +
-+config X86_SYSENTER
-+	bool
-+	depends on !X86_NO_TSS
-+	default y
-+
 +config X86_NO_IDT
 +	bool
 +	depends on X86_XEN
@@ -329,9 +324,9 @@
  config KTIME_SCALAR
  	bool
  	default y
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --exclude=.hg ../hg/linux-2.6/arch/i386/Kconfig.cpu i386/arch/i386/Kconfig.cpu
---- ../hg/linux-2.6/arch/i386/Kconfig.cpu	2006-04-17 13:34:05.000000000 -0400
-+++ i386/arch/i386/Kconfig.cpu	2006-04-20 07:09:43.000000000 -0400
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/Kconfig.cpu new/arch/i386/Kconfig.cpu
+--- ../upstream/hg/linux-2.6/arch/i386/Kconfig.cpu	2006-04-14 19:01:33.000000000 +0200
++++ new/arch/i386/Kconfig.cpu	2006-04-24 23:54:19.000000000 +0200
 @@ -251,7 +251,7 @@ config X86_PPRO_FENCE
  
  config X86_F00F_BUG
@@ -341,9 +336,9 @@
  	default y
  
  config X86_WP_WORKS_OK
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --exclude=.hg ../hg/linux-2.6/arch/i386/Kconfig.debug i386/arch/i386/Kconfig.debug
---- ../hg/linux-2.6/arch/i386/Kconfig.debug	2006-04-18 16:49:18.000000000 -0400
-+++ i386/arch/i386/Kconfig.debug	2006-04-20 07:09:43.000000000 -0400
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/Kconfig.debug new/arch/i386/Kconfig.debug
+--- ../upstream/hg/linux-2.6/arch/i386/Kconfig.debug	2006-04-20 13:58:44.000000000 +0200
++++ new/arch/i386/Kconfig.debug	2006-04-24 23:54:19.000000000 +0200
 @@ -84,6 +84,7 @@ config X86_MPPARSE
  config DOUBLEFAULT
  	default y
@@ -352,9 +347,9 @@
  	help
            This option allows trapping of rare doublefault exceptions that
            would otherwise cause a system to silently reboot. Disabling this
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --exclude=.hg ../hg/linux-2.6/arch/i386/kernel/acpi/boot-xen.c i386/arch/i386/kernel/acpi/boot-xen.c
---- ../hg/linux-2.6/arch/i386/kernel/acpi/boot-xen.c	1969-12-31 19:00:00.000000000 -0500
-+++ i386/arch/i386/kernel/acpi/boot-xen.c	2006-04-20 07:09:43.000000000 -0400
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/kernel/acpi/boot-xen.c new/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
++++ new/arch/i386/kernel/acpi/boot-xen.c	2006-04-24 23:54:19.000000000 +0200
 @@ -0,0 +1,1170 @@
 +/*
 + *  boot.c - Architecture-Specific Low-Level ACPI Boot Support
@@ -1526,9 +1521,9 @@
 +
 +	return 0;
 +}
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --exclude=.hg ../hg/linux-2.6/arch/i386/kernel/acpi/Makefile i386/arch/i386/kernel/acpi/Makefile
---- ../hg/linux-2.6/arch/i386/kernel/acpi/Makefile	2006-04-17 13:34:05.000000000 -0400
-+++ i386/arch/i386/kernel/acpi/Makefile	2006-04-20 07:09:43.000000000 -0400
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/kernel/acpi/Makefile new/arch/i386/kernel/acpi/Makefile
+--- ../upstream/hg/linux-2.6/arch/i386/kernel/acpi/Makefile	2006-03-10 14:25:05.000000000 +0100
++++ new/arch/i386/kernel/acpi/Makefile	2006-04-24 23:54:19.000000000 +0200
 @@ -6,3 +6,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
  obj-y				+= cstate.o processor.o
  endif
@@ -1537,9 +1532,9 @@
 +include $(srctree)/scripts/Makefile.xen
 +obj-y := $(call cherrypickxen, $(obj-y), $(src))
 +endif
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --exclude=.hg ../hg/linux-2.6/arch/i386/kernel/apic-xen.c i386/arch/i386/kernel/apic-xen.c
---- ../hg/linux-2.6/arch/i386/kernel/apic-xen.c	1969-12-31 19:00:00.000000000 -0500
-+++ i386/arch/i386/kernel/apic-xen.c	2006-04-20 07:09:43.000000000 -0400
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/kernel/apic-xen.c new/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
++++ new/arch/i386/kernel/apic-xen.c	2006-04-24 23:54:19.000000000 +0200
 @@ -0,0 +1,160 @@
 +/*
 + *	Local APIC handling, local APIC timers
@@ -1701,9 +1696,9 @@
 +
 +	return 0;
 +}
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --exclude=.hg ../hg/linux-2.6/arch/i386/kernel/asm-offsets.c i386/arch/i386/kernel/asm-offsets.c
---- ../hg/linux-2.6/arch/i386/kernel/asm-offsets.c	2006-04-17 13:34:05.000000000 -0400
-+++ i386/arch/i386/kernel/asm-offsets.c	2006-04-20 07:09:43.000000000 -0400
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/kernel/asm-offsets.c new/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
++++ new/arch/i386/kernel/asm-offsets.c	2006-04-24 23:54:19.000000000 +0200
 @@ -13,6 +13,7 @@
  #include <asm/fixmap.h>
  #include <asm/processor.h>
@@ -1712,23 +1707,27 @@
  
  #define DEFINE(sym, val) \
          asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-@@ -63,10 +64,12 @@ void foo(void)
+@@ -63,10 +64,15 @@ void foo(void)
  	OFFSET(pbe_orig_address, pbe, orig_address);
  	OFFSET(pbe_next, pbe, next);
  
-+#ifdef CONFIG_X86_SYSENTER
++#ifndef CONFIG_X86_NO_TSS
  	/* Offset from the sysenter stack to tss.esp0 */
- 	DEFINE(TSS_sysenter_esp0, offsetof(struct tss_struct, esp0) -
+-	DEFINE(TSS_sysenter_esp0, offsetof(struct tss_struct, esp0) -
++	DEFINE(SYSENTER_stack_esp0, offsetof(struct tss_struct, esp0) -
  		 sizeof(struct tss_struct));
++#else
++	/* sysenter stack points directly to esp0 */
++	DEFINE(SYSENTER_stack_esp0, 0);
 +#endif
  
  	DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
 -	DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL));
 +	DEFINE(VSYSCALL_BASE, VSYSCALL_BASE);
  }
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --exclude=.hg ../hg/linux-2.6/arch/i386/kernel/cpu/common-xen.c i386/arch/i386/kernel/cpu/common-xen.c
---- ../hg/linux-2.6/arch/i386/kernel/cpu/common-xen.c	1969-12-31 19:00:00.000000000 -0500
-+++ i386/arch/i386/kernel/cpu/common-xen.c	2006-04-20 09:47:57.000000000 -0400
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/common-xen.c new/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
++++ new/arch/i386/kernel/cpu/common-xen.c	2006-04-25 12:35:17.000000000 +0200
 @@ -0,0 +1,732 @@
 +#include <linux/init.h>
 +#include <linux/string.h>
@@ -2462,9 +2461,9 @@
 +	per_cpu(cpu_tlbstate, cpu).active_mm = &init_mm;
 +}
 +#endif
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --exclude=.hg ../hg/linux-2.6/arch/i386/kernel/cpu/Makefile i386/arch/i386/kernel/cpu/Makefile
---- ../hg/linux-2.6/arch/i386/kernel/cpu/Makefile	2006-04-17 13:34:05.000000000 -0400
-+++ i386/arch/i386/kernel/cpu/Makefile	2006-04-20 07:09:43.000000000 -0400
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/Makefile new/arch/i386/kernel/cpu/Makefile
+--- ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/Makefile	2005-11-07 20:02:43.000000000 +0100
++++ new/arch/i386/kernel/cpu/Makefile	2006-04-24 23:54:19.000000000 +0200
 @@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE)	+=	mcheck/
  
  obj-$(CONFIG_MTRR)	+= 	mtrr/
@@ -2474,9 +2473,9 @@
 +include $(srctree)/scripts/Makefile.xen
 +obj-y := $(call cherrypickxen, $(obj-y), $(src))
 +endif
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --exclude=.hg ../hg/linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c i386/arch/i386/kernel/cpu/mtrr/main-xen.c
---- ../hg/linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c	1969-12-31 19:00:00.000000000 -0500
-+++ i386/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-04-20 07:09:43.000000000 -0400
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c new/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
++++ new/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-04-24 23:54:19.000000000 +0200
 @@ -0,0 +1,197 @@
 +#include <linux/init.h>
 +#include <linux/proc_fs.h>
@@ -2675,9 +2674,9 @@
 +}
 +
 +subsys_initcall(mtrr_init);
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --exclude=.hg ../hg/linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile i386/arch/i386/kernel/cpu/mtrr/Makefile
---- ../hg/linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile	2006-04-17 13:34:05.000000000 -0400
-+++ i386/arch/i386/kernel/cpu/mtrr/Makefile	2006-04-20 07:09:43.000000000 -0400
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile new/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
++++ new/arch/i386/kernel/cpu/mtrr/Makefile	2006-04-24 23:54:19.000000000 +0200
[...6381 lines suppressed...]
+ 	}						\
+ }
  
 +#ifdef CONFIG_XEN
-+	/* If a checksum-deferred packet is forwarded to a device that needs a
-+	 * checksum, correct the pointers and force checksumming.
-+	 */
++inline int skb_checksum_setup(struct sk_buff *skb)
++{
 +	if (skb->proto_csum_blank) {
 +		if (skb->protocol != htons(ETH_P_IP))
-+			goto out_kfree_skb;
++			goto out;
 +		skb->h.raw = (unsigned char *)skb->nh.iph + 4*skb->nh.iph->ihl;
 +		if (skb->h.raw >= skb->tail)
-+			goto out_kfree_skb;
++			goto out;
 +		switch (skb->nh.iph->protocol) {
 +		case IPPROTO_TCP:
 +			skb->csum = offsetof(struct tcphdr, check);
@@ -84332,20 +83696,39 @@
 +				printk(KERN_ERR "Attempting to checksum a non-"
 +				       "TCP/UDP packet, dropping a protocol"
 +				       " %d packet", skb->nh.iph->protocol);
-+			rc = -EPROTO;
-+			goto out_kfree_skb;
++			goto out;
 +		}
 +		if ((skb->h.raw + skb->csum + 2) > skb->tail)
-+			goto out_kfree_skb;
++			goto out;
 +		skb->ip_summed = CHECKSUM_HW;
 +		skb->proto_csum_blank = 0;
 +	}
++	return 0;
++out:
++	return -EPROTO;
++}
++#else
++inline int skb_checksum_setup(struct sk_buff *skb) {}
 +#endif
 +
++
+ /**
+  *	dev_queue_xmit - transmit a buffer
+  *	@skb: buffer to transmit
+@@ -1331,6 +1374,12 @@ int dev_queue_xmit(struct sk_buff *skb)
+ 	    __skb_linearize(skb, GFP_ATOMIC))
+ 		goto out_kfree_skb;
+ 
++ 	/* 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))
++ 		goto out_kfree_skb;
++  
  	/* If packet is not checksummed and device does not support
  	 * checksumming for this protocol, complete checksumming here.
  	 */
-@@ -1704,6 +1742,19 @@ int netif_receive_skb(struct sk_buff *sk
+@@ -1704,6 +1753,19 @@ int netif_receive_skb(struct sk_buff *sk
  	}
  #endif
  
@@ -84365,10 +83748,18 @@
  	list_for_each_entry_rcu(ptype, &ptype_all, list) {
  		if (!ptype->dev || ptype->dev == skb->dev) {
  			if (pt_prev) 
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --exclude=.hg ../hg/linux-2.6/net/core/skbuff.c i386/net/core/skbuff.c
---- ../hg/linux-2.6/net/core/skbuff.c	2006-04-17 13:34:25.000000000 -0400
-+++ i386/net/core/skbuff.c	2006-04-20 07:10:01.000000000 -0400
-@@ -132,6 +132,7 @@ void skb_under_panic(struct sk_buff *skb
+@@ -3410,6 +3472,7 @@ EXPORT_SYMBOL(unregister_netdevice_notif
+ EXPORT_SYMBOL(net_enable_timestamp);
+ EXPORT_SYMBOL(net_disable_timestamp);
+ EXPORT_SYMBOL(dev_get_flags);
++EXPORT_SYMBOL(skb_checksum_setup);
+ 
+ #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
+ EXPORT_SYMBOL(br_handle_frame_hook);
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/net/core/skbuff.c new/net/core/skbuff.c
+--- ../upstream/hg/linux-2.6/net/core/skbuff.c	2006-04-21 20:21:11.000000000 +0200
++++ new/net/core/skbuff.c	2006-04-24 23:57:00.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.
   */
@@ -84376,7 +83767,7 @@
  struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask,
  			    int fclone)
  {
-@@ -186,6 +187,7 @@ nodata:
+@@ -194,6 +195,7 @@ nodata:
  	skb = NULL;
  	goto out;
  }
@@ -84384,7 +83775,7 @@
  
  /**
   *	alloc_skb_from_cache	-	allocate a network buffer
-@@ -203,14 +205,18 @@ nodata:
+@@ -211,14 +213,18 @@ nodata:
   */
  struct sk_buff *alloc_skb_from_cache(kmem_cache_t *cp,
  				     unsigned int size,
@@ -84406,7 +83797,7 @@
  	if (!skb)
  		goto out;
  
-@@ -227,16 +233,29 @@ struct sk_buff *alloc_skb_from_cache(kme
+@@ -235,16 +241,29 @@ struct sk_buff *alloc_skb_from_cache(kme
  	skb->data = data;
  	skb->tail = data;
  	skb->end  = data + size;
@@ -84442,7 +83833,7 @@
  	skb = NULL;
  	goto out;
  }
-@@ -426,6 +445,10 @@ struct sk_buff *skb_clone(struct sk_buff
+@@ -434,6 +453,10 @@ struct sk_buff *skb_clone(struct sk_buff
  	C(local_df);
  	n->cloned = 1;
  	n->nohdr = 0;
@@ -84453,9 +83844,9 @@
  	C(pkt_type);
  	C(ip_summed);
  	C(priority);
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --exclude=.hg ../hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c i386/net/ipv4/netfilter/ip_nat_proto_tcp.c
---- ../hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-04-17 13:34:25.000000000 -0400
-+++ i386/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-04-20 07:10:02.000000000 -0400
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c new/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
++++ new/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-04-25 12:34:00.000000000 +0200
 @@ -129,10 +129,17 @@ tcp_manip_pkt(struct sk_buff **pskb,
  	if (hdrsize < sizeof(*hdr))
  		return 1;
@@ -84475,9 +83866,9 @@
  	return 1;
  }
  
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --exclude=.hg ../hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c i386/net/ipv4/netfilter/ip_nat_proto_udp.c
---- ../hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-04-17 13:34:25.000000000 -0400
-+++ i386/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-04-20 07:10:02.000000000 -0400
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c new/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
++++ new/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-04-25 12:34:00.000000000 +0200
 @@ -113,11 +113,19 @@ udp_manip_pkt(struct sk_buff **pskb,
  		newport = tuple->dst.u.udp.port;
  		portptr = &hdr->dest;
@@ -84500,9 +83891,32 @@
  	*portptr = newport;
  	return 1;
  }
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --exclude=.hg ../hg/linux-2.6/scripts/Makefile.xen i386/scripts/Makefile.xen
---- ../hg/linux-2.6/scripts/Makefile.xen	1969-12-31 19:00:00.000000000 -0500
-+++ i386/scripts/Makefile.xen	2006-04-20 07:10:02.000000000 -0400
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/net/ipv4/xfrm4_output.c new/net/ipv4/xfrm4_output.c
+--- ../upstream/hg/linux-2.6/net/ipv4/xfrm4_output.c	2006-02-18 11:50:03.000000000 +0100
++++ new/net/ipv4/xfrm4_output.c	2006-04-24 23:57:05.000000000 +0200
+@@ -17,6 +17,8 @@
+ #include <net/xfrm.h>
+ #include <net/icmp.h>
+ 
++extern int skb_checksum_setup(struct sk_buff *skb);
++
+ /* Add encapsulation header.
+  *
+  * In transport mode, the IP header will be moved forward to make space
+@@ -103,6 +105,10 @@ static int xfrm4_output_one(struct sk_bu
+ 	struct xfrm_state *x = dst->xfrm;
+ 	int err;
+ 	
++	err = skb_checksum_setup(skb);
++	if (err)
++		goto error_nolock;
++
+ 	if (skb->ip_summed == CHECKSUM_HW) {
+ 		err = skb_checksum_help(skb, 0);
+ 		if (err)
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/scripts/Makefile.xen new/scripts/Makefile.xen
+--- ../upstream/hg/linux-2.6/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
++++ new/scripts/Makefile.xen	2006-04-24 23:57:09.000000000 +0200
 @@ -0,0 +1,14 @@
 +
 +# cherrypickxen($1 = allobj)
@@ -84518,3 +83932,14 @@
 +	  )
 +# filterxen($1 = allobj, $2 = noobjs)
 +filterxen = $(filter-out $(2), $(1))
+diff -r c68722b17299 arch/x86_64/kernel/head-xen.S
+--- a/arch/x86_64/kernel/head-xen.S	Wed Apr 19 11:47:47 2006 +0100
++++ b/arch/x86_64/kernel/head-xen.S	Fri Apr 21 19:32:49 2006 -0400
+@@ -23,6 +23,7 @@
+ #include <asm/cache.h>
+ 
+ 	.text
++	.section .bootstrap.text
+ 	.code64
+ 	.globl startup_64
+ startup_64:



From fedora-cvs-commits at redhat.com  Wed Apr 26 11:21:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 07:21:08 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2160,1.2161
Message-ID: <200604261121.k3QBL8Lf030815@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30795

Modified Files:
	kernel-2.6.spec 
Log Message:
disable xen again


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2160
retrieving revision 1.2161
diff -u -r1.2160 -r1.2161
--- kernel-2.6.spec	26 Apr 2006 11:13:46 -0000	1.2160
+++ kernel-2.6.spec	26 Apr 2006 11:21:05 -0000	1.2161
@@ -9,7 +9,7 @@
 # Whether to apply the Xen patches, leave this enabled.
 %define includexen 1
 # Whether to build the Xen kernels, disable if you want.
-%define buildxen 1
+%define buildxen 0
 %define buildxenPAE 0
 %define builddoc 0
 %define buildkdump 1



From fedora-cvs-commits at redhat.com  Wed Apr 26 11:21:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 07:21:38 -0400
Subject: rpms/coreutils/devel coreutils.spec,1.111,1.112
Message-ID: <200604261121.k3QBLcaA031063@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31016

Modified Files:
	coreutils.spec 
Log Message:
- Avoid redeclared 'tee' function.


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- coreutils.spec	26 Apr 2006 11:02:25 -0000	1.111
+++ coreutils.spec	26 Apr 2006 11:21:36 -0000	1.112
@@ -41,6 +41,7 @@
 Patch908: coreutils-getgrouplist.patch
 Patch912: coreutils-overflow.patch
 Patch913: coreutils-afs.patch
+Patch914: coreutils-tee.patch
 
 #SELINUX Patch
 Patch950: coreutils-selinux.patch
@@ -93,6 +94,7 @@
 %patch908 -p1 -b .getgrouplist
 %patch912 -p1 -b .overflow
 %patch913 -p1 -b .afs
+%patch914 -p1 -b .tee
 
 #SELinux
 %patch950 -p1 -b .selinux
@@ -262,6 +264,7 @@
 
 %changelog
 * Wed Apr 26 2006 Tim Waugh <twaugh at redhat.com> 5.94-4
+- Avoid redeclared 'tee' function.
 - Fix 'cp -Z' when the destination exists (bug #189967).
 
 * Thu Apr 20 2006 Tim Waugh <twaugh at redhat.com> 5.94-3



From fedora-cvs-commits at redhat.com  Wed Apr 26 11:23:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 07:23:00 -0400
Subject: rpms/coreutils/devel coreutils-tee.patch,NONE,1.1
Message-ID: <200604261123.k3QBN0Hu031561@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31529

Added Files:
	coreutils-tee.patch 
Log Message:
Add the patch.

coreutils-tee.patch:
 tee.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE coreutils-tee.patch ---
--- coreutils-5.94/src/tee.c.tee	2006-04-26 12:20:43.000000000 +0100
+++ coreutils-5.94/src/tee.c	2006-04-26 12:20:44.000000000 +0100
@@ -31,7 +31,7 @@
 
 #define AUTHORS "Mike Parker", "Richard M. Stallman", "David MacKenzie"
 
-static bool tee (int nfiles, const char **files);
+static bool do_tee (int nfiles, const char **files);
 
 /* If true, append to output files rather than truncating them. */
 static bool append;
@@ -121,7 +121,7 @@
   /* Do *not* warn if tee is given no file arguments.
      POSIX requires that it work when given no arguments.  */
 
-  ok = tee (argc - optind, (const char **) &argv[optind]);
+  ok = do_tee (argc - optind, (const char **) &argv[optind]);
   if (close (STDIN_FILENO) != 0)
     error (EXIT_FAILURE, errno, _("standard input"));
 
@@ -133,7 +133,7 @@
    Return true if successful.  */
 
 static bool
-tee (int nfiles, const char **files)
+do_tee (int nfiles, const char **files)
 {
   FILE **descriptors;
   char buffer[BUFSIZ];



From fedora-cvs-commits at redhat.com  Wed Apr 26 11:32:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 07:32:34 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2161,1.2162
Message-ID: <200604261132.k3QBWYIK001898@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1867

Modified Files:
	kernel-2.6.spec 
Log Message:
enable xen again


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2161
retrieving revision 1.2162
diff -u -r1.2161 -r1.2162
--- kernel-2.6.spec	26 Apr 2006 11:21:05 -0000	1.2161
+++ kernel-2.6.spec	26 Apr 2006 11:32:28 -0000	1.2162
@@ -9,7 +9,7 @@
 # Whether to apply the Xen patches, leave this enabled.
 %define includexen 1
 # Whether to build the Xen kernels, disable if you want.
-%define buildxen 0
+%define buildxen 1
 %define buildxenPAE 0
 %define builddoc 0
 %define buildkdump 1



From fedora-cvs-commits at redhat.com  Wed Apr 26 11:56:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 07:56:51 -0400
Subject: rpms/pam/devel .cvsignore, 1.34, 1.35 pam.spec, 1.106, 1.107 sources,
	1.36, 1.37
Message-ID: <200604261156.k3QBupbV022201@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/pam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22164

Modified Files:
	.cvsignore pam.spec sources 
Log Message:
* Wed Apr 26 2006 Tomas Mraz <tmraz at redhat.com> 0.99.3.0-4
- fixed console device class for irda (#189966)
- make pam_console_apply fail gracefully when a class is missing



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	25 Apr 2006 14:53:39 -0000	1.34
+++ .cvsignore	26 Apr 2006 11:56:48 -0000	1.35
@@ -1,3 +1,3 @@
 Linux-PAM-0.99.3.0.tar.bz2
 db-4.3.29.tar.gz
-pam-redhat-0.99.4-1.tar.bz2
+pam-redhat-0.99.4-2.tar.bz2


Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- pam.spec	25 Apr 2006 14:53:39 -0000	1.106
+++ pam.spec	26 Apr 2006 11:56:48 -0000	1.107
@@ -6,12 +6,12 @@
 %define pwdb_version 0.62
 %define db_version 4.3.29
 %define db_conflicting_version 4.4.0
-%define pam_redhat_version 0.99.4-1
+%define pam_redhat_version 0.99.4-2
 
 Summary: A security tool which provides authentication for applications.
 Name: pam
 Version: 0.99.3.0
-Release: 3
+Release: 4
 License: GPL or BSD
 Group: System Environment/Base
 Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
@@ -361,6 +361,10 @@
 %{_libdir}/libpam_misc.so
 
 %changelog
+* Wed Apr 26 2006 Tomas Mraz <tmraz at redhat.com> 0.99.3.0-4
+- fixed console device class for irda (#189966)
+- make pam_console_apply fail gracefully when a class is missing
+
 * Tue Apr 25 2006 Tomas Mraz <tmraz at redhat.com> 0.99.3.0-3
 - added pam_namespace module written by Janak Desai (per-user /tmp
 support)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	25 Apr 2006 14:53:39 -0000	1.36
+++ sources	26 Apr 2006 11:56:48 -0000	1.37
@@ -1,3 +1,3 @@
 aabed0543f57dc3e4eebbb0779daf898  Linux-PAM-0.99.3.0.tar.bz2
 13585a20ce32f113b8e8cdb57f52e3bb  db-4.3.29.tar.gz
-754c2bd7c117aa898f477478b8bfb727  pam-redhat-0.99.4-1.tar.bz2
+fc3133446e2b2b3823ff1a296ca9981b  pam-redhat-0.99.4-2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 26 12:14:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 08:14:06 -0400
Subject: rpms/cups/devel cups.spec, 1.172, 1.173 cups-1.1.17-backend.patch,
	1.1, NONE
Message-ID: <200604261214.k3QCE6G7025447@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25388

Modified Files:
	cups.spec 
Removed Files:
	cups-1.1.17-backend.patch 
Log Message:
* Wed Apr 26 2006 Tim Waugh <twaugh at redhat.com>
- No longer need backend patch.



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- cups.spec	25 Apr 2006 22:30:02 -0000	1.172
+++ cups.spec	26 Apr 2006 12:14:03 -0000	1.173
@@ -26,7 +26,6 @@
 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
@@ -115,7 +114,6 @@
 %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
@@ -389,6 +387,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Apr 26 2006 Tim Waugh <twaugh at redhat.com>
+- No longer need backend patch.
+
 * Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com>
 - Own /var/run/cups (bug #189561).
 - Sync from svn5460 to svn5462.


--- cups-1.1.17-backend.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 26 12:22:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 08:22:19 -0400
Subject: rpms/kernel/devel linux-2.6-header-cleanup-git.patch, NONE,
	1.1 linux-2.6-header-install-git.patch, NONE,
	1.1 kernel-2.6.spec, 1.2162, 1.2163
Message-ID: <200604261222.k3QCMJB9009273@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9222

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-header-cleanup-git.patch 
	linux-2.6-header-install-git.patch 
Log Message:
kernel-headers subpackage

linux-2.6-header-cleanup-git.patch:
 acpi/platform/aclinux.h                      |    1 
 acpi/processor.h                             |    1 
 asm-alpha/bitops.h                           |    1 
 asm-alpha/cache.h                            |    1 
 asm-alpha/cacheflush.h                       |    1 
 asm-alpha/core_cia.h                         |    1 
 asm-alpha/core_t2.h                          |    1 
 asm-alpha/dma-mapping.h                      |    1 
 asm-alpha/dma.h                              |    1 
 asm-alpha/floppy.h                           |    1 
 asm-alpha/hardirq.h                          |    1 
 asm-alpha/hw_irq.h                           |    1 
 asm-alpha/ide.h                              |    1 
 asm-alpha/io.h                               |    1 
 asm-alpha/irq.h                              |    1 
 asm-alpha/kmap_types.h                       |    1 
 asm-alpha/machvec.h                          |    1 
 asm-alpha/mmu_context.h                      |    1 
 asm-alpha/mmzone.h                           |    1 
 asm-alpha/page.h                             |    1 
 asm-alpha/param.h                            |    1 
 asm-alpha/pgalloc.h                          |    1 
 asm-alpha/pgtable.h                          |    1 
 asm-alpha/serial.h                           |    1 
 asm-alpha/smp.h                              |    1 
 asm-alpha/spinlock.h                         |    1 
 asm-alpha/system.h                           |    1 
 asm-alpha/tlbflush.h                         |    1 
 asm-arm/apm.h                                |    1 
 asm-arm/arch-aaec2000/memory.h               |    1 
 asm-arm/arch-cl7500/acornfb.h                |    1 
 asm-arm/arch-clps711x/hardware.h             |    1 
 asm-arm/arch-clps711x/memory.h               |    1 
 asm-arm/arch-clps711x/uncompress.h           |    1 
 asm-arm/arch-ebsa285/hardware.h              |    1 
 asm-arm/arch-ebsa285/memory.h                |    1 
 asm-arm/arch-ebsa285/vmalloc.h               |    1 
 asm-arm/arch-integrator/smp.h                |    1 
 asm-arm/arch-iop3xx/memory.h                 |    1 
 asm-arm/arch-iop3xx/timex.h                  |    1 
 asm-arm/arch-iop3xx/uncompress.h             |    1 
 asm-arm/arch-ixp4xx/dma.h                    |    1 
 asm-arm/arch-lh7a40x/constants.h             |    1 
 asm-arm/arch-lh7a40x/irqs.h                  |    1 
 asm-arm/arch-lh7a40x/registers.h             |    1 
 asm-arm/arch-omap/board.h                    |    1 
 asm-arm/arch-omap/hardware.h                 |    1 
 asm-arm/arch-omap/system.h                   |    1 
 asm-arm/arch-omap/uncompress.h               |    1 
 asm-arm/arch-pxa/idp.h                       |    1 
 asm-arm/arch-pxa/irqs.h                      |    1 
 asm-arm/arch-pxa/pxa-regs.h                  |    1 
 asm-arm/arch-pxa/timex.h                     |    1 
 asm-arm/arch-realview/smp.h                  |    1 
 asm-arm/arch-s3c2410/dma.h                   |    1 
 asm-arm/arch-s3c2410/uncompress.h            |    1 
 asm-arm/arch-sa1100/assabet.h                |    1 
 asm-arm/arch-sa1100/cerf.h                   |    1 
 asm-arm/arch-sa1100/collie.h                 |    1 
 asm-arm/arch-sa1100/dma.h                    |    1 
 asm-arm/arch-sa1100/hardware.h               |    1 
 asm-arm/arch-sa1100/ide.h                    |    1 
 asm-arm/arch-sa1100/irqs.h                   |    1 
 asm-arm/arch-sa1100/memory.h                 |    1 
 asm-arm/arch-sa1100/system.h                 |    1 
 asm-arm/atomic.h                             |    1 
 asm-arm/bug.h                                |    1 
 asm-arm/cacheflush.h                         |    1 
 asm-arm/cpu.h                                |    1 
 asm-arm/dma-mapping.h                        |    1 
 asm-arm/dma.h                                |    1 
 asm-arm/elf.h                                |    1 
 asm-arm/fpstate.h                            |    1 
 asm-arm/glue.h                               |    1 
 asm-arm/hardirq.h                            |    1 
 asm-arm/hardware/dec21285.h                  |    1 
 asm-arm/hardware/iomd.h                      |    1 
 asm-arm/leds.h                               |    1 
 asm-arm/mach/serial_at91rm9200.h             |    1 
 asm-arm/mach/serial_sa1100.h                 |    1 
 asm-arm/memory.h                             |    1 
 asm-arm/page.h                               |    1 
 asm-arm/pci.h                                |    1 
 asm-arm/proc-fns.h                           |    1 
 asm-arm/ptrace.h                             |    1 
 asm-arm/smp.h                                |    1 
 asm-arm/system.h                             |    1 
 asm-arm/tlbflush.h                           |    1 
 asm-arm26/atomic.h                           |    1 
 asm-arm26/bug.h                              |    1 
 asm-arm26/dma.h                              |    1 
 asm-arm26/hardirq.h                          |    1 
 asm-arm26/hardware.h                         |    1 
 asm-arm26/io.h                               |    1 
 asm-arm26/leds.h                             |    1 
 asm-arm26/mach-types.h                       |    1 
 asm-arm26/page.h                             |    1 
 asm-arm26/pgtable.h                          |    1 
 asm-arm26/serial.h                           |    1 
 asm-arm26/smp.h                              |    1 
 asm-arm26/sysirq.h                           |    1 
 asm-arm26/system.h                           |    1 
 asm-cris/arch-v10/io.h                       |    1 
 asm-cris/arch-v10/page.h                     |    1 
 asm-cris/arch-v10/system.h                   |    1 
 asm-cris/arch-v32/io.h                       |    1 
 asm-cris/arch-v32/irq.h                      |    1 
 asm-cris/arch-v32/page.h                     |    1 
 asm-cris/arch-v32/processor.h                |    1 
 asm-cris/arch-v32/system.h                   |    1 
 asm-cris/eshlibld.h                          |    1 
 asm-cris/etraxgpio.h                         |    1 
 asm-cris/fasttimer.h                         |    1 
 asm-cris/page.h                              |    1 
 asm-cris/pci.h                               |    1 
 asm-cris/pgtable.h                           |    1 
 asm-cris/processor.h                         |    1 
 asm-cris/rtc.h                               |    1 
 asm-cris/tlbflush.h                          |    1 
 asm-frv/atomic.h                             |    1 
 asm-frv/bitops.h                             |    1 
 asm-frv/bug.h                                |    1 
 asm-frv/cache.h                              |    1 
 asm-frv/dma.h                                |    1 
 asm-frv/elf.h                                |    1 
 asm-frv/fpu.h                                |    1 
 asm-frv/hardirq.h                            |    1 
 asm-frv/highmem.h                            |    1 
 asm-frv/ide.h                                |    1 
 asm-frv/io.h                                 |    1 
 asm-frv/irq.h                                |    1 
 asm-frv/mmu_context.h                        |    1 
 asm-frv/page.h                               |    1 
 asm-frv/pci.h                                |    1 
 asm-frv/pgalloc.h                            |    1 
 asm-frv/pgtable.h                            |    1 
 asm-frv/processor.h                          |    1 
 asm-frv/segment.h                            |    1 
 asm-frv/serial.h                             |    1 
 asm-frv/smp.h                                |    1 
 asm-frv/system.h                             |    1 
 asm-frv/tlbflush.h                           |    1 
 asm-frv/types.h                              |    1 
 asm-frv/unaligned.h                          |    1 
 asm-frv/virtconvert.h                        |    1 
 asm-generic/bug.h                            |    1 
 asm-generic/dma-mapping.h                    |    1 
 asm-generic/fcntl.h                          |    1 
 asm-generic/local.h                          |    1 
 asm-generic/tlb.h                            |    1 
 asm-h8300/bitops.h                           |    1 
 asm-h8300/dma.h                              |    1 
 asm-h8300/elf.h                              |    1 
 asm-h8300/hardirq.h                          |    1 
 asm-h8300/io.h                               |    1 
 asm-h8300/keyboard.h                         |    1 
 asm-h8300/mmu_context.h                      |    1 
 asm-h8300/page.h                             |    1 
 asm-h8300/page_offset.h                      |    1 
 asm-h8300/param.h                            |    1 
 asm-h8300/pgtable.h                          |    1 
 asm-h8300/processor.h                        |    1 
 asm-h8300/semaphore-helper.h                 |    1 
 asm-h8300/shm.h                              |    1 
 asm-h8300/system.h                           |    1 
 asm-h8300/unaligned.h                        |    1 
 asm-h8300/virtconvert.h                      |    1 
 asm-i386/apic.h                              |    1 
 asm-i386/atomic.h                            |    1 
 asm-i386/bitops.h                            |    1 
 asm-i386/bug.h                               |    1 
 asm-i386/bugs.h                              |    1 
 asm-i386/byteorder.h                         |    1 
 asm-i386/cache.h                             |    1 
 asm-i386/dma.h                               |    1 
 asm-i386/fixmap.h                            |    1 
 asm-i386/hardirq.h                           |    1 
 asm-i386/highmem.h                           |    1 
 asm-i386/hpet.h                              |    1 
 asm-i386/hw_irq.h                            |    1 
 asm-i386/ide.h                               |    1 
 asm-i386/io.h                                |    1 
 asm-i386/io_apic.h                           |    1 
 asm-i386/irq.h                               |    1 
 asm-i386/kmap_types.h                        |    1 
 asm-i386/mach-summit/mach_apic.h             |    1 
 asm-i386/mmu_context.h                       |    1 
 asm-i386/mtrr.h                              |    1 
 asm-i386/page.h                              |    1 
 asm-i386/param.h                             |    1 
 asm-i386/pci.h                               |    1 
 asm-i386/pgalloc.h                           |    1 
 asm-i386/pgtable.h                           |    1 
 asm-i386/processor.h                         |    1 
 asm-i386/serial.h                            |    1 
 asm-i386/smp.h                               |    1 
 asm-i386/spinlock.h                          |    1 
 asm-i386/string.h                            |    1 
 asm-i386/system.h                            |    1 
 asm-i386/thread_info.h                       |    1 
 asm-i386/timex.h                             |    1 
 asm-i386/tlbflush.h                          |    1 
 asm-i386/types.h                             |    1 
 asm-i386/uaccess.h                           |    1 
 asm-ia64/asmmacro.h                          |    1 
 asm-ia64/cache.h                             |    1 
 asm-ia64/delay.h                             |    1 
 asm-ia64/dma-mapping.h                       |    1 
 asm-ia64/dma.h                               |    1 
 asm-ia64/elf.h                               |    1 
 asm-ia64/hardirq.h                           |    1 
 asm-ia64/ia32.h                              |    1 
 asm-ia64/ide.h                               |    1 
 asm-ia64/intrinsics.h                        |    1 
 asm-ia64/kmap_types.h                        |    1 
 asm-ia64/machvec.h                           |    1 
 asm-ia64/meminit.h                           |    1 
 asm-ia64/nodedata.h                          |    1 
 asm-ia64/numa.h                              |    1 
 asm-ia64/page.h                              |    1 
 asm-ia64/param.h                             |    1 
 asm-ia64/percpu.h                            |    1 
 asm-ia64/pgalloc.h                           |    1 
 asm-ia64/pgtable.h                           |    1 
 asm-ia64/processor.h                         |    1 
 asm-ia64/ptrace.h                            |    1 
 asm-ia64/smp.h                               |    1 
 asm-ia64/sn/simulator.h                      |    1 
 asm-ia64/sn/sn_cpuid.h                       |    1 
 asm-ia64/sn/sn_sal.h                         |    1 
 asm-ia64/sn/xpc.h                            |    1 
 asm-ia64/string.h                            |    1 
 asm-ia64/system.h                            |    1 
 asm-ia64/tlb.h                               |    1 
 asm-ia64/tlbflush.h                          |    1 
 asm-ia64/unistd.h                            |    1 
 asm-m32r/assembler.h                         |    1 
 asm-m32r/atomic.h                            |    1 
 asm-m32r/bitops.h                            |    1 
 asm-m32r/cacheflush.h                        |    1 
 asm-m32r/hardirq.h                           |    1 
 asm-m32r/ide.h                               |    1 
 asm-m32r/irq.h                               |    1 
 asm-m32r/kmap_types.h                        |    1 
 asm-m32r/m32104ut/m32104ut_pld.h             |    1 
 asm-m32r/m32700ut/m32700ut_lan.h             |    1 
 asm-m32r/m32700ut/m32700ut_lcd.h             |    1 
 asm-m32r/m32700ut/m32700ut_pld.h             |    1 
 asm-m32r/m32r.h                              |    1 
 asm-m32r/mmu.h                               |    1 
 asm-m32r/mmu_context.h                       |    2 -
 asm-m32r/opsput/opsput_lan.h                 |    1 
 asm-m32r/opsput/opsput_lcd.h                 |    1 
 asm-m32r/opsput/opsput_pld.h                 |    1 
 asm-m32r/page.h                              |    1 
 asm-m32r/pgalloc.h                           |    1 
 asm-m32r/pgtable-2level.h                    |    1 
 asm-m32r/pgtable.h                           |    1 
 asm-m32r/processor.h                         |    1 
 asm-m32r/ptrace.h                            |    1 
 asm-m32r/rtc.h                               |    1 
 asm-m32r/semaphore.h                         |    1 
 asm-m32r/serial.h                            |    1 
 asm-m32r/sigcontext.h                        |    1 
 asm-m32r/smp.h                               |    1 
 asm-m32r/spinlock.h                          |    1 
 asm-m32r/system.h                            |    1 
 asm-m32r/timex.h                             |    1 
 asm-m32r/tlbflush.h                          |    1 
 asm-m32r/uaccess.h                           |    1 
 asm-m68k/atomic.h                            |    1 
 asm-m68k/bug.h                               |    1 
 asm-m68k/dma-mapping.h                       |    1 
 asm-m68k/dma.h                               |    1 
 asm-m68k/dvma.h                              |    1 
 asm-m68k/elf.h                               |    1 
 asm-m68k/entry.h                             |    1 
 asm-m68k/fpu.h                               |    1 
 asm-m68k/hardirq.h                           |    1 
 asm-m68k/ide.h                               |    1 
 asm-m68k/io.h                                |    1 
 asm-m68k/irq.h                               |    1 
 asm-m68k/mc146818rtc.h                       |    1 
 asm-m68k/mmu_context.h                       |    1 
 asm-m68k/motorola_pgtable.h                  |    1 
 asm-m68k/openprom.h                          |    1 
 asm-m68k/page.h                              |    1 
 asm-m68k/page_offset.h                       |    1 
 asm-m68k/pgalloc.h                           |    1 
 asm-m68k/pgtable.h                           |    1 
 asm-m68k/processor.h                         |    1 
 asm-m68k/semaphore-helper.h                  |    1 
 asm-m68k/serial.h                            |    1 
 asm-m68k/setup.h                             |    1 
 asm-m68k/shm.h                               |    1 
 asm-m68k/system.h                            |    1 
 asm-m68k/tlbflush.h                          |    1 
 asm-m68k/virtconvert.h                       |    1 
 asm-m68knommu/bitops.h                       |    1 
 asm-m68knommu/coldfire.h                     |    1 
 asm-m68knommu/commproc.h                     |    1 
 asm-m68knommu/dma-mapping.h                  |    1 
 asm-m68knommu/dma.h                          |    1 
 asm-m68knommu/elf.h                          |    1 
 asm-m68knommu/elia.h                         |    1 
 asm-m68knommu/entry.h                        |    1 
 asm-m68knommu/fpu.h                          |    1 
 asm-m68knommu/hardirq.h                      |    1 
 asm-m68knommu/io.h                           |    1 
 asm-m68knommu/irq.h                          |    1 
 asm-m68knommu/m5206sim.h                     |    1 
 asm-m68knommu/m520xsim.h                     |    1 
 asm-m68knommu/m523xsim.h                     |    1 
 asm-m68knommu/m5272sim.h                     |    1 
 asm-m68knommu/m527xsim.h                     |    1 
 asm-m68knommu/m528xsim.h                     |    1 
 asm-m68knommu/mcfcache.h                     |    1 
 asm-m68knommu/mcfdma.h                       |    1 
 asm-m68knommu/mcfmbus.h                      |    1 
 asm-m68knommu/mcfne.h                        |    1 
 asm-m68knommu/mcfpci.h                       |    1 
 asm-m68knommu/mcfpit.h                       |    1 
 asm-m68knommu/mcfsim.h                       |    1 
 asm-m68knommu/mcfsmc.h                       |    1 
 asm-m68knommu/mcftimer.h                     |    1 
 asm-m68knommu/mcfuart.h                      |    1 
 asm-m68knommu/mcfwdebug.h                    |    1 
 asm-m68knommu/mmu_context.h                  |    1 
 asm-m68knommu/nettel.h                       |    1 
 asm-m68knommu/page.h                         |    1 
 asm-m68knommu/page_offset.h                  |    1 
 asm-m68knommu/param.h                        |    1 
 asm-m68knommu/pgtable.h                      |    1 
 asm-m68knommu/processor.h                    |    1 
 asm-m68knommu/semaphore-helper.h             |    1 
 asm-m68knommu/system.h                       |    1 
 asm-m68knommu/unaligned.h                    |    1 
 asm-mips/a.out.h                             |    1 
 asm-mips/addrspace.h                         |    1 
 asm-mips/arc/types.h                         |    1 
 asm-mips/asm.h                               |    1 
 asm-mips/asmmacro.h                          |    1 
 asm-mips/atomic.h                            |    1 
 asm-mips/bcache.h                            |    1 
 asm-mips/bitops.h                            |    1 
 asm-mips/bug.h                               |    1 
 asm-mips/bugs.h                              |    1 
 asm-mips/byteorder.h                         |    1 
 asm-mips/cache.h                             |    1 
 asm-mips/checksum.h                          |    1 
 asm-mips/cpu-features.h                      |    1 
 asm-mips/cpu-info.h                          |    1 
 asm-mips/ddb5xxx/ddb5477.h                   |    1 
 asm-mips/ddb5xxx/ddb5xxx.h                   |    1 
 asm-mips/debug.h                             |    1 
 asm-mips/dec/prom.h                          |    1 
 asm-mips/delay.h                             |    1 
 asm-mips/dma.h                               |    1 
 asm-mips/elf.h                               |    1 
 asm-mips/fcntl.h                             |    1 
 asm-mips/fixmap.h                            |    1 
 asm-mips/fpu.h                               |    1 
 asm-mips/futex.h                             |    1 
 asm-mips/hazards.h                           |    1 
 asm-mips/highmem.h                           |    1 
 asm-mips/interrupt.h                         |    1 
 asm-mips/io.h                                |    1 
 asm-mips/ip32/machine.h                      |    1 
 asm-mips/irq.h                               |    1 
 asm-mips/isadep.h                            |    1 
 asm-mips/jmr3927/irq.h                       |    1 
 asm-mips/kmap_types.h                        |    1 
 asm-mips/local.h                             |    1 
 asm-mips/mach-au1x00/au1000.h                |    1 
 asm-mips/mach-au1x00/au1xxx.h                |    1 
 asm-mips/mach-au1x00/au1xxx_dbdma.h          |    1 
 asm-mips/mach-au1x00/au1xxx_ide.h            |    1 
 asm-mips/mach-au1x00/au1xxx_psc.h            |    1 
 asm-mips/mach-au1x00/ioremap.h               |    1 
 asm-mips/mach-cobalt/cpu-feature-overrides.h |    1 
 asm-mips/mach-db1x00/db1x00.h                |    1 
 asm-mips/mach-generic/ide.h                  |    1 
 asm-mips/mach-generic/kmalloc.h              |    1 
 asm-mips/mach-generic/spaces.h               |    1 
 asm-mips/mach-ip22/spaces.h                  |    1 
 asm-mips/mach-ip32/cpu-feature-overrides.h   |    1 
 asm-mips/mach-ip32/kmalloc.h                 |    1 
 asm-mips/mach-mips/cpu-feature-overrides.h   |    1 
 asm-mips/mach-mips/irq.h                     |    1 
 asm-mips/mach-pb1x00/pb1550.h                |    1 
 asm-mips/mach-sim/cpu-feature-overrides.h    |    1 
 asm-mips/mips-boards/generic.h               |    1 
 asm-mips/mipsregs.h                          |    1 
 asm-mips/mmu_context.h                       |    1 
 asm-mips/mmzone.h                            |    1 
 asm-mips/module.h                            |    1 
 asm-mips/msgbuf.h                            |    1 
 asm-mips/paccess.h                           |    1 
 asm-mips/page.h                              |    1 
 asm-mips/pci.h                               |    1 
 asm-mips/pgalloc.h                           |    1 
 asm-mips/pgtable-32.h                        |    1 
 asm-mips/pgtable-64.h                        |    1 
 asm-mips/pgtable-bits.h                      |    1 
 asm-mips/pgtable.h                           |    1 
 asm-mips/prefetch.h                          |    1 
 asm-mips/processor.h                         |    1 
 asm-mips/ptrace.h                            |    1 
 asm-mips/reg.h                               |    1 
 asm-mips/resource.h                          |    1 
 asm-mips/serial.h                            |    1 
 asm-mips/sgiarcs.h                           |    1 
 asm-mips/sibyte/board.h                      |    1 
 asm-mips/sibyte/carmel.h                     |    1 
 asm-mips/sibyte/sentosa.h                    |    1 
 asm-mips/sibyte/swarm.h                      |    1 
 asm-mips/siginfo.h                           |    1 
 asm-mips/signal.h                            |    1 
 asm-mips/sim.h                               |    1 
 asm-mips/smp.h                               |    1 
 asm-mips/sn/addrs.h                          |    1 
 asm-mips/sn/agent.h                          |    1 
 asm-mips/sn/arch.h                           |    1 
 asm-mips/sn/io.h                             |    1 
 asm-mips/sn/klconfig.h                       |    1 
 asm-mips/sn/kldir.h                          |    1 
 asm-mips/sn/launch.h                         |    1 
 asm-mips/sn/mapped_kernel.h                  |    1 
 asm-mips/sn/sn0/addrs.h                      |    1 
 asm-mips/sn/sn0/arch.h                       |    1 
 asm-mips/sn/sn0/hubmd.h                      |    1 
 asm-mips/stackframe.h                        |    1 
 asm-mips/string.h                            |    1 
 asm-mips/system.h                            |    1 
 asm-mips/thread_info.h                       |    1 
 asm-mips/tlbflush.h                          |    1 
 asm-mips/tx4927/toshiba_rbtx4927.h           |    1 
 asm-mips/types.h                             |    1 
 asm-mips/uaccess.h                           |    1 
 asm-mips/unistd.h                            |    1 
 asm-mips/vr41xx/vrc4173.h                    |    1 
 asm-mips/war.h                               |    1 
 asm-mips/wbflush.h                           |    1 
 asm-parisc/atomic.h                          |    1 
 asm-parisc/cache.h                           |    1 
 asm-parisc/cacheflush.h                      |    1 
 asm-parisc/dma-mapping.h                     |    1 
 asm-parisc/dma.h                             |    1 
 asm-parisc/io.h                              |    1 
 asm-parisc/irq.h                             |    1 
 asm-parisc/kmap_types.h                      |    1 
 asm-parisc/page.h                            |    1 
 asm-parisc/param.h                           |    1 
 asm-parisc/pci.h                             |    1 
 asm-parisc/pdc.h                             |    1 
 asm-parisc/pgtable.h                         |    1 
 asm-parisc/processor.h                       |    1 
 asm-parisc/psw.h                             |    1 
 asm-parisc/smp.h                             |    1 
 asm-parisc/system.h                          |    1 
 asm-parisc/tlbflush.h                        |    1 
 asm-powerpc/abs_addr.h                       |    1 
 asm-powerpc/cache.h                          |    1 
 asm-powerpc/dma-mapping.h                    |    1 
 asm-powerpc/dma.h                            |    1 
 asm-powerpc/eeh.h                            |    1 
 asm-powerpc/elf.h                            |    7 ++--
 asm-powerpc/floppy.h                         |    1 
 asm-powerpc/hw_irq.h                         |    1 
 asm-powerpc/ide.h                            |    1 
 asm-powerpc/iommu.h                          |    1 
 asm-powerpc/irq.h                            |    1 
 asm-powerpc/iseries/iseries_io.h             |    1 
 asm-powerpc/machdep.h                        |    1 
 asm-powerpc/mmzone.h                         |    1 
 asm-powerpc/paca.h                           |    1 
 asm-powerpc/page.h                           |    1 
 asm-powerpc/pgtable.h                        |    1 
 asm-powerpc/ppc_asm.h                        |    1 
 asm-powerpc/prom.h                           |    1 
 asm-powerpc/smp.h                            |    1 
 asm-powerpc/smu.h                            |    1 
 asm-powerpc/spu.h                            |    1 
 asm-powerpc/thread_info.h                    |    1 
 asm-powerpc/time.h                           |    1 
 asm-powerpc/timex.h                          |    1 
 asm-powerpc/tlb.h                            |    1 
 asm-powerpc/tlbflush.h                       |    1 
 asm-powerpc/topology.h                       |    1 
 asm-powerpc/types.h                          |    1 
 asm-powerpc/unistd.h                         |    1 
 asm-powerpc/vga.h                            |    1 
 asm-powerpc/vio.h                            |    1 
 asm-ppc/amigahw.h                            |    1 
 asm-ppc/bootinfo.h                           |    1 
 asm-ppc/commproc.h                           |    1 
 asm-ppc/ibm403.h                             |    1 
 asm-ppc/ibm44x.h                             |    1 
 asm-ppc/ibm4xx.h                             |    1 
 asm-ppc/io.h                                 |    1 
 asm-ppc/machdep.h                            |    1 
 asm-ppc/mmu.h                                |    1 
 asm-ppc/mmu_context.h                        |    1 
 asm-ppc/mpc8260.h                            |    1 
 asm-ppc/mpc83xx.h                            |    1 
 asm-ppc/mpc85xx.h                            |    1 
 asm-ppc/mpc8xx.h                             |    1 
 asm-ppc/mv64x60.h                            |    1 
 asm-ppc/ocp.h                                |    1 
 asm-ppc/open_pic.h                           |    1 
 asm-ppc/page.h                               |    2 -
 asm-ppc/pc_serial.h                          |    1 
 asm-ppc/pgalloc.h                            |    1 
 asm-ppc/pgtable.h                            |    1 
 asm-ppc/ppc4xx_dma.h                         |    1 
 asm-ppc/ppc4xx_pic.h                         |    1 
 asm-ppc/serial.h                             |    1 
 asm-ppc/smp.h                                |    1 
 asm-ppc/time.h                               |    1 
 asm-s390/bitops.h                            |    1 
 asm-s390/debug.h                             |    1 
 asm-s390/hardirq.h                           |    1 
 asm-s390/idals.h                             |    1 
 asm-s390/local.h                             |    1 
 asm-s390/lowcore.h                           |    1 
 asm-s390/pgalloc.h                           |    1 
 asm-s390/ptrace.h                            |    1 
 asm-s390/sfp-machine.h                       |    1 
 asm-s390/smp.h                               |    1 
 asm-s390/system.h                            |    1 
 asm-s390/tlbflush.h                          |    1 
 asm-s390/types.h                             |    1 
 asm-s390/unistd.h                            |    1 
 asm-sh/bug.h                                 |    1 
 asm-sh/checksum.h                            |    1 
 asm-sh/dma-mapping.h                         |    1 
 asm-sh/dma.h                                 |    1 
 asm-sh/fixmap.h                              |    1 
 asm-sh/hardirq.h                             |    1 
 asm-sh/hd64461/hd64461.h                     |    1 
 asm-sh/hd64465/hd64465.h                     |    1 
 asm-sh/ide.h                                 |    1 
 asm-sh/io.h                                  |    1 
 asm-sh/irq.h                                 |    1 
 asm-sh/keyboard.h                            |    1 
 asm-sh/kmap_types.h                          |    1 
 asm-sh/machvec.h                             |    1 
 asm-sh/machvec_init.h                        |    1 
 asm-sh/mpc1211/dma.h                         |    1 
 asm-sh/overdrive/overdrive.h                 |    1 
 asm-sh/page.h                                |    1 
 asm-sh/pgtable.h                             |    1 
 asm-sh/serial.h                              |    1 
 asm-sh/smp.h                                 |    1 
 asm-sh/system.h                              |    1 
 asm-sh/types.h                               |    1 
 asm-sh/watchdog.h                            |    1 
 asm-sh64/bug.h                               |    1 
 asm-sh64/dma-mapping.h                       |    1 
 asm-sh64/hardirq.h                           |    1 
 asm-sh64/ide.h                               |    1 
 asm-sh64/irq.h                               |    1 
 asm-sh64/mmu_context.h                       |    1 
 asm-sh64/page.h                              |    1 
 asm-sh64/param.h                             |    1 
 asm-sh64/pgtable.h                           |    1 
 asm-sh64/system.h                            |    1 
 asm-sparc/asmmacro.h                         |    1 
 asm-sparc/atomic.h                           |    1 
 asm-sparc/bugs.h                             |    1 
 asm-sparc/cacheflush.h                       |    1 
 asm-sparc/delay.h                            |    1 
 asm-sparc/dma-mapping.h                      |    1 
 asm-sparc/dma.h                              |    1 
 asm-sparc/elf.h                              |    1 
 asm-sparc/fixmap.h                           |    1 
 asm-sparc/hardirq.h                          |    1 
 asm-sparc/ide.h                              |    1 
 asm-sparc/irq.h                              |    1 
 asm-sparc/mostek.h                           |    1 
 asm-sparc/page.h                             |    1 
 asm-sparc/pgalloc.h                          |    1 
 asm-sparc/pgtable.h                          |    1 
 asm-sparc/sfp-machine.h                      |    1 
 asm-sparc/smp.h                              |    1 
 asm-sparc/system.h                           |    2 -
 asm-sparc/timer.h                            |    1 
 asm-sparc/tlbflush.h                         |    1 
 asm-sparc/vac-ops.h                          |    1 
 asm-sparc/winmacro.h                         |    1 
 asm-sparc64/atomic.h                         |    1 
 asm-sparc64/bitops.h                         |    1 
 asm-sparc64/bugs.h                           |    1 
 asm-sparc64/cacheflush.h                     |    1 
 asm-sparc64/delay.h                          |    1 
 asm-sparc64/dma-mapping.h                    |    1 
 asm-sparc64/dma.h                            |    1 
 asm-sparc64/floppy.h                         |    1 
 asm-sparc64/ide.h                            |    1 
 asm-sparc64/irq.h                            |    1 
 asm-sparc64/kprobes.h                        |    1 
 asm-sparc64/mc146818rtc.h                    |    1 
 asm-sparc64/mmu.h                            |    1 
 asm-sparc64/oplib.h                          |    1 
 asm-sparc64/page.h                           |    1 
 asm-sparc64/param.h                          |    1 
 asm-sparc64/pgalloc.h                        |    1 
 asm-sparc64/pgtable.h                        |    1 
 asm-sparc64/processor.h                      |    1 
 asm-sparc64/siginfo.h                        |    1 
 asm-sparc64/signal.h                         |    1 
 asm-sparc64/smp.h                            |    1 
 asm-sparc64/spinlock.h                       |    1 
 asm-sparc64/system.h                         |    1 
 asm-sparc64/timer.h                          |    1 
 asm-sparc64/tlb.h                            |    1 
 asm-sparc64/tlbflush.h                       |    1 
 asm-sparc64/ttable.h                         |    1 
 asm-um/a.out.h                               |    1 
 asm-um/cache.h                               |    1 
 asm-um/elf-ppc.h                             |    1 
 asm-um/fixmap.h                              |    1 
 asm-um/hardirq.h                             |    1 
 asm-um/linkage.h                             |    1 
 asm-um/mmu_context.h                         |    1 
 asm-um/page.h                                |    1 
 asm-um/pgalloc.h                             |    1 
 asm-um/processor-generic.h                   |    1 
 asm-um/ptrace-generic.h                      |    1 
 asm-um/smp.h                                 |    1 
 asm-um/thread_info.h                         |    1 
 asm-v850/atomic.h                            |    1 
 asm-v850/bitops.h                            |    1 
 asm-v850/dma-mapping.h                       |    1 
 asm-v850/hardirq.h                           |    1 
 asm-v850/machdep.h                           |    1 
 asm-v850/pgtable.h                           |    1 
 asm-v850/processor.h                         |    1 
 asm-v850/serial.h                            |    1 
 asm-v850/v850e_uart.h                        |    1 
 asm-x86_64/apic.h                            |    1 
 asm-x86_64/atomic.h                          |    1 
 asm-x86_64/bitops.h                          |    1 
 asm-x86_64/bugs.h                            |    1 
 asm-x86_64/cache.h                           |    1 
 asm-x86_64/calling.h                         |    1 
 asm-x86_64/dma-mapping.h                     |    1 
 asm-x86_64/dma.h                             |    1 
 asm-x86_64/dwarf2.h                          |    1 
 asm-x86_64/fixmap.h                          |    1 
 asm-x86_64/hardirq.h                         |    1 
 asm-x86_64/hw_irq.h                          |    1 
 asm-x86_64/ia32.h                            |    1 
 asm-x86_64/io.h                              |    1 
 asm-x86_64/io_apic.h                         |    1 
 asm-x86_64/mmu_context.h                     |    1 
 asm-x86_64/mmzone.h                          |    1 
 asm-x86_64/mtrr.h                            |    1 
 asm-x86_64/page.h                            |    1 
 asm-x86_64/param.h                           |    1 
 asm-x86_64/pci.h                             |    1 
 asm-x86_64/processor.h                       |    1 
 asm-x86_64/serial.h                          |    1 
 asm-x86_64/smp.h                             |    1 
 asm-x86_64/spinlock.h                        |    1 
 asm-x86_64/swiotlb.h                         |    1 
 asm-x86_64/system.h                          |    1 
 asm-x86_64/tlbflush.h                        |    1 
 asm-x86_64/topology.h                        |    1 
 asm-x86_64/uaccess.h                         |    1 
 asm-xtensa/atomic.h                          |    1 
 asm-xtensa/checksum.h                        |    1 
 asm-xtensa/delay.h                           |    1 
 asm-xtensa/dma.h                             |    1 
 asm-xtensa/hardirq.h                         |    1 
 asm-xtensa/ide.h                             |    1 
 asm-xtensa/io.h                              |    1 
 asm-xtensa/irq.h                             |    1 
 asm-xtensa/mmu_context.h                     |    1 
 asm-xtensa/page.h                            |    1 
 asm-xtensa/pgalloc.h                         |    1 
 asm-xtensa/platform.h                        |    1 
 asm-xtensa/system.h                          |    1 
 linux/acct.h                                 |    3 --
 linux/acpi.h                                 |    1 
 linux/agpgart.h                              |    3 --
 linux/amba/clcd.h                            |    1 
 linux/atmdev.h                               |    1 
 linux/blkdev.h                               |    1 
 linux/blktrace_api.h                         |    1 
 linux/blockgroup_lock.h                      |    1 
 linux/cache.h                                |    1 
 linux/coda.h                                 |    1 
 linux/compat.h                               |    1 
 linux/cpufreq.h                              |    1 
 linux/crypto.h                               |    1 
 linux/cyclomx.h                              |    1 
 linux/dcookies.h                             |    1 
 linux/devfs_fs_kernel.h                      |    1 
 linux/device.h                               |    1 
 linux/dmi.h                                  |    1 
 linux/dnotify.h                              |    1 
 linux/errqueue.h                             |    1 
 linux/ext2_fs.h                              |    2 -
 linux/ext3_fs.h                              |    7 +---
 linux/fs.h                                   |    1 
 linux/ftape.h                                |    1 
 linux/gameport.h                             |    6 ++++
 linux/generic_serial.h                       |    6 ++--
 linux/genhd.h                                |   12 ++++----
 linux/gfp.h                                  |    1 
 linux/hardirq.h                              |    1 
 linux/highmem.h                              |    1 
 linux/highuid.h                              |    1 
 linux/i2c-algo-ite.h                         |    7 +++-
 linux/i2c.h                                  |    9 ++++--
 linux/ide.h                                  |    1 
 linux/if_frad.h                              |    1 
 linux/if_tr.h                                |    1 
 linux/init.h                                 |    1 
 linux/inotify.h                              |    1 
 linux/interrupt.h                            |    1 
 linux/ipmi.h                                 |    2 -
 linux/ipv6.h                                 |    1 
 linux/irq.h                                  |    1 
 linux/irq_cpustat.h                          |    1 
 linux/isapnp.h                               |    1 
 linux/isdn.h                                 |    1 
 linux/isdn/tpam.h                            |    1 
 linux/isdn_ppp.h                             |    1 
 linux/isdnif.h                               |    1 
 linux/kallsyms.h                             |    1 
 linux/kernel_stat.h                          |    1 
 linux/kmod.h                                 |    1 
 linux/kprobes.h                              |    1 
 linux/linkage.h                              |    1 
 linux/lockd/lockd.h                          |    1 
 linux/lockd/nlm.h                            |    1 
 linux/mempolicy.h                            |    1 
 linux/migrate.h                              |    1 
 linux/mm.h                                   |    1 
 linux/mman.h                                 |   12 ++++----
 linux/mmzone.h                               |    1 
 linux/module.h                               |    1 
 linux/msg.h                                  |    2 -
 linux/mtd/cfi.h                              |    1 
 linux/mtd/map.h                              |    1 
 linux/mtd/mtd.h                              |    1 
 linux/mtd/nand.h                             |    1 
 linux/mtd/physmap.h                          |    1 
 linux/mtd/xip.h                              |    1 
 linux/ncp_fs.h                               |    5 +--
 linux/net.h                                  |    3 --
 linux/netdevice.h                            |    1 
 linux/netfilter.h                            |    1 
 linux/netfilter_arp.h                        |    1 
 linux/netfilter_bridge.h                     |    1 
 linux/netfilter_ipv4.h                       |    1 
 linux/netfilter_ipv4/ip_conntrack.h          |    1 
 linux/netfilter_ipv4/listhelp.h              |    1 
 linux/nfs.h                                  |    8 ++---
 linux/nfs4.h                                 |    6 ++--
 linux/nfs_fs.h                               |   39 +++++++++++++--------------
 linux/nfsd/nfsd.h                            |    1 
 linux/nfsd/nfsfh.h                           |    1 
 linux/nfsd/syscall.h                         |    1 
 linux/numa.h                                 |    1 
 linux/parport.h                              |    1 
 linux/pci.h                                  |    1 
 linux/percpu_counter.h                       |    1 
 linux/pm.h                                   |    1 
 linux/pm_legacy.h                            |    1 
 linux/pmu.h                                  |    1 
 linux/preempt.h                              |    1 
 linux/proc_fs.h                              |    1 
 linux/profile.h                              |    1 
 linux/quota.h                                |    4 +-
 linux/quotaops.h                             |    1 
 linux/reiserfs_xattr.h                       |    3 --
 linux/relay.h                                |    1 
 linux/rio.h                                  |    1 
 linux/rio_drv.h                              |    1 
 linux/rmap.h                                 |    1 
 linux/rtnetlink.h                            |    1 
 linux/rwsem.h                                |    1 
 linux/scc.h                                  |    1 
 linux/sched.h                                |   18 ++++++------
 linux/seccomp.h                              |    1 
 linux/sem.h                                  |    2 -
 linux/seqlock.h                              |    1 
 linux/serialP.h                              |    1 
 linux/serial_core.h                          |    1 
 linux/signal.h                               |    4 +-
 linux/skbuff.h                               |    1 
 linux/slab.h                                 |    1 
 linux/smb_fs.h                               |    4 +-
 linux/smp.h                                  |    1 
 linux/smp_lock.h                             |    1 
 linux/socket.h                               |    2 -
 linux/spinlock.h                             |    1 
 linux/stop_machine.h                         |    1 
 linux/sunrpc/auth.h                          |    1 
 linux/sunrpc/debug.h                         |   24 +++++++---------
 linux/sunrpc/stats.h                         |    1 
 linux/suspend.h                              |    1 
 linux/swap.h                                 |    1 
 linux/syscalls.h                             |    1 
 linux/sysrq.h                                |    1 
 linux/tcp.h                                  |    1 
 linux/threads.h                              |    1 
 linux/timer.h                                |    1 
 linux/timex.h                                |    1 
 linux/tty.h                                  |    1 
 linux/types.h                                |    1 
 linux/udp.h                                  |    1 
 linux/usb.h                                  |    1 
 linux/usb_usual.h                            |    1 
 linux/usbdevice_fs.h                         |    2 +
 linux/vt_buffer.h                            |    1 
 linux/vt_kern.h                              |    1 
 linux/wait.h                                 |    1 
 linux/wanrouter.h                            |    4 +-
 mtd/mtd-abi.h                                |    5 ++-
 net/addrconf.h                               |    1 
 net/af_unix.h                                |    1 
 net/ax25.h                                   |    1 
 net/compat.h                                 |    1 
 net/dst.h                                    |    1 
 net/icmp.h                                   |    1 
 net/inet6_hashtables.h                       |    1 
 net/inet_hashtables.h                        |    1 
 net/inet_sock.h                              |    1 
 net/inet_timewait_sock.h                     |    1 
 net/ip.h                                     |    1 
 net/ip_fib.h                                 |    1 
 net/ip_mp_alg.h                              |    1 
 net/ip_vs.h                                  |    1 
 net/ipv6.h                                   |    1 
 net/irda/irda.h                              |    1 
 net/irda/irda_device.h                       |    1 
 net/irda/irlap.h                             |    1 
 net/irda/irlmp.h                             |    1 
 net/irda/irlmp_frame.h                       |    1 
 net/irda/qos.h                               |    1 
 net/ndisc.h                                  |    1 
 net/netfilter/nf_conntrack.h                 |    1 
 net/pkt_act.h                                |    1 
 net/protocol.h                               |    1 
 net/raw.h                                    |    1 
 net/red.h                                    |    1 
 net/route.h                                  |    1 
 net/sch_generic.h                            |    1 
 net/sctp/sctp.h                              |    1 
 net/sock.h                                   |    1 
 net/tcp.h                                    |    1 
 pcmcia/ss.h                                  |    1 
 scsi/scsi_transport_fc.h                     |    1 
 scsi/scsi_transport_spi.h                    |    1 
 sound/driver.h                               |    1 
 video/edid.h                                 |    1 
 video/vga.h                                  |    1 
 861 files changed, 109 insertions(+), 937 deletions(-)

--- NEW FILE linux-2.6-header-cleanup-git.patch ---
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index 2e6d545..3c6a620 100644
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -49,7 +49,6 @@ #define ACPI_USE_DO_WHILE_0
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
 #include <linux/string.h>
 #include <linux/kernel.h>
 #include <linux/ctype.h>
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index badf027..ef7d83a 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -2,7 +2,6 @@ #ifndef __ACPI_PROCESSOR_H
 #define __ACPI_PROCESSOR_H
 
 #include <linux/kernel.h>
-#include <linux/config.h>
 
 #include <asm/acpi.h>
 
diff --git a/include/asm-alpha/bitops.h b/include/asm-alpha/bitops.h
index 3f88715..4b6ef7f 100644
--- a/include/asm-alpha/bitops.h
+++ b/include/asm-alpha/bitops.h
@@ -1,7 +1,6 @@
 #ifndef _ALPHA_BITOPS_H
 #define _ALPHA_BITOPS_H
 
-#include <linux/config.h>
 #include <asm/compiler.h>
 
 /*
diff --git a/include/asm-alpha/cache.h b/include/asm-alpha/cache.h
index e6d4d16..f199e69 100644
--- a/include/asm-alpha/cache.h
+++ b/include/asm-alpha/cache.h
@@ -4,7 +4,6 @@
 #ifndef __ARCH_ALPHA_CACHE_H
 #define __ARCH_ALPHA_CACHE_H
 
-#include <linux/config.h>
 
 /* Bytes per L1 (data) cache line. */
 #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6)
diff --git a/include/asm-alpha/cacheflush.h b/include/asm-alpha/cacheflush.h
index 3fc6ef7..805640b 100644
--- a/include/asm-alpha/cacheflush.h
+++ b/include/asm-alpha/cacheflush.h
@@ -1,7 +1,6 @@
 #ifndef _ALPHA_CACHEFLUSH_H
 #define _ALPHA_CACHEFLUSH_H
 
-#include <linux/config.h>
 #include <linux/mm.h>
 
 /* Caches aren't brain-dead on the Alpha. */
diff --git a/include/asm-alpha/core_cia.h b/include/asm-alpha/core_cia.h
index 3a70d68..9e0516c 100644
--- a/include/asm-alpha/core_cia.h
+++ b/include/asm-alpha/core_cia.h
@@ -4,7 +4,6 @@ #define __ALPHA_CIA__H__
 /* Define to experiment with fitting everything into one 512MB HAE window.  */
 #define CIA_ONE_HAE_WINDOW 1
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <asm/compiler.h>
 
diff --git a/include/asm-alpha/core_t2.h b/include/asm-alpha/core_t2.h
index 5c1c403..dba70c6 100644
--- a/include/asm-alpha/core_t2.h
+++ b/include/asm-alpha/core_t2.h
@@ -1,7 +1,6 @@
 #ifndef __ALPHA_T2__H__
 #define __ALPHA_T2__H__
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/spinlock.h>
 #include <asm/compiler.h>
diff --git a/include/asm-alpha/dma-mapping.h b/include/asm-alpha/dma-mapping.h
index 62d0d66..b9ff4d8 100644
--- a/include/asm-alpha/dma-mapping.h
+++ b/include/asm-alpha/dma-mapping.h
@@ -1,7 +1,6 @@
 #ifndef _ALPHA_DMA_MAPPING_H
 #define _ALPHA_DMA_MAPPING_H
 
-#include <linux/config.h>
 
 #ifdef CONFIG_PCI
 
diff --git a/include/asm-alpha/dma.h b/include/asm-alpha/dma.h
index 683afaa..87cfdbd 100644
--- a/include/asm-alpha/dma.h
+++ b/include/asm-alpha/dma.h
@@ -18,7 +18,6 @@
 #ifndef _ASM_DMA_H
 #define _ASM_DMA_H
 
-#include <linux/config.h>
 #include <linux/spinlock.h>
 #include <asm/io.h>
 
diff --git a/include/asm-alpha/floppy.h b/include/asm-alpha/floppy.h
index 289a00d..e177d41 100644
--- a/include/asm-alpha/floppy.h
+++ b/include/asm-alpha/floppy.h
@@ -10,7 +10,6 @@
 #ifndef __ASM_ALPHA_FLOPPY_H
 #define __ASM_ALPHA_FLOPPY_H
 
-#include <linux/config.h>
 
 #define fd_inb(port)			inb_p(port)
 #define fd_outb(value,port)		outb_p(value,port)
diff --git a/include/asm-alpha/hardirq.h b/include/asm-alpha/hardirq.h
index 7bb6a36..d953e23 100644
--- a/include/asm-alpha/hardirq.h
+++ b/include/asm-alpha/hardirq.h
@@ -1,7 +1,6 @@
 #ifndef _ALPHA_HARDIRQ_H
 #define _ALPHA_HARDIRQ_H
 
-#include <linux/config.h>
 #include <linux/threads.h>
 #include <linux/cache.h>
 
diff --git a/include/asm-alpha/hw_irq.h b/include/asm-alpha/hw_irq.h
index a310b9e..ca9d43b 100644
--- a/include/asm-alpha/hw_irq.h
+++ b/include/asm-alpha/hw_irq.h
@@ -1,7 +1,6 @@
 #ifndef _ALPHA_HW_IRQ_H
 #define _ALPHA_HW_IRQ_H
 
-#include <linux/config.h>
 
 static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i) {}
 
diff --git a/include/asm-alpha/ide.h b/include/asm-alpha/ide.h
index 6126afe..2a5cc0b 100644
--- a/include/asm-alpha/ide.h
+++ b/include/asm-alpha/ide.h
@@ -13,7 +13,6 @@ #define __ASMalpha_IDE_H
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
 
 #define IDE_ARCH_OBSOLETE_DEFAULTS
 
diff --git a/include/asm-alpha/io.h b/include/asm-alpha/io.h
index 3ebbeee..f5ae98c 100644
--- a/include/asm-alpha/io.h
+++ b/include/asm-alpha/io.h
@@ -3,7 +3,6 @@ #define __ALPHA_IO_H
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <asm/compiler.h>
 #include <asm/system.h>
diff --git a/include/asm-alpha/irq.h b/include/asm-alpha/irq.h
index 566db72..f6de033 100644
--- a/include/asm-alpha/irq.h
+++ b/include/asm-alpha/irq.h
@@ -8,7 +8,6 @@ #define _ALPHA_IRQ_H
  */
 
 #include <linux/linkage.h>
-#include <linux/config.h>
 
 #if   defined(CONFIG_ALPHA_GENERIC)
 
diff --git a/include/asm-alpha/kmap_types.h b/include/asm-alpha/kmap_types.h
index 3d10cd3..3e6735a 100644
--- a/include/asm-alpha/kmap_types.h
+++ b/include/asm-alpha/kmap_types.h
@@ -3,7 +3,6 @@ #define _ASM_KMAP_TYPES_H
 
 /* Dummy header just to define km_type. */
 
-#include <linux/config.h>
 
 #ifdef CONFIG_DEBUG_HIGHMEM
 # define D(n) __KM_FENCE_##n ,
diff --git a/include/asm-alpha/machvec.h b/include/asm-alpha/machvec.h
index ece166a..aced22f 100644
--- a/include/asm-alpha/machvec.h
+++ b/include/asm-alpha/machvec.h
@@ -1,7 +1,6 @@
 #ifndef __ALPHA_MACHVEC_H
 #define __ALPHA_MACHVEC_H 1
[...10397 lines suppressed...]
@@ -37,7 +37,6 @@ #define ND_MAX_RANDOM_FACTOR		(3/2)
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
 #include <linux/compiler.h>
 #include <linux/icmpv6.h>
 #include <linux/in6.h>
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index 916013c..fc00aa3 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -15,7 +15,6 @@ #define _NF_CONNTRACK_H
 #include <linux/netfilter/nf_conntrack_common.h>
 
 #ifdef __KERNEL__
-#include <linux/config.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
 #include <asm/atomic.h>
diff --git a/include/net/pkt_act.h b/include/net/pkt_act.h
index b225d84..cf5e4d2 100644
--- a/include/net/pkt_act.h
+++ b/include/net/pkt_act.h
@@ -4,7 +4,6 @@ #define __NET_PKT_ACT_H
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <linux/bitops.h>
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
diff --git a/include/net/protocol.h b/include/net/protocol.h
index 6dc5970..bcaee39 100644
--- a/include/net/protocol.h
+++ b/include/net/protocol.h
@@ -24,7 +24,6 @@
 #ifndef _PROTOCOL_H
 #define _PROTOCOL_H
 
-#include <linux/config.h>
 #include <linux/in6.h>
 #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
 #include <linux/ipv6.h>
diff --git a/include/net/raw.h b/include/net/raw.h
index e67b28a..481b201 100644
--- a/include/net/raw.h
+++ b/include/net/raw.h
@@ -17,7 +17,6 @@
 #ifndef _RAW_H
 #define _RAW_H
 
-#include <linux/config.h>
 
 #include <net/protocol.h>
 
diff --git a/include/net/red.h b/include/net/red.h
index 2ed4358..5ccdbb3 100644
--- a/include/net/red.h
+++ b/include/net/red.h
@@ -1,7 +1,6 @@
 #ifndef __NET_SCHED_RED_H
 #define __NET_SCHED_RED_H
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <net/pkt_sched.h>
 #include <net/inet_ecn.h>
diff --git a/include/net/route.h b/include/net/route.h
index 98c915a..c4a0686 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -24,7 +24,6 @@
 #ifndef _ROUTE_H
 #define _ROUTE_H
 
-#include <linux/config.h>
 #include <net/dst.h>
 #include <net/inetpeer.h>
 #include <net/flow.h>
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 7b6ec99..b0e9108 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -1,7 +1,6 @@
 #ifndef __NET_SCHED_GENERIC_H
 #define __NET_SCHED_GENERIC_H
 
-#include <linux/config.h>
 #include <linux/netdevice.h>
 #include <linux/types.h>
 #include <linux/rcupdate.h>
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index e673b2c..9c30fa5 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -63,7 +63,6 @@ #define __net_sctp_h__
  */
 
 
-#include <linux/config.h>
 
 #ifdef TEST_FRAME
 #undef CONFIG_PROC_FS
diff --git a/include/net/sock.h b/include/net/sock.h
index ff8b0da..d8a5d87 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -40,7 +40,6 @@
 #ifndef _SOCK_H
 #define _SOCK_H
 
-#include <linux/config.h>
 #include <linux/list.h>
 #include <linux/timer.h>
 #include <linux/cache.h>
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 3c989db..9e88dcd 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -21,7 +21,6 @@ #define _TCP_H
 #define TCP_DEBUG 1
 #define FASTRETRANS_DEBUG 1
 
-#include <linux/config.h>
 #include <linux/list.h>
 #include <linux/tcp.h>
 #include <linux/slab.h>
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index 5e0a01a..ede6398 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -15,7 +15,6 @@
 #ifndef _LINUX_SS_H
 #define _LINUX_SS_H
 
-#include <linux/config.h>
 #include <linux/device.h>
 #include <linux/sched.h>	/* task_struct, completion */
 #include <linux/mutex.h>
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index 5626225..6d28b03 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -27,7 +27,6 @@
 #ifndef SCSI_TRANSPORT_FC_H
 #define SCSI_TRANSPORT_FC_H
 
-#include <linux/config.h>
 #include <linux/sched.h>
 #include <scsi/scsi.h>
 
diff --git a/include/scsi/scsi_transport_spi.h b/include/scsi/scsi_transport_spi.h
index 5e1d619..302680c 100644
--- a/include/scsi/scsi_transport_spi.h
+++ b/include/scsi/scsi_transport_spi.h
@@ -20,7 +20,6 @@
 #ifndef SCSI_TRANSPORT_SPI_H
 #define SCSI_TRANSPORT_SPI_H
 
-#include <linux/config.h>
 #include <linux/transport_class.h>
 #include <linux/mutex.h>
 
diff --git a/include/sound/driver.h b/include/sound/driver.h
index 89c6a73..3c522e5 100644
--- a/include/sound/driver.h
+++ b/include/sound/driver.h
@@ -26,7 +26,6 @@ #ifdef ALSA_BUILD
 #include "config.h"
 #endif
 
-#include <linux/config.h>
 
 /* number of supported soundcards */
 #ifdef CONFIG_SND_DYNAMIC_MINORS
diff --git a/include/video/edid.h b/include/video/edid.h
index b913f19..f6a42d6 100644
--- a/include/video/edid.h
+++ b/include/video/edid.h
@@ -3,7 +3,6 @@ #define __linux_video_edid_h__
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
 
 #ifdef CONFIG_X86
 struct edid_info {
diff --git a/include/video/vga.h b/include/video/vga.h
index 700d6c8..b49a512 100644
--- a/include/video/vga.h
+++ b/include/video/vga.h
@@ -17,7 +17,6 @@
 #ifndef __linux_video_vga_h__
 #define __linux_video_vga_h__
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <asm/io.h>
 #ifndef CONFIG_AMIGA

linux-2.6-header-install-git.patch:
 Makefile                              |   17 ++++
 include/Kbuild                        |    2 
 include/asm-alpha/Kbuild              |    9 ++
 include/asm-arm/Kbuild                |    7 ++
 include/asm-arm26/Kbuild              |    8 ++
 include/asm-cris/Kbuild               |    6 +
 include/asm-cris/arch-v10/Kbuild      |    3 
 include/asm-generic/Kbuild            |    3 
 include/asm-generic/Kbuild.asm        |   11 +++
 include/asm-h8300/Kbuild              |    6 +
 include/asm-i386/Kbuild               |    5 +
 include/asm-ia64/Kbuild               |    6 +
 include/asm-m32r/Kbuild               |    7 ++
 include/asm-m68k/Kbuild               |   17 ++++
 include/asm-m68knommu/Kbuild          |   12 +++
 include/asm-mips/Kbuild               |   15 ++++
 include/asm-parisc/Kbuild             |    8 ++
 include/asm-powerpc/Kbuild            |   10 ++
 include/asm-ppc/Kbuild                |    8 ++
 include/asm-s390/Kbuild               |    4 +
 include/asm-sh/Kbuild                 |    6 +
 include/asm-sh64/Kbuild               |    6 +
 include/asm-sparc/Kbuild              |   13 +++
 include/asm-sparc64/Kbuild            |   15 ++++
 include/asm-um/Kbuild                 |   14 ++++
 include/asm-v850/Kbuild               |   10 ++
 include/asm-x86_64/Kbuild             |   10 ++
 include/linux/Kbuild                  |   63 ++++++++++++++++++
 include/linux/byteorder/Kbuild        |    1 
 include/linux/dvb/Kbuild              |    2 
 include/linux/hdlc/Kbuild             |    1 
 include/linux/isdn/Kbuild             |    1 
 include/linux/netfilter/Kbuild        |   11 +++
 include/linux/netfilter_arp/Kbuild    |    2 
 include/linux/netfilter_bridge/Kbuild |    4 +
 include/linux/netfilter_ipv4/Kbuild   |   21 ++++++
 include/linux/netfilter_ipv6/Kbuild   |    5 +
 include/linux/nfsd/Kbuild             |    2 
 include/linux/raid/Kbuild             |    1 
 include/linux/sunrpc/Kbuild           |    1 
 include/linux/tc_act/Kbuild           |    1 
 include/linux/tc_ematch/Kbuild        |    1 
 include/media/Kbuild                  |    2 
 include/mtd/Kbuild                    |    2 
 include/rdma/Kbuild                   |    1 
 include/scsi/Kbuild                   |    2 
 include/sound/Kbuild                  |    2 
 include/video/Kbuild                  |    1 
 scripts/Makefile.headersinst          |  116 ++++++++++++++++++++++++++++++++++
 scripts/hdrcheck.sh                   |    8 ++
 50 files changed, 489 insertions(+)

--- NEW FILE linux-2.6-header-install-git.patch ---
diff --git a/Makefile b/Makefile
index a940eae..09a420f 100644
--- a/Makefile
+++ b/Makefile
@@ -858,6 +858,21 @@ depend dep:
 	@echo '*** Warning: make $@ is unnecessary now.'
 
 # ---------------------------------------------------------------------------
+# Kernel headers
+INSTALL_HDR_PATH=$(MODLIB)/abi
+export INSTALL_HDR_PATH
+
+.PHONY: headers_install
+headers_install: .kernelrelease
+	@unifdef -Ux /dev/null
+	@rm -rf $(INSTALL_HDR_PATH)
+	$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include
+
+.PHONY: headers_check
+headers_check: headers_install
+	$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include HDRCHECK=1
+
+# ---------------------------------------------------------------------------
 # Modules
 
 ifdef CONFIG_MODULES
@@ -1029,6 +1044,8 @@ help:
 	@echo  '  cscope	  - Generate cscope index'
 	@echo  '  kernelrelease	  - Output the release version string'
 	@echo  '  kernelversion	  - Output the version stored in Makefile'
+	@echo  '  headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'
+	@echo  '                    (default: /usr/include)'
 	@echo  ''
 	@echo  'Static analysers'
 	@echo  '  checkstack      - Generate a list of stack hogs'
diff --git a/include/Kbuild b/include/Kbuild
new file mode 100644
index 0000000..ae01565
--- /dev/null
+++ b/include/Kbuild
@@ -0,0 +1,2 @@
+header-y += asm-generic/ linux/ scsi/ sound/ mtd/ rdma/ video/ media/
+header-y += asm-$(ARCH)/ 
diff --git a/include/asm-alpha/Kbuild b/include/asm-alpha/Kbuild
new file mode 100644
index 0000000..57ff88a
--- /dev/null
+++ b/include/asm-alpha/Kbuild
@@ -0,0 +1,9 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += 8253pit.h agp.h agp_backend.h compiler.h console.h core_apecs.h \
+	core_cia.h core_irongate.h core_lca.h core_marvel.h core_mcpcia.h \
+	core_polaris.h core_t2.h core_titan.h core_tsunami.h core_wildfire.h \
+	err_common.h err_ev6.h err_ev7.h floppy.h fpu.h gct.h gentrap.h \
+	hdreg.h hw_irq.h hwrpb.h init.h jensen.h md.h numnodes.h pal.h \
+	parport.h pci.h reg.h regdef.h segment.h serial.h sfp-machine.h \
+	spinlock.h suspend.h sysinfo.h ucontext.h vga.h
diff --git a/include/asm-arm/Kbuild b/include/asm-arm/Kbuild
new file mode 100644
index 0000000..fad30e6
--- /dev/null
+++ b/include/asm-arm/Kbuild
@@ -0,0 +1,7 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += apm.h assembler.h cpu-multi32.h cpu-single.h domain.h ecard.h \
+	fiq.h floppy.h fpstate.h hardware.h hdreg.h ipc.h leds.h limits.h \
+	locks.h memory.h numnodes.h nwflash.h parport.h procinfo.h \
+	segment.h semaphore-helper.h serial.h sizes.h spinlock.h suspend.h \
+	therm.h traps.h ucontext.h vga.h
diff --git a/include/asm-arm26/Kbuild b/include/asm-arm26/Kbuild
new file mode 100644
index 0000000..8590f0b
--- /dev/null
+++ b/include/asm-arm26/Kbuild
@@ -0,0 +1,8 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += assembler.h calls.h constants.h ecard.h fiq.h floppy.h fpstate.h \
+	hardware.h hdreg.h ian_char.h ioc.h ipc.h irqchip.h leds.h limits.h \
+	linux_logo.h locks.h mach-types.h map.h memory.h oldlatches.h \
+	parport.h proc-fns.h procinfo.h segment.h semaphore-helper.h \
+	serial.h sizes.h spinlock.h suspend.h sysirq.h ucontext.h \
+	uncompress.h
diff --git a/include/asm-cris/Kbuild b/include/asm-cris/Kbuild
new file mode 100644
index 0000000..8480c8a
--- /dev/null
+++ b/include/asm-cris/Kbuild
@@ -0,0 +1,6 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += axisflashmap.h eshlibld.h ethernet.h etraxgpio.h etraxi2c.h \
+	fasttimer.h ipc.h rs485.h segment.h semaphore-helper.h ucontext.h
+
+header-y += arch-v10/
diff --git a/include/asm-cris/arch-v10/Kbuild b/include/asm-cris/arch-v10/Kbuild
new file mode 100644
index 0000000..1837529
--- /dev/null
+++ b/include/asm-cris/arch-v10/Kbuild
@@ -0,0 +1,3 @@
+header-y += bitops.h cache.h checksum.h dma.h elf.h io.h irq.h mmu.h \
+	offset.h processor.h ptrace.h sv_addr_ag.h svinto.h system.h \
+	timex.h unistd.h user.h
diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild
new file mode 100644
index 0000000..fb44933
--- /dev/null
+++ b/include/asm-generic/Kbuild
@@ -0,0 +1,3 @@
+header-y += errno-base.h errno.h fcntl.h ipc.h mman.h signal.h	\
+	statfs.h
+unifdef-y := resource.h siginfo.h
diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm
new file mode 100644
index 0000000..9e8ae58
--- /dev/null
+++ b/include/asm-generic/Kbuild.asm
@@ -0,0 +1,11 @@
+unifdef-y += a.out.h auxvec.h errno.h fcntl.h ioctl.h ioctls.h ipcbuf.h	\
+	irq.h mman.h mmu.h msgbuf.h param.h poll.h posix_types.h	\
+	ptrace.h resource.h semaphore.h sembuf.h shmbuf.h shmparam.h	\
+	sigcontext.h siginfo.h signal.h socket.h sockios.h stat.h	\
+	statfs.h termbits.h termios.h timex.h types.h unistd.h user.h
+
+# These really shouldn't be exported
+unifdef-y += atomic.h byteorder.h io.h
+
+# There probably shouldn't be exported
+unifdef-y += elf.h page.h
diff --git a/include/asm-h8300/Kbuild b/include/asm-h8300/Kbuild
new file mode 100644
index 0000000..a45477a
--- /dev/null
+++ b/include/asm-h8300/Kbuild
@@ -0,0 +1,6 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += cachectl.h dbg.h flat.h fpu.h gpio.h h8300_ne.h hdreg.h \
+	hw_irq.h init.h ipc.h keyboard.h linux_logo.h md.h \
+	page_offset.h segment.h semaphore-helper.h sh_bios.h shm.h \
+	spinlock.h target_time.h traps.h ucontext.h
diff --git a/include/asm-i386/Kbuild b/include/asm-i386/Kbuild
new file mode 100644
index 0000000..5e952fd
--- /dev/null
+++ b/include/asm-i386/Kbuild
@@ -0,0 +1,5 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += boot.h cpufeature.h debugreg.h kprobes.h ldt.h setup.h ucontext.h
+
+unifdef-y += mtrr.h vm86.h
diff --git a/include/asm-ia64/Kbuild b/include/asm-ia64/Kbuild
new file mode 100644
index 0000000..e1200f3
--- /dev/null
+++ b/include/asm-ia64/Kbuild
@@ -0,0 +1,6 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += break.h fwspa.h fpu.h ia64regs.h kprobes.h perfmon_default_smpl.h \
+	 ptrace_offsets.h rse.h setup.h ucontext.h
+
+unifdef-y += perfmon.h
diff --git a/include/asm-m32r/Kbuild b/include/asm-m32r/Kbuild
new file mode 100644
index 0000000..d3f0f99
--- /dev/null
+++ b/include/asm-m32r/Kbuild
@@ -0,0 +1,7 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += addrspace.h assembler.h bugs.h cachectl.h current.h delay.h \
+	div64.h flat.h hdreg.h hw_irq.h ipc.h kmap_types.h m32102.h \
+	m32102peri.h m32r.h m32r_mp_fpga.h mc146818rtc.h mmzone.h \
+	numnodes.h pgtable-2level.h rtc.h scatterlist.h segment.h serial.h \
+	setup.h smp.h spinlock.h string.h syscall.h ucontext.h vga.h
diff --git a/include/asm-m68k/Kbuild b/include/asm-m68k/Kbuild
new file mode 100644
index 0000000..48881b3
--- /dev/null
+++ b/include/asm-m68k/Kbuild
@@ -0,0 +1,17 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += adb.h adb_iop.h adb_mouse.h amigahw.h amigaints.h amigayle.h \
+	amipcmcia.h apollodma.h apollohw.h atafd.h atafdreg.h \
+	atari_SCCserial.h atari_SLM.h atari_acsi.h atari_joystick.h \
+	atari_stdma.h atari_stram.h atarihw.h atariints.h atarikb.h \
+	blinken.h bvme6000hw.h cachectl.h contregs.h dsp56k.h dvma.h \
+	entry.h fbio.h floppy.h fpu.h hdreg.h hw_irq.h hwtest.h \
+	idprom.h init.h intersil.h ipc.h kbio.h mac_asc.h mac_baboon.h\
+	mac_iop.h mac_mouse.h mac_oss.h mac_psc.h mac_via.h machdep.h \
+	machines.h machw.h macintosh.h macints.h math-emu.h md.h \
+	motorola_pgalloc.h movs.h mvme147hw.h mvme16xhw.h nubus.h \
+	openprom.h oplib.h page_offset.h parport.h q40_master.h \
+	q40ints.h sbus.h segment.h semaphore-helper.h serial.h shm.h \
+	spinlock.h sun3-head.h sun3_pgalloc.h sun3ints.h sun3mmu.h \
+	sun3x.h sun3xflop.h sun3xprom.h suspend.h swim_iop.h traps.h \
+	ucontext.h vuid_event.h
diff --git a/include/asm-m68knommu/Kbuild b/include/asm-m68knommu/Kbuild
new file mode 100644
index 0000000..d91668d
--- /dev/null
+++ b/include/asm-m68knommu/Kbuild
@@ -0,0 +1,12 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += MC68328.h MC68332.h MC68EZ328.h MC68VZ328.h anchor.h \
+	asm-offsets.h bootstd.h cachectl.h coldfire.h commproc.h dbg.h \
+	elia.h entry.h flat.h fpu.h hdreg.h hwtest.h init.h io_hw_swap.h \
+	ipc.h keyboard.h m5206sim.h m5249sim.h m5272sim.h m5282sim.h \
+	m5307sim.h m5407sim.h m68360.h m68360_enet.h m68360_pram.h \
+	m68360_quicc.h m68360_regs.h machdep.h math-emu.h mcfdma.h \
+	mcfmbus.h mcfne.h mcfpci.h mcfpit.h mcfsim.h mcfsmc.h mcftimer.h \
+	mcfuart.h mcfwdebug.h md.h movs.h nap.h nettel.h openprom.h \
+	oplib.h page_offset.h quicc_simple.h segment.h semaphore-helper.h \
+	semp3.h shglcore.h shglports.h shm.h spinlock.h traps.h ucontext.h
diff --git a/include/asm-mips/Kbuild b/include/asm-mips/Kbuild
new file mode 100644
index 0000000..e19ec09
--- /dev/null
+++ b/include/asm-mips/Kbuild
@@ -0,0 +1,15 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += 8253pit.h addrspace.h asm.h asmmacro-32.h asmmacro-64.h \
+	asmmacro.h bcache.h branch.h break.h cachectl.h cacheops.h \
+	compat.h compiler.h cpu.h cpu-info.h ddb5074.h debug.h \
+	ds1286.h fixmap.h floppy.h fpregdef.h fpu_emulator.h \
+	gdb-stub.h gfx.h gt64120.h hdreg.h hw_irq.h i8259.h init.h \
+	inst.h interrupt.h inventory.h ipc.h irq_cpu.h \
+	isadep.h it8712.h jazz.h jazzdma.h m48t35.h mipsprom.h \
+	mipsregs.h msc01_ic.h ng1.h ng1hw.h nile4.h paccess.h parport.h \
+	pci_channel.h pgtable-32.h pgtable-64.h pgtable-bits.h prctl.h \
+	r4kcache.h reboot.h regdef.h riscos-syscall.h segment.h \
+	serial.h sgialib.h sgiarcs.h sgidefs.h sim.h sni.h spinlock.h \
+	stackframe.h suspend.h sysmips.h tlbdebug.h traps.h \
+	tx3912.h ucontext.h vga.h war.h watch.h wbflush.h
diff --git a/include/asm-parisc/Kbuild b/include/asm-parisc/Kbuild
new file mode 100644
index 0000000..b94e3f9
--- /dev/null
+++ b/include/asm-parisc/Kbuild
@@ -0,0 +1,8 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += asmregs.h assembly.h bootdata.h compat.h eisa_bus.h \
+	eisa_eeprom.h fixmap.h floppy.h grfioctl.h hardware.h hdreg.h \
+	hw_irq.h iosapic.h led.h machdep.h parisc-device.h parport.h \
+	parport_gsc.h pdc.h pdc_chassis.h pdcpat.h perf.h psw.h real.h \
+	rt_sigframe.h segment.h semaphore-helper.h serial.h som.h \
+	spinlock.h superio.h ucontext.h unwind.h
diff --git a/include/asm-powerpc/Kbuild b/include/asm-powerpc/Kbuild
new file mode 100644
index 0000000..ac61d7e
--- /dev/null
+++ b/include/asm-powerpc/Kbuild
@@ -0,0 +1,10 @@
+include include/asm-generic/Kbuild.asm
+
+unifdef-y += a.out.h asm-compat.h bootx.h byteorder.h cputable.h elf.h	\
+	nvram.h param.h posix_types.h ptrace.h seccomp.h signal.h	\
+	termios.h types.h unistd.h
+
+header-y += auxvec.h ioctls.h mman.h sembuf.h siginfo.h stat.h errno.h	\
+	ipcbuf.h msgbuf.h shmbuf.h socket.h termbits.h fcntl.h ipc.h	\
+	poll.h shmparam.h sockios.h ucontext.h ioctl.h linkage.h	\
+	resource.h sigcontext.h statfs.h
diff --git a/include/asm-ppc/Kbuild b/include/asm-ppc/Kbuild
new file mode 100644
index 0000000..58af928
--- /dev/null
+++ b/include/asm-ppc/Kbuild
@@ -0,0 +1,8 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += agp.h amigayle.h amipcmcia.h ans-lcd.h bootx.h bseip.h \
+	commproc.h cputable.h floppy.h gg2.h gt64260.h gt64260_defs.h \
+	harrier.h hdreg.h heathrow.h hw_irq.h i8259.h ipc.h keylargo.h \
+	m48t35.h machdep.h macio.h mk48t59.h nvram.h ocp_ids.h of_device.h\
+	ohare.h open_pic.h parport.h ppc_asm.h ppcboot.h reg.h \
+	segment.h spinlock.h todc.h traps.h ucontext.h vga.h xparameters.h
diff --git a/include/asm-s390/Kbuild b/include/asm-s390/Kbuild
new file mode 100644
index 0000000..0870054
--- /dev/null
+++ b/include/asm-s390/Kbuild
@@ -0,0 +1,4 @@
+include include/asm-generic/Kbuild.asm
+
+unifdef-y += cmb.h
+header-y += dasd.h debug.h qeth.h sfp-machine.h tape390.h ucontext.h vtoc.h
diff --git a/include/asm-sh/Kbuild b/include/asm-sh/Kbuild
new file mode 100644
index 0000000..7e77613
--- /dev/null
+++ b/include/asm-sh/Kbuild
@@ -0,0 +1,6 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += addrspace.h floppy.h freq.h hdreg.h hw_irq.h init.h ipc.h \
+	irq-sh73180.h \
+	keyboard.h numnodes.h pgtable-2level.h semaphore-helper.h \
+	serial.h sh_bios.h spinlock.h ubc.h ucontext.h watchdog.h
diff --git a/include/asm-sh64/Kbuild b/include/asm-sh64/Kbuild
new file mode 100644
index 0000000..642b9db
--- /dev/null
+++ b/include/asm-sh64/Kbuild
@@ -0,0 +1,6 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += bugs.h cayman.h current.h delay.h hardware.h hdreg.h \
+	hw_irq.h ipc.h kmap_types.h mc146818rtc.h platform.h registers.h \
+	scatterlist.h segment.h semaphore-helper.h serial.h smp.h \
+	spinlock.h string.h ucontext.h
diff --git a/include/asm-sparc/Kbuild b/include/asm-sparc/Kbuild
new file mode 100644
index 0000000..cecdc61
--- /dev/null
+++ b/include/asm-sparc/Kbuild
@@ -0,0 +1,13 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += apc.h asi.h asmmacro.h auxio.h bitext.h bpp.h \
+	bsderrno.h btfixup.h clock.h contregs.h cpudata.h cypress.h \
+	ebus.h ecc.h eeprom.h fbio.h floppy.h head.h hw_irq.h \
+	idprom.h io-unit.h iommu.h ipc.h jsflash.h \
+	kdebug.h machines.h mbus.h memreg.h mostek.h mpmbox.h msi.h \
+	mxcc.h obio.h openprom.h openpromio.h oplib.h pbm.h pcic.h \
+	pconf.h perfctr.h pgtsrmmu.h pgtsun4.h pgtsun4c.h psr.h reg.h \
+	ross.h sbi.h sbus.h sfp-machine.h smpprim.h \
+	solerrno.h spinlock.h sun4paddr.h sun4prom.h sunbpp.h svr4.h \
+	swift.h sysen.h timer.h traps.h tsunami.h turbosparc.h \
+	vac-ops.h vaddrs.h vfc_ioctls.h viking.h winmacro.h
diff --git a/include/asm-sparc64/Kbuild b/include/asm-sparc64/Kbuild
new file mode 100644
index 0000000..9b1c48c
--- /dev/null
+++ b/include/asm-sparc64/Kbuild
@@ -0,0 +1,15 @@
+include include/asm-generic/Kbuild.asm
+
+ALTARCH := sparc
+ARCHDEF := __arch64__ 
+
+header-y += agp.h apb.h asi.h auxio.h bbc.h bpp.h bsderrno.h \
+	chafsr.h chmctrl.h compat.h const.h cpudata.h dcr.h dcu.h \
+	display7seg.h ebus.h envctrl.h estate.h fbio.h fhc.h floppy.h \
+	fpumacro.h head.h hw_irq.h idprom.h iommu.h \
+	ipc.h isa.h kdebug.h kprobes.h lsu.h mostek.h ns87303.h \
+	openprom.h openpromio.h oplib.h parport.h pbm.h pconf.h \
+	perfctr.h pil.h psrcompat.h pstate.h reg.h sbus.h \
+	sfp-machine.h solerrno.h spinlock.h spitfire.h starfire.h \
+	sunbpp.h svr4.h timer.h ttable.h uctx.h upa.h utrap.h vga.h \
+	visasm.h watchdog.h
diff --git a/include/asm-um/Kbuild b/include/asm-um/Kbuild
new file mode 100644
index 0000000..e8f61cb
--- /dev/null
+++ b/include/asm-um/Kbuild
@@ -0,0 +1,14 @@
+header-y += a.out.h arch-signal-i386.h archparam-i386.h archparam-ppc.h \
+	atomic.h bitops.h boot.h bug.h byteorder.h cache.h cacheflush.h \
+	checksum.h cobalt.h desc.h dma.h elf.h errno.h fcntl.h fixmap.h \
+	floppy.h hardirq.h hdreg.h hw_irq.h init.h io.h ioctl.h ioctls.h \
+	ipc.h ipcbuf.h irq.h irq_vectors.h keyboard.h linkage.h locks.h \
+	mca_dma.h mman.h mmu.h mmu_context.h msgbuf.h mtrr.h namei.h \
+	page.h page_offset.h param.h pgalloc.h poll.h posix_types.h \
+	processor-generic.h processor-i386.h processor-ppc.h \
+	ptrace-generic.h ptrace-i386.h rwlock.h segment.h semaphore.h \
+	sembuf.h serial.h shmbuf.h shmparam.h sigcontext-generic.h \
+	sigcontext-i386.h sigcontext-ppc.h siginfo.h socket.h sockios.h \
+	spinlock.h stat.h suspend.h system-generic.h system-i386.h \
+	system-ppc.h termbits.h termios.h timex.h tlbflush.h types.h \
+	ucontext.h unaligned.h unistd.h user.h vga.h
diff --git a/include/asm-v850/Kbuild b/include/asm-v850/Kbuild
new file mode 100644
index 0000000..fe2930b
--- /dev/null
+++ b/include/asm-v850/Kbuild
@@ -0,0 +1,10 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += anna.h as85ep1.h asm.h clinkage.h entry.h flat.h fpga85e2c.h \
+	gbus_int.h highres_timer.h hw_irq.h ipc.h ma.h ma1.h machdep.h \
+	macrology.h me2.h rte_cb.h rte_ma1_cb.h rte_mb_a_pci.h \
+	rte_me2_cb.h rte_nb85e_cb.h segment.h serial.h sim.h sim85e2.h \
+	sim85e2c.h sim85e2s.h simsyscall.h teg.h ucontext.h \
+	v850e.h v850e2.h v850e2_cache.h v850e_cache.h v850e_intc.h \
+	v850e_timer_c.h v850e_timer_d.h v850e_uart.h v850e_uarta.h \
+	v850e_uartb.h v850e_utils.h
diff --git a/include/asm-x86_64/Kbuild b/include/asm-x86_64/Kbuild
new file mode 100644
index 0000000..b8d8251
--- /dev/null
+++ b/include/asm-x86_64/Kbuild
@@ -0,0 +1,10 @@
+include include/asm-generic/Kbuild.asm
+
+ALTARCH := i386
+ARCHDEF := __x86_64__
+
+header-y += boot.h bootsetup.h cpufeature.h debugreg.h kprobes.h ldt.h \
+	 msr.h prctl.h setup.h sigcontext32.h ucontext.h user32.h \
+	 vsyscall32.h
+
+unifdef-y += ia32.h mce.h mtrr.h vsyscall.h
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
new file mode 100644
index 0000000..54e8c3e
--- /dev/null
+++ b/include/linux/Kbuild
@@ -0,0 +1,63 @@
+header-y := byteorder/ dvb/ hdlc/ isdn/ nfsd/ raid/ sunrpc/ tc_act/	\
+	netfilter/ netfilter_arp/ netfilter_bridge/ netfilter_ipv4/	\
+	netfilter_ipv6/
+
+header-y += affs_fs.h affs_hardblocks.h aio_abi.h a.out.h arcfb.h	\
+	atmapi.h atmbr2684.h atmclip.h atm_eni.h atm_he.h		\
+	atm_idt77105.h atmioc.h atmlec.h atmmpc.h atm_nicstar.h		\
+	atmppp.h atmsap.h atmsvc.h atm_zatm.h auto_fs4.h auxvec.h	\
+	awe_voice.h ax25.h b1lli.h baycom.h bfs_fs.h blkpg.h		\
+	bpqether.h cdk.h chio.h coda_psdev.h coff.h comstats.h		\
+	consolemap.h crc-ccitt.h cycx_cfm.h cycx_x25.h			\
+	devfs_fs.h dn.h dqblk_v1.h dqblk_v2.h dqblk_xfs.h efs_fs_sb.h	\
+	elf-fdpic.h elf.h ethtool.h fadvise.h fd.h			\
+	ftape-header-segment.h ftape-vendors.h fuse.h futex.h		\
+	genetlink.h gen_stats.h gigaset_dev.h hdsmart.h hpfs_fs.h	\
+	hysdn_if.h i2c-dev.h i2c-id.h i8k.h icmp.h if_arcnet.h		\
+	if_arp.h if_bonding.h if_cablemodem.h if_fc.h if_fddi.h if.h	\
+	if_hippi.h if_infiniband.h if_packet.h if_plip.h if_ppp.h	\
+	if_slip.h if_strip.h if_tunnel.h in6.h 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 mii.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 ppp_defs.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 statfs.h stddef.h synclink.h telephony.h ticable.h	\
+	times.h tiocl.h tipc.h toshiba.h ultrasound.h un.h unistd.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 compiler.h connector.h cramfs_fs.h cuda.h	\
+	cyclades.h dccp.h dirent.h divert.h elfcore.h errno.h		\
+	errqueue.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 hdlcdrv.h hdlc.h hdreg.h hiddev.h hpet.h		\
+	i2c-algo-ite.h i2c.h i2o-dev.h icmpv6.h if_bridge.h if_ec.h	\
+	if_eql.h if_ether.h if_frad.h if_ltalk.h if_pppox.h		\
+	if_shaper.h if_tr.h if_tun.h if_vlan.h if_wanpipe.h igmp.h	\
+	inet_diag.h in.h inotify.h input.h ipc.h ipmi.h ipv6.h		\
+	ipv6_route.h isdn.h isdnif.h isdn_ppp.h isicom.h jbd.h		\
+	joystick.h kdev_t.h kd.h kernelcapi.h kernel.h keyboard.h	\
+	llc.h loop.h lp.h mempolicy.h mman.h mroute.h msdos_fs.h msg.h	\
+	nbd.h ncp_fs.h ncp.h ncp_mount.h netdevice.h		\
+	netfilter_bridge.h netfilter_decnet.h netfilter.h		\
+	netfilter_ipv4.h netfilter_ipv6.h netfilter_logging.h net.h	\
+	netlink.h nfs3.h nfs4.h nfsacl.h nfs_fs.h nfs.h nfs_idmap.h	\
+	n_r3964.h nubus.h nvram.h parport.h patchkey.h pktcdvd.h	\
+	pmu.h ppp-comp.h ptrace.h qnx4_fs.h quota.h	\
+	random.h reboot.h reiserfs_fs.h reiserfs_xattr.h romfs_fs.h	\
+	route.h rtc.h rtnetlink.h scc.h sched.h sdla.h			\
+	selinux_netlink.h sem.h serial_core.h serial.h serio.h shm.h	\
+	signal.h smb_fs.h smb.h smb_mount.h socket.h sonet.h sonypi.h	\
+	soundcard.h stat.h sysctl.h sysv_fs.h tcp.h time.h	\
+	timex.h tty.h types.h udf_fs_i.h udp.h uinput.h uio.h	\
+	user.h videodev2.h videodev.h wait.h wanrouter.h watchdog.h	\
+	xfrm.h zftape.h
diff --git a/include/linux/byteorder/Kbuild b/include/linux/byteorder/Kbuild
new file mode 100644
index 0000000..89e60f3
--- /dev/null
+++ b/include/linux/byteorder/Kbuild
@@ -0,0 +1 @@
+header-y += big_endian.h generic.h little_endian.h pdp_endian.h swab.h swabb.h
diff --git a/include/linux/dvb/Kbuild b/include/linux/dvb/Kbuild
new file mode 100644
index 0000000..63973af
--- /dev/null
+++ b/include/linux/dvb/Kbuild
@@ -0,0 +1,2 @@
+header-y += ca.h frontend.h net.h osd.h version.h
+unifdef-y := audio.h dmx.h video.h
diff --git a/include/linux/hdlc/Kbuild b/include/linux/hdlc/Kbuild
new file mode 100644
index 0000000..1fb2644
--- /dev/null
+++ b/include/linux/hdlc/Kbuild
@@ -0,0 +1 @@
+header-y += ioctl.h
diff --git a/include/linux/isdn/Kbuild b/include/linux/isdn/Kbuild
new file mode 100644
index 0000000..c1727c8
--- /dev/null
+++ b/include/linux/isdn/Kbuild
@@ -0,0 +1 @@
+header-y += capicmd.h tpam.h
diff --git a/include/linux/netfilter/Kbuild b/include/linux/netfilter/Kbuild
new file mode 100644
index 0000000..d06311a
--- /dev/null
+++ b/include/linux/netfilter/Kbuild
@@ -0,0 +1,11 @@
+header-y := nf_conntrack_sctp.h nf_conntrack_tuple_common.h		\
+	    nfnetlink_conntrack.h nfnetlink_log.h nfnetlink_queue.h	\
+	    xt_CLASSIFY.h xt_comment.h xt_connbytes.h xt_connmark.h	\
+	    xt_CONNMARK.h xt_conntrack.h xt_dccp.h xt_esp.h		\
+	    xt_helper.h xt_length.h xt_limit.h xt_mac.h xt_mark.h	\
+	    xt_MARK.h xt_multiport.h xt_NFQUEUE.h xt_pkttype.h		\
+	    xt_policy.h xt_realm.h xt_sctp.h xt_state.h xt_string.h	\
+	    xt_tcpmss.h xt_tcpudp.h
+
+unifdef-y := nf_conntrack_common.h nf_conntrack_ftp.h		\
+	nf_conntrack_tcp.h nfnetlink.h x_tables.h xt_physdev.h
diff --git a/include/linux/netfilter_arp/Kbuild b/include/linux/netfilter_arp/Kbuild
new file mode 100644
index 0000000..198ec5e
--- /dev/null
+++ b/include/linux/netfilter_arp/Kbuild
@@ -0,0 +1,2 @@
+header-y := arpt_mangle.h
+unifdef-y := arp_tables.h
diff --git a/include/linux/netfilter_bridge/Kbuild b/include/linux/netfilter_bridge/Kbuild
new file mode 100644
index 0000000..5b1aba6
--- /dev/null
+++ b/include/linux/netfilter_bridge/Kbuild
@@ -0,0 +1,4 @@
+header-y += ebt_among.h ebt_arp.h ebt_arpreply.h ebt_ip.h ebt_limit.h	\
+	ebt_log.h ebt_mark_m.h ebt_mark_t.h ebt_nat.h ebt_pkttype.h	\
+	ebt_redirect.h ebt_stp.h ebt_ulog.h ebt_vlan.h
+unifdef-y := ebtables.h ebt_802_3.h
diff --git a/include/linux/netfilter_ipv4/Kbuild b/include/linux/netfilter_ipv4/Kbuild
new file mode 100644
index 0000000..04e4d27
--- /dev/null
+++ b/include/linux/netfilter_ipv4/Kbuild
@@ -0,0 +1,21 @@
+
+header-y := ip_conntrack_helper.h ip_conntrack_helper_h323_asn1.h	\
+	    ip_conntrack_helper_h323_types.h ip_conntrack_protocol.h	\
+	    ip_conntrack_sctp.h ip_conntrack_tcp.h ip_conntrack_tftp.h	\
+	    ip_nat_pptp.h ipt_addrtype.h ipt_ah.h	\
+	    ipt_CLASSIFY.h ipt_CLUSTERIP.h ipt_comment.h		\
+	    ipt_connbytes.h ipt_connmark.h ipt_CONNMARK.h		\
+	    ipt_conntrack.h ipt_dccp.h ipt_dscp.h ipt_DSCP.h ipt_ecn.h	\
+	    ipt_ECN.h ipt_esp.h ipt_hashlimit.h ipt_helper.h		\
+	    ipt_iprange.h ipt_length.h ipt_limit.h ipt_LOG.h ipt_mac.h	\
+	    ipt_mark.h ipt_MARK.h ipt_multiport.h ipt_NFQUEUE.h		\
+	    ipt_owner.h ipt_physdev.h ipt_pkttype.h ipt_policy.h	\
+	    ipt_realm.h ipt_recent.h ipt_REJECT.h ipt_SAME.h		\
+	    ipt_sctp.h ipt_state.h ipt_string.h ipt_tcpmss.h		\
+	    ipt_TCPMSS.h ipt_tos.h ipt_TOS.h ipt_ttl.h ipt_TTL.h	\
+	    ipt_ULOG.h
+
+unifdef-y := ip_conntrack.h ip_conntrack_h323.h ip_conntrack_irc.h	\
+	ip_conntrack_pptp.h ip_conntrack_proto_gre.h			\
+	ip_conntrack_tuple.h ip_nat.h ip_nat_rule.h ip_queue.h		\
+	ip_tables.h
diff --git a/include/linux/netfilter_ipv6/Kbuild b/include/linux/netfilter_ipv6/Kbuild
new file mode 100644
index 0000000..0e64a36
--- /dev/null
+++ b/include/linux/netfilter_ipv6/Kbuild
@@ -0,0 +1,5 @@
+header-y += ip6t_LOG.h ip6t_MARK.h ip6t_ah.h ip6t_esp.h \
+	ip6t_frag.h ip6t_hl.h ip6t_ipv6header.h ip6t_length.h \
+	ip6t_limit.h ip6t_mac.h ip6t_mark.h ip6t_multiport.h ip6t_opts.h \
+	ip6t_owner.h ip6t_physdev.h ip6t_rt.h
+unifdef-y := ip6_tables.h
diff --git a/include/linux/nfsd/Kbuild b/include/linux/nfsd/Kbuild
new file mode 100644
index 0000000..c8c5456
--- /dev/null
+++ b/include/linux/nfsd/Kbuild
@@ -0,0 +1,2 @@
+unifdef-y := const.h export.h stats.h syscall.h nfsfh.h debug.h auth.h
+
diff --git a/include/linux/raid/Kbuild b/include/linux/raid/Kbuild
new file mode 100644
index 0000000..73fa27a
--- /dev/null
+++ b/include/linux/raid/Kbuild
@@ -0,0 +1 @@
+header-y += md_p.h md_u.h
diff --git a/include/linux/sunrpc/Kbuild b/include/linux/sunrpc/Kbuild
new file mode 100644
index 0000000..0d1d768
--- /dev/null
+++ b/include/linux/sunrpc/Kbuild
@@ -0,0 +1 @@
+unifdef-y := debug.h
diff --git a/include/linux/tc_act/Kbuild b/include/linux/tc_act/Kbuild
new file mode 100644
index 0000000..5251a50
--- /dev/null
+++ b/include/linux/tc_act/Kbuild
@@ -0,0 +1 @@
+header-y += tc_gact.h tc_ipt.h tc_mirred.h tc_pedit.h
diff --git a/include/linux/tc_ematch/Kbuild b/include/linux/tc_ematch/Kbuild
new file mode 100644
index 0000000..381e930
--- /dev/null
+++ b/include/linux/tc_ematch/Kbuild
@@ -0,0 +1 @@
+headers-y := tc_em_cmp.h tc_em_meta.h tc_em_nbyte.h tc_em_text.h
diff --git a/include/media/Kbuild b/include/media/Kbuild
new file mode 100644
index 0000000..9c5d805
--- /dev/null
+++ b/include/media/Kbuild
@@ -0,0 +1,2 @@
+header-y := audiochip.h v4l2-common.h
+unifdef-y := tuner.h
diff --git a/include/mtd/Kbuild b/include/mtd/Kbuild
new file mode 100644
index 0000000..e1da2a5
--- /dev/null
+++ b/include/mtd/Kbuild
@@ -0,0 +1,2 @@
+unifdef-y := mtd-abi.h
+header-y := inftl-user.h jffs2-user.h mtd-user.h nftl-user.h
diff --git a/include/rdma/Kbuild b/include/rdma/Kbuild
new file mode 100644
index 0000000..eb710ba
--- /dev/null
+++ b/include/rdma/Kbuild
@@ -0,0 +1 @@
+header-y := ib_user_mad.h
diff --git a/include/scsi/Kbuild b/include/scsi/Kbuild
new file mode 100644
index 0000000..14a033d
--- /dev/null
+++ b/include/scsi/Kbuild
@@ -0,0 +1,2 @@
+header-y += scsi.h
+unifdef-y := scsi_ioctl.h sg.h
diff --git a/include/sound/Kbuild b/include/sound/Kbuild
new file mode 100644
index 0000000..3a5a3df
--- /dev/null
+++ b/include/sound/Kbuild
@@ -0,0 +1,2 @@
+header-y := asound_fm.h hdsp.h hdspm.h sfnt_info.h sscape_ioctl.h
+unifdef-y := asequencer.h asound.h emu10k1.h sb16_csp.h 
diff --git a/include/video/Kbuild b/include/video/Kbuild
new file mode 100644
index 0000000..76a6073
--- /dev/null
+++ b/include/video/Kbuild
@@ -0,0 +1 @@
+unifdef-y := sisfb.h
diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
new file mode 100644
index 0000000..265d1ea
--- /dev/null
+++ b/scripts/Makefile.headersinst
@@ -0,0 +1,116 @@
+# ==========================================================================
+# Installing headers
+# ==========================================================================
+
+UNIFDEF := unifdef -U__KERNEL__
+
+_dst := $(if $(dst),$(dst),$(obj))
+
+.PHONY: __headersinst
+__headersinst:
+
+
+ifeq (,$(patsubst include/asm/%,,$(obj)/))
+# For producing the generated stuff in include/asm for biarch builds, include
+# both sets of Kbuild files; we'll generate anything which is mentioned in
+# _either_ arch, and recurse into subdirectories which are mentioned in either
+# arch. Since some directories may exist in one but not the other, we must
+# use '-include'.
+GENASM := 1
+archasm	   := $(subst include/asm,asm-$(ARCH),$(obj))
+altarchasm := $(subst include/asm,asm-$(ALTARCH),$(obj))
+-include $(if $(wildcard $(srctree)/include/$(archasm)/Kbuild), include/$(archasm)/Kbuild, include/$(archasm)/Makefile)
+-include $(if $(wildcard $(srctree)/include/$(altarchasm)/Kbuild), include/$(altarchasm)/Kbuild, include/$(altarchasm)/Makefile)
+else
+include $(if $(wildcard $(srctree)/$(obj)/Kbuild), $(obj)/Kbuild, $(obj)/Makefile)
+endif
+
+include scripts/Kbuild.include
+
+# If this is include/asm-$(ARCH) and there's no $(ALTARCH), then
+# override $(_dst) so that we install to include/asm directly.
+ifeq ($(obj)$(ALTARCH),include/asm-$(ARCH))
+     _dst := include/asm
+endif
+
+header-y	:= $(sort $(header-y))
+unifdef-y	:= $(sort $(unifdef-y))
+subdir-y	:= $(patsubst %/,%,$(filter %/, $(header-y)))
+header-y	:= $(filter-out %/, $(header-y))
+header-y	:= $(filter-out $(unifdef-y),$(header-y))
+
+ifdef ALTARCH
+ifeq ($(obj),include/asm-$(ARCH))
+altarch-y	:= altarch-dir
+endif
+endif
+
+export ALTARCH
+export ARCHDEF
+
+quiet_cmd_headers_install = INSTALL $(_dst)/$@
+      cmd_headers_install = cp $(srctree)/$(obj)/$@ $(INSTALL_HDR_PATH)/$(_dst)
+
+quiet_cmd_unifdef	  = UNIFDEF $(_dst)/$@
+      cmd_unifdef	  = $(UNIFDEF) $(srctree)/$(obj)/$@ > $(INSTALL_HDR_PATH)/$(_dst)/$@ || :
+
+quiet_cmd_check		  = CHECK $(_dst)/$@
+      cmd_check		  = $(srctree)/scripts/hdrcheck.sh $(INSTALL_HDR_PATH)/include $(INSTALL_HDR_PATH)/$(_dst)/$@
+
+quiet_cmd_mkdir		  = MKDIR $@
+      cmd_mkdir		  = mkdir -p $(INSTALL_HDR_PATH)/$@
+
+quiet_cmd_gen		  = GEN $(_dst)/$@
+      cmd_gen		  = ( echo "/* File autogenerated by 'make headers_install' */"	;			\
+      			    echo "\#ifdef $(ARCHDEF)" ;								\
+			    if [ -r $(srctree)/include/$(archasm)/$@ ]; then					\
+      			       echo "\#include <$(archasm)/$@>" ;						\
+			    else										\
+      			       echo "\#error $(archasm)/$@ does not exist in the $(ARCH) architecture" ;	\
+			    fi ;										\
+      			    echo "\#else" ;									\
+			    if [ -r $(srctree)/include/$(altarchasm)/$@ ]; then					\
+      			       echo "\#include <$(altarchasm)/$@>" ;						\
+			    else										\
+      			       echo "\#error $(altarchasm)/$@ does not exist in the $(ALTARCH) architecture" ;	\
+			    fi ;										\
+      			    echo "\#endif" ) > $(INSTALL_HDR_PATH)/$(_dst)/$@
+
+__headersinst: $(subdir-y) $(header-y) $(unifdef-y) $(altarch-y)
+
+.PHONY: $(header-y) $(unifdef-y) $(subdir-y)
+
+ifdef HDRCHECK
+# Rules for checking headers
+$(header-y) $(unifdef-y):
+	$(call cmd,check)
+else
+# Rules for installing headers
+
+$(subdir-y) $(header-y) $(unifdef-y): $(_dst)
+
+.PHONY: $(_dst)
+$(_dst):
+	$(call cmd,mkdir)
+
+ifdef GENASM
+$(header-y) $(unifdef-y):
+	$(call cmd,gen)
+
+else
+$(header-y):
+	$(call cmd,headers_install)
+
+$(unifdef-y):
+	$(call cmd,unifdef)
+endif
+endif
+
+.PHONY: altarch-dir
+altarch-dir:
+	$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include/asm-$(ALTARCH) dst=include/asm-$(ALTARCH)
+	$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include/asm dst=include/asm
+
+# Recursion
+$(subdir-y):
+	$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=$(obj)/$@ dst=$(_dst)/$@ rel=../$(rel)
diff --git a/scripts/hdrcheck.sh b/scripts/hdrcheck.sh
new file mode 100755
index 0000000..b3bb683
--- /dev/null
+++ b/scripts/hdrcheck.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+for FILE in `grep '^#include <' $2 | cut -f2 -d\< | cut -f1 -d\> | egrep ^linux\|^asm` ; do
+    if [ ! -r $1/$FILE ]; then
+	echo $2 requires $FILE, which does not exist
+	exit 1
+    fi
+done


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2162
retrieving revision 1.2163
diff -u -r1.2162 -r1.2163
--- kernel-2.6.spec	26 Apr 2006 11:32:28 -0000	1.2162
+++ kernel-2.6.spec	26 Apr 2006 12:22:04 -0000	1.2163
@@ -13,6 +13,7 @@
 %define buildxenPAE 0
 %define builddoc 0
 %define buildkdump 1
+%define buildheaders 0
 
 # Versions of various parts
 
@@ -187,6 +188,9 @@
 BuildPreReq: module-init-tools, patch >= 2.5.4, bash >= 2.03, sh-utils, tar
 BuildPreReq: bzip2, findutils, gzip, m4, perl, make >= 3.78, gnupg, diffutils
 BuildRequires: gcc >= 3.4.2, binutils >= 2.12, redhat-rpm-config
+%if %{buildheaders}
+BuildRequires: unifdef
+%endif
 BuildConflicts: rhbuildsys(DiskFree) < 500Mb
 
 
@@ -226,6 +230,14 @@
 Patch1: patch-2.6.17-rc2.bz2
 Patch2: patch-2.6.17-rc2-git7.bz2
 
+#
+# Clean up and export kernel headers to userspace
+#
+# git://git.infradead.org/hdrinstall-2.6.git
+Patch50: linux-2.6-header-install-git.patch
+# git://git.infradead.org/hdrcleanup-2.6.git
+Patch51: linux-2.6-header-cleanup-git.patch
+
 # Patches 100 through 500 are meant for architecture patches
 
 # 200 - 299   x86(-64)
@@ -436,6 +448,17 @@
 You'll want to install this package if you need a reference to the
 options that can be passed to Linux kernel modules at load time.
 
+%package headers
+Summary: Header files for the Linux kernel for use by glibc
+Group: Development/System
+Obsoletes: glibc-kernheaders
+
+%description headers
+Kernel-headers includes the C header files that specify the interface
+between the Linux kernel and userspace libraries and programs.  The
+header files define structures and constants that are needed for
+building most standard programs and are also needed for rebuilding the
+glibc package.
 
 %package PAE
 Summary: The Linux kernel compiled for PAE capable machines.
@@ -724,6 +747,11 @@
 %patch1 -p1
 %patch2 -p1
 
+%if %{buildheaders}
+%patch50 -p1
+%patch51 -p1
+%endif
+
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
 #
@@ -1331,6 +1359,10 @@
 tar cf - Documentation | tar xf - -C $RPM_BUILD_ROOT/usr/share/doc/kernel-doc-%{kversion}
 %endif
 
+%if %{buildheaders}
+# Install kernel headers
+make INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr headers_install
+%endif
 ###
 ### clean
 ###
@@ -1515,6 +1547,12 @@
 %verify(not mtime) /usr/src/kernels/%{KVERREL}-%{_target_cpu}
 %endif
 
+%if %{buildheaders}
+%files headers
+%defattr(-,root,root)
+/usr/include/*
+%endif
+
 %if %{buildpae}
 %files PAE
 %defattr(-,root,root)
@@ -1666,6 +1704,9 @@
 %endif
 
 %changelog
+* Wed Apr 26 2006 David Woodhouse <dwmw2 at redhat.com>
+- Include kernel-headers subpackage, conditionally (and off for now)
+
 * Wed Apr 26 2006 Juan Quintela <quintela at redhat.com>
 - rebase with last linux-2.6-xen.
 - enable xen again.



From fedora-cvs-commits at redhat.com  Wed Apr 26 12:25:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 08:25:50 -0400
Subject: rpms/cups/devel cups.spec, 1.173, 1.174 cups-logfileperm.patch, 1.1,
	NONE
Message-ID: <200604261225.k3QCPonQ010677@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10628

Modified Files:
	cups.spec 
Removed Files:
	cups-logfileperm.patch 
Log Message:
- Use configure switch for LogFilePerm default instead of patch.


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- cups.spec	26 Apr 2006 12:14:03 -0000	1.173
+++ cups.spec	26 Apr 2006 12:25:47 -0000	1.174
@@ -29,7 +29,6 @@
 Patch5: cups-ext.patch
 Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
-Patch8: cups-logfileperm.patch
 Patch9: cups-1.1.17-rcp.patch
 Patch10: cups-1.1.17-ppdsdat.patch
 Patch12: cups-locale.patch
@@ -117,7 +116,6 @@
 %patch5 -p1 -b .ext
 %patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
-%patch8 -p1 -b .logfileperm
 %patch9 -p1 -b .rcp
 %patch10 -p1 -b .ppdsdat
 %patch12 -p1 -b .locale
@@ -147,7 +145,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" \
+	--with-log-file-perm=0700
 
 # If we got this far, all prerequisite libraries must be here.
 make
@@ -389,6 +388,7 @@
 %changelog
 * Wed Apr 26 2006 Tim Waugh <twaugh at redhat.com>
 - No longer need backend patch.
+- Use configure switch for LogFilePerm default instead of patch.
 
 * Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com>
 - Own /var/run/cups (bug #189561).


--- cups-logfileperm.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 26 12:37:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 08:37:20 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2096.2.1,
	1.2096.2.2 3844-IPSEC-Kill-unused-decap-state-structure.txt,
	1.1.2.1, NONE
Message-ID: <200604261237.k3QCbKIv012785@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv12662

Modified Files:
      Tag: private-linville-netdev-fc5-2-branch
	kernel-2.6.spec 
Removed Files:
      Tag: private-linville-netdev-fc5-2-branch
	3844-IPSEC-Kill-unused-decap-state-structure.txt 
Log Message:



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2096.2.1
retrieving revision 1.2096.2.2
diff -u -r1.2096.2.1 -r1.2096.2.2
--- kernel-2.6.spec	26 Apr 2006 00:07:38 -0000	1.2096.2.1
+++ kernel-2.6.spec	26 Apr 2006 12:37:01 -0000	1.2096.2.2
@@ -962,154 +962,153 @@
 Patch30525: 3841-TG3-Update-driver-version-and-reldate.txt
 Patch30526: 3842-NET-com90xx-kmalloc-fix.txt
 Patch30527: 3843-IPSEC-Kill-unused-decap-state-argument.txt
-Patch30528: 3844-IPSEC-Kill-unused-decap-state-structure.txt
-Patch30529: 3846-NETFILTER-x_tables-unify-IPv4-IPv6-esp-match.txt
-Patch30530: 3847-NETFILTER-x_tables-unify-IPv4-IPv6-multiport-match.txt
-Patch30531: 3848-NETFILTER-fix-ifdef-for-connmark-support-in-nf_conntrack_netlink.txt
-Patch30532: 3865-smc91x-add-support-for-LogicPD-PXA270-platform.txt
-Patch30533: 3866-Goramo-PCI200SYN-WAN-driver-subsystem-ID-patch.txt
-Patch30534: 3947-BUG_ON-Conversion-in-drivers-net.txt
-Patch30535: 3999-kbuild-fix-unneeded-rebuilds-in-drivers-net-chelsio-after-moving-source-tree.txt
-Patch30536: 4072-IPSEC-Check-x-encap-before-dereferencing-it.txt
-Patch30537: 4076-NET-netconsole-set-.name-in-struct-console.txt
-Patch30538: 4077-NET-Fix-an-off-by-21-or-49-error.txt
-Patch30539: 4078-TG3-Fix-a-memory-leak.txt
-Patch30540: 4079-BLUETOOTH-sco-Possible-double-free.txt
-Patch30541: 4080-INET-Use-port-unreachable-instead-of-proto-for-tunnels.txt
-Patch30542: 4081-IRDA-smcinit-merged-into-smsc-ircc-driver.txt
-Patch30543: 4082-IRDA-Support-for-Sigmatel-STIR421x-chip.txt
-Patch30544: 4083-NETFILTER-Add-helper-functions-for-mass-hook-registration-unregistration.txt
-Patch30545: 4086-NETFILTER-H.323-helper-move-some-function-prototypes-to-ip_conntrack_h323.h.txt
-Patch30546: 4087-NETFILTER-H.323-helper-change-EXPORT_SYMBOL-to-EXPORT_SYMBOL_GPL.txt
-Patch30547: 4088-NETFILTER-H.323-helper-make-get_h245_addr-static.txt
-Patch30548: 4089-NETFILTER-H.323-helper-add-parameter-default_rrq_ttl.txt
-Patch30549: 4090-NETFILTER-Fix-IP_NF_CONNTRACK_NETLINK-dependency.txt
-Patch30550: 4091-NETFILTER-Introduce-infrastructure-for-address-family-specific-operations.txt
-Patch30551: 4092-NETFILTER-Add-address-family-specific-checksum-helpers.txt
-Patch30552: 4093-NETFILTER-Convert-conntrack-ipt_REJECT-to-new-checksumming-functions.txt
-Patch30553: 4094-NETFILTER-H.323-helper-remove-changelog.txt
-Patch30554: 4095-TG3-Kill-some-less-useful-flags.txt
-Patch30555: 4096-TG3-Speed-up-SRAM-access-2nd-version.txt
-Patch30556: 4097-PKT_SCHED-act_police-Rename-methods.txt
-Patch30557: 4098-NET-kzalloc-use-in-alloc_netdev.txt
-Patch30558: 4099-NET-More-kzalloc-conversions.txt
-Patch30559: 4100-NETFILTER-Fix-build-with-CONFIG_NETFILTER-y-m-on-IA64.txt
-Patch30560: 4102-NET-Fix-hotplug-race-during-device-registration.txt
-Patch30561: 4103-X25-Restore-skb-dev-setting-in-x25_type_trans.txt
-Patch30562: 4104-NETFILTER-Fix-DNAT-in-LOCAL_OUT.txt
-Patch30563: 4105-IPV4-ip_fragment-Always-compute-hash-with-ipfrag_lock-held.txt
-Patch30564: 4106-IPV6-Deinline-few-large-functions-in-inet6-code.txt
-Patch30565: 4323-knfsd-svcrpc-gss-don-t-call-svc_take_page-unnecessarily.txt
-Patch30566: 4351-IPv6-reassembly-Always-compute-hash-under-the-fragment-lock.txt
-Patch30567: 4352-BRIDGE-receive-link-local-on-disabled-ports.txt
-Patch30568: 4353-DCCP-Fix-leak-in-net-dccp-ipv4.c.txt
-Patch30569: 4355-WAN-Remove-broken-and-unmaintained-Sangoma-drivers.txt
-Patch30570: 4372-dlink-pci-cards-using-wrong-driver.txt
-Patch30571: 4373-network-axnet_cs.c-add-missing-PRIV-in-ei_rx_overrun.txt
-Patch30572: 4374-via-rhine-execute-bounce-buffers-code-on-Rhine-I-only.txt
-Patch30573: 4375-b44-disable-default-tx-pause.txt
-Patch30574: 4376-b44-increase-version-to-1.00.txt
-Patch30575: 4377-netdrvr-b44-trim-trailing-whitespace.txt
-Patch30576: 4379-drivers-net-via-rhine.c-make-a-function-static.txt
-Patch30577: 4381-net-drivers-fix-section-attributes-for-gcc.txt
-Patch30578: 4382-mv643xx_eth-Always-free-completed-tx-descs-on-tx-interrupt.txt
-Patch30579: 4383-mv643xx_eth-Fix-tx_timeout-to-only-conditionally-wake-tx-queue.txt
-Patch30580: 4385-Use-pci_set_consistent_dma_mask-in-ixgb-driver.txt
-Patch30581: 4504-IPV4-Possible-cleanups.txt
-Patch30582: 4505-XFRM-Fix-aevent-timer.txt
-Patch30583: 4510-ATM-Clip-timer-race.txt
-Patch30584: 4511-ATM-clip-run-through-Lindent.txt
-Patch30585: 4512-ATM-clip-get-rid-of-PROC_FS-ifdef.txt
-Patch30586: 4513-ATM-clip-notifier-related-cleanups.txt
-Patch30587: 4514-ATM-clip-add-module-info.txt
-Patch30588: 4515-IRDA-irda-usb-unregister-netdev-when-patch-upload-fails.txt
-Patch30589: 4516-IRDA-smsc-ircc2-smcinit-support-for-ALi-ISA-bridges.txt
-Patch30590: 4517-ip_output-account-for-fraggap-when-checking-to-add-trailer_len.txt
-Patch30591: 4521-e1000-Remove-PM-warning-DPRINTKs-breaking-2.4.x-kernels.txt
-Patch30592: 4522-e1000-Esb2-wol-link-cycle-bug-and-uninitialized-registers.txt
-Patch30593: 4523-e1000-De-inline-functions-to-benefit-from-compiler-smartness.txt
-Patch30594: 4524-e1000-Made-an-adapter-struct-variable-into-a-local-txb2b.txt
-Patch30595: 4525-e1000-Update-truesize-with-the-length-of-the-packet-for-packet-split.txt
-Patch30596: 4526-e1000-Dead-variable-cleanup.txt
-Patch30597: 4528-e1000-implement-more-efficient-tx-queue-locking.txt
-Patch30598: 4529-e1000-Version-bump-contact-fix-year-string-change.txt
-Patch30599: 4554-e1000-fix-mispatch-for-media-type-detect.txt
-Patch30600: 4564-TCP-Fix-truesize-underflow.txt
-Patch30601: 4565-IPV6-Ensure-to-have-hop-by-hop-options-in-our-header-of-sk_buff.txt
-Patch30602: 4566-IPV6-XFRM-Don-t-use-old-copy-of-pointer-after-pskb_may_pull.txt
-Patch30603: 4567-IPV6-XFRM-Fix-decoding-session-with-preceding-extension-header-s.txt
-Patch30604: 4568-IPV6-Clean-up-hop-by-hop-options-handler.txt
-Patch30605: 4569-unaligned-access-in-sk_run_filter.txt
-Patch30606: 4671-RPCSEC_GSS-fix-leak-in-krb5-code-caused-by-superfluous-kmalloc.txt
-Patch30607: 4678-SUNRPC-Dead-code-in-net-sunrpc-auth_gss-auth_gss.c.txt
-Patch30608: 4684-softmac-uses-Wiress-Ext.txt
-Patch30609: 4686-wireless-atmel-send-WEXT-scan-completion-events.txt
-Patch30610: 4687-wext-Fix-IWENCODEEXT-security-permissions.txt
-Patch30611: 4689-softmac-fix-spinlock-recursion-on-reassoc.txt
-Patch30612: 4690-orinoco-fix-truncating-commsquality-RID-with-the-latest-Symbol-firmware.txt
-Patch30613: 4691-bcm43xx-set-trans_start-on-TX-to-prevent-bogus-timeouts.txt
-Patch30614: 4692-softmac-return-EAGAIN-from-getscan-while-scanning.txt
-Patch30615: 4693-softmac-dont-send-out-packets-while-scanning.txt
-Patch30616: 4694-softmac-handle-iw_mode-properly.txt
-Patch30617: 4697-bcm43xx-wireless-fix-printk-format-warnings.txt
-Patch30618: 4698-bcm43xx-fix-config-menu-alignment.txt
-Patch30619: 4699-bcm43xx-fix-dyn-tssi2dbm-memleak.txt
-Patch30620: 4700-bcm43xx-fix-pctl-slowclock-limit-calculation.txt
-Patch30621: 4702-bcm43xx-iw_priv_args-names-should-be-16-characters.txt
-Patch30622: 4703-wext-Fix-RtNetlink-ENCODE-security-permissions.txt
-Patch30623: 4706-LLC-Use-pskb_trim_rcsum-in-llc_fixup_skb.txt
-Patch30624: 4707-SUNGEM-Marvell-PHY-suspend.txt
-Patch30625: 4709-TCP-Account-skb-overhead-in-tcp_fragment.txt
-Patch30626: 4710-NET-Add-skb-truesize-assertion-checking.txt
-Patch30627: 4741-NEx000-fix-RTL8019AS-base-address-for-RBTX4938.txt
-Patch30628: 4742-Add-VLAN-802.1q-support-to-sis900-driver.txt
-Patch30629: 4744-au1000_eth.c-probe-code-straightened-up.txt
-Patch30630: 4747-netdrvr-Convert-cassini-to-pci_iomap.txt
-Patch30631: 4748-Fix-locking-in-gianfar.txt
-Patch30632: 4768-pcmcia-add-new-ID-to-pcnet_cs.txt
-Patch30633: 4808-Fix-crash-on-big-endian-systems-during-scan.txt
-Patch30634: 4809-softmac-fix-SIOCSIWAP.txt
-Patch30635: 4813-orinoco-remove-PCMCIA-audio-support-it-s-useless-for-wireless-cards.txt
-Patch30636: 4815-orinoco-remove-tracing-code-it-s-unused.txt
-Patch30637: 4816-orinoco-remove-debug-buffer-code-and-userspace-include-support.txt
-Patch30638: 4817-orinoco-Symbol-card-supported-by-spectrum_cs-is-LA4137-not-LA4100.txt
-Patch30639: 4818-orinoco-optimize-Tx-exception-handling-in-orinoco.txt
-Patch30640: 4819-orinoco-orinoco_xmit-should-only-return-valid-symbolic-constants.txt
-Patch30641: 4820-orinoco-replace-hermes_write_words-with-hermes_write_bytes.txt
-Patch30642: 4821-orinoco-don-t-use-any-padding-for-Tx-frames.txt
-Patch30643: 4822-orinoco-refactor-and-clean-up-Tx-error-handling.txt
-Patch30644: 4823-orinoco-simplify-802.3-encapsulation-code.txt
-Patch30645: 4824-orinoco-fix-BAP0-offset-error-after-several-days-of-operation.txt
-Patch30646: 4825-orinoco-delay-FID-allocation-after-firmware-initialization.txt
-Patch30647: 4826-orinoco_pci-disable-device-and-free-IRQ-when-suspending.txt
-Patch30648: 4827-orinoco_pci-use-pci_iomap-for-resources.txt
-Patch30649: 4828-orinoco-support-PCI-suspend-resume-for-Nortel-PLX-and-TMD-adaptors.txt
-Patch30650: 4829-orinoco-reduce-differences-between-PCI-drivers-create-orinoco_pci.h.txt
-Patch30651: 4830-orinoco-further-comment-cleanup-in-the-PCI-drivers.txt
-Patch30652: 4831-orinoco-bump-version-to-0.15.txt
-Patch30653: 4833-ieee80211-Fix-TKIP-MIC-calculation-for-QoS-frames.txt
-Patch30654: 4834-ieee80211-Fix-TX-code-doesn-t-enable-QoS-when-using-WPA-QoS.txt
-Patch30655: 4835-ieee80211-export-list-of-bit-rates-with-standard-WEXT-procddures.txt
-Patch30656: 4837-ieee80211-replace-debug-IEEE80211_WARNING-with-each-own-debug-macro.txt
-Patch30657: 4838-ieee80211-update-version-stamp-to-1.1.13.txt
-Patch30658: 4839-ipw2200-Exponential-averaging-for-signal-and-noise-Level.txt
-Patch30659: 4840-ipw2200-Fix-TX-QoS-enabled-frames-problem.txt
-Patch30660: 4841-ipw2200-generates-a-scan-event-after-a-scan-has-completed.txt
-Patch30661: 4843-ipw2200-fix-compile-warning-when-CONFIG_IPW2200_DEBUG.txt
-Patch30662: 4844-ipw2200-Do-not-continue-loading-the-firmware-if-kmalloc-fails.txt
-Patch30663: 4845-ipw2200-turn-off-signal-debug-log.txt
-Patch30664: 4850-ipw2200-version-string-rework.txt
-Patch30665: 4851-ipw2200-update-version-stamp-to-1.1.2.txt
-Patch30666: 4856-ipw2200-Fix-wpa_supplicant-association-problem.txt
-Patch30667: 4857-softmac-add-SIOCSIWMLME.txt
-Patch30668: 4861-patch-prism54usb-add-set_bssid_filter.txt
-Patch30669: 4862-add-adm8211-wireless-driver.txt
-Patch30670: 4863-NETFILTER-nf_conntrack-Fix-module-refcount-dropping-too-far.txt
-Patch30671: 4864-NETFILTER-ULOG-target-is-not-obsolete.txt
-Patch30672: 4866-NETFILTER-nf_conntrack-kill-unused-callback-init_conntrack.txt
-Patch30673: 4867-NETFILTER-ip6_tables-remove-broken-comefrom-debugging.txt
-Patch30674: 4868-NETFILTER-x_tables-move-table-lock-initialization.txt
-Patch30675: 4869-NETFILTER-ipt-action-use-xt_check_target-for-basic-verification.txt
+Patch30528: 3846-NETFILTER-x_tables-unify-IPv4-IPv6-esp-match.txt
+Patch30529: 3847-NETFILTER-x_tables-unify-IPv4-IPv6-multiport-match.txt
+Patch30530: 3848-NETFILTER-fix-ifdef-for-connmark-support-in-nf_conntrack_netlink.txt
+Patch30531: 3865-smc91x-add-support-for-LogicPD-PXA270-platform.txt
+Patch30532: 3866-Goramo-PCI200SYN-WAN-driver-subsystem-ID-patch.txt
+Patch30533: 3947-BUG_ON-Conversion-in-drivers-net.txt
+Patch30534: 3999-kbuild-fix-unneeded-rebuilds-in-drivers-net-chelsio-after-moving-source-tree.txt
+Patch30535: 4072-IPSEC-Check-x-encap-before-dereferencing-it.txt
+Patch30536: 4076-NET-netconsole-set-.name-in-struct-console.txt
+Patch30537: 4077-NET-Fix-an-off-by-21-or-49-error.txt
+Patch30538: 4078-TG3-Fix-a-memory-leak.txt
+Patch30539: 4079-BLUETOOTH-sco-Possible-double-free.txt
+Patch30540: 4080-INET-Use-port-unreachable-instead-of-proto-for-tunnels.txt
+Patch30541: 4081-IRDA-smcinit-merged-into-smsc-ircc-driver.txt
+Patch30542: 4082-IRDA-Support-for-Sigmatel-STIR421x-chip.txt
+Patch30543: 4083-NETFILTER-Add-helper-functions-for-mass-hook-registration-unregistration.txt
+Patch30544: 4086-NETFILTER-H.323-helper-move-some-function-prototypes-to-ip_conntrack_h323.h.txt
+Patch30545: 4087-NETFILTER-H.323-helper-change-EXPORT_SYMBOL-to-EXPORT_SYMBOL_GPL.txt
+Patch30546: 4088-NETFILTER-H.323-helper-make-get_h245_addr-static.txt
+Patch30547: 4089-NETFILTER-H.323-helper-add-parameter-default_rrq_ttl.txt
+Patch30548: 4090-NETFILTER-Fix-IP_NF_CONNTRACK_NETLINK-dependency.txt
+Patch30549: 4091-NETFILTER-Introduce-infrastructure-for-address-family-specific-operations.txt
+Patch30550: 4092-NETFILTER-Add-address-family-specific-checksum-helpers.txt
+Patch30551: 4093-NETFILTER-Convert-conntrack-ipt_REJECT-to-new-checksumming-functions.txt
+Patch30552: 4094-NETFILTER-H.323-helper-remove-changelog.txt
+Patch30553: 4095-TG3-Kill-some-less-useful-flags.txt
+Patch30554: 4096-TG3-Speed-up-SRAM-access-2nd-version.txt
+Patch30555: 4097-PKT_SCHED-act_police-Rename-methods.txt
+Patch30556: 4098-NET-kzalloc-use-in-alloc_netdev.txt
+Patch30557: 4099-NET-More-kzalloc-conversions.txt
+Patch30558: 4100-NETFILTER-Fix-build-with-CONFIG_NETFILTER-y-m-on-IA64.txt
+Patch30559: 4102-NET-Fix-hotplug-race-during-device-registration.txt
+Patch30560: 4103-X25-Restore-skb-dev-setting-in-x25_type_trans.txt
+Patch30561: 4104-NETFILTER-Fix-DNAT-in-LOCAL_OUT.txt
+Patch30562: 4105-IPV4-ip_fragment-Always-compute-hash-with-ipfrag_lock-held.txt
+Patch30563: 4106-IPV6-Deinline-few-large-functions-in-inet6-code.txt
+Patch30564: 4323-knfsd-svcrpc-gss-don-t-call-svc_take_page-unnecessarily.txt
+Patch30565: 4351-IPv6-reassembly-Always-compute-hash-under-the-fragment-lock.txt
+Patch30566: 4352-BRIDGE-receive-link-local-on-disabled-ports.txt
+Patch30567: 4353-DCCP-Fix-leak-in-net-dccp-ipv4.c.txt
+Patch30568: 4355-WAN-Remove-broken-and-unmaintained-Sangoma-drivers.txt
+Patch30569: 4372-dlink-pci-cards-using-wrong-driver.txt
+Patch30570: 4373-network-axnet_cs.c-add-missing-PRIV-in-ei_rx_overrun.txt
+Patch30571: 4374-via-rhine-execute-bounce-buffers-code-on-Rhine-I-only.txt
+Patch30572: 4375-b44-disable-default-tx-pause.txt
+Patch30573: 4376-b44-increase-version-to-1.00.txt
+Patch30574: 4377-netdrvr-b44-trim-trailing-whitespace.txt
+Patch30575: 4379-drivers-net-via-rhine.c-make-a-function-static.txt
+Patch30576: 4381-net-drivers-fix-section-attributes-for-gcc.txt
+Patch30577: 4382-mv643xx_eth-Always-free-completed-tx-descs-on-tx-interrupt.txt
+Patch30578: 4383-mv643xx_eth-Fix-tx_timeout-to-only-conditionally-wake-tx-queue.txt
+Patch30579: 4385-Use-pci_set_consistent_dma_mask-in-ixgb-driver.txt
+Patch30580: 4504-IPV4-Possible-cleanups.txt
+Patch30581: 4505-XFRM-Fix-aevent-timer.txt
+Patch30582: 4510-ATM-Clip-timer-race.txt
+Patch30583: 4511-ATM-clip-run-through-Lindent.txt
+Patch30584: 4512-ATM-clip-get-rid-of-PROC_FS-ifdef.txt
+Patch30585: 4513-ATM-clip-notifier-related-cleanups.txt
+Patch30586: 4514-ATM-clip-add-module-info.txt
+Patch30587: 4515-IRDA-irda-usb-unregister-netdev-when-patch-upload-fails.txt
+Patch30588: 4516-IRDA-smsc-ircc2-smcinit-support-for-ALi-ISA-bridges.txt
+Patch30589: 4517-ip_output-account-for-fraggap-when-checking-to-add-trailer_len.txt
+Patch30590: 4521-e1000-Remove-PM-warning-DPRINTKs-breaking-2.4.x-kernels.txt
+Patch30591: 4522-e1000-Esb2-wol-link-cycle-bug-and-uninitialized-registers.txt
+Patch30592: 4523-e1000-De-inline-functions-to-benefit-from-compiler-smartness.txt
+Patch30593: 4524-e1000-Made-an-adapter-struct-variable-into-a-local-txb2b.txt
+Patch30594: 4525-e1000-Update-truesize-with-the-length-of-the-packet-for-packet-split.txt
+Patch30595: 4526-e1000-Dead-variable-cleanup.txt
+Patch30596: 4528-e1000-implement-more-efficient-tx-queue-locking.txt
+Patch30597: 4529-e1000-Version-bump-contact-fix-year-string-change.txt
+Patch30598: 4554-e1000-fix-mispatch-for-media-type-detect.txt
+Patch30599: 4564-TCP-Fix-truesize-underflow.txt
+Patch30600: 4565-IPV6-Ensure-to-have-hop-by-hop-options-in-our-header-of-sk_buff.txt
+Patch30601: 4566-IPV6-XFRM-Don-t-use-old-copy-of-pointer-after-pskb_may_pull.txt
+Patch30602: 4567-IPV6-XFRM-Fix-decoding-session-with-preceding-extension-header-s.txt
+Patch30603: 4568-IPV6-Clean-up-hop-by-hop-options-handler.txt
+Patch30604: 4569-unaligned-access-in-sk_run_filter.txt
+Patch30605: 4671-RPCSEC_GSS-fix-leak-in-krb5-code-caused-by-superfluous-kmalloc.txt
+Patch30606: 4678-SUNRPC-Dead-code-in-net-sunrpc-auth_gss-auth_gss.c.txt
+Patch30607: 4684-softmac-uses-Wiress-Ext.txt
+Patch30608: 4686-wireless-atmel-send-WEXT-scan-completion-events.txt
+Patch30609: 4687-wext-Fix-IWENCODEEXT-security-permissions.txt
+Patch30610: 4689-softmac-fix-spinlock-recursion-on-reassoc.txt
+Patch30611: 4690-orinoco-fix-truncating-commsquality-RID-with-the-latest-Symbol-firmware.txt
+Patch30612: 4691-bcm43xx-set-trans_start-on-TX-to-prevent-bogus-timeouts.txt
+Patch30613: 4692-softmac-return-EAGAIN-from-getscan-while-scanning.txt
+Patch30614: 4693-softmac-dont-send-out-packets-while-scanning.txt
+Patch30615: 4694-softmac-handle-iw_mode-properly.txt
+Patch30616: 4697-bcm43xx-wireless-fix-printk-format-warnings.txt
+Patch30617: 4698-bcm43xx-fix-config-menu-alignment.txt
+Patch30618: 4699-bcm43xx-fix-dyn-tssi2dbm-memleak.txt
+Patch30619: 4700-bcm43xx-fix-pctl-slowclock-limit-calculation.txt
+Patch30620: 4702-bcm43xx-iw_priv_args-names-should-be-16-characters.txt
+Patch30621: 4703-wext-Fix-RtNetlink-ENCODE-security-permissions.txt
+Patch30622: 4706-LLC-Use-pskb_trim_rcsum-in-llc_fixup_skb.txt
+Patch30623: 4707-SUNGEM-Marvell-PHY-suspend.txt
+Patch30624: 4709-TCP-Account-skb-overhead-in-tcp_fragment.txt
+Patch30625: 4710-NET-Add-skb-truesize-assertion-checking.txt
+Patch30626: 4741-NEx000-fix-RTL8019AS-base-address-for-RBTX4938.txt
+Patch30627: 4742-Add-VLAN-802.1q-support-to-sis900-driver.txt
+Patch30628: 4744-au1000_eth.c-probe-code-straightened-up.txt
+Patch30629: 4747-netdrvr-Convert-cassini-to-pci_iomap.txt
+Patch30630: 4748-Fix-locking-in-gianfar.txt
+Patch30631: 4768-pcmcia-add-new-ID-to-pcnet_cs.txt
+Patch30632: 4808-Fix-crash-on-big-endian-systems-during-scan.txt
+Patch30633: 4809-softmac-fix-SIOCSIWAP.txt
+Patch30634: 4813-orinoco-remove-PCMCIA-audio-support-it-s-useless-for-wireless-cards.txt
+Patch30635: 4815-orinoco-remove-tracing-code-it-s-unused.txt
+Patch30636: 4816-orinoco-remove-debug-buffer-code-and-userspace-include-support.txt
+Patch30637: 4817-orinoco-Symbol-card-supported-by-spectrum_cs-is-LA4137-not-LA4100.txt
+Patch30638: 4818-orinoco-optimize-Tx-exception-handling-in-orinoco.txt
+Patch30639: 4819-orinoco-orinoco_xmit-should-only-return-valid-symbolic-constants.txt
+Patch30640: 4820-orinoco-replace-hermes_write_words-with-hermes_write_bytes.txt
+Patch30641: 4821-orinoco-don-t-use-any-padding-for-Tx-frames.txt
+Patch30642: 4822-orinoco-refactor-and-clean-up-Tx-error-handling.txt
+Patch30643: 4823-orinoco-simplify-802.3-encapsulation-code.txt
+Patch30644: 4824-orinoco-fix-BAP0-offset-error-after-several-days-of-operation.txt
+Patch30645: 4825-orinoco-delay-FID-allocation-after-firmware-initialization.txt
+Patch30646: 4826-orinoco_pci-disable-device-and-free-IRQ-when-suspending.txt
+Patch30647: 4827-orinoco_pci-use-pci_iomap-for-resources.txt
+Patch30648: 4828-orinoco-support-PCI-suspend-resume-for-Nortel-PLX-and-TMD-adaptors.txt
+Patch30649: 4829-orinoco-reduce-differences-between-PCI-drivers-create-orinoco_pci.h.txt
+Patch30650: 4830-orinoco-further-comment-cleanup-in-the-PCI-drivers.txt
+Patch30651: 4831-orinoco-bump-version-to-0.15.txt
+Patch30652: 4833-ieee80211-Fix-TKIP-MIC-calculation-for-QoS-frames.txt
+Patch30653: 4834-ieee80211-Fix-TX-code-doesn-t-enable-QoS-when-using-WPA-QoS.txt
+Patch30654: 4835-ieee80211-export-list-of-bit-rates-with-standard-WEXT-procddures.txt
+Patch30655: 4837-ieee80211-replace-debug-IEEE80211_WARNING-with-each-own-debug-macro.txt
+Patch30656: 4838-ieee80211-update-version-stamp-to-1.1.13.txt
+Patch30657: 4839-ipw2200-Exponential-averaging-for-signal-and-noise-Level.txt
+Patch30658: 4840-ipw2200-Fix-TX-QoS-enabled-frames-problem.txt
+Patch30659: 4841-ipw2200-generates-a-scan-event-after-a-scan-has-completed.txt
+Patch30660: 4843-ipw2200-fix-compile-warning-when-CONFIG_IPW2200_DEBUG.txt
+Patch30661: 4844-ipw2200-Do-not-continue-loading-the-firmware-if-kmalloc-fails.txt
+Patch30662: 4845-ipw2200-turn-off-signal-debug-log.txt
+Patch30663: 4850-ipw2200-version-string-rework.txt
+Patch30664: 4851-ipw2200-update-version-stamp-to-1.1.2.txt
+Patch30665: 4856-ipw2200-Fix-wpa_supplicant-association-problem.txt
+Patch30666: 4857-softmac-add-SIOCSIWMLME.txt
+Patch30667: 4861-patch-prism54usb-add-set_bssid_filter.txt
+Patch30668: 4862-add-adm8211-wireless-driver.txt
+Patch30669: 4863-NETFILTER-nf_conntrack-Fix-module-refcount-dropping-too-far.txt
+Patch30670: 4864-NETFILTER-ULOG-target-is-not-obsolete.txt
+Patch30671: 4866-NETFILTER-nf_conntrack-kill-unused-callback-init_conntrack.txt
+Patch30672: 4867-NETFILTER-ip6_tables-remove-broken-comefrom-debugging.txt
+Patch30673: 4868-NETFILTER-x_tables-move-table-lock-initialization.txt
+Patch30674: 4869-NETFILTER-ipt-action-use-xt_check_target-for-basic-verification.txt
 
 # END OF PATCH DEFINITIONS
 
@@ -2824,302 +2823,300 @@
 %patch30526 -p1
 # [IPSEC]: Kill unused decap state argument
 %patch30527 -p1
-# [IPSEC]: Kill unused decap state structure
-%patch30528 -p1
 # [NETFILTER]: x_tables: unify IPv4/IPv6 esp match
-%patch30529 -p1
+%patch30528 -p1
 # [NETFILTER]: x_tables: unify IPv4/IPv6 multiport match
-%patch30530 -p1
+%patch30529 -p1
 # [NETFILTER]: fix ifdef for connmark support in nf_conntrack_netlink
-%patch30531 -p1
+%patch30530 -p1
 # smc91x: add support for LogicPD PXA270 platform
-%patch30532 -p1
+%patch30531 -p1
 # Goramo PCI200SYN WAN driver subsystem ID patch
-%patch30533 -p1
+%patch30532 -p1
 # BUG_ON() Conversion in drivers/net/
-%patch30534 -p1
+%patch30533 -p1
 # kbuild: fix unneeded rebuilds in drivers/net/chelsio after moving source tree
-%patch30535 -p1
+%patch30534 -p1
 # [IPSEC]: Check x->encap before dereferencing it
-%patch30536 -p1
+%patch30535 -p1
 # [NET] netconsole: set .name in struct console
-%patch30537 -p1
+%patch30536 -p1
 # [NET]: Fix an off-by-21-or-49 error.
-%patch30538 -p1
+%patch30537 -p1
 # [TG3]: Fix a memory leak.
-%patch30539 -p1
+%patch30538 -p1
 # [BLUETOOTH] sco: Possible double free.
-%patch30540 -p1
+%patch30539 -p1
 # [INET]: Use port unreachable instead of proto for tunnels
-%patch30541 -p1
+%patch30540 -p1
 # [IRDA]: smcinit merged into smsc-ircc driver
-%patch30542 -p1
+%patch30541 -p1
 # [IRDA]: Support for Sigmatel STIR421x chip
-%patch30543 -p1
+%patch30542 -p1
 # [NETFILTER]: Add helper functions for mass hook registration/unregistration
-%patch30544 -p1
+%patch30543 -p1
 # [NETFILTER]: H.323 helper: move some function prototypes to ip_conntrack_h323.h
-%patch30545 -p1
+%patch30544 -p1
 # [NETFILTER]: H.323 helper: change EXPORT_SYMBOL to EXPORT_SYMBOL_GPL
-%patch30546 -p1
+%patch30545 -p1
 # [NETFILTER]: H.323 helper: make get_h245_addr() static
-%patch30547 -p1
+%patch30546 -p1
 # [NETFILTER]: H.323 helper: add parameter 'default_rrq_ttl'
-%patch30548 -p1
+%patch30547 -p1
 # [NETFILTER]: Fix IP_NF_CONNTRACK_NETLINK dependency
-%patch30549 -p1
+%patch30548 -p1
 # [NETFILTER]: Introduce infrastructure for address family specific operations
-%patch30550 -p1
+%patch30549 -p1
 # [NETFILTER]: Add address family specific checksum helpers
-%patch30551 -p1
+%patch30550 -p1
 # [NETFILTER]: Convert conntrack/ipt_REJECT to new checksumming functions
-%patch30552 -p1
+%patch30551 -p1
 # [NETFILTER]: H.323 helper: remove changelog
-%patch30553 -p1
+%patch30552 -p1
 # [TG3]: Kill some less useful flags
-%patch30554 -p1
+%patch30553 -p1
 # [TG3]: Speed up SRAM access (2nd version)
-%patch30555 -p1
+%patch30554 -p1
 # [PKT_SCHED] act_police: Rename methods.
-%patch30556 -p1
+%patch30555 -p1
 # [NET] kzalloc: use in alloc_netdev
-%patch30557 -p1
+%patch30556 -p1
 # [NET]: More kzalloc conversions.
-%patch30558 -p1
+%patch30557 -p1
 # [NETFILTER]: Fix build with CONFIG_NETFILTER=y/m on IA64
-%patch30559 -p1
+%patch30558 -p1
 # [NET]: Fix hotplug race during device registration.
-%patch30560 -p1
+%patch30559 -p1
 # [X25]: Restore skb->dev setting in x25_type_trans().
-%patch30561 -p1
+%patch30560 -p1
 # [NETFILTER]: Fix DNAT in LOCAL_OUT
-%patch30562 -p1
+%patch30561 -p1
 # [IPV4] ip_fragment: Always compute hash with ipfrag_lock held.
-%patch30563 -p1
+%patch30562 -p1
 # [IPV6]: Deinline few large functions in inet6 code
-%patch30564 -p1
+%patch30563 -p1
 # knfsd: svcrpc: gss: don't call svc_take_page unnecessarily
-%patch30565 -p1
+%patch30564 -p1
 # [IPv6] reassembly: Always compute hash under the fragment lock.
-%patch30566 -p1
+%patch30565 -p1
 # [BRIDGE]: receive link-local on disabled ports.
-%patch30567 -p1
+%patch30566 -p1
 # [DCCP]: Fix leak in net/dccp/ipv4.c
-%patch30568 -p1
+%patch30567 -p1
 # [WAN]: Remove broken and unmaintained Sangoma drivers.
-%patch30569 -p1
+%patch30568 -p1
 # dlink pci cards using wrong driver
-%patch30570 -p1
+%patch30569 -p1
 # network: axnet_cs.c: add missing 'PRIV' in ei_rx_overrun
-%patch30571 -p1
+%patch30570 -p1
 # via-rhine: execute bounce buffers code on Rhine-I only
-%patch30572 -p1
+%patch30571 -p1
 # b44: disable default tx pause
-%patch30573 -p1
+%patch30572 -p1
 # b44: increase version to 1.00
-%patch30574 -p1
+%patch30573 -p1
 # [netdrvr b44] trim trailing whitespace
-%patch30575 -p1
+%patch30574 -p1
 # drivers/net/via-rhine.c: make a function static
-%patch30576 -p1
+%patch30575 -p1
 # net drivers: fix section attributes for gcc
-%patch30577 -p1
+%patch30576 -p1
 # mv643xx_eth: Always free completed tx descs on tx interrupt
-%patch30578 -p1
+%patch30577 -p1
 # mv643xx_eth: Fix tx_timeout to only conditionally wake tx queue
-%patch30579 -p1
+%patch30578 -p1
 # Use pci_set_consistent_dma_mask in ixgb driver
-%patch30580 -p1
+%patch30579 -p1
 # [IPV4]: Possible cleanups.
-%patch30581 -p1
+%patch30580 -p1
 # [XFRM]: Fix aevent timer.
-%patch30582 -p1
+%patch30581 -p1
 # [ATM]: Clip timer race.
-%patch30583 -p1
+%patch30582 -p1
 # [ATM] clip: run through Lindent
-%patch30584 -p1
+%patch30583 -p1
 # [ATM] clip: get rid of PROC_FS ifdef
-%patch30585 -p1
+%patch30584 -p1
 # [ATM] clip: notifier related cleanups
-%patch30586 -p1
+%patch30585 -p1
 # [ATM] clip: add module info
-%patch30587 -p1
+%patch30586 -p1
 # [IRDA]: irda-usb, unregister netdev when patch upload fails
-%patch30588 -p1
+%patch30587 -p1
 # [IRDA]: smsc-ircc2, smcinit support for ALi ISA bridges
-%patch30589 -p1
+%patch30588 -p1
 # ip_output: account for fraggap when checking to add trailer_len
-%patch30590 -p1
+%patch30589 -p1
 # e1000: Remove PM warning DPRINTKs breaking 2.4.x kernels
-%patch30591 -p1
+%patch30590 -p1
 # e1000: Esb2 wol link cycle bug and uninitialized registers
-%patch30592 -p1
+%patch30591 -p1
 # e1000: De-inline functions to benefit from compiler smartness
-%patch30593 -p1
+%patch30592 -p1
 # e1000: Made an adapter struct variable into a local (txb2b)
-%patch30594 -p1
+%patch30593 -p1
 # e1000: Update truesize with the length of the packet for packet split
-%patch30595 -p1
+%patch30594 -p1
 # e1000: Dead variable cleanup
-%patch30596 -p1
+%patch30595 -p1
 # e1000: implement more efficient tx queue locking
-%patch30597 -p1
+%patch30596 -p1
 # e1000: Version bump, contact fix, year string change
-%patch30598 -p1
+%patch30597 -p1
 # e1000: fix mispatch for media type detect.
-%patch30599 -p1
+%patch30598 -p1
 # [TCP]: Fix truesize underflow
-%patch30600 -p1
+%patch30599 -p1
 # [IPV6]: Ensure to have hop-by-hop options in our header of &sk_buff.
-%patch30601 -p1
+%patch30600 -p1
 # [IPV6] XFRM: Don't use old copy of pointer after pskb_may_pull().
-%patch30602 -p1
+%patch30601 -p1
 # [IPV6] XFRM: Fix decoding session with preceding extension header(s).
-%patch30603 -p1
+%patch30602 -p1
 # [IPV6]: Clean up hop-by-hop options handler.
-%patch30604 -p1
+%patch30603 -p1
 # unaligned access in sk_run_filter()
-%patch30605 -p1
+%patch30604 -p1
 # RPCSEC_GSS: fix leak in krb5 code caused by superfluous kmalloc
-%patch30606 -p1
+%patch30605 -p1
 # SUNRPC: Dead code in net/sunrpc/auth_gss/auth_gss.c
-%patch30607 -p1
+%patch30606 -p1
 # softmac uses Wiress Ext.
-%patch30608 -p1
+%patch30607 -p1
 # wireless/atmel: send WEXT scan completion events
-%patch30609 -p1
+%patch30608 -p1
 # wext: Fix IWENCODEEXT security permissions
-%patch30610 -p1
+%patch30609 -p1
 # softmac: fix spinlock recursion on reassoc
-%patch30611 -p1
+%patch30610 -p1
 # orinoco: fix truncating commsquality RID with the latest Symbol firmware
-%patch30612 -p1
+%patch30611 -p1
 # bcm43xx: set trans_start on TX to prevent bogus timeouts
-%patch30613 -p1
+%patch30612 -p1
 # softmac: return -EAGAIN from getscan while scanning
-%patch30614 -p1
+%patch30613 -p1
 # softmac: dont send out packets while scanning
-%patch30615 -p1
+%patch30614 -p1
 # softmac: handle iw_mode properly
-%patch30616 -p1
+%patch30615 -p1
 # bcm43xx wireless: fix printk format warnings
-%patch30617 -p1
+%patch30616 -p1
 # bcm43xx: fix config menu alignment
-%patch30618 -p1
+%patch30617 -p1
 # bcm43xx: fix dyn tssi2dbm memleak
-%patch30619 -p1
+%patch30618 -p1
 # bcm43xx: fix pctl slowclock limit calculation
-%patch30620 -p1
+%patch30619 -p1
 # bcm43xx: iw_priv_args names should be <16 characters
-%patch30621 -p1
+%patch30620 -p1
 # wext: Fix RtNetlink ENCODE security permissions
-%patch30622 -p1
+%patch30621 -p1
 # [LLC]: Use pskb_trim_rcsum() in llc_fixup_skb().
-%patch30623 -p1
+%patch30622 -p1
 # [SUNGEM]: Marvell PHY suspend.
-%patch30624 -p1
+%patch30623 -p1
 # [TCP]: Account skb overhead in tcp_fragment
-%patch30625 -p1
+%patch30624 -p1
 # [NET]: Add skb->truesize assertion checking.
-%patch30626 -p1
+%patch30625 -p1
 # NEx000: fix RTL8019AS base address for RBTX4938
-%patch30627 -p1
+%patch30626 -p1
 # Add VLAN (802.1q) support to sis900 driver
-%patch30628 -p1
+%patch30627 -p1
 # au1000_eth.c probe code straightened up
-%patch30629 -p1
+%patch30628 -p1
 # netdrvr: Convert cassini to pci_iomap
-%patch30630 -p1
+%patch30629 -p1
 # Fix locking in gianfar
-%patch30631 -p1
+%patch30630 -p1
 # pcmcia: add new ID to pcnet_cs
-%patch30632 -p1
+%patch30631 -p1
 # Fix crash on big-endian systems during scan
-%patch30633 -p1
+%patch30632 -p1
 # softmac: fix SIOCSIWAP
-%patch30634 -p1
+%patch30633 -p1
 # orinoco: remove PCMCIA audio support, it's useless for wireless cards
-%patch30635 -p1
+%patch30634 -p1
 # orinoco: remove tracing code, it's unused
-%patch30636 -p1
+%patch30635 -p1
 # orinoco: remove debug buffer code and userspace include support
-%patch30637 -p1
+%patch30636 -p1
 # orinoco: Symbol card supported by spectrum_cs is LA4137, not LA4100
-%patch30638 -p1
+%patch30637 -p1
 # orinoco: optimize Tx exception handling in orinoco
-%patch30639 -p1
+%patch30638 -p1
 # orinoco: orinoco_xmit() should only return valid symbolic constants
-%patch30640 -p1
+%patch30639 -p1
 # orinoco replace hermes_write_words() with hermes_write_bytes()
-%patch30641 -p1
+%patch30640 -p1
 # orinoco: don't use any padding for Tx frames
-%patch30642 -p1
+%patch30641 -p1
 # orinoco: refactor and clean up Tx error handling
-%patch30643 -p1
+%patch30642 -p1
 # orinoco: simplify 802.3 encapsulation code
-%patch30644 -p1
+%patch30643 -p1
 # orinoco: fix BAP0 offset error after several days of operation
-%patch30645 -p1
+%patch30644 -p1
 # orinoco: delay FID allocation after firmware initialization
-%patch30646 -p1
+%patch30645 -p1
 # orinoco_pci: disable device and free IRQ when suspending
-%patch30647 -p1
+%patch30646 -p1
 # orinoco_pci: use pci_iomap() for resources
-%patch30648 -p1
+%patch30647 -p1
 # orinoco: support PCI suspend/resume for Nortel, PLX and TMD adaptors
-%patch30649 -p1
+%patch30648 -p1
 # orinoco: reduce differences between PCI drivers, create orinoco_pci.h
-%patch30650 -p1
+%patch30649 -p1
 # orinoco: further comment cleanup in the PCI drivers
-%patch30651 -p1
+%patch30650 -p1
 # orinoco: bump version to 0.15
-%patch30652 -p1
+%patch30651 -p1
 # ieee80211: Fix TKIP MIC calculation for QoS frames
-%patch30653 -p1
+%patch30652 -p1
 # ieee80211: Fix TX code doesn't enable QoS when using WPA + QoS
-%patch30654 -p1
+%patch30653 -p1
 # ieee80211: export list of bit rates with standard WEXT procddures
-%patch30655 -p1
+%patch30654 -p1
 # ieee80211: replace debug IEEE80211_WARNING with each own debug macro
-%patch30656 -p1
+%patch30655 -p1
 # ieee80211: update version stamp to 1.1.13
-%patch30657 -p1
+%patch30656 -p1
 # ipw2200: Exponential averaging for signal and noise Level
-%patch30658 -p1
+%patch30657 -p1
 # ipw2200: Fix TX QoS enabled frames problem
-%patch30659 -p1
+%patch30658 -p1
 # ipw2200: generates a scan event after a scan has completed
-%patch30660 -p1
+%patch30659 -p1
 # ipw2200: fix compile warning when !CONFIG_IPW2200_DEBUG
-%patch30661 -p1
+%patch30660 -p1
 # ipw2200: Do not continue loading the firmware if kmalloc fails
-%patch30662 -p1
+%patch30661 -p1
 # ipw2200: turn off signal debug log
-%patch30663 -p1
+%patch30662 -p1
 # ipw2200: version string rework
-%patch30664 -p1
+%patch30663 -p1
 # ipw2200: update version stamp to 1.1.2
-%patch30665 -p1
+%patch30664 -p1
 # ipw2200: Fix wpa_supplicant association problem
-%patch30666 -p1
+%patch30665 -p1
 # softmac: add SIOCSIWMLME
-%patch30667 -p1
+%patch30666 -p1
 # patch prism54usb: add set_bssid_filter
-%patch30668 -p1
+%patch30667 -p1
 # add adm8211 wireless driver
-%patch30669 -p1
+%patch30668 -p1
 # [NETFILTER]: nf_conntrack: Fix module refcount dropping too far
-%patch30670 -p1
+%patch30669 -p1
 # [NETFILTER]: ULOG target is not obsolete
-%patch30671 -p1
+%patch30670 -p1
 # [NETFILTER]: nf_conntrack: kill unused callback init_conntrack
-%patch30672 -p1
+%patch30671 -p1
 # [NETFILTER]: ip6_tables: remove broken comefrom debugging
-%patch30673 -p1
+%patch30672 -p1
 # [NETFILTER]: x_tables: move table->lock initialization
-%patch30674 -p1
+%patch30673 -p1
 # [NETFILTER]: ipt action: use xt_check_target for basic verification
-%patch30675 -p1
+%patch30674 -p1
 
 # END OF PATCH APPLICATIONS
 
@@ -4249,7 +4246,6 @@
 - [TG3]: Update driver version and reldate.
 - [NET]: com90xx kmalloc fix
 - [IPSEC]: Kill unused decap state argument
-- [IPSEC]: Kill unused decap state structure
 - [NETFILTER]: x_tables: unify IPv4/IPv6 esp match
 - [NETFILTER]: x_tables: unify IPv4/IPv6 multiport match
 - [NETFILTER]: fix ifdef for connmark support in nf_conntrack_netlink


--- 3844-IPSEC-Kill-unused-decap-state-structure.txt DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 26 12:51:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 08:51:42 -0400
Subject: rpms/cups/devel cups.spec, 1.174, 1.175 cups-1.1.17-rcp.patch, 1.3,
	NONE
Message-ID: <200604261251.k3QCpg8A031088@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31031

Modified Files:
	cups.spec 
Removed Files:
	cups-1.1.17-rcp.patch 
Log Message:
No longer need rcp patch.


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- cups.spec	26 Apr 2006 12:25:47 -0000	1.174
+++ cups.spec	26 Apr 2006 12:51:40 -0000	1.175
@@ -29,7 +29,6 @@
 Patch5: cups-ext.patch
 Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
-Patch9: cups-1.1.17-rcp.patch
 Patch10: cups-1.1.17-ppdsdat.patch
 Patch12: cups-locale.patch
 Patch13: cups-CAN-2005-0064.patch
@@ -116,7 +115,6 @@
 %patch5 -p1 -b .ext
 %patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
-%patch9 -p1 -b .rcp
 %patch10 -p1 -b .ppdsdat
 %patch12 -p1 -b .locale
 %patch13 -p1 -b .CAN-2005-0064
@@ -387,7 +385,7 @@
 
 %changelog
 * Wed Apr 26 2006 Tim Waugh <twaugh at redhat.com>
-- No longer need backend patch.
+- No longer need backend, rcp patches.
 - Use configure switch for LogFilePerm default instead of patch.
 
 * Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com>


--- cups-1.1.17-rcp.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 26 12:55:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 08:55:18 -0400
Subject: rpms/cups/devel cups.init, 1.6, 1.7 cups.spec, 1.175,
	1.176 cups-1.1.17-ppdsdat.patch, 1.4, NONE
Message-ID: <200604261255.k3QCtIcu032455@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32403

Modified Files:
	cups.init cups.spec 
Removed Files:
	cups-1.1.17-ppdsdat.patch 
Log Message:
No longer need --ppdsdat option.


Index: cups.init
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cups.init	9 Sep 2004 04:05:22 -0000	1.6
+++ cups.init	26 Apr 2006 12:55:15 -0000	1.7
@@ -99,12 +99,6 @@
 		killproc $DAEMON -HUP
 		RETVAL=$?
 		echo
-		if [ $RETVAL -ne 0 ]
-		then
-			# Rebuild ppds.dat file if the daemon wasn't
-			# there to do it.
-			$DAEMON --ppdsdat
-		fi
 	;;
 	status)
 		status $DAEMON


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- cups.spec	26 Apr 2006 12:51:40 -0000	1.175
+++ cups.spec	26 Apr 2006 12:55:15 -0000	1.176
@@ -29,7 +29,6 @@
 Patch5: cups-ext.patch
 Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
-Patch10: cups-1.1.17-ppdsdat.patch
 Patch12: cups-locale.patch
 Patch13: cups-CAN-2005-0064.patch
 Patch16: cups-pie.patch
@@ -115,7 +114,6 @@
 %patch5 -p1 -b .ext
 %patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
-%patch10 -p1 -b .ppdsdat
 %patch12 -p1 -b .locale
 %patch13 -p1 -b .CAN-2005-0064
 %if %build_as_pie
@@ -385,7 +383,7 @@
 
 %changelog
 * Wed Apr 26 2006 Tim Waugh <twaugh at redhat.com>
-- No longer need backend, rcp patches.
+- No longer need backend, rcp, ppdsdat patches.
 - Use configure switch for LogFilePerm default instead of patch.
 
 * Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com>


--- cups-1.1.17-ppdsdat.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 26 12:58:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 08:58:46 -0400
Subject: rpms/libgdiplus/FC-5 .cvsignore, 1.6, 1.7 libgdiplus.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <200604261258.k3QCwkjd001397@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/libgdiplus/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1130

Modified Files:
	.cvsignore libgdiplus.spec sources 
Log Message:
* Wed Apr 26 2006 Alexander Larsson <alexl at redhat.com> - 1.1.13.6-1.fc5.1
- Upgrade to 1.1.13.6




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgdiplus/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	4 Mar 2006 01:16:15 -0000	1.6
+++ .cvsignore	26 Apr 2006 12:58:43 -0000	1.7
@@ -1 +1 @@
-libgdiplus-1.1.13.4.tar.gz
+libgdiplus-1.1.13.6.tar.gz


Index: libgdiplus.spec
===================================================================
RCS file: /cvs/dist/rpms/libgdiplus/FC-5/libgdiplus.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libgdiplus.spec	4 Mar 2006 01:16:15 -0000	1.13
+++ libgdiplus.spec	26 Apr 2006 12:58:43 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           libgdiplus
-Version:        1.1.13.4
-Release:        1
+Version:        1.1.13.6
+Release:        1.fc5.1
 Summary:        libgdiplus: An Open Source implementation of the GDI+ API
 
 Group:          System Environment/Libraries
@@ -46,6 +46,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Apr 26 2006 Alexander Larsson <alexl at redhat.com> - 1.1.13.6-1.fc5.1
+- Upgrade to 1.1.13.6
+
 * Fri Mar  3 2006 Christopher Aillon <caillon at redhat.com> - 1.1.13.4-1
 - Update to 1.1.13.4
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgdiplus/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	4 Mar 2006 01:16:15 -0000	1.6
+++ sources	26 Apr 2006 12:58:43 -0000	1.7
@@ -1 +1 @@
-3ea5e3ee01f1f43459e2c2d0b52ece1a  libgdiplus-1.1.13.4.tar.gz
+9177164efa8dfe8f625c240945d6a379  libgdiplus-1.1.13.6.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 26 12:59:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 08:59:40 -0400
Subject: rpms/libgdiplus/devel .cvsignore, 1.6, 1.7 libgdiplus.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <200604261259.k3QCxeGT001802@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/libgdiplus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1762

Modified Files:
	.cvsignore libgdiplus.spec sources 
Log Message:
- Upgrade to 1.1.13.6




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgdiplus/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	4 Mar 2006 01:16:15 -0000	1.6
+++ .cvsignore	26 Apr 2006 12:59:38 -0000	1.7
@@ -1 +1 @@
-libgdiplus-1.1.13.4.tar.gz
+libgdiplus-1.1.13.6.tar.gz


Index: libgdiplus.spec
===================================================================
RCS file: /cvs/dist/rpms/libgdiplus/devel/libgdiplus.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libgdiplus.spec	4 Mar 2006 01:16:15 -0000	1.13
+++ libgdiplus.spec	26 Apr 2006 12:59:38 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           libgdiplus
-Version:        1.1.13.4
-Release:        1
+Version:        1.1.13.6
+Release:        2
 Summary:        libgdiplus: An Open Source implementation of the GDI+ API
 
 Group:          System Environment/Libraries
@@ -46,6 +46,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Apr 26 2006 Alexander Larsson <alexl at redhat.com> - 1.1.13.6-2
+- Upgrade to 1.1.13.6
+
 * Fri Mar  3 2006 Christopher Aillon <caillon at redhat.com> - 1.1.13.4-1
 - Update to 1.1.13.4
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgdiplus/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	4 Mar 2006 01:16:15 -0000	1.6
+++ sources	26 Apr 2006 12:59:38 -0000	1.7
@@ -1 +1 @@
-3ea5e3ee01f1f43459e2c2d0b52ece1a  libgdiplus-1.1.13.4.tar.gz
+9177164efa8dfe8f625c240945d6a379  libgdiplus-1.1.13.6.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 26 13:10:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 09:10:10 -0400
Subject: rpms/kernel/FC-5 XXXX-tiacx-ia64-enable.txt, NONE,
	1.1.4.1 kernel-2.6.spec, 1.2096.2.2, 1.2096.2.3
Message-ID: <200604261310.k3QDAAkw002625@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2559

Modified Files:
      Tag: private-linville-netdev-fc5-2-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-linville-netdev-fc5-2-branch
	XXXX-tiacx-ia64-enable.txt 
Log Message:



--- NEW FILE XXXX-tiacx-ia64-enable.txt ---
--- linux-2.6.16.noarch/drivers/net/wireless/tiacx/wlan_compat.h.orig	2006-03-29 08:27:14.000000000 -0500
+++ linux-2.6.16.noarch/drivers/net/wireless/tiacx/wlan_compat.h	2006-03-29 08:30:24.000000000 -0500
@@ -52,6 +52,7 @@
 #define WLAN_SPARC			8
 #define WLAN_SH				9
 #define WLAN_x86_64			10
+#define WLAN_ITANIUM			11
 /* WLAN_CPU_CORE */
 #define WLAN_I386CORE			1
 #define WLAN_PPCCORE			2
@@ -81,6 +82,7 @@
 #define WLAN_ALPHAARCH			7
 #define WLAN_MIPSARCH			9
 #define WLAN_HPPAARCH			10
+#define WLAN_ITANIUMARCH		11
 /* WLAN_HOSTIF (generally set on the command line, not detected) */
 #define WLAN_PCMCIA			1
 #define WLAN_ISA			2
@@ -158,6 +160,9 @@
  #ifndef __LITTLE_ENDIAN__
   #define __LITTLE_ENDIAN__
  #endif
+#elif defined(__ia64__)
+ #define WLAN_CPU_FAMILY	WLAN_ITANIUM
+ #define WLAN_SYSARCH		WLAN_ITANIUMARCH
 #else
  #error "No CPU identified!"
 #endif


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2096.2.2
retrieving revision 1.2096.2.3
diff -u -r1.2096.2.2 -r1.2096.2.3
--- kernel-2.6.spec	26 Apr 2006 12:37:01 -0000	1.2096.2.2
+++ kernel-2.6.spec	26 Apr 2006 13:09:51 -0000	1.2096.2.3
@@ -1109,6 +1109,7 @@
 Patch30672: 4867-NETFILTER-ip6_tables-remove-broken-comefrom-debugging.txt
 Patch30673: 4868-NETFILTER-x_tables-move-table-lock-initialization.txt
 Patch30674: 4869-NETFILTER-ipt-action-use-xt_check_target-for-basic-verification.txt
+Patch30675: XXXX-tiacx-ia64-enable.txt
 
 # END OF PATCH DEFINITIONS
 
@@ -3117,6 +3118,8 @@
 %patch30673 -p1
 # [NETFILTER]: ipt action: use xt_check_target for basic verification
 %patch30674 -p1
+# tiacx: enable build for ia64
+%patch30675 -p1
 
 # END OF PATCH APPLICATIONS
 
@@ -4393,6 +4396,7 @@
 - [NETFILTER]: ip6_tables: remove broken comefrom debugging
 - [NETFILTER]: x_tables: move table->lock initialization
 - [NETFILTER]: ipt action: use xt_check_target for basic verification
+- tiacx: enable build for ia64
 
 * Wed Apr 19 2006 David Woodhouse <dwmw2 at redhat.com>
 - 2.6.16.9



From fedora-cvs-commits at redhat.com  Wed Apr 26 13:21:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 09:21:36 -0400
Subject: rpms/mono/devel .cvsignore, 1.7, 1.8 mono.spec, 1.32, 1.33 sources,
	1.7, 1.8
Message-ID: <200604261321.k3QDLa8h027758@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/mono/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20442/devel

Modified Files:
	.cvsignore mono.spec sources 
Log Message:
Update to 1.1.13.7



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	4 Mar 2006 01:25:08 -0000	1.7
+++ .cvsignore	26 Apr 2006 13:21:34 -0000	1.8
@@ -1 +1 @@
-mono-1.1.13.4.tar.gz
+mono-1.1.13.7.tar.gz


Index: mono.spec
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/mono.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mono.spec	10 Mar 2006 06:05:43 -0000	1.32
+++ mono.spec	26 Apr 2006 13:21:34 -0000	1.33
@@ -1,5 +1,5 @@
 Name:           mono
-Version:        1.1.13.4
+Version:        1.1.13.7
 Release:        2
 Summary:        a .NET runtime environment
 
@@ -500,6 +500,9 @@
 %gac_dll IBM.Data.DB2
 
 %changelog
+* Wed Apr 26 2006 Alexander Larsson <alexl at redhat.com> - 1.1.13.7-2
+- Update to 1.1.13.7
+
 * Fri Mar 10 2006 Bill Nottingham <notting at redhat.com> - 1.1.13.4-2
 - rebuild for ppc TLS issue (#184446)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Mar 2006 01:25:08 -0000	1.7
+++ sources	26 Apr 2006 13:21:34 -0000	1.8
@@ -1 +1 @@
-a8c58b1d0722771745c228adbb27f3c1  mono-1.1.13.4.tar.gz
+13435fd14b6fc3a0e9efbf664201e2ee  mono-1.1.13.7.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 26 13:21:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 09:21:36 -0400
Subject: rpms/mono/FC-5 .cvsignore, 1.7, 1.8 mono.spec, 1.32, 1.33 sources,
	1.7, 1.8
Message-ID: <200604261321.k3QDLaqT027406@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/mono/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20442/FC-5

Modified Files:
	.cvsignore mono.spec sources 
Log Message:
Update to 1.1.13.7



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mono/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	4 Mar 2006 01:25:08 -0000	1.7
+++ .cvsignore	26 Apr 2006 13:21:33 -0000	1.8
@@ -1 +1 @@
-mono-1.1.13.4.tar.gz
+mono-1.1.13.7.tar.gz


Index: mono.spec
===================================================================
RCS file: /cvs/dist/rpms/mono/FC-5/mono.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mono.spec	10 Mar 2006 06:05:43 -0000	1.32
+++ mono.spec	26 Apr 2006 13:21:33 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           mono
-Version:        1.1.13.4
-Release:        2
+Version:        1.1.13.7
+Release:        1.fc5.1
 Summary:        a .NET runtime environment
 
 Group:          Development/Languages
@@ -500,6 +500,9 @@
 %gac_dll IBM.Data.DB2
 
 %changelog
+* Wed Apr 26 2006 Alexander Larsson <alexl at redhat.com> - 1.1.13.7-1.fc5.1
+- Update to 1.1.13.7
+
 * Fri Mar 10 2006 Bill Nottingham <notting at redhat.com> - 1.1.13.4-2
 - rebuild for ppc TLS issue (#184446)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mono/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Mar 2006 01:25:08 -0000	1.7
+++ sources	26 Apr 2006 13:21:33 -0000	1.8
@@ -1 +1 @@
-a8c58b1d0722771745c228adbb27f3c1  mono-1.1.13.4.tar.gz
+13435fd14b6fc3a0e9efbf664201e2ee  mono-1.1.13.7.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 26 14:40:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 10:40:45 -0400
Subject: rpms/system-config-date/devel .cvsignore, 1.41, 1.42 sources, 1.44,
	1.45 system-config-date.spec, 1.49, 1.50
Message-ID: <200604261440.k3QEejse012106@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/system-config-date/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12033

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
feed timezone po files from anaconda (#131528, patch by Andrew Martynov)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	6 Mar 2006 15:47:37 -0000	1.41
+++ .cvsignore	26 Apr 2006 14:40:42 -0000	1.42
@@ -1 +1 @@
-system-config-date-1.8.2.tar.bz2
+system-config-date-1.8.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	6 Mar 2006 15:47:37 -0000	1.44
+++ sources	26 Apr 2006 14:40:42 -0000	1.45
@@ -1 +1 @@
-04b0e69d7d0c4d9fbffde77dfe62522b  system-config-date-1.8.2.tar.bz2
+5bfbb01bc3206efb91f1fe4ad44b57e4  system-config-date-1.8.3.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- system-config-date.spec	6 Mar 2006 15:47:37 -0000	1.49
+++ system-config-date.spec	26 Apr 2006 14:40:42 -0000	1.50
@@ -1,6 +1,6 @@
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.8.2
+Version: 1.8.3
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -17,6 +17,7 @@
 BuildRequires: gettext
 BuildRequires: intltool
 BuildRequires: python
+BuildRequires: anaconda
 Requires: ntp
 Requires: python2
 Requires: pygtk2-libglade
@@ -33,7 +34,7 @@
 %description
 system-config-date is a graphical interface for changing the system date and
 time, configuring the system time zone, and setting up the NTP daemon to
-synchronize the time of the system with a NTP time server.
+synchronize the time of the system with an NTP time server.
 
 %prep
 %setup -q
@@ -97,6 +98,9 @@
 %attr(0644,root,root) %config(noreplace) /usr/share/system-config-date/ntp.template
 
 %changelog
+* Tue Mar 14 2006 Nils Philippsen <nphilipp at redhat.com> 1.8.3
+- feed timezone po files from anaconda (#131528, patch by Andrew Martynov)
+
 * Mon Mar 06 2006 Nils Philippsen <nphilipp at redhat.com> 1.8.2
 - don't write into /tmp
 - make synchronizing with time servers configurable (#157485)



From fedora-cvs-commits at redhat.com  Wed Apr 26 14:57:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 10:57:09 -0400
Subject: rpms/coreutils/devel coreutils-selinux.patch,1.21,1.22
Message-ID: <200604261457.k3QEv9hE031857@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31740

Modified Files:
	coreutils-selinux.patch 
Log Message:
Fixed selinux patch.

coreutils-selinux.patch:
 README             |    4 
 config.hin         |   27 +--
 configure.ac       |    7 
 man/Makefile.am    |    4 
 man/Makefile.in    |   56 +++----
 man/chcon.1        |   64 ++++++++
 man/chcon.x        |    4 
 man/cp.1           |    5 
 man/dir.1          |   14 +
 man/id.1           |    3 
 man/install.1      |    5 
 man/ls.1           |   14 +
 man/mkdir.1        |    2 
 man/mkfifo.1       |    3 
 man/mknod.1        |    3 
 man/runcon.1       |   43 +++++
 man/runcon.x       |   14 +
 man/stat.1         |    6 
 man/vdir.1         |   14 +
 src/Makefile.am    |   23 +-
 src/chcon.c        |  421 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/copy.c         |   72 ++++++++-
 src/copy.h         |    3 
 src/cp.c           |   64 +++++++-
 src/id.c           |   68 ++++++++
 src/install.c      |   99 ++++++++++++
 src/ls.c           |  296 ++++++++++++++++++++++++++++++++-----
 src/mkdir.c        |   30 +++
 src/mkfifo.c       |   29 +++
 src/mknod.c        |   30 +++
 src/mv.c           |   12 +
 src/runcon.c       |  253 +++++++++++++++++++++++++++++++
 src/stat.c         |  142 ++++++++++++++---
 tests/help-version |    4 
 34 files changed, 1714 insertions(+), 124 deletions(-)

Index: coreutils-selinux.patch
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-selinux.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- coreutils-selinux.patch	26 Apr 2006 11:02:22 -0000	1.21
+++ coreutils-selinux.patch	26 Apr 2006 14:57:05 -0000	1.22
@@ -2245,8 +2245,8 @@
 +  }
 +#endif
  }
---- coreutils-5.94/src/copy.c	2006-03-24 13:23:45.000000000 +0000
-+++ coreutils-5.94/src/copy.c	2006-04-26 14:06:02.000000000 +1000
+--- 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
 @@ -51,6 +51,11 @@
  #include "xreadlink.h"
  #include "yesno.h"
@@ -2259,12 +2259,12 @@
  #ifndef HAVE_FCHMOD
  # define HAVE_FCHMOD false
  #endif
-@@ -238,6 +243,25 @@
+@@ -238,6 +243,29 @@
      {
        dest_desc = open (dst_name, O_WRONLY | O_TRUNC | O_BINARY, dst_mode);
  
 +#ifdef WITH_SELINUX
-+      if (dest_desc >= 0)
++      if (selinux_enabled && x->preserve_security_context && dest_desc >= 0)
 +	{
 +	  security_context_t con;
 +	  if(getfscreatecon(&con) == -1)
@@ -2272,20 +2272,24 @@
 +	      return_val = false;
 +	      goto close_src_desc;
 +	    }
-+	  if(fsetfilecon(dest_desc, con) == -1)
++
++	  if (con)
 +	    {
-+	      return_val = false;
++	      if(fsetfilecon(dest_desc, con) == -1)
++		{
++		  return_val = false;
++		  freecon(con);
++		  goto close_src_desc;
++		}
 +	      freecon(con);
-+	      goto close_src_desc;
 +	    }
-+	  freecon(con);
 +	}
 +#endif
 +
        if (dest_desc < 0 && x->unlink_dest_after_failed_open)
  	{
  	  if (unlink (dst_name) != 0)
-@@ -1416,6 +1440,32 @@
+@@ -1416,6 +1444,32 @@
       In such cases, set this variable to zero.  */
    preserve_metadata = true;
  
@@ -2318,7 +2322,7 @@
    if (S_ISDIR (src_mode))
      {
        struct dir_list *dir;
-@@ -1486,7 +1536,13 @@
+@@ -1486,7 +1540,13 @@
  
        /* Are we crossing a file system boundary?  */
        if (x->one_file_system && device != 0 && device != src_sb.st_dev)
@@ -2333,7 +2337,7 @@
  
        /* Copy the contents of the directory.  */
  
-@@ -1622,6 +1678,11 @@
+@@ -1622,6 +1682,11 @@
  	    }
  	}
  
@@ -2345,7 +2349,7 @@
        /* There's no need to preserve timestamps or permissions.  */
        preserve_metadata = false;
  
-@@ -1760,6 +1821,11 @@
+@@ -1760,6 +1825,11 @@
  
  un_backup:
  



From fedora-cvs-commits at redhat.com  Wed Apr 26 14:59:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 10:59:40 -0400
Subject: rpms/system-config-date/FC-5 .cvsignore, 1.41, 1.42 sources, 1.44,
	1.45 system-config-date.spec, 1.49, 1.50
Message-ID: <200604261459.k3QExe7t000476@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/system-config-date/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv390

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
feed timezone po files from anaconda (#131528, patch by Andrew Martynov)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/FC-5/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	6 Mar 2006 15:47:37 -0000	1.41
+++ .cvsignore	26 Apr 2006 14:59:37 -0000	1.42
@@ -1 +1 @@
-system-config-date-1.8.2.tar.bz2
+system-config-date-1.8.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/FC-5/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	6 Mar 2006 15:47:37 -0000	1.44
+++ sources	26 Apr 2006 14:59:37 -0000	1.45
@@ -1 +1 @@
-04b0e69d7d0c4d9fbffde77dfe62522b  system-config-date-1.8.2.tar.bz2
+5bfbb01bc3206efb91f1fe4ad44b57e4  system-config-date-1.8.3.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/FC-5/system-config-date.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- system-config-date.spec	6 Mar 2006 15:47:37 -0000	1.49
+++ system-config-date.spec	26 Apr 2006 14:59:37 -0000	1.50
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.8.2
-Release: 1
+Version: 1.8.3
+Release: 0.fc5.1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -17,6 +17,7 @@
 BuildRequires: gettext
 BuildRequires: intltool
 BuildRequires: python
+BuildRequires: anaconda
 Requires: ntp
 Requires: python2
 Requires: pygtk2-libglade
@@ -33,7 +34,7 @@
 %description
 system-config-date is a graphical interface for changing the system date and
 time, configuring the system time zone, and setting up the NTP daemon to
-synchronize the time of the system with a NTP time server.
+synchronize the time of the system with an NTP time server.
 
 %prep
 %setup -q
@@ -97,6 +98,9 @@
 %attr(0644,root,root) %config(noreplace) /usr/share/system-config-date/ntp.template
 
 %changelog
+* Tue Mar 14 2006 Nils Philippsen <nphilipp at redhat.com> 1.8.3
+- feed timezone po files from anaconda (#131528, patch by Andrew Martynov)
+
 * Mon Mar 06 2006 Nils Philippsen <nphilipp at redhat.com> 1.8.2
 - don't write into /tmp
 - make synchronizing with time servers configurable (#157485)



From fedora-cvs-commits at redhat.com  Wed Apr 26 15:10:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 11:10:35 -0400
Subject: rpms/system-config-date/FC-4 .cvsignore, 1.21, 1.22 sources, 1.21,
	1.22 system-config-date.spec, 1.27, 1.28
Message-ID: <200604261510.k3QFAZKV001353@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/system-config-date/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv1298

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
feed timezone po files from anaconda (#131528, patch by Andrew Martynov)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/FC-4/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	7 Apr 2006 11:28:04 -0000	1.21
+++ .cvsignore	26 Apr 2006 15:10:30 -0000	1.22
@@ -1 +1 @@
-system-config-date-1.8.2.tar.bz2
+system-config-date-1.8.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/FC-4/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	7 Apr 2006 11:28:04 -0000	1.21
+++ sources	26 Apr 2006 15:10:30 -0000	1.22
@@ -1 +1 @@
-04b0e69d7d0c4d9fbffde77dfe62522b  system-config-date-1.8.2.tar.bz2
+5bfbb01bc3206efb91f1fe4ad44b57e4  system-config-date-1.8.3.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/FC-4/system-config-date.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- system-config-date.spec	7 Apr 2006 11:36:20 -0000	1.27
+++ system-config-date.spec	26 Apr 2006 15:10:30 -0000	1.28
@@ -1,6 +1,6 @@
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.8.2
+Version: 1.8.3
 Release: 0.fc4.1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -18,6 +18,7 @@
 BuildRequires: gettext
 BuildRequires: intltool
 BuildRequires: python
+BuildRequires: anaconda
 Requires: ntp
 Requires: python2
 Requires: pygtk2-libglade
@@ -34,7 +35,7 @@
 %description
 system-config-date is a graphical interface for changing the system date and
 time, configuring the system time zone, and setting up the NTP daemon to
-synchronize the time of the system with a NTP time server.
+synchronize the time of the system with an NTP time server.
 
 %prep
 %setup -q
@@ -98,9 +99,12 @@
 %attr(0644,root,root) %config(noreplace) /usr/share/system-config-date/ntp.template
 
 %changelog
-* Fri Apr 07 2006 Nils Philippsen <nphilipp at redhat.com>
+* Tue Mar 14 2006 Nils Philippsen <nphilipp at redhat.com>
 - use pam system-auth on FC4
 
+* Tue Mar 14 2006 Nils Philippsen <nphilipp at redhat.com> 1.8.3
+- feed timezone po files from anaconda (#131528, patch by Andrew Martynov)
+
 * Mon Mar 06 2006 Nils Philippsen <nphilipp at redhat.com> 1.8.2
 - don't write into /tmp
 - make synchronizing with time servers configurable (#157485)



From fedora-cvs-commits at redhat.com  Wed Apr 26 15:23:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 11:23:33 -0400
Subject: rpms/groff/devel groff.spec,1.37,1.38
Message-ID: <200604261523.k3QFNXXV019578@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/groff/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19476

Modified Files:
	groff.spec 
Log Message:
- Rebuild for updated imake build rules.



Index: groff.spec
===================================================================
RCS file: /cvs/dist/rpms/groff/devel/groff.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- groff.spec	16 Feb 2006 15:39:44 -0000	1.37
+++ groff.spec	26 Apr 2006 15:23:30 -0000	1.38
@@ -3,7 +3,7 @@
 Summary: A document formatting system.
 Name: groff
 Version: 1.18.1.1
-Release: 10
+Release: 11
 License: GPL
 Group: Applications/Publishing
 Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
@@ -70,7 +70,7 @@
 Summary: An X previewer for groff text processor output.
 Group: Applications/Publishing
 BuildRequires: imake xorg-x11-proto-devel libX11-devel libXaw-devel
-BuildRequires: libXt-devel libXpm-devel libXp-devel libXext-devel
+BuildRequires: libXt-devel libXpm-devel libXext-devel
 
 %description gxditview
 Gxditview displays the groff text processor's output on an X Window
@@ -212,6 +212,9 @@
 %endif
 
 %changelog
+* Wed Apr 26 2006 Adam Jackson <ajackson at redhat.com> - 1.18.1.1-11
+- Rebuild for updated imake build rules.
+
 * Thu Feb 16 2006 Miroslav Lichvar <mlichvar at redhat.com> - 1.18.1.1-10
 - use mktemp for temporary files in pic2graph and eqn2graph scripts
 



From fedora-cvs-commits at redhat.com  Wed Apr 26 15:24:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 11:24:22 -0400
Subject: rpms/hal/FC-5 hal-0.5.7-lid-open-fix.patch, NONE, 1.1 hal.spec, 1.87,
	1.88
Message-ID: <200604261524.k3QFOM4Z019943@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/hal/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19843

Modified Files:
	hal.spec 
Added Files:
	hal-0.5.7-lid-open-fix.patch 
Log Message:
- Add fix so gnome-power-manager handles lid opens correctly now


hal-0.5.7-lid-open-fix.patch:
 hal-system-power-hibernate |   10 ++++++++++
 hal-system-power-suspend   |   10 ++++++++++
 2 files changed, 20 insertions(+)

--- NEW FILE hal-0.5.7-lid-open-fix.patch ---
--- hal-0.5.7/tools/hal-system-power-hibernate.lid-open-fix	2006-04-26 11:13:35.000000000 -0400
+++ hal-0.5.7/tools/hal-system-power-hibernate	2006-04-26 11:14:14.000000000 -0400
@@ -52,4 +52,14 @@
 		fi
 	fi
 
+#Refresh devices as a resume can do funny things
+for type in button battery ac_adapter
+do
+        devices=`hal-find-by-capability --capability $type`
+        for device in $devices
+        do
+                dbus-send --system --print-reply --dest=org.freedesktop.Hal \
+                        $device org.freedesktop.Hal.Device.Rescan
+        done
+done
 exit $RET
--- hal-0.5.7/tools/hal-system-power-suspend.lid-open-fix	2006-04-26 11:11:43.000000000 -0400
+++ hal-0.5.7/tools/hal-system-power-suspend	2006-04-26 11:13:05.000000000 -0400
@@ -72,4 +72,14 @@
 	    fi
 	fi
 
+#Refresh devices as a resume can do funny things
+for type in button battery ac_adapter
+do
+	devices=`hal-find-by-capability --capability $type`
+	for device in $devices
+	do
+		dbus-send --system --print-reply --dest=org.freedesktop.Hal \
+			$device org.freedesktop.Hal.Device.Rescan
+	done
+done
 exit $RET


Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/FC-5/hal.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- hal.spec	3 Mar 2006 18:48:27 -0000	1.87
+++ hal.spec	26 Apr 2006 15:24:19 -0000	1.88
@@ -19,11 +19,12 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.7
-Release: 3 
+Release: 3.fc5.1
 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
 License: AFL/GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
@@ -85,7 +86,8 @@
 
 %prep
 %setup -q
-%patch -p0 -b .fix-fedora-powersave
+%patch0 -p0 -b .fix-fedora-powersave
+%patch1 -p1 -b .lid-open-fix
 
 %build
 
@@ -191,6 +193,9 @@
 %{_bindir}/hal-device-manager
 
 %changelog
+* Wed Apr 26 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7-3.fc5.1
+- Add fix so gnome-power-manager handles lid opens correctly now
+
 * Fri Mar 03 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7-3
 - Fix fstab clearing script to not strip whitespace
 



From fedora-cvs-commits at redhat.com  Wed Apr 26 16:17:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 12:17:07 -0400
Subject: rpms/audit/devel audit.spec,1.87,1.88
Message-ID: <200604261617.k3QGH72j019611@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19254

Modified Files:
	audit.spec 
Log Message:
Require kernel-headers, not glibc-kernheaders


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- audit.spec	16 Apr 2006 20:33:48 -0000	1.87
+++ audit.spec	26 Apr 2006 16:17:04 -0000	1.88
@@ -1,7 +1,7 @@
 Summary: User space tools for 2.6 kernel auditing.
 Name: audit
 Version: 1.2.1
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
@@ -9,7 +9,7 @@
 Patch1: audit-1.1.3-initscript-disabled.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtool swig python-devel
-BuildRequires: glibc-kernheaders >= 2.4-9.1.95
+BuildRequires: kernel-headers >= 2.4-9.1.95
 BuildRequires: automake >= 1.9
 BuildRequires: autoconf >= 2.59
 Requires: %{name}-libs = %{version}-%{release}
@@ -154,6 +154,9 @@
 
 
 %changelog
+* Wed Apr 25 2006 David Woodhouse <dwmw2 at redhat.com> 1.2.1-2
+- Require kernel-headers, not glibc-kernheaders
+
 * Sun Apr 16 2006 Steve Grubb <sgrubb at redhat.com> 1.2.1-1
 - New message type for trusted apps
 - Add new keywords today, yesterday, now for ausearch and aureport



From fedora-cvs-commits at redhat.com  Wed Apr 26 16:41:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 12:41:44 -0400
Subject: rpms/fontconfig/devel .cvsignore, 1.21, 1.22 fontconfig.spec, 1.72,
	1.73 sources, 1.22, 1.23
Message-ID: <200604261641.k3QGfima001216@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/fontconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv732

Modified Files:
	.cvsignore fontconfig.spec sources 
Log Message:
2.3.95



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	24 Feb 2006 20:33:50 -0000	1.21
+++ .cvsignore	26 Apr 2006 16:41:41 -0000	1.22
@@ -1,8 +1 @@
-fontconfig-2.3.93.tar.gz
-fontconfig-2.3.93.cvs20060124.tar.gz
-fontconfig-2.3.93.cvs20060129.tar.gz
-fontconfig-2.3.93.cvs20060131.tar.gz
-fontconfig-2.3.93.cvs20060207.tar.gz
-fontconfig-2.3.93.cvs20060208.tar.gz
-fontconfig-2.3.93.cvs20060211.tar.gz
-fontconfig-2.3.94.tar.gz
+fontconfig-2.3.95.tar.gz


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- fontconfig.spec	24 Feb 2006 20:33:50 -0000	1.72
+++ fontconfig.spec	26 Apr 2006 16:41:41 -0000	1.73
@@ -2,7 +2,7 @@
 
 Summary: Font configuration and customization library
 Name: fontconfig
-Version: 2.3.94
+Version: 2.3.95
 Release: 1
 License: MIT
 Group: System Environment/Libraries
@@ -135,6 +135,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 26 2006 Matthias Clasen <mclasen at redhat.com> - 2.3.95-1
+- Update to 2.3.95
+
 * Fri Feb 24 2006 Matthias Clasen <mclasen at redhat.com> - 2.3.94-1
 - Update to 2.3.94
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	24 Feb 2006 20:33:50 -0000	1.22
+++ sources	26 Apr 2006 16:41:41 -0000	1.23
@@ -1 +1 @@
-362ca8b2168b20d30838700238015811  fontconfig-2.3.94.tar.gz
+6860be35882f6d34636d52345efd5944  fontconfig-2.3.95.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 26 16:56:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 12:56:37 -0400
Subject: rpms/kernel/FC-4/configs config-generic,1.56,1.56.2.1
Message-ID: <200604261656.k3QGubTi028847@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-4/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv28805/configs

Modified Files:
      Tag: private-linville-netdev-fc4-14-branch
	config-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v
retrieving revision 1.56
retrieving revision 1.56.2.1
diff -u -r1.56 -r1.56.2.1
--- config-generic	4 Apr 2006 18:37:08 -0000	1.56
+++ config-generic	26 Apr 2006 16:56:34 -0000	1.56.2.1
@@ -648,6 +648,8 @@
 
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
@@ -672,13 +674,16 @@
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_STATE=m
@@ -704,7 +709,7 @@
 CONFIG_IP_NF_MATCH_RECENT=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_DSCP=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
+CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_LENGTH=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_MATCH_TCPMSS=m
@@ -762,6 +767,7 @@
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_NETBIOS_NS=m
 CONFIG_IP_NF_PPTP=m
+CONFIG_IP_NF_H323=m
 
 #
 # IPv6: Netfilter Configuration
@@ -778,7 +784,7 @@
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_MARK=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AHESP=m
+CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_LENGTH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_MATCH_PHYSDEV=m
@@ -849,6 +855,7 @@
 CONFIG_WAN_ROUTER=m
 CONFIG_IP_DCCP=m
 CONFIG_IP_DCCP_CCID3=m
+CONFIG_IP_DCCP_CCID2=m
 # CONFIG_IP_DCCP_DEBUG is not set
 CONFIG_IP_DCCP_UNLOAD_HACK=y
 
@@ -1106,6 +1113,7 @@
 # Wireless LAN (non-hamradio)
 #
 CONFIG_NET_RADIO=y
+CONFIG_NET_WIRELESS_RTNETLINK=y
 
 #
 # Obsolete Wireless cards support (pre-802.11)
@@ -1129,12 +1137,13 @@
 CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_IEEE80211_SOFTMAC=m
+CONFIG_IEEE80211_SOFTMAC_DEBUG=y
 # CONFIG_IPW2100 is not set
-# CONFIG_IPW2100_PROMISC is not set
-# CONFIG_IPW2100_LEGACY_FW_LOAD is not set
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2200_DEBUG is not set
+# CONFIG_IPW_QOS is not set
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1144,6 +1153,12 @@
 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
 
 #
 # Wireless 802.11b Pcmcia/Cardbus cards support
@@ -1223,6 +1238,7 @@
 CONFIG_TEKRAM_DONGLE=m
 CONFIG_IRPORT_SIR=m
 # CONFIG_DONGLE_OLD is not set
+CONFIG_TOIM3232_DONGLE=m
 CONFIG_LITELINK_DONGLE=m
 CONFIG_MA600_DONGLE=m
 CONFIG_GIRBIL_DONGLE=m
@@ -1474,7 +1490,7 @@
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_UINPUT=m 
 
 #
 # Character devices



From fedora-cvs-commits at redhat.com  Wed Apr 26 16:58:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 12:58:33 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2096.2.3, 1.2096.2.4
	3102-bcm43xx-fix-some-stuff-add-a-few-missing-mmiowb-remove-dead-code.txt,
	1.1.2.1,
	NONE 3107-bcm43xx-Remove-the-workaround-in-dummy_transmission.txt,
	1.1.2.1, NONE XXXX-tiacx-ia64-enable.txt, 1.1.4.1, NONE
Message-ID: <200604261658.k3QGwXu1028920@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv28907

Modified Files:
      Tag: private-linville-netdev-fc5-2-branch
	kernel-2.6.spec 
Removed Files:
      Tag: private-linville-netdev-fc5-2-branch
	3102-bcm43xx-fix-some-stuff-add-a-few-missing-mmiowb-remove-dead-code.txt 
	3107-bcm43xx-Remove-the-workaround-in-dummy_transmission.txt 
	XXXX-tiacx-ia64-enable.txt 
Log Message:



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2096.2.3
retrieving revision 1.2096.2.4
diff -u -r1.2096.2.3 -r1.2096.2.4
--- kernel-2.6.spec	26 Apr 2006 13:09:51 -0000	1.2096.2.3
+++ kernel-2.6.spec	26 Apr 2006 16:58:31 -0000	1.2096.2.4
@@ -893,223 +893,221 @@
 Patch30456: 3098-bcm43xx-fix-DMA-TX-skb-freeing-in-case-of-fragmented-packets.txt
 Patch30457: 3099-bcm43xx-Set-both-the-DMAmask-and-the-coherent-DMAmask.txt
 Patch30458: 3101-bcm43xx-Remove-the-mmio-access-printing-facility-overhead.txt
-Patch30459: 3102-bcm43xx-fix-some-stuff-add-a-few-missing-mmiowb-remove-dead-code.txt
-Patch30460: 3103-bcm43xx-receive-TX-status-on-MMIO-or-DMA-unconditionally-regarding-the-80211-core-rev.txt
-Patch30461: 3104-bcm43xx-add-functions-bcm43xx_dma_read-write-bcm43xx_dma_tx_suspend-resume.txt
-Patch30462: 3107-bcm43xx-Remove-the-workaround-in-dummy_transmission.txt
-Patch30463: 3108-bcm43xx-Do-boardflags-workarounds-for-specific-boards.txt
-Patch30464: 3109-bcm43xx-properly-mask-txctl1-before-writing-it-to-hardware.txt
-Patch30465: 3111-bcm43xx-fix-some-gpio-register-trashing-hopefully-D.txt
-Patch30466: 3117-bcm43xx-add-useless-and-broken-statistics-stuff.-People-seem-to-want-it.-well.txt
-Patch30467: 3119-bcm43xx-fix-include-issues-on-some-platforms.txt
-Patch30468: 3126-hostap-Make-hostap_tx_encrypt-static.txt
-Patch30469: 3165-knfsd-Change-the-store-of-auth_domains-to-not-be-a-cache.txt
-Patch30470: 3167-knfsd-Get-rid-of-inplace-sunrpc-caches.txt
-Patch30471: 3168-knfsd-Create-cache_lookup-function-instead-of-using-a-macro-to-declare-one.txt
-Patch30472: 3169-knfsd-Convert-ip_map-cache-to-use-the-new-lookup-routine.txt
-Patch30473: 3172-knfsd-Use-new-sunrpc-cache-for-rsi-cache.txt
-Patch30474: 3173-knfsd-Use-new-cache-code-for-rsc-cache.txt
-Patch30475: 3175-knfsd-An-assortment-of-little-fixes-to-the-sunrpc-cache-code.txt
-Patch30476: 3180-knfsd-Tidy-up-unix_domain_find.txt
-Patch30477: 3252-pnp-IRDA-adjust-pnp_register_driver-signature.txt
-Patch30478: 3328-Minor-janitorial-change-to-ieee80211.txt
-Patch30479: 3329-wireless-add-prism54usb-driver.txt
-Patch30480: 3330-prism54usb-fix-build-break-in-islusb_init.c.txt
-Patch30481: 3331-wireless-add-acx-driver.txt
-Patch30482: 3332-acxsm-merge-from-acx-0.3.32.txt
-Patch30483: 3333-tiacx-Let-only-ACX_PCI-ACX_USB-be-user-visible.txt
-Patch30484: 3334-softmac-prism54usb-update.txt
-Patch30485: 3335-tiacx-revert-neither-PCI-nor-USB-is-selected-change.txt
-Patch30486: 3336-tiacx-implement-much-more-flexible-firmware-statistics-parsing.txt
-Patch30487: 3337-tiacx-Change-acx_ioctl_-get-set-_encode-to-use-kernel-80211-stack.txt
-Patch30488: 3338-tiacx-fix-breakage-of-Get-rid-of-circular-list-of-adev-s.txt
-Patch30489: 3339-tiacx-split-module-into-acx-common-acx-pci-acx-usb.txt
-Patch30490: 3346-update-prism54usb-sources.txt
-Patch30491: 3464-TG3-Fix-probe-failure-due-to-invalid-MAC-address.txt
-Patch30492: 3465-TG3-Fix-bug-in-40-bit-DMA-workaround-code.txt
-Patch30493: 3466-TG3-Fix-PHY-loopback-on-5700.txt
-Patch30494: 3467-TG3-Speed-up-SRAM-access.txt
-Patch30495: 3468-TG3-Skip-timer-code-during-full-lock.txt
-Patch30496: 3469-TG3-Update-version-and-reldate.txt
-Patch30497: 3471-NET-Fix-ipx-econet-appletalk-irda-ioctl-crashes.txt
-Patch30498: 3472-ECONET-Convert-away-from-SOCKOPS_WRAPPED.txt
-Patch30499: 3473-NET-deinline-200-byte-inlines-in-sock.h.txt
-Patch30500: 3475-TCP-Fix-RFC2465-typo.txt
-Patch30501: 3476-NETFILTER-Rename-init-functions.txt
-Patch30502: 3534-DECNET-Fix-refcount.txt
-Patch30503: 3535-DCCP-Use-NULL-for-pointers-comfort-sparse.txt
-Patch30504: 3536-b44-fix-force-mac-address-before-ifconfig-up.txt
-Patch30505: 3538-axnet_cs.c-add-hardware-multicast-support.txt
-Patch30506: 3539-via-rhine-link-state-fix.txt
-Patch30507: 3540-spidernet-reduce-console-spam.txt
-Patch30508: 3541-acenic-fix-section-mismatches.txt
-Patch30509: 3542-bonding-support-carrier-state-for-master.txt
-Patch30510: 3543-spidernet-enable-tx-checksum-offloading-by-default.txt
-Patch30511: 3544-natsemi-Support-oversized-EEPROMs.txt
-Patch30512: 3545-net-remove-CONFIG_NET_CBUS-conditional-for-NS8390.txt
-Patch30513: 3546-Janitor-drivers-net-pcnet32-fix-incorrect-comments.txt
-Patch30514: 3547-b44-ensure-valid-mac-addr.txt
-Patch30515: 3548-ixp2000-fix-gcc4-breakage.txt
-Patch30516: 3549-NET-Deinline-some-larger-functions-from-netdevice.h.txt
-Patch30517: 3602-NET-add-SO_RCVBUF-comment.txt
-Patch30518: 3603-TCP-Kill-unused-extern-decl-for-tcp_v4_hash_connecting.txt
-Patch30519: 3627-pcmcia-default-suspend-and-resume-handling.txt
-Patch30520: 3629-pcmcia-remove-unneeded-Vcc-pseudo-setting.txt
-Patch30521: 3699-uml-kconfigs.txt
-Patch30522: 3726-3c59x-collision-statistics-fix-fix.txt
-Patch30523: 3727-3c59x-fix-networking-for-10base2-NICs.txt
-Patch30524: 3840-TG3-Revert-Speed-up-SRAM-access.txt
-Patch30525: 3841-TG3-Update-driver-version-and-reldate.txt
-Patch30526: 3842-NET-com90xx-kmalloc-fix.txt
-Patch30527: 3843-IPSEC-Kill-unused-decap-state-argument.txt
-Patch30528: 3846-NETFILTER-x_tables-unify-IPv4-IPv6-esp-match.txt
-Patch30529: 3847-NETFILTER-x_tables-unify-IPv4-IPv6-multiport-match.txt
-Patch30530: 3848-NETFILTER-fix-ifdef-for-connmark-support-in-nf_conntrack_netlink.txt
-Patch30531: 3865-smc91x-add-support-for-LogicPD-PXA270-platform.txt
-Patch30532: 3866-Goramo-PCI200SYN-WAN-driver-subsystem-ID-patch.txt
-Patch30533: 3947-BUG_ON-Conversion-in-drivers-net.txt
-Patch30534: 3999-kbuild-fix-unneeded-rebuilds-in-drivers-net-chelsio-after-moving-source-tree.txt
-Patch30535: 4072-IPSEC-Check-x-encap-before-dereferencing-it.txt
-Patch30536: 4076-NET-netconsole-set-.name-in-struct-console.txt
-Patch30537: 4077-NET-Fix-an-off-by-21-or-49-error.txt
-Patch30538: 4078-TG3-Fix-a-memory-leak.txt
-Patch30539: 4079-BLUETOOTH-sco-Possible-double-free.txt
-Patch30540: 4080-INET-Use-port-unreachable-instead-of-proto-for-tunnels.txt
-Patch30541: 4081-IRDA-smcinit-merged-into-smsc-ircc-driver.txt
-Patch30542: 4082-IRDA-Support-for-Sigmatel-STIR421x-chip.txt
-Patch30543: 4083-NETFILTER-Add-helper-functions-for-mass-hook-registration-unregistration.txt
-Patch30544: 4086-NETFILTER-H.323-helper-move-some-function-prototypes-to-ip_conntrack_h323.h.txt
-Patch30545: 4087-NETFILTER-H.323-helper-change-EXPORT_SYMBOL-to-EXPORT_SYMBOL_GPL.txt
-Patch30546: 4088-NETFILTER-H.323-helper-make-get_h245_addr-static.txt
-Patch30547: 4089-NETFILTER-H.323-helper-add-parameter-default_rrq_ttl.txt
-Patch30548: 4090-NETFILTER-Fix-IP_NF_CONNTRACK_NETLINK-dependency.txt
-Patch30549: 4091-NETFILTER-Introduce-infrastructure-for-address-family-specific-operations.txt
-Patch30550: 4092-NETFILTER-Add-address-family-specific-checksum-helpers.txt
-Patch30551: 4093-NETFILTER-Convert-conntrack-ipt_REJECT-to-new-checksumming-functions.txt
-Patch30552: 4094-NETFILTER-H.323-helper-remove-changelog.txt
-Patch30553: 4095-TG3-Kill-some-less-useful-flags.txt
-Patch30554: 4096-TG3-Speed-up-SRAM-access-2nd-version.txt
-Patch30555: 4097-PKT_SCHED-act_police-Rename-methods.txt
-Patch30556: 4098-NET-kzalloc-use-in-alloc_netdev.txt
-Patch30557: 4099-NET-More-kzalloc-conversions.txt
-Patch30558: 4100-NETFILTER-Fix-build-with-CONFIG_NETFILTER-y-m-on-IA64.txt
-Patch30559: 4102-NET-Fix-hotplug-race-during-device-registration.txt
-Patch30560: 4103-X25-Restore-skb-dev-setting-in-x25_type_trans.txt
-Patch30561: 4104-NETFILTER-Fix-DNAT-in-LOCAL_OUT.txt
-Patch30562: 4105-IPV4-ip_fragment-Always-compute-hash-with-ipfrag_lock-held.txt
-Patch30563: 4106-IPV6-Deinline-few-large-functions-in-inet6-code.txt
-Patch30564: 4323-knfsd-svcrpc-gss-don-t-call-svc_take_page-unnecessarily.txt
-Patch30565: 4351-IPv6-reassembly-Always-compute-hash-under-the-fragment-lock.txt
-Patch30566: 4352-BRIDGE-receive-link-local-on-disabled-ports.txt
-Patch30567: 4353-DCCP-Fix-leak-in-net-dccp-ipv4.c.txt
-Patch30568: 4355-WAN-Remove-broken-and-unmaintained-Sangoma-drivers.txt
-Patch30569: 4372-dlink-pci-cards-using-wrong-driver.txt
-Patch30570: 4373-network-axnet_cs.c-add-missing-PRIV-in-ei_rx_overrun.txt
-Patch30571: 4374-via-rhine-execute-bounce-buffers-code-on-Rhine-I-only.txt
-Patch30572: 4375-b44-disable-default-tx-pause.txt
-Patch30573: 4376-b44-increase-version-to-1.00.txt
-Patch30574: 4377-netdrvr-b44-trim-trailing-whitespace.txt
-Patch30575: 4379-drivers-net-via-rhine.c-make-a-function-static.txt
-Patch30576: 4381-net-drivers-fix-section-attributes-for-gcc.txt
-Patch30577: 4382-mv643xx_eth-Always-free-completed-tx-descs-on-tx-interrupt.txt
-Patch30578: 4383-mv643xx_eth-Fix-tx_timeout-to-only-conditionally-wake-tx-queue.txt
-Patch30579: 4385-Use-pci_set_consistent_dma_mask-in-ixgb-driver.txt
-Patch30580: 4504-IPV4-Possible-cleanups.txt
-Patch30581: 4505-XFRM-Fix-aevent-timer.txt
-Patch30582: 4510-ATM-Clip-timer-race.txt
-Patch30583: 4511-ATM-clip-run-through-Lindent.txt
-Patch30584: 4512-ATM-clip-get-rid-of-PROC_FS-ifdef.txt
-Patch30585: 4513-ATM-clip-notifier-related-cleanups.txt
-Patch30586: 4514-ATM-clip-add-module-info.txt
-Patch30587: 4515-IRDA-irda-usb-unregister-netdev-when-patch-upload-fails.txt
-Patch30588: 4516-IRDA-smsc-ircc2-smcinit-support-for-ALi-ISA-bridges.txt
-Patch30589: 4517-ip_output-account-for-fraggap-when-checking-to-add-trailer_len.txt
-Patch30590: 4521-e1000-Remove-PM-warning-DPRINTKs-breaking-2.4.x-kernels.txt
-Patch30591: 4522-e1000-Esb2-wol-link-cycle-bug-and-uninitialized-registers.txt
-Patch30592: 4523-e1000-De-inline-functions-to-benefit-from-compiler-smartness.txt
-Patch30593: 4524-e1000-Made-an-adapter-struct-variable-into-a-local-txb2b.txt
-Patch30594: 4525-e1000-Update-truesize-with-the-length-of-the-packet-for-packet-split.txt
-Patch30595: 4526-e1000-Dead-variable-cleanup.txt
-Patch30596: 4528-e1000-implement-more-efficient-tx-queue-locking.txt
-Patch30597: 4529-e1000-Version-bump-contact-fix-year-string-change.txt
-Patch30598: 4554-e1000-fix-mispatch-for-media-type-detect.txt
-Patch30599: 4564-TCP-Fix-truesize-underflow.txt
-Patch30600: 4565-IPV6-Ensure-to-have-hop-by-hop-options-in-our-header-of-sk_buff.txt
-Patch30601: 4566-IPV6-XFRM-Don-t-use-old-copy-of-pointer-after-pskb_may_pull.txt
-Patch30602: 4567-IPV6-XFRM-Fix-decoding-session-with-preceding-extension-header-s.txt
-Patch30603: 4568-IPV6-Clean-up-hop-by-hop-options-handler.txt
-Patch30604: 4569-unaligned-access-in-sk_run_filter.txt
-Patch30605: 4671-RPCSEC_GSS-fix-leak-in-krb5-code-caused-by-superfluous-kmalloc.txt
-Patch30606: 4678-SUNRPC-Dead-code-in-net-sunrpc-auth_gss-auth_gss.c.txt
-Patch30607: 4684-softmac-uses-Wiress-Ext.txt
-Patch30608: 4686-wireless-atmel-send-WEXT-scan-completion-events.txt
-Patch30609: 4687-wext-Fix-IWENCODEEXT-security-permissions.txt
-Patch30610: 4689-softmac-fix-spinlock-recursion-on-reassoc.txt
-Patch30611: 4690-orinoco-fix-truncating-commsquality-RID-with-the-latest-Symbol-firmware.txt
-Patch30612: 4691-bcm43xx-set-trans_start-on-TX-to-prevent-bogus-timeouts.txt
-Patch30613: 4692-softmac-return-EAGAIN-from-getscan-while-scanning.txt
-Patch30614: 4693-softmac-dont-send-out-packets-while-scanning.txt
-Patch30615: 4694-softmac-handle-iw_mode-properly.txt
-Patch30616: 4697-bcm43xx-wireless-fix-printk-format-warnings.txt
-Patch30617: 4698-bcm43xx-fix-config-menu-alignment.txt
-Patch30618: 4699-bcm43xx-fix-dyn-tssi2dbm-memleak.txt
-Patch30619: 4700-bcm43xx-fix-pctl-slowclock-limit-calculation.txt
-Patch30620: 4702-bcm43xx-iw_priv_args-names-should-be-16-characters.txt
-Patch30621: 4703-wext-Fix-RtNetlink-ENCODE-security-permissions.txt
-Patch30622: 4706-LLC-Use-pskb_trim_rcsum-in-llc_fixup_skb.txt
-Patch30623: 4707-SUNGEM-Marvell-PHY-suspend.txt
-Patch30624: 4709-TCP-Account-skb-overhead-in-tcp_fragment.txt
-Patch30625: 4710-NET-Add-skb-truesize-assertion-checking.txt
-Patch30626: 4741-NEx000-fix-RTL8019AS-base-address-for-RBTX4938.txt
-Patch30627: 4742-Add-VLAN-802.1q-support-to-sis900-driver.txt
-Patch30628: 4744-au1000_eth.c-probe-code-straightened-up.txt
-Patch30629: 4747-netdrvr-Convert-cassini-to-pci_iomap.txt
-Patch30630: 4748-Fix-locking-in-gianfar.txt
-Patch30631: 4768-pcmcia-add-new-ID-to-pcnet_cs.txt
-Patch30632: 4808-Fix-crash-on-big-endian-systems-during-scan.txt
-Patch30633: 4809-softmac-fix-SIOCSIWAP.txt
-Patch30634: 4813-orinoco-remove-PCMCIA-audio-support-it-s-useless-for-wireless-cards.txt
-Patch30635: 4815-orinoco-remove-tracing-code-it-s-unused.txt
-Patch30636: 4816-orinoco-remove-debug-buffer-code-and-userspace-include-support.txt
-Patch30637: 4817-orinoco-Symbol-card-supported-by-spectrum_cs-is-LA4137-not-LA4100.txt
-Patch30638: 4818-orinoco-optimize-Tx-exception-handling-in-orinoco.txt
-Patch30639: 4819-orinoco-orinoco_xmit-should-only-return-valid-symbolic-constants.txt
-Patch30640: 4820-orinoco-replace-hermes_write_words-with-hermes_write_bytes.txt
-Patch30641: 4821-orinoco-don-t-use-any-padding-for-Tx-frames.txt
-Patch30642: 4822-orinoco-refactor-and-clean-up-Tx-error-handling.txt
-Patch30643: 4823-orinoco-simplify-802.3-encapsulation-code.txt
-Patch30644: 4824-orinoco-fix-BAP0-offset-error-after-several-days-of-operation.txt
-Patch30645: 4825-orinoco-delay-FID-allocation-after-firmware-initialization.txt
-Patch30646: 4826-orinoco_pci-disable-device-and-free-IRQ-when-suspending.txt
-Patch30647: 4827-orinoco_pci-use-pci_iomap-for-resources.txt
-Patch30648: 4828-orinoco-support-PCI-suspend-resume-for-Nortel-PLX-and-TMD-adaptors.txt
-Patch30649: 4829-orinoco-reduce-differences-between-PCI-drivers-create-orinoco_pci.h.txt
-Patch30650: 4830-orinoco-further-comment-cleanup-in-the-PCI-drivers.txt
-Patch30651: 4831-orinoco-bump-version-to-0.15.txt
-Patch30652: 4833-ieee80211-Fix-TKIP-MIC-calculation-for-QoS-frames.txt
-Patch30653: 4834-ieee80211-Fix-TX-code-doesn-t-enable-QoS-when-using-WPA-QoS.txt
-Patch30654: 4835-ieee80211-export-list-of-bit-rates-with-standard-WEXT-procddures.txt
-Patch30655: 4837-ieee80211-replace-debug-IEEE80211_WARNING-with-each-own-debug-macro.txt
-Patch30656: 4838-ieee80211-update-version-stamp-to-1.1.13.txt
-Patch30657: 4839-ipw2200-Exponential-averaging-for-signal-and-noise-Level.txt
-Patch30658: 4840-ipw2200-Fix-TX-QoS-enabled-frames-problem.txt
-Patch30659: 4841-ipw2200-generates-a-scan-event-after-a-scan-has-completed.txt
-Patch30660: 4843-ipw2200-fix-compile-warning-when-CONFIG_IPW2200_DEBUG.txt
-Patch30661: 4844-ipw2200-Do-not-continue-loading-the-firmware-if-kmalloc-fails.txt
-Patch30662: 4845-ipw2200-turn-off-signal-debug-log.txt
-Patch30663: 4850-ipw2200-version-string-rework.txt
-Patch30664: 4851-ipw2200-update-version-stamp-to-1.1.2.txt
-Patch30665: 4856-ipw2200-Fix-wpa_supplicant-association-problem.txt
-Patch30666: 4857-softmac-add-SIOCSIWMLME.txt
-Patch30667: 4861-patch-prism54usb-add-set_bssid_filter.txt
-Patch30668: 4862-add-adm8211-wireless-driver.txt
-Patch30669: 4863-NETFILTER-nf_conntrack-Fix-module-refcount-dropping-too-far.txt
-Patch30670: 4864-NETFILTER-ULOG-target-is-not-obsolete.txt
-Patch30671: 4866-NETFILTER-nf_conntrack-kill-unused-callback-init_conntrack.txt
-Patch30672: 4867-NETFILTER-ip6_tables-remove-broken-comefrom-debugging.txt
-Patch30673: 4868-NETFILTER-x_tables-move-table-lock-initialization.txt
-Patch30674: 4869-NETFILTER-ipt-action-use-xt_check_target-for-basic-verification.txt
-Patch30675: XXXX-tiacx-ia64-enable.txt
+Patch30459: 3103-bcm43xx-receive-TX-status-on-MMIO-or-DMA-unconditionally-regarding-the-80211-core-rev.txt
+Patch30460: 3104-bcm43xx-add-functions-bcm43xx_dma_read-write-bcm43xx_dma_tx_suspend-resume.txt
+Patch30461: 3108-bcm43xx-Do-boardflags-workarounds-for-specific-boards.txt
+Patch30462: 3109-bcm43xx-properly-mask-txctl1-before-writing-it-to-hardware.txt
+Patch30463: 3111-bcm43xx-fix-some-gpio-register-trashing-hopefully-D.txt
+Patch30464: 3117-bcm43xx-add-useless-and-broken-statistics-stuff.-People-seem-to-want-it.-well.txt
+Patch30465: 3119-bcm43xx-fix-include-issues-on-some-platforms.txt
+Patch30466: 3126-hostap-Make-hostap_tx_encrypt-static.txt
+Patch30467: 3165-knfsd-Change-the-store-of-auth_domains-to-not-be-a-cache.txt
+Patch30468: 3167-knfsd-Get-rid-of-inplace-sunrpc-caches.txt
+Patch30469: 3168-knfsd-Create-cache_lookup-function-instead-of-using-a-macro-to-declare-one.txt
+Patch30470: 3169-knfsd-Convert-ip_map-cache-to-use-the-new-lookup-routine.txt
+Patch30471: 3172-knfsd-Use-new-sunrpc-cache-for-rsi-cache.txt
+Patch30472: 3173-knfsd-Use-new-cache-code-for-rsc-cache.txt
+Patch30473: 3175-knfsd-An-assortment-of-little-fixes-to-the-sunrpc-cache-code.txt
+Patch30474: 3180-knfsd-Tidy-up-unix_domain_find.txt
+Patch30475: 3252-pnp-IRDA-adjust-pnp_register_driver-signature.txt
+Patch30476: 3328-Minor-janitorial-change-to-ieee80211.txt
+Patch30477: 3329-wireless-add-prism54usb-driver.txt
+Patch30478: 3330-prism54usb-fix-build-break-in-islusb_init.c.txt
+Patch30479: 3331-wireless-add-acx-driver.txt
+Patch30480: 3332-acxsm-merge-from-acx-0.3.32.txt
+Patch30481: 3333-tiacx-Let-only-ACX_PCI-ACX_USB-be-user-visible.txt
+Patch30482: 3334-softmac-prism54usb-update.txt
+Patch30483: 3335-tiacx-revert-neither-PCI-nor-USB-is-selected-change.txt
+Patch30484: 3336-tiacx-implement-much-more-flexible-firmware-statistics-parsing.txt
+Patch30485: 3337-tiacx-Change-acx_ioctl_-get-set-_encode-to-use-kernel-80211-stack.txt
+Patch30486: 3338-tiacx-fix-breakage-of-Get-rid-of-circular-list-of-adev-s.txt
+Patch30487: 3339-tiacx-split-module-into-acx-common-acx-pci-acx-usb.txt
+Patch30488: 3346-update-prism54usb-sources.txt
+Patch30489: 3464-TG3-Fix-probe-failure-due-to-invalid-MAC-address.txt
+Patch30490: 3465-TG3-Fix-bug-in-40-bit-DMA-workaround-code.txt
+Patch30491: 3466-TG3-Fix-PHY-loopback-on-5700.txt
+Patch30492: 3467-TG3-Speed-up-SRAM-access.txt
+Patch30493: 3468-TG3-Skip-timer-code-during-full-lock.txt
+Patch30494: 3469-TG3-Update-version-and-reldate.txt
+Patch30495: 3471-NET-Fix-ipx-econet-appletalk-irda-ioctl-crashes.txt
+Patch30496: 3472-ECONET-Convert-away-from-SOCKOPS_WRAPPED.txt
+Patch30497: 3473-NET-deinline-200-byte-inlines-in-sock.h.txt
+Patch30498: 3475-TCP-Fix-RFC2465-typo.txt
+Patch30499: 3476-NETFILTER-Rename-init-functions.txt
+Patch30500: 3534-DECNET-Fix-refcount.txt
+Patch30501: 3535-DCCP-Use-NULL-for-pointers-comfort-sparse.txt
+Patch30502: 3536-b44-fix-force-mac-address-before-ifconfig-up.txt
+Patch30503: 3538-axnet_cs.c-add-hardware-multicast-support.txt
+Patch30504: 3539-via-rhine-link-state-fix.txt
+Patch30505: 3540-spidernet-reduce-console-spam.txt
+Patch30506: 3541-acenic-fix-section-mismatches.txt
+Patch30507: 3542-bonding-support-carrier-state-for-master.txt
+Patch30508: 3543-spidernet-enable-tx-checksum-offloading-by-default.txt
+Patch30509: 3544-natsemi-Support-oversized-EEPROMs.txt
+Patch30510: 3545-net-remove-CONFIG_NET_CBUS-conditional-for-NS8390.txt
+Patch30511: 3546-Janitor-drivers-net-pcnet32-fix-incorrect-comments.txt
+Patch30512: 3547-b44-ensure-valid-mac-addr.txt
+Patch30513: 3548-ixp2000-fix-gcc4-breakage.txt
+Patch30514: 3549-NET-Deinline-some-larger-functions-from-netdevice.h.txt
+Patch30515: 3602-NET-add-SO_RCVBUF-comment.txt
+Patch30516: 3603-TCP-Kill-unused-extern-decl-for-tcp_v4_hash_connecting.txt
+Patch30517: 3627-pcmcia-default-suspend-and-resume-handling.txt
+Patch30518: 3629-pcmcia-remove-unneeded-Vcc-pseudo-setting.txt
+Patch30519: 3699-uml-kconfigs.txt
+Patch30520: 3726-3c59x-collision-statistics-fix-fix.txt
+Patch30521: 3727-3c59x-fix-networking-for-10base2-NICs.txt
+Patch30522: 3840-TG3-Revert-Speed-up-SRAM-access.txt
+Patch30523: 3841-TG3-Update-driver-version-and-reldate.txt
+Patch30524: 3842-NET-com90xx-kmalloc-fix.txt
+Patch30525: 3843-IPSEC-Kill-unused-decap-state-argument.txt
+Patch30526: 3846-NETFILTER-x_tables-unify-IPv4-IPv6-esp-match.txt
+Patch30527: 3847-NETFILTER-x_tables-unify-IPv4-IPv6-multiport-match.txt
+Patch30528: 3848-NETFILTER-fix-ifdef-for-connmark-support-in-nf_conntrack_netlink.txt
+Patch30529: 3865-smc91x-add-support-for-LogicPD-PXA270-platform.txt
+Patch30530: 3866-Goramo-PCI200SYN-WAN-driver-subsystem-ID-patch.txt
+Patch30531: 3947-BUG_ON-Conversion-in-drivers-net.txt
+Patch30532: 3999-kbuild-fix-unneeded-rebuilds-in-drivers-net-chelsio-after-moving-source-tree.txt
+Patch30533: 4072-IPSEC-Check-x-encap-before-dereferencing-it.txt
+Patch30534: 4076-NET-netconsole-set-.name-in-struct-console.txt
+Patch30535: 4077-NET-Fix-an-off-by-21-or-49-error.txt
+Patch30536: 4078-TG3-Fix-a-memory-leak.txt
+Patch30537: 4079-BLUETOOTH-sco-Possible-double-free.txt
+Patch30538: 4080-INET-Use-port-unreachable-instead-of-proto-for-tunnels.txt
+Patch30539: 4081-IRDA-smcinit-merged-into-smsc-ircc-driver.txt
+Patch30540: 4082-IRDA-Support-for-Sigmatel-STIR421x-chip.txt
+Patch30541: 4083-NETFILTER-Add-helper-functions-for-mass-hook-registration-unregistration.txt
+Patch30542: 4086-NETFILTER-H.323-helper-move-some-function-prototypes-to-ip_conntrack_h323.h.txt
+Patch30543: 4087-NETFILTER-H.323-helper-change-EXPORT_SYMBOL-to-EXPORT_SYMBOL_GPL.txt
+Patch30544: 4088-NETFILTER-H.323-helper-make-get_h245_addr-static.txt
+Patch30545: 4089-NETFILTER-H.323-helper-add-parameter-default_rrq_ttl.txt
+Patch30546: 4090-NETFILTER-Fix-IP_NF_CONNTRACK_NETLINK-dependency.txt
+Patch30547: 4091-NETFILTER-Introduce-infrastructure-for-address-family-specific-operations.txt
+Patch30548: 4092-NETFILTER-Add-address-family-specific-checksum-helpers.txt
+Patch30549: 4093-NETFILTER-Convert-conntrack-ipt_REJECT-to-new-checksumming-functions.txt
+Patch30550: 4094-NETFILTER-H.323-helper-remove-changelog.txt
+Patch30551: 4095-TG3-Kill-some-less-useful-flags.txt
+Patch30552: 4096-TG3-Speed-up-SRAM-access-2nd-version.txt
+Patch30553: 4097-PKT_SCHED-act_police-Rename-methods.txt
+Patch30554: 4098-NET-kzalloc-use-in-alloc_netdev.txt
+Patch30555: 4099-NET-More-kzalloc-conversions.txt
+Patch30556: 4100-NETFILTER-Fix-build-with-CONFIG_NETFILTER-y-m-on-IA64.txt
+Patch30557: 4102-NET-Fix-hotplug-race-during-device-registration.txt
+Patch30558: 4103-X25-Restore-skb-dev-setting-in-x25_type_trans.txt
+Patch30559: 4104-NETFILTER-Fix-DNAT-in-LOCAL_OUT.txt
+Patch30560: 4105-IPV4-ip_fragment-Always-compute-hash-with-ipfrag_lock-held.txt
+Patch30561: 4106-IPV6-Deinline-few-large-functions-in-inet6-code.txt
+Patch30562: 4323-knfsd-svcrpc-gss-don-t-call-svc_take_page-unnecessarily.txt
+Patch30563: 4351-IPv6-reassembly-Always-compute-hash-under-the-fragment-lock.txt
+Patch30564: 4352-BRIDGE-receive-link-local-on-disabled-ports.txt
+Patch30565: 4353-DCCP-Fix-leak-in-net-dccp-ipv4.c.txt
+Patch30566: 4355-WAN-Remove-broken-and-unmaintained-Sangoma-drivers.txt
+Patch30567: 4372-dlink-pci-cards-using-wrong-driver.txt
+Patch30568: 4373-network-axnet_cs.c-add-missing-PRIV-in-ei_rx_overrun.txt
+Patch30569: 4374-via-rhine-execute-bounce-buffers-code-on-Rhine-I-only.txt
+Patch30570: 4375-b44-disable-default-tx-pause.txt
+Patch30571: 4376-b44-increase-version-to-1.00.txt
+Patch30572: 4377-netdrvr-b44-trim-trailing-whitespace.txt
+Patch30573: 4379-drivers-net-via-rhine.c-make-a-function-static.txt
+Patch30574: 4381-net-drivers-fix-section-attributes-for-gcc.txt
+Patch30575: 4382-mv643xx_eth-Always-free-completed-tx-descs-on-tx-interrupt.txt
+Patch30576: 4383-mv643xx_eth-Fix-tx_timeout-to-only-conditionally-wake-tx-queue.txt
+Patch30577: 4385-Use-pci_set_consistent_dma_mask-in-ixgb-driver.txt
+Patch30578: 4504-IPV4-Possible-cleanups.txt
+Patch30579: 4505-XFRM-Fix-aevent-timer.txt
+Patch30580: 4510-ATM-Clip-timer-race.txt
+Patch30581: 4511-ATM-clip-run-through-Lindent.txt
+Patch30582: 4512-ATM-clip-get-rid-of-PROC_FS-ifdef.txt
+Patch30583: 4513-ATM-clip-notifier-related-cleanups.txt
+Patch30584: 4514-ATM-clip-add-module-info.txt
+Patch30585: 4515-IRDA-irda-usb-unregister-netdev-when-patch-upload-fails.txt
+Patch30586: 4516-IRDA-smsc-ircc2-smcinit-support-for-ALi-ISA-bridges.txt
+Patch30587: 4517-ip_output-account-for-fraggap-when-checking-to-add-trailer_len.txt
+Patch30588: 4521-e1000-Remove-PM-warning-DPRINTKs-breaking-2.4.x-kernels.txt
+Patch30589: 4522-e1000-Esb2-wol-link-cycle-bug-and-uninitialized-registers.txt
+Patch30590: 4523-e1000-De-inline-functions-to-benefit-from-compiler-smartness.txt
+Patch30591: 4524-e1000-Made-an-adapter-struct-variable-into-a-local-txb2b.txt
+Patch30592: 4525-e1000-Update-truesize-with-the-length-of-the-packet-for-packet-split.txt
+Patch30593: 4526-e1000-Dead-variable-cleanup.txt
+Patch30594: 4528-e1000-implement-more-efficient-tx-queue-locking.txt
+Patch30595: 4529-e1000-Version-bump-contact-fix-year-string-change.txt
+Patch30596: 4554-e1000-fix-mispatch-for-media-type-detect.txt
+Patch30597: 4564-TCP-Fix-truesize-underflow.txt
+Patch30598: 4565-IPV6-Ensure-to-have-hop-by-hop-options-in-our-header-of-sk_buff.txt
+Patch30599: 4566-IPV6-XFRM-Don-t-use-old-copy-of-pointer-after-pskb_may_pull.txt
+Patch30600: 4567-IPV6-XFRM-Fix-decoding-session-with-preceding-extension-header-s.txt
+Patch30601: 4568-IPV6-Clean-up-hop-by-hop-options-handler.txt
+Patch30602: 4569-unaligned-access-in-sk_run_filter.txt
+Patch30603: 4671-RPCSEC_GSS-fix-leak-in-krb5-code-caused-by-superfluous-kmalloc.txt
+Patch30604: 4678-SUNRPC-Dead-code-in-net-sunrpc-auth_gss-auth_gss.c.txt
+Patch30605: 4684-softmac-uses-Wiress-Ext.txt
+Patch30606: 4686-wireless-atmel-send-WEXT-scan-completion-events.txt
+Patch30607: 4687-wext-Fix-IWENCODEEXT-security-permissions.txt
+Patch30608: 4689-softmac-fix-spinlock-recursion-on-reassoc.txt
+Patch30609: 4690-orinoco-fix-truncating-commsquality-RID-with-the-latest-Symbol-firmware.txt
+Patch30610: 4691-bcm43xx-set-trans_start-on-TX-to-prevent-bogus-timeouts.txt
+Patch30611: 4692-softmac-return-EAGAIN-from-getscan-while-scanning.txt
+Patch30612: 4693-softmac-dont-send-out-packets-while-scanning.txt
+Patch30613: 4694-softmac-handle-iw_mode-properly.txt
+Patch30614: 4697-bcm43xx-wireless-fix-printk-format-warnings.txt
+Patch30615: 4698-bcm43xx-fix-config-menu-alignment.txt
+Patch30616: 4699-bcm43xx-fix-dyn-tssi2dbm-memleak.txt
+Patch30617: 4700-bcm43xx-fix-pctl-slowclock-limit-calculation.txt
+Patch30618: 4702-bcm43xx-iw_priv_args-names-should-be-16-characters.txt
+Patch30619: 4703-wext-Fix-RtNetlink-ENCODE-security-permissions.txt
+Patch30620: 4706-LLC-Use-pskb_trim_rcsum-in-llc_fixup_skb.txt
+Patch30621: 4707-SUNGEM-Marvell-PHY-suspend.txt
+Patch30622: 4709-TCP-Account-skb-overhead-in-tcp_fragment.txt
+Patch30623: 4710-NET-Add-skb-truesize-assertion-checking.txt
+Patch30624: 4741-NEx000-fix-RTL8019AS-base-address-for-RBTX4938.txt
+Patch30625: 4742-Add-VLAN-802.1q-support-to-sis900-driver.txt
+Patch30626: 4744-au1000_eth.c-probe-code-straightened-up.txt
+Patch30627: 4747-netdrvr-Convert-cassini-to-pci_iomap.txt
+Patch30628: 4748-Fix-locking-in-gianfar.txt
+Patch30629: 4768-pcmcia-add-new-ID-to-pcnet_cs.txt
+Patch30630: 4808-Fix-crash-on-big-endian-systems-during-scan.txt
+Patch30631: 4809-softmac-fix-SIOCSIWAP.txt
+Patch30632: 4813-orinoco-remove-PCMCIA-audio-support-it-s-useless-for-wireless-cards.txt
+Patch30633: 4815-orinoco-remove-tracing-code-it-s-unused.txt
+Patch30634: 4816-orinoco-remove-debug-buffer-code-and-userspace-include-support.txt
+Patch30635: 4817-orinoco-Symbol-card-supported-by-spectrum_cs-is-LA4137-not-LA4100.txt
+Patch30636: 4818-orinoco-optimize-Tx-exception-handling-in-orinoco.txt
+Patch30637: 4819-orinoco-orinoco_xmit-should-only-return-valid-symbolic-constants.txt
+Patch30638: 4820-orinoco-replace-hermes_write_words-with-hermes_write_bytes.txt
+Patch30639: 4821-orinoco-don-t-use-any-padding-for-Tx-frames.txt
+Patch30640: 4822-orinoco-refactor-and-clean-up-Tx-error-handling.txt
+Patch30641: 4823-orinoco-simplify-802.3-encapsulation-code.txt
+Patch30642: 4824-orinoco-fix-BAP0-offset-error-after-several-days-of-operation.txt
+Patch30643: 4825-orinoco-delay-FID-allocation-after-firmware-initialization.txt
+Patch30644: 4826-orinoco_pci-disable-device-and-free-IRQ-when-suspending.txt
+Patch30645: 4827-orinoco_pci-use-pci_iomap-for-resources.txt
+Patch30646: 4828-orinoco-support-PCI-suspend-resume-for-Nortel-PLX-and-TMD-adaptors.txt
+Patch30647: 4829-orinoco-reduce-differences-between-PCI-drivers-create-orinoco_pci.h.txt
+Patch30648: 4830-orinoco-further-comment-cleanup-in-the-PCI-drivers.txt
+Patch30649: 4831-orinoco-bump-version-to-0.15.txt
+Patch30650: 4833-ieee80211-Fix-TKIP-MIC-calculation-for-QoS-frames.txt
+Patch30651: 4834-ieee80211-Fix-TX-code-doesn-t-enable-QoS-when-using-WPA-QoS.txt
+Patch30652: 4835-ieee80211-export-list-of-bit-rates-with-standard-WEXT-procddures.txt
+Patch30653: 4837-ieee80211-replace-debug-IEEE80211_WARNING-with-each-own-debug-macro.txt
+Patch30654: 4838-ieee80211-update-version-stamp-to-1.1.13.txt
+Patch30655: 4839-ipw2200-Exponential-averaging-for-signal-and-noise-Level.txt
+Patch30656: 4840-ipw2200-Fix-TX-QoS-enabled-frames-problem.txt
+Patch30657: 4841-ipw2200-generates-a-scan-event-after-a-scan-has-completed.txt
+Patch30658: 4843-ipw2200-fix-compile-warning-when-CONFIG_IPW2200_DEBUG.txt
+Patch30659: 4844-ipw2200-Do-not-continue-loading-the-firmware-if-kmalloc-fails.txt
+Patch30660: 4845-ipw2200-turn-off-signal-debug-log.txt
+Patch30661: 4850-ipw2200-version-string-rework.txt
+Patch30662: 4851-ipw2200-update-version-stamp-to-1.1.2.txt
+Patch30663: 4856-ipw2200-Fix-wpa_supplicant-association-problem.txt
+Patch30664: 4857-softmac-add-SIOCSIWMLME.txt
+Patch30665: 4861-patch-prism54usb-add-set_bssid_filter.txt
+Patch30666: 4862-add-adm8211-wireless-driver.txt
+Patch30667: 4863-NETFILTER-nf_conntrack-Fix-module-refcount-dropping-too-far.txt
+Patch30668: 4864-NETFILTER-ULOG-target-is-not-obsolete.txt
+Patch30669: 4866-NETFILTER-nf_conntrack-kill-unused-callback-init_conntrack.txt
+Patch30670: 4867-NETFILTER-ip6_tables-remove-broken-comefrom-debugging.txt
+Patch30671: 4868-NETFILTER-x_tables-move-table-lock-initialization.txt
+Patch30672: 4869-NETFILTER-ipt-action-use-xt_check_target-for-basic-verification.txt
+Patch30673: XXXX-tiacx-ia64-enable.txt
 
 # END OF PATCH DEFINITIONS
 
@@ -2686,440 +2684,436 @@
 %patch30457 -p1
 # bcm43xx: Remove the mmio access printing facility overhead.
 %patch30458 -p1
-# bcm43xx: fix some stuff, add a few missing mmiowb(), remove dead code.
-%patch30459 -p1
 # bcm43xx: receive TX status on MMIO or DMA unconditionally regarding the 80211 core rev.
-%patch30460 -p1
+%patch30459 -p1
 # bcm43xx: add functions bcm43xx_dma_read/write, bcm43xx_dma_tx_suspend/resume.
-%patch30461 -p1
-# bcm43xx: Remove the workaround in dummy_transmission,
-%patch30462 -p1
+%patch30460 -p1
 # bcm43xx: Do boardflags workarounds for specific boards.
-%patch30463 -p1
+%patch30461 -p1
 # bcm43xx: properly mask txctl1 before writing it to hardware.
-%patch30464 -p1
+%patch30462 -p1
 # bcm43xx: fix some gpio register trashing (hopefully :D)
-%patch30465 -p1
+%patch30463 -p1
 # bcm43xx: add useless and broken statistics stuff. People seem to want it. well...
-%patch30466 -p1
+%patch30464 -p1
 # bcm43xx: fix "include" issues on some platforms.
-%patch30467 -p1
+%patch30465 -p1
 # hostap: Make hostap_tx_encrypt() static
-%patch30468 -p1
+%patch30466 -p1
 # knfsd: Change the store of auth_domains to not be a 'cache'
-%patch30469 -p1
+%patch30467 -p1
 # knfsd: Get rid of 'inplace' sunrpc caches
-%patch30470 -p1
+%patch30468 -p1
 # knfsd: Create cache_lookup function instead of using a macro to declare one
-%patch30471 -p1
+%patch30469 -p1
 # knfsd: Convert ip_map cache to use the new lookup routine
-%patch30472 -p1
+%patch30470 -p1
 # knfsd: Use new sunrpc cache for rsi cache
-%patch30473 -p1
+%patch30471 -p1
 # knfsd: Use new cache code for rsc cache
-%patch30474 -p1
+%patch30472 -p1
 # knfsd: An assortment of little fixes to the sunrpc cache code
-%patch30475 -p1
+%patch30473 -p1
 # knfsd: Tidy up unix_domain_find
-%patch30476 -p1
+%patch30474 -p1
 # pnp: IRDA: adjust pnp_register_driver signature
-%patch30477 -p1
+%patch30475 -p1
 # Minor (janitorial) change to ieee80211
-%patch30478 -p1
+%patch30476 -p1
 # wireless: add prism54usb driver
-%patch30479 -p1
+%patch30477 -p1
 # prism54usb: fix build break in islusb_init.c
-%patch30480 -p1
+%patch30478 -p1
 # wireless: add acx driver
-%patch30481 -p1
+%patch30479 -p1
 # acxsm: merge from acx 0.3.32
-%patch30482 -p1
+%patch30480 -p1
 # tiacx: Let only ACX_PCI/ACX_USB be user-visible
-%patch30483 -p1
+%patch30481 -p1
 # softmac: prism54usb update
-%patch30484 -p1
+%patch30482 -p1
 # tiacx: revert "neither PCI nor USB is selected" change
-%patch30485 -p1
+%patch30483 -p1
 # tiacx: implement much more flexible firmware statistics parsing
-%patch30486 -p1
+%patch30484 -p1
 # tiacx: Change acx_ioctl_{get,set}_encode to use kernel 80211 stack
-%patch30487 -p1
+%patch30485 -p1
 # tiacx: fix breakage of "Get rid of circular list of adev's"
-%patch30488 -p1
+%patch30486 -p1
 # tiacx: split module into acx-common + acx-pci + acx-usb
-%patch30489 -p1
+%patch30487 -p1
 # update prism54usb sources
-%patch30490 -p1
+%patch30488 -p1
 # [TG3]: Fix probe failure due to invalid MAC address
-%patch30491 -p1
+%patch30489 -p1
 # [TG3]: Fix bug in 40-bit DMA workaround code
-%patch30492 -p1
+%patch30490 -p1
 # [TG3]: Fix PHY loopback on 5700
-%patch30493 -p1
+%patch30491 -p1
 # [TG3]: Speed up SRAM access
-%patch30494 -p1
+%patch30492 -p1
 # [TG3]: Skip timer code during full lock
-%patch30495 -p1
+%patch30493 -p1
 # [TG3]: Update version and reldate
-%patch30496 -p1
+%patch30494 -p1
 # [NET]: Fix ipx/econet/appletalk/irda ioctl crashes
-%patch30497 -p1
+%patch30495 -p1
 # [ECONET]: Convert away from SOCKOPS_WRAPPED
-%patch30498 -p1
+%patch30496 -p1
 # [NET]: deinline 200+ byte inlines in sock.h
-%patch30499 -p1
+%patch30497 -p1
 # [TCP]: Fix RFC2465 typo.
-%patch30500 -p1
+%patch30498 -p1
 # [NETFILTER]: Rename init functions.
-%patch30501 -p1
+%patch30499 -p1
 # [DECNET]: Fix refcount
-%patch30502 -p1
+%patch30500 -p1
 # [DCCP]: Use NULL for pointers, comfort sparse.
-%patch30503 -p1
+%patch30501 -p1
 # b44: fix force mac address before ifconfig up
-%patch30504 -p1
+%patch30502 -p1
 # axnet_cs.c : add hardware multicast support
-%patch30505 -p1
+%patch30503 -p1
 # via-rhine: link state fix
-%patch30506 -p1
+%patch30504 -p1
 # spidernet : reduce console spam
-%patch30507 -p1
+%patch30505 -p1
 # acenic: fix section mismatches
-%patch30508 -p1
+%patch30506 -p1
 # bonding: support carrier state for master
-%patch30509 -p1
+%patch30507 -p1
 # spidernet : enable tx checksum offloading by default
-%patch30510 -p1
+%patch30508 -p1
 # natsemi: Support oversized EEPROMs
-%patch30511 -p1
+%patch30509 -p1
 # net: remove CONFIG_NET_CBUS conditional for NS8390
-%patch30512 -p1
+%patch30510 -p1
 # Janitor: drivers/net/pcnet32: fix incorrect comments
-%patch30513 -p1
+%patch30511 -p1
 # b44: ensure valid mac addr
-%patch30514 -p1
+%patch30512 -p1
 # ixp2000: fix gcc4 breakage
-%patch30515 -p1
+%patch30513 -p1
 # [NET]: Deinline some larger functions from netdevice.h
-%patch30516 -p1
+%patch30514 -p1
 # [NET]: add SO_RCVBUF comment
-%patch30517 -p1
+%patch30515 -p1
 # [TCP]: Kill unused extern decl for tcp_v4_hash_connecting()
-%patch30518 -p1
+%patch30516 -p1
 # pcmcia: default suspend and resume handling
-%patch30519 -p1
+%patch30517 -p1
 # pcmcia: remove unneeded Vcc pseudo setting
-%patch30520 -p1
+%patch30518 -p1
 # uml: kconfigs
-%patch30521 -p1
+%patch30519 -p1
 # "3c59x collision statistics fix" fix
-%patch30522 -p1
+%patch30520 -p1
 # 3c59x: fix networking for 10base2 NICs
-%patch30523 -p1
+%patch30521 -p1
 # [TG3]: Revert "Speed up SRAM access"
-%patch30524 -p1
+%patch30522 -p1
 # [TG3]: Update driver version and reldate.
-%patch30525 -p1
+%patch30523 -p1
 # [NET]: com90xx kmalloc fix
-%patch30526 -p1
+%patch30524 -p1
 # [IPSEC]: Kill unused decap state argument
-%patch30527 -p1
+%patch30525 -p1
 # [NETFILTER]: x_tables: unify IPv4/IPv6 esp match
-%patch30528 -p1
+%patch30526 -p1
 # [NETFILTER]: x_tables: unify IPv4/IPv6 multiport match
-%patch30529 -p1
+%patch30527 -p1
 # [NETFILTER]: fix ifdef for connmark support in nf_conntrack_netlink
-%patch30530 -p1
+%patch30528 -p1
 # smc91x: add support for LogicPD PXA270 platform
-%patch30531 -p1
+%patch30529 -p1
 # Goramo PCI200SYN WAN driver subsystem ID patch
-%patch30532 -p1
+%patch30530 -p1
 # BUG_ON() Conversion in drivers/net/
-%patch30533 -p1
+%patch30531 -p1
 # kbuild: fix unneeded rebuilds in drivers/net/chelsio after moving source tree
-%patch30534 -p1
+%patch30532 -p1
 # [IPSEC]: Check x->encap before dereferencing it
-%patch30535 -p1
+%patch30533 -p1
 # [NET] netconsole: set .name in struct console
-%patch30536 -p1
+%patch30534 -p1
 # [NET]: Fix an off-by-21-or-49 error.
-%patch30537 -p1
+%patch30535 -p1
 # [TG3]: Fix a memory leak.
-%patch30538 -p1
+%patch30536 -p1
 # [BLUETOOTH] sco: Possible double free.
-%patch30539 -p1
+%patch30537 -p1
 # [INET]: Use port unreachable instead of proto for tunnels
-%patch30540 -p1
+%patch30538 -p1
 # [IRDA]: smcinit merged into smsc-ircc driver
-%patch30541 -p1
+%patch30539 -p1
 # [IRDA]: Support for Sigmatel STIR421x chip
-%patch30542 -p1
+%patch30540 -p1
 # [NETFILTER]: Add helper functions for mass hook registration/unregistration
-%patch30543 -p1
+%patch30541 -p1
 # [NETFILTER]: H.323 helper: move some function prototypes to ip_conntrack_h323.h
-%patch30544 -p1
+%patch30542 -p1
 # [NETFILTER]: H.323 helper: change EXPORT_SYMBOL to EXPORT_SYMBOL_GPL
-%patch30545 -p1
+%patch30543 -p1
 # [NETFILTER]: H.323 helper: make get_h245_addr() static
-%patch30546 -p1
+%patch30544 -p1
 # [NETFILTER]: H.323 helper: add parameter 'default_rrq_ttl'
-%patch30547 -p1
+%patch30545 -p1
 # [NETFILTER]: Fix IP_NF_CONNTRACK_NETLINK dependency
-%patch30548 -p1
+%patch30546 -p1
 # [NETFILTER]: Introduce infrastructure for address family specific operations
-%patch30549 -p1
+%patch30547 -p1
 # [NETFILTER]: Add address family specific checksum helpers
-%patch30550 -p1
+%patch30548 -p1
 # [NETFILTER]: Convert conntrack/ipt_REJECT to new checksumming functions
-%patch30551 -p1
+%patch30549 -p1
 # [NETFILTER]: H.323 helper: remove changelog
-%patch30552 -p1
+%patch30550 -p1
 # [TG3]: Kill some less useful flags
-%patch30553 -p1
+%patch30551 -p1
 # [TG3]: Speed up SRAM access (2nd version)
-%patch30554 -p1
+%patch30552 -p1
 # [PKT_SCHED] act_police: Rename methods.
-%patch30555 -p1
+%patch30553 -p1
 # [NET] kzalloc: use in alloc_netdev
-%patch30556 -p1
+%patch30554 -p1
 # [NET]: More kzalloc conversions.
-%patch30557 -p1
+%patch30555 -p1
 # [NETFILTER]: Fix build with CONFIG_NETFILTER=y/m on IA64
-%patch30558 -p1
+%patch30556 -p1
 # [NET]: Fix hotplug race during device registration.
-%patch30559 -p1
+%patch30557 -p1
 # [X25]: Restore skb->dev setting in x25_type_trans().
-%patch30560 -p1
+%patch30558 -p1
 # [NETFILTER]: Fix DNAT in LOCAL_OUT
-%patch30561 -p1
+%patch30559 -p1
 # [IPV4] ip_fragment: Always compute hash with ipfrag_lock held.
-%patch30562 -p1
+%patch30560 -p1
 # [IPV6]: Deinline few large functions in inet6 code
-%patch30563 -p1
+%patch30561 -p1
 # knfsd: svcrpc: gss: don't call svc_take_page unnecessarily
-%patch30564 -p1
+%patch30562 -p1
 # [IPv6] reassembly: Always compute hash under the fragment lock.
-%patch30565 -p1
+%patch30563 -p1
 # [BRIDGE]: receive link-local on disabled ports.
-%patch30566 -p1
+%patch30564 -p1
 # [DCCP]: Fix leak in net/dccp/ipv4.c
-%patch30567 -p1
+%patch30565 -p1
 # [WAN]: Remove broken and unmaintained Sangoma drivers.
-%patch30568 -p1
+%patch30566 -p1
 # dlink pci cards using wrong driver
-%patch30569 -p1
+%patch30567 -p1
 # network: axnet_cs.c: add missing 'PRIV' in ei_rx_overrun
-%patch30570 -p1
+%patch30568 -p1
 # via-rhine: execute bounce buffers code on Rhine-I only
-%patch30571 -p1
+%patch30569 -p1
 # b44: disable default tx pause
-%patch30572 -p1
+%patch30570 -p1
 # b44: increase version to 1.00
-%patch30573 -p1
+%patch30571 -p1
 # [netdrvr b44] trim trailing whitespace
-%patch30574 -p1
+%patch30572 -p1
 # drivers/net/via-rhine.c: make a function static
-%patch30575 -p1
+%patch30573 -p1
 # net drivers: fix section attributes for gcc
-%patch30576 -p1
+%patch30574 -p1
 # mv643xx_eth: Always free completed tx descs on tx interrupt
-%patch30577 -p1
+%patch30575 -p1
 # mv643xx_eth: Fix tx_timeout to only conditionally wake tx queue
-%patch30578 -p1
+%patch30576 -p1
 # Use pci_set_consistent_dma_mask in ixgb driver
-%patch30579 -p1
+%patch30577 -p1
 # [IPV4]: Possible cleanups.
-%patch30580 -p1
+%patch30578 -p1
 # [XFRM]: Fix aevent timer.
-%patch30581 -p1
+%patch30579 -p1
 # [ATM]: Clip timer race.
-%patch30582 -p1
+%patch30580 -p1
 # [ATM] clip: run through Lindent
-%patch30583 -p1
+%patch30581 -p1
 # [ATM] clip: get rid of PROC_FS ifdef
-%patch30584 -p1
+%patch30582 -p1
 # [ATM] clip: notifier related cleanups
-%patch30585 -p1
+%patch30583 -p1
 # [ATM] clip: add module info
-%patch30586 -p1
+%patch30584 -p1
 # [IRDA]: irda-usb, unregister netdev when patch upload fails
-%patch30587 -p1
+%patch30585 -p1
 # [IRDA]: smsc-ircc2, smcinit support for ALi ISA bridges
-%patch30588 -p1
+%patch30586 -p1
 # ip_output: account for fraggap when checking to add trailer_len
-%patch30589 -p1
+%patch30587 -p1
 # e1000: Remove PM warning DPRINTKs breaking 2.4.x kernels
-%patch30590 -p1
+%patch30588 -p1
 # e1000: Esb2 wol link cycle bug and uninitialized registers
-%patch30591 -p1
+%patch30589 -p1
 # e1000: De-inline functions to benefit from compiler smartness
-%patch30592 -p1
+%patch30590 -p1
 # e1000: Made an adapter struct variable into a local (txb2b)
-%patch30593 -p1
+%patch30591 -p1
 # e1000: Update truesize with the length of the packet for packet split
-%patch30594 -p1
+%patch30592 -p1
 # e1000: Dead variable cleanup
-%patch30595 -p1
+%patch30593 -p1
 # e1000: implement more efficient tx queue locking
-%patch30596 -p1
+%patch30594 -p1
 # e1000: Version bump, contact fix, year string change
-%patch30597 -p1
+%patch30595 -p1
 # e1000: fix mispatch for media type detect.
-%patch30598 -p1
+%patch30596 -p1
 # [TCP]: Fix truesize underflow
-%patch30599 -p1
+%patch30597 -p1
 # [IPV6]: Ensure to have hop-by-hop options in our header of &sk_buff.
-%patch30600 -p1
+%patch30598 -p1
 # [IPV6] XFRM: Don't use old copy of pointer after pskb_may_pull().
-%patch30601 -p1
+%patch30599 -p1
 # [IPV6] XFRM: Fix decoding session with preceding extension header(s).
-%patch30602 -p1
+%patch30600 -p1
 # [IPV6]: Clean up hop-by-hop options handler.
-%patch30603 -p1
+%patch30601 -p1
 # unaligned access in sk_run_filter()
-%patch30604 -p1
+%patch30602 -p1
 # RPCSEC_GSS: fix leak in krb5 code caused by superfluous kmalloc
-%patch30605 -p1
+%patch30603 -p1
 # SUNRPC: Dead code in net/sunrpc/auth_gss/auth_gss.c
-%patch30606 -p1
+%patch30604 -p1
 # softmac uses Wiress Ext.
-%patch30607 -p1
+%patch30605 -p1
 # wireless/atmel: send WEXT scan completion events
-%patch30608 -p1
+%patch30606 -p1
 # wext: Fix IWENCODEEXT security permissions
-%patch30609 -p1
+%patch30607 -p1
 # softmac: fix spinlock recursion on reassoc
-%patch30610 -p1
+%patch30608 -p1
 # orinoco: fix truncating commsquality RID with the latest Symbol firmware
-%patch30611 -p1
+%patch30609 -p1
 # bcm43xx: set trans_start on TX to prevent bogus timeouts
-%patch30612 -p1
+%patch30610 -p1
 # softmac: return -EAGAIN from getscan while scanning
-%patch30613 -p1
+%patch30611 -p1
 # softmac: dont send out packets while scanning
-%patch30614 -p1
+%patch30612 -p1
 # softmac: handle iw_mode properly
-%patch30615 -p1
+%patch30613 -p1
 # bcm43xx wireless: fix printk format warnings
-%patch30616 -p1
+%patch30614 -p1
 # bcm43xx: fix config menu alignment
-%patch30617 -p1
+%patch30615 -p1
 # bcm43xx: fix dyn tssi2dbm memleak
-%patch30618 -p1
+%patch30616 -p1
 # bcm43xx: fix pctl slowclock limit calculation
-%patch30619 -p1
+%patch30617 -p1
 # bcm43xx: iw_priv_args names should be <16 characters
-%patch30620 -p1
+%patch30618 -p1
 # wext: Fix RtNetlink ENCODE security permissions
-%patch30621 -p1
+%patch30619 -p1
 # [LLC]: Use pskb_trim_rcsum() in llc_fixup_skb().
-%patch30622 -p1
+%patch30620 -p1
 # [SUNGEM]: Marvell PHY suspend.
-%patch30623 -p1
+%patch30621 -p1
 # [TCP]: Account skb overhead in tcp_fragment
-%patch30624 -p1
+%patch30622 -p1
 # [NET]: Add skb->truesize assertion checking.
-%patch30625 -p1
+%patch30623 -p1
 # NEx000: fix RTL8019AS base address for RBTX4938
-%patch30626 -p1
+%patch30624 -p1
 # Add VLAN (802.1q) support to sis900 driver
-%patch30627 -p1
+%patch30625 -p1
 # au1000_eth.c probe code straightened up
-%patch30628 -p1
+%patch30626 -p1
 # netdrvr: Convert cassini to pci_iomap
-%patch30629 -p1
+%patch30627 -p1
 # Fix locking in gianfar
-%patch30630 -p1
+%patch30628 -p1
 # pcmcia: add new ID to pcnet_cs
-%patch30631 -p1
+%patch30629 -p1
 # Fix crash on big-endian systems during scan
-%patch30632 -p1
+%patch30630 -p1
 # softmac: fix SIOCSIWAP
-%patch30633 -p1
+%patch30631 -p1
 # orinoco: remove PCMCIA audio support, it's useless for wireless cards
-%patch30634 -p1
+%patch30632 -p1
 # orinoco: remove tracing code, it's unused
-%patch30635 -p1
+%patch30633 -p1
 # orinoco: remove debug buffer code and userspace include support
-%patch30636 -p1
+%patch30634 -p1
 # orinoco: Symbol card supported by spectrum_cs is LA4137, not LA4100
-%patch30637 -p1
+%patch30635 -p1
 # orinoco: optimize Tx exception handling in orinoco
-%patch30638 -p1
+%patch30636 -p1
 # orinoco: orinoco_xmit() should only return valid symbolic constants
-%patch30639 -p1
+%patch30637 -p1
 # orinoco replace hermes_write_words() with hermes_write_bytes()
-%patch30640 -p1
+%patch30638 -p1
 # orinoco: don't use any padding for Tx frames
-%patch30641 -p1
+%patch30639 -p1
 # orinoco: refactor and clean up Tx error handling
-%patch30642 -p1
+%patch30640 -p1
 # orinoco: simplify 802.3 encapsulation code
-%patch30643 -p1
+%patch30641 -p1
 # orinoco: fix BAP0 offset error after several days of operation
-%patch30644 -p1
+%patch30642 -p1
 # orinoco: delay FID allocation after firmware initialization
-%patch30645 -p1
+%patch30643 -p1
 # orinoco_pci: disable device and free IRQ when suspending
-%patch30646 -p1
+%patch30644 -p1
 # orinoco_pci: use pci_iomap() for resources
-%patch30647 -p1
+%patch30645 -p1
 # orinoco: support PCI suspend/resume for Nortel, PLX and TMD adaptors
-%patch30648 -p1
+%patch30646 -p1
 # orinoco: reduce differences between PCI drivers, create orinoco_pci.h
-%patch30649 -p1
+%patch30647 -p1
 # orinoco: further comment cleanup in the PCI drivers
-%patch30650 -p1
+%patch30648 -p1
 # orinoco: bump version to 0.15
-%patch30651 -p1
+%patch30649 -p1
 # ieee80211: Fix TKIP MIC calculation for QoS frames
-%patch30652 -p1
+%patch30650 -p1
 # ieee80211: Fix TX code doesn't enable QoS when using WPA + QoS
-%patch30653 -p1
+%patch30651 -p1
 # ieee80211: export list of bit rates with standard WEXT procddures
-%patch30654 -p1
+%patch30652 -p1
 # ieee80211: replace debug IEEE80211_WARNING with each own debug macro
-%patch30655 -p1
+%patch30653 -p1
 # ieee80211: update version stamp to 1.1.13
-%patch30656 -p1
+%patch30654 -p1
 # ipw2200: Exponential averaging for signal and noise Level
-%patch30657 -p1
+%patch30655 -p1
 # ipw2200: Fix TX QoS enabled frames problem
-%patch30658 -p1
+%patch30656 -p1
 # ipw2200: generates a scan event after a scan has completed
-%patch30659 -p1
+%patch30657 -p1
 # ipw2200: fix compile warning when !CONFIG_IPW2200_DEBUG
-%patch30660 -p1
+%patch30658 -p1
 # ipw2200: Do not continue loading the firmware if kmalloc fails
-%patch30661 -p1
+%patch30659 -p1
 # ipw2200: turn off signal debug log
-%patch30662 -p1
+%patch30660 -p1
 # ipw2200: version string rework
-%patch30663 -p1
+%patch30661 -p1
 # ipw2200: update version stamp to 1.1.2
-%patch30664 -p1
+%patch30662 -p1
 # ipw2200: Fix wpa_supplicant association problem
-%patch30665 -p1
+%patch30663 -p1
 # softmac: add SIOCSIWMLME
-%patch30666 -p1
+%patch30664 -p1
 # patch prism54usb: add set_bssid_filter
-%patch30667 -p1
+%patch30665 -p1
 # add adm8211 wireless driver
-%patch30668 -p1
+%patch30666 -p1
 # [NETFILTER]: nf_conntrack: Fix module refcount dropping too far
-%patch30669 -p1
+%patch30667 -p1
 # [NETFILTER]: ULOG target is not obsolete
-%patch30670 -p1
+%patch30668 -p1
 # [NETFILTER]: nf_conntrack: kill unused callback init_conntrack
-%patch30671 -p1
+%patch30669 -p1
 # [NETFILTER]: ip6_tables: remove broken comefrom debugging
-%patch30672 -p1
+%patch30670 -p1
 # [NETFILTER]: x_tables: move table->lock initialization
-%patch30673 -p1
+%patch30671 -p1
 # [NETFILTER]: ipt action: use xt_check_target for basic verification
-%patch30674 -p1
+%patch30672 -p1
 # tiacx: enable build for ia64
-%patch30675 -p1
+%patch30673 -p1
 
 # END OF PATCH APPLICATIONS
 
@@ -4180,10 +4174,8 @@
 - bcm43xx: fix DMA TX skb freeing in case of fragmented packets.
 - bcm43xx: Set both, the DMAmask and the coherent DMAmask.
 - bcm43xx: Remove the mmio access printing facility overhead.
-- bcm43xx: fix some stuff, add a few missing mmiowb(), remove dead code.
 - bcm43xx: receive TX status on MMIO or DMA unconditionally regarding the 80211 core rev.
 - bcm43xx: add functions bcm43xx_dma_read/write, bcm43xx_dma_tx_suspend/resume.
-- bcm43xx: Remove the workaround in dummy_transmission,
 - bcm43xx: Do boardflags workarounds for specific boards.
 - bcm43xx: properly mask txctl1 before writing it to hardware.
 - bcm43xx: fix some gpio register trashing (hopefully :D)


--- 3102-bcm43xx-fix-some-stuff-add-a-few-missing-mmiowb-remove-dead-code.txt DELETED ---


--- 3107-bcm43xx-Remove-the-workaround-in-dummy_transmission.txt DELETED ---


--- XXXX-tiacx-ia64-enable.txt DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 26 16:58:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 12:58:43 -0400
Subject: rpms/kernel/FC-5 XXXX-tiacx-ia64-enable.txt,1.1.4.2,1.1.4.3
Message-ID: <200604261658.k3QGwhU8028944@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv28931

Added Files:
      Tag: private-linville-netdev-fc5-2-branch
	XXXX-tiacx-ia64-enable.txt 
Log Message:



Index: XXXX-tiacx-ia64-enable.txt
===================================================================
RCS file: XXXX-tiacx-ia64-enable.txt
diff -N XXXX-tiacx-ia64-enable.txt
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ XXXX-tiacx-ia64-enable.txt	26 Apr 2006 16:58:41 -0000	1.1.4.3
@@ -0,0 +1,28 @@
+--- linux-2.6.16.noarch/drivers/net/wireless/tiacx/wlan_compat.h.orig	2006-03-29 08:27:14.000000000 -0500
++++ linux-2.6.16.noarch/drivers/net/wireless/tiacx/wlan_compat.h	2006-03-29 08:30:24.000000000 -0500
+@@ -52,6 +52,7 @@
+ #define WLAN_SPARC			8
+ #define WLAN_SH				9
+ #define WLAN_x86_64			10
++#define WLAN_ITANIUM			11
+ /* WLAN_CPU_CORE */
+ #define WLAN_I386CORE			1
+ #define WLAN_PPCCORE			2
+@@ -81,6 +82,7 @@
+ #define WLAN_ALPHAARCH			7
+ #define WLAN_MIPSARCH			9
+ #define WLAN_HPPAARCH			10
++#define WLAN_ITANIUMARCH		11
+ /* WLAN_HOSTIF (generally set on the command line, not detected) */
+ #define WLAN_PCMCIA			1
+ #define WLAN_ISA			2
+@@ -158,6 +160,9 @@
+  #ifndef __LITTLE_ENDIAN__
+   #define __LITTLE_ENDIAN__
+  #endif
++#elif defined(__ia64__)
++ #define WLAN_CPU_FAMILY	WLAN_ITANIUM
++ #define WLAN_SYSARCH		WLAN_ITANIUMARCH
+ #else
+  #error "No CPU identified!"
+ #endif



From fedora-cvs-commits at redhat.com  Wed Apr 26 17:05:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 13:05:32 -0400
Subject: rpms/cups/devel sources,1.19,1.20
Message-ID: <200604261705.k3QH5Wpa029189@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29176

Modified Files:
	sources 
Log Message:
No longer need rc2 source.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	24 Apr 2006 16:49:05 -0000	1.19
+++ sources	26 Apr 2006 17:05:16 -0000	1.20
@@ -1,3 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-a16f213bfa43e85c6076d6e0d9f6db3e  cups-1.2rc2-source.tar.bz2
 730b77b994d1be29e5bf1f884424e9ae  cups-1.2rc3-source.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 26 17:17:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 13:17:10 -0400
Subject: rpms/cups/devel cups-CAN-2005-0064.patch,1.2,1.3
Message-ID: <200604261717.k3QHHAbh009877@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9817

Modified Files:
	cups-CAN-2005-0064.patch 
Log Message:
Fix patch.

cups-CAN-2005-0064.patch:
 Decrypt.cxx |    5 +++++
 1 files changed, 5 insertions(+)

Index: cups-CAN-2005-0064.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-CAN-2005-0064.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cups-CAN-2005-0064.patch	17 Mar 2006 12:10:57 -0000	1.2
+++ cups-CAN-2005-0064.patch	26 Apr 2006 17:17:03 -0000	1.3
@@ -1,12 +1,6 @@
---- cups-1.2svn-r4929/pdftops/Decrypt.cxx.CAN-2005-0064	2005-09-17 15:52:15.000000000 +0100
-+++ cups-1.2svn-r4929/pdftops/Decrypt.cxx	2006-01-20 14:31:21.000000000 +0000
-@@ -135,11 +135,16 @@
-   Guchar *buf;
-   Guchar test[32];
-   Guchar fState[256];
--  Guchar tmpKey[16];
-+  Guchar *tmpKey;
-   Guchar fx, fy;
+--- cups-1.2rc3/pdftops/Decrypt.cxx.CAN-2005-0064	2005-09-17 15:52:15.000000000 +0100
++++ cups-1.2rc3/pdftops/Decrypt.cxx	2006-04-26 18:14:58.000000000 +0100
+@@ -140,6 +140,11 @@
    int len, i, j;
    GBool ok;
  
@@ -18,11 +12,3 @@
    // generate file key
    buf = (Guchar *)gmalloc(72 + fileID->getLength());
    if (userPassword) {
-@@ -201,6 +206,7 @@
-     ok = gFalse;
-   }
- 
-+  gfree(tmpKey);
-   gfree(buf);
-   return ok;
- }



From fedora-cvs-commits at redhat.com  Wed Apr 26 17:18:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 13:18:08 -0400
Subject: rpms/cups/FC-5 cups-CAN-2005-0064.patch, 1.2, 1.3 cups.spec, 1.166,
	1.167
Message-ID: <200604261718.k3QHI8xR012896@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv12399

Modified Files:
	cups-CAN-2005-0064.patch cups.spec 
Log Message:
- Fix CAN-2005-0064 patch.

cups-CAN-2005-0064.patch:
 Decrypt.cxx |    5 +++++
 1 files changed, 5 insertions(+)

Index: cups-CAN-2005-0064.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-CAN-2005-0064.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cups-CAN-2005-0064.patch	30 Mar 2006 15:15:35 -0000	1.2
+++ cups-CAN-2005-0064.patch	26 Apr 2006 17:18:05 -0000	1.3
@@ -1,12 +1,6 @@
---- cups-1.2svn-r4929/pdftops/Decrypt.cxx.CAN-2005-0064	2005-09-17 15:52:15.000000000 +0100
-+++ cups-1.2svn-r4929/pdftops/Decrypt.cxx	2006-01-20 14:31:21.000000000 +0000
-@@ -135,11 +135,16 @@
-   Guchar *buf;
-   Guchar test[32];
-   Guchar fState[256];
--  Guchar tmpKey[16];
-+  Guchar *tmpKey;
-   Guchar fx, fy;
+--- cups-1.2rc3/pdftops/Decrypt.cxx.CAN-2005-0064	2005-09-17 15:52:15.000000000 +0100
++++ cups-1.2rc3/pdftops/Decrypt.cxx	2006-04-26 18:14:58.000000000 +0100
+@@ -140,6 +140,11 @@
    int len, i, j;
    GBool ok;
  
@@ -18,11 +12,3 @@
    // generate file key
    buf = (Guchar *)gmalloc(72 + fileID->getLength());
    if (userPassword) {
-@@ -201,6 +206,7 @@
-     ok = gFalse;
-   }
- 
-+  gfree(tmpKey);
-   gfree(buf);
-   return ok;
- }


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- cups.spec	25 Apr 2006 22:32:28 -0000	1.166
+++ cups.spec	26 Apr 2006 17:18:05 -0000	1.167
@@ -394,11 +394,12 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com>
+* Wed Apr 26 2006 Tim Waugh <twaugh at redhat.com>
 - Own /var/run/cups (bug #189561).
 - Patch pdftops to understand 'includeifexists', and use that in the
   pdftops.conf file (bug #189809).
 - Sync from svn5460 to svn5462.
+- Fix CAN-2005-0064 patch.
 
 * Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.4.1.rc3.1
 - 1.2rc3.



From fedora-cvs-commits at redhat.com  Wed Apr 26 17:22:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 13:22:10 -0400
Subject: rpms/fontconfig/devel fontconfig-2.3.95-defaultconfig.patch, NONE,
	1.1 fontconfig.spec, 1.73,
	1.74 fontconfig-2.3.93-defaultconfig.patch, 1.6, NONE
Message-ID: <200604261722.k3QHMA4Z023461@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/fontconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23416

Modified Files:
	fontconfig.spec 
Added Files:
	fontconfig-2.3.95-defaultconfig.patch 
Removed Files:
	fontconfig-2.3.93-defaultconfig.patch 
Log Message:
2.3.95


fontconfig-2.3.95-defaultconfig.patch:
 fonts.conf.in |  102 +++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 77 insertions(+), 25 deletions(-)

--- NEW FILE fontconfig-2.3.95-defaultconfig.patch ---
--- 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
@@ -80,6 +80,8 @@
 		<family>Nimbus Roman No9 L</family>
 		<family>Luxi Serif</family>
 		<family>Kochi Mincho</family>
+                <family>Sazanami Mincho</family>>
+                <family>AR PL ZenKai Uni</family>
 		<family>AR PL SungtiL GB</family>
 		<family>AR PL Mingti2L Big5</family>
 		<family>?????? ??????</family>
@@ -100,7 +102,9 @@
 		<family>Albany AMT</family>
 		<family>Nimbus Sans L</family>
 		<family>Luxi Sans</family>
+                <family>Sazanami Gothic</family>
 		<family>Kochi Gothic</family>
+                <family>AR PL ShanHeiSun Uni</family
 		<family>AR PL KaitiM GB</family>
 		<family>AR PL KaitiM Big5</family>
 		<family>?????? ????????????</family>
@@ -138,7 +142,7 @@
 		<test qual="all" name="family" compare="not_eq">
 			<string>monospace</string>
 		</test>
-		<edit name="family" mode="append_last">
+		<edit name="family" mode="append_last"> 
 			<string>sans-serif</string>
 		</edit>
 	</match>
@@ -156,11 +160,19 @@
         </alias>
         <alias>
 	  <family>Courier</family>
-	  <accept><family>Nimbus Mono L</family></accept>
+	  <accept>
+	    <family>Cumberland AMT</family>
+	    <family>Courier New</family>
+            <family>Nimbus Mono L</family>
+        </accept>
 	</alias>
         <alias>
 	  <family>Helvetica</family>
-	  <accept><family>Nimbus Sans L</family></accept>
+	  <accept>
+            <family>Nimbus Sans L</family>
+	    <family>Albany AMT</family>
+	    <family>Arial</family>
+          </accept>
 	</alias>
         <alias>
           <family>New Century Schoolbook</family>
@@ -172,7 +184,11 @@
         </alias>
         <alias>
 	  <family>Times</family>
-	  <accept><family>Nimbus Roman No9 L</family></accept>
+	  <accept>
+            <family>Nimbus Roman No9 L</family>
+            <family>Thorndale AMT</family>
+	    <family>Times New Roman</family>
+          </accept>
 	</alias>
         <alias>
 	  <family>Zapf Chancery</family>
@@ -182,6 +198,10 @@
 	  <family>Zapf Dingbats</family>
 	  <accept><family>Dingbats</family></accept>
 	</alias>
+	<alias>
+	  <family>ZapfDingbats</family>
+	  <accept><family>Dingbats</family></accept>
+	</alias>
 	<match target="pattern">
 	  <test name="family">
 	    <string>Symbol</string>
@@ -196,11 +216,18 @@
  -->
  	<alias>
 		<family>Times New Roman</family>
-		<accept><family>Thorndale AMT</family></accept>
+		<accept>
+                        <family>Thorndale AMT</family>
+                        <family>Nimbus Roman No9 L</family>
+                </accept>
 	</alias>
  	<alias>
 		<family>Arial</family>
-		<accept><family>Albany AMT</family></accept>
+		<accept>
+                        <family>Albany AMT</family>
+			<family>Nimbus Sans L</family>
+			<family>Arial</family>
+                </accept>
 	</alias>
  	<alias>
 		<family>Courier New</family>
@@ -293,17 +320,25 @@
 	<alias>
 		<family>serif</family>
 		<prefer>
-			<family>DejaVu Serif</family>
+                        <family>Nimbus Roman No9 L</family>
+			<family>Thorndale AMT</family>
 			<family>Bitstream Vera Serif</family>
 			<family>Times New Roman</family>
-			<family>Thorndale AMT</family>
 			<family>Luxi Serif</family>
-			<family>Nimbus Roman No9 L</family>
 			<family>Times</family>
-			<family>Frank Ruehl</family>
+			<family>KacstQura</family>
+			<family>Frank Ruehl CLM</family>
+                        <family>Lohit Bengali</family>
+			<family>Lohit Gujarati</family>
+			<family>Lohit Hindi</family>
+			<family>Lohit Punjabi</family>
+			<family>Lohit Tamil</family>
+			<family>Sazanami Mincho</family>
+			<family>Kochi Mincho</family>
+			<family>ZYSong18030</family>
 			<family>MgOpen Canonica</family>
 			<family>FreeSerif</family>
-			<family>Kochi Mincho</family>
+			<family>AR PL Zenkai Uni</family>
 			<family>AR PL SungtiL GB</family>
 			<family>AR PL Mingti2L Big5</family>
 			<family>?????? ??????</family>
@@ -313,41 +348,58 @@
 	<alias>
 		<family>sans-serif</family>
 		<prefer>
-			<family>DejaVu Sans</family>
+			<family>Luxi Sans</family>
+			<family>Albany AMT</family>
 			<family>Bitstream Vera Sans</family>
 			<family>Verdana</family>
 			<family>Arial</family>
-			<family>Albany AMT</family>
-			<family>Luxi Sans</family>
 			<family>Nimbus Sans L</family>
 			<family>Helvetica</family>
+			<family>KacstQura</family>
 			<family>Nachlieli</family>
-			<family>MgOpen Modata</family>
-			<family>FreeSans</family>
+                        <family>Lohit Bengali</family>
+			<family>Lohit Gujarati</family>
+			<family>Lohit Hindi</family>
+			<family>Lohit Punjabi</family>
+			<family>Lohit Tamil</family>
+			<family>Sazanami Gothic</family>
 			<family>Kochi Gothic</family>
-			<family>AR PL KaitiM GB</family>
-			<family>AR PL KaitiM Big5</family>
 			<family>?????? ????????????</family>
-			<family>Baekmuk Dotum</family>
+			<family>MgOpen Modata</family>
+			<family>FreeSans</family>
+                        <family>ZYSong18030</family>
+			<family>AR PL ShanHeiSun Uni</family>
+			<family>AR PL SungtiL GB</family>
+			<family>AR PL Mingti2L Big5</family>
+			<family>Baekmuk Gulim</family>
 			<family>SimSun</family>
 		</prefer>
 	</alias>
 	<alias>
 		<family>monospace</family>
 		<prefer>
-			<family>DejaVu Sans Mono</family>
+			<family>Luxi Mono</family>
 			<family>Bitstream Vera Sans Mono</family>
 			<family>Andale Mono</family>
 			<family>Courier New</family>
 			<family>Cumberland AMT</family>
-			<family>Luxi Mono</family>
+                        <family>KacstQura</family>
+                        <family>Miriam Mono CLM</family>
+                        <family>Lohit Bengali</family>
+                        <family>Lohit Gujarati</family>
+                        <family>Lohit Hindi</family>
+                        <family>Lohit Punjabi</family>
+			<family>Lohit Tamil</family>
 			<family>Nimbus Mono L</family>
 			<family>Courier</family>
-			<family>Miriam Mono</family>
+                        <family>Sazanami Gothic</family>
+                        <family>Kochi Gothic</family>
+                        <family>ZYSong18030</family>
+			<family>AR PL ShanHeiSun Uni</family>
+                        <family>AR PL SungtiL GB</family>
+                        <family>AR PL Mingti2L Big5</family>
+                        <family>Baekmuk Gulim</family>
 			<family>FreeMono</family>
-			<family>Kochi Gothic</family>
-			<family>AR PL KaitiM GB</family>
-			<family>Baekmuk Dotum</family>
 		</prefer>
 	</alias>
 


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- fontconfig.spec	26 Apr 2006 16:41:41 -0000	1.73
+++ fontconfig.spec	26 Apr 2006 17:22:08 -0000	1.74
@@ -12,7 +12,7 @@
 Source1: 40-blacklist-fonts.conf
 Source2: 50-no-hint-fonts.conf
 
-Patch1: fontconfig-2.3.93-defaultconfig.patch
+Patch1: fontconfig-2.3.95-defaultconfig.patch
 Patch2: fontconfig-2.3.93.cvs20060211-move-user-cache.patch
 
 BuildRequires: freetype-devel >= %{freetype_version}


--- fontconfig-2.3.93-defaultconfig.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 26 17:46:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 13:46:44 -0400
Subject: rpms/openoffice.org/FC-5 openoffice.org.spec,1.653,1.654
Message-ID: <200604261746.k3QHki1H029876@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv29473

Modified Files:
	openoffice.org.spec 
Log Message:
damn patch backup in rpms


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.653
retrieving revision 1.654
diff -u -r1.653 -r1.654
--- openoffice.org.spec	26 Apr 2006 08:36:04 -0000	1.653
+++ openoffice.org.spec	26 Apr 2006 17:46:35 -0000	1.654
@@ -808,7 +808,7 @@
 %patch34 -p1 -b .ooo62030.solenv._version.patch
 %patch35 -p1 -b .oooXXXXX.config_office.noppds.patch
 %patch36 -p1 -b .ooo63155.sfx2.badscript.patch
-%patch37 -p1 -b .rh188467.printingdefaults.patch
+%patch37 -p1 .rh188467.printingdefaults.patch
 %patch38 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
 %patch39 -p1 -b .ooo64743.vcl.adjustonlevel1.patch
 
@@ -3251,7 +3251,7 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Wed Apr 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.8
+* Wed Apr 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.9
 - rh#187939# mispatch between gnomeprint vs OOo printer detect
 - rh#188467# set better printing defaults
 - rh#189061# honour fontconfig autohint/hinting settings



From fedora-cvs-commits at redhat.com  Wed Apr 26 17:47:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 13:47:11 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.674,1.675
Message-ID: <200604261747.k3QHlBGa030879@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30613

Modified Files:
	openoffice.org.spec 
Log Message:
damn patch backup in rpms


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.674
retrieving revision 1.675
diff -u -r1.674 -r1.675
--- openoffice.org.spec	25 Apr 2006 15:43:00 -0000	1.674
+++ openoffice.org.spec	26 Apr 2006 17:47:06 -0000	1.675
@@ -259,6 +259,7 @@
 %if ! %{build_rhel4}
 Requires: bitstream-vera-fonts
 %endif
+Requires: urw-fonts
 # Ensure we have 32-bit theme libs in 64-bit multilib environments.
 # We need at least 32-bit redhat-artwork and 32-bit gtk2-engines, but
 # rpm doesn't "do the right thing" if only the packages are Required.
@@ -901,7 +902,6 @@
 Summary: Russian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: urw-fonts
 %if %{obsoleteold}
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-ru
@@ -1151,7 +1151,7 @@
 tar xzf %{SOURCE13} Archive-Zip-1.13/lib
 cd ../..
 %endif
-%patch40 -p1 -b .rh188467.printingdefaults.patch
+%patch40 -p1 .rh188467.printingdefaults.patch
 %patch41 -p1 -b .ooo64463.extensions.noxaw.patch
 %patch42 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
 %patch43 -p1 -b .ooo64743.vcl.adjustonlevel1.patch



From fedora-cvs-commits at redhat.com  Wed Apr 26 17:51:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 13:51:36 -0400
Subject: rpms/openoffice.org/FC-5 openoffice.org.spec,1.654,1.655
Message-ID: <200604261751.k3QHpahF010997@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv10920

Modified Files:
	openoffice.org.spec 
Log Message:
same


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.654
retrieving revision 1.655
diff -u -r1.654 -r1.655
--- openoffice.org.spec	26 Apr 2006 17:46:35 -0000	1.654
+++ openoffice.org.spec	26 Apr 2006 17:51:32 -0000	1.655
@@ -1,6 +1,6 @@
 %define oootag OOB680
 %define ooomilestone 5
-%define rh_rpm_release 8
+%define rh_rpm_release 9
 
 %define build_fc5 1
 
@@ -3252,6 +3252,9 @@
 
 %changelog
 * Wed Apr 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.9
+- avoid the patch backup in final rpms
+
+* Wed Apr 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.8
 - rh#187939# mispatch between gnomeprint vs OOo printer detect
 - rh#188467# set better printing defaults
 - rh#189061# honour fontconfig autohint/hinting settings



From fedora-cvs-commits at redhat.com  Wed Apr 26 18:23:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 14:23:27 -0400
Subject: rpms/libtiff/FC-5 tiff-3.6.1-color.patch, NONE,
	1.1 tiff-3.7.1-multiple.patch, NONE, 1.1 libtiff.spec, 1.36, 1.37
Message-ID: <200604261823.k3QINQ5g031194@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libtiff/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31143

Modified Files:
	libtiff.spec 
Added Files:
	tiff-3.6.1-color.patch tiff-3.7.1-multiple.patch 
Log Message:
fix vuln.


tiff-3.6.1-color.patch:
 tif_color.c |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE tiff-3.6.1-color.patch ---
Index: libtiff/tif_color.c
===================================================================
RCS file: /cvs/maptools/cvsroot/libtiff/libtiff/tif_color.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -a -u -r1.11 -r1.12
--- libtiff/tif_color.c	23 Nov 2005 22:20:56 -0000	1.11
+++ libtiff/tif_color.c	9 Feb 2006 15:42:20 -0000	1.12
@@ -92,6 +92,11 @@
 	Yg = TIFFmax(Yg, cielab->display.d_Y0G);
 	Yb = TIFFmax(Yb, cielab->display.d_Y0B);
 
+	/* Avoid overflow in case of wrong input values */
+	Yr = TIFFmin(Yr, cielab->display.d_YCR);
+	Yg = TIFFmin(Yg, cielab->display.d_YCG);
+	Yb = TIFFmin(Yb, cielab->display.d_YCB);
+
 	/* Turn luminosity to colour value. */
 	i = (int)((Yr - cielab->display.d_Y0R) / cielab->rstep);
 	i = TIFFmin(cielab->range, i);

tiff-3.7.1-multiple.patch:
 tif_dirread.c  |    9 ++++++++-
 tif_fax3.c     |   32 +++++++++++++++++++-------------
 tif_jpeg.c     |   22 +++++++++++++---------
 tif_lzw.c      |    2 ++
 tif_pixarlog.c |   39 ++++++++++++++++++++++-----------------
 tif_predict.c  |   27 ++++++++++++++++++++++++++-
 tif_predict.h  |    1 +
 tif_zip.c      |   26 ++++++++++++++++----------
 8 files changed, 107 insertions(+), 51 deletions(-)

--- NEW FILE tiff-3.7.1-multiple.patch ---
--- tiff-3.7.1/libtiff/tif_fax3.c.multiple	2004-12-20 14:29:27.000000000 -0500
+++ tiff-3.7.1/libtiff/tif_fax3.c	2006-04-26 14:10:24.000000000 -0400
@@ -1070,19 +1070,22 @@
 static void
 Fax3Cleanup(TIFF* tif)
 {
-	if (tif->tif_data) {
-		Fax3CodecState* sp = DecoderState(tif);
-
-		if (sp->runs)
-			_TIFFfree(sp->runs);
-		if (sp->refline)
-			_TIFFfree(sp->refline);
-
-		if (Fax3State(tif)->subaddress)
-			_TIFFfree(Fax3State(tif)->subaddress);
-		_TIFFfree(tif->tif_data);
-		tif->tif_data = NULL;
-	}
+	Fax3CodecState* sp = DecoderState(tif);
+	
+	assert(sp != 0);
+
+	tif->tif_tagmethods.vgetfield = sp->b.vgetparent;
+	tif->tif_tagmethods.vsetfield = sp->b.vsetparent;
+
+	if (sp->runs)
+		_TIFFfree(sp->runs);
+	if (sp->refline)
+		_TIFFfree(sp->refline);
+
+	if (Fax3State(tif)->subaddress)
+		_TIFFfree(Fax3State(tif)->subaddress);
+	_TIFFfree(tif->tif_data);
+	tif->tif_data = NULL;
 }
 
 #define	FIELD_BADFAXLINES	(FIELD_CODEC+0)
@@ -1131,6 +1134,9 @@
 {
 	Fax3BaseState* sp = Fax3State(tif);
 
+	assert(sp != 0);
+	assert(sp->vsetparent != 0);
+
 	switch (tag) {
 	case TIFFTAG_FAXMODE:
 		sp->mode = va_arg(ap, int);
--- tiff-3.7.1/libtiff/tif_dirread.c.multiple	2006-04-26 14:10:24.000000000 -0400
+++ tiff-3.7.1/libtiff/tif_dirread.c	2006-04-26 14:10:24.000000000 -0400
@@ -795,13 +795,20 @@
 	int w = TIFFDataWidth((TIFFDataType) dir->tdir_type);
 	tsize_t cc = dir->tdir_count * w;
 
+	/* Check for overflow. */
+	if (!dir->tdir_count || !w || cc / w != (tsize_t)dir->tdir_count)
+		goto bad;
+
 	if (!isMapped(tif)) {
 		if (!SeekOK(tif, dir->tdir_offset))
 			goto bad;
 		if (!ReadOK(tif, cp, cc))
 			goto bad;
 	} else {
-		if (dir->tdir_offset + cc > tif->tif_size)
+		/* Check for overflow. */
+		if ((tsize_t)dir->tdir_offset + cc < (tsize_t)dir->tdir_offset
+		    || (tsize_t)dir->tdir_offset + cc < cc
+		    || (tsize_t)dir->tdir_offset + cc > (tsize_t)tif->tif_size)
 			goto bad;
 		_TIFFmemcpy(cp, tif->tif_base + dir->tdir_offset, cc);
 	}
--- tiff-3.7.1/libtiff/tif_lzw.c.multiple	2004-10-02 09:52:29.000000000 -0400
+++ tiff-3.7.1/libtiff/tif_lzw.c	2006-04-26 14:11:42.000000000 -0400
@@ -1002,6 +1002,8 @@
 static void
 LZWCleanup(TIFF* tif)
 {
+        (void)TIFFPredictorCleanup(tif); 
+
 	if (tif->tif_data) {
 		if (DecoderState(tif)->dec_codetab)
 			_TIFFfree(DecoderState(tif)->dec_codetab);
--- tiff-3.7.1/libtiff/tif_jpeg.c.multiple	2004-12-01 13:26:39.000000000 -0500
+++ tiff-3.7.1/libtiff/tif_jpeg.c	2006-04-26 14:10:24.000000000 -0400
@@ -1351,15 +1351,19 @@
 static void
 JPEGCleanup(TIFF* tif)
 {
-	if (tif->tif_data) {
-		JPEGState *sp = JState(tif);
-                if( sp->cinfo_initialized )
-                    TIFFjpeg_destroy(sp);	/* release libjpeg resources */
-		if (sp->jpegtables)		/* tag value */
-			_TIFFfree(sp->jpegtables);
-		_TIFFfree(tif->tif_data);	/* release local state */
-		tif->tif_data = NULL;
-	}
+	JPEGState *sp = JState(tif);
+	
+	assert(sp != 0);
+
+	tif->tif_tagmethods.vgetfield = sp->vgetparent;
+	tif->tif_tagmethods.vsetfield = sp->vsetparent;
+
+	if( sp->cinfo_initialized )
+	    TIFFjpeg_destroy(sp);	/* release libjpeg resources */
+	if (sp->jpegtables)		/* tag value */
+		_TIFFfree(sp->jpegtables);
+	_TIFFfree(tif->tif_data);	/* release local state */
+	tif->tif_data = NULL;
 }
 
 static int
--- tiff-3.7.1/libtiff/tif_predict.c.multiple	2004-10-02 09:52:29.000000000 -0400
+++ tiff-3.7.1/libtiff/tif_predict.c	2006-04-26 14:12:19.000000000 -0400
@@ -9,7 +9,7 @@
  * that (i) the above copyright notices and this permission notice appear in
  * all copies of the software and related documentation, and (ii) the names of
  * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
+ * publicity relating t software without the specific, prior written
  * permission of Sam Leffler and Silicon Graphics.
  * 
  * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
@@ -386,6 +386,9 @@
 {
 	TIFFPredictorState *sp = PredictorState(tif);
 
+	assert(sp != NULL);
+	assert(sp->vsetparent != NULL);
+
 	switch (tag) {
 	case TIFFTAG_PREDICTOR:
 		sp->predictor = (uint16) va_arg(ap, int);
@@ -403,6 +406,9 @@
 {
 	TIFFPredictorState *sp = PredictorState(tif);
 
+	assert(sp != NULL);
+	assert(sp->vgetparent != NULL);
+
 	switch (tag) {
 	case TIFFTAG_PREDICTOR:
 		*va_arg(ap, uint16*) = sp->predictor;
@@ -436,6 +442,8 @@
 {
 	TIFFPredictorState* sp = PredictorState(tif);
 
+	assert(sp != 0);
+
 	/*
 	 * Merge codec-specific tag information and
 	 * override parent get/set field methods.
@@ -461,4 +469,21 @@
 	return (1);
 }
 
+ int
+ TIFFPredictorCleanup(TIFF* tif)
+ {
+  	TIFFPredictorState* sp = PredictorState(tif);
+  
+  	assert(sp != 0);
+  
+  	tif->tif_tagmethods.vgetfield = sp->vgetparent;
+  	tif->tif_tagmethods.vsetfield = sp->vsetparent;
+  	tif->tif_tagmethods.printdir = sp->printdir;
+  	tif->tif_setupdecode = sp->setupdecode;
+  	tif->tif_setupencode = sp->setupencode;
+  
+  	return 1;
+  }
+  
+
 /* vim: set ts=8 sts=8 sw=8 noet: */
--- tiff-3.7.1/libtiff/tif_zip.c.multiple	2004-10-02 09:52:29.000000000 -0400
+++ tiff-3.7.1/libtiff/tif_zip.c	2006-04-26 14:10:24.000000000 -0400
@@ -249,17 +249,23 @@
 ZIPCleanup(TIFF* tif)
 {
 	ZIPState* sp = ZState(tif);
-	if (sp) {
-		if (sp->state&ZSTATE_INIT) {
-			/* NB: avoid problems in the library */
-			if (tif->tif_mode == O_RDONLY)
-				inflateEnd(&sp->stream);
-			else
-				deflateEnd(&sp->stream);
-		}
-		_TIFFfree(sp);
-		tif->tif_data = NULL;
+
+	assert(sp != 0);
+
+	(void)TIFFPredictorCleanup(tif);
+
+	tif->tif_tagmethods.vgetfield = sp->vgetparent;
+	tif->tif_tagmethods.vsetfield = sp->vsetparent;
+
+	if (sp->state&ZSTATE_INIT) {
+		/* NB: avoid problems in the library */
+		if (tif->tif_mode == O_RDONLY)
+			inflateEnd(&sp->stream);
+		else
+			deflateEnd(&sp->stream);
 	}
+	_TIFFfree(sp);
+	tif->tif_data = NULL;
 }
 
 static int
--- tiff-3.7.1/libtiff/tif_pixarlog.c.multiple	2004-10-14 13:53:27.000000000 -0400
+++ tiff-3.7.1/libtiff/tif_pixarlog.c	2006-04-26 14:10:24.000000000 -0400
@@ -1160,24 +1160,29 @@
 {
 	PixarLogState* sp = (PixarLogState*) tif->tif_data;
 
-	if (sp) {
-		if (sp->FromLT2) _TIFFfree(sp->FromLT2);
-		if (sp->From14) _TIFFfree(sp->From14);
-		if (sp->From8) _TIFFfree(sp->From8);
-		if (sp->ToLinearF) _TIFFfree(sp->ToLinearF);
-		if (sp->ToLinear16) _TIFFfree(sp->ToLinear16);
-		if (sp->ToLinear8) _TIFFfree(sp->ToLinear8);
-		if (sp->state&PLSTATE_INIT) {
-			if (tif->tif_mode == O_RDONLY)
-				inflateEnd(&sp->stream);
-			else
-				deflateEnd(&sp->stream);
-		}
-		if (sp->tbuf)
-			_TIFFfree(sp->tbuf);
-		_TIFFfree(sp);
-		tif->tif_data = NULL;
+	assert(sp != 0);
+
+	(void)TIFFPredictorCleanup(tif);
+
+	tif->tif_tagmethods.vgetfield = sp->vgetparent;
+	tif->tif_tagmethods.vsetfield = sp->vsetparent;
+
+	if (sp->FromLT2) _TIFFfree(sp->FromLT2);
+	if (sp->From14) _TIFFfree(sp->From14);
+	if (sp->From8) _TIFFfree(sp->From8);
+	if (sp->ToLinearF) _TIFFfree(sp->ToLinearF);
+	if (sp->ToLinear16) _TIFFfree(sp->ToLinear16);
+	if (sp->ToLinear8) _TIFFfree(sp->ToLinear8);
+	if (sp->state&PLSTATE_INIT) {
+		if (tif->tif_mode == O_RDONLY)
+			inflateEnd(&sp->stream);
+		else
+			deflateEnd(&sp->stream);
 	}
+	if (sp->tbuf)
+		_TIFFfree(sp->tbuf);
+	_TIFFfree(sp);
+	tif->tif_data = NULL;
 }
 
 static int
--- tiff-3.7.1/libtiff/tif_predict.h.multiple	1999-07-27 17:50:27.000000000 -0400
+++ tiff-3.7.1/libtiff/tif_predict.h	2006-04-26 14:10:24.000000000 -0400
@@ -55,6 +55,7 @@
 extern "C" {
 #endif
 extern	int TIFFPredictorInit(TIFF*);
+extern	int TIFFPredictorCleanup(TIFF*);
 #if defined(__cplusplus)
 }
 #endif


Index: libtiff.spec
===================================================================
RCS file: /cvs/dist/rpms/libtiff/FC-5/libtiff.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- libtiff.spec	11 Feb 2006 04:14:36 -0000	1.36
+++ libtiff.spec	26 Apr 2006 18:23:22 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: Library of functions for manipulating TIFF format image files
 Name: libtiff
 Version: 3.7.4
-Release: 3.2.1
+Release: 4
 License: distributable
 Group: System Environment/Libraries
 Source: ftp://ftp.remotesensing.org/pub/libtiff/tiff-%{version}.tar.gz
@@ -10,6 +10,9 @@
 BuildRequires: zlib-devel libjpeg-devel
 %define LIBVER %(echo %{version} | cut -f 1-2 -d .)
 
+Patch0: tiff-3.7.1-multiple.patch
+Patch1: tiff-3.6.1-color.patch
+
 %description
 The libtiff package contains a library of functions for manipulating
 TIFF (Tagged Image File Format) image format files.  TIFF is a widely
@@ -35,6 +38,8 @@
 
 %prep
 %setup -q -n tiff-%{version}
+%patch0 -p1 -b .multiple
+%patch1 -p0 -b .color
 
 %build
 %configure
@@ -74,6 +79,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 26 2006 Matthias Clasen <mclasen at redhat.com> - 3.7.4-4
+- fix several vulnerabilities (#189933, #189974, CVE-2006-2024)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.7.4-3.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Apr 26 18:14:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 14:14:17 -0400
Subject: rpms/libtiff/FC-4 tiff-3.6.1-color.patch, NONE,
	1.1 tiff-3.7.1-multiple.patch, NONE, 1.1 libtiff.spec, 1.29, 1.30
Message-ID: <200604261814.k3QIEH3L015703@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libtiff/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv15663

Modified Files:
	libtiff.spec 
Added Files:
	tiff-3.6.1-color.patch tiff-3.7.1-multiple.patch 
Log Message:
fix serveral vuln.


tiff-3.6.1-color.patch:
 tif_color.c |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE tiff-3.6.1-color.patch ---
Index: libtiff/tif_color.c
===================================================================
RCS file: /cvs/maptools/cvsroot/libtiff/libtiff/tif_color.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -a -u -r1.11 -r1.12
--- libtiff/tif_color.c	23 Nov 2005 22:20:56 -0000	1.11
+++ libtiff/tif_color.c	9 Feb 2006 15:42:20 -0000	1.12
@@ -92,6 +92,11 @@
 	Yg = TIFFmax(Yg, cielab->display.d_Y0G);
 	Yb = TIFFmax(Yb, cielab->display.d_Y0B);
 
+	/* Avoid overflow in case of wrong input values */
+	Yr = TIFFmin(Yr, cielab->display.d_YCR);
+	Yg = TIFFmin(Yg, cielab->display.d_YCG);
+	Yb = TIFFmin(Yb, cielab->display.d_YCB);
+
 	/* Turn luminosity to colour value. */
 	i = (int)((Yr - cielab->display.d_Y0R) / cielab->rstep);
 	i = TIFFmin(cielab->range, i);

tiff-3.7.1-multiple.patch:
 tif_dirread.c  |    9 ++++++++-
 tif_fax3.c     |   32 +++++++++++++++++++-------------
 tif_jpeg.c     |   22 +++++++++++++---------
 tif_lzw.c      |    2 ++
 tif_pixarlog.c |   39 ++++++++++++++++++++++-----------------
 tif_predict.c  |   27 ++++++++++++++++++++++++++-
 tif_predict.h  |    1 +
 tif_zip.c      |   26 ++++++++++++++++----------
 8 files changed, 107 insertions(+), 51 deletions(-)

--- NEW FILE tiff-3.7.1-multiple.patch ---
--- tiff-3.7.1/libtiff/tif_fax3.c.multiple	2004-12-20 14:29:27.000000000 -0500
+++ tiff-3.7.1/libtiff/tif_fax3.c	2006-04-26 14:10:24.000000000 -0400
@@ -1070,19 +1070,22 @@
 static void
 Fax3Cleanup(TIFF* tif)
 {
-	if (tif->tif_data) {
-		Fax3CodecState* sp = DecoderState(tif);
-
-		if (sp->runs)
-			_TIFFfree(sp->runs);
-		if (sp->refline)
-			_TIFFfree(sp->refline);
-
-		if (Fax3State(tif)->subaddress)
-			_TIFFfree(Fax3State(tif)->subaddress);
-		_TIFFfree(tif->tif_data);
-		tif->tif_data = NULL;
-	}
+	Fax3CodecState* sp = DecoderState(tif);
+	
+	assert(sp != 0);
+
+	tif->tif_tagmethods.vgetfield = sp->b.vgetparent;
+	tif->tif_tagmethods.vsetfield = sp->b.vsetparent;
+
+	if (sp->runs)
+		_TIFFfree(sp->runs);
+	if (sp->refline)
+		_TIFFfree(sp->refline);
+
+	if (Fax3State(tif)->subaddress)
+		_TIFFfree(Fax3State(tif)->subaddress);
+	_TIFFfree(tif->tif_data);
+	tif->tif_data = NULL;
 }
 
 #define	FIELD_BADFAXLINES	(FIELD_CODEC+0)
@@ -1131,6 +1134,9 @@
 {
 	Fax3BaseState* sp = Fax3State(tif);
 
+	assert(sp != 0);
+	assert(sp->vsetparent != 0);
+
 	switch (tag) {
 	case TIFFTAG_FAXMODE:
 		sp->mode = va_arg(ap, int);
--- tiff-3.7.1/libtiff/tif_dirread.c.multiple	2006-04-26 14:10:24.000000000 -0400
+++ tiff-3.7.1/libtiff/tif_dirread.c	2006-04-26 14:10:24.000000000 -0400
@@ -795,13 +795,20 @@
 	int w = TIFFDataWidth((TIFFDataType) dir->tdir_type);
 	tsize_t cc = dir->tdir_count * w;
 
+	/* Check for overflow. */
+	if (!dir->tdir_count || !w || cc / w != (tsize_t)dir->tdir_count)
+		goto bad;
+
 	if (!isMapped(tif)) {
 		if (!SeekOK(tif, dir->tdir_offset))
 			goto bad;
 		if (!ReadOK(tif, cp, cc))
 			goto bad;
 	} else {
-		if (dir->tdir_offset + cc > tif->tif_size)
+		/* Check for overflow. */
+		if ((tsize_t)dir->tdir_offset + cc < (tsize_t)dir->tdir_offset
+		    || (tsize_t)dir->tdir_offset + cc < cc
+		    || (tsize_t)dir->tdir_offset + cc > (tsize_t)tif->tif_size)
 			goto bad;
 		_TIFFmemcpy(cp, tif->tif_base + dir->tdir_offset, cc);
 	}
--- tiff-3.7.1/libtiff/tif_lzw.c.multiple	2004-10-02 09:52:29.000000000 -0400
+++ tiff-3.7.1/libtiff/tif_lzw.c	2006-04-26 14:11:42.000000000 -0400
@@ -1002,6 +1002,8 @@
 static void
 LZWCleanup(TIFF* tif)
 {
+        (void)TIFFPredictorCleanup(tif); 
+
 	if (tif->tif_data) {
 		if (DecoderState(tif)->dec_codetab)
 			_TIFFfree(DecoderState(tif)->dec_codetab);
--- tiff-3.7.1/libtiff/tif_jpeg.c.multiple	2004-12-01 13:26:39.000000000 -0500
+++ tiff-3.7.1/libtiff/tif_jpeg.c	2006-04-26 14:10:24.000000000 -0400
@@ -1351,15 +1351,19 @@
 static void
 JPEGCleanup(TIFF* tif)
 {
-	if (tif->tif_data) {
-		JPEGState *sp = JState(tif);
-                if( sp->cinfo_initialized )
-                    TIFFjpeg_destroy(sp);	/* release libjpeg resources */
-		if (sp->jpegtables)		/* tag value */
-			_TIFFfree(sp->jpegtables);
-		_TIFFfree(tif->tif_data);	/* release local state */
-		tif->tif_data = NULL;
-	}
+	JPEGState *sp = JState(tif);
+	
+	assert(sp != 0);
+
+	tif->tif_tagmethods.vgetfield = sp->vgetparent;
+	tif->tif_tagmethods.vsetfield = sp->vsetparent;
+
+	if( sp->cinfo_initialized )
+	    TIFFjpeg_destroy(sp);	/* release libjpeg resources */
+	if (sp->jpegtables)		/* tag value */
+		_TIFFfree(sp->jpegtables);
+	_TIFFfree(tif->tif_data);	/* release local state */
+	tif->tif_data = NULL;
 }
 
 static int
--- tiff-3.7.1/libtiff/tif_predict.c.multiple	2004-10-02 09:52:29.000000000 -0400
+++ tiff-3.7.1/libtiff/tif_predict.c	2006-04-26 14:12:19.000000000 -0400
@@ -9,7 +9,7 @@
  * that (i) the above copyright notices and this permission notice appear in
  * all copies of the software and related documentation, and (ii) the names of
  * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
+ * publicity relating t software without the specific, prior written
  * permission of Sam Leffler and Silicon Graphics.
  * 
  * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
@@ -386,6 +386,9 @@
 {
 	TIFFPredictorState *sp = PredictorState(tif);
 
+	assert(sp != NULL);
+	assert(sp->vsetparent != NULL);
+
 	switch (tag) {
 	case TIFFTAG_PREDICTOR:
 		sp->predictor = (uint16) va_arg(ap, int);
@@ -403,6 +406,9 @@
 {
 	TIFFPredictorState *sp = PredictorState(tif);
 
+	assert(sp != NULL);
+	assert(sp->vgetparent != NULL);
+
 	switch (tag) {
 	case TIFFTAG_PREDICTOR:
 		*va_arg(ap, uint16*) = sp->predictor;
@@ -436,6 +442,8 @@
 {
 	TIFFPredictorState* sp = PredictorState(tif);
 
+	assert(sp != 0);
+
 	/*
 	 * Merge codec-specific tag information and
 	 * override parent get/set field methods.
@@ -461,4 +469,21 @@
 	return (1);
 }
 
+ int
+ TIFFPredictorCleanup(TIFF* tif)
+ {
+  	TIFFPredictorState* sp = PredictorState(tif);
+  
+  	assert(sp != 0);
+  
+  	tif->tif_tagmethods.vgetfield = sp->vgetparent;
+  	tif->tif_tagmethods.vsetfield = sp->vsetparent;
+  	tif->tif_tagmethods.printdir = sp->printdir;
+  	tif->tif_setupdecode = sp->setupdecode;
+  	tif->tif_setupencode = sp->setupencode;
+  
+  	return 1;
+  }
+  
+
 /* vim: set ts=8 sts=8 sw=8 noet: */
--- tiff-3.7.1/libtiff/tif_zip.c.multiple	2004-10-02 09:52:29.000000000 -0400
+++ tiff-3.7.1/libtiff/tif_zip.c	2006-04-26 14:10:24.000000000 -0400
@@ -249,17 +249,23 @@
 ZIPCleanup(TIFF* tif)
 {
 	ZIPState* sp = ZState(tif);
-	if (sp) {
-		if (sp->state&ZSTATE_INIT) {
-			/* NB: avoid problems in the library */
-			if (tif->tif_mode == O_RDONLY)
-				inflateEnd(&sp->stream);
-			else
-				deflateEnd(&sp->stream);
-		}
-		_TIFFfree(sp);
-		tif->tif_data = NULL;
+
+	assert(sp != 0);
+
+	(void)TIFFPredictorCleanup(tif);
+
+	tif->tif_tagmethods.vgetfield = sp->vgetparent;
+	tif->tif_tagmethods.vsetfield = sp->vsetparent;
+
+	if (sp->state&ZSTATE_INIT) {
+		/* NB: avoid problems in the library */
+		if (tif->tif_mode == O_RDONLY)
+			inflateEnd(&sp->stream);
+		else
+			deflateEnd(&sp->stream);
 	}
+	_TIFFfree(sp);
+	tif->tif_data = NULL;
 }
 
 static int
--- tiff-3.7.1/libtiff/tif_pixarlog.c.multiple	2004-10-14 13:53:27.000000000 -0400
+++ tiff-3.7.1/libtiff/tif_pixarlog.c	2006-04-26 14:10:24.000000000 -0400
@@ -1160,24 +1160,29 @@
 {
 	PixarLogState* sp = (PixarLogState*) tif->tif_data;
 
-	if (sp) {
-		if (sp->FromLT2) _TIFFfree(sp->FromLT2);
-		if (sp->From14) _TIFFfree(sp->From14);
-		if (sp->From8) _TIFFfree(sp->From8);
-		if (sp->ToLinearF) _TIFFfree(sp->ToLinearF);
-		if (sp->ToLinear16) _TIFFfree(sp->ToLinear16);
-		if (sp->ToLinear8) _TIFFfree(sp->ToLinear8);
-		if (sp->state&PLSTATE_INIT) {
-			if (tif->tif_mode == O_RDONLY)
-				inflateEnd(&sp->stream);
-			else
-				deflateEnd(&sp->stream);
-		}
-		if (sp->tbuf)
-			_TIFFfree(sp->tbuf);
-		_TIFFfree(sp);
-		tif->tif_data = NULL;
+	assert(sp != 0);
+
+	(void)TIFFPredictorCleanup(tif);
+
+	tif->tif_tagmethods.vgetfield = sp->vgetparent;
+	tif->tif_tagmethods.vsetfield = sp->vsetparent;
+
+	if (sp->FromLT2) _TIFFfree(sp->FromLT2);
+	if (sp->From14) _TIFFfree(sp->From14);
+	if (sp->From8) _TIFFfree(sp->From8);
+	if (sp->ToLinearF) _TIFFfree(sp->ToLinearF);
+	if (sp->ToLinear16) _TIFFfree(sp->ToLinear16);
+	if (sp->ToLinear8) _TIFFfree(sp->ToLinear8);
+	if (sp->state&PLSTATE_INIT) {
+		if (tif->tif_mode == O_RDONLY)
+			inflateEnd(&sp->stream);
+		else
+			deflateEnd(&sp->stream);
 	}
+	if (sp->tbuf)
+		_TIFFfree(sp->tbuf);
+	_TIFFfree(sp);
+	tif->tif_data = NULL;
 }
 
 static int
--- tiff-3.7.1/libtiff/tif_predict.h.multiple	1999-07-27 17:50:27.000000000 -0400
+++ tiff-3.7.1/libtiff/tif_predict.h	2006-04-26 14:10:24.000000000 -0400
@@ -55,6 +55,7 @@
 extern "C" {
 #endif
 extern	int TIFFPredictorInit(TIFF*);
+extern	int TIFFPredictorCleanup(TIFF*);
 #if defined(__cplusplus)
 }
 #endif


Index: libtiff.spec
===================================================================
RCS file: /cvs/dist/rpms/libtiff/FC-4/libtiff.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- libtiff.spec	6 May 2005 14:48:39 -0000	1.29
+++ libtiff.spec	26 Apr 2006 18:14:14 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: A library of functions for manipulating TIFF format image files.
 Name: libtiff
 Version: 3.7.1
-Release: 6
+Release: 6.fc4.1
 License: distributable
 Group: System Environment/Libraries
 Source0: http://www.libtiff.org/tiff-%{version}.tar.gz
@@ -12,6 +12,8 @@
 Patch3: libtiff-3.7.1-mktemp.patch
 # http://bugzilla.remotesensing.org/show_bug.cgi?id=843, fixed in 3.7.3
 Patch4: libtiff-3.7.1-persample.patch
+Patch5: tiff-3.7.1-multiple.patch
+Patch6: tiff-3.6.1-color.patch
 URL: http://www.libtiff.org/
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: zlib-devel zlib libjpeg-devel libjpeg
@@ -49,6 +51,8 @@
 %patch2 -p1 -b .extrasamples
 %patch3 -p1 -b .mktemp
 %patch4 -p1 -b .persample
+%patch5 -p1 -b .multiple
+%patch6 -p0 -b .color
 
 %build
 
@@ -87,6 +91,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 26 2006 Matthias Clasen <mclasen at redhat.com> - 3.7.1-6.fc4.1
+- Fix multiple vulnerabilities (#189933, #189974, CVE-2006-2024)
+
 * Fri May  6 2005 Matthias Clasen <mclasen at redhat.com> - 3.7.1-6
 - Fix a stack overflow
 



From fedora-cvs-commits at redhat.com  Wed Apr 26 18:43:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 14:43:49 -0400
Subject: rpms/libtiff/devel .cvsignore, 1.7, 1.8 libtiff.spec, 1.36,
	1.37 sources, 1.7, 1.8
Message-ID: <200604261843.k3QIhn8E002595@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libtiff/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2557

Modified Files:
	.cvsignore libtiff.spec sources 
Log Message:
3.8.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libtiff/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	29 Sep 2005 19:20:27 -0000	1.7
+++ .cvsignore	26 Apr 2006 18:43:45 -0000	1.8
@@ -1,4 +1 @@
-tiff-v3.6.1.tar.gz
-tiff-3.7.1.tar.gz
-tiff-3.7.2.tar.gz
-tiff-3.7.4.tar.gz
+tiff-3.8.2.tar.gz


Index: libtiff.spec
===================================================================
RCS file: /cvs/dist/rpms/libtiff/devel/libtiff.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- libtiff.spec	11 Feb 2006 04:14:36 -0000	1.36
+++ libtiff.spec	26 Apr 2006 18:43:45 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: Library of functions for manipulating TIFF format image files
 Name: libtiff
-Version: 3.7.4
-Release: 3.2.1
+Version: 3.8.2
+Release: 1
 License: distributable
 Group: System Environment/Libraries
 Source: ftp://ftp.remotesensing.org/pub/libtiff/tiff-%{version}.tar.gz
@@ -74,6 +74,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 26 2006 Matthias Clasen <mclasen at redhat.com> - 3.8.2-1
+- Update to 3.8.2
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.7.4-3.2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libtiff/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	29 Sep 2005 19:20:27 -0000	1.7
+++ sources	26 Apr 2006 18:43:45 -0000	1.8
@@ -1 +1 @@
-f37a7907bca4e235da85eb0126caa2b0  tiff-3.7.4.tar.gz
+fbb6f446ea4ed18955e2714934e5b698  tiff-3.8.2.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 26 19:19:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 15:19:42 -0400
Subject: rpms/kernel/FC-4 kernel-2.6.spec, 1.1625.2.1, 1.1625.2.2
	3123-bcm43xx-don-t-set-the-channel-on-a-device-which-is-down.txt,
	1.1.2.1, NONE
Message-ID: <200604261919.k3QJJghH004718@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv4656

Modified Files:
      Tag: private-linville-netdev-fc4-14-branch
	kernel-2.6.spec 
Removed Files:
      Tag: private-linville-netdev-fc4-14-branch
	3123-bcm43xx-don-t-set-the-channel-on-a-device-which-is-down.txt 
Log Message:



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1625.2.1
retrieving revision 1.1625.2.2
diff -u -r1.1625.2.1 -r1.1625.2.2
--- kernel-2.6.spec	26 Apr 2006 16:56:30 -0000	1.1625.2.1
+++ kernel-2.6.spec	26 Apr 2006 19:19:37 -0000	1.1625.2.2
@@ -881,222 +881,221 @@
 Patch30513: 3117-bcm43xx-add-useless-and-broken-statistics-stuff.-People-seem-to-want-it.-well.txt
 Patch30514: 3118-bcm43xx-get-rid-of-vim-.-lines-at-the-end-of-several-files.txt
 Patch30515: 3119-bcm43xx-fix-include-issues-on-some-platforms.txt
-Patch30516: 3123-bcm43xx-don-t-set-the-channel-on-a-device-which-is-down.txt
-Patch30517: 3126-hostap-Make-hostap_tx_encrypt-static.txt
-Patch30518: 3165-knfsd-Change-the-store-of-auth_domains-to-not-be-a-cache.txt
-Patch30519: 3167-knfsd-Get-rid-of-inplace-sunrpc-caches.txt
-Patch30520: 3168-knfsd-Create-cache_lookup-function-instead-of-using-a-macro-to-declare-one.txt
-Patch30521: 3169-knfsd-Convert-ip_map-cache-to-use-the-new-lookup-routine.txt
-Patch30522: 3172-knfsd-Use-new-sunrpc-cache-for-rsi-cache.txt
-Patch30523: 3173-knfsd-Use-new-cache-code-for-rsc-cache.txt
-Patch30524: 3175-knfsd-An-assortment-of-little-fixes-to-the-sunrpc-cache-code.txt
-Patch30525: 3180-knfsd-Tidy-up-unix_domain_find.txt
-Patch30526: 3252-pnp-IRDA-adjust-pnp_register_driver-signature.txt
-Patch30527: 3328-Minor-janitorial-change-to-ieee80211.txt
-Patch30528: 3329-wireless-add-prism54usb-driver.txt
-Patch30529: 3330-prism54usb-fix-build-break-in-islusb_init.c.txt
-Patch30530: 3331-wireless-add-acx-driver.txt
-Patch30531: 3332-acxsm-merge-from-acx-0.3.32.txt
-Patch30532: 3333-tiacx-Let-only-ACX_PCI-ACX_USB-be-user-visible.txt
-Patch30533: 3334-softmac-prism54usb-update.txt
-Patch30534: 3335-tiacx-revert-neither-PCI-nor-USB-is-selected-change.txt
-Patch30535: 3336-tiacx-implement-much-more-flexible-firmware-statistics-parsing.txt
-Patch30536: 3337-tiacx-Change-acx_ioctl_-get-set-_encode-to-use-kernel-80211-stack.txt
-Patch30537: 3338-tiacx-fix-breakage-of-Get-rid-of-circular-list-of-adev-s.txt
-Patch30538: 3339-tiacx-split-module-into-acx-common-acx-pci-acx-usb.txt
-Patch30539: 3342-softmac-reduce-scan-dwell-time.txt
-Patch30540: 3343-softmac-reduce-default-rate-to-11Mbps.txt
-Patch30541: 3346-update-prism54usb-sources.txt
-Patch30542: 3464-TG3-Fix-probe-failure-due-to-invalid-MAC-address.txt
-Patch30543: 3465-TG3-Fix-bug-in-40-bit-DMA-workaround-code.txt
-Patch30544: 3466-TG3-Fix-PHY-loopback-on-5700.txt
-Patch30545: 3467-TG3-Speed-up-SRAM-access.txt
-Patch30546: 3468-TG3-Skip-timer-code-during-full-lock.txt
-Patch30547: 3469-TG3-Update-version-and-reldate.txt
-Patch30548: 3471-NET-Fix-ipx-econet-appletalk-irda-ioctl-crashes.txt
-Patch30549: 3472-ECONET-Convert-away-from-SOCKOPS_WRAPPED.txt
-Patch30550: 3473-NET-deinline-200-byte-inlines-in-sock.h.txt
-Patch30551: 3475-TCP-Fix-RFC2465-typo.txt
-Patch30552: 3476-NETFILTER-Rename-init-functions.txt
-Patch30553: 3534-DECNET-Fix-refcount.txt
-Patch30554: 3535-DCCP-Use-NULL-for-pointers-comfort-sparse.txt
-Patch30555: 3536-b44-fix-force-mac-address-before-ifconfig-up.txt
-Patch30556: 3538-axnet_cs.c-add-hardware-multicast-support.txt
-Patch30557: 3539-via-rhine-link-state-fix.txt
-Patch30558: 3540-spidernet-reduce-console-spam.txt
-Patch30559: 3541-acenic-fix-section-mismatches.txt
-Patch30560: 3542-bonding-support-carrier-state-for-master.txt
-Patch30561: 3543-spidernet-enable-tx-checksum-offloading-by-default.txt
-Patch30562: 3544-natsemi-Support-oversized-EEPROMs.txt
-Patch30563: 3545-net-remove-CONFIG_NET_CBUS-conditional-for-NS8390.txt
-Patch30564: 3546-Janitor-drivers-net-pcnet32-fix-incorrect-comments.txt
-Patch30565: 3547-b44-ensure-valid-mac-addr.txt
-Patch30566: 3548-ixp2000-fix-gcc4-breakage.txt
-Patch30567: 3549-NET-Deinline-some-larger-functions-from-netdevice.h.txt
-Patch30568: 3602-NET-add-SO_RCVBUF-comment.txt
-Patch30569: 3603-TCP-Kill-unused-extern-decl-for-tcp_v4_hash_connecting.txt
-Patch30570: 3627-pcmcia-default-suspend-and-resume-handling.txt
-Patch30571: 3629-pcmcia-remove-unneeded-Vcc-pseudo-setting.txt
-Patch30572: 3699-uml-kconfigs.txt
-Patch30573: 3726-3c59x-collision-statistics-fix-fix.txt
-Patch30574: 3727-3c59x-fix-networking-for-10base2-NICs.txt
-Patch30575: 3840-TG3-Revert-Speed-up-SRAM-access.txt
-Patch30576: 3841-TG3-Update-driver-version-and-reldate.txt
-Patch30577: 3842-NET-com90xx-kmalloc-fix.txt
-Patch30578: 3843-IPSEC-Kill-unused-decap-state-argument.txt
-Patch30579: 3846-NETFILTER-x_tables-unify-IPv4-IPv6-esp-match.txt
-Patch30580: 3847-NETFILTER-x_tables-unify-IPv4-IPv6-multiport-match.txt
-Patch30581: 3848-NETFILTER-fix-ifdef-for-connmark-support-in-nf_conntrack_netlink.txt
-Patch30582: 3865-smc91x-add-support-for-LogicPD-PXA270-platform.txt
-Patch30583: 3866-Goramo-PCI200SYN-WAN-driver-subsystem-ID-patch.txt
-Patch30584: 3947-BUG_ON-Conversion-in-drivers-net.txt
-Patch30585: 3999-kbuild-fix-unneeded-rebuilds-in-drivers-net-chelsio-after-moving-source-tree.txt
-Patch30586: 4072-IPSEC-Check-x-encap-before-dereferencing-it.txt
-Patch30587: 4076-NET-netconsole-set-.name-in-struct-console.txt
-Patch30588: 4077-NET-Fix-an-off-by-21-or-49-error.txt
-Patch30589: 4078-TG3-Fix-a-memory-leak.txt
-Patch30590: 4079-BLUETOOTH-sco-Possible-double-free.txt
-Patch30591: 4080-INET-Use-port-unreachable-instead-of-proto-for-tunnels.txt
-Patch30592: 4081-IRDA-smcinit-merged-into-smsc-ircc-driver.txt
-Patch30593: 4082-IRDA-Support-for-Sigmatel-STIR421x-chip.txt
-Patch30594: 4083-NETFILTER-Add-helper-functions-for-mass-hook-registration-unregistration.txt
-Patch30595: 4086-NETFILTER-H.323-helper-move-some-function-prototypes-to-ip_conntrack_h323.h.txt
-Patch30596: 4087-NETFILTER-H.323-helper-change-EXPORT_SYMBOL-to-EXPORT_SYMBOL_GPL.txt
-Patch30597: 4088-NETFILTER-H.323-helper-make-get_h245_addr-static.txt
-Patch30598: 4089-NETFILTER-H.323-helper-add-parameter-default_rrq_ttl.txt
-Patch30599: 4090-NETFILTER-Fix-IP_NF_CONNTRACK_NETLINK-dependency.txt
-Patch30600: 4091-NETFILTER-Introduce-infrastructure-for-address-family-specific-operations.txt
-Patch30601: 4092-NETFILTER-Add-address-family-specific-checksum-helpers.txt
-Patch30602: 4093-NETFILTER-Convert-conntrack-ipt_REJECT-to-new-checksumming-functions.txt
-Patch30603: 4094-NETFILTER-H.323-helper-remove-changelog.txt
-Patch30604: 4095-TG3-Kill-some-less-useful-flags.txt
-Patch30605: 4096-TG3-Speed-up-SRAM-access-2nd-version.txt
-Patch30606: 4097-PKT_SCHED-act_police-Rename-methods.txt
-Patch30607: 4098-NET-kzalloc-use-in-alloc_netdev.txt
-Patch30608: 4099-NET-More-kzalloc-conversions.txt
-Patch30609: 4100-NETFILTER-Fix-build-with-CONFIG_NETFILTER-y-m-on-IA64.txt
-Patch30610: 4102-NET-Fix-hotplug-race-during-device-registration.txt
-Patch30611: 4103-X25-Restore-skb-dev-setting-in-x25_type_trans.txt
-Patch30612: 4104-NETFILTER-Fix-DNAT-in-LOCAL_OUT.txt
-Patch30613: 4105-IPV4-ip_fragment-Always-compute-hash-with-ipfrag_lock-held.txt
-Patch30614: 4106-IPV6-Deinline-few-large-functions-in-inet6-code.txt
-Patch30615: 4323-knfsd-svcrpc-gss-don-t-call-svc_take_page-unnecessarily.txt
-Patch30616: 4351-IPv6-reassembly-Always-compute-hash-under-the-fragment-lock.txt
-Patch30617: 4352-BRIDGE-receive-link-local-on-disabled-ports.txt
-Patch30618: 4353-DCCP-Fix-leak-in-net-dccp-ipv4.c.txt
-Patch30619: 4354-BRIDGE-ebtables-fix-allocation-in-net-bridge-netfilter-ebtables.c.txt
-Patch30620: 4355-WAN-Remove-broken-and-unmaintained-Sangoma-drivers.txt
-Patch30621: 4372-dlink-pci-cards-using-wrong-driver.txt
-Patch30622: 4373-network-axnet_cs.c-add-missing-PRIV-in-ei_rx_overrun.txt
-Patch30623: 4374-via-rhine-execute-bounce-buffers-code-on-Rhine-I-only.txt
-Patch30624: 4375-b44-disable-default-tx-pause.txt
-Patch30625: 4376-b44-increase-version-to-1.00.txt
-Patch30626: 4377-netdrvr-b44-trim-trailing-whitespace.txt
-Patch30627: 4379-drivers-net-via-rhine.c-make-a-function-static.txt
-Patch30628: 4381-net-drivers-fix-section-attributes-for-gcc.txt
-Patch30629: 4382-mv643xx_eth-Always-free-completed-tx-descs-on-tx-interrupt.txt
-Patch30630: 4383-mv643xx_eth-Fix-tx_timeout-to-only-conditionally-wake-tx-queue.txt
-Patch30631: 4385-Use-pci_set_consistent_dma_mask-in-ixgb-driver.txt
-Patch30632: 4504-IPV4-Possible-cleanups.txt
-Patch30633: 4505-XFRM-Fix-aevent-timer.txt
-Patch30634: 4510-ATM-Clip-timer-race.txt
-Patch30635: 4511-ATM-clip-run-through-Lindent.txt
-Patch30636: 4512-ATM-clip-get-rid-of-PROC_FS-ifdef.txt
-Patch30637: 4513-ATM-clip-notifier-related-cleanups.txt
-Patch30638: 4514-ATM-clip-add-module-info.txt
-Patch30639: 4515-IRDA-irda-usb-unregister-netdev-when-patch-upload-fails.txt
-Patch30640: 4516-IRDA-smsc-ircc2-smcinit-support-for-ALi-ISA-bridges.txt
-Patch30641: 4517-ip_output-account-for-fraggap-when-checking-to-add-trailer_len.txt
-Patch30642: 4521-e1000-Remove-PM-warning-DPRINTKs-breaking-2.4.x-kernels.txt
-Patch30643: 4522-e1000-Esb2-wol-link-cycle-bug-and-uninitialized-registers.txt
-Patch30644: 4523-e1000-De-inline-functions-to-benefit-from-compiler-smartness.txt
-Patch30645: 4524-e1000-Made-an-adapter-struct-variable-into-a-local-txb2b.txt
-Patch30646: 4525-e1000-Update-truesize-with-the-length-of-the-packet-for-packet-split.txt
-Patch30647: 4526-e1000-Dead-variable-cleanup.txt
-Patch30648: 4528-e1000-implement-more-efficient-tx-queue-locking.txt
-Patch30649: 4529-e1000-Version-bump-contact-fix-year-string-change.txt
-Patch30650: 4554-e1000-fix-mispatch-for-media-type-detect.txt
-Patch30651: 4564-TCP-Fix-truesize-underflow.txt
-Patch30652: 4565-IPV6-Ensure-to-have-hop-by-hop-options-in-our-header-of-sk_buff.txt
-Patch30653: 4566-IPV6-XFRM-Don-t-use-old-copy-of-pointer-after-pskb_may_pull.txt
-Patch30654: 4567-IPV6-XFRM-Fix-decoding-session-with-preceding-extension-header-s.txt
-Patch30655: 4568-IPV6-Clean-up-hop-by-hop-options-handler.txt
-Patch30656: 4569-unaligned-access-in-sk_run_filter.txt
-Patch30657: 4671-RPCSEC_GSS-fix-leak-in-krb5-code-caused-by-superfluous-kmalloc.txt
-Patch30658: 4678-SUNRPC-Dead-code-in-net-sunrpc-auth_gss-auth_gss.c.txt
-Patch30659: 4684-softmac-uses-Wiress-Ext.txt
-Patch30660: 4686-wireless-atmel-send-WEXT-scan-completion-events.txt
-Patch30661: 4687-wext-Fix-IWENCODEEXT-security-permissions.txt
-Patch30662: 4689-softmac-fix-spinlock-recursion-on-reassoc.txt
-Patch30663: 4690-orinoco-fix-truncating-commsquality-RID-with-the-latest-Symbol-firmware.txt
-Patch30664: 4691-bcm43xx-set-trans_start-on-TX-to-prevent-bogus-timeouts.txt
-Patch30665: 4692-softmac-return-EAGAIN-from-getscan-while-scanning.txt
-Patch30666: 4693-softmac-dont-send-out-packets-while-scanning.txt
-Patch30667: 4694-softmac-handle-iw_mode-properly.txt
-Patch30668: 4695-softmac-fix-event-sending.txt
-Patch30669: 4696-softmac-report-when-scanning-has-finished.txt
-Patch30670: 4697-bcm43xx-wireless-fix-printk-format-warnings.txt
-Patch30671: 4698-bcm43xx-fix-config-menu-alignment.txt
-Patch30672: 4699-bcm43xx-fix-dyn-tssi2dbm-memleak.txt
-Patch30673: 4700-bcm43xx-fix-pctl-slowclock-limit-calculation.txt
-Patch30674: 4701-bcm43xx-sysfs-code-cleanup.txt
-Patch30675: 4702-bcm43xx-iw_priv_args-names-should-be-16-characters.txt
-Patch30676: 4703-wext-Fix-RtNetlink-ENCODE-security-permissions.txt
-Patch30677: 4706-LLC-Use-pskb_trim_rcsum-in-llc_fixup_skb.txt
-Patch30678: 4707-SUNGEM-Marvell-PHY-suspend.txt
-Patch30679: 4709-TCP-Account-skb-overhead-in-tcp_fragment.txt
-Patch30680: 4710-NET-Add-skb-truesize-assertion-checking.txt
-Patch30681: 4741-NEx000-fix-RTL8019AS-base-address-for-RBTX4938.txt
-Patch30682: 4742-Add-VLAN-802.1q-support-to-sis900-driver.txt
-Patch30683: 4744-au1000_eth.c-probe-code-straightened-up.txt
-Patch30684: 4747-netdrvr-Convert-cassini-to-pci_iomap.txt
-Patch30685: 4748-Fix-locking-in-gianfar.txt
-Patch30686: 4768-pcmcia-add-new-ID-to-pcnet_cs.txt
-Patch30687: 4808-Fix-crash-on-big-endian-systems-during-scan.txt
-Patch30688: 4809-softmac-fix-SIOCSIWAP.txt
-Patch30689: 4813-orinoco-remove-PCMCIA-audio-support-it-s-useless-for-wireless-cards.txt
-Patch30690: 4815-orinoco-remove-tracing-code-it-s-unused.txt
-Patch30691: 4816-orinoco-remove-debug-buffer-code-and-userspace-include-support.txt
-Patch30692: 4817-orinoco-Symbol-card-supported-by-spectrum_cs-is-LA4137-not-LA4100.txt
-Patch30693: 4818-orinoco-optimize-Tx-exception-handling-in-orinoco.txt
-Patch30694: 4819-orinoco-orinoco_xmit-should-only-return-valid-symbolic-constants.txt
-Patch30695: 4820-orinoco-replace-hermes_write_words-with-hermes_write_bytes.txt
-Patch30696: 4821-orinoco-don-t-use-any-padding-for-Tx-frames.txt
-Patch30697: 4822-orinoco-refactor-and-clean-up-Tx-error-handling.txt
-Patch30698: 4823-orinoco-simplify-802.3-encapsulation-code.txt
-Patch30699: 4824-orinoco-fix-BAP0-offset-error-after-several-days-of-operation.txt
-Patch30700: 4825-orinoco-delay-FID-allocation-after-firmware-initialization.txt
-Patch30701: 4826-orinoco_pci-disable-device-and-free-IRQ-when-suspending.txt
-Patch30702: 4827-orinoco_pci-use-pci_iomap-for-resources.txt
-Patch30703: 4828-orinoco-support-PCI-suspend-resume-for-Nortel-PLX-and-TMD-adaptors.txt
-Patch30704: 4829-orinoco-reduce-differences-between-PCI-drivers-create-orinoco_pci.h.txt
-Patch30705: 4830-orinoco-further-comment-cleanup-in-the-PCI-drivers.txt
-Patch30706: 4831-orinoco-bump-version-to-0.15.txt
-Patch30707: 4833-ieee80211-Fix-TKIP-MIC-calculation-for-QoS-frames.txt
-Patch30708: 4834-ieee80211-Fix-TX-code-doesn-t-enable-QoS-when-using-WPA-QoS.txt
-Patch30709: 4835-ieee80211-export-list-of-bit-rates-with-standard-WEXT-procddures.txt
-Patch30710: 4837-ieee80211-replace-debug-IEEE80211_WARNING-with-each-own-debug-macro.txt
-Patch30711: 4838-ieee80211-update-version-stamp-to-1.1.13.txt
-Patch30712: 4839-ipw2200-Exponential-averaging-for-signal-and-noise-Level.txt
-Patch30713: 4840-ipw2200-Fix-TX-QoS-enabled-frames-problem.txt
-Patch30714: 4841-ipw2200-generates-a-scan-event-after-a-scan-has-completed.txt
-Patch30715: 4843-ipw2200-fix-compile-warning-when-CONFIG_IPW2200_DEBUG.txt
-Patch30716: 4844-ipw2200-Do-not-continue-loading-the-firmware-if-kmalloc-fails.txt
-Patch30717: 4845-ipw2200-turn-off-signal-debug-log.txt
-Patch30718: 4850-ipw2200-version-string-rework.txt
-Patch30719: 4851-ipw2200-update-version-stamp-to-1.1.2.txt
-Patch30720: 4856-ipw2200-Fix-wpa_supplicant-association-problem.txt
-Patch30721: 4857-softmac-add-SIOCSIWMLME.txt
-Patch30722: 4858-softmac-clean-up-event-handling-code.txt
-Patch30723: 4861-patch-prism54usb-add-set_bssid_filter.txt
-Patch30724: 4862-add-adm8211-wireless-driver.txt
-Patch30725: 4863-NETFILTER-nf_conntrack-Fix-module-refcount-dropping-too-far.txt
-Patch30726: 4864-NETFILTER-ULOG-target-is-not-obsolete.txt
-Patch30727: 4866-NETFILTER-nf_conntrack-kill-unused-callback-init_conntrack.txt
-Patch30728: 4867-NETFILTER-ip6_tables-remove-broken-comefrom-debugging.txt
-Patch30729: 4868-NETFILTER-x_tables-move-table-lock-initialization.txt
-Patch30730: 4869-NETFILTER-ipt-action-use-xt_check_target-for-basic-verification.txt
-Patch30731: XXXX-tiacx-ia64-enable.txt
+Patch30516: 3126-hostap-Make-hostap_tx_encrypt-static.txt
+Patch30517: 3165-knfsd-Change-the-store-of-auth_domains-to-not-be-a-cache.txt
+Patch30518: 3167-knfsd-Get-rid-of-inplace-sunrpc-caches.txt
+Patch30519: 3168-knfsd-Create-cache_lookup-function-instead-of-using-a-macro-to-declare-one.txt
+Patch30520: 3169-knfsd-Convert-ip_map-cache-to-use-the-new-lookup-routine.txt
+Patch30521: 3172-knfsd-Use-new-sunrpc-cache-for-rsi-cache.txt
+Patch30522: 3173-knfsd-Use-new-cache-code-for-rsc-cache.txt
+Patch30523: 3175-knfsd-An-assortment-of-little-fixes-to-the-sunrpc-cache-code.txt
+Patch30524: 3180-knfsd-Tidy-up-unix_domain_find.txt
+Patch30525: 3252-pnp-IRDA-adjust-pnp_register_driver-signature.txt
+Patch30526: 3328-Minor-janitorial-change-to-ieee80211.txt
+Patch30527: 3329-wireless-add-prism54usb-driver.txt
+Patch30528: 3330-prism54usb-fix-build-break-in-islusb_init.c.txt
+Patch30529: 3331-wireless-add-acx-driver.txt
+Patch30530: 3332-acxsm-merge-from-acx-0.3.32.txt
+Patch30531: 3333-tiacx-Let-only-ACX_PCI-ACX_USB-be-user-visible.txt
+Patch30532: 3334-softmac-prism54usb-update.txt
+Patch30533: 3335-tiacx-revert-neither-PCI-nor-USB-is-selected-change.txt
+Patch30534: 3336-tiacx-implement-much-more-flexible-firmware-statistics-parsing.txt
+Patch30535: 3337-tiacx-Change-acx_ioctl_-get-set-_encode-to-use-kernel-80211-stack.txt
+Patch30536: 3338-tiacx-fix-breakage-of-Get-rid-of-circular-list-of-adev-s.txt
+Patch30537: 3339-tiacx-split-module-into-acx-common-acx-pci-acx-usb.txt
+Patch30538: 3342-softmac-reduce-scan-dwell-time.txt
+Patch30539: 3343-softmac-reduce-default-rate-to-11Mbps.txt
+Patch30540: 3346-update-prism54usb-sources.txt
+Patch30541: 3464-TG3-Fix-probe-failure-due-to-invalid-MAC-address.txt
+Patch30542: 3465-TG3-Fix-bug-in-40-bit-DMA-workaround-code.txt
+Patch30543: 3466-TG3-Fix-PHY-loopback-on-5700.txt
+Patch30544: 3467-TG3-Speed-up-SRAM-access.txt
+Patch30545: 3468-TG3-Skip-timer-code-during-full-lock.txt
+Patch30546: 3469-TG3-Update-version-and-reldate.txt
+Patch30547: 3471-NET-Fix-ipx-econet-appletalk-irda-ioctl-crashes.txt
+Patch30548: 3472-ECONET-Convert-away-from-SOCKOPS_WRAPPED.txt
+Patch30549: 3473-NET-deinline-200-byte-inlines-in-sock.h.txt
+Patch30550: 3475-TCP-Fix-RFC2465-typo.txt
+Patch30551: 3476-NETFILTER-Rename-init-functions.txt
+Patch30552: 3534-DECNET-Fix-refcount.txt
+Patch30553: 3535-DCCP-Use-NULL-for-pointers-comfort-sparse.txt
+Patch30554: 3536-b44-fix-force-mac-address-before-ifconfig-up.txt
+Patch30555: 3538-axnet_cs.c-add-hardware-multicast-support.txt
+Patch30556: 3539-via-rhine-link-state-fix.txt
+Patch30557: 3540-spidernet-reduce-console-spam.txt
+Patch30558: 3541-acenic-fix-section-mismatches.txt
+Patch30559: 3542-bonding-support-carrier-state-for-master.txt
+Patch30560: 3543-spidernet-enable-tx-checksum-offloading-by-default.txt
+Patch30561: 3544-natsemi-Support-oversized-EEPROMs.txt
+Patch30562: 3545-net-remove-CONFIG_NET_CBUS-conditional-for-NS8390.txt
+Patch30563: 3546-Janitor-drivers-net-pcnet32-fix-incorrect-comments.txt
+Patch30564: 3547-b44-ensure-valid-mac-addr.txt
+Patch30565: 3548-ixp2000-fix-gcc4-breakage.txt
+Patch30566: 3549-NET-Deinline-some-larger-functions-from-netdevice.h.txt
+Patch30567: 3602-NET-add-SO_RCVBUF-comment.txt
+Patch30568: 3603-TCP-Kill-unused-extern-decl-for-tcp_v4_hash_connecting.txt
+Patch30569: 3627-pcmcia-default-suspend-and-resume-handling.txt
+Patch30570: 3629-pcmcia-remove-unneeded-Vcc-pseudo-setting.txt
+Patch30571: 3699-uml-kconfigs.txt
+Patch30572: 3726-3c59x-collision-statistics-fix-fix.txt
+Patch30573: 3727-3c59x-fix-networking-for-10base2-NICs.txt
+Patch30574: 3840-TG3-Revert-Speed-up-SRAM-access.txt
+Patch30575: 3841-TG3-Update-driver-version-and-reldate.txt
+Patch30576: 3842-NET-com90xx-kmalloc-fix.txt
+Patch30577: 3843-IPSEC-Kill-unused-decap-state-argument.txt
+Patch30578: 3846-NETFILTER-x_tables-unify-IPv4-IPv6-esp-match.txt
+Patch30579: 3847-NETFILTER-x_tables-unify-IPv4-IPv6-multiport-match.txt
+Patch30580: 3848-NETFILTER-fix-ifdef-for-connmark-support-in-nf_conntrack_netlink.txt
+Patch30581: 3865-smc91x-add-support-for-LogicPD-PXA270-platform.txt
+Patch30582: 3866-Goramo-PCI200SYN-WAN-driver-subsystem-ID-patch.txt
+Patch30583: 3947-BUG_ON-Conversion-in-drivers-net.txt
+Patch30584: 3999-kbuild-fix-unneeded-rebuilds-in-drivers-net-chelsio-after-moving-source-tree.txt
+Patch30585: 4072-IPSEC-Check-x-encap-before-dereferencing-it.txt
+Patch30586: 4076-NET-netconsole-set-.name-in-struct-console.txt
+Patch30587: 4077-NET-Fix-an-off-by-21-or-49-error.txt
+Patch30588: 4078-TG3-Fix-a-memory-leak.txt
+Patch30589: 4079-BLUETOOTH-sco-Possible-double-free.txt
+Patch30590: 4080-INET-Use-port-unreachable-instead-of-proto-for-tunnels.txt
+Patch30591: 4081-IRDA-smcinit-merged-into-smsc-ircc-driver.txt
+Patch30592: 4082-IRDA-Support-for-Sigmatel-STIR421x-chip.txt
+Patch30593: 4083-NETFILTER-Add-helper-functions-for-mass-hook-registration-unregistration.txt
+Patch30594: 4086-NETFILTER-H.323-helper-move-some-function-prototypes-to-ip_conntrack_h323.h.txt
+Patch30595: 4087-NETFILTER-H.323-helper-change-EXPORT_SYMBOL-to-EXPORT_SYMBOL_GPL.txt
+Patch30596: 4088-NETFILTER-H.323-helper-make-get_h245_addr-static.txt
+Patch30597: 4089-NETFILTER-H.323-helper-add-parameter-default_rrq_ttl.txt
+Patch30598: 4090-NETFILTER-Fix-IP_NF_CONNTRACK_NETLINK-dependency.txt
+Patch30599: 4091-NETFILTER-Introduce-infrastructure-for-address-family-specific-operations.txt
+Patch30600: 4092-NETFILTER-Add-address-family-specific-checksum-helpers.txt
+Patch30601: 4093-NETFILTER-Convert-conntrack-ipt_REJECT-to-new-checksumming-functions.txt
+Patch30602: 4094-NETFILTER-H.323-helper-remove-changelog.txt
+Patch30603: 4095-TG3-Kill-some-less-useful-flags.txt
+Patch30604: 4096-TG3-Speed-up-SRAM-access-2nd-version.txt
+Patch30605: 4097-PKT_SCHED-act_police-Rename-methods.txt
+Patch30606: 4098-NET-kzalloc-use-in-alloc_netdev.txt
+Patch30607: 4099-NET-More-kzalloc-conversions.txt
+Patch30608: 4100-NETFILTER-Fix-build-with-CONFIG_NETFILTER-y-m-on-IA64.txt
+Patch30609: 4102-NET-Fix-hotplug-race-during-device-registration.txt
+Patch30610: 4103-X25-Restore-skb-dev-setting-in-x25_type_trans.txt
+Patch30611: 4104-NETFILTER-Fix-DNAT-in-LOCAL_OUT.txt
+Patch30612: 4105-IPV4-ip_fragment-Always-compute-hash-with-ipfrag_lock-held.txt
+Patch30613: 4106-IPV6-Deinline-few-large-functions-in-inet6-code.txt
+Patch30614: 4323-knfsd-svcrpc-gss-don-t-call-svc_take_page-unnecessarily.txt
+Patch30615: 4351-IPv6-reassembly-Always-compute-hash-under-the-fragment-lock.txt
+Patch30616: 4352-BRIDGE-receive-link-local-on-disabled-ports.txt
+Patch30617: 4353-DCCP-Fix-leak-in-net-dccp-ipv4.c.txt
+Patch30618: 4354-BRIDGE-ebtables-fix-allocation-in-net-bridge-netfilter-ebtables.c.txt
+Patch30619: 4355-WAN-Remove-broken-and-unmaintained-Sangoma-drivers.txt
+Patch30620: 4372-dlink-pci-cards-using-wrong-driver.txt
+Patch30621: 4373-network-axnet_cs.c-add-missing-PRIV-in-ei_rx_overrun.txt
+Patch30622: 4374-via-rhine-execute-bounce-buffers-code-on-Rhine-I-only.txt
+Patch30623: 4375-b44-disable-default-tx-pause.txt
+Patch30624: 4376-b44-increase-version-to-1.00.txt
+Patch30625: 4377-netdrvr-b44-trim-trailing-whitespace.txt
+Patch30626: 4379-drivers-net-via-rhine.c-make-a-function-static.txt
+Patch30627: 4381-net-drivers-fix-section-attributes-for-gcc.txt
+Patch30628: 4382-mv643xx_eth-Always-free-completed-tx-descs-on-tx-interrupt.txt
+Patch30629: 4383-mv643xx_eth-Fix-tx_timeout-to-only-conditionally-wake-tx-queue.txt
+Patch30630: 4385-Use-pci_set_consistent_dma_mask-in-ixgb-driver.txt
+Patch30631: 4504-IPV4-Possible-cleanups.txt
+Patch30632: 4505-XFRM-Fix-aevent-timer.txt
+Patch30633: 4510-ATM-Clip-timer-race.txt
+Patch30634: 4511-ATM-clip-run-through-Lindent.txt
+Patch30635: 4512-ATM-clip-get-rid-of-PROC_FS-ifdef.txt
+Patch30636: 4513-ATM-clip-notifier-related-cleanups.txt
+Patch30637: 4514-ATM-clip-add-module-info.txt
+Patch30638: 4515-IRDA-irda-usb-unregister-netdev-when-patch-upload-fails.txt
+Patch30639: 4516-IRDA-smsc-ircc2-smcinit-support-for-ALi-ISA-bridges.txt
+Patch30640: 4517-ip_output-account-for-fraggap-when-checking-to-add-trailer_len.txt
+Patch30641: 4521-e1000-Remove-PM-warning-DPRINTKs-breaking-2.4.x-kernels.txt
+Patch30642: 4522-e1000-Esb2-wol-link-cycle-bug-and-uninitialized-registers.txt
+Patch30643: 4523-e1000-De-inline-functions-to-benefit-from-compiler-smartness.txt
+Patch30644: 4524-e1000-Made-an-adapter-struct-variable-into-a-local-txb2b.txt
+Patch30645: 4525-e1000-Update-truesize-with-the-length-of-the-packet-for-packet-split.txt
+Patch30646: 4526-e1000-Dead-variable-cleanup.txt
+Patch30647: 4528-e1000-implement-more-efficient-tx-queue-locking.txt
+Patch30648: 4529-e1000-Version-bump-contact-fix-year-string-change.txt
+Patch30649: 4554-e1000-fix-mispatch-for-media-type-detect.txt
+Patch30650: 4564-TCP-Fix-truesize-underflow.txt
+Patch30651: 4565-IPV6-Ensure-to-have-hop-by-hop-options-in-our-header-of-sk_buff.txt
+Patch30652: 4566-IPV6-XFRM-Don-t-use-old-copy-of-pointer-after-pskb_may_pull.txt
+Patch30653: 4567-IPV6-XFRM-Fix-decoding-session-with-preceding-extension-header-s.txt
+Patch30654: 4568-IPV6-Clean-up-hop-by-hop-options-handler.txt
+Patch30655: 4569-unaligned-access-in-sk_run_filter.txt
+Patch30656: 4671-RPCSEC_GSS-fix-leak-in-krb5-code-caused-by-superfluous-kmalloc.txt
+Patch30657: 4678-SUNRPC-Dead-code-in-net-sunrpc-auth_gss-auth_gss.c.txt
+Patch30658: 4684-softmac-uses-Wiress-Ext.txt
+Patch30659: 4686-wireless-atmel-send-WEXT-scan-completion-events.txt
+Patch30660: 4687-wext-Fix-IWENCODEEXT-security-permissions.txt
+Patch30661: 4689-softmac-fix-spinlock-recursion-on-reassoc.txt
+Patch30662: 4690-orinoco-fix-truncating-commsquality-RID-with-the-latest-Symbol-firmware.txt
+Patch30663: 4691-bcm43xx-set-trans_start-on-TX-to-prevent-bogus-timeouts.txt
+Patch30664: 4692-softmac-return-EAGAIN-from-getscan-while-scanning.txt
+Patch30665: 4693-softmac-dont-send-out-packets-while-scanning.txt
+Patch30666: 4694-softmac-handle-iw_mode-properly.txt
+Patch30667: 4695-softmac-fix-event-sending.txt
+Patch30668: 4696-softmac-report-when-scanning-has-finished.txt
+Patch30669: 4697-bcm43xx-wireless-fix-printk-format-warnings.txt
+Patch30670: 4698-bcm43xx-fix-config-menu-alignment.txt
+Patch30671: 4699-bcm43xx-fix-dyn-tssi2dbm-memleak.txt
+Patch30672: 4700-bcm43xx-fix-pctl-slowclock-limit-calculation.txt
+Patch30673: 4701-bcm43xx-sysfs-code-cleanup.txt
+Patch30674: 4702-bcm43xx-iw_priv_args-names-should-be-16-characters.txt
+Patch30675: 4703-wext-Fix-RtNetlink-ENCODE-security-permissions.txt
+Patch30676: 4706-LLC-Use-pskb_trim_rcsum-in-llc_fixup_skb.txt
+Patch30677: 4707-SUNGEM-Marvell-PHY-suspend.txt
+Patch30678: 4709-TCP-Account-skb-overhead-in-tcp_fragment.txt
+Patch30679: 4710-NET-Add-skb-truesize-assertion-checking.txt
+Patch30680: 4741-NEx000-fix-RTL8019AS-base-address-for-RBTX4938.txt
+Patch30681: 4742-Add-VLAN-802.1q-support-to-sis900-driver.txt
+Patch30682: 4744-au1000_eth.c-probe-code-straightened-up.txt
+Patch30683: 4747-netdrvr-Convert-cassini-to-pci_iomap.txt
+Patch30684: 4748-Fix-locking-in-gianfar.txt
+Patch30685: 4768-pcmcia-add-new-ID-to-pcnet_cs.txt
+Patch30686: 4808-Fix-crash-on-big-endian-systems-during-scan.txt
+Patch30687: 4809-softmac-fix-SIOCSIWAP.txt
+Patch30688: 4813-orinoco-remove-PCMCIA-audio-support-it-s-useless-for-wireless-cards.txt
+Patch30689: 4815-orinoco-remove-tracing-code-it-s-unused.txt
+Patch30690: 4816-orinoco-remove-debug-buffer-code-and-userspace-include-support.txt
+Patch30691: 4817-orinoco-Symbol-card-supported-by-spectrum_cs-is-LA4137-not-LA4100.txt
+Patch30692: 4818-orinoco-optimize-Tx-exception-handling-in-orinoco.txt
+Patch30693: 4819-orinoco-orinoco_xmit-should-only-return-valid-symbolic-constants.txt
+Patch30694: 4820-orinoco-replace-hermes_write_words-with-hermes_write_bytes.txt
+Patch30695: 4821-orinoco-don-t-use-any-padding-for-Tx-frames.txt
+Patch30696: 4822-orinoco-refactor-and-clean-up-Tx-error-handling.txt
+Patch30697: 4823-orinoco-simplify-802.3-encapsulation-code.txt
+Patch30698: 4824-orinoco-fix-BAP0-offset-error-after-several-days-of-operation.txt
+Patch30699: 4825-orinoco-delay-FID-allocation-after-firmware-initialization.txt
+Patch30700: 4826-orinoco_pci-disable-device-and-free-IRQ-when-suspending.txt
+Patch30701: 4827-orinoco_pci-use-pci_iomap-for-resources.txt
+Patch30702: 4828-orinoco-support-PCI-suspend-resume-for-Nortel-PLX-and-TMD-adaptors.txt
+Patch30703: 4829-orinoco-reduce-differences-between-PCI-drivers-create-orinoco_pci.h.txt
+Patch30704: 4830-orinoco-further-comment-cleanup-in-the-PCI-drivers.txt
+Patch30705: 4831-orinoco-bump-version-to-0.15.txt
+Patch30706: 4833-ieee80211-Fix-TKIP-MIC-calculation-for-QoS-frames.txt
+Patch30707: 4834-ieee80211-Fix-TX-code-doesn-t-enable-QoS-when-using-WPA-QoS.txt
+Patch30708: 4835-ieee80211-export-list-of-bit-rates-with-standard-WEXT-procddures.txt
+Patch30709: 4837-ieee80211-replace-debug-IEEE80211_WARNING-with-each-own-debug-macro.txt
+Patch30710: 4838-ieee80211-update-version-stamp-to-1.1.13.txt
+Patch30711: 4839-ipw2200-Exponential-averaging-for-signal-and-noise-Level.txt
+Patch30712: 4840-ipw2200-Fix-TX-QoS-enabled-frames-problem.txt
+Patch30713: 4841-ipw2200-generates-a-scan-event-after-a-scan-has-completed.txt
+Patch30714: 4843-ipw2200-fix-compile-warning-when-CONFIG_IPW2200_DEBUG.txt
+Patch30715: 4844-ipw2200-Do-not-continue-loading-the-firmware-if-kmalloc-fails.txt
+Patch30716: 4845-ipw2200-turn-off-signal-debug-log.txt
+Patch30717: 4850-ipw2200-version-string-rework.txt
+Patch30718: 4851-ipw2200-update-version-stamp-to-1.1.2.txt
+Patch30719: 4856-ipw2200-Fix-wpa_supplicant-association-problem.txt
+Patch30720: 4857-softmac-add-SIOCSIWMLME.txt
+Patch30721: 4858-softmac-clean-up-event-handling-code.txt
+Patch30722: 4861-patch-prism54usb-add-set_bssid_filter.txt
+Patch30723: 4862-add-adm8211-wireless-driver.txt
+Patch30724: 4863-NETFILTER-nf_conntrack-Fix-module-refcount-dropping-too-far.txt
+Patch30725: 4864-NETFILTER-ULOG-target-is-not-obsolete.txt
+Patch30726: 4866-NETFILTER-nf_conntrack-kill-unused-callback-init_conntrack.txt
+Patch30727: 4867-NETFILTER-ip6_tables-remove-broken-comefrom-debugging.txt
+Patch30728: 4868-NETFILTER-x_tables-move-table-lock-initialization.txt
+Patch30729: 4869-NETFILTER-ipt-action-use-xt_check_target-for-basic-verification.txt
+Patch30730: XXXX-tiacx-ia64-enable.txt
 
 # END OF PATCH DEFINITIONS
 
@@ -2490,438 +2489,436 @@
 %patch30514 -p1
 # bcm43xx: fix "include" issues on some platforms.
 %patch30515 -p1
-# bcm43xx: don't set the channel on a device, which is down.
-%patch30516 -p1
 # hostap: Make hostap_tx_encrypt() static
-%patch30517 -p1
+%patch30516 -p1
 # knfsd: Change the store of auth_domains to not be a 'cache'
-%patch30518 -p1
+%patch30517 -p1
 # knfsd: Get rid of 'inplace' sunrpc caches
-%patch30519 -p1
+%patch30518 -p1
 # knfsd: Create cache_lookup function instead of using a macro to declare one
-%patch30520 -p1
+%patch30519 -p1
 # knfsd: Convert ip_map cache to use the new lookup routine
-%patch30521 -p1
+%patch30520 -p1
 # knfsd: Use new sunrpc cache for rsi cache
-%patch30522 -p1
+%patch30521 -p1
 # knfsd: Use new cache code for rsc cache
-%patch30523 -p1
+%patch30522 -p1
 # knfsd: An assortment of little fixes to the sunrpc cache code
-%patch30524 -p1
+%patch30523 -p1
 # knfsd: Tidy up unix_domain_find
-%patch30525 -p1
+%patch30524 -p1
 # pnp: IRDA: adjust pnp_register_driver signature
-%patch30526 -p1
+%patch30525 -p1
 # Minor (janitorial) change to ieee80211
-%patch30527 -p1
+%patch30526 -p1
 # wireless: add prism54usb driver
-%patch30528 -p1
+%patch30527 -p1
 # prism54usb: fix build break in islusb_init.c
-%patch30529 -p1
+%patch30528 -p1
 # wireless: add acx driver
-%patch30530 -p1
+%patch30529 -p1
 # acxsm: merge from acx 0.3.32
-%patch30531 -p1
+%patch30530 -p1
 # tiacx: Let only ACX_PCI/ACX_USB be user-visible
-%patch30532 -p1
+%patch30531 -p1
 # softmac: prism54usb update
-%patch30533 -p1
+%patch30532 -p1
 # tiacx: revert "neither PCI nor USB is selected" change
-%patch30534 -p1
+%patch30533 -p1
 # tiacx: implement much more flexible firmware statistics parsing
-%patch30535 -p1
+%patch30534 -p1
 # tiacx: Change acx_ioctl_{get,set}_encode to use kernel 80211 stack
-%patch30536 -p1
+%patch30535 -p1
 # tiacx: fix breakage of "Get rid of circular list of adev's"
-%patch30537 -p1
+%patch30536 -p1
 # tiacx: split module into acx-common + acx-pci + acx-usb
-%patch30538 -p1
+%patch30537 -p1
 # softmac: reduce scan dwell time
-%patch30539 -p1
+%patch30538 -p1
 # softmac: reduce default rate to 11Mbps.
-%patch30540 -p1
+%patch30539 -p1
 # update prism54usb sources
-%patch30541 -p1
+%patch30540 -p1
 # [TG3]: Fix probe failure due to invalid MAC address
-%patch30542 -p1
+%patch30541 -p1
 # [TG3]: Fix bug in 40-bit DMA workaround code
-%patch30543 -p1
+%patch30542 -p1
 # [TG3]: Fix PHY loopback on 5700
-%patch30544 -p1
+%patch30543 -p1
 # [TG3]: Speed up SRAM access
-%patch30545 -p1
+%patch30544 -p1
 # [TG3]: Skip timer code during full lock
-%patch30546 -p1
+%patch30545 -p1
 # [TG3]: Update version and reldate
-%patch30547 -p1
+%patch30546 -p1
 # [NET]: Fix ipx/econet/appletalk/irda ioctl crashes
-%patch30548 -p1
+%patch30547 -p1
 # [ECONET]: Convert away from SOCKOPS_WRAPPED
-%patch30549 -p1
+%patch30548 -p1
 # [NET]: deinline 200+ byte inlines in sock.h
-%patch30550 -p1
+%patch30549 -p1
 # [TCP]: Fix RFC2465 typo.
-%patch30551 -p1
+%patch30550 -p1
 # [NETFILTER]: Rename init functions.
-%patch30552 -p1
+%patch30551 -p1
 # [DECNET]: Fix refcount
-%patch30553 -p1
+%patch30552 -p1
 # [DCCP]: Use NULL for pointers, comfort sparse.
-%patch30554 -p1
+%patch30553 -p1
 # b44: fix force mac address before ifconfig up
-%patch30555 -p1
+%patch30554 -p1
 # axnet_cs.c : add hardware multicast support
-%patch30556 -p1
+%patch30555 -p1
 # via-rhine: link state fix
-%patch30557 -p1
+%patch30556 -p1
 # spidernet : reduce console spam
-%patch30558 -p1
+%patch30557 -p1
 # acenic: fix section mismatches
-%patch30559 -p1
+%patch30558 -p1
 # bonding: support carrier state for master
-%patch30560 -p1
+%patch30559 -p1
 # spidernet : enable tx checksum offloading by default
-%patch30561 -p1
+%patch30560 -p1
 # natsemi: Support oversized EEPROMs
-%patch30562 -p1
+%patch30561 -p1
 # net: remove CONFIG_NET_CBUS conditional for NS8390
-%patch30563 -p1
+%patch30562 -p1
 # Janitor: drivers/net/pcnet32: fix incorrect comments
-%patch30564 -p1
+%patch30563 -p1
 # b44: ensure valid mac addr
-%patch30565 -p1
+%patch30564 -p1
 # ixp2000: fix gcc4 breakage
-%patch30566 -p1
+%patch30565 -p1
 # [NET]: Deinline some larger functions from netdevice.h
-%patch30567 -p1
+%patch30566 -p1
 # [NET]: add SO_RCVBUF comment
-%patch30568 -p1
+%patch30567 -p1
 # [TCP]: Kill unused extern decl for tcp_v4_hash_connecting()
-%patch30569 -p1
+%patch30568 -p1
 # pcmcia: default suspend and resume handling
-%patch30570 -p1
+%patch30569 -p1
 # pcmcia: remove unneeded Vcc pseudo setting
-%patch30571 -p1
+%patch30570 -p1
 # uml: kconfigs
-%patch30572 -p1
+%patch30571 -p1
 # "3c59x collision statistics fix" fix
-%patch30573 -p1
+%patch30572 -p1
 # 3c59x: fix networking for 10base2 NICs
-%patch30574 -p1
+%patch30573 -p1
 # [TG3]: Revert "Speed up SRAM access"
-%patch30575 -p1
+%patch30574 -p1
 # [TG3]: Update driver version and reldate.
-%patch30576 -p1
+%patch30575 -p1
 # [NET]: com90xx kmalloc fix
-%patch30577 -p1
+%patch30576 -p1
 # [IPSEC]: Kill unused decap state argument
-%patch30578 -p1
+%patch30577 -p1
 # [NETFILTER]: x_tables: unify IPv4/IPv6 esp match
-%patch30579 -p1
+%patch30578 -p1
 # [NETFILTER]: x_tables: unify IPv4/IPv6 multiport match
-%patch30580 -p1
+%patch30579 -p1
 # [NETFILTER]: fix ifdef for connmark support in nf_conntrack_netlink
-%patch30581 -p1
+%patch30580 -p1
 # smc91x: add support for LogicPD PXA270 platform
-%patch30582 -p1
+%patch30581 -p1
 # Goramo PCI200SYN WAN driver subsystem ID patch
-%patch30583 -p1
+%patch30582 -p1
 # BUG_ON() Conversion in drivers/net/
-%patch30584 -p1
+%patch30583 -p1
 # kbuild: fix unneeded rebuilds in drivers/net/chelsio after moving source tree
-%patch30585 -p1
+%patch30584 -p1
 # [IPSEC]: Check x->encap before dereferencing it
-%patch30586 -p1
+%patch30585 -p1
 # [NET] netconsole: set .name in struct console
-%patch30587 -p1
+%patch30586 -p1
 # [NET]: Fix an off-by-21-or-49 error.
-%patch30588 -p1
+%patch30587 -p1
 # [TG3]: Fix a memory leak.
-%patch30589 -p1
+%patch30588 -p1
 # [BLUETOOTH] sco: Possible double free.
-%patch30590 -p1
+%patch30589 -p1
 # [INET]: Use port unreachable instead of proto for tunnels
-%patch30591 -p1
+%patch30590 -p1
 # [IRDA]: smcinit merged into smsc-ircc driver
-%patch30592 -p1
+%patch30591 -p1
 # [IRDA]: Support for Sigmatel STIR421x chip
-%patch30593 -p1
+%patch30592 -p1
 # [NETFILTER]: Add helper functions for mass hook registration/unregistration
-%patch30594 -p1
+%patch30593 -p1
 # [NETFILTER]: H.323 helper: move some function prototypes to ip_conntrack_h323.h
-%patch30595 -p1
+%patch30594 -p1
 # [NETFILTER]: H.323 helper: change EXPORT_SYMBOL to EXPORT_SYMBOL_GPL
-%patch30596 -p1
+%patch30595 -p1
 # [NETFILTER]: H.323 helper: make get_h245_addr() static
-%patch30597 -p1
+%patch30596 -p1
 # [NETFILTER]: H.323 helper: add parameter 'default_rrq_ttl'
-%patch30598 -p1
+%patch30597 -p1
 # [NETFILTER]: Fix IP_NF_CONNTRACK_NETLINK dependency
-%patch30599 -p1
+%patch30598 -p1
 # [NETFILTER]: Introduce infrastructure for address family specific operations
-%patch30600 -p1
+%patch30599 -p1
 # [NETFILTER]: Add address family specific checksum helpers
-%patch30601 -p1
+%patch30600 -p1
 # [NETFILTER]: Convert conntrack/ipt_REJECT to new checksumming functions
-%patch30602 -p1
+%patch30601 -p1
 # [NETFILTER]: H.323 helper: remove changelog
-%patch30603 -p1
+%patch30602 -p1
 # [TG3]: Kill some less useful flags
-%patch30604 -p1
+%patch30603 -p1
 # [TG3]: Speed up SRAM access (2nd version)
-%patch30605 -p1
+%patch30604 -p1
 # [PKT_SCHED] act_police: Rename methods.
-%patch30606 -p1
+%patch30605 -p1
 # [NET] kzalloc: use in alloc_netdev
-%patch30607 -p1
+%patch30606 -p1
 # [NET]: More kzalloc conversions.
-%patch30608 -p1
+%patch30607 -p1
 # [NETFILTER]: Fix build with CONFIG_NETFILTER=y/m on IA64
-%patch30609 -p1
+%patch30608 -p1
 # [NET]: Fix hotplug race during device registration.
-%patch30610 -p1
+%patch30609 -p1
 # [X25]: Restore skb->dev setting in x25_type_trans().
-%patch30611 -p1
+%patch30610 -p1
 # [NETFILTER]: Fix DNAT in LOCAL_OUT
-%patch30612 -p1
+%patch30611 -p1
 # [IPV4] ip_fragment: Always compute hash with ipfrag_lock held.
-%patch30613 -p1
+%patch30612 -p1
 # [IPV6]: Deinline few large functions in inet6 code
-%patch30614 -p1
+%patch30613 -p1
 # knfsd: svcrpc: gss: don't call svc_take_page unnecessarily
-%patch30615 -p1
+%patch30614 -p1
 # [IPv6] reassembly: Always compute hash under the fragment lock.
-%patch30616 -p1
+%patch30615 -p1
 # [BRIDGE]: receive link-local on disabled ports.
-%patch30617 -p1
+%patch30616 -p1
 # [DCCP]: Fix leak in net/dccp/ipv4.c
-%patch30618 -p1
+%patch30617 -p1
 # [BRIDGE] ebtables: fix allocation in net/bridge/netfilter/ebtables.c
-%patch30619 -p1
+%patch30618 -p1
 # [WAN]: Remove broken and unmaintained Sangoma drivers.
-%patch30620 -p1
+%patch30619 -p1
 # dlink pci cards using wrong driver
-%patch30621 -p1
+%patch30620 -p1
 # network: axnet_cs.c: add missing 'PRIV' in ei_rx_overrun
-%patch30622 -p1
+%patch30621 -p1
 # via-rhine: execute bounce buffers code on Rhine-I only
-%patch30623 -p1
+%patch30622 -p1
 # b44: disable default tx pause
-%patch30624 -p1
+%patch30623 -p1
 # b44: increase version to 1.00
-%patch30625 -p1
+%patch30624 -p1
 # [netdrvr b44] trim trailing whitespace
-%patch30626 -p1
+%patch30625 -p1
 # drivers/net/via-rhine.c: make a function static
-%patch30627 -p1
+%patch30626 -p1
 # net drivers: fix section attributes for gcc
-%patch30628 -p1
+%patch30627 -p1
 # mv643xx_eth: Always free completed tx descs on tx interrupt
-%patch30629 -p1
+%patch30628 -p1
 # mv643xx_eth: Fix tx_timeout to only conditionally wake tx queue
-%patch30630 -p1
+%patch30629 -p1
 # Use pci_set_consistent_dma_mask in ixgb driver
-%patch30631 -p1
+%patch30630 -p1
 # [IPV4]: Possible cleanups.
-%patch30632 -p1
+%patch30631 -p1
 # [XFRM]: Fix aevent timer.
-%patch30633 -p1
+%patch30632 -p1
 # [ATM]: Clip timer race.
-%patch30634 -p1
+%patch30633 -p1
 # [ATM] clip: run through Lindent
-%patch30635 -p1
+%patch30634 -p1
 # [ATM] clip: get rid of PROC_FS ifdef
-%patch30636 -p1
+%patch30635 -p1
 # [ATM] clip: notifier related cleanups
-%patch30637 -p1
+%patch30636 -p1
 # [ATM] clip: add module info
-%patch30638 -p1
+%patch30637 -p1
 # [IRDA]: irda-usb, unregister netdev when patch upload fails
-%patch30639 -p1
+%patch30638 -p1
 # [IRDA]: smsc-ircc2, smcinit support for ALi ISA bridges
-%patch30640 -p1
+%patch30639 -p1
 # ip_output: account for fraggap when checking to add trailer_len
-%patch30641 -p1
+%patch30640 -p1
 # e1000: Remove PM warning DPRINTKs breaking 2.4.x kernels
-%patch30642 -p1
+%patch30641 -p1
 # e1000: Esb2 wol link cycle bug and uninitialized registers
-%patch30643 -p1
+%patch30642 -p1
 # e1000: De-inline functions to benefit from compiler smartness
-%patch30644 -p1
+%patch30643 -p1
 # e1000: Made an adapter struct variable into a local (txb2b)
-%patch30645 -p1
+%patch30644 -p1
 # e1000: Update truesize with the length of the packet for packet split
-%patch30646 -p1
+%patch30645 -p1
 # e1000: Dead variable cleanup
-%patch30647 -p1
+%patch30646 -p1
 # e1000: implement more efficient tx queue locking
-%patch30648 -p1
+%patch30647 -p1
 # e1000: Version bump, contact fix, year string change
-%patch30649 -p1
+%patch30648 -p1
 # e1000: fix mispatch for media type detect.
-%patch30650 -p1
+%patch30649 -p1
 # [TCP]: Fix truesize underflow
-%patch30651 -p1
+%patch30650 -p1
 # [IPV6]: Ensure to have hop-by-hop options in our header of &sk_buff.
-%patch30652 -p1
+%patch30651 -p1
 # [IPV6] XFRM: Don't use old copy of pointer after pskb_may_pull().
-%patch30653 -p1
+%patch30652 -p1
 # [IPV6] XFRM: Fix decoding session with preceding extension header(s).
-%patch30654 -p1
+%patch30653 -p1
 # [IPV6]: Clean up hop-by-hop options handler.
-%patch30655 -p1
+%patch30654 -p1
 # unaligned access in sk_run_filter()
-%patch30656 -p1
+%patch30655 -p1
 # RPCSEC_GSS: fix leak in krb5 code caused by superfluous kmalloc
-%patch30657 -p1
+%patch30656 -p1
 # SUNRPC: Dead code in net/sunrpc/auth_gss/auth_gss.c
-%patch30658 -p1
+%patch30657 -p1
 # softmac uses Wiress Ext.
-%patch30659 -p1
+%patch30658 -p1
 # wireless/atmel: send WEXT scan completion events
-%patch30660 -p1
+%patch30659 -p1
 # wext: Fix IWENCODEEXT security permissions
-%patch30661 -p1
+%patch30660 -p1
 # softmac: fix spinlock recursion on reassoc
-%patch30662 -p1
+%patch30661 -p1
 # orinoco: fix truncating commsquality RID with the latest Symbol firmware
-%patch30663 -p1
+%patch30662 -p1
 # bcm43xx: set trans_start on TX to prevent bogus timeouts
-%patch30664 -p1
+%patch30663 -p1
 # softmac: return -EAGAIN from getscan while scanning
-%patch30665 -p1
+%patch30664 -p1
 # softmac: dont send out packets while scanning
-%patch30666 -p1
+%patch30665 -p1
 # softmac: handle iw_mode properly
-%patch30667 -p1
+%patch30666 -p1
 # softmac: fix event sending
-%patch30668 -p1
+%patch30667 -p1
 # softmac: report when scanning has finished
-%patch30669 -p1
+%patch30668 -p1
 # bcm43xx wireless: fix printk format warnings
-%patch30670 -p1
+%patch30669 -p1
 # bcm43xx: fix config menu alignment
-%patch30671 -p1
+%patch30670 -p1
 # bcm43xx: fix dyn tssi2dbm memleak
-%patch30672 -p1
+%patch30671 -p1
 # bcm43xx: fix pctl slowclock limit calculation
-%patch30673 -p1
+%patch30672 -p1
 # bcm43xx: sysfs code cleanup
-%patch30674 -p1
+%patch30673 -p1
 # bcm43xx: iw_priv_args names should be <16 characters
-%patch30675 -p1
+%patch30674 -p1
 # wext: Fix RtNetlink ENCODE security permissions
-%patch30676 -p1
+%patch30675 -p1
 # [LLC]: Use pskb_trim_rcsum() in llc_fixup_skb().
-%patch30677 -p1
+%patch30676 -p1
 # [SUNGEM]: Marvell PHY suspend.
-%patch30678 -p1
+%patch30677 -p1
 # [TCP]: Account skb overhead in tcp_fragment
-%patch30679 -p1
+%patch30678 -p1
 # [NET]: Add skb->truesize assertion checking.
-%patch30680 -p1
+%patch30679 -p1
 # NEx000: fix RTL8019AS base address for RBTX4938
-%patch30681 -p1
+%patch30680 -p1
 # Add VLAN (802.1q) support to sis900 driver
-%patch30682 -p1
+%patch30681 -p1
 # au1000_eth.c probe code straightened up
-%patch30683 -p1
+%patch30682 -p1
 # netdrvr: Convert cassini to pci_iomap
-%patch30684 -p1
+%patch30683 -p1
 # Fix locking in gianfar
-%patch30685 -p1
+%patch30684 -p1
 # pcmcia: add new ID to pcnet_cs
-%patch30686 -p1
+%patch30685 -p1
 # Fix crash on big-endian systems during scan
-%patch30687 -p1
+%patch30686 -p1
 # softmac: fix SIOCSIWAP
-%patch30688 -p1
+%patch30687 -p1
 # orinoco: remove PCMCIA audio support, it's useless for wireless cards
-%patch30689 -p1
+%patch30688 -p1
 # orinoco: remove tracing code, it's unused
-%patch30690 -p1
+%patch30689 -p1
 # orinoco: remove debug buffer code and userspace include support
-%patch30691 -p1
+%patch30690 -p1
 # orinoco: Symbol card supported by spectrum_cs is LA4137, not LA4100
-%patch30692 -p1
+%patch30691 -p1
 # orinoco: optimize Tx exception handling in orinoco
-%patch30693 -p1
+%patch30692 -p1
 # orinoco: orinoco_xmit() should only return valid symbolic constants
-%patch30694 -p1
+%patch30693 -p1
 # orinoco replace hermes_write_words() with hermes_write_bytes()
-%patch30695 -p1
+%patch30694 -p1
 # orinoco: don't use any padding for Tx frames
-%patch30696 -p1
+%patch30695 -p1
 # orinoco: refactor and clean up Tx error handling
-%patch30697 -p1
+%patch30696 -p1
 # orinoco: simplify 802.3 encapsulation code
-%patch30698 -p1
+%patch30697 -p1
 # orinoco: fix BAP0 offset error after several days of operation
-%patch30699 -p1
+%patch30698 -p1
 # orinoco: delay FID allocation after firmware initialization
-%patch30700 -p1
+%patch30699 -p1
 # orinoco_pci: disable device and free IRQ when suspending
-%patch30701 -p1
+%patch30700 -p1
 # orinoco_pci: use pci_iomap() for resources
-%patch30702 -p1
+%patch30701 -p1
 # orinoco: support PCI suspend/resume for Nortel, PLX and TMD adaptors
-%patch30703 -p1
+%patch30702 -p1
 # orinoco: reduce differences between PCI drivers, create orinoco_pci.h
-%patch30704 -p1
+%patch30703 -p1
 # orinoco: further comment cleanup in the PCI drivers
-%patch30705 -p1
+%patch30704 -p1
 # orinoco: bump version to 0.15
-%patch30706 -p1
+%patch30705 -p1
 # ieee80211: Fix TKIP MIC calculation for QoS frames
-%patch30707 -p1
+%patch30706 -p1
 # ieee80211: Fix TX code doesn't enable QoS when using WPA + QoS
-%patch30708 -p1
+%patch30707 -p1
 # ieee80211: export list of bit rates with standard WEXT procddures
-%patch30709 -p1
+%patch30708 -p1
 # ieee80211: replace debug IEEE80211_WARNING with each own debug macro
-%patch30710 -p1
+%patch30709 -p1
 # ieee80211: update version stamp to 1.1.13
-%patch30711 -p1
+%patch30710 -p1
 # ipw2200: Exponential averaging for signal and noise Level
-%patch30712 -p1
+%patch30711 -p1
 # ipw2200: Fix TX QoS enabled frames problem
-%patch30713 -p1
+%patch30712 -p1
 # ipw2200: generates a scan event after a scan has completed
-%patch30714 -p1
+%patch30713 -p1
 # ipw2200: fix compile warning when !CONFIG_IPW2200_DEBUG
-%patch30715 -p1
+%patch30714 -p1
 # ipw2200: Do not continue loading the firmware if kmalloc fails
-%patch30716 -p1
+%patch30715 -p1
 # ipw2200: turn off signal debug log
-%patch30717 -p1
+%patch30716 -p1
 # ipw2200: version string rework
-%patch30718 -p1
+%patch30717 -p1
 # ipw2200: update version stamp to 1.1.2
-%patch30719 -p1
+%patch30718 -p1
 # ipw2200: Fix wpa_supplicant association problem
-%patch30720 -p1
+%patch30719 -p1
 # softmac: add SIOCSIWMLME
-%patch30721 -p1
+%patch30720 -p1
 # softmac: clean up event handling code
-%patch30722 -p1
+%patch30721 -p1
 # patch prism54usb: add set_bssid_filter
-%patch30723 -p1
+%patch30722 -p1
 # add adm8211 wireless driver
-%patch30724 -p1
+%patch30723 -p1
 # [NETFILTER]: nf_conntrack: Fix module refcount dropping too far
-%patch30725 -p1
+%patch30724 -p1
 # [NETFILTER]: ULOG target is not obsolete
-%patch30726 -p1
+%patch30725 -p1
 # [NETFILTER]: nf_conntrack: kill unused callback init_conntrack
-%patch30727 -p1
+%patch30726 -p1
 # [NETFILTER]: ip6_tables: remove broken comefrom debugging
-%patch30728 -p1
+%patch30727 -p1
 # [NETFILTER]: x_tables: move table->lock initialization
-%patch30729 -p1
+%patch30728 -p1
 # [NETFILTER]: ipt action: use xt_check_target for basic verification
-%patch30730 -p1
+%patch30729 -p1
 # tiacx: enable build for ia64
-%patch30731 -p1
+%patch30730 -p1
 
 # END OF PATCH APPLICATIONS
 
@@ -3777,7 +3774,6 @@
 - bcm43xx: add useless and broken statistics stuff. People seem to want it. well...
 - bcm43xx: get rid of "/\* vim: ..." lines at the end of several files.
 - bcm43xx: fix "include" issues on some platforms.
-- bcm43xx: don't set the channel on a device, which is down.
 - hostap: Make hostap_tx_encrypt() static
 - knfsd: Change the store of auth_domains to not be a 'cache'
 - knfsd: Get rid of 'inplace' sunrpc caches


--- 3123-bcm43xx-don-t-set-the-channel-on-a-device-which-is-down.txt DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 26 19:21:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 15:21:38 -0400
Subject: rpms/yum/FC-5 installonlyn.py, 1.9, 1.10 sources, 1.35,
	1.36 yum.spec, 1.86, 1.87
Message-ID: <200604261921.k3QJLc63005282@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/yum/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5223

Modified Files:
	installonlyn.py sources yum.spec 
Log Message:
* Wed Apr 26 2006 Jeremy Katz <katzj at redhat.com> - 2.6.1-1
- update to 2.6.1 with fixes for #181406, #185309, #161190, #185946



Index: installonlyn.py
===================================================================
RCS file: /cvs/dist/rpms/yum/FC-5/installonlyn.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- installonlyn.py	24 Feb 2006 23:25:07 -0000	1.9
+++ installonlyn.py	26 Apr 2006 19:21:27 -0000	1.10
@@ -33,7 +33,8 @@
     """This takes the output of uname and figures out the (version, release)
     tuple for the running kernel."""
     ver = os.uname()[2]
-    for s in ("bigmem", "enterprise", "smp", "hugemem", "guest", "hypervisor"):
+    for s in ("bigmem", "enterprise", "smp", "hugemem",
+              "guest", "hypervisor", "xen0", "xenU"):
         if ver.endswith(s):
             ver = ver.replace(s, "")
     if ver.find("-") != -1:


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/yum/FC-5/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	7 Mar 2006 04:56:41 -0000	1.35
+++ sources	26 Apr 2006 19:21:28 -0000	1.36
@@ -1 +1,2 @@
 37aae7ceca1c3648ac0df86965467ab6  yum-2.6.0.tar.gz
+2dc94410341ef7f4171a7ecdc00be5bf  yum-2.6.1.tar.gz


Index: yum.spec
===================================================================
RCS file: /cvs/dist/rpms/yum/FC-5/yum.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- yum.spec	7 Mar 2006 04:56:41 -0000	1.86
+++ yum.spec	26 Apr 2006 19:21:28 -0000	1.87
@@ -2,8 +2,8 @@
 
 Summary: RPM installer/updater
 Name: yum
-Version: 2.6.0
-Release: 1
+Version: 2.6.1
+Release: 0.fc5
 License: GPL
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/2.5/yum-%{version}.tar.gz
@@ -12,6 +12,7 @@
 Source99: plugin.conf
 # default plugins here
 Source100: installonlyn.py
+
 URL: http://linux.duke.edu/yum/
 BuildArchitectures: noarch
 BuildRequires: python
@@ -92,6 +93,16 @@
 /usr/lib/yum-plugins/*
 
 %changelog
+* Wed Apr 26 2006 Jeremy Katz <katzj at redhat.com> - 2.6.1-1
+- update to 2.6.1 with fixes for #181406, #185309, #161190, #185946
+
+* Tue Apr 18 2006 Jeremy Katz <katzj at redhat.com> - 2.6.0-3
+- more proxy fixing for non CLI use case (#185309)
+
+* Mon Apr 10 2006 Jeremy Katz <katzj at redhat.com> - 2.6.0-2
+- add fix for xen0/xenU kernels in installonlyn (#187894)
+- add fix for proxies with the mirror list (#161190)
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 2.6.0-1
 - update to 2.6.0 final containing fix for #176257
 



From fedora-cvs-commits at redhat.com  Wed Apr 26 19:40:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 15:40:27 -0400
Subject: rpms/gnome-power-manager/FC-5 gnome-power-manager.spec,1.38,1.39
Message-ID: <200604261940.k3QJeRln009329@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-power-manager/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9170

Modified Files:
	gnome-power-manager.spec 
Log Message:
- Put requirement for the latest hal



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/FC-5/gnome-power-manager.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gnome-power-manager.spec	26 Apr 2006 04:59:14 -0000	1.38
+++ gnome-power-manager.spec	26 Apr 2006 19:40:15 -0000	1.39
@@ -1,11 +1,11 @@
 
-%define hal_version  0.5.5.1.cvs
+%define hal_version 0.5.7-3.fc5.1
 %define dbus_version 0.60
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.14.3
-Release: 1
+Release: 1 
 License: GPL
 Group: Applications/System
 Source: gnome-power-manager-%{version}.tar.bz2
@@ -100,6 +100,7 @@
 %changelog
 * Wed Apr 26 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-1
 - Update to 2.14.3
+- Requires hal >= 0.5.7-3.fc5.1
 
 * Sun Apr  9 2006 Ray Strode <rstrode at redhat.com> - 2.14.1-1
 - Update to 2.14.1



From fedora-cvs-commits at redhat.com  Wed Apr 26 19:49:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 15:49:41 -0400
Subject: rpms/gnome-power-manager/FC-5 gnome-power-manager.spec,1.39,1.40
Message-ID: <200604261949.k3QJnfLU026130@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-power-manager/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv25799

Modified Files:
	gnome-power-manager.spec 
Log Message:
- BuildRequires an older version of HAL so we don't have dependancy issues.
  The newer version of HAL is only needed for runtime



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/FC-5/gnome-power-manager.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gnome-power-manager.spec	26 Apr 2006 19:40:15 -0000	1.39
+++ gnome-power-manager.spec	26 Apr 2006 19:49:38 -0000	1.40
@@ -1,4 +1,4 @@
-
+%define hal_devel_version 0.5.5.1.cvs
 %define hal_version 0.5.7-3.fc5.1
 %define dbus_version 0.60
 
@@ -14,7 +14,7 @@
 BuildPrereq: libgnomeui-devel
 BuildPrereq: libglade2-devel
 BuildPrereq: libwnck-devel
-BuildPrereq: hal-devel >= %{hal_version}
+BuildPrereq: hal-devel >= %{hal_devel_version}
 BuildPrereq: dbus-devel >= %{dbus_version}
 BuildPrereq: libnotify-devel
 BuildRequires: scrollkeeper



From fedora-cvs-commits at redhat.com  Wed Apr 26 20:12:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 16:12:11 -0400
Subject: rpms/kernel/devel linux-2.6-header-install-git.patch,1.1,1.2
Message-ID: <200604262012.k3QKCBd1031306@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31272

Modified Files:
	linux-2.6-header-install-git.patch 
Log Message:
Fix typo

linux-2.6-header-install-git.patch:
 Makefile                              |   17 ++++
 include/Kbuild                        |    2 
 include/asm-alpha/Kbuild              |    9 ++
 include/asm-arm/Kbuild                |    7 ++
 include/asm-arm26/Kbuild              |    8 ++
 include/asm-cris/Kbuild               |    6 +
 include/asm-cris/arch-v10/Kbuild      |    3 
 include/asm-generic/Kbuild            |    3 
 include/asm-generic/Kbuild.asm        |   11 +++
 include/asm-h8300/Kbuild              |    6 +
 include/asm-i386/Kbuild               |    5 +
 include/asm-ia64/Kbuild               |    6 +
 include/asm-m32r/Kbuild               |    7 ++
 include/asm-m68k/Kbuild               |   17 ++++
 include/asm-m68knommu/Kbuild          |   12 +++
 include/asm-mips/Kbuild               |   15 ++++
 include/asm-parisc/Kbuild             |    8 ++
 include/asm-powerpc/Kbuild            |   10 ++
 include/asm-ppc/Kbuild                |    8 ++
 include/asm-s390/Kbuild               |    4 +
 include/asm-sh/Kbuild                 |    6 +
 include/asm-sh64/Kbuild               |    6 +
 include/asm-sparc/Kbuild              |   13 +++
 include/asm-sparc64/Kbuild            |   15 ++++
 include/asm-um/Kbuild                 |   14 ++++
 include/asm-v850/Kbuild               |   10 ++
 include/asm-x86_64/Kbuild             |   10 ++
 include/linux/Kbuild                  |   63 ++++++++++++++++++
 include/linux/byteorder/Kbuild        |    1 
 include/linux/dvb/Kbuild              |    2 
 include/linux/hdlc/Kbuild             |    1 
 include/linux/isdn/Kbuild             |    1 
 include/linux/netfilter/Kbuild        |   11 +++
 include/linux/netfilter_arp/Kbuild    |    2 
 include/linux/netfilter_bridge/Kbuild |    4 +
 include/linux/netfilter_ipv4/Kbuild   |   21 ++++++
 include/linux/netfilter_ipv6/Kbuild   |    5 +
 include/linux/nfsd/Kbuild             |    2 
 include/linux/raid/Kbuild             |    1 
 include/linux/sunrpc/Kbuild           |    1 
 include/linux/tc_act/Kbuild           |    1 
 include/linux/tc_ematch/Kbuild        |    1 
 include/media/Kbuild                  |    2 
 include/mtd/Kbuild                    |    2 
 include/rdma/Kbuild                   |    1 
 include/scsi/Kbuild                   |    2 
 include/sound/Kbuild                  |    2 
 include/video/Kbuild                  |    1 
 scripts/Makefile.headersinst          |  116 ++++++++++++++++++++++++++++++++++
 scripts/hdrcheck.sh                   |    8 ++
 50 files changed, 489 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-header-install-git.patch	26 Apr 2006 12:22:04 -0000	1.1
+++ linux-2.6-header-install-git.patch	26 Apr 2006 20:11:56 -0000	1.2
@@ -13,7 +13,7 @@
 +.PHONY: headers_install
 +headers_install: .kernelrelease
 +	@unifdef -Ux /dev/null
-+	@rm -rf $(INSTALL_HDR_PATH)
++	@rm -rf $(INSTALL_HDR_PATH)/include
 +	$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include
 +
 +.PHONY: headers_check
@@ -161,7 +161,7 @@
 @@ -0,0 +1,6 @@
 +include include/asm-generic/Kbuild.asm
 +
-+header-y += break.h fwspa.h fpu.h ia64regs.h kprobes.h perfmon_default_smpl.h \
++header-y += break.h fpswa.h fpu.h ia64regs.h kprobes.h perfmon_default_smpl.h \
 +	 ptrace_offsets.h rse.h setup.h ucontext.h
 +
 +unifdef-y += perfmon.h



From fedora-cvs-commits at redhat.com  Wed Apr 26 20:37:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 16:37:24 -0400
Subject: rpms/glibc/devel .cvsignore, 1.146, 1.147 glibc-fedora.patch, 1.149,
	1.150 glibc.spec, 1.235, 1.236 sources, 1.170, 1.171
Message-ID: <200604262037.k3QKbONV026485@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26451/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec sources 
Log Message:
auto-import glibc-2.4.90-2 on branch devel from glibc-2.4.90-2.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- .cvsignore	25 Apr 2006 09:47:00 -0000	1.146
+++ .cvsignore	26 Apr 2006 20:37:17 -0000	1.147
@@ -1,2 +1,2 @@
-glibc-20060425T0903.tar.bz2
-glibc-fedora-20060425T0903.tar.bz2
+glibc-20060426T2000.tar.bz2
+glibc-fedora-20060426T2000.tar.bz2

glibc-fedora.patch:
 ChangeLog                                                   |   96 +++
 ChangeLog.11                                                |   21 
 ChangeLog.12                                                |   12 
 ChangeLog.15                                                |   45 +
 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 
 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                                          |   15 
 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/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 +
 55 files changed, 1377 insertions(+), 630 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- glibc-fedora.patch	25 Apr 2006 09:47:00 -0000	1.149
+++ glibc-fedora.patch	26 Apr 2006 20:37:17 -0000	1.150
@@ -1,6 +1,6 @@
---- glibc-20060425T0903/ChangeLog	24 Apr 2006 23:02:03 -0000	1.10135
-+++ glibc-20060425T0903-fedora/ChangeLog	25 Apr 2006 09:20:26 -0000	1.8782.2.178
-@@ -759,6 +759,34 @@
+--- glibc-20060426T2000/ChangeLog	26 Apr 2006 19:36:15 -0000	1.10147
++++ glibc-20060426T2000-fedora/ChangeLog	26 Apr 2006 20:18:16 -0000	1.8782.2.179
+@@ -830,6 +830,34 @@
  	_SC_CPUTIME and _SC_THREAD_CPUTIME here.
  	* sysdeps/unix/sysv/linux/x86_64/sysconf.c (__sysconf): Likewise.
  
@@ -35,7 +35,7 @@
  2006-03-05  Roland McGrath  <roland at redhat.com>
  
  	* malloc/malloc.c (MALLOC_ALIGNMENT): Revert to (2 * SIZE_SZ) value.
-@@ -1771,6 +1799,11 @@
+@@ -1842,6 +1870,11 @@
  	(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
  	followed by __THROW.
  
@@ -47,7 +47,7 @@
  2006-02-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/unix/sysv/linux/futimesat.c [__NR_futimesat]
-@@ -1830,6 +1863,11 @@
+@@ -1901,6 +1934,11 @@
  	* sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo.
  	* sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps.
  
@@ -59,7 +59,7 @@
  2006-01-19  Thomas Schwinge  <tschwinge at gnu.org>
  
  	* libio/genops.c: Include <stdbool.h>.
-@@ -4256,6 +4294,10 @@
+@@ -4327,6 +4365,10 @@
  
  	* elf/order2mod2.c (init): Cast ignored value to void.
  
@@ -70,7 +70,7 @@
  2005-12-27  Ulrich Drepper  <drepper at redhat.com>
  
  	* elf/tst-tls13.c (do_test): Avoid using the library path when
-@@ -4539,6 +4581,26 @@
+@@ -4610,6 +4652,26 @@
  	* sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined,
  	use sysdeps/unix/time.c implementation.
  
@@ -97,7 +97,7 @@
  2005-12-19  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #1955]
-@@ -7657,6 +7719,11 @@
+@@ -7728,6 +7790,11 @@
  	R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32,
  	R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros.
  
@@ -109,7 +109,7 @@
  2005-10-03  Roland McGrath  <roland at redhat.com>
  
  	* sysdeps/powerpc/nofpu: Directory removed, saved in ports repository.
-@@ -8651,6 +8718,12 @@
+@@ -8722,6 +8789,12 @@
  	* argp/argp-help.c (__argp_error): __asprintf -> vasprintf.
  	(__argp_failure): Likewise.
  
@@ -122,7 +122,7 @@
  2005-08-08  Ulrich Drepper  <drepper at redhat.com>
  
  	* nscd/cache.c (cache_add): Commit hash table and header to disk.
-@@ -8775,6 +8848,17 @@
+@@ -8846,6 +8919,17 @@
  	__syslog_chk.
  	* misc/Versions: Export __syslog_chk and __vsyslog_chk.
  
@@ -140,7 +140,7 @@
  2005-07-28  Thomas Schwinge  <schwinge at nic-nac-project.de>
  
  	[BZ #1137]
-@@ -11835,6 +11919,18 @@
+@@ -11906,6 +11990,18 @@
  
  	* scripts/soversions.awk: Fix default version set handling.
  
@@ -159,8 +159,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20060425T0903/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20060425T0903-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060426T2000/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
++++ glibc-20060426T2000-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.
@@ -210,8 +210,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-20060425T0903/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20060425T0903-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060426T2000/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
++++ glibc-20060426T2000-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.
@@ -238,8 +238,8 @@
  2001-01-02  Franz Sirl	<Franz.Sirl-kernel at lauterbach.com>
  
  	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
---- glibc-20060425T0903/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20060425T0903-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
+--- glibc-20060426T2000/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20060426T2000-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>
@@ -320,8 +320,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20060425T0903/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20060425T0903-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20060426T2000/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20060426T2000-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;
@@ -346,8 +346,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20060425T0903/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
-+++ glibc-20060425T0903-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
+--- glibc-20060426T2000/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
++++ glibc-20060426T2000-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.  */
@@ -376,8 +376,8 @@
  # define O 0
  #else
  # define O 1
---- glibc-20060425T0903/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
-+++ glibc-20060425T0903-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
+--- glibc-20060426T2000/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
++++ glibc-20060426T2000-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
 @@ -964,17 +964,19 @@ search_dirs (void)
  
  
@@ -459,8 +459,8 @@
      }
  
    search_dirs ();
---- glibc-20060425T0903/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20060425T0903-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20060426T2000/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20060426T2000-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;
@@ -485,8 +485,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060425T0903/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
-+++ glibc-20060425T0903-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
+--- glibc-20060426T2000/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
++++ glibc-20060426T2000-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)
@@ -563,8 +563,8 @@
    /* Open the output file.  */
    if (output_file == NULL)
      {
---- glibc-20060425T0903/include/features.h	5 Jan 2006 12:25:35 -0000	1.42
-+++ glibc-20060425T0903-fedora/include/features.h	6 Jan 2006 09:23:23 -0000	1.35.2.11
+--- glibc-20060426T2000/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
++++ glibc-20060426T2000-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
 @@ -275,7 +275,13 @@
  #endif
  
@@ -580,16 +580,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20060425T0903/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060425T0903-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060426T2000/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060426T2000-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-20060425T0903/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060425T0903-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060426T2000/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060426T2000-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-20060425T0903/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20060425T0903-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20060426T2000/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20060426T2000-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
@@ -599,8 +599,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20060425T0903/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
-+++ glibc-20060425T0903-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
+--- glibc-20060426T2000/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
++++ glibc-20060426T2000-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.  */
@@ -614,8 +614,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20060425T0903/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
-+++ glibc-20060425T0903-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
+--- glibc-20060426T2000/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
++++ glibc-20060426T2000-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);
@@ -646,15 +646,15 @@
  
  #endif
  
---- glibc-20060425T0903/locale/iso-4217.def	23 Sep 2005 19:07:54 -0000	1.18
-+++ glibc-20060425T0903-fedora/locale/iso-4217.def	3 Oct 2005 20:44:15 -0000	1.15.2.3
+--- glibc-20060426T2000/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
++++ glibc-20060426T2000-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 !!!
   */
 +DEFINE_INT_CURR("ADP")		/* Andorran Peseta -> EUR  */
  DEFINE_INT_CURR("AED")		/* United Arab Emirates Dirham  */
- DEFINE_INT_CURR("AFA")		/* Afghanistan Afgani  */
+ DEFINE_INT_CURR("AFN")		/* Afghanistan Afgani  */
  DEFINE_INT_CURR("ALL")		/* Albanian Lek  */
 @@ -15,12 +16,14 @@ DEFINE_INT_CURR("AMD")		/* Armenia Dram 
  DEFINE_INT_CURR("ANG")		/* Netherlands Antilles  */
@@ -664,11 +664,11 @@
  DEFINE_INT_CURR("AUD")		/* Australian Dollar  */
  DEFINE_INT_CURR("AWG")		/* Aruba Guilder  */
  DEFINE_INT_CURR("AZM")		/* Azerbaijan Manat  */
- DEFINE_INT_CURR("BAK")		/* Bosnian and Herzegovina Convertible Mark  */
+ DEFINE_INT_CURR("BAM")		/* Bosnian and Herzegovina Convertible Mark  */
  DEFINE_INT_CURR("BBD")		/* Barbados Dollar  */
  DEFINE_INT_CURR("BDT")		/* Bangladesh Taka  */
 +DEFINE_INT_CURR("BEF")		/* Belgian Franc -> EUR  */
- DEFINE_INT_CURR("BGL")		/* Bulgarian Lev  */
+ DEFINE_INT_CURR("BGN")		/* Bulgarian Lev  */
  DEFINE_INT_CURR("BHD")		/* Bahraini Dinar  */
  DEFINE_INT_CURR("BIF")		/* Burundi Franc  */
 @@ -45,6 +48,7 @@ DEFINE_INT_CURR("CUP")		/* Cuban Peso  *
@@ -712,10 +712,10 @@
  DEFINE_INT_CURR("IRR")		/* Iranian Rial  */
  DEFINE_INT_CURR("ISK")		/* Iceland Krona  */
 +DEFINE_INT_CURR("ITL")		/* Italian Lira -> EUR  */
+ DEFINE_INT_CURR("JEP")		/* Jersey Pound  */
  DEFINE_INT_CURR("JMD")		/* Jamaican Dollar  */
  DEFINE_INT_CURR("JOD")		/* Jordanian Dinar  */
- DEFINE_INT_CURR("JPY")		/* Japanese Yen  */
-@@ -94,6 +104,7 @@ DEFINE_INT_CURR("LKR")		/* Sri Lankan Ru
+@@ -95,6 +105,7 @@ DEFINE_INT_CURR("LKR")		/* Sri Lankan Ru
  DEFINE_INT_CURR("LRD")		/* Liberian Dollar  */
  DEFINE_INT_CURR("LSL")		/* Lesotho Maloti  */
  DEFINE_INT_CURR("LTL")		/* Lithuanian Litas  */
@@ -723,7 +723,7 @@
  DEFINE_INT_CURR("LVL")		/* Latvia Lat  */
  DEFINE_INT_CURR("LYD")		/* Libyan Arab Jamahiriya Dinar  */
  DEFINE_INT_CURR("MAD")		/* Moroccan Dirham  */
-@@ -114,6 +125,7 @@ DEFINE_INT_CURR("MZM")		/* Mozambique Me
+@@ -115,6 +126,7 @@ DEFINE_INT_CURR("MZM")		/* Mozambique Me
  DEFINE_INT_CURR("NAD")		/* Namibia Dollar  */
  DEFINE_INT_CURR("NGN")		/* Nigeria Naira  */
  DEFINE_INT_CURR("NIO")		/* Nicaragua Cordoba Oro  */
@@ -731,7 +731,7 @@
  DEFINE_INT_CURR("NOK")		/* Norwegian Krone  */
  DEFINE_INT_CURR("NPR")		/* Nepalese Rupee  */
  DEFINE_INT_CURR("NZD")		/* New Zealand Dollar  */
-@@ -124,6 +136,7 @@ DEFINE_INT_CURR("PGK")		/* Papau New Gui
+@@ -125,6 +137,7 @@ DEFINE_INT_CURR("PGK")		/* Papau New Gui
  DEFINE_INT_CURR("PHP")		/* Philippines Peso  */
  DEFINE_INT_CURR("PKR")		/* Pakistan Rupee  */
  DEFINE_INT_CURR("PLN")		/* Polish Zloty  */
@@ -739,8 +739,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20060425T0903/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
-+++ glibc-20060425T0903-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
+--- glibc-20060426T2000/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
++++ glibc-20060426T2000-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,
  	}
      }
@@ -784,9 +784,9 @@
  #endif
  
  #ifndef NO_FINALIZE
---- glibc-20060425T0903/localedata/Makefile	25 Sep 2005 17:01:12 -0000	1.102
-+++ glibc-20060425T0903-fedora/localedata/Makefile	3 Oct 2005 20:44:15 -0000	1.101.2.2
-@@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
+--- glibc-20060426T2000/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
++++ glibc-20060426T2000-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/'`; \
  	$(LOCALEDEF) --alias-file=../intl/locale.alias \
@@ -794,8 +794,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20060425T0903/localedata/SUPPORTED	24 Apr 2006 07:06:44 -0000	1.90
-+++ glibc-20060425T0903-fedora/localedata/SUPPORTED	24 Apr 2006 08:55:41 -0000	1.71.2.9
+--- glibc-20060426T2000/localedata/SUPPORTED	24 Apr 2006 07:06:44 -0000	1.90
++++ glibc-20060426T2000-fedora/localedata/SUPPORTED	24 Apr 2006 08:55:41 -0000	1.71.2.9
 @@ -75,6 +75,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -837,8 +837,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20060425T0903/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20060425T0903-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20060426T2000/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20060426T2000-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>"
@@ -853,8 +853,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20060425T0903/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
-+++ glibc-20060425T0903-fedora/localedata/locales/en_GB	2 Nov 2004 12:25:47 -0000	1.10.2.2
+--- glibc-20060426T2000/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
++++ glibc-20060426T2000-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>"
@@ -866,8 +866,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-20060425T0903/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060425T0903-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20060426T2000/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20060426T2000-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -938,8 +938,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20060425T0903/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20060425T0903-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20060426T2000/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20060426T2000-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -967,8 +967,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20060425T0903/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
-+++ glibc-20060425T0903-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
+--- glibc-20060426T2000/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
++++ glibc-20060426T2000-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>
@@ -1044,8 +1044,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20060425T0903/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
-+++ glibc-20060425T0903-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20060426T2000/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
++++ glibc-20060426T2000-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)
@@ -1101,8 +1101,8 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20060425T0903/nptl/ChangeLog	9 Apr 2006 02:45:24 -0000	1.887
-+++ glibc-20060425T0903-fedora/nptl/ChangeLog	24 Apr 2006 08:55:42 -0000	1.706.2.85
+--- glibc-20060426T2000/nptl/ChangeLog	9 Apr 2006 02:45:24 -0000	1.887
++++ glibc-20060426T2000-fedora/nptl/ChangeLog	24 Apr 2006 08:55:42 -0000	1.706.2.85
 @@ -798,6 +798,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -1143,8 +1143,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20060425T0903/nptl/Makefile	28 Mar 2006 04:13:27 -0000	1.180
-+++ glibc-20060425T0903-fedora/nptl/Makefile	28 Mar 2006 09:36:22 -0000	1.157.2.20
+--- glibc-20060426T2000/nptl/Makefile	28 Mar 2006 04:13:27 -0000	1.180
++++ glibc-20060426T2000-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
@@ -1167,8 +1167,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20060425T0903/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20060425T0903-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20060426T2000/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20060426T2000-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;
@@ -1193,8 +1193,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060425T0903/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060425T0903-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20060426T2000/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060426T2000-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>
 +
@@ -1202,8 +1202,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20060425T0903/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	9 Apr 2006 02:42:29 -0000	1.30
-+++ glibc-20060425T0903-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	24 Apr 2006 08:55:42 -0000	1.25.2.5
+--- glibc-20060426T2000/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	9 Apr 2006 02:42:29 -0000	1.30
++++ glibc-20060426T2000-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")
  
@@ -1539,8 +1539,8 @@
  			      : "=m" (futex), "=&a" (ignore)		      \
  			      : "m" (futex),				      \
  				"i" (offsetof (tcbhead_t, multiple_threads))  \
---- glibc-20060425T0903/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
-+++ glibc-20060425T0903-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	24 Apr 2006 08:55:43 -0000	1.13.2.3
+--- glibc-20060426T2000/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
++++ glibc-20060426T2000-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.
@@ -1686,8 +1686,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060425T0903/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
-+++ glibc-20060425T0903-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
+--- glibc-20060426T2000/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
++++ glibc-20060426T2000-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
@@ -1788,8 +1788,8 @@
 -	ret
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060425T0903/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
-+++ glibc-20060425T0903-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
+--- glibc-20060426T2000/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
++++ glibc-20060426T2000-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.
@@ -1931,8 +1931,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060425T0903/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	17 Feb 2006 08:06:14 -0000	1.26
-+++ glibc-20060425T0903-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	6 Mar 2006 07:33:30 -0000	1.23.2.3
+--- glibc-20060426T2000/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	17 Feb 2006 08:06:14 -0000	1.26
++++ glibc-20060426T2000-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")
  
@@ -2320,8 +2320,8 @@
  			      : "=m" (futex), "=&D" (ignore)		      \
  			      : "m" (futex)				      \
  			      : "ax", "cx", "r11", "cc", "memory"); })
---- glibc-20060425T0903/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
-+++ glibc-20060425T0903-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
+--- glibc-20060426T2000/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
++++ glibc-20060426T2000-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
@@ -2416,11 +2416,11 @@
 -	retq
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060425T0903/nscd/connections.c	1 Apr 2006 18:49:53 -0000	1.83
-+++ glibc-20060425T0903-fedora/nscd/connections.c	24 Apr 2006 08:55:43 -0000	1.55.2.20
-@@ -1879,3 +1879,18 @@ finish_drop_privileges (void)
-       exit (4);
-     }
+--- glibc-20060426T2000/nscd/connections.c	26 Apr 2006 17:28:50 -0000	1.85
++++ glibc-20060426T2000-fedora/nscd/connections.c	26 Apr 2006 20:18:18 -0000	1.55.2.21
+@@ -1892,3 +1892,18 @@ finish_drop_privileges (void)
+   install_real_capabilities (new_caps);
+ #endif
  }
 +
 +/* Handle the HUP signal which will force a dump of the cache */
@@ -2437,8 +2437,8 @@
 +    prune_cache (&dbs[hstdb], LONG_MAX);
 +}
 +
---- glibc-20060425T0903/nscd/nscd.c	6 Apr 2006 22:55:50 -0000	1.52
-+++ glibc-20060425T0903-fedora/nscd/nscd.c	24 Apr 2006 08:55:43 -0000	1.38.2.12
+--- glibc-20060426T2000/nscd/nscd.c	6 Apr 2006 22:55:50 -0000	1.52
++++ glibc-20060426T2000-fedora/nscd/nscd.c	24 Apr 2006 08:55:43 -0000	1.38.2.12
 @@ -119,6 +119,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -2457,9 +2457,9 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20060425T0903/nscd/nscd.conf	23 Aug 2005 23:17:32 -0000	1.11
-+++ glibc-20060425T0903-fedora/nscd/nscd.conf	24 Aug 2005 07:23:30 -0000	1.8.2.3
-@@ -32,8 +32,8 @@
+--- glibc-20060426T2000/nscd/nscd.conf	26 Apr 2006 17:27:03 -0000	1.12
++++ glibc-20060426T2000-fedora/nscd/nscd.conf	26 Apr 2006 20:18:18 -0000	1.8.2.4
+@@ -33,8 +33,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
  #	max-threads		128
@@ -2470,8 +2470,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20060425T0903/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
-+++ glibc-20060425T0903-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
+--- glibc-20060426T2000/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
++++ glibc-20060426T2000-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
@@ -2512,8 +2512,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20060425T0903/posix/Makefile	15 Apr 2006 21:41:25 -0000	1.189
-+++ glibc-20060425T0903-fedora/posix/Makefile	24 Apr 2006 08:55:43 -0000	1.171.2.17
+--- glibc-20060426T2000/posix/Makefile	15 Apr 2006 21:41:25 -0000	1.189
++++ glibc-20060426T2000-fedora/posix/Makefile	24 Apr 2006 08:55:43 -0000	1.171.2.17
 @@ -107,7 +107,8 @@ generated := $(addprefix wordexp-test-re
  	     bug-regex21-mem bug-regex21.mtrace \
  	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
@@ -2547,8 +2547,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
---- glibc-20060425T0903/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060425T0903-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20060426T2000/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060426T2000-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 =
@@ -2565,8 +2565,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20060425T0903/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20060425T0903-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20060426T2000/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20060426T2000-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
@@ -2582,8 +2582,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-20060425T0903/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20060425T0903-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20060426T2000/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20060426T2000-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))
@@ -2595,8 +2595,8 @@
  endif
  endif
  
---- glibc-20060425T0903/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20060425T0903-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20060426T2000/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20060426T2000-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.  */
@@ -2948,8 +2948,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20060425T0903/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060425T0903-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060426T2000/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060426T2000-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.
@@ -3035,8 +3035,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20060425T0903/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
-+++ glibc-20060425T0903-fedora/sysdeps/unix/nice.c	22 Sep 2004 21:21:08 -0000	1.6.2.1
+--- glibc-20060426T2000/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
++++ glibc-20060426T2000-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);
      }
@@ -3051,8 +3051,8 @@
    if (result != -1)
      return getpriority (PRIO_PROCESS, 0);
    else
---- glibc-20060425T0903/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Jan 2006 08:21:15 -0000	1.22
-+++ glibc-20060425T0903-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	9 Jan 2006 21:55:08 -0000	1.14.2.8
+--- glibc-20060426T2000/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Jan 2006 08:21:15 -0000	1.22
++++ glibc-20060426T2000-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.  */
  
@@ -3101,8 +3101,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20060425T0903/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20060425T0903-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20060426T2000/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20060426T2000-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;
@@ -3145,8 +3145,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20060425T0903/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20060425T0903-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20060426T2000/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20060426T2000-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"
@@ -3156,8 +3156,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20060425T0903/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20060425T0903-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20060426T2000/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20060426T2000-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;
@@ -3203,8 +3203,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20060425T0903/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060425T0903-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060426T2000/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060426T2000-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.
@@ -3265,8 +3265,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20060425T0903/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20060425T0903-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20060426T2000/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20060426T2000-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)
@@ -3299,24 +3299,24 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20060425T0903/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060425T0903-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060426T2000/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060426T2000-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-20060425T0903/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060425T0903-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060426T2000/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060426T2000-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-20060425T0903/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20060425T0903-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20060426T2000/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20060426T2000-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.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- glibc.spec	25 Apr 2006 09:47:01 -0000	1.235
+++ glibc.spec	26 Apr 2006 20:37:19 -0000	1.236
@@ -1,9 +1,9 @@
-%define glibcdate 20060425T0903
+%define glibcdate 20060426T2000
 %define glibcname glibc
-%define glibcsrcdir glibc-20060425T0903
+%define glibcsrcdir glibc-20060426T2000
 %define glibc_release_tarballs 0
 %define glibcversion 2.4.90
-%define glibcrelease 1
+%define glibcrelease 2
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define xenarches i686 athlon
@@ -46,7 +46,7 @@
 # This is for building auxiliary programs like memusage, nscd
 # For initial glibc bootstraps it can be commented out
 BuildPreReq: gd-devel libpng-devel zlib-devel texinfo, libselinux-devel >= 1.17.10-1
-BuildPreReq: audit-libs-devel >= 1.1.3, sed >= 3.95
+BuildPreReq: audit-libs-devel >= 1.1.3, sed >= 3.95, libcap-devel
 %ifarch %{prelinkarches}
 BuildPreReq: prelink >= 0.2.0-5
 %endif
@@ -1394,6 +1394,12 @@
 %endif
 
 %changelog
+* Wed Apr 26 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-2
+- update from CVS
+  - fix getaddrinfo (#190002)
+  - add auto-propagate nscd.conf options (#177154)
+  - fix nscd auditing (#169148)
+
 * Tue Apr 25 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-1
 - update from CVS
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- sources	25 Apr 2006 09:47:01 -0000	1.170
+++ sources	26 Apr 2006 20:37:20 -0000	1.171
@@ -1,2 +1,2 @@
-16b5f16a0ed4fcf5ea751ad2702ae25e  glibc-20060425T0903.tar.bz2
-7edb61eb2991b5c7e1351123f251f485  glibc-fedora-20060425T0903.tar.bz2
+3779fc87ccf9879fea067c903e5d804f  glibc-20060426T2000.tar.bz2
+dbdda4bbcc47526d21a4a1610f76feaa  glibc-fedora-20060426T2000.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 26 20:49:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 16:49:12 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.103, 1.104 mkinitrd.spec, 1.116,
	1.117 sources, 1.116, 1.117
Message-ID: <200604262049.k3QKnClU020766@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20726/devel

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
auto-import mkinitrd-5.0.35-1 on branch devel from mkinitrd-5.0.35-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- .cvsignore	10 Apr 2006 18:11:50 -0000	1.103
+++ .cvsignore	26 Apr 2006 20:49:08 -0000	1.104
@@ -1 +1 @@
-mkinitrd-5.0.34.tar.bz2
+mkinitrd-5.0.35.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- mkinitrd.spec	10 Apr 2006 18:11:52 -0000	1.116
+++ mkinitrd.spec	26 Apr 2006 20:49:08 -0000	1.117
@@ -1,6 +1,6 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.0.34
+Version: 5.0.35
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -63,6 +63,9 @@
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
 
 %changelog
+* Wed Apr 26 2006 Bill Nottingham <notting at redhat.com> - 5.0.35-1
+- NFS root fixes
+
 * Mon Apr 10 2006 Peter Jones <pjones at redhat.com> - 5.0.34-1
 - fix "!" handling for sysfs paths in mkblkdevs
 - fix argument checking for mknodCommand


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- sources	10 Apr 2006 18:11:50 -0000	1.116
+++ sources	26 Apr 2006 20:49:08 -0000	1.117
@@ -1 +1 @@
-1417d8a5aea4ec1b8a227706d4859890  mkinitrd-5.0.34.tar.bz2
+9cbcecc44fc60f406b8d774fa196b693  mkinitrd-5.0.35.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 26 20:53:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 16:53:24 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2163,1.2164
Message-ID: <200604262053.k3QKrO6O022348@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22311

Modified Files:
	kernel-2.6.spec 
Log Message:
remove hypervisor figlet to get x86_64 building


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2163
retrieving revision 1.2164
diff -u -r1.2163 -r1.2164
--- kernel-2.6.spec	26 Apr 2006 12:22:04 -0000	1.2163
+++ kernel-2.6.spec	26 Apr 2006 20:53:21 -0000	1.2164
@@ -719,6 +719,8 @@
   rm -f pax_global_header
 %setup -q -n %{name}-%{version} -c -a1
   cp %{SOURCE2} .
+# Don't ask, it kills x86_64 rawhide
+  rm xen/tools/figlet/figlet
   mv linux-%{kversion} vanilla
   mv xen xen-vanilla
   cp %{SOURCE2} .
@@ -1704,6 +1706,9 @@
 %endif
 
 %changelog
+* Wed Apr 26 2006 Juan Quintela <quintela at redhat.com>
+- Delete figlet form xen hypervisor.
+
 * Wed Apr 26 2006 David Woodhouse <dwmw2 at redhat.com>
 - Include kernel-headers subpackage, conditionally (and off for now)
 



From fedora-cvs-commits at redhat.com  Wed Apr 26 23:46:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 19:46:22 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2164,
	1.2165 linux-2.6-header-cleanup-git.patch, 1.1,
	1.2 linux-2.6-header-install-git.patch, 1.2, 1.3
Message-ID: <200604262346.k3QNkMna021029@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20649

Modified Files:
	kernel-2.6.spec linux-2.6-header-cleanup-git.patch 
	linux-2.6-header-install-git.patch 
Log Message:
this kernel-headers should work


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2164
retrieving revision 1.2165
diff -u -r1.2164 -r1.2165
--- kernel-2.6.spec	26 Apr 2006 20:53:21 -0000	1.2164
+++ kernel-2.6.spec	26 Apr 2006 23:46:20 -0000	1.2165
@@ -13,7 +13,7 @@
 %define buildxenPAE 0
 %define builddoc 0
 %define buildkdump 1
-%define buildheaders 0
+%define buildheaders 1
 
 # Versions of various parts
 
@@ -749,11 +749,6 @@
 %patch1 -p1
 %patch2 -p1
 
-%if %{buildheaders}
-%patch50 -p1
-%patch51 -p1
-%endif
-
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
 #
@@ -1054,6 +1049,11 @@
 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
 %patch10001 -p1
 
+# Put these last for now, so they don't conflict with other people's patches
+%if %{buildheaders}
+%patch50 -p1
+%patch51 -p1
+%endif
 
 # END OF PATCH APPLICATIONS
 
@@ -1364,6 +1364,8 @@
 %if %{buildheaders}
 # Install kernel headers
 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
 %endif
 ###
 ### clean
@@ -1706,6 +1708,11 @@
 %endif
 
 %changelog
+* Wed Apr 26 2006 David Woodhouse <dwmw2 at redhat.com>
+- Don't include /usr/include/scsi in kernel-headers for now, because
+  glibc ships those for itself. Update header cleanup patches so that
+  glibc actually builds against the resulting headers
+
 * Wed Apr 26 2006 Juan Quintela <quintela at redhat.com>
 - Delete figlet form xen hypervisor.
 

linux-2.6-header-cleanup-git.patch:
 acpi/platform/aclinux.h                      |    1 
 acpi/processor.h                             |    1 
 asm-alpha/bitops.h                           |    1 
 asm-alpha/cache.h                            |    1 
 asm-alpha/cacheflush.h                       |    1 
 asm-alpha/core_cia.h                         |    1 
 asm-alpha/core_t2.h                          |    1 
 asm-alpha/dma-mapping.h                      |    1 
 asm-alpha/dma.h                              |    1 
 asm-alpha/floppy.h                           |    1 
 asm-alpha/hardirq.h                          |    1 
 asm-alpha/hw_irq.h                           |    1 
 asm-alpha/ide.h                              |    1 
 asm-alpha/io.h                               |    1 
 asm-alpha/irq.h                              |    1 
 asm-alpha/kmap_types.h                       |    1 
 asm-alpha/machvec.h                          |    1 
 asm-alpha/mmu_context.h                      |    1 
 asm-alpha/mmzone.h                           |    1 
 asm-alpha/page.h                             |    1 
 asm-alpha/param.h                            |    1 
 asm-alpha/pgalloc.h                          |    1 
 asm-alpha/pgtable.h                          |    1 
 asm-alpha/serial.h                           |    1 
 asm-alpha/smp.h                              |    1 
 asm-alpha/spinlock.h                         |    1 
 asm-alpha/system.h                           |    1 
 asm-alpha/tlbflush.h                         |    1 
 asm-arm/apm.h                                |    1 
 asm-arm/arch-aaec2000/memory.h               |    1 
 asm-arm/arch-cl7500/acornfb.h                |    1 
 asm-arm/arch-clps711x/hardware.h             |    1 
 asm-arm/arch-clps711x/memory.h               |    1 
 asm-arm/arch-clps711x/uncompress.h           |    1 
 asm-arm/arch-ebsa285/hardware.h              |    1 
 asm-arm/arch-ebsa285/memory.h                |    1 
 asm-arm/arch-ebsa285/vmalloc.h               |    1 
 asm-arm/arch-integrator/smp.h                |    1 
 asm-arm/arch-iop3xx/memory.h                 |    1 
 asm-arm/arch-iop3xx/timex.h                  |    1 
 asm-arm/arch-iop3xx/uncompress.h             |    1 
 asm-arm/arch-ixp4xx/dma.h                    |    1 
 asm-arm/arch-lh7a40x/constants.h             |    1 
 asm-arm/arch-lh7a40x/irqs.h                  |    1 
 asm-arm/arch-lh7a40x/registers.h             |    1 
 asm-arm/arch-omap/board.h                    |    1 
 asm-arm/arch-omap/hardware.h                 |    1 
 asm-arm/arch-omap/system.h                   |    1 
 asm-arm/arch-omap/uncompress.h               |    1 
 asm-arm/arch-pxa/idp.h                       |    1 
 asm-arm/arch-pxa/irqs.h                      |    1 
 asm-arm/arch-pxa/pxa-regs.h                  |    1 
 asm-arm/arch-pxa/timex.h                     |    1 
 asm-arm/arch-realview/smp.h                  |    1 
 asm-arm/arch-s3c2410/dma.h                   |    1 
 asm-arm/arch-s3c2410/uncompress.h            |    1 
 asm-arm/arch-sa1100/assabet.h                |    1 
 asm-arm/arch-sa1100/cerf.h                   |    1 
 asm-arm/arch-sa1100/collie.h                 |    1 
 asm-arm/arch-sa1100/dma.h                    |    1 
 asm-arm/arch-sa1100/hardware.h               |    1 
 asm-arm/arch-sa1100/ide.h                    |    1 
 asm-arm/arch-sa1100/irqs.h                   |    1 
 asm-arm/arch-sa1100/memory.h                 |    1 
 asm-arm/arch-sa1100/system.h                 |    1 
 asm-arm/atomic.h                             |    1 
 asm-arm/bug.h                                |    1 
 asm-arm/cacheflush.h                         |    1 
 asm-arm/cpu.h                                |    1 
 asm-arm/dma-mapping.h                        |    1 
 asm-arm/dma.h                                |    1 
 asm-arm/elf.h                                |    1 
 asm-arm/fpstate.h                            |    1 
 asm-arm/glue.h                               |    1 
 asm-arm/hardirq.h                            |    1 
 asm-arm/hardware/dec21285.h                  |    1 
 asm-arm/hardware/iomd.h                      |    1 
 asm-arm/leds.h                               |    1 
 asm-arm/mach/serial_at91rm9200.h             |    1 
 asm-arm/mach/serial_sa1100.h                 |    1 
 asm-arm/memory.h                             |    1 
 asm-arm/page.h                               |    1 
 asm-arm/pci.h                                |    1 
 asm-arm/proc-fns.h                           |    1 
 asm-arm/ptrace.h                             |    1 
 asm-arm/smp.h                                |    1 
 asm-arm/system.h                             |    1 
 asm-arm/tlbflush.h                           |    1 
 asm-arm26/atomic.h                           |    1 
 asm-arm26/bug.h                              |    1 
 asm-arm26/dma.h                              |    1 
 asm-arm26/hardirq.h                          |    1 
 asm-arm26/hardware.h                         |    1 
 asm-arm26/io.h                               |    1 
 asm-arm26/leds.h                             |    1 
 asm-arm26/mach-types.h                       |    1 
 asm-arm26/page.h                             |    1 
 asm-arm26/pgtable.h                          |    1 
 asm-arm26/serial.h                           |    1 
 asm-arm26/smp.h                              |    1 
 asm-arm26/sysirq.h                           |    1 
 asm-arm26/system.h                           |    1 
 asm-cris/arch-v10/io.h                       |    1 
 asm-cris/arch-v10/page.h                     |    1 
 asm-cris/arch-v10/system.h                   |    1 
 asm-cris/arch-v32/io.h                       |    1 
 asm-cris/arch-v32/irq.h                      |    1 
 asm-cris/arch-v32/page.h                     |    1 
 asm-cris/arch-v32/processor.h                |    1 
 asm-cris/arch-v32/system.h                   |    1 
 asm-cris/eshlibld.h                          |    1 
 asm-cris/etraxgpio.h                         |    1 
 asm-cris/fasttimer.h                         |    1 
 asm-cris/page.h                              |    1 
 asm-cris/pci.h                               |    1 
 asm-cris/pgtable.h                           |    1 
 asm-cris/processor.h                         |    1 
 asm-cris/rtc.h                               |    1 
 asm-cris/tlbflush.h                          |    1 
 asm-frv/atomic.h                             |    1 
 asm-frv/bitops.h                             |    1 
 asm-frv/bug.h                                |    1 
 asm-frv/cache.h                              |    1 
 asm-frv/dma.h                                |    1 
 asm-frv/elf.h                                |    1 
 asm-frv/fpu.h                                |    1 
 asm-frv/hardirq.h                            |    1 
 asm-frv/highmem.h                            |    1 
 asm-frv/ide.h                                |    1 
 asm-frv/io.h                                 |    1 
 asm-frv/irq.h                                |    1 
 asm-frv/mmu_context.h                        |    1 
 asm-frv/page.h                               |    1 
 asm-frv/pci.h                                |    1 
 asm-frv/pgalloc.h                            |    1 
 asm-frv/pgtable.h                            |    1 
 asm-frv/processor.h                          |    1 
 asm-frv/segment.h                            |    1 
 asm-frv/serial.h                             |    1 
 asm-frv/smp.h                                |    1 
 asm-frv/system.h                             |    1 
 asm-frv/tlbflush.h                           |    1 
 asm-frv/types.h                              |    1 
 asm-frv/unaligned.h                          |    1 
 asm-frv/virtconvert.h                        |    1 
 asm-generic/bug.h                            |    1 
 asm-generic/dma-mapping.h                    |    1 
 asm-generic/fcntl.h                          |    1 
 asm-generic/local.h                          |    1 
 asm-generic/tlb.h                            |    1 
 asm-h8300/bitops.h                           |    1 
 asm-h8300/dma.h                              |    1 
 asm-h8300/elf.h                              |    1 
 asm-h8300/hardirq.h                          |    1 
 asm-h8300/io.h                               |    1 
 asm-h8300/keyboard.h                         |    1 
 asm-h8300/mmu_context.h                      |    1 
 asm-h8300/page.h                             |    1 
 asm-h8300/page_offset.h                      |    1 
 asm-h8300/param.h                            |    1 
 asm-h8300/pgtable.h                          |    1 
 asm-h8300/processor.h                        |    1 
 asm-h8300/semaphore-helper.h                 |    1 
 asm-h8300/shm.h                              |    1 
 asm-h8300/system.h                           |    1 
 asm-h8300/unaligned.h                        |    1 
 asm-h8300/virtconvert.h                      |    1 
 asm-i386/apic.h                              |    1 
 asm-i386/atomic.h                            |    1 
 asm-i386/bitops.h                            |    1 
 asm-i386/bug.h                               |    1 
 asm-i386/bugs.h                              |    1 
 asm-i386/byteorder.h                         |    1 
 asm-i386/cache.h                             |    1 
 asm-i386/dma.h                               |    1 
 asm-i386/fixmap.h                            |    1 
 asm-i386/hardirq.h                           |    1 
 asm-i386/highmem.h                           |    1 
 asm-i386/hpet.h                              |    1 
 asm-i386/hw_irq.h                            |    1 
 asm-i386/ide.h                               |    1 
 asm-i386/io.h                                |    1 
 asm-i386/io_apic.h                           |    1 
 asm-i386/irq.h                               |    1 
 asm-i386/kmap_types.h                        |    1 
 asm-i386/mach-summit/mach_apic.h             |    1 
 asm-i386/mmu_context.h                       |    1 
 asm-i386/mtrr.h                              |    1 
 asm-i386/page.h                              |    1 
 asm-i386/param.h                             |    1 
 asm-i386/pci.h                               |    1 
 asm-i386/pgalloc.h                           |    1 
 asm-i386/pgtable.h                           |    1 
 asm-i386/processor.h                         |    1 
 asm-i386/serial.h                            |    1 
 asm-i386/smp.h                               |    1 
 asm-i386/spinlock.h                          |    1 
 asm-i386/string.h                            |    1 
 asm-i386/system.h                            |    1 
 asm-i386/thread_info.h                       |    1 
 asm-i386/timex.h                             |    1 
 asm-i386/tlbflush.h                          |    1 
 asm-i386/types.h                             |    1 
 asm-i386/uaccess.h                           |    1 
 asm-ia64/asmmacro.h                          |    1 
 asm-ia64/cache.h                             |    1 
 asm-ia64/delay.h                             |    1 
 asm-ia64/dma-mapping.h                       |    1 
 asm-ia64/dma.h                               |    1 
 asm-ia64/elf.h                               |    1 
 asm-ia64/hardirq.h                           |    1 
 asm-ia64/ia32.h                              |    1 
 asm-ia64/ide.h                               |    1 
 asm-ia64/intrinsics.h                        |    1 
 asm-ia64/kmap_types.h                        |    1 
 asm-ia64/machvec.h                           |    1 
 asm-ia64/meminit.h                           |    1 
 asm-ia64/nodedata.h                          |    1 
 asm-ia64/numa.h                              |    1 
 asm-ia64/page.h                              |    1 
 asm-ia64/param.h                             |    1 
 asm-ia64/percpu.h                            |    1 
 asm-ia64/pgalloc.h                           |    1 
 asm-ia64/pgtable.h                           |    1 
 asm-ia64/processor.h                         |    1 
 asm-ia64/ptrace.h                            |    1 
 asm-ia64/smp.h                               |    1 
 asm-ia64/sn/simulator.h                      |    1 
 asm-ia64/sn/sn_cpuid.h                       |    1 
 asm-ia64/sn/sn_sal.h                         |    1 
 asm-ia64/sn/xpc.h                            |    1 
 asm-ia64/string.h                            |    1 
 asm-ia64/system.h                            |    1 
 asm-ia64/tlb.h                               |    1 
 asm-ia64/tlbflush.h                          |    1 
 asm-ia64/unistd.h                            |    1 
 asm-m32r/assembler.h                         |    1 
 asm-m32r/atomic.h                            |    1 
 asm-m32r/bitops.h                            |    1 
 asm-m32r/cacheflush.h                        |    1 
 asm-m32r/hardirq.h                           |    1 
 asm-m32r/ide.h                               |    1 
 asm-m32r/irq.h                               |    1 
 asm-m32r/kmap_types.h                        |    1 
 asm-m32r/m32104ut/m32104ut_pld.h             |    1 
 asm-m32r/m32700ut/m32700ut_lan.h             |    1 
 asm-m32r/m32700ut/m32700ut_lcd.h             |    1 
 asm-m32r/m32700ut/m32700ut_pld.h             |    1 
 asm-m32r/m32r.h                              |    1 
 asm-m32r/mmu.h                               |    1 
 asm-m32r/mmu_context.h                       |    2 
 asm-m32r/opsput/opsput_lan.h                 |    1 
 asm-m32r/opsput/opsput_lcd.h                 |    1 
 asm-m32r/opsput/opsput_pld.h                 |    1 
 asm-m32r/page.h                              |    1 
 asm-m32r/pgalloc.h                           |    1 
 asm-m32r/pgtable-2level.h                    |    1 
 asm-m32r/pgtable.h                           |    1 
 asm-m32r/processor.h                         |    1 
 asm-m32r/ptrace.h                            |    1 
 asm-m32r/rtc.h                               |    1 
 asm-m32r/semaphore.h                         |    1 
 asm-m32r/serial.h                            |    1 
 asm-m32r/sigcontext.h                        |    1 
 asm-m32r/smp.h                               |    1 
 asm-m32r/spinlock.h                          |    1 
 asm-m32r/system.h                            |    1 
 asm-m32r/timex.h                             |    1 
 asm-m32r/tlbflush.h                          |    1 
 asm-m32r/uaccess.h                           |    1 
 asm-m68k/atomic.h                            |    1 
 asm-m68k/bug.h                               |    1 
 asm-m68k/dma-mapping.h                       |    1 
 asm-m68k/dma.h                               |    1 
 asm-m68k/dvma.h                              |    1 
 asm-m68k/elf.h                               |    1 
 asm-m68k/entry.h                             |    1 
 asm-m68k/fpu.h                               |    1 
 asm-m68k/hardirq.h                           |    1 
 asm-m68k/ide.h                               |    1 
 asm-m68k/io.h                                |    1 
 asm-m68k/irq.h                               |    1 
 asm-m68k/mc146818rtc.h                       |    1 
 asm-m68k/mmu_context.h                       |    1 
 asm-m68k/motorola_pgtable.h                  |    1 
 asm-m68k/openprom.h                          |    1 
 asm-m68k/page.h                              |    1 
 asm-m68k/page_offset.h                       |    1 
 asm-m68k/pgalloc.h                           |    1 
 asm-m68k/pgtable.h                           |    1 
 asm-m68k/processor.h                         |    1 
 asm-m68k/semaphore-helper.h                  |    1 
 asm-m68k/serial.h                            |    1 
 asm-m68k/setup.h                             |    1 
 asm-m68k/shm.h                               |    1 
 asm-m68k/system.h                            |    1 
 asm-m68k/tlbflush.h                          |    1 
 asm-m68k/virtconvert.h                       |    1 
 asm-m68knommu/bitops.h                       |    1 
 asm-m68knommu/coldfire.h                     |    1 
 asm-m68knommu/commproc.h                     |    1 
 asm-m68knommu/dma-mapping.h                  |    1 
 asm-m68knommu/dma.h                          |    1 
 asm-m68knommu/elf.h                          |    1 
 asm-m68knommu/elia.h                         |    1 
 asm-m68knommu/entry.h                        |    1 
 asm-m68knommu/fpu.h                          |    1 
 asm-m68knommu/hardirq.h                      |    1 
 asm-m68knommu/io.h                           |    1 
 asm-m68knommu/irq.h                          |    1 
 asm-m68knommu/m5206sim.h                     |    1 
 asm-m68knommu/m520xsim.h                     |    1 
 asm-m68knommu/m523xsim.h                     |    1 
 asm-m68knommu/m5272sim.h                     |    1 
 asm-m68knommu/m527xsim.h                     |    1 
 asm-m68knommu/m528xsim.h                     |    1 
 asm-m68knommu/mcfcache.h                     |    1 
 asm-m68knommu/mcfdma.h                       |    1 
 asm-m68knommu/mcfmbus.h                      |    1 
 asm-m68knommu/mcfne.h                        |    1 
 asm-m68knommu/mcfpci.h                       |    1 
 asm-m68knommu/mcfpit.h                       |    1 
 asm-m68knommu/mcfsim.h                       |    1 
 asm-m68knommu/mcfsmc.h                       |    1 
 asm-m68knommu/mcftimer.h                     |    1 
 asm-m68knommu/mcfuart.h                      |    1 
 asm-m68knommu/mcfwdebug.h                    |    1 
 asm-m68knommu/mmu_context.h                  |    1 
 asm-m68knommu/nettel.h                       |    1 
 asm-m68knommu/page.h                         |    1 
 asm-m68knommu/page_offset.h                  |    1 
 asm-m68knommu/param.h                        |    1 
 asm-m68knommu/pgtable.h                      |    1 
 asm-m68knommu/processor.h                    |    1 
 asm-m68knommu/semaphore-helper.h             |    1 
 asm-m68knommu/system.h                       |    1 
 asm-m68knommu/unaligned.h                    |    1 
 asm-mips/a.out.h                             |    1 
 asm-mips/addrspace.h                         |    1 
 asm-mips/arc/types.h                         |    1 
 asm-mips/asm.h                               |    1 
 asm-mips/asmmacro.h                          |    1 
 asm-mips/atomic.h                            |    1 
 asm-mips/bcache.h                            |    1 
 asm-mips/bitops.h                            |    1 
 asm-mips/bug.h                               |    1 
 asm-mips/bugs.h                              |    1 
 asm-mips/byteorder.h                         |    1 
 asm-mips/cache.h                             |    1 
 asm-mips/checksum.h                          |    1 
 asm-mips/cpu-features.h                      |    1 
 asm-mips/cpu-info.h                          |    1 
 asm-mips/ddb5xxx/ddb5477.h                   |    1 
 asm-mips/ddb5xxx/ddb5xxx.h                   |    1 
 asm-mips/debug.h                             |    1 
 asm-mips/dec/prom.h                          |    1 
 asm-mips/delay.h                             |    1 
 asm-mips/dma.h                               |    1 
 asm-mips/elf.h                               |    1 
 asm-mips/fcntl.h                             |    1 
 asm-mips/fixmap.h                            |    1 
 asm-mips/fpu.h                               |    1 
 asm-mips/futex.h                             |    1 
 asm-mips/hazards.h                           |    1 
 asm-mips/highmem.h                           |    1 
 asm-mips/interrupt.h                         |    1 
 asm-mips/io.h                                |    1 
 asm-mips/ip32/machine.h                      |    1 
 asm-mips/irq.h                               |    1 
 asm-mips/isadep.h                            |    1 
 asm-mips/jmr3927/irq.h                       |    1 
 asm-mips/kmap_types.h                        |    1 
 asm-mips/local.h                             |    1 
 asm-mips/mach-au1x00/au1000.h                |    1 
 asm-mips/mach-au1x00/au1xxx.h                |    1 
 asm-mips/mach-au1x00/au1xxx_dbdma.h          |    1 
 asm-mips/mach-au1x00/au1xxx_ide.h            |    1 
 asm-mips/mach-au1x00/au1xxx_psc.h            |    1 
 asm-mips/mach-au1x00/ioremap.h               |    1 
 asm-mips/mach-cobalt/cpu-feature-overrides.h |    1 
 asm-mips/mach-db1x00/db1x00.h                |    1 
 asm-mips/mach-generic/ide.h                  |    1 
 asm-mips/mach-generic/kmalloc.h              |    1 
 asm-mips/mach-generic/spaces.h               |    1 
 asm-mips/mach-ip22/spaces.h                  |    1 
 asm-mips/mach-ip32/cpu-feature-overrides.h   |    1 
 asm-mips/mach-ip32/kmalloc.h                 |    1 
 asm-mips/mach-mips/cpu-feature-overrides.h   |    1 
 asm-mips/mach-mips/irq.h                     |    1 
 asm-mips/mach-pb1x00/pb1550.h                |    1 
 asm-mips/mach-sim/cpu-feature-overrides.h    |    1 
 asm-mips/mips-boards/generic.h               |    1 
 asm-mips/mipsregs.h                          |    1 
 asm-mips/mmu_context.h                       |    1 
 asm-mips/mmzone.h                            |    1 
 asm-mips/module.h                            |    1 
 asm-mips/msgbuf.h                            |    1 
 asm-mips/paccess.h                           |    1 
 asm-mips/page.h                              |    1 
 asm-mips/pci.h                               |    1 
 asm-mips/pgalloc.h                           |    1 
 asm-mips/pgtable-32.h                        |    1 
 asm-mips/pgtable-64.h                        |    1 
 asm-mips/pgtable-bits.h                      |    1 
 asm-mips/pgtable.h                           |    1 
 asm-mips/prefetch.h                          |    1 
 asm-mips/processor.h                         |    1 
 asm-mips/ptrace.h                            |    1 
 asm-mips/reg.h                               |    1 
 asm-mips/resource.h                          |    1 
 asm-mips/serial.h                            |    1 
 asm-mips/sgiarcs.h                           |    1 
 asm-mips/sibyte/board.h                      |    1 
 asm-mips/sibyte/carmel.h                     |    1 
 asm-mips/sibyte/sentosa.h                    |    1 
 asm-mips/sibyte/swarm.h                      |    1 
 asm-mips/siginfo.h                           |    1 
 asm-mips/signal.h                            |    1 
 asm-mips/sim.h                               |    1 
 asm-mips/smp.h                               |    1 
 asm-mips/sn/addrs.h                          |    1 
 asm-mips/sn/agent.h                          |    1 
 asm-mips/sn/arch.h                           |    1 
 asm-mips/sn/io.h                             |    1 
 asm-mips/sn/klconfig.h                       |    1 
 asm-mips/sn/kldir.h                          |    1 
 asm-mips/sn/launch.h                         |    1 
 asm-mips/sn/mapped_kernel.h                  |    1 
 asm-mips/sn/sn0/addrs.h                      |    1 
 asm-mips/sn/sn0/arch.h                       |    1 
 asm-mips/sn/sn0/hubmd.h                      |    1 
 asm-mips/stackframe.h                        |    1 
 asm-mips/string.h                            |    1 
 asm-mips/system.h                            |    1 
 asm-mips/thread_info.h                       |    1 
 asm-mips/tlbflush.h                          |    1 
 asm-mips/tx4927/toshiba_rbtx4927.h           |    1 
 asm-mips/types.h                             |    1 
 asm-mips/uaccess.h                           |    1 
 asm-mips/unistd.h                            |    1 
 asm-mips/vr41xx/vrc4173.h                    |    1 
 asm-mips/war.h                               |    1 
 asm-mips/wbflush.h                           |    1 
 asm-parisc/atomic.h                          |    1 
 asm-parisc/cache.h                           |    1 
 asm-parisc/cacheflush.h                      |    1 
 asm-parisc/dma-mapping.h                     |    1 
 asm-parisc/dma.h                             |    1 
 asm-parisc/io.h                              |    1 
 asm-parisc/irq.h                             |    1 
 asm-parisc/kmap_types.h                      |    1 
 asm-parisc/page.h                            |    1 
 asm-parisc/param.h                           |    1 
 asm-parisc/pci.h                             |    1 
 asm-parisc/pdc.h                             |    1 
 asm-parisc/pgtable.h                         |    1 
 asm-parisc/processor.h                       |    1 
 asm-parisc/psw.h                             |    1 
 asm-parisc/smp.h                             |    1 
 asm-parisc/system.h                          |    1 
 asm-parisc/tlbflush.h                        |    1 
 asm-powerpc/abs_addr.h                       |    1 
 asm-powerpc/cache.h                          |    1 
 asm-powerpc/dma-mapping.h                    |    1 
 asm-powerpc/dma.h                            |    1 
 asm-powerpc/eeh.h                            |    1 
 asm-powerpc/elf.h                            |    7 --
 asm-powerpc/floppy.h                         |    1 
 asm-powerpc/hw_irq.h                         |    1 
 asm-powerpc/ide.h                            |    1 
 asm-powerpc/iommu.h                          |    1 
 asm-powerpc/irq.h                            |    1 
 asm-powerpc/iseries/iseries_io.h             |    1 
 asm-powerpc/machdep.h                        |    1 
 asm-powerpc/mmzone.h                         |    1 
 asm-powerpc/paca.h                           |    1 
 asm-powerpc/page.h                           |    1 
 asm-powerpc/pgtable.h                        |    1 
 asm-powerpc/ppc_asm.h                        |    1 
 asm-powerpc/prom.h                           |    1 
 asm-powerpc/smp.h                            |    1 
 asm-powerpc/smu.h                            |    1 
 asm-powerpc/spu.h                            |    1 
 asm-powerpc/thread_info.h                    |    1 
 asm-powerpc/time.h                           |    1 
 asm-powerpc/timex.h                          |    1 
 asm-powerpc/tlb.h                            |    1 
 asm-powerpc/tlbflush.h                       |    1 
 asm-powerpc/topology.h                       |    1 
 asm-powerpc/types.h                          |    1 
 asm-powerpc/unistd.h                         |    1 
 asm-powerpc/vga.h                            |    1 
 asm-powerpc/vio.h                            |    1 
 asm-ppc/amigahw.h                            |    1 
 asm-ppc/bootinfo.h                           |    1 
 asm-ppc/commproc.h                           |    1 
 asm-ppc/ibm403.h                             |    1 
 asm-ppc/ibm44x.h                             |    1 
 asm-ppc/ibm4xx.h                             |    1 
 asm-ppc/io.h                                 |    1 
 asm-ppc/machdep.h                            |    1 
 asm-ppc/mmu.h                                |    1 
 asm-ppc/mmu_context.h                        |    1 
 asm-ppc/mpc8260.h                            |    1 
 asm-ppc/mpc83xx.h                            |    1 
 asm-ppc/mpc85xx.h                            |    1 
 asm-ppc/mpc8xx.h                             |    1 
 asm-ppc/mv64x60.h                            |    1 
 asm-ppc/ocp.h                                |    1 
 asm-ppc/open_pic.h                           |    1 
 asm-ppc/page.h                               |    2 
 asm-ppc/pc_serial.h                          |    1 
 asm-ppc/pgalloc.h                            |    1 
 asm-ppc/pgtable.h                            |    1 
 asm-ppc/ppc4xx_dma.h                         |    1 
 asm-ppc/ppc4xx_pic.h                         |    1 
 asm-ppc/serial.h                             |    1 
 asm-ppc/smp.h                                |    1 
 asm-ppc/time.h                               |    1 
 asm-s390/bitops.h                            |    1 
 asm-s390/debug.h                             |    1 
 asm-s390/hardirq.h                           |    1 
 asm-s390/idals.h                             |    1 
 asm-s390/local.h                             |    1 
 asm-s390/lowcore.h                           |    1 
 asm-s390/pgalloc.h                           |    1 
 asm-s390/ptrace.h                            |    1 
 asm-s390/sfp-machine.h                       |    1 
 asm-s390/smp.h                               |    1 
 asm-s390/system.h                            |    1 
 asm-s390/tlbflush.h                          |    1 
 asm-s390/types.h                             |    1 
 asm-s390/unistd.h                            |    1 
 asm-sh/bug.h                                 |    1 
 asm-sh/checksum.h                            |    1 
 asm-sh/dma-mapping.h                         |    1 
 asm-sh/dma.h                                 |    1 
 asm-sh/fixmap.h                              |    1 
 asm-sh/hardirq.h                             |    1 
 asm-sh/hd64461/hd64461.h                     |    1 
 asm-sh/hd64465/hd64465.h                     |    1 
 asm-sh/ide.h                                 |    1 
 asm-sh/io.h                                  |    1 
 asm-sh/irq.h                                 |    1 
 asm-sh/keyboard.h                            |    1 
 asm-sh/kmap_types.h                          |    1 
 asm-sh/machvec.h                             |    1 
 asm-sh/machvec_init.h                        |    1 
 asm-sh/mpc1211/dma.h                         |    1 
 asm-sh/overdrive/overdrive.h                 |    1 
 asm-sh/page.h                                |    1 
 asm-sh/pgtable.h                             |    1 
 asm-sh/serial.h                              |    1 
 asm-sh/smp.h                                 |    1 
 asm-sh/system.h                              |    1 
 asm-sh/types.h                               |    1 
 asm-sh/watchdog.h                            |    1 
 asm-sh64/bug.h                               |    1 
 asm-sh64/dma-mapping.h                       |    1 
 asm-sh64/hardirq.h                           |    1 
 asm-sh64/ide.h                               |    1 
 asm-sh64/irq.h                               |    1 
 asm-sh64/mmu_context.h                       |    1 
 asm-sh64/page.h                              |    1 
 asm-sh64/param.h                             |    1 
 asm-sh64/pgtable.h                           |    1 
 asm-sh64/system.h                            |    1 
 asm-sparc/asmmacro.h                         |    1 
 asm-sparc/atomic.h                           |    1 
 asm-sparc/bugs.h                             |    1 
 asm-sparc/cacheflush.h                       |    1 
 asm-sparc/delay.h                            |    1 
 asm-sparc/dma-mapping.h                      |    1 
 asm-sparc/dma.h                              |    1 
 asm-sparc/elf.h                              |    1 
 asm-sparc/fixmap.h                           |    1 
 asm-sparc/hardirq.h                          |    1 
 asm-sparc/ide.h                              |    1 
 asm-sparc/irq.h                              |    1 
 asm-sparc/mostek.h                           |    1 
 asm-sparc/page.h                             |    1 
 asm-sparc/pgalloc.h                          |    1 
 asm-sparc/pgtable.h                          |    1 
 asm-sparc/sfp-machine.h                      |    1 
 asm-sparc/smp.h                              |    1 
 asm-sparc/system.h                           |    2 
 asm-sparc/timer.h                            |    1 
 asm-sparc/tlbflush.h                         |    1 
 asm-sparc/vac-ops.h                          |    1 
 asm-sparc/winmacro.h                         |    1 
 asm-sparc64/atomic.h                         |    1 
 asm-sparc64/bitops.h                         |    1 
 asm-sparc64/bugs.h                           |    1 
 asm-sparc64/cacheflush.h                     |    1 
 asm-sparc64/delay.h                          |    1 
 asm-sparc64/dma-mapping.h                    |    1 
 asm-sparc64/dma.h                            |    1 
 asm-sparc64/floppy.h                         |    1 
 asm-sparc64/ide.h                            |    1 
 asm-sparc64/irq.h                            |    1 
 asm-sparc64/kprobes.h                        |    1 
 asm-sparc64/mc146818rtc.h                    |    1 
 asm-sparc64/mmu.h                            |    1 
 asm-sparc64/oplib.h                          |    1 
 asm-sparc64/page.h                           |    1 
 asm-sparc64/param.h                          |    1 
 asm-sparc64/pgalloc.h                        |    1 
 asm-sparc64/pgtable.h                        |    1 
 asm-sparc64/processor.h                      |    1 
 asm-sparc64/siginfo.h                        |    1 
 asm-sparc64/signal.h                         |    1 
 asm-sparc64/smp.h                            |    1 
 asm-sparc64/spinlock.h                       |    1 
 asm-sparc64/system.h                         |    1 
 asm-sparc64/timer.h                          |    1 
 asm-sparc64/tlb.h                            |    1 
 asm-sparc64/tlbflush.h                       |    1 
 asm-sparc64/ttable.h                         |    1 
 asm-um/a.out.h                               |    1 
 asm-um/cache.h                               |    1 
 asm-um/elf-ppc.h                             |    1 
 asm-um/fixmap.h                              |    1 
 asm-um/hardirq.h                             |    1 
 asm-um/linkage.h                             |    1 
 asm-um/mmu_context.h                         |    1 
 asm-um/page.h                                |    1 
 asm-um/pgalloc.h                             |    1 
 asm-um/processor-generic.h                   |    1 
 asm-um/ptrace-generic.h                      |    1 
 asm-um/smp.h                                 |    1 
 asm-um/thread_info.h                         |    1 
 asm-v850/atomic.h                            |    1 
 asm-v850/bitops.h                            |    1 
 asm-v850/dma-mapping.h                       |    1 
 asm-v850/hardirq.h                           |    1 
 asm-v850/machdep.h                           |    1 
 asm-v850/pgtable.h                           |    1 
 asm-v850/processor.h                         |    1 
 asm-v850/serial.h                            |    1 
 asm-v850/v850e_uart.h                        |    1 
 asm-x86_64/apic.h                            |    1 
 asm-x86_64/atomic.h                          |    1 
 asm-x86_64/bitops.h                          |    1 
 asm-x86_64/bugs.h                            |    1 
 asm-x86_64/cache.h                           |    1 
 asm-x86_64/calling.h                         |    1 
 asm-x86_64/dma-mapping.h                     |    1 
 asm-x86_64/dma.h                             |    1 
 asm-x86_64/dwarf2.h                          |    1 
 asm-x86_64/fixmap.h                          |    1 
 asm-x86_64/hardirq.h                         |    1 
 asm-x86_64/hw_irq.h                          |    1 
 asm-x86_64/ia32.h                            |    1 
 asm-x86_64/io.h                              |    1 
 asm-x86_64/io_apic.h                         |    1 
 asm-x86_64/mmu_context.h                     |    1 
 asm-x86_64/mmzone.h                          |    1 
 asm-x86_64/mtrr.h                            |    1 
 asm-x86_64/page.h                            |    1 
 asm-x86_64/param.h                           |    1 
 asm-x86_64/pci.h                             |    1 
 asm-x86_64/processor.h                       |    1 
 asm-x86_64/serial.h                          |    1 
 asm-x86_64/smp.h                             |    1 
 asm-x86_64/spinlock.h                        |    1 
 asm-x86_64/swiotlb.h                         |    1 
 asm-x86_64/system.h                          |    1 
 asm-x86_64/tlbflush.h                        |    1 
 asm-x86_64/topology.h                        |    1 
 asm-x86_64/uaccess.h                         |    1 
 asm-xtensa/atomic.h                          |    1 
 asm-xtensa/checksum.h                        |    1 
 asm-xtensa/delay.h                           |    1 
 asm-xtensa/dma.h                             |    1 
 asm-xtensa/hardirq.h                         |    1 
 asm-xtensa/ide.h                             |    1 
 asm-xtensa/io.h                              |    1 
 asm-xtensa/irq.h                             |    1 
 asm-xtensa/mmu_context.h                     |    1 
 asm-xtensa/page.h                            |    1 
 asm-xtensa/pgalloc.h                         |    1 
 asm-xtensa/platform.h                        |    1 
 asm-xtensa/system.h                          |    1 
 linux/acct.h                                 |    3 
 linux/acpi.h                                 |    1 
 linux/agpgart.h                              |    3 
 linux/amba/clcd.h                            |    1 
 linux/atmdev.h                               |    1 
 linux/audit.h                                |    4 -
 linux/blkdev.h                               |    1 
 linux/blktrace_api.h                         |    1 
 linux/blockgroup_lock.h                      |    1 
 linux/cache.h                                |    1 
 linux/coda.h                                 |    1 
 linux/compat.h                               |    1 
 linux/cpufreq.h                              |    1 
 linux/crypto.h                               |    1 
 linux/cyclomx.h                              |    1 
 linux/dcookies.h                             |    1 
 linux/devfs_fs_kernel.h                      |    1 
 linux/device.h                               |    1 
 linux/dmi.h                                  |    1 
 linux/dnotify.h                              |    1 
 linux/elf-em.h                               |   44 ++++++++++++
 linux/elf.h                                  |   59 ----------------
 linux/errqueue.h                             |    1 
 linux/ext2_fs.h                              |    2 
 linux/ext3_fs.h                              |    7 --
 linux/fs.h                                   |    1 
 linux/ftape.h                                |    1 
 linux/gameport.h                             |    6 +
 linux/generic_serial.h                       |    6 +
 linux/genhd.h                                |   12 +--
 linux/gfp.h                                  |    1 
 linux/hardirq.h                              |    1 
 linux/highmem.h                              |    1 
 linux/highuid.h                              |    1 
 linux/i2c-algo-ite.h                         |    7 +-
 linux/i2c.h                                  |    9 +-
 linux/ide.h                                  |    1 
 linux/if_frad.h                              |    1 
 linux/if_tr.h                                |    1 
 linux/init.h                                 |    1 
 linux/inotify.h                              |    1 
 linux/interrupt.h                            |    1 
 linux/ipmi.h                                 |    2 
 linux/ipv6.h                                 |    1 
 linux/irq.h                                  |    1 
 linux/irq_cpustat.h                          |    1 
 linux/isapnp.h                               |    1 
 linux/isdn.h                                 |    1 
 linux/isdn/tpam.h                            |    1 
 linux/isdn_ppp.h                             |    1 
 linux/isdnif.h                               |    1 
 linux/kallsyms.h                             |    1 
 linux/kernel_stat.h                          |    1 
 linux/kmod.h                                 |    1 
 linux/kprobes.h                              |    1 
 linux/linkage.h                              |    1 
 linux/lockd/lockd.h                          |    1 
 linux/lockd/nlm.h                            |    1 
 linux/mempolicy.h                            |    1 
 linux/migrate.h                              |    1 
 linux/mm.h                                   |    1 
 linux/mman.h                                 |   12 ++-
 linux/mmzone.h                               |    1 
 linux/module.h                               |    1 
 linux/msg.h                                  |    2 
 linux/mtd/cfi.h                              |    1 
 linux/mtd/map.h                              |    1 
 linux/mtd/mtd.h                              |    1 
 linux/mtd/nand.h                             |    1 
 linux/mtd/physmap.h                          |    1 
 linux/mtd/xip.h                              |    1 
 linux/ncp_fs.h                               |    5 -
 linux/net.h                                  |    3 
 linux/netdevice.h                            |    1 
 linux/netfilter.h                            |    1 
 linux/netfilter_arp.h                        |    1 
 linux/netfilter_bridge.h                     |    1 
 linux/netfilter_ipv4.h                       |    1 
 linux/netfilter_ipv4/ip_conntrack.h          |    1 
 linux/netfilter_ipv4/listhelp.h              |    1 
 linux/nfs.h                                  |    8 +-
 linux/nfs4.h                                 |    6 -
 linux/nfs_fs.h                               |   39 +++++------
 linux/nfsd/nfsd.h                            |    1 
 linux/nfsd/nfsfh.h                           |    1 
 linux/nfsd/syscall.h                         |    1 
 linux/numa.h                                 |    1 
 linux/parport.h                              |    1 
 linux/pci.h                                  |    1 
 linux/percpu_counter.h                       |    1 
 linux/pm.h                                   |    1 
 linux/pm_legacy.h                            |    1 
 linux/pmu.h                                  |    1 
 linux/preempt.h                              |    1 
 linux/proc_fs.h                              |    1 
 linux/profile.h                              |    1 
 linux/quota.h                                |    4 -
 linux/quotaops.h                             |    1 
 linux/reiserfs_xattr.h                       |    3 
 linux/relay.h                                |    1 
 linux/rio.h                                  |    1 
 linux/rio_drv.h                              |    1 
 linux/rmap.h                                 |    1 
 linux/rtnetlink.h                            |    1 
 linux/rwsem.h                                |    1 
 linux/scc.h                                  |    1 
 linux/sched.h                                |   94 +++++++++++++--------------
 linux/seccomp.h                              |    1 
 linux/sem.h                                  |    2 
 linux/seqlock.h                              |    1 
 linux/serialP.h                              |    1 
 linux/serial_core.h                          |    1 
 linux/signal.h                               |    4 -
 linux/skbuff.h                               |    1 
 linux/slab.h                                 |    1 
 linux/smb_fs.h                               |    4 -
 linux/smp.h                                  |    1 
 linux/smp_lock.h                             |    1 
 linux/socket.h                               |    2 
 linux/spinlock.h                             |    1 
 linux/stop_machine.h                         |    1 
 linux/sunrpc/auth.h                          |    1 
 linux/sunrpc/debug.h                         |   24 +++---
 linux/sunrpc/stats.h                         |    1 
 linux/suspend.h                              |    1 
 linux/swap.h                                 |    1 
 linux/syscalls.h                             |    1 
 linux/sysrq.h                                |    1 
 linux/tcp.h                                  |    1 
 linux/threads.h                              |    1 
 linux/timer.h                                |    1 
 linux/timex.h                                |    1 
 linux/tty.h                                  |    1 
 linux/types.h                                |    1 
 linux/udp.h                                  |    1 
 linux/usb.h                                  |    1 
 linux/usb_usual.h                            |    1 
 linux/usbdevice_fs.h                         |    2 
 linux/vt_buffer.h                            |    1 
 linux/vt_kern.h                              |    1 
 linux/wait.h                                 |    1 
 linux/wanrouter.h                            |    4 -
 mtd/mtd-abi.h                                |    5 -
 net/addrconf.h                               |    1 
 net/af_unix.h                                |    1 
 net/ax25.h                                   |    1 
 net/compat.h                                 |    1 
 net/dst.h                                    |    1 
 net/icmp.h                                   |    1 
 net/inet6_hashtables.h                       |    1 
 net/inet_hashtables.h                        |    1 
 net/inet_sock.h                              |    1 
 net/inet_timewait_sock.h                     |    1 
 net/ip.h                                     |    1 
 net/ip_fib.h                                 |    1 
 net/ip_mp_alg.h                              |    1 
 net/ip_vs.h                                  |    1 
 net/ipv6.h                                   |    1 
 net/irda/irda.h                              |    1 
 net/irda/irda_device.h                       |    1 
 net/irda/irlap.h                             |    1 
 net/irda/irlmp.h                             |    1 
 net/irda/irlmp_frame.h                       |    1 
 net/irda/qos.h                               |    1 
 net/ndisc.h                                  |    1 
 net/netfilter/nf_conntrack.h                 |    1 
 net/pkt_act.h                                |    1 
 net/protocol.h                               |    1 
 net/raw.h                                    |    1 
 net/red.h                                    |    1 
 net/route.h                                  |    1 
 net/sch_generic.h                            |    1 
 net/sctp/sctp.h                              |    1 
 net/sock.h                                   |    1 
 net/tcp.h                                    |    1 
 pcmcia/ss.h                                  |    1 
 scsi/scsi_transport_fc.h                     |    1 
 scsi/scsi_transport_spi.h                    |    1 
 sound/driver.h                               |    1 
 video/edid.h                                 |    1 
 video/vga.h                                  |    1 
 864 files changed, 193 insertions(+), 1036 deletions(-)

Index: linux-2.6-header-cleanup-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-cleanup-git.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-header-cleanup-git.patch	26 Apr 2006 12:22:04 -0000	1.1
+++ linux-2.6-header-cleanup-git.patch	26 Apr 2006 23:46:20 -0000	1.2
@@ -8312,6 +8312,28 @@
  #include <linux/wait.h> /* wait_queue_head_t */
  #include <linux/time.h> /* struct timeval */
  #include <linux/net.h>
+diff --git a/include/linux/audit.h b/include/linux/audit.h
+index 1c47c59..3199755 100644
+--- a/include/linux/audit.h
++++ b/include/linux/audit.h
+@@ -24,8 +24,7 @@
+ #ifndef _LINUX_AUDIT_H_
+ #define _LINUX_AUDIT_H_
+ 
+-#include <linux/sched.h>
+-#include <linux/elf.h>
++#include <linux/elf-em.h>
+ 
+ /* The netlink messages for the audit system is divided into blocks:
+  * 1000 - 1099 are for commanding the audit system
+@@ -267,6 +266,7 @@ struct audit_rule {		/* for AUDIT_LIST, 
+ };
+ 
+ #ifdef __KERNEL__
++#include <linux/sched.h>
+ 
+ struct audit_sig_info {
+ 	uid_t		uid;
 diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
 index 59e1259..5d32731 100644
 --- a/include/linux/blkdev.h
@@ -8480,6 +8502,133 @@
  
  #ifdef CONFIG_DNOTIFY
  
+diff --git a/include/linux/elf-em.h b/include/linux/elf-em.h
+new file mode 100644
+index 0000000..114a96d
+--- /dev/null
++++ b/include/linux/elf-em.h
+@@ -0,0 +1,44 @@
++#ifndef _LINUX_ELF_EM_H
++#define _LINUX_ELF_EM_H
++
++/* These constants define the various ELF target machines */
++#define EM_NONE		0
++#define EM_M32		1
++#define EM_SPARC	2
++#define EM_386		3
++#define EM_68K		4
++#define EM_88K		5
++#define EM_486		6	/* Perhaps disused */
++#define EM_860		7
++#define EM_MIPS		8	/* MIPS R3000 (officially, big-endian only) */
++#define EM_MIPS_RS4_BE	10	/* MIPS R4000 big-endian */
++#define EM_PARISC	15	/* HPPA */
++#define EM_SPARC32PLUS	18	/* Sun's "v8plus" */
++#define EM_PPC		20	/* PowerPC */
++#define EM_PPC64	21       /* PowerPC64 */
++#define EM_SH		42	/* SuperH */
++#define EM_SPARCV9	43	/* SPARC v9 64-bit */
++#define EM_IA_64	50	/* HP/Intel IA-64 */
++#define EM_X86_64	62	/* AMD x86-64 */
++#define EM_S390		22	/* IBM S/390 */
++#define EM_CRIS		76	/* Axis Communications 32-bit embedded processor */
++#define EM_V850		87	/* NEC v850 */
++#define EM_M32R		88	/* Renesas M32R */
++#define EM_H8_300	46	/* Renesas H8/300,300H,H8S */
++#define EM_FRV		0x5441	/* Fujitsu FR-V */
++
++/*
++ * This is an interim value that we will use until the committee comes
++ * up with a final number.
++ */
++#define EM_ALPHA	0x9026
++
++/* Bogus old v850 magic number, used by old tools. */
++#define EM_CYGNUS_V850	0x9080
++/* Bogus old m32r magic number, used by old tools. */
++#define EM_CYGNUS_M32R	0x9041
++/* This is the old interim value for S/390 architecture */
++#define EM_S390_OLD	0xA390
++
++
++#endif /* _LINUX_ELF_EM_H */
+diff --git a/include/linux/elf.h b/include/linux/elf.h
+index d3bfacb..b70d1d2 100644
+--- a/include/linux/elf.h
++++ b/include/linux/elf.h
+@@ -3,6 +3,7 @@ #define _LINUX_ELF_H
+ 
+ #include <linux/types.h>
+ #include <linux/auxvec.h>
++#include <linux/elf-em.h>
+ #include <asm/elf.h>
+ 
+ #ifndef elf_read_implies_exec
+@@ -55,64 +56,6 @@ #define ET_CORE   4
+ #define ET_LOPROC 0xff00
+ #define ET_HIPROC 0xffff
+ 
+-/* These constants define the various ELF target machines */
+-#define EM_NONE  0
+-#define EM_M32   1
+-#define EM_SPARC 2
+-#define EM_386   3
+-#define EM_68K   4
+-#define EM_88K   5
+-#define EM_486   6   /* Perhaps disused */
+-#define EM_860   7
+-
+-#define EM_MIPS		8	/* MIPS R3000 (officially, big-endian only) */
+-
+-#define EM_MIPS_RS4_BE 10	/* MIPS R4000 big-endian */
+-
+-#define EM_PARISC      15	/* HPPA */
+-
+-#define EM_SPARC32PLUS 18	/* Sun's "v8plus" */
+-
+-#define EM_PPC	       20	/* PowerPC */
+-#define EM_PPC64       21       /* PowerPC64 */
+-
+-#define EM_SH	       42	/* SuperH */
+-
+-#define EM_SPARCV9     43	/* SPARC v9 64-bit */
+-
+-#define EM_IA_64	50	/* HP/Intel IA-64 */
+-
+-#define EM_X86_64	62	/* AMD x86-64 */
+-
+-#define EM_S390		22	/* IBM S/390 */
+-
+-#define EM_CRIS         76      /* Axis Communications 32-bit embedded processor */
+-
+-#define EM_V850		87	/* NEC v850 */
+-
+-#define EM_M32R		88	/* Renesas M32R */
+-
+-#define EM_H8_300       46      /* Renesas H8/300,300H,H8S */
+-
+-/*
+- * This is an interim value that we will use until the committee comes
+- * up with a final number.
+- */
+-#define EM_ALPHA	0x9026
+-
+-/* Bogus old v850 magic number, used by old tools.  */
+-#define EM_CYGNUS_V850	0x9080
+-
+-/* Bogus old m32r magic number, used by old tools.  */
+-#define EM_CYGNUS_M32R	0x9041
+-
+-/*
+- * This is the old interim value for S/390 architecture
+- */
+-#define EM_S390_OLD     0xA390
+-
+-#define EM_FRV		0x5441		/* Fujitsu FR-V */
+-
+ /* This is the info that is needed to parse the dynamic section of the file */
+ #define DT_NULL		0
+ #define DT_NEEDED	1
 diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h
 index 174582f..408118a 100644
 --- a/include/linux/errqueue.h
@@ -9784,37 +9933,101 @@
  /* selection of hardware types */
  
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 29b7d4f..2e05e40 100644
+index 29b7d4f..701b8cb 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -1,9 +1,9 @@
+@@ -1,9 +1,46 @@
  #ifndef _LINUX_SCHED_H
  #define _LINUX_SCHED_H
  
++#include <linux/auxvec.h>	/* For AT_VECTOR_SIZE */
++
++/*
++ * cloning flags:
++ */
++#define CSIGNAL		0x000000ff	/* signal mask to be sent at exit */
++#define CLONE_VM	0x00000100	/* set if VM shared between processes */
++#define CLONE_FS	0x00000200	/* set if fs info shared between processes */
++#define CLONE_FILES	0x00000400	/* set if open files shared between processes */
++#define CLONE_SIGHAND	0x00000800	/* set if signal handlers and blocked signals shared */
++#define CLONE_PTRACE	0x00002000	/* set if we want to let tracing continue on the child too */
++#define CLONE_VFORK	0x00004000	/* set if the parent wants the child to wake it up on mm_release */
++#define CLONE_PARENT	0x00008000	/* set if we want to have the same parent as the cloner */
++#define CLONE_THREAD	0x00010000	/* Same thread group? */
++#define CLONE_NEWNS	0x00020000	/* New namespace group? */
++#define CLONE_SYSVSEM	0x00040000	/* share system V SEM_UNDO semantics */
++#define CLONE_SETTLS	0x00080000	/* create a new TLS for the child */
++#define CLONE_PARENT_SETTID	0x00100000	/* set the TID in the parent */
++#define CLONE_CHILD_CLEARTID	0x00200000	/* clear the TID in the child */
++#define CLONE_DETACHED		0x00400000	/* Unused, ignored */
++#define CLONE_UNTRACED		0x00800000	/* set if the tracing process can't force CLONE_PTRACE on this clone */
++#define CLONE_CHILD_SETTID	0x01000000	/* set the TID in the child */
++#define CLONE_STOPPED		0x02000000	/* Start in stopped state */
++
++/*
++ * Scheduling policies
++ */
++#define SCHED_NORMAL		0
++#define SCHED_FIFO		1
++#define SCHED_RR		2
++#define SCHED_BATCH		3
++
 +#ifdef __KERNEL__
++
++struct sched_param {
++	int sched_priority;
++};
++
  #include <asm/param.h>	/* for HZ */
  
 -#include <linux/config.h>
  #include <linux/capability.h>
  #include <linux/threads.h>
  #include <linux/kernel.h>
-@@ -37,6 +37,15 @@ #include <linux/seccomp.h>
+@@ -37,33 +74,17 @@ #include <linux/seccomp.h>
  #include <linux/rcupdate.h>
  #include <linux/futex.h>
  
+-#include <linux/auxvec.h>	/* For AT_VECTOR_SIZE */
 +#include <linux/time.h>
 +#include <linux/param.h>
 +#include <linux/resource.h>
 +#include <linux/timer.h>
 +#include <linux/hrtimer.h>
-+
+ 
+-struct exec_domain;
+-extern int exec_shield;
+-extern int print_fatal_signals;
 +#include <asm/processor.h>
-+#endif
-+
- #include <linux/auxvec.h>	/* For AT_VECTOR_SIZE */
  
- struct exec_domain;
-@@ -103,13 +112,6 @@ extern unsigned long nr_uninterruptible(
+-/*
+- * cloning flags:
+- */
+-#define CSIGNAL		0x000000ff	/* signal mask to be sent at exit */
+-#define CLONE_VM	0x00000100	/* set if VM shared between processes */
+-#define CLONE_FS	0x00000200	/* set if fs info shared between processes */
+-#define CLONE_FILES	0x00000400	/* set if open files shared between processes */
+-#define CLONE_SIGHAND	0x00000800	/* set if signal handlers and blocked signals shared */
+-#define CLONE_PTRACE	0x00002000	/* set if we want to let tracing continue on the child too */
+-#define CLONE_VFORK	0x00004000	/* set if the parent wants the child to wake it up on mm_release */
+-#define CLONE_PARENT	0x00008000	/* set if we want to have the same parent as the cloner */
+-#define CLONE_THREAD	0x00010000	/* Same thread group? */
+-#define CLONE_NEWNS	0x00020000	/* New namespace group? */
+-#define CLONE_SYSVSEM	0x00040000	/* share system V SEM_UNDO semantics */
+-#define CLONE_SETTLS	0x00080000	/* create a new TLS for the child */
+-#define CLONE_PARENT_SETTID	0x00100000	/* set the TID in the parent */
+-#define CLONE_CHILD_CLEARTID	0x00200000	/* clear the TID in the child */
+-#define CLONE_DETACHED		0x00400000	/* Unused, ignored */
+-#define CLONE_UNTRACED		0x00800000	/* set if the tracing process can't force CLONE_PTRACE on this clone */
+-#define CLONE_CHILD_SETTID	0x01000000	/* set the TID in the child */
+-#define CLONE_STOPPED		0x02000000	/* Start in stopped state */
++struct exec_domain;
++extern int exec_shield;
++extern int print_fatal_signals;
+ 
+ /*
+  * List of flags we want to share for kernel threads,
+@@ -103,13 +124,6 @@ extern unsigned long nr_uninterruptible(
  extern unsigned long nr_active(void);
  extern unsigned long nr_iowait(void);
  
@@ -9828,6 +10041,27 @@
  
  /*
   * Task state bitmask. NOTE! These bits are also
+@@ -156,20 +170,6 @@ #define set_current_state(state_value)		
+ /* Task command name length */
+ #define TASK_COMM_LEN 16
+ 
+-/*
+- * Scheduling policies
+- */
+-#define SCHED_NORMAL		0
+-#define SCHED_FIFO		1
+-#define SCHED_RR		2
+-#define SCHED_BATCH		3
+-
+-struct sched_param {
+-	int sched_priority;
+-};
+-
+-#ifdef __KERNEL__
+-
+ #include <linux/spinlock.h>
+ 
+ /*
 diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h
 index cd2773b..3e8b1cf 100644
 --- a/include/linux/seccomp.h

linux-2.6-header-install-git.patch:
 Makefile                              |   17 ++++
 include/Kbuild                        |    2 
 include/asm-alpha/Kbuild              |    9 ++
 include/asm-arm/Kbuild                |    7 ++
 include/asm-arm26/Kbuild              |    8 ++
 include/asm-cris/Kbuild               |    6 +
 include/asm-cris/arch-v10/Kbuild      |    3 
 include/asm-generic/Kbuild            |    3 
 include/asm-generic/Kbuild.asm        |   11 +++
 include/asm-h8300/Kbuild              |    6 +
 include/asm-i386/Kbuild               |    5 +
 include/asm-ia64/Kbuild               |    6 +
 include/asm-m32r/Kbuild               |    7 ++
 include/asm-m68k/Kbuild               |   17 ++++
 include/asm-m68knommu/Kbuild          |   12 +++
 include/asm-mips/Kbuild               |   15 ++++
 include/asm-parisc/Kbuild             |    8 ++
 include/asm-powerpc/Kbuild            |   10 ++
 include/asm-ppc/Kbuild                |    8 ++
 include/asm-s390/Kbuild               |    4 +
 include/asm-sh/Kbuild                 |    6 +
 include/asm-sh64/Kbuild               |    6 +
 include/asm-sparc/Kbuild              |   13 +++
 include/asm-sparc64/Kbuild            |   15 ++++
 include/asm-um/Kbuild                 |   14 ++++
 include/asm-v850/Kbuild               |   10 ++
 include/asm-x86_64/Kbuild             |   10 ++
 include/linux/Kbuild                  |   63 ++++++++++++++++++
 include/linux/byteorder/Kbuild        |    1 
 include/linux/dvb/Kbuild              |    2 
 include/linux/hdlc/Kbuild             |    1 
 include/linux/isdn/Kbuild             |    1 
 include/linux/netfilter/Kbuild        |   11 +++
 include/linux/netfilter_arp/Kbuild    |    2 
 include/linux/netfilter_bridge/Kbuild |    4 +
 include/linux/netfilter_ipv4/Kbuild   |   21 ++++++
 include/linux/netfilter_ipv6/Kbuild   |    5 +
 include/linux/nfsd/Kbuild             |    2 
 include/linux/raid/Kbuild             |    1 
 include/linux/sunrpc/Kbuild           |    1 
 include/linux/tc_act/Kbuild           |    1 
 include/linux/tc_ematch/Kbuild        |    1 
 include/media/Kbuild                  |    2 
 include/mtd/Kbuild                    |    2 
 include/rdma/Kbuild                   |    1 
 include/scsi/Kbuild                   |    2 
 include/sound/Kbuild                  |    2 
 include/video/Kbuild                  |    1 
 scripts/Makefile.headersinst          |  116 ++++++++++++++++++++++++++++++++++
 scripts/hdrcheck.sh                   |    8 ++
 50 files changed, 489 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-header-install-git.patch	26 Apr 2006 20:11:56 -0000	1.2
+++ linux-2.6-header-install-git.patch	26 Apr 2006 23:46:20 -0000	1.3
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index a940eae..09a420f 100644
+index a940eae..ca470f5 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -858,6 +858,21 @@ depend dep:
@@ -155,13 +155,13 @@
 +unifdef-y += mtrr.h vm86.h
 diff --git a/include/asm-ia64/Kbuild b/include/asm-ia64/Kbuild
 new file mode 100644
-index 0000000..e1200f3
+index 0000000..178f555
 --- /dev/null
 +++ b/include/asm-ia64/Kbuild
 @@ -0,0 +1,6 @@
 +include include/asm-generic/Kbuild.asm
 +
-+header-y += break.h fpswa.h fpu.h ia64regs.h kprobes.h perfmon_default_smpl.h \
++header-y += break.h fpu.h fwspa.h ia64regs.h kprobes.h perfmon_default_smpl.h \
 +	 ptrace_offsets.h rse.h setup.h ucontext.h
 +
 +unifdef-y += perfmon.h
@@ -412,7 +412,7 @@
 +unifdef-y += ia32.h mce.h mtrr.h vsyscall.h
 diff --git a/include/linux/Kbuild b/include/linux/Kbuild
 new file mode 100644
-index 0000000..54e8c3e
+index 0000000..ad45a99
 --- /dev/null
 +++ b/include/linux/Kbuild
 @@ -0,0 +1,63 @@
@@ -428,7 +428,7 @@
 +	bpqether.h cdk.h chio.h coda_psdev.h coff.h comstats.h		\
 +	consolemap.h crc-ccitt.h cycx_cfm.h cycx_x25.h			\
 +	devfs_fs.h dn.h dqblk_v1.h dqblk_v2.h dqblk_xfs.h efs_fs_sb.h	\
-+	elf-fdpic.h elf.h ethtool.h fadvise.h fd.h			\
++	elf-fdpic.h elf.h elf-em.h ethtool.h fadvise.h fd.h		\
 +	ftape-header-segment.h ftape-vendors.h fuse.h futex.h		\
 +	genetlink.h gen_stats.h gigaset_dev.h hdsmart.h hpfs_fs.h	\
 +	hysdn_if.h i2c-dev.h i2c-id.h i8k.h icmp.h if_arcnet.h		\



From fedora-cvs-commits at redhat.com  Wed Apr 26 23:47:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 19:47:07 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2165,1.2166
Message-ID: <200604262347.k3QNl7NU027221@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26596

Modified Files:
	kernel-2.6.spec 
Log Message:
but let's not turn it on just yet...


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2165
retrieving revision 1.2166
diff -u -r1.2165 -r1.2166
--- kernel-2.6.spec	26 Apr 2006 23:46:20 -0000	1.2165
+++ kernel-2.6.spec	26 Apr 2006 23:47:05 -0000	1.2166
@@ -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 Apr 26 23:54:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 19:54:54 -0400
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders.spec, 1.106,
	1.107 sources, 1.22, 1.23
Message-ID: <200604262354.k3QNssvF005169@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5135

Modified Files:
	glibc-kernheaders.spec sources 
Log Message:
Update to new tarball from kernel


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- glibc-kernheaders.spec	24 Apr 2006 13:11:41 -0000	1.106
+++ glibc-kernheaders.spec	26 Apr 2006 23:54:51 -0000	1.107
@@ -1,7 +1,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -17,33 +17,6 @@
 %endif
 
 Source0: glibc-kernheaders.tar.bz2
-Patch0: glibc-kernheaders-2.4-atmfix.patch
-Patch1: glibc-kernheaders-2.4-mtd.patch
-Patch2: glibc-kernheaders-2.4-audit.patch
-Patch3: glibc-kernheaders-2.4-ppc64-ptrace-1.patch
-Patch4: glibc-kernheaders-2.4-ppc-ptrace-2.patch
-Patch5: glibc-kernheaders-2.4-ia64-ptrace.patch
-Patch6: glibc-kernheaders-2.4-v6only.patch
-#Patch7: glibc-kernheaders-2.4-kversion.patch
-Patch8: glibc-kernheaders-2.4-videodev.patch
-Patch9: glibc-kernheaders-2.4-quota.patch
-Patch10: glibc-kernheaders-2.4-socket.patch
-Patch11: glibc-kernheaders-2.4-x86_64-mce.patch
-Patch12: glibc-kernheaders-2.4-futex.patch
-Patch13: glibc-kernheaders-2.4-gplpedantry.patch
-Patch14: glibc-kernheaders-2.4-x86_64-epoll.patch
-Patch15: glibc-kernheaders-2.4-uinput.patch
-Patch16: glibc-kernheaders-2.4-ppc64-stat.patch
-Patch17: glibc-kernheaders-2.4-ppc64-statfs.patch
-Patch18: glibc-kernheaders-2.4-infiniband.patch
-Patch19: glibc-kernheaders-2.4-miitypes.patch
-Patch20: glibc-kernheaders-2.4-shmexec.patch
-Patch21: glibc-kernheaders-2.4-dvb.patch
-Patch22: glibc-kernheaders-2.4-keyctl.patch
-Patch23: glibc-kernheaders-2.4-unistd.patch
-Patch24: glibc-kernheaders-2.4-watchdog.patch
-Patch25: glibc-kernheaders-2.4-iphdr.patch
-Patch26: glibc-kernheaders-2.4-errno.patch
 
 %description
 Kernel-headers includes the C header files that specify the interface
@@ -56,96 +29,39 @@
 
 %prep
 %setup -q -c
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-#%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
 
 %build
 
 %install
 mkdir -p $RPM_BUILD_ROOT
 tar -cf -  usr | tar -xf - -C $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/include/asm
 pushd $RPM_BUILD_ROOT/usr/include
-d1=asm-%{_arch}
-d2=asm
 %ifarch x86_64
-p1='defined __x86_64__'
-d2=asm-i386
-p2='defined __i386__'
-%endif
-%ifarch sparc sparc64
-d1=asm-sparc
-p1='defined __sparc__ && !defined __arch64__'
-d2=asm-sparc64
-p2='defined __sparc__ && defined __arch64__'
+%define removedirs asm-{s390,powerpc,ia64}
+%define asmdir asm-bix86
 %endif
 %ifarch ppc ppc64
-d1=asm-ppc
-p1='defined __powerpc__ && !defined __powerpc64__'
-d2=asm-ppc64
-p2='defined __powerpc64__'
+%define removedirs asm-{s390,i386,x86_64,bix86,ia64}
+%define asmdir asm-powerpc
 %endif
 %ifarch s390 s390x
-d1=asm-s390
-p1='defined __s390__ && !defined __s390x__'
-d2=asm-s390x
-p2='defined __s390x__'
+%define removedirs asm-{i386,x86_64,bix86,powerpc,ia64}
+%define asmdir asm-s390
+%endif
+%ifarch i386
+%define removedirs asm-{s390,x86_64,bix86,powerpc,ia64}
+%define asmdir asm-i386
+%endif
+%ifarch ia64
+%define removedirs asm-{s390,i386,x86_64,bix86,powerpc}
+%define asmdir asm-ia64
 %endif
-for i in asm-*; do
-  case $i in $d1|$d2) ;; *) rm -rf $i;; esac
-done
-if [ "$d2" = "asm" ]; then
-  rm -rf asm
-  mv $d1 asm
-else
-  for f in `find $d1 $d2 -name \*.h -exec basename {} \; | sort -u`; do
-    F=`echo $f | tr a-z. A-Z_`
-    ( cat <<EOF
-#ifndef __ASM_STUB_${F}__
-# define __ASM_STUB_${F}__
-EOF
-      echo "# if $p1"
-      if [ -f $d1/$f ]; then
-	echo "#  include <$d1/$f>"
-      else
-	echo "#  error <$d1/$f> does not exist"
-      fi
-      echo "# endif"
-      echo "# if $p2"
-      if [ -f $d2/$f ]; then
-	echo "#  include <$d2/$f>"
-      else
-	echo "#  error <$d2/$f> does not exist"
-      fi
-      echo "# endif"
-      echo "#endif"
-    ) > asm/$f
-  done
-fi
+
+rm -rf %{removedirs}
+mv %{asmdir} asm
+
+# glibc-headers provides /usr/include/scsi, although it's kernel headers
+rm -rf scsi
 popd
 
 %clean
@@ -170,12 +86,16 @@
 
 %files
 %defattr(-,root,root)
-/usr/include/mtd
-/usr/include/linux
-/usr/include/asm*
+/usr/include/*
 
 
 %changelog
+* Wed Apr 26 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-8
+- Updated tarball from 'make headers_install' from 2.6.16-1.2166_FC6
+  This should match the contents of the 'kernel-headers' subpackage
+  of the kernel, if I was brave enough to actually switch over to that
+  for real. Let's just test it this way for now though...
+
 * Mon Apr 24 2006 Jakub Jelinek <jakub at redhat.com> - 3.0-7
 - fix typo in the i386 fstatat64 change
 - Add new syscalls up to 2006-04-24
@@ -189,6 +109,7 @@
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0-5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
+>>>>>>> 1.106
 * Mon Feb 6 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-5
 - Add EOWNERDEAD and ENOTRECOVERABLE error codes
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	20 Jan 2005 11:22:49 -0000	1.22
+++ sources	26 Apr 2006 23:54:51 -0000	1.23
@@ -1 +1 @@
-e41009e5e188a243a47949695ff3cb0d  glibc-kernheaders.tar.bz2
+116e65e8cdebc8984909ecddeb1add2c  glibc-kernheaders.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 00:08:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 20:08:36 -0400
Subject: rpms/glibc/devel glibc.spec,1.236,1.236.2.1
Message-ID: <200604270008.k3R08a0C007539@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7529

Modified Files:
      Tag: private-dwmw2-test-branch
	glibc.spec 
Log Message:
testbuild


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.236
retrieving revision 1.236.2.1
diff -u -r1.236 -r1.236.2.1
--- glibc.spec	26 Apr 2006 20:37:19 -0000	1.236
+++ glibc.spec	27 Apr 2006 00:08:33 -0000	1.236.2.1
@@ -20,7 +20,7 @@
 Summary: The GNU libc libraries.
 Name: glibc
 Version: %{glibcversion}
-Release: %{glibcrelease}
+Release: %{glibcrelease}.dwmw2testbuild
 License: LGPL
 Group: System Environment/Libraries
 Source0: %{glibcsrcdir}.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 00:29:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 20:29:08 -0400
Subject: rpms/glibc/devel glibc.spec,1.236.2.1,1.236.2.2
Message-ID: <200604270029.k3R0T8cs027842@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27811

Modified Files:
      Tag: private-dwmw2-test-branch
	glibc.spec 
Log Message:
try again without x86_64, which is playing silly buggers


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.236.2.1
retrieving revision 1.236.2.2
diff -u -r1.236.2.1 -r1.236.2.2
--- glibc.spec	27 Apr 2006 00:08:33 -0000	1.236.2.1
+++ glibc.spec	27 Apr 2006 00:29:05 -0000	1.236.2.2
@@ -20,7 +20,8 @@
 Summary: The GNU libc libraries.
 Name: glibc
 Version: %{glibcversion}
-Release: %{glibcrelease}.dwmw2testbuild
+Release: %{glibcrelease}.dwmw2testbuild.1
+ExcludeArch: x64_64
 License: LGPL
 Group: System Environment/Libraries
 Source0: %{glibcsrcdir}.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 00:32:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 20:32:38 -0400
Subject: rpms/glibc/devel glibc.spec,1.236.2.2,1.236.2.3
Message-ID: <200604270032.k3R0WccC028344@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28308

Modified Files:
      Tag: private-dwmw2-test-branch
	glibc.spec 
Log Message:
I can't spell x86_64. But that wasn't the problem


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.236.2.2
retrieving revision 1.236.2.3
diff -u -r1.236.2.2 -r1.236.2.3
--- glibc.spec	27 Apr 2006 00:29:05 -0000	1.236.2.2
+++ glibc.spec	27 Apr 2006 00:31:43 -0000	1.236.2.3
@@ -20,8 +20,8 @@
 Summary: The GNU libc libraries.
 Name: glibc
 Version: %{glibcversion}
-Release: %{glibcrelease}.dwmw2testbuild.1
-ExcludeArch: x64_64
+Release: %{glibcrelease}.dwmw2testbuild.2
+ExcludeArch: x86_64
 License: LGPL
 Group: System Environment/Libraries
 Source0: %{glibcsrcdir}.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 00:32:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 20:32:55 -0400
Subject: rpms/kernel/devel patch-2.6.17-rc2-git8.bz2.sign, NONE,
	1.1 .cvsignore, 1.414, 1.415 kernel-2.6.spec, 1.2166,
	1.2167 sources, 1.356, 1.357 upstream, 1.327,
	1.328 patch-2.6.17-rc2-git7.bz2.sign, 1.1, NONE
Message-ID: <200604270032.k3R0WtKu028361@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28307

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17-rc2-git8.bz2.sign 
Removed Files:
	patch-2.6.17-rc2-git7.bz2.sign 
Log Message:
git8



--- NEW FILE patch-2.6.17-rc2-git8.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBET8OryGugalF9Dw4RAm10AKCNrvVsE9sfLl6W/8MXzDKks/FL/ACfZoly
ifwFWCaqbTAJQzcFR6xcTqE=
=48N6
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -r1.414 -r1.415
--- .cvsignore	25 Apr 2006 22:22:38 -0000	1.414
+++ .cvsignore	27 Apr 2006 00:32:04 -0000	1.415
@@ -4,4 +4,4 @@
 linux-2.6.16.tar.bz2
 xen-20060413.tar.bz2
 patch-2.6.17-rc2.bz2
-patch-2.6.17-rc2-git7.bz2
+patch-2.6.17-rc2-git8.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2166
retrieving revision 1.2167
diff -u -r1.2166 -r1.2167
--- kernel-2.6.spec	26 Apr 2006 23:47:05 -0000	1.2166
+++ kernel-2.6.spec	27 Apr 2006 00:32:21 -0000	1.2167
@@ -228,7 +228,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.17-rc2.bz2
-Patch2: patch-2.6.17-rc2-git7.bz2
+Patch2: patch-2.6.17-rc2-git8.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -1708,6 +1708,9 @@
 %endif
 
 %changelog
+* Wed Apr 26 2006 Dave Jones <davej at redhat.com>
+- 2.6.17rc2-git8
+
 * Wed Apr 26 2006 David Woodhouse <dwmw2 at redhat.com>
 - Don't include /usr/include/scsi in kernel-headers for now, because
   glibc ships those for itself. Update header cleanup patches so that


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -r1.356 -r1.357
--- sources	25 Apr 2006 22:22:40 -0000	1.356
+++ sources	27 Apr 2006 00:32:21 -0000	1.357
@@ -1,4 +1,4 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 e8e055329db3aad40a010ded0f8bdcf9  xen-20060413.tar.bz2
 87c4ea50e1b25ad808b65ad3fb19a9b5  patch-2.6.17-rc2.bz2
-5f475c41a119c619d0132d65bc98dff5  patch-2.6.17-rc2-git7.bz2
+e86d6994d26133854b8ae0af46917c62  patch-2.6.17-rc2-git8.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -r1.327 -r1.328
--- upstream	25 Apr 2006 22:22:40 -0000	1.327
+++ upstream	27 Apr 2006 00:32:21 -0000	1.328
@@ -1,3 +1,3 @@
 linux-2.6.16.tar.bz2
 patch-2.6.17-rc2.bz2
-patch-2.6.17-rc2-git7.bz2
+patch-2.6.17-rc2-git8.bz2


--- patch-2.6.17-rc2-git7.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 27 00:40:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 20:40:21 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2167,1.2168
Message-ID: <200604270040.k3R0eLI1029185@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29058

Modified Files:
	kernel-2.6.spec 
Log Message:
s390 lives again



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2167
retrieving revision 1.2168
diff -u -r1.2167 -r1.2168
--- kernel-2.6.spec	27 Apr 2006 00:32:21 -0000	1.2167
+++ kernel-2.6.spec	27 Apr 2006 00:40:16 -0000	1.2168
@@ -168,8 +168,7 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries
-#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0



From fedora-cvs-commits at redhat.com  Thu Apr 27 00:46:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 20:46:36 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2168,1.2169
Message-ID: <200604270046.k3R0kaYF002224@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1660

Modified Files:
	kernel-2.6.spec 
Log Message:
empty



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2168
retrieving revision 1.2169
diff -u -r1.2168 -r1.2169
--- kernel-2.6.spec	27 Apr 2006 00:40:16 -0000	1.2168
+++ kernel-2.6.spec	27 Apr 2006 00:46:33 -0000	1.2169
@@ -1043,7 +1043,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  Thu Apr 27 01:03:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 21:03:22 -0400
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders.spec, 1.107,
	1.108 sources, 1.23, 1.24
Message-ID: <200604270103.k3R13Msf017683@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17660

Modified Files:
	glibc-kernheaders.spec sources 
Log Message:
add asm-generic/ioctl.h back


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- glibc-kernheaders.spec	26 Apr 2006 23:54:51 -0000	1.107
+++ glibc-kernheaders.spec	27 Apr 2006 01:03:20 -0000	1.108
@@ -1,7 +1,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -91,6 +91,9 @@
 
 %changelog
 * Wed Apr 26 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-8
+- Add asm-generic/ioctl.h
+
+* Wed Apr 26 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-8
 - Updated tarball from 'make headers_install' from 2.6.16-1.2166_FC6
   This should match the contents of the 'kernel-headers' subpackage
   of the kernel, if I was brave enough to actually switch over to that


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	26 Apr 2006 23:54:51 -0000	1.23
+++ sources	27 Apr 2006 01:03:20 -0000	1.24
@@ -1 +1 @@
-116e65e8cdebc8984909ecddeb1add2c  glibc-kernheaders.tar.bz2
+8d0c34fe4f83c0b7f88d01930529a9a5  glibc-kernheaders.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 01:20:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 21:20:54 -0400
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders.spec, 1.108,
	1.109 sources, 1.24, 1.25
Message-ID: <200604270120.k3R1KshV001829@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1729

Modified Files:
	glibc-kernheaders.spec sources 
Log Message:
fix x86_64 glibc build


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- glibc-kernheaders.spec	27 Apr 2006 01:03:20 -0000	1.108
+++ glibc-kernheaders.spec	27 Apr 2006 01:20:37 -0000	1.109
@@ -1,7 +1,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -90,7 +90,10 @@
 
 
 %changelog
-* Wed Apr 26 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-8
+* Wed Apr 26 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-9
+- Change the include guards for biarch headers to cope with -undef
+
+* Wed Apr 26 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-9
 - Add asm-generic/ioctl.h
 
 * Wed Apr 26 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-8


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	27 Apr 2006 01:03:20 -0000	1.24
+++ sources	27 Apr 2006 01:20:37 -0000	1.25
@@ -1 +1 @@
-8d0c34fe4f83c0b7f88d01930529a9a5  glibc-kernheaders.tar.bz2
+5f42c374d8fa4e6517a0c338d0598c10  glibc-kernheaders.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 01:39:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 21:39:10 -0400
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders.spec, 1.109,
	1.110 sources, 1.25, 1.26
Message-ID: <200604270139.k3R1dApX005671@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5627

Modified Files:
	glibc-kernheaders.spec sources 
Log Message:
fix ia64 too


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- glibc-kernheaders.spec	27 Apr 2006 01:20:37 -0000	1.109
+++ glibc-kernheaders.spec	27 Apr 2006 01:39:06 -0000	1.110
@@ -1,7 +1,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -25,6 +25,7 @@
 building most standard programs and are also needed for rebuilding the
 glibc package
 
+* Wed Apr 26 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-9
 
 
 %prep
@@ -90,7 +91,10 @@
 
 
 %changelog
-* Wed Apr 26 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-9
+* Thu Apr 27 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-11
+- Include asm-ia64/*intrin*.h
+
+* Wed Apr 26 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-10
 - Change the include guards for biarch headers to cope with -undef
 
 * Wed Apr 26 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-9


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	27 Apr 2006 01:20:37 -0000	1.25
+++ sources	27 Apr 2006 01:39:06 -0000	1.26
@@ -1 +1 @@
-5f42c374d8fa4e6517a0c338d0598c10  glibc-kernheaders.tar.bz2
+c3afef886b175bd9e4568e33171c0c15  glibc-kernheaders.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 01:42:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 21:42:53 -0400
Subject: rpms/kernel/devel linux-2.6-header-install-git.patch,1.3,1.4
Message-ID: <200604270142.k3R1grjV006634@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6605

Modified Files:
	linux-2.6-header-install-git.patch 
Log Message:
this should fix glibc on most arches... hopefully

linux-2.6-header-install-git.patch:
 Makefile                              |   17 ++++
 include/Kbuild                        |    2 
 include/asm-alpha/Kbuild              |    9 ++
 include/asm-arm/Kbuild                |    7 +
 include/asm-arm26/Kbuild              |    8 ++
 include/asm-cris/Kbuild               |    6 +
 include/asm-cris/arch-v10/Kbuild      |    3 
 include/asm-generic/Kbuild            |    3 
 include/asm-generic/Kbuild.asm        |   11 +++
 include/asm-h8300/Kbuild              |    6 +
 include/asm-i386/Kbuild               |    5 +
 include/asm-ia64/Kbuild               |    7 +
 include/asm-m32r/Kbuild               |    7 +
 include/asm-m68k/Kbuild               |   17 ++++
 include/asm-m68knommu/Kbuild          |   12 +++
 include/asm-mips/Kbuild               |   15 ++++
 include/asm-parisc/Kbuild             |    8 ++
 include/asm-powerpc/Kbuild            |   10 ++
 include/asm-ppc/Kbuild                |    8 ++
 include/asm-s390/Kbuild               |    4 +
 include/asm-sh/Kbuild                 |    6 +
 include/asm-sh64/Kbuild               |    6 +
 include/asm-sparc/Kbuild              |   13 +++
 include/asm-sparc64/Kbuild            |   16 ++++
 include/asm-um/Kbuild                 |   14 +++
 include/asm-v850/Kbuild               |   10 ++
 include/asm-x86_64/Kbuild             |   11 +++
 include/linux/Kbuild                  |   63 +++++++++++++++++
 include/linux/byteorder/Kbuild        |    1 
 include/linux/dvb/Kbuild              |    2 
 include/linux/hdlc/Kbuild             |    1 
 include/linux/isdn/Kbuild             |    1 
 include/linux/netfilter/Kbuild        |   11 +++
 include/linux/netfilter_arp/Kbuild    |    2 
 include/linux/netfilter_bridge/Kbuild |    4 +
 include/linux/netfilter_ipv4/Kbuild   |   21 +++++
 include/linux/netfilter_ipv6/Kbuild   |    5 +
 include/linux/nfsd/Kbuild             |    2 
 include/linux/raid/Kbuild             |    1 
 include/linux/sunrpc/Kbuild           |    1 
 include/linux/tc_act/Kbuild           |    1 
 include/linux/tc_ematch/Kbuild        |    1 
 include/media/Kbuild                  |    2 
 include/mtd/Kbuild                    |    2 
 include/rdma/Kbuild                   |    1 
 include/scsi/Kbuild                   |    2 
 include/sound/Kbuild                  |    2 
 include/video/Kbuild                  |    1 
 scripts/Makefile.headersinst          |  124 ++++++++++++++++++++++++++++++++++
 scripts/hdrcheck.sh                   |    8 ++
 50 files changed, 500 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-header-install-git.patch	26 Apr 2006 23:46:20 -0000	1.3
+++ linux-2.6-header-install-git.patch	27 Apr 2006 01:42:49 -0000	1.4
@@ -106,11 +106,11 @@
 +	timex.h unistd.h user.h
 diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild
 new file mode 100644
-index 0000000..fb44933
+index 0000000..2558ee8
 --- /dev/null
 +++ b/include/asm-generic/Kbuild
 @@ -0,0 +1,3 @@
-+header-y += errno-base.h errno.h fcntl.h ipc.h mman.h signal.h	\
++header-y += errno-base.h errno.h fcntl.h ioctl.h ipc.h mman.h signal.h	\
 +	statfs.h
 +unifdef-y := resource.h siginfo.h
 diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm
@@ -155,13 +155,14 @@
 +unifdef-y += mtrr.h vm86.h
 diff --git a/include/asm-ia64/Kbuild b/include/asm-ia64/Kbuild
 new file mode 100644
-index 0000000..178f555
+index 0000000..070c2e6
 --- /dev/null
 +++ b/include/asm-ia64/Kbuild
-@@ -0,0 +1,6 @@
+@@ -0,0 +1,7 @@
 +include include/asm-generic/Kbuild.asm
 +
-+header-y += break.h fpu.h fwspa.h ia64regs.h kprobes.h perfmon_default_smpl.h \
++header-y += break.h fpu.h fwspa.h gcc_intrin.h ia64regs.h		\
++	 intel_intrin.h kprobes.h intrinsics.h perfmon_default_smpl.h	\
 +	 ptrace_offsets.h rse.h setup.h ucontext.h
 +
 +unifdef-y += perfmon.h
@@ -339,14 +340,15 @@
 +	vac-ops.h vaddrs.h vfc_ioctls.h viking.h winmacro.h
 diff --git a/include/asm-sparc64/Kbuild b/include/asm-sparc64/Kbuild
 new file mode 100644
-index 0000000..9b1c48c
+index 0000000..225df8a
 --- /dev/null
 +++ b/include/asm-sparc64/Kbuild
-@@ -0,0 +1,15 @@
+@@ -0,0 +1,16 @@
 +include include/asm-generic/Kbuild.asm
 +
 +ALTARCH := sparc
-+ARCHDEF := __arch64__ 
++ARCHDEF := defined __sparc__ && defined __arch64__ 
++ALTARCHDEF := defined __sparc__ && !defined __arch64__
 +
 +header-y += agp.h apb.h asi.h auxio.h bbc.h bpp.h bsderrno.h \
 +	chafsr.h chmctrl.h compat.h const.h cpudata.h dcr.h dcu.h \
@@ -396,14 +398,15 @@
 +	v850e_uartb.h v850e_utils.h
 diff --git a/include/asm-x86_64/Kbuild b/include/asm-x86_64/Kbuild
 new file mode 100644
-index 0000000..b8d8251
+index 0000000..ed24e73
 --- /dev/null
 +++ b/include/asm-x86_64/Kbuild
-@@ -0,0 +1,10 @@
+@@ -0,0 +1,11 @@
 +include include/asm-generic/Kbuild.asm
 +
 +ALTARCH := i386
-+ARCHDEF := __x86_64__
++ARCHDEF := defined __x86_64__
++ALTARCHDEF := defined __i386__
 +
 +header-y += boot.h bootsetup.h cpufeature.h debugreg.h kprobes.h ldt.h \
 +	 msr.h prctl.h setup.h sigcontext32.h ucontext.h user32.h \
@@ -665,10 +668,10 @@
 +unifdef-y := sisfb.h
 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
 new file mode 100644
-index 0000000..265d1ea
+index 0000000..ecb78b0
 --- /dev/null
 +++ b/scripts/Makefile.headersinst
-@@ -0,0 +1,116 @@
+@@ -0,0 +1,124 @@
 +# ==========================================================================
 +# Installing headers
 +# ==========================================================================
@@ -718,6 +721,7 @@
 +
 +export ALTARCH
 +export ARCHDEF
++export ALTARCHDEF
 +
 +quiet_cmd_headers_install = INSTALL $(_dst)/$@
 +      cmd_headers_install = cp $(srctree)/$(obj)/$@ $(INSTALL_HDR_PATH)/$(_dst)
@@ -732,20 +736,27 @@
 +      cmd_mkdir		  = mkdir -p $(INSTALL_HDR_PATH)/$@
 +
 +quiet_cmd_gen		  = GEN $(_dst)/$@
-+      cmd_gen		  = ( echo "/* File autogenerated by 'make headers_install' */"	;			\
-+      			    echo "\#ifdef $(ARCHDEF)" ;								\
++      cmd_gen		  = STUBDEF=__ASM_STUB_`echo $@ | tr a-z. A-Z_` ;					\
++      			    ( echo "/* File autogenerated by 'make headers_install' */"	;			\
++      			    echo "\#ifndef $$STUBDEF" ;								\
++      			    echo "\#define $$STUBDEF" ;								\
++      			    echo "\# if $(ARCHDEF)" ;								\
 +			    if [ -r $(srctree)/include/$(archasm)/$@ ]; then					\
-+      			       echo "\#include <$(archasm)/$@>" ;						\
++      			       echo "\#  include <$(archasm)/$@>" ;						\
 +			    else										\
-+      			       echo "\#error $(archasm)/$@ does not exist in the $(ARCH) architecture" ;	\
++      			       echo "\#  error $(archasm)/$@ does not exist in the $(ARCH) architecture" ;	\
 +			    fi ;										\
-+      			    echo "\#else" ;									\
++      			    echo "\# elif $(ALTARCHDEF)" ;							\
 +			    if [ -r $(srctree)/include/$(altarchasm)/$@ ]; then					\
-+      			       echo "\#include <$(altarchasm)/$@>" ;						\
++      			       echo "\#  include <$(altarchasm)/$@>" ;						\
 +			    else										\
-+      			       echo "\#error $(altarchasm)/$@ does not exist in the $(ALTARCH) architecture" ;	\
++      			       echo "\#  error $(altarchasm)/$@ does not exist in the $(ALTARCH) architecture" ;	\
 +			    fi ;										\
-+      			    echo "\#endif" ) > $(INSTALL_HDR_PATH)/$(_dst)/$@
++      			    echo "\# else" ;									\
++			    echo "\#  warning This machine appears to be neither $(ARCH) nor $(ALTARCH)." ;	\
++      			    echo "\# endif" ;									\
++      			    echo "\#endif /* $$STUBDEF */" ;							\
++			    	 ) > $(INSTALL_HDR_PATH)/$(_dst)/$@
 +
 +__headersinst: $(subdir-y) $(header-y) $(unifdef-y) $(altarch-y)
 +



From fedora-cvs-commits at redhat.com  Thu Apr 27 01:49:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 21:49:42 -0400
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders.spec,1.110,1.111
Message-ID: <200604270149.k3R1ngbD019419@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19385

Modified Files:
	glibc-kernheaders.spec 
Log Message:
Remove stray cvs conflict marker


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- glibc-kernheaders.spec	27 Apr 2006 01:39:06 -0000	1.110
+++ glibc-kernheaders.spec	27 Apr 2006 01:49:37 -0000	1.111
@@ -119,7 +119,6 @@
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0-5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
->>>>>>> 1.106
 * Mon Feb 6 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-5
 - Add EOWNERDEAD and ENOTRECOVERABLE error codes
 



From fedora-cvs-commits at redhat.com  Thu Apr 27 02:05:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 22:05:55 -0400
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders.spec, 1.111,
	1.112 sources, 1.26, 1.27
Message-ID: <200604270205.k3R25tFo026015@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25978

Modified Files:
	glibc-kernheaders.spec sources 
Log Message:
Wheee. Another attempt


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- glibc-kernheaders.spec	27 Apr 2006 01:49:37 -0000	1.111
+++ glibc-kernheaders.spec	27 Apr 2006 02:05:40 -0000	1.112
@@ -1,7 +1,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -91,6 +91,9 @@
 
 
 %changelog
+* Thu Apr 27 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-12
+- ... and remove the inclusion of <linux/config.h> from it.
+
 * Thu Apr 27 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-11
 - Include asm-ia64/*intrin*.h
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	27 Apr 2006 01:39:06 -0000	1.26
+++ sources	27 Apr 2006 02:05:40 -0000	1.27
@@ -1 +1 @@
-c3afef886b175bd9e4568e33171c0c15  glibc-kernheaders.tar.bz2
+65ef83fb0833fdef4e8ce360a1f0614f  glibc-kernheaders.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 02:48:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 22:48:53 -0400
Subject: rpms/glibc-kernheaders/devel kernel-headers-2.6-libaudit.patch, NONE,
	1.1 glibc-kernheaders.spec, 1.112, 1.113
Message-ID: <200604270248.k3R2mrSx003925@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3910

Modified Files:
	glibc-kernheaders.spec 
Added Files:
	kernel-headers-2.6-libaudit.patch 
Log Message:
work around userspace libaudit.h

kernel-headers-2.6-libaudit.patch:
 audit.h |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE kernel-headers-2.6-libaudit.patch ---
--- usr/include/linux/audit.h	2006-04-27 00:47:28.000000000 +0100
+++ usr/include/linux/audit.h	2006-04-27 03:42:09.000000000 +0100
@@ -236,6 +236,7 @@
 	__u32		backlog;	/* messages waiting in queue */
 };
 
+#if 0 /* libaudit.h has this unconditionally */
 /* audit_rule_data supports filter rules with both integer and string
  * fields.  It corresponds with AUDIT_ADD_RULE, AUDIT_DEL_RULE and
  * AUDIT_LIST_RULES requests.
@@ -251,6 +252,7 @@
 	__u32		buflen;	/* total length of string fields */
 	char		buf[0];	/* string fields buffer */
 };
+#endif
 
 /* audit_rule is supported to maintain backward compatibility with
  * userspace.  It supports integer fields only and corresponds to


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- glibc-kernheaders.spec	27 Apr 2006 02:05:40 -0000	1.112
+++ glibc-kernheaders.spec	27 Apr 2006 02:48:50 -0000	1.113
@@ -1,7 +1,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -17,6 +17,7 @@
 %endif
 
 Source0: glibc-kernheaders.tar.bz2
+Patch1: kernel-headers-2.6-libaudit.patch
 
 %description
 Kernel-headers includes the C header files that specify the interface
@@ -25,11 +26,10 @@
 building most standard programs and are also needed for rebuilding the
 glibc package
 
-* Wed Apr 26 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-9
-
 
 %prep
 %setup -q -c
+%patch1 -p0
 
 %build
 
@@ -91,6 +91,9 @@
 
 
 %changelog
+* Thu Apr 27 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-13
+- Work around libaudit.h defining audit_rule_data
+
 * Thu Apr 27 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-12
 - ... and remove the inclusion of <linux/config.h> from it.
 



From fedora-cvs-commits at redhat.com  Thu Apr 27 03:10:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 23:10:57 -0400
Subject: rpms/kernel/devel patch-2.6.17-rc3.bz2.sign, NONE, 1.1 .cvsignore,
	1.415, 1.416 kernel-2.6.spec, 1.2169, 1.2170 sources, 1.357,
	1.358 upstream, 1.328, 1.329 patch-2.6.17-rc2-git8.bz2.sign,
	1.1, NONE patch-2.6.17-rc2.bz2.sign, 1.1, NONE
Message-ID: <200604270310.k3R3AvHh012572@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4194

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17-rc3.bz2.sign 
Removed Files:
	patch-2.6.17-rc2-git8.bz2.sign patch-2.6.17-rc2.bz2.sign 
Log Message:
rc3



--- NEW FILE patch-2.6.17-rc3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEUDJEyGugalF9Dw4RAshdAKCSOWWisGNDYfmJ/ue5nyAwwOVGngCfY4qc
5uFWZr4R2oo4Yke1+y0nxIA=
=G3ts
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -r1.415 -r1.416
--- .cvsignore	27 Apr 2006 00:32:04 -0000	1.415
+++ .cvsignore	27 Apr 2006 03:10:47 -0000	1.416
@@ -3,5 +3,4 @@
 kernel-2.6.16
 linux-2.6.16.tar.bz2
 xen-20060413.tar.bz2
-patch-2.6.17-rc2.bz2
-patch-2.6.17-rc2-git8.bz2
+patch-2.6.17-rc3.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2169
retrieving revision 1.2170
diff -u -r1.2169 -r1.2170
--- kernel-2.6.spec	27 Apr 2006 00:46:33 -0000	1.2169
+++ kernel-2.6.spec	27 Apr 2006 03:10:48 -0000	1.2170
@@ -226,8 +226,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17-rc2.bz2
-Patch2: patch-2.6.17-rc2-git8.bz2
+Patch1: patch-2.6.17-rc3.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -746,7 +745,7 @@
 
 # Update to latest upstream.
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -1708,6 +1707,7 @@
 
 %changelog
 * Wed Apr 26 2006 Dave Jones <davej at redhat.com>
+- 2.6.17rc3
 - 2.6.17rc2-git8
 
 * Wed Apr 26 2006 David Woodhouse <dwmw2 at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- sources	27 Apr 2006 00:32:21 -0000	1.357
+++ sources	27 Apr 2006 03:10:51 -0000	1.358
@@ -1,4 +1,3 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 e8e055329db3aad40a010ded0f8bdcf9  xen-20060413.tar.bz2
-87c4ea50e1b25ad808b65ad3fb19a9b5  patch-2.6.17-rc2.bz2
-e86d6994d26133854b8ae0af46917c62  patch-2.6.17-rc2-git8.bz2
+ee23bf1dfd67fcbbad1eb124ec32428c  patch-2.6.17-rc3.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -r1.328 -r1.329
--- upstream	27 Apr 2006 00:32:21 -0000	1.328
+++ upstream	27 Apr 2006 03:10:51 -0000	1.329
@@ -1,3 +1,2 @@
 linux-2.6.16.tar.bz2
-patch-2.6.17-rc2.bz2
-patch-2.6.17-rc2-git8.bz2
+patch-2.6.17-rc3.bz2


--- patch-2.6.17-rc2-git8.bz2.sign DELETED ---


--- patch-2.6.17-rc2.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 27 03:18:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 23:18:01 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2170,1.2171
Message-ID: <200604270318.k3R3I1Si026677@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25213

Modified Files:
	kernel-2.6.spec 
Log Message:
something odd in the buildhosts, disable xen for now



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2170
retrieving revision 1.2171
diff -u -r1.2170 -r1.2171
--- kernel-2.6.spec	27 Apr 2006 03:10:48 -0000	1.2170
+++ kernel-2.6.spec	27 Apr 2006 03:17:56 -0000	1.2171
@@ -9,7 +9,7 @@
 # Whether to apply the Xen patches, leave this enabled.
 %define includexen 1
 # Whether to build the Xen kernels, disable if you want.
-%define buildxen 1
+%define buildxen 0
 %define buildxenPAE 0
 %define builddoc 0
 %define buildkdump 1



From fedora-cvs-commits at redhat.com  Thu Apr 27 03:27:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 23:27:52 -0400
Subject: rpms/fontconfig/devel fontconfig-2.3.95-defaultconfig.patch, 1.1,
	1.2 fontconfig.spec, 1.74, 1.75
Message-ID: <200604270327.k3R3RqCi032513@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/fontconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32463

Modified Files:
	fontconfig-2.3.95-defaultconfig.patch fontconfig.spec 
Log Message:
fix typo


fontconfig-2.3.95-defaultconfig.patch:
 fonts.conf.in |  102 +++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 77 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fontconfig-2.3.95-defaultconfig.patch	26 Apr 2006 17:22:08 -0000	1.1
+++ fontconfig-2.3.95-defaultconfig.patch	27 Apr 2006 03:27:48 -0000	1.2
@@ -4,7 +4,7 @@
  		<family>Nimbus Roman No9 L</family>
  		<family>Luxi Serif</family>
  		<family>Kochi Mincho</family>
-+                <family>Sazanami Mincho</family>>
++                <family>Sazanami Mincho</family>
 +                <family>AR PL ZenKai Uni</family>
  		<family>AR PL SungtiL GB</family>
  		<family>AR PL Mingti2L Big5</family>
@@ -15,7 +15,7 @@
  		<family>Luxi Sans</family>
 +                <family>Sazanami Gothic</family>
  		<family>Kochi Gothic</family>
-+                <family>AR PL ShanHeiSun Uni</family
++                <family>AR PL ShanHeiSun Uni</family>
  		<family>AR PL KaitiM GB</family>
  		<family>AR PL KaitiM Big5</family>
  		<family>?????? ????????????</family>


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- fontconfig.spec	26 Apr 2006 17:22:08 -0000	1.74
+++ fontconfig.spec	27 Apr 2006 03:27:48 -0000	1.75
@@ -3,7 +3,7 @@
 Summary: Font configuration and customization library
 Name: fontconfig
 Version: 2.3.95
-Release: 1
+Release: 2
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -135,6 +135,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 26 2006 Bill Nottingham <notting at redhat.com> - 2.3.95-2
+- fix fonts.conf typo
+
 * Wed Apr 26 2006 Matthias Clasen <mclasen at redhat.com> - 2.3.95-1
 - Update to 2.3.95
 



From fedora-cvs-commits at redhat.com  Thu Apr 27 03:45:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 23:45:53 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.104, 1.105 mkinitrd.spec, 1.117,
	1.118 sources, 1.117, 1.118
Message-ID: <200604270345.k3R3jrMa003503@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3353/devel

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
auto-import mkinitrd-5.0.36-1 on branch devel from mkinitrd-5.0.36-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- .cvsignore	26 Apr 2006 20:49:08 -0000	1.104
+++ .cvsignore	27 Apr 2006 03:45:50 -0000	1.105
@@ -1 +1 @@
-mkinitrd-5.0.35.tar.bz2
+mkinitrd-5.0.36.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- mkinitrd.spec	26 Apr 2006 20:49:08 -0000	1.117
+++ mkinitrd.spec	27 Apr 2006 03:45:50 -0000	1.118
@@ -1,6 +1,6 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.0.35
+Version: 5.0.36
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -63,8 +63,9 @@
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
 
 %changelog
-* Wed Apr 26 2006 Bill Nottingham <notting at redhat.com> - 5.0.35-1
+* Wed Apr 26 2006 Bill Nottingham <notting at redhat.com> - 5.0.36-1
 - NFS root fixes
+- fix typo
 
 * Mon Apr 10 2006 Peter Jones <pjones at redhat.com> - 5.0.34-1
 - fix "!" handling for sysfs paths in mkblkdevs


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- sources	26 Apr 2006 20:49:08 -0000	1.117
+++ sources	27 Apr 2006 03:45:50 -0000	1.118
@@ -1 +1 @@
-9cbcecc44fc60f406b8d774fa196b693  mkinitrd-5.0.35.tar.bz2
+ebc8fbf249e6bd5fdeb5f3849a0b5a4f  mkinitrd-5.0.36.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 03:52:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 23:52:36 -0400
Subject: rpms/kernel/devel linux-2.6-header-cleanup-git.patch,1.2,1.3
Message-ID: <200604270352.k3R3qa60018477@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18439

Modified Files:
	linux-2.6-header-cleanup-git.patch 
Log Message:
fix s390 ptrace.h

linux-2.6-header-cleanup-git.patch:
 b/include/asm-s390/ptrace.h                          |    6 -
 b/include/linux/elf-em.h                             |   44 ++++++++
 include/acpi/platform/aclinux.h                      |    1 
 include/acpi/processor.h                             |    1 
 include/asm-alpha/bitops.h                           |    1 
 include/asm-alpha/cache.h                            |    1 
 include/asm-alpha/cacheflush.h                       |    1 
 include/asm-alpha/core_cia.h                         |    1 
 include/asm-alpha/core_t2.h                          |    1 
 include/asm-alpha/dma-mapping.h                      |    1 
 include/asm-alpha/dma.h                              |    1 
 include/asm-alpha/floppy.h                           |    1 
 include/asm-alpha/hardirq.h                          |    1 
 include/asm-alpha/hw_irq.h                           |    1 
 include/asm-alpha/ide.h                              |    1 
 include/asm-alpha/io.h                               |    1 
 include/asm-alpha/irq.h                              |    1 
 include/asm-alpha/kmap_types.h                       |    1 
 include/asm-alpha/machvec.h                          |    1 
 include/asm-alpha/mmu_context.h                      |    1 
 include/asm-alpha/mmzone.h                           |    1 
 include/asm-alpha/page.h                             |    1 
 include/asm-alpha/param.h                            |    1 
 include/asm-alpha/pgalloc.h                          |    1 
 include/asm-alpha/pgtable.h                          |    1 
 include/asm-alpha/serial.h                           |    1 
 include/asm-alpha/smp.h                              |    1 
 include/asm-alpha/spinlock.h                         |    1 
 include/asm-alpha/system.h                           |    1 
 include/asm-alpha/tlbflush.h                         |    1 
 include/asm-arm/apm.h                                |    1 
 include/asm-arm/arch-aaec2000/memory.h               |    1 
 include/asm-arm/arch-cl7500/acornfb.h                |    1 
 include/asm-arm/arch-clps711x/hardware.h             |    1 
 include/asm-arm/arch-clps711x/memory.h               |    1 
 include/asm-arm/arch-clps711x/uncompress.h           |    1 
 include/asm-arm/arch-ebsa285/hardware.h              |    1 
 include/asm-arm/arch-ebsa285/memory.h                |    1 
 include/asm-arm/arch-ebsa285/vmalloc.h               |    1 
 include/asm-arm/arch-integrator/smp.h                |    1 
 include/asm-arm/arch-iop3xx/memory.h                 |    1 
 include/asm-arm/arch-iop3xx/timex.h                  |    1 
 include/asm-arm/arch-iop3xx/uncompress.h             |    1 
 include/asm-arm/arch-ixp4xx/dma.h                    |    1 
 include/asm-arm/arch-lh7a40x/constants.h             |    1 
 include/asm-arm/arch-lh7a40x/irqs.h                  |    1 
 include/asm-arm/arch-lh7a40x/registers.h             |    1 
 include/asm-arm/arch-omap/board.h                    |    1 
 include/asm-arm/arch-omap/hardware.h                 |    1 
 include/asm-arm/arch-omap/system.h                   |    1 
 include/asm-arm/arch-omap/uncompress.h               |    1 
 include/asm-arm/arch-pxa/idp.h                       |    1 
 include/asm-arm/arch-pxa/irqs.h                      |    1 
 include/asm-arm/arch-pxa/pxa-regs.h                  |    1 
 include/asm-arm/arch-pxa/timex.h                     |    1 
 include/asm-arm/arch-realview/smp.h                  |    1 
 include/asm-arm/arch-s3c2410/dma.h                   |    1 
 include/asm-arm/arch-s3c2410/uncompress.h            |    1 
 include/asm-arm/arch-sa1100/assabet.h                |    1 
 include/asm-arm/arch-sa1100/cerf.h                   |    1 
 include/asm-arm/arch-sa1100/collie.h                 |    1 
 include/asm-arm/arch-sa1100/dma.h                    |    1 
 include/asm-arm/arch-sa1100/hardware.h               |    1 
 include/asm-arm/arch-sa1100/ide.h                    |    1 
 include/asm-arm/arch-sa1100/irqs.h                   |    1 
 include/asm-arm/arch-sa1100/memory.h                 |    1 
 include/asm-arm/arch-sa1100/system.h                 |    1 
 include/asm-arm/atomic.h                             |    1 
 include/asm-arm/bug.h                                |    1 
 include/asm-arm/cacheflush.h                         |    1 
 include/asm-arm/cpu.h                                |    1 
 include/asm-arm/dma-mapping.h                        |    1 
 include/asm-arm/dma.h                                |    1 
 include/asm-arm/elf.h                                |    1 
 include/asm-arm/fpstate.h                            |    1 
 include/asm-arm/glue.h                               |    1 
 include/asm-arm/hardirq.h                            |    1 
 include/asm-arm/hardware/dec21285.h                  |    1 
 include/asm-arm/hardware/iomd.h                      |    1 
 include/asm-arm/leds.h                               |    1 
 include/asm-arm/mach/serial_at91rm9200.h             |    1 
 include/asm-arm/mach/serial_sa1100.h                 |    1 
 include/asm-arm/memory.h                             |    1 
 include/asm-arm/page.h                               |    1 
 include/asm-arm/pci.h                                |    1 
 include/asm-arm/proc-fns.h                           |    1 
 include/asm-arm/ptrace.h                             |    1 
 include/asm-arm/smp.h                                |    1 
 include/asm-arm/system.h                             |    1 
 include/asm-arm/tlbflush.h                           |    1 
 include/asm-arm26/atomic.h                           |    1 
 include/asm-arm26/bug.h                              |    1 
 include/asm-arm26/dma.h                              |    1 
 include/asm-arm26/hardirq.h                          |    1 
 include/asm-arm26/hardware.h                         |    1 
 include/asm-arm26/io.h                               |    1 
 include/asm-arm26/leds.h                             |    1 
 include/asm-arm26/mach-types.h                       |    1 
 include/asm-arm26/page.h                             |    1 
 include/asm-arm26/pgtable.h                          |    1 
 include/asm-arm26/serial.h                           |    1 
 include/asm-arm26/smp.h                              |    1 
 include/asm-arm26/sysirq.h                           |    1 
 include/asm-arm26/system.h                           |    1 
 include/asm-cris/arch-v10/io.h                       |    1 
 include/asm-cris/arch-v10/page.h                     |    1 
 include/asm-cris/arch-v10/system.h                   |    1 
 include/asm-cris/arch-v32/io.h                       |    1 
 include/asm-cris/arch-v32/irq.h                      |    1 
 include/asm-cris/arch-v32/page.h                     |    1 
 include/asm-cris/arch-v32/processor.h                |    1 
 include/asm-cris/arch-v32/system.h                   |    1 
 include/asm-cris/eshlibld.h                          |    1 
 include/asm-cris/etraxgpio.h                         |    1 
 include/asm-cris/fasttimer.h                         |    1 
 include/asm-cris/page.h                              |    1 
 include/asm-cris/pci.h                               |    1 
 include/asm-cris/pgtable.h                           |    1 
 include/asm-cris/processor.h                         |    1 
 include/asm-cris/rtc.h                               |    1 
 include/asm-cris/tlbflush.h                          |    1 
 include/asm-frv/atomic.h                             |    1 
 include/asm-frv/bitops.h                             |    1 
 include/asm-frv/bug.h                                |    1 
 include/asm-frv/cache.h                              |    1 
 include/asm-frv/dma.h                                |    1 
 include/asm-frv/elf.h                                |    1 
 include/asm-frv/fpu.h                                |    1 
 include/asm-frv/hardirq.h                            |    1 
 include/asm-frv/highmem.h                            |    1 
 include/asm-frv/ide.h                                |    1 
 include/asm-frv/io.h                                 |    1 
 include/asm-frv/irq.h                                |    1 
 include/asm-frv/mmu_context.h                        |    1 
 include/asm-frv/page.h                               |    1 
 include/asm-frv/pci.h                                |    1 
 include/asm-frv/pgalloc.h                            |    1 
 include/asm-frv/pgtable.h                            |    1 
 include/asm-frv/processor.h                          |    1 
 include/asm-frv/segment.h                            |    1 
 include/asm-frv/serial.h                             |    1 
 include/asm-frv/smp.h                                |    1 
 include/asm-frv/system.h                             |    1 
 include/asm-frv/tlbflush.h                           |    1 
 include/asm-frv/types.h                              |    1 
 include/asm-frv/unaligned.h                          |    1 
 include/asm-frv/virtconvert.h                        |    1 
 include/asm-generic/bug.h                            |    1 
 include/asm-generic/dma-mapping.h                    |    1 
 include/asm-generic/fcntl.h                          |    1 
 include/asm-generic/local.h                          |    1 
 include/asm-generic/tlb.h                            |    1 
 include/asm-h8300/bitops.h                           |    1 
 include/asm-h8300/dma.h                              |    1 
 include/asm-h8300/elf.h                              |    1 
 include/asm-h8300/hardirq.h                          |    1 
 include/asm-h8300/io.h                               |    1 
 include/asm-h8300/keyboard.h                         |    1 
 include/asm-h8300/mmu_context.h                      |    1 
 include/asm-h8300/page.h                             |    1 
 include/asm-h8300/page_offset.h                      |    1 
 include/asm-h8300/param.h                            |    1 
 include/asm-h8300/pgtable.h                          |    1 
 include/asm-h8300/processor.h                        |    1 
 include/asm-h8300/semaphore-helper.h                 |    1 
 include/asm-h8300/shm.h                              |    1 
 include/asm-h8300/system.h                           |    1 
 include/asm-h8300/unaligned.h                        |    1 
 include/asm-h8300/virtconvert.h                      |    1 
 include/asm-i386/apic.h                              |    1 
 include/asm-i386/atomic.h                            |    1 
 include/asm-i386/bitops.h                            |    1 
 include/asm-i386/bug.h                               |    1 
 include/asm-i386/bugs.h                              |    1 
 include/asm-i386/byteorder.h                         |    1 
 include/asm-i386/cache.h                             |    1 
 include/asm-i386/dma.h                               |    1 
 include/asm-i386/fixmap.h                            |    1 
 include/asm-i386/hardirq.h                           |    1 
 include/asm-i386/highmem.h                           |    1 
 include/asm-i386/hpet.h                              |    1 
 include/asm-i386/hw_irq.h                            |    1 
 include/asm-i386/ide.h                               |    1 
 include/asm-i386/io.h                                |    1 
 include/asm-i386/io_apic.h                           |    1 
 include/asm-i386/irq.h                               |    1 
 include/asm-i386/kmap_types.h                        |    1 
 include/asm-i386/mach-summit/mach_apic.h             |    1 
 include/asm-i386/mmu_context.h                       |    1 
 include/asm-i386/mtrr.h                              |    1 
 include/asm-i386/page.h                              |    1 
 include/asm-i386/param.h                             |    1 
 include/asm-i386/pci.h                               |    1 
 include/asm-i386/pgalloc.h                           |    1 
 include/asm-i386/pgtable.h                           |    1 
 include/asm-i386/processor.h                         |    1 
 include/asm-i386/serial.h                            |    1 
 include/asm-i386/smp.h                               |    1 
 include/asm-i386/spinlock.h                          |    1 
 include/asm-i386/string.h                            |    1 
 include/asm-i386/system.h                            |    1 
 include/asm-i386/thread_info.h                       |    1 
 include/asm-i386/timex.h                             |    1 
 include/asm-i386/tlbflush.h                          |    1 
 include/asm-i386/types.h                             |    1 
 include/asm-i386/uaccess.h                           |    1 
 include/asm-ia64/asmmacro.h                          |    1 
 include/asm-ia64/cache.h                             |    1 
 include/asm-ia64/delay.h                             |    1 
 include/asm-ia64/dma-mapping.h                       |    1 
 include/asm-ia64/dma.h                               |    1 
 include/asm-ia64/elf.h                               |    1 
 include/asm-ia64/hardirq.h                           |    1 
 include/asm-ia64/ia32.h                              |    1 
 include/asm-ia64/ide.h                               |    1 
 include/asm-ia64/intrinsics.h                        |    1 
 include/asm-ia64/kmap_types.h                        |    1 
 include/asm-ia64/machvec.h                           |    1 
 include/asm-ia64/meminit.h                           |    1 
 include/asm-ia64/nodedata.h                          |    1 
 include/asm-ia64/numa.h                              |    1 
 include/asm-ia64/page.h                              |    1 
 include/asm-ia64/param.h                             |    1 
 include/asm-ia64/percpu.h                            |    1 
 include/asm-ia64/pgalloc.h                           |    1 
 include/asm-ia64/pgtable.h                           |    1 
 include/asm-ia64/processor.h                         |    1 
 include/asm-ia64/ptrace.h                            |    1 
 include/asm-ia64/smp.h                               |    1 
 include/asm-ia64/sn/simulator.h                      |    1 
 include/asm-ia64/sn/sn_cpuid.h                       |    1 
 include/asm-ia64/sn/sn_sal.h                         |    1 
 include/asm-ia64/sn/xpc.h                            |    1 
 include/asm-ia64/string.h                            |    1 
 include/asm-ia64/system.h                            |    1 
 include/asm-ia64/tlb.h                               |    1 
 include/asm-ia64/tlbflush.h                          |    1 
 include/asm-ia64/unistd.h                            |    1 
 include/asm-m32r/assembler.h                         |    1 
 include/asm-m32r/atomic.h                            |    1 
 include/asm-m32r/bitops.h                            |    1 
 include/asm-m32r/cacheflush.h                        |    1 
 include/asm-m32r/hardirq.h                           |    1 
 include/asm-m32r/ide.h                               |    1 
 include/asm-m32r/irq.h                               |    1 
 include/asm-m32r/kmap_types.h                        |    1 
 include/asm-m32r/m32104ut/m32104ut_pld.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lan.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lcd.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_pld.h             |    1 
 include/asm-m32r/m32r.h                              |    1 
 include/asm-m32r/mmu.h                               |    1 
 include/asm-m32r/mmu_context.h                       |    2 
 include/asm-m32r/opsput/opsput_lan.h                 |    1 
 include/asm-m32r/opsput/opsput_lcd.h                 |    1 
 include/asm-m32r/opsput/opsput_pld.h                 |    1 
 include/asm-m32r/page.h                              |    1 
 include/asm-m32r/pgalloc.h                           |    1 
 include/asm-m32r/pgtable-2level.h                    |    1 
 include/asm-m32r/pgtable.h                           |    1 
 include/asm-m32r/processor.h                         |    1 
 include/asm-m32r/ptrace.h                            |    1 
 include/asm-m32r/rtc.h                               |    1 
 include/asm-m32r/semaphore.h                         |    1 
 include/asm-m32r/serial.h                            |    1 
 include/asm-m32r/sigcontext.h                        |    1 
 include/asm-m32r/smp.h                               |    1 
 include/asm-m32r/spinlock.h                          |    1 
 include/asm-m32r/system.h                            |    1 
 include/asm-m32r/timex.h                             |    1 
 include/asm-m32r/tlbflush.h                          |    1 
 include/asm-m32r/uaccess.h                           |    1 
 include/asm-m68k/atomic.h                            |    1 
 include/asm-m68k/bug.h                               |    1 
 include/asm-m68k/dma-mapping.h                       |    1 
 include/asm-m68k/dma.h                               |    1 
 include/asm-m68k/dvma.h                              |    1 
 include/asm-m68k/elf.h                               |    1 
 include/asm-m68k/entry.h                             |    1 
 include/asm-m68k/fpu.h                               |    1 
 include/asm-m68k/hardirq.h                           |    1 
 include/asm-m68k/ide.h                               |    1 
 include/asm-m68k/io.h                                |    1 
 include/asm-m68k/irq.h                               |    1 
 include/asm-m68k/mc146818rtc.h                       |    1 
 include/asm-m68k/mmu_context.h                       |    1 
 include/asm-m68k/motorola_pgtable.h                  |    1 
 include/asm-m68k/openprom.h                          |    1 
 include/asm-m68k/page.h                              |    1 
 include/asm-m68k/page_offset.h                       |    1 
 include/asm-m68k/pgalloc.h                           |    1 
 include/asm-m68k/pgtable.h                           |    1 
 include/asm-m68k/processor.h                         |    1 
 include/asm-m68k/semaphore-helper.h                  |    1 
 include/asm-m68k/serial.h                            |    1 
 include/asm-m68k/setup.h                             |    1 
 include/asm-m68k/shm.h                               |    1 
 include/asm-m68k/system.h                            |    1 
 include/asm-m68k/tlbflush.h                          |    1 
 include/asm-m68k/virtconvert.h                       |    1 
 include/asm-m68knommu/bitops.h                       |    1 
 include/asm-m68knommu/coldfire.h                     |    1 
 include/asm-m68knommu/commproc.h                     |    1 
 include/asm-m68knommu/dma-mapping.h                  |    1 
 include/asm-m68knommu/dma.h                          |    1 
 include/asm-m68knommu/elf.h                          |    1 
 include/asm-m68knommu/elia.h                         |    1 
 include/asm-m68knommu/entry.h                        |    1 
 include/asm-m68knommu/fpu.h                          |    1 
 include/asm-m68knommu/hardirq.h                      |    1 
 include/asm-m68knommu/io.h                           |    1 
 include/asm-m68knommu/irq.h                          |    1 
 include/asm-m68knommu/m5206sim.h                     |    1 
 include/asm-m68knommu/m520xsim.h                     |    1 
 include/asm-m68knommu/m523xsim.h                     |    1 
 include/asm-m68knommu/m5272sim.h                     |    1 
 include/asm-m68knommu/m527xsim.h                     |    1 
 include/asm-m68knommu/m528xsim.h                     |    1 
 include/asm-m68knommu/mcfcache.h                     |    1 
 include/asm-m68knommu/mcfdma.h                       |    1 
 include/asm-m68knommu/mcfmbus.h                      |    1 
 include/asm-m68knommu/mcfne.h                        |    1 
 include/asm-m68knommu/mcfpci.h                       |    1 
 include/asm-m68knommu/mcfpit.h                       |    1 
 include/asm-m68knommu/mcfsim.h                       |    1 
 include/asm-m68knommu/mcfsmc.h                       |    1 
 include/asm-m68knommu/mcftimer.h                     |    1 
 include/asm-m68knommu/mcfuart.h                      |    1 
 include/asm-m68knommu/mcfwdebug.h                    |    1 
 include/asm-m68knommu/mmu_context.h                  |    1 
 include/asm-m68knommu/nettel.h                       |    1 
 include/asm-m68knommu/page.h                         |    1 
 include/asm-m68knommu/page_offset.h                  |    1 
 include/asm-m68knommu/param.h                        |    1 
 include/asm-m68knommu/pgtable.h                      |    1 
 include/asm-m68knommu/processor.h                    |    1 
 include/asm-m68knommu/semaphore-helper.h             |    1 
 include/asm-m68knommu/system.h                       |    1 
 include/asm-m68knommu/unaligned.h                    |    1 
 include/asm-mips/a.out.h                             |    1 
 include/asm-mips/addrspace.h                         |    1 
 include/asm-mips/arc/types.h                         |    1 
 include/asm-mips/asm.h                               |    1 
 include/asm-mips/asmmacro.h                          |    1 
 include/asm-mips/atomic.h                            |    1 
 include/asm-mips/bcache.h                            |    1 
 include/asm-mips/bitops.h                            |    1 
 include/asm-mips/bug.h                               |    1 
 include/asm-mips/bugs.h                              |    1 
 include/asm-mips/byteorder.h                         |    1 
 include/asm-mips/cache.h                             |    1 
 include/asm-mips/checksum.h                          |    1 
 include/asm-mips/cpu-features.h                      |    1 
 include/asm-mips/cpu-info.h                          |    1 
 include/asm-mips/ddb5xxx/ddb5477.h                   |    1 
 include/asm-mips/ddb5xxx/ddb5xxx.h                   |    1 
 include/asm-mips/debug.h                             |    1 
 include/asm-mips/dec/prom.h                          |    1 
 include/asm-mips/delay.h                             |    1 
 include/asm-mips/dma.h                               |    1 
 include/asm-mips/elf.h                               |    1 
 include/asm-mips/fcntl.h                             |    1 
 include/asm-mips/fixmap.h                            |    1 
 include/asm-mips/fpu.h                               |    1 
 include/asm-mips/futex.h                             |    1 
 include/asm-mips/hazards.h                           |    1 
 include/asm-mips/highmem.h                           |    1 
 include/asm-mips/interrupt.h                         |    1 
 include/asm-mips/io.h                                |    1 
 include/asm-mips/ip32/machine.h                      |    1 
 include/asm-mips/irq.h                               |    1 
 include/asm-mips/isadep.h                            |    1 
 include/asm-mips/jmr3927/irq.h                       |    1 
 include/asm-mips/kmap_types.h                        |    1 
 include/asm-mips/local.h                             |    1 
 include/asm-mips/mach-au1x00/au1000.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx_dbdma.h          |    1 
 include/asm-mips/mach-au1x00/au1xxx_ide.h            |    1 
 include/asm-mips/mach-au1x00/au1xxx_psc.h            |    1 
 include/asm-mips/mach-au1x00/ioremap.h               |    1 
 include/asm-mips/mach-cobalt/cpu-feature-overrides.h |    1 
 include/asm-mips/mach-db1x00/db1x00.h                |    1 
 include/asm-mips/mach-generic/ide.h                  |    1 
 include/asm-mips/mach-generic/kmalloc.h              |    1 
 include/asm-mips/mach-generic/spaces.h               |    1 
 include/asm-mips/mach-ip22/spaces.h                  |    1 
 include/asm-mips/mach-ip32/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-ip32/kmalloc.h                 |    1 
 include/asm-mips/mach-mips/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-mips/irq.h                     |    1 
 include/asm-mips/mach-pb1x00/pb1550.h                |    1 
 include/asm-mips/mach-sim/cpu-feature-overrides.h    |    1 
 include/asm-mips/mips-boards/generic.h               |    1 
 include/asm-mips/mipsregs.h                          |    1 
 include/asm-mips/mmu_context.h                       |    1 
 include/asm-mips/mmzone.h                            |    1 
 include/asm-mips/module.h                            |    1 
 include/asm-mips/msgbuf.h                            |    1 
 include/asm-mips/paccess.h                           |    1 
 include/asm-mips/page.h                              |    1 
 include/asm-mips/pci.h                               |    1 
 include/asm-mips/pgalloc.h                           |    1 
 include/asm-mips/pgtable-32.h                        |    1 
 include/asm-mips/pgtable-64.h                        |    1 
 include/asm-mips/pgtable-bits.h                      |    1 
 include/asm-mips/pgtable.h                           |    1 
 include/asm-mips/prefetch.h                          |    1 
 include/asm-mips/processor.h                         |    1 
 include/asm-mips/ptrace.h                            |    1 
 include/asm-mips/reg.h                               |    1 
 include/asm-mips/resource.h                          |    1 
 include/asm-mips/serial.h                            |    1 
 include/asm-mips/sgiarcs.h                           |    1 
 include/asm-mips/sibyte/board.h                      |    1 
 include/asm-mips/sibyte/carmel.h                     |    1 
 include/asm-mips/sibyte/sentosa.h                    |    1 
 include/asm-mips/sibyte/swarm.h                      |    1 
 include/asm-mips/siginfo.h                           |    1 
 include/asm-mips/signal.h                            |    1 
 include/asm-mips/sim.h                               |    1 
 include/asm-mips/smp.h                               |    1 
 include/asm-mips/sn/addrs.h                          |    1 
 include/asm-mips/sn/agent.h                          |    1 
 include/asm-mips/sn/arch.h                           |    1 
 include/asm-mips/sn/io.h                             |    1 
 include/asm-mips/sn/klconfig.h                       |    1 
 include/asm-mips/sn/kldir.h                          |    1 
 include/asm-mips/sn/launch.h                         |    1 
 include/asm-mips/sn/mapped_kernel.h                  |    1 
 include/asm-mips/sn/sn0/addrs.h                      |    1 
 include/asm-mips/sn/sn0/arch.h                       |    1 
 include/asm-mips/sn/sn0/hubmd.h                      |    1 
 include/asm-mips/stackframe.h                        |    1 
 include/asm-mips/string.h                            |    1 
 include/asm-mips/system.h                            |    1 
 include/asm-mips/thread_info.h                       |    1 
 include/asm-mips/tlbflush.h                          |    1 
 include/asm-mips/tx4927/toshiba_rbtx4927.h           |    1 
 include/asm-mips/types.h                             |    1 
 include/asm-mips/uaccess.h                           |    1 
 include/asm-mips/unistd.h                            |    1 
 include/asm-mips/vr41xx/vrc4173.h                    |    1 
 include/asm-mips/war.h                               |    1 
 include/asm-mips/wbflush.h                           |    1 
 include/asm-parisc/atomic.h                          |    1 
 include/asm-parisc/cache.h                           |    1 
 include/asm-parisc/cacheflush.h                      |    1 
 include/asm-parisc/dma-mapping.h                     |    1 
 include/asm-parisc/dma.h                             |    1 
 include/asm-parisc/io.h                              |    1 
 include/asm-parisc/irq.h                             |    1 
 include/asm-parisc/kmap_types.h                      |    1 
 include/asm-parisc/page.h                            |    1 
 include/asm-parisc/param.h                           |    1 
 include/asm-parisc/pci.h                             |    1 
 include/asm-parisc/pdc.h                             |    1 
 include/asm-parisc/pgtable.h                         |    1 
 include/asm-parisc/processor.h                       |    1 
 include/asm-parisc/psw.h                             |    1 
 include/asm-parisc/smp.h                             |    1 
 include/asm-parisc/system.h                          |    1 
 include/asm-parisc/tlbflush.h                        |    1 
 include/asm-powerpc/abs_addr.h                       |    1 
 include/asm-powerpc/cache.h                          |    1 
 include/asm-powerpc/dma-mapping.h                    |    1 
 include/asm-powerpc/dma.h                            |    1 
 include/asm-powerpc/eeh.h                            |    1 
 include/asm-powerpc/elf.h                            |    7 -
 include/asm-powerpc/floppy.h                         |    1 
 include/asm-powerpc/hw_irq.h                         |    1 
 include/asm-powerpc/ide.h                            |    1 
 include/asm-powerpc/iommu.h                          |    1 
 include/asm-powerpc/irq.h                            |    1 
 include/asm-powerpc/iseries/iseries_io.h             |    1 
 include/asm-powerpc/machdep.h                        |    1 
 include/asm-powerpc/mmzone.h                         |    1 
 include/asm-powerpc/paca.h                           |    1 
 include/asm-powerpc/page.h                           |    1 
 include/asm-powerpc/pgtable.h                        |    1 
 include/asm-powerpc/ppc_asm.h                        |    1 
 include/asm-powerpc/prom.h                           |    1 
 include/asm-powerpc/smp.h                            |    1 
 include/asm-powerpc/smu.h                            |    1 
 include/asm-powerpc/spu.h                            |    1 
 include/asm-powerpc/thread_info.h                    |    1 
 include/asm-powerpc/time.h                           |    1 
 include/asm-powerpc/timex.h                          |    1 
 include/asm-powerpc/tlb.h                            |    1 
 include/asm-powerpc/tlbflush.h                       |    1 
 include/asm-powerpc/topology.h                       |    1 
 include/asm-powerpc/types.h                          |    1 
 include/asm-powerpc/unistd.h                         |    1 
 include/asm-powerpc/vga.h                            |    1 
 include/asm-powerpc/vio.h                            |    1 
 include/asm-ppc/amigahw.h                            |    1 
 include/asm-ppc/bootinfo.h                           |    1 
 include/asm-ppc/commproc.h                           |    1 
 include/asm-ppc/ibm403.h                             |    1 
 include/asm-ppc/ibm44x.h                             |    1 
 include/asm-ppc/ibm4xx.h                             |    1 
 include/asm-ppc/io.h                                 |    1 
 include/asm-ppc/machdep.h                            |    1 
 include/asm-ppc/mmu.h                                |    1 
 include/asm-ppc/mmu_context.h                        |    1 
 include/asm-ppc/mpc8260.h                            |    1 
 include/asm-ppc/mpc83xx.h                            |    1 
 include/asm-ppc/mpc85xx.h                            |    1 
 include/asm-ppc/mpc8xx.h                             |    1 
 include/asm-ppc/mv64x60.h                            |    1 
 include/asm-ppc/ocp.h                                |    1 
 include/asm-ppc/open_pic.h                           |    1 
 include/asm-ppc/page.h                               |    2 
 include/asm-ppc/pc_serial.h                          |    1 
 include/asm-ppc/pgalloc.h                            |    1 
 include/asm-ppc/pgtable.h                            |    1 
 include/asm-ppc/ppc4xx_dma.h                         |    1 
 include/asm-ppc/ppc4xx_pic.h                         |    1 
 include/asm-ppc/serial.h                             |    1 
 include/asm-ppc/smp.h                                |    1 
 include/asm-ppc/time.h                               |    1 
 include/asm-s390/bitops.h                            |    1 
 include/asm-s390/debug.h                             |    1 
 include/asm-s390/hardirq.h                           |    1 
 include/asm-s390/idals.h                             |    1 
 include/asm-s390/local.h                             |    1 
 include/asm-s390/lowcore.h                           |    1 
 include/asm-s390/page.h                              |    6 -
 include/asm-s390/pgalloc.h                           |    1 
 include/asm-s390/sfp-machine.h                       |    1 
 include/asm-s390/smp.h                               |    1 
 include/asm-s390/system.h                            |    1 
 include/asm-s390/tlbflush.h                          |    1 
 include/asm-s390/types.h                             |    1 
 include/asm-s390/unistd.h                            |    1 
 include/asm-sh/bug.h                                 |    1 
 include/asm-sh/checksum.h                            |    1 
 include/asm-sh/dma-mapping.h                         |    1 
 include/asm-sh/dma.h                                 |    1 
 include/asm-sh/fixmap.h                              |    1 
 include/asm-sh/hardirq.h                             |    1 
 include/asm-sh/hd64461/hd64461.h                     |    1 
 include/asm-sh/hd64465/hd64465.h                     |    1 
 include/asm-sh/ide.h                                 |    1 
 include/asm-sh/io.h                                  |    1 
 include/asm-sh/irq.h                                 |    1 
 include/asm-sh/keyboard.h                            |    1 
 include/asm-sh/kmap_types.h                          |    1 
 include/asm-sh/machvec.h                             |    1 
 include/asm-sh/machvec_init.h                        |    1 
 include/asm-sh/mpc1211/dma.h                         |    1 
 include/asm-sh/overdrive/overdrive.h                 |    1 
 include/asm-sh/page.h                                |    1 
 include/asm-sh/pgtable.h                             |    1 
 include/asm-sh/serial.h                              |    1 
 include/asm-sh/smp.h                                 |    1 
 include/asm-sh/system.h                              |    1 
 include/asm-sh/types.h                               |    1 
 include/asm-sh/watchdog.h                            |    1 
 include/asm-sh64/bug.h                               |    1 
 include/asm-sh64/dma-mapping.h                       |    1 
 include/asm-sh64/hardirq.h                           |    1 
 include/asm-sh64/ide.h                               |    1 
 include/asm-sh64/irq.h                               |    1 
 include/asm-sh64/mmu_context.h                       |    1 
 include/asm-sh64/page.h                              |    1 
 include/asm-sh64/param.h                             |    1 
 include/asm-sh64/pgtable.h                           |    1 
 include/asm-sh64/system.h                            |    1 
 include/asm-sparc/asmmacro.h                         |    1 
 include/asm-sparc/atomic.h                           |    1 
 include/asm-sparc/bugs.h                             |    1 
 include/asm-sparc/cacheflush.h                       |    1 
 include/asm-sparc/delay.h                            |    1 
 include/asm-sparc/dma-mapping.h                      |    1 
 include/asm-sparc/dma.h                              |    1 
 include/asm-sparc/elf.h                              |    1 
 include/asm-sparc/fixmap.h                           |    1 
 include/asm-sparc/hardirq.h                          |    1 
 include/asm-sparc/ide.h                              |    1 
 include/asm-sparc/irq.h                              |    1 
 include/asm-sparc/mostek.h                           |    1 
 include/asm-sparc/page.h                             |    1 
 include/asm-sparc/pgalloc.h                          |    1 
 include/asm-sparc/pgtable.h                          |    1 
 include/asm-sparc/sfp-machine.h                      |    1 
 include/asm-sparc/smp.h                              |    1 
 include/asm-sparc/system.h                           |    2 
 include/asm-sparc/timer.h                            |    1 
 include/asm-sparc/tlbflush.h                         |    1 
 include/asm-sparc/vac-ops.h                          |    1 
 include/asm-sparc/winmacro.h                         |    1 
 include/asm-sparc64/atomic.h                         |    1 
 include/asm-sparc64/bitops.h                         |    1 
 include/asm-sparc64/bugs.h                           |    1 
 include/asm-sparc64/cacheflush.h                     |    1 
 include/asm-sparc64/delay.h                          |    1 
 include/asm-sparc64/dma-mapping.h                    |    1 
 include/asm-sparc64/dma.h                            |    1 
 include/asm-sparc64/floppy.h                         |    1 
 include/asm-sparc64/ide.h                            |    1 
 include/asm-sparc64/irq.h                            |    1 
 include/asm-sparc64/kprobes.h                        |    1 
 include/asm-sparc64/mc146818rtc.h                    |    1 
 include/asm-sparc64/mmu.h                            |    1 
 include/asm-sparc64/oplib.h                          |    1 
 include/asm-sparc64/page.h                           |    1 
 include/asm-sparc64/param.h                          |    1 
 include/asm-sparc64/pgalloc.h                        |    1 
 include/asm-sparc64/pgtable.h                        |    1 
 include/asm-sparc64/processor.h                      |    1 
 include/asm-sparc64/siginfo.h                        |    1 
 include/asm-sparc64/signal.h                         |    1 
 include/asm-sparc64/smp.h                            |    1 
 include/asm-sparc64/spinlock.h                       |    1 
 include/asm-sparc64/system.h                         |    1 
 include/asm-sparc64/timer.h                          |    1 
 include/asm-sparc64/tlb.h                            |    1 
 include/asm-sparc64/tlbflush.h                       |    1 
 include/asm-sparc64/ttable.h                         |    1 
 include/asm-um/a.out.h                               |    1 
 include/asm-um/cache.h                               |    1 
 include/asm-um/elf-ppc.h                             |    1 
 include/asm-um/fixmap.h                              |    1 
 include/asm-um/hardirq.h                             |    1 
 include/asm-um/linkage.h                             |    1 
 include/asm-um/mmu_context.h                         |    1 
 include/asm-um/page.h                                |    1 
 include/asm-um/pgalloc.h                             |    1 
 include/asm-um/processor-generic.h                   |    1 
 include/asm-um/ptrace-generic.h                      |    1 
 include/asm-um/smp.h                                 |    1 
 include/asm-um/thread_info.h                         |    1 
 include/asm-v850/atomic.h                            |    1 
 include/asm-v850/bitops.h                            |    1 
 include/asm-v850/dma-mapping.h                       |    1 
 include/asm-v850/hardirq.h                           |    1 
 include/asm-v850/machdep.h                           |    1 
 include/asm-v850/pgtable.h                           |    1 
 include/asm-v850/processor.h                         |    1 
 include/asm-v850/serial.h                            |    1 
 include/asm-v850/v850e_uart.h                        |    1 
 include/asm-x86_64/apic.h                            |    1 
 include/asm-x86_64/atomic.h                          |    1 
 include/asm-x86_64/bitops.h                          |    1 
 include/asm-x86_64/bugs.h                            |    1 
 include/asm-x86_64/cache.h                           |    1 
 include/asm-x86_64/calling.h                         |    1 
 include/asm-x86_64/dma-mapping.h                     |    1 
 include/asm-x86_64/dma.h                             |    1 
 include/asm-x86_64/dwarf2.h                          |    1 
 include/asm-x86_64/fixmap.h                          |    1 
 include/asm-x86_64/hardirq.h                         |    1 
 include/asm-x86_64/hw_irq.h                          |    1 
 include/asm-x86_64/ia32.h                            |    1 
 include/asm-x86_64/io.h                              |    1 
 include/asm-x86_64/io_apic.h                         |    1 
 include/asm-x86_64/mmu_context.h                     |    1 
 include/asm-x86_64/mmzone.h                          |    1 
 include/asm-x86_64/mtrr.h                            |    1 
 include/asm-x86_64/page.h                            |    1 
 include/asm-x86_64/param.h                           |    1 
 include/asm-x86_64/pci.h                             |    1 
 include/asm-x86_64/processor.h                       |    1 
 include/asm-x86_64/serial.h                          |    1 
 include/asm-x86_64/smp.h                             |    1 
 include/asm-x86_64/spinlock.h                        |    1 
 include/asm-x86_64/swiotlb.h                         |    1 
 include/asm-x86_64/system.h                          |    1 
 include/asm-x86_64/tlbflush.h                        |    1 
 include/asm-x86_64/topology.h                        |    1 
 include/asm-x86_64/uaccess.h                         |    1 
 include/asm-xtensa/atomic.h                          |    1 
 include/asm-xtensa/checksum.h                        |    1 
 include/asm-xtensa/delay.h                           |    1 
 include/asm-xtensa/dma.h                             |    1 
 include/asm-xtensa/hardirq.h                         |    1 
 include/asm-xtensa/ide.h                             |    1 
 include/asm-xtensa/io.h                              |    1 
 include/asm-xtensa/irq.h                             |    1 
 include/asm-xtensa/mmu_context.h                     |    1 
 include/asm-xtensa/page.h                            |    1 
 include/asm-xtensa/pgalloc.h                         |    1 
 include/asm-xtensa/platform.h                        |    1 
 include/asm-xtensa/system.h                          |    1 
 include/linux/acct.h                                 |    3 
 include/linux/acpi.h                                 |    1 
 include/linux/agpgart.h                              |    3 
 include/linux/amba/clcd.h                            |    1 
 include/linux/atmdev.h                               |    1 
 include/linux/audit.h                                |    4 
 include/linux/blkdev.h                               |    1 
 include/linux/blktrace_api.h                         |    1 
 include/linux/blockgroup_lock.h                      |    1 
 include/linux/cache.h                                |    1 
 include/linux/coda.h                                 |    1 
 include/linux/compat.h                               |    1 
 include/linux/cpufreq.h                              |    1 
 include/linux/crypto.h                               |    1 
 include/linux/cyclomx.h                              |    1 
 include/linux/dcookies.h                             |    1 
 include/linux/devfs_fs_kernel.h                      |    1 
 include/linux/device.h                               |    1 
 include/linux/dmi.h                                  |    1 
 include/linux/dnotify.h                              |    1 
 include/linux/elf.h                                  |   59 -----------
 include/linux/errqueue.h                             |    1 
 include/linux/ext2_fs.h                              |    2 
 include/linux/ext3_fs.h                              |    7 -
 include/linux/fs.h                                   |    1 
 include/linux/ftape.h                                |    1 
 include/linux/gameport.h                             |    6 +
 include/linux/generic_serial.h                       |    6 -
 include/linux/genhd.h                                |   12 +-
 include/linux/gfp.h                                  |    1 
 include/linux/hardirq.h                              |    1 
 include/linux/highmem.h                              |    1 
 include/linux/highuid.h                              |    1 
 include/linux/i2c-algo-ite.h                         |    7 +
 include/linux/i2c.h                                  |    9 +
 include/linux/ide.h                                  |    1 
 include/linux/if_frad.h                              |    1 
 include/linux/if_tr.h                                |    1 
 include/linux/init.h                                 |    1 
 include/linux/inotify.h                              |    1 
 include/linux/interrupt.h                            |    1 
 include/linux/ipmi.h                                 |    2 
 include/linux/ipv6.h                                 |    1 
 include/linux/irq.h                                  |    1 
 include/linux/irq_cpustat.h                          |    1 
 include/linux/isapnp.h                               |    1 
 include/linux/isdn.h                                 |    1 
 include/linux/isdn/tpam.h                            |    1 
 include/linux/isdn_ppp.h                             |    1 
 include/linux/isdnif.h                               |    1 
 include/linux/kallsyms.h                             |    1 
 include/linux/kernel_stat.h                          |    1 
 include/linux/kmod.h                                 |    1 
 include/linux/kprobes.h                              |    1 
 include/linux/linkage.h                              |    1 
 include/linux/lockd/lockd.h                          |    1 
 include/linux/lockd/nlm.h                            |    1 
 include/linux/mempolicy.h                            |    1 
 include/linux/migrate.h                              |    1 
 include/linux/mm.h                                   |    1 
 include/linux/mman.h                                 |   12 +-
 include/linux/mmzone.h                               |    1 
 include/linux/module.h                               |    1 
 include/linux/msg.h                                  |    2 
 include/linux/mtd/cfi.h                              |    1 
 include/linux/mtd/map.h                              |    1 
 include/linux/mtd/mtd.h                              |    1 
 include/linux/mtd/nand.h                             |    1 
 include/linux/mtd/physmap.h                          |    1 
 include/linux/mtd/xip.h                              |    1 
 include/linux/ncp_fs.h                               |    5 -
 include/linux/net.h                                  |    3 
 include/linux/netdevice.h                            |    1 
 include/linux/netfilter.h                            |    1 
 include/linux/netfilter_arp.h                        |    1 
 include/linux/netfilter_bridge.h                     |    1 
 include/linux/netfilter_ipv4.h                       |    1 
 include/linux/netfilter_ipv4/ip_conntrack.h          |    1 
 include/linux/netfilter_ipv4/listhelp.h              |    1 
 include/linux/nfs.h                                  |    8 -
 include/linux/nfs4.h                                 |    6 -
 include/linux/nfs_fs.h                               |   39 +++----
 include/linux/nfsd/nfsd.h                            |    1 
 include/linux/nfsd/nfsfh.h                           |    1 
 include/linux/nfsd/syscall.h                         |    1 
 include/linux/numa.h                                 |    1 
 include/linux/parport.h                              |    1 
 include/linux/pci.h                                  |    1 
 include/linux/percpu_counter.h                       |    1 
 include/linux/pm.h                                   |    1 
 include/linux/pm_legacy.h                            |    1 
 include/linux/pmu.h                                  |    1 
 include/linux/preempt.h                              |    1 
 include/linux/proc_fs.h                              |    1 
 include/linux/profile.h                              |    1 
 include/linux/quota.h                                |    4 
 include/linux/quotaops.h                             |    1 
 include/linux/reiserfs_xattr.h                       |    3 
 include/linux/relay.h                                |    1 
 include/linux/rio.h                                  |    1 
 include/linux/rio_drv.h                              |    1 
 include/linux/rmap.h                                 |    1 
 include/linux/rtnetlink.h                            |    1 
 include/linux/rwsem.h                                |    1 
 include/linux/scc.h                                  |    1 
 include/linux/sched.h                                |   94 +++++++++----------
 include/linux/seccomp.h                              |    1 
 include/linux/sem.h                                  |    2 
 include/linux/seqlock.h                              |    1 
 include/linux/serialP.h                              |    1 
 include/linux/serial_core.h                          |    1 
 include/linux/signal.h                               |    4 
 include/linux/skbuff.h                               |    1 
 include/linux/slab.h                                 |    1 
 include/linux/smb_fs.h                               |    4 
 include/linux/smp.h                                  |    1 
 include/linux/smp_lock.h                             |    1 
 include/linux/socket.h                               |    2 
 include/linux/spinlock.h                             |    1 
 include/linux/stop_machine.h                         |    1 
 include/linux/sunrpc/auth.h                          |    1 
 include/linux/sunrpc/debug.h                         |   24 ++--
 include/linux/sunrpc/stats.h                         |    1 
 include/linux/suspend.h                              |    1 
 include/linux/swap.h                                 |    1 
 include/linux/syscalls.h                             |    1 
 include/linux/sysrq.h                                |    1 
 include/linux/tcp.h                                  |    1 
 include/linux/threads.h                              |    1 
 include/linux/timer.h                                |    1 
 include/linux/timex.h                                |    1 
 include/linux/tty.h                                  |    1 
 include/linux/types.h                                |    1 
 include/linux/udp.h                                  |    1 
 include/linux/usb.h                                  |    1 
 include/linux/usb_usual.h                            |    1 
 include/linux/usbdevice_fs.h                         |    2 
 include/linux/vt_buffer.h                            |    1 
 include/linux/vt_kern.h                              |    1 
 include/linux/wait.h                                 |    1 
 include/linux/wanrouter.h                            |    4 
 include/mtd/mtd-abi.h                                |    5 -
 include/net/addrconf.h                               |    1 
 include/net/af_unix.h                                |    1 
 include/net/ax25.h                                   |    1 
 include/net/compat.h                                 |    1 
 include/net/dst.h                                    |    1 
 include/net/icmp.h                                   |    1 
 include/net/inet6_hashtables.h                       |    1 
 include/net/inet_hashtables.h                        |    1 
 include/net/inet_sock.h                              |    1 
 include/net/inet_timewait_sock.h                     |    1 
 include/net/ip.h                                     |    1 
 include/net/ip_fib.h                                 |    1 
 include/net/ip_mp_alg.h                              |    1 
 include/net/ip_vs.h                                  |    1 
 include/net/ipv6.h                                   |    1 
 include/net/irda/irda.h                              |    1 
 include/net/irda/irda_device.h                       |    1 
 include/net/irda/irlap.h                             |    1 
 include/net/irda/irlmp.h                             |    1 
 include/net/irda/irlmp_frame.h                       |    1 
 include/net/irda/qos.h                               |    1 
 include/net/ndisc.h                                  |    1 
 include/net/netfilter/nf_conntrack.h                 |    1 
 include/net/pkt_act.h                                |    1 
 include/net/protocol.h                               |    1 
 include/net/raw.h                                    |    1 
 include/net/red.h                                    |    1 
 include/net/route.h                                  |    1 
 include/net/sch_generic.h                            |    1 
 include/net/sctp/sctp.h                              |    1 
 include/net/sock.h                                   |    1 
 include/net/tcp.h                                    |    1 
 include/pcmcia/ss.h                                  |    1 
 include/scsi/scsi_transport_fc.h                     |    1 
 include/scsi/scsi_transport_spi.h                    |    1 
 include/sound/driver.h                               |    1 
 include/video/edid.h                                 |    1 
 include/video/vga.h                                  |    1 
 865 files changed, 199 insertions(+), 1041 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 linux-2.6-header-cleanup-git.patch
Index: linux-2.6-header-cleanup-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-cleanup-git.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-header-cleanup-git.patch	26 Apr 2006 23:46:20 -0000	1.2
+++ linux-2.6-header-cleanup-git.patch	27 Apr 2006 03:52:32 -0000	1.3
@@ -1,5 +1,4 @@
-diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
-index 2e6d545..3c6a620 100644
+unchanged:
 --- a/include/acpi/platform/aclinux.h
 +++ b/include/acpi/platform/aclinux.h
 @@ -49,7 +49,6 @@ #define ACPI_USE_DO_WHILE_0
@@ -10,8 +9,7 @@
  #include <linux/string.h>
  #include <linux/kernel.h>
  #include <linux/ctype.h>
-diff --git a/include/acpi/processor.h b/include/acpi/processor.h
-index badf027..ef7d83a 100644
+unchanged:
 --- a/include/acpi/processor.h
 +++ b/include/acpi/processor.h
 @@ -2,7 +2,6 @@ #ifndef __ACPI_PROCESSOR_H
@@ -22,8 +20,7 @@
  
  #include <asm/acpi.h>
  
-diff --git a/include/asm-alpha/bitops.h b/include/asm-alpha/bitops.h
-index 3f88715..4b6ef7f 100644
+unchanged:
 --- a/include/asm-alpha/bitops.h
 +++ b/include/asm-alpha/bitops.h
 @@ -1,7 +1,6 @@
@@ -34,8 +31,7 @@
  #include <asm/compiler.h>
  
  /*
-diff --git a/include/asm-alpha/cache.h b/include/asm-alpha/cache.h
-index e6d4d16..f199e69 100644
+unchanged:
 --- a/include/asm-alpha/cache.h
 +++ b/include/asm-alpha/cache.h
 @@ -4,7 +4,6 @@
@@ -46,8 +42,7 @@
  
  /* Bytes per L1 (data) cache line. */
  #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6)
-diff --git a/include/asm-alpha/cacheflush.h b/include/asm-alpha/cacheflush.h
-index 3fc6ef7..805640b 100644
+unchanged:
 --- a/include/asm-alpha/cacheflush.h
 +++ b/include/asm-alpha/cacheflush.h
 @@ -1,7 +1,6 @@
@@ -58,8 +53,7 @@
  #include <linux/mm.h>
  
  /* Caches aren't brain-dead on the Alpha. */
-diff --git a/include/asm-alpha/core_cia.h b/include/asm-alpha/core_cia.h
-index 3a70d68..9e0516c 100644
+unchanged:
 --- a/include/asm-alpha/core_cia.h
 +++ b/include/asm-alpha/core_cia.h
 @@ -4,7 +4,6 @@ #define __ALPHA_CIA__H__
@@ -70,8 +64,7 @@
  #include <linux/types.h>
  #include <asm/compiler.h>
  
-diff --git a/include/asm-alpha/core_t2.h b/include/asm-alpha/core_t2.h
-index 5c1c403..dba70c6 100644
+unchanged:
 --- a/include/asm-alpha/core_t2.h
 +++ b/include/asm-alpha/core_t2.h
 @@ -1,7 +1,6 @@
@@ -82,8 +75,7 @@
  #include <linux/types.h>
  #include <linux/spinlock.h>
  #include <asm/compiler.h>
-diff --git a/include/asm-alpha/dma-mapping.h b/include/asm-alpha/dma-mapping.h
-index 62d0d66..b9ff4d8 100644
+unchanged:
 --- a/include/asm-alpha/dma-mapping.h
 +++ b/include/asm-alpha/dma-mapping.h
 @@ -1,7 +1,6 @@
@@ -94,8 +86,7 @@
  
  #ifdef CONFIG_PCI
  
-diff --git a/include/asm-alpha/dma.h b/include/asm-alpha/dma.h
-index 683afaa..87cfdbd 100644
+unchanged:
 --- a/include/asm-alpha/dma.h
 +++ b/include/asm-alpha/dma.h
 @@ -18,7 +18,6 @@
@@ -106,8 +97,7 @@
  #include <linux/spinlock.h>
  #include <asm/io.h>
  
-diff --git a/include/asm-alpha/floppy.h b/include/asm-alpha/floppy.h
-index 289a00d..e177d41 100644
+unchanged:
 --- a/include/asm-alpha/floppy.h
 +++ b/include/asm-alpha/floppy.h
 @@ -10,7 +10,6 @@
@@ -118,8 +108,7 @@
  
  #define fd_inb(port)			inb_p(port)
  #define fd_outb(value,port)		outb_p(value,port)
-diff --git a/include/asm-alpha/hardirq.h b/include/asm-alpha/hardirq.h
-index 7bb6a36..d953e23 100644
+unchanged:
 --- a/include/asm-alpha/hardirq.h
 +++ b/include/asm-alpha/hardirq.h
 @@ -1,7 +1,6 @@
@@ -130,8 +119,7 @@
  #include <linux/threads.h>
  #include <linux/cache.h>
  
-diff --git a/include/asm-alpha/hw_irq.h b/include/asm-alpha/hw_irq.h
-index a310b9e..ca9d43b 100644
+unchanged:
 --- a/include/asm-alpha/hw_irq.h
 +++ b/include/asm-alpha/hw_irq.h
 @@ -1,7 +1,6 @@
@@ -142,8 +130,7 @@
  
  static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i) {}
  
-diff --git a/include/asm-alpha/ide.h b/include/asm-alpha/ide.h
-index 6126afe..2a5cc0b 100644
+unchanged:
 --- a/include/asm-alpha/ide.h
 +++ b/include/asm-alpha/ide.h
 @@ -13,7 +13,6 @@ #define __ASMalpha_IDE_H
@@ -154,8 +141,7 @@
  
  #define IDE_ARCH_OBSOLETE_DEFAULTS
  
-diff --git a/include/asm-alpha/io.h b/include/asm-alpha/io.h
-index 3ebbeee..f5ae98c 100644
+unchanged:
 --- a/include/asm-alpha/io.h
 +++ b/include/asm-alpha/io.h
 @@ -3,7 +3,6 @@ #define __ALPHA_IO_H
@@ -166,8 +152,7 @@
  #include <linux/kernel.h>
  #include <asm/compiler.h>
  #include <asm/system.h>
-diff --git a/include/asm-alpha/irq.h b/include/asm-alpha/irq.h
-index 566db72..f6de033 100644
+unchanged:
 --- a/include/asm-alpha/irq.h
 +++ b/include/asm-alpha/irq.h
 @@ -8,7 +8,6 @@ #define _ALPHA_IRQ_H
@@ -178,8 +163,7 @@
  
  #if   defined(CONFIG_ALPHA_GENERIC)
  
-diff --git a/include/asm-alpha/kmap_types.h b/include/asm-alpha/kmap_types.h
-index 3d10cd3..3e6735a 100644
+unchanged:
 --- a/include/asm-alpha/kmap_types.h
 +++ b/include/asm-alpha/kmap_types.h
 @@ -3,7 +3,6 @@ #define _ASM_KMAP_TYPES_H
@@ -190,8 +174,7 @@
  
  #ifdef CONFIG_DEBUG_HIGHMEM
  # define D(n) __KM_FENCE_##n ,
-diff --git a/include/asm-alpha/machvec.h b/include/asm-alpha/machvec.h
-index ece166a..aced22f 100644
+unchanged:
 --- a/include/asm-alpha/machvec.h
 +++ b/include/asm-alpha/machvec.h
 @@ -1,7 +1,6 @@
@@ -202,8 +185,7 @@
  #include <linux/types.h>
  
  /*
-diff --git a/include/asm-alpha/mmu_context.h b/include/asm-alpha/mmu_context.h
-index 0c017fc..fe249e9 100644
+unchanged:
 --- a/include/asm-alpha/mmu_context.h
 +++ b/include/asm-alpha/mmu_context.h
 @@ -7,7 +7,6 @@ #define __ALPHA_MMU_CONTEXT_H
@@ -214,8 +196,7 @@
  #include <asm/system.h>
  #include <asm/machvec.h>
  #include <asm/compiler.h>
-diff --git a/include/asm-alpha/mmzone.h b/include/asm-alpha/mmzone.h
-index 192d80c..64d0ab9 100644
+unchanged:
 --- a/include/asm-alpha/mmzone.h
 +++ b/include/asm-alpha/mmzone.h
 @@ -5,7 +5,6 @@
@@ -226,8 +207,7 @@
  #include <asm/smp.h>
  
  struct bootmem_data_t; /* stupid forward decl. */
-diff --git a/include/asm-alpha/page.h b/include/asm-alpha/page.h
[...8302 lines suppressed...]
+unchanged:
 --- a/include/net/ndisc.h
 +++ b/include/net/ndisc.h
 @@ -37,7 +37,6 @@ #define ND_MAX_RANDOM_FACTOR		(3/2)
@@ -10836,8 +10001,7 @@
  #include <linux/compiler.h>
  #include <linux/icmpv6.h>
  #include <linux/in6.h>
-diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
-index 916013c..fc00aa3 100644
+unchanged:
 --- a/include/net/netfilter/nf_conntrack.h
 +++ b/include/net/netfilter/nf_conntrack.h
 @@ -15,7 +15,6 @@ #define _NF_CONNTRACK_H
@@ -10848,8 +10012,7 @@
  #include <linux/bitops.h>
  #include <linux/compiler.h>
  #include <asm/atomic.h>
-diff --git a/include/net/pkt_act.h b/include/net/pkt_act.h
-index b225d84..cf5e4d2 100644
+unchanged:
 --- a/include/net/pkt_act.h
 +++ b/include/net/pkt_act.h
 @@ -4,7 +4,6 @@ #define __NET_PKT_ACT_H
@@ -10860,8 +10023,7 @@
  #include <linux/types.h>
  #include <linux/kernel.h>
  #include <linux/sched.h>
-diff --git a/include/net/protocol.h b/include/net/protocol.h
-index 6dc5970..bcaee39 100644
+unchanged:
 --- a/include/net/protocol.h
 +++ b/include/net/protocol.h
 @@ -24,7 +24,6 @@
@@ -10872,8 +10034,7 @@
  #include <linux/in6.h>
  #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
  #include <linux/ipv6.h>
-diff --git a/include/net/raw.h b/include/net/raw.h
-index e67b28a..481b201 100644
+unchanged:
 --- a/include/net/raw.h
 +++ b/include/net/raw.h
 @@ -17,7 +17,6 @@
@@ -10884,8 +10045,7 @@
  
  #include <net/protocol.h>
  
-diff --git a/include/net/red.h b/include/net/red.h
-index 2ed4358..5ccdbb3 100644
+unchanged:
 --- a/include/net/red.h
 +++ b/include/net/red.h
 @@ -1,7 +1,6 @@
@@ -10896,8 +10056,7 @@
  #include <linux/types.h>
  #include <net/pkt_sched.h>
  #include <net/inet_ecn.h>
-diff --git a/include/net/route.h b/include/net/route.h
-index 98c915a..c4a0686 100644
+unchanged:
 --- a/include/net/route.h
 +++ b/include/net/route.h
 @@ -24,7 +24,6 @@
@@ -10908,8 +10067,7 @@
  #include <net/dst.h>
  #include <net/inetpeer.h>
  #include <net/flow.h>
-diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
-index 7b6ec99..b0e9108 100644
+unchanged:
 --- a/include/net/sch_generic.h
 +++ b/include/net/sch_generic.h
 @@ -1,7 +1,6 @@
@@ -10920,8 +10078,7 @@
  #include <linux/netdevice.h>
  #include <linux/types.h>
  #include <linux/rcupdate.h>
-diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
-index e673b2c..9c30fa5 100644
+unchanged:
 --- a/include/net/sctp/sctp.h
 +++ b/include/net/sctp/sctp.h
 @@ -63,7 +63,6 @@ #define __net_sctp_h__
@@ -10932,8 +10089,7 @@
  
  #ifdef TEST_FRAME
  #undef CONFIG_PROC_FS
-diff --git a/include/net/sock.h b/include/net/sock.h
-index ff8b0da..d8a5d87 100644
+unchanged:
 --- a/include/net/sock.h
 +++ b/include/net/sock.h
 @@ -40,7 +40,6 @@
@@ -10944,8 +10100,7 @@
  #include <linux/list.h>
  #include <linux/timer.h>
  #include <linux/cache.h>
-diff --git a/include/net/tcp.h b/include/net/tcp.h
-index 3c989db..9e88dcd 100644
+unchanged:
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
 @@ -21,7 +21,6 @@ #define _TCP_H
@@ -10956,8 +10111,7 @@
  #include <linux/list.h>
  #include <linux/tcp.h>
  #include <linux/slab.h>
-diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
-index 5e0a01a..ede6398 100644
+unchanged:
 --- a/include/pcmcia/ss.h
 +++ b/include/pcmcia/ss.h
 @@ -15,7 +15,6 @@
@@ -10968,8 +10122,7 @@
  #include <linux/device.h>
  #include <linux/sched.h>	/* task_struct, completion */
  #include <linux/mutex.h>
-diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
-index 5626225..6d28b03 100644
+unchanged:
 --- a/include/scsi/scsi_transport_fc.h
 +++ b/include/scsi/scsi_transport_fc.h
 @@ -27,7 +27,6 @@
@@ -10980,8 +10133,7 @@
  #include <linux/sched.h>
  #include <scsi/scsi.h>
  
-diff --git a/include/scsi/scsi_transport_spi.h b/include/scsi/scsi_transport_spi.h
-index 5e1d619..302680c 100644
+unchanged:
 --- a/include/scsi/scsi_transport_spi.h
 +++ b/include/scsi/scsi_transport_spi.h
 @@ -20,7 +20,6 @@
@@ -10992,8 +10144,7 @@
  #include <linux/transport_class.h>
  #include <linux/mutex.h>
  
-diff --git a/include/sound/driver.h b/include/sound/driver.h
-index 89c6a73..3c522e5 100644
+unchanged:
 --- a/include/sound/driver.h
 +++ b/include/sound/driver.h
 @@ -26,7 +26,6 @@ #ifdef ALSA_BUILD
@@ -11004,8 +10155,7 @@
  
  /* number of supported soundcards */
  #ifdef CONFIG_SND_DYNAMIC_MINORS
-diff --git a/include/video/edid.h b/include/video/edid.h
-index b913f19..f6a42d6 100644
+unchanged:
 --- a/include/video/edid.h
 +++ b/include/video/edid.h
 @@ -3,7 +3,6 @@ #define __linux_video_edid_h__
@@ -11016,8 +10166,7 @@
  
  #ifdef CONFIG_X86
  struct edid_info {
-diff --git a/include/video/vga.h b/include/video/vga.h
-index 700d6c8..b49a512 100644
+unchanged:
 --- a/include/video/vga.h
 +++ b/include/video/vga.h
 @@ -17,7 +17,6 @@
@@ -11028,3 +10177,35 @@
  #include <linux/types.h>
  #include <asm/io.h>
  #ifndef CONFIG_AMIGA
+only in patch2:
+unchanged:
+--- a/include/asm-s390/page.h
++++ b/include/asm-s390/page.h
+@@ -9,7 +9,6 @@
+ #ifndef _S390_PAGE_H
+ #define _S390_PAGE_H
+ 
+-#include <asm/setup.h>
+ #include <asm/types.h>
+ 
+ /* PAGE_SHIFT determines the page size */
+@@ -20,6 +19,7 @@ #define PAGE_DEFAULT_ACC	0
+ #define PAGE_DEFAULT_KEY	(PAGE_DEFAULT_ACC << 4)
+ 
+ #ifdef __KERNEL__
++#include <asm/setup.h>
+ #ifndef __ASSEMBLY__
+ 
+ #ifndef __s390x__
+@@ -189,9 +189,9 @@ #define virt_addr_valid(kaddr)	pfn_valid
+ #define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \
+ 				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+ 
+-#endif /* __KERNEL__ */
+-
+ #include <asm-generic/memory_model.h>
+ #include <asm-generic/page.h>
+ 
++#endif /* __KERNEL__ */
++
+ #endif /* _S390_PAGE_H */



From fedora-cvs-commits at redhat.com  Thu Apr 27 03:59:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Apr 2006 23:59:05 -0400
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders.spec, 1.113,
	1.114 sources, 1.27, 1.28
Message-ID: <200604270359.k3R3x5gm020591@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20565

Modified Files:
	glibc-kernheaders.spec sources 
Log Message:
fix s390 too...


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- glibc-kernheaders.spec	27 Apr 2006 02:48:50 -0000	1.113
+++ glibc-kernheaders.spec	27 Apr 2006 03:59:02 -0000	1.114
@@ -1,7 +1,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -91,6 +91,9 @@
 
 
 %changelog
+* Thu Apr 27 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-14
+- Fix asm/s390/{ptrace.h,page.h}
+
 * Thu Apr 27 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-13
 - Work around libaudit.h defining audit_rule_data
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	27 Apr 2006 02:05:40 -0000	1.27
+++ sources	27 Apr 2006 03:59:02 -0000	1.28
@@ -1 +1 @@
-65ef83fb0833fdef4e8ce360a1f0614f  glibc-kernheaders.tar.bz2
+453adf99aef993ec1f142d5312ad9529  glibc-kernheaders.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 04:18:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 00:18:52 -0400
Subject: rpms/glibc/devel glibc.spec,1.236.2.3,1.236.2.4
Message-ID: <200604270418.k3R4Iq2o029118@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29015

Modified Files:
      Tag: private-dwmw2-test-branch
	glibc.spec 
Log Message:
Exclude S390 this time since it's AWOL again


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.236.2.3
retrieving revision 1.236.2.4
diff -u -r1.236.2.3 -r1.236.2.4
--- glibc.spec	27 Apr 2006 00:31:43 -0000	1.236.2.3
+++ glibc.spec	27 Apr 2006 04:18:43 -0000	1.236.2.4
@@ -20,8 +20,8 @@
 Summary: The GNU libc libraries.
 Name: glibc
 Version: %{glibcversion}
-Release: %{glibcrelease}.dwmw2testbuild.2
-ExcludeArch: x86_64
+Release: %{glibcrelease}.dwmw2testbuild.3
+ExcludeArch: s390 s390x
 License: LGPL
 Group: System Environment/Libraries
 Source0: %{glibcsrcdir}.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 04:43:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 00:43:05 -0400
Subject: rpms/glibc/devel glibc.spec,1.236.2.4,1.236.2.5
Message-ID: <200604270443.k3R4h4PV009635@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9594

Modified Files:
      Tag: private-dwmw2-test-branch
	glibc.spec 
Log Message:
s390 came back


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.236.2.4
retrieving revision 1.236.2.5
diff -u -r1.236.2.4 -r1.236.2.5
--- glibc.spec	27 Apr 2006 04:18:43 -0000	1.236.2.4
+++ glibc.spec	27 Apr 2006 04:42:59 -0000	1.236.2.5
@@ -20,8 +20,8 @@
 Summary: The GNU libc libraries.
 Name: glibc
 Version: %{glibcversion}
-Release: %{glibcrelease}.dwmw2testbuild.3
-ExcludeArch: s390 s390x
+Release: %{glibcrelease}.dwmw2testbuild.4
+ExclusiveArch: s390 s390x
 License: LGPL
 Group: System Environment/Libraries
 Source0: %{glibcsrcdir}.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 04:48:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 00:48:03 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2171,1.2171.2.1
Message-ID: <200604270448.k3R4m33u014198@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13852

Modified Files:
      Tag: private-kernel-headers-branch
	kernel-2.6.spec 
Log Message:
build kernel headers


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2171
retrieving revision 1.2171.2.1
diff -u -r1.2171 -r1.2171.2.1
--- kernel-2.6.spec	27 Apr 2006 03:17:56 -0000	1.2171
+++ kernel-2.6.spec	27 Apr 2006 04:47:57 -0000	1.2171.2.1
@@ -13,7 +13,7 @@
 %define buildxenPAE 0
 %define builddoc 0
 %define buildkdump 1
-%define buildheaders 0
+%define buildheaders 1
 
 # Versions of various parts
 



From fedora-cvs-commits at redhat.com  Thu Apr 27 05:37:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 01:37:55 -0400
Subject: rpms/pango/FC-5 .cvsignore, 1.31, 1.32 pango.spec, 1.65,
	1.66 sources, 1.32, 1.33
Message-ID: <200604270537.k3R5btaQ014794@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pango/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14751

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
1.12.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pango/FC-5/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	13 Mar 2006 05:37:10 -0000	1.31
+++ .cvsignore	27 Apr 2006 05:37:49 -0000	1.32
@@ -1,17 +1 @@
-pango-1.6.0.tar.bz2
-pango-1.8.0.tar.bz2
-pango-1.8.1.tar.bz2
-pango-1.9.0.tar.bz2
-pango-1.9.1.tar.bz2
-pango-1.10.0.tar.bz2
-pango-1.10.1.tar.bz2
-pango-1.10.2.tar.bz2
-pango-1.11.0.tar.bz2
-pango-1.11.1.tar.bz2
-pango-1.11.2.tar.bz2
-pango-1.11.3.tar.bz2
-pango-1.11.4.tar.bz2
-pango-1.11.5.tar.bz2
-pango-1.11.6.tar.bz2
-pango-1.11.99.tar.bz2
-pango-1.12.0.tar.bz2
+pango-1.12.2.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/FC-5/pango.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- pango.spec	7 Apr 2006 18:23:02 -0000	1.65
+++ pango.spec	27 Apr 2006 05:37:49 -0000	1.66
@@ -7,8 +7,8 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.12.1
-Release: 1.fc5.1
+Version: 1.12.2
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.8/pango-%{version}.tar.bz2
@@ -188,6 +188,9 @@
 
 
 %changelog
+* Thu Apr 27 2006 Matthias Clasen <mclasen at redhat.com> - 1.12.2-1
+- Update to 1.12.2
+
 * Fri Apr  7 2006 Matthias Clasen <mclasen at redhat.com> - 1.12.1-1.fc5.1
 - Update to 1.12.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pango/FC-5/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	7 Apr 2006 18:23:02 -0000	1.32
+++ sources	27 Apr 2006 05:37:49 -0000	1.33
@@ -1 +1 @@
-10ddfbc43cf895639b77788ca637409c  pango-1.12.1.tar.bz2
+f41488236baf881a4844216ac61abc24  pango-1.12.2.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 05:43:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 01:43:51 -0400
Subject: rpms/kernel/devel linux-2.6-header-cleanup-git.patch,1.3,1.3.2.1
Message-ID: <200604270543.k3R5hpVi016046@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16010

Modified Files:
      Tag: private-kernel-headers-branch
	linux-2.6-header-cleanup-git.patch 
Log Message:
fix ia64 build

linux-2.6-header-cleanup-git.patch:
 b/include/asm-s390/ptrace.h                          |    6 -
 b/include/linux/elf-em.h                             |   44 ++++++++
 include/acpi/platform/aclinux.h                      |    1 
 include/acpi/processor.h                             |    1 
 include/asm-alpha/bitops.h                           |    1 
 include/asm-alpha/cache.h                            |    1 
 include/asm-alpha/cacheflush.h                       |    1 
 include/asm-alpha/core_cia.h                         |    1 
 include/asm-alpha/core_t2.h                          |    1 
 include/asm-alpha/dma-mapping.h                      |    1 
 include/asm-alpha/dma.h                              |    1 
 include/asm-alpha/floppy.h                           |    1 
 include/asm-alpha/hardirq.h                          |    1 
 include/asm-alpha/hw_irq.h                           |    1 
 include/asm-alpha/ide.h                              |    1 
 include/asm-alpha/io.h                               |    1 
 include/asm-alpha/irq.h                              |    1 
 include/asm-alpha/kmap_types.h                       |    1 
 include/asm-alpha/machvec.h                          |    1 
 include/asm-alpha/mmu_context.h                      |    1 
 include/asm-alpha/mmzone.h                           |    1 
 include/asm-alpha/page.h                             |    1 
 include/asm-alpha/param.h                            |    1 
 include/asm-alpha/pgalloc.h                          |    1 
 include/asm-alpha/pgtable.h                          |    1 
 include/asm-alpha/serial.h                           |    1 
 include/asm-alpha/smp.h                              |    1 
 include/asm-alpha/spinlock.h                         |    1 
 include/asm-alpha/system.h                           |    1 
 include/asm-alpha/tlbflush.h                         |    1 
 include/asm-arm/apm.h                                |    1 
 include/asm-arm/arch-aaec2000/memory.h               |    1 
 include/asm-arm/arch-cl7500/acornfb.h                |    1 
 include/asm-arm/arch-clps711x/hardware.h             |    1 
 include/asm-arm/arch-clps711x/memory.h               |    1 
 include/asm-arm/arch-clps711x/uncompress.h           |    1 
 include/asm-arm/arch-ebsa285/hardware.h              |    1 
 include/asm-arm/arch-ebsa285/memory.h                |    1 
 include/asm-arm/arch-ebsa285/vmalloc.h               |    1 
 include/asm-arm/arch-integrator/smp.h                |    1 
 include/asm-arm/arch-iop3xx/memory.h                 |    1 
 include/asm-arm/arch-iop3xx/timex.h                  |    1 
 include/asm-arm/arch-iop3xx/uncompress.h             |    1 
 include/asm-arm/arch-ixp4xx/dma.h                    |    1 
 include/asm-arm/arch-lh7a40x/constants.h             |    1 
 include/asm-arm/arch-lh7a40x/irqs.h                  |    1 
 include/asm-arm/arch-lh7a40x/registers.h             |    1 
 include/asm-arm/arch-omap/board.h                    |    1 
 include/asm-arm/arch-omap/hardware.h                 |    1 
 include/asm-arm/arch-omap/system.h                   |    1 
 include/asm-arm/arch-omap/uncompress.h               |    1 
 include/asm-arm/arch-pxa/idp.h                       |    1 
 include/asm-arm/arch-pxa/irqs.h                      |    1 
 include/asm-arm/arch-pxa/pxa-regs.h                  |    1 
 include/asm-arm/arch-pxa/timex.h                     |    1 
 include/asm-arm/arch-realview/smp.h                  |    1 
 include/asm-arm/arch-s3c2410/dma.h                   |    1 
 include/asm-arm/arch-s3c2410/uncompress.h            |    1 
 include/asm-arm/arch-sa1100/assabet.h                |    1 
 include/asm-arm/arch-sa1100/cerf.h                   |    1 
 include/asm-arm/arch-sa1100/collie.h                 |    1 
 include/asm-arm/arch-sa1100/dma.h                    |    1 
 include/asm-arm/arch-sa1100/hardware.h               |    1 
 include/asm-arm/arch-sa1100/ide.h                    |    1 
 include/asm-arm/arch-sa1100/irqs.h                   |    1 
 include/asm-arm/arch-sa1100/memory.h                 |    1 
 include/asm-arm/arch-sa1100/system.h                 |    1 
 include/asm-arm/atomic.h                             |    1 
 include/asm-arm/bug.h                                |    1 
 include/asm-arm/cacheflush.h                         |    1 
 include/asm-arm/cpu.h                                |    1 
 include/asm-arm/dma-mapping.h                        |    1 
 include/asm-arm/dma.h                                |    1 
 include/asm-arm/elf.h                                |    1 
 include/asm-arm/fpstate.h                            |    1 
 include/asm-arm/glue.h                               |    1 
 include/asm-arm/hardirq.h                            |    1 
 include/asm-arm/hardware/dec21285.h                  |    1 
 include/asm-arm/hardware/iomd.h                      |    1 
 include/asm-arm/leds.h                               |    1 
 include/asm-arm/mach/serial_at91rm9200.h             |    1 
 include/asm-arm/mach/serial_sa1100.h                 |    1 
 include/asm-arm/memory.h                             |    1 
 include/asm-arm/page.h                               |    1 
 include/asm-arm/pci.h                                |    1 
 include/asm-arm/proc-fns.h                           |    1 
 include/asm-arm/ptrace.h                             |    1 
 include/asm-arm/smp.h                                |    1 
 include/asm-arm/system.h                             |    1 
 include/asm-arm/tlbflush.h                           |    1 
 include/asm-arm26/atomic.h                           |    1 
 include/asm-arm26/bug.h                              |    1 
 include/asm-arm26/dma.h                              |    1 
 include/asm-arm26/hardirq.h                          |    1 
 include/asm-arm26/hardware.h                         |    1 
 include/asm-arm26/io.h                               |    1 
 include/asm-arm26/leds.h                             |    1 
 include/asm-arm26/mach-types.h                       |    1 
 include/asm-arm26/page.h                             |    1 
 include/asm-arm26/pgtable.h                          |    1 
 include/asm-arm26/serial.h                           |    1 
 include/asm-arm26/smp.h                              |    1 
 include/asm-arm26/sysirq.h                           |    1 
 include/asm-arm26/system.h                           |    1 
 include/asm-cris/arch-v10/io.h                       |    1 
 include/asm-cris/arch-v10/page.h                     |    1 
 include/asm-cris/arch-v10/system.h                   |    1 
 include/asm-cris/arch-v32/io.h                       |    1 
 include/asm-cris/arch-v32/irq.h                      |    1 
 include/asm-cris/arch-v32/page.h                     |    1 
 include/asm-cris/arch-v32/processor.h                |    1 
 include/asm-cris/arch-v32/system.h                   |    1 
 include/asm-cris/eshlibld.h                          |    1 
 include/asm-cris/etraxgpio.h                         |    1 
 include/asm-cris/fasttimer.h                         |    1 
 include/asm-cris/page.h                              |    1 
 include/asm-cris/pci.h                               |    1 
 include/asm-cris/pgtable.h                           |    1 
 include/asm-cris/processor.h                         |    1 
 include/asm-cris/rtc.h                               |    1 
 include/asm-cris/tlbflush.h                          |    1 
 include/asm-frv/atomic.h                             |    1 
 include/asm-frv/bitops.h                             |    1 
 include/asm-frv/bug.h                                |    1 
 include/asm-frv/cache.h                              |    1 
 include/asm-frv/dma.h                                |    1 
 include/asm-frv/elf.h                                |    1 
 include/asm-frv/fpu.h                                |    1 
 include/asm-frv/hardirq.h                            |    1 
 include/asm-frv/highmem.h                            |    1 
 include/asm-frv/ide.h                                |    1 
 include/asm-frv/io.h                                 |    1 
 include/asm-frv/irq.h                                |    1 
 include/asm-frv/mmu_context.h                        |    1 
 include/asm-frv/page.h                               |    1 
 include/asm-frv/pci.h                                |    1 
 include/asm-frv/pgalloc.h                            |    1 
 include/asm-frv/pgtable.h                            |    1 
 include/asm-frv/processor.h                          |    1 
 include/asm-frv/segment.h                            |    1 
 include/asm-frv/serial.h                             |    1 
 include/asm-frv/smp.h                                |    1 
 include/asm-frv/system.h                             |    1 
 include/asm-frv/tlbflush.h                           |    1 
 include/asm-frv/types.h                              |    1 
 include/asm-frv/unaligned.h                          |    1 
 include/asm-frv/virtconvert.h                        |    1 
 include/asm-generic/bug.h                            |    1 
 include/asm-generic/dma-mapping.h                    |    1 
 include/asm-generic/fcntl.h                          |    1 
 include/asm-generic/local.h                          |    1 
 include/asm-generic/signal.h                         |    7 +
 include/asm-generic/tlb.h                            |    1 
 include/asm-h8300/bitops.h                           |    1 
 include/asm-h8300/dma.h                              |    1 
 include/asm-h8300/elf.h                              |    1 
 include/asm-h8300/hardirq.h                          |    1 
 include/asm-h8300/io.h                               |    1 
 include/asm-h8300/keyboard.h                         |    1 
 include/asm-h8300/mmu_context.h                      |    1 
 include/asm-h8300/page.h                             |    1 
 include/asm-h8300/page_offset.h                      |    1 
 include/asm-h8300/param.h                            |    1 
 include/asm-h8300/pgtable.h                          |    1 
 include/asm-h8300/processor.h                        |    1 
 include/asm-h8300/semaphore-helper.h                 |    1 
 include/asm-h8300/shm.h                              |    1 
 include/asm-h8300/system.h                           |    1 
 include/asm-h8300/unaligned.h                        |    1 
 include/asm-h8300/virtconvert.h                      |    1 
 include/asm-i386/apic.h                              |    1 
 include/asm-i386/atomic.h                            |    1 
 include/asm-i386/bitops.h                            |    1 
 include/asm-i386/bug.h                               |    1 
 include/asm-i386/bugs.h                              |    1 
 include/asm-i386/byteorder.h                         |    1 
 include/asm-i386/cache.h                             |    1 
 include/asm-i386/dma.h                               |    1 
 include/asm-i386/fixmap.h                            |    1 
 include/asm-i386/hardirq.h                           |    1 
 include/asm-i386/highmem.h                           |    1 
 include/asm-i386/hpet.h                              |    1 
 include/asm-i386/hw_irq.h                            |    1 
 include/asm-i386/ide.h                               |    1 
 include/asm-i386/io.h                                |    1 
 include/asm-i386/io_apic.h                           |    1 
 include/asm-i386/irq.h                               |    1 
 include/asm-i386/kmap_types.h                        |    1 
 include/asm-i386/mach-summit/mach_apic.h             |    1 
 include/asm-i386/mmu_context.h                       |    1 
 include/asm-i386/mtrr.h                              |    1 
 include/asm-i386/page.h                              |    1 
 include/asm-i386/param.h                             |    1 
 include/asm-i386/pci.h                               |    1 
 include/asm-i386/pgalloc.h                           |    1 
 include/asm-i386/pgtable.h                           |    1 
 include/asm-i386/processor.h                         |    1 
 include/asm-i386/serial.h                            |    1 
 include/asm-i386/smp.h                               |    1 
 include/asm-i386/spinlock.h                          |    1 
 include/asm-i386/string.h                            |    1 
 include/asm-i386/system.h                            |    1 
 include/asm-i386/thread_info.h                       |    1 
 include/asm-i386/timex.h                             |    1 
 include/asm-i386/tlbflush.h                          |    1 
 include/asm-i386/types.h                             |    1 
 include/asm-i386/uaccess.h                           |    1 
 include/asm-ia64/asmmacro.h                          |    1 
 include/asm-ia64/cache.h                             |    1 
 include/asm-ia64/delay.h                             |    1 
 include/asm-ia64/dma-mapping.h                       |    1 
 include/asm-ia64/dma.h                               |    1 
 include/asm-ia64/elf.h                               |    1 
 include/asm-ia64/hardirq.h                           |    1 
 include/asm-ia64/ia32.h                              |    1 
 include/asm-ia64/ide.h                               |    1 
 include/asm-ia64/intrinsics.h                        |    1 
 include/asm-ia64/kmap_types.h                        |    1 
 include/asm-ia64/machvec.h                           |    1 
 include/asm-ia64/meminit.h                           |    1 
 include/asm-ia64/nodedata.h                          |    1 
 include/asm-ia64/numa.h                              |    1 
 include/asm-ia64/page.h                              |    1 
 include/asm-ia64/param.h                             |    1 
 include/asm-ia64/percpu.h                            |    1 
 include/asm-ia64/pgalloc.h                           |    1 
 include/asm-ia64/pgtable.h                           |    1 
 include/asm-ia64/processor.h                         |    1 
 include/asm-ia64/ptrace.h                            |    1 
 include/asm-ia64/smp.h                               |    1 
 include/asm-ia64/sn/simulator.h                      |    1 
 include/asm-ia64/sn/sn_cpuid.h                       |    1 
 include/asm-ia64/sn/sn_sal.h                         |    1 
 include/asm-ia64/sn/xpc.h                            |    1 
 include/asm-ia64/string.h                            |    1 
 include/asm-ia64/system.h                            |    1 
 include/asm-ia64/tlb.h                               |    1 
 include/asm-ia64/tlbflush.h                          |    1 
 include/asm-ia64/unistd.h                            |    1 
 include/asm-m32r/assembler.h                         |    1 
 include/asm-m32r/atomic.h                            |    1 
 include/asm-m32r/bitops.h                            |    1 
 include/asm-m32r/cacheflush.h                        |    1 
 include/asm-m32r/hardirq.h                           |    1 
 include/asm-m32r/ide.h                               |    1 
 include/asm-m32r/irq.h                               |    1 
 include/asm-m32r/kmap_types.h                        |    1 
 include/asm-m32r/m32104ut/m32104ut_pld.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lan.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lcd.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_pld.h             |    1 
 include/asm-m32r/m32r.h                              |    1 
 include/asm-m32r/mmu.h                               |    1 
 include/asm-m32r/mmu_context.h                       |    2 
 include/asm-m32r/opsput/opsput_lan.h                 |    1 
 include/asm-m32r/opsput/opsput_lcd.h                 |    1 
 include/asm-m32r/opsput/opsput_pld.h                 |    1 
 include/asm-m32r/page.h                              |    1 
 include/asm-m32r/pgalloc.h                           |    1 
 include/asm-m32r/pgtable-2level.h                    |    1 
 include/asm-m32r/pgtable.h                           |    1 
 include/asm-m32r/processor.h                         |    1 
 include/asm-m32r/ptrace.h                            |    1 
 include/asm-m32r/rtc.h                               |    1 
 include/asm-m32r/semaphore.h                         |    1 
 include/asm-m32r/serial.h                            |    1 
 include/asm-m32r/sigcontext.h                        |    1 
 include/asm-m32r/smp.h                               |    1 
 include/asm-m32r/spinlock.h                          |    1 
 include/asm-m32r/system.h                            |    1 
 include/asm-m32r/timex.h                             |    1 
 include/asm-m32r/tlbflush.h                          |    1 
 include/asm-m32r/uaccess.h                           |    1 
 include/asm-m68k/atomic.h                            |    1 
 include/asm-m68k/bug.h                               |    1 
 include/asm-m68k/dma-mapping.h                       |    1 
 include/asm-m68k/dma.h                               |    1 
 include/asm-m68k/dvma.h                              |    1 
 include/asm-m68k/elf.h                               |    1 
 include/asm-m68k/entry.h                             |    1 
 include/asm-m68k/fpu.h                               |    1 
 include/asm-m68k/hardirq.h                           |    1 
 include/asm-m68k/ide.h                               |    1 
 include/asm-m68k/io.h                                |    1 
 include/asm-m68k/irq.h                               |    1 
 include/asm-m68k/mc146818rtc.h                       |    1 
 include/asm-m68k/mmu_context.h                       |    1 
 include/asm-m68k/motorola_pgtable.h                  |    1 
 include/asm-m68k/openprom.h                          |    1 
 include/asm-m68k/page.h                              |    1 
 include/asm-m68k/page_offset.h                       |    1 
 include/asm-m68k/pgalloc.h                           |    1 
 include/asm-m68k/pgtable.h                           |    1 
 include/asm-m68k/processor.h                         |    1 
 include/asm-m68k/semaphore-helper.h                  |    1 
 include/asm-m68k/serial.h                            |    1 
 include/asm-m68k/setup.h                             |    1 
 include/asm-m68k/shm.h                               |    1 
 include/asm-m68k/system.h                            |    1 
 include/asm-m68k/tlbflush.h                          |    1 
 include/asm-m68k/virtconvert.h                       |    1 
 include/asm-m68knommu/bitops.h                       |    1 
 include/asm-m68knommu/coldfire.h                     |    1 
 include/asm-m68knommu/commproc.h                     |    1 
 include/asm-m68knommu/dma-mapping.h                  |    1 
 include/asm-m68knommu/dma.h                          |    1 
 include/asm-m68knommu/elf.h                          |    1 
 include/asm-m68knommu/elia.h                         |    1 
 include/asm-m68knommu/entry.h                        |    1 
 include/asm-m68knommu/fpu.h                          |    1 
 include/asm-m68knommu/hardirq.h                      |    1 
 include/asm-m68knommu/io.h                           |    1 
 include/asm-m68knommu/irq.h                          |    1 
 include/asm-m68knommu/m5206sim.h                     |    1 
 include/asm-m68knommu/m520xsim.h                     |    1 
 include/asm-m68knommu/m523xsim.h                     |    1 
 include/asm-m68knommu/m5272sim.h                     |    1 
 include/asm-m68knommu/m527xsim.h                     |    1 
 include/asm-m68knommu/m528xsim.h                     |    1 
 include/asm-m68knommu/mcfcache.h                     |    1 
 include/asm-m68knommu/mcfdma.h                       |    1 
 include/asm-m68knommu/mcfmbus.h                      |    1 
 include/asm-m68knommu/mcfne.h                        |    1 
 include/asm-m68knommu/mcfpci.h                       |    1 
 include/asm-m68knommu/mcfpit.h                       |    1 
 include/asm-m68knommu/mcfsim.h                       |    1 
 include/asm-m68knommu/mcfsmc.h                       |    1 
 include/asm-m68knommu/mcftimer.h                     |    1 
 include/asm-m68knommu/mcfuart.h                      |    1 
 include/asm-m68knommu/mcfwdebug.h                    |    1 
 include/asm-m68knommu/mmu_context.h                  |    1 
 include/asm-m68knommu/nettel.h                       |    1 
 include/asm-m68knommu/page.h                         |    1 
 include/asm-m68knommu/page_offset.h                  |    1 
 include/asm-m68knommu/param.h                        |    1 
 include/asm-m68knommu/pgtable.h                      |    1 
 include/asm-m68knommu/processor.h                    |    1 
 include/asm-m68knommu/semaphore-helper.h             |    1 
 include/asm-m68knommu/system.h                       |    1 
 include/asm-m68knommu/unaligned.h                    |    1 
 include/asm-mips/a.out.h                             |    1 
 include/asm-mips/addrspace.h                         |    1 
 include/asm-mips/arc/types.h                         |    1 
 include/asm-mips/asm.h                               |    1 
 include/asm-mips/asmmacro.h                          |    1 
 include/asm-mips/atomic.h                            |    1 
 include/asm-mips/bcache.h                            |    1 
 include/asm-mips/bitops.h                            |    1 
 include/asm-mips/bug.h                               |    1 
 include/asm-mips/bugs.h                              |    1 
 include/asm-mips/byteorder.h                         |    1 
 include/asm-mips/cache.h                             |    1 
 include/asm-mips/checksum.h                          |    1 
 include/asm-mips/cpu-features.h                      |    1 
 include/asm-mips/cpu-info.h                          |    1 
 include/asm-mips/ddb5xxx/ddb5477.h                   |    1 
 include/asm-mips/ddb5xxx/ddb5xxx.h                   |    1 
 include/asm-mips/debug.h                             |    1 
 include/asm-mips/dec/prom.h                          |    1 
 include/asm-mips/delay.h                             |    1 
 include/asm-mips/dma.h                               |    1 
 include/asm-mips/elf.h                               |    1 
 include/asm-mips/fcntl.h                             |    1 
 include/asm-mips/fixmap.h                            |    1 
 include/asm-mips/fpu.h                               |    1 
 include/asm-mips/futex.h                             |    1 
 include/asm-mips/hazards.h                           |    1 
 include/asm-mips/highmem.h                           |    1 
 include/asm-mips/interrupt.h                         |    1 
 include/asm-mips/io.h                                |    1 
 include/asm-mips/ip32/machine.h                      |    1 
 include/asm-mips/irq.h                               |    1 
 include/asm-mips/isadep.h                            |    1 
 include/asm-mips/jmr3927/irq.h                       |    1 
 include/asm-mips/kmap_types.h                        |    1 
 include/asm-mips/local.h                             |    1 
 include/asm-mips/mach-au1x00/au1000.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx_dbdma.h          |    1 
 include/asm-mips/mach-au1x00/au1xxx_ide.h            |    1 
 include/asm-mips/mach-au1x00/au1xxx_psc.h            |    1 
 include/asm-mips/mach-au1x00/ioremap.h               |    1 
 include/asm-mips/mach-cobalt/cpu-feature-overrides.h |    1 
 include/asm-mips/mach-db1x00/db1x00.h                |    1 
 include/asm-mips/mach-generic/ide.h                  |    1 
 include/asm-mips/mach-generic/kmalloc.h              |    1 
 include/asm-mips/mach-generic/spaces.h               |    1 
 include/asm-mips/mach-ip22/spaces.h                  |    1 
 include/asm-mips/mach-ip32/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-ip32/kmalloc.h                 |    1 
 include/asm-mips/mach-mips/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-mips/irq.h                     |    1 
 include/asm-mips/mach-pb1x00/pb1550.h                |    1 
 include/asm-mips/mach-sim/cpu-feature-overrides.h    |    1 
 include/asm-mips/mips-boards/generic.h               |    1 
 include/asm-mips/mipsregs.h                          |    1 
 include/asm-mips/mmu_context.h                       |    1 
 include/asm-mips/mmzone.h                            |    1 
 include/asm-mips/module.h                            |    1 
 include/asm-mips/msgbuf.h                            |    1 
 include/asm-mips/paccess.h                           |    1 
 include/asm-mips/page.h                              |    1 
 include/asm-mips/pci.h                               |    1 
 include/asm-mips/pgalloc.h                           |    1 
 include/asm-mips/pgtable-32.h                        |    1 
 include/asm-mips/pgtable-64.h                        |    1 
 include/asm-mips/pgtable-bits.h                      |    1 
 include/asm-mips/pgtable.h                           |    1 
 include/asm-mips/prefetch.h                          |    1 
 include/asm-mips/processor.h                         |    1 
 include/asm-mips/ptrace.h                            |    1 
 include/asm-mips/reg.h                               |    1 
 include/asm-mips/resource.h                          |    1 
 include/asm-mips/serial.h                            |    1 
 include/asm-mips/sgiarcs.h                           |    1 
 include/asm-mips/sibyte/board.h                      |    1 
 include/asm-mips/sibyte/carmel.h                     |    1 
 include/asm-mips/sibyte/sentosa.h                    |    1 
 include/asm-mips/sibyte/swarm.h                      |    1 
 include/asm-mips/siginfo.h                           |    1 
 include/asm-mips/signal.h                            |    1 
 include/asm-mips/sim.h                               |    1 
 include/asm-mips/smp.h                               |    1 
 include/asm-mips/sn/addrs.h                          |    1 
 include/asm-mips/sn/agent.h                          |    1 
 include/asm-mips/sn/arch.h                           |    1 
 include/asm-mips/sn/io.h                             |    1 
 include/asm-mips/sn/klconfig.h                       |    1 
 include/asm-mips/sn/kldir.h                          |    1 
 include/asm-mips/sn/launch.h                         |    1 
 include/asm-mips/sn/mapped_kernel.h                  |    1 
 include/asm-mips/sn/sn0/addrs.h                      |    1 
 include/asm-mips/sn/sn0/arch.h                       |    1 
 include/asm-mips/sn/sn0/hubmd.h                      |    1 
 include/asm-mips/stackframe.h                        |    1 
 include/asm-mips/string.h                            |    1 
 include/asm-mips/system.h                            |    1 
 include/asm-mips/thread_info.h                       |    1 
 include/asm-mips/tlbflush.h                          |    1 
 include/asm-mips/tx4927/toshiba_rbtx4927.h           |    1 
 include/asm-mips/types.h                             |    1 
 include/asm-mips/uaccess.h                           |    1 
 include/asm-mips/unistd.h                            |    1 
 include/asm-mips/vr41xx/vrc4173.h                    |    1 
 include/asm-mips/war.h                               |    1 
 include/asm-mips/wbflush.h                           |    1 
 include/asm-parisc/atomic.h                          |    1 
 include/asm-parisc/cache.h                           |    1 
 include/asm-parisc/cacheflush.h                      |    1 
 include/asm-parisc/dma-mapping.h                     |    1 
 include/asm-parisc/dma.h                             |    1 
 include/asm-parisc/io.h                              |    1 
 include/asm-parisc/irq.h                             |    1 
 include/asm-parisc/kmap_types.h                      |    1 
 include/asm-parisc/page.h                            |    1 
 include/asm-parisc/param.h                           |    1 
 include/asm-parisc/pci.h                             |    1 
 include/asm-parisc/pdc.h                             |    1 
 include/asm-parisc/pgtable.h                         |    1 
 include/asm-parisc/processor.h                       |    1 
 include/asm-parisc/psw.h                             |    1 
 include/asm-parisc/smp.h                             |    1 
 include/asm-parisc/system.h                          |    1 
 include/asm-parisc/tlbflush.h                        |    1 
 include/asm-powerpc/abs_addr.h                       |    1 
 include/asm-powerpc/cache.h                          |    1 
 include/asm-powerpc/dma-mapping.h                    |    1 
 include/asm-powerpc/dma.h                            |    1 
 include/asm-powerpc/eeh.h                            |    1 
 include/asm-powerpc/elf.h                            |    7 -
 include/asm-powerpc/floppy.h                         |    1 
 include/asm-powerpc/hw_irq.h                         |    1 
 include/asm-powerpc/ide.h                            |    1 
 include/asm-powerpc/iommu.h                          |    1 
 include/asm-powerpc/irq.h                            |    1 
 include/asm-powerpc/iseries/iseries_io.h             |    1 
 include/asm-powerpc/machdep.h                        |    1 
 include/asm-powerpc/mmzone.h                         |    1 
 include/asm-powerpc/paca.h                           |    1 
 include/asm-powerpc/page.h                           |    1 
 include/asm-powerpc/pgtable.h                        |    1 
 include/asm-powerpc/ppc_asm.h                        |    1 
 include/asm-powerpc/prom.h                           |    1 
 include/asm-powerpc/smp.h                            |    1 
 include/asm-powerpc/smu.h                            |    1 
 include/asm-powerpc/spu.h                            |    1 
 include/asm-powerpc/thread_info.h                    |    1 
 include/asm-powerpc/time.h                           |    1 
 include/asm-powerpc/timex.h                          |    1 
 include/asm-powerpc/tlb.h                            |    1 
 include/asm-powerpc/tlbflush.h                       |    1 
 include/asm-powerpc/topology.h                       |    1 
 include/asm-powerpc/types.h                          |    1 
 include/asm-powerpc/unistd.h                         |    1 
 include/asm-powerpc/vga.h                            |    1 
 include/asm-powerpc/vio.h                            |    1 
 include/asm-ppc/amigahw.h                            |    1 
 include/asm-ppc/bootinfo.h                           |    1 
 include/asm-ppc/commproc.h                           |    1 
 include/asm-ppc/ibm403.h                             |    1 
 include/asm-ppc/ibm44x.h                             |    1 
 include/asm-ppc/ibm4xx.h                             |    1 
 include/asm-ppc/io.h                                 |    1 
 include/asm-ppc/machdep.h                            |    1 
 include/asm-ppc/mmu.h                                |    1 
 include/asm-ppc/mmu_context.h                        |    1 
 include/asm-ppc/mpc8260.h                            |    1 
 include/asm-ppc/mpc83xx.h                            |    1 
 include/asm-ppc/mpc85xx.h                            |    1 
 include/asm-ppc/mpc8xx.h                             |    1 
 include/asm-ppc/mv64x60.h                            |    1 
 include/asm-ppc/ocp.h                                |    1 
 include/asm-ppc/open_pic.h                           |    1 
 include/asm-ppc/page.h                               |    2 
 include/asm-ppc/pc_serial.h                          |    1 
 include/asm-ppc/pgalloc.h                            |    1 
 include/asm-ppc/pgtable.h                            |    1 
 include/asm-ppc/ppc4xx_dma.h                         |    1 
 include/asm-ppc/ppc4xx_pic.h                         |    1 
 include/asm-ppc/serial.h                             |    1 
 include/asm-ppc/smp.h                                |    1 
 include/asm-ppc/time.h                               |    1 
 include/asm-s390/bitops.h                            |    1 
 include/asm-s390/debug.h                             |    1 
 include/asm-s390/hardirq.h                           |    1 
 include/asm-s390/idals.h                             |    1 
 include/asm-s390/local.h                             |    1 
 include/asm-s390/lowcore.h                           |    1 
 include/asm-s390/page.h                              |    6 -
 include/asm-s390/pgalloc.h                           |    1 
 include/asm-s390/sfp-machine.h                       |    1 
 include/asm-s390/smp.h                               |    1 
 include/asm-s390/system.h                            |    1 
 include/asm-s390/tlbflush.h                          |    1 
 include/asm-s390/types.h                             |    1 
 include/asm-s390/unistd.h                            |    1 
 include/asm-sh/bug.h                                 |    1 
 include/asm-sh/checksum.h                            |    1 
 include/asm-sh/dma-mapping.h                         |    1 
 include/asm-sh/dma.h                                 |    1 
 include/asm-sh/fixmap.h                              |    1 
 include/asm-sh/hardirq.h                             |    1 
 include/asm-sh/hd64461/hd64461.h                     |    1 
 include/asm-sh/hd64465/hd64465.h                     |    1 
 include/asm-sh/ide.h                                 |    1 
 include/asm-sh/io.h                                  |    1 
 include/asm-sh/irq.h                                 |    1 
 include/asm-sh/keyboard.h                            |    1 
 include/asm-sh/kmap_types.h                          |    1 
 include/asm-sh/machvec.h                             |    1 
 include/asm-sh/machvec_init.h                        |    1 
 include/asm-sh/mpc1211/dma.h                         |    1 
 include/asm-sh/overdrive/overdrive.h                 |    1 
 include/asm-sh/page.h                                |    1 
 include/asm-sh/pgtable.h                             |    1 
 include/asm-sh/serial.h                              |    1 
 include/asm-sh/smp.h                                 |    1 
 include/asm-sh/system.h                              |    1 
 include/asm-sh/types.h                               |    1 
 include/asm-sh/watchdog.h                            |    1 
 include/asm-sh64/bug.h                               |    1 
 include/asm-sh64/dma-mapping.h                       |    1 
 include/asm-sh64/hardirq.h                           |    1 
 include/asm-sh64/ide.h                               |    1 
 include/asm-sh64/irq.h                               |    1 
 include/asm-sh64/mmu_context.h                       |    1 
 include/asm-sh64/page.h                              |    1 
 include/asm-sh64/param.h                             |    1 
 include/asm-sh64/pgtable.h                           |    1 
 include/asm-sh64/system.h                            |    1 
 include/asm-sparc/asmmacro.h                         |    1 
 include/asm-sparc/atomic.h                           |    1 
 include/asm-sparc/bugs.h                             |    1 
 include/asm-sparc/cacheflush.h                       |    1 
 include/asm-sparc/delay.h                            |    1 
 include/asm-sparc/dma-mapping.h                      |    1 
 include/asm-sparc/dma.h                              |    1 
 include/asm-sparc/elf.h                              |    1 
 include/asm-sparc/fixmap.h                           |    1 
 include/asm-sparc/hardirq.h                          |    1 
 include/asm-sparc/ide.h                              |    1 
 include/asm-sparc/irq.h                              |    1 
 include/asm-sparc/mostek.h                           |    1 
 include/asm-sparc/page.h                             |    1 
 include/asm-sparc/pgalloc.h                          |    1 
 include/asm-sparc/pgtable.h                          |    1 
 include/asm-sparc/sfp-machine.h                      |    1 
 include/asm-sparc/smp.h                              |    1 
 include/asm-sparc/system.h                           |    2 
 include/asm-sparc/timer.h                            |    1 
 include/asm-sparc/tlbflush.h                         |    1 
 include/asm-sparc/vac-ops.h                          |    1 
 include/asm-sparc/winmacro.h                         |    1 
 include/asm-sparc64/atomic.h                         |    1 
 include/asm-sparc64/bitops.h                         |    1 
 include/asm-sparc64/bugs.h                           |    1 
 include/asm-sparc64/cacheflush.h                     |    1 
 include/asm-sparc64/delay.h                          |    1 
 include/asm-sparc64/dma-mapping.h                    |    1 
 include/asm-sparc64/dma.h                            |    1 
 include/asm-sparc64/floppy.h                         |    1 
 include/asm-sparc64/ide.h                            |    1 
 include/asm-sparc64/irq.h                            |    1 
 include/asm-sparc64/kprobes.h                        |    1 
 include/asm-sparc64/mc146818rtc.h                    |    1 
 include/asm-sparc64/mmu.h                            |    1 
 include/asm-sparc64/oplib.h                          |    1 
 include/asm-sparc64/page.h                           |    1 
 include/asm-sparc64/param.h                          |    1 
 include/asm-sparc64/pgalloc.h                        |    1 
 include/asm-sparc64/pgtable.h                        |    1 
 include/asm-sparc64/processor.h                      |    1 
 include/asm-sparc64/siginfo.h                        |    1 
 include/asm-sparc64/signal.h                         |    1 
 include/asm-sparc64/smp.h                            |    1 
 include/asm-sparc64/spinlock.h                       |    1 
 include/asm-sparc64/system.h                         |    1 
 include/asm-sparc64/timer.h                          |    1 
 include/asm-sparc64/tlb.h                            |    1 
 include/asm-sparc64/tlbflush.h                       |    1 
 include/asm-sparc64/ttable.h                         |    1 
 include/asm-um/a.out.h                               |    1 
 include/asm-um/cache.h                               |    1 
 include/asm-um/elf-ppc.h                             |    1 
 include/asm-um/fixmap.h                              |    1 
 include/asm-um/hardirq.h                             |    1 
 include/asm-um/linkage.h                             |    1 
 include/asm-um/mmu_context.h                         |    1 
 include/asm-um/page.h                                |    1 
 include/asm-um/pgalloc.h                             |    1 
 include/asm-um/processor-generic.h                   |    1 
 include/asm-um/ptrace-generic.h                      |    1 
 include/asm-um/smp.h                                 |    1 
 include/asm-um/thread_info.h                         |    1 
 include/asm-v850/atomic.h                            |    1 
 include/asm-v850/bitops.h                            |    1 
 include/asm-v850/dma-mapping.h                       |    1 
 include/asm-v850/hardirq.h                           |    1 
 include/asm-v850/machdep.h                           |    1 
 include/asm-v850/pgtable.h                           |    1 
 include/asm-v850/processor.h                         |    1 
 include/asm-v850/serial.h                            |    1 
 include/asm-v850/v850e_uart.h                        |    1 
 include/asm-x86_64/apic.h                            |    1 
 include/asm-x86_64/atomic.h                          |    1 
 include/asm-x86_64/bitops.h                          |    1 
 include/asm-x86_64/bugs.h                            |    1 
 include/asm-x86_64/cache.h                           |    1 
 include/asm-x86_64/calling.h                         |    1 
 include/asm-x86_64/dma-mapping.h                     |    1 
 include/asm-x86_64/dma.h                             |    1 
 include/asm-x86_64/dwarf2.h                          |    1 
 include/asm-x86_64/fixmap.h                          |    1 
 include/asm-x86_64/hardirq.h                         |    1 
 include/asm-x86_64/hw_irq.h                          |    1 
 include/asm-x86_64/ia32.h                            |    1 
 include/asm-x86_64/io.h                              |    1 
 include/asm-x86_64/io_apic.h                         |    1 
 include/asm-x86_64/mmu_context.h                     |    1 
 include/asm-x86_64/mmzone.h                          |    1 
 include/asm-x86_64/mtrr.h                            |    1 
 include/asm-x86_64/page.h                            |    1 
 include/asm-x86_64/param.h                           |    1 
 include/asm-x86_64/pci.h                             |    1 
 include/asm-x86_64/processor.h                       |    1 
 include/asm-x86_64/serial.h                          |    1 
 include/asm-x86_64/smp.h                             |    1 
 include/asm-x86_64/spinlock.h                        |    1 
 include/asm-x86_64/swiotlb.h                         |    1 
 include/asm-x86_64/system.h                          |    1 
 include/asm-x86_64/tlbflush.h                        |    1 
 include/asm-x86_64/topology.h                        |    1 
 include/asm-x86_64/uaccess.h                         |    1 
 include/asm-xtensa/atomic.h                          |    1 
 include/asm-xtensa/checksum.h                        |    1 
 include/asm-xtensa/delay.h                           |    1 
 include/asm-xtensa/dma.h                             |    1 
 include/asm-xtensa/hardirq.h                         |    1 
 include/asm-xtensa/ide.h                             |    1 
 include/asm-xtensa/io.h                              |    1 
 include/asm-xtensa/irq.h                             |    1 
 include/asm-xtensa/mmu_context.h                     |    1 
 include/asm-xtensa/page.h                            |    1 
 include/asm-xtensa/pgalloc.h                         |    1 
 include/asm-xtensa/platform.h                        |    1 
 include/asm-xtensa/system.h                          |    1 
 include/linux/acct.h                                 |    3 
 include/linux/acpi.h                                 |    1 
 include/linux/agpgart.h                              |    3 
 include/linux/amba/clcd.h                            |    1 
 include/linux/atmdev.h                               |    1 
 include/linux/audit.h                                |    4 
 include/linux/blkdev.h                               |    1 
 include/linux/blktrace_api.h                         |    1 
 include/linux/blockgroup_lock.h                      |    1 
 include/linux/cache.h                                |    1 
 include/linux/coda.h                                 |    1 
 include/linux/compat.h                               |    1 
 include/linux/cpufreq.h                              |    1 
 include/linux/crypto.h                               |    1 
 include/linux/cyclomx.h                              |    1 
 include/linux/dcookies.h                             |    1 
 include/linux/devfs_fs_kernel.h                      |    1 
 include/linux/device.h                               |    1 
 include/linux/dmi.h                                  |    1 
 include/linux/dnotify.h                              |    1 
 include/linux/elf.h                                  |   59 -----------
 include/linux/errqueue.h                             |    1 
 include/linux/ext2_fs.h                              |    2 
 include/linux/ext3_fs.h                              |    7 -
 include/linux/fs.h                                   |    1 
 include/linux/ftape.h                                |    1 
 include/linux/gameport.h                             |    6 +
 include/linux/generic_serial.h                       |    6 -
 include/linux/genhd.h                                |   12 +-
 include/linux/gfp.h                                  |    1 
 include/linux/hardirq.h                              |    1 
 include/linux/highmem.h                              |    1 
 include/linux/highuid.h                              |    1 
 include/linux/i2c-algo-ite.h                         |    7 +
 include/linux/i2c.h                                  |    9 +
 include/linux/ide.h                                  |    1 
 include/linux/if_frad.h                              |    1 
 include/linux/if_tr.h                                |    1 
 include/linux/init.h                                 |    1 
 include/linux/inotify.h                              |    1 
 include/linux/interrupt.h                            |    1 
 include/linux/ipmi.h                                 |    2 
 include/linux/ipv6.h                                 |    1 
 include/linux/irq.h                                  |    1 
 include/linux/irq_cpustat.h                          |    1 
 include/linux/isapnp.h                               |    1 
 include/linux/isdn.h                                 |    1 
 include/linux/isdn/tpam.h                            |    1 
 include/linux/isdn_ppp.h                             |    1 
 include/linux/isdnif.h                               |    1 
 include/linux/kallsyms.h                             |    1 
 include/linux/kernel_stat.h                          |    1 
 include/linux/kmod.h                                 |    1 
 include/linux/kprobes.h                              |    1 
 include/linux/linkage.h                              |    1 
 include/linux/lockd/lockd.h                          |    1 
 include/linux/lockd/nlm.h                            |    1 
 include/linux/mempolicy.h                            |    1 
 include/linux/migrate.h                              |    1 
 include/linux/mm.h                                   |    1 
 include/linux/mman.h                                 |   12 +-
 include/linux/mmzone.h                               |    1 
 include/linux/module.h                               |    1 
 include/linux/msg.h                                  |    2 
 include/linux/mtd/cfi.h                              |    1 
 include/linux/mtd/map.h                              |    1 
 include/linux/mtd/mtd.h                              |    1 
 include/linux/mtd/nand.h                             |    1 
 include/linux/mtd/physmap.h                          |    1 
 include/linux/mtd/xip.h                              |    1 
 include/linux/ncp_fs.h                               |    5 -
 include/linux/net.h                                  |    3 
 include/linux/netdevice.h                            |    1 
 include/linux/netfilter.h                            |    1 
 include/linux/netfilter_arp.h                        |    1 
 include/linux/netfilter_bridge.h                     |    1 
 include/linux/netfilter_ipv4.h                       |    1 
 include/linux/netfilter_ipv4/ip_conntrack.h          |    1 
 include/linux/netfilter_ipv4/listhelp.h              |    1 
 include/linux/nfs.h                                  |    8 -
 include/linux/nfs4.h                                 |    6 -
 include/linux/nfs_fs.h                               |   39 +++----
 include/linux/nfsd/nfsd.h                            |    1 
 include/linux/nfsd/nfsfh.h                           |    1 
 include/linux/nfsd/syscall.h                         |    1 
 include/linux/numa.h                                 |    1 
 include/linux/parport.h                              |    1 
 include/linux/pci.h                                  |    1 
 include/linux/percpu_counter.h                       |    1 
 include/linux/pm.h                                   |    1 
 include/linux/pm_legacy.h                            |    1 
 include/linux/pmu.h                                  |    1 
 include/linux/preempt.h                              |    1 
 include/linux/proc_fs.h                              |    1 
 include/linux/profile.h                              |    1 
 include/linux/quota.h                                |    4 
 include/linux/quotaops.h                             |    1 
 include/linux/reiserfs_xattr.h                       |    3 
 include/linux/relay.h                                |    1 
 include/linux/rio.h                                  |    1 
 include/linux/rio_drv.h                              |    1 
 include/linux/rmap.h                                 |    1 
 include/linux/rtnetlink.h                            |    1 
 include/linux/rwsem.h                                |    1 
 include/linux/scc.h                                  |    1 
 include/linux/sched.h                                |   94 +++++++++----------
 include/linux/seccomp.h                              |    1 
 include/linux/sem.h                                  |    2 
 include/linux/seqlock.h                              |    1 
 include/linux/serialP.h                              |    1 
 include/linux/serial_core.h                          |    1 
 include/linux/signal.h                               |    4 
 include/linux/skbuff.h                               |    1 
 include/linux/slab.h                                 |    1 
 include/linux/smb_fs.h                               |    4 
 include/linux/smp.h                                  |    1 
 include/linux/smp_lock.h                             |    1 
 include/linux/socket.h                               |    2 
 include/linux/spinlock.h                             |    1 
 include/linux/stop_machine.h                         |    1 
 include/linux/sunrpc/auth.h                          |    1 
 include/linux/sunrpc/debug.h                         |   24 ++--
 include/linux/sunrpc/stats.h                         |    1 
 include/linux/suspend.h                              |    1 
 include/linux/swap.h                                 |    1 
 include/linux/syscalls.h                             |    1 
 include/linux/sysrq.h                                |    1 
 include/linux/tcp.h                                  |    1 
 include/linux/threads.h                              |    1 
 include/linux/timer.h                                |    1 
 include/linux/timex.h                                |    1 
 include/linux/tty.h                                  |    1 
 include/linux/types.h                                |    1 
 include/linux/udp.h                                  |    1 
 include/linux/usb.h                                  |    1 
 include/linux/usb_usual.h                            |    1 
 include/linux/usbdevice_fs.h                         |    2 
 include/linux/vt_buffer.h                            |    1 
 include/linux/vt_kern.h                              |    1 
 include/linux/wait.h                                 |    1 
 include/linux/wanrouter.h                            |    4 
 include/mtd/mtd-abi.h                                |    5 -
 include/net/addrconf.h                               |    1 
 include/net/af_unix.h                                |    1 
 include/net/ax25.h                                   |    1 
 include/net/compat.h                                 |    1 
 include/net/dst.h                                    |    1 
 include/net/icmp.h                                   |    1 
 include/net/inet6_hashtables.h                       |    1 
 include/net/inet_hashtables.h                        |    1 
 include/net/inet_sock.h                              |    1 
 include/net/inet_timewait_sock.h                     |    1 
 include/net/ip.h                                     |    1 
 include/net/ip_fib.h                                 |    1 
 include/net/ip_mp_alg.h                              |    1 
 include/net/ip_vs.h                                  |    1 
 include/net/ipv6.h                                   |    1 
 include/net/irda/irda.h                              |    1 
 include/net/irda/irda_device.h                       |    1 
 include/net/irda/irlap.h                             |    1 
 include/net/irda/irlmp.h                             |    1 
 include/net/irda/irlmp_frame.h                       |    1 
 include/net/irda/qos.h                               |    1 
 include/net/ndisc.h                                  |    1 
 include/net/netfilter/nf_conntrack.h                 |    1 
 include/net/pkt_act.h                                |    1 
 include/net/protocol.h                               |    1 
 include/net/raw.h                                    |    1 
 include/net/red.h                                    |    1 
 include/net/route.h                                  |    1 
 include/net/sch_generic.h                            |    1 
 include/net/sctp/sctp.h                              |    1 
 include/net/sock.h                                   |    1 
 include/net/tcp.h                                    |    1 
 include/pcmcia/ss.h                                  |    1 
 include/scsi/scsi_transport_fc.h                     |    1 
 include/scsi/scsi_transport_spi.h                    |    1 
 include/sound/driver.h                               |    1 
 include/video/edid.h                                 |    1 
 include/video/vga.h                                  |    1 
 866 files changed, 206 insertions(+), 1041 deletions(-)

Index: linux-2.6-header-cleanup-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-cleanup-git.patch,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- linux-2.6-header-cleanup-git.patch	27 Apr 2006 03:52:32 -0000	1.3
+++ linux-2.6-header-cleanup-git.patch	27 Apr 2006 05:43:43 -0000	1.3.2.1
@@ -5814,7 +5814,7 @@
  #include <linux/threads.h>
  #include <linux/gfp.h>
  #include <linux/mm.h>
-diff -u b/include/asm-s390/ptrace.h b/include/asm-s390/ptrace.h
+unchanged:
 --- b/include/asm-s390/ptrace.h
 +++ b/include/asm-s390/ptrace.h
 @@ -181,11 +181,8 @@
@@ -10177,7 +10177,6 @@
  #include <linux/types.h>
  #include <asm/io.h>
  #ifndef CONFIG_AMIGA
-only in patch2:
 unchanged:
 --- a/include/asm-s390/page.h
 +++ b/include/asm-s390/page.h
@@ -10209,3 +10208,22 @@
 +#endif /* __KERNEL__ */
 +
  #endif /* _S390_PAGE_H */
+only in patch2:
+unchanged:
+--- a/include/asm-generic/signal.h
++++ b/include/asm-generic/signal.h
+@@ -1,3 +1,8 @@
++#ifndef __ASM_GENERIC_SIGNAL_H
++#define __ASM_GENERIC_SIGNAL_H
++
++#include <linux/compiler.h>
++
+ #ifndef SIG_BLOCK
+ #define SIG_BLOCK          0	/* for blocking signals */
+ #endif
+@@ -19,3 +24,5 @@ #define SIG_DFL	((__force __sighandler_t
+ #define SIG_IGN	((__force __sighandler_t)1)	/* ignore signal */
+ #define SIG_ERR	((__force __sighandler_t)-1)	/* error return from signal */
+ #endif
++
++#endif /* __ASM_GENERIC_SIGNAL_H */



From fedora-cvs-commits at redhat.com  Thu Apr 27 05:45:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 01:45:23 -0400
Subject: rpms/kernel/devel linux-2.6-header-cleanup-git.patch,1.3,1.4
Message-ID: <200604270545.k3R5jNxC016348@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16315

Modified Files:
	linux-2.6-header-cleanup-git.patch 
Log Message:
fix ia64 build with header patches

linux-2.6-header-cleanup-git.patch:
 b/include/asm-s390/ptrace.h                          |    6 -
 b/include/linux/elf-em.h                             |   44 ++++++++
 include/acpi/platform/aclinux.h                      |    1 
 include/acpi/processor.h                             |    1 
 include/asm-alpha/bitops.h                           |    1 
 include/asm-alpha/cache.h                            |    1 
 include/asm-alpha/cacheflush.h                       |    1 
 include/asm-alpha/core_cia.h                         |    1 
 include/asm-alpha/core_t2.h                          |    1 
 include/asm-alpha/dma-mapping.h                      |    1 
 include/asm-alpha/dma.h                              |    1 
 include/asm-alpha/floppy.h                           |    1 
 include/asm-alpha/hardirq.h                          |    1 
 include/asm-alpha/hw_irq.h                           |    1 
 include/asm-alpha/ide.h                              |    1 
 include/asm-alpha/io.h                               |    1 
 include/asm-alpha/irq.h                              |    1 
 include/asm-alpha/kmap_types.h                       |    1 
 include/asm-alpha/machvec.h                          |    1 
 include/asm-alpha/mmu_context.h                      |    1 
 include/asm-alpha/mmzone.h                           |    1 
 include/asm-alpha/page.h                             |    1 
 include/asm-alpha/param.h                            |    1 
 include/asm-alpha/pgalloc.h                          |    1 
 include/asm-alpha/pgtable.h                          |    1 
 include/asm-alpha/serial.h                           |    1 
 include/asm-alpha/smp.h                              |    1 
 include/asm-alpha/spinlock.h                         |    1 
 include/asm-alpha/system.h                           |    1 
 include/asm-alpha/tlbflush.h                         |    1 
 include/asm-arm/apm.h                                |    1 
 include/asm-arm/arch-aaec2000/memory.h               |    1 
 include/asm-arm/arch-cl7500/acornfb.h                |    1 
 include/asm-arm/arch-clps711x/hardware.h             |    1 
 include/asm-arm/arch-clps711x/memory.h               |    1 
 include/asm-arm/arch-clps711x/uncompress.h           |    1 
 include/asm-arm/arch-ebsa285/hardware.h              |    1 
 include/asm-arm/arch-ebsa285/memory.h                |    1 
 include/asm-arm/arch-ebsa285/vmalloc.h               |    1 
 include/asm-arm/arch-integrator/smp.h                |    1 
 include/asm-arm/arch-iop3xx/memory.h                 |    1 
 include/asm-arm/arch-iop3xx/timex.h                  |    1 
 include/asm-arm/arch-iop3xx/uncompress.h             |    1 
 include/asm-arm/arch-ixp4xx/dma.h                    |    1 
 include/asm-arm/arch-lh7a40x/constants.h             |    1 
 include/asm-arm/arch-lh7a40x/irqs.h                  |    1 
 include/asm-arm/arch-lh7a40x/registers.h             |    1 
 include/asm-arm/arch-omap/board.h                    |    1 
 include/asm-arm/arch-omap/hardware.h                 |    1 
 include/asm-arm/arch-omap/system.h                   |    1 
 include/asm-arm/arch-omap/uncompress.h               |    1 
 include/asm-arm/arch-pxa/idp.h                       |    1 
 include/asm-arm/arch-pxa/irqs.h                      |    1 
 include/asm-arm/arch-pxa/pxa-regs.h                  |    1 
 include/asm-arm/arch-pxa/timex.h                     |    1 
 include/asm-arm/arch-realview/smp.h                  |    1 
 include/asm-arm/arch-s3c2410/dma.h                   |    1 
 include/asm-arm/arch-s3c2410/uncompress.h            |    1 
 include/asm-arm/arch-sa1100/assabet.h                |    1 
 include/asm-arm/arch-sa1100/cerf.h                   |    1 
 include/asm-arm/arch-sa1100/collie.h                 |    1 
 include/asm-arm/arch-sa1100/dma.h                    |    1 
 include/asm-arm/arch-sa1100/hardware.h               |    1 
 include/asm-arm/arch-sa1100/ide.h                    |    1 
 include/asm-arm/arch-sa1100/irqs.h                   |    1 
 include/asm-arm/arch-sa1100/memory.h                 |    1 
 include/asm-arm/arch-sa1100/system.h                 |    1 
 include/asm-arm/atomic.h                             |    1 
 include/asm-arm/bug.h                                |    1 
 include/asm-arm/cacheflush.h                         |    1 
 include/asm-arm/cpu.h                                |    1 
 include/asm-arm/dma-mapping.h                        |    1 
 include/asm-arm/dma.h                                |    1 
 include/asm-arm/elf.h                                |    1 
 include/asm-arm/fpstate.h                            |    1 
 include/asm-arm/glue.h                               |    1 
 include/asm-arm/hardirq.h                            |    1 
 include/asm-arm/hardware/dec21285.h                  |    1 
 include/asm-arm/hardware/iomd.h                      |    1 
 include/asm-arm/leds.h                               |    1 
 include/asm-arm/mach/serial_at91rm9200.h             |    1 
 include/asm-arm/mach/serial_sa1100.h                 |    1 
 include/asm-arm/memory.h                             |    1 
 include/asm-arm/page.h                               |    1 
 include/asm-arm/pci.h                                |    1 
 include/asm-arm/proc-fns.h                           |    1 
 include/asm-arm/ptrace.h                             |    1 
 include/asm-arm/smp.h                                |    1 
 include/asm-arm/system.h                             |    1 
 include/asm-arm/tlbflush.h                           |    1 
 include/asm-arm26/atomic.h                           |    1 
 include/asm-arm26/bug.h                              |    1 
 include/asm-arm26/dma.h                              |    1 
 include/asm-arm26/hardirq.h                          |    1 
 include/asm-arm26/hardware.h                         |    1 
 include/asm-arm26/io.h                               |    1 
 include/asm-arm26/leds.h                             |    1 
 include/asm-arm26/mach-types.h                       |    1 
 include/asm-arm26/page.h                             |    1 
 include/asm-arm26/pgtable.h                          |    1 
 include/asm-arm26/serial.h                           |    1 
 include/asm-arm26/smp.h                              |    1 
 include/asm-arm26/sysirq.h                           |    1 
 include/asm-arm26/system.h                           |    1 
 include/asm-cris/arch-v10/io.h                       |    1 
 include/asm-cris/arch-v10/page.h                     |    1 
 include/asm-cris/arch-v10/system.h                   |    1 
 include/asm-cris/arch-v32/io.h                       |    1 
 include/asm-cris/arch-v32/irq.h                      |    1 
 include/asm-cris/arch-v32/page.h                     |    1 
 include/asm-cris/arch-v32/processor.h                |    1 
 include/asm-cris/arch-v32/system.h                   |    1 
 include/asm-cris/eshlibld.h                          |    1 
 include/asm-cris/etraxgpio.h                         |    1 
 include/asm-cris/fasttimer.h                         |    1 
 include/asm-cris/page.h                              |    1 
 include/asm-cris/pci.h                               |    1 
 include/asm-cris/pgtable.h                           |    1 
 include/asm-cris/processor.h                         |    1 
 include/asm-cris/rtc.h                               |    1 
 include/asm-cris/tlbflush.h                          |    1 
 include/asm-frv/atomic.h                             |    1 
 include/asm-frv/bitops.h                             |    1 
 include/asm-frv/bug.h                                |    1 
 include/asm-frv/cache.h                              |    1 
 include/asm-frv/dma.h                                |    1 
 include/asm-frv/elf.h                                |    1 
 include/asm-frv/fpu.h                                |    1 
 include/asm-frv/hardirq.h                            |    1 
 include/asm-frv/highmem.h                            |    1 
 include/asm-frv/ide.h                                |    1 
 include/asm-frv/io.h                                 |    1 
 include/asm-frv/irq.h                                |    1 
 include/asm-frv/mmu_context.h                        |    1 
 include/asm-frv/page.h                               |    1 
 include/asm-frv/pci.h                                |    1 
 include/asm-frv/pgalloc.h                            |    1 
 include/asm-frv/pgtable.h                            |    1 
 include/asm-frv/processor.h                          |    1 
 include/asm-frv/segment.h                            |    1 
 include/asm-frv/serial.h                             |    1 
 include/asm-frv/smp.h                                |    1 
 include/asm-frv/system.h                             |    1 
 include/asm-frv/tlbflush.h                           |    1 
 include/asm-frv/types.h                              |    1 
 include/asm-frv/unaligned.h                          |    1 
 include/asm-frv/virtconvert.h                        |    1 
 include/asm-generic/bug.h                            |    1 
 include/asm-generic/dma-mapping.h                    |    1 
 include/asm-generic/fcntl.h                          |    1 
 include/asm-generic/local.h                          |    1 
 include/asm-generic/signal.h                         |    7 +
 include/asm-generic/tlb.h                            |    1 
 include/asm-h8300/bitops.h                           |    1 
 include/asm-h8300/dma.h                              |    1 
 include/asm-h8300/elf.h                              |    1 
 include/asm-h8300/hardirq.h                          |    1 
 include/asm-h8300/io.h                               |    1 
 include/asm-h8300/keyboard.h                         |    1 
 include/asm-h8300/mmu_context.h                      |    1 
 include/asm-h8300/page.h                             |    1 
 include/asm-h8300/page_offset.h                      |    1 
 include/asm-h8300/param.h                            |    1 
 include/asm-h8300/pgtable.h                          |    1 
 include/asm-h8300/processor.h                        |    1 
 include/asm-h8300/semaphore-helper.h                 |    1 
 include/asm-h8300/shm.h                              |    1 
 include/asm-h8300/system.h                           |    1 
 include/asm-h8300/unaligned.h                        |    1 
 include/asm-h8300/virtconvert.h                      |    1 
 include/asm-i386/apic.h                              |    1 
 include/asm-i386/atomic.h                            |    1 
 include/asm-i386/bitops.h                            |    1 
 include/asm-i386/bug.h                               |    1 
 include/asm-i386/bugs.h                              |    1 
 include/asm-i386/byteorder.h                         |    1 
 include/asm-i386/cache.h                             |    1 
 include/asm-i386/dma.h                               |    1 
 include/asm-i386/fixmap.h                            |    1 
 include/asm-i386/hardirq.h                           |    1 
 include/asm-i386/highmem.h                           |    1 
 include/asm-i386/hpet.h                              |    1 
 include/asm-i386/hw_irq.h                            |    1 
 include/asm-i386/ide.h                               |    1 
 include/asm-i386/io.h                                |    1 
 include/asm-i386/io_apic.h                           |    1 
 include/asm-i386/irq.h                               |    1 
 include/asm-i386/kmap_types.h                        |    1 
 include/asm-i386/mach-summit/mach_apic.h             |    1 
 include/asm-i386/mmu_context.h                       |    1 
 include/asm-i386/mtrr.h                              |    1 
 include/asm-i386/page.h                              |    1 
 include/asm-i386/param.h                             |    1 
 include/asm-i386/pci.h                               |    1 
 include/asm-i386/pgalloc.h                           |    1 
 include/asm-i386/pgtable.h                           |    1 
 include/asm-i386/processor.h                         |    1 
 include/asm-i386/serial.h                            |    1 
 include/asm-i386/smp.h                               |    1 
 include/asm-i386/spinlock.h                          |    1 
 include/asm-i386/string.h                            |    1 
 include/asm-i386/system.h                            |    1 
 include/asm-i386/thread_info.h                       |    1 
 include/asm-i386/timex.h                             |    1 
 include/asm-i386/tlbflush.h                          |    1 
 include/asm-i386/types.h                             |    1 
 include/asm-i386/uaccess.h                           |    1 
 include/asm-ia64/asmmacro.h                          |    1 
 include/asm-ia64/cache.h                             |    1 
 include/asm-ia64/delay.h                             |    1 
 include/asm-ia64/dma-mapping.h                       |    1 
 include/asm-ia64/dma.h                               |    1 
 include/asm-ia64/elf.h                               |    1 
 include/asm-ia64/hardirq.h                           |    1 
 include/asm-ia64/ia32.h                              |    1 
 include/asm-ia64/ide.h                               |    1 
 include/asm-ia64/intrinsics.h                        |    1 
 include/asm-ia64/kmap_types.h                        |    1 
 include/asm-ia64/machvec.h                           |    1 
 include/asm-ia64/meminit.h                           |    1 
 include/asm-ia64/nodedata.h                          |    1 
 include/asm-ia64/numa.h                              |    1 
 include/asm-ia64/page.h                              |    1 
 include/asm-ia64/param.h                             |    1 
 include/asm-ia64/percpu.h                            |    1 
 include/asm-ia64/pgalloc.h                           |    1 
 include/asm-ia64/pgtable.h                           |    1 
 include/asm-ia64/processor.h                         |    1 
 include/asm-ia64/ptrace.h                            |    1 
 include/asm-ia64/smp.h                               |    1 
 include/asm-ia64/sn/simulator.h                      |    1 
 include/asm-ia64/sn/sn_cpuid.h                       |    1 
 include/asm-ia64/sn/sn_sal.h                         |    1 
 include/asm-ia64/sn/xpc.h                            |    1 
 include/asm-ia64/string.h                            |    1 
 include/asm-ia64/system.h                            |    1 
 include/asm-ia64/tlb.h                               |    1 
 include/asm-ia64/tlbflush.h                          |    1 
 include/asm-ia64/unistd.h                            |    1 
 include/asm-m32r/assembler.h                         |    1 
 include/asm-m32r/atomic.h                            |    1 
 include/asm-m32r/bitops.h                            |    1 
 include/asm-m32r/cacheflush.h                        |    1 
 include/asm-m32r/hardirq.h                           |    1 
 include/asm-m32r/ide.h                               |    1 
 include/asm-m32r/irq.h                               |    1 
 include/asm-m32r/kmap_types.h                        |    1 
 include/asm-m32r/m32104ut/m32104ut_pld.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lan.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lcd.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_pld.h             |    1 
 include/asm-m32r/m32r.h                              |    1 
 include/asm-m32r/mmu.h                               |    1 
 include/asm-m32r/mmu_context.h                       |    2 
 include/asm-m32r/opsput/opsput_lan.h                 |    1 
 include/asm-m32r/opsput/opsput_lcd.h                 |    1 
 include/asm-m32r/opsput/opsput_pld.h                 |    1 
 include/asm-m32r/page.h                              |    1 
 include/asm-m32r/pgalloc.h                           |    1 
 include/asm-m32r/pgtable-2level.h                    |    1 
 include/asm-m32r/pgtable.h                           |    1 
 include/asm-m32r/processor.h                         |    1 
 include/asm-m32r/ptrace.h                            |    1 
 include/asm-m32r/rtc.h                               |    1 
 include/asm-m32r/semaphore.h                         |    1 
 include/asm-m32r/serial.h                            |    1 
 include/asm-m32r/sigcontext.h                        |    1 
 include/asm-m32r/smp.h                               |    1 
 include/asm-m32r/spinlock.h                          |    1 
 include/asm-m32r/system.h                            |    1 
 include/asm-m32r/timex.h                             |    1 
 include/asm-m32r/tlbflush.h                          |    1 
 include/asm-m32r/uaccess.h                           |    1 
 include/asm-m68k/atomic.h                            |    1 
 include/asm-m68k/bug.h                               |    1 
 include/asm-m68k/dma-mapping.h                       |    1 
 include/asm-m68k/dma.h                               |    1 
 include/asm-m68k/dvma.h                              |    1 
 include/asm-m68k/elf.h                               |    1 
 include/asm-m68k/entry.h                             |    1 
 include/asm-m68k/fpu.h                               |    1 
 include/asm-m68k/hardirq.h                           |    1 
 include/asm-m68k/ide.h                               |    1 
 include/asm-m68k/io.h                                |    1 
 include/asm-m68k/irq.h                               |    1 
 include/asm-m68k/mc146818rtc.h                       |    1 
 include/asm-m68k/mmu_context.h                       |    1 
 include/asm-m68k/motorola_pgtable.h                  |    1 
 include/asm-m68k/openprom.h                          |    1 
 include/asm-m68k/page.h                              |    1 
 include/asm-m68k/page_offset.h                       |    1 
 include/asm-m68k/pgalloc.h                           |    1 
 include/asm-m68k/pgtable.h                           |    1 
 include/asm-m68k/processor.h                         |    1 
 include/asm-m68k/semaphore-helper.h                  |    1 
 include/asm-m68k/serial.h                            |    1 
 include/asm-m68k/setup.h                             |    1 
 include/asm-m68k/shm.h                               |    1 
 include/asm-m68k/system.h                            |    1 
 include/asm-m68k/tlbflush.h                          |    1 
 include/asm-m68k/virtconvert.h                       |    1 
 include/asm-m68knommu/bitops.h                       |    1 
 include/asm-m68knommu/coldfire.h                     |    1 
 include/asm-m68knommu/commproc.h                     |    1 
 include/asm-m68knommu/dma-mapping.h                  |    1 
 include/asm-m68knommu/dma.h                          |    1 
 include/asm-m68knommu/elf.h                          |    1 
 include/asm-m68knommu/elia.h                         |    1 
 include/asm-m68knommu/entry.h                        |    1 
 include/asm-m68knommu/fpu.h                          |    1 
 include/asm-m68knommu/hardirq.h                      |    1 
 include/asm-m68knommu/io.h                           |    1 
 include/asm-m68knommu/irq.h                          |    1 
 include/asm-m68knommu/m5206sim.h                     |    1 
 include/asm-m68knommu/m520xsim.h                     |    1 
 include/asm-m68knommu/m523xsim.h                     |    1 
 include/asm-m68knommu/m5272sim.h                     |    1 
 include/asm-m68knommu/m527xsim.h                     |    1 
 include/asm-m68knommu/m528xsim.h                     |    1 
 include/asm-m68knommu/mcfcache.h                     |    1 
 include/asm-m68knommu/mcfdma.h                       |    1 
 include/asm-m68knommu/mcfmbus.h                      |    1 
 include/asm-m68knommu/mcfne.h                        |    1 
 include/asm-m68knommu/mcfpci.h                       |    1 
 include/asm-m68knommu/mcfpit.h                       |    1 
 include/asm-m68knommu/mcfsim.h                       |    1 
 include/asm-m68knommu/mcfsmc.h                       |    1 
 include/asm-m68knommu/mcftimer.h                     |    1 
 include/asm-m68knommu/mcfuart.h                      |    1 
 include/asm-m68knommu/mcfwdebug.h                    |    1 
 include/asm-m68knommu/mmu_context.h                  |    1 
 include/asm-m68knommu/nettel.h                       |    1 
 include/asm-m68knommu/page.h                         |    1 
 include/asm-m68knommu/page_offset.h                  |    1 
 include/asm-m68knommu/param.h                        |    1 
 include/asm-m68knommu/pgtable.h                      |    1 
 include/asm-m68knommu/processor.h                    |    1 
 include/asm-m68knommu/semaphore-helper.h             |    1 
 include/asm-m68knommu/system.h                       |    1 
 include/asm-m68knommu/unaligned.h                    |    1 
 include/asm-mips/a.out.h                             |    1 
 include/asm-mips/addrspace.h                         |    1 
 include/asm-mips/arc/types.h                         |    1 
 include/asm-mips/asm.h                               |    1 
 include/asm-mips/asmmacro.h                          |    1 
 include/asm-mips/atomic.h                            |    1 
 include/asm-mips/bcache.h                            |    1 
 include/asm-mips/bitops.h                            |    1 
 include/asm-mips/bug.h                               |    1 
 include/asm-mips/bugs.h                              |    1 
 include/asm-mips/byteorder.h                         |    1 
 include/asm-mips/cache.h                             |    1 
 include/asm-mips/checksum.h                          |    1 
 include/asm-mips/cpu-features.h                      |    1 
 include/asm-mips/cpu-info.h                          |    1 
 include/asm-mips/ddb5xxx/ddb5477.h                   |    1 
 include/asm-mips/ddb5xxx/ddb5xxx.h                   |    1 
 include/asm-mips/debug.h                             |    1 
 include/asm-mips/dec/prom.h                          |    1 
 include/asm-mips/delay.h                             |    1 
 include/asm-mips/dma.h                               |    1 
 include/asm-mips/elf.h                               |    1 
 include/asm-mips/fcntl.h                             |    1 
 include/asm-mips/fixmap.h                            |    1 
 include/asm-mips/fpu.h                               |    1 
 include/asm-mips/futex.h                             |    1 
 include/asm-mips/hazards.h                           |    1 
 include/asm-mips/highmem.h                           |    1 
 include/asm-mips/interrupt.h                         |    1 
 include/asm-mips/io.h                                |    1 
 include/asm-mips/ip32/machine.h                      |    1 
 include/asm-mips/irq.h                               |    1 
 include/asm-mips/isadep.h                            |    1 
 include/asm-mips/jmr3927/irq.h                       |    1 
 include/asm-mips/kmap_types.h                        |    1 
 include/asm-mips/local.h                             |    1 
 include/asm-mips/mach-au1x00/au1000.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx_dbdma.h          |    1 
 include/asm-mips/mach-au1x00/au1xxx_ide.h            |    1 
 include/asm-mips/mach-au1x00/au1xxx_psc.h            |    1 
 include/asm-mips/mach-au1x00/ioremap.h               |    1 
 include/asm-mips/mach-cobalt/cpu-feature-overrides.h |    1 
 include/asm-mips/mach-db1x00/db1x00.h                |    1 
 include/asm-mips/mach-generic/ide.h                  |    1 
 include/asm-mips/mach-generic/kmalloc.h              |    1 
 include/asm-mips/mach-generic/spaces.h               |    1 
 include/asm-mips/mach-ip22/spaces.h                  |    1 
 include/asm-mips/mach-ip32/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-ip32/kmalloc.h                 |    1 
 include/asm-mips/mach-mips/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-mips/irq.h                     |    1 
 include/asm-mips/mach-pb1x00/pb1550.h                |    1 
 include/asm-mips/mach-sim/cpu-feature-overrides.h    |    1 
 include/asm-mips/mips-boards/generic.h               |    1 
 include/asm-mips/mipsregs.h                          |    1 
 include/asm-mips/mmu_context.h                       |    1 
 include/asm-mips/mmzone.h                            |    1 
 include/asm-mips/module.h                            |    1 
 include/asm-mips/msgbuf.h                            |    1 
 include/asm-mips/paccess.h                           |    1 
 include/asm-mips/page.h                              |    1 
 include/asm-mips/pci.h                               |    1 
 include/asm-mips/pgalloc.h                           |    1 
 include/asm-mips/pgtable-32.h                        |    1 
 include/asm-mips/pgtable-64.h                        |    1 
 include/asm-mips/pgtable-bits.h                      |    1 
 include/asm-mips/pgtable.h                           |    1 
 include/asm-mips/prefetch.h                          |    1 
 include/asm-mips/processor.h                         |    1 
 include/asm-mips/ptrace.h                            |    1 
 include/asm-mips/reg.h                               |    1 
 include/asm-mips/resource.h                          |    1 
 include/asm-mips/serial.h                            |    1 
 include/asm-mips/sgiarcs.h                           |    1 
 include/asm-mips/sibyte/board.h                      |    1 
 include/asm-mips/sibyte/carmel.h                     |    1 
 include/asm-mips/sibyte/sentosa.h                    |    1 
 include/asm-mips/sibyte/swarm.h                      |    1 
 include/asm-mips/siginfo.h                           |    1 
 include/asm-mips/signal.h                            |    1 
 include/asm-mips/sim.h                               |    1 
 include/asm-mips/smp.h                               |    1 
 include/asm-mips/sn/addrs.h                          |    1 
 include/asm-mips/sn/agent.h                          |    1 
 include/asm-mips/sn/arch.h                           |    1 
 include/asm-mips/sn/io.h                             |    1 
 include/asm-mips/sn/klconfig.h                       |    1 
 include/asm-mips/sn/kldir.h                          |    1 
 include/asm-mips/sn/launch.h                         |    1 
 include/asm-mips/sn/mapped_kernel.h                  |    1 
 include/asm-mips/sn/sn0/addrs.h                      |    1 
 include/asm-mips/sn/sn0/arch.h                       |    1 
 include/asm-mips/sn/sn0/hubmd.h                      |    1 
 include/asm-mips/stackframe.h                        |    1 
 include/asm-mips/string.h                            |    1 
 include/asm-mips/system.h                            |    1 
 include/asm-mips/thread_info.h                       |    1 
 include/asm-mips/tlbflush.h                          |    1 
 include/asm-mips/tx4927/toshiba_rbtx4927.h           |    1 
 include/asm-mips/types.h                             |    1 
 include/asm-mips/uaccess.h                           |    1 
 include/asm-mips/unistd.h                            |    1 
 include/asm-mips/vr41xx/vrc4173.h                    |    1 
 include/asm-mips/war.h                               |    1 
 include/asm-mips/wbflush.h                           |    1 
 include/asm-parisc/atomic.h                          |    1 
 include/asm-parisc/cache.h                           |    1 
 include/asm-parisc/cacheflush.h                      |    1 
 include/asm-parisc/dma-mapping.h                     |    1 
 include/asm-parisc/dma.h                             |    1 
 include/asm-parisc/io.h                              |    1 
 include/asm-parisc/irq.h                             |    1 
 include/asm-parisc/kmap_types.h                      |    1 
 include/asm-parisc/page.h                            |    1 
 include/asm-parisc/param.h                           |    1 
 include/asm-parisc/pci.h                             |    1 
 include/asm-parisc/pdc.h                             |    1 
 include/asm-parisc/pgtable.h                         |    1 
 include/asm-parisc/processor.h                       |    1 
 include/asm-parisc/psw.h                             |    1 
 include/asm-parisc/smp.h                             |    1 
 include/asm-parisc/system.h                          |    1 
 include/asm-parisc/tlbflush.h                        |    1 
 include/asm-powerpc/abs_addr.h                       |    1 
 include/asm-powerpc/cache.h                          |    1 
 include/asm-powerpc/dma-mapping.h                    |    1 
 include/asm-powerpc/dma.h                            |    1 
 include/asm-powerpc/eeh.h                            |    1 
 include/asm-powerpc/elf.h                            |    7 -
 include/asm-powerpc/floppy.h                         |    1 
 include/asm-powerpc/hw_irq.h                         |    1 
 include/asm-powerpc/ide.h                            |    1 
 include/asm-powerpc/iommu.h                          |    1 
 include/asm-powerpc/irq.h                            |    1 
 include/asm-powerpc/iseries/iseries_io.h             |    1 
 include/asm-powerpc/machdep.h                        |    1 
 include/asm-powerpc/mmzone.h                         |    1 
 include/asm-powerpc/paca.h                           |    1 
 include/asm-powerpc/page.h                           |    1 
 include/asm-powerpc/pgtable.h                        |    1 
 include/asm-powerpc/ppc_asm.h                        |    1 
 include/asm-powerpc/prom.h                           |    1 
 include/asm-powerpc/smp.h                            |    1 
 include/asm-powerpc/smu.h                            |    1 
 include/asm-powerpc/spu.h                            |    1 
 include/asm-powerpc/thread_info.h                    |    1 
 include/asm-powerpc/time.h                           |    1 
 include/asm-powerpc/timex.h                          |    1 
 include/asm-powerpc/tlb.h                            |    1 
 include/asm-powerpc/tlbflush.h                       |    1 
 include/asm-powerpc/topology.h                       |    1 
 include/asm-powerpc/types.h                          |    1 
 include/asm-powerpc/unistd.h                         |    1 
 include/asm-powerpc/vga.h                            |    1 
 include/asm-powerpc/vio.h                            |    1 
 include/asm-ppc/amigahw.h                            |    1 
 include/asm-ppc/bootinfo.h                           |    1 
 include/asm-ppc/commproc.h                           |    1 
 include/asm-ppc/ibm403.h                             |    1 
 include/asm-ppc/ibm44x.h                             |    1 
 include/asm-ppc/ibm4xx.h                             |    1 
 include/asm-ppc/io.h                                 |    1 
 include/asm-ppc/machdep.h                            |    1 
 include/asm-ppc/mmu.h                                |    1 
 include/asm-ppc/mmu_context.h                        |    1 
 include/asm-ppc/mpc8260.h                            |    1 
 include/asm-ppc/mpc83xx.h                            |    1 
 include/asm-ppc/mpc85xx.h                            |    1 
 include/asm-ppc/mpc8xx.h                             |    1 
 include/asm-ppc/mv64x60.h                            |    1 
 include/asm-ppc/ocp.h                                |    1 
 include/asm-ppc/open_pic.h                           |    1 
 include/asm-ppc/page.h                               |    2 
 include/asm-ppc/pc_serial.h                          |    1 
 include/asm-ppc/pgalloc.h                            |    1 
 include/asm-ppc/pgtable.h                            |    1 
 include/asm-ppc/ppc4xx_dma.h                         |    1 
 include/asm-ppc/ppc4xx_pic.h                         |    1 
 include/asm-ppc/serial.h                             |    1 
 include/asm-ppc/smp.h                                |    1 
 include/asm-ppc/time.h                               |    1 
 include/asm-s390/bitops.h                            |    1 
 include/asm-s390/debug.h                             |    1 
 include/asm-s390/hardirq.h                           |    1 
 include/asm-s390/idals.h                             |    1 
 include/asm-s390/local.h                             |    1 
 include/asm-s390/lowcore.h                           |    1 
 include/asm-s390/page.h                              |    6 -
 include/asm-s390/pgalloc.h                           |    1 
 include/asm-s390/sfp-machine.h                       |    1 
 include/asm-s390/smp.h                               |    1 
 include/asm-s390/system.h                            |    1 
 include/asm-s390/tlbflush.h                          |    1 
 include/asm-s390/types.h                             |    1 
 include/asm-s390/unistd.h                            |    1 
 include/asm-sh/bug.h                                 |    1 
 include/asm-sh/checksum.h                            |    1 
 include/asm-sh/dma-mapping.h                         |    1 
 include/asm-sh/dma.h                                 |    1 
 include/asm-sh/fixmap.h                              |    1 
 include/asm-sh/hardirq.h                             |    1 
 include/asm-sh/hd64461/hd64461.h                     |    1 
 include/asm-sh/hd64465/hd64465.h                     |    1 
 include/asm-sh/ide.h                                 |    1 
 include/asm-sh/io.h                                  |    1 
 include/asm-sh/irq.h                                 |    1 
 include/asm-sh/keyboard.h                            |    1 
 include/asm-sh/kmap_types.h                          |    1 
 include/asm-sh/machvec.h                             |    1 
 include/asm-sh/machvec_init.h                        |    1 
 include/asm-sh/mpc1211/dma.h                         |    1 
 include/asm-sh/overdrive/overdrive.h                 |    1 
 include/asm-sh/page.h                                |    1 
 include/asm-sh/pgtable.h                             |    1 
 include/asm-sh/serial.h                              |    1 
 include/asm-sh/smp.h                                 |    1 
 include/asm-sh/system.h                              |    1 
 include/asm-sh/types.h                               |    1 
 include/asm-sh/watchdog.h                            |    1 
 include/asm-sh64/bug.h                               |    1 
 include/asm-sh64/dma-mapping.h                       |    1 
 include/asm-sh64/hardirq.h                           |    1 
 include/asm-sh64/ide.h                               |    1 
 include/asm-sh64/irq.h                               |    1 
 include/asm-sh64/mmu_context.h                       |    1 
 include/asm-sh64/page.h                              |    1 
 include/asm-sh64/param.h                             |    1 
 include/asm-sh64/pgtable.h                           |    1 
 include/asm-sh64/system.h                            |    1 
 include/asm-sparc/asmmacro.h                         |    1 
 include/asm-sparc/atomic.h                           |    1 
 include/asm-sparc/bugs.h                             |    1 
 include/asm-sparc/cacheflush.h                       |    1 
 include/asm-sparc/delay.h                            |    1 
 include/asm-sparc/dma-mapping.h                      |    1 
 include/asm-sparc/dma.h                              |    1 
 include/asm-sparc/elf.h                              |    1 
 include/asm-sparc/fixmap.h                           |    1 
 include/asm-sparc/hardirq.h                          |    1 
 include/asm-sparc/ide.h                              |    1 
 include/asm-sparc/irq.h                              |    1 
 include/asm-sparc/mostek.h                           |    1 
 include/asm-sparc/page.h                             |    1 
 include/asm-sparc/pgalloc.h                          |    1 
 include/asm-sparc/pgtable.h                          |    1 
 include/asm-sparc/sfp-machine.h                      |    1 
 include/asm-sparc/smp.h                              |    1 
 include/asm-sparc/system.h                           |    2 
 include/asm-sparc/timer.h                            |    1 
 include/asm-sparc/tlbflush.h                         |    1 
 include/asm-sparc/vac-ops.h                          |    1 
 include/asm-sparc/winmacro.h                         |    1 
 include/asm-sparc64/atomic.h                         |    1 
 include/asm-sparc64/bitops.h                         |    1 
 include/asm-sparc64/bugs.h                           |    1 
 include/asm-sparc64/cacheflush.h                     |    1 
 include/asm-sparc64/delay.h                          |    1 
 include/asm-sparc64/dma-mapping.h                    |    1 
 include/asm-sparc64/dma.h                            |    1 
 include/asm-sparc64/floppy.h                         |    1 
 include/asm-sparc64/ide.h                            |    1 
 include/asm-sparc64/irq.h                            |    1 
 include/asm-sparc64/kprobes.h                        |    1 
 include/asm-sparc64/mc146818rtc.h                    |    1 
 include/asm-sparc64/mmu.h                            |    1 
 include/asm-sparc64/oplib.h                          |    1 
 include/asm-sparc64/page.h                           |    1 
 include/asm-sparc64/param.h                          |    1 
 include/asm-sparc64/pgalloc.h                        |    1 
 include/asm-sparc64/pgtable.h                        |    1 
 include/asm-sparc64/processor.h                      |    1 
 include/asm-sparc64/siginfo.h                        |    1 
 include/asm-sparc64/signal.h                         |    1 
 include/asm-sparc64/smp.h                            |    1 
 include/asm-sparc64/spinlock.h                       |    1 
 include/asm-sparc64/system.h                         |    1 
 include/asm-sparc64/timer.h                          |    1 
 include/asm-sparc64/tlb.h                            |    1 
 include/asm-sparc64/tlbflush.h                       |    1 
 include/asm-sparc64/ttable.h                         |    1 
 include/asm-um/a.out.h                               |    1 
 include/asm-um/cache.h                               |    1 
 include/asm-um/elf-ppc.h                             |    1 
 include/asm-um/fixmap.h                              |    1 
 include/asm-um/hardirq.h                             |    1 
 include/asm-um/linkage.h                             |    1 
 include/asm-um/mmu_context.h                         |    1 
 include/asm-um/page.h                                |    1 
 include/asm-um/pgalloc.h                             |    1 
 include/asm-um/processor-generic.h                   |    1 
 include/asm-um/ptrace-generic.h                      |    1 
 include/asm-um/smp.h                                 |    1 
 include/asm-um/thread_info.h                         |    1 
 include/asm-v850/atomic.h                            |    1 
 include/asm-v850/bitops.h                            |    1 
 include/asm-v850/dma-mapping.h                       |    1 
 include/asm-v850/hardirq.h                           |    1 
 include/asm-v850/machdep.h                           |    1 
 include/asm-v850/pgtable.h                           |    1 
 include/asm-v850/processor.h                         |    1 
 include/asm-v850/serial.h                            |    1 
 include/asm-v850/v850e_uart.h                        |    1 
 include/asm-x86_64/apic.h                            |    1 
 include/asm-x86_64/atomic.h                          |    1 
 include/asm-x86_64/bitops.h                          |    1 
 include/asm-x86_64/bugs.h                            |    1 
 include/asm-x86_64/cache.h                           |    1 
 include/asm-x86_64/calling.h                         |    1 
 include/asm-x86_64/dma-mapping.h                     |    1 
 include/asm-x86_64/dma.h                             |    1 
 include/asm-x86_64/dwarf2.h                          |    1 
 include/asm-x86_64/fixmap.h                          |    1 
 include/asm-x86_64/hardirq.h                         |    1 
 include/asm-x86_64/hw_irq.h                          |    1 
 include/asm-x86_64/ia32.h                            |    1 
 include/asm-x86_64/io.h                              |    1 
 include/asm-x86_64/io_apic.h                         |    1 
 include/asm-x86_64/mmu_context.h                     |    1 
 include/asm-x86_64/mmzone.h                          |    1 
 include/asm-x86_64/mtrr.h                            |    1 
 include/asm-x86_64/page.h                            |    1 
 include/asm-x86_64/param.h                           |    1 
 include/asm-x86_64/pci.h                             |    1 
 include/asm-x86_64/processor.h                       |    1 
 include/asm-x86_64/serial.h                          |    1 
 include/asm-x86_64/smp.h                             |    1 
 include/asm-x86_64/spinlock.h                        |    1 
 include/asm-x86_64/swiotlb.h                         |    1 
 include/asm-x86_64/system.h                          |    1 
 include/asm-x86_64/tlbflush.h                        |    1 
 include/asm-x86_64/topology.h                        |    1 
 include/asm-x86_64/uaccess.h                         |    1 
 include/asm-xtensa/atomic.h                          |    1 
 include/asm-xtensa/checksum.h                        |    1 
 include/asm-xtensa/delay.h                           |    1 
 include/asm-xtensa/dma.h                             |    1 
 include/asm-xtensa/hardirq.h                         |    1 
 include/asm-xtensa/ide.h                             |    1 
 include/asm-xtensa/io.h                              |    1 
 include/asm-xtensa/irq.h                             |    1 
 include/asm-xtensa/mmu_context.h                     |    1 
 include/asm-xtensa/page.h                            |    1 
 include/asm-xtensa/pgalloc.h                         |    1 
 include/asm-xtensa/platform.h                        |    1 
 include/asm-xtensa/system.h                          |    1 
 include/linux/acct.h                                 |    3 
 include/linux/acpi.h                                 |    1 
 include/linux/agpgart.h                              |    3 
 include/linux/amba/clcd.h                            |    1 
 include/linux/atmdev.h                               |    1 
 include/linux/audit.h                                |    4 
 include/linux/blkdev.h                               |    1 
 include/linux/blktrace_api.h                         |    1 
 include/linux/blockgroup_lock.h                      |    1 
 include/linux/cache.h                                |    1 
 include/linux/coda.h                                 |    1 
 include/linux/compat.h                               |    1 
 include/linux/cpufreq.h                              |    1 
 include/linux/crypto.h                               |    1 
 include/linux/cyclomx.h                              |    1 
 include/linux/dcookies.h                             |    1 
 include/linux/devfs_fs_kernel.h                      |    1 
 include/linux/device.h                               |    1 
 include/linux/dmi.h                                  |    1 
 include/linux/dnotify.h                              |    1 
 include/linux/elf.h                                  |   59 -----------
 include/linux/errqueue.h                             |    1 
 include/linux/ext2_fs.h                              |    2 
 include/linux/ext3_fs.h                              |    7 -
 include/linux/fs.h                                   |    1 
 include/linux/ftape.h                                |    1 
 include/linux/gameport.h                             |    6 +
 include/linux/generic_serial.h                       |    6 -
 include/linux/genhd.h                                |   12 +-
 include/linux/gfp.h                                  |    1 
 include/linux/hardirq.h                              |    1 
 include/linux/highmem.h                              |    1 
 include/linux/highuid.h                              |    1 
 include/linux/i2c-algo-ite.h                         |    7 +
 include/linux/i2c.h                                  |    9 +
 include/linux/ide.h                                  |    1 
 include/linux/if_frad.h                              |    1 
 include/linux/if_tr.h                                |    1 
 include/linux/init.h                                 |    1 
 include/linux/inotify.h                              |    1 
 include/linux/interrupt.h                            |    1 
 include/linux/ipmi.h                                 |    2 
 include/linux/ipv6.h                                 |    1 
 include/linux/irq.h                                  |    1 
 include/linux/irq_cpustat.h                          |    1 
 include/linux/isapnp.h                               |    1 
 include/linux/isdn.h                                 |    1 
 include/linux/isdn/tpam.h                            |    1 
 include/linux/isdn_ppp.h                             |    1 
 include/linux/isdnif.h                               |    1 
 include/linux/kallsyms.h                             |    1 
 include/linux/kernel_stat.h                          |    1 
 include/linux/kmod.h                                 |    1 
 include/linux/kprobes.h                              |    1 
 include/linux/linkage.h                              |    1 
 include/linux/lockd/lockd.h                          |    1 
 include/linux/lockd/nlm.h                            |    1 
 include/linux/mempolicy.h                            |    1 
 include/linux/migrate.h                              |    1 
 include/linux/mm.h                                   |    1 
 include/linux/mman.h                                 |   12 +-
 include/linux/mmzone.h                               |    1 
 include/linux/module.h                               |    1 
 include/linux/msg.h                                  |    2 
 include/linux/mtd/cfi.h                              |    1 
 include/linux/mtd/map.h                              |    1 
 include/linux/mtd/mtd.h                              |    1 
 include/linux/mtd/nand.h                             |    1 
 include/linux/mtd/physmap.h                          |    1 
 include/linux/mtd/xip.h                              |    1 
 include/linux/ncp_fs.h                               |    5 -
 include/linux/net.h                                  |    3 
 include/linux/netdevice.h                            |    1 
 include/linux/netfilter.h                            |    1 
 include/linux/netfilter_arp.h                        |    1 
 include/linux/netfilter_bridge.h                     |    1 
 include/linux/netfilter_ipv4.h                       |    1 
 include/linux/netfilter_ipv4/ip_conntrack.h          |    1 
 include/linux/netfilter_ipv4/listhelp.h              |    1 
 include/linux/nfs.h                                  |    8 -
 include/linux/nfs4.h                                 |    6 -
 include/linux/nfs_fs.h                               |   39 +++----
 include/linux/nfsd/nfsd.h                            |    1 
 include/linux/nfsd/nfsfh.h                           |    1 
 include/linux/nfsd/syscall.h                         |    1 
 include/linux/numa.h                                 |    1 
 include/linux/parport.h                              |    1 
 include/linux/pci.h                                  |    1 
 include/linux/percpu_counter.h                       |    1 
 include/linux/pm.h                                   |    1 
 include/linux/pm_legacy.h                            |    1 
 include/linux/pmu.h                                  |    1 
 include/linux/preempt.h                              |    1 
 include/linux/proc_fs.h                              |    1 
 include/linux/profile.h                              |    1 
 include/linux/quota.h                                |    4 
 include/linux/quotaops.h                             |    1 
 include/linux/reiserfs_xattr.h                       |    3 
 include/linux/relay.h                                |    1 
 include/linux/rio.h                                  |    1 
 include/linux/rio_drv.h                              |    1 
 include/linux/rmap.h                                 |    1 
 include/linux/rtnetlink.h                            |    1 
 include/linux/rwsem.h                                |    1 
 include/linux/scc.h                                  |    1 
 include/linux/sched.h                                |   94 +++++++++----------
 include/linux/seccomp.h                              |    1 
 include/linux/sem.h                                  |    2 
 include/linux/seqlock.h                              |    1 
 include/linux/serialP.h                              |    1 
 include/linux/serial_core.h                          |    1 
 include/linux/signal.h                               |    4 
 include/linux/skbuff.h                               |    1 
 include/linux/slab.h                                 |    1 
 include/linux/smb_fs.h                               |    4 
 include/linux/smp.h                                  |    1 
 include/linux/smp_lock.h                             |    1 
 include/linux/socket.h                               |    2 
 include/linux/spinlock.h                             |    1 
 include/linux/stop_machine.h                         |    1 
 include/linux/sunrpc/auth.h                          |    1 
 include/linux/sunrpc/debug.h                         |   24 ++--
 include/linux/sunrpc/stats.h                         |    1 
 include/linux/suspend.h                              |    1 
 include/linux/swap.h                                 |    1 
 include/linux/syscalls.h                             |    1 
 include/linux/sysrq.h                                |    1 
 include/linux/tcp.h                                  |    1 
 include/linux/threads.h                              |    1 
 include/linux/timer.h                                |    1 
 include/linux/timex.h                                |    1 
 include/linux/tty.h                                  |    1 
 include/linux/types.h                                |    1 
 include/linux/udp.h                                  |    1 
 include/linux/usb.h                                  |    1 
 include/linux/usb_usual.h                            |    1 
 include/linux/usbdevice_fs.h                         |    2 
 include/linux/vt_buffer.h                            |    1 
 include/linux/vt_kern.h                              |    1 
 include/linux/wait.h                                 |    1 
 include/linux/wanrouter.h                            |    4 
 include/mtd/mtd-abi.h                                |    5 -
 include/net/addrconf.h                               |    1 
 include/net/af_unix.h                                |    1 
 include/net/ax25.h                                   |    1 
 include/net/compat.h                                 |    1 
 include/net/dst.h                                    |    1 
 include/net/icmp.h                                   |    1 
 include/net/inet6_hashtables.h                       |    1 
 include/net/inet_hashtables.h                        |    1 
 include/net/inet_sock.h                              |    1 
 include/net/inet_timewait_sock.h                     |    1 
 include/net/ip.h                                     |    1 
 include/net/ip_fib.h                                 |    1 
 include/net/ip_mp_alg.h                              |    1 
 include/net/ip_vs.h                                  |    1 
 include/net/ipv6.h                                   |    1 
 include/net/irda/irda.h                              |    1 
 include/net/irda/irda_device.h                       |    1 
 include/net/irda/irlap.h                             |    1 
 include/net/irda/irlmp.h                             |    1 
 include/net/irda/irlmp_frame.h                       |    1 
 include/net/irda/qos.h                               |    1 
 include/net/ndisc.h                                  |    1 
 include/net/netfilter/nf_conntrack.h                 |    1 
 include/net/pkt_act.h                                |    1 
 include/net/protocol.h                               |    1 
 include/net/raw.h                                    |    1 
 include/net/red.h                                    |    1 
 include/net/route.h                                  |    1 
 include/net/sch_generic.h                            |    1 
 include/net/sctp/sctp.h                              |    1 
 include/net/sock.h                                   |    1 
 include/net/tcp.h                                    |    1 
 include/pcmcia/ss.h                                  |    1 
 include/scsi/scsi_transport_fc.h                     |    1 
 include/scsi/scsi_transport_spi.h                    |    1 
 include/sound/driver.h                               |    1 
 include/video/edid.h                                 |    1 
 include/video/vga.h                                  |    1 
 866 files changed, 206 insertions(+), 1041 deletions(-)

Index: linux-2.6-header-cleanup-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-cleanup-git.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-header-cleanup-git.patch	27 Apr 2006 03:52:32 -0000	1.3
+++ linux-2.6-header-cleanup-git.patch	27 Apr 2006 05:45:21 -0000	1.4
@@ -5814,7 +5814,7 @@
  #include <linux/threads.h>
  #include <linux/gfp.h>
  #include <linux/mm.h>
-diff -u b/include/asm-s390/ptrace.h b/include/asm-s390/ptrace.h
+unchanged:
 --- b/include/asm-s390/ptrace.h
 +++ b/include/asm-s390/ptrace.h
 @@ -181,11 +181,8 @@
@@ -10177,7 +10177,6 @@
  #include <linux/types.h>
  #include <asm/io.h>
  #ifndef CONFIG_AMIGA
-only in patch2:
 unchanged:
 --- a/include/asm-s390/page.h
 +++ b/include/asm-s390/page.h
@@ -10209,3 +10208,22 @@
 +#endif /* __KERNEL__ */
 +
  #endif /* _S390_PAGE_H */
+only in patch2:
+unchanged:
+--- a/include/asm-generic/signal.h
++++ b/include/asm-generic/signal.h
+@@ -1,3 +1,8 @@
++#ifndef __ASM_GENERIC_SIGNAL_H
++#define __ASM_GENERIC_SIGNAL_H
++
++#include <linux/compiler.h>
++
+ #ifndef SIG_BLOCK
+ #define SIG_BLOCK          0	/* for blocking signals */
+ #endif
+@@ -19,3 +24,5 @@ #define SIG_DFL	((__force __sighandler_t
+ #define SIG_IGN	((__force __sighandler_t)1)	/* ignore signal */
+ #define SIG_ERR	((__force __sighandler_t)-1)	/* error return from signal */
+ #endif
++
++#endif /* __ASM_GENERIC_SIGNAL_H */



From fedora-cvs-commits at redhat.com  Thu Apr 27 06:27:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 02:27:45 -0400
Subject: rpms/ruby/devel ruby.spec,1.59,1.60
Message-ID: <200604270627.k3R6Rjrf020247@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20213

Modified Files:
	ruby.spec 
Log Message:



Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ruby.spec	20 Apr 2006 09:52:09 -0000	1.59
+++ ruby.spec	27 Apr 2006 06:27:40 -0000	1.60
@@ -5,7 +5,7 @@
 
 Name:		ruby
 Version:	1.8.4
-Release:	4.fc6.2
+Release:	5.fc6
 License:	Ruby License/GPL - see COPYING
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -438,7 +438,7 @@
 %dir %{_datadir}/emacs/site-lisp/ruby-mode
 
 %changelog
-* Thu Apr 20 2006 Akira TAGOH <tagoh at redhat.com>
+* Thu Apr 27 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-5
 - ruby-deprecated-search-path.patch: added the deprecated installation paths
   to the search path for the backward compatibility.
 - added a Provides: ruby(abi) to ruby-libs.



From fedora-cvs-commits at redhat.com  Thu Apr 27 07:09:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 03:09:34 -0400
Subject: rpms/ruby/devel ruby.spec,1.60,1.61
Message-ID: <200604270709.k3R79Y2n013928@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13915

Modified Files:
	ruby.spec 
Log Message:
updated


Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ruby.spec	27 Apr 2006 06:27:40 -0000	1.60
+++ ruby.spec	27 Apr 2006 07:09:31 -0000	1.61
@@ -289,6 +289,7 @@
 DESTDIR=$RPM_BUILD_ROOT LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_bindir}/ruby -I $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} -I $RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os}/ -I $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}/lib $RPM_BUILD_ROOT%{_bindir}/rdoc --all --ri-system $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}
 
 # XXX: installing irb
+install %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man1/
 
 # installing ruby-mode
 cd %{name}-%{version}
@@ -442,16 +443,16 @@
 - ruby-deprecated-search-path.patch: added the deprecated installation paths
   to the search path for the backward compatibility.
 - added a Provides: ruby(abi) to ruby-libs.
-- ruby-1.8.4-64bit-pack.patch: backport patch to fix unpack("l") not working
-  on 64bit arch and integer overflow on template "w". (#189350)
+- ruby-1.8.4-64bit-pack.patch: backport patch from upstream to fix unpack("l")
+  not working on 64bit arch and integer overflow on template "w". (#189350)
 - updated License tag to be more comfortable, and with a pointer to get more
   details, like Python package does. (#179933)
 
 * Wed Apr 19 2006 Akira TAGOH <tagoh at redhat.com>
-- ruby-rubyprefix.patch: moved all arch-independent modules to /usr/lib/ruby
-  and keep arch-dependent modules  in /usr/lib64/ruby for 64bit arch.
-  so 'rubylibdir', 'sitelibdir' and 'sitedir' on Config::CONFIG points to
-  /usr/lib/ruby now. (#184199)
+- ruby-rubyprefix.patch: moved all arch-independent modules under /usr/lib/ruby
+  and keep arch-dependent modules under /usr/lib64/ruby for 64bit archs.
+  so 'rubylibdir', 'sitelibdir' and 'sitedir' in Config::CONFIG points to
+  the kind of /usr/lib/ruby now. (#184199)
 
 * Mon Apr 17 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-4
 - correct sitelibdir. (#184198)



From fedora-cvs-commits at redhat.com  Thu Apr 27 07:33:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 03:33:08 -0400
Subject: rpms/kernel/FC-5/configs config-xen-generic,1.13,1.14
Message-ID: <200604270733.k3R7X8CG028081@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/FC-5/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv28036/configs

Modified Files:
	config-xen-generic 
Log Message:
rebase with xen 3.0.2


Index: config-xen-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-xen-generic,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- config-xen-generic	13 Mar 2006 21:05:33 -0000	1.13
+++ config-xen-generic	27 Apr 2006 07:33:05 -0000	1.14
@@ -114,3 +114,5 @@
 #
 # CONFIG_KEXEC is not set
 # CONFIG_CRASH is not set
+CONFIG_XEN_SYSFS=y
+CONFIG_XEN_BACKEND=y



From fedora-cvs-commits at redhat.com  Thu Apr 27 07:33:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 03:33:07 -0400
Subject: rpms/kernel/FC-5 .cvsignore, 1.391, 1.392 kernel-2.6.spec, 1.2101,
	1.2102 linux-2.6-crashdump-common.patch, 1.14,
	1.15 linux-2.6-xen.patch, 1.7, 1.8 sources, 1.332, 1.333
Message-ID: <200604270733.k3R7X7Y2028065@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv28036

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-crashdump-common.patch 
	linux-2.6-xen.patch sources 
Log Message:
rebase with xen 3.0.2


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -r1.391 -r1.392
--- .cvsignore	24 Apr 2006 21:22:03 -0000	1.391
+++ .cvsignore	27 Apr 2006 07:32:55 -0000	1.392
@@ -1,6 +1,6 @@
 kernel-2.6.*.config
 temp-*
 kernel-2.6.16
-xen-20060301.tar.bz2
 linux-2.6.16.tar.bz2
 patch-2.6.16.11.bz2
+xen-20060426.tar.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2101
retrieving revision 1.2102
diff -u -r1.2101 -r1.2102
--- kernel-2.6.spec	25 Apr 2006 12:22:46 -0000	1.2101
+++ kernel-2.6.spec	27 Apr 2006 07:32:55 -0000	1.2102
@@ -260,9 +260,6 @@
 Patch704: linux-2.6-xen-vsyscall_base.patch
 Patch706: linux-2.6-xen_remap_vma_flags.patch
 Patch709: linux-2.6-percpu-NR_CPUS-hotplug-fix.patch
-Patch710: linux-2.6-xen-kva-mmap.patch
-Patch711: linux-2.6-xen-disable_ati_timer_quirk.patch
-Patch712: linux-2.6-xen-time-went-backwards.patch
 
 #
 # Patches 800 through 899 are reserved for bugfixes to the core system
@@ -833,9 +830,6 @@
 %patch704 -p1
 %patch706 -p1
 %patch709 -p1
-%patch710 -p2
-%patch711 -p1
-%patch712 -p1
 
 %endif
 

linux-2.6-crashdump-common.patch:
 linux-2.6.12/Documentation/sysrq.txt         |    8 
 linux-2.6.12/arch/i386/kernel/nmi.c          |    1 
 linux-2.6.12/arch/i386/kernel/traps.c        |    3 
 linux-2.6.12/arch/i386/mm/init.c             |   47 +++++
 linux-2.6.12/arch/ia64/kernel/process.c      |   30 ++-
 linux-2.6.12/arch/ia64/kernel/traps.c        |    6 
 linux-2.6.12/arch/ia64/mm/contig.c           |    3 
 linux-2.6.12/arch/ia64/mm/discontig.c        |    3 
 linux-2.6.12/arch/ia64/mm/init.c             |   90 +++++++++
 linux-2.6.12/arch/powerpc/kernel/process.c   |    1 
 linux-2.6.12/arch/powerpc/kernel/traps.c     |    3 
 linux-2.6.12/arch/powerpc/mm/mem.c           |   29 +++
 linux-2.6.12/arch/s390/kernel/traps.c        |    6 
 linux-2.6.12/arch/x86_64/kernel/process.c    |    2 
 linux-2.6.12/arch/x86_64/kernel/traps.c      |    6 
 linux-2.6.12/arch/x86_64/mm/init.c           |   32 +++
 linux-2.6.12/drivers/char/sysrq.c            |    2 
 linux-2.6.12/include/asm-generic/crashdump.h |   47 +++++
 linux-2.6.12/include/asm-i386/crashdump.h    |  123 +++++++++++++
 linux-2.6.12/include/asm-i386/kmap_types.h   |    4 
 linux-2.6.12/include/asm-ia64/crashdump.h    |   72 +++++++
 linux-2.6.12/include/asm-powerpc/crashdump.h |   61 ++++++
 linux-2.6.12/include/asm-x86_64/crashdump.h  |   86 +++++++++
 linux-2.6.12/include/linux/kernel.h          |   18 +
 linux-2.6.12/kernel/Makefile                 |    2 
 linux-2.6.12/kernel/dump.c                   |  246 +++++++++++++++++++++++++++
 linux-2.6.12/kernel/panic.c                  |    4 
 linux-2.6.12/kernel/printk.c                 |   20 ++
 linux-2.6.12/kernel/sched.c                  |    2 
 linux-2.6.13/arch/x86_64/mm/fault.c          |    1 
 linux-2.6.13/drivers/char/sysrq.c            |    5 
 linux-2.6.16.noarch/arch/i386/mm/pgtable.c   |    2 
 32 files changed, 951 insertions(+), 14 deletions(-)

Index: linux-2.6-crashdump-common.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-crashdump-common.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- linux-2.6-crashdump-common.patch	29 Mar 2006 20:54:41 -0000	1.14
+++ linux-2.6-crashdump-common.patch	27 Apr 2006 07:32:57 -0000	1.15
@@ -889,14 +889,6 @@
   * valid. The argument is a physical page number.
 --- linux-2.6.16.noarch/arch/i386/mm/pgtable.c~	2006-03-24 21:29:33.000000000 -0500
 +++ linux-2.6.16.noarch/arch/i386/mm/pgtable.c	2006-03-24 21:29:42.000000000 -0500
-@@ -13,6 +13,7 @@
- #include <linux/slab.h>
- #include <linux/pagemap.h>
- #include <linux/spinlock.h>
-+#include <linux/module.h>
- 
- #include <asm/system.h>
- #include <asm/pgtable.h>
 @@ -63,6 +64,8 @@
  	printk(KERN_INFO "%lu pages pagetables\n", ps.nr_page_table_pages);
  }

linux-2.6-xen.patch:
 linux-2.6.16-xen/arch/i386/Kconfig                                   |   98 
 linux-2.6.16-xen/arch/i386/Kconfig.cpu                               |    2 
 linux-2.6.16-xen/arch/i386/Makefile                                  |   23 
 linux-2.6.16-xen/arch/i386/boot-xen/Makefile                         |   21 
 linux-2.6.16-xen/arch/i386/kernel/Makefile                           |   33 
 linux-2.6.16-xen/arch/i386/kernel/acpi/Makefile                      |    4 
 linux-2.6.16-xen/arch/i386/kernel/acpi/boot-xen.c                    | 1161 ++++
 linux-2.6.16-xen/arch/i386/kernel/apic-xen.c                         |  140 
 linux-2.6.16-xen/arch/i386/kernel/asm-offsets.c                      |    5 
 linux-2.6.16-xen/arch/i386/kernel/cpu/Makefile                       |    5 
 linux-2.6.16-xen/arch/i386/kernel/cpu/common-xen.c                   |  715 ++
 linux-2.6.16-xen/arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 linux-2.6.16-xen/arch/i386/kernel/cpu/mtrr/main-xen.c                |  196 
 linux-2.6.16-xen/arch/i386/kernel/early_printk-xen.c                 |    2 
 linux-2.6.16-xen/arch/i386/kernel/entry-xen.S                        |  876 +++
 linux-2.6.16-xen/arch/i386/kernel/fixup.c                            |   96 
 linux-2.6.16-xen/arch/i386/kernel/head-xen.S                         |  171 
 linux-2.6.16-xen/arch/i386/kernel/init_task-xen.c                    |   51 
 linux-2.6.16-xen/arch/i386/kernel/io_apic-xen.c                      | 2753 ++++++++++
 linux-2.6.16-xen/arch/i386/kernel/ioport-xen.c                       |  122 
 linux-2.6.16-xen/arch/i386/kernel/irq-xen.c                          |  306 +
 linux-2.6.16-xen/arch/i386/kernel/ldt-xen.c                          |  269 
 linux-2.6.16-xen/arch/i386/kernel/microcode-xen.c                    |  165 
 linux-2.6.16-xen/arch/i386/kernel/mpparse-xen.c                      | 1188 ++++
 linux-2.6.16-xen/arch/i386/kernel/pci-dma-xen.c                      |  344 +
 linux-2.6.16-xen/arch/i386/kernel/process-xen.c                      |  833 +++
 linux-2.6.16-xen/arch/i386/kernel/quirks-xen.c                       |   48 
 linux-2.6.16-xen/arch/i386/kernel/setup-xen.c                        | 1892 ++++++
 linux-2.6.16-xen/arch/i386/kernel/smp-xen.c                          |  617 ++
 linux-2.6.16-xen/arch/i386/kernel/swiotlb.c                          |  674 ++
 linux-2.6.16-xen/arch/i386/kernel/sysenter.c                         |   90 
 linux-2.6.16-xen/arch/i386/kernel/time-xen.c                         | 1097 +++
 linux-2.6.16-xen/arch/i386/kernel/traps-xen.c                        | 1094 +++
 linux-2.6.16-xen/arch/i386/kernel/vm86.c                             |    8 
 linux-2.6.16-xen/arch/i386/kernel/vmlinux.lds.S                      |    4 
 linux-2.6.16-xen/arch/i386/kernel/vsyscall-note-xen.S                |   32 
 linux-2.6.16-xen/arch/i386/kernel/vsyscall.S                         |    2 
 linux-2.6.16-xen/arch/i386/mach-xen/Makefile                         |    5 
 linux-2.6.16-xen/arch/i386/mach-xen/setup.c                          |   37 
 linux-2.6.16-xen/arch/i386/mm/Makefile                               |    8 
 linux-2.6.16-xen/arch/i386/mm/fault-xen.c                            |  617 ++
 linux-2.6.16-xen/arch/i386/mm/highmem-xen.c                          |  123 
 linux-2.6.16-xen/arch/i386/mm/hypervisor.c                           |  424 +
 linux-2.6.16-xen/arch/i386/mm/init-xen.c                             |  854 +++
 linux-2.6.16-xen/arch/i386/mm/ioremap-xen.c                          |  464 +
 linux-2.6.16-xen/arch/i386/mm/pgtable-xen.c                          |  652 ++
 linux-2.6.16-xen/arch/i386/mm/pgtable.c                              |   63 
 linux-2.6.16-xen/arch/i386/pci/Makefile                              |    9 
 linux-2.6.16-xen/arch/i386/pci/irq-xen.c                             | 1202 ++++
 linux-2.6.16-xen/arch/i386/pci/pcifront.c                            |   55 
 linux-2.6.16-xen/arch/i386/power/Makefile                            |    4 
 linux-2.6.16-xen/arch/ia64/Kconfig                                   |   51 
 linux-2.6.16-xen/arch/ia64/Makefile                                  |   16 
 linux-2.6.16-xen/arch/ia64/hp/sim/Makefile                           |    2 
 linux-2.6.16-xen/arch/ia64/kernel/entry.S                            |   32 
 linux-2.6.16-xen/arch/ia64/kernel/head.S                             |    6 
 linux-2.6.16-xen/arch/ia64/kernel/pal.S                              |    5 
 linux-2.6.16-xen/arch/ia64/kernel/sal.c                              |    3 
 linux-2.6.16-xen/arch/ia64/kernel/setup.c                            |   32 
 linux-2.6.16-xen/arch/ia64/xen-mkbuildtree-post                      |    2 
 linux-2.6.16-xen/arch/ia64/xen-mkbuildtree-pre                       |   50 
 linux-2.6.16-xen/arch/ia64/xen/Makefile                              |    5 
 linux-2.6.16-xen/arch/ia64/xen/drivers/Makefile                      |   20 
 linux-2.6.16-xen/arch/ia64/xen/drivers/README                        |    2 
 linux-2.6.16-xen/arch/ia64/xen/drivers/coreMakefile                  |   26 
 linux-2.6.16-xen/arch/ia64/xen/drivers/evtchn_ia64.c                 |  273 
 linux-2.6.16-xen/arch/ia64/xen/drivers/patches/blkback.c.patch       |   33 
 linux-2.6.16-xen/arch/ia64/xen/drivers/patches/console.c.patch       |   11 
 linux-2.6.16-xen/arch/ia64/xen/drivers/patches/devmem.c.patch        |    2 
 linux-2.6.16-xen/arch/ia64/xen/drivers/patches/gnttab.c.patch        |   33 
 linux-2.6.16-xen/arch/ia64/xen/drivers/patches/privcmd.c.patch       |   30 
 linux-2.6.16-xen/arch/ia64/xen/drivers/xenia64_init.c                |   55 
 linux-2.6.16-xen/arch/ia64/xen/hypercall.S                           |  365 +
 linux-2.6.16-xen/arch/ia64/xen/xen_ksyms.c                           |   12 
 linux-2.6.16-xen/arch/ia64/xen/xenconsole.c                          |   19 
 linux-2.6.16-xen/arch/ia64/xen/xenentry.S                            |  850 +++
 linux-2.6.16-xen/arch/ia64/xen/xenhpski.c                            |   19 
 linux-2.6.16-xen/arch/ia64/xen/xenivt.S                              | 2032 +++++++
 linux-2.6.16-xen/arch/ia64/xen/xenminstate.h                         |  367 +
 linux-2.6.16-xen/arch/ia64/xen/xenpal.S                              |   73 
 linux-2.6.16-xen/arch/ia64/xen/xensetup.S                            |   35 
 linux-2.6.16-xen/arch/um/kernel/physmem.c                            |    4 
 linux-2.6.16-xen/arch/x86_64/Kconfig                                 |   58 
 linux-2.6.16-xen/arch/x86_64/Makefile                                |   20 
 linux-2.6.16-xen/arch/x86_64/ia32/ia32entry-xen.S                    |  721 ++
 linux-2.6.16-xen/arch/x86_64/ia32/syscall32-xen.c                    |  128 
 linux-2.6.16-xen/arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 linux-2.6.16-xen/arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 linux-2.6.16-xen/arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 linux-2.6.16-xen/arch/x86_64/kernel/Makefile                         |   18 
 linux-2.6.16-xen/arch/x86_64/kernel/acpi/Makefile                    |    1 
 linux-2.6.16-xen/arch/x86_64/kernel/apic-xen.c                       |  198 
 linux-2.6.16-xen/arch/x86_64/kernel/asm-offsets.c                    |    2 
 linux-2.6.16-xen/arch/x86_64/kernel/e820-xen.c                       |  744 ++
 linux-2.6.16-xen/arch/x86_64/kernel/early_printk-xen.c               |  306 +
 linux-2.6.16-xen/arch/x86_64/kernel/entry-xen.S                      | 1149 ++++
 linux-2.6.16-xen/arch/x86_64/kernel/genapic-xen.c                    |  144 
 linux-2.6.16-xen/arch/x86_64/kernel/genapic_xen.c                    |  162 
 linux-2.6.16-xen/arch/x86_64/kernel/head-xen.S                       |  156 
 linux-2.6.16-xen/arch/x86_64/kernel/head64-xen.c                     |  140 
 linux-2.6.16-xen/arch/x86_64/kernel/init_task.c                      |    3 
 linux-2.6.16-xen/arch/x86_64/kernel/io_apic-xen.c                    | 2231 ++++++++
 linux-2.6.16-xen/arch/x86_64/kernel/ioport-xen.c                     |   58 
 linux-2.6.16-xen/arch/x86_64/kernel/irq-xen.c                        |  168 
 linux-2.6.16-xen/arch/x86_64/kernel/ldt-xen.c                        |  282 +
 linux-2.6.16-xen/arch/x86_64/kernel/mpparse-xen.c                    | 1005 +++
 linux-2.6.16-xen/arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 linux-2.6.16-xen/arch/x86_64/kernel/process-xen.c                    |  810 ++
 linux-2.6.16-xen/arch/x86_64/kernel/setup-xen.c                      | 1661 ++++++
 linux-2.6.16-xen/arch/x86_64/kernel/setup64-xen.c                    |  360 +
 linux-2.6.16-xen/arch/x86_64/kernel/smp-xen.c                        |  596 ++
 linux-2.6.16-xen/arch/x86_64/kernel/traps-xen.c                      | 1023 +++
 linux-2.6.16-xen/arch/x86_64/kernel/vsyscall-xen.c                   |  239 
 linux-2.6.16-xen/arch/x86_64/kernel/x8664_ksyms-xen.c                |  163 
 linux-2.6.16-xen/arch/x86_64/kernel/xen_entry.S                      |   40 
 linux-2.6.16-xen/arch/x86_64/mm/Makefile                             |   10 
 linux-2.6.16-xen/arch/x86_64/mm/fault-xen.c                          |  595 ++
 linux-2.6.16-xen/arch/x86_64/mm/init-xen.c                           | 1101 +++
 linux-2.6.16-xen/arch/x86_64/mm/pageattr-xen.c                       |  401 +
 linux-2.6.16-xen/arch/x86_64/pci/Makefile                            |   12 
 linux-2.6.16-xen/drivers/Makefile                                    |    1 
 linux-2.6.16-xen/drivers/acpi/Kconfig                                |    3 
 linux-2.6.16-xen/drivers/acpi/tables.c                               |    7 
 linux-2.6.16-xen/drivers/char/mem.c                                  |    6 
 linux-2.6.16-xen/drivers/char/tpm/Kconfig                            |   14 
 linux-2.6.16-xen/drivers/char/tpm/Makefile                           |    1 
 linux-2.6.16-xen/drivers/char/tpm/tpm.c                              |   44 
 linux-2.6.16-xen/drivers/char/tpm/tpm.h                              |    7 
 linux-2.6.16-xen/drivers/char/tpm/tpm_xen.c                          |  536 +
 linux-2.6.16-xen/drivers/char/tty_io.c                               |    7 
 linux-2.6.16-xen/drivers/firmware/Kconfig                            |    2 
 linux-2.6.16-xen/drivers/pci/Kconfig                                 |    1 
 linux-2.6.16-xen/drivers/serial/Kconfig                              |    1 
 linux-2.6.16-xen/drivers/video/Kconfig                               |    2 
 linux-2.6.16-xen/drivers/xen/Kconfig                                 |  223 
 linux-2.6.16-xen/drivers/xen/Makefile                                |   22 
 linux-2.6.16-xen/drivers/xen/balloon/Makefile                        |    2 
 linux-2.6.16-xen/drivers/xen/balloon/balloon.c                       |  592 ++
 linux-2.6.16-xen/drivers/xen/blkback/Makefile                        |    3 
 linux-2.6.16-xen/drivers/xen/blkback/blkback.c                       |  596 ++
 linux-2.6.16-xen/drivers/xen/blkback/common.h                        |  148 
 linux-2.6.16-xen/drivers/xen/blkback/interface.c                     |  188 
 linux-2.6.16-xen/drivers/xen/blkback/vbd.c                           |  126 
 linux-2.6.16-xen/drivers/xen/blkback/xenbus.c                        |  425 +
 linux-2.6.16-xen/drivers/xen/blkfront/Makefile                       |    5 
 linux-2.6.16-xen/drivers/xen/blkfront/blkfront.c                     |  819 ++
 linux-2.6.16-xen/drivers/xen/blkfront/block.h                        |  165 
 linux-2.6.16-xen/drivers/xen/blkfront/vbd.c                          |  327 +
 linux-2.6.16-xen/drivers/xen/blktap/Makefile                         |    3 
 linux-2.6.16-xen/drivers/xen/blktap/blktap.c                         |  910 +++
 linux-2.6.16-xen/drivers/xen/blktap/common.h                         |  110 
 linux-2.6.16-xen/drivers/xen/blktap/interface.c                      |  146 
 linux-2.6.16-xen/drivers/xen/blktap/xenbus.c                         |  233 
 linux-2.6.16-xen/drivers/xen/char/Makefile                           |    2 
 linux-2.6.16-xen/drivers/xen/char/mem.c                              |  192 
 linux-2.6.16-xen/drivers/xen/console/Makefile                        |    2 
 linux-2.6.16-xen/drivers/xen/console/console.c                       |  648 ++
 linux-2.6.16-xen/drivers/xen/console/xencons_ring.c                  |  151 
 linux-2.6.16-xen/drivers/xen/core/Makefile                           |   11 
 linux-2.6.16-xen/drivers/xen/core/evtchn.c                           |  867 +++
 linux-2.6.16-xen/drivers/xen/core/features.c                         |   29 
 linux-2.6.16-xen/drivers/xen/core/gnttab.c                           |  464 +
 linux-2.6.16-xen/drivers/xen/core/hypervisor_sysfs.c                 |   57 
 linux-2.6.16-xen/drivers/xen/core/reboot.c                           |  381 +
 linux-2.6.16-xen/drivers/xen/core/skbuff.c                           |  144 
 linux-2.6.16-xen/drivers/xen/core/smpboot.c                          |  581 ++
 linux-2.6.16-xen/drivers/xen/core/xen_proc.c                         |   29 
 linux-2.6.16-xen/drivers/xen/core/xen_sysfs.c                        |  311 +
 linux-2.6.16-xen/drivers/xen/evtchn/Makefile                         |    2 
 linux-2.6.16-xen/drivers/xen/evtchn/evtchn.c                         |  464 +
 linux-2.6.16-xen/drivers/xen/net_driver_util.c                       |   68 
 linux-2.6.16-xen/drivers/xen/netback/Makefile                        |    5 
 linux-2.6.16-xen/drivers/xen/netback/common.h                        |  133 
 linux-2.6.16-xen/drivers/xen/netback/interface.c                     |  334 +
 linux-2.6.16-xen/drivers/xen/netback/loopback.c                      |  254 
 linux-2.6.16-xen/drivers/xen/netback/netback.c                       |  868 +++
 linux-2.6.16-xen/drivers/xen/netback/xenbus.c                        |  366 +
 linux-2.6.16-xen/drivers/xen/netfront/Makefile                       |    4 
 linux-2.6.16-xen/drivers/xen/netfront/netfront.c                     | 1519 +++++
 linux-2.6.16-xen/drivers/xen/pciback/Makefile                        |   10 
 linux-2.6.16-xen/drivers/xen/pciback/conf_space.c                    |  345 +
 linux-2.6.16-xen/drivers/xen/pciback/conf_space.h                    |   97 
 linux-2.6.16-xen/drivers/xen/pciback/conf_space_header.c             |  267 
 linux-2.6.16-xen/drivers/xen/pciback/passthrough.c                   |  157 
 linux-2.6.16-xen/drivers/xen/pciback/pci_stub.c                      |  695 ++
 linux-2.6.16-xen/drivers/xen/pciback/pciback.h                       |   79 
 linux-2.6.16-xen/drivers/xen/pciback/pciback_ops.c                   |   74 
 linux-2.6.16-xen/drivers/xen/pciback/vpci.c                          |  204 
 linux-2.6.16-xen/drivers/xen/pciback/xenbus.c                        |  446 +
 linux-2.6.16-xen/drivers/xen/pcifront/Makefile                       |    7 
 linux-2.6.16-xen/drivers/xen/pcifront/pci.c                          |   46 
 linux-2.6.16-xen/drivers/xen/pcifront/pci_op.c                       |  272 
 linux-2.6.16-xen/drivers/xen/pcifront/pcifront.h                     |   40 
 linux-2.6.16-xen/drivers/xen/pcifront/xenbus.c                       |  294 +
 linux-2.6.16-xen/drivers/xen/privcmd/Makefile                        |    2 
 linux-2.6.16-xen/drivers/xen/privcmd/privcmd.c                       |  302 +
 linux-2.6.16-xen/drivers/xen/tpmback/Makefile                        |    4 
 linux-2.6.16-xen/drivers/xen/tpmback/common.h                        |   91 
 linux-2.6.16-xen/drivers/xen/tpmback/interface.c                     |  194 
 linux-2.6.16-xen/drivers/xen/tpmback/tpmback.c                       | 1060 +++
 linux-2.6.16-xen/drivers/xen/tpmback/xenbus.c                        |  328 +
 linux-2.6.16-xen/drivers/xen/tpmfront/Makefile                       |    2 
 linux-2.6.16-xen/drivers/xen/tpmfront/tpmfront.c                     |  731 ++
 linux-2.6.16-xen/drivers/xen/tpmfront/tpmfront.h                     |   40 
 linux-2.6.16-xen/drivers/xen/util.c                                  |   80 
 linux-2.6.16-xen/drivers/xen/xenbus/Makefile                         |   12 
 linux-2.6.16-xen/drivers/xen/xenbus/xenbus_backend_client.c          |  151 
 linux-2.6.16-xen/drivers/xen/xenbus/xenbus_client.c                  |  284 +
 linux-2.6.16-xen/drivers/xen/xenbus/xenbus_comms.c                   |  218 
 linux-2.6.16-xen/drivers/xen/xenbus/xenbus_comms.h                   |   53 
 linux-2.6.16-xen/drivers/xen/xenbus/xenbus_dev.c                     |  255 
 linux-2.6.16-xen/drivers/xen/xenbus/xenbus_probe.c                   | 1093 +++
 linux-2.6.16-xen/drivers/xen/xenbus/xenbus_xs.c                      |  856 +++
 linux-2.6.16-xen/fs/Kconfig                                          |    1 
 linux-2.6.16-xen/include/asm-i386/a.out.h                            |    2 
 linux-2.6.16-xen/include/asm-i386/apic.h                             |    2 
 linux-2.6.16-xen/include/asm-i386/elf.h                              |    7 
 linux-2.6.16-xen/include/asm-i386/fixmap.h                           |   13 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/agp.h                 |   37 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/desc.h                |  164 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/dma-mapping.h         |  156 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/fixmap.h              |  156 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/floppy.h              |  147 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/highmem.h             |   81 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/hw_irq.h              |   73 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/hypercall.h           |  342 +
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/hypervisor.h          |  224 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/io.h                  |  401 +
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/mmu.h                 |   21 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/mmu_context.h         |  105 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/page.h                |  327 +
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/param.h               |   24 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/pci.h                 |  154 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/pgtable-2level.h      |   83 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/pgtable-3level.h      |  181 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/pgtable.h             |  521 +
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/processor.h           |  753 ++
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/segment.h             |  117 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/setup.h               |   66 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/smp.h                 |  103 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/spinlock.h            |  217 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/system.h              |  679 ++
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 linux-2.6.16-xen/include/asm-i386/mach-xen/asm/vga.h                 |   20 
 linux-2.6.16-xen/include/asm-i386/mach-xen/irq_vectors.h             |  125 
 linux-2.6.16-xen/include/asm-i386/mach-xen/mach_traps.h              |   33 
 linux-2.6.16-xen/include/asm-i386/mach-xen/setup_arch_post.h         |   45 
 linux-2.6.16-xen/include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 linux-2.6.16-xen/include/asm-i386/page.h                             |    4 
 linux-2.6.16-xen/include/asm-i386/spinlock.h                         |    6 
 linux-2.6.16-xen/include/asm-i386/system.h                           |    2 
 linux-2.6.16-xen/include/asm-ia64/fixmap.h                           |    2 
 linux-2.6.16-xen/include/asm-ia64/gcc_intrin.h                       |   60 
 linux-2.6.16-xen/include/asm-ia64/hypercall.h                        |  274 
 linux-2.6.16-xen/include/asm-ia64/hypervisor.h                       |  138 
 linux-2.6.16-xen/include/asm-ia64/intel_intrin.h                     |   68 
 linux-2.6.16-xen/include/asm-ia64/meminit.h                          |    5 
 linux-2.6.16-xen/include/asm-ia64/pal.h                              |    1 
 linux-2.6.16-xen/include/asm-ia64/privop.h                           |   59 
 linux-2.6.16-xen/include/asm-ia64/processor.h                        |    1 
 linux-2.6.16-xen/include/asm-ia64/synch_bitops.h                     |   61 
 linux-2.6.16-xen/include/asm-ia64/system.h                           |    4 
 linux-2.6.16-xen/include/asm-ia64/xen/privop.h                       |  277 +
 linux-2.6.16-xen/include/asm-um/page.h                               |    2 
 linux-2.6.16-xen/include/asm-x86_64/apic.h                           |    2 
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/desc.h              |  263 
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/fixmap.h            |  109 
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/floppy.h            |  206 
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/hw_irq.h            |  141 
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/hypercall.h         |  343 +
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/io.h                |  359 +
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/mmu.h               |   33 
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/mmu_context.h       |  134 
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/msr.h               |  399 +
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/page.h              |  318 +
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/pci.h               |  174 
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/pgalloc.h           |  198 
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/processor.h         |  493 +
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/smp.h               |  152 
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/system.h            |  434 +
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/asm/xor.h               |  328 +
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/mach_time.h             |  122 
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/setup_arch_post.h       |   28 
 linux-2.6.16-xen/include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 linux-2.6.16-xen/include/linux/gfp.h                                 |    6 
 linux-2.6.16-xen/include/linux/highmem.h                             |    6 
 linux-2.6.16-xen/include/linux/mm.h                                  |   13 
 linux-2.6.16-xen/include/linux/skbuff.h                              |   13 
 linux-2.6.16-xen/include/xen/balloon.h                               |   73 
 linux-2.6.16-xen/include/xen/driver_util.h                           |   26 
 linux-2.6.16-xen/include/xen/evtchn.h                                |  126 
 linux-2.6.16-xen/include/xen/features.h                              |   20 
 linux-2.6.16-xen/include/xen/foreign_page.h                          |   40 
 linux-2.6.16-xen/include/xen/gnttab.h                                |  126 
 linux-2.6.16-xen/include/xen/hypervisor_sysfs.h                      |   32 
 linux-2.6.16-xen/include/xen/interface/COPYING                       |   28 
 linux-2.6.16-xen/include/xen/interface/acm.h                         |  181 
 linux-2.6.16-xen/include/xen/interface/acm_ops.h                     |   98 
 linux-2.6.16-xen/include/xen/interface/arch-ia64.h                   |  337 +
 linux-2.6.16-xen/include/xen/interface/arch-x86_32.h                 |  195 
 linux-2.6.16-xen/include/xen/interface/arch-x86_64.h                 |  271 
 linux-2.6.16-xen/include/xen/interface/dom0_ops.h                    |  533 +
 linux-2.6.16-xen/include/xen/interface/event_channel.h               |  205 
 linux-2.6.16-xen/include/xen/interface/features.h                    |   53 
 linux-2.6.16-xen/include/xen/interface/grant_table.h                 |  311 +
 linux-2.6.16-xen/include/xen/interface/hvm/hvm_info_table.h          |   24 
 linux-2.6.16-xen/include/xen/interface/hvm/ioreq.h                   |   94 
 linux-2.6.16-xen/include/xen/interface/hvm/vmx_assist.h              |   97 
 linux-2.6.16-xen/include/xen/interface/io/blkif.h                    |   85 
 linux-2.6.16-xen/include/xen/interface/io/console.h                  |   33 
 linux-2.6.16-xen/include/xen/interface/io/netif.h                    |   84 
 linux-2.6.16-xen/include/xen/interface/io/pciif.h                    |   55 
 linux-2.6.16-xen/include/xen/interface/io/ring.h                     |  265 
 linux-2.6.16-xen/include/xen/interface/io/tpmif.h                    |   56 
 linux-2.6.16-xen/include/xen/interface/io/xenbus.h                   |   42 
 linux-2.6.16-xen/include/xen/interface/io/xs_wire.h                  |   97 
 linux-2.6.16-xen/include/xen/interface/memory.h                      |  155 
 linux-2.6.16-xen/include/xen/interface/nmi.h                         |   59 
 linux-2.6.16-xen/include/xen/interface/physdev.h                     |   71 
 linux-2.6.16-xen/include/xen/interface/sched.h                       |   87 
 linux-2.6.16-xen/include/xen/interface/sched_ctl.h                   |   64 
 linux-2.6.16-xen/include/xen/interface/trace.h                       |   86 
 linux-2.6.16-xen/include/xen/interface/vcpu.h                        |  119 
 linux-2.6.16-xen/include/xen/interface/version.h                     |   64 
 linux-2.6.16-xen/include/xen/interface/xen-compat.h                  |   31 
 linux-2.6.16-xen/include/xen/interface/xen.h                         |  451 +
 linux-2.6.16-xen/include/xen/net_driver_util.h                       |   58 
 linux-2.6.16-xen/include/xen/pcifront.h                              |   39 
 linux-2.6.16-xen/include/xen/public/evtchn.h                         |  101 
 linux-2.6.16-xen/include/xen/public/privcmd.h                        |   94 
 linux-2.6.16-xen/include/xen/tpmfe.h                                 |   40 
 linux-2.6.16-xen/include/xen/xen_proc.h                              |   23 
 linux-2.6.16-xen/include/xen/xenbus.h                                |  306 +
 linux-2.6.16-xen/include/xen/xencons.h                               |   14 
 linux-2.6.16-xen/kernel/Kconfig.preempt                              |    1 
 linux-2.6.16-xen/lib/Makefile                                        |    3 
 linux-2.6.16-xen/mm/Kconfig                                          |    3 
 linux-2.6.16-xen/mm/highmem.c                                        |   11 
 linux-2.6.16-xen/mm/memory.c                                         |  116 
 linux-2.6.16-xen/mm/mmap.c                                           |    4 
 linux-2.6.16-xen/mm/page_alloc.c                                     |    6 
 linux-2.6.16-xen/net/core/dev.c                                      |   63 
 linux-2.6.16-xen/net/core/skbuff.c                                   |   41 
 linux-2.6.16-xen/scripts/Makefile.xen                                |   14 
 linux-2.6.16.noarch/arch/x86_64/ia32/Makefile                        |   20 
 367 files changed, 79424 insertions(+), 223 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.7 -r 1.8 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-xen.patch	17 Apr 2006 21:57:06 -0000	1.7
+++ linux-2.6-xen.patch	27 Apr 2006 07:32:57 -0000	1.8
@@ -1,6 +1,6 @@
-diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/boot-xen/Makefile linux-2.6.16-rc5-xen0/arch/i386/boot-xen/Makefile
---- ref-linux-2.6.16-rc5/arch/i386/boot-xen/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.16-rc5-xen0/arch/i386/boot-xen/Makefile	2006-03-01 11:09:36.000000000 -0500
+diff -Nru -p --exclude='.*' ref-linux-2.6.16/arch/i386/boot-xen/Makefile linux-2.6.16-xen/arch/i386/boot-xen/Makefile
+--- ref-linux-2.6.16/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.16-xen/arch/i386/boot-xen/Makefile	2006-04-26 18:40:53.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 -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/Kconfig linux-2.6.16-rc5-xen0/arch/i386/Kconfig
---- ref-linux-2.6.16-rc5/arch/i386/Kconfig	2006-03-01 11:12:36.000000000 -0500
-+++ linux-2.6.16-rc5-xen0/arch/i386/Kconfig	2006-03-01 11:09:36.000000000 -0500
+diff -Nru -p --exclude='.*' ref-linux-2.6.16/arch/i386/Kconfig linux-2.6.16-xen/arch/i386/Kconfig
+--- ref-linux-2.6.16/arch/i386/Kconfig	2006-04-26 19:12:45.000000000 +0200
++++ linux-2.6.16-xen/arch/i386/Kconfig	2006-04-26 18:40:53.000000000 +0200
 @@ -58,6 +58,15 @@ config X86_PC
  	help
  	  Choose this option if your computer is a standard PC or compatible.
@@ -329,9 +329,9 @@
  config KTIME_SCALAR
  	bool
  	default y
-diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/Kconfig.cpu linux-2.6.16-rc5-xen0/arch/i386/Kconfig.cpu
---- ref-linux-2.6.16-rc5/arch/i386/Kconfig.cpu	2006-03-01 11:12:26.000000000 -0500
-+++ linux-2.6.16-rc5-xen0/arch/i386/Kconfig.cpu	2006-03-01 11:09:36.000000000 -0500
+diff -Nru -p --exclude='.*' ref-linux-2.6.16/arch/i386/Kconfig.cpu linux-2.6.16-xen/arch/i386/Kconfig.cpu
+--- ref-linux-2.6.16/arch/i386/Kconfig.cpu	2006-03-20 06:53:29.000000000 +0100
++++ linux-2.6.16-xen/arch/i386/Kconfig.cpu	2006-04-26 18:40:53.000000000 +0200
 @@ -251,7 +251,7 @@ config X86_PPRO_FENCE
  
  config X86_F00F_BUG
@@ -341,9 +341,9 @@
  	default y
  
  config X86_WP_WORKS_OK
-diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/kernel/acpi/boot-xen.c linux-2.6.16-rc5-xen0/arch/i386/kernel/acpi/boot-xen.c
---- ref-linux-2.6.16-rc5/arch/i386/kernel/acpi/boot-xen.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.16-rc5-xen0/arch/i386/kernel/acpi/boot-xen.c	2006-03-01 11:09:36.000000000 -0500
+diff -Nru -p --exclude='.*' ref-linux-2.6.16/arch/i386/kernel/acpi/boot-xen.c linux-2.6.16-xen/arch/i386/kernel/acpi/boot-xen.c
+--- ref-linux-2.6.16/arch/i386/kernel/acpi/boot-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.16-xen/arch/i386/kernel/acpi/boot-xen.c	2006-04-26 18:40:53.000000000 +0200
 @@ -0,0 +1,1161 @@
 +/*
 + *  boot.c - Architecture-Specific Low-Level ACPI Boot Support
@@ -391,6 +391,9 @@
 +extern int gsi_irq_sharing(int gsi);
 +#include <asm/proto.h>
 +
++static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id) { return 0; }
++
++
 +#else				/* X86 */
 +
 +#ifdef	CONFIG_X86_LOCAL_APIC
@@ -1458,9 +1461,6 @@
 +		disable_acpi();
 +		return error;
 +	}
-+#ifdef __i386__
-+	check_acpi_pci();
-+#endif
 +
 +	acpi_table_parse(ACPI_BOOT, acpi_parse_sbf);
 +
@@ -1506,9 +1506,9 @@
 +
 +	return 0;
 +}
-diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/kernel/acpi/Makefile linux-2.6.16-rc5-xen0/arch/i386/kernel/acpi/Makefile
---- ref-linux-2.6.16-rc5/arch/i386/kernel/acpi/Makefile	2006-03-01 11:12:26.000000000 -0500
-+++ linux-2.6.16-rc5-xen0/arch/i386/kernel/acpi/Makefile	2006-03-01 11:09:36.000000000 -0500
+diff -Nru -p --exclude='.*' ref-linux-2.6.16/arch/i386/kernel/acpi/Makefile linux-2.6.16-xen/arch/i386/kernel/acpi/Makefile
+--- ref-linux-2.6.16/arch/i386/kernel/acpi/Makefile	2006-03-20 06:53:29.000000000 +0100
++++ linux-2.6.16-xen/arch/i386/kernel/acpi/Makefile	2006-04-26 18:40:53.000000000 +0200
 @@ -6,3 +6,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
  obj-y				+= cstate.o processor.o
  endif
@@ -1517,9 +1517,9 @@
 +include $(srctree)/scripts/Makefile.xen
 +obj-y := $(call cherrypickxen, $(obj-y), $(src))
 +endif
-diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/kernel/apic-xen.c linux-2.6.16-rc5-xen0/arch/i386/kernel/apic-xen.c
---- ref-linux-2.6.16-rc5/arch/i386/kernel/apic-xen.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.16-rc5-xen0/arch/i386/kernel/apic-xen.c	2006-03-01 11:09:36.000000000 -0500
+diff -Nru -p --exclude='.*' ref-linux-2.6.16/arch/i386/kernel/apic-xen.c linux-2.6.16-xen/arch/i386/kernel/apic-xen.c
+--- ref-linux-2.6.16/arch/i386/kernel/apic-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.16-xen/arch/i386/kernel/apic-xen.c	2006-04-26 18:40:53.000000000 +0200
 @@ -0,0 +1,140 @@
 +/*
 + *	Local APIC handling, local APIC timers
@@ -1661,9 +1661,9 @@
 +
 +	return 0;
 +}
-diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/kernel/asm-offsets.c linux-2.6.16-rc5-xen0/arch/i386/kernel/asm-offsets.c
---- ref-linux-2.6.16-rc5/arch/i386/kernel/asm-offsets.c	2006-01-02 22:21:10.000000000 -0500
-+++ linux-2.6.16-rc5-xen0/arch/i386/kernel/asm-offsets.c	2006-03-01 11:09:36.000000000 -0500
+diff -Nru -p --exclude='.*' ref-linux-2.6.16/arch/i386/kernel/asm-offsets.c linux-2.6.16-xen/arch/i386/kernel/asm-offsets.c
+--- ref-linux-2.6.16/arch/i386/kernel/asm-offsets.c	2006-03-20 06:53:29.000000000 +0100
++++ linux-2.6.16-xen/arch/i386/kernel/asm-offsets.c	2006-04-26 18:40:53.000000000 +0200
 @@ -13,6 +13,7 @@
  #include <asm/fixmap.h>
  #include <asm/processor.h>
@@ -1686,10 +1686,10 @@
 -	DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL));
 +	DEFINE(VSYSCALL_BASE, VSYSCALL_BASE);
  }
-diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/kernel/cpu/common-xen.c linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/common-xen.c
---- ref-linux-2.6.16-rc5/arch/i386/kernel/cpu/common-xen.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/common-xen.c	2006-03-01 11:09:36.000000000 -0500
-@@ -0,0 +1,719 @@
+diff -Nru -p --exclude='.*' ref-linux-2.6.16/arch/i386/kernel/cpu/common-xen.c linux-2.6.16-xen/arch/i386/kernel/cpu/common-xen.c
+--- ref-linux-2.6.16/arch/i386/kernel/cpu/common-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.16-xen/arch/i386/kernel/cpu/common-xen.c	2006-04-26 18:40:53.000000000 +0200
+@@ -0,0 +1,715 @@
 +#include <linux/init.h>
 +#include <linux/string.h>
 +#include <linux/delay.h>
@@ -1726,8 +1726,6 @@
 +
 +struct cpu_dev * cpu_devs[X86_VENDOR_NUM] = {};
 +
-+extern void machine_specific_modify_cpu_capabilities(struct cpuinfo_x86 *c);
-+
 +extern int disable_pse;
 +
 +static void default_init(struct cpuinfo_x86 * c)
@@ -1975,10 +1973,10 @@
 +			c->x86_capability[4] = excap;
 +			c->x86 = (tfms >> 8) & 15;
 +			c->x86_model = (tfms >> 4) & 15;
-+			if (c->x86 == 0xf) {
++			if (c->x86 == 0xf)
 +				c->x86 += (tfms >> 20) & 0xff;
++			if (c->x86 >= 0x6)
 +				c->x86_model += ((tfms >> 16) & 0xF) << 4;
-+			} 
 +			c->x86_mask = tfms & 15;
 +		} else {
 +			/* Have CPUID level 0 only - unheard of */
@@ -2117,8 +2115,6 @@
 +				c->x86_vendor, c->x86_model);
 +	}
 +
-+	machine_specific_modify_cpu_capabilities(c);
-+
 +	/* Now the feature flags better reflect actual CPU features! */
 +
 +	printk(KERN_DEBUG "CPU: After all inits, caps:");
@@ -2409,9 +2405,9 @@
 +	per_cpu(cpu_tlbstate, cpu).active_mm = &init_mm;
 +}
 +#endif
-diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/kernel/cpu/Makefile linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/Makefile
---- ref-linux-2.6.16-rc5/arch/i386/kernel/cpu/Makefile	2006-01-02 22:21:10.000000000 -0500
-+++ linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/Makefile	2006-03-01 11:09:36.000000000 -0500
+diff -Nru -p --exclude='.*' ref-linux-2.6.16/arch/i386/kernel/cpu/Makefile linux-2.6.16-xen/arch/i386/kernel/cpu/Makefile
+--- ref-linux-2.6.16/arch/i386/kernel/cpu/Makefile	2006-03-20 06:53:29.000000000 +0100
++++ linux-2.6.16-xen/arch/i386/kernel/cpu/Makefile	2006-04-26 18:40:53.000000000 +0200
 @@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE)	+=	mcheck/
  
  obj-$(CONFIG_MTRR)	+= 	mtrr/
@@ -2421,10 +2417,10 @@
 +include $(srctree)/scripts/Makefile.xen
 +obj-y := $(call cherrypickxen, $(obj-y), $(src))
 +endif
-diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/kernel/cpu/mtrr/main-xen.c linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/mtrr/main-xen.c
---- ref-linux-2.6.16-rc5/arch/i386/kernel/cpu/mtrr/main-xen.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-03-01 11:09:36.000000000 -0500
-@@ -0,0 +1,187 @@
+diff -Nru -p --exclude='.*' ref-linux-2.6.16/arch/i386/kernel/cpu/mtrr/main-xen.c linux-2.6.16-xen/arch/i386/kernel/cpu/mtrr/main-xen.c
+--- ref-linux-2.6.16/arch/i386/kernel/cpu/mtrr/main-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.16-xen/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-04-26 18:40:53.000000000 +0200
+@@ -0,0 +1,196 @@
 +#include <linux/init.h>
 +#include <linux/proc_fs.h>
 +#include <linux/ctype.h>
@@ -2435,6 +2431,8 @@
 +#include <asm/mtrr.h>
 +#include "mtrr.h"
 +
++static DECLARE_MUTEX(mtrr_sem);
++
 +void generic_get_mtrr(unsigned int reg, unsigned long *base,
 +		      unsigned int *size, mtrr_type * type)
 +{
@@ -2490,12 +2488,15 @@
[...18629 lines suppressed...]
 +	} while (pud++, addr = next, addr != end);
@@ -80543,8 +82479,8 @@
 + * Scan a region of virtual memory, filling in page tables as necessary
 + * and calling a provided function on each leaf page table.
 + */
-+int generic_page_range(struct mm_struct *mm, unsigned long addr,
-+		       unsigned long size, pte_fn_t fn, void *data)
++int apply_to_page_range(struct mm_struct *mm, unsigned long addr,
++			unsigned long size, pte_fn_t fn, void *data)
 +{
 +	pgd_t *pgd;
 +	unsigned long next;
@@ -80555,20 +82491,21 @@
 +	pgd = pgd_offset(mm, addr);
 +	do {
 +		next = pgd_addr_end(addr, end);
-+		err = generic_pud_range(mm, pgd, addr, next, fn, data);
++		err = apply_to_pud_range(mm, pgd, addr, next, fn, data);
 +		if (err)
 +			break;
 +	} while (pgd++, addr = next, addr != end);
 +	return err;
 +}
++EXPORT_SYMBOL_GPL(apply_to_page_range);
 +#endif
 +
  /*
   * handle_pte_fault chooses page fault handler according to an entry
   * which was read non-atomically.  Before making any commitment, on
-diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/mm/mmap.c linux-2.6.16-rc5-xen0/mm/mmap.c
---- ref-linux-2.6.16-rc5/mm/mmap.c	2006-03-01 11:12:31.000000000 -0500
-+++ linux-2.6.16-rc5-xen0/mm/mmap.c	2006-03-01 11:09:38.000000000 -0500
+diff -Nru -p --exclude='.*' ref-linux-2.6.16/mm/mmap.c linux-2.6.16-xen/mm/mmap.c
+--- ref-linux-2.6.16/mm/mmap.c	2006-03-20 06:53:29.000000000 +0100
++++ linux-2.6.16-xen/mm/mmap.c	2006-04-26 18:40:57.000000000 +0200
 @@ -1937,6 +1937,10 @@ void exit_mmap(struct mm_struct *mm)
  	unsigned long nr_accounted = 0;
  	unsigned long end;
@@ -80580,9 +82517,9 @@
  	lru_add_drain();
  	flush_cache_mm(mm);
  	tlb = tlb_gather_mmu(mm, 1);
-diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/mm/page_alloc.c linux-2.6.16-rc5-xen0/mm/page_alloc.c
---- ref-linux-2.6.16-rc5/mm/page_alloc.c	2006-03-01 11:12:31.000000000 -0500
-+++ linux-2.6.16-rc5-xen0/mm/page_alloc.c	2006-03-01 11:09:38.000000000 -0500
+diff -Nru -p --exclude='.*' ref-linux-2.6.16/mm/page_alloc.c linux-2.6.16-xen/mm/page_alloc.c
+--- ref-linux-2.6.16/mm/page_alloc.c	2006-03-20 06:53:29.000000000 +0100
++++ linux-2.6.16-xen/mm/page_alloc.c	2006-04-26 18:40:57.000000000 +0200
 @@ -418,7 +418,8 @@ static void __free_pages_ok(struct page 
  	int i;
  	int reserved = 0;
@@ -80593,7 +82530,7 @@
  	if (!PageHighMem(page))
  		mutex_debug_check_no_locks_freed(page_address(page),
  						 PAGE_SIZE<<order);
-@@ -712,7 +713,8 @@ static void fastcall free_hot_cold_page(
+@@ -711,7 +712,8 @@ static void fastcall free_hot_cold_page(
  	struct per_cpu_pages *pcp;
  	unsigned long flags;
  
@@ -80603,9 +82540,9 @@
  
  	if (PageAnon(page))
  		page->mapping = NULL;
-diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/net/core/dev.c linux-2.6.16-rc5-xen0/net/core/dev.c
---- ref-linux-2.6.16-rc5/net/core/dev.c	2006-03-01 11:12:32.000000000 -0500
-+++ linux-2.6.16-rc5-xen0/net/core/dev.c	2006-03-01 11:09:38.000000000 -0500
+diff -Nru -p --exclude='.*' ref-linux-2.6.16/net/core/dev.c linux-2.6.16-xen/net/core/dev.c
+--- ref-linux-2.6.16/net/core/dev.c	2006-03-20 06:53:29.000000000 +0100
++++ linux-2.6.16-xen/net/core/dev.c	2006-04-26 18:40:57.000000000 +0200
 @@ -116,6 +116,12 @@
  #endif	/* CONFIG_NET_RADIO */
  #include <asm/current.h>
@@ -80619,20 +82556,19 @@
  /*
   *	The list of packet types we will receive (as opposed to discard)
   *	and the routines to invoke.
-@@ -1260,6 +1266,37 @@ int dev_queue_xmit(struct sk_buff *skb)
- 	    __skb_linearize(skb, GFP_ATOMIC))
- 		goto out_kfree_skb;
+@@ -1214,6 +1220,43 @@ int __skb_linearize(struct sk_buff *skb,
+ 	}						\
+ }
  
 +#ifdef CONFIG_XEN
-+	/* If a checksum-deferred packet is forwarded to a device that needs a
-+	 * checksum, correct the pointers and force checksumming.
-+	 */
++inline int skb_checksum_setup(struct sk_buff *skb)
++{
 +	if (skb->proto_csum_blank) {
 +		if (skb->protocol != htons(ETH_P_IP))
-+			goto out_kfree_skb;
++			goto out;
 +		skb->h.raw = (unsigned char *)skb->nh.iph + 4*skb->nh.iph->ihl;
 +		if (skb->h.raw >= skb->tail)
-+			goto out_kfree_skb;
++			goto out;
 +		switch (skb->nh.iph->protocol) {
 +		case IPPROTO_TCP:
 +			skb->csum = offsetof(struct tcphdr, check);
@@ -80645,31 +82581,51 @@
 +				printk(KERN_ERR "Attempting to checksum a non-"
 +				       "TCP/UDP packet, dropping a protocol"
 +				       " %d packet", skb->nh.iph->protocol);
-+			rc = -EPROTO;
-+			goto out_kfree_skb;
++			goto out;
 +		}
 +		if ((skb->h.raw + skb->csum + 2) > skb->tail)
-+			goto out_kfree_skb;
++			goto out;
 +		skb->ip_summed = CHECKSUM_HW;
++		skb->proto_csum_blank = 0;
 +	}
++	return 0;
++out:
++	return -EPROTO;
++}
++#else
++inline int skb_checksum_setup(struct sk_buff *skb) {}
 +#endif
 +
++
+ /**
+  *	dev_queue_xmit - transmit a buffer
+  *	@skb: buffer to transmit
+@@ -1260,6 +1303,12 @@ int dev_queue_xmit(struct sk_buff *skb)
+ 	    __skb_linearize(skb, GFP_ATOMIC))
+ 		goto out_kfree_skb;
+ 
++ 	/* 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))
++ 		goto out_kfree_skb;
++  
  	/* If packet is not checksummed and device does not support
  	 * checksumming for this protocol, complete checksumming here.
  	 */
-@@ -1609,6 +1646,19 @@ int netif_receive_skb(struct sk_buff *sk
+@@ -1609,6 +1658,19 @@ int netif_receive_skb(struct sk_buff *sk
  	}
  #endif
  
 +#ifdef CONFIG_XEN
 +	switch (skb->ip_summed) {
 +	case CHECKSUM_UNNECESSARY:
-+		skb->proto_csum_valid = 1;
++		skb->proto_data_valid = 1;
 +		break;
 +	case CHECKSUM_HW:
 +		/* XXX Implement me. */
 +	default:
-+		skb->proto_csum_valid = 0;
++		skb->proto_data_valid = 0;
 +		break;
 +	}
 +#endif
@@ -80677,9 +82633,17 @@
  	list_for_each_entry_rcu(ptype, &ptype_all, list) {
  		if (!ptype->dev || ptype->dev == skb->dev) {
  			if (pt_prev) 
-diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/net/core/skbuff.c linux-2.6.16-rc5-xen0/net/core/skbuff.c
---- ref-linux-2.6.16-rc5/net/core/skbuff.c	2006-03-01 11:12:32.000000000 -0500
-+++ linux-2.6.16-rc5-xen0/net/core/skbuff.c	2006-03-01 11:09:39.000000000 -0500
+@@ -3300,6 +3362,7 @@ EXPORT_SYMBOL(unregister_netdevice_notif
+ EXPORT_SYMBOL(net_enable_timestamp);
+ EXPORT_SYMBOL(net_disable_timestamp);
+ EXPORT_SYMBOL(dev_get_flags);
++EXPORT_SYMBOL(skb_checksum_setup);
+ 
+ #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
+ EXPORT_SYMBOL(br_handle_frame_hook);
+diff -Nru -p --exclude='.*' ref-linux-2.6.16/net/core/skbuff.c linux-2.6.16-xen/net/core/skbuff.c
+--- ref-linux-2.6.16/net/core/skbuff.c	2006-03-20 06:53:29.000000000 +0100
++++ linux-2.6.16-xen/net/core/skbuff.c	2006-04-26 18:40:57.000000000 +0200
 @@ -132,6 +132,7 @@ void skb_under_panic(struct sk_buff *skb
   *	Buffers may only be allocated from interrupts using a @gfp_mask of
   *	%GFP_ATOMIC.
@@ -80759,15 +82723,15 @@
  	n->cloned = 1;
  	n->nohdr = 0;
 +#ifdef CONFIG_XEN
-+	C(proto_csum_valid);
++	C(proto_data_valid);
 +	C(proto_csum_blank);
 +#endif
  	C(pkt_type);
  	C(ip_summed);
  	C(priority);
-diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/scripts/Makefile.xen linux-2.6.16-rc5-xen0/scripts/Makefile.xen
---- ref-linux-2.6.16-rc5/scripts/Makefile.xen	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.16-rc5-xen0/scripts/Makefile.xen	2006-03-01 11:09:39.000000000 -0500
+diff -Nru -p --exclude='.*' ref-linux-2.6.16/scripts/Makefile.xen linux-2.6.16-xen/scripts/Makefile.xen
+--- ref-linux-2.6.16/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.16-xen/scripts/Makefile.xen	2006-04-26 18:40:57.000000000 +0200
 @@ -0,0 +1,14 @@
 +
 +# cherrypickxen($1 = allobj)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -r1.332 -r1.333
--- sources	24 Apr 2006 21:22:03 -0000	1.332
+++ sources	27 Apr 2006 07:33:05 -0000	1.333
@@ -1,3 +1,3 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
-cdfde609af8adcf58d7ff626599b2d90  xen-20060301.tar.bz2
 1d136b87d4e3ca239a55bcd72b78dae9  patch-2.6.16.11.bz2
+b25c5e366bb28581801c0646d09c3427  xen-20060426.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 07:42:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 03:42:54 -0400
Subject: rpms/kernel/devel/configs config-xen-generic,1.16,1.17
Message-ID: <200604270742.k3R7gsk9006446@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv6266/configs

Modified Files:
	config-xen-generic 
Log Message:
rebase linux-2.6-xen cset 22432


Index: config-xen-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-generic,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- config-xen-generic	22 Apr 2006 17:48:29 -0000	1.16
+++ config-xen-generic	27 Apr 2006 07:42:49 -0000	1.17
@@ -116,7 +116,6 @@
 # CONFIG_KEXEC is not set
 # CONFIG_CRASH is not set
 CONFIG_XEN_SYSFS=y
-# CONFIG_OPROFILE is not set
 CONFIG_PCI=y
 # CONFIG_PCI_GOBIOS is not set
 # CONFIG_PCI_GOMMCONFIG is not set



From fedora-cvs-commits at redhat.com  Thu Apr 27 07:42:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 03:42:54 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2171,
	1.2172 linux-2.6-xen.patch, 1.14, 1.15
Message-ID: <200604270742.k3R7gs4G006434@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6266

Modified Files:
	kernel-2.6.spec linux-2.6-xen.patch 
Log Message:
rebase linux-2.6-xen cset 22432


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2171
retrieving revision 1.2172
diff -u -r1.2171 -r1.2172
--- kernel-2.6.spec	27 Apr 2006 03:17:56 -0000	1.2171
+++ kernel-2.6.spec	27 Apr 2006 07:42:31 -0000	1.2172
@@ -9,7 +9,7 @@
 # Whether to apply the Xen patches, leave this enabled.
 %define includexen 1
 # Whether to build the Xen kernels, disable if you want.
-%define buildxen 0
+%define buildxen 1
 %define buildxenPAE 0
 %define builddoc 0
 %define buildkdump 1
@@ -1706,6 +1706,11 @@
 %endif
 
 %changelog
+* Thr Apr 27 2006 Juan Quintela <quintela at redhat.com>
+- Enable xen again
+- rebase linux-2.6-xen linux-2.6-xen
+- fix & enable xenoprof
+
 * Wed Apr 26 2006 Dave Jones <davej at redhat.com>
 - 2.6.17rc3
 - 2.6.17rc2-git8

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   94 
 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                    | 1170 ++++++++
 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                            |   96 
 arch/i386/kernel/head-xen.S                         |  171 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2748 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  122 
 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                      | 1176 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  354 ++
 arch/i386/kernel/process-xen.c                      |  824 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1854 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  613 ++++
 arch/i386/kernel/swiotlb.c                          |  674 ++++
 arch/i386/kernel/sysenter.c                         |  102 
 arch/i386/kernel/time-xen.c                         | 1097 +++++++
 arch/i386/kernel/traps-xen.c                        | 1137 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/vm86.c                             |    8 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |   49 
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  683 ++++
 arch/i386/mm/highmem-xen.c                          |  123 
 arch/i386/mm/hypervisor.c                           |  424 +++
 arch/i386/mm/init-xen.c                             |  855 ++++++
 arch/i386/mm/ioremap-xen.c                          |  486 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  652 ++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  441 +++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1205 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   51 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/sal.c                              |    3 
 arch/ia64/kernel/setup.c                            |   32 
 arch/ia64/xen/Makefile                              |    5 
 arch/ia64/xen/drivers/Makefile                      |   20 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/drivers/coreMakefile                  |   26 
 arch/ia64/xen/drivers/evtchn_ia64.c                 |  273 +
 arch/ia64/xen/drivers/patches/blkback.c.patch       |   33 
 arch/ia64/xen/drivers/patches/console.c.patch       |   11 
 arch/ia64/xen/drivers/patches/devmem.c.patch        |    2 
 arch/ia64/xen/drivers/patches/gnttab.c.patch        |   33 
 arch/ia64/xen/drivers/patches/privcmd.c.patch       |   30 
 arch/ia64/xen/drivers/xenia64_init.c                |   55 
 arch/ia64/xen/hypercall.S                           |  365 ++
 arch/ia64/xen/xen_ksyms.c                           |   12 
 arch/ia64/xen/xenconsole.c                          |   19 
 arch/ia64/xen/xenentry.S                            |  850 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2032 ++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  367 ++
 arch/ia64/xen/xenpal.S                              |   73 
 arch/ia64/xen/xensetup.S                            |   35 
 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                    |  725 +++++
 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                       |  777 +++++
 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                       |  164 +
 arch/x86_64/kernel/head64-xen.c                     |  140 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2229 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   58 
 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                    | 1002 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  802 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1679 ++++++++++++
 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                      | 1025 +++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/x8664_ksyms-xen.c                |  155 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  644 ++++
 arch/x86_64/mm/init-xen.c                           | 1176 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  390 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   14 
 drivers/char/tpm/Makefile                           |    1 
 drivers/char/tpm/tpm.c                              |   44 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_xen.c                          |  536 +++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 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                                 |  223 +
 drivers/xen/Makefile                                |   22 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  592 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  597 ++++
 drivers/xen/blkback/common.h                        |  145 +
 drivers/xen/blkback/interface.c                     |  181 +
 drivers/xen/blkback/vbd.c                           |  126 
 drivers/xen/blkback/xenbus.c                        |  421 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  819 +++++
 drivers/xen/blkfront/block.h                        |  165 +
 drivers/xen/blkfront/vbd.c                          |  327 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         |  910 ++++++
 drivers/xen/blktap/common.h                         |  110 
 drivers/xen/blktap/interface.c                      |  143 +
 drivers/xen/blktap/xenbus.c                         |  233 +
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  192 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  648 ++++
 drivers/xen/console/xencons_ring.c                  |  151 +
 drivers/xen/core/Makefile                           |   11 
 drivers/xen/core/evtchn.c                           |  867 ++++++
 drivers/xen/core/features.c                         |   29 
 drivers/xen/core/gnttab.c                           |  471 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   57 
 drivers/xen/core/reboot.c                           |  381 ++
 drivers/xen/core/skbuff.c                           |  144 +
 drivers/xen/core/smpboot.c                          |  576 ++++
 drivers/xen/core/xen_proc.c                         |   29 
 drivers/xen/core/xen_sysfs.c                        |  311 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  464 +++
 drivers/xen/net_driver_util.c                       |   68 
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  133 
 drivers/xen/netback/interface.c                     |  328 ++
 drivers/xen/netback/loopback.c                      |  254 +
 drivers/xen/netback/netback.c                       |  864 ++++++
 drivers/xen/netback/xenbus.c                        |  366 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1522 +++++++++++
 drivers/xen/pciback/Makefile                        |   10 
 drivers/xen/pciback/conf_space.c                    |  345 ++
 drivers/xen/pciback/conf_space.h                    |   97 
 drivers/xen/pciback/conf_space_header.c             |  267 +
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  695 +++++
 drivers/xen/pciback/pciback.h                       |   89 
 drivers/xen/pciback/pciback_ops.c                   |   97 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  453 +++
 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                       |  303 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   92 
 drivers/xen/tpmback/interface.c                     |  193 +
 drivers/xen/tpmback/tpmback.c                       | 1061 +++++++
 drivers/xen/tpmback/xenbus.c                        |  316 ++
 drivers/xen/tpmfront/Makefile                       |    2 
 drivers/xen/tpmfront/tpmfront.c                     |  767 +++++
 drivers/xen/tpmfront/tpmfront.h                     |   40 
 drivers/xen/util.c                                  |   80 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  144 +
 drivers/xen/xenbus/xenbus_client.c                  |  284 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  218 +
 drivers/xen/xenbus/xenbus_comms.h                   |   53 
 drivers/xen/xenbus/xenbus_dev.c                     |  255 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1093 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  856 ++++++
 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         |  156 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   81 
 include/asm-i386/mach-xen/asm/hw_irq.h              |   73 
 include/asm-i386/mach-xen/asm/hypercall.h           |  357 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  224 +
 include/asm-i386/mach-xen/asm/io.h                  |  390 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 include/asm-i386/mach-xen/asm/mmu.h                 |   21 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  105 
 include/asm-i386/mach-xen/asm/page.h                |  326 ++
 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      |   85 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  183 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  520 +++
 include/asm-i386/mach-xen/asm/processor.h           |  754 +++++
 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              |  576 ++++
 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         |   69 
 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/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hypercall.h                        |  274 +
 include/asm-ia64/hypervisor.h                       |  138 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/pal.h                              |    1 
 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/fixmap.h            |  114 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  141 +
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  357 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  328 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   33 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  134 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 include/asm-x86_64/mach-xen/asm/page.h              |  317 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   23 
 include/asm-x86_64/mach-xen/asm/pci.h               |  174 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  494 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  153 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  428 +++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/mm.h                                  |   13 
 include/linux/oprofile.h                            |    8 
 include/linux/pfn.h                                 |    2 
 include/linux/skbuff.h                              |   13 
 include/xen/balloon.h                               |   73 
 include/xen/driver_util.h                           |   26 
 include/xen/evtchn.h                                |  126 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   40 
 include/xen/gnttab.h                                |  160 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  187 +
 include/xen/interface/acm_ops.h                     |   98 
 include/xen/interface/arch-ia64.h                   |  337 ++
 include/xen/interface/arch-x86_32.h                 |  200 +
 include/xen/interface/arch-x86_64.h                 |  273 +
 include/xen/interface/callback.h                    |   63 
 include/xen/interface/dom0_ops.h                    |  533 +++
 include/xen/interface/event_channel.h               |  211 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  311 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   94 
 include/xen/interface/hvm/vmx_assist.h              |   97 
 include/xen/interface/io/blkif.h                    |   85 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |   84 
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  265 +
 include/xen/interface/io/tpmif.h                    |   56 
 include/xen/interface/io/xenbus.h                   |   42 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  155 +
 include/xen/interface/nmi.h                         |   59 
 include/xen/interface/physdev.h                     |   71 
 include/xen/interface/sched.h                       |  100 
 include/xen/interface/sched_ctl.h                   |   64 
 include/xen/interface/trace.h                       |   86 
 include/xen/interface/vcpu.h                        |  119 
 include/xen/interface/version.h                     |   64 
 include/xen/interface/xen-compat.h                  |   31 
 include/xen/interface/xen.h                         |  461 +++
 include/xen/interface/xenoprof.h                    |   91 
 include/xen/net_driver_util.h                       |   58 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |  101 
 include/xen/public/privcmd.h                        |   94 
 include/xen/tpmfe.h                                 |   40 
 include/xen/xen_proc.h                              |   23 
 include/xen/xenbus.h                                |  306 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/irq/manage.c                                 |   24 
 lib/Kconfig.debug                                   |   31 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  116 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/skbuff.c                                   |   41 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    9 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |   12 
 net/ipv4/xfrm4_output.c                             |    6 
 scripts/Makefile.xen                                |   14 
 394 files changed, 80578 insertions(+), 262 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/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	26 Apr 2006 11:13:46 -0000	1.14
+++ linux-2.6-xen.patch	27 Apr 2006 07:42:33 -0000	1.15
@@ -8832,8 +8832,8 @@
 +#endif /* CONFIG_ACPI */
 diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/kernel/pci-dma-xen.c new/arch/i386/kernel/pci-dma-xen.c
 --- ../upstream/hg/linux-2.6/arch/i386/kernel/pci-dma-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ new/arch/i386/kernel/pci-dma-xen.c	2006-04-24 23:54:20.000000000 +0200
-@@ -0,0 +1,344 @@
++++ new/arch/i386/kernel/pci-dma-xen.c	2006-04-26 23:37:53.000000000 +0200
+@@ -0,0 +1,354 @@
 +/*
 + * Dynamic DMA mapping support.
 + *
@@ -8929,6 +8929,13 @@
 +}
 +EXPORT_SYMBOL(dma_unmap_sg);
 +
++/*
++ * XXX This file is also used by xenLinux/ia64. 
++ * "defined(__i386__) || defined (__x86_64__)" means "!defined(__ia64__)".
++ * This #if work around should be removed once this file is merbed back into
++ * i386' pci-dma or is moved to drivers/xen/core.
++ */
++#if defined(__i386__) || defined(__x86_64__)
 +dma_addr_t
 +dma_map_page(struct device *dev, struct page *page, unsigned long offset,
 +	     size_t size, enum dma_data_direction direction)
@@ -8958,6 +8965,7 @@
 +		swiotlb_unmap_page(dev, dma_address, size, direction);
 +}
 +EXPORT_SYMBOL(dma_unmap_page);
++#endif /* defined(__i386__) || defined(__x86_64__) */
 +
 +int
 +dma_mapping_error(dma_addr_t dma_addr)
@@ -9040,6 +9048,7 @@
 +}
 +EXPORT_SYMBOL(dma_free_coherent);
 +
++#ifdef ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY
 +int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
 +				dma_addr_t device_addr, size_t size, int flags)
 +{
@@ -9116,6 +9125,7 @@
 +	return mem->virt_base + (pos << PAGE_SHIFT);
 +}
 +EXPORT_SYMBOL(dma_mark_declared_memory_occupied);
++#endif /* ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY */
 +
 +dma_addr_t
 +dma_map_single(struct device *dev, void *ptr, size_t size,
@@ -20961,8 +20971,8 @@
  	bool
  	default y
 diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/ia64/kernel/entry.S new/arch/ia64/kernel/entry.S
---- ../upstream/hg/linux-2.6/arch/ia64/kernel/entry.S	2006-04-17 19:14:56.000000000 +0200
-+++ new/arch/ia64/kernel/entry.S	2006-04-24 23:54:22.000000000 +0200
+--- ../upstream/hg/linux-2.6/arch/ia64/kernel/entry.S	2006-04-26 18:04:19.000000000 +0200
++++ new/arch/ia64/kernel/entry.S	2006-04-26 23:35:20.000000000 +0200
 @@ -181,7 +181,7 @@ END(sys_clone)
   *	called.  The code starting at .map relies on this.  The rest of the code
   *	doesn't care about the interrupt masking status.
@@ -29782,8 +29792,8 @@
 +}
 diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/x86_64/kernel/head-xen.S new/arch/x86_64/kernel/head-xen.S
 --- ../upstream/hg/linux-2.6/arch/x86_64/kernel/head-xen.S	1970-01-01 01:00:00.000000000 +0100
-+++ new/arch/x86_64/kernel/head-xen.S	2006-04-24 23:54:53.000000000 +0200
-@@ -0,0 +1,163 @@
++++ new/arch/x86_64/kernel/head-xen.S	2006-04-25 13:33:31.000000000 +0200
+@@ -0,0 +1,164 @@
 +/*
 + *  linux/arch/x86_64/kernel/head.S -- start in 32bit and switch to 64bit
 + *
@@ -29809,6 +29819,7 @@
 +#include <asm/cache.h>
 +
 +	.text
++	.section .bootstrap.text
 +	.code64
 +	.globl startup_64
 +startup_64:
@@ -41121,9 +41132,9 @@
  	help
  	  The Power Management Timer is available on all ACPI-capable,
 diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/drivers/char/mem.c new/drivers/char/mem.c
---- ../upstream/hg/linux-2.6/drivers/char/mem.c	2006-04-04 08:17:33.000000000 +0200
-+++ new/drivers/char/mem.c	2006-04-24 23:55:04.000000000 +0200
-@@ -102,6 +102,7 @@ static inline int valid_mmap_phys_addr_r
+--- ../upstream/hg/linux-2.6/drivers/char/mem.c	2006-04-26 18:04:19.000000000 +0200
++++ new/drivers/char/mem.c	2006-04-26 23:35:20.000000000 +0200
+@@ -103,6 +103,7 @@ static inline int valid_mmap_phys_addr_r
  }
  #endif
  
@@ -41131,7 +41142,7 @@
  /*
   * This funcion reads the *physical* memory. The f_pos points directly to the 
   * memory location. 
-@@ -224,6 +225,7 @@ static ssize_t write_mem(struct file * f
+@@ -225,6 +226,7 @@ static ssize_t write_mem(struct file * f
  	*ppos += written;
  	return written;
  }
@@ -41139,7 +41150,7 @@
  
  #ifndef __HAVE_PHYS_MEM_ACCESS_PROT
  static pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
-@@ -765,6 +767,7 @@ static int open_port(struct inode * inod
+@@ -778,6 +780,7 @@ static int open_port(struct inode * inod
  #define open_kmem	open_mem
  #define open_oldmem	open_mem
  
@@ -41147,7 +41158,7 @@
  static struct file_operations mem_fops = {
  	.llseek		= memory_lseek,
  	.read		= read_mem,
-@@ -772,6 +775,9 @@ static struct file_operations mem_fops =
+@@ -785,6 +788,9 @@ static struct file_operations mem_fops =
  	.mmap		= mmap_mem,
  	.open		= open_mem,
  };
@@ -41949,6 +41960,375 @@
  obj-$(CONFIG_IDE)		+= ide/
  obj-$(CONFIG_FC4)		+= fc4/
  obj-$(CONFIG_SCSI)		+= scsi/
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/drivers/oprofile/buffer_sync.c new/drivers/oprofile/buffer_sync.c
+--- ../upstream/hg/linux-2.6/drivers/oprofile/buffer_sync.c	2006-01-09 15:53:59.000000000 +0100
++++ new/drivers/oprofile/buffer_sync.c	2006-04-27 01:41:32.000000000 +0200
+@@ -6,6 +6,10 @@
+  *
+  * @author John Levon <levon at movementarian.org>
+  *
++ * Modified by Aravind Menon for Xen
++ * These modifications are:
++ * Copyright (C) 2005 Hewlett-Packard Co.
++ *
+  * This is the core of the buffer management. Each
+  * CPU buffer is processed and entered into the
+  * global event buffer. Such processing is necessary
+@@ -275,15 +279,24 @@ static void add_cpu_switch(int i)
+ 	last_cookie = INVALID_COOKIE;
+ }
+ 
+-static void add_kernel_ctx_switch(unsigned int in_kernel)
++static void add_cpu_mode_switch(unsigned int cpu_mode)
+ {
+ 	add_event_entry(ESCAPE_CODE);
+-	if (in_kernel)
+-		add_event_entry(KERNEL_ENTER_SWITCH_CODE); 
+-	else
+-		add_event_entry(KERNEL_EXIT_SWITCH_CODE); 
++	switch (cpu_mode) {
++	case CPU_MODE_USER:
++		add_event_entry(USER_ENTER_SWITCH_CODE);
++		break;
++	case CPU_MODE_KERNEL:
++		add_event_entry(KERNEL_ENTER_SWITCH_CODE);
++		break;
++	case CPU_MODE_XEN:
++		add_event_entry(XEN_ENTER_SWITCH_CODE);
++		break;
++	default:
++		break;
++	}
+ }
+- 
++
+ static void
+ add_user_ctx_switch(struct task_struct const * task, unsigned long cookie)
+ {
+@@ -348,9 +361,9 @@ static int add_us_sample(struct mm_struc
+  * for later lookup from userspace.
+  */
+ static int
+-add_sample(struct mm_struct * mm, struct op_sample * s, int in_kernel)
++add_sample(struct mm_struct * mm, struct op_sample * s, int cpu_mode)
+ {
+-	if (in_kernel) {
++	if (cpu_mode >= CPU_MODE_KERNEL) {
+ 		add_sample_entry(s->eip, s->event);
+ 		return 1;
+ 	} else if (mm) {
+@@ -496,7 +509,7 @@ void sync_buffer(int cpu)
+ 	struct mm_struct *mm = NULL;
+ 	struct task_struct * new;
+ 	unsigned long cookie = 0;
+-	int in_kernel = 1;
++	int cpu_mode = 1;
+ 	unsigned int i;
+ 	sync_buffer_state state = sb_buffer_start;
+ 	unsigned long available;
+@@ -513,12 +526,12 @@ void sync_buffer(int cpu)
+ 		struct op_sample * s = &cpu_buf->buffer[cpu_buf->tail_pos];
+  
+ 		if (is_code(s->eip)) {
+-			if (s->event <= CPU_IS_KERNEL) {
++			if (s->event <= CPU_MODE_XEN) {
+ 				/* kernel/userspace switch */
+-				in_kernel = s->event;
++				cpu_mode = s->event;
+ 				if (state == sb_buffer_start)
+ 					state = sb_sample_start;
+-				add_kernel_ctx_switch(s->event);
++				add_cpu_mode_switch(s->event);
+ 			} else if (s->event == CPU_TRACE_BEGIN) {
+ 				state = sb_bt_start;
+ 				add_trace_begin();
+@@ -536,7 +549,7 @@ void sync_buffer(int cpu)
+ 			}
+ 		} else {
+ 			if (state >= sb_bt_start &&
+-			    !add_sample(mm, s, in_kernel)) {
++			    !add_sample(mm, s, cpu_mode)) {
+ 				if (state == sb_bt_start) {
+ 					state = sb_bt_ignore;
+ 					atomic_inc(&oprofile_stats.bt_lost_no_mapping);
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/drivers/oprofile/cpu_buffer.c new/drivers/oprofile/cpu_buffer.c
+--- ../upstream/hg/linux-2.6/drivers/oprofile/cpu_buffer.c	2006-04-04 08:17:55.000000000 +0200
++++ new/drivers/oprofile/cpu_buffer.c	2006-04-27 01:41:32.000000000 +0200
+@@ -6,6 +6,10 @@
+  *
+  * @author John Levon <levon at movementarian.org>
+  *
++ * Modified by Aravind Menon for Xen
++ * These modifications are:
++ * Copyright (C) 2005 Hewlett-Packard Co.
++ *
+  * Each CPU has a local buffer that stores PC value/event
+  * pairs. We also log context switches when we notice them.
+  * Eventually each CPU's buffer is processed into the global
+@@ -57,7 +61,7 @@ int alloc_cpu_buffers(void)
+ 			goto fail;
+  
+ 		b->last_task = NULL;
+-		b->last_is_kernel = -1;
++		b->last_cpu_mode = -1;
+ 		b->tracing = 0;
+ 		b->buffer_size = buffer_size;
+ 		b->tail_pos = 0;
+@@ -113,7 +117,7 @@ void cpu_buffer_reset(struct oprofile_cp
+ 	 * collected will populate the buffer with proper
+ 	 * values to initialize the buffer
+ 	 */
+-	cpu_buf->last_is_kernel = -1;
++	cpu_buf->last_cpu_mode = -1;
+ 	cpu_buf->last_task = NULL;
+ }
+ 
+@@ -163,13 +167,13 @@ add_code(struct oprofile_cpu_buffer * bu
+  * because of the head/tail separation of the writer and reader
+  * of the CPU buffer.
+  *
+- * is_kernel is needed because on some architectures you cannot
++ * cpu_mode is needed because on some architectures you cannot
+  * tell if you are in kernel or user space simply by looking at
+- * pc. We tag this in the buffer by generating kernel enter/exit
+- * events whenever is_kernel changes
++ * pc. We tag this in the buffer by generating kernel/user (and xen)
++ *  enter events whenever cpu_mode changes
+  */
+ static int log_sample(struct oprofile_cpu_buffer * cpu_buf, unsigned long pc,
+-		      int is_kernel, unsigned long event)
++		      int cpu_mode, unsigned long event)
+ {
+ 	struct task_struct * task;
+ 
+@@ -180,16 +184,16 @@ static int log_sample(struct oprofile_cp
+ 		return 0;
+ 	}
+ 
+-	is_kernel = !!is_kernel;
++	WARN_ON(cpu_mode > CPU_MODE_XEN);
+ 
+ 	task = current;
+ 
+ 	/* notice a switch from user->kernel or vice versa */
+-	if (cpu_buf->last_is_kernel != is_kernel) {
+-		cpu_buf->last_is_kernel = is_kernel;
+-		add_code(cpu_buf, is_kernel);
++	if (cpu_buf->last_cpu_mode != cpu_mode) {
++		cpu_buf->last_cpu_mode = cpu_mode;
++		add_code(cpu_buf, cpu_mode);
+ 	}
+-
++	
+ 	/* notice a task switch */
+ 	if (cpu_buf->last_task != task) {
+ 		cpu_buf->last_task = task;
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/drivers/oprofile/cpu_buffer.h new/drivers/oprofile/cpu_buffer.h
+--- ../upstream/hg/linux-2.6/drivers/oprofile/cpu_buffer.h	2005-11-07 20:02:49.000000000 +0100
++++ new/drivers/oprofile/cpu_buffer.h	2006-04-27 01:41:32.000000000 +0200
+@@ -36,7 +36,7 @@ struct oprofile_cpu_buffer {
+ 	volatile unsigned long tail_pos;
+ 	unsigned long buffer_size;
+ 	struct task_struct * last_task;
+-	int last_is_kernel;
++	int last_cpu_mode;
+ 	int tracing;
+ 	struct op_sample * buffer;
+ 	unsigned long sample_received;
+@@ -51,7 +51,9 @@ extern struct oprofile_cpu_buffer cpu_bu
+ void cpu_buffer_reset(struct oprofile_cpu_buffer * cpu_buf);
+ 
+ /* transient events for the CPU buffer -> event buffer */
+-#define CPU_IS_KERNEL 1
+-#define CPU_TRACE_BEGIN 2
++#define CPU_MODE_USER    0
++#define CPU_MODE_KERNEL  1
++#define CPU_MODE_XEN     2
++#define CPU_TRACE_BEGIN  3
+ 
+ #endif /* OPROFILE_CPU_BUFFER_H */
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/drivers/oprofile/event_buffer.h new/drivers/oprofile/event_buffer.h
+--- ../upstream/hg/linux-2.6/drivers/oprofile/event_buffer.h	2005-11-07 20:02:49.000000000 +0100
++++ new/drivers/oprofile/event_buffer.h	2006-04-27 01:41:32.000000000 +0200
+@@ -29,11 +29,12 @@ void wake_up_buffer_waiter(void);
+ #define CPU_SWITCH_CODE 		2
+ #define COOKIE_SWITCH_CODE 		3
+ #define KERNEL_ENTER_SWITCH_CODE	4
+-#define KERNEL_EXIT_SWITCH_CODE		5
++#define USER_ENTER_SWITCH_CODE		5
+ #define MODULE_LOADED_CODE		6
+ #define CTX_TGID_CODE			7
+ #define TRACE_BEGIN_CODE		8
+ #define TRACE_END_CODE			9
++#define XEN_ENTER_SWITCH_CODE		10
+  
+ #define INVALID_COOKIE ~0UL
+ #define NO_COOKIE 0UL
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/drivers/oprofile/oprof.c new/drivers/oprofile/oprof.c
+--- ../upstream/hg/linux-2.6/drivers/oprofile/oprof.c	2005-11-07 20:02:49.000000000 +0100
++++ new/drivers/oprofile/oprof.c	2006-04-27 02:09:53.000000000 +0200
+@@ -5,6 +5,10 @@
+  * @remark Read the file COPYING
+  *
+  * @author John Levon <levon at movementarian.org>
++ *
++ * Modified by Aravind Menon for Xen
++ * These modifications are:
++ * Copyright (C) 2005 Hewlett-Packard Co.
+  */
+ 
+ #include <linux/kernel.h>
+@@ -19,7 +23,7 @@
+ #include "cpu_buffer.h"
+ #include "buffer_sync.h"
+ #include "oprofile_stats.h"
+- 
++
+ struct oprofile_operations oprofile_ops;
+ 
+ unsigned long oprofile_started;
+@@ -33,6 +37,19 @@ static DECLARE_MUTEX(start_sem);
+  */
+ static int timer = 0;
+ 
++#ifdef CONFIG_XEN
++extern unsigned int adomains;
++extern int active_domains[MAX_OPROF_DOMAINS];
++
++int oprofile_set_active(void)
++{
++	if (oprofile_ops.set_active)
++		return oprofile_ops.set_active(active_domains, adomains);
++
++	return -EINVAL;
++}
++#endif
++
+ int oprofile_setup(void)
+ {
+ 	int err;
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/drivers/oprofile/oprof.h new/drivers/oprofile/oprof.h
+--- ../upstream/hg/linux-2.6/drivers/oprofile/oprof.h	2005-11-07 20:02:49.000000000 +0100
++++ new/drivers/oprofile/oprof.h	2006-04-27 01:41:32.000000000 +0200
+@@ -35,5 +35,7 @@ void oprofile_create_files(struct super_
+ void oprofile_timer_init(struct oprofile_operations * ops);
+ 
+ int oprofile_set_backtrace(unsigned long depth);
++
++int oprofile_set_active(void);
+  
+ #endif /* OPROF_H */
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/drivers/oprofile/oprofile_files.c new/drivers/oprofile/oprofile_files.c
+--- ../upstream/hg/linux-2.6/drivers/oprofile/oprofile_files.c	2005-11-07 20:02:49.000000000 +0100
++++ new/drivers/oprofile/oprofile_files.c	2006-04-27 02:09:53.000000000 +0200
+@@ -5,15 +5,21 @@
+  * @remark Read the file COPYING
+  *
+  * @author John Levon <levon at movementarian.org>
++ *
++ * Modified by Aravind Menon for Xen
++ * These modifications are:
++ * Copyright (C) 2005 Hewlett-Packard Co.	
+  */
+ 
+ #include <linux/fs.h>
+ #include <linux/oprofile.h>
++#include <asm/uaccess.h>
++#include <linux/ctype.h>
+ 
+ #include "event_buffer.h"
+ #include "oprofile_stats.h"
+ #include "oprof.h"
+- 
++
+ unsigned long fs_buffer_size = 131072;
+ unsigned long fs_cpu_buffer_size = 8192;
+ unsigned long fs_buffer_watershed = 32768; /* FIXME: tune */
+@@ -117,11 +123,83 @@ static ssize_t dump_write(struct file * 
+ static struct file_operations dump_fops = {
+ 	.write		= dump_write,
+ };
+- 
++
++#ifdef CONFIG_XEN
++#define TMPBUFSIZE 512
++
++unsigned int adomains = 0;
++long active_domains[MAX_OPROF_DOMAINS];
++
++static ssize_t adomain_write(struct file * file, char const __user * buf, 
++			     size_t count, loff_t * offset)
++{
++	char tmpbuf[TMPBUFSIZE];
++	char * startp = tmpbuf;
++	char * endp = tmpbuf;
++	int i;
++	unsigned long val;
++	
++	if (*offset)
++		return -EINVAL;	
++	if (!count)
++		return 0;
++	if (count > TMPBUFSIZE - 1)
++		return -EINVAL;
++
++	memset(tmpbuf, 0x0, TMPBUFSIZE);
++
++	if (copy_from_user(tmpbuf, buf, count))
++		return -EFAULT;
++	
++	for (i = 0; i < MAX_OPROF_DOMAINS; i++)
++		active_domains[i] = -1;
++	adomains = 0;
++
++	while (1) {
++		val = simple_strtol(startp, &endp, 0);
++		if (endp == startp)
++			break;
++		while (ispunct(*endp))
++			endp++;
++		active_domains[adomains++] = val;
++		if (adomains >= MAX_OPROF_DOMAINS)
++			break;
++		startp = endp;
++	}
++	if (oprofile_set_active())
++		return -EINVAL; 
++	return count;
++}
++
++static ssize_t adomain_read(struct file * file, char __user * buf, 
++			    size_t count, loff_t * offset)
++{
++	char tmpbuf[TMPBUFSIZE];
++	size_t len = 0;
++	int i;
++	/* This is all screwed up if we run out of space */
++	for (i = 0; i < adomains; i++) 
++		len += snprintf(tmpbuf + len, TMPBUFSIZE - len, 
++				"%u ", (unsigned int)active_domains[i]);
++	len += snprintf(tmpbuf + len, TMPBUFSIZE - len, "\n");
++	return simple_read_from_buffer((void __user *)buf, count, 
++				       offset, tmpbuf, len);
++}
++
++
++static struct file_operations active_domain_ops = {
++	.read		= adomain_read,
++	.write		= adomain_write,
++};
++#endif /* CONFIG_XEN */
++
+ void oprofile_create_files(struct super_block * sb, struct dentry * root)
+ {
+ 	oprofilefs_create_file(sb, root, "enable", &enable_fops);
+ 	oprofilefs_create_file_perm(sb, root, "dump", &dump_fops, 0666);
++#ifdef CONFIG_XEN
++	oprofilefs_create_file(sb, root, "active_domains", &active_domain_ops);
++#endif
+ 	oprofilefs_create_file(sb, root, "buffer", &event_buffer_fops);
+ 	oprofilefs_create_ulong(sb, root, "buffer_size", &fs_buffer_size);
+ 	oprofilefs_create_ulong(sb, root, "buffer_watershed", &fs_buffer_watershed);
 diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/drivers/pci/Kconfig new/drivers/pci/Kconfig
 --- ../upstream/hg/linux-2.6/drivers/pci/Kconfig	2006-04-04 08:17:56.000000000 +0200
 +++ new/drivers/pci/Kconfig	2006-04-24 23:55:35.000000000 +0200
@@ -55989,8 +56369,8 @@
 +}
 diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/drivers/xen/pciback/pciback.h new/drivers/xen/pciback/pciback.h
 --- ../upstream/hg/linux-2.6/drivers/xen/pciback/pciback.h	1970-01-01 01:00:00.000000000 +0100
-+++ new/drivers/xen/pciback/pciback.h	2006-04-24 23:56:01.000000000 +0200
-@@ -0,0 +1,78 @@
++++ new/drivers/xen/pciback/pciback.h	2006-04-26 23:37:53.000000000 +0200
+@@ -0,0 +1,89 @@
 +/*
 + * PCI Backend Common Data Structures & Function Declarations
 + *
@@ -56004,6 +56384,8 @@
 +#include <xen/xenbus.h>
 +#include <linux/list.h>
 +#include <linux/spinlock.h>
++#include <linux/workqueue.h>
++#include <asm/atomic.h>
 +#include <xen/interface/io/pciif.h>
 +
 +struct pci_dev_entry {
@@ -56011,6 +56393,9 @@
 +	struct pci_dev *dev;
 +};
 +
++#define _PDEVF_op_active 	(0)
++#define PDEVF_op_active 	(1<<(_PDEVF_op_active))
++
 +struct pciback_device {
 +	void *pci_dev_data;
 +	spinlock_t dev_lock;
@@ -56022,7 +56407,12 @@
 +
 +	int evtchn_irq;
 +
++	struct vm_struct *sh_area;
 +	struct xen_pci_sharedinfo *sh_info;
++
++	unsigned long flags;
++
++	struct work_struct op_work;
 +};
 +
 +struct pciback_dev_data {
@@ -56063,6 +56453,7 @@
 +
 +/* Handles events from front-end */
 +irqreturn_t pciback_handle_event(int irq, void *dev_id, struct pt_regs *regs);
++void pciback_do_op(void *data);
 +
 +int pciback_xenbus_register(void);
 +void pciback_xenbus_unregister(void);
@@ -56071,8 +56462,8 @@
 +#endif
 diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/drivers/xen/pciback/pciback_ops.c new/drivers/xen/pciback/pciback_ops.c
 --- ../upstream/hg/linux-2.6/drivers/xen/pciback/pciback_ops.c	1970-01-01 01:00:00.000000000 +0100
-+++ new/drivers/xen/pciback/pciback_ops.c	2006-04-24 23:56:01.000000000 +0200
-@@ -0,0 +1,74 @@
++++ new/drivers/xen/pciback/pciback_ops.c	2006-04-26 23:37:53.000000000 +0200
+@@ -0,0 +1,97 @@
 +/*
 + * PCI Backend Operations - respond to PCI requests from Frontend
 + *
@@ -56115,18 +56506,25 @@
 +	pciback_config_reset(dev);
 +}
 +
-+irqreturn_t pciback_handle_event(int irq, void *dev_id, struct pt_regs *regs)
++static inline void test_and_schedule_op(struct pciback_device *pdev)
 +{
-+	struct pciback_device *pdev = dev_id;
++	/* Check that frontend is requesting an operation and that we are not
++	 * already processing a request */
++	if (test_bit(_XEN_PCIF_active, (unsigned long *)&pdev->sh_info->flags)
++	    && !test_and_set_bit(_PDEVF_op_active, &pdev->flags))
++		schedule_work(&pdev->op_work);
++}
++
++/* Performing the configuration space reads/writes must not be done in atomic
++ * context because some of the pci_* functions can sleep (mostly due to ACPI
++ * use of semaphores). This function is intended to be called from a work
++ * queue in process context taking a struct pciback_device as a parameter */
++void pciback_do_op(void *data)
++{
++	struct pciback_device *pdev = data;
 +	struct pci_dev *dev;
 +	struct xen_pci_op *op = &pdev->sh_info->op;
 +
-+	if (unlikely(!test_bit(_XEN_PCIF_active,
-+			       (unsigned long *)&pdev->sh_info->flags))) {
-+		pr_debug("pciback: interrupt, but no active operation\n");
-+		goto out;
-+	}
-+
 +	dev = pciback_get_pci_dev(pdev, op->domain, op->bus, op->devfn);
 +
 +	if (dev == NULL)
@@ -56140,11 +56538,27 @@
 +	else
 +		op->err = XEN_PCI_ERR_not_implemented;
 +
++	/* Tell the driver domain that we're done. */ 
 +	wmb();
 +	clear_bit(_XEN_PCIF_active, (unsigned long *)&pdev->sh_info->flags);
 +	notify_remote_via_irq(pdev->evtchn_irq);
 +
-+      out:
++	/* Mark that we're done. */
++	smp_mb__before_clear_bit(); /* /after/ clearing PCIF_active */
++	clear_bit(_PDEVF_op_active, &pdev->flags);
++	smp_mb__after_clear_bit(); /* /before/ final check for work */
++
++	/* Check to see if the driver domain tried to start another request in
++	 * between clearing _XEN_PCIF_active and clearing _PDEVF_op_active. */
++	test_and_schedule_op(pdev);
++}
++
++irqreturn_t pciback_handle_event(int irq, void *dev_id, struct pt_regs *regs)
++{
++	struct pciback_device *pdev = dev_id;
++
++	test_and_schedule_op(pdev);
++
 +	return IRQ_HANDLED;
 +}
 diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/drivers/xen/pciback/pci_stub.c new/drivers/xen/pciback/pci_stub.c
@@ -57056,8 +57470,8 @@
 +}
 diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/drivers/xen/pciback/xenbus.c new/drivers/xen/pciback/xenbus.c
 --- ../upstream/hg/linux-2.6/drivers/xen/pciback/xenbus.c	1970-01-01 01:00:00.000000000 +0100
-+++ new/drivers/xen/pciback/xenbus.c	2006-04-24 23:56:01.000000000 +0200
-@@ -0,0 +1,441 @@
++++ new/drivers/xen/pciback/xenbus.c	2006-04-26 23:37:53.000000000 +0200
+@@ -0,0 +1,453 @@
 +/*
 + * PCI Backend Xenbus Setup - handles setup with frontend and xend
 + *
@@ -57086,10 +57500,13 @@
 +
 +	spin_lock_init(&pdev->dev_lock);
 +
++	pdev->sh_area = NULL;
 +	pdev->sh_info = NULL;
 +	pdev->evtchn_irq = INVALID_EVTCHN_IRQ;
 +	pdev->be_watching = 0;
 +
++	INIT_WORK(&pdev->op_work, pciback_do_op, pdev);
++
 +	if (pciback_init_devices(pdev)) {
 +		kfree(pdev);
 +		pdev = NULL;
@@ -57107,8 +57524,13 @@
 +	if (pdev->evtchn_irq != INVALID_EVTCHN_IRQ)
 +		unbind_from_irqhandler(pdev->evtchn_irq, pdev);
 +
++	/* If the driver domain started an op, make sure we complete it or
++	 * delete it before releasing the shared memory */
++	cancel_delayed_work(&pdev->op_work);
++	flush_scheduled_work();
++
 +	if (pdev->sh_info)
-+		xenbus_unmap_ring_vfree(pdev->xdev, pdev->sh_info);
++		xenbus_unmap_ring_vfree(pdev->xdev, pdev->sh_area);
 +
 +	pciback_release_devices(pdev);
 +
@@ -57123,15 +57545,19 @@
 +{
 +	int err = 0;
 +	int evtchn;
++	struct vm_struct *area;
++
 +	dev_dbg(&pdev->xdev->dev,
 +		"Attaching to frontend resources - gnt_ref=%d evtchn=%d\n",
 +		gnt_ref, remote_evtchn);
 +
-+	err =
-+	    xenbus_map_ring_valloc(pdev->xdev, gnt_ref,
-+				   (void **)&pdev->sh_info);
-+	if (err)
++	area = xenbus_map_ring_valloc(pdev->xdev, gnt_ref);
++	if (IS_ERR(area)) {
++		err = PTR_ERR(area);
 +		goto out;
++	}
++	pdev->sh_area = area;
++	pdev->sh_info = area->addr;
 +
 +	err = xenbus_bind_evtchn(pdev->xdev, remote_evtchn, &evtchn);
 +	if (err)
@@ -61100,8 +61526,8 @@
 +xenbus-objs += xenbus_dev.o
 diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/drivers/xen/xenbus/xenbus_backend_client.c new/drivers/xen/xenbus/xenbus_backend_client.c
 --- ../upstream/hg/linux-2.6/drivers/xen/xenbus/xenbus_backend_client.c	1970-01-01 01:00:00.000000000 +0100
-+++ new/drivers/xen/xenbus/xenbus_backend_client.c	2006-04-24 23:56:01.000000000 +0200
-@@ -0,0 +1,165 @@
++++ new/drivers/xen/xenbus/xenbus_backend_client.c	2006-04-26 23:37:53.000000000 +0200
+@@ -0,0 +1,144 @@
 +/******************************************************************************
 + * Backend-client-facing interface for the Xenbus driver.  In other words, the
 + * interface between the Xenbus and the device-specific code in the backend
@@ -61134,21 +61560,20 @@
 + * IN THE SOFTWARE.
 + */
 +
++#include <linux/err.h>
 +#include <xen/gnttab.h>
 +#include <xen/xenbus.h>
 +#include <xen/driver_util.h>
 +
 +/* Based on Rusty Russell's skeleton driver's map_page */
-+int xenbus_map_ring_valloc(struct xenbus_device *dev, int gnt_ref, void **vaddr)
++struct vm_struct *xenbus_map_ring_valloc(struct xenbus_device *dev, int gnt_ref)
 +{
 +	struct gnttab_map_grant_ref op;
 +	struct vm_struct *area;
 +
-+	*vaddr = NULL;
-+
 +	area = alloc_vm_area(PAGE_SIZE);
 +	if (!area)
-+		return -ENOMEM;
++		return ERR_PTR(-ENOMEM);
 +
 +	gnttab_set_map_op(&op, (unsigned long)area->addr, GNTMAP_host_map,
 +			  gnt_ref, dev->otherend_id);
@@ -61162,14 +61587,14 @@
 +		xenbus_dev_fatal(dev, op.status,
 +				 "mapping in shared page %d from domain %d",
 +				 gnt_ref, dev->otherend_id);
-+		return op.status;
++		BUG_ON(!IS_ERR(ERR_PTR(op.status)));
++		return ERR_PTR(op.status);
 +	}
 +
 +	/* Stuff the handle in an unused field */
 +	area->phys_addr = (unsigned long)op.handle;
 +
-+	*vaddr = area->addr;
-+	return 0;
++	return area;
 +}
 +EXPORT_SYMBOL_GPL(xenbus_map_ring_valloc);
 +
@@ -61196,31 +61621,11 @@
 +
 +
 +/* Based on Rusty Russell's skeleton driver's unmap_page */
-+int xenbus_unmap_ring_vfree(struct xenbus_device *dev, void *vaddr)
++int xenbus_unmap_ring_vfree(struct xenbus_device *dev, struct vm_struct *area)
 +{
-+	struct vm_struct *area;
 +	struct gnttab_unmap_grant_ref op;
 +
-+	/* It'd be nice if linux/vmalloc.h provided a find_vm_area(void *addr)
-+	 * method so that we don't have to muck with vmalloc internals here.
-+	 * We could force the user to hang on to their struct vm_struct from
-+	 * xenbus_map_ring_valloc, but these 6 lines considerably simplify
-+	 * this API.
-+	 */
-+	read_lock(&vmlist_lock);
-+	for (area = vmlist; area != NULL; area = area->next) {
-+		if (area->addr == vaddr)
-+			break;
-+	}
-+	read_unlock(&vmlist_lock);
-+
-+	if (!area) {
-+		xenbus_dev_error(dev, -ENOENT,
-+				 "can't find mapped virtual address %p", vaddr);
-+		return GNTST_bad_virt_addr;
-+	}
-+
-+	gnttab_set_unmap_op(&op, (unsigned long)vaddr, GNTMAP_host_map,
++	gnttab_set_unmap_op(&op, (unsigned long)area->addr, GNTMAP_host_map,
 +			    (grant_handle_t)area->phys_addr);
 +
 +	lock_vm_area(area);
@@ -72486,7 +72891,7 @@
 +#endif /* _ASM_HW_IRQ_H */
 diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/include/asm-x86_64/mach-xen/asm/hypercall.h new/include/asm-x86_64/mach-xen/asm/hypercall.h
 --- ../upstream/hg/linux-2.6/include/asm-x86_64/mach-xen/asm/hypercall.h	1970-01-01 01:00:00.000000000 +0100
-+++ new/include/asm-x86_64/mach-xen/asm/hypercall.h	2006-04-24 23:56:44.000000000 +0200
++++ new/include/asm-x86_64/mach-xen/asm/hypercall.h	2006-04-27 02:09:53.000000000 +0200
 @@ -0,0 +1,357 @@
 +/******************************************************************************
 + * hypercall.h
@@ -72829,9 +73234,9 @@
 +
 +static inline int
 +HYPERVISOR_xenoprof_op(
-+	int op, unsigned long arg1, unsigned long arg2)
++	int op, void *arg)
 +{
-+	return _hypercall3(int, xenoprof_op, op, arg1, arg2);
++	return _hypercall2(int, xenoprof_op, op, arg);
 +}
 +
 +#endif /* __HYPERCALL_H__ */
@@ -77402,6 +77807,31 @@
  #ifdef CONFIG_PROC_FS
  void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
  #else
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/include/linux/oprofile.h new/include/linux/oprofile.h
+--- ../upstream/hg/linux-2.6/include/linux/oprofile.h	2006-04-04 08:18:22.000000000 +0200
++++ new/include/linux/oprofile.h	2006-04-27 02:10:48.000000000 +0200
+@@ -16,6 +16,10 @@
+ #include <linux/types.h>
+ #include <linux/spinlock.h>
+ #include <asm/atomic.h>
++
++#ifdef CONFIG_XEN
++#include <xen/interface/xenoprof.h>
++#endif
+  
+ struct super_block;
+ struct dentry;
+@@ -27,6 +31,10 @@ struct oprofile_operations {
+ 	/* create any necessary configuration files in the oprofile fs.
+ 	 * Optional. */
+ 	int (*create_files)(struct super_block * sb, struct dentry * root);
++#ifdef CONFIG_XEN
++	/* setup active domains with Xen */
++	int (*set_active)(int *active_domains, unsigned int adomains);
++#endif
+ 	/* Do any necessary interrupt setup. Optional. */
+ 	int (*setup)(void);
+ 	/* Do any necessary interrupt shutdown. Optional. */
 diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/include/linux/pfn.h new/include/linux/pfn.h
 --- ../upstream/hg/linux-2.6/include/linux/pfn.h	2006-04-04 08:18:23.000000000 +0200
 +++ new/include/linux/pfn.h	2006-04-24 23:56:50.000000000 +0200
@@ -82944,7 +83374,7 @@
 +#endif
 diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/include/xen/xenbus.h new/include/xen/xenbus.h
 --- ../upstream/hg/linux-2.6/include/xen/xenbus.h	1970-01-01 01:00:00.000000000 +0100
-+++ new/include/xen/xenbus.h	2006-04-24 23:56:56.000000000 +0200
++++ new/include/xen/xenbus.h	2006-04-26 23:37:53.000000000 +0200
 @@ -0,0 +1,306 @@
 +/******************************************************************************
 + * xenbus.h
@@ -83176,8 +83606,8 @@
 + * or -ENOMEM on error. If an error is returned, device will switch to
 + * XenbusStateClosing and the error message will be saved in XenStore.
 + */
-+int xenbus_map_ring_valloc(struct xenbus_device *dev,
-+			   int gnt_ref, void **vaddr);
++struct vm_struct *xenbus_map_ring_valloc(struct xenbus_device *dev,
++					 int gnt_ref);
 +int xenbus_map_ring(struct xenbus_device *dev, int gnt_ref,
 +			   grant_handle_t *handle, void *vaddr);
 +
@@ -83189,7 +83619,7 @@
 + * Returns 0 on success and returns GNTST_* on error
 + * (see xen/include/interface/grant_table.h).
 + */
-+int xenbus_unmap_ring_vfree(struct xenbus_device *dev, void *vaddr);
++int xenbus_unmap_ring_vfree(struct xenbus_device *dev, struct vm_struct *);
 +int xenbus_unmap_ring(struct xenbus_device *dev,
 +		      grant_handle_t handle, void *vaddr);
 +
@@ -83633,8 +84063,8 @@
  	flush_cache_mm(mm);
  	tlb = tlb_gather_mmu(mm, 1);
 diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/mm/page_alloc.c new/mm/page_alloc.c
---- ../upstream/hg/linux-2.6/mm/page_alloc.c	2006-04-20 13:58:49.000000000 +0200
-+++ new/mm/page_alloc.c	2006-04-24 23:56:58.000000000 +0200
+--- ../upstream/hg/linux-2.6/mm/page_alloc.c	2006-04-26 18:04:20.000000000 +0200
++++ new/mm/page_alloc.c	2006-04-26 23:35:21.000000000 +0200
 @@ -437,7 +437,8 @@ static void __free_pages_ok(struct page 
  	int i;
  	int reserved = 0;
@@ -83657,7 +84087,7 @@
  		page->mapping = NULL;
 diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/net/core/dev.c new/net/core/dev.c
 --- ../upstream/hg/linux-2.6/net/core/dev.c	2006-04-21 20:21:11.000000000 +0200
-+++ new/net/core/dev.c	2006-04-24 23:57:00.000000000 +0200
++++ new/net/core/dev.c	2006-04-26 23:37:54.000000000 +0200
 @@ -116,6 +116,12 @@
  #include <asm/current.h>
  #include <linux/audit.h>
@@ -83708,7 +84138,7 @@
 +	return -EPROTO;
 +}
 +#else
-+inline int skb_checksum_setup(struct sk_buff *skb) {}
++inline int skb_checksum_setup(struct sk_buff *skb) { return 0; }
 +#endif
 +
 +
@@ -83932,14 +84362,3 @@
 +	  )
 +# filterxen($1 = allobj, $2 = noobjs)
 +filterxen = $(filter-out $(2), $(1))
-diff -r c68722b17299 arch/x86_64/kernel/head-xen.S
---- a/arch/x86_64/kernel/head-xen.S	Wed Apr 19 11:47:47 2006 +0100
-+++ b/arch/x86_64/kernel/head-xen.S	Fri Apr 21 19:32:49 2006 -0400
-@@ -23,6 +23,7 @@
- #include <asm/cache.h>
- 
- 	.text
-+	.section .bootstrap.text
- 	.code64
- 	.globl startup_64
- startup_64:



From fedora-cvs-commits at redhat.com  Thu Apr 27 07:50:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 03:50:39 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2172,1.2173
Message-ID: <200604270750.k3R7odYX021728@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21691

Modified Files:
	kernel-2.6.spec 
Log Message:
fix type


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2172
retrieving revision 1.2173
diff -u -r1.2172 -r1.2173
--- kernel-2.6.spec	27 Apr 2006 07:42:31 -0000	1.2172
+++ kernel-2.6.spec	27 Apr 2006 07:50:33 -0000	1.2173
@@ -1706,7 +1706,7 @@
 %endif
 
 %changelog
-* Thr Apr 27 2006 Juan Quintela <quintela at redhat.com>
+* Thu Apr 27 2006 Juan Quintela <quintela at redhat.com>
 - Enable xen again
 - rebase linux-2.6-xen linux-2.6-xen
 - fix & enable xenoprof



From fedora-cvs-commits at redhat.com  Thu Apr 27 08:23:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 04:23:49 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2173,1.2174
Message-ID: <200604270823.k3R8NnMI010937@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10895

Modified Files:
	kernel-2.6.spec 
Log Message:
remove figlet again


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2173
retrieving revision 1.2174
diff -u -r1.2173 -r1.2174
--- kernel-2.6.spec	27 Apr 2006 07:50:33 -0000	1.2173
+++ kernel-2.6.spec	27 Apr 2006 08:23:41 -0000	1.2174
@@ -1707,6 +1707,7 @@
 
 %changelog
 * Thu Apr 27 2006 Juan Quintela <quintela at redhat.com>
+- Remove figlet by hand again.
 - Enable xen again
 - rebase linux-2.6-xen linux-2.6-xen
 - fix & enable xenoprof



From fedora-cvs-commits at redhat.com  Thu Apr 27 08:27:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 04:27:41 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2102,1.2103
Message-ID: <200604270827.k3R8Rfd5012053@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv12019

Modified Files:
	kernel-2.6.spec 
Log Message:
if you put right xen version number, beehive don't complain


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2102
retrieving revision 1.2103
diff -u -r1.2102 -r1.2103
--- kernel-2.6.spec	27 Apr 2006 07:32:55 -0000	1.2102
+++ kernel-2.6.spec	27 Apr 2006 08:27:34 -0000	1.2103
@@ -181,7 +181,7 @@
 
 
 Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
-Source1: xen-20060301.tar.bz2
+Source1: xen-20060426.tar.bz2
 Source2: Config.mk
 
 Source10: COPYING.modules



From fedora-cvs-commits at redhat.com  Thu Apr 27 08:42:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 04:42:28 -0400
Subject: rpms/ruby/devel ruby.spec,1.61,1.62
Message-ID: <200604270842.k3R8gRrO015099@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15039

Modified Files:
	ruby.spec 
Log Message:
build with --enable-pthread


Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ruby.spec	27 Apr 2006 07:09:31 -0000	1.61
+++ ruby.spec	27 Apr 2006 08:42:21 -0000	1.62
@@ -5,7 +5,7 @@
 
 Name:		ruby
 Version:	1.8.4
-Release:	5.fc6
+Release:	6.fc6
 License:	Ruby License/GPL - see COPYING
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -166,6 +166,7 @@
   --with-default-kcode=none \
   --enable-shared \
   --enable-ipv6 \
+  --enable-pthread \
   --with-lookup-order-hack=INET \
   --disable-rpath \
   --with-ruby-prefix=%{_prefix}/lib
@@ -439,7 +440,7 @@
 %dir %{_datadir}/emacs/site-lisp/ruby-mode
 
 %changelog
-* Thu Apr 27 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-5
+* Thu Apr 27 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-6
 - ruby-deprecated-search-path.patch: added the deprecated installation paths
   to the search path for the backward compatibility.
 - added a Provides: ruby(abi) to ruby-libs.
@@ -447,6 +448,7 @@
   not working on 64bit arch and integer overflow on template "w". (#189350)
 - updated License tag to be more comfortable, and with a pointer to get more
   details, like Python package does. (#179933)
+- build with --enable-pthread to build Tcl/Tk module against thread enabled Tcl/Tk.
 
 * Wed Apr 19 2006 Akira TAGOH <tagoh at redhat.com>
 - ruby-rubyprefix.patch: moved all arch-independent modules under /usr/lib/ruby



From fedora-cvs-commits at redhat.com  Thu Apr 27 08:49:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 04:49:55 -0400
Subject: rpms/kernel/FC-5 linux-2.6-xen-cpusteal-hv.patch, 1.3,
	NONE linux-2.6-xen-kva-mmap.patch, 1.1,
	NONE linux-2.6-xen-time-went-backwards.patch, 1.1,
	NONE xen-9232_fix_vmx.patch, 1.1, NONE xen-9236_fix_vmx.patch,
	1.1, NONE
Message-ID: <200604270849.k3R8ntrG030337@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv30187

Removed Files:
	linux-2.6-xen-cpusteal-hv.patch linux-2.6-xen-kva-mmap.patch 
	linux-2.6-xen-time-went-backwards.patch xen-9232_fix_vmx.patch 
	xen-9236_fix_vmx.patch 
Log Message:
remove all patches already on new xen patch/tarball


--- linux-2.6-xen-cpusteal-hv.patch DELETED ---


--- linux-2.6-xen-kva-mmap.patch DELETED ---


--- linux-2.6-xen-time-went-backwards.patch DELETED ---


--- xen-9232_fix_vmx.patch DELETED ---


--- xen-9236_fix_vmx.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 27 08:50:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 04:50:38 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2103,1.2104
Message-ID: <200604270850.k3R8ocSc030483@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv30451

Modified Files:
	kernel-2.6.spec 
Log Message:
put right xen tarball version number


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2103
retrieving revision 1.2104
diff -u -r1.2103 -r1.2104
--- kernel-2.6.spec	27 Apr 2006 08:27:34 -0000	1.2103
+++ kernel-2.6.spec	27 Apr 2006 08:50:35 -0000	1.2104
@@ -429,8 +429,6 @@
 
 # Xen hypervisor patches
 Patch20000: xen-sched-sedf.patch
-Patch20001: xen-9232_fix_vmx.patch
-Patch20002: xen-9236_fix_vmx.patch
 
 
 # END OF PATCH DEFINITIONS
@@ -716,8 +714,6 @@
 
 # Any necessary hypervisor patches go here
 %patch20000 -p1
-%patch20001 -p1
-%patch20002 -p1
 
 cd linux-%{kversion}.%{_target_cpu}
 



From fedora-cvs-commits at redhat.com  Thu Apr 27 09:54:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 05:54:21 -0400
Subject: rpms/xen/devel xen.spec,1.109,1.110
Message-ID: <200604270954.k3R9sLjo007594@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/xen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7447

Modified Files:
	xen.spec 
Log Message:
xen.h now requires one more header which was not installed, Daniel



Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- xen.spec	26 Apr 2006 15:03:30 -0000	1.109
+++ xen.spec	27 Apr 2006 09:54:18 -0000	1.110
@@ -5,7 +5,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0.2
-Release: 2
+Release: 3
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -112,6 +112,7 @@
 install -m 644 tools/libxc/xen/arch-x86_64.h %{buildroot}%{_includedir}/xen
 install -m 644 tools/libxc/xen/arch-ia64.h %{buildroot}%{_includedir}/xen
 install -m 644 xen/include/public/io/xs_wire.h %{buildroot}%{_includedir}/xen/io
+install -m 644 xen/include/public/xen-compat.h %{buildroot}%{_includedir}/xen
 
 ### fixing start-script dir
 mkdir -p %{buildroot}/etc/rc.d
@@ -171,6 +172,9 @@
 %dir %{_localstatedir}/run/xenstored
 
 %changelog
+* Thu Apr 27 2006 Daniel Veillard <veillard at redhat.com> - 3.0.2-3
+- xen.h now requires xen-compat.h, install it too
+
 * Wed Apr 26 2006 Jeremy Katz <katzj at redhat.com> - 3.0.2-2
 - -m64 patch isn't needed anymore either
 



From fedora-cvs-commits at redhat.com  Thu Apr 27 10:05:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 06:05:00 -0400
Subject: rpms/sip/devel .cvsignore, 1.13, 1.14 sip.spec, 1.25, 1.26 sources,
	1.13, 1.14
Message-ID: <200604271005.k3RA50WZ010104@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/sip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10061

Modified Files:
	.cvsignore sip.spec sources 
Log Message:
- update to 4.4.3
- built with %%{optflags}



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sip/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	12 Sep 2005 13:19:18 -0000	1.13
+++ .cvsignore	27 Apr 2006 10:04:57 -0000	1.14
@@ -3,3 +3,4 @@
 sip-4.2.tar.gz
 sip-4.2.1.tar.gz
 sip-4.3.1.tar.gz
+sip-4.4.3.tar.gz


Index: sip.spec
===================================================================
RCS file: /cvs/dist/rpms/sip/devel/sip.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sip.spec	11 Feb 2006 05:42:01 -0000	1.25
+++ sip.spec	27 Apr 2006 10:04:57 -0000	1.26
@@ -3,7 +3,7 @@
 %define pythonpkg python
 %define minor .2
 
-%define qtver 3.3.5
+%define qtver 3.3.6
 %define qtpkg qt
 
 %if "%{pythonver}" == "2.4"
@@ -14,8 +14,8 @@
 
 Summary: SIP - Python/C++ Bindings Generator
 Name: sip
-Version: 4.3.1
-Release: 1.2.1
+Version: 4.4.3
+Release: 1
 License: GPL
 Group: Development/Tools
 Url: http://www.riverbankcomputing.co.uk/
@@ -56,7 +56,7 @@
 %build
 QTDIR="" && source /etc/profile.d/qt.sh
 
-%pythonprog configure.py -l qt-mt -d %{pythonsitedir}
+%pythonprog configure.py -d %{pythonsitedir} CXXFLAGS="%{optflags}" CFLAGS="%{optflags}"
 
 make %{?_smp_mflags} 
 
@@ -83,6 +83,11 @@
 %{_includedir}/python%{pythonver}/*
 
 %changelog
+* Thu Apr 27 2006 Than Ngo <than at redhat.com> 4.4.3-1
+- update to 4.4.3
+- built with %%{optflags}
+
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.3.1-1.2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sip/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	12 Sep 2005 13:19:18 -0000	1.13
+++ sources	27 Apr 2006 10:04:57 -0000	1.14
@@ -1 +1 @@
-c561d8dc19fbe3a8bffc4b10bd56910f  sip-4.3.1.tar.gz
+7465a9cf8e1f280425ab8f9f6e85b888  sip-4.4.3.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 27 10:17:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 06:17:06 -0400
Subject: rpms/PyQt/devel .cvsignore, 1.15, 1.16 PyQt.spec, 1.27, 1.28 sources,
	1.15, 1.16
Message-ID: <200604271017.k3RAH6kM019132@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/PyQt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18497

Modified Files:
	.cvsignore PyQt.spec sources 
Log Message:
- update to 3.16
- built with %%{optflags}



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/PyQt/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	12 Sep 2005 13:20:37 -0000	1.15
+++ .cvsignore	27 Apr 2006 10:17:03 -0000	1.16
@@ -3,3 +3,4 @@
 PyQt-x11-gpl-3.14.tar.gz
 PyQt-x11-gpl-3.14.1.tar.gz
 PyQt-x11-gpl-3.15.tar.gz
+PyQt-x11-gpl-3.16.tar.gz


Index: PyQt.spec
===================================================================
RCS file: /cvs/dist/rpms/PyQt/devel/PyQt.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- PyQt.spec	13 Feb 2006 18:45:16 -0000	1.27
+++ PyQt.spec	27 Apr 2006 10:17:03 -0000	1.28
@@ -5,7 +5,7 @@
 
 %define qtversion 3.3.5
 %define qtpkg qt
-%define sip_version 4.3.1
+%define sip_version 4.4.3
 
 %if "%{pythonver}" == "2.4"
 %define pythonprog /usr/bin/python2.4
@@ -15,8 +15,8 @@
 
 Summary: Python bindings for Qt
 Name: PyQt
-Version: 3.15
-Release: 1.2.2
+Version: 3.16
+Release: 1
 License: GPL
 Group: Development/Languages
 Url: http://www.riverbankcomputing.co.uk/pyqt/
@@ -62,7 +62,7 @@
 %build
 QTDIR="" && . /etc/profile.d/qt.sh
 
-echo yes | %pythonprog configure.py -d %{pythonsitedir}
+echo yes | %pythonprog configure.py -d %{pythonsitedir} CXXFLAGS="%{optflags}" CFLAGS="%{optflags}"
 
 # Makefiles are broken, workaround
 make -C qt %{?_smp_mflags}
@@ -76,7 +76,7 @@
 mv examples3 examples
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -95,6 +95,10 @@
 %doc examples/*.png examples/*.gif examples/*.bmp
 
 %changelog
+* Thu Apr 27 2006 Than Ngo <than at redhat.com> 3.16-1
+- update to 3.16
+- built with %%{optflags}
+
 * Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 3.15-1.2.2
 - rebump for build order issues during double-long bump
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/PyQt/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	12 Sep 2005 13:20:37 -0000	1.15
+++ sources	27 Apr 2006 10:17:03 -0000	1.16
@@ -1 +1 @@
-8e70fac4f403fb759b537008170ff446  PyQt-x11-gpl-3.15.tar.gz
+5f7a32a15bf8afe17c0d0a0cc46de690  PyQt-x11-gpl-3.16.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 27 11:45:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 07:45:23 -0400
Subject: rpms/sysreport/devel .cvsignore, 1.26, 1.27 sources, 1.29,
	1.30 sysreport.spec, 1.36, 1.37
Message-ID: <200604271145.k3RBjNWP025290@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/sysreport/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25246

Modified Files:
	.cvsignore sources sysreport.spec 
Log Message:
fix #190053, Sysreport text refers to Red Hat Linux



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sysreport/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	29 Mar 2006 18:29:17 -0000	1.26
+++ .cvsignore	27 Apr 2006 11:44:48 -0000	1.27
@@ -12,3 +12,4 @@
 sysreport-1.4.3-2.tar.bz2
 sysreport-1.4.3-3.tar.bz2
 sysreport-1.4.3-5.tar.bz2
+sysreport-1.4.3-6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sysreport/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	29 Mar 2006 18:29:17 -0000	1.29
+++ sources	27 Apr 2006 11:45:02 -0000	1.30
@@ -1 +1 @@
-ad36bcbb080d4f65e65e7f3c1c421617  sysreport-1.4.3-5.tar.bz2
+8373f09136ef9340f923c76a397664bc  sysreport-1.4.3-6.tar.bz2


Index: sysreport.spec
===================================================================
RCS file: /cvs/dist/rpms/sysreport/devel/sysreport.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sysreport.spec	29 Mar 2006 18:29:17 -0000	1.36
+++ sysreport.spec	27 Apr 2006 11:45:02 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: Gathers system hardware and configuration information.
 Name: sysreport
 Version: 1.4.3
-Release: 5
+Release: 6
 URL: http://www.redhat.com/support
 Group: Development/Debuggers
 Source0: %{name}-%{version}-%{release}.tar.bz2
@@ -42,6 +42,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Apr 27 2006 Than Ngo <than at redhat.com> 1.4.3-6
+- fix #190053, Sysreport text refers to Red Hat Linux
+
 * Tue Mar 28 2006 Than Ngo <than at redhat.com> 1.4.3-5
 - use LANG=C
 



From fedora-cvs-commits at redhat.com  Thu Apr 27 12:42:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 08:42:23 -0400
Subject: rpms/kernel/devel linux-2.6-header-install-git.patch,1.4,1.5
Message-ID: <200604271242.k3RCgNVP002483@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2454

Modified Files:
	linux-2.6-header-install-git.patch 
Log Message:
Fix ia64 build with headers, harder

linux-2.6-header-install-git.patch:
 Makefile                              |   17 ++++
 include/Kbuild                        |    2 
 include/asm-alpha/Kbuild              |    9 ++
 include/asm-arm/Kbuild                |    7 +
 include/asm-arm26/Kbuild              |    8 ++
 include/asm-cris/Kbuild               |    6 +
 include/asm-cris/arch-v10/Kbuild      |    3 
 include/asm-generic/Kbuild            |    3 
 include/asm-generic/Kbuild.asm        |   11 +++
 include/asm-h8300/Kbuild              |    6 +
 include/asm-i386/Kbuild               |    5 +
 include/asm-ia64/Kbuild               |    7 +
 include/asm-m32r/Kbuild               |    7 +
 include/asm-m68k/Kbuild               |   17 ++++
 include/asm-m68knommu/Kbuild          |   12 +++
 include/asm-mips/Kbuild               |   15 ++++
 include/asm-parisc/Kbuild             |    8 ++
 include/asm-powerpc/Kbuild            |   10 ++
 include/asm-ppc/Kbuild                |    8 ++
 include/asm-s390/Kbuild               |    4 +
 include/asm-sh/Kbuild                 |    6 +
 include/asm-sh64/Kbuild               |    6 +
 include/asm-sparc/Kbuild              |   13 +++
 include/asm-sparc64/Kbuild            |   16 ++++
 include/asm-um/Kbuild                 |   14 +++
 include/asm-v850/Kbuild               |   10 ++
 include/asm-x86_64/Kbuild             |   11 +++
 include/linux/Kbuild                  |   63 +++++++++++++++++
 include/linux/byteorder/Kbuild        |    1 
 include/linux/dvb/Kbuild              |    2 
 include/linux/hdlc/Kbuild             |    1 
 include/linux/isdn/Kbuild             |    1 
 include/linux/netfilter/Kbuild        |   11 +++
 include/linux/netfilter_arp/Kbuild    |    2 
 include/linux/netfilter_bridge/Kbuild |    4 +
 include/linux/netfilter_ipv4/Kbuild   |   21 +++++
 include/linux/netfilter_ipv6/Kbuild   |    5 +
 include/linux/nfsd/Kbuild             |    2 
 include/linux/raid/Kbuild             |    1 
 include/linux/sunrpc/Kbuild           |    1 
 include/linux/tc_act/Kbuild           |    1 
 include/linux/tc_ematch/Kbuild        |    1 
 include/media/Kbuild                  |    2 
 include/mtd/Kbuild                    |    2 
 include/rdma/Kbuild                   |    1 
 include/scsi/Kbuild                   |    2 
 include/sound/Kbuild                  |    2 
 include/video/Kbuild                  |    1 
 scripts/Makefile.headersinst          |  124 ++++++++++++++++++++++++++++++++++
 scripts/hdrcheck.sh                   |    8 ++
 50 files changed, 500 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-header-install-git.patch	27 Apr 2006 01:42:49 -0000	1.4
+++ linux-2.6-header-install-git.patch	27 Apr 2006 12:42:19 -0000	1.5
@@ -161,7 +161,7 @@
 @@ -0,0 +1,7 @@
 +include include/asm-generic/Kbuild.asm
 +
-+header-y += break.h fpu.h fwspa.h gcc_intrin.h ia64regs.h		\
++header-y += break.h fpu.h fpswa.h gcc_intrin.h ia64regs.h		\
 +	 intel_intrin.h kprobes.h intrinsics.h perfmon_default_smpl.h	\
 +	 ptrace_offsets.h rse.h setup.h ucontext.h
 +



From fedora-cvs-commits at redhat.com  Thu Apr 27 12:43:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 08:43:04 -0400
Subject: rpms/kernel/devel linux-2.6-header-install-git.patch,1.4,1.4.2.1
Message-ID: <200604271243.k3RCh41P002772@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2740

Modified Files:
      Tag: private-kernel-headers-branch
	linux-2.6-header-install-git.patch 
Log Message:
it's fpswa.h not fwspa.h

linux-2.6-header-install-git.patch:
 Makefile                              |   17 ++++
 include/Kbuild                        |    2 
 include/asm-alpha/Kbuild              |    9 ++
 include/asm-arm/Kbuild                |    7 +
 include/asm-arm26/Kbuild              |    8 ++
 include/asm-cris/Kbuild               |    6 +
 include/asm-cris/arch-v10/Kbuild      |    3 
 include/asm-generic/Kbuild            |    3 
 include/asm-generic/Kbuild.asm        |   11 +++
 include/asm-h8300/Kbuild              |    6 +
 include/asm-i386/Kbuild               |    5 +
 include/asm-ia64/Kbuild               |    7 +
 include/asm-m32r/Kbuild               |    7 +
 include/asm-m68k/Kbuild               |   17 ++++
 include/asm-m68knommu/Kbuild          |   12 +++
 include/asm-mips/Kbuild               |   15 ++++
 include/asm-parisc/Kbuild             |    8 ++
 include/asm-powerpc/Kbuild            |   10 ++
 include/asm-ppc/Kbuild                |    8 ++
 include/asm-s390/Kbuild               |    4 +
 include/asm-sh/Kbuild                 |    6 +
 include/asm-sh64/Kbuild               |    6 +
 include/asm-sparc/Kbuild              |   13 +++
 include/asm-sparc64/Kbuild            |   16 ++++
 include/asm-um/Kbuild                 |   14 +++
 include/asm-v850/Kbuild               |   10 ++
 include/asm-x86_64/Kbuild             |   11 +++
 include/linux/Kbuild                  |   63 +++++++++++++++++
 include/linux/byteorder/Kbuild        |    1 
 include/linux/dvb/Kbuild              |    2 
 include/linux/hdlc/Kbuild             |    1 
 include/linux/isdn/Kbuild             |    1 
 include/linux/netfilter/Kbuild        |   11 +++
 include/linux/netfilter_arp/Kbuild    |    2 
 include/linux/netfilter_bridge/Kbuild |    4 +
 include/linux/netfilter_ipv4/Kbuild   |   21 +++++
 include/linux/netfilter_ipv6/Kbuild   |    5 +
 include/linux/nfsd/Kbuild             |    2 
 include/linux/raid/Kbuild             |    1 
 include/linux/sunrpc/Kbuild           |    1 
 include/linux/tc_act/Kbuild           |    1 
 include/linux/tc_ematch/Kbuild        |    1 
 include/media/Kbuild                  |    2 
 include/mtd/Kbuild                    |    2 
 include/rdma/Kbuild                   |    1 
 include/scsi/Kbuild                   |    2 
 include/sound/Kbuild                  |    2 
 include/video/Kbuild                  |    1 
 scripts/Makefile.headersinst          |  124 ++++++++++++++++++++++++++++++++++
 scripts/hdrcheck.sh                   |    8 ++
 50 files changed, 500 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.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- linux-2.6-header-install-git.patch	27 Apr 2006 01:42:49 -0000	1.4
+++ linux-2.6-header-install-git.patch	27 Apr 2006 12:43:00 -0000	1.4.2.1
@@ -161,7 +161,7 @@
 @@ -0,0 +1,7 @@
 +include include/asm-generic/Kbuild.asm
 +
-+header-y += break.h fpu.h fwspa.h gcc_intrin.h ia64regs.h		\
++header-y += break.h fpu.h fpswa.h gcc_intrin.h ia64regs.h		\
 +	 intel_intrin.h kprobes.h intrinsics.h perfmon_default_smpl.h	\
 +	 ptrace_offsets.h rse.h setup.h ucontext.h
 +



From fedora-cvs-commits at redhat.com  Thu Apr 27 14:11:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 10:11:53 -0400
Subject: rpms/wpa_supplicant/devel
	wpa_supplicant-0.4.8-madwifi-ioctl-reorder.patch, NONE,
	1.1 wpa_supplicant-0.4.8-madwifi-privacy-invoked-fix.patch,
	NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 wpa_supplicant.spec, 1.16, 1.17
Message-ID: <200604271411.k3REBrVc016797@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/wpa_supplicant/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16730

Modified Files:
	.cvsignore sources wpa_supplicant.spec 
Added Files:
	wpa_supplicant-0.4.8-madwifi-ioctl-reorder.patch 
	wpa_supplicant-0.4.8-madwifi-privacy-invoked-fix.patch 
Log Message:
* 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
- Update madwifi headers to r1475



wpa_supplicant-0.4.8-madwifi-ioctl-reorder.patch:
 driver_madwifi.c |   36 ++++++++++++++++++++++++++----------
 1 files changed, 26 insertions(+), 10 deletions(-)

--- NEW FILE wpa_supplicant-0.4.8-madwifi-ioctl-reorder.patch ---
Index: wpa_supplicant-0.4.8/driver_madwifi.c
===================================================================
RCS file: /cvs/hostap/wpa_supplicant/driver_madwifi.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wpa_supplicant-0.4.8/driver_madwifi.c	27 Nov 2005 04:45:45 -0000	1.20
+++ wpa_supplicant-0.4.8/driver_madwifi.c	20 Mar 2006 01:32:27 -0000	1.21
@@ -73,26 +73,39 @@
 		if (show_err) {
 #ifdef MADWIFI_NG
 			int first = IEEE80211_IOCTL_SETPARAM;
-			int last = IEEE80211_IOCTL_GETMODE;
+			int last = IEEE80211_IOCTL_KICKMAC;
 			static const char *opnames[] = {
 				"ioctl[IEEE80211_IOCTL_SETPARAM]",
 				"ioctl[IEEE80211_IOCTL_GETPARAM]",
-				"ioctl[IEEE80211_IOCTL_SETKEY]",
+				"ioctl[IEEE80211_IOCTL_SETMODE]",
+				"ioctl[IEEE80211_IOCTL_GETMODE]",
 				"ioctl[IEEE80211_IOCTL_SETWMMPARAMS]",
-				"ioctl[IEEE80211_IOCTL_DELKEY]",
 				"ioctl[IEEE80211_IOCTL_GETWMMPARAMS]",
-				"ioctl[IEEE80211_IOCTL_SETMLME]",
+				"ioctl[IEEE80211_IOCTL_SETCHANLIST]",
+				"ioctl[IEEE80211_IOCTL_GETCHANLIST]",
+				"ioctl[IEEE80211_IOCTL_CHANSWITCH]",
+				NULL,
+				NULL,
+				"ioctl[IEEE80211_IOCTL_GETSCANRESULTS]",
+				NULL,
 				"ioctl[IEEE80211_IOCTL_GETCHANINFO]",
 				"ioctl[IEEE80211_IOCTL_SETOPTIE]",
 				"ioctl[IEEE80211_IOCTL_GETOPTIE]",
+				"ioctl[IEEE80211_IOCTL_SETMLME]",
+				NULL,
+				"ioctl[IEEE80211_IOCTL_SETKEY]",
+				NULL,
+				"ioctl[IEEE80211_IOCTL_DELKEY]",
+				NULL,
 				"ioctl[IEEE80211_IOCTL_ADDMAC]",
 				NULL,
 				"ioctl[IEEE80211_IOCTL_DELMAC]",
-				"ioctl[IEEE80211_IOCTL_GETCHANLIST]",
-				"ioctl[IEEE80211_IOCTL_SETCHANLIST]",
 				NULL,
-				"ioctl[IEEE80211_IOCTL_SETMODE]",
-				"ioctl[IEEE80211_IOCTL_GETMODE]",
+				"ioctl[IEEE80211_IOCTL_WDSMAC]",
+				NULL,
+				"ioctl[IEEE80211_IOCTL_WDSDELMAC]",
+				NULL,
+				"ioctl[IEEE80211_IOCTL_KICKMAC]",
 			};
 #else /* MADWIFI_NG */
 			int first = IEEE80211_IOCTL_SETPARAM;
@@ -115,8 +128,11 @@
 				"ioctl[IEEE80211_IOCTL_CHANLIST]",
 			};
 #endif /* MADWIFI_NG */
-			if (first <= op && op <= last)
-				perror(opnames[op - first]);
+			int idx = op - first;
+			if (first <= op && op <= last &&
+			    idx < sizeof(opnames) / sizeof(opnames[0]) &&
+			    opnames[idx])
+				perror(opnames[idx]);
 			else
 				perror("ioctl[unknown???]");
 		}

wpa_supplicant-0.4.8-madwifi-privacy-invoked-fix.patch:
 driver_wext.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE wpa_supplicant-0.4.8-madwifi-privacy-invoked-fix.patch ---
wpa_supplicant/hostap bug # 140

revision 1.58
date: 2006/04/17 00:31:48;  author: jm;  state: Exp;  lines: +4 -1
driver_wext: fixed privacy configuration for static WEP keys mode
[Bug 140]


Index: wpa_supplicant-0.4.8/driver_wext.c
===================================================================
RCS file: /cvs/hostap/wpa_supplicant/driver_wext.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- wpa_supplicant-0.4.8/driver_wext.c	10 Apr 2006 03:00:09 -0000	1.57
+++ wpa_supplicant-0.4.8/driver_wext.c	17 Apr 2006 00:31:48 -0000	1.58
@@ -1671,7 +1671,10 @@
 wpa_printf(MSG_DEBUG, "%s: assoc failed because set_auth_param(KEY_MGMT) failed", __FUNCTION__);
 		ret = -1;
 }
-	value = params->key_mgmt_suite != KEY_MGMT_NONE;
+	value = params->key_mgmt_suite != KEY_MGMT_NONE ||
+		params->pairwise_suite != CIPHER_NONE ||
+		params->group_suite != CIPHER_NONE ||
+		params->wpa_ie_len;
 	if (wpa_driver_wext_set_auth_param(drv,
 					   IW_AUTH_PRIVACY_INVOKED, value) < 0)
 {


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Feb 2006 07:46:47 -0000	1.4
+++ .cvsignore	27 Apr 2006 14:11:49 -0000	1.5
@@ -2,3 +2,4 @@
 wpa_supplicant-0.4.7.tar.gz
 wpa_supplicant-0.5.1.tar.gz
 wpa_supplicant-0.4.8.tar.gz
+madwifi-headers-r1475.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Feb 2006 07:46:47 -0000	1.4
+++ sources	27 Apr 2006 14:11:49 -0000	1.5
@@ -1,2 +1,2 @@
-3be286e0d0f5ab5223ccfdecd3b74546  madwifi-headers.tar.bz2
 765d6c70d75e88cd4dc010fa6b52c45f  wpa_supplicant-0.4.8.tar.gz
+b82289b140cc1c66db11564bde248d8a  madwifi-headers-r1475.tar.bz2


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wpa_supplicant.spec	25 Apr 2006 14:17:01 -0000	1.16
+++ wpa_supplicant.spec	27 Apr 2006 14:11:49 -0000	1.17
@@ -2,7 +2,7 @@
 Name: wpa_supplicant
 Epoch: 1
 Version: 0.4.8
-Release: 9.fc6
+Release: 10.fc6
 License: GPL
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -10,7 +10,7 @@
 Source2: %{name}.conf
 Source3: %{name}.init.d
 Source4: %{name}.sysconfig
-Source5: madwifi-headers.tar.bz2
+Source5: madwifi-headers-r1475.tar.bz2
 Patch0: wpa_supplicant-auth-fallback-v4.patch
 Patch1: wpa_supplicant-ctrl-iface-ap-scan.patch
 Patch2: wpa_supplicant-ctrl-iface-hide-keys.patch
@@ -18,6 +18,8 @@
 Patch4: wpa_supplicant-driver-wext-debug.patch
 Patch5: wpa_supplicant-wep-key-fix.patch
 Patch6: wpa_supplicant-ssid-len-fix.patch
+Patch7: wpa_supplicant-0.4.8-madwifi-privacy-invoked-fix.patch
+Patch8: wpa_supplicant-0.4.8-madwifi-ioctl-reorder.patch
 URL: http://hostap.epitest.fi/wpa_supplicant/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,6 +52,8 @@
 %patch4 -p1 -b .driver-wext-debug
 %patch5 -p1 -b .wep-key-fix
 %patch6 -p1 -b .ssid-len-fix
+%patch7 -p1 -b .madwifi-privacy-invoked-fix
+%patch8 -p1 -b .madwifi-ioctl-reorder
 
 %build
 cp %{SOURCE1} ./.config
@@ -127,6 +131,11 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* 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
+- Update madwifi headers to r1475
+
 * Tue Apr 25 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-9
 - Enable Wired driver, PKCS12, and Smartcard options (#rh189805#)
 



From fedora-cvs-commits at redhat.com  Thu Apr 27 14:30:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 10:30:56 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.675,1.676
Message-ID: <200604271430.k3REUud8004096@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4068

Modified Files:
	openoffice.org.spec 
Log Message:
test a lfs build


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.675
retrieving revision 1.676
diff -u -r1.675 -r1.676
--- openoffice.org.spec	26 Apr 2006 17:47:06 -0000	1.675
+++ openoffice.org.spec	27 Apr 2006 14:30:38 -0000	1.676
@@ -1,6 +1,6 @@
 %define oootag OOB680
 %define ooomilestone 5
-%define rh_rpm_release 12
+%define rh_rpm_release 13
 
 %define build_fc6 1
 %define build_rhel4 0
@@ -1232,6 +1232,7 @@
         esac
         ARCH_FLAGS="$ARCH_FLAGS $i"
 done
+ARCH_FLAGS="$ARCH_FLAGS -D_FILE_OFFSET_BITS=64"
 export ARCH_FLAGS
 
 %if %{build_rhel4}
@@ -3710,6 +3711,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Thu Apr 27 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.13
+- rh#189630# lfs trouble
+
 * Tue Apr 25 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.12
 - ooo#64743# continuing my epic battle with CJK and Indic glyph
   fallback (rh#189760#)



From fedora-cvs-commits at redhat.com  Thu Apr 27 14:34:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 10:34:01 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.676,1.677
Message-ID: <200604271434.k3REY1QM004250@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4236

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.676
retrieving revision 1.677
diff -u -r1.676 -r1.677
--- openoffice.org.spec	27 Apr 2006 14:30:38 -0000	1.676
+++ openoffice.org.spec	27 Apr 2006 14:33:58 -0000	1.677
@@ -1151,7 +1151,7 @@
 tar xzf %{SOURCE13} Archive-Zip-1.13/lib
 cd ../..
 %endif
-%patch40 -p1 .rh188467.printingdefaults.patch
+%patch40 -p1
 %patch41 -p1 -b .ooo64463.extensions.noxaw.patch
 %patch42 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
 %patch43 -p1 -b .ooo64743.vcl.adjustonlevel1.patch



From fedora-cvs-commits at redhat.com  Thu Apr 27 14:38:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 10:38:55 -0400
Subject: rpms/numactl/devel numactl-64bit-cpu-mask.patch, NONE,
	1.1 numactl-64bit-overruns.patch, NONE, 1.1 numactl.spec, 1.27, 1.28
Message-ID: <200604271438.k3REctjE004807@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/numactl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4770

Modified Files:
	numactl.spec 
Added Files:
	numactl-64bit-cpu-mask.patch numactl-64bit-overruns.patch 
Log Message:
adding new patches

numactl-64bit-cpu-mask.patch:
 libnuma.c |   73 +++++++++++++++++++++++++++++++++-----------------------------
 numaint.h |    2 -
 2 files changed, 41 insertions(+), 34 deletions(-)

--- NEW FILE numactl-64bit-cpu-mask.patch ---
--- numactl-0.6.4/libnuma.c.orig	2006-04-24 12:09:46.000000000 -0400
+++ numactl-0.6.4/libnuma.c	2006-04-24 12:15:28.000000000 -0400
@@ -439,6 +439,9 @@
 	int buflen_needed;
 	unsigned long *mask, prev;
 	int ncpus = number_of_cpus();
+	int i;
+	int mask_words;
+	int bits_in_mask_0;
 
 	buflen_needed = CPU_BYTES(ncpus);
 	if ((unsigned)node > maxnode || bufferlen < buflen_needed) { 
@@ -467,41 +470,45 @@
 		set_bit(node, (unsigned long *)mask);
 		goto out;
 	} 
-	n = 0;
-	s = line;
-	prev = 0; 
-	while (*s) {
- 		unsigned num; 
-		int i;
-		num = 0;
-		for (i = 0; s[i] && s[i] != ','; i++) { 
-			static const char hexdigits[] = "0123456789abcdef";
-			char *w = strchr(hexdigits, tolower(s[i]));
-			if (!w) { 
-				if (isspace(s[i]))
-					break;
-				numa_warn_int(W_cpumap, 
-					  "Unexpected character `%c' in sysfs cpumap", s[i]);
-				set_bit(node, mask);
-				goto out;
-			}
-			num = (num*16) + (w - hexdigits); 
-		}
-		if (i == 0) 
-			break; 
-		s += i;
-		if (*s == ',')
-			s++;
-		/* skip leading zeros */
-		if (num == 0 && prev == 0) 
-			continue;
-		prev |= num; 
-		memmove(mask + 1, mask, buflen_needed - sizeof(unsigned)); 
-		mask[0] = num; 
-	}
+	mask_words = 0;
+        bits_in_mask_0 = 0;
+        n = 0;
+        s = line;
+        prev = 0;
+	for (i = 0; s[i]; i++) {
+                static const char hexdigits[] = "0123456789abcdef";
+                char *w = strchr(hexdigits, tolower(s[i]));
+                if (!w) {
+                        if (isspace(s[i]) || s[i] == ',')
+                                continue;
+                        numa_warn_int(W_cpumap,
+                                  "Unexpected character `%c' in sysfs cpumap",
+                                        s[i]);
+                        set_bit(node, mask);
+                        goto out;
+                }
+
+                /* if mask[0] is full shift left before adding another */
+                if (bits_in_mask_0 >= sizeof(mask[0])*8) {
+                        /* skip any leading zeros */
+                        if (prev || mask[0]){
+			    /* shift over any previously loaded masks */
+                                memmove(mask+mask_words+1, mask+mask_words,
+                                        sizeof(mask[0]) * mask_words);
+                                mask_words++;
+                                bits_in_mask_0 = 0;
+                                mask[0] = 0;
+                                prev = 1;
+                        }
+                }
+
+                mask[0] = (mask[0]*16) + (w - hexdigits);
+                bits_in_mask_0 += 4; /* 4 bits per hex char */
+        }
  out:
 	free(line);
-	fclose(f);
+	if (f)
+                fclose(f);
 	memcpy(buffer, mask, buflen_needed);
 
 	/* slightly racy, see above */ 
--- numactl-0.6.4/numaint.h.orig	2006-04-24 12:08:57.000000000 -0400
+++ numactl-0.6.4/numaint.h	2006-04-24 12:09:14.000000000 -0400
@@ -22,7 +22,7 @@
 #define round_up(x,y) (((x) + (y) - 1) & ~((y)-1))
 
 
-#define CPU_BYTES(x) round_up(x, BITS_PER_LONG)
+#define CPU_BYTES(x) (round_up(x, BITS_PER_LONG)/8)
 #define CPU_WORDS(x) (CPU_BYTES(x) / sizeof(long))
 
 

numactl-64bit-overruns.patch:
 libnuma.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE numactl-64bit-overruns.patch ---
--- numactl-0.6.4/libnuma.c.orig	2006-01-10 10:10:38.000000000 -0500
+++ numactl-0.6.4/libnuma.c	2006-01-10 10:13:09.000000000 -0500
@@ -115,7 +115,7 @@
 
 static void dombind(void *mem, size_t size, int pol, nodemask_t *nodes)
 { 
-	if (mbind_int(mem, size, pol, nodes->n, nodes ? NUMA_NUM_NODES+1 : 0, mbind_flags) 
+	if (mbind_int(mem, size, pol, nodes ? nodes->n : NULL, nodes ? NUMA_NUM_NODES+1 : 0, mbind_flags) 
 	    < 0) 
 		numa_error_int("mbind"); 
 } 
@@ -437,7 +437,7 @@
 	char *s;
 	int n;
 	int buflen_needed;
-	unsigned *mask, prev;
+	unsigned long *mask, prev;
 	int ncpus = number_of_cpus();
 
 	buflen_needed = CPU_BYTES(ncpus);
@@ -455,7 +455,7 @@
 
 	mask = malloc(buflen_needed);
 	if (!mask) 
-		mask = (unsigned *)buffer; 
+		mask = (unsigned long *)buffer; 
 	memset(mask, 0, buflen_needed); 
 			
 	sprintf(fn, "/sys/devices/system/node/node%d/cpumap", node); 
@@ -506,7 +506,7 @@
 
 	/* slightly racy, see above */ 
 	if (node_cpu_mask[node]) {
-		if (mask != (unsigned *)buffer)
+		if (mask != (unsigned long *)buffer)
 			free(mask); 	       
 	} else {
 		node_cpu_mask[node] = (unsigned long *)mask; 
@@ -543,6 +543,7 @@
 nodemask_t numa_get_run_node_mask(void)
 { 
 	int ncpus = number_of_cpus();
+	int max_nodes = numa_max_node();
 	nodemask_t mask;
 	int i, k;
 	unsigned long cpus[CPU_WORDS(ncpus)], nodecpus[CPU_WORDS(ncpus)];
@@ -552,7 +553,7 @@
 	if (numa_sched_getaffinity_int(getpid(), CPU_BYTES(ncpus), cpus) < 0) 
 		return numa_no_nodes_int; 
 	/* somewhat dumb algorithm */
-	for (i = 0; i < NUMA_NUM_NODES; i++) {
+	for (i = 0; i < max_nodes; i++) {
 		if (numa_node_to_cpus_int(i, nodecpus, CPU_BYTES(ncpus)) < 0) {
 			numa_warn_int(W_noderunmask, "Cannot read node cpumask from sysfs");
 			continue;


Index: numactl.spec
===================================================================
RCS file: /cvs/dist/rpms/numactl/devel/numactl.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- numactl.spec	10 Mar 2006 06:06:35 -0000	1.27
+++ numactl.spec	27 Apr 2006 14:38:52 -0000	1.28
@@ -13,6 +13,8 @@
 Patch1:	numactl-lib.patch
 Patch2: numactl-0.6.4-ppc.patch
 Patch3: numactl-0.6.4-commonalias.patch
+Patch4: numactl-64bit-overruns.patch
+Patch5: numactl-64bit-cpu-mask.patch
 
 %description
 Simple NUMA policy support. It consists of a numactl program to run
@@ -33,6 +35,12 @@
 # Fix breakage with aliases to tentatitive common symbols.
 %patch3
 
+# Fix 64 bit overruns
+%patch4
+
+# Fix cpu mask computation for > 7 nodes
+%patch5
+
 %build
 cd numactl-%{version}
 make CFLAGS="$RPM_OPT_FLAGS -I. -fPIC"
@@ -71,6 +79,9 @@
 %{_mandir}/man8/*.8*
 
 %changelog
+* Wed Apr 26 2006 Neil Horman <nhorman at redhat.com>
+- Added patches for 64 bit overflows and cpu mask problem
+
 * Fri Mar 10 2006 Bill Nottingham <notting at redhat.com>
 - rebuild for ppc TLS issue (#184446)
 



From fedora-cvs-commits at redhat.com  Thu Apr 27 14:51:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 10:51:42 -0400
Subject: rpms/kernel/devel linux-2.6-header-cleanup-git.patch,1.4,1.5
Message-ID: <200604271451.k3REpgbO022736@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22672

Modified Files:
	linux-2.6-header-cleanup-git.patch 
Log Message:
fix i386 and x86_64 page.h

linux-2.6-header-cleanup-git.patch:
 b/include/asm-i386/page.h                            |    5 -
 b/include/asm-s390/ptrace.h                          |    6 -
 b/include/asm-x86_64/page.h                          |    5 -
 b/include/linux/elf-em.h                             |   44 ++++++++
 include/acpi/platform/aclinux.h                      |    1 
 include/acpi/processor.h                             |    1 
 include/asm-alpha/bitops.h                           |    1 
 include/asm-alpha/cache.h                            |    1 
 include/asm-alpha/cacheflush.h                       |    1 
 include/asm-alpha/core_cia.h                         |    1 
 include/asm-alpha/core_t2.h                          |    1 
 include/asm-alpha/dma-mapping.h                      |    1 
 include/asm-alpha/dma.h                              |    1 
 include/asm-alpha/floppy.h                           |    1 
 include/asm-alpha/hardirq.h                          |    1 
 include/asm-alpha/hw_irq.h                           |    1 
 include/asm-alpha/ide.h                              |    1 
 include/asm-alpha/io.h                               |    1 
 include/asm-alpha/irq.h                              |    1 
 include/asm-alpha/kmap_types.h                       |    1 
 include/asm-alpha/machvec.h                          |    1 
 include/asm-alpha/mmu_context.h                      |    1 
 include/asm-alpha/mmzone.h                           |    1 
 include/asm-alpha/page.h                             |    1 
 include/asm-alpha/param.h                            |    1 
 include/asm-alpha/pgalloc.h                          |    1 
 include/asm-alpha/pgtable.h                          |    1 
 include/asm-alpha/serial.h                           |    1 
 include/asm-alpha/smp.h                              |    1 
 include/asm-alpha/spinlock.h                         |    1 
 include/asm-alpha/system.h                           |    1 
 include/asm-alpha/tlbflush.h                         |    1 
 include/asm-arm/apm.h                                |    1 
 include/asm-arm/arch-aaec2000/memory.h               |    1 
 include/asm-arm/arch-cl7500/acornfb.h                |    1 
 include/asm-arm/arch-clps711x/hardware.h             |    1 
 include/asm-arm/arch-clps711x/memory.h               |    1 
 include/asm-arm/arch-clps711x/uncompress.h           |    1 
 include/asm-arm/arch-ebsa285/hardware.h              |    1 
 include/asm-arm/arch-ebsa285/memory.h                |    1 
 include/asm-arm/arch-ebsa285/vmalloc.h               |    1 
 include/asm-arm/arch-integrator/smp.h                |    1 
 include/asm-arm/arch-iop3xx/memory.h                 |    1 
 include/asm-arm/arch-iop3xx/timex.h                  |    1 
 include/asm-arm/arch-iop3xx/uncompress.h             |    1 
 include/asm-arm/arch-ixp4xx/dma.h                    |    1 
 include/asm-arm/arch-lh7a40x/constants.h             |    1 
 include/asm-arm/arch-lh7a40x/irqs.h                  |    1 
 include/asm-arm/arch-lh7a40x/registers.h             |    1 
 include/asm-arm/arch-omap/board.h                    |    1 
 include/asm-arm/arch-omap/hardware.h                 |    1 
 include/asm-arm/arch-omap/system.h                   |    1 
 include/asm-arm/arch-omap/uncompress.h               |    1 
 include/asm-arm/arch-pxa/idp.h                       |    1 
 include/asm-arm/arch-pxa/irqs.h                      |    1 
 include/asm-arm/arch-pxa/pxa-regs.h                  |    1 
 include/asm-arm/arch-pxa/timex.h                     |    1 
 include/asm-arm/arch-realview/smp.h                  |    1 
 include/asm-arm/arch-s3c2410/dma.h                   |    1 
 include/asm-arm/arch-s3c2410/uncompress.h            |    1 
 include/asm-arm/arch-sa1100/assabet.h                |    1 
 include/asm-arm/arch-sa1100/cerf.h                   |    1 
 include/asm-arm/arch-sa1100/collie.h                 |    1 
 include/asm-arm/arch-sa1100/dma.h                    |    1 
 include/asm-arm/arch-sa1100/hardware.h               |    1 
 include/asm-arm/arch-sa1100/ide.h                    |    1 
 include/asm-arm/arch-sa1100/irqs.h                   |    1 
 include/asm-arm/arch-sa1100/memory.h                 |    1 
 include/asm-arm/arch-sa1100/system.h                 |    1 
 include/asm-arm/atomic.h                             |    1 
 include/asm-arm/bug.h                                |    1 
 include/asm-arm/cacheflush.h                         |    1 
 include/asm-arm/cpu.h                                |    1 
 include/asm-arm/dma-mapping.h                        |    1 
 include/asm-arm/dma.h                                |    1 
 include/asm-arm/elf.h                                |    1 
 include/asm-arm/fpstate.h                            |    1 
 include/asm-arm/glue.h                               |    1 
 include/asm-arm/hardirq.h                            |    1 
 include/asm-arm/hardware/dec21285.h                  |    1 
 include/asm-arm/hardware/iomd.h                      |    1 
 include/asm-arm/leds.h                               |    1 
 include/asm-arm/mach/serial_at91rm9200.h             |    1 
 include/asm-arm/mach/serial_sa1100.h                 |    1 
 include/asm-arm/memory.h                             |    1 
 include/asm-arm/page.h                               |    1 
 include/asm-arm/pci.h                                |    1 
 include/asm-arm/proc-fns.h                           |    1 
 include/asm-arm/ptrace.h                             |    1 
 include/asm-arm/smp.h                                |    1 
 include/asm-arm/system.h                             |    1 
 include/asm-arm/tlbflush.h                           |    1 
 include/asm-arm26/atomic.h                           |    1 
 include/asm-arm26/bug.h                              |    1 
 include/asm-arm26/dma.h                              |    1 
 include/asm-arm26/hardirq.h                          |    1 
 include/asm-arm26/hardware.h                         |    1 
 include/asm-arm26/io.h                               |    1 
 include/asm-arm26/leds.h                             |    1 
 include/asm-arm26/mach-types.h                       |    1 
 include/asm-arm26/page.h                             |    1 
 include/asm-arm26/pgtable.h                          |    1 
 include/asm-arm26/serial.h                           |    1 
 include/asm-arm26/smp.h                              |    1 
 include/asm-arm26/sysirq.h                           |    1 
 include/asm-arm26/system.h                           |    1 
 include/asm-cris/arch-v10/io.h                       |    1 
 include/asm-cris/arch-v10/page.h                     |    1 
 include/asm-cris/arch-v10/system.h                   |    1 
 include/asm-cris/arch-v32/io.h                       |    1 
 include/asm-cris/arch-v32/irq.h                      |    1 
 include/asm-cris/arch-v32/page.h                     |    1 
 include/asm-cris/arch-v32/processor.h                |    1 
 include/asm-cris/arch-v32/system.h                   |    1 
 include/asm-cris/eshlibld.h                          |    1 
 include/asm-cris/etraxgpio.h                         |    1 
 include/asm-cris/fasttimer.h                         |    1 
 include/asm-cris/page.h                              |    1 
 include/asm-cris/pci.h                               |    1 
 include/asm-cris/pgtable.h                           |    1 
 include/asm-cris/processor.h                         |    1 
 include/asm-cris/rtc.h                               |    1 
 include/asm-cris/tlbflush.h                          |    1 
 include/asm-frv/atomic.h                             |    1 
 include/asm-frv/bitops.h                             |    1 
 include/asm-frv/bug.h                                |    1 
 include/asm-frv/cache.h                              |    1 
 include/asm-frv/dma.h                                |    1 
 include/asm-frv/elf.h                                |    1 
 include/asm-frv/fpu.h                                |    1 
 include/asm-frv/hardirq.h                            |    1 
 include/asm-frv/highmem.h                            |    1 
 include/asm-frv/ide.h                                |    1 
 include/asm-frv/io.h                                 |    1 
 include/asm-frv/irq.h                                |    1 
 include/asm-frv/mmu_context.h                        |    1 
 include/asm-frv/page.h                               |    1 
 include/asm-frv/pci.h                                |    1 
 include/asm-frv/pgalloc.h                            |    1 
 include/asm-frv/pgtable.h                            |    1 
 include/asm-frv/processor.h                          |    1 
 include/asm-frv/segment.h                            |    1 
 include/asm-frv/serial.h                             |    1 
 include/asm-frv/smp.h                                |    1 
 include/asm-frv/system.h                             |    1 
 include/asm-frv/tlbflush.h                           |    1 
 include/asm-frv/types.h                              |    1 
 include/asm-frv/unaligned.h                          |    1 
 include/asm-frv/virtconvert.h                        |    1 
 include/asm-generic/bug.h                            |    1 
 include/asm-generic/dma-mapping.h                    |    1 
 include/asm-generic/fcntl.h                          |    1 
 include/asm-generic/local.h                          |    1 
 include/asm-generic/signal.h                         |    7 +
 include/asm-generic/tlb.h                            |    1 
 include/asm-h8300/bitops.h                           |    1 
 include/asm-h8300/dma.h                              |    1 
 include/asm-h8300/elf.h                              |    1 
 include/asm-h8300/hardirq.h                          |    1 
 include/asm-h8300/io.h                               |    1 
 include/asm-h8300/keyboard.h                         |    1 
 include/asm-h8300/mmu_context.h                      |    1 
 include/asm-h8300/page.h                             |    1 
 include/asm-h8300/page_offset.h                      |    1 
 include/asm-h8300/param.h                            |    1 
 include/asm-h8300/pgtable.h                          |    1 
 include/asm-h8300/processor.h                        |    1 
 include/asm-h8300/semaphore-helper.h                 |    1 
 include/asm-h8300/shm.h                              |    1 
 include/asm-h8300/system.h                           |    1 
 include/asm-h8300/unaligned.h                        |    1 
 include/asm-h8300/virtconvert.h                      |    1 
 include/asm-i386/apic.h                              |    1 
 include/asm-i386/atomic.h                            |    1 
 include/asm-i386/bitops.h                            |    1 
 include/asm-i386/bug.h                               |    1 
 include/asm-i386/bugs.h                              |    1 
 include/asm-i386/byteorder.h                         |    1 
 include/asm-i386/cache.h                             |    1 
 include/asm-i386/dma.h                               |    1 
 include/asm-i386/fixmap.h                            |    1 
 include/asm-i386/hardirq.h                           |    1 
 include/asm-i386/highmem.h                           |    1 
 include/asm-i386/hpet.h                              |    1 
 include/asm-i386/hw_irq.h                            |    1 
 include/asm-i386/ide.h                               |    1 
 include/asm-i386/io.h                                |    1 
 include/asm-i386/io_apic.h                           |    1 
 include/asm-i386/irq.h                               |    1 
 include/asm-i386/kmap_types.h                        |    1 
 include/asm-i386/mach-summit/mach_apic.h             |    1 
 include/asm-i386/mmu_context.h                       |    1 
 include/asm-i386/mtrr.h                              |    1 
 include/asm-i386/param.h                             |    1 
 include/asm-i386/pci.h                               |    1 
 include/asm-i386/pgalloc.h                           |    1 
 include/asm-i386/pgtable.h                           |    1 
 include/asm-i386/processor.h                         |    1 
 include/asm-i386/serial.h                            |    1 
 include/asm-i386/smp.h                               |    1 
 include/asm-i386/spinlock.h                          |    1 
 include/asm-i386/string.h                            |    1 
 include/asm-i386/system.h                            |    1 
 include/asm-i386/thread_info.h                       |    1 
 include/asm-i386/timex.h                             |    1 
 include/asm-i386/tlbflush.h                          |    1 
 include/asm-i386/types.h                             |    1 
 include/asm-i386/uaccess.h                           |    1 
 include/asm-ia64/asmmacro.h                          |    1 
 include/asm-ia64/cache.h                             |    1 
 include/asm-ia64/delay.h                             |    1 
 include/asm-ia64/dma-mapping.h                       |    1 
 include/asm-ia64/dma.h                               |    1 
 include/asm-ia64/elf.h                               |    1 
 include/asm-ia64/hardirq.h                           |    1 
 include/asm-ia64/ia32.h                              |    1 
 include/asm-ia64/ide.h                               |    1 
 include/asm-ia64/intrinsics.h                        |    1 
 include/asm-ia64/kmap_types.h                        |    1 
 include/asm-ia64/machvec.h                           |    1 
 include/asm-ia64/meminit.h                           |    1 
 include/asm-ia64/nodedata.h                          |    1 
 include/asm-ia64/numa.h                              |    1 
 include/asm-ia64/page.h                              |    1 
 include/asm-ia64/param.h                             |    1 
 include/asm-ia64/percpu.h                            |    1 
 include/asm-ia64/pgalloc.h                           |    1 
 include/asm-ia64/pgtable.h                           |    1 
 include/asm-ia64/processor.h                         |    1 
 include/asm-ia64/ptrace.h                            |    1 
 include/asm-ia64/smp.h                               |    1 
 include/asm-ia64/sn/simulator.h                      |    1 
 include/asm-ia64/sn/sn_cpuid.h                       |    1 
 include/asm-ia64/sn/sn_sal.h                         |    1 
 include/asm-ia64/sn/xpc.h                            |    1 
 include/asm-ia64/string.h                            |    1 
 include/asm-ia64/system.h                            |    1 
 include/asm-ia64/tlb.h                               |    1 
 include/asm-ia64/tlbflush.h                          |    1 
 include/asm-ia64/unistd.h                            |    1 
 include/asm-m32r/assembler.h                         |    1 
 include/asm-m32r/atomic.h                            |    1 
 include/asm-m32r/bitops.h                            |    1 
 include/asm-m32r/cacheflush.h                        |    1 
 include/asm-m32r/hardirq.h                           |    1 
 include/asm-m32r/ide.h                               |    1 
 include/asm-m32r/irq.h                               |    1 
 include/asm-m32r/kmap_types.h                        |    1 
 include/asm-m32r/m32104ut/m32104ut_pld.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lan.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lcd.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_pld.h             |    1 
 include/asm-m32r/m32r.h                              |    1 
 include/asm-m32r/mmu.h                               |    1 
 include/asm-m32r/mmu_context.h                       |    2 
 include/asm-m32r/opsput/opsput_lan.h                 |    1 
 include/asm-m32r/opsput/opsput_lcd.h                 |    1 
 include/asm-m32r/opsput/opsput_pld.h                 |    1 
 include/asm-m32r/page.h                              |    1 
 include/asm-m32r/pgalloc.h                           |    1 
 include/asm-m32r/pgtable-2level.h                    |    1 
 include/asm-m32r/pgtable.h                           |    1 
 include/asm-m32r/processor.h                         |    1 
 include/asm-m32r/ptrace.h                            |    1 
 include/asm-m32r/rtc.h                               |    1 
 include/asm-m32r/semaphore.h                         |    1 
 include/asm-m32r/serial.h                            |    1 
 include/asm-m32r/sigcontext.h                        |    1 
 include/asm-m32r/smp.h                               |    1 
 include/asm-m32r/spinlock.h                          |    1 
 include/asm-m32r/system.h                            |    1 
 include/asm-m32r/timex.h                             |    1 
 include/asm-m32r/tlbflush.h                          |    1 
 include/asm-m32r/uaccess.h                           |    1 
 include/asm-m68k/atomic.h                            |    1 
 include/asm-m68k/bug.h                               |    1 
 include/asm-m68k/dma-mapping.h                       |    1 
 include/asm-m68k/dma.h                               |    1 
 include/asm-m68k/dvma.h                              |    1 
 include/asm-m68k/elf.h                               |    1 
 include/asm-m68k/entry.h                             |    1 
 include/asm-m68k/fpu.h                               |    1 
 include/asm-m68k/hardirq.h                           |    1 
 include/asm-m68k/ide.h                               |    1 
 include/asm-m68k/io.h                                |    1 
 include/asm-m68k/irq.h                               |    1 
 include/asm-m68k/mc146818rtc.h                       |    1 
 include/asm-m68k/mmu_context.h                       |    1 
 include/asm-m68k/motorola_pgtable.h                  |    1 
 include/asm-m68k/openprom.h                          |    1 
 include/asm-m68k/page.h                              |    1 
 include/asm-m68k/page_offset.h                       |    1 
 include/asm-m68k/pgalloc.h                           |    1 
 include/asm-m68k/pgtable.h                           |    1 
 include/asm-m68k/processor.h                         |    1 
 include/asm-m68k/semaphore-helper.h                  |    1 
 include/asm-m68k/serial.h                            |    1 
 include/asm-m68k/setup.h                             |    1 
 include/asm-m68k/shm.h                               |    1 
 include/asm-m68k/system.h                            |    1 
 include/asm-m68k/tlbflush.h                          |    1 
 include/asm-m68k/virtconvert.h                       |    1 
 include/asm-m68knommu/bitops.h                       |    1 
 include/asm-m68knommu/coldfire.h                     |    1 
 include/asm-m68knommu/commproc.h                     |    1 
 include/asm-m68knommu/dma-mapping.h                  |    1 
 include/asm-m68knommu/dma.h                          |    1 
 include/asm-m68knommu/elf.h                          |    1 
 include/asm-m68knommu/elia.h                         |    1 
 include/asm-m68knommu/entry.h                        |    1 
 include/asm-m68knommu/fpu.h                          |    1 
 include/asm-m68knommu/hardirq.h                      |    1 
 include/asm-m68knommu/io.h                           |    1 
 include/asm-m68knommu/irq.h                          |    1 
 include/asm-m68knommu/m5206sim.h                     |    1 
 include/asm-m68knommu/m520xsim.h                     |    1 
 include/asm-m68knommu/m523xsim.h                     |    1 
 include/asm-m68knommu/m5272sim.h                     |    1 
 include/asm-m68knommu/m527xsim.h                     |    1 
 include/asm-m68knommu/m528xsim.h                     |    1 
 include/asm-m68knommu/mcfcache.h                     |    1 
 include/asm-m68knommu/mcfdma.h                       |    1 
 include/asm-m68knommu/mcfmbus.h                      |    1 
 include/asm-m68knommu/mcfne.h                        |    1 
 include/asm-m68knommu/mcfpci.h                       |    1 
 include/asm-m68knommu/mcfpit.h                       |    1 
 include/asm-m68knommu/mcfsim.h                       |    1 
 include/asm-m68knommu/mcfsmc.h                       |    1 
 include/asm-m68knommu/mcftimer.h                     |    1 
 include/asm-m68knommu/mcfuart.h                      |    1 
 include/asm-m68knommu/mcfwdebug.h                    |    1 
 include/asm-m68knommu/mmu_context.h                  |    1 
 include/asm-m68knommu/nettel.h                       |    1 
 include/asm-m68knommu/page.h                         |    1 
 include/asm-m68knommu/page_offset.h                  |    1 
 include/asm-m68knommu/param.h                        |    1 
 include/asm-m68knommu/pgtable.h                      |    1 
 include/asm-m68knommu/processor.h                    |    1 
 include/asm-m68knommu/semaphore-helper.h             |    1 
 include/asm-m68knommu/system.h                       |    1 
 include/asm-m68knommu/unaligned.h                    |    1 
 include/asm-mips/a.out.h                             |    1 
 include/asm-mips/addrspace.h                         |    1 
 include/asm-mips/arc/types.h                         |    1 
 include/asm-mips/asm.h                               |    1 
 include/asm-mips/asmmacro.h                          |    1 
 include/asm-mips/atomic.h                            |    1 
 include/asm-mips/bcache.h                            |    1 
 include/asm-mips/bitops.h                            |    1 
 include/asm-mips/bug.h                               |    1 
 include/asm-mips/bugs.h                              |    1 
 include/asm-mips/byteorder.h                         |    1 
 include/asm-mips/cache.h                             |    1 
 include/asm-mips/checksum.h                          |    1 
 include/asm-mips/cpu-features.h                      |    1 
 include/asm-mips/cpu-info.h                          |    1 
 include/asm-mips/ddb5xxx/ddb5477.h                   |    1 
 include/asm-mips/ddb5xxx/ddb5xxx.h                   |    1 
 include/asm-mips/debug.h                             |    1 
 include/asm-mips/dec/prom.h                          |    1 
 include/asm-mips/delay.h                             |    1 
 include/asm-mips/dma.h                               |    1 
 include/asm-mips/elf.h                               |    1 
 include/asm-mips/fcntl.h                             |    1 
 include/asm-mips/fixmap.h                            |    1 
 include/asm-mips/fpu.h                               |    1 
 include/asm-mips/futex.h                             |    1 
 include/asm-mips/hazards.h                           |    1 
 include/asm-mips/highmem.h                           |    1 
 include/asm-mips/interrupt.h                         |    1 
 include/asm-mips/io.h                                |    1 
 include/asm-mips/ip32/machine.h                      |    1 
 include/asm-mips/irq.h                               |    1 
 include/asm-mips/isadep.h                            |    1 
 include/asm-mips/jmr3927/irq.h                       |    1 
 include/asm-mips/kmap_types.h                        |    1 
 include/asm-mips/local.h                             |    1 
 include/asm-mips/mach-au1x00/au1000.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx_dbdma.h          |    1 
 include/asm-mips/mach-au1x00/au1xxx_ide.h            |    1 
 include/asm-mips/mach-au1x00/au1xxx_psc.h            |    1 
 include/asm-mips/mach-au1x00/ioremap.h               |    1 
 include/asm-mips/mach-cobalt/cpu-feature-overrides.h |    1 
 include/asm-mips/mach-db1x00/db1x00.h                |    1 
 include/asm-mips/mach-generic/ide.h                  |    1 
 include/asm-mips/mach-generic/kmalloc.h              |    1 
 include/asm-mips/mach-generic/spaces.h               |    1 
 include/asm-mips/mach-ip22/spaces.h                  |    1 
 include/asm-mips/mach-ip32/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-ip32/kmalloc.h                 |    1 
 include/asm-mips/mach-mips/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-mips/irq.h                     |    1 
 include/asm-mips/mach-pb1x00/pb1550.h                |    1 
 include/asm-mips/mach-sim/cpu-feature-overrides.h    |    1 
 include/asm-mips/mips-boards/generic.h               |    1 
 include/asm-mips/mipsregs.h                          |    1 
 include/asm-mips/mmu_context.h                       |    1 
 include/asm-mips/mmzone.h                            |    1 
 include/asm-mips/module.h                            |    1 
 include/asm-mips/msgbuf.h                            |    1 
 include/asm-mips/paccess.h                           |    1 
 include/asm-mips/page.h                              |    1 
 include/asm-mips/pci.h                               |    1 
 include/asm-mips/pgalloc.h                           |    1 
 include/asm-mips/pgtable-32.h                        |    1 
 include/asm-mips/pgtable-64.h                        |    1 
 include/asm-mips/pgtable-bits.h                      |    1 
 include/asm-mips/pgtable.h                           |    1 
 include/asm-mips/prefetch.h                          |    1 
 include/asm-mips/processor.h                         |    1 
 include/asm-mips/ptrace.h                            |    1 
 include/asm-mips/reg.h                               |    1 
 include/asm-mips/resource.h                          |    1 
 include/asm-mips/serial.h                            |    1 
 include/asm-mips/sgiarcs.h                           |    1 
 include/asm-mips/sibyte/board.h                      |    1 
 include/asm-mips/sibyte/carmel.h                     |    1 
 include/asm-mips/sibyte/sentosa.h                    |    1 
 include/asm-mips/sibyte/swarm.h                      |    1 
 include/asm-mips/siginfo.h                           |    1 
 include/asm-mips/signal.h                            |    1 
 include/asm-mips/sim.h                               |    1 
 include/asm-mips/smp.h                               |    1 
 include/asm-mips/sn/addrs.h                          |    1 
 include/asm-mips/sn/agent.h                          |    1 
 include/asm-mips/sn/arch.h                           |    1 
 include/asm-mips/sn/io.h                             |    1 
 include/asm-mips/sn/klconfig.h                       |    1 
 include/asm-mips/sn/kldir.h                          |    1 
 include/asm-mips/sn/launch.h                         |    1 
 include/asm-mips/sn/mapped_kernel.h                  |    1 
 include/asm-mips/sn/sn0/addrs.h                      |    1 
 include/asm-mips/sn/sn0/arch.h                       |    1 
 include/asm-mips/sn/sn0/hubmd.h                      |    1 
 include/asm-mips/stackframe.h                        |    1 
 include/asm-mips/string.h                            |    1 
 include/asm-mips/system.h                            |    1 
 include/asm-mips/thread_info.h                       |    1 
 include/asm-mips/tlbflush.h                          |    1 
 include/asm-mips/tx4927/toshiba_rbtx4927.h           |    1 
 include/asm-mips/types.h                             |    1 
 include/asm-mips/uaccess.h                           |    1 
 include/asm-mips/unistd.h                            |    1 
 include/asm-mips/vr41xx/vrc4173.h                    |    1 
 include/asm-mips/war.h                               |    1 
 include/asm-mips/wbflush.h                           |    1 
 include/asm-parisc/atomic.h                          |    1 
 include/asm-parisc/cache.h                           |    1 
 include/asm-parisc/cacheflush.h                      |    1 
 include/asm-parisc/dma-mapping.h                     |    1 
 include/asm-parisc/dma.h                             |    1 
 include/asm-parisc/io.h                              |    1 
 include/asm-parisc/irq.h                             |    1 
 include/asm-parisc/kmap_types.h                      |    1 
 include/asm-parisc/page.h                            |    1 
 include/asm-parisc/param.h                           |    1 
 include/asm-parisc/pci.h                             |    1 
 include/asm-parisc/pdc.h                             |    1 
 include/asm-parisc/pgtable.h                         |    1 
 include/asm-parisc/processor.h                       |    1 
 include/asm-parisc/psw.h                             |    1 
 include/asm-parisc/smp.h                             |    1 
 include/asm-parisc/system.h                          |    1 
 include/asm-parisc/tlbflush.h                        |    1 
 include/asm-powerpc/abs_addr.h                       |    1 
 include/asm-powerpc/cache.h                          |    1 
 include/asm-powerpc/dma-mapping.h                    |    1 
 include/asm-powerpc/dma.h                            |    1 
 include/asm-powerpc/eeh.h                            |    1 
 include/asm-powerpc/elf.h                            |    7 -
 include/asm-powerpc/floppy.h                         |    1 
 include/asm-powerpc/hw_irq.h                         |    1 
 include/asm-powerpc/ide.h                            |    1 
 include/asm-powerpc/iommu.h                          |    1 
 include/asm-powerpc/irq.h                            |    1 
 include/asm-powerpc/iseries/iseries_io.h             |    1 
 include/asm-powerpc/machdep.h                        |    1 
 include/asm-powerpc/mmzone.h                         |    1 
 include/asm-powerpc/paca.h                           |    1 
 include/asm-powerpc/page.h                           |    1 
 include/asm-powerpc/pgtable.h                        |    1 
 include/asm-powerpc/ppc_asm.h                        |    1 
 include/asm-powerpc/prom.h                           |    1 
 include/asm-powerpc/smp.h                            |    1 
 include/asm-powerpc/smu.h                            |    1 
 include/asm-powerpc/spu.h                            |    1 
 include/asm-powerpc/thread_info.h                    |    1 
 include/asm-powerpc/time.h                           |    1 
 include/asm-powerpc/timex.h                          |    1 
 include/asm-powerpc/tlb.h                            |    1 
 include/asm-powerpc/tlbflush.h                       |    1 
 include/asm-powerpc/topology.h                       |    1 
 include/asm-powerpc/types.h                          |    1 
 include/asm-powerpc/unistd.h                         |    1 
 include/asm-powerpc/vga.h                            |    1 
 include/asm-powerpc/vio.h                            |    1 
 include/asm-ppc/amigahw.h                            |    1 
 include/asm-ppc/bootinfo.h                           |    1 
 include/asm-ppc/commproc.h                           |    1 
 include/asm-ppc/ibm403.h                             |    1 
 include/asm-ppc/ibm44x.h                             |    1 
 include/asm-ppc/ibm4xx.h                             |    1 
 include/asm-ppc/io.h                                 |    1 
 include/asm-ppc/machdep.h                            |    1 
 include/asm-ppc/mmu.h                                |    1 
 include/asm-ppc/mmu_context.h                        |    1 
 include/asm-ppc/mpc8260.h                            |    1 
 include/asm-ppc/mpc83xx.h                            |    1 
 include/asm-ppc/mpc85xx.h                            |    1 
 include/asm-ppc/mpc8xx.h                             |    1 
 include/asm-ppc/mv64x60.h                            |    1 
 include/asm-ppc/ocp.h                                |    1 
 include/asm-ppc/open_pic.h                           |    1 
 include/asm-ppc/page.h                               |    2 
 include/asm-ppc/pc_serial.h                          |    1 
 include/asm-ppc/pgalloc.h                            |    1 
 include/asm-ppc/pgtable.h                            |    1 
 include/asm-ppc/ppc4xx_dma.h                         |    1 
 include/asm-ppc/ppc4xx_pic.h                         |    1 
 include/asm-ppc/serial.h                             |    1 
 include/asm-ppc/smp.h                                |    1 
 include/asm-ppc/time.h                               |    1 
 include/asm-s390/bitops.h                            |    1 
 include/asm-s390/debug.h                             |    1 
 include/asm-s390/hardirq.h                           |    1 
 include/asm-s390/idals.h                             |    1 
 include/asm-s390/local.h                             |    1 
 include/asm-s390/lowcore.h                           |    1 
 include/asm-s390/page.h                              |    6 -
 include/asm-s390/pgalloc.h                           |    1 
 include/asm-s390/sfp-machine.h                       |    1 
 include/asm-s390/smp.h                               |    1 
 include/asm-s390/system.h                            |    1 
 include/asm-s390/tlbflush.h                          |    1 
 include/asm-s390/types.h                             |    1 
 include/asm-s390/unistd.h                            |    1 
 include/asm-sh/bug.h                                 |    1 
 include/asm-sh/checksum.h                            |    1 
 include/asm-sh/dma-mapping.h                         |    1 
 include/asm-sh/dma.h                                 |    1 
 include/asm-sh/fixmap.h                              |    1 
 include/asm-sh/hardirq.h                             |    1 
 include/asm-sh/hd64461/hd64461.h                     |    1 
 include/asm-sh/hd64465/hd64465.h                     |    1 
 include/asm-sh/ide.h                                 |    1 
 include/asm-sh/io.h                                  |    1 
 include/asm-sh/irq.h                                 |    1 
 include/asm-sh/keyboard.h                            |    1 
 include/asm-sh/kmap_types.h                          |    1 
 include/asm-sh/machvec.h                             |    1 
 include/asm-sh/machvec_init.h                        |    1 
 include/asm-sh/mpc1211/dma.h                         |    1 
 include/asm-sh/overdrive/overdrive.h                 |    1 
 include/asm-sh/page.h                                |    1 
 include/asm-sh/pgtable.h                             |    1 
 include/asm-sh/serial.h                              |    1 
 include/asm-sh/smp.h                                 |    1 
 include/asm-sh/system.h                              |    1 
 include/asm-sh/types.h                               |    1 
 include/asm-sh/watchdog.h                            |    1 
 include/asm-sh64/bug.h                               |    1 
 include/asm-sh64/dma-mapping.h                       |    1 
 include/asm-sh64/hardirq.h                           |    1 
 include/asm-sh64/ide.h                               |    1 
 include/asm-sh64/irq.h                               |    1 
 include/asm-sh64/mmu_context.h                       |    1 
 include/asm-sh64/page.h                              |    1 
 include/asm-sh64/param.h                             |    1 
 include/asm-sh64/pgtable.h                           |    1 
 include/asm-sh64/system.h                            |    1 
 include/asm-sparc/asmmacro.h                         |    1 
 include/asm-sparc/atomic.h                           |    1 
 include/asm-sparc/bugs.h                             |    1 
 include/asm-sparc/cacheflush.h                       |    1 
 include/asm-sparc/delay.h                            |    1 
 include/asm-sparc/dma-mapping.h                      |    1 
 include/asm-sparc/dma.h                              |    1 
 include/asm-sparc/elf.h                              |    1 
 include/asm-sparc/fixmap.h                           |    1 
 include/asm-sparc/hardirq.h                          |    1 
 include/asm-sparc/ide.h                              |    1 
 include/asm-sparc/irq.h                              |    1 
 include/asm-sparc/mostek.h                           |    1 
 include/asm-sparc/page.h                             |    1 
 include/asm-sparc/pgalloc.h                          |    1 
 include/asm-sparc/pgtable.h                          |    1 
 include/asm-sparc/sfp-machine.h                      |    1 
 include/asm-sparc/smp.h                              |    1 
 include/asm-sparc/system.h                           |    2 
 include/asm-sparc/timer.h                            |    1 
 include/asm-sparc/tlbflush.h                         |    1 
 include/asm-sparc/vac-ops.h                          |    1 
 include/asm-sparc/winmacro.h                         |    1 
 include/asm-sparc64/atomic.h                         |    1 
 include/asm-sparc64/bitops.h                         |    1 
 include/asm-sparc64/bugs.h                           |    1 
 include/asm-sparc64/cacheflush.h                     |    1 
 include/asm-sparc64/delay.h                          |    1 
 include/asm-sparc64/dma-mapping.h                    |    1 
 include/asm-sparc64/dma.h                            |    1 
 include/asm-sparc64/floppy.h                         |    1 
 include/asm-sparc64/ide.h                            |    1 
 include/asm-sparc64/irq.h                            |    1 
 include/asm-sparc64/kprobes.h                        |    1 
 include/asm-sparc64/mc146818rtc.h                    |    1 
 include/asm-sparc64/mmu.h                            |    1 
 include/asm-sparc64/oplib.h                          |    1 
 include/asm-sparc64/page.h                           |    1 
 include/asm-sparc64/param.h                          |    1 
 include/asm-sparc64/pgalloc.h                        |    1 
 include/asm-sparc64/pgtable.h                        |    1 
 include/asm-sparc64/processor.h                      |    1 
 include/asm-sparc64/siginfo.h                        |    1 
 include/asm-sparc64/signal.h                         |    1 
 include/asm-sparc64/smp.h                            |    1 
 include/asm-sparc64/spinlock.h                       |    1 
 include/asm-sparc64/system.h                         |    1 
 include/asm-sparc64/timer.h                          |    1 
 include/asm-sparc64/tlb.h                            |    1 
 include/asm-sparc64/tlbflush.h                       |    1 
 include/asm-sparc64/ttable.h                         |    1 
 include/asm-um/a.out.h                               |    1 
 include/asm-um/cache.h                               |    1 
 include/asm-um/elf-ppc.h                             |    1 
 include/asm-um/fixmap.h                              |    1 
 include/asm-um/hardirq.h                             |    1 
 include/asm-um/linkage.h                             |    1 
 include/asm-um/mmu_context.h                         |    1 
 include/asm-um/page.h                                |    1 
 include/asm-um/pgalloc.h                             |    1 
 include/asm-um/processor-generic.h                   |    1 
 include/asm-um/ptrace-generic.h                      |    1 
 include/asm-um/smp.h                                 |    1 
 include/asm-um/thread_info.h                         |    1 
 include/asm-v850/atomic.h                            |    1 
 include/asm-v850/bitops.h                            |    1 
 include/asm-v850/dma-mapping.h                       |    1 
 include/asm-v850/hardirq.h                           |    1 
 include/asm-v850/machdep.h                           |    1 
 include/asm-v850/pgtable.h                           |    1 
 include/asm-v850/processor.h                         |    1 
 include/asm-v850/serial.h                            |    1 
 include/asm-v850/v850e_uart.h                        |    1 
 include/asm-x86_64/apic.h                            |    1 
 include/asm-x86_64/atomic.h                          |    1 
 include/asm-x86_64/bitops.h                          |    1 
 include/asm-x86_64/bugs.h                            |    1 
 include/asm-x86_64/cache.h                           |    1 
 include/asm-x86_64/calling.h                         |    1 
 include/asm-x86_64/dma-mapping.h                     |    1 
 include/asm-x86_64/dma.h                             |    1 
 include/asm-x86_64/dwarf2.h                          |    1 
 include/asm-x86_64/fixmap.h                          |    1 
 include/asm-x86_64/hardirq.h                         |    1 
 include/asm-x86_64/hw_irq.h                          |    1 
 include/asm-x86_64/ia32.h                            |    1 
 include/asm-x86_64/io.h                              |    1 
 include/asm-x86_64/io_apic.h                         |    1 
 include/asm-x86_64/mmu_context.h                     |    1 
 include/asm-x86_64/mmzone.h                          |    1 
 include/asm-x86_64/mtrr.h                            |    1 
 include/asm-x86_64/param.h                           |    1 
 include/asm-x86_64/pci.h                             |    1 
 include/asm-x86_64/processor.h                       |    1 
 include/asm-x86_64/serial.h                          |    1 
 include/asm-x86_64/smp.h                             |    1 
 include/asm-x86_64/spinlock.h                        |    1 
 include/asm-x86_64/swiotlb.h                         |    1 
 include/asm-x86_64/system.h                          |    1 
 include/asm-x86_64/tlbflush.h                        |    1 
 include/asm-x86_64/topology.h                        |    1 
 include/asm-x86_64/uaccess.h                         |    1 
 include/asm-xtensa/atomic.h                          |    1 
 include/asm-xtensa/checksum.h                        |    1 
 include/asm-xtensa/delay.h                           |    1 
 include/asm-xtensa/dma.h                             |    1 
 include/asm-xtensa/hardirq.h                         |    1 
 include/asm-xtensa/ide.h                             |    1 
 include/asm-xtensa/io.h                              |    1 
 include/asm-xtensa/irq.h                             |    1 
 include/asm-xtensa/mmu_context.h                     |    1 
 include/asm-xtensa/page.h                            |    1 
 include/asm-xtensa/pgalloc.h                         |    1 
 include/asm-xtensa/platform.h                        |    1 
 include/asm-xtensa/system.h                          |    1 
 include/linux/acct.h                                 |    3 
 include/linux/acpi.h                                 |    1 
 include/linux/agpgart.h                              |    3 
 include/linux/amba/clcd.h                            |    1 
 include/linux/atmdev.h                               |    1 
 include/linux/audit.h                                |    4 
 include/linux/blkdev.h                               |    1 
 include/linux/blktrace_api.h                         |    1 
 include/linux/blockgroup_lock.h                      |    1 
 include/linux/cache.h                                |    1 
 include/linux/coda.h                                 |    1 
 include/linux/compat.h                               |    1 
 include/linux/cpufreq.h                              |    1 
 include/linux/crypto.h                               |    1 
 include/linux/cyclomx.h                              |    1 
 include/linux/dcookies.h                             |    1 
 include/linux/devfs_fs_kernel.h                      |    1 
 include/linux/device.h                               |    1 
 include/linux/dmi.h                                  |    1 
 include/linux/dnotify.h                              |    1 
 include/linux/elf.h                                  |   59 -----------
 include/linux/errqueue.h                             |    1 
 include/linux/ext2_fs.h                              |    2 
 include/linux/ext3_fs.h                              |    7 -
 include/linux/fs.h                                   |    1 
 include/linux/ftape.h                                |    1 
 include/linux/gameport.h                             |    6 +
 include/linux/generic_serial.h                       |    6 -
 include/linux/genhd.h                                |   12 +-
 include/linux/gfp.h                                  |    1 
 include/linux/hardirq.h                              |    1 
 include/linux/highmem.h                              |    1 
 include/linux/highuid.h                              |    1 
 include/linux/i2c-algo-ite.h                         |    7 +
 include/linux/i2c.h                                  |    9 +
 include/linux/ide.h                                  |    1 
 include/linux/if_frad.h                              |    1 
 include/linux/if_tr.h                                |    1 
 include/linux/init.h                                 |    1 
 include/linux/inotify.h                              |    1 
 include/linux/interrupt.h                            |    1 
 include/linux/ipmi.h                                 |    2 
 include/linux/ipv6.h                                 |    1 
 include/linux/irq.h                                  |    1 
 include/linux/irq_cpustat.h                          |    1 
 include/linux/isapnp.h                               |    1 
 include/linux/isdn.h                                 |    1 
 include/linux/isdn/tpam.h                            |    1 
 include/linux/isdn_ppp.h                             |    1 
 include/linux/isdnif.h                               |    1 
 include/linux/kallsyms.h                             |    1 
 include/linux/kernel_stat.h                          |    1 
 include/linux/kmod.h                                 |    1 
 include/linux/kprobes.h                              |    1 
 include/linux/linkage.h                              |    1 
 include/linux/lockd/lockd.h                          |    1 
 include/linux/lockd/nlm.h                            |    1 
 include/linux/mempolicy.h                            |    1 
 include/linux/migrate.h                              |    1 
 include/linux/mm.h                                   |    1 
 include/linux/mman.h                                 |   12 +-
 include/linux/mmzone.h                               |    1 
 include/linux/module.h                               |    1 
 include/linux/msg.h                                  |    2 
 include/linux/mtd/cfi.h                              |    1 
 include/linux/mtd/map.h                              |    1 
 include/linux/mtd/mtd.h                              |    1 
 include/linux/mtd/nand.h                             |    1 
 include/linux/mtd/physmap.h                          |    1 
 include/linux/mtd/xip.h                              |    1 
 include/linux/ncp_fs.h                               |    5 -
 include/linux/net.h                                  |    3 
 include/linux/netdevice.h                            |    1 
 include/linux/netfilter.h                            |    1 
 include/linux/netfilter_arp.h                        |    1 
 include/linux/netfilter_bridge.h                     |    1 
 include/linux/netfilter_ipv4.h                       |    1 
 include/linux/netfilter_ipv4/ip_conntrack.h          |    1 
 include/linux/netfilter_ipv4/listhelp.h              |    1 
 include/linux/nfs.h                                  |    8 -
 include/linux/nfs4.h                                 |    6 -
 include/linux/nfs_fs.h                               |   39 +++----
 include/linux/nfsd/nfsd.h                            |    1 
 include/linux/nfsd/nfsfh.h                           |    1 
 include/linux/nfsd/syscall.h                         |    1 
 include/linux/numa.h                                 |    1 
 include/linux/parport.h                              |    1 
 include/linux/pci.h                                  |    1 
 include/linux/percpu_counter.h                       |    1 
 include/linux/pm.h                                   |    1 
 include/linux/pm_legacy.h                            |    1 
 include/linux/pmu.h                                  |    1 
 include/linux/preempt.h                              |    1 
 include/linux/proc_fs.h                              |    1 
 include/linux/profile.h                              |    1 
 include/linux/quota.h                                |    4 
 include/linux/quotaops.h                             |    1 
 include/linux/reiserfs_xattr.h                       |    3 
 include/linux/relay.h                                |    1 
 include/linux/rio.h                                  |    1 
 include/linux/rio_drv.h                              |    1 
 include/linux/rmap.h                                 |    1 
 include/linux/rtnetlink.h                            |    1 
 include/linux/rwsem.h                                |    1 
 include/linux/scc.h                                  |    1 
 include/linux/sched.h                                |   94 +++++++++----------
 include/linux/seccomp.h                              |    1 
 include/linux/sem.h                                  |    2 
 include/linux/seqlock.h                              |    1 
 include/linux/serialP.h                              |    1 
 include/linux/serial_core.h                          |    1 
 include/linux/signal.h                               |    4 
 include/linux/skbuff.h                               |    1 
 include/linux/slab.h                                 |    1 
 include/linux/smb_fs.h                               |    4 
 include/linux/smp.h                                  |    1 
 include/linux/smp_lock.h                             |    1 
 include/linux/socket.h                               |    2 
 include/linux/spinlock.h                             |    1 
 include/linux/stop_machine.h                         |    1 
 include/linux/sunrpc/auth.h                          |    1 
 include/linux/sunrpc/debug.h                         |   24 ++--
 include/linux/sunrpc/stats.h                         |    1 
 include/linux/suspend.h                              |    1 
 include/linux/swap.h                                 |    1 
 include/linux/syscalls.h                             |    1 
 include/linux/sysrq.h                                |    1 
 include/linux/tcp.h                                  |    1 
 include/linux/threads.h                              |    1 
 include/linux/timer.h                                |    1 
 include/linux/timex.h                                |    1 
 include/linux/tty.h                                  |    1 
 include/linux/types.h                                |    1 
 include/linux/udp.h                                  |    1 
 include/linux/usb.h                                  |    1 
 include/linux/usb_usual.h                            |    1 
 include/linux/usbdevice_fs.h                         |    2 
 include/linux/vt_buffer.h                            |    1 
 include/linux/vt_kern.h                              |    1 
 include/linux/wait.h                                 |    1 
 include/linux/wanrouter.h                            |    4 
 include/mtd/mtd-abi.h                                |    5 -
 include/net/addrconf.h                               |    1 
 include/net/af_unix.h                                |    1 
 include/net/ax25.h                                   |    1 
 include/net/compat.h                                 |    1 
 include/net/dst.h                                    |    1 
 include/net/icmp.h                                   |    1 
 include/net/inet6_hashtables.h                       |    1 
 include/net/inet_hashtables.h                        |    1 
 include/net/inet_sock.h                              |    1 
 include/net/inet_timewait_sock.h                     |    1 
 include/net/ip.h                                     |    1 
 include/net/ip_fib.h                                 |    1 
 include/net/ip_mp_alg.h                              |    1 
 include/net/ip_vs.h                                  |    1 
 include/net/ipv6.h                                   |    1 
 include/net/irda/irda.h                              |    1 
 include/net/irda/irda_device.h                       |    1 
 include/net/irda/irlap.h                             |    1 
 include/net/irda/irlmp.h                             |    1 
 include/net/irda/irlmp_frame.h                       |    1 
 include/net/irda/qos.h                               |    1 
 include/net/ndisc.h                                  |    1 
 include/net/netfilter/nf_conntrack.h                 |    1 
 include/net/pkt_act.h                                |    1 
 include/net/protocol.h                               |    1 
 include/net/raw.h                                    |    1 
 include/net/red.h                                    |    1 
 include/net/route.h                                  |    1 
 include/net/sch_generic.h                            |    1 
 include/net/sctp/sctp.h                              |    1 
 include/net/sock.h                                   |    1 
 include/net/tcp.h                                    |    1 
 include/pcmcia/ss.h                                  |    1 
 include/scsi/scsi_transport_fc.h                     |    1 
 include/scsi/scsi_transport_spi.h                    |    1 
 include/sound/driver.h                               |    1 
 include/video/edid.h                                 |    1 
 include/video/vga.h                                  |    1 
 866 files changed, 210 insertions(+), 1045 deletions(-)

Index: linux-2.6-header-cleanup-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-cleanup-git.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-header-cleanup-git.patch	27 Apr 2006 05:45:21 -0000	1.4
+++ linux-2.6-header-cleanup-git.patch	27 Apr 2006 14:51:37 -0000	1.5
@@ -2060,10 +2060,10 @@
  #include <linux/ioctl.h>
  #include <linux/errno.h>
  
-unchanged:
---- a/include/asm-i386/page.h
+diff -u b/include/asm-i386/page.h b/include/asm-i386/page.h
+--- b/include/asm-i386/page.h
 +++ b/include/asm-i386/page.h
-@@ -12,7 +12,6 @@ #define LARGE_PAGE_SIZE (1UL << PMD_SHIF
+@@ -12,7 +12,6 @@
  #ifdef __KERNEL__
  #ifndef __ASSEMBLY__
  
@@ -2071,6 +2071,16 @@
  
  #ifdef CONFIG_X86_USE_3DNOW
  
+@@ -139,7 +138,7 @@
+ 
+-#endif /* __KERNEL__ */
+-
+ #include <asm-generic/memory_model.h>
+ #include <asm-generic/page.h>
+ 
++#endif /* __KERNEL__ */
++
+ #endif /* _I386_PAGE_H */
 unchanged:
 --- a/include/asm-i386/param.h
 +++ b/include/asm-i386/param.h
@@ -7283,8 +7293,8 @@
  #include <linux/ioctl.h>
  #include <linux/compat.h>
  
-unchanged:
---- a/include/asm-x86_64/page.h
+diff -u b/include/asm-x86_64/page.h b/include/asm-x86_64/page.h
+--- b/include/asm-x86_64/page.h
 +++ b/include/asm-x86_64/page.h
 @@ -1,7 +1,6 @@
  #ifndef _X86_64_PAGE_H
@@ -7294,6 +7304,16 @@
  
  /* PAGE_SHIFT determines the page size */
  #define PAGE_SHIFT	12
+@@ -138,7 +137,7 @@
+ 
+-#endif /* __KERNEL__ */
+-
+ #include <asm-generic/memory_model.h>
+ #include <asm-generic/page.h>
+ 
++#endif /* __KERNEL__ */
++
+ #endif /* _X86_64_PAGE_H */
 unchanged:
 --- a/include/asm-x86_64/param.h
 +++ b/include/asm-x86_64/param.h
@@ -10208,7 +10228,6 @@
 +#endif /* __KERNEL__ */
 +
  #endif /* _S390_PAGE_H */
-only in patch2:
 unchanged:
 --- a/include/asm-generic/signal.h
 +++ b/include/asm-generic/signal.h



From fedora-cvs-commits at redhat.com  Thu Apr 27 14:52:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 10:52:41 -0400
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders.spec,1.114,1.115
Message-ID: <200604271452.k3REqflV023184@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23156

Modified Files:
	glibc-kernheaders.spec 
Log Message:
fix i386 and x86_64 page.h


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- glibc-kernheaders.spec	27 Apr 2006 03:59:02 -0000	1.114
+++ glibc-kernheaders.spec	27 Apr 2006 14:52:38 -0000	1.115
@@ -1,7 +1,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -91,6 +91,9 @@
 
 
 %changelog
+* Thu Apr 27 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-15
+- Fix asm-i386/page.h and asm-x86_64/page.h for Xen
+
 * Thu Apr 27 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-14
 - Fix asm/s390/{ptrace.h,page.h}
 



From fedora-cvs-commits at redhat.com  Thu Apr 27 14:55:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 10:55:45 -0400
Subject: rpms/kernel/devel linux-2.6-header-cleanup-git.patch, 1.3.2.1,
	1.3.2.2
Message-ID: <200604271455.k3REtjnq024411@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24372

Modified Files:
      Tag: private-kernel-headers-branch
	linux-2.6-header-cleanup-git.patch 
Log Message:
fix i386 and x86_64 asm/page.h

linux-2.6-header-cleanup-git.patch:
 b/include/asm-i386/page.h                            |    5 -
 b/include/asm-s390/ptrace.h                          |    6 -
 b/include/asm-x86_64/page.h                          |    5 -
 b/include/linux/elf-em.h                             |   44 ++++++++
 include/acpi/platform/aclinux.h                      |    1 
 include/acpi/processor.h                             |    1 
 include/asm-alpha/bitops.h                           |    1 
 include/asm-alpha/cache.h                            |    1 
 include/asm-alpha/cacheflush.h                       |    1 
 include/asm-alpha/core_cia.h                         |    1 
 include/asm-alpha/core_t2.h                          |    1 
 include/asm-alpha/dma-mapping.h                      |    1 
 include/asm-alpha/dma.h                              |    1 
 include/asm-alpha/floppy.h                           |    1 
 include/asm-alpha/hardirq.h                          |    1 
 include/asm-alpha/hw_irq.h                           |    1 
 include/asm-alpha/ide.h                              |    1 
 include/asm-alpha/io.h                               |    1 
 include/asm-alpha/irq.h                              |    1 
 include/asm-alpha/kmap_types.h                       |    1 
 include/asm-alpha/machvec.h                          |    1 
 include/asm-alpha/mmu_context.h                      |    1 
 include/asm-alpha/mmzone.h                           |    1 
 include/asm-alpha/page.h                             |    1 
 include/asm-alpha/param.h                            |    1 
 include/asm-alpha/pgalloc.h                          |    1 
 include/asm-alpha/pgtable.h                          |    1 
 include/asm-alpha/serial.h                           |    1 
 include/asm-alpha/smp.h                              |    1 
 include/asm-alpha/spinlock.h                         |    1 
 include/asm-alpha/system.h                           |    1 
 include/asm-alpha/tlbflush.h                         |    1 
 include/asm-arm/apm.h                                |    1 
 include/asm-arm/arch-aaec2000/memory.h               |    1 
 include/asm-arm/arch-cl7500/acornfb.h                |    1 
 include/asm-arm/arch-clps711x/hardware.h             |    1 
 include/asm-arm/arch-clps711x/memory.h               |    1 
 include/asm-arm/arch-clps711x/uncompress.h           |    1 
 include/asm-arm/arch-ebsa285/hardware.h              |    1 
 include/asm-arm/arch-ebsa285/memory.h                |    1 
 include/asm-arm/arch-ebsa285/vmalloc.h               |    1 
 include/asm-arm/arch-integrator/smp.h                |    1 
 include/asm-arm/arch-iop3xx/memory.h                 |    1 
 include/asm-arm/arch-iop3xx/timex.h                  |    1 
 include/asm-arm/arch-iop3xx/uncompress.h             |    1 
 include/asm-arm/arch-ixp4xx/dma.h                    |    1 
 include/asm-arm/arch-lh7a40x/constants.h             |    1 
 include/asm-arm/arch-lh7a40x/irqs.h                  |    1 
 include/asm-arm/arch-lh7a40x/registers.h             |    1 
 include/asm-arm/arch-omap/board.h                    |    1 
 include/asm-arm/arch-omap/hardware.h                 |    1 
 include/asm-arm/arch-omap/system.h                   |    1 
 include/asm-arm/arch-omap/uncompress.h               |    1 
 include/asm-arm/arch-pxa/idp.h                       |    1 
 include/asm-arm/arch-pxa/irqs.h                      |    1 
 include/asm-arm/arch-pxa/pxa-regs.h                  |    1 
 include/asm-arm/arch-pxa/timex.h                     |    1 
 include/asm-arm/arch-realview/smp.h                  |    1 
 include/asm-arm/arch-s3c2410/dma.h                   |    1 
 include/asm-arm/arch-s3c2410/uncompress.h            |    1 
 include/asm-arm/arch-sa1100/assabet.h                |    1 
 include/asm-arm/arch-sa1100/cerf.h                   |    1 
 include/asm-arm/arch-sa1100/collie.h                 |    1 
 include/asm-arm/arch-sa1100/dma.h                    |    1 
 include/asm-arm/arch-sa1100/hardware.h               |    1 
 include/asm-arm/arch-sa1100/ide.h                    |    1 
 include/asm-arm/arch-sa1100/irqs.h                   |    1 
 include/asm-arm/arch-sa1100/memory.h                 |    1 
 include/asm-arm/arch-sa1100/system.h                 |    1 
 include/asm-arm/atomic.h                             |    1 
 include/asm-arm/bug.h                                |    1 
 include/asm-arm/cacheflush.h                         |    1 
 include/asm-arm/cpu.h                                |    1 
 include/asm-arm/dma-mapping.h                        |    1 
 include/asm-arm/dma.h                                |    1 
 include/asm-arm/elf.h                                |    1 
 include/asm-arm/fpstate.h                            |    1 
 include/asm-arm/glue.h                               |    1 
 include/asm-arm/hardirq.h                            |    1 
 include/asm-arm/hardware/dec21285.h                  |    1 
 include/asm-arm/hardware/iomd.h                      |    1 
 include/asm-arm/leds.h                               |    1 
 include/asm-arm/mach/serial_at91rm9200.h             |    1 
 include/asm-arm/mach/serial_sa1100.h                 |    1 
 include/asm-arm/memory.h                             |    1 
 include/asm-arm/page.h                               |    1 
 include/asm-arm/pci.h                                |    1 
 include/asm-arm/proc-fns.h                           |    1 
 include/asm-arm/ptrace.h                             |    1 
 include/asm-arm/smp.h                                |    1 
 include/asm-arm/system.h                             |    1 
 include/asm-arm/tlbflush.h                           |    1 
 include/asm-arm26/atomic.h                           |    1 
 include/asm-arm26/bug.h                              |    1 
 include/asm-arm26/dma.h                              |    1 
 include/asm-arm26/hardirq.h                          |    1 
 include/asm-arm26/hardware.h                         |    1 
 include/asm-arm26/io.h                               |    1 
 include/asm-arm26/leds.h                             |    1 
 include/asm-arm26/mach-types.h                       |    1 
 include/asm-arm26/page.h                             |    1 
 include/asm-arm26/pgtable.h                          |    1 
 include/asm-arm26/serial.h                           |    1 
 include/asm-arm26/smp.h                              |    1 
 include/asm-arm26/sysirq.h                           |    1 
 include/asm-arm26/system.h                           |    1 
 include/asm-cris/arch-v10/io.h                       |    1 
 include/asm-cris/arch-v10/page.h                     |    1 
 include/asm-cris/arch-v10/system.h                   |    1 
 include/asm-cris/arch-v32/io.h                       |    1 
 include/asm-cris/arch-v32/irq.h                      |    1 
 include/asm-cris/arch-v32/page.h                     |    1 
 include/asm-cris/arch-v32/processor.h                |    1 
 include/asm-cris/arch-v32/system.h                   |    1 
 include/asm-cris/eshlibld.h                          |    1 
 include/asm-cris/etraxgpio.h                         |    1 
 include/asm-cris/fasttimer.h                         |    1 
 include/asm-cris/page.h                              |    1 
 include/asm-cris/pci.h                               |    1 
 include/asm-cris/pgtable.h                           |    1 
 include/asm-cris/processor.h                         |    1 
 include/asm-cris/rtc.h                               |    1 
 include/asm-cris/tlbflush.h                          |    1 
 include/asm-frv/atomic.h                             |    1 
 include/asm-frv/bitops.h                             |    1 
 include/asm-frv/bug.h                                |    1 
 include/asm-frv/cache.h                              |    1 
 include/asm-frv/dma.h                                |    1 
 include/asm-frv/elf.h                                |    1 
 include/asm-frv/fpu.h                                |    1 
 include/asm-frv/hardirq.h                            |    1 
 include/asm-frv/highmem.h                            |    1 
 include/asm-frv/ide.h                                |    1 
 include/asm-frv/io.h                                 |    1 
 include/asm-frv/irq.h                                |    1 
 include/asm-frv/mmu_context.h                        |    1 
 include/asm-frv/page.h                               |    1 
 include/asm-frv/pci.h                                |    1 
 include/asm-frv/pgalloc.h                            |    1 
 include/asm-frv/pgtable.h                            |    1 
 include/asm-frv/processor.h                          |    1 
 include/asm-frv/segment.h                            |    1 
 include/asm-frv/serial.h                             |    1 
 include/asm-frv/smp.h                                |    1 
 include/asm-frv/system.h                             |    1 
 include/asm-frv/tlbflush.h                           |    1 
 include/asm-frv/types.h                              |    1 
 include/asm-frv/unaligned.h                          |    1 
 include/asm-frv/virtconvert.h                        |    1 
 include/asm-generic/bug.h                            |    1 
 include/asm-generic/dma-mapping.h                    |    1 
 include/asm-generic/fcntl.h                          |    1 
 include/asm-generic/local.h                          |    1 
 include/asm-generic/signal.h                         |    7 +
 include/asm-generic/tlb.h                            |    1 
 include/asm-h8300/bitops.h                           |    1 
 include/asm-h8300/dma.h                              |    1 
 include/asm-h8300/elf.h                              |    1 
 include/asm-h8300/hardirq.h                          |    1 
 include/asm-h8300/io.h                               |    1 
 include/asm-h8300/keyboard.h                         |    1 
 include/asm-h8300/mmu_context.h                      |    1 
 include/asm-h8300/page.h                             |    1 
 include/asm-h8300/page_offset.h                      |    1 
 include/asm-h8300/param.h                            |    1 
 include/asm-h8300/pgtable.h                          |    1 
 include/asm-h8300/processor.h                        |    1 
 include/asm-h8300/semaphore-helper.h                 |    1 
 include/asm-h8300/shm.h                              |    1 
 include/asm-h8300/system.h                           |    1 
 include/asm-h8300/unaligned.h                        |    1 
 include/asm-h8300/virtconvert.h                      |    1 
 include/asm-i386/apic.h                              |    1 
 include/asm-i386/atomic.h                            |    1 
 include/asm-i386/bitops.h                            |    1 
 include/asm-i386/bug.h                               |    1 
 include/asm-i386/bugs.h                              |    1 
 include/asm-i386/byteorder.h                         |    1 
 include/asm-i386/cache.h                             |    1 
 include/asm-i386/dma.h                               |    1 
 include/asm-i386/fixmap.h                            |    1 
 include/asm-i386/hardirq.h                           |    1 
 include/asm-i386/highmem.h                           |    1 
 include/asm-i386/hpet.h                              |    1 
 include/asm-i386/hw_irq.h                            |    1 
 include/asm-i386/ide.h                               |    1 
 include/asm-i386/io.h                                |    1 
 include/asm-i386/io_apic.h                           |    1 
 include/asm-i386/irq.h                               |    1 
 include/asm-i386/kmap_types.h                        |    1 
 include/asm-i386/mach-summit/mach_apic.h             |    1 
 include/asm-i386/mmu_context.h                       |    1 
 include/asm-i386/mtrr.h                              |    1 
 include/asm-i386/param.h                             |    1 
 include/asm-i386/pci.h                               |    1 
 include/asm-i386/pgalloc.h                           |    1 
 include/asm-i386/pgtable.h                           |    1 
 include/asm-i386/processor.h                         |    1 
 include/asm-i386/serial.h                            |    1 
 include/asm-i386/smp.h                               |    1 
 include/asm-i386/spinlock.h                          |    1 
 include/asm-i386/string.h                            |    1 
 include/asm-i386/system.h                            |    1 
 include/asm-i386/thread_info.h                       |    1 
 include/asm-i386/timex.h                             |    1 
 include/asm-i386/tlbflush.h                          |    1 
 include/asm-i386/types.h                             |    1 
 include/asm-i386/uaccess.h                           |    1 
 include/asm-ia64/asmmacro.h                          |    1 
 include/asm-ia64/cache.h                             |    1 
 include/asm-ia64/delay.h                             |    1 
 include/asm-ia64/dma-mapping.h                       |    1 
 include/asm-ia64/dma.h                               |    1 
 include/asm-ia64/elf.h                               |    1 
 include/asm-ia64/hardirq.h                           |    1 
 include/asm-ia64/ia32.h                              |    1 
 include/asm-ia64/ide.h                               |    1 
 include/asm-ia64/intrinsics.h                        |    1 
 include/asm-ia64/kmap_types.h                        |    1 
 include/asm-ia64/machvec.h                           |    1 
 include/asm-ia64/meminit.h                           |    1 
 include/asm-ia64/nodedata.h                          |    1 
 include/asm-ia64/numa.h                              |    1 
 include/asm-ia64/page.h                              |    1 
 include/asm-ia64/param.h                             |    1 
 include/asm-ia64/percpu.h                            |    1 
 include/asm-ia64/pgalloc.h                           |    1 
 include/asm-ia64/pgtable.h                           |    1 
 include/asm-ia64/processor.h                         |    1 
 include/asm-ia64/ptrace.h                            |    1 
 include/asm-ia64/smp.h                               |    1 
 include/asm-ia64/sn/simulator.h                      |    1 
 include/asm-ia64/sn/sn_cpuid.h                       |    1 
 include/asm-ia64/sn/sn_sal.h                         |    1 
 include/asm-ia64/sn/xpc.h                            |    1 
 include/asm-ia64/string.h                            |    1 
 include/asm-ia64/system.h                            |    1 
 include/asm-ia64/tlb.h                               |    1 
 include/asm-ia64/tlbflush.h                          |    1 
 include/asm-ia64/unistd.h                            |    1 
 include/asm-m32r/assembler.h                         |    1 
 include/asm-m32r/atomic.h                            |    1 
 include/asm-m32r/bitops.h                            |    1 
 include/asm-m32r/cacheflush.h                        |    1 
 include/asm-m32r/hardirq.h                           |    1 
 include/asm-m32r/ide.h                               |    1 
 include/asm-m32r/irq.h                               |    1 
 include/asm-m32r/kmap_types.h                        |    1 
 include/asm-m32r/m32104ut/m32104ut_pld.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lan.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lcd.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_pld.h             |    1 
 include/asm-m32r/m32r.h                              |    1 
 include/asm-m32r/mmu.h                               |    1 
 include/asm-m32r/mmu_context.h                       |    2 
 include/asm-m32r/opsput/opsput_lan.h                 |    1 
 include/asm-m32r/opsput/opsput_lcd.h                 |    1 
 include/asm-m32r/opsput/opsput_pld.h                 |    1 
 include/asm-m32r/page.h                              |    1 
 include/asm-m32r/pgalloc.h                           |    1 
 include/asm-m32r/pgtable-2level.h                    |    1 
 include/asm-m32r/pgtable.h                           |    1 
 include/asm-m32r/processor.h                         |    1 
 include/asm-m32r/ptrace.h                            |    1 
 include/asm-m32r/rtc.h                               |    1 
 include/asm-m32r/semaphore.h                         |    1 
 include/asm-m32r/serial.h                            |    1 
 include/asm-m32r/sigcontext.h                        |    1 
 include/asm-m32r/smp.h                               |    1 
 include/asm-m32r/spinlock.h                          |    1 
 include/asm-m32r/system.h                            |    1 
 include/asm-m32r/timex.h                             |    1 
 include/asm-m32r/tlbflush.h                          |    1 
 include/asm-m32r/uaccess.h                           |    1 
 include/asm-m68k/atomic.h                            |    1 
 include/asm-m68k/bug.h                               |    1 
 include/asm-m68k/dma-mapping.h                       |    1 
 include/asm-m68k/dma.h                               |    1 
 include/asm-m68k/dvma.h                              |    1 
 include/asm-m68k/elf.h                               |    1 
 include/asm-m68k/entry.h                             |    1 
 include/asm-m68k/fpu.h                               |    1 
 include/asm-m68k/hardirq.h                           |    1 
 include/asm-m68k/ide.h                               |    1 
 include/asm-m68k/io.h                                |    1 
 include/asm-m68k/irq.h                               |    1 
 include/asm-m68k/mc146818rtc.h                       |    1 
 include/asm-m68k/mmu_context.h                       |    1 
 include/asm-m68k/motorola_pgtable.h                  |    1 
 include/asm-m68k/openprom.h                          |    1 
 include/asm-m68k/page.h                              |    1 
 include/asm-m68k/page_offset.h                       |    1 
 include/asm-m68k/pgalloc.h                           |    1 
 include/asm-m68k/pgtable.h                           |    1 
 include/asm-m68k/processor.h                         |    1 
 include/asm-m68k/semaphore-helper.h                  |    1 
 include/asm-m68k/serial.h                            |    1 
 include/asm-m68k/setup.h                             |    1 
 include/asm-m68k/shm.h                               |    1 
 include/asm-m68k/system.h                            |    1 
 include/asm-m68k/tlbflush.h                          |    1 
 include/asm-m68k/virtconvert.h                       |    1 
 include/asm-m68knommu/bitops.h                       |    1 
 include/asm-m68knommu/coldfire.h                     |    1 
 include/asm-m68knommu/commproc.h                     |    1 
 include/asm-m68knommu/dma-mapping.h                  |    1 
 include/asm-m68knommu/dma.h                          |    1 
 include/asm-m68knommu/elf.h                          |    1 
 include/asm-m68knommu/elia.h                         |    1 
 include/asm-m68knommu/entry.h                        |    1 
 include/asm-m68knommu/fpu.h                          |    1 
 include/asm-m68knommu/hardirq.h                      |    1 
 include/asm-m68knommu/io.h                           |    1 
 include/asm-m68knommu/irq.h                          |    1 
 include/asm-m68knommu/m5206sim.h                     |    1 
 include/asm-m68knommu/m520xsim.h                     |    1 
 include/asm-m68knommu/m523xsim.h                     |    1 
 include/asm-m68knommu/m5272sim.h                     |    1 
 include/asm-m68knommu/m527xsim.h                     |    1 
 include/asm-m68knommu/m528xsim.h                     |    1 
 include/asm-m68knommu/mcfcache.h                     |    1 
 include/asm-m68knommu/mcfdma.h                       |    1 
 include/asm-m68knommu/mcfmbus.h                      |    1 
 include/asm-m68knommu/mcfne.h                        |    1 
 include/asm-m68knommu/mcfpci.h                       |    1 
 include/asm-m68knommu/mcfpit.h                       |    1 
 include/asm-m68knommu/mcfsim.h                       |    1 
 include/asm-m68knommu/mcfsmc.h                       |    1 
 include/asm-m68knommu/mcftimer.h                     |    1 
 include/asm-m68knommu/mcfuart.h                      |    1 
 include/asm-m68knommu/mcfwdebug.h                    |    1 
 include/asm-m68knommu/mmu_context.h                  |    1 
 include/asm-m68knommu/nettel.h                       |    1 
 include/asm-m68knommu/page.h                         |    1 
 include/asm-m68knommu/page_offset.h                  |    1 
 include/asm-m68knommu/param.h                        |    1 
 include/asm-m68knommu/pgtable.h                      |    1 
 include/asm-m68knommu/processor.h                    |    1 
 include/asm-m68knommu/semaphore-helper.h             |    1 
 include/asm-m68knommu/system.h                       |    1 
 include/asm-m68knommu/unaligned.h                    |    1 
 include/asm-mips/a.out.h                             |    1 
 include/asm-mips/addrspace.h                         |    1 
 include/asm-mips/arc/types.h                         |    1 
 include/asm-mips/asm.h                               |    1 
 include/asm-mips/asmmacro.h                          |    1 
 include/asm-mips/atomic.h                            |    1 
 include/asm-mips/bcache.h                            |    1 
 include/asm-mips/bitops.h                            |    1 
 include/asm-mips/bug.h                               |    1 
 include/asm-mips/bugs.h                              |    1 
 include/asm-mips/byteorder.h                         |    1 
 include/asm-mips/cache.h                             |    1 
 include/asm-mips/checksum.h                          |    1 
 include/asm-mips/cpu-features.h                      |    1 
 include/asm-mips/cpu-info.h                          |    1 
 include/asm-mips/ddb5xxx/ddb5477.h                   |    1 
 include/asm-mips/ddb5xxx/ddb5xxx.h                   |    1 
 include/asm-mips/debug.h                             |    1 
 include/asm-mips/dec/prom.h                          |    1 
 include/asm-mips/delay.h                             |    1 
 include/asm-mips/dma.h                               |    1 
 include/asm-mips/elf.h                               |    1 
 include/asm-mips/fcntl.h                             |    1 
 include/asm-mips/fixmap.h                            |    1 
 include/asm-mips/fpu.h                               |    1 
 include/asm-mips/futex.h                             |    1 
 include/asm-mips/hazards.h                           |    1 
 include/asm-mips/highmem.h                           |    1 
 include/asm-mips/interrupt.h                         |    1 
 include/asm-mips/io.h                                |    1 
 include/asm-mips/ip32/machine.h                      |    1 
 include/asm-mips/irq.h                               |    1 
 include/asm-mips/isadep.h                            |    1 
 include/asm-mips/jmr3927/irq.h                       |    1 
 include/asm-mips/kmap_types.h                        |    1 
 include/asm-mips/local.h                             |    1 
 include/asm-mips/mach-au1x00/au1000.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx_dbdma.h          |    1 
 include/asm-mips/mach-au1x00/au1xxx_ide.h            |    1 
 include/asm-mips/mach-au1x00/au1xxx_psc.h            |    1 
 include/asm-mips/mach-au1x00/ioremap.h               |    1 
 include/asm-mips/mach-cobalt/cpu-feature-overrides.h |    1 
 include/asm-mips/mach-db1x00/db1x00.h                |    1 
 include/asm-mips/mach-generic/ide.h                  |    1 
 include/asm-mips/mach-generic/kmalloc.h              |    1 
 include/asm-mips/mach-generic/spaces.h               |    1 
 include/asm-mips/mach-ip22/spaces.h                  |    1 
 include/asm-mips/mach-ip32/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-ip32/kmalloc.h                 |    1 
 include/asm-mips/mach-mips/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-mips/irq.h                     |    1 
 include/asm-mips/mach-pb1x00/pb1550.h                |    1 
 include/asm-mips/mach-sim/cpu-feature-overrides.h    |    1 
 include/asm-mips/mips-boards/generic.h               |    1 
 include/asm-mips/mipsregs.h                          |    1 
 include/asm-mips/mmu_context.h                       |    1 
 include/asm-mips/mmzone.h                            |    1 
 include/asm-mips/module.h                            |    1 
 include/asm-mips/msgbuf.h                            |    1 
 include/asm-mips/paccess.h                           |    1 
 include/asm-mips/page.h                              |    1 
 include/asm-mips/pci.h                               |    1 
 include/asm-mips/pgalloc.h                           |    1 
 include/asm-mips/pgtable-32.h                        |    1 
 include/asm-mips/pgtable-64.h                        |    1 
 include/asm-mips/pgtable-bits.h                      |    1 
 include/asm-mips/pgtable.h                           |    1 
 include/asm-mips/prefetch.h                          |    1 
 include/asm-mips/processor.h                         |    1 
 include/asm-mips/ptrace.h                            |    1 
 include/asm-mips/reg.h                               |    1 
 include/asm-mips/resource.h                          |    1 
 include/asm-mips/serial.h                            |    1 
 include/asm-mips/sgiarcs.h                           |    1 
 include/asm-mips/sibyte/board.h                      |    1 
 include/asm-mips/sibyte/carmel.h                     |    1 
 include/asm-mips/sibyte/sentosa.h                    |    1 
 include/asm-mips/sibyte/swarm.h                      |    1 
 include/asm-mips/siginfo.h                           |    1 
 include/asm-mips/signal.h                            |    1 
 include/asm-mips/sim.h                               |    1 
 include/asm-mips/smp.h                               |    1 
 include/asm-mips/sn/addrs.h                          |    1 
 include/asm-mips/sn/agent.h                          |    1 
 include/asm-mips/sn/arch.h                           |    1 
 include/asm-mips/sn/io.h                             |    1 
 include/asm-mips/sn/klconfig.h                       |    1 
 include/asm-mips/sn/kldir.h                          |    1 
 include/asm-mips/sn/launch.h                         |    1 
 include/asm-mips/sn/mapped_kernel.h                  |    1 
 include/asm-mips/sn/sn0/addrs.h                      |    1 
 include/asm-mips/sn/sn0/arch.h                       |    1 
 include/asm-mips/sn/sn0/hubmd.h                      |    1 
 include/asm-mips/stackframe.h                        |    1 
 include/asm-mips/string.h                            |    1 
 include/asm-mips/system.h                            |    1 
 include/asm-mips/thread_info.h                       |    1 
 include/asm-mips/tlbflush.h                          |    1 
 include/asm-mips/tx4927/toshiba_rbtx4927.h           |    1 
 include/asm-mips/types.h                             |    1 
 include/asm-mips/uaccess.h                           |    1 
 include/asm-mips/unistd.h                            |    1 
 include/asm-mips/vr41xx/vrc4173.h                    |    1 
 include/asm-mips/war.h                               |    1 
 include/asm-mips/wbflush.h                           |    1 
 include/asm-parisc/atomic.h                          |    1 
 include/asm-parisc/cache.h                           |    1 
 include/asm-parisc/cacheflush.h                      |    1 
 include/asm-parisc/dma-mapping.h                     |    1 
 include/asm-parisc/dma.h                             |    1 
 include/asm-parisc/io.h                              |    1 
 include/asm-parisc/irq.h                             |    1 
 include/asm-parisc/kmap_types.h                      |    1 
 include/asm-parisc/page.h                            |    1 
 include/asm-parisc/param.h                           |    1 
 include/asm-parisc/pci.h                             |    1 
 include/asm-parisc/pdc.h                             |    1 
 include/asm-parisc/pgtable.h                         |    1 
 include/asm-parisc/processor.h                       |    1 
 include/asm-parisc/psw.h                             |    1 
 include/asm-parisc/smp.h                             |    1 
 include/asm-parisc/system.h                          |    1 
 include/asm-parisc/tlbflush.h                        |    1 
 include/asm-powerpc/abs_addr.h                       |    1 
 include/asm-powerpc/cache.h                          |    1 
 include/asm-powerpc/dma-mapping.h                    |    1 
 include/asm-powerpc/dma.h                            |    1 
 include/asm-powerpc/eeh.h                            |    1 
 include/asm-powerpc/elf.h                            |    7 -
 include/asm-powerpc/floppy.h                         |    1 
 include/asm-powerpc/hw_irq.h                         |    1 
 include/asm-powerpc/ide.h                            |    1 
 include/asm-powerpc/iommu.h                          |    1 
 include/asm-powerpc/irq.h                            |    1 
 include/asm-powerpc/iseries/iseries_io.h             |    1 
 include/asm-powerpc/machdep.h                        |    1 
 include/asm-powerpc/mmzone.h                         |    1 
 include/asm-powerpc/paca.h                           |    1 
 include/asm-powerpc/page.h                           |    1 
 include/asm-powerpc/pgtable.h                        |    1 
 include/asm-powerpc/ppc_asm.h                        |    1 
 include/asm-powerpc/prom.h                           |    1 
 include/asm-powerpc/smp.h                            |    1 
 include/asm-powerpc/smu.h                            |    1 
 include/asm-powerpc/spu.h                            |    1 
 include/asm-powerpc/thread_info.h                    |    1 
 include/asm-powerpc/time.h                           |    1 
 include/asm-powerpc/timex.h                          |    1 
 include/asm-powerpc/tlb.h                            |    1 
 include/asm-powerpc/tlbflush.h                       |    1 
 include/asm-powerpc/topology.h                       |    1 
 include/asm-powerpc/types.h                          |    1 
 include/asm-powerpc/unistd.h                         |    1 
 include/asm-powerpc/vga.h                            |    1 
 include/asm-powerpc/vio.h                            |    1 
 include/asm-ppc/amigahw.h                            |    1 
 include/asm-ppc/bootinfo.h                           |    1 
 include/asm-ppc/commproc.h                           |    1 
 include/asm-ppc/ibm403.h                             |    1 
 include/asm-ppc/ibm44x.h                             |    1 
 include/asm-ppc/ibm4xx.h                             |    1 
 include/asm-ppc/io.h                                 |    1 
 include/asm-ppc/machdep.h                            |    1 
 include/asm-ppc/mmu.h                                |    1 
 include/asm-ppc/mmu_context.h                        |    1 
 include/asm-ppc/mpc8260.h                            |    1 
 include/asm-ppc/mpc83xx.h                            |    1 
 include/asm-ppc/mpc85xx.h                            |    1 
 include/asm-ppc/mpc8xx.h                             |    1 
 include/asm-ppc/mv64x60.h                            |    1 
 include/asm-ppc/ocp.h                                |    1 
 include/asm-ppc/open_pic.h                           |    1 
 include/asm-ppc/page.h                               |    2 
 include/asm-ppc/pc_serial.h                          |    1 
 include/asm-ppc/pgalloc.h                            |    1 
 include/asm-ppc/pgtable.h                            |    1 
 include/asm-ppc/ppc4xx_dma.h                         |    1 
 include/asm-ppc/ppc4xx_pic.h                         |    1 
 include/asm-ppc/serial.h                             |    1 
 include/asm-ppc/smp.h                                |    1 
 include/asm-ppc/time.h                               |    1 
 include/asm-s390/bitops.h                            |    1 
 include/asm-s390/debug.h                             |    1 
 include/asm-s390/hardirq.h                           |    1 
 include/asm-s390/idals.h                             |    1 
 include/asm-s390/local.h                             |    1 
 include/asm-s390/lowcore.h                           |    1 
 include/asm-s390/page.h                              |    6 -
 include/asm-s390/pgalloc.h                           |    1 
 include/asm-s390/sfp-machine.h                       |    1 
 include/asm-s390/smp.h                               |    1 
 include/asm-s390/system.h                            |    1 
 include/asm-s390/tlbflush.h                          |    1 
 include/asm-s390/types.h                             |    1 
 include/asm-s390/unistd.h                            |    1 
 include/asm-sh/bug.h                                 |    1 
 include/asm-sh/checksum.h                            |    1 
 include/asm-sh/dma-mapping.h                         |    1 
 include/asm-sh/dma.h                                 |    1 
 include/asm-sh/fixmap.h                              |    1 
 include/asm-sh/hardirq.h                             |    1 
 include/asm-sh/hd64461/hd64461.h                     |    1 
 include/asm-sh/hd64465/hd64465.h                     |    1 
 include/asm-sh/ide.h                                 |    1 
 include/asm-sh/io.h                                  |    1 
 include/asm-sh/irq.h                                 |    1 
 include/asm-sh/keyboard.h                            |    1 
 include/asm-sh/kmap_types.h                          |    1 
 include/asm-sh/machvec.h                             |    1 
 include/asm-sh/machvec_init.h                        |    1 
 include/asm-sh/mpc1211/dma.h                         |    1 
 include/asm-sh/overdrive/overdrive.h                 |    1 
 include/asm-sh/page.h                                |    1 
 include/asm-sh/pgtable.h                             |    1 
 include/asm-sh/serial.h                              |    1 
 include/asm-sh/smp.h                                 |    1 
 include/asm-sh/system.h                              |    1 
 include/asm-sh/types.h                               |    1 
 include/asm-sh/watchdog.h                            |    1 
 include/asm-sh64/bug.h                               |    1 
 include/asm-sh64/dma-mapping.h                       |    1 
 include/asm-sh64/hardirq.h                           |    1 
 include/asm-sh64/ide.h                               |    1 
 include/asm-sh64/irq.h                               |    1 
 include/asm-sh64/mmu_context.h                       |    1 
 include/asm-sh64/page.h                              |    1 
 include/asm-sh64/param.h                             |    1 
 include/asm-sh64/pgtable.h                           |    1 
 include/asm-sh64/system.h                            |    1 
 include/asm-sparc/asmmacro.h                         |    1 
 include/asm-sparc/atomic.h                           |    1 
 include/asm-sparc/bugs.h                             |    1 
 include/asm-sparc/cacheflush.h                       |    1 
 include/asm-sparc/delay.h                            |    1 
 include/asm-sparc/dma-mapping.h                      |    1 
 include/asm-sparc/dma.h                              |    1 
 include/asm-sparc/elf.h                              |    1 
 include/asm-sparc/fixmap.h                           |    1 
 include/asm-sparc/hardirq.h                          |    1 
 include/asm-sparc/ide.h                              |    1 
 include/asm-sparc/irq.h                              |    1 
 include/asm-sparc/mostek.h                           |    1 
 include/asm-sparc/page.h                             |    1 
 include/asm-sparc/pgalloc.h                          |    1 
 include/asm-sparc/pgtable.h                          |    1 
 include/asm-sparc/sfp-machine.h                      |    1 
 include/asm-sparc/smp.h                              |    1 
 include/asm-sparc/system.h                           |    2 
 include/asm-sparc/timer.h                            |    1 
 include/asm-sparc/tlbflush.h                         |    1 
 include/asm-sparc/vac-ops.h                          |    1 
 include/asm-sparc/winmacro.h                         |    1 
 include/asm-sparc64/atomic.h                         |    1 
 include/asm-sparc64/bitops.h                         |    1 
 include/asm-sparc64/bugs.h                           |    1 
 include/asm-sparc64/cacheflush.h                     |    1 
 include/asm-sparc64/delay.h                          |    1 
 include/asm-sparc64/dma-mapping.h                    |    1 
 include/asm-sparc64/dma.h                            |    1 
 include/asm-sparc64/floppy.h                         |    1 
 include/asm-sparc64/ide.h                            |    1 
 include/asm-sparc64/irq.h                            |    1 
 include/asm-sparc64/kprobes.h                        |    1 
 include/asm-sparc64/mc146818rtc.h                    |    1 
 include/asm-sparc64/mmu.h                            |    1 
 include/asm-sparc64/oplib.h                          |    1 
 include/asm-sparc64/page.h                           |    1 
 include/asm-sparc64/param.h                          |    1 
 include/asm-sparc64/pgalloc.h                        |    1 
 include/asm-sparc64/pgtable.h                        |    1 
 include/asm-sparc64/processor.h                      |    1 
 include/asm-sparc64/siginfo.h                        |    1 
 include/asm-sparc64/signal.h                         |    1 
 include/asm-sparc64/smp.h                            |    1 
 include/asm-sparc64/spinlock.h                       |    1 
 include/asm-sparc64/system.h                         |    1 
 include/asm-sparc64/timer.h                          |    1 
 include/asm-sparc64/tlb.h                            |    1 
 include/asm-sparc64/tlbflush.h                       |    1 
 include/asm-sparc64/ttable.h                         |    1 
 include/asm-um/a.out.h                               |    1 
 include/asm-um/cache.h                               |    1 
 include/asm-um/elf-ppc.h                             |    1 
 include/asm-um/fixmap.h                              |    1 
 include/asm-um/hardirq.h                             |    1 
 include/asm-um/linkage.h                             |    1 
 include/asm-um/mmu_context.h                         |    1 
 include/asm-um/page.h                                |    1 
 include/asm-um/pgalloc.h                             |    1 
 include/asm-um/processor-generic.h                   |    1 
 include/asm-um/ptrace-generic.h                      |    1 
 include/asm-um/smp.h                                 |    1 
 include/asm-um/thread_info.h                         |    1 
 include/asm-v850/atomic.h                            |    1 
 include/asm-v850/bitops.h                            |    1 
 include/asm-v850/dma-mapping.h                       |    1 
 include/asm-v850/hardirq.h                           |    1 
 include/asm-v850/machdep.h                           |    1 
 include/asm-v850/pgtable.h                           |    1 
 include/asm-v850/processor.h                         |    1 
 include/asm-v850/serial.h                            |    1 
 include/asm-v850/v850e_uart.h                        |    1 
 include/asm-x86_64/apic.h                            |    1 
 include/asm-x86_64/atomic.h                          |    1 
 include/asm-x86_64/bitops.h                          |    1 
 include/asm-x86_64/bugs.h                            |    1 
 include/asm-x86_64/cache.h                           |    1 
 include/asm-x86_64/calling.h                         |    1 
 include/asm-x86_64/dma-mapping.h                     |    1 
 include/asm-x86_64/dma.h                             |    1 
 include/asm-x86_64/dwarf2.h                          |    1 
 include/asm-x86_64/fixmap.h                          |    1 
 include/asm-x86_64/hardirq.h                         |    1 
 include/asm-x86_64/hw_irq.h                          |    1 
 include/asm-x86_64/ia32.h                            |    1 
 include/asm-x86_64/io.h                              |    1 
 include/asm-x86_64/io_apic.h                         |    1 
 include/asm-x86_64/mmu_context.h                     |    1 
 include/asm-x86_64/mmzone.h                          |    1 
 include/asm-x86_64/mtrr.h                            |    1 
 include/asm-x86_64/param.h                           |    1 
 include/asm-x86_64/pci.h                             |    1 
 include/asm-x86_64/processor.h                       |    1 
 include/asm-x86_64/serial.h                          |    1 
 include/asm-x86_64/smp.h                             |    1 
 include/asm-x86_64/spinlock.h                        |    1 
 include/asm-x86_64/swiotlb.h                         |    1 
 include/asm-x86_64/system.h                          |    1 
 include/asm-x86_64/tlbflush.h                        |    1 
 include/asm-x86_64/topology.h                        |    1 
 include/asm-x86_64/uaccess.h                         |    1 
 include/asm-xtensa/atomic.h                          |    1 
 include/asm-xtensa/checksum.h                        |    1 
 include/asm-xtensa/delay.h                           |    1 
 include/asm-xtensa/dma.h                             |    1 
 include/asm-xtensa/hardirq.h                         |    1 
 include/asm-xtensa/ide.h                             |    1 
 include/asm-xtensa/io.h                              |    1 
 include/asm-xtensa/irq.h                             |    1 
 include/asm-xtensa/mmu_context.h                     |    1 
 include/asm-xtensa/page.h                            |    1 
 include/asm-xtensa/pgalloc.h                         |    1 
 include/asm-xtensa/platform.h                        |    1 
 include/asm-xtensa/system.h                          |    1 
 include/linux/acct.h                                 |    3 
 include/linux/acpi.h                                 |    1 
 include/linux/agpgart.h                              |    3 
 include/linux/amba/clcd.h                            |    1 
 include/linux/atmdev.h                               |    1 
 include/linux/audit.h                                |    4 
 include/linux/blkdev.h                               |    1 
 include/linux/blktrace_api.h                         |    1 
 include/linux/blockgroup_lock.h                      |    1 
 include/linux/cache.h                                |    1 
 include/linux/coda.h                                 |    1 
 include/linux/compat.h                               |    1 
 include/linux/cpufreq.h                              |    1 
 include/linux/crypto.h                               |    1 
 include/linux/cyclomx.h                              |    1 
 include/linux/dcookies.h                             |    1 
 include/linux/devfs_fs_kernel.h                      |    1 
 include/linux/device.h                               |    1 
 include/linux/dmi.h                                  |    1 
 include/linux/dnotify.h                              |    1 
 include/linux/elf.h                                  |   59 -----------
 include/linux/errqueue.h                             |    1 
 include/linux/ext2_fs.h                              |    2 
 include/linux/ext3_fs.h                              |    7 -
 include/linux/fs.h                                   |    1 
 include/linux/ftape.h                                |    1 
 include/linux/gameport.h                             |    6 +
 include/linux/generic_serial.h                       |    6 -
 include/linux/genhd.h                                |   12 +-
 include/linux/gfp.h                                  |    1 
 include/linux/hardirq.h                              |    1 
 include/linux/highmem.h                              |    1 
 include/linux/highuid.h                              |    1 
 include/linux/i2c-algo-ite.h                         |    7 +
 include/linux/i2c.h                                  |    9 +
 include/linux/ide.h                                  |    1 
 include/linux/if_frad.h                              |    1 
 include/linux/if_tr.h                                |    1 
 include/linux/init.h                                 |    1 
 include/linux/inotify.h                              |    1 
 include/linux/interrupt.h                            |    1 
 include/linux/ipmi.h                                 |    2 
 include/linux/ipv6.h                                 |    1 
 include/linux/irq.h                                  |    1 
 include/linux/irq_cpustat.h                          |    1 
 include/linux/isapnp.h                               |    1 
 include/linux/isdn.h                                 |    1 
 include/linux/isdn/tpam.h                            |    1 
 include/linux/isdn_ppp.h                             |    1 
 include/linux/isdnif.h                               |    1 
 include/linux/kallsyms.h                             |    1 
 include/linux/kernel_stat.h                          |    1 
 include/linux/kmod.h                                 |    1 
 include/linux/kprobes.h                              |    1 
 include/linux/linkage.h                              |    1 
 include/linux/lockd/lockd.h                          |    1 
 include/linux/lockd/nlm.h                            |    1 
 include/linux/mempolicy.h                            |    1 
 include/linux/migrate.h                              |    1 
 include/linux/mm.h                                   |    1 
 include/linux/mman.h                                 |   12 +-
 include/linux/mmzone.h                               |    1 
 include/linux/module.h                               |    1 
 include/linux/msg.h                                  |    2 
 include/linux/mtd/cfi.h                              |    1 
 include/linux/mtd/map.h                              |    1 
 include/linux/mtd/mtd.h                              |    1 
 include/linux/mtd/nand.h                             |    1 
 include/linux/mtd/physmap.h                          |    1 
 include/linux/mtd/xip.h                              |    1 
 include/linux/ncp_fs.h                               |    5 -
 include/linux/net.h                                  |    3 
 include/linux/netdevice.h                            |    1 
 include/linux/netfilter.h                            |    1 
 include/linux/netfilter_arp.h                        |    1 
 include/linux/netfilter_bridge.h                     |    1 
 include/linux/netfilter_ipv4.h                       |    1 
 include/linux/netfilter_ipv4/ip_conntrack.h          |    1 
 include/linux/netfilter_ipv4/listhelp.h              |    1 
 include/linux/nfs.h                                  |    8 -
 include/linux/nfs4.h                                 |    6 -
 include/linux/nfs_fs.h                               |   39 +++----
 include/linux/nfsd/nfsd.h                            |    1 
 include/linux/nfsd/nfsfh.h                           |    1 
 include/linux/nfsd/syscall.h                         |    1 
 include/linux/numa.h                                 |    1 
 include/linux/parport.h                              |    1 
 include/linux/pci.h                                  |    1 
 include/linux/percpu_counter.h                       |    1 
 include/linux/pm.h                                   |    1 
 include/linux/pm_legacy.h                            |    1 
 include/linux/pmu.h                                  |    1 
 include/linux/preempt.h                              |    1 
 include/linux/proc_fs.h                              |    1 
 include/linux/profile.h                              |    1 
 include/linux/quota.h                                |    4 
 include/linux/quotaops.h                             |    1 
 include/linux/reiserfs_xattr.h                       |    3 
 include/linux/relay.h                                |    1 
 include/linux/rio.h                                  |    1 
 include/linux/rio_drv.h                              |    1 
 include/linux/rmap.h                                 |    1 
 include/linux/rtnetlink.h                            |    1 
 include/linux/rwsem.h                                |    1 
 include/linux/scc.h                                  |    1 
 include/linux/sched.h                                |   94 +++++++++----------
 include/linux/seccomp.h                              |    1 
 include/linux/sem.h                                  |    2 
 include/linux/seqlock.h                              |    1 
 include/linux/serialP.h                              |    1 
 include/linux/serial_core.h                          |    1 
 include/linux/signal.h                               |    4 
 include/linux/skbuff.h                               |    1 
 include/linux/slab.h                                 |    1 
 include/linux/smb_fs.h                               |    4 
 include/linux/smp.h                                  |    1 
 include/linux/smp_lock.h                             |    1 
 include/linux/socket.h                               |    2 
 include/linux/spinlock.h                             |    1 
 include/linux/stop_machine.h                         |    1 
 include/linux/sunrpc/auth.h                          |    1 
 include/linux/sunrpc/debug.h                         |   24 ++--
 include/linux/sunrpc/stats.h                         |    1 
 include/linux/suspend.h                              |    1 
 include/linux/swap.h                                 |    1 
 include/linux/syscalls.h                             |    1 
 include/linux/sysrq.h                                |    1 
 include/linux/tcp.h                                  |    1 
 include/linux/threads.h                              |    1 
 include/linux/timer.h                                |    1 
 include/linux/timex.h                                |    1 
 include/linux/tty.h                                  |    1 
 include/linux/types.h                                |    1 
 include/linux/udp.h                                  |    1 
 include/linux/usb.h                                  |    1 
 include/linux/usb_usual.h                            |    1 
 include/linux/usbdevice_fs.h                         |    2 
 include/linux/vt_buffer.h                            |    1 
 include/linux/vt_kern.h                              |    1 
 include/linux/wait.h                                 |    1 
 include/linux/wanrouter.h                            |    4 
 include/mtd/mtd-abi.h                                |    5 -
 include/net/addrconf.h                               |    1 
 include/net/af_unix.h                                |    1 
 include/net/ax25.h                                   |    1 
 include/net/compat.h                                 |    1 
 include/net/dst.h                                    |    1 
 include/net/icmp.h                                   |    1 
 include/net/inet6_hashtables.h                       |    1 
 include/net/inet_hashtables.h                        |    1 
 include/net/inet_sock.h                              |    1 
 include/net/inet_timewait_sock.h                     |    1 
 include/net/ip.h                                     |    1 
 include/net/ip_fib.h                                 |    1 
 include/net/ip_mp_alg.h                              |    1 
 include/net/ip_vs.h                                  |    1 
 include/net/ipv6.h                                   |    1 
 include/net/irda/irda.h                              |    1 
 include/net/irda/irda_device.h                       |    1 
 include/net/irda/irlap.h                             |    1 
 include/net/irda/irlmp.h                             |    1 
 include/net/irda/irlmp_frame.h                       |    1 
 include/net/irda/qos.h                               |    1 
 include/net/ndisc.h                                  |    1 
 include/net/netfilter/nf_conntrack.h                 |    1 
 include/net/pkt_act.h                                |    1 
 include/net/protocol.h                               |    1 
 include/net/raw.h                                    |    1 
 include/net/red.h                                    |    1 
 include/net/route.h                                  |    1 
 include/net/sch_generic.h                            |    1 
 include/net/sctp/sctp.h                              |    1 
 include/net/sock.h                                   |    1 
 include/net/tcp.h                                    |    1 
 include/pcmcia/ss.h                                  |    1 
 include/scsi/scsi_transport_fc.h                     |    1 
 include/scsi/scsi_transport_spi.h                    |    1 
 include/sound/driver.h                               |    1 
 include/video/edid.h                                 |    1 
 include/video/vga.h                                  |    1 
 866 files changed, 210 insertions(+), 1045 deletions(-)

Index: linux-2.6-header-cleanup-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-cleanup-git.patch,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- linux-2.6-header-cleanup-git.patch	27 Apr 2006 05:43:43 -0000	1.3.2.1
+++ linux-2.6-header-cleanup-git.patch	27 Apr 2006 14:55:42 -0000	1.3.2.2
@@ -2060,10 +2060,10 @@
  #include <linux/ioctl.h>
  #include <linux/errno.h>
  
-unchanged:
---- a/include/asm-i386/page.h
+diff -u b/include/asm-i386/page.h b/include/asm-i386/page.h
+--- b/include/asm-i386/page.h
 +++ b/include/asm-i386/page.h
-@@ -12,7 +12,6 @@ #define LARGE_PAGE_SIZE (1UL << PMD_SHIF
+@@ -12,7 +12,6 @@
  #ifdef __KERNEL__
  #ifndef __ASSEMBLY__
  
@@ -2071,6 +2071,16 @@
  
  #ifdef CONFIG_X86_USE_3DNOW
  
+@@ -139,7 +138,7 @@
+ 
+-#endif /* __KERNEL__ */
+-
+ #include <asm-generic/memory_model.h>
+ #include <asm-generic/page.h>
+ 
++#endif /* __KERNEL__ */
++
+ #endif /* _I386_PAGE_H */
 unchanged:
 --- a/include/asm-i386/param.h
 +++ b/include/asm-i386/param.h
@@ -7283,8 +7293,8 @@
  #include <linux/ioctl.h>
  #include <linux/compat.h>
  
-unchanged:
---- a/include/asm-x86_64/page.h
+diff -u b/include/asm-x86_64/page.h b/include/asm-x86_64/page.h
+--- b/include/asm-x86_64/page.h
 +++ b/include/asm-x86_64/page.h
 @@ -1,7 +1,6 @@
  #ifndef _X86_64_PAGE_H
@@ -7294,6 +7304,16 @@
  
  /* PAGE_SHIFT determines the page size */
  #define PAGE_SHIFT	12
+@@ -138,7 +137,7 @@
+ 
+-#endif /* __KERNEL__ */
+-
+ #include <asm-generic/memory_model.h>
+ #include <asm-generic/page.h>
+ 
++#endif /* __KERNEL__ */
++
+ #endif /* _X86_64_PAGE_H */
 unchanged:
 --- a/include/asm-x86_64/param.h
 +++ b/include/asm-x86_64/param.h
@@ -10208,7 +10228,6 @@
 +#endif /* __KERNEL__ */
 +
  #endif /* _S390_PAGE_H */
-only in patch2:
 unchanged:
 --- a/include/asm-generic/signal.h
 +++ b/include/asm-generic/signal.h



From fedora-cvs-commits at redhat.com  Thu Apr 27 14:58:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 10:58:37 -0400
Subject: rpms/numactl/devel numactl.spec,1.28,1.29
Message-ID: <200604271458.k3REwbBa025598@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/numactl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25569

Modified Files:
	numactl.spec 
Log Message:
bumping release number





From fedora-cvs-commits at redhat.com  Thu Apr 27 15:19:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 11:19:33 -0400
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders.spec, 1.115,
	1.116 sources, 1.28, 1.29
Message-ID: <200604271519.k3RFJXf3010968@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10944

Modified Files:
	glibc-kernheaders.spec sources 
Log Message:
correct tarball


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- glibc-kernheaders.spec	27 Apr 2006 14:52:38 -0000	1.115
+++ glibc-kernheaders.spec	27 Apr 2006 15:19:30 -0000	1.116
@@ -1,7 +1,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -91,6 +91,9 @@
 
 
 %changelog
+* Thu Apr 27 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-16
+- ...this time with the right tarball so it's actually changed
+
 * Thu Apr 27 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-15
 - Fix asm-i386/page.h and asm-x86_64/page.h for Xen
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	27 Apr 2006 03:59:02 -0000	1.28
+++ sources	27 Apr 2006 15:19:30 -0000	1.29
@@ -1 +1 @@
-453adf99aef993ec1f142d5312ad9529  glibc-kernheaders.tar.bz2
+42d534768e2515488f20ad3fa565b6af  glibc-kernheaders.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 16:01:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 12:01:02 -0400
Subject: rpms/kernel/devel linux-2.6-header-cleanup-git.patch,1.5,1.6
Message-ID: <200604271601.k3RG127Z004156@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4115

Modified Files:
	linux-2.6-header-cleanup-git.patch 
Log Message:
fix blkpg.h

linux-2.6-header-cleanup-git.patch:
 b/include/asm-i386/page.h                            |    5 -
 b/include/asm-s390/ptrace.h                          |    6 -
 b/include/asm-x86_64/page.h                          |    5 -
 b/include/linux/elf-em.h                             |   44 ++++++++
 include/acpi/platform/aclinux.h                      |    1 
 include/acpi/processor.h                             |    1 
 include/asm-alpha/bitops.h                           |    1 
 include/asm-alpha/cache.h                            |    1 
 include/asm-alpha/cacheflush.h                       |    1 
 include/asm-alpha/core_cia.h                         |    1 
 include/asm-alpha/core_t2.h                          |    1 
 include/asm-alpha/dma-mapping.h                      |    1 
 include/asm-alpha/dma.h                              |    1 
 include/asm-alpha/floppy.h                           |    1 
 include/asm-alpha/hardirq.h                          |    1 
 include/asm-alpha/hw_irq.h                           |    1 
 include/asm-alpha/ide.h                              |    1 
 include/asm-alpha/io.h                               |    1 
 include/asm-alpha/irq.h                              |    1 
 include/asm-alpha/kmap_types.h                       |    1 
 include/asm-alpha/machvec.h                          |    1 
 include/asm-alpha/mmu_context.h                      |    1 
 include/asm-alpha/mmzone.h                           |    1 
 include/asm-alpha/page.h                             |    1 
 include/asm-alpha/param.h                            |    1 
 include/asm-alpha/pgalloc.h                          |    1 
 include/asm-alpha/pgtable.h                          |    1 
 include/asm-alpha/serial.h                           |    1 
 include/asm-alpha/smp.h                              |    1 
 include/asm-alpha/spinlock.h                         |    1 
 include/asm-alpha/system.h                           |    1 
 include/asm-alpha/tlbflush.h                         |    1 
 include/asm-arm/apm.h                                |    1 
 include/asm-arm/arch-aaec2000/memory.h               |    1 
 include/asm-arm/arch-cl7500/acornfb.h                |    1 
 include/asm-arm/arch-clps711x/hardware.h             |    1 
 include/asm-arm/arch-clps711x/memory.h               |    1 
 include/asm-arm/arch-clps711x/uncompress.h           |    1 
 include/asm-arm/arch-ebsa285/hardware.h              |    1 
 include/asm-arm/arch-ebsa285/memory.h                |    1 
 include/asm-arm/arch-ebsa285/vmalloc.h               |    1 
 include/asm-arm/arch-integrator/smp.h                |    1 
 include/asm-arm/arch-iop3xx/memory.h                 |    1 
 include/asm-arm/arch-iop3xx/timex.h                  |    1 
 include/asm-arm/arch-iop3xx/uncompress.h             |    1 
 include/asm-arm/arch-ixp4xx/dma.h                    |    1 
 include/asm-arm/arch-lh7a40x/constants.h             |    1 
 include/asm-arm/arch-lh7a40x/irqs.h                  |    1 
 include/asm-arm/arch-lh7a40x/registers.h             |    1 
 include/asm-arm/arch-omap/board.h                    |    1 
 include/asm-arm/arch-omap/hardware.h                 |    1 
 include/asm-arm/arch-omap/system.h                   |    1 
 include/asm-arm/arch-omap/uncompress.h               |    1 
 include/asm-arm/arch-pxa/idp.h                       |    1 
 include/asm-arm/arch-pxa/irqs.h                      |    1 
 include/asm-arm/arch-pxa/pxa-regs.h                  |    1 
 include/asm-arm/arch-pxa/timex.h                     |    1 
 include/asm-arm/arch-realview/smp.h                  |    1 
 include/asm-arm/arch-s3c2410/dma.h                   |    1 
 include/asm-arm/arch-s3c2410/uncompress.h            |    1 
 include/asm-arm/arch-sa1100/assabet.h                |    1 
 include/asm-arm/arch-sa1100/cerf.h                   |    1 
 include/asm-arm/arch-sa1100/collie.h                 |    1 
 include/asm-arm/arch-sa1100/dma.h                    |    1 
 include/asm-arm/arch-sa1100/hardware.h               |    1 
 include/asm-arm/arch-sa1100/ide.h                    |    1 
 include/asm-arm/arch-sa1100/irqs.h                   |    1 
 include/asm-arm/arch-sa1100/memory.h                 |    1 
 include/asm-arm/arch-sa1100/system.h                 |    1 
 include/asm-arm/atomic.h                             |    1 
 include/asm-arm/bug.h                                |    1 
 include/asm-arm/cacheflush.h                         |    1 
 include/asm-arm/cpu.h                                |    1 
 include/asm-arm/dma-mapping.h                        |    1 
 include/asm-arm/dma.h                                |    1 
 include/asm-arm/elf.h                                |    1 
 include/asm-arm/fpstate.h                            |    1 
 include/asm-arm/glue.h                               |    1 
 include/asm-arm/hardirq.h                            |    1 
 include/asm-arm/hardware/dec21285.h                  |    1 
 include/asm-arm/hardware/iomd.h                      |    1 
 include/asm-arm/leds.h                               |    1 
 include/asm-arm/mach/serial_at91rm9200.h             |    1 
 include/asm-arm/mach/serial_sa1100.h                 |    1 
 include/asm-arm/memory.h                             |    1 
 include/asm-arm/page.h                               |    1 
 include/asm-arm/pci.h                                |    1 
 include/asm-arm/proc-fns.h                           |    1 
 include/asm-arm/ptrace.h                             |    1 
 include/asm-arm/smp.h                                |    1 
 include/asm-arm/system.h                             |    1 
 include/asm-arm/tlbflush.h                           |    1 
 include/asm-arm26/atomic.h                           |    1 
 include/asm-arm26/bug.h                              |    1 
 include/asm-arm26/dma.h                              |    1 
 include/asm-arm26/hardirq.h                          |    1 
 include/asm-arm26/hardware.h                         |    1 
 include/asm-arm26/io.h                               |    1 
 include/asm-arm26/leds.h                             |    1 
 include/asm-arm26/mach-types.h                       |    1 
 include/asm-arm26/page.h                             |    1 
 include/asm-arm26/pgtable.h                          |    1 
 include/asm-arm26/serial.h                           |    1 
 include/asm-arm26/smp.h                              |    1 
 include/asm-arm26/sysirq.h                           |    1 
 include/asm-arm26/system.h                           |    1 
 include/asm-cris/arch-v10/io.h                       |    1 
 include/asm-cris/arch-v10/page.h                     |    1 
 include/asm-cris/arch-v10/system.h                   |    1 
 include/asm-cris/arch-v32/io.h                       |    1 
 include/asm-cris/arch-v32/irq.h                      |    1 
 include/asm-cris/arch-v32/page.h                     |    1 
 include/asm-cris/arch-v32/processor.h                |    1 
 include/asm-cris/arch-v32/system.h                   |    1 
 include/asm-cris/eshlibld.h                          |    1 
 include/asm-cris/etraxgpio.h                         |    1 
 include/asm-cris/fasttimer.h                         |    1 
 include/asm-cris/page.h                              |    1 
 include/asm-cris/pci.h                               |    1 
 include/asm-cris/pgtable.h                           |    1 
 include/asm-cris/processor.h                         |    1 
 include/asm-cris/rtc.h                               |    1 
 include/asm-cris/tlbflush.h                          |    1 
 include/asm-frv/atomic.h                             |    1 
 include/asm-frv/bitops.h                             |    1 
 include/asm-frv/bug.h                                |    1 
 include/asm-frv/cache.h                              |    1 
 include/asm-frv/dma.h                                |    1 
 include/asm-frv/elf.h                                |    1 
 include/asm-frv/fpu.h                                |    1 
 include/asm-frv/hardirq.h                            |    1 
 include/asm-frv/highmem.h                            |    1 
 include/asm-frv/ide.h                                |    1 
 include/asm-frv/io.h                                 |    1 
 include/asm-frv/irq.h                                |    1 
 include/asm-frv/mmu_context.h                        |    1 
 include/asm-frv/page.h                               |    1 
 include/asm-frv/pci.h                                |    1 
 include/asm-frv/pgalloc.h                            |    1 
 include/asm-frv/pgtable.h                            |    1 
 include/asm-frv/processor.h                          |    1 
 include/asm-frv/segment.h                            |    1 
 include/asm-frv/serial.h                             |    1 
 include/asm-frv/smp.h                                |    1 
 include/asm-frv/system.h                             |    1 
 include/asm-frv/tlbflush.h                           |    1 
 include/asm-frv/types.h                              |    1 
 include/asm-frv/unaligned.h                          |    1 
 include/asm-frv/virtconvert.h                        |    1 
 include/asm-generic/bug.h                            |    1 
 include/asm-generic/dma-mapping.h                    |    1 
 include/asm-generic/fcntl.h                          |    1 
 include/asm-generic/local.h                          |    1 
 include/asm-generic/signal.h                         |    7 +
 include/asm-generic/tlb.h                            |    1 
 include/asm-h8300/bitops.h                           |    1 
 include/asm-h8300/dma.h                              |    1 
 include/asm-h8300/elf.h                              |    1 
 include/asm-h8300/hardirq.h                          |    1 
 include/asm-h8300/io.h                               |    1 
 include/asm-h8300/keyboard.h                         |    1 
 include/asm-h8300/mmu_context.h                      |    1 
 include/asm-h8300/page.h                             |    1 
 include/asm-h8300/page_offset.h                      |    1 
 include/asm-h8300/param.h                            |    1 
 include/asm-h8300/pgtable.h                          |    1 
 include/asm-h8300/processor.h                        |    1 
 include/asm-h8300/semaphore-helper.h                 |    1 
 include/asm-h8300/shm.h                              |    1 
 include/asm-h8300/system.h                           |    1 
 include/asm-h8300/unaligned.h                        |    1 
 include/asm-h8300/virtconvert.h                      |    1 
 include/asm-i386/apic.h                              |    1 
 include/asm-i386/atomic.h                            |    1 
 include/asm-i386/bitops.h                            |    1 
 include/asm-i386/bug.h                               |    1 
 include/asm-i386/bugs.h                              |    1 
 include/asm-i386/byteorder.h                         |    1 
 include/asm-i386/cache.h                             |    1 
 include/asm-i386/dma.h                               |    1 
 include/asm-i386/fixmap.h                            |    1 
 include/asm-i386/hardirq.h                           |    1 
 include/asm-i386/highmem.h                           |    1 
 include/asm-i386/hpet.h                              |    1 
 include/asm-i386/hw_irq.h                            |    1 
 include/asm-i386/ide.h                               |    1 
 include/asm-i386/io.h                                |    1 
 include/asm-i386/io_apic.h                           |    1 
 include/asm-i386/irq.h                               |    1 
 include/asm-i386/kmap_types.h                        |    1 
 include/asm-i386/mach-summit/mach_apic.h             |    1 
 include/asm-i386/mmu_context.h                       |    1 
 include/asm-i386/mtrr.h                              |    1 
 include/asm-i386/param.h                             |    1 
 include/asm-i386/pci.h                               |    1 
 include/asm-i386/pgalloc.h                           |    1 
 include/asm-i386/pgtable.h                           |    1 
 include/asm-i386/processor.h                         |    1 
 include/asm-i386/serial.h                            |    1 
 include/asm-i386/smp.h                               |    1 
 include/asm-i386/spinlock.h                          |    1 
 include/asm-i386/string.h                            |    1 
 include/asm-i386/system.h                            |    1 
 include/asm-i386/thread_info.h                       |    1 
 include/asm-i386/timex.h                             |    1 
 include/asm-i386/tlbflush.h                          |    1 
 include/asm-i386/types.h                             |    1 
 include/asm-i386/uaccess.h                           |    1 
 include/asm-ia64/asmmacro.h                          |    1 
 include/asm-ia64/cache.h                             |    1 
 include/asm-ia64/delay.h                             |    1 
 include/asm-ia64/dma-mapping.h                       |    1 
 include/asm-ia64/dma.h                               |    1 
 include/asm-ia64/elf.h                               |    1 
 include/asm-ia64/hardirq.h                           |    1 
 include/asm-ia64/ia32.h                              |    1 
 include/asm-ia64/ide.h                               |    1 
 include/asm-ia64/intrinsics.h                        |    1 
 include/asm-ia64/kmap_types.h                        |    1 
 include/asm-ia64/machvec.h                           |    1 
 include/asm-ia64/meminit.h                           |    1 
 include/asm-ia64/nodedata.h                          |    1 
 include/asm-ia64/numa.h                              |    1 
 include/asm-ia64/page.h                              |    1 
 include/asm-ia64/param.h                             |    1 
 include/asm-ia64/percpu.h                            |    1 
 include/asm-ia64/pgalloc.h                           |    1 
 include/asm-ia64/pgtable.h                           |    1 
 include/asm-ia64/processor.h                         |    1 
 include/asm-ia64/ptrace.h                            |    1 
 include/asm-ia64/smp.h                               |    1 
 include/asm-ia64/sn/simulator.h                      |    1 
 include/asm-ia64/sn/sn_cpuid.h                       |    1 
 include/asm-ia64/sn/sn_sal.h                         |    1 
 include/asm-ia64/sn/xpc.h                            |    1 
 include/asm-ia64/string.h                            |    1 
 include/asm-ia64/system.h                            |    1 
 include/asm-ia64/tlb.h                               |    1 
 include/asm-ia64/tlbflush.h                          |    1 
 include/asm-ia64/unistd.h                            |    1 
 include/asm-m32r/assembler.h                         |    1 
 include/asm-m32r/atomic.h                            |    1 
 include/asm-m32r/bitops.h                            |    1 
 include/asm-m32r/cacheflush.h                        |    1 
 include/asm-m32r/hardirq.h                           |    1 
 include/asm-m32r/ide.h                               |    1 
 include/asm-m32r/irq.h                               |    1 
 include/asm-m32r/kmap_types.h                        |    1 
 include/asm-m32r/m32104ut/m32104ut_pld.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lan.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lcd.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_pld.h             |    1 
 include/asm-m32r/m32r.h                              |    1 
 include/asm-m32r/mmu.h                               |    1 
 include/asm-m32r/mmu_context.h                       |    2 
 include/asm-m32r/opsput/opsput_lan.h                 |    1 
 include/asm-m32r/opsput/opsput_lcd.h                 |    1 
 include/asm-m32r/opsput/opsput_pld.h                 |    1 
 include/asm-m32r/page.h                              |    1 
 include/asm-m32r/pgalloc.h                           |    1 
 include/asm-m32r/pgtable-2level.h                    |    1 
 include/asm-m32r/pgtable.h                           |    1 
 include/asm-m32r/processor.h                         |    1 
 include/asm-m32r/ptrace.h                            |    1 
 include/asm-m32r/rtc.h                               |    1 
 include/asm-m32r/semaphore.h                         |    1 
 include/asm-m32r/serial.h                            |    1 
 include/asm-m32r/sigcontext.h                        |    1 
 include/asm-m32r/smp.h                               |    1 
 include/asm-m32r/spinlock.h                          |    1 
 include/asm-m32r/system.h                            |    1 
 include/asm-m32r/timex.h                             |    1 
 include/asm-m32r/tlbflush.h                          |    1 
 include/asm-m32r/uaccess.h                           |    1 
 include/asm-m68k/atomic.h                            |    1 
 include/asm-m68k/bug.h                               |    1 
 include/asm-m68k/dma-mapping.h                       |    1 
 include/asm-m68k/dma.h                               |    1 
 include/asm-m68k/dvma.h                              |    1 
 include/asm-m68k/elf.h                               |    1 
 include/asm-m68k/entry.h                             |    1 
 include/asm-m68k/fpu.h                               |    1 
 include/asm-m68k/hardirq.h                           |    1 
 include/asm-m68k/ide.h                               |    1 
 include/asm-m68k/io.h                                |    1 
 include/asm-m68k/irq.h                               |    1 
 include/asm-m68k/mc146818rtc.h                       |    1 
 include/asm-m68k/mmu_context.h                       |    1 
 include/asm-m68k/motorola_pgtable.h                  |    1 
 include/asm-m68k/openprom.h                          |    1 
 include/asm-m68k/page.h                              |    1 
 include/asm-m68k/page_offset.h                       |    1 
 include/asm-m68k/pgalloc.h                           |    1 
 include/asm-m68k/pgtable.h                           |    1 
 include/asm-m68k/processor.h                         |    1 
 include/asm-m68k/semaphore-helper.h                  |    1 
 include/asm-m68k/serial.h                            |    1 
 include/asm-m68k/setup.h                             |    1 
 include/asm-m68k/shm.h                               |    1 
 include/asm-m68k/system.h                            |    1 
 include/asm-m68k/tlbflush.h                          |    1 
 include/asm-m68k/virtconvert.h                       |    1 
 include/asm-m68knommu/bitops.h                       |    1 
 include/asm-m68knommu/coldfire.h                     |    1 
 include/asm-m68knommu/commproc.h                     |    1 
 include/asm-m68knommu/dma-mapping.h                  |    1 
 include/asm-m68knommu/dma.h                          |    1 
 include/asm-m68knommu/elf.h                          |    1 
 include/asm-m68knommu/elia.h                         |    1 
 include/asm-m68knommu/entry.h                        |    1 
 include/asm-m68knommu/fpu.h                          |    1 
 include/asm-m68knommu/hardirq.h                      |    1 
 include/asm-m68knommu/io.h                           |    1 
 include/asm-m68knommu/irq.h                          |    1 
 include/asm-m68knommu/m5206sim.h                     |    1 
 include/asm-m68knommu/m520xsim.h                     |    1 
 include/asm-m68knommu/m523xsim.h                     |    1 
 include/asm-m68knommu/m5272sim.h                     |    1 
 include/asm-m68knommu/m527xsim.h                     |    1 
 include/asm-m68knommu/m528xsim.h                     |    1 
 include/asm-m68knommu/mcfcache.h                     |    1 
 include/asm-m68knommu/mcfdma.h                       |    1 
 include/asm-m68knommu/mcfmbus.h                      |    1 
 include/asm-m68knommu/mcfne.h                        |    1 
 include/asm-m68knommu/mcfpci.h                       |    1 
 include/asm-m68knommu/mcfpit.h                       |    1 
 include/asm-m68knommu/mcfsim.h                       |    1 
 include/asm-m68knommu/mcfsmc.h                       |    1 
 include/asm-m68knommu/mcftimer.h                     |    1 
 include/asm-m68knommu/mcfuart.h                      |    1 
 include/asm-m68knommu/mcfwdebug.h                    |    1 
 include/asm-m68knommu/mmu_context.h                  |    1 
 include/asm-m68knommu/nettel.h                       |    1 
 include/asm-m68knommu/page.h                         |    1 
 include/asm-m68knommu/page_offset.h                  |    1 
 include/asm-m68knommu/param.h                        |    1 
 include/asm-m68knommu/pgtable.h                      |    1 
 include/asm-m68knommu/processor.h                    |    1 
 include/asm-m68knommu/semaphore-helper.h             |    1 
 include/asm-m68knommu/system.h                       |    1 
 include/asm-m68knommu/unaligned.h                    |    1 
 include/asm-mips/a.out.h                             |    1 
 include/asm-mips/addrspace.h                         |    1 
 include/asm-mips/arc/types.h                         |    1 
 include/asm-mips/asm.h                               |    1 
 include/asm-mips/asmmacro.h                          |    1 
 include/asm-mips/atomic.h                            |    1 
 include/asm-mips/bcache.h                            |    1 
 include/asm-mips/bitops.h                            |    1 
 include/asm-mips/bug.h                               |    1 
 include/asm-mips/bugs.h                              |    1 
 include/asm-mips/byteorder.h                         |    1 
 include/asm-mips/cache.h                             |    1 
 include/asm-mips/checksum.h                          |    1 
 include/asm-mips/cpu-features.h                      |    1 
 include/asm-mips/cpu-info.h                          |    1 
 include/asm-mips/ddb5xxx/ddb5477.h                   |    1 
 include/asm-mips/ddb5xxx/ddb5xxx.h                   |    1 
 include/asm-mips/debug.h                             |    1 
 include/asm-mips/dec/prom.h                          |    1 
 include/asm-mips/delay.h                             |    1 
 include/asm-mips/dma.h                               |    1 
 include/asm-mips/elf.h                               |    1 
 include/asm-mips/fcntl.h                             |    1 
 include/asm-mips/fixmap.h                            |    1 
 include/asm-mips/fpu.h                               |    1 
 include/asm-mips/futex.h                             |    1 
 include/asm-mips/hazards.h                           |    1 
 include/asm-mips/highmem.h                           |    1 
 include/asm-mips/interrupt.h                         |    1 
 include/asm-mips/io.h                                |    1 
 include/asm-mips/ip32/machine.h                      |    1 
 include/asm-mips/irq.h                               |    1 
 include/asm-mips/isadep.h                            |    1 
 include/asm-mips/jmr3927/irq.h                       |    1 
 include/asm-mips/kmap_types.h                        |    1 
 include/asm-mips/local.h                             |    1 
 include/asm-mips/mach-au1x00/au1000.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx_dbdma.h          |    1 
 include/asm-mips/mach-au1x00/au1xxx_ide.h            |    1 
 include/asm-mips/mach-au1x00/au1xxx_psc.h            |    1 
 include/asm-mips/mach-au1x00/ioremap.h               |    1 
 include/asm-mips/mach-cobalt/cpu-feature-overrides.h |    1 
 include/asm-mips/mach-db1x00/db1x00.h                |    1 
 include/asm-mips/mach-generic/ide.h                  |    1 
 include/asm-mips/mach-generic/kmalloc.h              |    1 
 include/asm-mips/mach-generic/spaces.h               |    1 
 include/asm-mips/mach-ip22/spaces.h                  |    1 
 include/asm-mips/mach-ip32/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-ip32/kmalloc.h                 |    1 
 include/asm-mips/mach-mips/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-mips/irq.h                     |    1 
 include/asm-mips/mach-pb1x00/pb1550.h                |    1 
 include/asm-mips/mach-sim/cpu-feature-overrides.h    |    1 
 include/asm-mips/mips-boards/generic.h               |    1 
 include/asm-mips/mipsregs.h                          |    1 
 include/asm-mips/mmu_context.h                       |    1 
 include/asm-mips/mmzone.h                            |    1 
 include/asm-mips/module.h                            |    1 
 include/asm-mips/msgbuf.h                            |    1 
 include/asm-mips/paccess.h                           |    1 
 include/asm-mips/page.h                              |    1 
 include/asm-mips/pci.h                               |    1 
 include/asm-mips/pgalloc.h                           |    1 
 include/asm-mips/pgtable-32.h                        |    1 
 include/asm-mips/pgtable-64.h                        |    1 
 include/asm-mips/pgtable-bits.h                      |    1 
 include/asm-mips/pgtable.h                           |    1 
 include/asm-mips/prefetch.h                          |    1 
 include/asm-mips/processor.h                         |    1 
 include/asm-mips/ptrace.h                            |    1 
 include/asm-mips/reg.h                               |    1 
 include/asm-mips/resource.h                          |    1 
 include/asm-mips/serial.h                            |    1 
 include/asm-mips/sgiarcs.h                           |    1 
 include/asm-mips/sibyte/board.h                      |    1 
 include/asm-mips/sibyte/carmel.h                     |    1 
 include/asm-mips/sibyte/sentosa.h                    |    1 
 include/asm-mips/sibyte/swarm.h                      |    1 
 include/asm-mips/siginfo.h                           |    1 
 include/asm-mips/signal.h                            |    1 
 include/asm-mips/sim.h                               |    1 
 include/asm-mips/smp.h                               |    1 
 include/asm-mips/sn/addrs.h                          |    1 
 include/asm-mips/sn/agent.h                          |    1 
 include/asm-mips/sn/arch.h                           |    1 
 include/asm-mips/sn/io.h                             |    1 
 include/asm-mips/sn/klconfig.h                       |    1 
 include/asm-mips/sn/kldir.h                          |    1 
 include/asm-mips/sn/launch.h                         |    1 
 include/asm-mips/sn/mapped_kernel.h                  |    1 
 include/asm-mips/sn/sn0/addrs.h                      |    1 
 include/asm-mips/sn/sn0/arch.h                       |    1 
 include/asm-mips/sn/sn0/hubmd.h                      |    1 
 include/asm-mips/stackframe.h                        |    1 
 include/asm-mips/string.h                            |    1 
 include/asm-mips/system.h                            |    1 
 include/asm-mips/thread_info.h                       |    1 
 include/asm-mips/tlbflush.h                          |    1 
 include/asm-mips/tx4927/toshiba_rbtx4927.h           |    1 
 include/asm-mips/types.h                             |    1 
 include/asm-mips/uaccess.h                           |    1 
 include/asm-mips/unistd.h                            |    1 
 include/asm-mips/vr41xx/vrc4173.h                    |    1 
 include/asm-mips/war.h                               |    1 
 include/asm-mips/wbflush.h                           |    1 
 include/asm-parisc/atomic.h                          |    1 
 include/asm-parisc/cache.h                           |    1 
 include/asm-parisc/cacheflush.h                      |    1 
 include/asm-parisc/dma-mapping.h                     |    1 
 include/asm-parisc/dma.h                             |    1 
 include/asm-parisc/io.h                              |    1 
 include/asm-parisc/irq.h                             |    1 
 include/asm-parisc/kmap_types.h                      |    1 
 include/asm-parisc/page.h                            |    1 
 include/asm-parisc/param.h                           |    1 
 include/asm-parisc/pci.h                             |    1 
 include/asm-parisc/pdc.h                             |    1 
 include/asm-parisc/pgtable.h                         |    1 
 include/asm-parisc/processor.h                       |    1 
 include/asm-parisc/psw.h                             |    1 
 include/asm-parisc/smp.h                             |    1 
 include/asm-parisc/system.h                          |    1 
 include/asm-parisc/tlbflush.h                        |    1 
 include/asm-powerpc/abs_addr.h                       |    1 
 include/asm-powerpc/cache.h                          |    1 
 include/asm-powerpc/dma-mapping.h                    |    1 
 include/asm-powerpc/dma.h                            |    1 
 include/asm-powerpc/eeh.h                            |    1 
 include/asm-powerpc/elf.h                            |    7 -
 include/asm-powerpc/floppy.h                         |    1 
 include/asm-powerpc/hw_irq.h                         |    1 
 include/asm-powerpc/ide.h                            |    1 
 include/asm-powerpc/iommu.h                          |    1 
 include/asm-powerpc/irq.h                            |    1 
 include/asm-powerpc/iseries/iseries_io.h             |    1 
 include/asm-powerpc/machdep.h                        |    1 
 include/asm-powerpc/mmzone.h                         |    1 
 include/asm-powerpc/paca.h                           |    1 
 include/asm-powerpc/page.h                           |    1 
 include/asm-powerpc/pgtable.h                        |    1 
 include/asm-powerpc/ppc_asm.h                        |    1 
 include/asm-powerpc/prom.h                           |    1 
 include/asm-powerpc/smp.h                            |    1 
 include/asm-powerpc/smu.h                            |    1 
 include/asm-powerpc/spu.h                            |    1 
 include/asm-powerpc/thread_info.h                    |    1 
 include/asm-powerpc/time.h                           |    1 
 include/asm-powerpc/timex.h                          |    1 
 include/asm-powerpc/tlb.h                            |    1 
 include/asm-powerpc/tlbflush.h                       |    1 
 include/asm-powerpc/topology.h                       |    1 
 include/asm-powerpc/types.h                          |    1 
 include/asm-powerpc/unistd.h                         |    1 
 include/asm-powerpc/vga.h                            |    1 
 include/asm-powerpc/vio.h                            |    1 
 include/asm-ppc/amigahw.h                            |    1 
 include/asm-ppc/bootinfo.h                           |    1 
 include/asm-ppc/commproc.h                           |    1 
 include/asm-ppc/ibm403.h                             |    1 
 include/asm-ppc/ibm44x.h                             |    1 
 include/asm-ppc/ibm4xx.h                             |    1 
 include/asm-ppc/io.h                                 |    1 
 include/asm-ppc/machdep.h                            |    1 
 include/asm-ppc/mmu.h                                |    1 
 include/asm-ppc/mmu_context.h                        |    1 
 include/asm-ppc/mpc8260.h                            |    1 
 include/asm-ppc/mpc83xx.h                            |    1 
 include/asm-ppc/mpc85xx.h                            |    1 
 include/asm-ppc/mpc8xx.h                             |    1 
 include/asm-ppc/mv64x60.h                            |    1 
 include/asm-ppc/ocp.h                                |    1 
 include/asm-ppc/open_pic.h                           |    1 
 include/asm-ppc/page.h                               |    2 
 include/asm-ppc/pc_serial.h                          |    1 
 include/asm-ppc/pgalloc.h                            |    1 
 include/asm-ppc/pgtable.h                            |    1 
 include/asm-ppc/ppc4xx_dma.h                         |    1 
 include/asm-ppc/ppc4xx_pic.h                         |    1 
 include/asm-ppc/serial.h                             |    1 
 include/asm-ppc/smp.h                                |    1 
 include/asm-ppc/time.h                               |    1 
 include/asm-s390/bitops.h                            |    1 
 include/asm-s390/debug.h                             |    1 
 include/asm-s390/hardirq.h                           |    1 
 include/asm-s390/idals.h                             |    1 
 include/asm-s390/local.h                             |    1 
 include/asm-s390/lowcore.h                           |    1 
 include/asm-s390/page.h                              |    6 -
 include/asm-s390/pgalloc.h                           |    1 
 include/asm-s390/sfp-machine.h                       |    1 
 include/asm-s390/smp.h                               |    1 
 include/asm-s390/system.h                            |    1 
 include/asm-s390/tlbflush.h                          |    1 
 include/asm-s390/types.h                             |    1 
 include/asm-s390/unistd.h                            |    1 
 include/asm-sh/bug.h                                 |    1 
 include/asm-sh/checksum.h                            |    1 
 include/asm-sh/dma-mapping.h                         |    1 
 include/asm-sh/dma.h                                 |    1 
 include/asm-sh/fixmap.h                              |    1 
 include/asm-sh/hardirq.h                             |    1 
 include/asm-sh/hd64461/hd64461.h                     |    1 
 include/asm-sh/hd64465/hd64465.h                     |    1 
 include/asm-sh/ide.h                                 |    1 
 include/asm-sh/io.h                                  |    1 
 include/asm-sh/irq.h                                 |    1 
 include/asm-sh/keyboard.h                            |    1 
 include/asm-sh/kmap_types.h                          |    1 
 include/asm-sh/machvec.h                             |    1 
 include/asm-sh/machvec_init.h                        |    1 
 include/asm-sh/mpc1211/dma.h                         |    1 
 include/asm-sh/overdrive/overdrive.h                 |    1 
 include/asm-sh/page.h                                |    1 
 include/asm-sh/pgtable.h                             |    1 
 include/asm-sh/serial.h                              |    1 
 include/asm-sh/smp.h                                 |    1 
 include/asm-sh/system.h                              |    1 
 include/asm-sh/types.h                               |    1 
 include/asm-sh/watchdog.h                            |    1 
 include/asm-sh64/bug.h                               |    1 
 include/asm-sh64/dma-mapping.h                       |    1 
 include/asm-sh64/hardirq.h                           |    1 
 include/asm-sh64/ide.h                               |    1 
 include/asm-sh64/irq.h                               |    1 
 include/asm-sh64/mmu_context.h                       |    1 
 include/asm-sh64/page.h                              |    1 
 include/asm-sh64/param.h                             |    1 
 include/asm-sh64/pgtable.h                           |    1 
 include/asm-sh64/system.h                            |    1 
 include/asm-sparc/asmmacro.h                         |    1 
 include/asm-sparc/atomic.h                           |    1 
 include/asm-sparc/bugs.h                             |    1 
 include/asm-sparc/cacheflush.h                       |    1 
 include/asm-sparc/delay.h                            |    1 
 include/asm-sparc/dma-mapping.h                      |    1 
 include/asm-sparc/dma.h                              |    1 
 include/asm-sparc/elf.h                              |    1 
 include/asm-sparc/fixmap.h                           |    1 
 include/asm-sparc/hardirq.h                          |    1 
 include/asm-sparc/ide.h                              |    1 
 include/asm-sparc/irq.h                              |    1 
 include/asm-sparc/mostek.h                           |    1 
 include/asm-sparc/page.h                             |    1 
 include/asm-sparc/pgalloc.h                          |    1 
 include/asm-sparc/pgtable.h                          |    1 
 include/asm-sparc/sfp-machine.h                      |    1 
 include/asm-sparc/smp.h                              |    1 
 include/asm-sparc/system.h                           |    2 
 include/asm-sparc/timer.h                            |    1 
 include/asm-sparc/tlbflush.h                         |    1 
 include/asm-sparc/vac-ops.h                          |    1 
 include/asm-sparc/winmacro.h                         |    1 
 include/asm-sparc64/atomic.h                         |    1 
 include/asm-sparc64/bitops.h                         |    1 
 include/asm-sparc64/bugs.h                           |    1 
 include/asm-sparc64/cacheflush.h                     |    1 
 include/asm-sparc64/delay.h                          |    1 
 include/asm-sparc64/dma-mapping.h                    |    1 
 include/asm-sparc64/dma.h                            |    1 
 include/asm-sparc64/floppy.h                         |    1 
 include/asm-sparc64/ide.h                            |    1 
 include/asm-sparc64/irq.h                            |    1 
 include/asm-sparc64/kprobes.h                        |    1 
 include/asm-sparc64/mc146818rtc.h                    |    1 
 include/asm-sparc64/mmu.h                            |    1 
 include/asm-sparc64/oplib.h                          |    1 
 include/asm-sparc64/page.h                           |    1 
 include/asm-sparc64/param.h                          |    1 
 include/asm-sparc64/pgalloc.h                        |    1 
 include/asm-sparc64/pgtable.h                        |    1 
 include/asm-sparc64/processor.h                      |    1 
 include/asm-sparc64/siginfo.h                        |    1 
 include/asm-sparc64/signal.h                         |    1 
 include/asm-sparc64/smp.h                            |    1 
 include/asm-sparc64/spinlock.h                       |    1 
 include/asm-sparc64/system.h                         |    1 
 include/asm-sparc64/timer.h                          |    1 
 include/asm-sparc64/tlb.h                            |    1 
 include/asm-sparc64/tlbflush.h                       |    1 
 include/asm-sparc64/ttable.h                         |    1 
 include/asm-um/a.out.h                               |    1 
 include/asm-um/cache.h                               |    1 
 include/asm-um/elf-ppc.h                             |    1 
 include/asm-um/fixmap.h                              |    1 
 include/asm-um/hardirq.h                             |    1 
 include/asm-um/linkage.h                             |    1 
 include/asm-um/mmu_context.h                         |    1 
 include/asm-um/page.h                                |    1 
 include/asm-um/pgalloc.h                             |    1 
 include/asm-um/processor-generic.h                   |    1 
 include/asm-um/ptrace-generic.h                      |    1 
 include/asm-um/smp.h                                 |    1 
 include/asm-um/thread_info.h                         |    1 
 include/asm-v850/atomic.h                            |    1 
 include/asm-v850/bitops.h                            |    1 
 include/asm-v850/dma-mapping.h                       |    1 
 include/asm-v850/hardirq.h                           |    1 
 include/asm-v850/machdep.h                           |    1 
 include/asm-v850/pgtable.h                           |    1 
 include/asm-v850/processor.h                         |    1 
 include/asm-v850/serial.h                            |    1 
 include/asm-v850/v850e_uart.h                        |    1 
 include/asm-x86_64/apic.h                            |    1 
 include/asm-x86_64/atomic.h                          |    1 
 include/asm-x86_64/bitops.h                          |    1 
 include/asm-x86_64/bugs.h                            |    1 
 include/asm-x86_64/cache.h                           |    1 
 include/asm-x86_64/calling.h                         |    1 
 include/asm-x86_64/dma-mapping.h                     |    1 
 include/asm-x86_64/dma.h                             |    1 
 include/asm-x86_64/dwarf2.h                          |    1 
 include/asm-x86_64/fixmap.h                          |    1 
 include/asm-x86_64/hardirq.h                         |    1 
 include/asm-x86_64/hw_irq.h                          |    1 
 include/asm-x86_64/ia32.h                            |    1 
 include/asm-x86_64/io.h                              |    1 
 include/asm-x86_64/io_apic.h                         |    1 
 include/asm-x86_64/mmu_context.h                     |    1 
 include/asm-x86_64/mmzone.h                          |    1 
 include/asm-x86_64/mtrr.h                            |    1 
 include/asm-x86_64/param.h                           |    1 
 include/asm-x86_64/pci.h                             |    1 
 include/asm-x86_64/processor.h                       |    1 
 include/asm-x86_64/serial.h                          |    1 
 include/asm-x86_64/smp.h                             |    1 
 include/asm-x86_64/spinlock.h                        |    1 
 include/asm-x86_64/swiotlb.h                         |    1 
 include/asm-x86_64/system.h                          |    1 
 include/asm-x86_64/tlbflush.h                        |    1 
 include/asm-x86_64/topology.h                        |    1 
 include/asm-x86_64/uaccess.h                         |    1 
 include/asm-xtensa/atomic.h                          |    1 
 include/asm-xtensa/checksum.h                        |    1 
 include/asm-xtensa/delay.h                           |    1 
 include/asm-xtensa/dma.h                             |    1 
 include/asm-xtensa/hardirq.h                         |    1 
 include/asm-xtensa/ide.h                             |    1 
 include/asm-xtensa/io.h                              |    1 
 include/asm-xtensa/irq.h                             |    1 
 include/asm-xtensa/mmu_context.h                     |    1 
 include/asm-xtensa/page.h                            |    1 
 include/asm-xtensa/pgalloc.h                         |    1 
 include/asm-xtensa/platform.h                        |    1 
 include/asm-xtensa/system.h                          |    1 
 include/linux/acct.h                                 |    3 
 include/linux/acpi.h                                 |    1 
 include/linux/agpgart.h                              |    3 
 include/linux/amba/clcd.h                            |    1 
 include/linux/atmdev.h                               |    1 
 include/linux/audit.h                                |    4 
 include/linux/blkdev.h                               |    1 
 include/linux/blkpg.h                                |    1 
 include/linux/blktrace_api.h                         |    1 
 include/linux/blockgroup_lock.h                      |    1 
 include/linux/cache.h                                |    1 
 include/linux/coda.h                                 |    1 
 include/linux/compat.h                               |    1 
 include/linux/cpufreq.h                              |    1 
 include/linux/crypto.h                               |    1 
 include/linux/cyclomx.h                              |    1 
 include/linux/dcookies.h                             |    1 
 include/linux/devfs_fs_kernel.h                      |    1 
 include/linux/device.h                               |    1 
 include/linux/dmi.h                                  |    1 
 include/linux/dnotify.h                              |    1 
 include/linux/elf.h                                  |   59 -----------
 include/linux/errqueue.h                             |    1 
 include/linux/ext2_fs.h                              |    2 
 include/linux/ext3_fs.h                              |    7 -
 include/linux/fs.h                                   |    1 
 include/linux/ftape.h                                |    1 
 include/linux/gameport.h                             |    6 +
 include/linux/generic_serial.h                       |    6 -
 include/linux/genhd.h                                |   12 +-
 include/linux/gfp.h                                  |    1 
 include/linux/hardirq.h                              |    1 
 include/linux/highmem.h                              |    1 
 include/linux/highuid.h                              |    1 
 include/linux/i2c-algo-ite.h                         |    7 +
 include/linux/i2c.h                                  |    9 +
 include/linux/ide.h                                  |    1 
 include/linux/if_frad.h                              |    1 
 include/linux/if_tr.h                                |    1 
 include/linux/init.h                                 |    1 
 include/linux/inotify.h                              |    1 
 include/linux/interrupt.h                            |    1 
 include/linux/ipmi.h                                 |    2 
 include/linux/ipv6.h                                 |    1 
 include/linux/irq.h                                  |    1 
 include/linux/irq_cpustat.h                          |    1 
 include/linux/isapnp.h                               |    1 
 include/linux/isdn.h                                 |    1 
 include/linux/isdn/tpam.h                            |    1 
 include/linux/isdn_ppp.h                             |    1 
 include/linux/isdnif.h                               |    1 
 include/linux/kallsyms.h                             |    1 
 include/linux/kernel_stat.h                          |    1 
 include/linux/kmod.h                                 |    1 
 include/linux/kprobes.h                              |    1 
 include/linux/linkage.h                              |    1 
 include/linux/lockd/lockd.h                          |    1 
 include/linux/lockd/nlm.h                            |    1 
 include/linux/mempolicy.h                            |    1 
 include/linux/migrate.h                              |    1 
 include/linux/mm.h                                   |    1 
 include/linux/mman.h                                 |   12 +-
 include/linux/mmzone.h                               |    1 
 include/linux/module.h                               |    1 
 include/linux/msg.h                                  |    2 
 include/linux/mtd/cfi.h                              |    1 
 include/linux/mtd/map.h                              |    1 
 include/linux/mtd/mtd.h                              |    1 
 include/linux/mtd/nand.h                             |    1 
 include/linux/mtd/physmap.h                          |    1 
 include/linux/mtd/xip.h                              |    1 
 include/linux/ncp_fs.h                               |    5 -
 include/linux/net.h                                  |    3 
 include/linux/netdevice.h                            |    1 
 include/linux/netfilter.h                            |    1 
 include/linux/netfilter_arp.h                        |    1 
 include/linux/netfilter_bridge.h                     |    1 
 include/linux/netfilter_ipv4.h                       |    1 
 include/linux/netfilter_ipv4/ip_conntrack.h          |    1 
 include/linux/netfilter_ipv4/listhelp.h              |    1 
 include/linux/nfs.h                                  |    8 -
 include/linux/nfs4.h                                 |    6 -
 include/linux/nfs_fs.h                               |   39 +++----
 include/linux/nfsd/nfsd.h                            |    1 
 include/linux/nfsd/nfsfh.h                           |    1 
 include/linux/nfsd/syscall.h                         |    1 
 include/linux/numa.h                                 |    1 
 include/linux/parport.h                              |    1 
 include/linux/pci.h                                  |    1 
 include/linux/percpu_counter.h                       |    1 
 include/linux/pm.h                                   |    1 
 include/linux/pm_legacy.h                            |    1 
 include/linux/pmu.h                                  |    1 
 include/linux/preempt.h                              |    1 
 include/linux/proc_fs.h                              |    1 
 include/linux/profile.h                              |    1 
 include/linux/quota.h                                |    4 
 include/linux/quotaops.h                             |    1 
 include/linux/reiserfs_xattr.h                       |    3 
 include/linux/relay.h                                |    1 
 include/linux/rio.h                                  |    1 
 include/linux/rio_drv.h                              |    1 
 include/linux/rmap.h                                 |    1 
 include/linux/rtnetlink.h                            |    1 
 include/linux/rwsem.h                                |    1 
 include/linux/scc.h                                  |    1 
 include/linux/sched.h                                |   94 +++++++++----------
 include/linux/seccomp.h                              |    1 
 include/linux/sem.h                                  |    2 
 include/linux/seqlock.h                              |    1 
 include/linux/serialP.h                              |    1 
 include/linux/serial_core.h                          |    1 
 include/linux/signal.h                               |    4 
 include/linux/skbuff.h                               |    1 
 include/linux/slab.h                                 |    1 
 include/linux/smb_fs.h                               |    4 
 include/linux/smp.h                                  |    1 
 include/linux/smp_lock.h                             |    1 
 include/linux/socket.h                               |    2 
 include/linux/spinlock.h                             |    1 
 include/linux/stop_machine.h                         |    1 
 include/linux/sunrpc/auth.h                          |    1 
 include/linux/sunrpc/debug.h                         |   24 ++--
 include/linux/sunrpc/stats.h                         |    1 
 include/linux/suspend.h                              |    1 
 include/linux/swap.h                                 |    1 
 include/linux/syscalls.h                             |    1 
 include/linux/sysrq.h                                |    1 
 include/linux/tcp.h                                  |    1 
 include/linux/threads.h                              |    1 
 include/linux/timer.h                                |    1 
 include/linux/timex.h                                |    1 
 include/linux/tty.h                                  |    1 
 include/linux/types.h                                |    1 
 include/linux/udp.h                                  |    1 
 include/linux/usb.h                                  |    1 
 include/linux/usb_usual.h                            |    1 
 include/linux/usbdevice_fs.h                         |    2 
 include/linux/vt_buffer.h                            |    1 
 include/linux/vt_kern.h                              |    1 
 include/linux/wait.h                                 |    1 
 include/linux/wanrouter.h                            |    4 
 include/mtd/mtd-abi.h                                |    5 -
 include/net/addrconf.h                               |    1 
 include/net/af_unix.h                                |    1 
 include/net/ax25.h                                   |    1 
 include/net/compat.h                                 |    1 
 include/net/dst.h                                    |    1 
 include/net/icmp.h                                   |    1 
 include/net/inet6_hashtables.h                       |    1 
 include/net/inet_hashtables.h                        |    1 
 include/net/inet_sock.h                              |    1 
 include/net/inet_timewait_sock.h                     |    1 
 include/net/ip.h                                     |    1 
 include/net/ip_fib.h                                 |    1 
 include/net/ip_mp_alg.h                              |    1 
 include/net/ip_vs.h                                  |    1 
 include/net/ipv6.h                                   |    1 
 include/net/irda/irda.h                              |    1 
 include/net/irda/irda_device.h                       |    1 
 include/net/irda/irlap.h                             |    1 
 include/net/irda/irlmp.h                             |    1 
 include/net/irda/irlmp_frame.h                       |    1 
 include/net/irda/qos.h                               |    1 
 include/net/ndisc.h                                  |    1 
 include/net/netfilter/nf_conntrack.h                 |    1 
 include/net/pkt_act.h                                |    1 
 include/net/protocol.h                               |    1 
 include/net/raw.h                                    |    1 
 include/net/red.h                                    |    1 
 include/net/route.h                                  |    1 
 include/net/sch_generic.h                            |    1 
 include/net/sctp/sctp.h                              |    1 
 include/net/sock.h                                   |    1 
 include/net/tcp.h                                    |    1 
 include/pcmcia/ss.h                                  |    1 
 include/scsi/scsi_transport_fc.h                     |    1 
 include/scsi/scsi_transport_spi.h                    |    1 
 include/sound/driver.h                               |    1 
 include/video/edid.h                                 |    1 
 include/video/vga.h                                  |    1 
 867 files changed, 211 insertions(+), 1045 deletions(-)

Index: linux-2.6-header-cleanup-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-cleanup-git.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-header-cleanup-git.patch	27 Apr 2006 14:51:37 -0000	1.5
+++ linux-2.6-header-cleanup-git.patch	27 Apr 2006 16:00:17 -0000	1.6
@@ -2060,7 +2060,7 @@
  #include <linux/ioctl.h>
  #include <linux/errno.h>
  
-diff -u b/include/asm-i386/page.h b/include/asm-i386/page.h
+unchanged:
 --- b/include/asm-i386/page.h
 +++ b/include/asm-i386/page.h
 @@ -12,7 +12,6 @@
@@ -7293,7 +7293,7 @@
  #include <linux/ioctl.h>
  #include <linux/compat.h>
  
-diff -u b/include/asm-x86_64/page.h b/include/asm-x86_64/page.h
+unchanged:
 --- b/include/asm-x86_64/page.h
 +++ b/include/asm-x86_64/page.h
 @@ -1,7 +1,6 @@
@@ -10246,3 +10246,15 @@
  #endif
 +
 +#endif /* __ASM_GENERIC_SIGNAL_H */
+only in patch2:
+unchanged:
+--- a/include/linux/blkpg.h
++++ b/include/linux/blkpg.h
+@@ -24,6 +24,7 @@ #define _LINUX_BLKPG_H
+  *
+  * For today, only the partition stuff - aeb, 990515
+  */
++#include <linux/compiler.h>
+ #include <linux/ioctl.h>
+ 
+ #define BLKPG      _IO(0x12,105)



From fedora-cvs-commits at redhat.com  Thu Apr 27 16:21:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 12:21:56 -0400
Subject: rpms/kernel/devel linux-2.6-header-cleanup-git.patch, 1.6,
	1.7 linux-2.6-header-install-git.patch, 1.5, 1.6
Message-ID: <200604271621.k3RGLuxv022091@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22042

Modified Files:
	linux-2.6-header-cleanup-git.patch 
	linux-2.6-header-install-git.patch 
Log Message:
blkpg.h, mii.h, ethtool.h, version.h fixes

linux-2.6-header-cleanup-git.patch:
 b/include/asm-i386/page.h                            |    5 
 b/include/asm-s390/ptrace.h                          |    6 
 b/include/asm-x86_64/page.h                          |    5 
 b/include/linux/elf-em.h                             |   44 ++++
 include/acpi/platform/aclinux.h                      |    1 
 include/acpi/processor.h                             |    1 
 include/asm-alpha/bitops.h                           |    1 
 include/asm-alpha/cache.h                            |    1 
 include/asm-alpha/cacheflush.h                       |    1 
 include/asm-alpha/core_cia.h                         |    1 
 include/asm-alpha/core_t2.h                          |    1 
 include/asm-alpha/dma-mapping.h                      |    1 
 include/asm-alpha/dma.h                              |    1 
 include/asm-alpha/floppy.h                           |    1 
 include/asm-alpha/hardirq.h                          |    1 
 include/asm-alpha/hw_irq.h                           |    1 
 include/asm-alpha/ide.h                              |    1 
 include/asm-alpha/io.h                               |    1 
 include/asm-alpha/irq.h                              |    1 
 include/asm-alpha/kmap_types.h                       |    1 
 include/asm-alpha/machvec.h                          |    1 
 include/asm-alpha/mmu_context.h                      |    1 
 include/asm-alpha/mmzone.h                           |    1 
 include/asm-alpha/page.h                             |    1 
 include/asm-alpha/param.h                            |    1 
 include/asm-alpha/pgalloc.h                          |    1 
 include/asm-alpha/pgtable.h                          |    1 
 include/asm-alpha/serial.h                           |    1 
 include/asm-alpha/smp.h                              |    1 
 include/asm-alpha/spinlock.h                         |    1 
 include/asm-alpha/system.h                           |    1 
 include/asm-alpha/tlbflush.h                         |    1 
 include/asm-arm/apm.h                                |    1 
 include/asm-arm/arch-aaec2000/memory.h               |    1 
 include/asm-arm/arch-cl7500/acornfb.h                |    1 
 include/asm-arm/arch-clps711x/hardware.h             |    1 
 include/asm-arm/arch-clps711x/memory.h               |    1 
 include/asm-arm/arch-clps711x/uncompress.h           |    1 
 include/asm-arm/arch-ebsa285/hardware.h              |    1 
 include/asm-arm/arch-ebsa285/memory.h                |    1 
 include/asm-arm/arch-ebsa285/vmalloc.h               |    1 
 include/asm-arm/arch-integrator/smp.h                |    1 
 include/asm-arm/arch-iop3xx/memory.h                 |    1 
 include/asm-arm/arch-iop3xx/timex.h                  |    1 
 include/asm-arm/arch-iop3xx/uncompress.h             |    1 
 include/asm-arm/arch-ixp4xx/dma.h                    |    1 
 include/asm-arm/arch-lh7a40x/constants.h             |    1 
 include/asm-arm/arch-lh7a40x/irqs.h                  |    1 
 include/asm-arm/arch-lh7a40x/registers.h             |    1 
 include/asm-arm/arch-omap/board.h                    |    1 
 include/asm-arm/arch-omap/hardware.h                 |    1 
 include/asm-arm/arch-omap/system.h                   |    1 
 include/asm-arm/arch-omap/uncompress.h               |    1 
 include/asm-arm/arch-pxa/idp.h                       |    1 
 include/asm-arm/arch-pxa/irqs.h                      |    1 
 include/asm-arm/arch-pxa/pxa-regs.h                  |    1 
 include/asm-arm/arch-pxa/timex.h                     |    1 
 include/asm-arm/arch-realview/smp.h                  |    1 
 include/asm-arm/arch-s3c2410/dma.h                   |    1 
 include/asm-arm/arch-s3c2410/uncompress.h            |    1 
 include/asm-arm/arch-sa1100/assabet.h                |    1 
 include/asm-arm/arch-sa1100/cerf.h                   |    1 
 include/asm-arm/arch-sa1100/collie.h                 |    1 
 include/asm-arm/arch-sa1100/dma.h                    |    1 
 include/asm-arm/arch-sa1100/hardware.h               |    1 
 include/asm-arm/arch-sa1100/ide.h                    |    1 
 include/asm-arm/arch-sa1100/irqs.h                   |    1 
 include/asm-arm/arch-sa1100/memory.h                 |    1 
 include/asm-arm/arch-sa1100/system.h                 |    1 
 include/asm-arm/atomic.h                             |    1 
 include/asm-arm/bug.h                                |    1 
 include/asm-arm/cacheflush.h                         |    1 
 include/asm-arm/cpu.h                                |    1 
 include/asm-arm/dma-mapping.h                        |    1 
 include/asm-arm/dma.h                                |    1 
 include/asm-arm/elf.h                                |    1 
 include/asm-arm/fpstate.h                            |    1 
 include/asm-arm/glue.h                               |    1 
 include/asm-arm/hardirq.h                            |    1 
 include/asm-arm/hardware/dec21285.h                  |    1 
 include/asm-arm/hardware/iomd.h                      |    1 
 include/asm-arm/leds.h                               |    1 
 include/asm-arm/mach/serial_at91rm9200.h             |    1 
 include/asm-arm/mach/serial_sa1100.h                 |    1 
 include/asm-arm/memory.h                             |    1 
 include/asm-arm/page.h                               |    1 
 include/asm-arm/pci.h                                |    1 
 include/asm-arm/proc-fns.h                           |    1 
 include/asm-arm/ptrace.h                             |    1 
 include/asm-arm/smp.h                                |    1 
 include/asm-arm/system.h                             |    1 
 include/asm-arm/tlbflush.h                           |    1 
 include/asm-arm26/atomic.h                           |    1 
 include/asm-arm26/bug.h                              |    1 
 include/asm-arm26/dma.h                              |    1 
 include/asm-arm26/hardirq.h                          |    1 
 include/asm-arm26/hardware.h                         |    1 
 include/asm-arm26/io.h                               |    1 
 include/asm-arm26/leds.h                             |    1 
 include/asm-arm26/mach-types.h                       |    1 
 include/asm-arm26/page.h                             |    1 
 include/asm-arm26/pgtable.h                          |    1 
 include/asm-arm26/serial.h                           |    1 
 include/asm-arm26/smp.h                              |    1 
 include/asm-arm26/sysirq.h                           |    1 
 include/asm-arm26/system.h                           |    1 
 include/asm-cris/arch-v10/io.h                       |    1 
 include/asm-cris/arch-v10/page.h                     |    1 
 include/asm-cris/arch-v10/system.h                   |    1 
 include/asm-cris/arch-v32/io.h                       |    1 
 include/asm-cris/arch-v32/irq.h                      |    1 
 include/asm-cris/arch-v32/page.h                     |    1 
 include/asm-cris/arch-v32/processor.h                |    1 
 include/asm-cris/arch-v32/system.h                   |    1 
 include/asm-cris/eshlibld.h                          |    1 
 include/asm-cris/etraxgpio.h                         |    1 
 include/asm-cris/fasttimer.h                         |    1 
 include/asm-cris/page.h                              |    1 
 include/asm-cris/pci.h                               |    1 
 include/asm-cris/pgtable.h                           |    1 
 include/asm-cris/processor.h                         |    1 
 include/asm-cris/rtc.h                               |    1 
 include/asm-cris/tlbflush.h                          |    1 
 include/asm-frv/atomic.h                             |    1 
 include/asm-frv/bitops.h                             |    1 
 include/asm-frv/bug.h                                |    1 
 include/asm-frv/cache.h                              |    1 
 include/asm-frv/dma.h                                |    1 
 include/asm-frv/elf.h                                |    1 
 include/asm-frv/fpu.h                                |    1 
 include/asm-frv/hardirq.h                            |    1 
 include/asm-frv/highmem.h                            |    1 
 include/asm-frv/ide.h                                |    1 
 include/asm-frv/io.h                                 |    1 
 include/asm-frv/irq.h                                |    1 
 include/asm-frv/mmu_context.h                        |    1 
 include/asm-frv/page.h                               |    1 
 include/asm-frv/pci.h                                |    1 
 include/asm-frv/pgalloc.h                            |    1 
 include/asm-frv/pgtable.h                            |    1 
 include/asm-frv/processor.h                          |    1 
 include/asm-frv/segment.h                            |    1 
 include/asm-frv/serial.h                             |    1 
 include/asm-frv/smp.h                                |    1 
 include/asm-frv/system.h                             |    1 
 include/asm-frv/tlbflush.h                           |    1 
 include/asm-frv/types.h                              |    1 
 include/asm-frv/unaligned.h                          |    1 
 include/asm-frv/virtconvert.h                        |    1 
 include/asm-generic/bug.h                            |    1 
 include/asm-generic/dma-mapping.h                    |    1 
 include/asm-generic/fcntl.h                          |    1 
 include/asm-generic/local.h                          |    1 
 include/asm-generic/signal.h                         |    7 
 include/asm-generic/tlb.h                            |    1 
 include/asm-h8300/bitops.h                           |    1 
 include/asm-h8300/dma.h                              |    1 
 include/asm-h8300/elf.h                              |    1 
 include/asm-h8300/hardirq.h                          |    1 
 include/asm-h8300/io.h                               |    1 
 include/asm-h8300/keyboard.h                         |    1 
 include/asm-h8300/mmu_context.h                      |    1 
 include/asm-h8300/page.h                             |    1 
 include/asm-h8300/page_offset.h                      |    1 
 include/asm-h8300/param.h                            |    1 
 include/asm-h8300/pgtable.h                          |    1 
 include/asm-h8300/processor.h                        |    1 
 include/asm-h8300/semaphore-helper.h                 |    1 
 include/asm-h8300/shm.h                              |    1 
 include/asm-h8300/system.h                           |    1 
 include/asm-h8300/unaligned.h                        |    1 
 include/asm-h8300/virtconvert.h                      |    1 
 include/asm-i386/apic.h                              |    1 
 include/asm-i386/atomic.h                            |    1 
 include/asm-i386/bitops.h                            |    1 
 include/asm-i386/bug.h                               |    1 
 include/asm-i386/bugs.h                              |    1 
 include/asm-i386/byteorder.h                         |    1 
 include/asm-i386/cache.h                             |    1 
 include/asm-i386/dma.h                               |    1 
 include/asm-i386/fixmap.h                            |    1 
 include/asm-i386/hardirq.h                           |    1 
 include/asm-i386/highmem.h                           |    1 
 include/asm-i386/hpet.h                              |    1 
 include/asm-i386/hw_irq.h                            |    1 
 include/asm-i386/ide.h                               |    1 
 include/asm-i386/io.h                                |    1 
 include/asm-i386/io_apic.h                           |    1 
 include/asm-i386/irq.h                               |    1 
 include/asm-i386/kmap_types.h                        |    1 
 include/asm-i386/mach-summit/mach_apic.h             |    1 
 include/asm-i386/mmu_context.h                       |    1 
 include/asm-i386/mtrr.h                              |    1 
 include/asm-i386/param.h                             |    1 
 include/asm-i386/pci.h                               |    1 
 include/asm-i386/pgalloc.h                           |    1 
 include/asm-i386/pgtable.h                           |    1 
 include/asm-i386/processor.h                         |    1 
 include/asm-i386/serial.h                            |    1 
 include/asm-i386/smp.h                               |    1 
 include/asm-i386/spinlock.h                          |    1 
 include/asm-i386/string.h                            |    1 
 include/asm-i386/system.h                            |    1 
 include/asm-i386/thread_info.h                       |    1 
 include/asm-i386/timex.h                             |    1 
 include/asm-i386/tlbflush.h                          |    1 
 include/asm-i386/types.h                             |    1 
 include/asm-i386/uaccess.h                           |    1 
 include/asm-ia64/asmmacro.h                          |    1 
 include/asm-ia64/cache.h                             |    1 
 include/asm-ia64/delay.h                             |    1 
 include/asm-ia64/dma-mapping.h                       |    1 
 include/asm-ia64/dma.h                               |    1 
 include/asm-ia64/elf.h                               |    1 
 include/asm-ia64/hardirq.h                           |    1 
 include/asm-ia64/ia32.h                              |    1 
 include/asm-ia64/ide.h                               |    1 
 include/asm-ia64/intrinsics.h                        |    1 
 include/asm-ia64/kmap_types.h                        |    1 
 include/asm-ia64/machvec.h                           |    1 
 include/asm-ia64/meminit.h                           |    1 
 include/asm-ia64/nodedata.h                          |    1 
 include/asm-ia64/numa.h                              |    1 
 include/asm-ia64/page.h                              |    1 
 include/asm-ia64/param.h                             |    1 
 include/asm-ia64/percpu.h                            |    1 
 include/asm-ia64/pgalloc.h                           |    1 
 include/asm-ia64/pgtable.h                           |    1 
 include/asm-ia64/processor.h                         |    1 
 include/asm-ia64/ptrace.h                            |    1 
 include/asm-ia64/smp.h                               |    1 
 include/asm-ia64/sn/simulator.h                      |    1 
 include/asm-ia64/sn/sn_cpuid.h                       |    1 
 include/asm-ia64/sn/sn_sal.h                         |    1 
 include/asm-ia64/sn/xpc.h                            |    1 
 include/asm-ia64/string.h                            |    1 
 include/asm-ia64/system.h                            |    1 
 include/asm-ia64/tlb.h                               |    1 
 include/asm-ia64/tlbflush.h                          |    1 
 include/asm-ia64/unistd.h                            |    1 
 include/asm-m32r/assembler.h                         |    1 
 include/asm-m32r/atomic.h                            |    1 
 include/asm-m32r/bitops.h                            |    1 
 include/asm-m32r/cacheflush.h                        |    1 
 include/asm-m32r/hardirq.h                           |    1 
 include/asm-m32r/ide.h                               |    1 
 include/asm-m32r/irq.h                               |    1 
 include/asm-m32r/kmap_types.h                        |    1 
 include/asm-m32r/m32104ut/m32104ut_pld.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lan.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lcd.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_pld.h             |    1 
 include/asm-m32r/m32r.h                              |    1 
 include/asm-m32r/mmu.h                               |    1 
 include/asm-m32r/mmu_context.h                       |    2 
 include/asm-m32r/opsput/opsput_lan.h                 |    1 
 include/asm-m32r/opsput/opsput_lcd.h                 |    1 
 include/asm-m32r/opsput/opsput_pld.h                 |    1 
 include/asm-m32r/page.h                              |    1 
 include/asm-m32r/pgalloc.h                           |    1 
 include/asm-m32r/pgtable-2level.h                    |    1 
 include/asm-m32r/pgtable.h                           |    1 
 include/asm-m32r/processor.h                         |    1 
 include/asm-m32r/ptrace.h                            |    1 
 include/asm-m32r/rtc.h                               |    1 
 include/asm-m32r/semaphore.h                         |    1 
 include/asm-m32r/serial.h                            |    1 
 include/asm-m32r/sigcontext.h                        |    1 
 include/asm-m32r/smp.h                               |    1 
 include/asm-m32r/spinlock.h                          |    1 
 include/asm-m32r/system.h                            |    1 
 include/asm-m32r/timex.h                             |    1 
 include/asm-m32r/tlbflush.h                          |    1 
 include/asm-m32r/uaccess.h                           |    1 
 include/asm-m68k/atomic.h                            |    1 
 include/asm-m68k/bug.h                               |    1 
 include/asm-m68k/dma-mapping.h                       |    1 
 include/asm-m68k/dma.h                               |    1 
 include/asm-m68k/dvma.h                              |    1 
 include/asm-m68k/elf.h                               |    1 
 include/asm-m68k/entry.h                             |    1 
 include/asm-m68k/fpu.h                               |    1 
 include/asm-m68k/hardirq.h                           |    1 
 include/asm-m68k/ide.h                               |    1 
 include/asm-m68k/io.h                                |    1 
 include/asm-m68k/irq.h                               |    1 
 include/asm-m68k/mc146818rtc.h                       |    1 
 include/asm-m68k/mmu_context.h                       |    1 
 include/asm-m68k/motorola_pgtable.h                  |    1 
 include/asm-m68k/openprom.h                          |    1 
 include/asm-m68k/page.h                              |    1 
 include/asm-m68k/page_offset.h                       |    1 
 include/asm-m68k/pgalloc.h                           |    1 
 include/asm-m68k/pgtable.h                           |    1 
 include/asm-m68k/processor.h                         |    1 
 include/asm-m68k/semaphore-helper.h                  |    1 
 include/asm-m68k/serial.h                            |    1 
 include/asm-m68k/setup.h                             |    1 
 include/asm-m68k/shm.h                               |    1 
 include/asm-m68k/system.h                            |    1 
 include/asm-m68k/tlbflush.h                          |    1 
 include/asm-m68k/virtconvert.h                       |    1 
 include/asm-m68knommu/bitops.h                       |    1 
 include/asm-m68knommu/coldfire.h                     |    1 
 include/asm-m68knommu/commproc.h                     |    1 
 include/asm-m68knommu/dma-mapping.h                  |    1 
 include/asm-m68knommu/dma.h                          |    1 
 include/asm-m68knommu/elf.h                          |    1 
 include/asm-m68knommu/elia.h                         |    1 
 include/asm-m68knommu/entry.h                        |    1 
 include/asm-m68knommu/fpu.h                          |    1 
 include/asm-m68knommu/hardirq.h                      |    1 
 include/asm-m68knommu/io.h                           |    1 
 include/asm-m68knommu/irq.h                          |    1 
 include/asm-m68knommu/m5206sim.h                     |    1 
 include/asm-m68knommu/m520xsim.h                     |    1 
 include/asm-m68knommu/m523xsim.h                     |    1 
 include/asm-m68knommu/m5272sim.h                     |    1 
 include/asm-m68knommu/m527xsim.h                     |    1 
 include/asm-m68knommu/m528xsim.h                     |    1 
 include/asm-m68knommu/mcfcache.h                     |    1 
 include/asm-m68knommu/mcfdma.h                       |    1 
 include/asm-m68knommu/mcfmbus.h                      |    1 
 include/asm-m68knommu/mcfne.h                        |    1 
 include/asm-m68knommu/mcfpci.h                       |    1 
 include/asm-m68knommu/mcfpit.h                       |    1 
 include/asm-m68knommu/mcfsim.h                       |    1 
 include/asm-m68knommu/mcfsmc.h                       |    1 
 include/asm-m68knommu/mcftimer.h                     |    1 
 include/asm-m68knommu/mcfuart.h                      |    1 
 include/asm-m68knommu/mcfwdebug.h                    |    1 
 include/asm-m68knommu/mmu_context.h                  |    1 
 include/asm-m68knommu/nettel.h                       |    1 
 include/asm-m68knommu/page.h                         |    1 
 include/asm-m68knommu/page_offset.h                  |    1 
 include/asm-m68knommu/param.h                        |    1 
 include/asm-m68knommu/pgtable.h                      |    1 
 include/asm-m68knommu/processor.h                    |    1 
 include/asm-m68knommu/semaphore-helper.h             |    1 
 include/asm-m68knommu/system.h                       |    1 
 include/asm-m68knommu/unaligned.h                    |    1 
 include/asm-mips/a.out.h                             |    1 
 include/asm-mips/addrspace.h                         |    1 
 include/asm-mips/arc/types.h                         |    1 
 include/asm-mips/asm.h                               |    1 
 include/asm-mips/asmmacro.h                          |    1 
 include/asm-mips/atomic.h                            |    1 
 include/asm-mips/bcache.h                            |    1 
 include/asm-mips/bitops.h                            |    1 
 include/asm-mips/bug.h                               |    1 
 include/asm-mips/bugs.h                              |    1 
 include/asm-mips/byteorder.h                         |    1 
 include/asm-mips/cache.h                             |    1 
 include/asm-mips/checksum.h                          |    1 
 include/asm-mips/cpu-features.h                      |    1 
 include/asm-mips/cpu-info.h                          |    1 
 include/asm-mips/ddb5xxx/ddb5477.h                   |    1 
 include/asm-mips/ddb5xxx/ddb5xxx.h                   |    1 
 include/asm-mips/debug.h                             |    1 
 include/asm-mips/dec/prom.h                          |    1 
 include/asm-mips/delay.h                             |    1 
 include/asm-mips/dma.h                               |    1 
 include/asm-mips/elf.h                               |    1 
 include/asm-mips/fcntl.h                             |    1 
 include/asm-mips/fixmap.h                            |    1 
 include/asm-mips/fpu.h                               |    1 
 include/asm-mips/futex.h                             |    1 
 include/asm-mips/hazards.h                           |    1 
 include/asm-mips/highmem.h                           |    1 
 include/asm-mips/interrupt.h                         |    1 
 include/asm-mips/io.h                                |    1 
 include/asm-mips/ip32/machine.h                      |    1 
 include/asm-mips/irq.h                               |    1 
 include/asm-mips/isadep.h                            |    1 
 include/asm-mips/jmr3927/irq.h                       |    1 
 include/asm-mips/kmap_types.h                        |    1 
 include/asm-mips/local.h                             |    1 
 include/asm-mips/mach-au1x00/au1000.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx_dbdma.h          |    1 
 include/asm-mips/mach-au1x00/au1xxx_ide.h            |    1 
 include/asm-mips/mach-au1x00/au1xxx_psc.h            |    1 
 include/asm-mips/mach-au1x00/ioremap.h               |    1 
 include/asm-mips/mach-cobalt/cpu-feature-overrides.h |    1 
 include/asm-mips/mach-db1x00/db1x00.h                |    1 
 include/asm-mips/mach-generic/ide.h                  |    1 
 include/asm-mips/mach-generic/kmalloc.h              |    1 
 include/asm-mips/mach-generic/spaces.h               |    1 
 include/asm-mips/mach-ip22/spaces.h                  |    1 
 include/asm-mips/mach-ip32/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-ip32/kmalloc.h                 |    1 
 include/asm-mips/mach-mips/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-mips/irq.h                     |    1 
 include/asm-mips/mach-pb1x00/pb1550.h                |    1 
 include/asm-mips/mach-sim/cpu-feature-overrides.h    |    1 
 include/asm-mips/mips-boards/generic.h               |    1 
 include/asm-mips/mipsregs.h                          |    1 
 include/asm-mips/mmu_context.h                       |    1 
 include/asm-mips/mmzone.h                            |    1 
 include/asm-mips/module.h                            |    1 
 include/asm-mips/msgbuf.h                            |    1 
 include/asm-mips/paccess.h                           |    1 
 include/asm-mips/page.h                              |    1 
 include/asm-mips/pci.h                               |    1 
 include/asm-mips/pgalloc.h                           |    1 
 include/asm-mips/pgtable-32.h                        |    1 
 include/asm-mips/pgtable-64.h                        |    1 
 include/asm-mips/pgtable-bits.h                      |    1 
 include/asm-mips/pgtable.h                           |    1 
 include/asm-mips/prefetch.h                          |    1 
 include/asm-mips/processor.h                         |    1 
 include/asm-mips/ptrace.h                            |    1 
 include/asm-mips/reg.h                               |    1 
 include/asm-mips/resource.h                          |    1 
 include/asm-mips/serial.h                            |    1 
 include/asm-mips/sgiarcs.h                           |    1 
 include/asm-mips/sibyte/board.h                      |    1 
 include/asm-mips/sibyte/carmel.h                     |    1 
 include/asm-mips/sibyte/sentosa.h                    |    1 
 include/asm-mips/sibyte/swarm.h                      |    1 
 include/asm-mips/siginfo.h                           |    1 
 include/asm-mips/signal.h                            |    1 
 include/asm-mips/sim.h                               |    1 
 include/asm-mips/smp.h                               |    1 
 include/asm-mips/sn/addrs.h                          |    1 
 include/asm-mips/sn/agent.h                          |    1 
 include/asm-mips/sn/arch.h                           |    1 
 include/asm-mips/sn/io.h                             |    1 
 include/asm-mips/sn/klconfig.h                       |    1 
 include/asm-mips/sn/kldir.h                          |    1 
 include/asm-mips/sn/launch.h                         |    1 
 include/asm-mips/sn/mapped_kernel.h                  |    1 
 include/asm-mips/sn/sn0/addrs.h                      |    1 
 include/asm-mips/sn/sn0/arch.h                       |    1 
 include/asm-mips/sn/sn0/hubmd.h                      |    1 
 include/asm-mips/stackframe.h                        |    1 
 include/asm-mips/string.h                            |    1 
 include/asm-mips/system.h                            |    1 
 include/asm-mips/thread_info.h                       |    1 
 include/asm-mips/tlbflush.h                          |    1 
 include/asm-mips/tx4927/toshiba_rbtx4927.h           |    1 
 include/asm-mips/types.h                             |    1 
 include/asm-mips/uaccess.h                           |    1 
 include/asm-mips/unistd.h                            |    1 
 include/asm-mips/vr41xx/vrc4173.h                    |    1 
 include/asm-mips/war.h                               |    1 
 include/asm-mips/wbflush.h                           |    1 
 include/asm-parisc/atomic.h                          |    1 
 include/asm-parisc/cache.h                           |    1 
 include/asm-parisc/cacheflush.h                      |    1 
 include/asm-parisc/dma-mapping.h                     |    1 
 include/asm-parisc/dma.h                             |    1 
 include/asm-parisc/io.h                              |    1 
 include/asm-parisc/irq.h                             |    1 
 include/asm-parisc/kmap_types.h                      |    1 
 include/asm-parisc/page.h                            |    1 
 include/asm-parisc/param.h                           |    1 
 include/asm-parisc/pci.h                             |    1 
 include/asm-parisc/pdc.h                             |    1 
 include/asm-parisc/pgtable.h                         |    1 
 include/asm-parisc/processor.h                       |    1 
 include/asm-parisc/psw.h                             |    1 
 include/asm-parisc/smp.h                             |    1 
 include/asm-parisc/system.h                          |    1 
 include/asm-parisc/tlbflush.h                        |    1 
 include/asm-powerpc/abs_addr.h                       |    1 
 include/asm-powerpc/cache.h                          |    1 
 include/asm-powerpc/dma-mapping.h                    |    1 
 include/asm-powerpc/dma.h                            |    1 
 include/asm-powerpc/eeh.h                            |    1 
 include/asm-powerpc/elf.h                            |    7 
 include/asm-powerpc/floppy.h                         |    1 
 include/asm-powerpc/hw_irq.h                         |    1 
 include/asm-powerpc/ide.h                            |    1 
 include/asm-powerpc/iommu.h                          |    1 
 include/asm-powerpc/irq.h                            |    1 
 include/asm-powerpc/iseries/iseries_io.h             |    1 
 include/asm-powerpc/machdep.h                        |    1 
 include/asm-powerpc/mmzone.h                         |    1 
 include/asm-powerpc/paca.h                           |    1 
 include/asm-powerpc/page.h                           |    1 
 include/asm-powerpc/pgtable.h                        |    1 
 include/asm-powerpc/ppc_asm.h                        |    1 
 include/asm-powerpc/prom.h                           |    1 
 include/asm-powerpc/smp.h                            |    1 
 include/asm-powerpc/smu.h                            |    1 
 include/asm-powerpc/spu.h                            |    1 
 include/asm-powerpc/thread_info.h                    |    1 
 include/asm-powerpc/time.h                           |    1 
 include/asm-powerpc/timex.h                          |    1 
 include/asm-powerpc/tlb.h                            |    1 
 include/asm-powerpc/tlbflush.h                       |    1 
 include/asm-powerpc/topology.h                       |    1 
 include/asm-powerpc/types.h                          |    1 
 include/asm-powerpc/unistd.h                         |    1 
 include/asm-powerpc/vga.h                            |    1 
 include/asm-powerpc/vio.h                            |    1 
 include/asm-ppc/amigahw.h                            |    1 
 include/asm-ppc/bootinfo.h                           |    1 
 include/asm-ppc/commproc.h                           |    1 
 include/asm-ppc/ibm403.h                             |    1 
 include/asm-ppc/ibm44x.h                             |    1 
 include/asm-ppc/ibm4xx.h                             |    1 
 include/asm-ppc/io.h                                 |    1 
 include/asm-ppc/machdep.h                            |    1 
 include/asm-ppc/mmu.h                                |    1 
 include/asm-ppc/mmu_context.h                        |    1 
 include/asm-ppc/mpc8260.h                            |    1 
 include/asm-ppc/mpc83xx.h                            |    1 
 include/asm-ppc/mpc85xx.h                            |    1 
 include/asm-ppc/mpc8xx.h                             |    1 
 include/asm-ppc/mv64x60.h                            |    1 
 include/asm-ppc/ocp.h                                |    1 
 include/asm-ppc/open_pic.h                           |    1 
 include/asm-ppc/page.h                               |    2 
 include/asm-ppc/pc_serial.h                          |    1 
 include/asm-ppc/pgalloc.h                            |    1 
 include/asm-ppc/pgtable.h                            |    1 
 include/asm-ppc/ppc4xx_dma.h                         |    1 
 include/asm-ppc/ppc4xx_pic.h                         |    1 
 include/asm-ppc/serial.h                             |    1 
 include/asm-ppc/smp.h                                |    1 
 include/asm-ppc/time.h                               |    1 
 include/asm-s390/bitops.h                            |    1 
 include/asm-s390/debug.h                             |    1 
 include/asm-s390/hardirq.h                           |    1 
 include/asm-s390/idals.h                             |    1 
 include/asm-s390/local.h                             |    1 
 include/asm-s390/lowcore.h                           |    1 
 include/asm-s390/page.h                              |    6 
 include/asm-s390/pgalloc.h                           |    1 
 include/asm-s390/sfp-machine.h                       |    1 
 include/asm-s390/smp.h                               |    1 
 include/asm-s390/system.h                            |    1 
 include/asm-s390/tlbflush.h                          |    1 
 include/asm-s390/types.h                             |    1 
 include/asm-s390/unistd.h                            |    1 
 include/asm-sh/bug.h                                 |    1 
 include/asm-sh/checksum.h                            |    1 
 include/asm-sh/dma-mapping.h                         |    1 
 include/asm-sh/dma.h                                 |    1 
 include/asm-sh/fixmap.h                              |    1 
 include/asm-sh/hardirq.h                             |    1 
 include/asm-sh/hd64461/hd64461.h                     |    1 
 include/asm-sh/hd64465/hd64465.h                     |    1 
 include/asm-sh/ide.h                                 |    1 
 include/asm-sh/io.h                                  |    1 
 include/asm-sh/irq.h                                 |    1 
 include/asm-sh/keyboard.h                            |    1 
 include/asm-sh/kmap_types.h                          |    1 
 include/asm-sh/machvec.h                             |    1 
 include/asm-sh/machvec_init.h                        |    1 
 include/asm-sh/mpc1211/dma.h                         |    1 
 include/asm-sh/overdrive/overdrive.h                 |    1 
 include/asm-sh/page.h                                |    1 
 include/asm-sh/pgtable.h                             |    1 
 include/asm-sh/serial.h                              |    1 
 include/asm-sh/smp.h                                 |    1 
 include/asm-sh/system.h                              |    1 
 include/asm-sh/types.h                               |    1 
 include/asm-sh/watchdog.h                            |    1 
 include/asm-sh64/bug.h                               |    1 
 include/asm-sh64/dma-mapping.h                       |    1 
 include/asm-sh64/hardirq.h                           |    1 
 include/asm-sh64/ide.h                               |    1 
 include/asm-sh64/irq.h                               |    1 
 include/asm-sh64/mmu_context.h                       |    1 
 include/asm-sh64/page.h                              |    1 
 include/asm-sh64/param.h                             |    1 
 include/asm-sh64/pgtable.h                           |    1 
 include/asm-sh64/system.h                            |    1 
 include/asm-sparc/asmmacro.h                         |    1 
 include/asm-sparc/atomic.h                           |    1 
 include/asm-sparc/bugs.h                             |    1 
 include/asm-sparc/cacheflush.h                       |    1 
 include/asm-sparc/delay.h                            |    1 
 include/asm-sparc/dma-mapping.h                      |    1 
 include/asm-sparc/dma.h                              |    1 
 include/asm-sparc/elf.h                              |    1 
 include/asm-sparc/fixmap.h                           |    1 
 include/asm-sparc/hardirq.h                          |    1 
 include/asm-sparc/ide.h                              |    1 
 include/asm-sparc/irq.h                              |    1 
 include/asm-sparc/mostek.h                           |    1 
 include/asm-sparc/page.h                             |    1 
 include/asm-sparc/pgalloc.h                          |    1 
 include/asm-sparc/pgtable.h                          |    1 
 include/asm-sparc/sfp-machine.h                      |    1 
 include/asm-sparc/smp.h                              |    1 
 include/asm-sparc/system.h                           |    2 
 include/asm-sparc/timer.h                            |    1 
 include/asm-sparc/tlbflush.h                         |    1 
 include/asm-sparc/vac-ops.h                          |    1 
 include/asm-sparc/winmacro.h                         |    1 
 include/asm-sparc64/atomic.h                         |    1 
 include/asm-sparc64/bitops.h                         |    1 
 include/asm-sparc64/bugs.h                           |    1 
 include/asm-sparc64/cacheflush.h                     |    1 
 include/asm-sparc64/delay.h                          |    1 
 include/asm-sparc64/dma-mapping.h                    |    1 
 include/asm-sparc64/dma.h                            |    1 
 include/asm-sparc64/floppy.h                         |    1 
 include/asm-sparc64/ide.h                            |    1 
 include/asm-sparc64/irq.h                            |    1 
 include/asm-sparc64/kprobes.h                        |    1 
 include/asm-sparc64/mc146818rtc.h                    |    1 
 include/asm-sparc64/mmu.h                            |    1 
 include/asm-sparc64/oplib.h                          |    1 
 include/asm-sparc64/page.h                           |    1 
 include/asm-sparc64/param.h                          |    1 
 include/asm-sparc64/pgalloc.h                        |    1 
 include/asm-sparc64/pgtable.h                        |    1 
 include/asm-sparc64/processor.h                      |    1 
 include/asm-sparc64/siginfo.h                        |    1 
 include/asm-sparc64/signal.h                         |    1 
 include/asm-sparc64/smp.h                            |    1 
 include/asm-sparc64/spinlock.h                       |    1 
 include/asm-sparc64/system.h                         |    1 
 include/asm-sparc64/timer.h                          |    1 
 include/asm-sparc64/tlb.h                            |    1 
 include/asm-sparc64/tlbflush.h                       |    1 
 include/asm-sparc64/ttable.h                         |    1 
 include/asm-um/a.out.h                               |    1 
 include/asm-um/cache.h                               |    1 
 include/asm-um/elf-ppc.h                             |    1 
 include/asm-um/fixmap.h                              |    1 
 include/asm-um/hardirq.h                             |    1 
 include/asm-um/linkage.h                             |    1 
 include/asm-um/mmu_context.h                         |    1 
 include/asm-um/page.h                                |    1 
 include/asm-um/pgalloc.h                             |    1 
 include/asm-um/processor-generic.h                   |    1 
 include/asm-um/ptrace-generic.h                      |    1 
 include/asm-um/smp.h                                 |    1 
 include/asm-um/thread_info.h                         |    1 
 include/asm-v850/atomic.h                            |    1 
 include/asm-v850/bitops.h                            |    1 
 include/asm-v850/dma-mapping.h                       |    1 
 include/asm-v850/hardirq.h                           |    1 
 include/asm-v850/machdep.h                           |    1 
 include/asm-v850/pgtable.h                           |    1 
 include/asm-v850/processor.h                         |    1 
 include/asm-v850/serial.h                            |    1 
 include/asm-v850/v850e_uart.h                        |    1 
 include/asm-x86_64/apic.h                            |    1 
 include/asm-x86_64/atomic.h                          |    1 
 include/asm-x86_64/bitops.h                          |    1 
 include/asm-x86_64/bugs.h                            |    1 
 include/asm-x86_64/cache.h                           |    1 
 include/asm-x86_64/calling.h                         |    1 
 include/asm-x86_64/dma-mapping.h                     |    1 
 include/asm-x86_64/dma.h                             |    1 
 include/asm-x86_64/dwarf2.h                          |    1 
 include/asm-x86_64/fixmap.h                          |    1 
 include/asm-x86_64/hardirq.h                         |    1 
 include/asm-x86_64/hw_irq.h                          |    1 
 include/asm-x86_64/ia32.h                            |    1 
 include/asm-x86_64/io.h                              |    1 
 include/asm-x86_64/io_apic.h                         |    1 
 include/asm-x86_64/mmu_context.h                     |    1 
 include/asm-x86_64/mmzone.h                          |    1 
 include/asm-x86_64/mtrr.h                            |    1 
 include/asm-x86_64/param.h                           |    1 
 include/asm-x86_64/pci.h                             |    1 
 include/asm-x86_64/processor.h                       |    1 
 include/asm-x86_64/serial.h                          |    1 
 include/asm-x86_64/smp.h                             |    1 
 include/asm-x86_64/spinlock.h                        |    1 
 include/asm-x86_64/swiotlb.h                         |    1 
 include/asm-x86_64/system.h                          |    1 
 include/asm-x86_64/tlbflush.h                        |    1 
 include/asm-x86_64/topology.h                        |    1 
 include/asm-x86_64/uaccess.h                         |    1 
 include/asm-xtensa/atomic.h                          |    1 
 include/asm-xtensa/checksum.h                        |    1 
 include/asm-xtensa/delay.h                           |    1 
 include/asm-xtensa/dma.h                             |    1 
 include/asm-xtensa/hardirq.h                         |    1 
 include/asm-xtensa/ide.h                             |    1 
 include/asm-xtensa/io.h                              |    1 
 include/asm-xtensa/irq.h                             |    1 
 include/asm-xtensa/mmu_context.h                     |    1 
 include/asm-xtensa/page.h                            |    1 
 include/asm-xtensa/pgalloc.h                         |    1 
 include/asm-xtensa/platform.h                        |    1 
 include/asm-xtensa/system.h                          |    1 
 include/linux/acct.h                                 |    3 
 include/linux/acpi.h                                 |    1 
 include/linux/agpgart.h                              |    3 
 include/linux/amba/clcd.h                            |    1 
 include/linux/atmdev.h                               |    1 
 include/linux/audit.h                                |    4 
 include/linux/blkdev.h                               |    1 
 include/linux/blkpg.h                                |    1 
 include/linux/blktrace_api.h                         |    1 
 include/linux/blockgroup_lock.h                      |    1 
 include/linux/cache.h                                |    1 
 include/linux/coda.h                                 |    1 
 include/linux/compat.h                               |    1 
 include/linux/cpufreq.h                              |    1 
 include/linux/crypto.h                               |    1 
 include/linux/cyclomx.h                              |    1 
 include/linux/dcookies.h                             |    1 
 include/linux/devfs_fs_kernel.h                      |    1 
 include/linux/device.h                               |    1 
 include/linux/dmi.h                                  |    1 
 include/linux/dnotify.h                              |    1 
 include/linux/elf.h                                  |   59 ------
 include/linux/errqueue.h                             |    1 
 include/linux/ethtool.h                              |  169 +++++++++----------
 include/linux/ext2_fs.h                              |    2 
 include/linux/ext3_fs.h                              |    7 
 include/linux/fs.h                                   |    1 
 include/linux/ftape.h                                |    1 
 include/linux/gameport.h                             |    6 
 include/linux/generic_serial.h                       |    6 
 include/linux/genhd.h                                |   12 -
 include/linux/gfp.h                                  |    1 
 include/linux/hardirq.h                              |    1 
 include/linux/highmem.h                              |    1 
 include/linux/highuid.h                              |    1 
 include/linux/i2c-algo-ite.h                         |    7 
 include/linux/i2c.h                                  |    9 -
 include/linux/ide.h                                  |    1 
 include/linux/if_frad.h                              |    1 
 include/linux/if_tr.h                                |    1 
 include/linux/init.h                                 |    1 
 include/linux/inotify.h                              |    1 
 include/linux/interrupt.h                            |    1 
 include/linux/ipmi.h                                 |    2 
 include/linux/ipv6.h                                 |    1 
 include/linux/irq.h                                  |    1 
 include/linux/irq_cpustat.h                          |    1 
 include/linux/isapnp.h                               |    1 
 include/linux/isdn.h                                 |    1 
 include/linux/isdn/tpam.h                            |    1 
 include/linux/isdn_ppp.h                             |    1 
 include/linux/isdnif.h                               |    1 
 include/linux/kallsyms.h                             |    1 
 include/linux/kernel_stat.h                          |    1 
 include/linux/kmod.h                                 |    1 
 include/linux/kprobes.h                              |    1 
 include/linux/linkage.h                              |    1 
 include/linux/lockd/lockd.h                          |    1 
 include/linux/lockd/nlm.h                            |    1 
 include/linux/mempolicy.h                            |    1 
 include/linux/migrate.h                              |    1 
 include/linux/mii.h                                  |   30 +--
 include/linux/mm.h                                   |    1 
 include/linux/mman.h                                 |   12 -
 include/linux/mmzone.h                               |    1 
 include/linux/module.h                               |    1 
 include/linux/msg.h                                  |    2 
 include/linux/mtd/cfi.h                              |    1 
 include/linux/mtd/map.h                              |    1 
 include/linux/mtd/mtd.h                              |    1 
 include/linux/mtd/nand.h                             |    1 
 include/linux/mtd/physmap.h                          |    1 
 include/linux/mtd/xip.h                              |    1 
 include/linux/ncp_fs.h                               |    5 
 include/linux/net.h                                  |    3 
 include/linux/netdevice.h                            |    1 
 include/linux/netfilter.h                            |    1 
 include/linux/netfilter_arp.h                        |    1 
 include/linux/netfilter_bridge.h                     |    1 
 include/linux/netfilter_ipv4.h                       |    1 
 include/linux/netfilter_ipv4/ip_conntrack.h          |    1 
 include/linux/netfilter_ipv4/listhelp.h              |    1 
 include/linux/nfs.h                                  |    8 
 include/linux/nfs4.h                                 |    6 
 include/linux/nfs_fs.h                               |   39 ++--
 include/linux/nfsd/nfsd.h                            |    1 
 include/linux/nfsd/nfsfh.h                           |    1 
 include/linux/nfsd/syscall.h                         |    1 
 include/linux/numa.h                                 |    1 
 include/linux/parport.h                              |    1 
 include/linux/pci.h                                  |    1 
 include/linux/percpu_counter.h                       |    1 
 include/linux/pm.h                                   |    1 
 include/linux/pm_legacy.h                            |    1 
 include/linux/pmu.h                                  |    1 
 include/linux/preempt.h                              |    1 
 include/linux/proc_fs.h                              |    1 
 include/linux/profile.h                              |    1 
 include/linux/quota.h                                |    4 
 include/linux/quotaops.h                             |    1 
 include/linux/reiserfs_xattr.h                       |    3 
 include/linux/relay.h                                |    1 
 include/linux/rio.h                                  |    1 
 include/linux/rio_drv.h                              |    1 
 include/linux/rmap.h                                 |    1 
 include/linux/rtnetlink.h                            |    1 
 include/linux/rwsem.h                                |    1 
 include/linux/scc.h                                  |    1 
 include/linux/sched.h                                |   94 +++++-----
 include/linux/seccomp.h                              |    1 
 include/linux/sem.h                                  |    2 
 include/linux/seqlock.h                              |    1 
 include/linux/serialP.h                              |    1 
 include/linux/serial_core.h                          |    1 
 include/linux/signal.h                               |    4 
 include/linux/skbuff.h                               |    1 
 include/linux/slab.h                                 |    1 
 include/linux/smb_fs.h                               |    4 
 include/linux/smp.h                                  |    1 
 include/linux/smp_lock.h                             |    1 
 include/linux/socket.h                               |    2 
 include/linux/spinlock.h                             |    1 
 include/linux/stop_machine.h                         |    1 
 include/linux/sunrpc/auth.h                          |    1 
 include/linux/sunrpc/debug.h                         |   24 +-
 include/linux/sunrpc/stats.h                         |    1 
 include/linux/suspend.h                              |    1 
 include/linux/swap.h                                 |    1 
 include/linux/syscalls.h                             |    1 
 include/linux/sysrq.h                                |    1 
 include/linux/tcp.h                                  |    1 
 include/linux/threads.h                              |    1 
 include/linux/timer.h                                |    1 
 include/linux/timex.h                                |    1 
 include/linux/tty.h                                  |    1 
 include/linux/types.h                                |    1 
 include/linux/udp.h                                  |    1 
 include/linux/usb.h                                  |    1 
 include/linux/usb_usual.h                            |    1 
 include/linux/usbdevice_fs.h                         |    2 
 include/linux/vt_buffer.h                            |    1 
 include/linux/vt_kern.h                              |    1 
 include/linux/wait.h                                 |    1 
 include/linux/wanrouter.h                            |    4 
 include/mtd/mtd-abi.h                                |    5 
 include/net/addrconf.h                               |    1 
 include/net/af_unix.h                                |    1 
 include/net/ax25.h                                   |    1 
 include/net/compat.h                                 |    1 
 include/net/dst.h                                    |    1 
 include/net/icmp.h                                   |    1 
 include/net/inet6_hashtables.h                       |    1 
 include/net/inet_hashtables.h                        |    1 
 include/net/inet_sock.h                              |    1 
 include/net/inet_timewait_sock.h                     |    1 
 include/net/ip.h                                     |    1 
 include/net/ip_fib.h                                 |    1 
 include/net/ip_mp_alg.h                              |    1 
 include/net/ip_vs.h                                  |    1 
 include/net/ipv6.h                                   |    1 
 include/net/irda/irda.h                              |    1 
 include/net/irda/irda_device.h                       |    1 
 include/net/irda/irlap.h                             |    1 
 include/net/irda/irlmp.h                             |    1 
 include/net/irda/irlmp_frame.h                       |    1 
 include/net/irda/qos.h                               |    1 
 include/net/ndisc.h                                  |    1 
 include/net/netfilter/nf_conntrack.h                 |    1 
 include/net/pkt_act.h                                |    1 
 include/net/protocol.h                               |    1 
 include/net/raw.h                                    |    1 
 include/net/red.h                                    |    1 
 include/net/route.h                                  |    1 
 include/net/sch_generic.h                            |    1 
 include/net/sctp/sctp.h                              |    1 
 include/net/sock.h                                   |    1 
 include/net/tcp.h                                    |    1 
 include/pcmcia/ss.h                                  |    1 
 include/scsi/scsi_transport_fc.h                     |    1 
 include/scsi/scsi_transport_spi.h                    |    1 
 include/sound/driver.h                               |    1 
 include/video/edid.h                                 |    1 
 include/video/vga.h                                  |    1 
 869 files changed, 312 insertions(+), 1143 deletions(-)

Index: linux-2.6-header-cleanup-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-cleanup-git.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-header-cleanup-git.patch	27 Apr 2006 16:00:17 -0000	1.6
+++ linux-2.6-header-cleanup-git.patch	27 Apr 2006 16:21:54 -0000	1.7
@@ -10246,7 +10246,6 @@
  #endif
 +
 +#endif /* __ASM_GENERIC_SIGNAL_H */
-only in patch2:
 unchanged:
 --- a/include/linux/blkpg.h
 +++ b/include/linux/blkpg.h
@@ -10258,3 +10257,402 @@
  #include <linux/ioctl.h>
  
  #define BLKPG      _IO(0x12,105)
+only in patch2:
+unchanged:
+--- a/include/linux/ethtool.h
++++ b/include/linux/ethtool.h
+@@ -15,24 +15,24 @@ #define _LINUX_ETHTOOL_H
+ 
+ /* This should work for both 32 and 64 bit userland. */
+ struct ethtool_cmd {
+-	u32	cmd;
+-	u32	supported;	/* Features this interface supports */
+-	u32	advertising;	/* Features this interface advertises */
+-	u16	speed;		/* The forced speed, 10Mb, 100Mb, gigabit */
+-	u8	duplex;		/* Duplex, half or full */
+-	u8	port;		/* Which connector port */
+-	u8	phy_address;
+-	u8	transceiver;	/* Which transceiver to use */
+-	u8	autoneg;	/* Enable or disable autonegotiation */
+-	u32	maxtxpkt;	/* Tx pkts before generating tx int */
+-	u32	maxrxpkt;	/* Rx pkts before generating rx int */
+-	u32	reserved[4];
++	__u32	cmd;
++	__u32	supported;	/* Features this interface supports */
++	__u32	advertising;	/* Features this interface advertises */
++	__u16	speed;		/* The forced speed, 10Mb, 100Mb, gigabit */
++	__u8	duplex;		/* Duplex, half or full */
++	__u8	port;		/* Which connector port */
++	__u8	phy_address;
++	__u8	transceiver;	/* Which transceiver to use */
++	__u8	autoneg;	/* Enable or disable autonegotiation */
++	__u32	maxtxpkt;	/* Tx pkts before generating tx int */
++	__u32	maxrxpkt;	/* Rx pkts before generating rx int */
++	__u32	reserved[4];
+ };
+ 
+ #define ETHTOOL_BUSINFO_LEN	32
+ /* these strings are set to whatever the driver author decides... */
+ struct ethtool_drvinfo {
+-	u32	cmd;
++	__u32	cmd;
+ 	char	driver[32];	/* driver short name, "tulip", "eepro100" */
+ 	char	version[32];	/* driver version string */
+ 	char	fw_version[32];	/* firmware version string, if applicable */
+@@ -40,53 +40,53 @@ struct ethtool_drvinfo {
+ 				/* For PCI devices, use pci_name(pci_dev). */
+ 	char	reserved1[32];
+ 	char	reserved2[16];
+-	u32	n_stats;	/* number of u64's from ETHTOOL_GSTATS */
+-	u32	testinfo_len;
+-	u32	eedump_len;	/* Size of data from ETHTOOL_GEEPROM (bytes) */
+-	u32	regdump_len;	/* Size of data from ETHTOOL_GREGS (bytes) */
++	__u32	n_stats;	/* number of u64's from ETHTOOL_GSTATS */
++	__u32	testinfo_len;
++	__u32	eedump_len;	/* Size of data from ETHTOOL_GEEPROM (bytes) */
++	__u32	regdump_len;	/* Size of data from ETHTOOL_GREGS (bytes) */
+ };
+ 
+ #define SOPASS_MAX	6
+ /* wake-on-lan settings */
+ struct ethtool_wolinfo {
+-	u32	cmd;
+-	u32	supported;
+-	u32	wolopts;
+-	u8	sopass[SOPASS_MAX]; /* SecureOn(tm) password */
++	__u32	cmd;
++	__u32	supported;
++	__u32	wolopts;
++	__u8	sopass[SOPASS_MAX]; /* SecureOn(tm) password */
+ };
+ 
+ /* for passing single values */
+ struct ethtool_value {
+-	u32	cmd;
+-	u32	data;
++	__u32	cmd;
++	__u32	data;
+ };
+ 
+ /* for passing big chunks of data */
+ struct ethtool_regs {
+-	u32	cmd;
+-	u32	version; /* driver-specific, indicates different chips/revs */
+-	u32	len; /* bytes */
+-	u8	data[0];
++	__u32	cmd;
++	__u32	version; /* driver-specific, indicates different chips/revs */
++	__u32	len; /* bytes */
++	__u8	data[0];
+ };
+ 
+ /* for passing EEPROM chunks */
+ struct ethtool_eeprom {
+-	u32	cmd;
+-	u32	magic;
+-	u32	offset; /* in bytes */
+-	u32	len; /* in bytes */
+-	u8	data[0];
++	__u32	cmd;
++	__u32	magic;
++	__u32	offset; /* in bytes */
++	__u32	len; /* in bytes */
++	__u8	data[0];
+ };
+ 
+ /* for configuring coalescing parameters of chip */
+ struct ethtool_coalesce {
+-	u32	cmd;	/* ETHTOOL_{G,S}COALESCE */
++	__u32	cmd;	/* ETHTOOL_{G,S}COALESCE */
+ 
+ 	/* How many usecs to delay an RX interrupt after
+ 	 * a packet arrives.  If 0, only rx_max_coalesced_frames
+ 	 * is used.
+ 	 */
+-	u32	rx_coalesce_usecs;
++	__u32	rx_coalesce_usecs;
+ 
+ 	/* How many packets to delay an RX interrupt after
+ 	 * a packet arrives.  If 0, only rx_coalesce_usecs is
+@@ -94,21 +94,21 @@ struct ethtool_coalesce {
+ 	 * to zero as this would cause RX interrupts to never be
+ 	 * generated.
+ 	 */
+-	u32	rx_max_coalesced_frames;
++	__u32	rx_max_coalesced_frames;
+ 
+ 	/* Same as above two parameters, except that these values
+ 	 * apply while an IRQ is being serviced by the host.  Not
+ 	 * all cards support this feature and the values are ignored
+ 	 * in that case.
+ 	 */
+-	u32	rx_coalesce_usecs_irq;
+-	u32	rx_max_coalesced_frames_irq;
++	__u32	rx_coalesce_usecs_irq;
++	__u32	rx_max_coalesced_frames_irq;
+ 
+ 	/* How many usecs to delay a TX interrupt after
+ 	 * a packet is sent.  If 0, only tx_max_coalesced_frames
+ 	 * is used.
+ 	 */
+-	u32	tx_coalesce_usecs;
++	__u32	tx_coalesce_usecs;
+ 
+ 	/* How many packets to delay a TX interrupt after
+ 	 * a packet is sent.  If 0, only tx_coalesce_usecs is
+@@ -116,22 +116,22 @@ struct ethtool_coalesce {
+ 	 * to zero as this would cause TX interrupts to never be
+ 	 * generated.
+ 	 */
+-	u32	tx_max_coalesced_frames;
++	__u32	tx_max_coalesced_frames;
+ 
+ 	/* Same as above two parameters, except that these values
+ 	 * apply while an IRQ is being serviced by the host.  Not
+ 	 * all cards support this feature and the values are ignored
+ 	 * in that case.
+ 	 */
+-	u32	tx_coalesce_usecs_irq;
+-	u32	tx_max_coalesced_frames_irq;
++	__u32	tx_coalesce_usecs_irq;
++	__u32	tx_max_coalesced_frames_irq;
+ 
+ 	/* How many usecs to delay in-memory statistics
+ 	 * block updates.  Some drivers do not have an in-memory
+ 	 * statistic block, and in such cases this value is ignored.
+ 	 * This value must not be zero.
+ 	 */
+-	u32	stats_block_coalesce_usecs;
++	__u32	stats_block_coalesce_usecs;
+ 
+ 	/* Adaptive RX/TX coalescing is an algorithm implemented by
+ 	 * some drivers to improve latency under low packet rates and
+@@ -140,18 +140,18 @@ struct ethtool_coalesce {
+ 	 * not implemented by the driver causes these values to be
+ 	 * silently ignored.
+ 	 */
+-	u32	use_adaptive_rx_coalesce;
+-	u32	use_adaptive_tx_coalesce;
++	__u32	use_adaptive_rx_coalesce;
++	__u32	use_adaptive_tx_coalesce;
+ 
+ 	/* When the packet rate (measured in packets per second)
+ 	 * is below pkt_rate_low, the {rx,tx}_*_low parameters are
+ 	 * used.
+ 	 */
+-	u32	pkt_rate_low;
+-	u32	rx_coalesce_usecs_low;
+-	u32	rx_max_coalesced_frames_low;
+-	u32	tx_coalesce_usecs_low;
+-	u32	tx_max_coalesced_frames_low;
++	__u32	pkt_rate_low;
++	__u32	rx_coalesce_usecs_low;
++	__u32	rx_max_coalesced_frames_low;
++	__u32	tx_coalesce_usecs_low;
++	__u32	tx_max_coalesced_frames_low;
+ 
+ 	/* When the packet rate is below pkt_rate_high but above
+ 	 * pkt_rate_low (both measured in packets per second) the
+@@ -162,43 +162,43 @@ struct ethtool_coalesce {
+ 	 * is above pkt_rate_high, the {rx,tx}_*_high parameters are
+ 	 * used.
+ 	 */
+-	u32	pkt_rate_high;
+-	u32	rx_coalesce_usecs_high;
+-	u32	rx_max_coalesced_frames_high;
+-	u32	tx_coalesce_usecs_high;
+-	u32	tx_max_coalesced_frames_high;
++	__u32	pkt_rate_high;
++	__u32	rx_coalesce_usecs_high;
++	__u32	rx_max_coalesced_frames_high;
++	__u32	tx_coalesce_usecs_high;
++	__u32	tx_max_coalesced_frames_high;
+ 
+ 	/* How often to do adaptive coalescing packet rate sampling,
+ 	 * measured in seconds.  Must not be zero.
+ 	 */
+-	u32	rate_sample_interval;
++	__u32	rate_sample_interval;
+ };
+ 
+ /* for configuring RX/TX ring parameters */
+ struct ethtool_ringparam {
+-	u32	cmd;	/* ETHTOOL_{G,S}RINGPARAM */
++	__u32	cmd;	/* ETHTOOL_{G,S}RINGPARAM */
+ 
+ 	/* Read only attributes.  These indicate the maximum number
+ 	 * of pending RX/TX ring entries the driver will allow the
+ 	 * user to set.
+ 	 */
+-	u32	rx_max_pending;
+-	u32	rx_mini_max_pending;
+-	u32	rx_jumbo_max_pending;
+-	u32	tx_max_pending;
++	__u32	rx_max_pending;
++	__u32	rx_mini_max_pending;
++	__u32	rx_jumbo_max_pending;
++	__u32	tx_max_pending;
+ 
+ 	/* Values changeable by the user.  The valid values are
+ 	 * in the range 1 to the "*_max_pending" counterpart above.
+ 	 */
+-	u32	rx_pending;
+-	u32	rx_mini_pending;
+-	u32	rx_jumbo_pending;
+-	u32	tx_pending;
++	__u32	rx_pending;
++	__u32	rx_mini_pending;
++	__u32	rx_jumbo_pending;
++	__u32	tx_pending;
+ };
+ 
+ /* for configuring link flow control parameters */
+ struct ethtool_pauseparam {
+-	u32	cmd;	/* ETHTOOL_{G,S}PAUSEPARAM */
++	__u32	cmd;	/* ETHTOOL_{G,S}PAUSEPARAM */
+ 
+ 	/* If the link is being auto-negotiated (via ethtool_cmd.autoneg
+ 	 * being true) the user may set 'autonet' here non-zero to have the
+@@ -210,9 +210,9 @@ struct ethtool_pauseparam {
+ 	 * then {rx,tx}_pause force the driver to use/not-use pause
+ 	 * flow control.
+ 	 */
+-	u32	autoneg;
+-	u32	rx_pause;
+-	u32	tx_pause;
++	__u32	autoneg;
++	__u32	rx_pause;
++	__u32	tx_pause;
+ };
+ 
+ #define ETH_GSTRING_LEN		32
+@@ -223,10 +223,10 @@ enum ethtool_stringset {
+ 
+ /* for passing string sets for data tagging */
+ struct ethtool_gstrings {
+-	u32	cmd;		/* ETHTOOL_GSTRINGS */
+-	u32	string_set;	/* string set id e.c. ETH_SS_TEST, etc*/
+-	u32	len;		/* number of strings in the string set */
+-	u8	data[0];
++	__u32	cmd;		/* ETHTOOL_GSTRINGS */
++	__u32	string_set;	/* string set id e.c. ETH_SS_TEST, etc*/
++	__u32	len;		/* number of strings in the string set */
++	__u8	data[0];
+ };
+ 
+ enum ethtool_test_flags {
+@@ -236,26 +236,28 @@ enum ethtool_test_flags {
+ 
+ /* for requesting NIC test and getting results*/
+ struct ethtool_test {
+-	u32	cmd;		/* ETHTOOL_TEST */
+-	u32	flags;		/* ETH_TEST_FL_xxx */
+-	u32	reserved;
+-	u32	len;		/* result length, in number of u64 elements */
+-	u64	data[0];
++	__u32	cmd;		/* ETHTOOL_TEST */
++	__u32	flags;		/* ETH_TEST_FL_xxx */
++	__u32	reserved;
++	__u32	len;		/* result length, in number of u64 elements */
++	__u64	data[0];
+ };
+ 
+ /* for dumping NIC-specific statistics */
+ struct ethtool_stats {
+-	u32	cmd;		/* ETHTOOL_GSTATS */
+-	u32	n_stats;	/* number of u64's being returned */
+-	u64	data[0];
++	__u32	cmd;		/* ETHTOOL_GSTATS */
++	__u32	n_stats;	/* number of u64's being returned */
++	__u64	data[0];
+ };
+ 
+ struct ethtool_perm_addr {
+-	u32	cmd;		/* ETHTOOL_GPERMADDR */
+-	u32	size;
+-	u8	data[0];
++	__u32	cmd;		/* ETHTOOL_GPERMADDR */
++	__u32	size;
++	__u8	data[0];
+ };
+ 
++#ifdef __KERNEL__
++
+ struct net_device;
+ 
+ /* Some generic methods drivers may use in their ethtool_ops */
+@@ -371,6 +373,7 @@ struct ethtool_ops {
+ 	u32     (*get_ufo)(struct net_device *);
+ 	int     (*set_ufo)(struct net_device *, u32);
+ };
++#endif /* __KERNEL__ */
+ 
+ /* CMDs currently supported */
+ #define ETHTOOL_GSET		0x00000001 /* Get settings. */
+only in patch2:
+unchanged:
+--- a/include/linux/mii.h
++++ b/include/linux/mii.h
+@@ -9,7 +9,6 @@ #ifndef __LINUX_MII_H__
+ #define __LINUX_MII_H__
+ 
+ #include <linux/types.h>
+-#include <linux/if.h>
+ 
+ /* Generic MII registers. */
+ 
+@@ -136,6 +135,20 @@ #define LPA_1000REMRXOK         0x1000  
+ #define LPA_1000FULL            0x0800  /* Link partner 1000BASE-T full duplex */
+ #define LPA_1000HALF            0x0400  /* Link partner 1000BASE-T half duplex */
+ 
++/* This structure is used in all SIOCxMIIxxx ioctl calls */
++struct mii_ioctl_data {
++	__u16		phy_id;
++	__u16		reg_num;
++	__u16		val_in;
++	__u16		val_out;
++};
++
++#ifdef __KERNEL__ 
++
++#include <linux/if.h>
++
++struct ethtool_cmd;
++
+ struct mii_if_info {
+ 	int phy_id;
+ 	int advertising;
+@@ -151,9 +164,6 @@ struct mii_if_info {
+ 	void (*mdio_write) (struct net_device *dev, int phy_id, int location, int val);
+ };
+ 
+-struct ethtool_cmd;
+-struct mii_ioctl_data;
+-
+ extern int mii_link_ok (struct mii_if_info *mii);
+ extern int mii_nway_restart (struct mii_if_info *mii);
+ extern int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd);
+@@ -168,16 +178,6 @@ extern int generic_mii_ioctl(struct mii_
+ 			     unsigned int *duplex_changed);
+ 
+ 
+-
+-/* This structure is used in all SIOCxMIIxxx ioctl calls */
+-struct mii_ioctl_data {
+-	u16		phy_id;
+-	u16		reg_num;
+-	u16		val_in;
+-	u16		val_out;
+-};
+-
+-
+ static inline struct mii_ioctl_data *if_mii(struct ifreq *rq)
+ {
+ 	return (struct mii_ioctl_data *) &rq->ifr_ifru;
+@@ -235,5 +235,5 @@ static inline unsigned int mii_duplex (u
+ 	return 0;
+ }
+ 
+-
++#endif /* __KERNEL__ */
+ #endif /* __LINUX_MII_H__ */

linux-2.6-header-install-git.patch:
 Makefile                              |   17 ++++
 include/Kbuild                        |    2 
 include/asm-alpha/Kbuild              |    9 ++
 include/asm-arm/Kbuild                |    7 +
 include/asm-arm26/Kbuild              |    8 ++
 include/asm-cris/Kbuild               |    6 +
 include/asm-cris/arch-v10/Kbuild      |    3 
 include/asm-generic/Kbuild            |    3 
 include/asm-generic/Kbuild.asm        |   11 +++
 include/asm-h8300/Kbuild              |    6 +
 include/asm-i386/Kbuild               |    5 +
 include/asm-ia64/Kbuild               |    7 +
 include/asm-m32r/Kbuild               |    7 +
 include/asm-m68k/Kbuild               |   17 ++++
 include/asm-m68knommu/Kbuild          |   12 +++
 include/asm-mips/Kbuild               |   15 ++++
 include/asm-parisc/Kbuild             |    8 ++
 include/asm-powerpc/Kbuild            |   10 ++
 include/asm-ppc/Kbuild                |    8 ++
 include/asm-s390/Kbuild               |    4 +
 include/asm-sh/Kbuild                 |    6 +
 include/asm-sh64/Kbuild               |    6 +
 include/asm-sparc/Kbuild              |   13 +++
 include/asm-sparc64/Kbuild            |   16 ++++
 include/asm-um/Kbuild                 |   14 +++
 include/asm-v850/Kbuild               |   10 ++
 include/asm-x86_64/Kbuild             |   11 +++
 include/linux/Kbuild                  |   63 +++++++++++++++++
 include/linux/byteorder/Kbuild        |    1 
 include/linux/dvb/Kbuild              |    2 
 include/linux/hdlc/Kbuild             |    1 
 include/linux/isdn/Kbuild             |    1 
 include/linux/netfilter/Kbuild        |   11 +++
 include/linux/netfilter_arp/Kbuild    |    2 
 include/linux/netfilter_bridge/Kbuild |    4 +
 include/linux/netfilter_ipv4/Kbuild   |   21 +++++
 include/linux/netfilter_ipv6/Kbuild   |    5 +
 include/linux/nfsd/Kbuild             |    2 
 include/linux/raid/Kbuild             |    1 
 include/linux/sunrpc/Kbuild           |    1 
 include/linux/tc_act/Kbuild           |    1 
 include/linux/tc_ematch/Kbuild        |    1 
 include/media/Kbuild                  |    2 
 include/mtd/Kbuild                    |    2 
 include/rdma/Kbuild                   |    1 
 include/scsi/Kbuild                   |    2 
 include/sound/Kbuild                  |    2 
 include/video/Kbuild                  |    1 
 scripts/Makefile.headersinst          |  124 ++++++++++++++++++++++++++++++++++
 scripts/hdrcheck.sh                   |    8 ++
 50 files changed, 500 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-header-install-git.patch	27 Apr 2006 12:42:19 -0000	1.5
+++ linux-2.6-header-install-git.patch	27 Apr 2006 16:21:54 -0000	1.6
@@ -11,7 +11,7 @@
 +export INSTALL_HDR_PATH
 +
 +.PHONY: headers_install
-+headers_install: .kernelrelease
++headers_install: include/linux/version.h
 +	@unifdef -Ux /dev/null
 +	@rm -rf $(INSTALL_HDR_PATH)/include
 +	$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include
@@ -449,7 +449,7 @@
 +	resource.h rose.h sctp.h smbno.h snmp.h sockios.h som.h		\
 +	sound.h statfs.h stddef.h synclink.h telephony.h ticable.h	\
 +	times.h tiocl.h tipc.h toshiba.h ultrasound.h un.h unistd.h	\
-+	utime.h utsname.h video_decoder.h		\
++	utime.h utsname.h version.h video_decoder.h			\
 +	video_encoder.h videotext.h vt.h wavefront.h wireless.h		\
 +	xattr.h x25.h zorro_ids.h
 +



From fedora-cvs-commits at redhat.com  Thu Apr 27 16:25:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 12:25:12 -0400
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders.spec, 1.116,
	1.117 sources, 1.29, 1.30
Message-ID: <200604271625.k3RGPCoT023361@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23332

Modified Files:
	glibc-kernheaders.spec sources 
Log Message:
fix mii.h ethtool.h version.h blkpg.h


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- glibc-kernheaders.spec	27 Apr 2006 15:19:30 -0000	1.116
+++ glibc-kernheaders.spec	27 Apr 2006 16:25:09 -0000	1.117
@@ -1,7 +1,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -91,6 +91,9 @@
 
 
 %changelog
+* Thu Apr 27 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-17
+- Fix mii.h, ethtool.h, version.h, blkpg.h
+
 * Thu Apr 27 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-16
 - ...this time with the right tarball so it's actually changed
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	27 Apr 2006 15:19:30 -0000	1.29
+++ sources	27 Apr 2006 16:25:09 -0000	1.30
@@ -1 +1 @@
-42d534768e2515488f20ad3fa565b6af  glibc-kernheaders.tar.bz2
+41ae2c9ba23fc4a3536ffd67f402be10  glibc-kernheaders.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 16:56:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 12:56:49 -0400
Subject: rpms/kernel/devel linux-2.6-header-install-git.patch,1.6,1.7
Message-ID: <200604271656.k3RGungX022162@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22149

Modified Files:
	linux-2.6-header-install-git.patch 
Log Message:
mii.h and ethtool.h are unifdef-y

linux-2.6-header-install-git.patch:
 Makefile                              |   17 ++++
 include/Kbuild                        |    2 
 include/asm-alpha/Kbuild              |    9 ++
 include/asm-arm/Kbuild                |    7 +
 include/asm-arm26/Kbuild              |    8 ++
 include/asm-cris/Kbuild               |    6 +
 include/asm-cris/arch-v10/Kbuild      |    3 
 include/asm-generic/Kbuild            |    3 
 include/asm-generic/Kbuild.asm        |   11 +++
 include/asm-h8300/Kbuild              |    6 +
 include/asm-i386/Kbuild               |    5 +
 include/asm-ia64/Kbuild               |    7 +
 include/asm-m32r/Kbuild               |    7 +
 include/asm-m68k/Kbuild               |   17 ++++
 include/asm-m68knommu/Kbuild          |   12 +++
 include/asm-mips/Kbuild               |   15 ++++
 include/asm-parisc/Kbuild             |    8 ++
 include/asm-powerpc/Kbuild            |   10 ++
 include/asm-ppc/Kbuild                |    8 ++
 include/asm-s390/Kbuild               |    4 +
 include/asm-sh/Kbuild                 |    6 +
 include/asm-sh64/Kbuild               |    6 +
 include/asm-sparc/Kbuild              |   13 +++
 include/asm-sparc64/Kbuild            |   16 ++++
 include/asm-um/Kbuild                 |   14 +++
 include/asm-v850/Kbuild               |   10 ++
 include/asm-x86_64/Kbuild             |   11 +++
 include/linux/Kbuild                  |   62 +++++++++++++++++
 include/linux/byteorder/Kbuild        |    1 
 include/linux/dvb/Kbuild              |    2 
 include/linux/hdlc/Kbuild             |    1 
 include/linux/isdn/Kbuild             |    1 
 include/linux/netfilter/Kbuild        |   11 +++
 include/linux/netfilter_arp/Kbuild    |    2 
 include/linux/netfilter_bridge/Kbuild |    4 +
 include/linux/netfilter_ipv4/Kbuild   |   21 +++++
 include/linux/netfilter_ipv6/Kbuild   |    5 +
 include/linux/nfsd/Kbuild             |    2 
 include/linux/raid/Kbuild             |    1 
 include/linux/sunrpc/Kbuild           |    1 
 include/linux/tc_act/Kbuild           |    1 
 include/linux/tc_ematch/Kbuild        |    1 
 include/media/Kbuild                  |    2 
 include/mtd/Kbuild                    |    2 
 include/rdma/Kbuild                   |    1 
 include/scsi/Kbuild                   |    2 
 include/sound/Kbuild                  |    2 
 include/video/Kbuild                  |    1 
 scripts/Makefile.headersinst          |  124 ++++++++++++++++++++++++++++++++++
 scripts/hdrcheck.sh                   |    8 ++
 50 files changed, 499 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-header-install-git.patch	27 Apr 2006 16:21:54 -0000	1.6
+++ linux-2.6-header-install-git.patch	27 Apr 2006 16:56:45 -0000	1.7
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index a940eae..ca470f5 100644
+index a940eae..8d92d78 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -858,6 +858,21 @@ depend dep:
@@ -155,7 +155,7 @@
 +unifdef-y += mtrr.h vm86.h
 diff --git a/include/asm-ia64/Kbuild b/include/asm-ia64/Kbuild
 new file mode 100644
-index 0000000..070c2e6
+index 0000000..44293be
 --- /dev/null
 +++ b/include/asm-ia64/Kbuild
 @@ -0,0 +1,7 @@
@@ -415,10 +415,10 @@
 +unifdef-y += ia32.h mce.h mtrr.h vsyscall.h
 diff --git a/include/linux/Kbuild b/include/linux/Kbuild
 new file mode 100644
-index 0000000..ad45a99
+index 0000000..4b96235
 --- /dev/null
 +++ b/include/linux/Kbuild
-@@ -0,0 +1,63 @@
+@@ -0,0 +1,62 @@
 +header-y := byteorder/ dvb/ hdlc/ isdn/ nfsd/ raid/ sunrpc/ tc_act/	\
 +	netfilter/ netfilter_arp/ netfilter_bridge/ netfilter_ipv4/	\
 +	netfilter_ipv6/
@@ -429,59 +429,58 @@
 +	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 crc-ccitt.h cycx_cfm.h cycx_x25.h			\
-+	devfs_fs.h dn.h dqblk_v1.h dqblk_v2.h dqblk_xfs.h efs_fs_sb.h	\
-+	elf-fdpic.h elf.h elf-em.h ethtool.h fadvise.h fd.h		\
-+	ftape-header-segment.h ftape-vendors.h fuse.h futex.h		\
-+	genetlink.h gen_stats.h gigaset_dev.h hdsmart.h hpfs_fs.h	\
-+	hysdn_if.h i2c-dev.h i2c-id.h i8k.h icmp.h if_arcnet.h		\
-+	if_arp.h if_bonding.h if_cablemodem.h if_fc.h if_fddi.h if.h	\
-+	if_hippi.h if_infiniband.h if_packet.h if_plip.h if_ppp.h	\
-+	if_slip.h if_strip.h if_tunnel.h in6.h 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 mii.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	\
++	consolemap.h crc-ccitt.h cycx_cfm.h cycx_x25.h devfs_fs.h dn.h	\
++	dqblk_v1.h dqblk_v2.h dqblk_xfs.h efs_fs_sb.h elf-fdpic.h	\
++	elf.h elf-em.h fadvise.h fd.h ftape-header-segment.h		\
++	ftape-vendors.h fuse.h futex.h genetlink.h gen_stats.h		\
++	gigaset_dev.h hdsmart.h hpfs_fs.h hysdn_if.h i2c-dev.h		\
++	i2c-id.h i8k.h icmp.h if_arcnet.h if_arp.h if_bonding.h		\
++	if_cablemodem.h if_fc.h if_fddi.h if.h if_hippi.h		\
++	if_infiniband.h if_packet.h if_plip.h if_ppp.h if_slip.h	\
++	if_strip.h if_tunnel.h in6.h 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 ppp_defs.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 statfs.h stddef.h synclink.h telephony.h ticable.h	\
 +	times.h tiocl.h tipc.h toshiba.h ultrasound.h un.h unistd.h	\
-+	utime.h utsname.h version.h video_decoder.h			\
-+	video_encoder.h videotext.h vt.h wavefront.h wireless.h		\
-+	xattr.h x25.h zorro_ids.h
++	utime.h utsname.h version.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 compiler.h connector.h cramfs_fs.h cuda.h	\
 +	cyclades.h dccp.h dirent.h divert.h elfcore.h errno.h		\
-+	errqueue.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 hdlcdrv.h hdlc.h hdreg.h hiddev.h hpet.h		\
-+	i2c-algo-ite.h i2c.h i2o-dev.h icmpv6.h if_bridge.h if_ec.h	\
-+	if_eql.h if_ether.h if_frad.h if_ltalk.h if_pppox.h		\
++	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 hdlcdrv.h hdlc.h hdreg.h hiddev.h	\
++	hpet.h i2c-algo-ite.h i2c.h i2o-dev.h icmpv6.h if_bridge.h	\
++	if_ec.h if_eql.h if_ether.h if_frad.h if_ltalk.h if_pppox.h	\
 +	if_shaper.h if_tr.h if_tun.h if_vlan.h if_wanpipe.h igmp.h	\
 +	inet_diag.h in.h inotify.h input.h ipc.h ipmi.h ipv6.h		\
 +	ipv6_route.h isdn.h isdnif.h isdn_ppp.h isicom.h jbd.h		\
 +	joystick.h kdev_t.h kd.h kernelcapi.h kernel.h keyboard.h	\
-+	llc.h loop.h lp.h mempolicy.h mman.h mroute.h msdos_fs.h msg.h	\
-+	nbd.h ncp_fs.h ncp.h ncp_mount.h netdevice.h		\
++	llc.h loop.h lp.h mempolicy.h mii.h mman.h mroute.h msdos_fs.h	\
++	msg.h nbd.h ncp_fs.h ncp.h ncp_mount.h netdevice.h		\
 +	netfilter_bridge.h netfilter_decnet.h netfilter.h		\
 +	netfilter_ipv4.h netfilter_ipv6.h netfilter_logging.h net.h	\
 +	netlink.h nfs3.h nfs4.h nfsacl.h nfs_fs.h nfs.h nfs_idmap.h	\
-+	n_r3964.h nubus.h nvram.h parport.h patchkey.h pktcdvd.h	\
-+	pmu.h ppp-comp.h ptrace.h qnx4_fs.h quota.h	\
-+	random.h reboot.h reiserfs_fs.h reiserfs_xattr.h romfs_fs.h	\
-+	route.h rtc.h rtnetlink.h scc.h sched.h sdla.h			\
-+	selinux_netlink.h sem.h serial_core.h serial.h serio.h shm.h	\
-+	signal.h smb_fs.h smb.h smb_mount.h socket.h sonet.h sonypi.h	\
-+	soundcard.h stat.h sysctl.h sysv_fs.h tcp.h time.h	\
-+	timex.h tty.h types.h udf_fs_i.h udp.h uinput.h uio.h	\
-+	user.h videodev2.h videodev.h wait.h wanrouter.h watchdog.h	\
-+	xfrm.h zftape.h
++	n_r3964.h nubus.h nvram.h parport.h patchkey.h pktcdvd.h pmu.h	\
++	ppp-comp.h ptrace.h qnx4_fs.h quota.h random.h reboot.h		\
++	reiserfs_fs.h reiserfs_xattr.h romfs_fs.h route.h rtc.h		\
++	rtnetlink.h scc.h sched.h sdla.h selinux_netlink.h sem.h	\
++	serial_core.h serial.h serio.h shm.h signal.h smb_fs.h smb.h	\
++	smb_mount.h socket.h sonet.h sonypi.h soundcard.h stat.h	\
++	sysctl.h sysv_fs.h tcp.h time.h timex.h tty.h types.h		\
++	udf_fs_i.h udp.h uinput.h uio.h user.h videodev2.h videodev.h	\
++	wait.h wanrouter.h watchdog.h xfrm.h zftape.h
 diff --git a/include/linux/byteorder/Kbuild b/include/linux/byteorder/Kbuild
 new file mode 100644
 index 0000000..89e60f3



From fedora-cvs-commits at redhat.com  Thu Apr 27 17:41:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 13:41:40 -0400
Subject: rpms/kernel/devel linux-2.6-header-cleanup-git.patch,1.7,1.8
Message-ID: <200604271741.k3RHfeqV014942@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14899

Modified Files:
	linux-2.6-header-cleanup-git.patch 
Log Message:
don't declare errno

linux-2.6-header-cleanup-git.patch:
 b/include/asm-i386/page.h                            |    5 
 b/include/asm-s390/ptrace.h                          |    6 
 b/include/asm-x86_64/page.h                          |    5 
 b/include/linux/elf-em.h                             |   44 ++++
 include/acpi/platform/aclinux.h                      |    1 
 include/acpi/processor.h                             |    1 
 include/asm-alpha/bitops.h                           |    1 
 include/asm-alpha/cache.h                            |    1 
 include/asm-alpha/cacheflush.h                       |    1 
 include/asm-alpha/core_cia.h                         |    1 
 include/asm-alpha/core_t2.h                          |    1 
 include/asm-alpha/dma-mapping.h                      |    1 
 include/asm-alpha/dma.h                              |    1 
 include/asm-alpha/floppy.h                           |    1 
 include/asm-alpha/hardirq.h                          |    1 
 include/asm-alpha/hw_irq.h                           |    1 
 include/asm-alpha/ide.h                              |    1 
 include/asm-alpha/io.h                               |    1 
 include/asm-alpha/irq.h                              |    1 
 include/asm-alpha/kmap_types.h                       |    1 
 include/asm-alpha/machvec.h                          |    1 
 include/asm-alpha/mmu_context.h                      |    1 
 include/asm-alpha/mmzone.h                           |    1 
 include/asm-alpha/page.h                             |    1 
 include/asm-alpha/param.h                            |    1 
 include/asm-alpha/pgalloc.h                          |    1 
 include/asm-alpha/pgtable.h                          |    1 
 include/asm-alpha/serial.h                           |    1 
 include/asm-alpha/smp.h                              |    1 
 include/asm-alpha/spinlock.h                         |    1 
 include/asm-alpha/system.h                           |    1 
 include/asm-alpha/tlbflush.h                         |    1 
 include/asm-arm/apm.h                                |    1 
 include/asm-arm/arch-aaec2000/memory.h               |    1 
 include/asm-arm/arch-cl7500/acornfb.h                |    1 
 include/asm-arm/arch-clps711x/hardware.h             |    1 
 include/asm-arm/arch-clps711x/memory.h               |    1 
 include/asm-arm/arch-clps711x/uncompress.h           |    1 
 include/asm-arm/arch-ebsa285/hardware.h              |    1 
 include/asm-arm/arch-ebsa285/memory.h                |    1 
 include/asm-arm/arch-ebsa285/vmalloc.h               |    1 
 include/asm-arm/arch-integrator/smp.h                |    1 
 include/asm-arm/arch-iop3xx/memory.h                 |    1 
 include/asm-arm/arch-iop3xx/timex.h                  |    1 
 include/asm-arm/arch-iop3xx/uncompress.h             |    1 
 include/asm-arm/arch-ixp4xx/dma.h                    |    1 
 include/asm-arm/arch-lh7a40x/constants.h             |    1 
 include/asm-arm/arch-lh7a40x/irqs.h                  |    1 
 include/asm-arm/arch-lh7a40x/registers.h             |    1 
 include/asm-arm/arch-omap/board.h                    |    1 
 include/asm-arm/arch-omap/hardware.h                 |    1 
 include/asm-arm/arch-omap/system.h                   |    1 
 include/asm-arm/arch-omap/uncompress.h               |    1 
 include/asm-arm/arch-pxa/idp.h                       |    1 
 include/asm-arm/arch-pxa/irqs.h                      |    1 
 include/asm-arm/arch-pxa/pxa-regs.h                  |    1 
 include/asm-arm/arch-pxa/timex.h                     |    1 
 include/asm-arm/arch-realview/smp.h                  |    1 
 include/asm-arm/arch-s3c2410/dma.h                   |    1 
 include/asm-arm/arch-s3c2410/uncompress.h            |    1 
 include/asm-arm/arch-sa1100/assabet.h                |    1 
 include/asm-arm/arch-sa1100/cerf.h                   |    1 
 include/asm-arm/arch-sa1100/collie.h                 |    1 
 include/asm-arm/arch-sa1100/dma.h                    |    1 
 include/asm-arm/arch-sa1100/hardware.h               |    1 
 include/asm-arm/arch-sa1100/ide.h                    |    1 
 include/asm-arm/arch-sa1100/irqs.h                   |    1 
 include/asm-arm/arch-sa1100/memory.h                 |    1 
 include/asm-arm/arch-sa1100/system.h                 |    1 
 include/asm-arm/atomic.h                             |    1 
 include/asm-arm/bug.h                                |    1 
 include/asm-arm/cacheflush.h                         |    1 
 include/asm-arm/cpu.h                                |    1 
 include/asm-arm/dma-mapping.h                        |    1 
 include/asm-arm/dma.h                                |    1 
 include/asm-arm/elf.h                                |    1 
 include/asm-arm/fpstate.h                            |    1 
 include/asm-arm/glue.h                               |    1 
 include/asm-arm/hardirq.h                            |    1 
 include/asm-arm/hardware/dec21285.h                  |    1 
 include/asm-arm/hardware/iomd.h                      |    1 
 include/asm-arm/leds.h                               |    1 
 include/asm-arm/mach/serial_at91rm9200.h             |    1 
 include/asm-arm/mach/serial_sa1100.h                 |    1 
 include/asm-arm/memory.h                             |    1 
 include/asm-arm/page.h                               |    1 
 include/asm-arm/pci.h                                |    1 
 include/asm-arm/proc-fns.h                           |    1 
 include/asm-arm/ptrace.h                             |    1 
 include/asm-arm/smp.h                                |    1 
 include/asm-arm/system.h                             |    1 
 include/asm-arm/tlbflush.h                           |    1 
 include/asm-arm26/atomic.h                           |    1 
 include/asm-arm26/bug.h                              |    1 
 include/asm-arm26/dma.h                              |    1 
 include/asm-arm26/hardirq.h                          |    1 
 include/asm-arm26/hardware.h                         |    1 
 include/asm-arm26/io.h                               |    1 
 include/asm-arm26/leds.h                             |    1 
 include/asm-arm26/mach-types.h                       |    1 
 include/asm-arm26/page.h                             |    1 
 include/asm-arm26/pgtable.h                          |    1 
 include/asm-arm26/serial.h                           |    1 
 include/asm-arm26/smp.h                              |    1 
 include/asm-arm26/sysirq.h                           |    1 
 include/asm-arm26/system.h                           |    1 
 include/asm-cris/arch-v10/io.h                       |    1 
 include/asm-cris/arch-v10/page.h                     |    1 
 include/asm-cris/arch-v10/system.h                   |    1 
 include/asm-cris/arch-v32/io.h                       |    1 
 include/asm-cris/arch-v32/irq.h                      |    1 
 include/asm-cris/arch-v32/page.h                     |    1 
 include/asm-cris/arch-v32/processor.h                |    1 
 include/asm-cris/arch-v32/system.h                   |    1 
 include/asm-cris/eshlibld.h                          |    1 
 include/asm-cris/etraxgpio.h                         |    1 
 include/asm-cris/fasttimer.h                         |    1 
 include/asm-cris/page.h                              |    1 
 include/asm-cris/pci.h                               |    1 
 include/asm-cris/pgtable.h                           |    1 
 include/asm-cris/processor.h                         |    1 
 include/asm-cris/rtc.h                               |    1 
 include/asm-cris/tlbflush.h                          |    1 
 include/asm-frv/atomic.h                             |    1 
 include/asm-frv/bitops.h                             |    1 
 include/asm-frv/bug.h                                |    1 
 include/asm-frv/cache.h                              |    1 
 include/asm-frv/dma.h                                |    1 
 include/asm-frv/elf.h                                |    1 
 include/asm-frv/fpu.h                                |    1 
 include/asm-frv/hardirq.h                            |    1 
 include/asm-frv/highmem.h                            |    1 
 include/asm-frv/ide.h                                |    1 
 include/asm-frv/io.h                                 |    1 
 include/asm-frv/irq.h                                |    1 
 include/asm-frv/mmu_context.h                        |    1 
 include/asm-frv/page.h                               |    1 
 include/asm-frv/pci.h                                |    1 
 include/asm-frv/pgalloc.h                            |    1 
 include/asm-frv/pgtable.h                            |    1 
 include/asm-frv/processor.h                          |    1 
 include/asm-frv/segment.h                            |    1 
 include/asm-frv/serial.h                             |    1 
 include/asm-frv/smp.h                                |    1 
 include/asm-frv/system.h                             |    1 
 include/asm-frv/tlbflush.h                           |    1 
 include/asm-frv/types.h                              |    1 
 include/asm-frv/unaligned.h                          |    1 
 include/asm-frv/virtconvert.h                        |    1 
 include/asm-generic/bug.h                            |    1 
 include/asm-generic/dma-mapping.h                    |    1 
 include/asm-generic/fcntl.h                          |    1 
 include/asm-generic/local.h                          |    1 
 include/asm-generic/signal.h                         |    7 
 include/asm-generic/tlb.h                            |    1 
 include/asm-h8300/bitops.h                           |    1 
 include/asm-h8300/dma.h                              |    1 
 include/asm-h8300/elf.h                              |    1 
 include/asm-h8300/hardirq.h                          |    1 
 include/asm-h8300/io.h                               |    1 
 include/asm-h8300/keyboard.h                         |    1 
 include/asm-h8300/mmu_context.h                      |    1 
 include/asm-h8300/page.h                             |    1 
 include/asm-h8300/page_offset.h                      |    1 
 include/asm-h8300/param.h                            |    1 
 include/asm-h8300/pgtable.h                          |    1 
 include/asm-h8300/processor.h                        |    1 
 include/asm-h8300/semaphore-helper.h                 |    1 
 include/asm-h8300/shm.h                              |    1 
 include/asm-h8300/system.h                           |    1 
 include/asm-h8300/unaligned.h                        |    1 
 include/asm-h8300/virtconvert.h                      |    1 
 include/asm-i386/apic.h                              |    1 
 include/asm-i386/atomic.h                            |    1 
 include/asm-i386/bitops.h                            |    1 
 include/asm-i386/bug.h                               |    1 
 include/asm-i386/bugs.h                              |    1 
 include/asm-i386/byteorder.h                         |    1 
 include/asm-i386/cache.h                             |    1 
 include/asm-i386/dma.h                               |    1 
 include/asm-i386/fixmap.h                            |    1 
 include/asm-i386/hardirq.h                           |    1 
 include/asm-i386/highmem.h                           |    1 
 include/asm-i386/hpet.h                              |    1 
 include/asm-i386/hw_irq.h                            |    1 
 include/asm-i386/ide.h                               |    1 
 include/asm-i386/io.h                                |    1 
 include/asm-i386/io_apic.h                           |    1 
 include/asm-i386/irq.h                               |    1 
 include/asm-i386/kmap_types.h                        |    1 
 include/asm-i386/mach-summit/mach_apic.h             |    1 
 include/asm-i386/mmu_context.h                       |    1 
 include/asm-i386/mtrr.h                              |    1 
 include/asm-i386/param.h                             |    1 
 include/asm-i386/pci.h                               |    1 
 include/asm-i386/pgalloc.h                           |    1 
 include/asm-i386/pgtable.h                           |    1 
 include/asm-i386/processor.h                         |    1 
 include/asm-i386/serial.h                            |    1 
 include/asm-i386/smp.h                               |    1 
 include/asm-i386/spinlock.h                          |    1 
 include/asm-i386/string.h                            |    1 
 include/asm-i386/system.h                            |    1 
 include/asm-i386/thread_info.h                       |    1 
 include/asm-i386/timex.h                             |    1 
 include/asm-i386/tlbflush.h                          |    1 
 include/asm-i386/types.h                             |    1 
 include/asm-i386/uaccess.h                           |    1 
 include/asm-ia64/asmmacro.h                          |    1 
 include/asm-ia64/cache.h                             |    1 
 include/asm-ia64/delay.h                             |    1 
 include/asm-ia64/dma-mapping.h                       |    1 
 include/asm-ia64/dma.h                               |    1 
 include/asm-ia64/elf.h                               |    1 
 include/asm-ia64/hardirq.h                           |    1 
 include/asm-ia64/ia32.h                              |    1 
 include/asm-ia64/ide.h                               |    1 
 include/asm-ia64/intrinsics.h                        |    1 
 include/asm-ia64/kmap_types.h                        |    1 
 include/asm-ia64/machvec.h                           |    1 
 include/asm-ia64/meminit.h                           |    1 
 include/asm-ia64/nodedata.h                          |    1 
 include/asm-ia64/numa.h                              |    1 
 include/asm-ia64/page.h                              |    1 
 include/asm-ia64/param.h                             |    1 
 include/asm-ia64/percpu.h                            |    1 
 include/asm-ia64/pgalloc.h                           |    1 
 include/asm-ia64/pgtable.h                           |    1 
 include/asm-ia64/processor.h                         |    1 
 include/asm-ia64/ptrace.h                            |    1 
 include/asm-ia64/smp.h                               |    1 
 include/asm-ia64/sn/simulator.h                      |    1 
 include/asm-ia64/sn/sn_cpuid.h                       |    1 
 include/asm-ia64/sn/sn_sal.h                         |    1 
 include/asm-ia64/sn/xpc.h                            |    1 
 include/asm-ia64/string.h                            |    1 
 include/asm-ia64/system.h                            |    1 
 include/asm-ia64/tlb.h                               |    1 
 include/asm-ia64/tlbflush.h                          |    1 
 include/asm-ia64/unistd.h                            |    1 
 include/asm-m32r/assembler.h                         |    1 
 include/asm-m32r/atomic.h                            |    1 
 include/asm-m32r/bitops.h                            |    1 
 include/asm-m32r/cacheflush.h                        |    1 
 include/asm-m32r/hardirq.h                           |    1 
 include/asm-m32r/ide.h                               |    1 
 include/asm-m32r/irq.h                               |    1 
 include/asm-m32r/kmap_types.h                        |    1 
 include/asm-m32r/m32104ut/m32104ut_pld.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lan.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lcd.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_pld.h             |    1 
 include/asm-m32r/m32r.h                              |    1 
 include/asm-m32r/mmu.h                               |    1 
 include/asm-m32r/mmu_context.h                       |    2 
 include/asm-m32r/opsput/opsput_lan.h                 |    1 
 include/asm-m32r/opsput/opsput_lcd.h                 |    1 
 include/asm-m32r/opsput/opsput_pld.h                 |    1 
 include/asm-m32r/page.h                              |    1 
 include/asm-m32r/pgalloc.h                           |    1 
 include/asm-m32r/pgtable-2level.h                    |    1 
 include/asm-m32r/pgtable.h                           |    1 
 include/asm-m32r/processor.h                         |    1 
 include/asm-m32r/ptrace.h                            |    1 
 include/asm-m32r/rtc.h                               |    1 
 include/asm-m32r/semaphore.h                         |    1 
 include/asm-m32r/serial.h                            |    1 
 include/asm-m32r/sigcontext.h                        |    1 
 include/asm-m32r/smp.h                               |    1 
 include/asm-m32r/spinlock.h                          |    1 
 include/asm-m32r/system.h                            |    1 
 include/asm-m32r/timex.h                             |    1 
 include/asm-m32r/tlbflush.h                          |    1 
 include/asm-m32r/uaccess.h                           |    1 
 include/asm-m68k/atomic.h                            |    1 
 include/asm-m68k/bug.h                               |    1 
 include/asm-m68k/dma-mapping.h                       |    1 
 include/asm-m68k/dma.h                               |    1 
 include/asm-m68k/dvma.h                              |    1 
 include/asm-m68k/elf.h                               |    1 
 include/asm-m68k/entry.h                             |    1 
 include/asm-m68k/fpu.h                               |    1 
 include/asm-m68k/hardirq.h                           |    1 
 include/asm-m68k/ide.h                               |    1 
 include/asm-m68k/io.h                                |    1 
 include/asm-m68k/irq.h                               |    1 
 include/asm-m68k/mc146818rtc.h                       |    1 
 include/asm-m68k/mmu_context.h                       |    1 
 include/asm-m68k/motorola_pgtable.h                  |    1 
 include/asm-m68k/openprom.h                          |    1 
 include/asm-m68k/page.h                              |    1 
 include/asm-m68k/page_offset.h                       |    1 
 include/asm-m68k/pgalloc.h                           |    1 
 include/asm-m68k/pgtable.h                           |    1 
 include/asm-m68k/processor.h                         |    1 
 include/asm-m68k/semaphore-helper.h                  |    1 
 include/asm-m68k/serial.h                            |    1 
 include/asm-m68k/setup.h                             |    1 
 include/asm-m68k/shm.h                               |    1 
 include/asm-m68k/system.h                            |    1 
 include/asm-m68k/tlbflush.h                          |    1 
 include/asm-m68k/virtconvert.h                       |    1 
 include/asm-m68knommu/bitops.h                       |    1 
 include/asm-m68knommu/coldfire.h                     |    1 
 include/asm-m68knommu/commproc.h                     |    1 
 include/asm-m68knommu/dma-mapping.h                  |    1 
 include/asm-m68knommu/dma.h                          |    1 
 include/asm-m68knommu/elf.h                          |    1 
 include/asm-m68knommu/elia.h                         |    1 
 include/asm-m68knommu/entry.h                        |    1 
 include/asm-m68knommu/fpu.h                          |    1 
 include/asm-m68knommu/hardirq.h                      |    1 
 include/asm-m68knommu/io.h                           |    1 
 include/asm-m68knommu/irq.h                          |    1 
 include/asm-m68knommu/m5206sim.h                     |    1 
 include/asm-m68knommu/m520xsim.h                     |    1 
 include/asm-m68knommu/m523xsim.h                     |    1 
 include/asm-m68knommu/m5272sim.h                     |    1 
 include/asm-m68knommu/m527xsim.h                     |    1 
 include/asm-m68knommu/m528xsim.h                     |    1 
 include/asm-m68knommu/mcfcache.h                     |    1 
 include/asm-m68knommu/mcfdma.h                       |    1 
 include/asm-m68knommu/mcfmbus.h                      |    1 
 include/asm-m68knommu/mcfne.h                        |    1 
 include/asm-m68knommu/mcfpci.h                       |    1 
 include/asm-m68knommu/mcfpit.h                       |    1 
 include/asm-m68knommu/mcfsim.h                       |    1 
 include/asm-m68knommu/mcfsmc.h                       |    1 
 include/asm-m68knommu/mcftimer.h                     |    1 
 include/asm-m68knommu/mcfuart.h                      |    1 
 include/asm-m68knommu/mcfwdebug.h                    |    1 
 include/asm-m68knommu/mmu_context.h                  |    1 
 include/asm-m68knommu/nettel.h                       |    1 
 include/asm-m68knommu/page.h                         |    1 
 include/asm-m68knommu/page_offset.h                  |    1 
 include/asm-m68knommu/param.h                        |    1 
 include/asm-m68knommu/pgtable.h                      |    1 
 include/asm-m68knommu/processor.h                    |    1 
 include/asm-m68knommu/semaphore-helper.h             |    1 
 include/asm-m68knommu/system.h                       |    1 
 include/asm-m68knommu/unaligned.h                    |    1 
 include/asm-mips/a.out.h                             |    1 
 include/asm-mips/addrspace.h                         |    1 
 include/asm-mips/arc/types.h                         |    1 
 include/asm-mips/asm.h                               |    1 
 include/asm-mips/asmmacro.h                          |    1 
 include/asm-mips/atomic.h                            |    1 
 include/asm-mips/bcache.h                            |    1 
 include/asm-mips/bitops.h                            |    1 
 include/asm-mips/bug.h                               |    1 
 include/asm-mips/bugs.h                              |    1 
 include/asm-mips/byteorder.h                         |    1 
 include/asm-mips/cache.h                             |    1 
 include/asm-mips/checksum.h                          |    1 
 include/asm-mips/cpu-features.h                      |    1 
 include/asm-mips/cpu-info.h                          |    1 
 include/asm-mips/ddb5xxx/ddb5477.h                   |    1 
 include/asm-mips/ddb5xxx/ddb5xxx.h                   |    1 
 include/asm-mips/debug.h                             |    1 
 include/asm-mips/dec/prom.h                          |    1 
 include/asm-mips/delay.h                             |    1 
 include/asm-mips/dma.h                               |    1 
 include/asm-mips/elf.h                               |    1 
 include/asm-mips/fcntl.h                             |    1 
 include/asm-mips/fixmap.h                            |    1 
 include/asm-mips/fpu.h                               |    1 
 include/asm-mips/futex.h                             |    1 
 include/asm-mips/hazards.h                           |    1 
 include/asm-mips/highmem.h                           |    1 
 include/asm-mips/interrupt.h                         |    1 
 include/asm-mips/io.h                                |    1 
 include/asm-mips/ip32/machine.h                      |    1 
 include/asm-mips/irq.h                               |    1 
 include/asm-mips/isadep.h                            |    1 
 include/asm-mips/jmr3927/irq.h                       |    1 
 include/asm-mips/kmap_types.h                        |    1 
 include/asm-mips/local.h                             |    1 
 include/asm-mips/mach-au1x00/au1000.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx_dbdma.h          |    1 
 include/asm-mips/mach-au1x00/au1xxx_ide.h            |    1 
 include/asm-mips/mach-au1x00/au1xxx_psc.h            |    1 
 include/asm-mips/mach-au1x00/ioremap.h               |    1 
 include/asm-mips/mach-cobalt/cpu-feature-overrides.h |    1 
 include/asm-mips/mach-db1x00/db1x00.h                |    1 
 include/asm-mips/mach-generic/ide.h                  |    1 
 include/asm-mips/mach-generic/kmalloc.h              |    1 
 include/asm-mips/mach-generic/spaces.h               |    1 
 include/asm-mips/mach-ip22/spaces.h                  |    1 
 include/asm-mips/mach-ip32/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-ip32/kmalloc.h                 |    1 
 include/asm-mips/mach-mips/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-mips/irq.h                     |    1 
 include/asm-mips/mach-pb1x00/pb1550.h                |    1 
 include/asm-mips/mach-sim/cpu-feature-overrides.h    |    1 
 include/asm-mips/mips-boards/generic.h               |    1 
 include/asm-mips/mipsregs.h                          |    1 
 include/asm-mips/mmu_context.h                       |    1 
 include/asm-mips/mmzone.h                            |    1 
 include/asm-mips/module.h                            |    1 
 include/asm-mips/msgbuf.h                            |    1 
 include/asm-mips/paccess.h                           |    1 
 include/asm-mips/page.h                              |    1 
 include/asm-mips/pci.h                               |    1 
 include/asm-mips/pgalloc.h                           |    1 
 include/asm-mips/pgtable-32.h                        |    1 
 include/asm-mips/pgtable-64.h                        |    1 
 include/asm-mips/pgtable-bits.h                      |    1 
 include/asm-mips/pgtable.h                           |    1 
 include/asm-mips/prefetch.h                          |    1 
 include/asm-mips/processor.h                         |    1 
 include/asm-mips/ptrace.h                            |    1 
 include/asm-mips/reg.h                               |    1 
 include/asm-mips/resource.h                          |    1 
 include/asm-mips/serial.h                            |    1 
 include/asm-mips/sgiarcs.h                           |    1 
 include/asm-mips/sibyte/board.h                      |    1 
 include/asm-mips/sibyte/carmel.h                     |    1 
 include/asm-mips/sibyte/sentosa.h                    |    1 
 include/asm-mips/sibyte/swarm.h                      |    1 
 include/asm-mips/siginfo.h                           |    1 
 include/asm-mips/signal.h                            |    1 
 include/asm-mips/sim.h                               |    1 
 include/asm-mips/smp.h                               |    1 
 include/asm-mips/sn/addrs.h                          |    1 
 include/asm-mips/sn/agent.h                          |    1 
 include/asm-mips/sn/arch.h                           |    1 
 include/asm-mips/sn/io.h                             |    1 
 include/asm-mips/sn/klconfig.h                       |    1 
 include/asm-mips/sn/kldir.h                          |    1 
 include/asm-mips/sn/launch.h                         |    1 
 include/asm-mips/sn/mapped_kernel.h                  |    1 
 include/asm-mips/sn/sn0/addrs.h                      |    1 
 include/asm-mips/sn/sn0/arch.h                       |    1 
 include/asm-mips/sn/sn0/hubmd.h                      |    1 
 include/asm-mips/stackframe.h                        |    1 
 include/asm-mips/string.h                            |    1 
 include/asm-mips/system.h                            |    1 
 include/asm-mips/thread_info.h                       |    1 
 include/asm-mips/tlbflush.h                          |    1 
 include/asm-mips/tx4927/toshiba_rbtx4927.h           |    1 
 include/asm-mips/types.h                             |    1 
 include/asm-mips/uaccess.h                           |    1 
 include/asm-mips/unistd.h                            |    1 
 include/asm-mips/vr41xx/vrc4173.h                    |    1 
 include/asm-mips/war.h                               |    1 
 include/asm-mips/wbflush.h                           |    1 
 include/asm-parisc/atomic.h                          |    1 
 include/asm-parisc/cache.h                           |    1 
 include/asm-parisc/cacheflush.h                      |    1 
 include/asm-parisc/dma-mapping.h                     |    1 
 include/asm-parisc/dma.h                             |    1 
 include/asm-parisc/io.h                              |    1 
 include/asm-parisc/irq.h                             |    1 
 include/asm-parisc/kmap_types.h                      |    1 
 include/asm-parisc/page.h                            |    1 
 include/asm-parisc/param.h                           |    1 
 include/asm-parisc/pci.h                             |    1 
 include/asm-parisc/pdc.h                             |    1 
 include/asm-parisc/pgtable.h                         |    1 
 include/asm-parisc/processor.h                       |    1 
 include/asm-parisc/psw.h                             |    1 
 include/asm-parisc/smp.h                             |    1 
 include/asm-parisc/system.h                          |    1 
 include/asm-parisc/tlbflush.h                        |    1 
 include/asm-powerpc/abs_addr.h                       |    1 
 include/asm-powerpc/cache.h                          |    1 
 include/asm-powerpc/dma-mapping.h                    |    1 
 include/asm-powerpc/dma.h                            |    1 
 include/asm-powerpc/eeh.h                            |    1 
 include/asm-powerpc/elf.h                            |    7 
 include/asm-powerpc/floppy.h                         |    1 
 include/asm-powerpc/hw_irq.h                         |    1 
 include/asm-powerpc/ide.h                            |    1 
 include/asm-powerpc/iommu.h                          |    1 
 include/asm-powerpc/irq.h                            |    1 
 include/asm-powerpc/iseries/iseries_io.h             |    1 
 include/asm-powerpc/machdep.h                        |    1 
 include/asm-powerpc/mmzone.h                         |    1 
 include/asm-powerpc/paca.h                           |    1 
 include/asm-powerpc/page.h                           |    1 
 include/asm-powerpc/pgtable.h                        |    1 
 include/asm-powerpc/ppc_asm.h                        |    1 
 include/asm-powerpc/prom.h                           |    1 
 include/asm-powerpc/smp.h                            |    1 
 include/asm-powerpc/smu.h                            |    1 
 include/asm-powerpc/spu.h                            |    1 
 include/asm-powerpc/thread_info.h                    |    1 
 include/asm-powerpc/time.h                           |    1 
 include/asm-powerpc/timex.h                          |    1 
 include/asm-powerpc/tlb.h                            |    1 
 include/asm-powerpc/tlbflush.h                       |    1 
 include/asm-powerpc/topology.h                       |    1 
 include/asm-powerpc/types.h                          |    1 
 include/asm-powerpc/unistd.h                         |    1 
 include/asm-powerpc/vga.h                            |    1 
 include/asm-powerpc/vio.h                            |    1 
 include/asm-ppc/amigahw.h                            |    1 
 include/asm-ppc/bootinfo.h                           |    1 
 include/asm-ppc/commproc.h                           |    1 
 include/asm-ppc/ibm403.h                             |    1 
 include/asm-ppc/ibm44x.h                             |    1 
 include/asm-ppc/ibm4xx.h                             |    1 
 include/asm-ppc/io.h                                 |    1 
 include/asm-ppc/machdep.h                            |    1 
 include/asm-ppc/mmu.h                                |    1 
 include/asm-ppc/mmu_context.h                        |    1 
 include/asm-ppc/mpc8260.h                            |    1 
 include/asm-ppc/mpc83xx.h                            |    1 
 include/asm-ppc/mpc85xx.h                            |    1 
 include/asm-ppc/mpc8xx.h                             |    1 
 include/asm-ppc/mv64x60.h                            |    1 
 include/asm-ppc/ocp.h                                |    1 
 include/asm-ppc/open_pic.h                           |    1 
 include/asm-ppc/page.h                               |    2 
 include/asm-ppc/pc_serial.h                          |    1 
 include/asm-ppc/pgalloc.h                            |    1 
 include/asm-ppc/pgtable.h                            |    1 
 include/asm-ppc/ppc4xx_dma.h                         |    1 
 include/asm-ppc/ppc4xx_pic.h                         |    1 
 include/asm-ppc/serial.h                             |    1 
 include/asm-ppc/smp.h                                |    1 
 include/asm-ppc/time.h                               |    1 
 include/asm-s390/bitops.h                            |    1 
 include/asm-s390/debug.h                             |    1 
 include/asm-s390/hardirq.h                           |    1 
 include/asm-s390/idals.h                             |    1 
 include/asm-s390/local.h                             |    1 
 include/asm-s390/lowcore.h                           |    1 
 include/asm-s390/page.h                              |    6 
 include/asm-s390/pgalloc.h                           |    1 
 include/asm-s390/sfp-machine.h                       |    1 
 include/asm-s390/smp.h                               |    1 
 include/asm-s390/system.h                            |    1 
 include/asm-s390/tlbflush.h                          |    1 
 include/asm-s390/types.h                             |    1 
 include/asm-s390/unistd.h                            |    1 
 include/asm-sh/bug.h                                 |    1 
 include/asm-sh/checksum.h                            |    1 
 include/asm-sh/dma-mapping.h                         |    1 
 include/asm-sh/dma.h                                 |    1 
 include/asm-sh/fixmap.h                              |    1 
 include/asm-sh/hardirq.h                             |    1 
 include/asm-sh/hd64461/hd64461.h                     |    1 
 include/asm-sh/hd64465/hd64465.h                     |    1 
 include/asm-sh/ide.h                                 |    1 
 include/asm-sh/io.h                                  |    1 
 include/asm-sh/irq.h                                 |    1 
 include/asm-sh/keyboard.h                            |    1 
 include/asm-sh/kmap_types.h                          |    1 
 include/asm-sh/machvec.h                             |    1 
 include/asm-sh/machvec_init.h                        |    1 
 include/asm-sh/mpc1211/dma.h                         |    1 
 include/asm-sh/overdrive/overdrive.h                 |    1 
 include/asm-sh/page.h                                |    1 
 include/asm-sh/pgtable.h                             |    1 
 include/asm-sh/serial.h                              |    1 
 include/asm-sh/smp.h                                 |    1 
 include/asm-sh/system.h                              |    1 
 include/asm-sh/types.h                               |    1 
 include/asm-sh/watchdog.h                            |    1 
 include/asm-sh64/bug.h                               |    1 
 include/asm-sh64/dma-mapping.h                       |    1 
 include/asm-sh64/hardirq.h                           |    1 
 include/asm-sh64/ide.h                               |    1 
 include/asm-sh64/irq.h                               |    1 
 include/asm-sh64/mmu_context.h                       |    1 
 include/asm-sh64/page.h                              |    1 
 include/asm-sh64/param.h                             |    1 
 include/asm-sh64/pgtable.h                           |    1 
 include/asm-sh64/system.h                            |    1 
 include/asm-sparc/asmmacro.h                         |    1 
 include/asm-sparc/atomic.h                           |    1 
 include/asm-sparc/bugs.h                             |    1 
 include/asm-sparc/cacheflush.h                       |    1 
 include/asm-sparc/delay.h                            |    1 
 include/asm-sparc/dma-mapping.h                      |    1 
 include/asm-sparc/dma.h                              |    1 
 include/asm-sparc/elf.h                              |    1 
 include/asm-sparc/fixmap.h                           |    1 
 include/asm-sparc/hardirq.h                          |    1 
 include/asm-sparc/ide.h                              |    1 
 include/asm-sparc/irq.h                              |    1 
 include/asm-sparc/mostek.h                           |    1 
 include/asm-sparc/page.h                             |    1 
 include/asm-sparc/pgalloc.h                          |    1 
 include/asm-sparc/pgtable.h                          |    1 
 include/asm-sparc/sfp-machine.h                      |    1 
 include/asm-sparc/smp.h                              |    1 
 include/asm-sparc/system.h                           |    2 
 include/asm-sparc/timer.h                            |    1 
 include/asm-sparc/tlbflush.h                         |    1 
 include/asm-sparc/vac-ops.h                          |    1 
 include/asm-sparc/winmacro.h                         |    1 
 include/asm-sparc64/atomic.h                         |    1 
 include/asm-sparc64/bitops.h                         |    1 
 include/asm-sparc64/bugs.h                           |    1 
 include/asm-sparc64/cacheflush.h                     |    1 
 include/asm-sparc64/delay.h                          |    1 
 include/asm-sparc64/dma-mapping.h                    |    1 
 include/asm-sparc64/dma.h                            |    1 
 include/asm-sparc64/floppy.h                         |    1 
 include/asm-sparc64/ide.h                            |    1 
 include/asm-sparc64/irq.h                            |    1 
 include/asm-sparc64/kprobes.h                        |    1 
 include/asm-sparc64/mc146818rtc.h                    |    1 
 include/asm-sparc64/mmu.h                            |    1 
 include/asm-sparc64/oplib.h                          |    1 
 include/asm-sparc64/page.h                           |    1 
 include/asm-sparc64/param.h                          |    1 
 include/asm-sparc64/pgalloc.h                        |    1 
 include/asm-sparc64/pgtable.h                        |    1 
 include/asm-sparc64/processor.h                      |    1 
 include/asm-sparc64/siginfo.h                        |    1 
 include/asm-sparc64/signal.h                         |    1 
 include/asm-sparc64/smp.h                            |    1 
 include/asm-sparc64/spinlock.h                       |    1 
 include/asm-sparc64/system.h                         |    1 
 include/asm-sparc64/timer.h                          |    1 
 include/asm-sparc64/tlb.h                            |    1 
 include/asm-sparc64/tlbflush.h                       |    1 
 include/asm-sparc64/ttable.h                         |    1 
 include/asm-um/a.out.h                               |    1 
 include/asm-um/cache.h                               |    1 
 include/asm-um/elf-ppc.h                             |    1 
 include/asm-um/fixmap.h                              |    1 
 include/asm-um/hardirq.h                             |    1 
 include/asm-um/linkage.h                             |    1 
 include/asm-um/mmu_context.h                         |    1 
 include/asm-um/page.h                                |    1 
 include/asm-um/pgalloc.h                             |    1 
 include/asm-um/processor-generic.h                   |    1 
 include/asm-um/ptrace-generic.h                      |    1 
 include/asm-um/smp.h                                 |    1 
 include/asm-um/thread_info.h                         |    1 
 include/asm-v850/atomic.h                            |    1 
 include/asm-v850/bitops.h                            |    1 
 include/asm-v850/dma-mapping.h                       |    1 
 include/asm-v850/hardirq.h                           |    1 
 include/asm-v850/machdep.h                           |    1 
 include/asm-v850/pgtable.h                           |    1 
 include/asm-v850/processor.h                         |    1 
 include/asm-v850/serial.h                            |    1 
 include/asm-v850/v850e_uart.h                        |    1 
 include/asm-x86_64/apic.h                            |    1 
 include/asm-x86_64/atomic.h                          |    1 
 include/asm-x86_64/bitops.h                          |    1 
 include/asm-x86_64/bugs.h                            |    1 
 include/asm-x86_64/cache.h                           |    1 
 include/asm-x86_64/calling.h                         |    1 
 include/asm-x86_64/dma-mapping.h                     |    1 
 include/asm-x86_64/dma.h                             |    1 
 include/asm-x86_64/dwarf2.h                          |    1 
 include/asm-x86_64/fixmap.h                          |    1 
 include/asm-x86_64/hardirq.h                         |    1 
 include/asm-x86_64/hw_irq.h                          |    1 
 include/asm-x86_64/ia32.h                            |    1 
 include/asm-x86_64/io.h                              |    1 
 include/asm-x86_64/io_apic.h                         |    1 
 include/asm-x86_64/mmu_context.h                     |    1 
 include/asm-x86_64/mmzone.h                          |    1 
 include/asm-x86_64/mtrr.h                            |    1 
 include/asm-x86_64/param.h                           |    1 
 include/asm-x86_64/pci.h                             |    1 
 include/asm-x86_64/processor.h                       |    1 
 include/asm-x86_64/serial.h                          |    1 
 include/asm-x86_64/smp.h                             |    1 
 include/asm-x86_64/spinlock.h                        |    1 
 include/asm-x86_64/swiotlb.h                         |    1 
 include/asm-x86_64/system.h                          |    1 
 include/asm-x86_64/tlbflush.h                        |    1 
 include/asm-x86_64/topology.h                        |    1 
 include/asm-x86_64/uaccess.h                         |    1 
 include/asm-xtensa/atomic.h                          |    1 
 include/asm-xtensa/checksum.h                        |    1 
 include/asm-xtensa/delay.h                           |    1 
 include/asm-xtensa/dma.h                             |    1 
 include/asm-xtensa/hardirq.h                         |    1 
 include/asm-xtensa/ide.h                             |    1 
 include/asm-xtensa/io.h                              |    1 
 include/asm-xtensa/irq.h                             |    1 
 include/asm-xtensa/mmu_context.h                     |    1 
 include/asm-xtensa/page.h                            |    1 
 include/asm-xtensa/pgalloc.h                         |    1 
 include/asm-xtensa/platform.h                        |    1 
 include/asm-xtensa/system.h                          |    1 
 include/linux/acct.h                                 |    3 
 include/linux/acpi.h                                 |    1 
 include/linux/agpgart.h                              |    3 
 include/linux/amba/clcd.h                            |    1 
 include/linux/atmdev.h                               |    1 
 include/linux/audit.h                                |    4 
 include/linux/blkdev.h                               |    1 
 include/linux/blkpg.h                                |    1 
 include/linux/blktrace_api.h                         |    1 
 include/linux/blockgroup_lock.h                      |    1 
 include/linux/cache.h                                |    1 
 include/linux/coda.h                                 |    1 
 include/linux/compat.h                               |    1 
 include/linux/cpufreq.h                              |    1 
 include/linux/crypto.h                               |    1 
 include/linux/cyclomx.h                              |    1 
 include/linux/dcookies.h                             |    1 
 include/linux/devfs_fs_kernel.h                      |    1 
 include/linux/device.h                               |    1 
 include/linux/dmi.h                                  |    1 
 include/linux/dnotify.h                              |    1 
 include/linux/elf.h                                  |   59 ------
 include/linux/errqueue.h                             |    1 
 include/linux/ethtool.h                              |  169 +++++++++----------
 include/linux/ext2_fs.h                              |    2 
 include/linux/ext3_fs.h                              |    7 
 include/linux/fs.h                                   |    1 
 include/linux/ftape.h                                |    1 
 include/linux/gameport.h                             |    6 
 include/linux/generic_serial.h                       |    6 
 include/linux/genhd.h                                |   12 -
 include/linux/gfp.h                                  |    1 
 include/linux/hardirq.h                              |    1 
 include/linux/highmem.h                              |    1 
 include/linux/highuid.h                              |    1 
 include/linux/i2c-algo-ite.h                         |    7 
 include/linux/i2c.h                                  |    9 -
 include/linux/ide.h                                  |    1 
 include/linux/if_frad.h                              |    1 
 include/linux/if_tr.h                                |    1 
 include/linux/init.h                                 |    1 
 include/linux/inotify.h                              |    1 
 include/linux/interrupt.h                            |    1 
 include/linux/ipmi.h                                 |    2 
 include/linux/ipv6.h                                 |    1 
 include/linux/irq.h                                  |    1 
 include/linux/irq_cpustat.h                          |    1 
 include/linux/isapnp.h                               |    1 
 include/linux/isdn.h                                 |    1 
 include/linux/isdn/tpam.h                            |    1 
 include/linux/isdn_ppp.h                             |    1 
 include/linux/isdnif.h                               |    1 
 include/linux/kallsyms.h                             |    1 
 include/linux/kernel_stat.h                          |    1 
 include/linux/kmod.h                                 |    1 
 include/linux/kprobes.h                              |    1 
 include/linux/linkage.h                              |    1 
 include/linux/lockd/lockd.h                          |    1 
 include/linux/lockd/nlm.h                            |    1 
 include/linux/mempolicy.h                            |    1 
 include/linux/migrate.h                              |    1 
 include/linux/mii.h                                  |   30 +--
 include/linux/mm.h                                   |    1 
 include/linux/mman.h                                 |   12 -
 include/linux/mmzone.h                               |    1 
 include/linux/module.h                               |    1 
 include/linux/msg.h                                  |    2 
 include/linux/mtd/cfi.h                              |    1 
 include/linux/mtd/map.h                              |    1 
 include/linux/mtd/mtd.h                              |    1 
 include/linux/mtd/nand.h                             |    1 
 include/linux/mtd/physmap.h                          |    1 
 include/linux/mtd/xip.h                              |    1 
 include/linux/ncp_fs.h                               |    5 
 include/linux/net.h                                  |    3 
 include/linux/netdevice.h                            |    1 
 include/linux/netfilter.h                            |    1 
 include/linux/netfilter_arp.h                        |    1 
 include/linux/netfilter_bridge.h                     |    1 
 include/linux/netfilter_ipv4.h                       |    1 
 include/linux/netfilter_ipv4/ip_conntrack.h          |    1 
 include/linux/netfilter_ipv4/listhelp.h              |    1 
 include/linux/nfs.h                                  |    8 
 include/linux/nfs4.h                                 |    6 
 include/linux/nfs_fs.h                               |   39 ++--
 include/linux/nfsd/nfsd.h                            |    1 
 include/linux/nfsd/nfsfh.h                           |    1 
 include/linux/nfsd/syscall.h                         |    1 
 include/linux/numa.h                                 |    1 
 include/linux/parport.h                              |    1 
 include/linux/pci.h                                  |    1 
 include/linux/percpu_counter.h                       |    1 
 include/linux/pm.h                                   |    1 
 include/linux/pm_legacy.h                            |    1 
 include/linux/pmu.h                                  |    1 
 include/linux/preempt.h                              |    1 
 include/linux/proc_fs.h                              |    1 
 include/linux/profile.h                              |    1 
 include/linux/quota.h                                |    4 
 include/linux/quotaops.h                             |    1 
 include/linux/reiserfs_xattr.h                       |    3 
 include/linux/relay.h                                |    1 
 include/linux/rio.h                                  |    1 
 include/linux/rio_drv.h                              |    1 
 include/linux/rmap.h                                 |    1 
 include/linux/rtnetlink.h                            |    1 
 include/linux/rwsem.h                                |    1 
 include/linux/scc.h                                  |    1 
 include/linux/sched.h                                |   94 +++++-----
 include/linux/seccomp.h                              |    1 
 include/linux/sem.h                                  |    2 
 include/linux/seqlock.h                              |    1 
 include/linux/serialP.h                              |    1 
 include/linux/serial_core.h                          |    1 
 include/linux/signal.h                               |    4 
 include/linux/skbuff.h                               |    1 
 include/linux/slab.h                                 |    1 
 include/linux/smb_fs.h                               |    4 
 include/linux/smp.h                                  |    1 
 include/linux/smp_lock.h                             |    1 
 include/linux/socket.h                               |    2 
 include/linux/spinlock.h                             |    1 
 include/linux/stop_machine.h                         |    1 
 include/linux/sunrpc/auth.h                          |    1 
 include/linux/sunrpc/debug.h                         |   24 +-
 include/linux/sunrpc/stats.h                         |    1 
 include/linux/suspend.h                              |    1 
 include/linux/swap.h                                 |    1 
 include/linux/syscalls.h                             |    1 
 include/linux/sysrq.h                                |    1 
 include/linux/tcp.h                                  |    1 
 include/linux/threads.h                              |    1 
 include/linux/timer.h                                |    1 
 include/linux/timex.h                                |    1 
 include/linux/tty.h                                  |    1 
 include/linux/types.h                                |    1 
 include/linux/udp.h                                  |    1 
 include/linux/unistd.h                               |    2 
 include/linux/usb.h                                  |    1 
 include/linux/usb_usual.h                            |    1 
 include/linux/usbdevice_fs.h                         |    2 
 include/linux/vt_buffer.h                            |    1 
 include/linux/vt_kern.h                              |    1 
 include/linux/wait.h                                 |    1 
 include/linux/wanrouter.h                            |    4 
 include/mtd/mtd-abi.h                                |    5 
 include/net/addrconf.h                               |    1 
 include/net/af_unix.h                                |    1 
 include/net/ax25.h                                   |    1 
 include/net/compat.h                                 |    1 
 include/net/dst.h                                    |    1 
 include/net/icmp.h                                   |    1 
 include/net/inet6_hashtables.h                       |    1 
 include/net/inet_hashtables.h                        |    1 
 include/net/inet_sock.h                              |    1 
 include/net/inet_timewait_sock.h                     |    1 
 include/net/ip.h                                     |    1 
 include/net/ip_fib.h                                 |    1 
 include/net/ip_mp_alg.h                              |    1 
 include/net/ip_vs.h                                  |    1 
 include/net/ipv6.h                                   |    1 
 include/net/irda/irda.h                              |    1 
 include/net/irda/irda_device.h                       |    1 
 include/net/irda/irlap.h                             |    1 
 include/net/irda/irlmp.h                             |    1 
 include/net/irda/irlmp_frame.h                       |    1 
 include/net/irda/qos.h                               |    1 
 include/net/ndisc.h                                  |    1 
 include/net/netfilter/nf_conntrack.h                 |    1 
 include/net/pkt_act.h                                |    1 
 include/net/protocol.h                               |    1 
 include/net/raw.h                                    |    1 
 include/net/red.h                                    |    1 
 include/net/route.h                                  |    1 
 include/net/sch_generic.h                            |    1 
 include/net/sctp/sctp.h                              |    1 
 include/net/sock.h                                   |    1 
 include/net/tcp.h                                    |    1 
 include/pcmcia/ss.h                                  |    1 
 include/scsi/scsi_transport_fc.h                     |    1 
 include/scsi/scsi_transport_spi.h                    |    1 
 include/sound/driver.h                               |    1 
 include/video/edid.h                                 |    1 
 include/video/vga.h                                  |    1 
 870 files changed, 312 insertions(+), 1145 deletions(-)

Index: linux-2.6-header-cleanup-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-cleanup-git.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-header-cleanup-git.patch	27 Apr 2006 16:21:54 -0000	1.7
+++ linux-2.6-header-cleanup-git.patch	27 Apr 2006 17:41:36 -0000	1.8
@@ -10257,7 +10257,6 @@
  #include <linux/ioctl.h>
  
  #define BLKPG      _IO(0x12,105)
-only in patch2:
 unchanged:
 --- a/include/linux/ethtool.h
 +++ b/include/linux/ethtool.h
@@ -10589,7 +10588,6 @@
  
  /* CMDs currently supported */
  #define ETHTOOL_GSET		0x00000001 /* Get settings. */
-only in patch2:
 unchanged:
 --- a/include/linux/mii.h
 +++ b/include/linux/mii.h
@@ -10656,3 +10654,16 @@
 -
 +#endif /* __KERNEL__ */
  #endif /* __LINUX_MII_H__ */
+only in patch2:
+unchanged:
+--- a/include/linux/unistd.h
++++ b/include/linux/unistd.h
+@@ -1,8 +1,6 @@
+ #ifndef _LINUX_UNISTD_H_
+ #define _LINUX_UNISTD_H_
+ 
+-extern int errno;
+-
+ /*
+  * Include machine specific syscallX macros
+  */



From fedora-cvs-commits at redhat.com  Thu Apr 27 17:51:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 13:51:49 -0400
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders.spec, 1.117,
	1.118 sources, 1.30, 1.31
Message-ID: <200604271751.k3RHpnS6032128@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32101

Modified Files:
	glibc-kernheaders.spec sources 
Log Message:
kill errno declaration


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- glibc-kernheaders.spec	27 Apr 2006 16:25:09 -0000	1.117
+++ glibc-kernheaders.spec	27 Apr 2006 17:51:46 -0000	1.118
@@ -1,7 +1,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -92,6 +92,9 @@
 
 %changelog
 * Thu Apr 27 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-17
+- Remove 'extern int errno;' from linux/unistd.h
+
+* Thu Apr 27 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-17
 - Fix mii.h, ethtool.h, version.h, blkpg.h
 
 * Thu Apr 27 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-16


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	27 Apr 2006 16:25:09 -0000	1.30
+++ sources	27 Apr 2006 17:51:46 -0000	1.31
@@ -1 +1 @@
-41ae2c9ba23fc4a3536ffd67f402be10  glibc-kernheaders.tar.bz2
+a3a9b79916c0c0aee9c729559b87fd8a  glibc-kernheaders.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 17:52:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 13:52:54 -0400
Subject: rpms/rpm/devel rpm.spec,1.199,1.200 rpm-4.4.2-trust.patch,1.1,1.2
Message-ID: <200604271752.k3RHqspB032565@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32482

Modified Files:
	rpm.spec rpm-4.4.2-trust.patch 
Log Message:
Fix rpmk breakage



Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- rpm.spec	25 Apr 2006 21:21:57 -0000	1.199
+++ rpm.spec	27 Apr 2006 17:52:50 -0000	1.200
@@ -20,7 +20,7 @@
 %define version 4.4.2
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 19
+Release: 20
 Group: System Environment/Base
 Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz
 Source1: mono-find-provides
@@ -576,6 +576,9 @@
 %{__includedir}/popt.h
 
 %changelog
+* Thu Apr 27 2006 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-20
+- Update --trusted stubs for rpmk breakage
+
 * Tue Apr 25 2006 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-19
 - Add --trusted stubs from upstream
 

rpm-4.4.2-trust.patch:
 poptQV.c |   29 +++++++++++++++++++++--------
 rpmcli.h |    1 +
 2 files changed, 22 insertions(+), 8 deletions(-)

Index: rpm-4.4.2-trust.patch
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm-4.4.2-trust.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpm-4.4.2-trust.patch	25 Apr 2006 21:21:57 -0000	1.1
+++ rpm-4.4.2-trust.patch	27 Apr 2006 17:52:50 -0000	1.2
@@ -1,5 +1,5 @@
---- rpm-4.4.2/lib/poptQV.c.trust	2006-04-24 17:42:20.000000000 -0400
-+++ rpm-4.4.2/lib/poptQV.c	2006-04-24 17:44:05.000000000 -0400
+--- rpm-4.4.2/lib/poptQV.c.trust	2004-11-09 19:50:42.000000000 -0500
++++ rpm-4.4.2/lib/poptQV.c	2006-04-27 13:42:31.000000000 -0400
 @@ -31,6 +31,10 @@
  #define POPT_HDLIST		-1011
  #define POPT_FTSWALK		-1012
@@ -11,11 +11,10 @@
  /* ========== Query/Verify/Signature source args */
  static void rpmQVSourceArgCallback( /*@unused@*/ poptContext con,
  		/*@unused@*/ enum poptCallbackReason reason,
-@@ -87,6 +91,15 @@
- 	qva->qva_source |= RPMQV_DBOFFSET; 
- 	qva->qva_sourceCount++;
+@@ -240,6 +244,14 @@
+ 	qva->qva_flags |= VERIFY_SCRIPT;
  	break;
-+
+ 
 +    /* XXX perhaps POPT_ARG_INT instead of callback. */
 +    case POPT_TRUST:
 +    {	char * end = NULL;
@@ -27,7 +26,7 @@
      }
  }
  
-@@ -376,14 +389,6 @@
+@@ -376,14 +388,6 @@
          N_("don't verify package signature(s)"), NULL },
  #endif
  
@@ -42,7 +41,7 @@
      POPT_TABLEEND
  };
  
-@@ -408,6 +413,15 @@
+@@ -408,6 +412,15 @@
  	N_("sign package(s) (identical to --addsign)"), NULL },
   { "sign", '\0', POPT_ARGFLAG_DOC_HIDDEN, &rpmQVKArgs.sign, 0,
  	N_("generate signature"), NULL },
@@ -58,8 +57,8 @@
  
   { "nodigest", '\0', POPT_BIT_SET, &rpmQVKArgs.qva_flags, VERIFY_DIGEST,
          N_("don't verify package digest(s)"), NULL },
---- rpm-4.4.2/lib/rpmcli.h.trust	2006-04-24 17:42:28.000000000 -0400
-+++ rpm-4.4.2/lib/rpmcli.h	2006-04-24 17:42:33.000000000 -0400
+--- rpm-4.4.2/lib/rpmcli.h.trust	2005-01-04 11:35:05.000000000 -0500
++++ rpm-4.4.2/lib/rpmcli.h	2006-04-27 13:37:40.000000000 -0400
 @@ -280,6 +280,7 @@
  /*@only@*/ /*@null@*/
      const char * qva_queryFormat;/*!< Format for headerSprintf(). */



From fedora-cvs-commits at redhat.com  Thu Apr 27 18:02:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 14:02:34 -0400
Subject: rpms/gnu-efi/devel .cvsignore, 1.5, 1.6 gnu-efi.spec, 1.12,
	1.13 sources, 1.5, 1.6 gnu-efi-3.0-makefile.patch, 1.2,
	NONE gnu-efi-3.0-rodata.patch, 1.1,
	NONE gnu-efi-erikj-reloc.patch, 1.1,
	NONE gnu-efi-unwind-discard.patch, 1.1, NONE
Message-ID: <200604271802.k3RI2YAT003060@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/gnu-efi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2935

Modified Files:
	.cvsignore gnu-efi.spec sources 
Removed Files:
	gnu-efi-3.0-makefile.patch gnu-efi-3.0-rodata.patch 
	gnu-efi-erikj-reloc.patch gnu-efi-unwind-discard.patch 
Log Message:
Upgrade to gnu-efi-3.0c.  Get rid of some our patches which are no longer
necessary.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnu-efi/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Sep 2004 05:43:55 -0000	1.5
+++ .cvsignore	27 Apr 2006 18:02:00 -0000	1.6
@@ -1 +1,2 @@
 gnu-efi-3.0a.tar.gz
+gnu-efi-3.0c.tar.gz


Index: gnu-efi.spec
===================================================================
RCS file: /cvs/dist/rpms/gnu-efi/devel/gnu-efi.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnu-efi.spec	7 Feb 2006 11:57:35 -0000	1.12
+++ gnu-efi.spec	27 Apr 2006 18:02:15 -0000	1.13
@@ -1,16 +1,12 @@
 Summary: Development Libraries and headers for EFI
 Name: gnu-efi
-Version: 3.0a
-Release: 7.2
+Version: 3.0c
+Release: 1
 Group: Development/System
 License: GPL
 Source: ftp://ftp.hpl.hp.com/pub/linux-ia64/gnu-efi-%{version}.tar.gz
-Patch1: gnu-efi-3.0-makefile.patch
-Patch2: gnu-efi-3.0-rodata.patch
-Patch3: gnu-efi-erikj-reloc.patch
-Patch4: gnu-efi-unwind-discard.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-ExclusiveArch: ia64
+ExclusiveArch: ia64 i386
 
 %description
 This package contains development headers and libraries for developing
@@ -18,10 +14,6 @@
 
 %prep
 %setup
-%patch1 -p1
-#%patch2 -p1
-%patch3 -p0 
-%patch4 -p1
 
 %build
 make 
@@ -49,6 +41,10 @@
 /usr/lib/*
 
 %changelog
+* Thu Apr 27 2006 Chris Lumens <clumens at redhat.com> 3.0c-1
+- Upgrade to gnu-efi-3.0c.
+- Enable build on i386.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0a-7.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnu-efi/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Sep 2004 05:43:55 -0000	1.5
+++ sources	27 Apr 2006 18:02:15 -0000	1.6
@@ -1 +1 @@
-0f613e693cbc3f35ff1863ac23954baf  gnu-efi-3.0a.tar.gz
+823e5f04d1c0a7b88831f91fbf12d470  gnu-efi-3.0c.tar.gz


--- gnu-efi-3.0-makefile.patch DELETED ---


--- gnu-efi-3.0-rodata.patch DELETED ---


--- gnu-efi-erikj-reloc.patch DELETED ---


--- gnu-efi-unwind-discard.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 27 18:47:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 14:47:58 -0400
Subject: rpms/xorg-x11-proto-devel/devel .cvsignore, 1.14, 1.15 sources, 1.13,
	1.14 xorg-x11-proto-devel.spec, 1.28, 1.29
Message-ID: <200604271847.k3RIlwle008540@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-proto-devel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8499/devel

Modified Files:
	.cvsignore sources xorg-x11-proto-devel.spec 
Log Message:
auto-import xorg-x11-proto-devel-7.0-11 on branch devel from xorg-x11-proto-devel-7.0-11.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	7 Apr 2006 15:37:55 -0000	1.14
+++ .cvsignore	27 Apr 2006 18:47:55 -0000	1.15
@@ -1,4 +1,5 @@
 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
@@ -25,6 +26,5 @@
 xf86rushproto-1.1.2.tar.bz2
 xf86vidmodeproto-2.2.2.tar.bz2
 xineramaproto-1.1.2.tar.bz2
-xproto-7.0.4.tar.bz2
 xproxymanagementprotocol-1.0.2.tar.bz2
-compositeproto-0.3.1.tar.bz2
+xproto-7.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	7 Apr 2006 15:37:55 -0000	1.13
+++ sources	27 Apr 2006 18:47:55 -0000	1.14
@@ -1,4 +1,5 @@
 95c29d9d10bf2868996c0c47a3b9a8dc  bigreqsproto-1.0.2.tar.bz2
+54f1fbd567f57093df054f8440a60a5e  compositeproto-0.3.1.tar.bz2
 b3eaee9850bb23020b9ac751626c7976  damageproto-1.0.3.tar.bz2
 d80acad88411e7944b9b085463d53302  dmxproto-2.2.2.tar.bz2
 2507b5d0f4b2848147fbddd155aa6cfe  evieext-1.0.2.tar.bz2
@@ -25,6 +26,5 @@
 b6a96ffdae084e27487a58314008b000  xf86rushproto-1.1.2.tar.bz2
 f00844a63d6e76b69eb0eb5e41eed843  xf86vidmodeproto-2.2.2.tar.bz2
 1cc292c562962ad0ad3a253cae68c632  xineramaproto-1.1.2.tar.bz2
-9b7c807841c28289151f911fc1bea707  xproto-7.0.4.tar.bz2
 d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.tar.bz2
-54f1fbd567f57093df054f8440a60a5e  compositeproto-0.3.1.tar.bz2
+7ebf5b845817a867f2e4bdcabc33a257  xproto-7.0.5.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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xorg-x11-proto-devel.spec	10 Apr 2006 22:25:39 -0000	1.28
+++ xorg-x11-proto-devel.spec	27 Apr 2006 18:47:55 -0000	1.29
@@ -45,7 +45,7 @@
 Source26: %{sourceurl}/xf86rushproto-1.1.2.tar.bz2
 Source27: %{sourceurl}/xf86vidmodeproto-2.2.2.tar.bz2
 Source28: %{sourceurl}/xineramaproto-1.1.2.tar.bz2
-Source29: %{sourceurl}/xproto-7.0.4.tar.bz2
+Source29: %{sourceurl}/xproto-7.0.5.tar.bz2
 Source30: %{sourceurl}/xproxymanagementprotocol-1.0.2.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -278,8 +278,8 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
-* Mon Apr 10 2006 Kristian H??gsberg <krh at redhat.com> 7.0-11
-- Bump and build in fc5-bling.
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 7.0-11
+- Update to xproto 7.0.5 for misc fixes
 
 * Fri Apr  7 2006 Adam Jackson <ajackson at redhat.com> 7.0-10
 - Update to compositeproto-0.3.1 to fix big-endian LP64.



From fedora-cvs-commits at redhat.com  Thu Apr 27 18:52:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 14:52:09 -0400
Subject: rpms/xorg-x11-proto-devel/devel .cvsignore, 1.15, 1.16 sources, 1.14,
	1.15 xorg-x11-proto-devel.spec, 1.29, 1.30
Message-ID: <200604271852.k3RIq9rh010223@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-proto-devel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10187/devel

Modified Files:
	.cvsignore sources xorg-x11-proto-devel.spec 
Log Message:
auto-import xorg-x11-proto-devel-7.0-12 on branch devel from xorg-x11-proto-devel-7.0-12.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	27 Apr 2006 18:47:55 -0000	1.15
+++ .cvsignore	27 Apr 2006 18:52:06 -0000	1.16
@@ -26,5 +26,5 @@
 xf86rushproto-1.1.2.tar.bz2
 xf86vidmodeproto-2.2.2.tar.bz2
 xineramaproto-1.1.2.tar.bz2
-xproxymanagementprotocol-1.0.2.tar.bz2
 xproto-7.0.5.tar.bz2
+xproxymanagementprotocol-1.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	27 Apr 2006 18:47:55 -0000	1.14
+++ sources	27 Apr 2006 18:52:06 -0000	1.15
@@ -26,5 +26,5 @@
 b6a96ffdae084e27487a58314008b000  xf86rushproto-1.1.2.tar.bz2
 f00844a63d6e76b69eb0eb5e41eed843  xf86vidmodeproto-2.2.2.tar.bz2
 1cc292c562962ad0ad3a253cae68c632  xineramaproto-1.1.2.tar.bz2
-d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.tar.bz2
 7ebf5b845817a867f2e4bdcabc33a257  xproto-7.0.5.tar.bz2
+d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xorg-x11-proto-devel.spec	27 Apr 2006 18:47:55 -0000	1.29
+++ xorg-x11-proto-devel.spec	27 Apr 2006 18:52:06 -0000	1.30
@@ -10,7 +10,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.0
-Release: 11
+Release: 12
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
@@ -278,7 +278,7 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
-* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 7.0-11
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 7.0-12
 - Update to xproto 7.0.5 for misc fixes
 
 * Fri Apr  7 2006 Adam Jackson <ajackson at redhat.com> 7.0-10



From fedora-cvs-commits at redhat.com  Thu Apr 27 19:05:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 15:05:00 -0400
Subject: rpms/libdmx/devel .cvsignore, 1.6, 1.7 libdmx.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <200604271905.k3RJ50Ng013568@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libdmx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13547/devel

Modified Files:
	.cvsignore libdmx.spec sources 
Log Message:
auto-import libdmx-1.0.2-1 on branch devel from libdmx-1.0.2-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libdmx/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Jan 2006 22:36:38 -0000	1.6
+++ .cvsignore	27 Apr 2006 19:04:57 -0000	1.7
@@ -1 +1 @@
-libdmx-1.0.1.tar.bz2
+libdmx-1.0.2.tar.bz2


Index: libdmx.spec
===================================================================
RCS file: /cvs/dist/rpms/libdmx/devel/libdmx.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libdmx.spec	11 Feb 2006 03:54:59 -0000	1.10
+++ libdmx.spec	27 Apr 2006 19:04:57 -0000	1.11
@@ -1,11 +1,11 @@
 Summary: X.Org X11 libdmx runtime library
 Name: libdmx
-Version: 1.0.1
-Release: 1.2
+Version: 1.0.2
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: pkgconfig
@@ -76,6 +76,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
+- Update to 1.0.2
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libdmx/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Jan 2006 22:36:38 -0000	1.6
+++ sources	27 Apr 2006 19:04:57 -0000	1.7
@@ -1 +1 @@
-76275f8b6ec8f75509ef7d39c14e1dbc  libdmx-1.0.1.tar.bz2
+4d866967210d06098fc9f302ed4c79b1  libdmx-1.0.2.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 19:15:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 15:15:56 -0400
Subject: rpms/libfontenc/devel .cvsignore, 1.7, 1.8 libfontenc.spec, 1.12,
	1.13 sources, 1.7, 1.8
Message-ID: <200604271915.k3RJFuSl015306@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libfontenc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15249/devel

Modified Files:
	.cvsignore libfontenc.spec sources 
Log Message:
auto-import libfontenc-1.0.2-1 on branch devel from libfontenc-1.0.2-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libfontenc/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	23 Jan 2006 22:36:56 -0000	1.7
+++ .cvsignore	27 Apr 2006 19:15:52 -0000	1.8
@@ -1 +1 @@
-libfontenc-1.0.1.tar.bz2
+libfontenc-1.0.2.tar.bz2


Index: libfontenc.spec
===================================================================
RCS file: /cvs/dist/rpms/libfontenc/devel/libfontenc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libfontenc.spec	11 Feb 2006 03:55:56 -0000	1.12
+++ libfontenc.spec	27 Apr 2006 19:15:52 -0000	1.13
@@ -1,13 +1,13 @@
 Summary: X.Org X11 libfontenc runtime library
 Name: libfontenc
-Version: 1.0.1
-Release: 1.2
+Version: 1.0.2
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/release/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/release/individual/lib/%{name}-%{version}.tar.bz2
 Patch0: libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch
 
 BuildRequires: pkgconfig
@@ -84,6 +84,9 @@
 %{_libdir}/pkgconfig/fontenc.pc
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
+- Update to 1.0.2
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libfontenc/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jan 2006 22:36:56 -0000	1.7
+++ sources	27 Apr 2006 19:15:52 -0000	1.8
@@ -1 +1 @@
-8623cb508fe8f45a8b693a7c6d64b6e1  libfontenc-1.0.1.tar.bz2
+40d7d3718492cacfb0e0e8b9e1a0e251  libfontenc-1.0.2.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 19:16:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 15:16:00 -0400
Subject: rpms/libICE/devel .cvsignore, 1.5, 1.6 libICE.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <200604271916.k3RJG0VO015334@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libICE/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15291/devel

Modified Files:
	.cvsignore libICE.spec sources 
Log Message:
auto-import libICE-1.0.1-1 on branch devel from libICE-1.0.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libICE/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Dec 2005 10:58:49 -0000	1.5
+++ .cvsignore	27 Apr 2006 19:15:55 -0000	1.6
@@ -1 +1 @@
-libICE-1.0.0.tar.bz2
+libICE-1.0.1.tar.bz2


Index: libICE.spec
===================================================================
RCS file: /cvs/dist/rpms/libICE/devel/libICE.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libICE.spec	11 Feb 2006 04:08:02 -0000	1.11
+++ libICE.spec	27 Apr 2006 19:15:55 -0000	1.12
@@ -1,11 +1,11 @@
 Summary: X.Org X11 libICE runtime library
 Name: libICE
-Version: 1.0.0
-Release: 2.2
+Version: 1.0.1
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: pkgconfig
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/ice.pc
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
+- Update to 1.0.1
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libICE/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jan 2006 22:21:34 -0000	1.7
+++ sources	27 Apr 2006 19:15:55 -0000	1.8
@@ -1 +1 @@
-b9c5ec4b4f5fd351f7f4a50e15248b02  libICE-1.0.0.tar.bz2
+34cc902e97eb52d0f99874d7f0e2796e  libICE-1.0.1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 19:35:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 15:35:45 -0400
Subject: rpms/libSM/devel .cvsignore, 1.7, 1.8 libSM.spec, 1.11, 1.12 sources,
	1.7, 1.8
Message-ID: <200604271935.k3RJZj8D002472@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libSM/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2429/devel

Modified Files:
	.cvsignore libSM.spec sources 
Log Message:
auto-import libSM-1.0.1-1 on branch devel from libSM-1.0.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libSM/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Dec 2005 10:59:03 -0000	1.7
+++ .cvsignore	27 Apr 2006 19:35:16 -0000	1.8
@@ -1 +1 @@
-libSM-1.0.0.tar.bz2
+libSM-1.0.1.tar.bz2


Index: libSM.spec
===================================================================
RCS file: /cvs/dist/rpms/libSM/devel/libSM.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libSM.spec	11 Feb 2006 04:13:25 -0000	1.11
+++ libSM.spec	27 Apr 2006 19:35:16 -0000	1.12
@@ -1,11 +1,11 @@
 Summary: X.Org X11 libSM runtime library
 Name: libSM
-Version: 1.0.0
-Release: 2.2
+Version: 1.0.1
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: xorg-x11-proto-devel
@@ -79,6 +79,9 @@
 %{_libdir}/pkgconfig/sm.pc
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
+- Update to 1.0.1
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libSM/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jan 2006 22:21:48 -0000	1.7
+++ sources	27 Apr 2006 19:35:16 -0000	1.8
@@ -1 +1 @@
-7cfe53ae26000062725c470da11e7659  libSM-1.0.0.tar.bz2
+f15315b5ed2fde4dc6688ef004a34e8a  libSM-1.0.1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 19:39:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 15:39:24 -0400
Subject: rpms/libXaw/devel .cvsignore, 1.8, 1.9 libXaw.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <200604271939.k3RJdOCk003067@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXaw/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3022/devel

Modified Files:
	.cvsignore libXaw.spec sources 
Log Message:
auto-import libXaw-1.0.2-1 on branch devel from libXaw-1.0.2-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXaw/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	23 Jan 2006 22:22:52 -0000	1.8
+++ .cvsignore	27 Apr 2006 19:39:22 -0000	1.9
@@ -1 +1 @@
-libXaw-1.0.1.tar.bz2
+libXaw-1.0.2.tar.bz2


Index: libXaw.spec
===================================================================
RCS file: /cvs/dist/rpms/libXaw/devel/libXaw.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libXaw.spec	11 Feb 2006 04:17:35 -0000	1.11
+++ libXaw.spec	27 Apr 2006 19:39:22 -0000	1.12
@@ -1,13 +1,13 @@
 Summary: X.Org X11 libXaw runtime library
 Name: libXaw
-Version: 1.0.1
-Release: 1.2
+Version: 1.0.2
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.x.org
 
-Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
@@ -96,6 +96,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
+- Update to 1.0.2
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXaw/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jan 2006 22:22:52 -0000	1.7
+++ sources	27 Apr 2006 19:39:22 -0000	1.8
@@ -1 +1 @@
-6e8ccc66aa3cc06bec6c23a18678a037  libXaw-1.0.1.tar.bz2
+27dc85f84ac78eb619f72a0805a323f4  libXaw-1.0.2.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 19:39:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 15:39:41 -0400
Subject: rpms/libXcursor/devel .cvsignore, 1.6, 1.7 libXcursor.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <200604271939.k3RJdfS6003159@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXcursor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3095/devel

Modified Files:
	.cvsignore libXcursor.spec sources 
Log Message:
auto-import libXcursor-1.1.6-1 on branch devel from libXcursor-1.1.6-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXcursor/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Dec 2005 11:05:47 -0000	1.6
+++ .cvsignore	27 Apr 2006 19:39:37 -0000	1.7
@@ -1 +1 @@
-libXcursor-1.1.5.2.tar.bz2
+libXcursor-1.1.6.tar.bz2


Index: libXcursor.spec
===================================================================
RCS file: /cvs/dist/rpms/libXcursor/devel/libXcursor.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libXcursor.spec	11 Feb 2006 04:17:57 -0000	1.10
+++ libXcursor.spec	27 Apr 2006 19:39:37 -0000	1.11
@@ -1,11 +1,11 @@
 Summary: X.Org X11 libXcursor runtime library
 Name: libXcursor
-Version: 1.1.5.2
-Release: 2.2
+Version: 1.1.6
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 Source1: index.theme
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -87,6 +87,9 @@
 %{_mandir}/man3/Xcursor.3x*
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.1.6-1
+- Update to 1.1.6
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1.5.2-2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXcursor/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jan 2006 22:23:47 -0000	1.7
+++ sources	27 Apr 2006 19:39:37 -0000	1.8
@@ -1 +1 @@
-df4c922947d0d74791f9d492ee9e9865  libXcursor-1.1.5.2.tar.bz2
+1ac683d0ff22f1b6b21cbe5ead1d7899  libXcursor-1.1.6.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 19:43:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 15:43:56 -0400
Subject: rpms/libXdamage/devel .cvsignore, 1.5, 1.6 libXdamage.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <200604271943.k3RJhuW6004784@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXdamage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4749/devel

Modified Files:
	.cvsignore libXdamage.spec sources 
Log Message:
auto-import libXdamage-1.0.3-1 on branch devel from libXdamage-1.0.3-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXdamage/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Dec 2005 11:06:17 -0000	1.5
+++ .cvsignore	27 Apr 2006 19:43:54 -0000	1.6
@@ -1 +1 @@
-libXdamage-1.0.2.2.tar.bz2
+libXdamage-1.0.3.tar.bz2


Index: libXdamage.spec
===================================================================
RCS file: /cvs/dist/rpms/libXdamage/devel/libXdamage.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libXdamage.spec	11 Feb 2006 04:18:09 -0000	1.10
+++ libXdamage.spec	27 Apr 2006 19:43:54 -0000	1.11
@@ -1,11 +1,11 @@
 Summary: X.Org X11 libXdamage runtime library
 Name: libXdamage
-Version: 1.0.2.2
-Release: 2.2
+Version: 1.0.3
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: pkgconfig
@@ -76,6 +76,9 @@
 %{_libdir}/pkgconfig/xdamage.pc
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.3-1
+- Update to 1.0.3
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.2.2-2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXdamage/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jan 2006 22:24:11 -0000	1.7
+++ sources	27 Apr 2006 19:43:54 -0000	1.8
@@ -1 +1 @@
-d8a367fe34feb3a7a3314137ff3e9c18  libXdamage-1.0.2.2.tar.bz2
+ff05bcad724383515cdedfe44b386653  libXdamage-1.0.3.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 19:47:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 15:47:31 -0400
Subject: rpms/libXdmcp/devel .cvsignore, 1.6, 1.7 libXdmcp.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <200604271947.k3RJlVsF011062@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXdmcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10556/devel

Modified Files:
	.cvsignore libXdmcp.spec sources 
Log Message:
auto-import libXdmcp-1.0.1-1 on branch devel from libXdmcp-1.0.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXdmcp/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Dec 2005 11:06:31 -0000	1.6
+++ .cvsignore	27 Apr 2006 19:47:28 -0000	1.7
@@ -1 +1 @@
-libXdmcp-1.0.0.tar.bz2
+libXdmcp-1.0.1.tar.bz2


Index: libXdmcp.spec
===================================================================
RCS file: /cvs/dist/rpms/libXdmcp/devel/libXdmcp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libXdmcp.spec	11 Feb 2006 04:18:20 -0000	1.10
+++ libXdmcp.spec	27 Apr 2006 19:47:28 -0000	1.11
@@ -1,11 +1,11 @@
 Summary: X.Org X11 libXdmcp runtime library
 Name: libXdmcp
-Version: 1.0.0
-Release: 2.2
+Version: 1.0.1
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: pkgconfig
@@ -73,6 +73,9 @@
 %{_libdir}/pkgconfig/xdmcp.pc
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
+- Update to 1.0.1
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXdmcp/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jan 2006 22:24:43 -0000	1.7
+++ sources	27 Apr 2006 19:47:28 -0000	1.8
@@ -1 +1 @@
-c26c2b2320565824e271758096d10743  libXdmcp-1.0.0.tar.bz2
+43d660d47ed81a3d852bcc42524e62d4  libXdmcp-1.0.1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 19:54:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 15:54:20 -0400
Subject: rpms/libXevie/devel .cvsignore, 1.5, 1.6 libXevie.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <200604271954.k3RJsK38021943@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXevie/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21909/devel

Modified Files:
	.cvsignore libXevie.spec sources 
Log Message:
auto-import libXevie-1.0.1-1 on branch devel from libXevie-1.0.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXevie/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Dec 2005 11:06:44 -0000	1.5
+++ .cvsignore	27 Apr 2006 19:54:17 -0000	1.6
@@ -1 +1 @@
-libXevie-1.0.0.tar.bz2
+libXevie-1.0.1.tar.bz2


Index: libXevie.spec
===================================================================
RCS file: /cvs/dist/rpms/libXevie/devel/libXevie.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libXevie.spec	11 Feb 2006 04:18:32 -0000	1.10
+++ libXevie.spec	27 Apr 2006 19:54:17 -0000	1.11
@@ -1,11 +1,11 @@
 Summary: X.Org X11 libXevie runtime library
 Name: libXevie
-Version: 1.0.0
-Release: 2.2
+Version: 1.0.1
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: pkgconfig
@@ -80,6 +80,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
+- Update to 1.0.1
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXevie/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Jan 2006 22:25:08 -0000	1.6
+++ sources	27 Apr 2006 19:54:17 -0000	1.7
@@ -1 +1 @@
-05903385dd79c1d77fa5d3edc17c6555  libXevie-1.0.0.tar.bz2
+a8d6d20ad665aefda75f6543325af72c  libXevie-1.0.1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 19:56:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 15:56:00 -0400
Subject: rpms/libXext/devel .cvsignore, 1.6, 1.7 libXext.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <200604271956.k3RJu0Gx022642@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXext/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22604/devel

Modified Files:
	.cvsignore libXext.spec sources 
Log Message:
auto-import libXext-1.0.1-1 on branch devel from libXext-1.0.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXext/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Dec 2005 11:06:59 -0000	1.6
+++ .cvsignore	27 Apr 2006 19:55:57 -0000	1.7
@@ -1 +1 @@
-libXext-1.0.0.tar.bz2
+libXext-1.0.1.tar.bz2


Index: libXext.spec
===================================================================
RCS file: /cvs/dist/rpms/libXext/devel/libXext.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libXext.spec	11 Feb 2006 04:18:43 -0000	1.11
+++ libXext.spec	27 Apr 2006 19:55:57 -0000	1.12
@@ -1,11 +1,11 @@
 Summary: X.Org X11 libXext runtime library
 Name: libXext
-Version: 1.0.0
-Release: 3.2
+Version: 1.0.1
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: pkgconfig
@@ -130,6 +130,9 @@
 %{_mandir}/man3/XmbufQueryExtension.3x*
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
+- Update to 1.0.1
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-3.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXext/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jan 2006 22:25:28 -0000	1.7
+++ sources	27 Apr 2006 19:55:57 -0000	1.8
@@ -1 +1 @@
-ee00e206adde27814b8832aa769f55ed  libXext-1.0.0.tar.bz2
+d7f3f752d291865108689c889d160ea0  libXext-1.0.1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 19:56:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 15:56:18 -0400
Subject: rpms/libXfontcache/devel .cvsignore, 1.6, 1.7 libXfontcache.spec,
	1.10, 1.11 sources, 1.6, 1.7
Message-ID: <200604271956.k3RJuIaL022822@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXfontcache/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22789/devel

Modified Files:
	.cvsignore libXfontcache.spec sources 
Log Message:
auto-import libXfontcache-1.0.2-1 on branch devel from libXfontcache-1.0.2-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXfontcache/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Jan 2006 22:26:25 -0000	1.6
+++ .cvsignore	27 Apr 2006 19:56:16 -0000	1.7
@@ -1 +1 @@
-libXfontcache-1.0.1.tar.bz2
+libXfontcache-1.0.2.tar.bz2


Index: libXfontcache.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfontcache/devel/libXfontcache.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libXfontcache.spec	11 Feb 2006 04:19:30 -0000	1.10
+++ libXfontcache.spec	27 Apr 2006 19:56:16 -0000	1.11
@@ -1,11 +1,11 @@
 Summary: X.Org X11 libXfontcache runtime library
 Name: libXfontcache
-Version: 1.0.1
-Release: 1.2
+Version: 1.0.2
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: pkgconfig
@@ -84,6 +84,9 @@
 %{_mandir}/man3/FontCacheQueryVersion.3x*
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
+- Update to 1.0.2
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXfontcache/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Jan 2006 22:26:25 -0000	1.6
+++ sources	27 Apr 2006 19:56:16 -0000	1.7
@@ -1 +1 @@
-8ce62afe8400cb19b4ea91c1aab2607b  libXfontcache-1.0.1.tar.bz2
+837d84166ae0dad5dc896f24206a92a5  libXfontcache-1.0.2.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 19:59:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 15:59:19 -0400
Subject: rpms/libXi/devel .cvsignore, 1.5, 1.6 libXi.spec, 1.10, 1.11 sources,
	1.6, 1.7
Message-ID: <200604271959.k3RJxJeS024056@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24018/devel

Modified Files:
	.cvsignore libXi.spec sources 
Log Message:
auto-import libXi-1.0.1-1 on branch devel from libXi-1.0.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXi/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Dec 2005 11:08:07 -0000	1.5
+++ .cvsignore	27 Apr 2006 19:59:17 -0000	1.6
@@ -1 +1 @@
-libXi-1.0.0.tar.bz2
+libXi-1.0.1.tar.bz2


Index: libXi.spec
===================================================================
RCS file: /cvs/dist/rpms/libXi/devel/libXi.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libXi.spec	11 Feb 2006 04:19:52 -0000	1.10
+++ libXi.spec	27 Apr 2006 19:59:17 -0000	1.11
@@ -1,11 +1,11 @@
 Summary: X.Org X11 libXi runtime library
 Name: libXi
-Version: 1.0.0
-Release: 2.2
+Version: 1.0.1
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: pkgconfig
@@ -78,6 +78,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
+- Update to 1.0.1
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXi/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Jan 2006 22:27:18 -0000	1.6
+++ sources	27 Apr 2006 19:59:17 -0000	1.7
@@ -1 +1 @@
-d952f57daa10135db64c53fa0e204cc6  libXi-1.0.0.tar.bz2
+0efe6758c98257edb009551eac53fcfb  libXi-1.0.1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 20:06:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 16:06:27 -0400
Subject: rpms/libxkbfile/devel .cvsignore, 1.7, 1.8 libxkbfile.spec, 1.13,
	1.14 sources, 1.7, 1.8
Message-ID: <200604272006.k3RK6RBB024760@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libxkbfile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24656/devel

Modified Files:
	.cvsignore libxkbfile.spec sources 
Log Message:
auto-import libxkbfile-1.0.3-1 on branch devel from libxkbfile-1.0.3-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libxkbfile/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Mar 2006 15:30:09 -0000	1.7
+++ .cvsignore	27 Apr 2006 20:06:08 -0000	1.8
@@ -1 +1 @@
-libxkbfile-1.0.2.tar.bz2
+libxkbfile-1.0.3.tar.bz2


Index: libxkbfile.spec
===================================================================
RCS file: /cvs/dist/rpms/libxkbfile/devel/libxkbfile.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libxkbfile.spec	2 Mar 2006 15:30:09 -0000	1.13
+++ libxkbfile.spec	27 Apr 2006 20:06:08 -0000	1.14
@@ -1,6 +1,6 @@
 Summary: X.Org X11 libxkbfile runtime library
 Name: libxkbfile
-Version: 1.0.2
+Version: 1.0.3
 Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
@@ -82,6 +82,9 @@
 %{_libdir}/pkgconfig/xkbfile.pc
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.3-1
+- Update to 1.0.3
+
 * Tue Feb 28 2006 Adam Jackson <ajackson at redhat.com> - 1.0.2-1
 - Updated libxkbfile to version 1.0.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libxkbfile/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Mar 2006 15:30:09 -0000	1.7
+++ sources	27 Apr 2006 20:06:08 -0000	1.8
@@ -1 +1 @@
-b7b2fd1eb3ccd5d1ed37cab1780b6013  libxkbfile-1.0.2.tar.bz2
+70f579c157f229a79e95f04eb0f583e0  libxkbfile-1.0.3.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 20:08:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 16:08:51 -0400
Subject: rpms/libxkbui/devel .cvsignore, 1.6, 1.7 libxkbui.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <200604272008.k3RK8px2024962@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libxkbui/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24915/devel

Modified Files:
	.cvsignore libxkbui.spec sources 
Log Message:
auto-import libxkbui-1.0.2-1 on branch devel from libxkbui-1.0.2-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libxkbui/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Jan 2006 22:37:59 -0000	1.6
+++ .cvsignore	27 Apr 2006 20:08:37 -0000	1.7
@@ -1 +1 @@
-libxkbui-1.0.1.tar.bz2
+libxkbui-1.0.2.tar.bz2


Index: libxkbui.spec
===================================================================
RCS file: /cvs/dist/rpms/libxkbui/devel/libxkbui.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libxkbui.spec	11 Feb 2006 04:20:23 -0000	1.10
+++ libxkbui.spec	27 Apr 2006 20:08:37 -0000	1.11
@@ -1,11 +1,11 @@
 Summary: X.Org X11 libxkbui runtime library
 Name: libxkbui
-Version: 1.0.1
-Release: 1.2
+Version: 1.0.2
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libX11-devel
@@ -76,6 +76,9 @@
 %{_libdir}/pkgconfig/xkbui.pc
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
+- Update to 1.0.2
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libxkbui/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Jan 2006 22:37:59 -0000	1.6
+++ sources	27 Apr 2006 20:08:37 -0000	1.7
@@ -1 +1 @@
-ed35b209b17fab2660cc7821d5001197  libxkbui-1.0.1.tar.bz2
+1143e456f7429e18e88f2eadb2f2b6b1  libxkbui-1.0.2.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 20:10:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 16:10:48 -0400
Subject: rpms/libXmu/devel .cvsignore, 1.5, 1.6 libXmu.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <200604272010.k3RKAmcW025252@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXmu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25165/devel

Modified Files:
	.cvsignore libXmu.spec sources 
Log Message:
auto-import libXmu-1.0.1-1 on branch devel from libXmu-1.0.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXmu/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Dec 2005 11:08:33 -0000	1.5
+++ .cvsignore	27 Apr 2006 20:10:45 -0000	1.6
@@ -1 +1 @@
-libXmu-1.0.0.tar.bz2
+libXmu-1.0.1.tar.bz2


Index: libXmu.spec
===================================================================
RCS file: /cvs/dist/rpms/libXmu/devel/libXmu.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libXmu.spec	11 Feb 2006 04:21:08 -0000	1.10
+++ libXmu.spec	27 Apr 2006 20:10:45 -0000	1.11
@@ -1,11 +1,11 @@
 Summary: X.Org X11 libXmu/libXmuu runtime libraries
 Name: libXmu
-Version: 1.0.0
-Release: 2.2
+Version: 1.0.1
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: pkgconfig
@@ -105,6 +105,9 @@
 %{_libdir}/pkgconfig/xmuu.pc
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
+- Update to 1.0.1
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXmu/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Jan 2006 22:27:50 -0000	1.6
+++ sources	27 Apr 2006 20:10:45 -0000	1.7
@@ -1 +1 @@
-e34d2a7b66f07f864f6edddf7d329fcd  libXmu-1.0.0.tar.bz2
+93ff54222a564464bd1208b1947f2f21  libXmu-1.0.1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 20:28:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 16:28:19 -0400
Subject: rpms/openldap/devel db-4.4.20-1.patch, NONE, 1.1 db-4.4.20-2.patch,
	NONE, 1.1 .cvsignore, 1.22, 1.23 openldap.spec, 1.54,
	1.55 sources, 1.23, 1.24
Message-ID: <200604272028.k3RKSJ2g021119@cvs.devel.redhat.com>

Author: fenlason

Update of /cvs/dist/rpms/openldap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21101

Modified Files:
	.cvsignore openldap.spec sources 
Added Files:
	db-4.4.20-1.patch db-4.4.20-2.patch 
Log Message:
2.3.21


db-4.4.20-1.patch:
 qam_files.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE db-4.4.20-1.patch ---
Fix a bug that could cause a trap during recovery if multiple 
operations that could remove the same extent were recovered. [#14061]


*** qam/qam_files.c.orig	2005-10-20 11:57:12.000000000 -0700
--- qam/qam_files.c	2006-01-27 13:38:38.000000000 -0800
***************
*** 411,416 ****
--- 411,422 ----
  	    DB_APP_DATA, buf, 0, NULL, &real_name)) != 0)
  		goto err;
  #endif
+ 
+ 	mpf = array->mpfarray[offset].mpf;
+ 	/* This extent my already be marked for delete and closed. */
+ 	if (mpf == NULL)
+ 		goto err;
+ 
  	/*
  	 * The log must be flushed before the file is deleted.  We depend on
  	 * the log record of the last delete to recreate the file if we crash.
***************
*** 418,424 ****
  	if (LOGGING_ON(dbenv) && (ret = __log_flush(dbenv, NULL)) != 0)
  		goto err;
  
- 	mpf = array->mpfarray[offset].mpf;
  	(void)__memp_set_flags(mpf, DB_MPOOL_UNLINK, 1);
  	/* Someone could be real slow, let them close it down. */
  	if (array->mpfarray[offset].pinref != 0)
--- 424,429 ----

db-4.4.20-2.patch:
 txn.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE db-4.4.20-2.patch ---
Fix a bug that could cause traps or hangs if the DB_TXN->set_name function 
is used in a multithreaded application. [#14033]


*** txn/txn.c.orig	Tue Nov  1 06:50:03 2005
--- txn/txn.c	Tue Jan 31 15:05:13 2006
***************
*** 1049,1060 ****
--- 1049,1062 ----
  		return (ret);
  	memcpy(txn->name, name, len);
  
+ 	TXN_SYSTEM_LOCK(dbenv);
  	if (td->name != INVALID_ROFF) {
  		__db_shalloc_free(
  		    &mgr->reginfo, R_ADDR(&mgr->reginfo, td->name));
  		td->name = INVALID_ROFF;
  	}
  	if ((ret = __db_shalloc(&mgr->reginfo, len, 0, &p)) != 0) {
+ 		TXN_SYSTEM_UNLOCK(dbenv);
  		__db_err(dbenv,
  		    "Unable to allocate memory for transaction name");
  
***************
*** 1063,1068 ****
--- 1065,1071 ----
  
  		return (ret);
  	}
+ 	TXN_SYSTEM_UNLOCK(dbenv);
  	td->name = R_OFFSET(&mgr->reginfo, p);
  	memcpy(p, name, len);


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openldap/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	31 Jan 2006 21:47:36 -0000	1.22
+++ .cvsignore	27 Apr 2006 20:28:17 -0000	1.23
@@ -4,3 +4,4 @@
 db-4.4.20.tar.gz
 autoconf-2.13.1.tar.gz
 automake-1.4a.tar.gz
+openldap-2.3.21.tgz


Index: openldap.spec
===================================================================
RCS file: /cvs/dist/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- openldap.spec	13 Feb 2006 16:11:17 -0000	1.54
+++ openldap.spec	27 Apr 2006 20:28:17 -0000	1.55
@@ -2,7 +2,7 @@
 %define db_version 4.4.20
 %define ldbm_backend berkeley
 %define version_22 2.2.29
-%define version_23 2.3.19
+%define version_23 2.3.21
 %define evolution_connector_prefix %{_libdir}/evolution-openldap
 %define evolution_connector_includedir %{evolution_connector_prefix}/include
 %define evolution_connector_libdir %{evolution_connector_prefix}/%{_lib}
@@ -13,7 +13,7 @@
 Summary: The configuration files, libraries, and documentation for OpenLDAP.
 Name: openldap
 Version: %{version_23}
-Release: 4
+Release: 2
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz
@@ -57,6 +57,8 @@
 Patch304: MigrationTools-46-schema.patch
 Patch305: MigrationTools-45-noaliases.patch
 
+Patch400: db-4.4.20-1.patch
+Patch401: db-4.4.20-2.patch
 
 URL: http://www.openldap.org/
 BuildRoot: %{_tmppath}/%{name}-%{version_23}-root
@@ -151,6 +153,12 @@
 %prep
 %setup -q -c -a 1 -a 2 -a 3 -a 4 -a 5
 
+pushd db-%{db_version}
+%patch400 -b .patch1
+%patch401 -b .patch2
+popd
+
+
 pushd openldap-%{version_23}
 cp %{_datadir}/libtool/config.{sub,guess} build/
 popd
@@ -221,7 +229,6 @@
 %build
 autodir=`pwd`/auto-instroot
 dbdir=`pwd`/db-instroot
-dbdir40=`pwd`/db-instroot-4.0
 libtool='%{_bindir}/libtool'
 tagname=CC; export tagname
 PATH=${autodir}/bin:${PATH}
@@ -682,6 +689,10 @@
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Thu Apr 27 2006 Jay Fenlason <fenlason at redhat.com> 2.3.21-2
+- Upgrade to 2.3.21
+- Add two upstream patches for db-4.4.20
+
 * Mon Feb 13 2006 Jay Fenlason <fenlason at redhat.com> 2.3.19-4
 - Re-fix ldap.init
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openldap/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	31 Jan 2006 21:47:36 -0000	1.23
+++ sources	27 Apr 2006 20:28:17 -0000	1.24
@@ -2,5 +2,5 @@
 0faee50993f7e4fe00f4b921b640b84d  automake-1.4a.tar.gz
 6c4c72a1336aa45b463e738034c078d6  openldap-2.2.29.tgz
 dc80548f76d6aeba2b51b15751e08b21  MigrationTools-46.tar.gz
-867ee197df0e4432fa00f2439e6094f6  openldap-2.3.19.tgz
 33851f01b455cca48aa601956de93c6f  db-4.4.20.tar.gz
+37ef142fc05abd088a4bb2d30dc4c679  openldap-2.3.21.tgz



From fedora-cvs-commits at redhat.com  Thu Apr 27 20:33:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 16:33:24 -0400
Subject: rpms/libXpm/devel .cvsignore, 1.6, 1.7 libXpm.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <200604272033.k3RKXOj8021254@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21234/devel

Modified Files:
	.cvsignore libXpm.spec sources 
Log Message:
auto-import libXpm-3.5.5-1 on branch devel from libXpm-3.5.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXpm/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Dec 2005 11:09:00 -0000	1.6
+++ .cvsignore	27 Apr 2006 20:33:22 -0000	1.7
@@ -1 +1 @@
-libXpm-3.5.4.2.tar.bz2
+libXpm-3.5.5.tar.bz2


Index: libXpm.spec
===================================================================
RCS file: /cvs/dist/rpms/libXpm/devel/libXpm.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libXpm.spec	11 Feb 2006 04:21:30 -0000	1.11
+++ libXpm.spec	27 Apr 2006 20:33:22 -0000	1.12
@@ -1,11 +1,11 @@
 Summary: X.Org X11 libXpm runtime library
 Name: libXpm
-Version: 3.5.4.2
-Release: 2.2
+Version: 3.5.5
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: xorg-x11-proto-devel
@@ -89,6 +89,9 @@
 #%{_mandir}/man1/*.1x*
 
 %changelog
+* Thu Apr 26 2006 Adam Jackson <ajackson at redhat.com> 3.5.5-1
+- Update to 3.5.5
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.5.4.2-2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXpm/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jan 2006 22:28:19 -0000	1.7
+++ sources	27 Apr 2006 20:33:22 -0000	1.8
@@ -1 +1 @@
-ee74fa5fc1804d99a7d57723fe4d1a09  libXpm-3.5.4.2.tar.bz2
+2b897e6a41dafa0716c197df308fbf0c  libXpm-3.5.5.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 20:34:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 16:34:48 -0400
Subject: rpms/libXrandr/devel .cvsignore, 1.6, 1.7 libXrandr.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <200604272034.k3RKYmVx021348@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXrandr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21319/devel

Modified Files:
	.cvsignore libXrandr.spec sources 
Log Message:
auto-import libXrandr-1.1.1-1 on branch devel from libXrandr-1.1.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXrandr/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Dec 2005 11:09:13 -0000	1.6
+++ .cvsignore	27 Apr 2006 20:34:44 -0000	1.7
@@ -1 +1 @@
-libXrandr-1.1.0.2.tar.bz2
+libXrandr-1.1.1.tar.bz2


Index: libXrandr.spec
===================================================================
RCS file: /cvs/dist/rpms/libXrandr/devel/libXrandr.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libXrandr.spec	11 Feb 2006 04:21:44 -0000	1.10
+++ libXrandr.spec	27 Apr 2006 20:34:44 -0000	1.11
@@ -1,11 +1,11 @@
 Summary: X.Org X11 libXrandr runtime library
 Name: libXrandr
-Version: 1.1.0.2
-Release: 2.2
+Version: 1.1.1
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #BuildRequires: randrproto >= 0.99
@@ -81,6 +81,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-1
+- Update to 1.1.1
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1.0.2-2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXrandr/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jan 2006 22:28:36 -0000	1.7
+++ sources	27 Apr 2006 20:34:44 -0000	1.8
@@ -1 +1 @@
-9188bb611be2a67f9019208b27016670  libXrandr-1.1.0.2.tar.bz2
+000374333b982ff13b30c2fc49ac41f8  libXrandr-1.1.1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 20:37:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 16:37:50 -0400
Subject: rpms/libXrender/devel .cvsignore, 1.4, 1.5 libXrender.spec, 1.11,
	1.12 sources, 1.6, 1.7
Message-ID: <200604272037.k3RKboV0021453@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXrender/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21429/devel

Modified Files:
	.cvsignore libXrender.spec sources 
Log Message:
auto-import libXrender-0.9.1-1 on branch devel from libXrender-0.9.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXrender/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Dec 2005 11:09:26 -0000	1.4
+++ .cvsignore	27 Apr 2006 20:37:48 -0000	1.5
@@ -1 +1 @@
-libXrender-0.9.0.2.tar.bz2
+libXrender-0.9.1.tar.bz2


Index: libXrender.spec
===================================================================
RCS file: /cvs/dist/rpms/libXrender/devel/libXrender.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libXrender.spec	11 Feb 2006 04:21:55 -0000	1.11
+++ libXrender.spec	27 Apr 2006 20:37:48 -0000	1.12
@@ -1,11 +1,11 @@
 Summary: X.Org X11 libXrender runtime library
 Name: libXrender
-Version: 0.9.0.2
-Release: 3.2
+Version: 0.9.1
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: xorg-x11-proto-devel
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/xrender.pc
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 0.9.1-1
+- Update to 0.9.1
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.9.0.2-3.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXrender/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Jan 2006 22:28:54 -0000	1.6
+++ sources	27 Apr 2006 20:37:48 -0000	1.7
@@ -1 +1 @@
-81cdd3c9f16c50266d828670bf672c4c  libXrender-0.9.0.2.tar.bz2
+220e15bb5e0ae23b6af99dd2e0b70a7f  libXrender-0.9.1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 20:42:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 16:42:34 -0400
Subject: rpms/libXres/devel .cvsignore, 1.6, 1.7 libXres.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <200604272042.k3RKgYpl021619@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXres/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21597/devel

Modified Files:
	.cvsignore libXres.spec sources 
Log Message:
auto-import libXres-1.0.1-1 on branch devel from libXres-1.0.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXres/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Dec 2005 11:09:40 -0000	1.6
+++ .cvsignore	27 Apr 2006 20:42:32 -0000	1.7
@@ -1 +1 @@
-libXres-1.0.0.tar.bz2
+libXres-1.0.1.tar.bz2


Index: libXres.spec
===================================================================
RCS file: /cvs/dist/rpms/libXres/devel/libXres.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libXres.spec	11 Feb 2006 04:22:04 -0000	1.10
+++ libXres.spec	27 Apr 2006 20:42:32 -0000	1.11
@@ -1,11 +1,11 @@
 Summary: X.Org X11 libXres runtime library
 Name: libXres
-Version: 1.0.0
-Release: 2.2
+Version: 1.0.1
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libX11-devel
@@ -78,6 +78,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
+- Update to 1.0.1
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXres/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jan 2006 22:29:11 -0000	1.7
+++ sources	27 Apr 2006 20:42:32 -0000	1.8
@@ -1 +1 @@
-1de4e33d55374e7068704c58c672c0ce  libXres-1.0.0.tar.bz2
+0bd0bfbbc093871f2bf395e2f101d334  libXres-1.0.1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 20:45:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 16:45:29 -0400
Subject: rpms/libXt/devel .cvsignore, 1.6, 1.7 libXt.spec, 1.15, 1.16 sources,
	1.7, 1.8
Message-ID: <200604272045.k3RKjTSp021772@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21747/devel

Modified Files:
	.cvsignore libXt.spec sources 
Log Message:
auto-import libXt-1.0.1-1 on branch devel from libXt-1.0.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXt/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Dec 2005 11:09:55 -0000	1.6
+++ .cvsignore	27 Apr 2006 20:45:27 -0000	1.7
@@ -1 +1 @@
-libXt-1.0.0.tar.bz2
+libXt-1.0.1.tar.bz2


Index: libXt.spec
===================================================================
RCS file: /cvs/dist/rpms/libXt/devel/libXt.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libXt.spec	11 Feb 2006 04:22:39 -0000	1.15
+++ libXt.spec	27 Apr 2006 20:45:27 -0000	1.16
@@ -1,11 +1,11 @@
 Summary: X.Org X11 libXt runtime library
 Name: libXt
-Version: 1.0.0
-Release: 2.2
+Version: 1.0.1
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: xorg-x11-proto-devel
@@ -129,6 +129,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
+- Update to 1.0.1
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXt/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jan 2006 22:29:25 -0000	1.7
+++ sources	27 Apr 2006 20:45:27 -0000	1.8
@@ -1 +1 @@
-ac88ae86bcfae3b062a84e9d26c3effc  libXt-1.0.0.tar.bz2
+c0d7f014448239f1c22caf05aa2821a9  libXt-1.0.1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 20:47:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 16:47:43 -0400
Subject: rpms/libXxf86dga/devel .cvsignore, 1.6, 1.7 libXxf86dga.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <200604272047.k3RKlhiB031705@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXxf86dga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31261/devel

Modified Files:
	.cvsignore libXxf86dga.spec sources 
Log Message:
auto-import libXxf86dga-1.0.1-1 on branch devel from libXxf86dga-1.0.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXxf86dga/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Dec 2005 11:10:55 -0000	1.6
+++ .cvsignore	27 Apr 2006 20:47:41 -0000	1.7
@@ -1 +1 @@
-libXxf86dga-1.0.0.tar.bz2
+libXxf86dga-1.0.1.tar.bz2


Index: libXxf86dga.spec
===================================================================
RCS file: /cvs/dist/rpms/libXxf86dga/devel/libXxf86dga.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libXxf86dga.spec	11 Feb 2006 04:23:28 -0000	1.10
+++ libXxf86dga.spec	27 Apr 2006 20:47:41 -0000	1.11
@@ -1,11 +1,11 @@
 Summary: X.Org X11 libXxf86dga runtime library
 Name: libXxf86dga
-Version: 1.0.0
-Release: 2.2
+Version: 1.0.1
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: xorg-x11-proto-devel
@@ -75,6 +75,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
+- Update to 1.0.1
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXxf86dga/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jan 2006 22:34:38 -0000	1.7
+++ sources	27 Apr 2006 20:47:41 -0000	1.8
@@ -1 +1 @@
-f55756a5513ef102fea3ebdc3fd2af4d  libXxf86dga-1.0.0.tar.bz2
+5b0e752c71a23e9d1290cad44a7c7c75  libXxf86dga-1.0.1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 20:58:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 16:58:03 -0400
Subject: rpms/libXvMC/devel .cvsignore, 1.6, 1.7 libXvMC.spec, 1.12,
	1.13 sources, 1.6,
	1.7 libXvMC-1.0.1-libXvMC-XConfigDir-fix-bug180902.patch, 1.1, NONE
Message-ID: <200604272058.k3RKw3rv003361@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXvMC/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3337/devel

Modified Files:
	.cvsignore libXvMC.spec sources 
Removed Files:
	libXvMC-1.0.1-libXvMC-XConfigDir-fix-bug180902.patch 
Log Message:
auto-import libXvMC-1.0.2-1 on branch devel from libXvMC-1.0.2-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXvMC/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Jan 2006 22:33:24 -0000	1.6
+++ .cvsignore	27 Apr 2006 20:58:01 -0000	1.7
@@ -1 +1 @@
-libXvMC-1.0.1.tar.bz2
+libXvMC-1.0.2.tar.bz2


Index: libXvMC.spec
===================================================================
RCS file: /cvs/dist/rpms/libXvMC/devel/libXvMC.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXvMC.spec	22 Feb 2006 05:58:56 -0000	1.12
+++ libXvMC.spec	27 Apr 2006 20:58:01 -0000	1.13
@@ -1,14 +1,13 @@
 Summary: X.Org X11 libXvMC runtime library
 Name: libXvMC
-Version: 1.0.1
-Release: 3
+Version: 1.0.2
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
-Patch0: libXvMC-1.0.1-libXvMC-XConfigDir-fix-bug180902.patch
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
@@ -38,14 +37,11 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .libXvMC-XConfigDir-fix-bug180902
 
 # Disable static library creation by default.
 %define with_static 0
 
 %build
-automake-1.7
-autoconf
 
 %configure \
 %if ! %{with_static}
@@ -89,6 +85,9 @@
 %{_libdir}/pkgconfig/xvmc.pc
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
+- Update to 1.0.2.  Drop #180902 patch, already fixed upstream.
+
 * Tue Feb 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
 - Added libXvMC-1.0.1-libXvMC-XConfigDir-fix-bug180902.patch to fix (#180902)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXvMC/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Jan 2006 22:33:24 -0000	1.6
+++ sources	27 Apr 2006 20:58:01 -0000	1.7
@@ -1 +1 @@
-9e8e6fee2617abf589f08aea69f4fb43  libXvMC-1.0.1.tar.bz2
+a6cc02c3c7879d9e36d5de24a5471c78  libXvMC-1.0.2.tar.bz2


--- libXvMC-1.0.1-libXvMC-XConfigDir-fix-bug180902.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 27 21:02:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 17:02:54 -0400
Subject: rpms/libXxf86misc/devel .cvsignore, 1.5, 1.6 libXxf86misc.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <200604272102.k3RL2sni003551@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXxf86misc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3516/devel

Modified Files:
	.cvsignore libXxf86misc.spec sources 
Log Message:
auto-import libXxf86misc-1.0.1-1 on branch devel from libXxf86misc-1.0.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXxf86misc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Dec 2005 11:11:09 -0000	1.5
+++ .cvsignore	27 Apr 2006 21:02:37 -0000	1.6
@@ -1 +1 @@
-libXxf86misc-1.0.0.tar.bz2
+libXxf86misc-1.0.1.tar.bz2


Index: libXxf86misc.spec
===================================================================
RCS file: /cvs/dist/rpms/libXxf86misc/devel/libXxf86misc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libXxf86misc.spec	11 Feb 2006 04:23:39 -0000	1.10
+++ libXxf86misc.spec	27 Apr 2006 21:02:51 -0000	1.11
@@ -1,11 +1,11 @@
 Summary: X.Org X11 libXxf86misc runtime library
 Name: libXxf86misc
-Version: 1.0.0
-Release: 2.2
+Version: 1.0.1
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: xorg-x11-proto-devel
@@ -74,6 +74,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
+- Update to 1.0.1
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXxf86misc/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Jan 2006 22:35:47 -0000	1.6
+++ sources	27 Apr 2006 21:02:51 -0000	1.7
@@ -1 +1 @@
-e8bed0d2d0859ec791a385b1901c2ace  libXxf86misc-1.0.0.tar.bz2
+7cee0df63903cef7f7a3fb68cdd99eef  libXxf86misc-1.0.1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 21:18:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 17:18:44 -0400
Subject: rpms/libXxf86vm/devel .cvsignore, 1.5, 1.6 libXxf86vm.spec, 1.11,
	1.12 sources, 1.6, 1.7
Message-ID: <200604272118.k3RLIitY029972@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXxf86vm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29932/devel

Modified Files:
	.cvsignore libXxf86vm.spec sources 
Log Message:
auto-import libXxf86vm-1.0.1-1 on branch devel from libXxf86vm-1.0.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXxf86vm/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Dec 2005 11:11:21 -0000	1.5
+++ .cvsignore	27 Apr 2006 21:18:41 -0000	1.6
@@ -1 +1 @@
-libXxf86vm-1.0.0.tar.bz2
+libXxf86vm-1.0.1.tar.bz2


Index: libXxf86vm.spec
===================================================================
RCS file: /cvs/dist/rpms/libXxf86vm/devel/libXxf86vm.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libXxf86vm.spec	11 Feb 2006 04:23:49 -0000	1.11
+++ libXxf86vm.spec	27 Apr 2006 21:18:41 -0000	1.12
@@ -1,11 +1,11 @@
 Summary: X.Org X11 libXxf86vm runtime library
 Name: libXxf86vm
-Version: 1.0.0
-Release: 2.2
+Version: 1.0.1
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: xorg-x11-proto-devel
@@ -75,6 +75,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
+- Update to 1.0.1
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXxf86vm/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Jan 2006 22:36:14 -0000	1.6
+++ sources	27 Apr 2006 21:18:41 -0000	1.7
@@ -1 +1 @@
-f552fe4e3b0b31f3bd7d567771398fce  libXxf86vm-1.0.0.tar.bz2
+8de1ca6c55aaad7d8cae19b4f0b3da32  libXxf86vm-1.0.1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 21:39:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 17:39:45 -0400
Subject: rpms/xorg-x11-server-utils/devel xset-1.0.2-spurious-xprint.patch,
	NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-server-utils.spec, 1.15,
	1.16 xset-1.0.1-spurious-xprint.patch, 1.1, NONE
Message-ID: <200604272139.k3RLdj17002664@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2624/devel

Modified Files:
	.cvsignore sources xorg-x11-server-utils.spec 
Added Files:
	xset-1.0.2-spurious-xprint.patch 
Removed Files:
	xset-1.0.1-spurious-xprint.patch 
Log Message:
auto-import xorg-x11-server-utils-1.0.1-4 on branch devel from xorg-x11-server-utils-1.0.1-4.src.rpm

xset-1.0.2-spurious-xprint.patch:
 configure.ac |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

--- NEW FILE xset-1.0.2-spurious-xprint.patch ---
--- xset-1.0.2/configure.ac.xprint	2006-04-25 17:41:21.000000000 -0400
+++ xset-1.0.2/configure.ac	2006-04-25 17:41:46.000000000 -0400
@@ -62,14 +62,8 @@
 	AC_CHECK_HEADERS([X11/extensions/fontcache.h X11/extensions/fontcacheP.h],,,[#include <X11/Xlib.h>])
 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
 
-PKG_CHECK_MODULES(SET_XPRINT, xp, 
-	[SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $SET_XPRINT_CFLAGS $SET_X11_CFLAGS"
-	AC_CHECK_HEADERS([X11/extensions/Print.h],,,[#include <X11/Xlib.h>])
-	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-
-XSET_CFLAGS="$XSET_CFLAGS $SET_XEXT_CFLAGS $SET_XKB_CFLAGS $SET_XF86MISC_CFLAGS $SET_FONTCACHE_CFLAGS $SET_XPRINT_CFLAGS"
-XSET_LIBS="$XSET_LIBS $SET_XEXT_LIBS $SET_XKB_LIBS $SET_XF86MISC_LIBS $SET_FONTCACHE_LIBS $SET_XPRINT_LIBS"
+XSET_CFLAGS="$XSET_CFLAGS $SET_XEXT_CFLAGS $SET_XKB_CFLAGS $SET_XF86MISC_CFLAGS $SET_FONTCACHE_CFLAGS"
+XSET_LIBS="$XSET_LIBS $SET_XEXT_LIBS $SET_XKB_LIBS $SET_XF86MISC_LIBS $SET_FONTCACHE_LIBS"
 
 AC_SUBST(XSET_CFLAGS)
 AC_SUBST(XSET_LIBS)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server-utils/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Apr 2006 00:24:48 -0000	1.5
+++ .cvsignore	27 Apr 2006 21:39:43 -0000	1.6
@@ -3,15 +3,15 @@
 sessreg-1.0.0.tar.bz2
 xcmsdb-1.0.1.tar.bz2
 xgamma-1.0.1.tar.bz2
-xmodmap-1.0.0.tar.bz2
-xrandr-1.0.1.tar.bz2
-xrdb-1.0.1.tar.bz2
+xhost-1.0.1.tar.bz2
 xrefresh-1.0.1.tar.bz2
-xset-1.0.1.tar.bz2
 xsetmode-1.0.0.tar.bz2
 xsetpointer-1.0.0.tar.bz2
 xsetroot-1.0.1.tar.bz2
 xstdcmap-1.0.1.tar.bz2
 xtrap-1.0.1.tar.bz2
 xvidtune-1.0.1.tar.bz2
-xhost-1.0.1.tar.bz2
+xmodmap-1.0.1.tar.bz2
+xrandr-1.0.2.tar.bz2
+xrdb-1.0.2.tar.bz2
+xset-1.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server-utils/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Apr 2006 00:24:48 -0000	1.5
+++ sources	27 Apr 2006 21:39:43 -0000	1.6
@@ -3,15 +3,15 @@
 15c8032bbf5197e8fb5d071d9500a880  sessreg-1.0.0.tar.bz2
 8579d5f50ba7f0c4a5bf16b9670fea01  xcmsdb-1.0.1.tar.bz2
 45d8fa3c85d4bfda87251798fd605a45  xgamma-1.0.1.tar.bz2
-6c45ef77c26dce98e625d1f99df16468  xmodmap-1.0.0.tar.bz2
-14de596b7276c46b77e336cbb4f13c24  xrandr-1.0.1.tar.bz2
-9ed059ee45780d32c697d4acc6b07192  xrdb-1.0.1.tar.bz2
+5300c9aafa58878c8f6e85379d5c199c  xhost-1.0.1.tar.bz2
 8e211e4dfa178d2797cea058709f72ab  xrefresh-1.0.1.tar.bz2
-efd71993a9dc96566dd3e89f507ccac5  xset-1.0.1.tar.bz2
 d074e79d380b031d2f60e4cd56538c93  xsetmode-1.0.0.tar.bz2
 c94ea103e27e370e4e5030e50c5d5d69  xsetpointer-1.0.0.tar.bz2
 fc7eeb7130bb54345671a9dbaab567ac  xsetroot-1.0.1.tar.bz2
 86ab558441edfb86f853639e4290a754  xstdcmap-1.0.1.tar.bz2
 e49c695a0af17bc4896e51c298304643  xtrap-1.0.1.tar.bz2
 e0744594f4e5969b20df28d897781318  xvidtune-1.0.1.tar.bz2
-5300c9aafa58878c8f6e85379d5c199c  xhost-1.0.1.tar.bz2
+66b8f25e9152e20849638d93a550ff7f  xmodmap-1.0.1.tar.bz2
+7157156809c7f432ae401859b0465ffe  xrandr-1.0.2.tar.bz2
+de1fd8e2169e813e43f43ced5837b989  xrdb-1.0.2.tar.bz2
+1b781a0802c7b8fb9619a6665607b3f0  xset-1.0.2.tar.bz2


Index: xorg-x11-server-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server-utils/devel/xorg-x11-server-utils.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-server-utils.spec	25 Apr 2006 21:55:33 -0000	1.15
+++ xorg-x11-server-utils.spec	27 Apr 2006 21:39:43 -0000	1.16
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 3
+Release: 4
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -14,11 +14,11 @@
 Source4:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xcmsdb-1.0.1.tar.bz2
 Source5:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xgamma-1.0.1.tar.bz2
 Source6:  http://xorg.freedesktop.org/releases/individual/app/xhost-1.0.1.tar.bz2
-Source7:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xmodmap-1.0.0.tar.bz2
-Source8:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xrandr-1.0.1.tar.bz2
-Source9:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xrdb-1.0.1.tar.bz2
+Source7:  http://xorg.freedesktop.org/releases/individual/app/xmodmap-1.0.1.tar.bz2
+Source8:  http://xorg.freedesktop.org/releases/individual/app/xrandr-1.0.2.tar.bz2
+Source9:  http://xorg.freedesktop.org/releases/individual/app/xrdb-1.0.2.tar.bz2
 Source10: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xrefresh-1.0.1.tar.bz2
-Source11: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xset-1.0.1.tar.bz2
+Source11: http://xorg.freedesktop.org/releases/individual/app/xset-1.0.2.tar.bz2
 Source12: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xsetmode-1.0.0.tar.bz2
 Source13: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xsetpointer-1.0.0.tar.bz2
 Source14: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xsetroot-1.0.1.tar.bz2
@@ -37,7 +37,7 @@
 # rgb section
 Patch1100: rgb-1.0.0-datadir-rgbpath-fix.patch
 # xset section
-Patch1200: xset-1.0.1-spurious-xprint.patch
+Patch1200: xset-1.0.2-spurious-xprint.patch
 # xvidtune section
 #Patch1700: xvidtune-0.99.1-datadir-app-defaults-fix.patch
 
@@ -195,6 +195,9 @@
 %{_mandir}/man1/xvidtune.1x*
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-4
+- Updated xmodmap, xrandr, xrdb, and xset.
+
 * Tue Apr 25 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-3
 - Eliminate a spurious Xprint dependency from xset.
 


--- xset-1.0.1-spurious-xprint.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 27 21:48:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 17:48:38 -0400
Subject: rpms/glibc/devel .cvsignore, 1.147, 1.148 glibc-fedora.patch, 1.150,
	1.151 glibc.spec, 1.236, 1.237 sources, 1.171, 1.172
Message-ID: <200604272148.k3RLmcOH018952@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18912/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec sources 
Log Message:
auto-import glibc-2.4.90-3 on branch devel from glibc-2.4.90-3.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- .cvsignore	26 Apr 2006 20:37:17 -0000	1.147
+++ .cvsignore	27 Apr 2006 21:48:35 -0000	1.148
@@ -1,2 +1,2 @@
-glibc-20060426T2000.tar.bz2
-glibc-fedora-20060426T2000.tar.bz2
+glibc-20060427T2122.tar.bz2
+glibc-fedora-20060427T2122.tar.bz2

glibc-fedora.patch:
 ChangeLog                                                   |  101 +++
 ChangeLog.11                                                |   21 
 ChangeLog.12                                                |   12 
 ChangeLog.15                                                |   45 +
 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 
 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/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 +
 55 files changed, 1385 insertions(+), 630 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- glibc-fedora.patch	26 Apr 2006 20:37:17 -0000	1.150
+++ glibc-fedora.patch	27 Apr 2006 21:48:35 -0000	1.151
@@ -1,6 +1,18 @@
---- glibc-20060426T2000/ChangeLog	26 Apr 2006 19:36:15 -0000	1.10147
-+++ glibc-20060426T2000-fedora/ChangeLog	26 Apr 2006 20:18:16 -0000	1.8782.2.179
-@@ -830,6 +830,34 @@
+--- glibc-20060427T2122/ChangeLog	27 Apr 2006 20:20:52 -0000	1.10153
++++ glibc-20060427T2122-fedora/ChangeLog	27 Apr 2006 21:29:50 -0000	1.8782.2.181
+@@ -13,6 +13,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.
+@@ -868,6 +873,34 @@
  	_SC_CPUTIME and _SC_THREAD_CPUTIME here.
  	* sysdeps/unix/sysv/linux/x86_64/sysconf.c (__sysconf): Likewise.
  
@@ -35,7 +47,7 @@
  2006-03-05  Roland McGrath  <roland at redhat.com>
  
  	* malloc/malloc.c (MALLOC_ALIGNMENT): Revert to (2 * SIZE_SZ) value.
-@@ -1842,6 +1870,11 @@
+@@ -1880,6 +1913,11 @@
  	(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
  	followed by __THROW.
  
@@ -47,7 +59,7 @@
  2006-02-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/unix/sysv/linux/futimesat.c [__NR_futimesat]
-@@ -1901,6 +1934,11 @@
+@@ -1939,6 +1977,11 @@
  	* sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo.
  	* sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps.
  
@@ -59,7 +71,7 @@
  2006-01-19  Thomas Schwinge  <tschwinge at gnu.org>
  
  	* libio/genops.c: Include <stdbool.h>.
-@@ -4327,6 +4365,10 @@
+@@ -4365,6 +4408,10 @@
  
  	* elf/order2mod2.c (init): Cast ignored value to void.
  
@@ -70,7 +82,7 @@
  2005-12-27  Ulrich Drepper  <drepper at redhat.com>
  
  	* elf/tst-tls13.c (do_test): Avoid using the library path when
-@@ -4610,6 +4652,26 @@
+@@ -4648,6 +4695,26 @@
  	* sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined,
  	use sysdeps/unix/time.c implementation.
  
@@ -97,7 +109,7 @@
  2005-12-19  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #1955]
-@@ -7728,6 +7790,11 @@
+@@ -7766,6 +7833,11 @@
  	R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32,
  	R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros.
  
@@ -109,7 +121,7 @@
  2005-10-03  Roland McGrath  <roland at redhat.com>
  
  	* sysdeps/powerpc/nofpu: Directory removed, saved in ports repository.
-@@ -8722,6 +8789,12 @@
+@@ -8760,6 +8832,12 @@
  	* argp/argp-help.c (__argp_error): __asprintf -> vasprintf.
  	(__argp_failure): Likewise.
  
@@ -122,7 +134,7 @@
  2005-08-08  Ulrich Drepper  <drepper at redhat.com>
  
  	* nscd/cache.c (cache_add): Commit hash table and header to disk.
-@@ -8846,6 +8919,17 @@
+@@ -8884,6 +8962,17 @@
  	__syslog_chk.
  	* misc/Versions: Export __syslog_chk and __vsyslog_chk.
  
@@ -140,7 +152,7 @@
  2005-07-28  Thomas Schwinge  <schwinge at nic-nac-project.de>
  
  	[BZ #1137]
-@@ -11906,6 +11990,18 @@
+@@ -11944,6 +12033,18 @@
  
  	* scripts/soversions.awk: Fix default version set handling.
  
@@ -159,8 +171,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20060426T2000/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20060426T2000-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060427T2122/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
++++ glibc-20060427T2122-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.
@@ -210,8 +222,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-20060426T2000/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20060426T2000-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060427T2122/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
++++ glibc-20060427T2122-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.
@@ -238,8 +250,8 @@
  2001-01-02  Franz Sirl	<Franz.Sirl-kernel at lauterbach.com>
  
  	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
---- glibc-20060426T2000/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20060426T2000-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
+--- glibc-20060427T2122/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20060427T2122-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>
@@ -320,8 +332,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20060426T2000/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20060426T2000-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20060427T2122/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20060427T2122-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;
@@ -346,8 +358,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20060426T2000/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
-+++ glibc-20060426T2000-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
+--- glibc-20060427T2122/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
++++ glibc-20060427T2122-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.  */
@@ -376,8 +388,8 @@
  # define O 0
  #else
  # define O 1
---- glibc-20060426T2000/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
-+++ glibc-20060426T2000-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
+--- glibc-20060427T2122/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
++++ glibc-20060427T2122-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
 @@ -964,17 +964,19 @@ search_dirs (void)
  
  
@@ -459,8 +471,8 @@
      }
  
    search_dirs ();
---- glibc-20060426T2000/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20060426T2000-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20060427T2122/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20060427T2122-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;
@@ -485,8 +497,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060426T2000/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
-+++ glibc-20060426T2000-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
+--- glibc-20060427T2122/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
++++ glibc-20060427T2122-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)
@@ -563,8 +575,8 @@
    /* Open the output file.  */
    if (output_file == NULL)
      {
---- glibc-20060426T2000/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
-+++ glibc-20060426T2000-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
+--- glibc-20060427T2122/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
++++ glibc-20060427T2122-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
 @@ -275,7 +275,13 @@
  #endif
  
@@ -580,16 +592,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20060426T2000/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060426T2000-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060427T2122/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060427T2122-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-20060426T2000/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060426T2000-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060427T2122/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060427T2122-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-20060426T2000/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20060426T2000-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20060427T2122/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20060427T2122-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
@@ -599,8 +611,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20060426T2000/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
-+++ glibc-20060426T2000-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
+--- glibc-20060427T2122/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
++++ glibc-20060427T2122-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.  */
@@ -614,8 +626,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20060426T2000/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
-+++ glibc-20060426T2000-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
+--- glibc-20060427T2122/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
++++ glibc-20060427T2122-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);
@@ -646,8 +658,8 @@
  
  #endif
  
---- glibc-20060426T2000/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
-+++ glibc-20060426T2000-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
+--- glibc-20060427T2122/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
++++ glibc-20060427T2122-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 !!!
@@ -739,8 +751,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20060426T2000/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
-+++ glibc-20060426T2000-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
+--- glibc-20060427T2122/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
++++ glibc-20060427T2122-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,
  	}
      }
@@ -784,8 +796,8 @@
  #endif
  
  #ifndef NO_FINALIZE
---- glibc-20060426T2000/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
-+++ glibc-20060426T2000-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
+--- glibc-20060427T2122/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
++++ glibc-20060427T2122-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/'`; \
@@ -794,8 +806,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20060426T2000/localedata/SUPPORTED	24 Apr 2006 07:06:44 -0000	1.90
-+++ glibc-20060426T2000-fedora/localedata/SUPPORTED	24 Apr 2006 08:55:41 -0000	1.71.2.9
+--- glibc-20060427T2122/localedata/SUPPORTED	24 Apr 2006 07:06:44 -0000	1.90
++++ glibc-20060427T2122-fedora/localedata/SUPPORTED	24 Apr 2006 08:55:41 -0000	1.71.2.9
 @@ -75,6 +75,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -837,8 +849,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20060426T2000/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20060426T2000-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20060427T2122/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20060427T2122-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>"
@@ -853,8 +865,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20060426T2000/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
-+++ glibc-20060426T2000-fedora/localedata/locales/en_GB	2 Nov 2004 12:25:47 -0000	1.10.2.2
+--- glibc-20060427T2122/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
++++ glibc-20060427T2122-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>"
@@ -866,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-20060426T2000/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060426T2000-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20060427T2122/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20060427T2122-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -938,8 +950,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20060426T2000/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20060426T2000-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20060427T2122/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20060427T2122-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -967,8 +979,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20060426T2000/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
-+++ glibc-20060426T2000-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
+--- glibc-20060427T2122/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
++++ glibc-20060427T2122-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>
@@ -1044,8 +1056,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20060426T2000/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
-+++ glibc-20060426T2000-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20060427T2122/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
++++ glibc-20060427T2122-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)
@@ -1101,9 +1113,9 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20060426T2000/nptl/ChangeLog	9 Apr 2006 02:45:24 -0000	1.887
-+++ glibc-20060426T2000-fedora/nptl/ChangeLog	24 Apr 2006 08:55:42 -0000	1.706.2.85
-@@ -798,6 +798,15 @@
+--- glibc-20060427T2122/nptl/ChangeLog	27 Apr 2006 18:17:50 -0000	1.889
++++ glibc-20060427T2122-fedora/nptl/ChangeLog	27 Apr 2006 21:29:53 -0000	1.706.2.86
+@@ -808,6 +808,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1119,7 +1131,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -1534,6 +1543,11 @@
+@@ -1544,6 +1553,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1131,7 +1143,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -3608,6 +3622,11 @@
+@@ -3618,6 +3632,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1143,8 +1155,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20060426T2000/nptl/Makefile	28 Mar 2006 04:13:27 -0000	1.180
-+++ glibc-20060426T2000-fedora/nptl/Makefile	28 Mar 2006 09:36:22 -0000	1.157.2.20
+--- glibc-20060427T2122/nptl/Makefile	28 Mar 2006 04:13:27 -0000	1.180
++++ glibc-20060427T2122-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
@@ -1167,8 +1179,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20060426T2000/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20060426T2000-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20060427T2122/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20060427T2122-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;
@@ -1193,8 +1205,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060426T2000/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060426T2000-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20060427T2122/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060427T2122-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>
 +
@@ -1202,8 +1214,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20060426T2000/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	9 Apr 2006 02:42:29 -0000	1.30
-+++ glibc-20060426T2000-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	24 Apr 2006 08:55:42 -0000	1.25.2.5
+--- glibc-20060427T2122/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	9 Apr 2006 02:42:29 -0000	1.30
++++ glibc-20060427T2122-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")
  
@@ -1539,8 +1551,8 @@
  			      : "=m" (futex), "=&a" (ignore)		      \
  			      : "m" (futex),				      \
  				"i" (offsetof (tcbhead_t, multiple_threads))  \
---- glibc-20060426T2000/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
-+++ glibc-20060426T2000-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	24 Apr 2006 08:55:43 -0000	1.13.2.3
+--- glibc-20060427T2122/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
++++ glibc-20060427T2122-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.
@@ -1686,8 +1698,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060426T2000/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
-+++ glibc-20060426T2000-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
+--- glibc-20060427T2122/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
++++ glibc-20060427T2122-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
@@ -1788,8 +1800,8 @@
 -	ret
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060426T2000/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
-+++ glibc-20060426T2000-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
+--- glibc-20060427T2122/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
++++ glibc-20060427T2122-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.
@@ -1931,8 +1943,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060426T2000/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	17 Feb 2006 08:06:14 -0000	1.26
-+++ glibc-20060426T2000-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	6 Mar 2006 07:33:30 -0000	1.23.2.3
+--- glibc-20060427T2122/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	17 Feb 2006 08:06:14 -0000	1.26
++++ glibc-20060427T2122-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")
  
@@ -2320,8 +2332,8 @@
  			      : "=m" (futex), "=&D" (ignore)		      \
  			      : "m" (futex)				      \
  			      : "ax", "cx", "r11", "cc", "memory"); })
---- glibc-20060426T2000/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
-+++ glibc-20060426T2000-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
+--- glibc-20060427T2122/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
++++ glibc-20060427T2122-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
@@ -2416,9 +2428,9 @@
 -	retq
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060426T2000/nscd/connections.c	26 Apr 2006 17:28:50 -0000	1.85
-+++ glibc-20060426T2000-fedora/nscd/connections.c	26 Apr 2006 20:18:18 -0000	1.55.2.21
-@@ -1892,3 +1892,18 @@ finish_drop_privileges (void)
+--- glibc-20060427T2122/nscd/connections.c	27 Apr 2006 20:33:32 -0000	1.87
++++ glibc-20060427T2122-fedora/nscd/connections.c	27 Apr 2006 21:29:54 -0000	1.55.2.23
+@@ -1901,3 +1901,21 @@ finish_drop_privileges (void)
    install_real_capabilities (new_caps);
  #endif
  }
@@ -2427,18 +2439,21 @@
 +void
 +sighup_handler (int signum)
 +{
-+    /* Prune the password database */
++  /* Prune the password database.  */
++  if (dbs[pwddb].enabled)
 +    prune_cache (&dbs[pwddb], LONG_MAX);
 +    
-+    /* Prune the group database */
++  /* Prune the group database.  */
++  if (dbs[grpdb].enabled)
 +    prune_cache (&dbs[grpdb], LONG_MAX);
 +
-+    /* Prune the host database */
++  /* Prune the host database.  */
++  if (dbs[hstdb].enabled)
 +    prune_cache (&dbs[hstdb], LONG_MAX);
 +}
 +
---- glibc-20060426T2000/nscd/nscd.c	6 Apr 2006 22:55:50 -0000	1.52
-+++ glibc-20060426T2000-fedora/nscd/nscd.c	24 Apr 2006 08:55:43 -0000	1.38.2.12
+--- glibc-20060427T2122/nscd/nscd.c	6 Apr 2006 22:55:50 -0000	1.52
++++ glibc-20060427T2122-fedora/nscd/nscd.c	24 Apr 2006 08:55:43 -0000	1.38.2.12
 @@ -119,6 +119,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -2457,8 +2472,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20060426T2000/nscd/nscd.conf	26 Apr 2006 17:27:03 -0000	1.12
-+++ glibc-20060426T2000-fedora/nscd/nscd.conf	26 Apr 2006 20:18:18 -0000	1.8.2.4
+--- glibc-20060427T2122/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
++++ glibc-20060427T2122-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
@@ -2470,8 +2485,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20060426T2000/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
-+++ glibc-20060426T2000-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
+--- glibc-20060427T2122/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
++++ glibc-20060427T2122-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
@@ -2512,8 +2527,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20060426T2000/posix/Makefile	15 Apr 2006 21:41:25 -0000	1.189
-+++ glibc-20060426T2000-fedora/posix/Makefile	24 Apr 2006 08:55:43 -0000	1.171.2.17
+--- glibc-20060427T2122/posix/Makefile	15 Apr 2006 21:41:25 -0000	1.189
++++ glibc-20060427T2122-fedora/posix/Makefile	24 Apr 2006 08:55:43 -0000	1.171.2.17
 @@ -107,7 +107,8 @@ generated := $(addprefix wordexp-test-re
  	     bug-regex21-mem bug-regex21.mtrace \
  	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
@@ -2547,8 +2562,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
---- glibc-20060426T2000/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060426T2000-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20060427T2122/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060427T2122-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 =
@@ -2565,8 +2580,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20060426T2000/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20060426T2000-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20060427T2122/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20060427T2122-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
@@ -2582,8 +2597,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-20060426T2000/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20060426T2000-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20060427T2122/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20060427T2122-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))
@@ -2595,8 +2610,8 @@
  endif
  endif
  
---- glibc-20060426T2000/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20060426T2000-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20060427T2122/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20060427T2122-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.  */
@@ -2948,8 +2963,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20060426T2000/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060426T2000-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060427T2122/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060427T2122-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.
@@ -3035,8 +3050,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20060426T2000/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
-+++ glibc-20060426T2000-fedora/sysdeps/unix/nice.c	22 Sep 2004 21:21:08 -0000	1.6.2.1
+--- glibc-20060427T2122/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
++++ glibc-20060427T2122-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);
      }
@@ -3051,8 +3066,8 @@
    if (result != -1)
      return getpriority (PRIO_PROCESS, 0);
    else
---- glibc-20060426T2000/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Jan 2006 08:21:15 -0000	1.22
-+++ glibc-20060426T2000-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	9 Jan 2006 21:55:08 -0000	1.14.2.8
+--- glibc-20060427T2122/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Jan 2006 08:21:15 -0000	1.22
++++ glibc-20060427T2122-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.  */
  
@@ -3101,8 +3116,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20060426T2000/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20060426T2000-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20060427T2122/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20060427T2122-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;
@@ -3145,8 +3160,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20060426T2000/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20060426T2000-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20060427T2122/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20060427T2122-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"
@@ -3156,8 +3171,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20060426T2000/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20060426T2000-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20060427T2122/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20060427T2122-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;
@@ -3203,8 +3218,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20060426T2000/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060426T2000-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060427T2122/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060427T2122-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.
@@ -3265,8 +3280,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20060426T2000/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20060426T2000-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20060427T2122/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20060427T2122-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)
@@ -3299,24 +3314,24 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20060426T2000/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060426T2000-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060427T2122/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060427T2122-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-20060426T2000/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060426T2000-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060427T2122/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060427T2122-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-20060426T2000/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20060426T2000-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20060427T2122/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20060427T2122-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.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- glibc.spec	26 Apr 2006 20:37:19 -0000	1.236
+++ glibc.spec	27 Apr 2006 21:48:35 -0000	1.237
@@ -1,9 +1,9 @@
-%define glibcdate 20060426T2000
+%define glibcdate 20060427T2122
 %define glibcname glibc
-%define glibcsrcdir glibc-20060426T2000
+%define glibcsrcdir glibc-20060427T2122
 %define glibc_release_tarballs 0
 %define glibcversion 2.4.90
-%define glibcrelease 2
+%define glibcrelease 3
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define xenarches i686 athlon
@@ -1394,6 +1394,12 @@
 %endif
 
 %changelog
+* Thu Apr 27 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-3
+- update from CVS
+  - fix a typo in nscd.conf (#190085)
+  - fix handling of SIGHUP in nscd when some caches are disabled (#189978)
+  - make nscd paranoia mode working with non-root server-user (#189779)
+
 * Wed Apr 26 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-2
 - update from CVS
   - fix getaddrinfo (#190002)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- sources	26 Apr 2006 20:37:20 -0000	1.171
+++ sources	27 Apr 2006 21:48:35 -0000	1.172
@@ -1,2 +1,2 @@
-3779fc87ccf9879fea067c903e5d804f  glibc-20060426T2000.tar.bz2
-dbdda4bbcc47526d21a4a1610f76feaa  glibc-fedora-20060426T2000.tar.bz2
+03ee335a1b1e9ba1acba5beaa5ad405a  glibc-20060427T2122.tar.bz2
+6c9d05cea82c92edbbabfcf523d5824f  glibc-fedora-20060427T2122.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 27 21:53:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 17:53:20 -0400
Subject: rpms/xorg-x11-xkb-utils/devel .cvsignore, 1.8, 1.9 sources, 1.6,
	1.7 xorg-x11-xkb-utils.spec, 1.11, 1.12
Message-ID: <200604272153.k3RLrKR0020813@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-xkb-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20772/devel

Modified Files:
	.cvsignore sources xorg-x11-xkb-utils.spec 
Log Message:
auto-import xorg-x11-xkb-utils-1.0.1-2 on branch devel from xorg-x11-xkb-utils-1.0.1-2.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xkb-utils/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	31 Jan 2006 15:33:44 -0000	1.8
+++ .cvsignore	27 Apr 2006 21:53:16 -0000	1.9
@@ -1,5 +1,5 @@
-setxkbmap-1.0.1.tar.bz2
-xkbcomp-1.0.1.tar.bz2
 xkbevd-1.0.1.tar.bz2
 xkbprint-1.0.1.tar.bz2
 xkbutils-1.0.1.tar.bz2
+setxkbmap-1.0.2.tar.bz2
+xkbcomp-1.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xkb-utils/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Jan 2006 15:33:44 -0000	1.6
+++ sources	27 Apr 2006 21:53:16 -0000	1.7
@@ -1,5 +1,5 @@
-cfea4f25b13ea2976132a1247f68b4b6  setxkbmap-1.0.1.tar.bz2
-c01c882d126c8c0da9a727537dfeaaee  xkbcomp-1.0.1.tar.bz2
 2b9a666c92bee42c6af77c29759a606c  xkbevd-1.0.1.tar.bz2
 b98ae2d8b21c545b7b322d0b302efefa  xkbprint-1.0.1.tar.bz2
 84396a3dd75337caaae29d8fa5616fb1  xkbutils-1.0.1.tar.bz2
+0316b2ab6fea88ed76d231c3b47544d8  setxkbmap-1.0.2.tar.bz2
+8b22a5e6d780ec70bf98d31cdbd65658  xkbcomp-1.0.2.tar.bz2


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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-xkb-utils.spec	1 Mar 2006 07:11:22 -0000	1.11
+++ xorg-x11-xkb-utils.spec	27 Apr 2006 21:53:16 -0000	1.12
@@ -3,17 +3,17 @@
 Summary: X.Org X11 xkb utilities
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1.2
+Release: 2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%define xorgurl http://xorg.freedesktop.org/releases/X11R7.0/src/everything
+%define xorgurl http://xorg.freedesktop.org/releases/individual/app
 Source0: %{xorgurl}/xkbutils-1.0.1.tar.bz2
-Source1: %{xorgurl}/xkbcomp-1.0.1.tar.bz2
+Source1: %{xorgurl}/xkbcomp-1.0.2.tar.bz2
 Source2: %{xorgurl}/xkbevd-1.0.1.tar.bz2
 Source3: %{xorgurl}/xkbprint-1.0.1.tar.bz2
-Source4: %{xorgurl}/setxkbmap-1.0.1.tar.bz2
+Source4: %{xorgurl}/setxkbmap-1.0.2.tar.bz2
 
 BuildRequires: pkgconfig
 # libxkbfile-devel needed for setxkbmap, xkbcomp, xkbevd, xkbprint
@@ -95,6 +95,9 @@
 %{_mandir}/man1/xkbprint.1x*
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-2
+- Update setxkbmap and xkbcomp
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Thu Apr 27 22:09:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 18:09:39 -0400
Subject: rpms/xorg-x11-xkb-utils/devel .cvsignore, 1.9, 1.10 sources, 1.7,
	1.8 xorg-x11-xkb-utils.spec, 1.12, 1.13
Message-ID: <200604272209.k3RM9diQ024072@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-xkb-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24046/devel

Modified Files:
	.cvsignore sources xorg-x11-xkb-utils.spec 
Log Message:
auto-import xorg-x11-xkb-utils-1.0.2-1 on branch devel from xorg-x11-xkb-utils-1.0.2-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xkb-utils/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	27 Apr 2006 21:53:16 -0000	1.9
+++ .cvsignore	27 Apr 2006 22:09:37 -0000	1.10
@@ -1,5 +1,5 @@
-xkbevd-1.0.1.tar.bz2
-xkbprint-1.0.1.tar.bz2
-xkbutils-1.0.1.tar.bz2
 setxkbmap-1.0.2.tar.bz2
 xkbcomp-1.0.2.tar.bz2
+xkbprint-1.0.1.tar.bz2
+xkbutils-1.0.1.tar.bz2
+xkbevd-1.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xkb-utils/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Apr 2006 21:53:16 -0000	1.7
+++ sources	27 Apr 2006 22:09:37 -0000	1.8
@@ -1,5 +1,5 @@
-2b9a666c92bee42c6af77c29759a606c  xkbevd-1.0.1.tar.bz2
-b98ae2d8b21c545b7b322d0b302efefa  xkbprint-1.0.1.tar.bz2
-84396a3dd75337caaae29d8fa5616fb1  xkbutils-1.0.1.tar.bz2
 0316b2ab6fea88ed76d231c3b47544d8  setxkbmap-1.0.2.tar.bz2
 8b22a5e6d780ec70bf98d31cdbd65658  xkbcomp-1.0.2.tar.bz2
+b98ae2d8b21c545b7b322d0b302efefa  xkbprint-1.0.1.tar.bz2
+84396a3dd75337caaae29d8fa5616fb1  xkbutils-1.0.1.tar.bz2
+68f2a143716c23b566f8509d9498f516  xkbevd-1.0.2.tar.bz2


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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-xkb-utils.spec	27 Apr 2006 21:53:16 -0000	1.12
+++ xorg-x11-xkb-utils.spec	27 Apr 2006 22:09:37 -0000	1.13
@@ -2,8 +2,8 @@
 
 Summary: X.Org X11 xkb utilities
 Name: xorg-x11-%{pkgname}
-Version: 1.0.1
-Release: 2
+Version: 1.0.2
+Release: 1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -11,7 +11,7 @@
 %define xorgurl http://xorg.freedesktop.org/releases/individual/app
 Source0: %{xorgurl}/xkbutils-1.0.1.tar.bz2
 Source1: %{xorgurl}/xkbcomp-1.0.2.tar.bz2
-Source2: %{xorgurl}/xkbevd-1.0.1.tar.bz2
+Source2: %{xorgurl}/xkbevd-1.0.2.tar.bz2
 Source3: %{xorgurl}/xkbprint-1.0.1.tar.bz2
 Source4: %{xorgurl}/setxkbmap-1.0.2.tar.bz2
 
@@ -95,8 +95,8 @@
 %{_mandir}/man1/xkbprint.1x*
 
 %changelog
-* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-2
-- Update setxkbmap and xkbcomp
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
+- Update setxkbmap, xkbevd, and xkbcomp
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.2
 - bump again for double-long bug on ppc(64)



From fedora-cvs-commits at redhat.com  Thu Apr 27 22:10:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 18:10:03 -0400
Subject: rpms/xorg-x11-apps/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-apps.spec, 1.12, 1.13
Message-ID: <200604272210.k3RMA3Bl024145@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-apps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24090/devel

Modified Files:
	.cvsignore sources xorg-x11-apps.spec 
Log Message:
auto-import xorg-x11-apps-1.0.3-1 on branch devel from xorg-x11-apps-1.0.3-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Mar 2006 01:37:12 -0000	1.5
+++ .cvsignore	27 Apr 2006 22:09:47 -0000	1.6
@@ -1,8 +1,8 @@
 luit-1.0.1.tar.bz2
 oclock-1.0.1.tar.bz2
+x11perf-1.4.1.tar.bz2
 xbiff-1.0.1.tar.bz2
 xclipboard-1.0.1.tar.bz2
-xclock-1.0.1.tar.bz2
 xconsole-1.0.1.tar.bz2
 xcursorgen-1.0.0.tar.bz2
 xeyes-1.0.1.tar.bz2
@@ -14,4 +14,4 @@
 xpr-1.0.1.tar.bz2
 xwd-1.0.1.tar.bz2
 xwud-1.0.1.tar.bz2
-x11perf-1.4.1.tar.bz2
+xclock-1.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Mar 2006 01:37:12 -0000	1.5
+++ sources	27 Apr 2006 22:09:47 -0000	1.6
@@ -1,8 +1,8 @@
 fbe44e739590d3d73f711bfc8a0e33fd  luit-1.0.1.tar.bz2
 91f49547f9ed3cd0137c8b7c3183e360  oclock-1.0.1.tar.bz2
+fd06c8b8e3572a0e14af65a49e0dd7d1  x11perf-1.4.1.tar.bz2
 404f5add4537d22dd109c33e518a5190  xbiff-1.0.1.tar.bz2
 2c6ecedb10dc51adbb64c95f22fd99c2  xclipboard-1.0.1.tar.bz2
-81af93fb9bd06319fd16b694b0f03aeb  xclock-1.0.1.tar.bz2
 de35711680fa1da3ca9e7b21b491b025  xconsole-1.0.1.tar.bz2
 0a57aa0a265e8ec83472d970d3e387fc  xcursorgen-1.0.0.tar.bz2
 033f14f7c4e30d1f4edbb22d5ef86883  xeyes-1.0.1.tar.bz2
@@ -14,4 +14,4 @@
 01c0a14755fc91369e8c011c9f881d5d  xpr-1.0.1.tar.bz2
 911addfb7fa402217ddac63e5c1d97c7  xwd-1.0.1.tar.bz2
 6e3c5d0297d88e890b6f5df31f73dd60  xwud-1.0.1.tar.bz2
-fd06c8b8e3572a0e14af65a49e0dd7d1  x11perf-1.4.1.tar.bz2
+6b930326f71993fb54b7203902b387cd  xclock-1.0.2.tar.bz2


Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-apps.spec	3 Mar 2006 01:37:12 -0000	1.12
+++ xorg-x11-apps.spec	27 Apr 2006 22:09:47 -0000	1.13
@@ -2,7 +2,7 @@
 
 Summary: X.Org X11 applications
 Name: xorg-x11-%{pkgname}
-Version: 1.0.2
+Version: 1.0.3
 Release: 1
 License: MIT/X11
 Group: User Interface/X
@@ -11,7 +11,7 @@
 
 # Clock apps
 Source0:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/oclock-1.0.1.tar.bz2
-Source1:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xclock-1.0.1.tar.bz2
+Source1:  http://xorg.freedesktop.org/releases/individual/app/xclock-1.0.2.tar.bz2
 # X Window Dump (xwd) utilities
 Source2:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xwd-1.0.1.tar.bz2
 Source3:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xwud-1.0.1.tar.bz2
@@ -21,7 +21,7 @@
 Source6:  http://xorg.freedesktop.org/releases/individual/app/x11perf-1.4.1.tar.bz2
 Source7:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xbiff-1.0.1.tar.bz2
 Source8:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xclipboard-1.0.1.tar.bz2
-Source9:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xconsole-1.0.1.tar.bz2
+Source9:  http://xorg.freedesktop.org/releases/individual/app/xconsole-1.0.1.tar.bz2
 Source10: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xcursorgen-1.0.0.tar.bz2
 Source11: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xeyes-1.0.1.tar.bz2
 Source12: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xkill-1.0.1.tar.bz2
@@ -155,6 +155,9 @@
 %{_mandir}/man1/xwud.1x*
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.3-1
+- Updated xclock and xconsole
+
 * Thu Mar 2 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
 - Bump x11perf to 1.4.1 from upstream.
 



From fedora-cvs-commits at redhat.com  Thu Apr 27 22:25:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 18:25:17 -0400
Subject: rpms/xorg-x11-font-utils/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 xorg-x11-font-utils.spec, 1.16, 1.17
Message-ID: <200604272225.k3RMPHuX010025@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-font-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9989/devel

Modified Files:
	.cvsignore sources xorg-x11-font-utils.spec 
Log Message:
auto-import xorg-x11-font-utils-1.0.2-1 on branch devel from xorg-x11-font-utils-1.0.2-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-font-utils/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	27 Jan 2006 03:11:07 -0000	1.7
+++ .cvsignore	27 Apr 2006 22:25:14 -0000	1.8
@@ -1,5 +1,5 @@
 bdftopcf-1.0.0.tar.bz2
 font-util-1.0.0.tar.bz2
 fonttosfnt-1.0.1.tar.bz2
-mkfontdir-1.0.1.tar.bz2
 mkfontscale-1.0.1.tar.bz2
+mkfontdir-1.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-font-utils/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Jan 2006 03:11:07 -0000	1.7
+++ sources	27 Apr 2006 22:25:14 -0000	1.8
@@ -1,5 +1,5 @@
 f489db67914ca4d9d2fa0331132f342b  bdftopcf-1.0.0.tar.bz2
 0a537f95ee9d46f9e5b58c1a2c733dd4  font-util-1.0.0.tar.bz2
 efe452ec264ee0fddbe9300873164dec  fonttosfnt-1.0.1.tar.bz2
-7bf7543a2af76c5f4376fcd18a86551e  mkfontdir-1.0.1.tar.bz2
 1e74e68eb9e8e91c6b7b615d80dc5ee1  mkfontscale-1.0.1.tar.bz2
+94da9dcd2447300e8fdada896d7ed433  mkfontdir-1.0.2.tar.bz2


Index: xorg-x11-font-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-font-utils/devel/xorg-x11-font-utils.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-font-utils.spec	1 Mar 2006 06:24:03 -0000	1.16
+++ xorg-x11-font-utils.spec	27 Apr 2006 22:25:14 -0000	1.17
@@ -13,8 +13,8 @@
 Name: xorg-x11-%{pkgname}
 # IMPORTANT: If package ever gets renamed to something else, remove the Epoch line!
 Epoch: 1
-Version: 1.0.1
-Release: 3
+Version: 1.0.2
+Release: 1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -22,7 +22,7 @@
 
 Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/bdftopcf-1.0.0.tar.bz2
 Source1: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/fonttosfnt-1.0.1.tar.bz2
-Source2: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/mkfontdir-1.0.1.tar.bz2
+Source2: http://xorg.freedesktop.org/releases/individual/app/mkfontdir-1.0.2.tar.bz2
 Source3: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/mkfontscale-1.0.1.tar.bz2
 Source4: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/font-util-1.0.0.tar.bz2
 Patch0: font-util-1.0.0-mapdir-use-datadir-fix.patch



From fedora-cvs-commits at redhat.com  Thu Apr 27 22:32:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 18:32:22 -0400
Subject: rpms/xorg-x11-font-utils/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 xorg-x11-font-utils.spec, 1.17, 1.18
Message-ID: <200604272232.k3RMWMw8012069@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-font-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12013/devel

Modified Files:
	.cvsignore sources xorg-x11-font-utils.spec 
Log Message:
auto-import xorg-x11-font-utils-1.0.2-2 on branch devel from xorg-x11-font-utils-1.0.2-2.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-font-utils/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	27 Apr 2006 22:25:14 -0000	1.8
+++ .cvsignore	27 Apr 2006 22:32:19 -0000	1.9
@@ -1,5 +1,5 @@
 bdftopcf-1.0.0.tar.bz2
 font-util-1.0.0.tar.bz2
 fonttosfnt-1.0.1.tar.bz2
-mkfontscale-1.0.1.tar.bz2
 mkfontdir-1.0.2.tar.bz2
+mkfontscale-1.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-font-utils/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Apr 2006 22:25:14 -0000	1.8
+++ sources	27 Apr 2006 22:32:19 -0000	1.9
@@ -1,5 +1,5 @@
 f489db67914ca4d9d2fa0331132f342b  bdftopcf-1.0.0.tar.bz2
 0a537f95ee9d46f9e5b58c1a2c733dd4  font-util-1.0.0.tar.bz2
 efe452ec264ee0fddbe9300873164dec  fonttosfnt-1.0.1.tar.bz2
-1e74e68eb9e8e91c6b7b615d80dc5ee1  mkfontscale-1.0.1.tar.bz2
 94da9dcd2447300e8fdada896d7ed433  mkfontdir-1.0.2.tar.bz2
+1e74e68eb9e8e91c6b7b615d80dc5ee1  mkfontscale-1.0.1.tar.bz2


Index: xorg-x11-font-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-font-utils/devel/xorg-x11-font-utils.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xorg-x11-font-utils.spec	27 Apr 2006 22:25:14 -0000	1.17
+++ xorg-x11-font-utils.spec	27 Apr 2006 22:32:19 -0000	1.18
@@ -14,7 +14,7 @@
 # IMPORTANT: If package ever gets renamed to something else, remove the Epoch line!
 Epoch: 1
 Version: 1.0.2
-Release: 1
+Release: 2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -151,6 +151,9 @@
 %{_mandir}/man1/ucs2any.1x*
 
 %changelog
+* Thu Apr 26 2006 Adam Jackson <ajackson at redhat.com> 1:1.0.2-2
+- Update mkfontdir
+
 * Wed Feb 22 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-3
 - Remove "Obsoletes: xorg-x11-font-utils" as the package should not obsolete
   itself.  Leftover from the original package template it seems.  (#182439)



From fedora-cvs-commits at redhat.com  Thu Apr 27 22:34:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 18:34:31 -0400
Subject: rpms/xorg-x11-xdm/devel .cvsignore, 1.7, 1.8 sources, 1.6,
	1.7 xorg-x11-xdm.spec, 1.20, 1.21
Message-ID: <200604272234.k3RMYVF5012460@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-xdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12414/devel

Modified Files:
	.cvsignore sources xorg-x11-xdm.spec 
Log Message:
auto-import xorg-x11-xdm-1.0.4-1 on branch devel from xorg-x11-xdm-1.0.4-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	31 Mar 2006 17:29:42 -0000	1.7
+++ .cvsignore	27 Apr 2006 22:34:28 -0000	1.8
@@ -1 +1 @@
-xdm-1.0.3.tar.bz2
+xdm-1.0.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Mar 2006 17:29:42 -0000	1.6
+++ sources	27 Apr 2006 22:34:28 -0000	1.7
@@ -1 +1 @@
-4540fd015672f8fb8590ab16f4974cfe  xdm-1.0.3.tar.bz2
+aeed9697f27c0730a550a1ac7efdc189  xdm-1.0.4.tar.bz2


Index: xorg-x11-xdm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/xorg-x11-xdm.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xorg-x11-xdm.spec	31 Mar 2006 17:29:42 -0000	1.20
+++ xorg-x11-xdm.spec	27 Apr 2006 22:34:28 -0000	1.21
@@ -10,7 +10,7 @@
 Name: xorg-x11-%{pkgname}
 # NOTE: Remove Epoch line if/when the package ever gets renamed.
 Epoch: 1
-Version: 1.0.3
+Version: 1.0.4
 Release: 1
 License: MIT/X11
 Group: User Interface/X
@@ -174,6 +174,9 @@
 %{_mandir}/man1x/*.1x*
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1:1.0.4-1
+- Updated to version 1.0.4
+
 * Fri Mar 31 2006 Adam Jackson <ajackson at redhat.com> 1:1.0.3-1
 - Updated to version 1.0.3.  Forcibly relibtoolize to avoid present and future
   bogons on libXdmGreet.so losing the .so extension.



From fedora-cvs-commits at redhat.com  Thu Apr 27 22:47:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 18:47:50 -0400
Subject: rpms/xorg-x11-xfs/devel .cvsignore, 1.8, 1.9 sources, 1.7,
	1.8 xorg-x11-xfs.spec, 1.21, 1.22
Message-ID: <200604272247.k3RMlosT020141@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-xfs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19940/devel

Modified Files:
	.cvsignore sources xorg-x11-xfs.spec 
Log Message:
auto-import xorg-x11-xfs-1.0.2-1 on branch devel from xorg-x11-xfs-1.0.2-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	31 Jan 2006 15:25:16 -0000	1.8
+++ .cvsignore	27 Apr 2006 22:47:47 -0000	1.9
@@ -1,5 +1,5 @@
 fslsfonts-1.0.1.tar.bz2
-fstobdf-1.0.1.tar.bz2
 showfont-1.0.1.tar.bz2
-xfs-1.0.1.tar.bz2
 xfsinfo-1.0.1.tar.bz2
+fstobdf-1.0.2.tar.bz2
+xfs-1.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	31 Jan 2006 15:25:16 -0000	1.7
+++ sources	27 Apr 2006 22:47:47 -0000	1.8
@@ -1,5 +1,5 @@
 c7b2f8a938749d41dc86db6bd1e6a4ca  fslsfonts-1.0.1.tar.bz2
-705b896777a3ba80ecc02b2ae5313cf9  fstobdf-1.0.1.tar.bz2
 339b2faf1ca5114fda414338e15b6e21  showfont-1.0.1.tar.bz2
-8ed805113037e86ad01068d0b464a062  xfs-1.0.1.tar.bz2
 e98b18fbce1261de30b1de819d86f48a  xfsinfo-1.0.1.tar.bz2
+99144743ab3cbb9cf37090fdc9e747db  fstobdf-1.0.2.tar.bz2
+6745fe95dd43863c60f6583500f0e115  xfs-1.0.2.tar.bz2


Index: xorg-x11-xfs.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/xorg-x11-xfs.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xorg-x11-xfs.spec	9 Mar 2006 11:46:31 -0000	1.21
+++ xorg-x11-xfs.spec	27 Apr 2006 22:47:47 -0000	1.22
@@ -6,18 +6,18 @@
 
 Summary: X.Org X11 xfs font server
 Name: xorg-x11-%{pkgname}
-Version: 1.0.1
-Release: 4
+Version: 1.0.2
+Release: 1
 # NOTE: Remove Epoch line if package gets renamed
 Epoch: 1
 License: MIT/X11
 Group: System Environment/Daemons
 URL: http://www.x.org
 #Source0: %{pkgname}-%{version}.tar.bz2
-Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xfs-1.0.1.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/app/xfs-1.0.2.tar.bz2
 Source1: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xfsinfo-1.0.1.tar.bz2
 Source2: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/fslsfonts-1.0.1.tar.bz2
-Source3: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/fstobdf-1.0.1.tar.bz2
+Source3: http://xorg.freedesktop.org/releases/individual/app/fstobdf-1.0.2.tar.bz2
 Source4: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/showfont-1.0.1.tar.bz2
 Source10:  xfs.init
 # NOTE: xfs config input file, processed via sed below.
@@ -277,6 +277,9 @@
 %{_mandir}/man1/xfsinfo.1x*
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1:1.0.2-1
+- Update xfs and fstobdf
+
 * Wed Mar 01 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-4
 - Fix all rpm scriptlets "upgrade" tests to only execute on upgrades.
 



From fedora-cvs-commits at redhat.com  Thu Apr 27 22:49:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 18:49:33 -0400
Subject: rpms/xorg-x11-xinit/devel .cvsignore, 1.8, 1.9 sources, 1.6,
	1.7 xorg-x11-xinit.spec, 1.17, 1.18
Message-ID: <200604272249.k3RMnXUU025806@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-xinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25719/devel

Modified Files:
	.cvsignore sources xorg-x11-xinit.spec 
Log Message:
auto-import xorg-x11-xinit-1.0.2-1 on branch devel from xorg-x11-xinit-1.0.2-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	31 Jan 2006 15:31:51 -0000	1.8
+++ .cvsignore	27 Apr 2006 22:49:30 -0000	1.9
@@ -1 +1 @@
-xinit-1.0.1.tar.bz2
+xinit-1.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Jan 2006 15:31:51 -0000	1.6
+++ sources	27 Apr 2006 22:49:30 -0000	1.7
@@ -1 +1 @@
-8c353e39389edbdffc5387acc24948a0  xinit-1.0.1.tar.bz2
+d591fafe69b57969b0521c461073a01f  xinit-1.0.2.tar.bz2


Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xorg-x11-xinit.spec	1 Mar 2006 07:09:45 -0000	1.17
+++ xorg-x11-xinit.spec	27 Apr 2006 22:49:30 -0000	1.18
@@ -2,8 +2,8 @@
 
 Summary: X.Org X11 X Window System xinit startup scripts
 Name: xorg-x11-%{pkgname}
-Version: 1.0.1
-Release: 2
+Version: 1.0.2
+Release: 1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -91,6 +91,9 @@
 %{_mandir}/man1/xinit.1x*
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
+- Update xinit to 1.0.2
+
 * Thu Feb 16 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Change Conflicts to Obsoletes for xorg-x11 and XFree86 (#181414)
 



From fedora-cvs-commits at redhat.com  Thu Apr 27 22:54:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 18:54:51 -0400
Subject: rpms/xorg-x11-xsm/devel
	rstart-1.0.2-rstart-installation-location-fixes.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xorg-x11-xsm.spec, 1.10,
	1.11 rstart-1.0.1-rstart-installation-location-fixes.patch,
	1.1, NONE
Message-ID: <200604272254.k3RMspLl030302@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-xsm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30261/devel

Modified Files:
	.cvsignore sources xorg-x11-xsm.spec 
Added Files:
	rstart-1.0.2-rstart-installation-location-fixes.patch 
Removed Files:
	rstart-1.0.1-rstart-installation-location-fixes.patch 
Log Message:
auto-import xorg-x11-xsm-1.0.2-1 on branch devel from xorg-x11-xsm-1.0.2-1.src.rpm

rstart-1.0.2-rstart-installation-location-fixes.patch:
 Makefile.am |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE rstart-1.0.2-rstart-installation-location-fixes.patch ---
--- rstart-1.0.2/Makefile.am.installation-location-fixes	2005-11-23 06:28:35.000000000 -0500
+++ rstart-1.0.2/Makefile.am	2005-11-23 06:31:44.000000000 -0500
@@ -26,7 +26,7 @@
 
 rstartd_real_CFLAGS = $(RSTART_CFLAGS)			\
 		-DSERVERNAME=\"rstart\"			\
-		-DDEFAULT_CONFIG=\"$(libdir)/X11/rstart/config\"
+		-DDEFAULT_CONFIG=\"$(datadir)/X11/rstart/config\"
 
 rstartd_real_LDADD = $(RSTART_LIBS)
 
@@ -50,9 +50,10 @@
 
 # config data
 
-configdir = $(libdir)/X11/rstart
+configdir = $(sysconfdir)/X11/rstart
 config_DATA = config
 
+# The -DLIBDIR=$(configdir) here just looks "wrong".. we'll see...
 config: config.cpp
 	$(RAWCPP) $(RAWCPPFLAGS) -DPACKAGEname=rstart -DLIBDIR=$(configdir) \
 	-DENVPREFIX=RSTART < ${srcdir}/config.cpp | $(CPP_SED_MAGIC) > $@
@@ -99,7 +100,7 @@
 # FIXME: Someone who cares about rstart may want to look into sanitizing
 # the stuff below.
 
-DATA_DIR = $(libdir)/X11/rstart
+DATA_DIR = $(datadir)/X11/rstart
 
 install-data-hook:
 	for name in `find ${srcdir}/commands -print | grep -v CVS` ; do	\


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xsm/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 Jan 2006 16:05:17 -0000	1.4
+++ .cvsignore	27 Apr 2006 22:54:49 -0000	1.5
@@ -1,3 +1,3 @@
-rstart-1.0.1.tar.bz2
-smproxy-1.0.1.tar.bz2
 xsm-1.0.1.tar.bz2
+rstart-1.0.2.tar.bz2
+smproxy-1.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xsm/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Jan 2006 16:05:17 -0000	1.4
+++ sources	27 Apr 2006 22:54:49 -0000	1.5
@@ -1,3 +1,3 @@
-48bb7ad1fb9a4e43a8a702148dfb846e  rstart-1.0.1.tar.bz2
-977acfb1f74d0de55d78bd80a4e08ad3  smproxy-1.0.1.tar.bz2
 cce867ff7d0df9c0b9e682591779952c  xsm-1.0.1.tar.bz2
+99aea04a27197056368a4431f30f9cdb  rstart-1.0.2.tar.bz2
+31da204a0255ba8c6a65386e65dc1c90  smproxy-1.0.2.tar.bz2


Index: xorg-x11-xsm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xsm/devel/xorg-x11-xsm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-xsm.spec	1 Mar 2006 07:12:49 -0000	1.10
+++ xorg-x11-xsm.spec	27 Apr 2006 22:54:49 -0000	1.11
@@ -2,15 +2,15 @@
 
 Summary: X.Org X11 X Session Manager
 Name: xorg-x11-%{pkgname}
-Version: 1.0.1
-Release: 1.2
+Version: 1.0.2
+Release: 1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xsm-1.0.1.tar.bz2
-Source1: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/smproxy-1.0.1.tar.bz2
-Source2: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/rstart-1.0.1.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/app/xsm-1.0.1.tar.bz2
+Source1: http://xorg.freedesktop.org/releases/individual/app/smproxy-1.0.2.tar.bz2
+Source2: http://xorg.freedesktop.org/releases/individual/app/rstart-1.0.2.tar.bz2
 
 # Patches for xsm (10-19)
 Patch10: xsm-1.0.1-xsm-installation-location-fixes.patch
@@ -19,7 +19,7 @@
 #Patch20:
 
 # Patches for rstart (30-39)
-Patch30: rstart-1.0.1-rstart-installation-location-fixes.patch
+Patch30: rstart-1.0.2-rstart-installation-location-fixes.patch
 
 # FIXME: The BuildRequires are all missing here and need to be figured out.
 # That's low priority for now though, unless we encounter real build
@@ -122,6 +122,9 @@
 %config %{_sysconfdir}/X11/xsm/system.xsm
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
+- Update smproxy and rstart
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 


--- rstart-1.0.1-rstart-installation-location-fixes.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 27 23:43:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Apr 2006 19:43:24 -0400
Subject: rpms/pm-utils/devel pm-hibernate.app, NONE, 1.1 pm-hibernate.pam,
	NONE, 1.1 pm-powersave.app, NONE, 1.1 pm-powersave.pam, NONE,
	1.1 pm-suspend.app, NONE, 1.1 pm-suspend.pam, NONE,
	1.1 pm-utils.spec, 1.33, 1.34
Message-ID: <200604272343.k3RNhOkL022411@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/pm-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22252

Modified Files:
	pm-utils.spec 
Added Files:
	pm-hibernate.app pm-hibernate.pam pm-powersave.app 
	pm-powersave.pam pm-suspend.app pm-suspend.pam 
Log Message:
- add the pam and console-helper stuff here.



--- NEW FILE pm-hibernate.app ---


--- NEW FILE pm-hibernate.pam ---
#%PAM-1.0
auth       sufficient	pam_rootok.so
auth       required	pam_console.so
#auth       required	pam_stack.so service=system-auth
account    required	pam_permit.so


--- NEW FILE pm-powersave.app ---


--- NEW FILE pm-powersave.pam ---
#%PAM-1.0
auth       sufficient	pam_rootok.so
auth       required	pam_console.so
#auth       required	pam_stack.so service=system-auth
account    required	pam_permit.so


--- NEW FILE pm-suspend.app ---


--- NEW FILE pm-suspend.pam ---
#%PAM-1.0
auth       sufficient	pam_rootok.so
auth       required	pam_console.so
#auth       required	pam_stack.so service=system-auth
account    required	pam_permit.so


Index: pm-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- pm-utils.spec	25 Apr 2006 14:29:25 -0000	1.33
+++ pm-utils.spec	27 Apr 2006 23:43:20 -0000	1.34
@@ -7,7 +7,13 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64
 Requires: usermode kbd pciutils >= 2.2.1
 Conflicts: bluez-utils < 2.25-6
-Source: pm-utils-%{version}.tar.gz
+Source0: pm-utils-%{version}.tar.gz
+Source1: pm-suspend.pam
+Source2: pm-hibernate.pam
+Source3: pm-powersave.pam
+Source4: pm-suspend.app
+Source5: pm-hibernate.app
+Source6: pm-powersave.app
 Source10: http://ftp.debian.org/debian/pool/main/v/vbetool/vbetool_0.5-1.tar.gz
 Source20: radeontool-1.5.tar.gz
 %ifarch i386 x86_64
@@ -68,6 +74,11 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+install -m 755 -d %{_sysconfdir}/pam.d
+install -m 644 %{source1} %{source2} %{source3} $(sysconfdir)/pam.d/
+install -m 755 -d %{_sysconfdir}/security/console.apps/
+install -m 644 %{source4} %{source5} %{source6} $(sysconfdir)/security/console.apps
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -88,6 +99,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* xxx
+- move pam and consolehelper stuff here.
+
 * Tue Apr 25 2006 Peter Jones <pjones at redhat.com> - 0.18-1
 - Make it work cross-distro
 



From fedora-cvs-commits at redhat.com  Fri Apr 28 04:28:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 00:28:08 -0400
Subject: rpms/vte/devel .cvsignore, 1.36, 1.37 sources, 1.36, 1.37 vte.spec,
	1.67, 1.68
Message-ID: <200604280428.k3S4S8Su029637@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/vte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29612

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
0.12.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	13 Mar 2006 12:55:33 -0000	1.36
+++ .cvsignore	28 Apr 2006 04:28:01 -0000	1.37
@@ -1,10 +1 @@
-vte-0.11.13.tar.bz2
-vte-0.11.14.tar.bz2
-vte-0.11.15.tar.bz2
-vte-0.11.16.tar.bz2
-vte-0.11.17.tar.bz2
-vte-0.11.18.tar.bz2
-vte-0.11.19.tar.bz2
-vte-0.11.20.tar.bz2
-vte-0.11.21.tar.bz2
-vte-0.12.0.tar.bz2
+vte-0.12.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	13 Mar 2006 12:55:33 -0000	1.36
+++ sources	28 Apr 2006 04:28:01 -0000	1.37
@@ -1 +1 @@
-2c3a321e7e6a8ec9d9740a7cb683c1d0  vte-0.12.0.tar.bz2
+15afabb3ee753441eaa26317bc97ca1f  vte-0.12.1.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- vte.spec	13 Apr 2006 18:37:58 -0000	1.67
+++ vte.spec	28 Apr 2006 04:28:01 -0000	1.68
@@ -1,6 +1,6 @@
 Name: vte
-Version: 0.12.0
-Release: 3
+Version: 0.12.1
+Release: 2
 Summary: An experimental terminal emulator.
 License: LGPL
 Group: User Interface/X
@@ -102,6 +102,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Apr 28 2006 Matthias Clasen <mclasen at redhat.com> 0.12.1-2
+- Update to 0.12.1
+
 * Thu Apr 13 2006 Kristian H??gsberg <krh at redhat.com> 0.12.0-3
 - Bump for rawhide build.
 



From fedora-cvs-commits at redhat.com  Fri Apr 28 04:43:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 00:43:10 -0400
Subject: rpms/vte/FC-5 sources,1.36,1.37 vte.spec,1.65,1.66
Message-ID: <200604280443.k3S4h80F031849@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/vte/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31816

Modified Files:
	sources vte.spec 
Log Message:
0.12.1



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/vte/FC-5/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	13 Mar 2006 12:55:33 -0000	1.36
+++ sources	28 Apr 2006 04:43:01 -0000	1.37
@@ -1 +1 @@
-2c3a321e7e6a8ec9d9740a7cb683c1d0  vte-0.12.0.tar.bz2
+15afabb3ee753441eaa26317bc97ca1f  vte-0.12.1.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/dist/rpms/vte/FC-5/vte.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- vte.spec	13 Mar 2006 12:55:33 -0000	1.65
+++ vte.spec	28 Apr 2006 04:43:01 -0000	1.66
@@ -1,7 +1,7 @@
 Name: vte
-Version: 0.12.0
+Version: 0.12.1
 Release: 1.fc5.1
-Summary: An experimental terminal emulator.
+Summary: A terminal emulator
 License: LGPL
 Group: User Interface/X
 BuildRoot: %{_tmppath}/%{name}-root
@@ -98,6 +98,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Apr 28 2006 Matthias Clasen <mclasen at redhat.com> 0.12.1-1.fc5.1
+- Update to 0.12.1
+
 * Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> 0.12.0-1
 - Update to 0.12.0-1
 



From fedora-cvs-commits at redhat.com  Fri Apr 28 08:33:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 04:33:01 -0400
Subject: rpms/system-config-printer/devel .cvsignore, 1.61, 1.62 sources,
	1.64, 1.65 system-config-printer.spec, 1.7, 1.8
Message-ID: <200604280833.k3S8X1HU017307@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/system-config-printer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17279

Modified Files:
	.cvsignore sources system-config-printer.spec 
Log Message:
* Fri Apr 28 2006 Tim Waugh <twaugh at redhat.com>
- Make it actually run.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	20 Apr 2006 16:50:57 -0000	1.61
+++ .cvsignore	28 Apr 2006 08:32:57 -0000	1.62
@@ -41,3 +41,4 @@
 pycups-1.9.7.tar.bz2
 pycups-1.9.8.tar.bz2
 system-config-printer-0.7.5.tar.bz2
+system-config-printer-0.7.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	20 Apr 2006 16:50:57 -0000	1.64
+++ sources	28 Apr 2006 08:32:57 -0000	1.65
@@ -1,2 +1,2 @@
 ea37d221e78f39afc5ad04a67e9ee15b  pycups-1.9.8.tar.bz2
-6b05814337b6de3d75dc449e95e0a871  system-config-printer-0.7.5.tar.bz2
+f0187a911ae8194740e50fd6aa1c6323  system-config-printer-0.7.6.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- system-config-printer.spec	21 Apr 2006 13:48:40 -0000	1.7
+++ system-config-printer.spec	28 Apr 2006 08:32:57 -0000	1.8
@@ -2,7 +2,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.5
+Version: 0.7.6
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -58,6 +58,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Fri Apr 28 2006 Tim Waugh <twaugh at redhat.com>
+- Make it actually run.
+
 * Fri Apr 21 2006 Tim Waugh <twaugh at redhat.com>
 - Build requires CUPS 1.2.
 



From fedora-cvs-commits at redhat.com  Fri Apr 28 08:55:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 04:55:46 -0400
Subject: rpms/openoffice.org/FC-5 openoffice.org.spec,1.655,1.656
Message-ID: <200604280855.k3S8tkDe003864@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3836

Modified Files:
	openoffice.org.spec 
Log Message:
foo


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.655
retrieving revision 1.656
diff -u -r1.655 -r1.656
--- openoffice.org.spec	26 Apr 2006 17:51:32 -0000	1.655
+++ openoffice.org.spec	28 Apr 2006 08:55:43 -0000	1.656
@@ -808,7 +808,7 @@
 %patch34 -p1 -b .ooo62030.solenv._version.patch
 %patch35 -p1 -b .oooXXXXX.config_office.noppds.patch
 %patch36 -p1 -b .ooo63155.sfx2.badscript.patch
-%patch37 -p1 .rh188467.printingdefaults.patch
+%patch37 -p1
 %patch38 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
 %patch39 -p1 -b .ooo64743.vcl.adjustonlevel1.patch
 



From fedora-cvs-commits at redhat.com  Fri Apr 28 10:42:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 06:42:31 -0400
Subject: rpms/kdebase/devel kdebase-3.5.2-kwin.patch, NONE, 1.1 kdebase.spec,
	1.164, 1.165
Message-ID: <200604281042.k3SAgVP2023283@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23223

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.2-kwin.patch 
Log Message:
fix #189702, kwin crashes when switching windows with Alt-Tab


kdebase-3.5.2-kwin.patch:
 activation.cpp                  |    2 -
 client.cpp                      |   18 +++++++++++---
 clients/b2/b2client.cpp         |    2 -
 clients/default/kdedefault.cpp  |    2 -
 events.cpp                      |    8 +++---
 geometry.cpp                    |   16 ++++++++++++
 kcmkwin/kwinoptions/windows.cpp |   24 +++++++++++++++++--
 kcmkwin/kwinoptions/windows.h   |    3 ++
 kcmkwin/kwinrules/main.cpp      |    4 +--
 kompmgr/kompmgr.c               |   15 +++++++++---
 layers.cpp                      |   17 ++++++++++++-
 manage.cpp                      |   11 ++++++++
 popupinfo.cpp                   |    1 
 tabbox.cpp                      |   50 +++++++++++++++++++++++++---------------
 useractions.cpp                 |    3 +-
 utils.cpp                       |    9 ++++---
 utils.h                         |    8 ++----
 workspace.cpp                   |   35 +++++++++++++++++++++++-----
 workspace.h                     |    4 ++-
 19 files changed, 177 insertions(+), 55 deletions(-)

--- NEW FILE kdebase-3.5.2-kwin.patch ---
--- kdebase-3.5.2/kwin/clients/b2/b2client.cpp.kwin	2006-01-19 18:01:02.000000000 +0100
+++ kdebase-3.5.2/kwin/clients/b2/b2client.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -530,7 +530,7 @@
     if (drawSmallBorders && (maximizeMode() & MaximizeVertical)) {
 	return false;
     } else {
-	return do_draw_handle & resizable;
+	return do_draw_handle && resizable;
     }
 }
 
--- kdebase-3.5.2/kwin/clients/default/kdedefault.cpp.kwin	2005-09-10 10:25:55.000000000 +0200
+++ kdebase-3.5.2/kwin/clients/default/kdedefault.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -808,7 +808,7 @@
 		case LM_ExplicitButtonSpacer:
 			if ( !isToolWindow() )
 				return borderWidth/2;
-
+			// fall though
 		default:
 			return KCommonDecoration::layoutMetric(lm, respectWindowState, btn);
 	}
--- kdebase-3.5.2/kwin/kcmkwin/kwinrules/main.cpp.kwin	2006-03-17 11:17:42.000000000 +0100
+++ kdebase-3.5.2/kwin/kcmkwin/kwinrules/main.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -119,8 +119,8 @@
             if( rule->types != NET::AllTypesMask )
                 {
                 int bits = 0;
-                for( int bit = 1;
-                     bit < 1 << 31;
+                for( unsigned int bit = 1;
+                     bit < 1U << 31;
                      bit <<= 1 )
                     if( rule->types & bit )
                         ++bits;
--- kdebase-3.5.2/kwin/kcmkwin/kwinoptions/windows.cpp.kwin	2006-03-17 11:17:42.000000000 +0100
+++ kdebase-3.5.2/kwin/kcmkwin/kwinoptions/windows.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -228,6 +228,7 @@
                  " is pressed, with no popup widget.  In addition, the previously"
                  " activated window will be sent to the back in this mode.");
     QWhatsThis::add( altTabPopup, wtstr );
+    connect(focusCombo, SIGNAL(activated(int)), this, SLOT(updateAltTabMode()));
 
     traverseAll = new QCheckBox( i18n( "&Traverse windows on all desktops" ), kbdBox );
     kLay->addWidget( traverseAll );
@@ -279,6 +280,13 @@
 
     // this will disable/hide the auto raise delay widget if focus==click
     setAutoRaiseEnabled();
+    updateAltTabMode();
+}
+
+void KFocusConfig::updateAltTabMode()
+{
+    // not KDE-style Alt+Tab with unreasonable focus policies
+    altTabPopup->setEnabled( focusCombo->currentItem() == 0 || focusCombo->currentItem() == 1 );
 }
 
 void KFocusConfig::setAutoRaiseInterval(int tb)
@@ -900,7 +908,6 @@
     BrdrSnap->setSpecialValueText( i18n("none") );
     BrdrSnap->setRange( 0, MAX_BRDR_SNAP);
     BrdrSnap->setLabel(i18n("&Border snap zone:"));
-    BrdrSnap->setSuffix(i18n(" pixels"));
     BrdrSnap->setSteps(1,10);
     QWhatsThis::add( BrdrSnap, i18n("Here you can set the snap zone for screen borders, i.e."
                                     " the 'strength' of the magnetic field which will make windows snap to the border when"
@@ -910,7 +917,6 @@
     WndwSnap->setSpecialValueText( i18n("none") );
     WndwSnap->setRange( 0, MAX_WNDW_SNAP);
     WndwSnap->setLabel(i18n("&Window snap zone:"));
-    WndwSnap->setSuffix( i18n(" pixels"));
     BrdrSnap->setSteps(1,10);
     QWhatsThis::add( WndwSnap, i18n("Here you can set the snap zone for windows, i.e."
                                     " the 'strength' of the magnetic field which will make windows snap to each other when"
@@ -935,8 +941,14 @@
     connect( moveResizeMaximized, SIGNAL(toggled(bool)), SLOT(changed()));
     connect( placementCombo, SIGNAL(activated(int)), SLOT(changed()));
     connect( BrdrSnap, SIGNAL(valueChanged(int)), SLOT(changed()));
+    connect( BrdrSnap, SIGNAL(valueChanged(int)), SLOT(slotBrdrSnapChanged(int)));
     connect( WndwSnap, SIGNAL(valueChanged(int)), SLOT(changed()));
+    connect( WndwSnap, SIGNAL(valueChanged(int)), SLOT(slotWndwSnapChanged(int)));
     connect( OverlapSnap, SIGNAL(clicked()), SLOT(changed()));
+
+    // To get suffix to BrdrSnap and WndwSnap inputs with default values.
+    slotBrdrSnapChanged(BrdrSnap->value());
+    slotWndwSnapChanged(WndwSnap->value());
 }
 
 int KMovingConfig::getMove()
@@ -1007,6 +1019,14 @@
     moveResizeMaximized->setChecked(a);
 }
 
+void KMovingConfig::slotBrdrSnapChanged(int value) {
+    BrdrSnap->setSuffix(i18n(" pixel", " pixels", value));
+}
+
+void KMovingConfig::slotWndwSnapChanged(int value) {
+    WndwSnap->setSuffix(i18n(" pixel", " pixels", value));
+}
+
 void KMovingConfig::load( void )
 {
     QString key;
--- kdebase-3.5.2/kwin/kcmkwin/kwinoptions/windows.h.kwin	2006-01-19 18:01:05.000000000 +0100
+++ kdebase-3.5.2/kwin/kcmkwin/kwinoptions/windows.h	2006-04-28 12:30:43.000000000 +0200
@@ -85,6 +85,7 @@
   void autoRaiseOnTog(bool);//CT 23Oct1998
   void delayFocusOnTog(bool);
   void clickRaiseOnTog(bool);
+  void updateAltTabMode();
 	void changed() { emit KCModule::changed(true); }
 
 
@@ -138,6 +139,8 @@
   void setMinimizeAnim( bool );
   void setMinimizeAnimSpeed( int );
 	void changed() { emit KCModule::changed(true); }
+  void slotBrdrSnapChanged( int );
+  void slotWndwSnapChanged( int );
 
 private:
   int getMove( void );
--- kdebase-3.5.2/kwin/kompmgr/kompmgr.c.kwin	2006-03-17 11:17:43.000000000 +0100
+++ kdebase-3.5.2/kwin/kompmgr/kompmgr.c	2006-04-28 12:30:43.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * $Id: kompmgr.c 511474 2006-02-20 01:12:52Z danimo $
+ * $Id: kompmgr.c 528927 2006-04-12 05:27:31Z rohanpm $
  *
  * Copyright ?? 2003 Keith Packard
  *
@@ -201,7 +201,7 @@
 typedef enum _compMode {
     CompSimple,		/* looks like a regular X server */
     CompServerShadows,	/* use window alpha for shadow; sharp, but precise */
-    CompClientShadows,	/* use window extents for shadow, blurred */
+    CompClientShadows	/* use window extents for shadow, blurred */
 } CompMode;
 
 static void
@@ -2878,7 +2878,16 @@
 									break;*/ /*skip if opacity does not change*/
 								if (fadeTrans)
 								{
-								    set_fade (dpy, w, w->opacity*1.0/OPAQUE, (tmp*1.0)/OPAQUE, fade_out_step, 0, False, True, True, False);
+									static double start, finish, step;
+									start = w->opacity*1.0/OPAQUE;
+									finish = (tmp*1.0)/OPAQUE;
+									
+									if ( start > finish )
+										step = fade_out_step;
+									else
+										step = fade_in_step;
+									
+								    set_fade (dpy, w, start, finish, step, 0, False, True, True, False);
                                     break;
                                     }
                                 else
--- kdebase-3.5.2/kwin/activation.cpp.kwin	2006-03-17 11:17:43.000000000 +0100
+++ kdebase-3.5.2/kwin/activation.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -231,7 +231,7 @@
         last_active_client = active_client;
     if ( active_client ) 
         {
-        updateFocusChains( active_client, true ); // make it first in focus chain
+        updateFocusChains( active_client, FocusChainMakeFirst );
         active_client->demandAttention( false );
         }
     pending_take_activity = NULL;
--- kdebase-3.5.2/kwin/client.cpp.kwin	2006-03-17 11:17:43.000000000 +0100
+++ kdebase-3.5.2/kwin/client.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -578,7 +578,7 @@
     updateAllowedActions();
     workspace()->updateMinimizedOfTransients( this );
     updateWindowRules();
-    workspace()->updateFocusChains( this, false ); // make it last in the focus chain
+    workspace()->updateFocusChains( this, Workspace::FocusChainMakeLast );
     }
 
 void Client::unminimize( bool avoid_animation )
@@ -895,7 +895,16 @@
         }
     if( show )
         {
-        if( workspace()->showingDesktop())
+        bool belongs_to_desktop = false;
+        for( ClientList::ConstIterator it = group()->members().begin();
+             it != group()->members().end();
+             ++it )
+            if( (*it)->isDesktop())
+                {
+                belongs_to_desktop = true;
+                break;
+                }
+        if( !belongs_to_desktop && workspace()->showingDesktop())
             workspace()->resetShowingDesktop( true );
         if( isShade())
             setMappingState( IconicState );
@@ -1149,7 +1158,8 @@
     info->setState( b?NET::SkipTaskbar:0, NET::SkipTaskbar );
     updateWindowRules();
     if( was_wants_tab_focus != wantsTabFocus())
-        workspace()->updateFocusChains( this, isActive());
+        workspace()->updateFocusChains( this,
+            isActive() ? Workspace::FocusChainMakeFirst : Workspace::FocusChainUpdate );
     }
 
 void Client::setSkipPager( bool b )
@@ -1191,7 +1201,7 @@
         }
     if( decoration != NULL )
         decoration->desktopChange();
-    workspace()->updateFocusChains( this, true );
+    workspace()->updateFocusChains( this, Workspace::FocusChainMakeFirst );
     updateVisibility();
     updateWindowRules();
     }
--- kdebase-3.5.2/kwin/events.cpp.kwin	2006-03-17 11:17:43.000000000 +0100
+++ kdebase-3.5.2/kwin/events.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -370,7 +370,7 @@
             if( c )
                 {
                 c->windowEvent( e );
-                updateFocusChains( c, true );
+                updateFocusChains( c, FocusChainUpdate );
                 return true;
                 }
             break;
@@ -402,15 +402,15 @@
             if ( e->xconfigurerequest.parent == root ) 
                 {
                 XWindowChanges wc;
-                unsigned int value_mask = 0;
-                wc.border_width = 0;
+                wc.border_width = e->xconfigurerequest.border_width;
                 wc.x = e->xconfigurerequest.x;
                 wc.y = e->xconfigurerequest.y;
                 wc.width = e->xconfigurerequest.width;
                 wc.height = e->xconfigurerequest.height;
                 wc.sibling = None;
                 wc.stack_mode = Above;
-                value_mask = e->xconfigurerequest.value_mask | CWBorderWidth;
+                unsigned int value_mask = e->xconfigurerequest.value_mask
+                    & ( CWX | CWY | CWWidth | CWHeight | CWBorderWidth );
                 XConfigureWindow( qt_xdisplay(), e->xconfigurerequest.window, value_mask, &wc );
                 return true;
                 }
--- kdebase-3.5.2/kwin/geometry.cpp.kwin	2006-03-17 11:17:43.000000000 +0100
+++ kdebase-3.5.2/kwin/geometry.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -1281,7 +1281,21 @@
         { // update to match restrictions
         QSize new_size = adjustedSize();
         if( new_size != size() && !isFullScreen())
+            {
+            QRect orig_geometry = geometry();
             resizeWithChecks( new_size );
+            if( ( !isSpecialWindow() || isToolbar()) && !isFullScreen())
+                {
+                // try to keep the window in its xinerama screen if possible,
+                // if that fails at least keep it visible somewhere
+                QRect area = workspace()->clientArea( MovementArea, this );
+                if( area.contains( orig_geometry ))
+                    keepInArea( area );
+                area = workspace()->clientArea( WorkArea, this );
+                if( area.contains( orig_geometry ))
+                    keepInArea( area );
+                }
+            }
         }
     updateAllowedActions(); // affects isResizeable()
     }
@@ -1840,7 +1854,7 @@
 
     // maximing one way and unmaximizing the other way shouldn't happen
     Q_ASSERT( !( vertical && horizontal )
-        || (( max_mode & MaximizeVertical != 0 ) == ( max_mode & MaximizeHorizontal != 0 )));
+        || ((( max_mode & MaximizeVertical ) != 0 ) == (( max_mode & MaximizeHorizontal ) != 0 )));
 
     QRect clientArea = workspace()->clientArea( MaximizeArea, this );
 
--- kdebase-3.5.2/kwin/layers.cpp.kwin	2006-03-17 11:17:43.000000000 +0100
+++ kdebase-3.5.2/kwin/layers.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -100,7 +100,7 @@
     {
     if( block_stacking_updates > 0 )
         {
-        blocked_propagating_new_clients |= propagate_new_clients;
+        blocked_propagating_new_clients = blocked_propagating_new_clients || propagate_new_clients;
         return;
         }
     ClientList new_stacking_order = constrainedStackingOrder();
@@ -441,6 +441,21 @@
                 }
             }
       	}
+    // the same for global_focus_chain
+    if( c->wantsTabFocus() && global_focus_chain.contains( active_client ))
+        {
+        global_focus_chain.remove( c );
+        for( ClientList::Iterator it = global_focus_chain.fromLast();
+             it != global_focus_chain.end();
+             --it )
+            {
+            if( Client::belongToSameApplication( active_client, *it ))
+                {
+                global_focus_chain.insert( it, c );
+                break;
+                }
+            }
+      	}
     updateStackingOrder();
     }
 
--- kdebase-3.5.2/kwin/manage.cpp.kwin	2006-03-17 11:17:43.000000000 +0100
+++ kdebase-3.5.2/kwin/manage.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -455,7 +455,16 @@
         if( !isOnCurrentDesktop() && !isMapped && !session && ( allow || workspace()->sessionSaving()))
             workspace()->setCurrentDesktop( desktop());
 
-        if( workspace()->showingDesktop())
+        bool belongs_to_desktop = false;
+        for( ClientList::ConstIterator it = group()->members().begin();
+             it != group()->members().end();
+             ++it )
+            if( (*it)->isDesktop())
+                {
+                belongs_to_desktop = true;
+                break;
+                }
+        if( !belongs_to_desktop && workspace()->showingDesktop())
             workspace()->resetShowingDesktop( false );
 
         if( isOnCurrentDesktop() && !isMapped && !allow )
--- kdebase-3.5.2/kwin/popupinfo.cpp.kwin	2006-03-17 11:17:43.000000000 +0100
+++ kdebase-3.5.2/kwin/popupinfo.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -38,6 +38,7 @@
     : QWidget( 0, name )
     {
     m_infoString = "";
+    m_shown = false;
     reset();
     reconfigure();
     connect(&m_delayedHideTimer, SIGNAL(timeout()), this, SLOT(hide()));
--- kdebase-3.5.2/kwin/tabbox.cpp.kwin	2006-03-17 11:17:43.000000000 +0100
+++ kdebase-3.5.2/kwin/tabbox.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -763,7 +763,7 @@
         return;
     if ( tab_grab || control_grab )
         return;
-    if ( options->altTabStyle == Options::CDE )
+    if ( options->altTabStyle == Options::CDE || !options->focusPolicyIsReasonable())
         {
         //XUngrabKeyboard(qt_xdisplay(), qt_x_time); // need that because of accelerator raw mode
         // CDE style raise / lower
@@ -789,7 +789,7 @@
         return;
     if( tab_grab || control_grab )
         return;
-    if ( options->altTabStyle == Options::CDE )
+    if ( options->altTabStyle == Options::CDE || !options->focusPolicyIsReasonable())
         {
         // CDE style raise / lower
         CDEWalkThroughWindows( false );
@@ -926,7 +926,23 @@
 
 void Workspace::CDEWalkThroughWindows( bool forward )
     {
-    Client* c = activeClient();
+    Client* c = NULL;
+// this function find the first suitable client for unreasonable focus
+// policies - the topmost one, with some exceptions (can't be keepabove/below,
+// otherwise it gets stuck on them)
+    Q_ASSERT( block_stacking_updates == 0 );
+    for( ClientList::ConstIterator it = stacking_order.fromLast();
+         it != stacking_order.end();
+         --it )
+        {
+        if ( (*it)->isOnCurrentDesktop() && !(*it)->isSpecialWindow()
+            && (*it)->isShown( false ) && (*it)->wantsTabFocus()
+            && !(*it)->keepAbove() && !(*it)->keepBelow())
+            {
+            c = *it;
+            break;
+            }
+        }
     Client* nc = c;
     bool options_traverse_all;
         {
@@ -952,7 +968,7 @@
             }
         } while (nc && nc != c &&
             (( !options_traverse_all && !nc->isOnDesktop(currentDesktop())) ||
-             nc->isMinimized() || !nc->wantsTabFocus() ) );
+             nc->isMinimized() || !nc->wantsTabFocus() || nc->keepAbove() || nc->keepBelow() ) );
     if (nc)
         {
         if (c && c != nc)
@@ -1152,14 +1168,13 @@
 */
 Client* Workspace::nextFocusChainClient( Client* c ) const
     {
-    int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop();
-    if ( focus_chain[desktop].isEmpty() )
+    if ( global_focus_chain.isEmpty() )
         return 0;
-    ClientList::ConstIterator it = focus_chain[desktop].find( c );
-    if ( it == focus_chain[desktop].end() )
-        return focus_chain[desktop].last();
-    if ( it == focus_chain[desktop].begin() )
-        return focus_chain[desktop].last();
+    ClientList::ConstIterator it = global_focus_chain.find( c );
+    if ( it == global_focus_chain.end() )
+        return global_focus_chain.last();
+    if ( it == global_focus_chain.begin() )
+        return global_focus_chain.last();
     --it;
     return *it;
     }
@@ -1170,15 +1185,14 @@
 */
 Client* Workspace::previousFocusChainClient( Client* c ) const
     {
-    int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop();
-    if ( focus_chain[desktop].isEmpty() )
+    if ( global_focus_chain.isEmpty() )
         return 0;
-    ClientList::ConstIterator it = focus_chain[desktop].find( c );
-    if ( it == focus_chain[desktop].end() )
-        return focus_chain[desktop].first();
+    ClientList::ConstIterator it = global_focus_chain.find( c );
+    if ( it == global_focus_chain.end() )
+        return global_focus_chain.first();
     ++it;
-    if ( it == focus_chain[desktop].end() )
-        return focus_chain[desktop].first();
+    if ( it == global_focus_chain.end() )
+        return global_focus_chain.first();
     return *it;
     }
 
--- kdebase-3.5.2/kwin/useractions.cpp.kwin	2005-11-08 23:36:42.000000000 +0100
+++ kdebase-3.5.2/kwin/useractions.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -391,6 +391,7 @@
             break;
         case Options::RestoreOp:
             c->maximize( Client::MaximizeRestore );
+            break;
         case Options::MinimizeOp:
             c->minimize();
             break;
@@ -471,7 +472,7 @@
             cancelShadeHover();
             break;
         case Options::MouseOperationsMenu:
-            if ( isActive() & options->clickRaise )
+            if ( isActive() && options->clickRaise )
                 autoRaise();
             workspace()->showWindowMenu( globalPos, this );
             break;
--- kdebase-3.5.2/kwin/utils.cpp.kwin	2006-03-17 11:17:43.000000000 +0100
+++ kdebase-3.5.2/kwin/utils.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -309,9 +309,12 @@
         hostnamebuf[sizeof(hostnamebuf)-1] = 0;
         if (host == hostnamebuf)
             return true;
-        char *dot = strchr(hostnamebuf, '.');
-        if (dot && !(*dot = 0) && host == hostnamebuf)
-            return true;
+        if( char *dot = strchr(hostnamebuf, '.'))
+            {
+            *dot = '\0';
+            if( host == hostnamebuf )
+                return true;
+            }
         }
     return false;
     }
--- kdebase-3.5.2/kwin/utils.h.kwin	2006-03-17 11:17:43.000000000 +0100
+++ kdebase-3.5.2/kwin/utils.h	2006-04-28 12:30:43.000000000 +0200
@@ -232,15 +232,13 @@
 inline
 int timestampCompare( Time time1, Time time2 ) // like strcmp()
     {
-    if( time1 == time2 )
-        return 0;
-    return ( time1 - time2 ) < 1000000000 ? 1 : -1; // time1 > time2 -> 1, handle wrapping
+    return NET::timestampCompare( time1, time2 );
     }
 
 inline
 Time timestampDiff( Time time1, Time time2 ) // returns time2 - time1
-    { // no need to handle wrapping?
-    return time2 - time1;
+    {
+    return NET::timestampDiff( time1, time2 );
     }
 
 bool isLocalMachine( const QCString& host );
--- kdebase-3.5.2/kwin/workspace.cpp.kwin	2006-03-17 11:17:43.000000000 +0100
+++ kdebase-3.5.2/kwin/workspace.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -512,7 +512,7 @@
         }
     else
         {
-        updateFocusChains( c, true );
+        updateFocusChains( c, FocusChainUpdate ); // add to focus chain if not already there
         clients.append( c );
         }
     if( !unconstrained_stacking_order.contains( c ))
@@ -564,6 +564,7 @@
          i <= numberOfDesktops();
          ++i )
         focus_chain[ i ].remove( c );
+    global_focus_chain.remove( c );
     attention_chain.remove( c );
     if( c->isTopMenu())
         removeTopMenu( c );
@@ -590,7 +591,7 @@
     updateClientArea();
     }
 
-void Workspace::updateFocusChains( Client* c, bool make_first )
+void Workspace::updateFocusChains( Client* c, FocusChainChange change )
     {
     if( !c->wantsTabFocus()) // doesn't want tab focus, remove
         {
@@ -598,16 +599,21 @@
              i<= numberOfDesktops();
              ++i )
             focus_chain[i].remove(c);
+        global_focus_chain.remove( c );
         return;
         }
     if(c->desktop() == NET::OnAllDesktops)
         { //now on all desktops, add it to focus_chains it is not already in
         for( int i=1; i<= numberOfDesktops(); i++)
-            { // make_first works only on current desktop, don't affect all desktops
-            if( make_first && i == currentDesktop())
+            { // making first/last works only on current desktop, don't affect all desktops
+            if( i == currentDesktop()
+                && ( change == FocusChainMakeFirst || change == FocusChainMakeLast ))
                 {
                 focus_chain[ i ].remove( c );
-                focus_chain[ i ].append( c );
+                if( change == FocusChainMakeFirst )
+                    focus_chain[ i ].append( c );
+                else
+                    focus_chain[ i ].prepend( c );
                 }
             else if( !focus_chain[ i ].contains( c ))
                 focus_chain[ i ].prepend( c ); // otherwise add as the last one
@@ -619,11 +625,16 @@
             {
             if( i == c->desktop())
                 {
-                if( make_first )
+                if( change == FocusChainMakeFirst )
                     {
                     focus_chain[ i ].remove( c );
                     focus_chain[ i ].append( c );
                     }
+                else if( change == FocusChainMakeLast )
+                    {
+                    focus_chain[ i ].remove( c );
+                    focus_chain[ i ].prepend( c );
+                    }
                 else if( !focus_chain[ i ].contains( c ))
                     focus_chain[ i ].prepend( c );
                 }
@@ -631,6 +642,18 @@
                 focus_chain[ i ].remove( c );
             }
         }
+    if( change == FocusChainMakeFirst )
+        {
+        global_focus_chain.remove( c );
+        global_focus_chain.append( c );
+        }
+    else if( change == FocusChainMakeLast )
+        {
+        global_focus_chain.remove( c );
+        global_focus_chain.prepend( c );
+        }
+    else if( !global_focus_chain.contains( c ))
+        global_focus_chain.prepend( c );
     }
 
 void Workspace::updateCurrentTopMenu()
--- kdebase-3.5.2/kwin/workspace.h.kwin	2006-03-17 11:17:43.000000000 +0100
+++ kdebase-3.5.2/kwin/workspace.h	2006-04-28 12:30:43.000000000 +0200
@@ -251,7 +251,8 @@
         bool checkStartupNotification( Window w, KStartupInfoId& id, KStartupInfoData& data );
 
         void focusToNull(); // SELI public?
-        void updateFocusChains( Client* c, bool make_first );
+        enum FocusChainChange { FocusChainMakeFirst, FocusChainMakeLast, FocusChainUpdate };
+        void updateFocusChains( Client* c, FocusChainChange change );
         
         bool forcedGlobalMouseGrab() const;
         void clientShortcutUpdated( Client* c );
@@ -510,6 +511,7 @@
         ClientList unconstrained_stacking_order;
         ClientList stacking_order;
         QValueVector< ClientList > focus_chain;
+        ClientList global_focus_chain; // this one is only for things like tabbox's MRU
         ClientList should_get_focus; // last is most recent
         ClientList attention_chain;
         


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- kdebase.spec	25 Apr 2006 14:17:54 -0000	1.164
+++ kdebase.spec	28 Apr 2006 10:42:28 -0000	1.165
@@ -20,7 +20,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.2
-Release: 4
+Release: 5
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -53,6 +53,9 @@
 Patch14: kdebase-3.5.1-kdm-readme.patch
 Patch15: kdebase-3.5.1-konsole-fonts.patch
 
+# upstream patches
+Patch100: kdebase-3.5.2-kwin.patch
+
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: libxml2 >= 2.6.5
 Requires: /etc/X11/xdm/Xaccess
@@ -137,6 +140,9 @@
 %patch14 -p1 -b .kdm-readme
 %patch15 -p1 -b .konsole-fonts
 
+# upstream patches
+%patch100 -p1 -b .kwin
+
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
    perl -pi -e "s,kdeprintfax,," kdeprint/Makefile.am
@@ -151,11 +157,6 @@
 %build
 # set some default enviroments
 unset QTDIR && . /etc/profile.d/qt.sh
-FLAGS="$RPM_OPT_FLAGS"
-
-export CXXFLAGS="$FLAGS"
-export CFLAGS="$FLAGS"
-export KDEDIR=%{_prefix}
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
@@ -425,6 +426,7 @@
 %changelog
 * Tue Apr 25 2006 Than Ngo <than at redhat.com> 6:3.5.2-4
 - fix #189790, kcheckpass cannot authenticate users using a LDAP directory
+- fix #189702, kwin crashes when switching windows with Alt-Tab
 
 * Thu Apr 13 2006 Than Ngo <than at redhat.com> 6:3.5.2-3
 - fix startkde to look in /usr and /etc/kde for env/ and shutdown/



From fedora-cvs-commits at redhat.com  Fri Apr 28 11:56:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 07:56:34 -0400
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders.spec, 1.118,
	1.119 sources, 1.31, 1.32
Message-ID: <200604281156.k3SBuYge019990@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19959

Modified Files:
	glibc-kernheaders.spec sources 
Log Message:
fix #190157


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- glibc-kernheaders.spec	27 Apr 2006 17:51:46 -0000	1.118
+++ glibc-kernheaders.spec	28 Apr 2006 11:56:31 -0000	1.119
@@ -1,7 +1,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -91,7 +91,10 @@
 
 
 %changelog
-* Thu Apr 27 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-17
+* Thu Apr 27 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-19
+- Remove device table crap from linux/input.h (#190157)
+
+* Thu Apr 27 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-18
 - Remove 'extern int errno;' from linux/unistd.h
 
 * Thu Apr 27 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-17


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	27 Apr 2006 17:51:46 -0000	1.31
+++ sources	28 Apr 2006 11:56:31 -0000	1.32
@@ -1 +1 @@
-a3a9b79916c0c0aee9c729559b87fd8a  glibc-kernheaders.tar.bz2
+09f47821e777cfc510a3e8322538b93f  glibc-kernheaders.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr 28 12:03:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 08:03:22 -0400
Subject: rpms/kernel/devel linux-2.6-header-cleanup-git.patch,1.8,1.9
Message-ID: <200604281203.k3SC3MvI021527@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21498

Modified Files:
	linux-2.6-header-cleanup-git.patch 
Log Message:
fix input.h

linux-2.6-header-cleanup-git.patch:
 b/include/asm-i386/page.h                            |    5 
 b/include/asm-s390/ptrace.h                          |    6 
 b/include/asm-x86_64/page.h                          |    5 
 b/include/linux/elf-em.h                             |   44 ++++
 include/acpi/platform/aclinux.h                      |    1 
 include/acpi/processor.h                             |    1 
 include/asm-alpha/bitops.h                           |    1 
 include/asm-alpha/cache.h                            |    1 
 include/asm-alpha/cacheflush.h                       |    1 
 include/asm-alpha/core_cia.h                         |    1 
 include/asm-alpha/core_t2.h                          |    1 
 include/asm-alpha/dma-mapping.h                      |    1 
 include/asm-alpha/dma.h                              |    1 
 include/asm-alpha/floppy.h                           |    1 
 include/asm-alpha/hardirq.h                          |    1 
 include/asm-alpha/hw_irq.h                           |    1 
 include/asm-alpha/ide.h                              |    1 
 include/asm-alpha/io.h                               |    1 
 include/asm-alpha/irq.h                              |    1 
 include/asm-alpha/kmap_types.h                       |    1 
 include/asm-alpha/machvec.h                          |    1 
 include/asm-alpha/mmu_context.h                      |    1 
 include/asm-alpha/mmzone.h                           |    1 
 include/asm-alpha/page.h                             |    1 
 include/asm-alpha/param.h                            |    1 
 include/asm-alpha/pgalloc.h                          |    1 
 include/asm-alpha/pgtable.h                          |    1 
 include/asm-alpha/serial.h                           |    1 
 include/asm-alpha/smp.h                              |    1 
 include/asm-alpha/spinlock.h                         |    1 
 include/asm-alpha/system.h                           |    1 
 include/asm-alpha/tlbflush.h                         |    1 
 include/asm-arm/apm.h                                |    1 
 include/asm-arm/arch-aaec2000/memory.h               |    1 
 include/asm-arm/arch-cl7500/acornfb.h                |    1 
 include/asm-arm/arch-clps711x/hardware.h             |    1 
 include/asm-arm/arch-clps711x/memory.h               |    1 
 include/asm-arm/arch-clps711x/uncompress.h           |    1 
 include/asm-arm/arch-ebsa285/hardware.h              |    1 
 include/asm-arm/arch-ebsa285/memory.h                |    1 
 include/asm-arm/arch-ebsa285/vmalloc.h               |    1 
 include/asm-arm/arch-integrator/smp.h                |    1 
 include/asm-arm/arch-iop3xx/memory.h                 |    1 
 include/asm-arm/arch-iop3xx/timex.h                  |    1 
 include/asm-arm/arch-iop3xx/uncompress.h             |    1 
 include/asm-arm/arch-ixp4xx/dma.h                    |    1 
 include/asm-arm/arch-lh7a40x/constants.h             |    1 
 include/asm-arm/arch-lh7a40x/irqs.h                  |    1 
 include/asm-arm/arch-lh7a40x/registers.h             |    1 
 include/asm-arm/arch-omap/board.h                    |    1 
 include/asm-arm/arch-omap/hardware.h                 |    1 
 include/asm-arm/arch-omap/system.h                   |    1 
 include/asm-arm/arch-omap/uncompress.h               |    1 
 include/asm-arm/arch-pxa/idp.h                       |    1 
 include/asm-arm/arch-pxa/irqs.h                      |    1 
 include/asm-arm/arch-pxa/pxa-regs.h                  |    1 
 include/asm-arm/arch-pxa/timex.h                     |    1 
 include/asm-arm/arch-realview/smp.h                  |    1 
 include/asm-arm/arch-s3c2410/dma.h                   |    1 
 include/asm-arm/arch-s3c2410/uncompress.h            |    1 
 include/asm-arm/arch-sa1100/assabet.h                |    1 
 include/asm-arm/arch-sa1100/cerf.h                   |    1 
 include/asm-arm/arch-sa1100/collie.h                 |    1 
 include/asm-arm/arch-sa1100/dma.h                    |    1 
 include/asm-arm/arch-sa1100/hardware.h               |    1 
 include/asm-arm/arch-sa1100/ide.h                    |    1 
 include/asm-arm/arch-sa1100/irqs.h                   |    1 
 include/asm-arm/arch-sa1100/memory.h                 |    1 
 include/asm-arm/arch-sa1100/system.h                 |    1 
 include/asm-arm/atomic.h                             |    1 
 include/asm-arm/bug.h                                |    1 
 include/asm-arm/cacheflush.h                         |    1 
 include/asm-arm/cpu.h                                |    1 
 include/asm-arm/dma-mapping.h                        |    1 
 include/asm-arm/dma.h                                |    1 
 include/asm-arm/elf.h                                |    1 
 include/asm-arm/fpstate.h                            |    1 
 include/asm-arm/glue.h                               |    1 
 include/asm-arm/hardirq.h                            |    1 
 include/asm-arm/hardware/dec21285.h                  |    1 
 include/asm-arm/hardware/iomd.h                      |    1 
 include/asm-arm/leds.h                               |    1 
 include/asm-arm/mach/serial_at91rm9200.h             |    1 
 include/asm-arm/mach/serial_sa1100.h                 |    1 
 include/asm-arm/memory.h                             |    1 
 include/asm-arm/page.h                               |    1 
 include/asm-arm/pci.h                                |    1 
 include/asm-arm/proc-fns.h                           |    1 
 include/asm-arm/ptrace.h                             |    1 
 include/asm-arm/smp.h                                |    1 
 include/asm-arm/system.h                             |    1 
 include/asm-arm/tlbflush.h                           |    1 
 include/asm-arm26/atomic.h                           |    1 
 include/asm-arm26/bug.h                              |    1 
 include/asm-arm26/dma.h                              |    1 
 include/asm-arm26/hardirq.h                          |    1 
 include/asm-arm26/hardware.h                         |    1 
 include/asm-arm26/io.h                               |    1 
 include/asm-arm26/leds.h                             |    1 
 include/asm-arm26/mach-types.h                       |    1 
 include/asm-arm26/page.h                             |    1 
 include/asm-arm26/pgtable.h                          |    1 
 include/asm-arm26/serial.h                           |    1 
 include/asm-arm26/smp.h                              |    1 
 include/asm-arm26/sysirq.h                           |    1 
 include/asm-arm26/system.h                           |    1 
 include/asm-cris/arch-v10/io.h                       |    1 
 include/asm-cris/arch-v10/page.h                     |    1 
 include/asm-cris/arch-v10/system.h                   |    1 
 include/asm-cris/arch-v32/io.h                       |    1 
 include/asm-cris/arch-v32/irq.h                      |    1 
 include/asm-cris/arch-v32/page.h                     |    1 
 include/asm-cris/arch-v32/processor.h                |    1 
 include/asm-cris/arch-v32/system.h                   |    1 
 include/asm-cris/eshlibld.h                          |    1 
 include/asm-cris/etraxgpio.h                         |    1 
 include/asm-cris/fasttimer.h                         |    1 
 include/asm-cris/page.h                              |    1 
 include/asm-cris/pci.h                               |    1 
 include/asm-cris/pgtable.h                           |    1 
 include/asm-cris/processor.h                         |    1 
 include/asm-cris/rtc.h                               |    1 
 include/asm-cris/tlbflush.h                          |    1 
 include/asm-frv/atomic.h                             |    1 
 include/asm-frv/bitops.h                             |    1 
 include/asm-frv/bug.h                                |    1 
 include/asm-frv/cache.h                              |    1 
 include/asm-frv/dma.h                                |    1 
 include/asm-frv/elf.h                                |    1 
 include/asm-frv/fpu.h                                |    1 
 include/asm-frv/hardirq.h                            |    1 
 include/asm-frv/highmem.h                            |    1 
 include/asm-frv/ide.h                                |    1 
 include/asm-frv/io.h                                 |    1 
 include/asm-frv/irq.h                                |    1 
 include/asm-frv/mmu_context.h                        |    1 
 include/asm-frv/page.h                               |    1 
 include/asm-frv/pci.h                                |    1 
 include/asm-frv/pgalloc.h                            |    1 
 include/asm-frv/pgtable.h                            |    1 
 include/asm-frv/processor.h                          |    1 
 include/asm-frv/segment.h                            |    1 
 include/asm-frv/serial.h                             |    1 
 include/asm-frv/smp.h                                |    1 
 include/asm-frv/system.h                             |    1 
 include/asm-frv/tlbflush.h                           |    1 
 include/asm-frv/types.h                              |    1 
 include/asm-frv/unaligned.h                          |    1 
 include/asm-frv/virtconvert.h                        |    1 
 include/asm-generic/bug.h                            |    1 
 include/asm-generic/dma-mapping.h                    |    1 
 include/asm-generic/fcntl.h                          |    1 
 include/asm-generic/local.h                          |    1 
 include/asm-generic/signal.h                         |    7 
 include/asm-generic/tlb.h                            |    1 
 include/asm-h8300/bitops.h                           |    1 
 include/asm-h8300/dma.h                              |    1 
 include/asm-h8300/elf.h                              |    1 
 include/asm-h8300/hardirq.h                          |    1 
 include/asm-h8300/io.h                               |    1 
 include/asm-h8300/keyboard.h                         |    1 
 include/asm-h8300/mmu_context.h                      |    1 
 include/asm-h8300/page.h                             |    1 
 include/asm-h8300/page_offset.h                      |    1 
 include/asm-h8300/param.h                            |    1 
 include/asm-h8300/pgtable.h                          |    1 
 include/asm-h8300/processor.h                        |    1 
 include/asm-h8300/semaphore-helper.h                 |    1 
 include/asm-h8300/shm.h                              |    1 
 include/asm-h8300/system.h                           |    1 
 include/asm-h8300/unaligned.h                        |    1 
 include/asm-h8300/virtconvert.h                      |    1 
 include/asm-i386/apic.h                              |    1 
 include/asm-i386/atomic.h                            |    1 
 include/asm-i386/bitops.h                            |    1 
 include/asm-i386/bug.h                               |    1 
 include/asm-i386/bugs.h                              |    1 
 include/asm-i386/byteorder.h                         |    1 
 include/asm-i386/cache.h                             |    1 
 include/asm-i386/dma.h                               |    1 
 include/asm-i386/fixmap.h                            |    1 
 include/asm-i386/hardirq.h                           |    1 
 include/asm-i386/highmem.h                           |    1 
 include/asm-i386/hpet.h                              |    1 
 include/asm-i386/hw_irq.h                            |    1 
 include/asm-i386/ide.h                               |    1 
 include/asm-i386/io.h                                |    1 
 include/asm-i386/io_apic.h                           |    1 
 include/asm-i386/irq.h                               |    1 
 include/asm-i386/kmap_types.h                        |    1 
 include/asm-i386/mach-summit/mach_apic.h             |    1 
 include/asm-i386/mmu_context.h                       |    1 
 include/asm-i386/mtrr.h                              |    1 
 include/asm-i386/param.h                             |    1 
 include/asm-i386/pci.h                               |    1 
 include/asm-i386/pgalloc.h                           |    1 
 include/asm-i386/pgtable.h                           |    1 
 include/asm-i386/processor.h                         |    1 
 include/asm-i386/serial.h                            |    1 
 include/asm-i386/smp.h                               |    1 
 include/asm-i386/spinlock.h                          |    1 
 include/asm-i386/string.h                            |    1 
 include/asm-i386/system.h                            |    1 
 include/asm-i386/thread_info.h                       |    1 
 include/asm-i386/timex.h                             |    1 
 include/asm-i386/tlbflush.h                          |    1 
 include/asm-i386/types.h                             |    1 
 include/asm-i386/uaccess.h                           |    1 
 include/asm-ia64/asmmacro.h                          |    1 
 include/asm-ia64/cache.h                             |    1 
 include/asm-ia64/delay.h                             |    1 
 include/asm-ia64/dma-mapping.h                       |    1 
 include/asm-ia64/dma.h                               |    1 
 include/asm-ia64/elf.h                               |    1 
 include/asm-ia64/hardirq.h                           |    1 
 include/asm-ia64/ia32.h                              |    1 
 include/asm-ia64/ide.h                               |    1 
 include/asm-ia64/intrinsics.h                        |    1 
 include/asm-ia64/kmap_types.h                        |    1 
 include/asm-ia64/machvec.h                           |    1 
 include/asm-ia64/meminit.h                           |    1 
 include/asm-ia64/nodedata.h                          |    1 
 include/asm-ia64/numa.h                              |    1 
 include/asm-ia64/page.h                              |    1 
 include/asm-ia64/param.h                             |    1 
 include/asm-ia64/percpu.h                            |    1 
 include/asm-ia64/pgalloc.h                           |    1 
 include/asm-ia64/pgtable.h                           |    1 
 include/asm-ia64/processor.h                         |    1 
 include/asm-ia64/ptrace.h                            |    1 
 include/asm-ia64/smp.h                               |    1 
 include/asm-ia64/sn/simulator.h                      |    1 
 include/asm-ia64/sn/sn_cpuid.h                       |    1 
 include/asm-ia64/sn/sn_sal.h                         |    1 
 include/asm-ia64/sn/xpc.h                            |    1 
 include/asm-ia64/string.h                            |    1 
 include/asm-ia64/system.h                            |    1 
 include/asm-ia64/tlb.h                               |    1 
 include/asm-ia64/tlbflush.h                          |    1 
 include/asm-ia64/unistd.h                            |    1 
 include/asm-m32r/assembler.h                         |    1 
 include/asm-m32r/atomic.h                            |    1 
 include/asm-m32r/bitops.h                            |    1 
 include/asm-m32r/cacheflush.h                        |    1 
 include/asm-m32r/hardirq.h                           |    1 
 include/asm-m32r/ide.h                               |    1 
 include/asm-m32r/irq.h                               |    1 
 include/asm-m32r/kmap_types.h                        |    1 
 include/asm-m32r/m32104ut/m32104ut_pld.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lan.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lcd.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_pld.h             |    1 
 include/asm-m32r/m32r.h                              |    1 
 include/asm-m32r/mmu.h                               |    1 
 include/asm-m32r/mmu_context.h                       |    2 
 include/asm-m32r/opsput/opsput_lan.h                 |    1 
 include/asm-m32r/opsput/opsput_lcd.h                 |    1 
 include/asm-m32r/opsput/opsput_pld.h                 |    1 
 include/asm-m32r/page.h                              |    1 
 include/asm-m32r/pgalloc.h                           |    1 
 include/asm-m32r/pgtable-2level.h                    |    1 
 include/asm-m32r/pgtable.h                           |    1 
 include/asm-m32r/processor.h                         |    1 
 include/asm-m32r/ptrace.h                            |    1 
 include/asm-m32r/rtc.h                               |    1 
 include/asm-m32r/semaphore.h                         |    1 
 include/asm-m32r/serial.h                            |    1 
 include/asm-m32r/sigcontext.h                        |    1 
 include/asm-m32r/smp.h                               |    1 
 include/asm-m32r/spinlock.h                          |    1 
 include/asm-m32r/system.h                            |    1 
 include/asm-m32r/timex.h                             |    1 
 include/asm-m32r/tlbflush.h                          |    1 
 include/asm-m32r/uaccess.h                           |    1 
 include/asm-m68k/atomic.h                            |    1 
 include/asm-m68k/bug.h                               |    1 
 include/asm-m68k/dma-mapping.h                       |    1 
 include/asm-m68k/dma.h                               |    1 
 include/asm-m68k/dvma.h                              |    1 
 include/asm-m68k/elf.h                               |    1 
 include/asm-m68k/entry.h                             |    1 
 include/asm-m68k/fpu.h                               |    1 
 include/asm-m68k/hardirq.h                           |    1 
 include/asm-m68k/ide.h                               |    1 
 include/asm-m68k/io.h                                |    1 
 include/asm-m68k/irq.h                               |    1 
 include/asm-m68k/mc146818rtc.h                       |    1 
 include/asm-m68k/mmu_context.h                       |    1 
 include/asm-m68k/motorola_pgtable.h                  |    1 
 include/asm-m68k/openprom.h                          |    1 
 include/asm-m68k/page.h                              |    1 
 include/asm-m68k/page_offset.h                       |    1 
 include/asm-m68k/pgalloc.h                           |    1 
 include/asm-m68k/pgtable.h                           |    1 
 include/asm-m68k/processor.h                         |    1 
 include/asm-m68k/semaphore-helper.h                  |    1 
 include/asm-m68k/serial.h                            |    1 
 include/asm-m68k/setup.h                             |    1 
 include/asm-m68k/shm.h                               |    1 
 include/asm-m68k/system.h                            |    1 
 include/asm-m68k/tlbflush.h                          |    1 
 include/asm-m68k/virtconvert.h                       |    1 
 include/asm-m68knommu/bitops.h                       |    1 
 include/asm-m68knommu/coldfire.h                     |    1 
 include/asm-m68knommu/commproc.h                     |    1 
 include/asm-m68knommu/dma-mapping.h                  |    1 
 include/asm-m68knommu/dma.h                          |    1 
 include/asm-m68knommu/elf.h                          |    1 
 include/asm-m68knommu/elia.h                         |    1 
 include/asm-m68knommu/entry.h                        |    1 
 include/asm-m68knommu/fpu.h                          |    1 
 include/asm-m68knommu/hardirq.h                      |    1 
 include/asm-m68knommu/io.h                           |    1 
 include/asm-m68knommu/irq.h                          |    1 
 include/asm-m68knommu/m5206sim.h                     |    1 
 include/asm-m68knommu/m520xsim.h                     |    1 
 include/asm-m68knommu/m523xsim.h                     |    1 
 include/asm-m68knommu/m5272sim.h                     |    1 
 include/asm-m68knommu/m527xsim.h                     |    1 
 include/asm-m68knommu/m528xsim.h                     |    1 
 include/asm-m68knommu/mcfcache.h                     |    1 
 include/asm-m68knommu/mcfdma.h                       |    1 
 include/asm-m68knommu/mcfmbus.h                      |    1 
 include/asm-m68knommu/mcfne.h                        |    1 
 include/asm-m68knommu/mcfpci.h                       |    1 
 include/asm-m68knommu/mcfpit.h                       |    1 
 include/asm-m68knommu/mcfsim.h                       |    1 
 include/asm-m68knommu/mcfsmc.h                       |    1 
 include/asm-m68knommu/mcftimer.h                     |    1 
 include/asm-m68knommu/mcfuart.h                      |    1 
 include/asm-m68knommu/mcfwdebug.h                    |    1 
 include/asm-m68knommu/mmu_context.h                  |    1 
 include/asm-m68knommu/nettel.h                       |    1 
 include/asm-m68knommu/page.h                         |    1 
 include/asm-m68knommu/page_offset.h                  |    1 
 include/asm-m68knommu/param.h                        |    1 
 include/asm-m68knommu/pgtable.h                      |    1 
 include/asm-m68knommu/processor.h                    |    1 
 include/asm-m68knommu/semaphore-helper.h             |    1 
 include/asm-m68knommu/system.h                       |    1 
 include/asm-m68knommu/unaligned.h                    |    1 
 include/asm-mips/a.out.h                             |    1 
 include/asm-mips/addrspace.h                         |    1 
 include/asm-mips/arc/types.h                         |    1 
 include/asm-mips/asm.h                               |    1 
 include/asm-mips/asmmacro.h                          |    1 
 include/asm-mips/atomic.h                            |    1 
 include/asm-mips/bcache.h                            |    1 
 include/asm-mips/bitops.h                            |    1 
 include/asm-mips/bug.h                               |    1 
 include/asm-mips/bugs.h                              |    1 
 include/asm-mips/byteorder.h                         |    1 
 include/asm-mips/cache.h                             |    1 
 include/asm-mips/checksum.h                          |    1 
 include/asm-mips/cpu-features.h                      |    1 
 include/asm-mips/cpu-info.h                          |    1 
 include/asm-mips/ddb5xxx/ddb5477.h                   |    1 
 include/asm-mips/ddb5xxx/ddb5xxx.h                   |    1 
 include/asm-mips/debug.h                             |    1 
 include/asm-mips/dec/prom.h                          |    1 
 include/asm-mips/delay.h                             |    1 
 include/asm-mips/dma.h                               |    1 
 include/asm-mips/elf.h                               |    1 
 include/asm-mips/fcntl.h                             |    1 
 include/asm-mips/fixmap.h                            |    1 
 include/asm-mips/fpu.h                               |    1 
 include/asm-mips/futex.h                             |    1 
 include/asm-mips/hazards.h                           |    1 
 include/asm-mips/highmem.h                           |    1 
 include/asm-mips/interrupt.h                         |    1 
 include/asm-mips/io.h                                |    1 
 include/asm-mips/ip32/machine.h                      |    1 
 include/asm-mips/irq.h                               |    1 
 include/asm-mips/isadep.h                            |    1 
 include/asm-mips/jmr3927/irq.h                       |    1 
 include/asm-mips/kmap_types.h                        |    1 
 include/asm-mips/local.h                             |    1 
 include/asm-mips/mach-au1x00/au1000.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx_dbdma.h          |    1 
 include/asm-mips/mach-au1x00/au1xxx_ide.h            |    1 
 include/asm-mips/mach-au1x00/au1xxx_psc.h            |    1 
 include/asm-mips/mach-au1x00/ioremap.h               |    1 
 include/asm-mips/mach-cobalt/cpu-feature-overrides.h |    1 
 include/asm-mips/mach-db1x00/db1x00.h                |    1 
 include/asm-mips/mach-generic/ide.h                  |    1 
 include/asm-mips/mach-generic/kmalloc.h              |    1 
 include/asm-mips/mach-generic/spaces.h               |    1 
 include/asm-mips/mach-ip22/spaces.h                  |    1 
 include/asm-mips/mach-ip32/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-ip32/kmalloc.h                 |    1 
 include/asm-mips/mach-mips/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-mips/irq.h                     |    1 
 include/asm-mips/mach-pb1x00/pb1550.h                |    1 
 include/asm-mips/mach-sim/cpu-feature-overrides.h    |    1 
 include/asm-mips/mips-boards/generic.h               |    1 
 include/asm-mips/mipsregs.h                          |    1 
 include/asm-mips/mmu_context.h                       |    1 
 include/asm-mips/mmzone.h                            |    1 
 include/asm-mips/module.h                            |    1 
 include/asm-mips/msgbuf.h                            |    1 
 include/asm-mips/paccess.h                           |    1 
 include/asm-mips/page.h                              |    1 
 include/asm-mips/pci.h                               |    1 
 include/asm-mips/pgalloc.h                           |    1 
 include/asm-mips/pgtable-32.h                        |    1 
 include/asm-mips/pgtable-64.h                        |    1 
 include/asm-mips/pgtable-bits.h                      |    1 
 include/asm-mips/pgtable.h                           |    1 
 include/asm-mips/prefetch.h                          |    1 
 include/asm-mips/processor.h                         |    1 
 include/asm-mips/ptrace.h                            |    1 
 include/asm-mips/reg.h                               |    1 
 include/asm-mips/resource.h                          |    1 
 include/asm-mips/serial.h                            |    1 
 include/asm-mips/sgiarcs.h                           |    1 
 include/asm-mips/sibyte/board.h                      |    1 
 include/asm-mips/sibyte/carmel.h                     |    1 
 include/asm-mips/sibyte/sentosa.h                    |    1 
 include/asm-mips/sibyte/swarm.h                      |    1 
 include/asm-mips/siginfo.h                           |    1 
 include/asm-mips/signal.h                            |    1 
 include/asm-mips/sim.h                               |    1 
 include/asm-mips/smp.h                               |    1 
 include/asm-mips/sn/addrs.h                          |    1 
 include/asm-mips/sn/agent.h                          |    1 
 include/asm-mips/sn/arch.h                           |    1 
 include/asm-mips/sn/io.h                             |    1 
 include/asm-mips/sn/klconfig.h                       |    1 
 include/asm-mips/sn/kldir.h                          |    1 
 include/asm-mips/sn/launch.h                         |    1 
 include/asm-mips/sn/mapped_kernel.h                  |    1 
 include/asm-mips/sn/sn0/addrs.h                      |    1 
 include/asm-mips/sn/sn0/arch.h                       |    1 
 include/asm-mips/sn/sn0/hubmd.h                      |    1 
 include/asm-mips/stackframe.h                        |    1 
 include/asm-mips/string.h                            |    1 
 include/asm-mips/system.h                            |    1 
 include/asm-mips/thread_info.h                       |    1 
 include/asm-mips/tlbflush.h                          |    1 
 include/asm-mips/tx4927/toshiba_rbtx4927.h           |    1 
 include/asm-mips/types.h                             |    1 
 include/asm-mips/uaccess.h                           |    1 
 include/asm-mips/unistd.h                            |    1 
 include/asm-mips/vr41xx/vrc4173.h                    |    1 
 include/asm-mips/war.h                               |    1 
 include/asm-mips/wbflush.h                           |    1 
 include/asm-parisc/atomic.h                          |    1 
 include/asm-parisc/cache.h                           |    1 
 include/asm-parisc/cacheflush.h                      |    1 
 include/asm-parisc/dma-mapping.h                     |    1 
 include/asm-parisc/dma.h                             |    1 
 include/asm-parisc/io.h                              |    1 
 include/asm-parisc/irq.h                             |    1 
 include/asm-parisc/kmap_types.h                      |    1 
 include/asm-parisc/page.h                            |    1 
 include/asm-parisc/param.h                           |    1 
 include/asm-parisc/pci.h                             |    1 
 include/asm-parisc/pdc.h                             |    1 
 include/asm-parisc/pgtable.h                         |    1 
 include/asm-parisc/processor.h                       |    1 
 include/asm-parisc/psw.h                             |    1 
 include/asm-parisc/smp.h                             |    1 
 include/asm-parisc/system.h                          |    1 
 include/asm-parisc/tlbflush.h                        |    1 
 include/asm-powerpc/abs_addr.h                       |    1 
 include/asm-powerpc/cache.h                          |    1 
 include/asm-powerpc/dma-mapping.h                    |    1 
 include/asm-powerpc/dma.h                            |    1 
 include/asm-powerpc/eeh.h                            |    1 
 include/asm-powerpc/elf.h                            |    7 
 include/asm-powerpc/floppy.h                         |    1 
 include/asm-powerpc/hw_irq.h                         |    1 
 include/asm-powerpc/ide.h                            |    1 
 include/asm-powerpc/iommu.h                          |    1 
 include/asm-powerpc/irq.h                            |    1 
 include/asm-powerpc/iseries/iseries_io.h             |    1 
 include/asm-powerpc/machdep.h                        |    1 
 include/asm-powerpc/mmzone.h                         |    1 
 include/asm-powerpc/paca.h                           |    1 
 include/asm-powerpc/page.h                           |    1 
 include/asm-powerpc/pgtable.h                        |    1 
 include/asm-powerpc/ppc_asm.h                        |    1 
 include/asm-powerpc/prom.h                           |    1 
 include/asm-powerpc/smp.h                            |    1 
 include/asm-powerpc/smu.h                            |    1 
 include/asm-powerpc/spu.h                            |    1 
 include/asm-powerpc/thread_info.h                    |    1 
 include/asm-powerpc/time.h                           |    1 
 include/asm-powerpc/timex.h                          |    1 
 include/asm-powerpc/tlb.h                            |    1 
 include/asm-powerpc/tlbflush.h                       |    1 
 include/asm-powerpc/topology.h                       |    1 
 include/asm-powerpc/types.h                          |    1 
 include/asm-powerpc/unistd.h                         |    1 
 include/asm-powerpc/vga.h                            |    1 
 include/asm-powerpc/vio.h                            |    1 
 include/asm-ppc/amigahw.h                            |    1 
 include/asm-ppc/bootinfo.h                           |    1 
 include/asm-ppc/commproc.h                           |    1 
 include/asm-ppc/ibm403.h                             |    1 
 include/asm-ppc/ibm44x.h                             |    1 
 include/asm-ppc/ibm4xx.h                             |    1 
 include/asm-ppc/io.h                                 |    1 
 include/asm-ppc/machdep.h                            |    1 
 include/asm-ppc/mmu.h                                |    1 
 include/asm-ppc/mmu_context.h                        |    1 
 include/asm-ppc/mpc8260.h                            |    1 
 include/asm-ppc/mpc83xx.h                            |    1 
 include/asm-ppc/mpc85xx.h                            |    1 
 include/asm-ppc/mpc8xx.h                             |    1 
 include/asm-ppc/mv64x60.h                            |    1 
 include/asm-ppc/ocp.h                                |    1 
 include/asm-ppc/open_pic.h                           |    1 
 include/asm-ppc/page.h                               |    2 
 include/asm-ppc/pc_serial.h                          |    1 
 include/asm-ppc/pgalloc.h                            |    1 
 include/asm-ppc/pgtable.h                            |    1 
 include/asm-ppc/ppc4xx_dma.h                         |    1 
 include/asm-ppc/ppc4xx_pic.h                         |    1 
 include/asm-ppc/serial.h                             |    1 
 include/asm-ppc/smp.h                                |    1 
 include/asm-ppc/time.h                               |    1 
 include/asm-s390/bitops.h                            |    1 
 include/asm-s390/debug.h                             |    1 
 include/asm-s390/hardirq.h                           |    1 
 include/asm-s390/idals.h                             |    1 
 include/asm-s390/local.h                             |    1 
 include/asm-s390/lowcore.h                           |    1 
 include/asm-s390/page.h                              |    6 
 include/asm-s390/pgalloc.h                           |    1 
 include/asm-s390/sfp-machine.h                       |    1 
 include/asm-s390/smp.h                               |    1 
 include/asm-s390/system.h                            |    1 
 include/asm-s390/tlbflush.h                          |    1 
 include/asm-s390/types.h                             |    1 
 include/asm-s390/unistd.h                            |    1 
 include/asm-sh/bug.h                                 |    1 
 include/asm-sh/checksum.h                            |    1 
 include/asm-sh/dma-mapping.h                         |    1 
 include/asm-sh/dma.h                                 |    1 
 include/asm-sh/fixmap.h                              |    1 
 include/asm-sh/hardirq.h                             |    1 
 include/asm-sh/hd64461/hd64461.h                     |    1 
 include/asm-sh/hd64465/hd64465.h                     |    1 
 include/asm-sh/ide.h                                 |    1 
 include/asm-sh/io.h                                  |    1 
 include/asm-sh/irq.h                                 |    1 
 include/asm-sh/keyboard.h                            |    1 
 include/asm-sh/kmap_types.h                          |    1 
 include/asm-sh/machvec.h                             |    1 
 include/asm-sh/machvec_init.h                        |    1 
 include/asm-sh/mpc1211/dma.h                         |    1 
 include/asm-sh/overdrive/overdrive.h                 |    1 
 include/asm-sh/page.h                                |    1 
 include/asm-sh/pgtable.h                             |    1 
 include/asm-sh/serial.h                              |    1 
 include/asm-sh/smp.h                                 |    1 
 include/asm-sh/system.h                              |    1 
 include/asm-sh/types.h                               |    1 
 include/asm-sh/watchdog.h                            |    1 
 include/asm-sh64/bug.h                               |    1 
 include/asm-sh64/dma-mapping.h                       |    1 
 include/asm-sh64/hardirq.h                           |    1 
 include/asm-sh64/ide.h                               |    1 
 include/asm-sh64/irq.h                               |    1 
 include/asm-sh64/mmu_context.h                       |    1 
 include/asm-sh64/page.h                              |    1 
 include/asm-sh64/param.h                             |    1 
 include/asm-sh64/pgtable.h                           |    1 
 include/asm-sh64/system.h                            |    1 
 include/asm-sparc/asmmacro.h                         |    1 
 include/asm-sparc/atomic.h                           |    1 
 include/asm-sparc/bugs.h                             |    1 
 include/asm-sparc/cacheflush.h                       |    1 
 include/asm-sparc/delay.h                            |    1 
 include/asm-sparc/dma-mapping.h                      |    1 
 include/asm-sparc/dma.h                              |    1 
 include/asm-sparc/elf.h                              |    1 
 include/asm-sparc/fixmap.h                           |    1 
 include/asm-sparc/hardirq.h                          |    1 
 include/asm-sparc/ide.h                              |    1 
 include/asm-sparc/irq.h                              |    1 
 include/asm-sparc/mostek.h                           |    1 
 include/asm-sparc/page.h                             |    1 
 include/asm-sparc/pgalloc.h                          |    1 
 include/asm-sparc/pgtable.h                          |    1 
 include/asm-sparc/sfp-machine.h                      |    1 
 include/asm-sparc/smp.h                              |    1 
 include/asm-sparc/system.h                           |    2 
 include/asm-sparc/timer.h                            |    1 
 include/asm-sparc/tlbflush.h                         |    1 
 include/asm-sparc/vac-ops.h                          |    1 
 include/asm-sparc/winmacro.h                         |    1 
 include/asm-sparc64/atomic.h                         |    1 
 include/asm-sparc64/bitops.h                         |    1 
 include/asm-sparc64/bugs.h                           |    1 
 include/asm-sparc64/cacheflush.h                     |    1 
 include/asm-sparc64/delay.h                          |    1 
 include/asm-sparc64/dma-mapping.h                    |    1 
 include/asm-sparc64/dma.h                            |    1 
 include/asm-sparc64/floppy.h                         |    1 
 include/asm-sparc64/ide.h                            |    1 
 include/asm-sparc64/irq.h                            |    1 
 include/asm-sparc64/kprobes.h                        |    1 
 include/asm-sparc64/mc146818rtc.h                    |    1 
 include/asm-sparc64/mmu.h                            |    1 
 include/asm-sparc64/oplib.h                          |    1 
 include/asm-sparc64/page.h                           |    1 
 include/asm-sparc64/param.h                          |    1 
 include/asm-sparc64/pgalloc.h                        |    1 
 include/asm-sparc64/pgtable.h                        |    1 
 include/asm-sparc64/processor.h                      |    1 
 include/asm-sparc64/siginfo.h                        |    1 
 include/asm-sparc64/signal.h                         |    1 
 include/asm-sparc64/smp.h                            |    1 
 include/asm-sparc64/spinlock.h                       |    1 
 include/asm-sparc64/system.h                         |    1 
 include/asm-sparc64/timer.h                          |    1 
 include/asm-sparc64/tlb.h                            |    1 
 include/asm-sparc64/tlbflush.h                       |    1 
 include/asm-sparc64/ttable.h                         |    1 
 include/asm-um/a.out.h                               |    1 
 include/asm-um/cache.h                               |    1 
 include/asm-um/elf-ppc.h                             |    1 
 include/asm-um/fixmap.h                              |    1 
 include/asm-um/hardirq.h                             |    1 
 include/asm-um/linkage.h                             |    1 
 include/asm-um/mmu_context.h                         |    1 
 include/asm-um/page.h                                |    1 
 include/asm-um/pgalloc.h                             |    1 
 include/asm-um/processor-generic.h                   |    1 
 include/asm-um/ptrace-generic.h                      |    1 
 include/asm-um/smp.h                                 |    1 
 include/asm-um/thread_info.h                         |    1 
 include/asm-v850/atomic.h                            |    1 
 include/asm-v850/bitops.h                            |    1 
 include/asm-v850/dma-mapping.h                       |    1 
 include/asm-v850/hardirq.h                           |    1 
 include/asm-v850/machdep.h                           |    1 
 include/asm-v850/pgtable.h                           |    1 
 include/asm-v850/processor.h                         |    1 
 include/asm-v850/serial.h                            |    1 
 include/asm-v850/v850e_uart.h                        |    1 
 include/asm-x86_64/apic.h                            |    1 
 include/asm-x86_64/atomic.h                          |    1 
 include/asm-x86_64/bitops.h                          |    1 
 include/asm-x86_64/bugs.h                            |    1 
 include/asm-x86_64/cache.h                           |    1 
 include/asm-x86_64/calling.h                         |    1 
 include/asm-x86_64/dma-mapping.h                     |    1 
 include/asm-x86_64/dma.h                             |    1 
 include/asm-x86_64/dwarf2.h                          |    1 
 include/asm-x86_64/fixmap.h                          |    1 
 include/asm-x86_64/hardirq.h                         |    1 
 include/asm-x86_64/hw_irq.h                          |    1 
 include/asm-x86_64/ia32.h                            |    1 
 include/asm-x86_64/io.h                              |    1 
 include/asm-x86_64/io_apic.h                         |    1 
 include/asm-x86_64/mmu_context.h                     |    1 
 include/asm-x86_64/mmzone.h                          |    1 
 include/asm-x86_64/mtrr.h                            |    1 
 include/asm-x86_64/param.h                           |    1 
 include/asm-x86_64/pci.h                             |    1 
 include/asm-x86_64/processor.h                       |    1 
 include/asm-x86_64/serial.h                          |    1 
 include/asm-x86_64/smp.h                             |    1 
 include/asm-x86_64/spinlock.h                        |    1 
 include/asm-x86_64/swiotlb.h                         |    1 
 include/asm-x86_64/system.h                          |    1 
 include/asm-x86_64/tlbflush.h                        |    1 
 include/asm-x86_64/topology.h                        |    1 
 include/asm-x86_64/uaccess.h                         |    1 
 include/asm-xtensa/atomic.h                          |    1 
 include/asm-xtensa/checksum.h                        |    1 
 include/asm-xtensa/delay.h                           |    1 
 include/asm-xtensa/dma.h                             |    1 
 include/asm-xtensa/hardirq.h                         |    1 
 include/asm-xtensa/ide.h                             |    1 
 include/asm-xtensa/io.h                              |    1 
 include/asm-xtensa/irq.h                             |    1 
 include/asm-xtensa/mmu_context.h                     |    1 
 include/asm-xtensa/page.h                            |    1 
 include/asm-xtensa/pgalloc.h                         |    1 
 include/asm-xtensa/platform.h                        |    1 
 include/asm-xtensa/system.h                          |    1 
 include/linux/acct.h                                 |    3 
 include/linux/acpi.h                                 |    1 
 include/linux/agpgart.h                              |    3 
 include/linux/amba/clcd.h                            |    1 
 include/linux/atmdev.h                               |    1 
 include/linux/audit.h                                |    4 
 include/linux/blkdev.h                               |    1 
 include/linux/blkpg.h                                |    1 
 include/linux/blktrace_api.h                         |    1 
 include/linux/blockgroup_lock.h                      |    1 
 include/linux/cache.h                                |    1 
 include/linux/coda.h                                 |    1 
 include/linux/compat.h                               |    1 
 include/linux/cpufreq.h                              |    1 
 include/linux/crypto.h                               |    1 
 include/linux/cyclomx.h                              |    1 
 include/linux/dcookies.h                             |    1 
 include/linux/devfs_fs_kernel.h                      |    1 
 include/linux/device.h                               |    1 
 include/linux/dmi.h                                  |    1 
 include/linux/dnotify.h                              |    1 
 include/linux/elf.h                                  |   59 ------
 include/linux/errqueue.h                             |    1 
 include/linux/ethtool.h                              |  169 +++++++++----------
 include/linux/ext2_fs.h                              |    2 
 include/linux/ext3_fs.h                              |    7 
 include/linux/fs.h                                   |    1 
 include/linux/ftape.h                                |    1 
 include/linux/gameport.h                             |    6 
 include/linux/generic_serial.h                       |    6 
 include/linux/genhd.h                                |   12 -
 include/linux/gfp.h                                  |    1 
 include/linux/hardirq.h                              |    1 
 include/linux/highmem.h                              |    1 
 include/linux/highuid.h                              |    1 
 include/linux/i2c-algo-ite.h                         |    7 
 include/linux/i2c.h                                  |    9 -
 include/linux/ide.h                                  |    1 
 include/linux/if_frad.h                              |    1 
 include/linux/if_tr.h                                |    1 
 include/linux/init.h                                 |    1 
 include/linux/inotify.h                              |    1 
 include/linux/input.h                                |   41 ----
 include/linux/interrupt.h                            |    1 
 include/linux/ipmi.h                                 |    2 
 include/linux/ipv6.h                                 |    1 
 include/linux/irq.h                                  |    1 
 include/linux/irq_cpustat.h                          |    1 
 include/linux/isapnp.h                               |    1 
 include/linux/isdn.h                                 |    1 
 include/linux/isdn/tpam.h                            |    1 
 include/linux/isdn_ppp.h                             |    1 
 include/linux/isdnif.h                               |    1 
 include/linux/kallsyms.h                             |    1 
 include/linux/kernel_stat.h                          |    1 
 include/linux/kmod.h                                 |    1 
 include/linux/kprobes.h                              |    1 
 include/linux/linkage.h                              |    1 
 include/linux/lockd/lockd.h                          |    1 
 include/linux/lockd/nlm.h                            |    1 
 include/linux/mempolicy.h                            |    1 
 include/linux/migrate.h                              |    1 
 include/linux/mii.h                                  |   30 +--
 include/linux/mm.h                                   |    1 
 include/linux/mman.h                                 |   12 -
 include/linux/mmzone.h                               |    1 
 include/linux/mod_devicetable.h                      |   38 ++++
 include/linux/module.h                               |    1 
 include/linux/msg.h                                  |    2 
 include/linux/mtd/cfi.h                              |    1 
 include/linux/mtd/map.h                              |    1 
 include/linux/mtd/mtd.h                              |    1 
 include/linux/mtd/nand.h                             |    1 
 include/linux/mtd/physmap.h                          |    1 
 include/linux/mtd/xip.h                              |    1 
 include/linux/ncp_fs.h                               |    5 
 include/linux/net.h                                  |    3 
 include/linux/netdevice.h                            |    1 
 include/linux/netfilter.h                            |    1 
 include/linux/netfilter_arp.h                        |    1 
 include/linux/netfilter_bridge.h                     |    1 
 include/linux/netfilter_ipv4.h                       |    1 
 include/linux/netfilter_ipv4/ip_conntrack.h          |    1 
 include/linux/netfilter_ipv4/listhelp.h              |    1 
 include/linux/nfs.h                                  |    8 
 include/linux/nfs4.h                                 |    6 
 include/linux/nfs_fs.h                               |   39 ++--
 include/linux/nfsd/nfsd.h                            |    1 
 include/linux/nfsd/nfsfh.h                           |    1 
 include/linux/nfsd/syscall.h                         |    1 
 include/linux/numa.h                                 |    1 
 include/linux/parport.h                              |    1 
 include/linux/pci.h                                  |    1 
 include/linux/percpu_counter.h                       |    1 
 include/linux/pm.h                                   |    1 
 include/linux/pm_legacy.h                            |    1 
 include/linux/pmu.h                                  |    1 
 include/linux/preempt.h                              |    1 
 include/linux/proc_fs.h                              |    1 
 include/linux/profile.h                              |    1 
 include/linux/quota.h                                |    4 
 include/linux/quotaops.h                             |    1 
 include/linux/reiserfs_xattr.h                       |    3 
 include/linux/relay.h                                |    1 
 include/linux/rio.h                                  |    1 
 include/linux/rio_drv.h                              |    1 
 include/linux/rmap.h                                 |    1 
 include/linux/rtnetlink.h                            |    1 
 include/linux/rwsem.h                                |    1 
 include/linux/scc.h                                  |    1 
 include/linux/sched.h                                |   94 +++++-----
 include/linux/seccomp.h                              |    1 
 include/linux/sem.h                                  |    2 
 include/linux/seqlock.h                              |    1 
 include/linux/serialP.h                              |    1 
 include/linux/serial_core.h                          |    1 
 include/linux/signal.h                               |    4 
 include/linux/skbuff.h                               |    1 
 include/linux/slab.h                                 |    1 
 include/linux/smb_fs.h                               |    4 
 include/linux/smp.h                                  |    1 
 include/linux/smp_lock.h                             |    1 
 include/linux/socket.h                               |    2 
 include/linux/spinlock.h                             |    1 
 include/linux/stop_machine.h                         |    1 
 include/linux/sunrpc/auth.h                          |    1 
 include/linux/sunrpc/debug.h                         |   24 +-
 include/linux/sunrpc/stats.h                         |    1 
 include/linux/suspend.h                              |    1 
 include/linux/swap.h                                 |    1 
 include/linux/syscalls.h                             |    1 
 include/linux/sysrq.h                                |    1 
 include/linux/tcp.h                                  |    1 
 include/linux/threads.h                              |    1 
 include/linux/timer.h                                |    1 
 include/linux/timex.h                                |    1 
 include/linux/tty.h                                  |    1 
 include/linux/types.h                                |    1 
 include/linux/udp.h                                  |    1 
 include/linux/unistd.h                               |    2 
 include/linux/usb.h                                  |    1 
 include/linux/usb_usual.h                            |    1 
 include/linux/usbdevice_fs.h                         |    2 
 include/linux/vt_buffer.h                            |    1 
 include/linux/vt_kern.h                              |    1 
 include/linux/wait.h                                 |    1 
 include/linux/wanrouter.h                            |    4 
 include/mtd/mtd-abi.h                                |    5 
 include/net/addrconf.h                               |    1 
 include/net/af_unix.h                                |    1 
 include/net/ax25.h                                   |    1 
 include/net/compat.h                                 |    1 
 include/net/dst.h                                    |    1 
 include/net/icmp.h                                   |    1 
 include/net/inet6_hashtables.h                       |    1 
 include/net/inet_hashtables.h                        |    1 
 include/net/inet_sock.h                              |    1 
 include/net/inet_timewait_sock.h                     |    1 
 include/net/ip.h                                     |    1 
 include/net/ip_fib.h                                 |    1 
 include/net/ip_mp_alg.h                              |    1 
 include/net/ip_vs.h                                  |    1 
 include/net/ipv6.h                                   |    1 
 include/net/irda/irda.h                              |    1 
 include/net/irda/irda_device.h                       |    1 
 include/net/irda/irlap.h                             |    1 
 include/net/irda/irlmp.h                             |    1 
 include/net/irda/irlmp_frame.h                       |    1 
 include/net/irda/qos.h                               |    1 
 include/net/ndisc.h                                  |    1 
 include/net/netfilter/nf_conntrack.h                 |    1 
 include/net/pkt_act.h                                |    1 
 include/net/protocol.h                               |    1 
 include/net/raw.h                                    |    1 
 include/net/red.h                                    |    1 
 include/net/route.h                                  |    1 
 include/net/sch_generic.h                            |    1 
 include/net/sctp/sctp.h                              |    1 
 include/net/sock.h                                   |    1 
 include/net/tcp.h                                    |    1 
 include/pcmcia/ss.h                                  |    1 
 include/scsi/scsi_transport_fc.h                     |    1 
 include/scsi/scsi_transport_spi.h                    |    1 
 include/sound/driver.h                               |    1 
 include/video/edid.h                                 |    1 
 include/video/vga.h                                  |    1 
 scripts/mod/file2alias.c                             |    1 
 873 files changed, 352 insertions(+), 1185 deletions(-)

Index: linux-2.6-header-cleanup-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-cleanup-git.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-header-cleanup-git.patch	27 Apr 2006 17:41:36 -0000	1.8
+++ linux-2.6-header-cleanup-git.patch	28 Apr 2006 12:02:43 -0000	1.9
@@ -10654,7 +10654,6 @@
 -
 +#endif /* __KERNEL__ */
  #endif /* __LINUX_MII_H__ */
-only in patch2:
 unchanged:
 --- a/include/linux/unistd.h
 +++ b/include/linux/unistd.h
@@ -10667,3 +10666,135 @@
  /*
   * Include machine specific syscallX macros
   */
+only in patch2:
+unchanged:
+--- a/include/linux/input.h
++++ b/include/linux/input.h
+@@ -13,7 +13,6 @@ #ifdef __KERNEL__
+ #include <linux/time.h>
+ #include <linux/list.h>
+ #include <linux/device.h>
+-#include <linux/mod_devicetable.h>
+ #else
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
+@@ -805,44 +804,6 @@ #define FF_AUTOCENTER	0x61
+ 
+ #define FF_MAX		0x7f
+ 
+-struct input_device_id {
+-
+-	kernel_ulong_t flags;
+-
+-	struct input_id id;
+-
+-	kernel_ulong_t evbit[EV_MAX/BITS_PER_LONG+1];
+-	kernel_ulong_t keybit[KEY_MAX/BITS_PER_LONG+1];
+-	kernel_ulong_t relbit[REL_MAX/BITS_PER_LONG+1];
+-	kernel_ulong_t absbit[ABS_MAX/BITS_PER_LONG+1];
+-	kernel_ulong_t mscbit[MSC_MAX/BITS_PER_LONG+1];
+-	kernel_ulong_t ledbit[LED_MAX/BITS_PER_LONG+1];
+-	kernel_ulong_t sndbit[SND_MAX/BITS_PER_LONG+1];
+-	kernel_ulong_t ffbit[FF_MAX/BITS_PER_LONG+1];
+-	kernel_ulong_t swbit[SW_MAX/BITS_PER_LONG+1];
+-
+-	kernel_ulong_t driver_info;
+-};
+-
+-/*
+- * Structure for hotplug & device<->driver matching.
+- */
+-
+-#define INPUT_DEVICE_ID_MATCH_BUS	1
+-#define INPUT_DEVICE_ID_MATCH_VENDOR	2
+-#define INPUT_DEVICE_ID_MATCH_PRODUCT	4
+-#define INPUT_DEVICE_ID_MATCH_VERSION	8
+-
+-#define INPUT_DEVICE_ID_MATCH_EVBIT	0x010
+-#define INPUT_DEVICE_ID_MATCH_KEYBIT	0x020
+-#define INPUT_DEVICE_ID_MATCH_RELBIT	0x040
+-#define INPUT_DEVICE_ID_MATCH_ABSBIT	0x080
+-#define INPUT_DEVICE_ID_MATCH_MSCIT	0x100
+-#define INPUT_DEVICE_ID_MATCH_LEDBIT	0x200
+-#define INPUT_DEVICE_ID_MATCH_SNDBIT	0x400
+-#define INPUT_DEVICE_ID_MATCH_FFBIT	0x800
+-#define INPUT_DEVICE_ID_MATCH_SWBIT	0x1000
+-
+ #ifdef __KERNEL__
+ 
+ /*
+@@ -851,6 +812,7 @@ #ifdef __KERNEL__
+ 
+ #include <linux/fs.h>
+ #include <linux/timer.h>
++#include <linux/mod_devicetable.h>
+ 
+ #define NBITS(x) (((x)/BITS_PER_LONG)+1)
+ #define BIT(x)	(1UL<<((x)%BITS_PER_LONG))
+@@ -957,6 +919,7 @@ #define INPUT_DEVICE_ID_MATCH_DEVICE_AND
+ 	(INPUT_DEVICE_ID_MATCH_DEVICE | INPUT_DEVICE_ID_MATCH_VERSION)
+ 
+ struct input_handle;
++struct input_device_id;
+ 
+ struct input_handler {
+ 
+only in patch2:
+unchanged:
+--- a/include/linux/mod_devicetable.h
++++ b/include/linux/mod_devicetable.h
+@@ -249,4 +249,42 @@ struct i2c_device_id {
+ 	__u16 id;
+ };
+ 
++/* Input */
++#include "input.h"
++
++struct input_device_id {
++
++	kernel_ulong_t flags;
++
++	struct input_id id;
++
++	kernel_ulong_t evbit[EV_MAX/BITS_PER_LONG+1];
++	kernel_ulong_t keybit[KEY_MAX/BITS_PER_LONG+1];
++	kernel_ulong_t relbit[REL_MAX/BITS_PER_LONG+1];
++	kernel_ulong_t absbit[ABS_MAX/BITS_PER_LONG+1];
++	kernel_ulong_t mscbit[MSC_MAX/BITS_PER_LONG+1];
++	kernel_ulong_t ledbit[LED_MAX/BITS_PER_LONG+1];
++	kernel_ulong_t sndbit[SND_MAX/BITS_PER_LONG+1];
++	kernel_ulong_t ffbit[FF_MAX/BITS_PER_LONG+1];
++	kernel_ulong_t swbit[SW_MAX/BITS_PER_LONG+1];
++
++	kernel_ulong_t driver_info;
++};
++
++#define INPUT_DEVICE_ID_MATCH_BUS	1
++#define INPUT_DEVICE_ID_MATCH_VENDOR	2
++#define INPUT_DEVICE_ID_MATCH_PRODUCT	4
++#define INPUT_DEVICE_ID_MATCH_VERSION	8
++
++#define INPUT_DEVICE_ID_MATCH_EVBIT	0x010
++#define INPUT_DEVICE_ID_MATCH_KEYBIT	0x020
++#define INPUT_DEVICE_ID_MATCH_RELBIT	0x040
++#define INPUT_DEVICE_ID_MATCH_ABSBIT	0x080
++#define INPUT_DEVICE_ID_MATCH_MSCIT	0x100
++#define INPUT_DEVICE_ID_MATCH_LEDBIT	0x200
++#define INPUT_DEVICE_ID_MATCH_SNDBIT	0x400
++#define INPUT_DEVICE_ID_MATCH_FFBIT	0x800
++#define INPUT_DEVICE_ID_MATCH_SWBIT	0x1000
++
++
+ #endif /* LINUX_MOD_DEVICETABLE_H */
+only in patch2:
+unchanged:
+--- a/scripts/mod/file2alias.c
++++ b/scripts/mod/file2alias.c
+@@ -37,7 +37,6 @@ typedef unsigned char	__u8;
+  * even potentially has different endianness and word sizes, since
+  * we handle those differences explicitly below */
+ #include "../../include/linux/mod_devicetable.h"
+-#include "../../include/linux/input.h"
+ 
+ #define ADD(str, sep, cond, field)                              \
+ do {                                                            \



From fedora-cvs-commits at redhat.com  Fri Apr 28 12:11:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 08:11:09 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2174,1.2174.2.1
Message-ID: <200604281211.k3SCB9pe022204@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22176

Modified Files:
      Tag: private-buildheaders-2174-branch
	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.2174
retrieving revision 1.2174.2.1
diff -u -r1.2174 -r1.2174.2.1
--- kernel-2.6.spec	27 Apr 2006 08:23:41 -0000	1.2174
+++ kernel-2.6.spec	28 Apr 2006 12:11:06 -0000	1.2174.2.1
@@ -13,7 +13,7 @@
 %define buildxenPAE 0
 %define builddoc 0
 %define buildkdump 1
-%define buildheaders 0
+%define buildheaders 1
 
 # Versions of various parts
 



From fedora-cvs-commits at redhat.com  Fri Apr 28 12:41:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 08:41:52 -0400
Subject: rpms/cups/devel cups-relro.patch, 1.3, 1.4 cups-svn.patch, 1.1,
	1.2 cups.spec, 1.176, 1.177 cups-CAN-2005-0064.patch, 1.3,
	NONE cups-link.patch, 1.3,
	NONE cups-no-propagate-ipp-port.patch, 1.2,
	NONE cups-pie.patch, 1.5, NONE
Message-ID: <200604281241.k3SCfqCs011884@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11721

Modified Files:
	cups-relro.patch cups-svn.patch cups.spec 
Removed Files:
	cups-CAN-2005-0064.patch cups-link.patch 
	cups-no-propagate-ipp-port.patch cups-pie.patch 
Log Message:
- Switch to upstream PIE implementation (every single binary is PIE).

cups-relro.patch:
 Makefile |    1 +
 1 files changed, 1 insertion(+)

Index: cups-relro.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-relro.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cups-relro.patch	17 Mar 2006 12:10:57 -0000	1.3
+++ cups-relro.patch	28 Apr 2006 12:41:35 -0000	1.4
@@ -1,11 +1,10 @@
---- 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.2rc3/pdftops/Makefile.relro	2006-03-05 16:48:12.000000000 +0000
++++ cups-1.2rc3/pdftops/Makefile	2006-04-28 13:40:58.000000000 +0100
+@@ -9,6 +9,7 @@
  
  
  include ../Makedefs
--LDFLAGS += -pie
-+LDFLAGS += -pie -Wl,-z,relro
++LDFLAGS += -Wl,-z,relro
  
  #
  # Object files...

cups-svn.patch:
 0 files changed

Index: cups-svn.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-svn.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-svn.patch	25 Apr 2006 22:30:02 -0000	1.1
+++ cups-svn.patch	28 Apr 2006 12:41:35 -0000	1.2
@@ -1,4 +1,19 @@
-only in patch2:
+--- pdftops/Decrypt.cxx	(revision 5460)
++++ pdftops/Decrypt.cxx	(working copy)
+@@ -142,0 +143,6 @@
++
++  // check whether we have non-zero keyLength
++  if ( keyLength < 5 || keyLength > 16 ) {
++    return gFalse;
++  }
++
+--- Makedefs.in	(revision 5460)
++++ Makedefs.in	(working copy)
+@@ -133 +133 @@
+-			@LDFLAGS@ $(OPTIM)
++			@LDFLAGS@ @PIEFLAGS@ $(OPTIM)
+@@ -139,0 +140 @@
++PAP		=	@PAP@
 --- backend/snmp.c	(revision 5460)
 +++ backend/snmp.c	(working copy)
 @@ -1436 +1436 @@
@@ -6,15 +21,1670 @@
 +      printf("network %s \"%s\" \"%s %s\" \"%s\"\n",
 @@ -1438,0 +1439 @@
 +	     cache->make_and_model ? cache->make_and_model : "Unknown",
-only in patch2:
+--- backend/Makefile	(revision 5460)
++++ backend/Makefile	(working copy)
+@@ -30 +30 @@
+-UBACKENDS =	parallel scsi serial snmp socket usb
++UBACKENDS =	$(PAP) parallel scsi serial snmp socket usb
+@@ -32 +32 @@
+-OBJS	=	betest.o ipp.o lpd.o parallel.o scsi.o \
++OBJS	=	betest.o ipp.o lpd.o pap.o parallel.o scsi.o \
+@@ -139,0 +140,9 @@
++# pap
++#
++
++pap:	pap.o ../cups/$(LIBCUPS)
++	echo Linking $@...
++	$(CC) $(LDFLAGS) -o pap pap.o $(BACKLIBS) $(LIBS) -framework AppleTalk
++
++
++#
+--- backend/pap.c	(revision 0)
++++ backend/pap.c	(revision 5470)
+@@ -0,0 +1,1516 @@
++/*
++* "$Id$"
++*
++* ? Copyright 2004 Apple Computer, Inc. All rights reserved.
++* 
++* IMPORTANT:  This Apple software is supplied to you by Apple Computer,
++* Inc. ("Apple") in consideration of your agreement to the following
++* terms, and your use, installation, modification or redistribution of
++* this Apple software constitutes acceptance of these terms.  If you do
++* not agree with these terms, please do not use, install, modify or
++* redistribute this Apple software.
++* 
++* In consideration of your agreement to abide by the following terms, and
++* subject to these terms, Apple grants you a personal, non-exclusive
++* license, under Apple?s copyrights in this original Apple software (the
++* "Apple Software"), to use, reproduce, modify and redistribute the Apple
++* Software, with or without modifications, in source and/or binary forms;
++* provided that if you redistribute the Apple Software in its entirety and
++* without modifications, you must retain this notice and the following
++* text and disclaimers in all such redistributions of the Apple Software. 
++* Neither the name, trademarks, service marks or logos of Apple Computer,
++* Inc. may be used to endorse or promote products derived from the Apple
++* Software without specific prior written permission from Apple.  Except
++* as expressly stated in this notice, no other rights or licenses, express
++* or implied, are granted by Apple herein, including but not limited to
++* any patent rights that may be infringed by your derivative works or by
++* other works in which the Apple Software may be incorporated.
++* 
++* The Apple Software is provided by Apple on an "AS IS" basis.  APPLE
++* MAKES NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION
++* THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS
++* FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND
++* OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
++* 
++* IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL
++* OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++* INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION,
++* MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED
++* AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE),
++* STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE
++* POSSIBILITY OF SUCH DAMAGE.
++*
++*
++* This program implements the Printer Access Protocol (PAP) on top of AppleTalk Transaction
++* Protocol (ATP). If it were to use the blocking pap functions of the AppleTalk library it 
++* would need seperate threads for reading, writing and status.
++*
++* Contents:
++*
++*  main()		- Send a file to the specified Appletalk printer.
++*  listDevices()	- List all LaserWriter printers in the local zone.
++*  printFile()		- Print from a file descriptor to an NBP specified printer.
++*  papOpen()		- Open a pap session to a printer.
++*  papClose()		- Close a pap session after cleaning up pending transactions.
++*  papWrite()		- Write bytes to a printer.
++*  papCloseResp()	- Send a pap close response in the rare case we receive a close connection request.
++*  papSendRequest()	- Fomrat and send a pap packet.
++*  papCancelRequest()	- Cancel a pending pap request.
++*  statusUpdate()	- Print printer status to stderr.
++*  parseUri()		- Extract the print name and zone from a uri.
++*  addPercentEscapes()	- Encode a string with percent escapes.
++*  removePercentEscapes	- Returns a string with any percent escape sequences replaced with their equivalent.
++*  nbptuple_compare()	- Compare routine for qsort.
++*  okayToUseAppleTalk() - Returns true if AppleTalk is available and enabled.
++*  connectTimeout()	- Returns the connect timeout preference value.
++*  signalHandler()	- handle SIGINT to close the session before quiting.
++*/
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <ctype.h>
++#include <termios.h>
++#include <unistd.h>
++#include <assert.h>
++#include <signal.h>
++
++#include <sys/fcntl.h>
++#include <sys/param.h>
++#include <sys/time.h>
++#include <sys/errno.h>
++
++#include <netat/appletalk.h>
++#include <netat/atp.h>
++#include <netat/ddp.h>
++#include <netat/nbp.h>
++#include <netat/pap.h>
++
++#include <cups/http.h>
++
++#include <AppleTalk/at_proto.h>
++#include <CoreFoundation/CFURL.h>
++#include <CoreFoundation/CFNumber.h>
++#include <CoreFoundation/CFPreferences.h>
++
++/* Defines */
++#define MAX_PRINTERS	500        /* Max number of printers we can lookup in listDevices */
++#define PAP_CONNID	0
++#define PAP_TYPE	1
++#define PAP_EOF		2
++
++#define CONNID_OF(p)	(((u_char *)&p)[0])
++#define TYPE_OF(p)	(((u_char *)&p)[1])
++#define SEQUENCE_NUM(p)	(((u_char *)&p)[2])
++#define IS_PAP_EOF(p)	(((u_char *)&p)[2])
++
++#define  PAPPacketStr(x) \
++  ((x) == AT_PAP_TYPE_OPEN_CONN)	? "PAP_OPEN_CONN"        : \
++  ((x) == AT_PAP_TYPE_OPEN_CONN_REPLY)	? "PAP_OPEN_CONN_REPLY"  : \
++  ((x) == AT_PAP_TYPE_SEND_DATA)	? "PAP_SEND_DATA"        : \
++  ((x) == AT_PAP_TYPE_DATA)		? "PAP_DATA"             : \
++  ((x) == AT_PAP_TYPE_TICKLE)		? "PAP_TICKLE"           : \
++  ((x) == AT_PAP_TYPE_CLOSE_CONN)	? "PAP_CLOSE_CONN"       : \
++  ((x) == AT_PAP_TYPE_CLOSE_CONN_REPLY)	? "PAP_CLOSE_CONN_REPLY" : \
++  ((x) == AT_PAP_TYPE_SEND_STATUS)	? "PAP_SEND_STATUS"      : \
++  ((x) == AT_PAP_TYPE_SEND_STS_REPLY)	? "PAP_SEND_STS_REPLY"   : \
++  ((x) == AT_PAP_TYPE_READ_LW)		? "PAP_READ_LW"          : \
++  "<Unknown>"
++
++#ifndef true
++#define true	1
++#define false 	0
++#endif
++
++/* Globals */
++int       gSockfd	= 0;		/* Socket descriptor                */
++at_inet_t gSessionAddr	= { 0 };	/* Address of the session responding socket    */
++u_char    gConnID	= 0;		/* PAP session connection id            */
++u_short   gSendDataID	= 0;		/* Transaction id of our pending send-data request  */
++u_short   gTickleID	= 0;		/* Transaction id of our outstanding tickle request*/
++int       gWaitEOF	= false;	/* Option: causes us to wait for a remote's EOF  */
++int       gStatusInterval= 5;		/* Option: 0=off else seconds between status requests*/
++int       gErrorlogged  = false;	/* If an error was logged don't send any more INFO messages */
++int       gDebug	= 0;		/* Option: causes us to emit debugging info    */
++
++/* Local functions */
++static int listDevices(void);
++static int printFile(char* name, char* type, char* zone, int fdin, int fdout, int fderr, int copies, int argc);
++static int papOpen(at_nbptuple_t* tuple, u_char* connID, int* fd, at_inet_t* pap_to, u_char* flowQuantum);
++static int papClose(int abort);
++static int papWrite(int sockfd, at_inet_t* dest, u_short tid, u_char connID, u_char flowQuantum, char* data, int len, int eof);
++static int papCloseResp(int sockfd, at_inet_t* dest, int xo, u_short tid, u_char connID);
++static int papSendRequest(int sockfd, at_inet_t* dest, u_char connID, int function, u_char bitmap, int xo, int seqno);
++static int papCancelRequest(int sockfd, int id);
++static void statusUpdate(u_char* status, u_char statusLen);
++static int parseUri(const char* argv0, char* name, char* type, char* zone);
++static int addPercentEscapes(const unsigned char* src, char* dst, int dstMax);
++static int removePercentEscapes(const char* src, unsigned char* dst, int dstMax);
++static int nbptuple_compare(const void *p1, const void *p2);
++static int okayToUseAppleTalk(void);
++static int connectTimeout(void);
++static void signalHandler(int sigraised);
++
++
++/*!
++ * @function  main
++ * @abstract  Send a file to the specified AppleTalk PAP address.
++ *
++ * Usage:  printer-uri job-id user title copies options [file]
++ *
++ * @param  argc  # of arguments
++ * @param  argv  array of arguments
++ *
++ * @result    A non-zero return value for errors
++ */
++int main (int argc, const char * argv[])
++{
++  int   err = 0;
++  FILE  *fp;				/* Print file */
++  int   copies;				/* Number of copies to print */
++  char  name[NBP_NVE_STR_SIZE + 1];	/* +1 for a nul */
++  char  type[NBP_NVE_STR_SIZE + 1];	/* +1 for a nul */
++  char  zone[NBP_NVE_STR_SIZE + 1];	/* +1 for a nul */
++
++  /* Make sure status messages are not buffered... */
++  setbuf(stderr, NULL);
++
++  if (argc == 1)
++  {
++    puts("network pap \"Unknown\" \"AppleTalk Printer Access Protocol (pap)\"");
++    return 0;
++  }
++
++  if (argc == 2 && strcmp(argv[1], "-discover") == 0)
++  {
++    /* Ignore errors returned by listDevices - they may be transitory 
++    *  and we don't want cupsd to think that pap is forever unusable.
++    */
++    listDevices();
++    return 0;
++  }
++
++  if (argc < 6 || argc > 7)
++  {
++    fprintf(stderr, "argc = %d\n", argc);
++    for (err = 0; err < argc; err++) {
++      fprintf(stderr, "%02d:%s\n", err, argv[err]);
++    }
++    fprintf(stderr, "Usage: pap job-id user title copies options [file]\n");
++    exit(EINVAL);
++  }
++
++  /* If we have 7 arguments, print the file named on the command-line.
++  *  Otherwise, send stdin instead...
++  */
++  if (argc == 6)
++  {
++    fp   = stdin;
++    copies = 1;
++  }
++  else
++  {
++    fprintf(stderr, "DEBUG: opening print file \"%s\"\n", argv[6]);
++
++    /* Try to open the print file... */
++    if ((fp = fopen(argv[6], "rb")) == NULL)
++    {
++      fprintf(stderr, "ERROR: unable to open print file \"%s\": %s\n", argv[6], strerror(errno));
++      return (1);
++    }
++
++    copies = atoi(argv[4]);
++  }
++
++  /* Extract the device name and options from the URI... */
++  parseUri(argv[0], name, type, zone);
++
++  err = printFile(name, type, zone, fileno(fp), STDOUT_FILENO, STDERR_FILENO, copies, argc);
++
++  if (fp != stdin)
++    fclose(fp);
++
++  /* Only clear the last status if there wasn't an error */
++  if (err == noErr && !gErrorlogged)
++    fprintf(stderr, "INFO:\n");
++
++  return err;
++}
++
++
++/*!
++ * @function  listDevices
++ * @abstract  Print a list of all LaserWriter type devices registered in the default zone.
++ *
++ * @result    A non-zero return value for errors
++ */
++static int listDevices(void)
++{
++  int  err = noErr;
++  int  index;
++  int  numberFound;
++
++  at_nvestr_t   at_zone;
++  at_entity_t   entity;
++  at_nbptuple_t buf[MAX_PRINTERS];
++  at_retry_t    retry;
++  char		name[NBP_NVE_STR_SIZE+1];
++  char		encodedName[(3 * NBP_NVE_STR_SIZE) + 1];
++  char		zone[NBP_NVE_STR_SIZE+1];
++  char		encodedZone[(3 * NBP_NVE_STR_SIZE) + 1];
++
++  /* Make sure it's okay to use appletalk */
++  if (!okayToUseAppleTalk())
++  {
++    fprintf(stderr, "ERROR: AppleTalk disabled in System Preferences\n");
++    return -1;  /* Network is down */
++  }
++
++  if ((err = zip_getmyzone(ZIP_DEF_INTERFACE, &at_zone)) != 0)
++  {
++    perror("ERROR: Unable to get default AppleTalk zone");
++    return -2;
++  }
++  memcpy(zone, at_zone.str, MIN(at_zone.len, sizeof(zone)-1));
++  zone[MIN(at_zone.len, sizeof(zone)-1)] = '\0';
++
++  err = addPercentEscapes(zone, encodedZone, sizeof(encodedZone));
++
++  /* Look up all the printers in our zone */
++  nbp_make_entity(&entity, "=", "LaserWriter", zone);
++  retry.retries = 1;
++  retry.interval = 1;
++  retry.backoff = 1;
++
++  if ((numberFound = nbp_lookup(&entity, buf, MAX_PRINTERS, &retry)) < 0)
++  {
++    perror("ERROR: Unable to lookup AppleTalk printers");
++    return numberFound;
++  }
++
++  if (numberFound >= MAX_PRINTERS)
++    fprintf(stderr, "WARNING: Adding only the first %d printers found", MAX_PRINTERS);
++
++  /* Not required but sort them so they look nice */
++  qsort(buf, numberFound, sizeof(at_nbptuple_t), nbptuple_compare);
++
++  for (index = 0; index < numberFound; index++) 
++  {
++    memcpy(name, buf[index].enu_entity.object.str, MIN(buf[index].enu_entity.object.len, sizeof(name)-1));
++    name[MIN(buf[index].enu_entity.object.len, sizeof(name)-1)] = '\0';
++
++    if (addPercentEscapes(name, encodedName, sizeof(encodedName)) == 0)
++    {
++      /* Each line is of the form: "class URI "make model" "name" */
++      printf("network pap://%s/%s/LaserWriter \"Unknown\" \"%s\"\n", encodedZone, encodedName, name);
++    }
++  }
++  return numberFound;
++}
++
++
++/*!
++ * @function  printFile
++ * @abstract  Open a PAP session and send the data from the input socket to the printer.
++ *
++ * @param  name		NBP name
++ * @param  zone		NBP zone
++ * @param  type		NBP type
++ * @param  fdin		File descriptor to read data from
++ * @param  fdout	File descriptor to write printer responses to
++ * @param  fderr	File descriptor to write printer status to
++ * @param  copies	# of copies to send (in case in the converter couldn't handle this for us).
++ * @param  argc		# of command line arguments.
++ *
++ * @result A non-zero return value for errors
++ */
++static int printFile(char* name, char* type, char* zone, int fdin, int fdout, int fderr, int copies, int argc)
++{
++  int	err;
++  int	rc;
++  int	val;
++  int	len, index;
++
++  char	fileBuffer[4096];    /* File buffer */
++  int	fileBufferNbytes;
++  off_t	fileTbytes;
++  int	fileEOFRead;
++  int	fileEOFSent;
++
++  char	sockBuffer[4096 + 1];    /* Socket buffer with room for nul */
++  char	atpReqBuf[AT_PAP_DATA_SIZE];
++  fd_set readSet;
++
++  at_nbptuple_t	tuple;
++  at_inet_t	sendDataAddr;
++  at_inet_t	src;
++  at_resp_t	resp;
++  int		userdata, xo, reqlen;
++  u_short	tid;
++  u_char	bitmap;
++  int		maxfdp1;
++  struct timeval timeout, *timeoutPtr;
++  u_char	flowQuantum;
++  u_short	recvSequence = 0;
++  time_t	now,
++		connect_time,
++		elasped_time, 
++		sleep_time,
++		connect_timeout = -1,
++		nextStatusTime = 0;
++  at_entity_t	entity;
++  at_retry_t	retry;
++  Boolean	recoverableErrShown = false;
++
++
++#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
++  struct sigaction action;  /* Actions for POSIX signals */
++#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
++
++  /* try to find our printer */
++  if ((err = nbp_make_entity(&entity, name, type, zone)) != noErr)
++  {
++    fprintf(stderr, "ERROR: Unable to make AppleTalk address: %s\n", strerror(errno));
++    goto Exit;
++  }
++
++ /*
++  * Remember when we started looking for the printer.
++  */
++
++  connect_time = time(NULL);
++
++  retry.interval = 1;
++  retry.retries  = 5;
++  retry.backoff  = 0;
++
++  /* Loop forever trying to get an open session with the printer.  */
++  for (;;)
++  {
++    /* Make sure it's okay to use appletalk */
++    if (okayToUseAppleTalk())
++    {
++      /* Resolve the name into an address. Returns the number found or an error */
++      if ((err = nbp_lookup(&entity, &tuple, 1, &retry)) > 0)
++      {
++        if (err > 1)
++          fprintf(stderr, "DEBUG: Found more than one printer with the name \"%s\"\n", name);
++
++	if (recoverableErrShown)
++	{
++	  fprintf(stderr, "INFO: recovered: \n");
++	  sleep(5);
++	  recoverableErrShown = false;
++	}
++
++        /* Open a connection to the device */
++        if ((err = papOpen(&tuple, &gConnID, &gSockfd, &gSessionAddr, &flowQuantum)) == 0)
++          break;
++
++        fprintf(stderr, "WARNING: Unable to open \"%s:%s\": %s\n", name, zone, strerror(errno));
++      }
++      else
++      {
++	fprintf(stderr, "WARNING: recoverable: Printer not responding\n");
++	recoverableErrShown = true;
++      }
++    }
++    else
++    {
++      fprintf(stderr, "WARNING: recoverable: AppleTalk disabled in System Preferences.\n");
++      recoverableErrShown = true;
++    }
++
++    retry.retries = 3;
++    elasped_time = time(NULL) - connect_time;
++
++    if (connect_timeout == -1)
++      connect_timeout = connectTimeout();
++
++    if (connect_timeout && elasped_time > connect_timeout)
++    {
++      fprintf(stderr, "ERROR: Printer not responding\n");
++      err = ETIMEDOUT;
++      goto Exit;					 	/* Waiting too long... */
++    }
++    else if (elasped_time < 30 /*(30 * 60)*/)
++      sleep_time = 10;					/* Waiting < 30 minutes */
++    else if (elasped_time < 60 /*(24 * 60 * 60)*/)
++      sleep_time = 30;					/* Waiting < 24 hours */
++    else
++      sleep_time = 60;					/* Waiting > 24 hours */
++
++    fprintf(stderr, "DEBUG: sleeping %d seconds...\n", (int)sleep_time);
++    sleep(sleep_time);
++  }
++
++  /*
++  * Now that we are connected to the printer ignore SIGTERM so that we
++  * can finish out any page data the driver sends (e.g. to eject the
++  * current page...  if we are printing data from a file then catch the
++  * signal so we can send a PAP Close packet (otherwise you can't cancel 
++  * raw jobs...)
++  */
++
++#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
++  sigset(SIGTERM, (argc < 7) ? SIG_IGN : signalHandler);
++#elif defined(HAVE_SIGACTION)
++  memset(&action, 0, sizeof(action));
++
++  sigemptyset(&action.sa_mask);
++  action.sa_handler = (argc < 7) ? SIG_IGN : signalHandler;
++  sigaction(SIGTERM, &action, NULL);
++#else
++  signal(SIGTERM, (argc < 7) ? SIG_IGN : signalHandler);
++
++#ifdef DEBUG
++  /* Makes debugging easier; otherwise printer will be busy for several minutes */
++  signal(SIGINT, signalHandler);
++#endif /* DEBUG */
++
++#endif /* HAVE_SIGSET */
++
++  fprintf(stderr, "INFO: Sending data\n");
++
++  sendDataAddr = tuple.enu_addr;
++
++  /* Start the tickle packets and set a timeout alarm  */
++  if ((err = papSendRequest(gSockfd, &gSessionAddr, gConnID, AT_PAP_TYPE_TICKLE, 0, false, false)) < 0)
++  {
++    perror("ERROR: Unable to send PAP tickle request");
++    goto Exit;
++  }
++  signal(SIGALRM, signalHandler);
++  alarm(PAP_TIMEOUT);
++
++  /* Prime the pump with an initial send-data packet */
++  if ((err = papSendRequest(gSockfd, &gSessionAddr, gConnID, AT_PAP_TYPE_SEND_DATA, 0xFF, true, true)) < 0)
++  {
++    perror("ERROR: Unable to send initial PAP send data request");
++    goto Exit;
++  }
++
++  /* Set non-blocking mode on our data source descriptor */
++  val = fcntl(fdin, F_GETFL, 0);
++  fcntl(fdin, F_SETFL, val | O_NONBLOCK);
++
++  fileBufferNbytes = 0;
++  fileTbytes = 0;
++  fileEOFRead = fileEOFSent = false;
++  maxfdp1 = MAX(fdin, gSockfd) + 1;
++
++  if (gStatusInterval != 0)
++  {
++    timeout.tv_usec  = 0;
++    nextStatusTime = time(NULL) + gStatusInterval;
++    timeoutPtr = &timeout;
++  }
++  else
++    timeoutPtr = NULL;
++
++
++  for (;;)
++  {
++    /* Set up our descriptors for the select */
++    FD_ZERO(&readSet);
++    FD_SET(gSockfd, &readSet);
++
++    if (fileBufferNbytes == 0 && fileEOFRead == false)
++      FD_SET(fdin, &readSet);
++
++    /* Set the select timeout value based on the next status interval */
++    if (gStatusInterval != 0)
++    {
++      now = time(NULL);
++      timeout.tv_sec = (nextStatusTime > now) ? nextStatusTime - now : 1;
++    }
++
++    /* Wait here for something interesting to happen */
++    if ((err = select(maxfdp1, &readSet, 0, 0, timeoutPtr)) < 0)
++    {
++      perror("ERROR: select");
++      break;
++    }
++
++    if (err == 0 || (gStatusInterval != 0 && time(NULL) >= nextStatusTime))
++    {
++      /* Time to send a status request */
++      if ((err = papSendRequest(gSockfd, &tuple.enu_addr, 0, AT_PAP_TYPE_SEND_STATUS, 0x01, false, false)) < 0)
++        perror("WARNING: Unable to send PAP status request");
++
++      if (gStatusInterval)
++        nextStatusTime = time(NULL) + gStatusInterval;
++    }
++
++    /* Was there an event on the input stream? */
++    if (FD_ISSET(fdin, &readSet))
++    {
++      FD_CLR(fdin, &readSet);
++
++      assert(fileBufferNbytes == 0);
++      fileBufferNbytes = read(fdin, fileBuffer, MIN(sizeof(fileBuffer), AT_PAP_DATA_SIZE * flowQuantum));
++      if (fileBufferNbytes == 0)
++        fileEOFRead = true;
++
++      if (fileEOFSent == false && fileBufferNbytes >= 0 && gSendDataID != 0)
++      {
++        fprintf(stderr, "DEBUG: -> PAP_DATA %d bytes %s\n", fileBufferNbytes, fileEOFRead ? "with EOF" : "");
++        papWrite(gSockfd, &sendDataAddr, gSendDataID, gConnID, flowQuantum, fileBuffer, fileBufferNbytes, fileEOFRead);
++
++        fileTbytes += fileBufferNbytes;
++        if (argc > 6 && !gErrorlogged)
++          fprintf(stderr, "DEBUG: Sending print file, %qd bytes\n", (off_t)fileTbytes);
++
++        fileBufferNbytes = 0;
++        gSendDataID = 0;
++        if (fileEOFRead)
++        {
++          fileEOFSent = true;
++          if (gWaitEOF == false || fileTbytes == 0)
++          {
++            err = 0;
++            goto Exit;
++          }
++        }
++      }
++    }
++
++    /* Was there an event on the output stream? */
++    if (FD_ISSET(gSockfd, &readSet))
++    {
++      if ((rc = atp_look(gSockfd)) < 0)
++      {
++        perror("ERROR: Unable to look for PAP response");
++        break;
++      }
++  
++      if (rc > 0)
++      {
++        /* It's an ATP response */
++        resp.resp[0].iov_base = sockBuffer;
++        resp.resp[0].iov_len = sizeof(sockBuffer) - 1;
++        resp.bitmap = 0x01;
++  
++        if ((err = atp_getresp(gSockfd, &tid, &resp)) < 0)
++        {
++          perror("ERROR: Unable to get PAP response");
++          break;
++        }
++        userdata = resp.userdata[0];
++      }
++      else
++      {
++        /* It's an ATP request */
++        reqlen = sizeof(atpReqBuf);
++        if ((err = atp_getreq(gSockfd, &src, atpReqBuf, &reqlen, &userdata, &xo, &tid, &bitmap, 0)) < 0)
++        {
++          perror("ERROR: Unable to get PAP request");
++          break;
++        }
++      }
++
++      fprintf(stderr, "DEBUG: <- %s\n", PAPPacketStr(TYPE_OF(userdata)));
++
++      switch (TYPE_OF(userdata))
++      {
++      case AT_PAP_TYPE_SEND_STS_REPLY:        /* Send-Status-Reply packet */
++        if (resp.bitmap & 1)
++        {
++          u_char *iov_base = (u_char *)resp.resp[0].iov_base;
++          statusUpdate(&iov_base[5], iov_base[4]);
++        }
++        break;
++      
++      case AT_PAP_TYPE_SEND_DATA:            /* Send-Data packet */
++        sendDataAddr.socket  = src.socket;
++        gSendDataID     = tid;
++        recvSequence    = SEQUENCE_NUM(userdata);
++
++        if ((fileBufferNbytes > 0 || fileEOFRead) && fileEOFSent == false)
++        {
++          fprintf(stderr, "DEBUG: -> PAP_DATA %d bytes %s\n", fileBufferNbytes, fileEOFRead ? "with EOF" : "");
++          papWrite(gSockfd, &sendDataAddr, gSendDataID, gConnID, flowQuantum, fileBuffer, fileBufferNbytes, fileEOFRead);
++
++          fileTbytes += fileBufferNbytes;
++          if (argc > 6 && !gErrorlogged)
++            fprintf(stderr, "DEBUG: Sending print file, %qd bytes\n", (off_t)fileTbytes);
++
++          fileBufferNbytes = 0;
++          gSendDataID = 0;
++          if (fileEOFRead)
++          {
++            fileEOFSent = true;
++            if (gWaitEOF == false)
++            {
++              err = 0;
++              goto Exit;
++            }
++          }
++        }
++        break;
++    
++      case AT_PAP_TYPE_DATA:              /* Data packet */
++        for (len=0, index=0; index < ATP_TRESP_MAX; index++)
++        {
++          if (resp.bitmap & (1 << index))
++            len += resp.resp[index].iov_len;
++        }
++
++        fprintf(stderr, "DEBUG: <- PAP_DATA %d bytes %s\n", len, IS_PAP_EOF(userdata) ? "with EOF" : "");
++
++        if (len > 0)
++        {
++          char *pLineBegin, *pCommentEnd, *pChar;
++          char *logLevel;
++          char logstr[512];
++          int  logstrlen;
++          
++          write(fdout, sockBuffer, len);
++          
++          sockBuffer[len] = '\0';     /* We always reserve room for the nul so we can use strstr() below*/
++          pLineBegin = sockBuffer;
++                                        
++          /* If there are PostScript status comments in the buffer log them.
++           *
++           *  This logic shouldn't be in the backend but until we get backchannel
++           *  data in CUPS 1.2 it has to live here.
++           */
++          while (pLineBegin < sockBuffer + len &&
++               (pLineBegin = strstr(pLineBegin,    "%%[")) != NULL &&
++               (pCommentEnd   = strstr(pLineBegin, "]%%")) != NULL)
++          {
++            pCommentEnd += 3;            /* Skip past "]%%" */
++            *pCommentEnd = '\0';         /* There's always room for the nul */
++            
++            /* Strip the CRs & LFs before writing it to stderr */
++            for (pChar = pLineBegin; pChar < pCommentEnd; pChar++)
++              if (*pChar == '\r' || *pChar == '\n')
++                *pChar = ' ';
++                                                
++            if (strncasecmp(pLineBegin, "%%[ Error:", 10) == 0)
++            {
++              /* logLevel should be "ERROR" here but this causes PrintCenter
++              *  to pause the queue which in turn clears this error, which 
++              *  restarts the job. So the job ends up in an infinite loop with
++              *  the queue being held/un-held. Just make it DEBUG for now until
++              *  we fix notifications later.
++              */
++              logLevel = "DEBUG";
++              gErrorlogged = true;
++            }
++            else if (strncasecmp(pLineBegin, "%%[ Flushing", 12) == 0)
++              logLevel = "DEBUG";
++            else
++              logLevel = "INFO";
++            
++            if ((logstrlen = snprintf(logstr, sizeof(logstr), "%s: %s\n", logLevel, pLineBegin)) >= sizeof(logstr))
++            {
++              /* If the string was trucnated make sure it has a linefeed before the nul */
++              logstrlen = sizeof(logstr) - 1;
++              logstr[logstrlen - 1] = '\n';
++            }
++
++            write(fderr, logstr, logstrlen);
++
++            pLineBegin = pCommentEnd + 1;
++          }
++        }
++
++        if (IS_PAP_EOF(userdata) != 0)
++        {
++          /* If this is EOF then were we expecting it? */
++          if (fileEOFSent == true)
++            goto Exit;
++          else
++          {
++            fprintf(stderr, "WARNING: Printer sent unexpected EOF\n");
++          }
++        }
++
++        if ((err = papSendRequest(gSockfd, &gSessionAddr, gConnID, AT_PAP_TYPE_SEND_DATA, 0xFF, true, true)) < 0)
++        {
++          fprintf(stderr, "ERROR: Error %d sending PAPSendData resuest: %s\n", err, strerror(errno));
++          goto Exit;
++        }
++        break;
++      
++      case AT_PAP_TYPE_TICKLE:            /* Tickle packet */
++        break;
++    
++      case AT_PAP_TYPE_CLOSE_CONN:          /* Close-Connection packet */
++        /* We shouldn't normally see this. */
++        papCloseResp(gSockfd, &gSessionAddr, xo, tid, gConnID);
++
++        /* If this is EOF then were we expecting it? */
++        if (fileEOFSent == true)
++        {
++          fprintf(stderr, "WARNING: Printer sent unexpected EOF\n");
++        }
++        else
++        {
++          fprintf(stderr, "ERROR: Printer sent unexpected EOF\n");
++        }
++        goto Exit;
++        break;
++    
++      case AT_PAP_TYPE_OPEN_CONN:            /* Open-Connection packet */
++      case AT_PAP_TYPE_OPEN_CONN_REPLY:        /* Open-Connection-Reply packet */
++      case AT_PAP_TYPE_SEND_STATUS:          /* Send-Status packet */
++      case AT_PAP_TYPE_CLOSE_CONN_REPLY:        /* Close-Connection-Reply packet */
++        fprintf(stderr, "WARNING: Unexpected PAP packet of type %d\n", TYPE_OF(userdata));
++        break;
++      
++      default:
++        fprintf(stderr, "WARNING: Unknown PAP packet of type %d\n", TYPE_OF(userdata));
++        break;
++      }
++    
++      if (CONNID_OF(userdata) == gConnID)
++      {
++        /* Reset tickle timer */
++        alarm(0);
++        alarm(PAP_TIMEOUT);
++      }
++    }
++  }
++
++Exit:
++  /*
++  * Close the socket and return...
++  */
++  papClose(false);
++
++  return err;
++}
++
++
++#pragma mark -
++/*!
++ * @function  papOpen
++ * @abstract  Open a pap session to a printer.
++ *
++ * @param  tuple	nbp address of printer
++ * @param  connID	returned pap connection id
++ * @param  fd		returned socket descriptor
++ * @param  sessionAddr	returned session address
++ * @param  flowQuantum	returned flow quantum (usually 8)
++ *
++ * @result    A non-zero return value for errors
++ */
++static int papOpen(at_nbptuple_t* tuple, u_char* connID, int* fd, at_inet_t* sessionAddr, u_char* flowQuantum)
++{
++  int		result;
++  long		tm;
++  unsigned char data[10], rdata[ATP_DATA_SIZE];
++  int		userdata;
++  u_char	*puserdata = (u_char *)&userdata;
++  at_socket	socket = 0;
++  int		waitTime;
++  int		status;
++  at_resp_t	resp;
++  at_retry_t	retry;
++
++  if (tuple == NULL)
++  {
++    errno = EINVAL;
++    return -1;
++  }
++
++  fprintf(stderr, "INFO: Opening connection\n");
++
++  errno  = 0;
++  result  = 0;
++
++  *fd = atp_open(&socket);
++  if (*fd < 0)
++    return -1;
++
++  /* Build the open connection request packet.
++  */
++  tm = time(NULL);
++  srand(tm);
++
++  *connID = (rand()&0xff) | 0x01;
++  puserdata[0] = *connID;
++  puserdata[1] = AT_PAP_TYPE_OPEN_CONN;
++  puserdata[2] = 0;
++  puserdata[3] = 0;
++
++  retry.interval = 2;
++  retry.retries = 5;
++
++  resp.bitmap = 0x01;
++  resp.resp[0].iov_base = rdata;
++  resp.resp[0].iov_len = sizeof(rdata);
++
++  data[0] = socket;
++  data[1] = 8;
++
++  for (;;)
++  {
++    waitTime = time(NULL) - tm;
++    data[2] = waitTime >> 8;
++    data[3] = waitTime & 0xff;
++
++    fprintf(stderr, "DEBUG: -> %s\n", PAPPacketStr(AT_PAP_TYPE_OPEN_CONN));
++
++    status = atp_sendreq(*fd, &tuple->enu_addr, data, 4, userdata, 1, 0, 0, &resp, &retry, 0);
++
++    if (status < 0)
++    {
++      statusUpdate("Destination unreachable", 23);
++      result = EHOSTUNREACH;
++      errno = EHOSTUNREACH;
++      sleep(1);
++      goto Exit;
++    }
++    else
++    {
++      puserdata = (u_char *)&resp.userdata[0];
++
++      fprintf(stderr, "DEBUG: <- %s, status %d\n", PAPPacketStr(puserdata[1]), (int)*(short *)&rdata[2]);
++
++      /* Just for the sake of our sanity check the other fields in the packet
++      */
++      if (puserdata[1] != AT_PAP_TYPE_OPEN_CONN_REPLY ||
++        (*(short *)&rdata[2] == 0 && (puserdata[0]&0xff) != *connID))
++      {
++	result = EINVAL;
++	errno = EINVAL;
++	goto Exit;
++      }
++  
++      statusUpdate(&rdata[5], rdata[4] & 0xff);
++
++      if (*(short *)&rdata[2] == 0)
++	break;        /* Connection established okay, exit from the loop */
++    }
++
++    sleep(1);
++  }
++
++  /* Update the session address
++  */
++  sessionAddr->net  = tuple->enu_addr.net;
++  sessionAddr->node  = tuple->enu_addr.node;
++  sessionAddr->socket  = rdata[0];
++  *flowQuantum    = rdata[1];
++
++Exit:
++  if (result != 0)
++  {
++    atp_close(*fd);
++    *fd = 0;
++  }
++
++  return result;
++}
++
++
++/*!
++ * @function  papClose
++ * @abstract  End a PAP session by canceling outstanding send-data & tickle 
++ *            transactions and sending a PAP close request.
++ *
++ * @param  abort  If we're aborting then send the close request 
++ *		  with 0 retries (not yet implemented)
++ *
++ * @result  A non-zero return value for errors
++ */
++static int papClose(int abort)
++{
++  int		fd, tmpID;
++  int		result;
++  unsigned char	rdata[ATP_DATA_SIZE];
++  int		userdata;
++  u_char	*puserdata = (u_char *)&userdata;
++  at_resp_t	resp;
++  at_retry_t	retry;
++
++  if (gSockfd != 0)
++  {
++    fd = gSockfd;
++    gSockfd = 0;
++
++    alarm(0);
++  
++    /* Cancel the pending send-data and tickle trnsactions
++    */
++    if (gSendDataID)
++    {
++      tmpID = gSendDataID;
++      gSendDataID = 0;
++      papCancelRequest(fd, tmpID);
++    }
++  
++    if (gTickleID)
++    {
++      tmpID = gTickleID;
++      gTickleID = 0;
++      papCancelRequest(fd, tmpID);
++    }
++
++    /* This is a workaround for bug #2735145. The problem is papWrite()
++    *  returns before the ATP TRel arrives for it. If we send the pap close packet
++    *  before this release then the printer can drop the last data packets. 
++    *  The effect on an Epson printer is the last page doesn't print, on HP it 
++    *  doesn't close the pap session.
++    */
++    if (gWaitEOF == false)
++      sleep(2);
++
++    fprintf(stderr, "DEBUG: -> %s\n", PAPPacketStr(AT_PAP_TYPE_CLOSE_CONN));
++  
++    puserdata[0] = gConnID;
++    puserdata[1] = AT_PAP_TYPE_CLOSE_CONN;
++    puserdata[2] = 0;
++    puserdata[3] = 0;
++  
++    retry.interval = 2;
++    retry.retries = 5;
++  
++    resp.bitmap = 0x01;
++    resp.resp[0].iov_base = rdata;
++    resp.resp[0].iov_len = sizeof(rdata);
++  
++    result = atp_sendreq(fd, &gSessionAddr, 0, 0, userdata, 1, 0, 0, &resp, &retry, 0);
++  
++    result = close(fd);
++  }
++  return noErr;
++}
++
++
++/*!
++ * @function  papWrite
++ * @abstract  Write bytes to a printer.
++ *
++ * @param  sockfd	socket descriptor
++ * @param  dest		destination address
++ * @param  tid		transaction id
++ * @param  connID	connection id
++ * @param  flowQuantum	returned flow quantum (usually 8)
++ * @param  data		pointer to the data
++ * @param  len		number of bytes to send
++ * @param  eof		pap eof flag
++ *
++ * @result  A non-zero return value for errors
++ */
++static int papWrite(int sockfd, at_inet_t* dest, u_short tid, u_char connID, u_char flowQuantum, char* data, int len, int eof)
++{
++  int		result;
++  int		index;
++  u_char*	puserdata;
++  at_resp_t	resp;
++
++  /* fprintf(stderr, "DEBUG: papWrite(%d%s) to %d,%d,%d; %d\n", len, eof ? " EOF":"", dest->net, dest->node, dest->socket, connID); */
++
++  if (len > AT_PAP_DATA_SIZE * flowQuantum)
++  {
++    fprintf(stderr, "DEBUG: papWrite() len of %d is too big!\n", len);
++    errno = E2BIG;
++    return -1;
++  }
++
++  /*
++  * Break up the outgoing data into a set of
++  * response packets to reply to an incoming
++  * PAP 'SENDDATA' request
++  */
++  for (index = 0; index < flowQuantum; index++)
++  {
++    resp.userdata[index] = 0;
++    puserdata = (u_char *)&resp.userdata[index];
++
++    puserdata[PAP_CONNID]  = connID;
++    puserdata[PAP_TYPE]    = AT_PAP_TYPE_DATA;
++    puserdata[PAP_EOF]    = eof ? 1 : 0;
++
++    resp.resp[index].iov_base = (caddr_t)data;
++
++    if (data)
++      data += AT_PAP_DATA_SIZE;
++
++    resp.resp[index].iov_len = MIN((int)len, (int)AT_PAP_DATA_SIZE);
++    len -= resp.resp[index].iov_len;
++    if (len == 0)
++      break;
++  }
++  resp.bitmap = (1 << (index + 1)) - 1;
++
++  /*
++  *  Write out the data as a PAP 'DATA' response
++  */
++  errno = 0;
++  if ((result = atp_sendrsp(sockfd, dest, true, tid, &resp)) < 0)
++  {
++    fprintf(stderr, "DEBUG: atp_sendrsp() returns %d, errno %d \"%s\"\n", result, errno, strerror(errno));
++    return -1;
++  }
++  return(0);
++}
++
++
++/*!
++ * @function  papCloseResp
++ * @abstract  Send a pap close response in the rare case we receive a close connection request.
++ *
++ * @param  sockfd	socket descriptor
++ * @param  dest		destination address
++ * @param  tid		transaction id
++ * @param  connID	connection id
++ *
++ * @result    A non-zero return value for errors
++ */
++static int papCloseResp(int sockfd, at_inet_t* dest, int xo, u_short tid, u_char connID)
++{
++  int		result;
++  at_resp_t	resp;
++
++  resp.bitmap = 1;
++  resp.userdata[0] = 0;
++
++  ((u_char*)&resp.userdata[0])[PAP_CONNID]  = connID;
++  ((u_char*)&resp.userdata[0])[PAP_TYPE]    = AT_PAP_TYPE_CLOSE_CONN_REPLY;
++
++  resp.resp[0].iov_base = NULL;
++  resp.resp[0].iov_len = 0;
++
++  if ((result = atp_sendrsp(sockfd, dest, xo, tid, &resp)) < 0)
++  {
++    fprintf(stderr, "DEBUG: atp_sendrsp() returns %d, errno %d \"%s\"\n", result, errno, strerror(errno));
++    return -1;
++  }
++  return 0;
++}
++
++
++/*!
++ * @function  papSendRequest
++ * @abstract  Send a pap close response in the rare case we receive a close connection request.
++ *
++ * @param  sockfd	socket descriptor
++ * @param  dest		destination address
++ * @param  function	pap function
++ * @param  bitmap	bitmap
++ * @param  xo		exactly once
++ * @param  seqno	sequence number
++ *
++ * @result  A non-zero return value for errors
++ */
++static int papSendRequest(int sockfd, at_inet_t* dest, u_char connID, int function, u_char bitmap, int xo, int seqno)
++{
++  u_short	tid;
++  int		err;
++  sigset_t	sv, osv;
++  int		userdata;
++  u_char	*puserdata = (u_char *)&userdata;
++  at_retry_t	retry;
++  at_resp_t	resp;
++  static u_short pap_send_count = 0;
++
++  fprintf(stderr, "DEBUG: -> %s\n", PAPPacketStr(function));
++
++  puserdata[0] = connID;
++  puserdata[1] = function;
++  resp.bitmap = bitmap;
++  retry.interval = 10;
++  retry.retries = -1; /* was ATP_INFINITE_RETRIES */
++  if (seqno)
++  {
++    pap_send_count++;
++    if (pap_send_count == 0)
++      pap_send_count = 1;
++    *(u_short *)&puserdata[2] = pap_send_count;
++  }
++  else
++    *(u_short *)&puserdata[2] = 0;
++
++  sigemptyset(&sv);
++  sigaddset(&sv, SIGIO);
++  sigprocmask(SIG_SETMASK, &sv, &osv);
++
++  err = atp_sendreq(sockfd, dest, 0, 0, userdata, xo, 0, &tid, &resp, &retry, 1);
++
++  sigprocmask(SIG_SETMASK, &osv, NULL);
++
++  return (int)tid;
++}
++
++
++/*!
++ * @function  papCancelRequest
++ * @abstract  Cancel a pending pap request.
++ *
++ * @param  sockfd	socket descriptor
++ * @param  dest		destination address
++ * @param  function	pap function
++ * @param  bitmap	bitmap
++ * @param  xo		exactly once
++ * @param  seqno	sequence number
++ *
++ * @result    A non-zero return value for errors
++ */
++int papCancelRequest(int sockfd, int id)
++{
++  int		len;
++  sigset_t	sv, osv;
++
++  len = sizeof(int);
++  sigemptyset(&sv);
++  sigaddset(&sv, SIGIO);
++  sigprocmask(SIG_SETMASK, &sv, &osv);
++
++  if (at_send_to_dev(sockfd, AT_ATP_CANCEL_REQUEST, (char*)&id, &len) < 0)
++  {
++    sigprocmask(SIG_SETMASK, &osv, NULL);
++    return -1;
++  }
++  sigprocmask(SIG_SETMASK, &osv, NULL);
++
++  return 0;
++}
++
++
++#pragma mark -
++/*!
++ * @function  statusUpdate
++ * @abstract  Format and print a PAP status response to stderr.
++ *
++ * @param  status	The status response string
++ * @param  statusLen	The length of the status response string
++ */
++void statusUpdate(u_char* status, u_char statusLen)
++{
++  static char	status_str[255];
++  static u_char	last_statusLen  = 0xFF;
++
++  /* Only send this if the status has changed */
++  if (statusLen != last_statusLen || memcmp(status, status_str, statusLen) != 0)
++  {
++    if (statusLen > sizeof(status_str)-1)
++      statusLen = sizeof(status_str)-1;
++    last_statusLen = statusLen;
++    memcpy(status_str, status, statusLen);
++    status_str[(int)statusLen] = '\0';
++    
++    /* 
++     * Make sure the status string is in the form of a PostScript comment.
++     */
++
++    if (statusLen > 3 && memcmp(status, "%%[", 3) == 0)
++      fprintf(stderr, "INFO: %s\n", status_str);
++    else
++      fprintf(stderr, "INFO: %%%%[ %s ]%%%%\n", status_str);
++  }
++  return;
++}
++
++
++/*!
++ * @function  parseUri
++ * @abstract  Parse a PAP URI into it's NBP components.
++ *
++ * @param  argv0	The PAP URI to parse
++ * @param  name		NBP name
++ * @param  zone		NBP zone
++ * @param  type		NBP type
++ *
++ * @result    A non-zero return value for errors
++ */
++static int parseUri(const char* argv0, char* name, char* type, char* zone)
++{
++  char  method[255],		/* Method in URI */
++        hostname[1024],		/* Hostname */
++        username[255],		/* Username info (not used) */
++        resource[1024],		/* Resource info (device and options) */
++        *resourcePtr,
++        *typePtr,
++        *options,		/* Pointer to options */
++        optionName[255],	/* Name of option */
++        value[255],		/* Value of option */
++        *ptr;			/* Pointer into name or value */
++  int   port;			/* Port number (not used) */
++  int   statusInterval;		/* */
++
++  /*
++  * Extract the device name and options from the URI...
++  */
++  method[0] = username[0] = hostname[0] = resource[0] = '\0';
++  port = 0;
++
++  httpSeparateURI(HTTP_URI_CODING_NONE, argv0, method, sizeof(method), 
++		  username, sizeof(username),
++		  hostname, sizeof(hostname), &port,
++		  resource, sizeof(resource), 0);
++
++  /*
++  * See if there are any options...
++  */
++  if ((options = strchr(resource, '?')) != NULL)
++  {
++    /*
++    * Yup, terminate the device name string and move to the first
++    * character of the options...
++    */
++    *options++ = '\0';
++
++    while (*options != '\0')
++    {
++      /*
++      * Get the name...
++      */
++      for (ptr = optionName; *options && *options != '=' && *options != '+'; )
++        *ptr++ = *options++;
++
++      *ptr = '\0';
++      value[0] = '\0';
++
++      if (*options == '=')
++      {
++        /*
++        * Get the value...
++        */
++        
++        options ++;
++        
++        for (ptr = value; *options && *options != '+';)
++          *ptr++ = *options++;
++
++        *ptr = '\0';
++        
++        if (*options == '+')
++          options ++;
++      }
++      else if (*options == '+')
++      {
++        options ++;
++      }
++
++      /*
++      * Process the option...
++      */
++      if (strcasecmp(optionName, "waiteof") == 0)
++      {
++        /*
++        * Set the banner...
++        */
++        if (strcasecmp(value, "on") == 0 ||
++          strcasecmp(value, "yes") == 0 ||
++          strcasecmp(value, "true") == 0)
++        {
++          gWaitEOF = true;
++        }
++        else if (strcasecmp(value, "off") == 0 ||
++            strcasecmp(value, "no") == 0 ||
++            strcasecmp(value, "false") == 0)
++        {
++          gWaitEOF = false;
++        }
++        else
++        {
++          fprintf(stderr, "WARNING: Boolean expected for waiteof option \"%s\"\n", value);
++        }
++      }
++      else if (strcasecmp(optionName, "status") == 0)
++      {
++        statusInterval = atoi(value);
++        if (value[0] < '0' || value[0] > '9' || 
++          statusInterval < 0)
++        {
++          fprintf(stderr, "WARNING: number expected for status option \"%s\"\n", value);
++        }
++        else
++        {
++          gStatusInterval = statusInterval;
++        }
++      }
++    }
++  }
++
++  resourcePtr = resource;
++
++  if (*resourcePtr == '/')
++    resourcePtr++;
++
++        /* If the resource has a slash we assume the slash seperates the AppleTalk object
++         * name from the AppleTalk type. If the slash is not present we assume the AppleTalk
++         * type is LaserWriter.
++         */
++        typePtr = strchr(resourcePtr, '/');
++        if (typePtr != NULL) {
++            *typePtr++ = '\0';
++        } else {
++            typePtr = "LaserWriter";
++        }
++
++  removePercentEscapes(hostname,    zone, NBP_NVE_STR_SIZE + 1);
++  removePercentEscapes(resourcePtr,  name, NBP_NVE_STR_SIZE + 1);
++  removePercentEscapes(typePtr,     type, NBP_NVE_STR_SIZE + 1);
++
++  return 0;
++}
++
++
++/*!
++ * @function  addPercentEscapes
++ * @abstract  Encode a string with percent escapes
++ *
++ * @param  src		The source C string
++ * @param  dst		Desination buffer
++ * @param  dstMax	Size of desination buffer
++ *
++ * @result    A non-zero return value for errors
++ */
++static int addPercentEscapes(const unsigned char* src, char* dst, int dstMax)
++{
++  unsigned char	c;
++  char		*dstEnd = dst + dstMax - 1;	/* -1 to leave room for the NUL */
++
++  while (*src)
++  {
++    c = *src++;
++
++    if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || 
++        (c >= '0' && c <= '9') || (c == '.' || c == '-'  || c == '*' || c == '_'))
++    {
++      if (dst >= dstEnd)
++        return -1;
++
++      *dst++ = c;
++    }
++    else
++    {
++      if (dst >= dstEnd - 2)
++        return -1;
++
++      snprintf(dst, dstEnd - dst, "%%%02x", c);
++      dst += 3;
++    }
++  }
++
++  *dst = '\0';
++  return 0;
++}
++
++
++/*!
++ * @function  removePercentEscapes
++ * @abstract  Returns a string with any percent escape sequences replaced with their equivalent character
++ *
++ * @param  src		Source buffer
++ * @param  srclen	Number of bytes in source buffer
++ * @param  dst		Desination buffer
++ * @param  dstMax	Size of desination buffer
++ *
++ * @result    A non-zero return value for errors
++ */
++static int removePercentEscapes(const char* src, unsigned char* dst, int dstMax)
++{
++  int c;
++  const unsigned char *dstEnd = dst + dstMax;
++
++  while (*src && dst < dstEnd)
++  {
++    c = *src++;
++
++    if (c == '%')
++    {
++      sscanf(src, "%02x", &c);
++      src += 2;
++    }
++    *dst++ = (char)c;
++  }
++
++  if (dst >= dstEnd)
++    return -1;
++
++  *dst = '\0';
++  return 0;
++}
++
++
++/*!
++ * @function  nbptuple_compare
++ * @abstract  An NBP comparator for qsort.
++ *
++ * @result    p1<p2: -1, p1=p2: 0, p1>p2: 1
++ */
++int nbptuple_compare(const void *p1, const void *p2)
++{
++  int result;
++  int len = MIN(((at_nbptuple_t*)p1)->enu_entity.object.len, 
++          ((at_nbptuple_t*)p2)->enu_entity.object.len);
++
++  if ((result = memcmp(((at_nbptuple_t*)p1)->enu_entity.object.str, ((at_nbptuple_t*)p2)->enu_entity.object.str, len)) == 0)
++  {
++    if (((at_nbptuple_t*)p1)->enu_entity.object.len < ((at_nbptuple_t*)p2)->enu_entity.object.len)
++      result = -1;
++    else if (((at_nbptuple_t*)p1)->enu_entity.object.len > ((at_nbptuple_t*)p2)->enu_entity.object.len)
++      result = 1;
++    else
++      result = 0;
++  }
++  return result;
++}
++
++
++/*!
++ * @function  okayToUseAppleTalk
++ * @abstract  Returns true if AppleTalk is available and enabled.
++ *
++ * @result    non-zero if AppleTalk is enabled
++ */
++static int okayToUseAppleTalk()
++{
++  int atStatus = checkATStack();
++  
++  /* I think the test should be:
++   *    return atStatus == RUNNING || atStatus == LOADED;
++   * but when I disable AppleTalk from the network control panel and
++   * reboot, AppleTalk shows up as loaded. The test empirically becomes
++   * the following:
++   */
++  return atStatus == RUNNING;
++}
++
++
++/*!
++ * @function  connectTimeout
++ * @abstract  Returns the connect timeout preference value.
++ */
++static int connectTimeout()
++{
++  CFPropertyListRef value;
++  SInt32 connect_timeout = (7 * 24 * 60 * 60);	/* Default timeout is one week... */
++
++  value = CFPreferencesCopyValue(CFSTR("timeout"), CFSTR("com.apple.print.backends"),
++				 kCFPreferencesAnyUser, kCFPreferencesCurrentHost);
++  if (value != NULL)
++  {
++    if (CFGetTypeID(value) == CFNumberGetTypeID())
++      CFNumberGetValue(value, kCFNumberSInt32Type, &connect_timeout);
++
++    CFRelease(value);
++  }
++
++  return connect_timeout;
++}
++
++
++/*!
++ * @function  signalHandler
++ * @abstract  A signal handler so we can clean up the pap session before exiting.
++ *
++ * @param  sigraised	The signal raised
++ *
++ * @result    Never returns
++ */
++static void signalHandler(int sigraised)
++{
++  fprintf(stderr, "ERROR: There was a timeout error while sending data to the printer\n");
++
++  papClose(true);
++
++  _exit(1);
++}
+--- config-scripts/cups-defaults.m4	(revision 5460)
++++ config-scripts/cups-defaults.m4	(working copy)
+@@ -222 +222 @@
+-AC_ARG_WITH(printcap, [  --with-printcap     set default printcap file],
++AC_ARG_WITH(printcap, [  --with-printcap         set default printcap file],
+--- config-scripts/cups-compiler.m4	(revision 5460)
++++ config-scripts/cups-compiler.m4	(working copy)
+@@ -81,0 +82,3 @@
++PIEFLAGS=""
++AC_SUBST(PIEFLAGS)
++
+@@ -99,2 +102,7 @@
+-				OPTIM="$OPTIM -fpie"
+-				LDFLAGS="$LDFLAGS -pie"
++				PIEFLAGS="-pie -fpie"
++			fi
++			;;
++
++		*)
++			if test x$enable_pie = xyes; then
++				echo "Sorry, --enable-pie is not supported on this OS!"
+--- config-scripts/cups-pap.m4	(revision 0)
++++ config-scripts/cups-pap.m4	(revision 5470)
+@@ -0,0 +1,36 @@
++dnl
++dnl "$Id$"
++dnl
++dnl   PAP (AppleTalk) stuff for the Common UNIX Printing System (CUPS).
++dnl
++dnl   Copyright 2006 by Easy Software Products, all rights reserved.
++dnl
++dnl   These coded instructions, statements, and computer programs are the
++dnl   property of Easy Software Products and are protected by Federal
++dnl   copyright law.  Distribution and use rights are outlined in the file
++dnl   "LICENSE.txt" which should have been included with this file.  If this
++dnl   file is missing or damaged please contact Easy Software Products
++dnl   at:
++dnl
++dnl       Attn: CUPS Licensing Information
++dnl       Easy Software Products
++dnl       44141 Airport View Drive, Suite 204
++dnl       Hollywood, Maryland 20636 USA
++dnl
++dnl       Voice: (301) 373-9600
++dnl       EMail: cups-info at cups.org
++dnl         WWW: http://www.cups.org
++dnl
++
++# Currently the PAP backend is only supported on MacOS X with the AppleTalk
++# SDK installed...
++PAP=""
++if test $uname = Darwin; then
++	AC_CHECK_HEADER(AppleTalk/at_proto.h, PAP="pap")
++fi
++
++AC_SUBST(PAP)
++
++dnl
++dnl End of "$Id$".
++dnl
+--- cups/string.h	(revision 5460)
++++ cups/string.h	(working copy)
+@@ -34,2 +33,0 @@
+-#  include <config.h>
+-
+@@ -36,0 +35 @@
++#  include <stdlib.h>
+@@ -40,0 +40,2 @@
++#  include <config.h>
++
+--- cups/getifaddrs.c	(revision 5460)
++++ cups/getifaddrs.c	(working copy)
+@@ -43 +43 @@
+-static int				/* O - 0 on success, -1 on error */
++int					/* O - 0 on success, -1 on error */
+@@ -219 +219 @@
+-static void
++void
+--- cups/http-private.h	(revision 5460)
++++ cups/http-private.h	(working copy)
+@@ -34 +34,2 @@
+-#  include "config.h"
++#  include <stdlib.h>
++#  include <config.h>
+@@ -168 +169 @@
+-static int	_cups_getifaddrs(struct ifaddrs **addrs);
++extern int	_cups_getifaddrs(struct ifaddrs **addrs);
+@@ -170 +171 @@
+-static void	_cups_freeifaddrs(struct ifaddrs *addrs);
++extern void	_cups_freeifaddrs(struct ifaddrs *addrs);
+--- filter/Makefile	(revision 5460)
++++ filter/Makefile	(working copy)
+@@ -208 +208,2 @@
+-	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm
++	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) \
++		-L../cups $(LINKCUPS) -lm
+@@ -219 +220,2 @@
+-	$(DSO) $(ARCH32FLAGS) $(DSOFLAGS) -o $@ $(IMAGE32OBJS) $(DSOLIBS) -lm
++	$(DSO) $(ARCH32FLAGS) $(DSOFLAGS) -o $@ $(IMAGE32OBJS) $(DSOLIBS) \
++		-L../cups $(LINKCUPS) -lm
+@@ -228 +230,2 @@
+-	$(DSO) $(ARCH64FLAGS) $(DSOFLAGS) -o $@ $(IMAGE64OBJS) $(DSOLIBS) -lm
++	$(DSO) $(ARCH64FLAGS) $(DSOFLAGS) -o $@ $(IMAGE64OBJS) $(DSOLIBS) \
++		-L../cups $(LINKCUPS) -lm
+@@ -264,0 +268 @@
++		-L../cups $(LINKCUPS) \
 --- CHANGES.txt	(revision 5460)
 +++ CHANGES.txt	(working copy)
 @@ -1 +1 @@
 -CHANGES.txt - 2006-04-24
-+CHANGES.txt - 2006-04-25
-@@ -3,0 +4,9 @@
++CHANGES.txt - 2006-04-27
+@@ -3,0 +4,22 @@
 +CHANGES IN CUPS V1.2
 +
++	- Redirects in the web interface did not always preserve
++	  the encrypted status of a connection (STR #1603)
++	- Added the Apple "pap" backend.
++	- Added CUPS library to CUPS Image shared library
++	  linkage to support Linux --as-needed linker option
++	  (STR #1606)
++	- Fixed support for --enable-pie (STR #1609)
++	- The pdftops filter did not validate the length of the
++	  encryption key (STR #1608)
++	- Updated the Polish localization.
++	- "Encryption Required" in the cupsd.conf file now only
++	  requires encryption when the connection is not over the
++	  loopback interface or domain socket.
 +	- Printer names containing "+" were not quoted properly in
 +	  the web interface (STR #1600)
 +	- The SNMP backend now reports the make and model in the
@@ -22,7 +1692,10 @@
 +	  name is more useful than just an IP address.
 +
 +
-only in patch2:
+--- configure.in	(revision 5460)
++++ configure.in	(working copy)
+@@ -45,0 +46 @@
++sinclude(config-scripts/cups-pap.m4)
 --- templates/ja/classes.tmpl	(revision 5460)
 +++ templates/ja/classes.tmpl	(working copy)
 @@ -22 +22 @@
@@ -58,7 +1731,6 @@
 @@ -50 +50 @@
 -<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}&amp;is_class=Y">
 +<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
-only in patch2:
 --- templates/ja/printers.tmpl	(revision 5460)
 +++ templates/ja/printers.tmpl	(working copy)
 @@ -22 +22 @@
@@ -100,7 +1772,6 @@
 @@ -54 +54 @@
 -<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}">
 +<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
-only in patch2:
 --- templates/classes.tmpl	(revision 5460)
 +++ templates/classes.tmpl	(working copy)
 @@ -20 +20 @@
@@ -136,7 +1807,6 @@
 @@ -48 +48 @@
 -<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}&amp;is_class=Y">
 +<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
-only in patch2:
 --- templates/printers.tmpl	(revision 5460)
 +++ templates/printers.tmpl	(working copy)
 @@ -26 +26 @@
@@ -178,7 +1848,6 @@
 @@ -58 +58 @@
 -<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}">
 +<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
-only in patch2:
 --- templates/sv/classes.tmpl	(revision 5460)
 +++ templates/sv/classes.tmpl	(working copy)
 @@ -20 +20 @@
@@ -214,7 +1883,6 @@
 @@ -48 +48 @@
 -<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}&amp;is_class=Y">
 +<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
-only in patch2:
 --- templates/sv/printers.tmpl	(revision 5460)
 +++ templates/sv/printers.tmpl	(working copy)
 @@ -26 +26 @@
@@ -256,9 +1924,11 @@
 @@ -58 +58 @@
 -<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}">
 +<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
-only in patch2:
 --- templates/pl/classes.tmpl	(revision 5460)
 +++ templates/pl/classes.tmpl	(working copy)
+@@ -13 +13 @@
+-{printer_is_accepting_jobs=0?odrzuca wydruki:akceptuje wydruki}, {printer_is_shared=0?nie upubliczniona:upubliczniona}.
++{printer_is_accepting_jobs=0?odrzuca wydruki:akceptuje wydruki}, {printer_is_shared=0?nie: opublikowana}.
 @@ -20 +20 @@
 -<A HREF="{admin_uri}?op=start-class&amp;printer_name={printer_name}&amp;is_class=Y">
 +<A HREF="{admin_uri}?op=start-class&amp;printer_name={%printer_name}&amp;is_class=Y">
@@ -274,12 +1944,16 @@
 @@ -33 +33 @@
 -<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
 +<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
-@@ -36 +36 @@
+@@ -36,2 +36,2 @@
 -<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1&amp;is_class=Y">
+-<IMG SRC="/images/button-publish-printer.gif" ALT="Upublicznij Drukark??" CLASS="button"></A>
 +<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1&amp;is_class=Y">
-@@ -39 +39 @@
++<IMG SRC="/images/button-publish-printer.gif" ALT="Publikuj Drukark??" CLASS="button"></A>
+@@ -39,2 +39,2 @@
 -<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0&amp;is_class=Y">
+-<IMG SRC="/images/button-unpublish-printer.gif" ALT="Nie Upubliczniaj Drukarki" CLASS="button"></A>
 +<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0&amp;is_class=Y">
++<IMG SRC="/images/button-unpublish-printer.gif" ALT="Nie Publikuj Drukarki" CLASS="button"></A>
 @@ -42 +42 @@
 -<A HREF="{admin_uri}?op=modify-class&amp;printer_name={printer_name}">
 +<A HREF="{admin_uri}?op=modify-class&amp;printer_name={%printer_name}">
@@ -292,9 +1966,11 @@
 @@ -48 +48 @@
 -<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}&amp;is_class=Y">
 +<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
-only in patch2:
 --- templates/pl/printers.tmpl	(revision 5460)
 +++ templates/pl/printers.tmpl	(working copy)
+@@ -15 +15 @@
+-{printer_is_accepting_jobs=0?odrzuca wydruki:akceptuje wydruki}, {printer_is_shared=0?nie:}  upubliczniona.
++{printer_is_accepting_jobs=0?odrzuca wydruki:akceptuje wydruki}, {printer_is_shared=0?nie:} opublikowana.
 @@ -26 +26 @@
 -<A HREF="{admin_uri}?op=start-printer&amp;printer_name={printer_name}">
 +<A HREF="{admin_uri}?op=start-printer&amp;printer_name={%printer_name}">
@@ -313,12 +1989,16 @@
 @@ -41 +41 @@
 -<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}">
 +<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}">
-@@ -44 +44 @@
+@@ -44,2 +44,2 @@
 -<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1">
+-<IMG SRC="/images/button-publish-printer.gif" ALT="Upublicznij Drukark??" CLASS="button"></A>
 +<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1">
-@@ -47 +47 @@
++<IMG SRC="/images/button-publish-printer.gif" ALT="Publikuj Drukark??" CLASS="button"></A>
+@@ -47,2 +47,2 @@
 -<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0">
+-<IMG SRC="/images/button-unpublish-printer.gif" ALT="Nie Upubliczniaj Drukarki" CLASS="button"></A>
 +<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0">
++<IMG SRC="/images/button-unpublish-printer.gif" ALT="Nie Publikuj Drukarki" CLASS="button"></A>
 @@ -50 +50 @@
 -<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={printer_name}">
 +<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={%printer_name}">
@@ -334,7 +2014,11 @@
 @@ -58 +58 @@
 -<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}">
 +<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
-only in patch2:
+--- templates/pl/admin.tmpl	(revision 5460)
++++ templates/pl/admin.tmpl	(working copy)
+@@ -65 +65 @@
+-<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Udost??pniaj upublicznione drukarki pod????czone do tego systemu<BR>
++<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Udost??pniaj opublikowane drukarki pod????czone do tego systemu<BR>
 --- templates/es/classes.tmpl	(revision 5460)
 +++ templates/es/classes.tmpl	(working copy)
 @@ -20 +20 @@
@@ -370,7 +2054,6 @@
 @@ -48 +48 @@
 -<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}&amp;is_class=Y">
 +<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
-only in patch2:
 --- templates/es/printers.tmpl	(revision 5460)
 +++ templates/es/printers.tmpl	(working copy)
 @@ -26 +26 @@
@@ -412,7 +2095,6 @@
 @@ -58 +58 @@
 -<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}">
 +<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
-only in patch2:
 --- cgi-bin/template.c	(revision 5460)
 +++ cgi-bin/template.c	(working copy)
 @@ -46,0 +47 @@
@@ -454,3 +2136,12 @@
 +
 +
 +/*
+--- scheduler/client.c	(revision 5460)
++++ scheduler/client.c	(working copy)
+@@ -3704 +3704 @@
+-  if (con->http.encryption == HTTP_ENCRYPT_ALWAYS)
++  if (con->http.tls)
+--- scheduler/auth.c	(revision 5460)
++++ scheduler/auth.c	(working copy)
+@@ -1623,0 +1624 @@
++      strcasecmp(con->http.hostname, "localhost") &&


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- cups.spec	26 Apr 2006 12:55:15 -0000	1.176
+++ cups.spec	28 Apr 2006 12:41:35 -0000	1.177
@@ -1,6 +1,5 @@
 %define initdir /etc/rc.d/init.d
 %define use_alternatives 1
-%define build_as_pie 1
 %define beta rc3
 %define cups_serverbin %{_exec_prefix}/lib/cups
 
@@ -30,16 +29,12 @@
 Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
 Patch12: cups-locale.patch
-Patch13: cups-CAN-2005-0064.patch
-Patch16: cups-pie.patch
 Patch17: cups-1.1.19-no_rpath.patch
 Patch18: cups-language.patch
 Patch20: cups-direct-usb.patch
 Patch22: cups-dest-cache-v2.patch
 Patch24: cups-maxlogsize.patch
-Patch28: cups-no-propagate-ipp-port.patch
 Patch32: cups-pid.patch
-Patch40: cups-link.patch
 Patch41: cups-relro.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -115,18 +110,12 @@
 %patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
 %patch12 -p1 -b .locale
-%patch13 -p1 -b .CAN-2005-0064
-%if %build_as_pie
-%patch16 -p1 -b .pie
-%endif
 %patch17 -p1 -b .no_rpath
 %patch18 -p1 -b .language
 %patch20 -p1 -b .direct-usb
 %patch22 -p1 -b .dest-cache-v2
 %patch24 -p1 -b .maxlogsize
-%patch28 -p1 -b .no-propagate-ipp-port
 %patch32 -p1 -b .pid
-%patch40 -p1 -b .link
 %patch41 -p1 -b .relro
 perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
 aclocal -I config-scripts
@@ -142,7 +131,7 @@
 export CFLAGS="-DLDAP_DEPRECATED=1"
 %configure --with-docdir=%{_docdir}/cups-%{version} \
 	--with-optim="$RPM_OPT_FLAGS $CFLAGS -fstack-protector-all" \
-	--with-log-file-perm=0700
+	--with-log-file-perm=0700 --enable-pie
 
 # If we got this far, all prerequisite libraries must be here.
 make
@@ -382,8 +371,13 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Apr 28 2006 Tim Waugh <twaugh at redhat.com>
+- Sync to svn5470.
+- No longer need link, CAN-2005-0064, or no-propagate-ipp-port patches.
+- Switch to upstream PIE implementation (every single binary is PIE).
+
 * Wed Apr 26 2006 Tim Waugh <twaugh at redhat.com>
-- No longer need backend, rcp, ppdsdat patches.
+- No longer need backend, rcp, or ppdsdat patches.
 - Use configure switch for LogFilePerm default instead of patch.
 
 * Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com>


--- cups-CAN-2005-0064.patch DELETED ---


--- cups-link.patch DELETED ---


--- cups-no-propagate-ipp-port.patch DELETED ---


--- cups-pie.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 28 13:08:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 09:08:42 -0400
Subject: rpms/busybox/devel busybox-1.1.1-ppc64.patch, NONE, 1.1 busybox.spec,
	1.33, 1.34
Message-ID: <200604281308.k3SD8g8H004439@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/busybox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4420

Modified Files:
	busybox.spec 
Added Files:
	busybox-1.1.1-ppc64.patch 
Log Message:
- add RPM_OPT_FLAGS
- add -minimal-toc option


busybox-1.1.1-ppc64.patch:
 Rules.mak |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE busybox-1.1.1-ppc64.patch ---
--- busybox-1.1.1/Rules.mak.pom	2006-03-22 22:16:26.000000000 +0100
+++ busybox-1.1.1/Rules.mak	2006-04-28 14:39:17.000000000 +0200
@@ -48,7 +48,7 @@
 
 # Select the compiler needed to build binaries for your development system
 HOSTCC    = gcc
-HOSTCFLAGS= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
+HOSTCFLAGS= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -mminimal-toc
 
 # Ensure consistent sort order, 'gcc -print-search-dirs' behavior, etc.
 LC_ALL:= C


Index: busybox.spec
===================================================================
RCS file: /cvs/dist/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- busybox.spec	6 Apr 2006 12:21:29 -0000	1.33
+++ busybox.spec	28 Apr 2006 13:08:40 -0000	1.34
@@ -10,6 +10,7 @@
 Patch1: busybox-1.1.1-anaconda.patch
 Patch2: busybox-1.1.1-selinux.patch
 Patch3: busybox-1.1.1-cve-2006-1058.patch
+Patch4: busybox-1.1.1-ppc64.patch
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: libselinux-devel >= 1.27.7-2
@@ -38,10 +39,13 @@
 %patch2 -b .selinux -p1
 %patch -b .static -p1
 %patch3 -b .cve-2006-1058 -p1
+%ifarch ppc64
+%patch4 -b .ppc64 -p1
+%endif
 
 %build
 make defconfig
-make 
+make CC="gcc $RPM_OPT_FLAGS"
 cp busybox busybox-static
 make clean
 
@@ -52,7 +56,7 @@
 
 patch -b --suffix .anaconda -p1 < %{PATCH1}
 make DOLFS=y defconfig
-make CONFIG_DEBUG=y
+make CONFIG_DEBUG=y CC="gcc $RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -75,10 +79,12 @@
 /sbin/busybox.anaconda
 
 %changelog
-* Wed Apr  6 2006 Ivana Varekova <varekova at redhat.com> - 1:1.1.1-1
+* Wed Apr  28 2006 Ivana Varekova <varekova at redhat.com> - 1:1.1.1-1
 - update to 1.1.1
 - fix CVE-2006-1058 - BusyBox passwd command 
   fails to generate password with salt (#187386)
+- add RPM_OPT_FLAGS
+- add -minimal-toc option
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.01-2.2.1
 - bump again for double-long bug on ppc(64)



From fedora-cvs-commits at redhat.com  Fri Apr 28 13:10:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 09:10:16 -0400
Subject: rpms/cups/devel cups-relro.patch,1.4,1.5 cups.spec,1.177,1.178
Message-ID: <200604281310.k3SDAGDh004507@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4490

Modified Files:
	cups-relro.patch cups.spec 
Log Message:
- Extend relro to all binaries.

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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cups-relro.patch	28 Apr 2006 12:41:35 -0000	1.4
+++ cups-relro.patch	28 Apr 2006 13:09:58 -0000	1.5
@@ -1,10 +1,36 @@
---- cups-1.2rc3/pdftops/Makefile.relro	2006-03-05 16:48:12.000000000 +0000
-+++ cups-1.2rc3/pdftops/Makefile	2006-04-28 13:40:58.000000000 +0100
-@@ -9,6 +9,7 @@
+--- 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
+ IMGFILTERS	=	@IMGFILTERS@
+ LDFLAGS		=	-L../cups -L../filter $(RC_CFLAGS) $(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 @@
+ CXXLIBS=""
+ AC_SUBST(CXXLIBS)
  
++RELROFLAG=""
++AC_SUBST(RELROFLAG)
++
+ PIEFLAGS=""
+ AC_SUBST(PIEFLAGS)
  
- include ../Makedefs
-+LDFLAGS += -Wl,-z,relro
+@@ -98,6 +101,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


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- cups.spec	28 Apr 2006 12:41:35 -0000	1.177
+++ cups.spec	28 Apr 2006 13:09:58 -0000	1.178
@@ -375,6 +375,7 @@
 - Sync to svn5470.
 - No longer need link, CAN-2005-0064, or no-propagate-ipp-port patches.
 - Switch to upstream PIE implementation (every single binary is PIE).
+- Extend relro to all binaries.
 
 * Wed Apr 26 2006 Tim Waugh <twaugh at redhat.com>
 - No longer need backend, rcp, or ppdsdat patches.



From fedora-cvs-commits at redhat.com  Fri Apr 28 13:32:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 09:32:39 -0400
Subject: rpms/cups/devel cups-rpath.patch, NONE, 1.1 cups.spec, 1.178,
	1.179 cups-1.1.19-no_rpath.patch, 1.2, NONE
Message-ID: <200604281332.k3SDWdqf002107@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2047

Modified Files:
	cups.spec 
Added Files:
	cups-rpath.patch 
Removed Files:
	cups-1.1.19-no_rpath.patch 
Log Message:
- Better rpath patch.

cups-rpath.patch:
 cups-sharedlibs.m4 |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

--- NEW FILE cups-rpath.patch ---
--- cups-1.2rc3/config-scripts/cups-sharedlibs.m4.rpath	2006-04-28 14:17:09.000000000 +0100
+++ cups-1.2rc3/config-scripts/cups-sharedlibs.m4	2006-04-28 14:24:52.000000000 +0100
@@ -26,6 +26,7 @@
 DSOFLAGS="${DSOFLAGS:=}"
 
 AC_ARG_ENABLE(shared, [  --enable-shared         turn on shared libraries, default=yes])
+AC_ARG_ENABLE(rpath, [  --enable-rpath          turn on rpath-style link options, default=yes])
 
 if test x$enable_shared != xno; then
 	case "$uname" in
@@ -45,7 +46,11 @@
 			LIBCUPS="libcups.so.2"
 			LIBCUPSIMAGE="libcupsimage.so.2"
 			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-rpath,\$(libdir),-set_version,sgi2.6,-soname,\$@ -shared \$(OPTIM)"
+			RPATH=""
+			if test x$enable_rpath != xno; then
+			  RPATH=",-rpath,\$(libdir)"
+			fi
+			DSOFLAGS="$DSOFLAGS -Wl$RPATH,-set_version,sgi2.6,-soname,\$@ -shared \$(OPTIM)"
 			;;
 		OSF1* | Linux | GNU | *BSD*)
 			LIBCUPS="libcups.so.2"
@@ -63,7 +68,11 @@
 			LIBCUPS="libcups_s.a"
 			LIBCUPSIMAGE="libcupsimage_s.a"
 			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-bexpall,-bM:SRE,-bnoentry,-blibpath:\$(libdir)"
+			RPATH=""
+			if test x$enable_rpath != xno; then
+			  RPATH=",-blibpath:\$(libdir)"
+			fi
+			DSOFLAGS="$DSOFLAGS -Wl,-bexpall,-bM:SRE,-bnoentry$RPATH"
 			;;
 		*)
 			echo "Warning: shared libraries may not be supported.  Trying -shared"
@@ -116,7 +125,7 @@
 	# The *BSD, HP-UX, and Solaris run-time linkers need help when
 	# deciding where to find a DSO.  Add linker options to tell them
 	# where to find the DSO (usually in /usr/lib...  duh!)
-	case $uname in
+	if test x$enable_rpath != xno; then case $uname in
                 HP-UX*)
 			# HP-UX
                 	DSOFLAGS="+s +b $libdir $DSOFLAGS"
@@ -141,7 +150,7 @@
                         LDFLAGS="$LDFLAGS -Wl,-rpath,$libdir"
                         EXPORT_LDFLAGS="-Wl,-rpath,$libdir"
                         ;;
-	esac
+	esac; fi
 else
 	DSOLIBS=""
 	IMGLIBS="\$(LIBPNG) \$(LIBTIFF) \$(LIBJPEG) \$(LIBZ)"


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- cups.spec	28 Apr 2006 13:09:58 -0000	1.178
+++ cups.spec	28 Apr 2006 13:32:35 -0000	1.179
@@ -29,7 +29,7 @@
 Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
 Patch12: cups-locale.patch
-Patch17: cups-1.1.19-no_rpath.patch
+Patch17: cups-rpath.patch
 Patch18: cups-language.patch
 Patch20: cups-direct-usb.patch
 Patch22: cups-dest-cache-v2.patch
@@ -110,7 +110,7 @@
 %patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
 %patch12 -p1 -b .locale
-%patch17 -p1 -b .no_rpath
+%patch17 -p1 -b .rpath
 %patch18 -p1 -b .language
 %patch20 -p1 -b .direct-usb
 %patch22 -p1 -b .dest-cache-v2
@@ -131,7 +131,7 @@
 export CFLAGS="-DLDAP_DEPRECATED=1"
 %configure --with-docdir=%{_docdir}/cups-%{version} \
 	--with-optim="$RPM_OPT_FLAGS $CFLAGS -fstack-protector-all" \
-	--with-log-file-perm=0700 --enable-pie
+	--with-log-file-perm=0700 --enable-pie --disable-rpath
 
 # If we got this far, all prerequisite libraries must be here.
 make
@@ -376,6 +376,7 @@
 - No longer need link, CAN-2005-0064, or no-propagate-ipp-port patches.
 - Switch to upstream PIE implementation (every single binary is PIE).
 - Extend relro to all binaries.
+- Better rpath patch.
 
 * Wed Apr 26 2006 Tim Waugh <twaugh at redhat.com>
 - No longer need backend, rcp, or ppdsdat patches.


--- cups-1.1.19-no_rpath.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 28 13:59:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 09:59:35 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2174,1.2175
Message-ID: <200604281359.k3SDxZl9023391@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23332

Modified Files:
	kernel-2.6.spec 
Log Message:
remove xen/tools/symbols too


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2174
retrieving revision 1.2175
diff -u -r1.2174 -r1.2175
--- kernel-2.6.spec	27 Apr 2006 08:23:41 -0000	1.2174
+++ kernel-2.6.spec	28 Apr 2006 13:59:32 -0000	1.2175
@@ -717,8 +717,9 @@
   rm -f pax_global_header
 %setup -q -n %{name}-%{version} -c -a1
   cp %{SOURCE2} .
-# Don't ask, it kills x86_64 rawhide
-  rm xen/tools/figlet/figlet
+# Xen tarball contains pre-build i386 binaries which need removing
+  rm -f xen/tools/figlet/figlet
+  rm -f xen/tools/symbols
   mv linux-%{kversion} vanilla
   mv xen xen-vanilla
   cp %{SOURCE2} .
@@ -1706,6 +1707,9 @@
 %endif
 
 %changelog
+* Fri Apr 28 2006 David Woodhouse <dwmw2 at redhat.com>
+- Remove another Xen tool which was pre-built in the tarball
+
 * Thu Apr 27 2006 Juan Quintela <quintela at redhat.com>
 - Remove figlet by hand again.
 - Enable xen again



From fedora-cvs-commits at redhat.com  Fri Apr 28 14:04:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 10:04:17 -0400
Subject: rpms/busybox/devel busybox.spec,1.34,1.35
Message-ID: <200604281404.k3SE4HxC023844@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/busybox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23789

Modified Files:
	busybox.spec 
Log Message:
remove RPM_OPT_FLAGS



Index: busybox.spec
===================================================================
RCS file: /cvs/dist/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- busybox.spec	28 Apr 2006 13:08:40 -0000	1.34
+++ busybox.spec	28 Apr 2006 14:04:00 -0000	1.35
@@ -45,7 +45,7 @@
 
 %build
 make defconfig
-make CC="gcc $RPM_OPT_FLAGS"
+make 
 cp busybox busybox-static
 make clean
 
@@ -56,7 +56,7 @@
 
 patch -b --suffix .anaconda -p1 < %{PATCH1}
 make DOLFS=y defconfig
-make CONFIG_DEBUG=y CC="gcc $RPM_OPT_FLAGS"
+make CONFIG_DEBUG=y 
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -83,7 +83,6 @@
 - update to 1.1.1
 - fix CVE-2006-1058 - BusyBox passwd command 
   fails to generate password with salt (#187386)
-- add RPM_OPT_FLAGS
 - add -minimal-toc option
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.01-2.2.1



From fedora-cvs-commits at redhat.com  Fri Apr 28 14:07:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 10:07:23 -0400
Subject: rpms/kernel/devel linux-2.6-header-cleanup-git.patch,1.9,1.10
Message-ID: <200604281407.k3SE7N26024079@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24051

Modified Files:
	linux-2.6-header-cleanup-git.patch 
Log Message:
Clean up unistd.h too

linux-2.6-header-cleanup-git.patch:
 b/include/asm-i386/page.h                            |    5 
 b/include/asm-mips/unistd.h                          |    7 
 b/include/asm-powerpc/unistd.h                       |    8 
 b/include/asm-s390/ptrace.h                          |    6 
 b/include/asm-s390/unistd.h                          |    8 
 b/include/asm-x86_64/page.h                          |    5 
 b/include/linux/elf-em.h                             |   44 ++++
 b/include/linux/unistd.h                             |    2 
 include/acpi/platform/aclinux.h                      |    1 
 include/acpi/processor.h                             |    1 
 include/asm-alpha/bitops.h                           |    1 
 include/asm-alpha/cache.h                            |    1 
 include/asm-alpha/cacheflush.h                       |    1 
 include/asm-alpha/core_cia.h                         |    1 
 include/asm-alpha/core_t2.h                          |    1 
 include/asm-alpha/dma-mapping.h                      |    1 
 include/asm-alpha/dma.h                              |    1 
 include/asm-alpha/floppy.h                           |    1 
 include/asm-alpha/hardirq.h                          |    1 
 include/asm-alpha/hw_irq.h                           |    1 
 include/asm-alpha/ide.h                              |    1 
 include/asm-alpha/io.h                               |    1 
 include/asm-alpha/irq.h                              |    1 
 include/asm-alpha/kmap_types.h                       |    1 
 include/asm-alpha/machvec.h                          |    1 
 include/asm-alpha/mmu_context.h                      |    1 
 include/asm-alpha/mmzone.h                           |    1 
 include/asm-alpha/page.h                             |    1 
 include/asm-alpha/param.h                            |    1 
 include/asm-alpha/pgalloc.h                          |    1 
 include/asm-alpha/pgtable.h                          |    1 
 include/asm-alpha/serial.h                           |    1 
 include/asm-alpha/smp.h                              |    1 
 include/asm-alpha/spinlock.h                         |    1 
 include/asm-alpha/system.h                           |    1 
 include/asm-alpha/tlbflush.h                         |    1 
 include/asm-alpha/unistd.h                           |    7 
 include/asm-arm/apm.h                                |    1 
 include/asm-arm/arch-aaec2000/memory.h               |    1 
 include/asm-arm/arch-cl7500/acornfb.h                |    1 
 include/asm-arm/arch-clps711x/hardware.h             |    1 
 include/asm-arm/arch-clps711x/memory.h               |    1 
 include/asm-arm/arch-clps711x/uncompress.h           |    1 
 include/asm-arm/arch-ebsa285/hardware.h              |    1 
 include/asm-arm/arch-ebsa285/memory.h                |    1 
 include/asm-arm/arch-ebsa285/vmalloc.h               |    1 
 include/asm-arm/arch-integrator/smp.h                |    1 
 include/asm-arm/arch-iop3xx/memory.h                 |    1 
 include/asm-arm/arch-iop3xx/timex.h                  |    1 
 include/asm-arm/arch-iop3xx/uncompress.h             |    1 
 include/asm-arm/arch-ixp4xx/dma.h                    |    1 
 include/asm-arm/arch-lh7a40x/constants.h             |    1 
 include/asm-arm/arch-lh7a40x/irqs.h                  |    1 
 include/asm-arm/arch-lh7a40x/registers.h             |    1 
 include/asm-arm/arch-omap/board.h                    |    1 
 include/asm-arm/arch-omap/hardware.h                 |    1 
 include/asm-arm/arch-omap/system.h                   |    1 
 include/asm-arm/arch-omap/uncompress.h               |    1 
 include/asm-arm/arch-pxa/idp.h                       |    1 
 include/asm-arm/arch-pxa/irqs.h                      |    1 
 include/asm-arm/arch-pxa/pxa-regs.h                  |    1 
 include/asm-arm/arch-pxa/timex.h                     |    1 
 include/asm-arm/arch-realview/smp.h                  |    1 
 include/asm-arm/arch-s3c2410/dma.h                   |    1 
 include/asm-arm/arch-s3c2410/uncompress.h            |    1 
 include/asm-arm/arch-sa1100/assabet.h                |    1 
 include/asm-arm/arch-sa1100/cerf.h                   |    1 
 include/asm-arm/arch-sa1100/collie.h                 |    1 
 include/asm-arm/arch-sa1100/dma.h                    |    1 
 include/asm-arm/arch-sa1100/hardware.h               |    1 
 include/asm-arm/arch-sa1100/ide.h                    |    1 
 include/asm-arm/arch-sa1100/irqs.h                   |    1 
 include/asm-arm/arch-sa1100/memory.h                 |    1 
 include/asm-arm/arch-sa1100/system.h                 |    1 
 include/asm-arm/atomic.h                             |    1 
 include/asm-arm/bug.h                                |    1 
 include/asm-arm/cacheflush.h                         |    1 
 include/asm-arm/cpu.h                                |    1 
 include/asm-arm/dma-mapping.h                        |    1 
 include/asm-arm/dma.h                                |    1 
 include/asm-arm/elf.h                                |    1 
 include/asm-arm/fpstate.h                            |    1 
 include/asm-arm/glue.h                               |    1 
 include/asm-arm/hardirq.h                            |    1 
 include/asm-arm/hardware/dec21285.h                  |    1 
 include/asm-arm/hardware/iomd.h                      |    1 
 include/asm-arm/leds.h                               |    1 
 include/asm-arm/mach/serial_at91rm9200.h             |    1 
 include/asm-arm/mach/serial_sa1100.h                 |    1 
 include/asm-arm/memory.h                             |    1 
 include/asm-arm/page.h                               |    1 
 include/asm-arm/pci.h                                |    1 
 include/asm-arm/proc-fns.h                           |    1 
 include/asm-arm/ptrace.h                             |    1 
 include/asm-arm/smp.h                                |    1 
 include/asm-arm/system.h                             |    1 
 include/asm-arm/tlbflush.h                           |    1 
 include/asm-arm/unistd.h                             |   10 -
 include/asm-arm26/atomic.h                           |    1 
 include/asm-arm26/bug.h                              |    1 
 include/asm-arm26/dma.h                              |    1 
 include/asm-arm26/hardirq.h                          |    1 
 include/asm-arm26/hardware.h                         |    1 
 include/asm-arm26/io.h                               |    1 
 include/asm-arm26/leds.h                             |    1 
 include/asm-arm26/mach-types.h                       |    1 
 include/asm-arm26/page.h                             |    1 
 include/asm-arm26/pgtable.h                          |    1 
 include/asm-arm26/serial.h                           |    1 
 include/asm-arm26/smp.h                              |    1 
 include/asm-arm26/sysirq.h                           |    1 
 include/asm-arm26/system.h                           |    1 
 include/asm-arm26/unistd.h                           |   10 -
 include/asm-cris/arch-v10/io.h                       |    1 
 include/asm-cris/arch-v10/page.h                     |    1 
 include/asm-cris/arch-v10/system.h                   |    1 
 include/asm-cris/arch-v32/io.h                       |    1 
 include/asm-cris/arch-v32/irq.h                      |    1 
 include/asm-cris/arch-v32/page.h                     |    1 
 include/asm-cris/arch-v32/processor.h                |    1 
 include/asm-cris/arch-v32/system.h                   |    1 
 include/asm-cris/eshlibld.h                          |    1 
 include/asm-cris/etraxgpio.h                         |    1 
 include/asm-cris/fasttimer.h                         |    1 
 include/asm-cris/page.h                              |    1 
 include/asm-cris/pci.h                               |    1 
 include/asm-cris/pgtable.h                           |    1 
 include/asm-cris/processor.h                         |    1 
 include/asm-cris/rtc.h                               |    1 
 include/asm-cris/tlbflush.h                          |    1 
 include/asm-cris/unistd.h                            |    9 -
 include/asm-frv/atomic.h                             |    1 
 include/asm-frv/bitops.h                             |    1 
 include/asm-frv/bug.h                                |    1 
 include/asm-frv/cache.h                              |    1 
 include/asm-frv/dma.h                                |    1 
 include/asm-frv/elf.h                                |    1 
 include/asm-frv/fpu.h                                |    1 
 include/asm-frv/hardirq.h                            |    1 
 include/asm-frv/highmem.h                            |    1 
 include/asm-frv/ide.h                                |    1 
 include/asm-frv/io.h                                 |    1 
 include/asm-frv/irq.h                                |    1 
 include/asm-frv/mmu_context.h                        |    1 
 include/asm-frv/page.h                               |    1 
 include/asm-frv/pci.h                                |    1 
 include/asm-frv/pgalloc.h                            |    1 
 include/asm-frv/pgtable.h                            |    1 
 include/asm-frv/processor.h                          |    1 
 include/asm-frv/segment.h                            |    1 
 include/asm-frv/serial.h                             |    1 
 include/asm-frv/smp.h                                |    1 
 include/asm-frv/system.h                             |    1 
 include/asm-frv/tlbflush.h                           |    1 
 include/asm-frv/types.h                              |    1 
 include/asm-frv/unaligned.h                          |    1 
 include/asm-frv/unistd.h                             |    7 
 include/asm-frv/virtconvert.h                        |    1 
 include/asm-generic/bug.h                            |    1 
 include/asm-generic/dma-mapping.h                    |    1 
 include/asm-generic/fcntl.h                          |    1 
 include/asm-generic/local.h                          |    1 
 include/asm-generic/signal.h                         |    7 
 include/asm-generic/tlb.h                            |    1 
 include/asm-h8300/bitops.h                           |    1 
 include/asm-h8300/dma.h                              |    1 
 include/asm-h8300/elf.h                              |    1 
 include/asm-h8300/hardirq.h                          |    1 
 include/asm-h8300/io.h                               |    1 
 include/asm-h8300/keyboard.h                         |    1 
 include/asm-h8300/mmu_context.h                      |    1 
 include/asm-h8300/page.h                             |    1 
 include/asm-h8300/page_offset.h                      |    1 
 include/asm-h8300/param.h                            |    1 
 include/asm-h8300/pgtable.h                          |    1 
 include/asm-h8300/processor.h                        |    1 
 include/asm-h8300/semaphore-helper.h                 |    1 
 include/asm-h8300/shm.h                              |    1 
 include/asm-h8300/system.h                           |    1 
 include/asm-h8300/unaligned.h                        |    1 
 include/asm-h8300/unistd.h                           |    7 
 include/asm-h8300/virtconvert.h                      |    1 
 include/asm-i386/apic.h                              |    1 
 include/asm-i386/atomic.h                            |    1 
 include/asm-i386/bitops.h                            |    1 
 include/asm-i386/bug.h                               |    1 
 include/asm-i386/bugs.h                              |    1 
 include/asm-i386/byteorder.h                         |    1 
 include/asm-i386/cache.h                             |    1 
 include/asm-i386/dma.h                               |    1 
 include/asm-i386/fixmap.h                            |    1 
 include/asm-i386/hardirq.h                           |    1 
 include/asm-i386/highmem.h                           |    1 
 include/asm-i386/hpet.h                              |    1 
 include/asm-i386/hw_irq.h                            |    1 
 include/asm-i386/ide.h                               |    1 
 include/asm-i386/io.h                                |    1 
 include/asm-i386/io_apic.h                           |    1 
 include/asm-i386/irq.h                               |    1 
 include/asm-i386/kmap_types.h                        |    1 
 include/asm-i386/mach-summit/mach_apic.h             |    1 
 include/asm-i386/mmu_context.h                       |    1 
 include/asm-i386/mtrr.h                              |    1 
 include/asm-i386/param.h                             |    1 
 include/asm-i386/pci.h                               |    1 
 include/asm-i386/pgalloc.h                           |    1 
 include/asm-i386/pgtable.h                           |    1 
 include/asm-i386/processor.h                         |    1 
 include/asm-i386/serial.h                            |    1 
 include/asm-i386/smp.h                               |    1 
 include/asm-i386/spinlock.h                          |    1 
 include/asm-i386/string.h                            |    1 
 include/asm-i386/system.h                            |    1 
 include/asm-i386/thread_info.h                       |    1 
 include/asm-i386/timex.h                             |    1 
 include/asm-i386/tlbflush.h                          |    1 
 include/asm-i386/types.h                             |    1 
 include/asm-i386/uaccess.h                           |    1 
 include/asm-i386/unistd.h                            |    7 
 include/asm-ia64/asmmacro.h                          |    1 
 include/asm-ia64/cache.h                             |    1 
 include/asm-ia64/delay.h                             |    1 
 include/asm-ia64/dma-mapping.h                       |    1 
 include/asm-ia64/dma.h                               |    1 
 include/asm-ia64/elf.h                               |    1 
 include/asm-ia64/hardirq.h                           |    1 
 include/asm-ia64/ia32.h                              |    1 
 include/asm-ia64/ide.h                               |    1 
 include/asm-ia64/intrinsics.h                        |    1 
 include/asm-ia64/kmap_types.h                        |    1 
 include/asm-ia64/machvec.h                           |    1 
 include/asm-ia64/meminit.h                           |    1 
 include/asm-ia64/nodedata.h                          |    1 
 include/asm-ia64/numa.h                              |    1 
 include/asm-ia64/page.h                              |    1 
 include/asm-ia64/param.h                             |    1 
 include/asm-ia64/percpu.h                            |    1 
 include/asm-ia64/pgalloc.h                           |    1 
 include/asm-ia64/pgtable.h                           |    1 
 include/asm-ia64/processor.h                         |    1 
 include/asm-ia64/ptrace.h                            |    1 
 include/asm-ia64/smp.h                               |    1 
 include/asm-ia64/sn/simulator.h                      |    1 
 include/asm-ia64/sn/sn_cpuid.h                       |    1 
 include/asm-ia64/sn/sn_sal.h                         |    1 
 include/asm-ia64/sn/xpc.h                            |    1 
 include/asm-ia64/string.h                            |    1 
 include/asm-ia64/system.h                            |    1 
 include/asm-ia64/tlb.h                               |    1 
 include/asm-ia64/tlbflush.h                          |    1 
 include/asm-ia64/unistd.h                            |    1 
 include/asm-m32r/assembler.h                         |    1 
 include/asm-m32r/atomic.h                            |    1 
 include/asm-m32r/bitops.h                            |    1 
 include/asm-m32r/cacheflush.h                        |    1 
 include/asm-m32r/hardirq.h                           |    1 
 include/asm-m32r/ide.h                               |    1 
 include/asm-m32r/irq.h                               |    1 
 include/asm-m32r/kmap_types.h                        |    1 
 include/asm-m32r/m32104ut/m32104ut_pld.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lan.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lcd.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_pld.h             |    1 
 include/asm-m32r/m32r.h                              |    1 
 include/asm-m32r/mmu.h                               |    1 
 include/asm-m32r/mmu_context.h                       |    2 
 include/asm-m32r/opsput/opsput_lan.h                 |    1 
 include/asm-m32r/opsput/opsput_lcd.h                 |    1 
 include/asm-m32r/opsput/opsput_pld.h                 |    1 
 include/asm-m32r/page.h                              |    1 
 include/asm-m32r/pgalloc.h                           |    1 
 include/asm-m32r/pgtable-2level.h                    |    1 
 include/asm-m32r/pgtable.h                           |    1 
 include/asm-m32r/processor.h                         |    1 
 include/asm-m32r/ptrace.h                            |    1 
 include/asm-m32r/rtc.h                               |    1 
 include/asm-m32r/semaphore.h                         |    1 
 include/asm-m32r/serial.h                            |    1 
 include/asm-m32r/sigcontext.h                        |    1 
 include/asm-m32r/smp.h                               |    1 
 include/asm-m32r/spinlock.h                          |    1 
 include/asm-m32r/system.h                            |    1 
 include/asm-m32r/timex.h                             |    1 
 include/asm-m32r/tlbflush.h                          |    1 
 include/asm-m32r/uaccess.h                           |    1 
 include/asm-m32r/unistd.h                            |    5 
 include/asm-m68k/atomic.h                            |    1 
 include/asm-m68k/bug.h                               |    1 
 include/asm-m68k/dma-mapping.h                       |    1 
 include/asm-m68k/dma.h                               |    1 
 include/asm-m68k/dvma.h                              |    1 
 include/asm-m68k/elf.h                               |    1 
 include/asm-m68k/entry.h                             |    1 
 include/asm-m68k/fpu.h                               |    1 
 include/asm-m68k/hardirq.h                           |    1 
 include/asm-m68k/ide.h                               |    1 
 include/asm-m68k/io.h                                |    1 
 include/asm-m68k/irq.h                               |    1 
 include/asm-m68k/mc146818rtc.h                       |    1 
 include/asm-m68k/mmu_context.h                       |    1 
 include/asm-m68k/motorola_pgtable.h                  |    1 
 include/asm-m68k/openprom.h                          |    1 
 include/asm-m68k/page.h                              |    1 
 include/asm-m68k/page_offset.h                       |    1 
 include/asm-m68k/pgalloc.h                           |    1 
 include/asm-m68k/pgtable.h                           |    1 
 include/asm-m68k/processor.h                         |    1 
 include/asm-m68k/semaphore-helper.h                  |    1 
 include/asm-m68k/serial.h                            |    1 
 include/asm-m68k/setup.h                             |    1 
 include/asm-m68k/shm.h                               |    1 
 include/asm-m68k/system.h                            |    1 
 include/asm-m68k/tlbflush.h                          |    1 
 include/asm-m68k/unistd.h                            |    7 
 include/asm-m68k/virtconvert.h                       |    1 
 include/asm-m68knommu/bitops.h                       |    1 
 include/asm-m68knommu/coldfire.h                     |    1 
 include/asm-m68knommu/commproc.h                     |    1 
 include/asm-m68knommu/dma-mapping.h                  |    1 
 include/asm-m68knommu/dma.h                          |    1 
 include/asm-m68knommu/elf.h                          |    1 
 include/asm-m68knommu/elia.h                         |    1 
 include/asm-m68knommu/entry.h                        |    1 
 include/asm-m68knommu/fpu.h                          |    1 
 include/asm-m68knommu/hardirq.h                      |    1 
 include/asm-m68knommu/io.h                           |    1 
 include/asm-m68knommu/irq.h                          |    1 
 include/asm-m68knommu/m5206sim.h                     |    1 
 include/asm-m68knommu/m520xsim.h                     |    1 
 include/asm-m68knommu/m523xsim.h                     |    1 
 include/asm-m68knommu/m5272sim.h                     |    1 
 include/asm-m68knommu/m527xsim.h                     |    1 
 include/asm-m68knommu/m528xsim.h                     |    1 
 include/asm-m68knommu/mcfcache.h                     |    1 
 include/asm-m68knommu/mcfdma.h                       |    1 
 include/asm-m68knommu/mcfmbus.h                      |    1 
 include/asm-m68knommu/mcfne.h                        |    1 
 include/asm-m68knommu/mcfpci.h                       |    1 
 include/asm-m68knommu/mcfpit.h                       |    1 
 include/asm-m68knommu/mcfsim.h                       |    1 
 include/asm-m68knommu/mcfsmc.h                       |    1 
 include/asm-m68knommu/mcftimer.h                     |    1 
 include/asm-m68knommu/mcfuart.h                      |    1 
 include/asm-m68knommu/mcfwdebug.h                    |    1 
 include/asm-m68knommu/mmu_context.h                  |    1 
 include/asm-m68knommu/nettel.h                       |    1 
 include/asm-m68knommu/page.h                         |    1 
 include/asm-m68knommu/page_offset.h                  |    1 
 include/asm-m68knommu/param.h                        |    1 
 include/asm-m68knommu/pgtable.h                      |    1 
 include/asm-m68knommu/processor.h                    |    1 
 include/asm-m68knommu/semaphore-helper.h             |    1 
 include/asm-m68knommu/system.h                       |    1 
 include/asm-m68knommu/unaligned.h                    |    1 
 include/asm-m68knommu/unistd.h                       |    7 
 include/asm-mips/a.out.h                             |    1 
 include/asm-mips/addrspace.h                         |    1 
 include/asm-mips/arc/types.h                         |    1 
 include/asm-mips/asm.h                               |    1 
 include/asm-mips/asmmacro.h                          |    1 
 include/asm-mips/atomic.h                            |    1 
 include/asm-mips/bcache.h                            |    1 
 include/asm-mips/bitops.h                            |    1 
 include/asm-mips/bug.h                               |    1 
 include/asm-mips/bugs.h                              |    1 
 include/asm-mips/byteorder.h                         |    1 
 include/asm-mips/cache.h                             |    1 
 include/asm-mips/checksum.h                          |    1 
 include/asm-mips/cpu-features.h                      |    1 
 include/asm-mips/cpu-info.h                          |    1 
 include/asm-mips/ddb5xxx/ddb5477.h                   |    1 
 include/asm-mips/ddb5xxx/ddb5xxx.h                   |    1 
 include/asm-mips/debug.h                             |    1 
 include/asm-mips/dec/prom.h                          |    1 
 include/asm-mips/delay.h                             |    1 
 include/asm-mips/dma.h                               |    1 
 include/asm-mips/elf.h                               |    1 
 include/asm-mips/fcntl.h                             |    1 
 include/asm-mips/fixmap.h                            |    1 
 include/asm-mips/fpu.h                               |    1 
 include/asm-mips/futex.h                             |    1 
 include/asm-mips/hazards.h                           |    1 
 include/asm-mips/highmem.h                           |    1 
 include/asm-mips/interrupt.h                         |    1 
 include/asm-mips/io.h                                |    1 
 include/asm-mips/ip32/machine.h                      |    1 
 include/asm-mips/irq.h                               |    1 
 include/asm-mips/isadep.h                            |    1 
 include/asm-mips/jmr3927/irq.h                       |    1 
 include/asm-mips/kmap_types.h                        |    1 
 include/asm-mips/local.h                             |    1 
 include/asm-mips/mach-au1x00/au1000.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx_dbdma.h          |    1 
 include/asm-mips/mach-au1x00/au1xxx_ide.h            |    1 
 include/asm-mips/mach-au1x00/au1xxx_psc.h            |    1 
 include/asm-mips/mach-au1x00/ioremap.h               |    1 
 include/asm-mips/mach-cobalt/cpu-feature-overrides.h |    1 
 include/asm-mips/mach-db1x00/db1x00.h                |    1 
 include/asm-mips/mach-generic/ide.h                  |    1 
 include/asm-mips/mach-generic/kmalloc.h              |    1 
 include/asm-mips/mach-generic/spaces.h               |    1 
 include/asm-mips/mach-ip22/spaces.h                  |    1 
 include/asm-mips/mach-ip32/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-ip32/kmalloc.h                 |    1 
 include/asm-mips/mach-mips/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-mips/irq.h                     |    1 
 include/asm-mips/mach-pb1x00/pb1550.h                |    1 
 include/asm-mips/mach-sim/cpu-feature-overrides.h    |    1 
 include/asm-mips/mips-boards/generic.h               |    1 
 include/asm-mips/mipsregs.h                          |    1 
 include/asm-mips/mmu_context.h                       |    1 
 include/asm-mips/mmzone.h                            |    1 
 include/asm-mips/module.h                            |    1 
 include/asm-mips/msgbuf.h                            |    1 
 include/asm-mips/paccess.h                           |    1 
 include/asm-mips/page.h                              |    1 
 include/asm-mips/pci.h                               |    1 
 include/asm-mips/pgalloc.h                           |    1 
 include/asm-mips/pgtable-32.h                        |    1 
 include/asm-mips/pgtable-64.h                        |    1 
 include/asm-mips/pgtable-bits.h                      |    1 
 include/asm-mips/pgtable.h                           |    1 
 include/asm-mips/prefetch.h                          |    1 
 include/asm-mips/processor.h                         |    1 
 include/asm-mips/ptrace.h                            |    1 
 include/asm-mips/reg.h                               |    1 
 include/asm-mips/resource.h                          |    1 
 include/asm-mips/serial.h                            |    1 
 include/asm-mips/sgiarcs.h                           |    1 
 include/asm-mips/sibyte/board.h                      |    1 
 include/asm-mips/sibyte/carmel.h                     |    1 
 include/asm-mips/sibyte/sentosa.h                    |    1 
 include/asm-mips/sibyte/swarm.h                      |    1 
 include/asm-mips/siginfo.h                           |    1 
 include/asm-mips/signal.h                            |    1 
 include/asm-mips/sim.h                               |    1 
 include/asm-mips/smp.h                               |    1 
 include/asm-mips/sn/addrs.h                          |    1 
 include/asm-mips/sn/agent.h                          |    1 
 include/asm-mips/sn/arch.h                           |    1 
 include/asm-mips/sn/io.h                             |    1 
 include/asm-mips/sn/klconfig.h                       |    1 
 include/asm-mips/sn/kldir.h                          |    1 
 include/asm-mips/sn/launch.h                         |    1 
 include/asm-mips/sn/mapped_kernel.h                  |    1 
 include/asm-mips/sn/sn0/addrs.h                      |    1 
 include/asm-mips/sn/sn0/arch.h                       |    1 
 include/asm-mips/sn/sn0/hubmd.h                      |    1 
 include/asm-mips/stackframe.h                        |    1 
 include/asm-mips/string.h                            |    1 
 include/asm-mips/system.h                            |    1 
 include/asm-mips/thread_info.h                       |    1 
 include/asm-mips/tlbflush.h                          |    1 
 include/asm-mips/tx4927/toshiba_rbtx4927.h           |    1 
 include/asm-mips/types.h                             |    1 
 include/asm-mips/uaccess.h                           |    1 
 include/asm-mips/vr41xx/vrc4173.h                    |    1 
 include/asm-mips/war.h                               |    1 
 include/asm-mips/wbflush.h                           |    1 
 include/asm-parisc/atomic.h                          |    1 
 include/asm-parisc/cache.h                           |    1 
 include/asm-parisc/cacheflush.h                      |    1 
 include/asm-parisc/dma-mapping.h                     |    1 
 include/asm-parisc/dma.h                             |    1 
 include/asm-parisc/io.h                              |    1 
 include/asm-parisc/irq.h                             |    1 
 include/asm-parisc/kmap_types.h                      |    1 
 include/asm-parisc/page.h                            |    1 
 include/asm-parisc/param.h                           |    1 
 include/asm-parisc/pci.h                             |    1 
 include/asm-parisc/pdc.h                             |    1 
 include/asm-parisc/pgtable.h                         |    1 
 include/asm-parisc/processor.h                       |    1 
 include/asm-parisc/psw.h                             |    1 
 include/asm-parisc/smp.h                             |    1 
 include/asm-parisc/system.h                          |    1 
 include/asm-parisc/tlbflush.h                        |    1 
 include/asm-parisc/unistd.h                          |    4 
 include/asm-powerpc/abs_addr.h                       |    1 
 include/asm-powerpc/cache.h                          |    1 
 include/asm-powerpc/dma-mapping.h                    |    1 
 include/asm-powerpc/dma.h                            |    1 
 include/asm-powerpc/eeh.h                            |    1 
 include/asm-powerpc/elf.h                            |    7 
 include/asm-powerpc/floppy.h                         |    1 
 include/asm-powerpc/hw_irq.h                         |    1 
 include/asm-powerpc/ide.h                            |    1 
 include/asm-powerpc/iommu.h                          |    1 
 include/asm-powerpc/irq.h                            |    1 
 include/asm-powerpc/iseries/iseries_io.h             |    1 
 include/asm-powerpc/machdep.h                        |    1 
 include/asm-powerpc/mmzone.h                         |    1 
 include/asm-powerpc/paca.h                           |    1 
 include/asm-powerpc/page.h                           |    1 
 include/asm-powerpc/pgtable.h                        |    1 
 include/asm-powerpc/ppc_asm.h                        |    1 
 include/asm-powerpc/prom.h                           |    1 
 include/asm-powerpc/smp.h                            |    1 
 include/asm-powerpc/smu.h                            |    1 
 include/asm-powerpc/spu.h                            |    1 
 include/asm-powerpc/thread_info.h                    |    1 
 include/asm-powerpc/time.h                           |    1 
 include/asm-powerpc/timex.h                          |    1 
 include/asm-powerpc/tlb.h                            |    1 
 include/asm-powerpc/tlbflush.h                       |    1 
 include/asm-powerpc/topology.h                       |    1 
 include/asm-powerpc/types.h                          |    1 
 include/asm-powerpc/vga.h                            |    1 
 include/asm-powerpc/vio.h                            |    1 
 include/asm-ppc/amigahw.h                            |    1 
 include/asm-ppc/bootinfo.h                           |    1 
 include/asm-ppc/commproc.h                           |    1 
 include/asm-ppc/ibm403.h                             |    1 
 include/asm-ppc/ibm44x.h                             |    1 
 include/asm-ppc/ibm4xx.h                             |    1 
 include/asm-ppc/io.h                                 |    1 
 include/asm-ppc/machdep.h                            |    1 
 include/asm-ppc/mmu.h                                |    1 
 include/asm-ppc/mmu_context.h                        |    1 
 include/asm-ppc/mpc8260.h                            |    1 
 include/asm-ppc/mpc83xx.h                            |    1 
 include/asm-ppc/mpc85xx.h                            |    1 
 include/asm-ppc/mpc8xx.h                             |    1 
 include/asm-ppc/mv64x60.h                            |    1 
 include/asm-ppc/ocp.h                                |    1 
 include/asm-ppc/open_pic.h                           |    1 
 include/asm-ppc/page.h                               |    2 
 include/asm-ppc/pc_serial.h                          |    1 
 include/asm-ppc/pgalloc.h                            |    1 
 include/asm-ppc/pgtable.h                            |    1 
 include/asm-ppc/ppc4xx_dma.h                         |    1 
 include/asm-ppc/ppc4xx_pic.h                         |    1 
 include/asm-ppc/serial.h                             |    1 
 include/asm-ppc/smp.h                                |    1 
 include/asm-ppc/time.h                               |    1 
 include/asm-s390/bitops.h                            |    1 
 include/asm-s390/debug.h                             |    1 
 include/asm-s390/hardirq.h                           |    1 
 include/asm-s390/idals.h                             |    1 
 include/asm-s390/local.h                             |    1 
 include/asm-s390/lowcore.h                           |    1 
 include/asm-s390/page.h                              |    6 
 include/asm-s390/pgalloc.h                           |    1 
 include/asm-s390/sfp-machine.h                       |    1 
 include/asm-s390/smp.h                               |    1 
 include/asm-s390/system.h                            |    1 
 include/asm-s390/tlbflush.h                          |    1 
 include/asm-s390/types.h                             |    1 
 include/asm-sh/bug.h                                 |    1 
 include/asm-sh/checksum.h                            |    1 
 include/asm-sh/dma-mapping.h                         |    1 
 include/asm-sh/dma.h                                 |    1 
 include/asm-sh/fixmap.h                              |    1 
 include/asm-sh/hardirq.h                             |    1 
 include/asm-sh/hd64461/hd64461.h                     |    1 
 include/asm-sh/hd64465/hd64465.h                     |    1 
 include/asm-sh/ide.h                                 |    1 
 include/asm-sh/io.h                                  |    1 
 include/asm-sh/irq.h                                 |    1 
 include/asm-sh/keyboard.h                            |    1 
 include/asm-sh/kmap_types.h                          |    1 
 include/asm-sh/machvec.h                             |    1 
 include/asm-sh/machvec_init.h                        |    1 
 include/asm-sh/mpc1211/dma.h                         |    1 
 include/asm-sh/overdrive/overdrive.h                 |    1 
 include/asm-sh/page.h                                |    1 
 include/asm-sh/pgtable.h                             |    1 
 include/asm-sh/serial.h                              |    1 
 include/asm-sh/smp.h                                 |    1 
 include/asm-sh/system.h                              |    1 
 include/asm-sh/types.h                               |    1 
 include/asm-sh/unistd.h                              |    7 
 include/asm-sh/watchdog.h                            |    1 
 include/asm-sh64/bug.h                               |    1 
 include/asm-sh64/dma-mapping.h                       |    1 
 include/asm-sh64/hardirq.h                           |    1 
 include/asm-sh64/ide.h                               |    1 
 include/asm-sh64/irq.h                               |    1 
 include/asm-sh64/mmu_context.h                       |    1 
 include/asm-sh64/page.h                              |    1 
 include/asm-sh64/param.h                             |    1 
 include/asm-sh64/pgtable.h                           |    1 
 include/asm-sh64/system.h                            |    1 
 include/asm-sh64/unistd.h                            |    7 
 include/asm-sparc/asmmacro.h                         |    1 
 include/asm-sparc/atomic.h                           |    1 
 include/asm-sparc/bugs.h                             |    1 
 include/asm-sparc/cacheflush.h                       |    1 
 include/asm-sparc/delay.h                            |    1 
 include/asm-sparc/dma-mapping.h                      |    1 
 include/asm-sparc/dma.h                              |    1 
 include/asm-sparc/elf.h                              |    1 
 include/asm-sparc/fixmap.h                           |    1 
 include/asm-sparc/hardirq.h                          |    1 
 include/asm-sparc/ide.h                              |    1 
 include/asm-sparc/irq.h                              |    1 
 include/asm-sparc/mostek.h                           |    1 
 include/asm-sparc/page.h                             |    1 
 include/asm-sparc/pgalloc.h                          |    1 
 include/asm-sparc/pgtable.h                          |    1 
 include/asm-sparc/sfp-machine.h                      |    1 
 include/asm-sparc/smp.h                              |    1 
 include/asm-sparc/system.h                           |    2 
 include/asm-sparc/timer.h                            |    1 
 include/asm-sparc/tlbflush.h                         |    1 
 include/asm-sparc/unistd.h                           |    4 
 include/asm-sparc/vac-ops.h                          |    1 
 include/asm-sparc/winmacro.h                         |    1 
 include/asm-sparc64/atomic.h                         |    1 
 include/asm-sparc64/bitops.h                         |    1 
 include/asm-sparc64/bugs.h                           |    1 
 include/asm-sparc64/cacheflush.h                     |    1 
 include/asm-sparc64/delay.h                          |    1 
 include/asm-sparc64/dma-mapping.h                    |    1 
 include/asm-sparc64/dma.h                            |    1 
 include/asm-sparc64/floppy.h                         |    1 
 include/asm-sparc64/ide.h                            |    1 
 include/asm-sparc64/irq.h                            |    1 
 include/asm-sparc64/kprobes.h                        |    1 
 include/asm-sparc64/mc146818rtc.h                    |    1 
 include/asm-sparc64/mmu.h                            |    1 
 include/asm-sparc64/oplib.h                          |    1 
 include/asm-sparc64/page.h                           |    1 
 include/asm-sparc64/param.h                          |    1 
 include/asm-sparc64/pgalloc.h                        |    1 
 include/asm-sparc64/pgtable.h                        |    1 
 include/asm-sparc64/processor.h                      |    1 
 include/asm-sparc64/siginfo.h                        |    1 
 include/asm-sparc64/signal.h                         |    1 
 include/asm-sparc64/smp.h                            |    1 
 include/asm-sparc64/spinlock.h                       |    1 
 include/asm-sparc64/system.h                         |    1 
 include/asm-sparc64/timer.h                          |    1 
 include/asm-sparc64/tlb.h                            |    1 
 include/asm-sparc64/tlbflush.h                       |    1 
 include/asm-sparc64/ttable.h                         |    1 
 include/asm-sparc64/unistd.h                         |    4 
 include/asm-um/a.out.h                               |    1 
 include/asm-um/cache.h                               |    1 
 include/asm-um/elf-ppc.h                             |    1 
 include/asm-um/fixmap.h                              |    1 
 include/asm-um/hardirq.h                             |    1 
 include/asm-um/linkage.h                             |    1 
 include/asm-um/mmu_context.h                         |    1 
 include/asm-um/page.h                                |    1 
 include/asm-um/pgalloc.h                             |    1 
 include/asm-um/processor-generic.h                   |    1 
 include/asm-um/ptrace-generic.h                      |    1 
 include/asm-um/smp.h                                 |    1 
 include/asm-um/thread_info.h                         |    1 
 include/asm-v850/atomic.h                            |    1 
 include/asm-v850/bitops.h                            |    1 
 include/asm-v850/dma-mapping.h                       |    1 
 include/asm-v850/hardirq.h                           |    1 
 include/asm-v850/machdep.h                           |    1 
 include/asm-v850/pgtable.h                           |    1 
 include/asm-v850/processor.h                         |    1 
 include/asm-v850/serial.h                            |    1 
 include/asm-v850/unistd.h                            |   12 -
 include/asm-v850/v850e_uart.h                        |    1 
 include/asm-x86_64/apic.h                            |    1 
 include/asm-x86_64/atomic.h                          |    1 
 include/asm-x86_64/bitops.h                          |    1 
 include/asm-x86_64/bugs.h                            |    1 
 include/asm-x86_64/cache.h                           |    1 
 include/asm-x86_64/calling.h                         |    1 
 include/asm-x86_64/dma-mapping.h                     |    1 
 include/asm-x86_64/dma.h                             |    1 
 include/asm-x86_64/dwarf2.h                          |    1 
 include/asm-x86_64/fixmap.h                          |    1 
 include/asm-x86_64/hardirq.h                         |    1 
 include/asm-x86_64/hw_irq.h                          |    1 
 include/asm-x86_64/ia32.h                            |    1 
 include/asm-x86_64/io.h                              |    1 
 include/asm-x86_64/io_apic.h                         |    1 
 include/asm-x86_64/mmu_context.h                     |    1 
 include/asm-x86_64/mmzone.h                          |    1 
 include/asm-x86_64/mtrr.h                            |    1 
 include/asm-x86_64/param.h                           |    1 
 include/asm-x86_64/pci.h                             |    1 
 include/asm-x86_64/processor.h                       |    1 
 include/asm-x86_64/serial.h                          |    1 
 include/asm-x86_64/smp.h                             |    1 
 include/asm-x86_64/spinlock.h                        |    1 
 include/asm-x86_64/swiotlb.h                         |    1 
 include/asm-x86_64/system.h                          |    1 
 include/asm-x86_64/tlbflush.h                        |    1 
 include/asm-x86_64/topology.h                        |    1 
 include/asm-x86_64/uaccess.h                         |    1 
 include/asm-x86_64/unistd.h                          |    7 
 include/asm-xtensa/atomic.h                          |    1 
 include/asm-xtensa/checksum.h                        |    1 
 include/asm-xtensa/delay.h                           |    1 
 include/asm-xtensa/dma.h                             |    1 
 include/asm-xtensa/hardirq.h                         |    1 
 include/asm-xtensa/ide.h                             |    1 
 include/asm-xtensa/io.h                              |    1 
 include/asm-xtensa/irq.h                             |    1 
 include/asm-xtensa/mmu_context.h                     |    1 
 include/asm-xtensa/page.h                            |    1 
 include/asm-xtensa/pgalloc.h                         |    1 
 include/asm-xtensa/platform.h                        |    1 
 include/asm-xtensa/system.h                          |    1 
 include/asm-xtensa/unistd.h                          |   21 --
 include/linux/acct.h                                 |    3 
 include/linux/acpi.h                                 |    1 
 include/linux/agpgart.h                              |    3 
 include/linux/amba/clcd.h                            |    1 
 include/linux/atmdev.h                               |    1 
 include/linux/audit.h                                |    4 
 include/linux/blkdev.h                               |    1 
 include/linux/blkpg.h                                |    1 
 include/linux/blktrace_api.h                         |    1 
 include/linux/blockgroup_lock.h                      |    1 
 include/linux/cache.h                                |    1 
 include/linux/coda.h                                 |    1 
 include/linux/compat.h                               |    1 
 include/linux/cpufreq.h                              |    1 
 include/linux/crypto.h                               |    1 
 include/linux/cyclomx.h                              |    1 
 include/linux/dcookies.h                             |    1 
 include/linux/devfs_fs_kernel.h                      |    1 
 include/linux/device.h                               |    1 
 include/linux/dmi.h                                  |    1 
 include/linux/dnotify.h                              |    1 
 include/linux/elf.h                                  |   59 ------
 include/linux/errqueue.h                             |    1 
 include/linux/ethtool.h                              |  169 +++++++++----------
 include/linux/ext2_fs.h                              |    2 
 include/linux/ext3_fs.h                              |    7 
 include/linux/fs.h                                   |    1 
 include/linux/ftape.h                                |    1 
 include/linux/gameport.h                             |    6 
 include/linux/generic_serial.h                       |    6 
 include/linux/genhd.h                                |   12 -
 include/linux/gfp.h                                  |    1 
 include/linux/hardirq.h                              |    1 
 include/linux/highmem.h                              |    1 
 include/linux/highuid.h                              |    1 
 include/linux/i2c-algo-ite.h                         |    7 
 include/linux/i2c.h                                  |    9 -
 include/linux/ide.h                                  |    1 
 include/linux/if_frad.h                              |    1 
 include/linux/if_tr.h                                |    1 
 include/linux/init.h                                 |    1 
 include/linux/inotify.h                              |    1 
 include/linux/input.h                                |   41 ----
 include/linux/interrupt.h                            |    1 
 include/linux/ipmi.h                                 |    2 
 include/linux/ipv6.h                                 |    1 
 include/linux/irq.h                                  |    1 
 include/linux/irq_cpustat.h                          |    1 
 include/linux/isapnp.h                               |    1 
 include/linux/isdn.h                                 |    1 
 include/linux/isdn/tpam.h                            |    1 
 include/linux/isdn_ppp.h                             |    1 
 include/linux/isdnif.h                               |    1 
 include/linux/kallsyms.h                             |    1 
 include/linux/kernel_stat.h                          |    1 
 include/linux/kmod.h                                 |    1 
 include/linux/kprobes.h                              |    1 
 include/linux/linkage.h                              |    1 
 include/linux/lockd/lockd.h                          |    1 
 include/linux/lockd/nlm.h                            |    1 
 include/linux/mempolicy.h                            |    1 
 include/linux/migrate.h                              |    1 
 include/linux/mii.h                                  |   30 +--
 include/linux/mm.h                                   |    1 
 include/linux/mman.h                                 |   12 -
 include/linux/mmzone.h                               |    1 
 include/linux/mod_devicetable.h                      |   38 ++++
 include/linux/module.h                               |    1 
 include/linux/msg.h                                  |    2 
 include/linux/mtd/cfi.h                              |    1 
 include/linux/mtd/map.h                              |    1 
 include/linux/mtd/mtd.h                              |    1 
 include/linux/mtd/nand.h                             |    1 
 include/linux/mtd/physmap.h                          |    1 
 include/linux/mtd/xip.h                              |    1 
 include/linux/ncp_fs.h                               |    5 
 include/linux/net.h                                  |    3 
 include/linux/netdevice.h                            |    1 
 include/linux/netfilter.h                            |    1 
 include/linux/netfilter_arp.h                        |    1 
 include/linux/netfilter_bridge.h                     |    1 
 include/linux/netfilter_ipv4.h                       |    1 
 include/linux/netfilter_ipv4/ip_conntrack.h          |    1 
 include/linux/netfilter_ipv4/listhelp.h              |    1 
 include/linux/nfs.h                                  |    8 
 include/linux/nfs4.h                                 |    6 
 include/linux/nfs_fs.h                               |   39 ++--
 include/linux/nfsd/nfsd.h                            |    1 
 include/linux/nfsd/nfsfh.h                           |    1 
 include/linux/nfsd/syscall.h                         |    1 
 include/linux/numa.h                                 |    1 
 include/linux/parport.h                              |    1 
 include/linux/pci.h                                  |    1 
 include/linux/percpu_counter.h                       |    1 
 include/linux/pm.h                                   |    1 
 include/linux/pm_legacy.h                            |    1 
 include/linux/pmu.h                                  |    1 
 include/linux/preempt.h                              |    1 
 include/linux/proc_fs.h                              |    1 
 include/linux/profile.h                              |    1 
 include/linux/quota.h                                |    4 
 include/linux/quotaops.h                             |    1 
 include/linux/reiserfs_xattr.h                       |    3 
 include/linux/relay.h                                |    1 
 include/linux/rio.h                                  |    1 
 include/linux/rio_drv.h                              |    1 
 include/linux/rmap.h                                 |    1 
 include/linux/rtnetlink.h                            |    1 
 include/linux/rwsem.h                                |    1 
 include/linux/scc.h                                  |    1 
 include/linux/sched.h                                |   94 +++++-----
 include/linux/seccomp.h                              |    1 
 include/linux/sem.h                                  |    2 
 include/linux/seqlock.h                              |    1 
 include/linux/serialP.h                              |    1 
 include/linux/serial_core.h                          |    1 
 include/linux/signal.h                               |    4 
 include/linux/skbuff.h                               |    1 
 include/linux/slab.h                                 |    1 
 include/linux/smb_fs.h                               |    4 
 include/linux/smp.h                                  |    1 
 include/linux/smp_lock.h                             |    1 
 include/linux/socket.h                               |    2 
 include/linux/spinlock.h                             |    1 
 include/linux/stop_machine.h                         |    1 
 include/linux/sunrpc/auth.h                          |    1 
 include/linux/sunrpc/debug.h                         |   24 +-
 include/linux/sunrpc/stats.h                         |    1 
 include/linux/suspend.h                              |    1 
 include/linux/swap.h                                 |    1 
 include/linux/syscalls.h                             |    1 
 include/linux/sysrq.h                                |    1 
 include/linux/tcp.h                                  |    1 
 include/linux/threads.h                              |    1 
 include/linux/timer.h                                |    1 
 include/linux/timex.h                                |    1 
 include/linux/tty.h                                  |    1 
 include/linux/types.h                                |    1 
 include/linux/udp.h                                  |    1 
 include/linux/usb.h                                  |    1 
 include/linux/usb_usual.h                            |    1 
 include/linux/usbdevice_fs.h                         |    2 
 include/linux/vt_buffer.h                            |    1 
 include/linux/vt_kern.h                              |    1 
 include/linux/wait.h                                 |    1 
 include/linux/wanrouter.h                            |    4 
 include/mtd/mtd-abi.h                                |    5 
 include/net/addrconf.h                               |    1 
 include/net/af_unix.h                                |    1 
 include/net/ax25.h                                   |    1 
 include/net/compat.h                                 |    1 
 include/net/dst.h                                    |    1 
 include/net/icmp.h                                   |    1 
 include/net/inet6_hashtables.h                       |    1 
 include/net/inet_hashtables.h                        |    1 
 include/net/inet_sock.h                              |    1 
 include/net/inet_timewait_sock.h                     |    1 
 include/net/ip.h                                     |    1 
 include/net/ip_fib.h                                 |    1 
 include/net/ip_mp_alg.h                              |    1 
 include/net/ip_vs.h                                  |    1 
 include/net/ipv6.h                                   |    1 
 include/net/irda/irda.h                              |    1 
 include/net/irda/irda_device.h                       |    1 
 include/net/irda/irlap.h                             |    1 
 include/net/irda/irlmp.h                             |    1 
 include/net/irda/irlmp_frame.h                       |    1 
 include/net/irda/qos.h                               |    1 
 include/net/ndisc.h                                  |    1 
 include/net/netfilter/nf_conntrack.h                 |    1 
 include/net/pkt_act.h                                |    1 
 include/net/protocol.h                               |    1 
 include/net/raw.h                                    |    1 
 include/net/red.h                                    |    1 
 include/net/route.h                                  |    1 
 include/net/sch_generic.h                            |    1 
 include/net/sctp/sctp.h                              |    1 
 include/net/sock.h                                   |    1 
 include/net/tcp.h                                    |    1 
 include/pcmcia/ss.h                                  |    1 
 include/scsi/scsi_transport_fc.h                     |    1 
 include/scsi/scsi_transport_spi.h                    |    1 
 include/sound/driver.h                               |    1 
 include/video/edid.h                                 |    1 
 include/video/vga.h                                  |    1 
 scripts/mod/file2alias.c                             |    1 
 891 files changed, 430 insertions(+), 1269 deletions(-)

Index: linux-2.6-header-cleanup-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-cleanup-git.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-header-cleanup-git.patch	28 Apr 2006 12:02:43 -0000	1.9
+++ linux-2.6-header-cleanup-git.patch	28 Apr 2006 14:07:00 -0000	1.10
@@ -4834,17 +4834,40 @@
  #include <linux/kernel.h>
  #include <linux/errno.h>
  #include <linux/thread_info.h>
-unchanged:
---- a/include/asm-mips/unistd.h
+diff -u b/include/asm-mips/unistd.h b/include/asm-mips/unistd.h
+--- b/include/asm-mips/unistd.h
 +++ b/include/asm-mips/unistd.h
-@@ -1170,7 +1170,6 @@ #endif /* (_MIPS_SIM == _MIPS_SIM_NABI32
+@@ -905,6 +905,8 @@
+ #define __NR_N32_Linux			6000
+ #define __NR_N32_Linux_syscalls		268
  
- #ifdef __KERNEL__
++#ifdef __KERNEL__
++
+ #ifndef __ASSEMBLY__
+ 
+ /* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
+@@ -1168,9 +1170,6 @@
+ 
+ #endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */
  
+-#ifdef __KERNEL__
+-
 -#include <linux/config.h>
  
  #define __ARCH_WANT_IPC_PARSE_VERSION
  #define __ARCH_WANT_OLD_READDIR
+@@ -1197,7 +1196,6 @@
+ # ifdef CONFIG_MIPS32_O32
+ #  define __ARCH_WANT_COMPAT_SYS_TIME
+ # endif
+-#endif
+ 
+ #ifdef __KERNEL_SYSCALLS__
+ 
+@@ -1250,2 +1248,3 @@
+ 
++#endif /* __KERNEL__ */
+ #endif /* _ASM_UNISTD_H */
 unchanged:
 --- a/include/asm-mips/vr41xx/vrc4173.h
 +++ b/include/asm-mips/vr41xx/vrc4173.h
@@ -5420,17 +5443,41 @@
  
  typedef signed char s8;
  typedef unsigned char u8;
-unchanged:
---- a/include/asm-powerpc/unistd.h
+diff -u b/include/asm-powerpc/unistd.h b/include/asm-powerpc/unistd.h
+--- b/include/asm-powerpc/unistd.h
 +++ b/include/asm-powerpc/unistd.h
-@@ -423,7 +423,6 @@ type name(type1 arg1, type2 arg2, type3 
+@@ -305,12 +305,12 @@
+ #define __NR_tee		284
+ #define __NR_vmsplice		285
  
- #ifdef __KERNEL__
++#ifdef __KERNEL__
++
+ #define __NR_syscalls		286
+ 
+-#ifdef __KERNEL__
+ #define __NR__exit __NR_exit
+ #define NR_syscalls	__NR_syscalls
+-#endif
+ 
+ #ifndef __ASSEMBLY__
+ 
+@@ -423,7 +423,5 @@
+ }
+ 
+-#ifdef __KERNEL__
  
 -#include <linux/config.h>
  #include <linux/types.h>
  #include <linux/compiler.h>
- #include <linux/linkage.h>
+@@ -480,7 +478,7 @@
+ #endif
+ 
+-#endif		/* __KERNEL__ */
+ 
+ #endif		/* __ASSEMBLY__ */
++#endif		/* __KERNEL__ */
+ 
+ #endif /* _ASM_PPC_UNISTD_H_ */
 unchanged:
 --- a/include/asm-powerpc/vga.h
 +++ b/include/asm-powerpc/vga.h
@@ -5904,10 +5951,31 @@
  
  typedef signed char s8;
  typedef unsigned char u8;
-unchanged:
---- a/include/asm-s390/unistd.h
+diff -u b/include/asm-s390/unistd.h b/include/asm-s390/unistd.h
+--- b/include/asm-s390/unistd.h
 +++ b/include/asm-s390/unistd.h
-@@ -571,7 +571,6 @@ #endif
+@@ -386,6 +386,8 @@
+ 
+ #endif
+ 
++#ifdef __KERNEL__
++
+ /* user-visible error numbers are in the range -1 - -122: see <asm-s390/errno.h> */
+ 
+ #define __syscall_return(type, res)			     \
+@@ -540,7 +542,6 @@
+ 	__syscall_return(type,__res);			     \
+ }
+ 
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_SYS_ALARM
+@@ -567,11 +568,9 @@
+ #   define __ARCH_WANT_COMPAT_SYS_TIME
+ #   define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
+ # endif
+-#endif
  
  #ifdef __KERNEL_SYSCALLS__
  
@@ -5915,6 +5983,19 @@
  #include <linux/compiler.h>
  #include <linux/types.h>
  #include <asm/ptrace.h>
+@@ -619,7 +618,7 @@
+ 				struct sigaction __user *oact,
+ 				size_t sigsetsize);
+ 
+-#endif
++#endif /* __KERNEL_SYSCALLS__ */
+ 
+ /*
+  * "Conditional" syscalls
+@@ -631,2 +630,3 @@
+ 
++#endif /* __KERNEL__ */
+ #endif /* _ASM_S390_UNISTD_H_ */
 unchanged:
 --- a/include/asm-sh/bug.h
 +++ b/include/asm-sh/bug.h
@@ -10654,19 +10735,19 @@
 -
 +#endif /* __KERNEL__ */
  #endif /* __LINUX_MII_H__ */
-unchanged:
---- a/include/linux/unistd.h
+diff -u b/include/linux/unistd.h b/include/linux/unistd.h
+--- b/include/linux/unistd.h
 +++ b/include/linux/unistd.h
-@@ -1,8 +1,6 @@
+@@ -1,7 +1,9 @@
  #ifndef _LINUX_UNISTD_H_
  #define _LINUX_UNISTD_H_
  
--extern int errno;
--
++#ifdef __KERNEL__
+ extern int errno;
++#endif
+ 
  /*
   * Include machine specific syscallX macros
-  */
-only in patch2:
 unchanged:
 --- a/include/linux/input.h
 +++ b/include/linux/input.h
@@ -10739,7 +10820,6 @@
  
  struct input_handler {
  
-only in patch2:
 unchanged:
 --- a/include/linux/mod_devicetable.h
 +++ b/include/linux/mod_devicetable.h
@@ -10786,7 +10866,6 @@
 +
 +
  #endif /* LINUX_MOD_DEVICETABLE_H */
-only in patch2:
 unchanged:
 --- a/scripts/mod/file2alias.c
 +++ b/scripts/mod/file2alias.c
@@ -10798,3 +10877,777 @@
  
  #define ADD(str, sep, cond, field)                              \
  do {                                                            \
+only in patch2:
+unchanged:
+--- a/include/asm-alpha/unistd.h
++++ b/include/asm-alpha/unistd.h
+@@ -383,6 +383,8 @@ #define __NR_inotify_init		444
+ #define __NR_inotify_add_watch		445
+ #define __NR_inotify_rm_watch		446
+ 
++#ifdef __KERNEL__
++
+ #define NR_SYSCALLS			447
+ 
+ #if defined(__GNUC__)
+@@ -565,9 +567,8 @@ type name (type1 arg1,type2 arg2,type3 a
+ 	_syscall_return(type);						\
+ }
+ 
+-#endif /* __LIBRARY__ && __GNUC__ */
++#endif /* __GNUC__ */
+ 
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_STAT64
+@@ -578,7 +579,6 @@ #define __ARCH_WANT_SYS_GETPGRP
+ #define __ARCH_WANT_SYS_OLD_GETRLIMIT
+ #define __ARCH_WANT_SYS_OLDUMOUNT
+ #define __ARCH_WANT_SYS_SIGPENDING
+-#endif
+ 
+ #ifdef __KERNEL_SYSCALLS__
+ 
+@@ -661,4 +661,5 @@ #endif /* __KERNEL_SYSCALLS__ */
+ 
+ #define cond_syscall(x)  asm(".weak\t" #x "\n" #x " = sys_ni_syscall")
+ 
++#endif /* __KERNEL__ */
+ #endif /* _ALPHA_UNISTD_H */
+only in patch2:
+unchanged:
+--- a/include/asm-arm/unistd.h
++++ b/include/asm-arm/unistd.h
+@@ -13,8 +13,6 @@
+ #ifndef __ASM_ARM_UNISTD_H
+ #define __ASM_ARM_UNISTD_H
+ 
+-#include <linux/linkage.h>
+-
+ #define __NR_OABI_SYSCALL_BASE	0x900000
+ 
+ #if defined(__thumb__) || defined(__ARM_EABI__)
+@@ -378,6 +376,9 @@ #undef __NR_syscall
+ #undef __NR_ipc
+ #endif
+ 
++#ifdef __KERNEL__
++#include <linux/linkage.h>
++
+ #define __sys2(x) #x
+ #define __sys1(x) __sys2(x)
+ 
+@@ -519,7 +520,6 @@ type name(type1 arg1, type2 arg2, type3 
+   __syscall_return(type,__res);						\
+ }
+ 
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_STAT64
+ #define __ARCH_WANT_SYS_GETHOSTNAME
+@@ -540,7 +540,6 @@ #define __ARCH_WANT_SYS_OLD_GETRLIMIT
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_SYS_SOCKETCALL
+ #endif
+-#endif
+ 
+ #ifdef __KERNEL_SYSCALLS__
+ 
+@@ -564,7 +563,7 @@ asmlinkage long sys_rt_sigaction(int sig
+ 				struct sigaction __user *oact,
+ 				size_t sigsetsize);
+ 
+-#endif
++#endif /* __KERNEL_SYSCALLS__ */
+ 
+ /*
+  * "Conditional" syscalls
+@@ -574,4 +573,5 @@ #endif
+  */
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+ 
++#endif /* __KERNEL__ */
+ #endif /* __ASM_ARM_UNISTD_H */
+only in patch2:
+unchanged:
+--- a/include/asm-arm26/unistd.h
++++ b/include/asm-arm26/unistd.h
+@@ -14,8 +14,6 @@
+ #ifndef __ASM_ARM_UNISTD_H
+ #define __ASM_ARM_UNISTD_H
+ 
+-#include <linux/linkage.h>
+-
+ #define __NR_SYSCALL_BASE	0x900000
+ 
+ /*
+@@ -312,6 +310,9 @@ #define __ARM_NR_breakpoint		(__ARM_NR_B
+ #define __ARM_NR_cacheflush		(__ARM_NR_BASE+2)
+ #define __ARM_NR_usr26			(__ARM_NR_BASE+3)
+ 
++#ifdef __KERNEL__
++#include <linux/linkage.h>
++
+ #define __sys2(x) #x
+ #define __sys1(x) __sys2(x)
+ 
+@@ -443,7 +444,6 @@ type name(type1 arg1, type2 arg2, type3 
+   __syscall_return(type,__res);						\
+ }
+ 
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_STAT64
+@@ -462,7 +462,6 @@ #define __ARCH_WANT_SYS_OLDUMOUNT
+ #define __ARCH_WANT_SYS_SIGPENDING
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+-#endif
+ 
+ #ifdef __KERNEL_SYSCALLS__
+ 
+@@ -486,7 +485,7 @@ asmlinkage long sys_rt_sigaction(int sig
+ 				struct sigaction __user *oact,
+ 				size_t sigsetsize);
+ 
+-#endif
++#endif /* __KERNEL_SYSCALLS__ */
+ 
+ /*
+  * "Conditional" syscalls
+@@ -496,4 +495,5 @@ #endif
+  */
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+ 
++#endif /* __KERNEL__ */
+ #endif /* __ASM_ARM_UNISTD_H */
+only in patch2:
+unchanged:
+--- a/include/asm-cris/unistd.h
++++ b/include/asm-cris/unistd.h
+@@ -295,11 +295,11 @@ #define __NR_add_key		286
+ #define __NR_request_key	287
+ #define __NR_keyctl		288
+ 
+-#define NR_syscalls 289
++#ifdef __KERNEL__
+ 
++#define NR_syscalls 289
+ 
+ 
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_OLD_STAT
+@@ -379,12 +379,10 @@ asmlinkage long sys_rt_sigaction(int sig
+  * complaints.  We don't want to use -fno-builtin, so just use a
+  * different name when in the kernel.
+  */
+-#ifdef __KERNEL__
+ #define _exit kernel_syscall_exit
+-#endif
+ static inline _syscall1(int,_exit,int,exitcode)
+ static inline _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options)
+-#endif
++#endif /* __KERNEL_SYSCALLS__ */
+ 
+ 
+ /*
+@@ -395,4 +393,5 @@ #endif
+  */
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+ 
++#endif /* __KERNEL__ */
+ #endif /* _ASM_CRIS_UNISTD_H_ */
+only in patch2:
+unchanged:
+--- a/include/asm-frv/unistd.h
++++ b/include/asm-frv/unistd.h
+@@ -317,6 +317,8 @@ #define __NR_faccessat		307
+ #define __NR_pselect6		308
+ #define __NR_ppoll		309
+ 
++#ifdef __KERNEL__
++
+ #define NR_syscalls 310
+ 
+ /*
+@@ -477,9 +479,8 @@ static inline pid_t wait(int * wait_stat
+ 	return waitpid(-1,wait_stat,0);
+ }
+ 
+-#endif
++#endif /* __KERNEL_SYSCALLS__ */
+ 
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ /* #define __ARCH_WANT_OLD_READDIR */
+ #define __ARCH_WANT_OLD_STAT
+@@ -503,7 +504,6 @@ #define __ARCH_WANT_SYS_OLDUMOUNT
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+ #define __ARCH_WANT_SYS_RT_SIGSUSPEND
+-#endif
+ 
+ /*
+  * "Conditional" syscalls
+@@ -515,4 +515,5 @@ #ifndef cond_syscall
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+ #endif
+ 
++#endif /* __KERNEL__ */
+ #endif /* _ASM_UNISTD_H_ */
+only in patch2:
+unchanged:
+--- a/include/asm-h8300/unistd.h
++++ b/include/asm-h8300/unistd.h
+@@ -292,6 +292,8 @@ #define __NR_add_key		286
+ #define __NR_request_key	287
+ #define __NR_keyctl		288
+ 
++#ifdef __KERNEL__
++
+ #define NR_syscalls 289
+ 
+ 
+@@ -460,7 +462,6 @@ type name(atype a, btype b, ctype c, dty
+   __syscall_return(type, __res);			\
+ }
+ 
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_OLD_STAT
+@@ -483,7 +484,6 @@ #define __ARCH_WANT_SYS_OLDUMOUNT
+ #define __ARCH_WANT_SYS_SIGPENDING
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+-#endif
+ 
+ #ifdef __KERNEL_SYSCALLS__
+ 
+@@ -534,7 +534,7 @@ asmlinkage long sys_rt_sigaction(int sig
+ 				struct sigaction __user *oact,
+ 				size_t sigsetsize);
+ 
+-#endif
++#endif /* __KERNEL_SYSCALLS__ */
+ 
+ /*
+  * "Conditional" syscalls
+@@ -543,4 +543,5 @@ #define cond_syscall(name)						\
+   asm (".weak\t_" #name "\n"				\
+        ".set\t_" #name ",_sys_ni_syscall");
+ 
++#endif /* __KERNEL__ */
+ #endif /* _ASM_H8300_UNISTD_H_ */
+only in patch2:
+unchanged:
+--- a/include/asm-i386/unistd.h
++++ b/include/asm-i386/unistd.h
+@@ -323,6 +323,8 @@ #define __NR_sync_file_range	314
+ #define __NR_tee		315
+ #define __NR_vmsplice		316
+ 
++#ifdef __KERNEL__
++
+ #define NR_syscalls 317
+ 
+ /*
+@@ -422,7 +424,6 @@ __asm__ volatile ("push %%ebp ; push %%e
+ __syscall_return(type,__res); \
+ }
+ 
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_OLD_STAT
+@@ -446,7 +447,6 @@ #define __ARCH_WANT_SYS_SIGPENDING
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+ #define __ARCH_WANT_SYS_RT_SIGSUSPEND
+-#endif
+ 
+ #ifdef __KERNEL_SYSCALLS__
+ 
+@@ -485,7 +485,7 @@ asmlinkage long sys_rt_sigaction(int sig
+ 				struct sigaction __user *oact,
+ 				size_t sigsetsize);
+ 
+-#endif
++#endif /* __KERNEL_SYSCALLS__ */
+ 
+ /*
+  * "Conditional" syscalls
+@@ -497,4 +497,5 @@ #ifndef cond_syscall
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+ #endif
+ 
++#endif /* __KERNEL__ */
+ #endif /* _ASM_I386_UNISTD_H_ */
+only in patch2:
+unchanged:
+--- a/include/asm-m32r/unistd.h
++++ b/include/asm-m32r/unistd.h
+@@ -295,6 +295,8 @@ #define __NR_mq_getsetattr	(__NR_mq_open
+ #define __NR_kexec_load		283
+ #define __NR_waitid		284
+ 
++#ifdef __KERNEL__
++
+ #define NR_syscalls 285
+ 
+ /* user-visible error numbers are in the range -1 - -124: see
+@@ -405,7 +407,6 @@ __asm__ __volatile__ (\
+ __syscall_return(type,__res); \
+ }
+ 
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_STAT64
+ #define __ARCH_WANT_SYS_ALARM
+@@ -421,7 +422,6 @@ #define __ARCH_WANT_SYS_LLSEEK
+ #define __ARCH_WANT_SYS_OLD_GETRLIMIT /*will be unused*/
+ #define __ARCH_WANT_SYS_OLDUMOUNT
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+-#endif
+ 
+ #ifdef __KERNEL_SYSCALLS__
+ 
+@@ -470,4 +470,5 @@ #ifndef cond_syscall
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+ #endif
+ 
++#endif /* __KERNEL__ */
+ #endif /* _ASM_M32R_UNISTD_H */
+only in patch2:
+unchanged:
+--- a/include/asm-m68k/unistd.h
++++ b/include/asm-m68k/unistd.h
+@@ -285,6 +285,8 @@ #define __NR_add_key		279
+ #define __NR_request_key	280
+ #define __NR_keyctl		281
+ 
++#ifdef __KERNEL__
++
+ #define NR_syscalls		282
+ 
+ /* user-visible error numbers are in the range -1 - -124: see
+@@ -383,7 +385,6 @@ __asm__ __volatile__ ("trap  #0" \
+ __syscall_return(type,__res); \
+ }
+ 
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_OLD_STAT
+@@ -406,7 +407,6 @@ #define __ARCH_WANT_SYS_OLDUMOUNT
+ #define __ARCH_WANT_SYS_SIGPENDING
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+-#endif
+ 
+ #ifdef __KERNEL_SYSCALLS__
+ 
+@@ -451,7 +451,7 @@ asmlinkage long sys_rt_sigaction(int sig
+ 				struct sigaction __user *oact,
+ 				size_t sigsetsize);
+ 
+-#endif
++#endif /* __KERNEL_SYSCALLS__ */
+ 
+ /*
+  * "Conditional" syscalls
+@@ -461,4 +461,5 @@ #endif
+  */
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+ 
++#endif /* __KERNEL__ */
+ #endif /* _ASM_M68K_UNISTD_H_ */
+only in patch2:
+unchanged:
+--- a/include/asm-m68knommu/unistd.h
++++ b/include/asm-m68knommu/unistd.h
+@@ -286,6 +286,8 @@ #define __NR_add_key		279
+ #define __NR_request_key	280
+ #define __NR_keyctl		281
+  
++#ifdef __KERNEL__
++
+ #define NR_syscalls		282
+ 
+ /* user-visible error numbers are in the range -1 - -122: see
+@@ -437,7 +439,6 @@ type name(atype a, btype b, ctype c, dty
+   return (type)__res;								\
+ }
+ 
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_OLD_STAT
+@@ -460,7 +461,6 @@ #define __ARCH_WANT_SYS_OLDUMOUNT
+ #define __ARCH_WANT_SYS_SIGPENDING
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+-#endif
+ 
+ #ifdef __KERNEL_SYSCALLS__
+ 
+@@ -515,7 +515,7 @@ asmlinkage long sys_rt_sigaction(int sig
+ 				struct sigaction __user *oact,
+ 				size_t sigsetsize);
+ 
+-#endif
++#endif /* __KERNEL_SYSCALLS__ */
+ 
+ /*
+  * "Conditional" syscalls
+@@ -525,4 +525,5 @@ #endif
+  */
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+ 
++#endif /* __KERNEL__ */
+ #endif /* _ASM_M68K_UNISTD_H_ */
+only in patch2:
+unchanged:
+--- a/include/asm-parisc/unistd.h
++++ b/include/asm-parisc/unistd.h
+@@ -792,6 +792,7 @@ #define __NR_Linux_syscalls     294
+ #define HPUX_GATEWAY_ADDR       0xC0000004
+ #define LINUX_GATEWAY_ADDR      0x100
+ 
++#ifdef __KERNEL__
+ #ifndef __ASSEMBLY__
+ 
+ #define SYS_ify(syscall_name)   __NR_##syscall_name
+@@ -934,7 +935,6 @@ type name(type1 arg1, type2 arg2, type3 
+     return K_INLINE_SYSCALL(name, 5, arg1, arg2, arg3, arg4, arg5);	\
+ }
+ 
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_STAT64
+ #define __ARCH_WANT_SYS_ALARM
+@@ -956,7 +956,6 @@ #define __ARCH_WANT_SYS_OLDUMOUNT
+ #define __ARCH_WANT_SYS_SIGPENDING
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+-#endif
+ 
+ /* mmap & mmap2 take 6 arguments */
+ #define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5,type6,arg6) \
+@@ -1056,4 +1055,5 @@ #undef STR
+  */
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+ 
++#endif /* __KERNEL__ */
+ #endif /* _ASM_PARISC_UNISTD_H_ */
+only in patch2:
+unchanged:
+--- a/include/asm-sh/unistd.h
++++ b/include/asm-sh/unistd.h
+@@ -304,6 +304,8 @@ #define __NR_inotify_rm_watch	292
+ 
+ #define NR_syscalls 293
+ 
++#ifdef __KERNEL__
++
+ /* user-visible error numbers are in the range -1 - -124: see <asm-sh/errno.h> */
+ 
+ #define __syscall_return(type, res) \
+@@ -420,7 +422,6 @@ __asm__ __volatile__ ("trapa	#0x16" \
+ __syscall_return(type,__sc0); \
+ }
+ 
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_OLD_STAT
+@@ -443,7 +444,6 @@ #define __ARCH_WANT_SYS_OLDUMOUNT
+ #define __ARCH_WANT_SYS_SIGPENDING
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+-#endif
+ 
+ #ifdef __KERNEL_SYSCALLS__
+ 
+@@ -513,7 +513,7 @@ asmlinkage long sys_rt_sigaction(int sig
+ 				struct sigaction __user *oact,
+ 				size_t sigsetsize);
+ 
+-#endif
++#endif /* __KERNEL_SYSCALLS__ */
+ 
+ /*
+  * "Conditional" syscalls
+@@ -525,4 +525,5 @@ #ifndef cond_syscall
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+ #endif
+ 
++#endif /* __KERNEL__ */
+ #endif /* __ASM_SH_UNISTD_H */
+only in patch2:
+unchanged:
+--- a/include/asm-sh64/unistd.h
++++ b/include/asm-sh64/unistd.h
+@@ -344,6 +344,8 @@ #define __NR_inotify_init	318
+ #define __NR_inotify_add_watch	319
+ #define __NR_inotify_rm_watch	320
+ 
++#ifdef __KERNEL__ 
++
+ #define NR_syscalls 321
+ 
+ /* user-visible error numbers are in the range -1 - -125: see <asm-sh64/errno.h> */
+@@ -486,7 +488,6 @@ __asm__ __volatile__ ("!dummy	%0 %1 %2 %
+ __syscall_return(type,__sc0); 						    \
+ }
+ 
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_OLD_STAT
+@@ -509,7 +510,6 @@ #define __ARCH_WANT_SYS_OLDUMOUNT
+ #define __ARCH_WANT_SYS_SIGPENDING
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+-#endif
+ 
+ #ifdef __KERNEL_SYSCALLS__
+ 
+@@ -550,7 +550,7 @@ static inline pid_t wait(int * wait_stat
+ {
+ 	return waitpid(-1,wait_stat,0);
+ }
+-#endif
++#endif /* __KERNEL_SYSCALLS__ */
+ 
+ /*
+  * "Conditional" syscalls
+@@ -562,4 +562,5 @@ #ifndef cond_syscall
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+ #endif
+ 
++#endif /* __KERNEL__ */
+ #endif /* __ASM_SH64_UNISTD_H */
+only in patch2:
+unchanged:
+--- a/include/asm-sparc/unistd.h
++++ b/include/asm-sparc/unistd.h
+@@ -317,6 +317,7 @@ #define __NR_pselect6		297
+ #define __NR_ppoll		298
+ #define __NR_unshare		299
+ 
++#ifdef __KERNEL__
+ /* WARNING: You MAY NOT add syscall numbers larger than 299, since
+  *          all of the syscall tables in the Sparc kernel are
+  *          sized to have 299 entries (starting at zero).  Therefore
+@@ -453,7 +454,6 @@ errno = -__res; \
+ return -1; \
+ }
+ 
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_STAT64
+@@ -475,7 +475,6 @@ #define __ARCH_WANT_SYS_OLDUMOUNT
+ #define __ARCH_WANT_SYS_SIGPENDING
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGSUSPEND
+-#endif
+ 
+ #ifdef __KERNEL_SYSCALLS__
+ 
+@@ -532,4 +531,5 @@ #endif /* __KERNEL_SYSCALLS__ */
+  */
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+ 
++#endif /* __KERNEL__ */
+ #endif /* _SPARC_UNISTD_H */
+only in patch2:
+unchanged:
+--- a/include/asm-sparc64/unistd.h
++++ b/include/asm-sparc64/unistd.h
+@@ -319,6 +319,7 @@ #define __NR_pselect6		297
+ #define __NR_ppoll		298
+ #define __NR_unshare		299
+ 
++#ifdef __KERNEL__
+ /* WARNING: You MAY NOT add syscall numbers larger than 299, since
+  *          all of the syscall tables in the Sparc kernel are
+  *          sized to have 299 entries (starting at zero).  Therefore
+@@ -485,7 +486,6 @@ asmlinkage long sys_rt_sigaction(int sig
+ 
+ #endif /* __KERNEL_SYSCALLS__ */
+ 
+-#ifdef __KERNEL__
+ /* sysconf options, for SunOS compatibility */
+ #define   _SC_ARG_MAX             1
+ #define   _SC_CHILD_MAX           2
+@@ -519,7 +519,6 @@ #define __ARCH_WANT_SYS_SIGPENDING
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGSUSPEND
+ #define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
+-#endif
+ 
+ /*
+  * "Conditional" syscalls
+@@ -529,4 +528,5 @@ #endif
+  */
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+ 
++#endif /* __KERNEL__ */
+ #endif /* _SPARC64_UNISTD_H */
+only in patch2:
+unchanged:
+--- a/include/asm-v850/unistd.h
++++ b/include/asm-v850/unistd.h
+@@ -14,8 +14,6 @@
+ #ifndef __V850_UNISTD_H__
+ #define __V850_UNISTD_H__
+ 
+-#include <asm/clinkage.h>
+-
+ #define __NR_restart_syscall	  0
+ #define __NR_exit		  1
+ #define __NR_fork		  2
+@@ -237,10 +235,9 @@ #define SYSCALL_CLOBBERS	"r1", "r5", "r1
+    except the syscall number (r12).  */
+ #define SYSCALL_SHORT_CLOBBERS	SYSCALL_CLOBBERS, "r13", "r14"
+ 
++#ifdef __KERNEL__
+ 
+-/* User programs sometimes end up including this header file
+-   (indirectly, via uClibc header files), so I'm a bit nervous just
+-   including <linux/compiler.h>.  */
++#include <asm/clinkage.h>
+ 
+ #define __syscall_return(type, res)					      \
+   do {									      \
+@@ -368,7 +365,6 @@ type name (atype a, btype b, ctype c, dt
+ }
+ 		
+ 
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_STAT64
+@@ -389,7 +385,6 @@ #define __ARCH_WANT_SYS_OLDUMOUNT
+ #define __ARCH_WANT_SYS_SIGPENDING
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+-#endif
+ 
+ #ifdef __KERNEL_SYSCALLS__
+ 
+@@ -440,7 +435,7 @@ asmlinkage long sys_rt_sigaction(int sig
+ 				struct sigaction __user *oact,
+ 				size_t sigsetsize);
+ 
+-#endif
++#endif /* __KERNEL_SYSCALLS__ */
+ 
+ /*
+  * "Conditional" syscalls
+@@ -455,4 +450,5 @@ #define cond_syscall(name)  \
+   void name (void) __attribute__ ((weak, alias ("sys_ni_syscall")));
+ #endif
+ 
++#endif /* __KERNEL__ */
+ #endif /* __V850_UNISTD_H__ */
+only in patch2:
+unchanged:
+--- a/include/asm-x86_64/unistd.h
++++ b/include/asm-x86_64/unistd.h
+@@ -618,6 +618,8 @@ __SYSCALL(__NR_sync_file_range, sys_sync
+ #define __NR_vmsplice		278
+ __SYSCALL(__NR_vmsplice, sys_vmsplice)
+ 
++#ifdef __KERNEL__
++
+ #define __NR_syscall_max __NR_vmsplice
+ 
+ #ifndef __NO_STUBS
+@@ -635,7 +637,6 @@ do { \
+ 	return (type) (res); \
+ } while (0)
+ 
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_OLD_STAT
+ #define __ARCH_WANT_SYS_ALARM
+@@ -657,7 +658,6 @@ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+ #define __ARCH_WANT_SYS_TIME
+ #define __ARCH_WANT_COMPAT_SYS_TIME
+-#endif
+ 
+ #ifndef __KERNEL_SYSCALLS__
+ 
+@@ -821,7 +821,7 @@ asmlinkage long sys_pipe(int *fildes);
+ 
+ #endif /* __KERNEL_SYSCALLS__ */
+ 
+-#if !defined(__ASSEMBLY__) && defined(__KERNEL__)
++#ifndef __ASSEMBLY__
+ 
+ #include <linux/linkage.h>
+ #include <linux/compiler.h>
+@@ -848,4 +848,5 @@ #endif /* __NO_STUBS */
+  */
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+ 
++#endif /* __KERNEL__ */
+ #endif
+only in patch2:
+unchanged:
+--- a/include/asm-xtensa/unistd.h
++++ b/include/asm-xtensa/unistd.h
+@@ -11,8 +11,6 @@
+ #ifndef _XTENSA_UNISTD_H
+ #define _XTENSA_UNISTD_H
+ 
+-#include <linux/linkage.h>
+-
+ #define __NR_spill		  0
+ #define __NR_exit		  1
+ #define __NR_read		  3
+@@ -221,21 +219,9 @@ #define SYSXTENSA_ATOMIC_CMP_SWP   4	/* 
+ #define SYSXTENSA_COUNT		   5	/* count of syscall0 functions*/
+ 
+ #ifdef __KERNEL__
+-#define __syscall_return(type, res) return ((type)(res))
+-#else
+-#define __syscall_return(type, res) \
+-do { \
+-	if ((unsigned long)(res) >= (unsigned long)(-125)) { \
+-	/* Avoid using "res" which is declared to be in register r2; \
+-	 * errno might expand to a function call and clobber it.  */ \
+-		int __err = -(res); \
+-		errno = __err; \
+-		res = -1; \
+-	} \
+-	return (type) (res); \
+-} while (0)
+-#endif
++#include <linux/linkage.h>
+ 
++#define __syscall_return(type, res) return ((type)(res))
+ 
+ /* Tensilica's xt-xcc compiler is much more agressive at code
+  * optimization than gcc.  Multiple __asm__ statements are
+@@ -429,11 +415,10 @@ #endif
+  */
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
+ 
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_STAT64
+ #define __ARCH_WANT_SYS_UTIME
+ #define __ARCH_WANT_SYS_LLSEEK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+-#endif
++#endif /* __KERNEL__ */
+ 
+ #endif	/* _XTENSA_UNISTD_H */



From fedora-cvs-commits at redhat.com  Fri Apr 28 14:12:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 10:12:21 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2175,1.2175.2.1
Message-ID: <200604281412.k3SECLtc024818@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24784

Modified Files:
      Tag: private-buildheaders-2175-branch
	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.2175
retrieving revision 1.2175.2.1
diff -u -r1.2175 -r1.2175.2.1
--- kernel-2.6.spec	28 Apr 2006 13:59:32 -0000	1.2175
+++ kernel-2.6.spec	28 Apr 2006 14:12:18 -0000	1.2175.2.1
@@ -13,7 +13,7 @@
 %define buildxenPAE 0
 %define builddoc 0
 %define buildkdump 1
-%define buildheaders 0
+%define buildheaders 1
 
 # Versions of various parts
 



From fedora-cvs-commits at redhat.com  Fri Apr 28 14:42:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 10:42:20 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2175.2.1,1.2175.2.2
Message-ID: <200604281442.k3SEgKKn014361@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14256

Modified Files:
      Tag: private-buildheaders-2175-branch
	kernel-2.6.spec 
Log Message:
no Xen. It's broken


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2175.2.1
retrieving revision 1.2175.2.2
diff -u -r1.2175.2.1 -r1.2175.2.2
--- kernel-2.6.spec	28 Apr 2006 14:12:18 -0000	1.2175.2.1
+++ kernel-2.6.spec	28 Apr 2006 14:42:18 -0000	1.2175.2.2
@@ -9,7 +9,7 @@
 # Whether to apply the Xen patches, leave this enabled.
 %define includexen 1
 # Whether to build the Xen kernels, disable if you want.
-%define buildxen 1
+%define buildxen 0
 %define buildxenPAE 0
 %define builddoc 0
 %define buildkdump 1



From fedora-cvs-commits at redhat.com  Fri Apr 28 14:47:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 10:47:23 -0400
Subject: rpms/cups/devel cups-rpath.patch,1.1,1.2
Message-ID: <200604281447.k3SElNDg023932@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23590

Modified Files:
	cups-rpath.patch 
Log Message:
Won't be accepted upstream (STR #1615) so simplify

cups-rpath.patch:
 cups-sharedlibs.m4 |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

Index: cups-rpath.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-rpath.patch	28 Apr 2006 13:32:35 -0000	1.1
+++ cups-rpath.patch	28 Apr 2006 14:47:20 -0000	1.2
@@ -8,32 +8,6 @@
  
  if test x$enable_shared != xno; then
  	case "$uname" in
-@@ -45,7 +46,11 @@
- 			LIBCUPS="libcups.so.2"
- 			LIBCUPSIMAGE="libcupsimage.so.2"
- 			DSO="\$(CC)"
--			DSOFLAGS="$DSOFLAGS -Wl,-rpath,\$(libdir),-set_version,sgi2.6,-soname,\$@ -shared \$(OPTIM)"
-+			RPATH=""
-+			if test x$enable_rpath != xno; then
-+			  RPATH=",-rpath,\$(libdir)"
-+			fi
-+			DSOFLAGS="$DSOFLAGS -Wl$RPATH,-set_version,sgi2.6,-soname,\$@ -shared \$(OPTIM)"
- 			;;
- 		OSF1* | Linux | GNU | *BSD*)
- 			LIBCUPS="libcups.so.2"
-@@ -63,7 +68,11 @@
- 			LIBCUPS="libcups_s.a"
- 			LIBCUPSIMAGE="libcupsimage_s.a"
- 			DSO="\$(CC)"
--			DSOFLAGS="$DSOFLAGS -Wl,-bexpall,-bM:SRE,-bnoentry,-blibpath:\$(libdir)"
-+			RPATH=""
-+			if test x$enable_rpath != xno; then
-+			  RPATH=",-blibpath:\$(libdir)"
-+			fi
-+			DSOFLAGS="$DSOFLAGS -Wl,-bexpall,-bM:SRE,-bnoentry$RPATH"
- 			;;
- 		*)
- 			echo "Warning: shared libraries may not be supported.  Trying -shared"
 @@ -116,7 +125,7 @@
  	# The *BSD, HP-UX, and Solaris run-time linkers need help when
  	# deciding where to find a DSO.  Add linker options to tell them



From fedora-cvs-commits at redhat.com  Fri Apr 28 14:48:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 10:48:34 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2175,1.2176
Message-ID: <200604281448.k3SEmYY9030084@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30056

Modified Files:
	kernel-2.6.spec 
Log Message:
Fix xen


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2175
retrieving revision 1.2176
diff -u -r1.2175 -r1.2176
--- kernel-2.6.spec	28 Apr 2006 13:59:32 -0000	1.2175
+++ kernel-2.6.spec	28 Apr 2006 14:48:31 -0000	1.2176
@@ -9,7 +9,7 @@
 # Whether to apply the Xen patches, leave this enabled.
 %define includexen 1
 # Whether to build the Xen kernels, disable if you want.
-%define buildxen 1
+%define buildxen 0
 %define buildxenPAE 0
 %define builddoc 0
 %define buildkdump 1
@@ -717,9 +717,11 @@
   rm -f pax_global_header
 %setup -q -n %{name}-%{version} -c -a1
   cp %{SOURCE2} .
-# Xen tarball contains pre-build i386 binaries which need removing
-  rm -f xen/tools/figlet/figlet
-  rm -f xen/tools/symbols
+# Sometimes we accidentally import an unclean Xen tarball
+  if [ -x xen/tools/figlet/figlet ]; then
+     echo "Xen tarball is unclean. Use an unbuilt Xen tarball"
+     exit 1
+  fi
   mv linux-%{kversion} vanilla
   mv xen xen-vanilla
   cp %{SOURCE2} .
@@ -1708,7 +1710,8 @@
 
 %changelog
 * Fri Apr 28 2006 David Woodhouse <dwmw2 at redhat.com>
-- Remove another Xen tool which was pre-built in the tarball
+- Disable Xen on the basis that it doesn't build
+- Check for Xen tarball being unclean, abort early even on i386.
 
 * Thu Apr 27 2006 Juan Quintela <quintela at redhat.com>
 - Remove figlet by hand again.



From fedora-cvs-commits at redhat.com  Fri Apr 28 14:50:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 10:50:55 -0400
Subject: rpms/kdebase/FC-5 kdebase-3.5.2-1-redhat.patch, NONE,
	1.1 kdebase-3.5.2-kwin.patch, NONE, 1.1 kdebase.spec, 1.161,
	1.162 kdebase-3.5.2-redhat.patch, 1.1, NONE
Message-ID: <200604281450.k3SEotrO031022@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv30924

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.2-1-redhat.patch kdebase-3.5.2-kwin.patch 
Removed Files:
	kdebase-3.5.2-redhat.patch 
Log Message:
- fix #189790, kcheckpass cannot authenticate users using a LDAP directory
- fix #189702, kwin crashes when switching windows with Alt-Tab
- fix startkde to look in /usr and /etc/kde for env/ and shutdown/
- update dbus patch


kdebase-3.5.2-1-redhat.patch:
 kdebase-3.4.91/kde.pamd |   16 +++++++----
 kdebase-3.5.1/startkde  |   68 +++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 69 insertions(+), 15 deletions(-)

--- NEW FILE kdebase-3.5.2-1-redhat.patch ---
--- kdebase-3.4.91/kde.pamd.redhat	2005-09-10 10:26:16.000000000 +0200
+++ kdebase-3.4.91/kde.pamd	2005-09-27 18:16:15.000000000 +0200
@@ -1,7 +1,11 @@
 #%PAM-1.0
-auth       required	/lib/security/pam_pwdb.so shadow nullok
-auth       required	/lib/security/pam_nologin.so
-account    required	/lib/security/pam_pwdb.so
-password   required	/lib/security/pam_cracklib.so
-password   required	/lib/security/pam_pwdb.so shadow nullok use_authtok
-session    required	/lib/security/pam_pwdb.so
+auth       sufficient	pam_timestamp.so
+auth       include     system-auth
+account    required	pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    include	system-auth
+session    required    pam_loginuid.so
+session    optional	pam_timestamp.so
+session    optional    pam_selinux.so
+session    optional	pam_console.so
--- kdebase-3.5.1/startkde.redhat	2006-01-19 18:03:19.000000000 +0100
+++ kdebase-3.5.1/startkde	2006-02-15 18:58:10.000000000 +0100
@@ -1,8 +1,56 @@
 #!/bin/sh
 #
 #  DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.2 )
+#  Modified for Red Hat Linux
 #
 
+unset BLOCK_SIZE # breaks parsing of df output
+shopt -u -o noclobber # allow overwriting of files with '>'
+
+# set up user environment if not present
+# check for space on /tmp and "$HOME" and for write access
+#  error exit, if not
+space_tmp=`df /tmp | xargs | cut -d" " -f11`
+homedir_mount=`df "$HOME" | xargs | cut -d" " -f8`
+
+if [ "$homedir_mount" = "AFS" -a -x "`which fs 2>/dev/null`" ] ; then
+    # check for AFS
+    space_home=`fs df "$HOME" | xargs | cut -d" " -f10`
+else
+    # check regular mounts
+    space_home=`df "$HOME" | xargs | cut -d" " -f11`
+fi
+
+if [ $space_tmp -lt 50 ]; then
+    echo $"Not enough free disk space on /tmp"
+    exit 1
+fi
+
+if [ $space_home -lt 25 ]; then
+    echo $"Not enough free disk space on "$HOME""
+    exit 1
+fi
+testfile_tmp=`mktemp /tmp/KDE.startkde.XXXXXX`
+testfile_home=`mktemp "$HOME"/KDE.startkde.XXXXXX`
+
+if ! echo TEST_TEXT >$testfile_tmp 2>/dev/null ; then
+    echo $"You don't have write permissions for /tmp"
+    exit 1
+fi
+rm -f $testfile_tmp
+
+if ! echo TEST_TEXT >$testfile_home 2>/dev/null ; then
+     echo $"You don't have write permissions for "$HOME""
+     exit 1
+fi
+rm -f $testfile_home
+
+[ -d "$HOME"/.kde/share/config ] || mkdir -p "$HOME"/.kde/share/config
+
+if [ ! -e "$HOME"/.kde/share/config/emaildefaults ]; then
+  /usr/bin/mailsettings >"$HOME"/.kde/share/config/emaildefaults
+fi
+
 # When the X server dies we get a HUP signal from xinit. We must ignore it
 # because we still need to do some cleanup.
 trap 'echo GOT SIGHUP' HUP
@@ -14,12 +62,12 @@
 	exit 1
 fi
 
-# Set the background to plain grey.
+# Set the background to the Red Hat default blue
 # The standard X background is nasty, causing moire effects and exploding
 # people's heads. We use colours from the standard KDE palette for those with
 # palettised displays.
 if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
-  xsetroot -solid "#000000"
+  xsetroot -solid "#5477A0"
 fi
 
 # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
@@ -64,7 +112,7 @@
 cat >$kdehome/share/config/startupconfigkeys <<EOF
 kcminputrc Mouse cursorTheme ''
 kcminputrc Mouse cursorSize ''
-kpersonalizerrc General FirstLogin true
+kpersonalizerrc General FirstLogin false
 ksplashrc KSplash Theme Default
 kcmrandrrc Display ApplyOnStartup false
 kcmrandrrc [Screen0]
@@ -135,8 +183,8 @@
     done
 fi
 
-# Source scripts found in <localprefix>/env/*.sh and <prefixes>/env/*.sh
-# (where <localprefix> is $KDEHOME or ~/.kde, and <prefixes> is where KDE is installed)
+# Source scripts found in <localprefix>/env/*.sh and /etc/kde/env/*.sh
+# (where <localprefix> is $KDEHOME or ~/.kde)
 #
 # This is where you can define environment variables that will be available to
 # all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
@@ -147,10 +195,11 @@
 # For anything else (that doesn't set env vars, or that needs a window manager),
 # better use the Autostart folder.
 
-exepath=`kde-config --path exe | tr : '\n'`
+exepath=`kde-config --path exe | tr : '\n'`
+envpath=/etc/kde/env/
 
-for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/env/,p'`; do
-  for file in "$prefix"*.sh; do
+for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/env/,p'` $envpath ; do
+  for file in "$prefix"*.sh ; do
     test -r "$file" && . "$file"
   done
 done
@@ -339,7 +388,8 @@
 echo 'startkde: Running shutdown scripts...'  1>&2
 
 # Run scripts found in $KDEDIRS/shutdown
-for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'`; do
+shutdownpath=/etc/kde/shutdown/
+for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'` $shutdownpath; do
   for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
     test -x "$prefix$file" && "$prefix$file"
   done

kdebase-3.5.2-kwin.patch:
 activation.cpp                  |    2 -
 client.cpp                      |   18 +++++++++++---
 clients/b2/b2client.cpp         |    2 -
 clients/default/kdedefault.cpp  |    2 -
 events.cpp                      |    8 +++---
 geometry.cpp                    |   16 ++++++++++++
 kcmkwin/kwinoptions/windows.cpp |   24 +++++++++++++++++--
 kcmkwin/kwinoptions/windows.h   |    3 ++
 kcmkwin/kwinrules/main.cpp      |    4 +--
 kompmgr/kompmgr.c               |   15 +++++++++---
 layers.cpp                      |   17 ++++++++++++-
 manage.cpp                      |   11 ++++++++
 popupinfo.cpp                   |    1 
 tabbox.cpp                      |   50 +++++++++++++++++++++++++---------------
 useractions.cpp                 |    3 +-
 utils.cpp                       |    9 ++++---
 utils.h                         |    8 ++----
 workspace.cpp                   |   35 +++++++++++++++++++++++-----
 workspace.h                     |    4 ++-
 19 files changed, 177 insertions(+), 55 deletions(-)

--- NEW FILE kdebase-3.5.2-kwin.patch ---
--- kdebase-3.5.2/kwin/clients/b2/b2client.cpp.kwin	2006-01-19 18:01:02.000000000 +0100
+++ kdebase-3.5.2/kwin/clients/b2/b2client.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -530,7 +530,7 @@
     if (drawSmallBorders && (maximizeMode() & MaximizeVertical)) {
 	return false;
     } else {
-	return do_draw_handle & resizable;
+	return do_draw_handle && resizable;
     }
 }
 
--- kdebase-3.5.2/kwin/clients/default/kdedefault.cpp.kwin	2005-09-10 10:25:55.000000000 +0200
+++ kdebase-3.5.2/kwin/clients/default/kdedefault.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -808,7 +808,7 @@
 		case LM_ExplicitButtonSpacer:
 			if ( !isToolWindow() )
 				return borderWidth/2;
-
+			// fall though
 		default:
 			return KCommonDecoration::layoutMetric(lm, respectWindowState, btn);
 	}
--- kdebase-3.5.2/kwin/kcmkwin/kwinrules/main.cpp.kwin	2006-03-17 11:17:42.000000000 +0100
+++ kdebase-3.5.2/kwin/kcmkwin/kwinrules/main.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -119,8 +119,8 @@
             if( rule->types != NET::AllTypesMask )
                 {
                 int bits = 0;
-                for( int bit = 1;
-                     bit < 1 << 31;
+                for( unsigned int bit = 1;
+                     bit < 1U << 31;
                      bit <<= 1 )
                     if( rule->types & bit )
                         ++bits;
--- kdebase-3.5.2/kwin/kcmkwin/kwinoptions/windows.cpp.kwin	2006-03-17 11:17:42.000000000 +0100
+++ kdebase-3.5.2/kwin/kcmkwin/kwinoptions/windows.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -228,6 +228,7 @@
                  " is pressed, with no popup widget.  In addition, the previously"
                  " activated window will be sent to the back in this mode.");
     QWhatsThis::add( altTabPopup, wtstr );
+    connect(focusCombo, SIGNAL(activated(int)), this, SLOT(updateAltTabMode()));
 
     traverseAll = new QCheckBox( i18n( "&Traverse windows on all desktops" ), kbdBox );
     kLay->addWidget( traverseAll );
@@ -279,6 +280,13 @@
 
     // this will disable/hide the auto raise delay widget if focus==click
     setAutoRaiseEnabled();
+    updateAltTabMode();
+}
+
+void KFocusConfig::updateAltTabMode()
+{
+    // not KDE-style Alt+Tab with unreasonable focus policies
+    altTabPopup->setEnabled( focusCombo->currentItem() == 0 || focusCombo->currentItem() == 1 );
 }
 
 void KFocusConfig::setAutoRaiseInterval(int tb)
@@ -900,7 +908,6 @@
     BrdrSnap->setSpecialValueText( i18n("none") );
     BrdrSnap->setRange( 0, MAX_BRDR_SNAP);
     BrdrSnap->setLabel(i18n("&Border snap zone:"));
-    BrdrSnap->setSuffix(i18n(" pixels"));
     BrdrSnap->setSteps(1,10);
     QWhatsThis::add( BrdrSnap, i18n("Here you can set the snap zone for screen borders, i.e."
                                     " the 'strength' of the magnetic field which will make windows snap to the border when"
@@ -910,7 +917,6 @@
     WndwSnap->setSpecialValueText( i18n("none") );
     WndwSnap->setRange( 0, MAX_WNDW_SNAP);
     WndwSnap->setLabel(i18n("&Window snap zone:"));
-    WndwSnap->setSuffix( i18n(" pixels"));
     BrdrSnap->setSteps(1,10);
     QWhatsThis::add( WndwSnap, i18n("Here you can set the snap zone for windows, i.e."
                                     " the 'strength' of the magnetic field which will make windows snap to each other when"
@@ -935,8 +941,14 @@
     connect( moveResizeMaximized, SIGNAL(toggled(bool)), SLOT(changed()));
     connect( placementCombo, SIGNAL(activated(int)), SLOT(changed()));
     connect( BrdrSnap, SIGNAL(valueChanged(int)), SLOT(changed()));
+    connect( BrdrSnap, SIGNAL(valueChanged(int)), SLOT(slotBrdrSnapChanged(int)));
     connect( WndwSnap, SIGNAL(valueChanged(int)), SLOT(changed()));
+    connect( WndwSnap, SIGNAL(valueChanged(int)), SLOT(slotWndwSnapChanged(int)));
     connect( OverlapSnap, SIGNAL(clicked()), SLOT(changed()));
+
+    // To get suffix to BrdrSnap and WndwSnap inputs with default values.
+    slotBrdrSnapChanged(BrdrSnap->value());
+    slotWndwSnapChanged(WndwSnap->value());
 }
 
 int KMovingConfig::getMove()
@@ -1007,6 +1019,14 @@
     moveResizeMaximized->setChecked(a);
 }
 
+void KMovingConfig::slotBrdrSnapChanged(int value) {
+    BrdrSnap->setSuffix(i18n(" pixel", " pixels", value));
+}
+
+void KMovingConfig::slotWndwSnapChanged(int value) {
+    WndwSnap->setSuffix(i18n(" pixel", " pixels", value));
+}
+
 void KMovingConfig::load( void )
 {
     QString key;
--- kdebase-3.5.2/kwin/kcmkwin/kwinoptions/windows.h.kwin	2006-01-19 18:01:05.000000000 +0100
+++ kdebase-3.5.2/kwin/kcmkwin/kwinoptions/windows.h	2006-04-28 12:30:43.000000000 +0200
@@ -85,6 +85,7 @@
   void autoRaiseOnTog(bool);//CT 23Oct1998
   void delayFocusOnTog(bool);
   void clickRaiseOnTog(bool);
+  void updateAltTabMode();
 	void changed() { emit KCModule::changed(true); }
 
 
@@ -138,6 +139,8 @@
   void setMinimizeAnim( bool );
   void setMinimizeAnimSpeed( int );
 	void changed() { emit KCModule::changed(true); }
+  void slotBrdrSnapChanged( int );
+  void slotWndwSnapChanged( int );
 
 private:
   int getMove( void );
--- kdebase-3.5.2/kwin/kompmgr/kompmgr.c.kwin	2006-03-17 11:17:43.000000000 +0100
+++ kdebase-3.5.2/kwin/kompmgr/kompmgr.c	2006-04-28 12:30:43.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * $Id: kompmgr.c 511474 2006-02-20 01:12:52Z danimo $
+ * $Id: kompmgr.c 528927 2006-04-12 05:27:31Z rohanpm $
  *
  * Copyright ?? 2003 Keith Packard
  *
@@ -201,7 +201,7 @@
 typedef enum _compMode {
     CompSimple,		/* looks like a regular X server */
     CompServerShadows,	/* use window alpha for shadow; sharp, but precise */
-    CompClientShadows,	/* use window extents for shadow, blurred */
+    CompClientShadows	/* use window extents for shadow, blurred */
 } CompMode;
 
 static void
@@ -2878,7 +2878,16 @@
 									break;*/ /*skip if opacity does not change*/
 								if (fadeTrans)
 								{
-								    set_fade (dpy, w, w->opacity*1.0/OPAQUE, (tmp*1.0)/OPAQUE, fade_out_step, 0, False, True, True, False);
+									static double start, finish, step;
+									start = w->opacity*1.0/OPAQUE;
+									finish = (tmp*1.0)/OPAQUE;
+									
+									if ( start > finish )
+										step = fade_out_step;
+									else
+										step = fade_in_step;
+									
+								    set_fade (dpy, w, start, finish, step, 0, False, True, True, False);
                                     break;
                                     }
                                 else
--- kdebase-3.5.2/kwin/activation.cpp.kwin	2006-03-17 11:17:43.000000000 +0100
+++ kdebase-3.5.2/kwin/activation.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -231,7 +231,7 @@
         last_active_client = active_client;
     if ( active_client ) 
         {
-        updateFocusChains( active_client, true ); // make it first in focus chain
+        updateFocusChains( active_client, FocusChainMakeFirst );
         active_client->demandAttention( false );
         }
     pending_take_activity = NULL;
--- kdebase-3.5.2/kwin/client.cpp.kwin	2006-03-17 11:17:43.000000000 +0100
+++ kdebase-3.5.2/kwin/client.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -578,7 +578,7 @@
     updateAllowedActions();
     workspace()->updateMinimizedOfTransients( this );
     updateWindowRules();
-    workspace()->updateFocusChains( this, false ); // make it last in the focus chain
+    workspace()->updateFocusChains( this, Workspace::FocusChainMakeLast );
     }
 
 void Client::unminimize( bool avoid_animation )
@@ -895,7 +895,16 @@
         }
     if( show )
         {
-        if( workspace()->showingDesktop())
+        bool belongs_to_desktop = false;
+        for( ClientList::ConstIterator it = group()->members().begin();
+             it != group()->members().end();
+             ++it )
+            if( (*it)->isDesktop())
+                {
+                belongs_to_desktop = true;
+                break;
+                }
+        if( !belongs_to_desktop && workspace()->showingDesktop())
             workspace()->resetShowingDesktop( true );
         if( isShade())
             setMappingState( IconicState );
@@ -1149,7 +1158,8 @@
     info->setState( b?NET::SkipTaskbar:0, NET::SkipTaskbar );
     updateWindowRules();
     if( was_wants_tab_focus != wantsTabFocus())
-        workspace()->updateFocusChains( this, isActive());
+        workspace()->updateFocusChains( this,
+            isActive() ? Workspace::FocusChainMakeFirst : Workspace::FocusChainUpdate );
     }
 
 void Client::setSkipPager( bool b )
@@ -1191,7 +1201,7 @@
         }
     if( decoration != NULL )
         decoration->desktopChange();
-    workspace()->updateFocusChains( this, true );
+    workspace()->updateFocusChains( this, Workspace::FocusChainMakeFirst );
     updateVisibility();
     updateWindowRules();
     }
--- kdebase-3.5.2/kwin/events.cpp.kwin	2006-03-17 11:17:43.000000000 +0100
+++ kdebase-3.5.2/kwin/events.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -370,7 +370,7 @@
             if( c )
                 {
                 c->windowEvent( e );
-                updateFocusChains( c, true );
+                updateFocusChains( c, FocusChainUpdate );
                 return true;
                 }
             break;
@@ -402,15 +402,15 @@
             if ( e->xconfigurerequest.parent == root ) 
                 {
                 XWindowChanges wc;
-                unsigned int value_mask = 0;
-                wc.border_width = 0;
+                wc.border_width = e->xconfigurerequest.border_width;
                 wc.x = e->xconfigurerequest.x;
                 wc.y = e->xconfigurerequest.y;
                 wc.width = e->xconfigurerequest.width;
                 wc.height = e->xconfigurerequest.height;
                 wc.sibling = None;
                 wc.stack_mode = Above;
-                value_mask = e->xconfigurerequest.value_mask | CWBorderWidth;
+                unsigned int value_mask = e->xconfigurerequest.value_mask
+                    & ( CWX | CWY | CWWidth | CWHeight | CWBorderWidth );
                 XConfigureWindow( qt_xdisplay(), e->xconfigurerequest.window, value_mask, &wc );
                 return true;
                 }
--- kdebase-3.5.2/kwin/geometry.cpp.kwin	2006-03-17 11:17:43.000000000 +0100
+++ kdebase-3.5.2/kwin/geometry.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -1281,7 +1281,21 @@
         { // update to match restrictions
         QSize new_size = adjustedSize();
         if( new_size != size() && !isFullScreen())
+            {
+            QRect orig_geometry = geometry();
             resizeWithChecks( new_size );
+            if( ( !isSpecialWindow() || isToolbar()) && !isFullScreen())
+                {
+                // try to keep the window in its xinerama screen if possible,
+                // if that fails at least keep it visible somewhere
+                QRect area = workspace()->clientArea( MovementArea, this );
+                if( area.contains( orig_geometry ))
+                    keepInArea( area );
+                area = workspace()->clientArea( WorkArea, this );
+                if( area.contains( orig_geometry ))
+                    keepInArea( area );
+                }
+            }
         }
     updateAllowedActions(); // affects isResizeable()
     }
@@ -1840,7 +1854,7 @@
 
     // maximing one way and unmaximizing the other way shouldn't happen
     Q_ASSERT( !( vertical && horizontal )
-        || (( max_mode & MaximizeVertical != 0 ) == ( max_mode & MaximizeHorizontal != 0 )));
+        || ((( max_mode & MaximizeVertical ) != 0 ) == (( max_mode & MaximizeHorizontal ) != 0 )));
 
     QRect clientArea = workspace()->clientArea( MaximizeArea, this );
 
--- kdebase-3.5.2/kwin/layers.cpp.kwin	2006-03-17 11:17:43.000000000 +0100
+++ kdebase-3.5.2/kwin/layers.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -100,7 +100,7 @@
     {
     if( block_stacking_updates > 0 )
         {
-        blocked_propagating_new_clients |= propagate_new_clients;
+        blocked_propagating_new_clients = blocked_propagating_new_clients || propagate_new_clients;
         return;
         }
     ClientList new_stacking_order = constrainedStackingOrder();
@@ -441,6 +441,21 @@
                 }
             }
       	}
+    // the same for global_focus_chain
+    if( c->wantsTabFocus() && global_focus_chain.contains( active_client ))
+        {
+        global_focus_chain.remove( c );
+        for( ClientList::Iterator it = global_focus_chain.fromLast();
+             it != global_focus_chain.end();
+             --it )
+            {
+            if( Client::belongToSameApplication( active_client, *it ))
+                {
+                global_focus_chain.insert( it, c );
+                break;
+                }
+            }
+      	}
     updateStackingOrder();
     }
 
--- kdebase-3.5.2/kwin/manage.cpp.kwin	2006-03-17 11:17:43.000000000 +0100
+++ kdebase-3.5.2/kwin/manage.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -455,7 +455,16 @@
         if( !isOnCurrentDesktop() && !isMapped && !session && ( allow || workspace()->sessionSaving()))
             workspace()->setCurrentDesktop( desktop());
 
-        if( workspace()->showingDesktop())
+        bool belongs_to_desktop = false;
+        for( ClientList::ConstIterator it = group()->members().begin();
+             it != group()->members().end();
+             ++it )
+            if( (*it)->isDesktop())
+                {
+                belongs_to_desktop = true;
+                break;
+                }
+        if( !belongs_to_desktop && workspace()->showingDesktop())
             workspace()->resetShowingDesktop( false );
 
         if( isOnCurrentDesktop() && !isMapped && !allow )
--- kdebase-3.5.2/kwin/popupinfo.cpp.kwin	2006-03-17 11:17:43.000000000 +0100
+++ kdebase-3.5.2/kwin/popupinfo.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -38,6 +38,7 @@
     : QWidget( 0, name )
     {
     m_infoString = "";
+    m_shown = false;
     reset();
     reconfigure();
     connect(&m_delayedHideTimer, SIGNAL(timeout()), this, SLOT(hide()));
--- kdebase-3.5.2/kwin/tabbox.cpp.kwin	2006-03-17 11:17:43.000000000 +0100
+++ kdebase-3.5.2/kwin/tabbox.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -763,7 +763,7 @@
         return;
     if ( tab_grab || control_grab )
         return;
-    if ( options->altTabStyle == Options::CDE )
+    if ( options->altTabStyle == Options::CDE || !options->focusPolicyIsReasonable())
         {
         //XUngrabKeyboard(qt_xdisplay(), qt_x_time); // need that because of accelerator raw mode
         // CDE style raise / lower
@@ -789,7 +789,7 @@
         return;
     if( tab_grab || control_grab )
         return;
-    if ( options->altTabStyle == Options::CDE )
+    if ( options->altTabStyle == Options::CDE || !options->focusPolicyIsReasonable())
         {
         // CDE style raise / lower
         CDEWalkThroughWindows( false );
@@ -926,7 +926,23 @@
 
 void Workspace::CDEWalkThroughWindows( bool forward )
     {
-    Client* c = activeClient();
+    Client* c = NULL;
+// this function find the first suitable client for unreasonable focus
+// policies - the topmost one, with some exceptions (can't be keepabove/below,
+// otherwise it gets stuck on them)
+    Q_ASSERT( block_stacking_updates == 0 );
+    for( ClientList::ConstIterator it = stacking_order.fromLast();
+         it != stacking_order.end();
+         --it )
+        {
+        if ( (*it)->isOnCurrentDesktop() && !(*it)->isSpecialWindow()
+            && (*it)->isShown( false ) && (*it)->wantsTabFocus()
+            && !(*it)->keepAbove() && !(*it)->keepBelow())
+            {
+            c = *it;
+            break;
+            }
+        }
     Client* nc = c;
     bool options_traverse_all;
         {
@@ -952,7 +968,7 @@
             }
         } while (nc && nc != c &&
             (( !options_traverse_all && !nc->isOnDesktop(currentDesktop())) ||
-             nc->isMinimized() || !nc->wantsTabFocus() ) );
+             nc->isMinimized() || !nc->wantsTabFocus() || nc->keepAbove() || nc->keepBelow() ) );
     if (nc)
         {
         if (c && c != nc)
@@ -1152,14 +1168,13 @@
 */
 Client* Workspace::nextFocusChainClient( Client* c ) const
     {
-    int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop();
-    if ( focus_chain[desktop].isEmpty() )
+    if ( global_focus_chain.isEmpty() )
         return 0;
-    ClientList::ConstIterator it = focus_chain[desktop].find( c );
-    if ( it == focus_chain[desktop].end() )
-        return focus_chain[desktop].last();
-    if ( it == focus_chain[desktop].begin() )
-        return focus_chain[desktop].last();
+    ClientList::ConstIterator it = global_focus_chain.find( c );
+    if ( it == global_focus_chain.end() )
+        return global_focus_chain.last();
+    if ( it == global_focus_chain.begin() )
+        return global_focus_chain.last();
     --it;
     return *it;
     }
@@ -1170,15 +1185,14 @@
 */
 Client* Workspace::previousFocusChainClient( Client* c ) const
     {
-    int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop();
-    if ( focus_chain[desktop].isEmpty() )
+    if ( global_focus_chain.isEmpty() )
         return 0;
-    ClientList::ConstIterator it = focus_chain[desktop].find( c );
-    if ( it == focus_chain[desktop].end() )
-        return focus_chain[desktop].first();
+    ClientList::ConstIterator it = global_focus_chain.find( c );
+    if ( it == global_focus_chain.end() )
+        return global_focus_chain.first();
     ++it;
-    if ( it == focus_chain[desktop].end() )
-        return focus_chain[desktop].first();
+    if ( it == global_focus_chain.end() )
+        return global_focus_chain.first();
     return *it;
     }
 
--- kdebase-3.5.2/kwin/useractions.cpp.kwin	2005-11-08 23:36:42.000000000 +0100
+++ kdebase-3.5.2/kwin/useractions.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -391,6 +391,7 @@
             break;
         case Options::RestoreOp:
             c->maximize( Client::MaximizeRestore );
+            break;
         case Options::MinimizeOp:
             c->minimize();
             break;
@@ -471,7 +472,7 @@
             cancelShadeHover();
             break;
         case Options::MouseOperationsMenu:
-            if ( isActive() & options->clickRaise )
+            if ( isActive() && options->clickRaise )
                 autoRaise();
             workspace()->showWindowMenu( globalPos, this );
             break;
--- kdebase-3.5.2/kwin/utils.cpp.kwin	2006-03-17 11:17:43.000000000 +0100
+++ kdebase-3.5.2/kwin/utils.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -309,9 +309,12 @@
         hostnamebuf[sizeof(hostnamebuf)-1] = 0;
         if (host == hostnamebuf)
             return true;
-        char *dot = strchr(hostnamebuf, '.');
-        if (dot && !(*dot = 0) && host == hostnamebuf)
-            return true;
+        if( char *dot = strchr(hostnamebuf, '.'))
+            {
+            *dot = '\0';
+            if( host == hostnamebuf )
+                return true;
+            }
         }
     return false;
     }
--- kdebase-3.5.2/kwin/utils.h.kwin	2006-03-17 11:17:43.000000000 +0100
+++ kdebase-3.5.2/kwin/utils.h	2006-04-28 12:30:43.000000000 +0200
@@ -232,15 +232,13 @@
 inline
 int timestampCompare( Time time1, Time time2 ) // like strcmp()
     {
-    if( time1 == time2 )
-        return 0;
-    return ( time1 - time2 ) < 1000000000 ? 1 : -1; // time1 > time2 -> 1, handle wrapping
+    return NET::timestampCompare( time1, time2 );
     }
 
 inline
 Time timestampDiff( Time time1, Time time2 ) // returns time2 - time1
-    { // no need to handle wrapping?
-    return time2 - time1;
+    {
+    return NET::timestampDiff( time1, time2 );
     }
 
 bool isLocalMachine( const QCString& host );
--- kdebase-3.5.2/kwin/workspace.cpp.kwin	2006-03-17 11:17:43.000000000 +0100
+++ kdebase-3.5.2/kwin/workspace.cpp	2006-04-28 12:30:43.000000000 +0200
@@ -512,7 +512,7 @@
         }
     else
         {
-        updateFocusChains( c, true );
+        updateFocusChains( c, FocusChainUpdate ); // add to focus chain if not already there
         clients.append( c );
         }
     if( !unconstrained_stacking_order.contains( c ))
@@ -564,6 +564,7 @@
          i <= numberOfDesktops();
          ++i )
         focus_chain[ i ].remove( c );
+    global_focus_chain.remove( c );
     attention_chain.remove( c );
     if( c->isTopMenu())
         removeTopMenu( c );
@@ -590,7 +591,7 @@
     updateClientArea();
     }
 
-void Workspace::updateFocusChains( Client* c, bool make_first )
+void Workspace::updateFocusChains( Client* c, FocusChainChange change )
     {
     if( !c->wantsTabFocus()) // doesn't want tab focus, remove
         {
@@ -598,16 +599,21 @@
              i<= numberOfDesktops();
              ++i )
             focus_chain[i].remove(c);
+        global_focus_chain.remove( c );
         return;
         }
     if(c->desktop() == NET::OnAllDesktops)
         { //now on all desktops, add it to focus_chains it is not already in
         for( int i=1; i<= numberOfDesktops(); i++)
-            { // make_first works only on current desktop, don't affect all desktops
-            if( make_first && i == currentDesktop())
+            { // making first/last works only on current desktop, don't affect all desktops
+            if( i == currentDesktop()
+                && ( change == FocusChainMakeFirst || change == FocusChainMakeLast ))
                 {
                 focus_chain[ i ].remove( c );
-                focus_chain[ i ].append( c );
+                if( change == FocusChainMakeFirst )
+                    focus_chain[ i ].append( c );
+                else
+                    focus_chain[ i ].prepend( c );
                 }
             else if( !focus_chain[ i ].contains( c ))
                 focus_chain[ i ].prepend( c ); // otherwise add as the last one
@@ -619,11 +625,16 @@
             {
             if( i == c->desktop())
                 {
-                if( make_first )
+                if( change == FocusChainMakeFirst )
                     {
                     focus_chain[ i ].remove( c );
                     focus_chain[ i ].append( c );
                     }
+                else if( change == FocusChainMakeLast )
+                    {
+                    focus_chain[ i ].remove( c );
+                    focus_chain[ i ].prepend( c );
+                    }
                 else if( !focus_chain[ i ].contains( c ))
                     focus_chain[ i ].prepend( c );
                 }
@@ -631,6 +642,18 @@
                 focus_chain[ i ].remove( c );
             }
         }
+    if( change == FocusChainMakeFirst )
+        {
+        global_focus_chain.remove( c );
+        global_focus_chain.append( c );
+        }
+    else if( change == FocusChainMakeLast )
+        {
+        global_focus_chain.remove( c );
+        global_focus_chain.prepend( c );
+        }
+    else if( !global_focus_chain.contains( c ))
+        global_focus_chain.prepend( c );
     }
 
 void Workspace::updateCurrentTopMenu()
--- kdebase-3.5.2/kwin/workspace.h.kwin	2006-03-17 11:17:43.000000000 +0100
+++ kdebase-3.5.2/kwin/workspace.h	2006-04-28 12:30:43.000000000 +0200
@@ -251,7 +251,8 @@
         bool checkStartupNotification( Window w, KStartupInfoId& id, KStartupInfoData& data );
 
         void focusToNull(); // SELI public?
-        void updateFocusChains( Client* c, bool make_first );
+        enum FocusChainChange { FocusChainMakeFirst, FocusChainMakeLast, FocusChainUpdate };
+        void updateFocusChains( Client* c, FocusChainChange change );
         
         bool forcedGlobalMouseGrab() const;
         void clientShortcutUpdated( Client* c );
@@ -510,6 +511,7 @@
         ClientList unconstrained_stacking_order;
         ClientList stacking_order;
         QValueVector< ClientList > focus_chain;
+        ClientList global_focus_chain; // this one is only for things like tabbox's MRU
         ClientList should_get_focus; // last is most recent
         ClientList attention_chain;
         


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- kdebase.spec	4 Apr 2006 09:54:44 -0000	1.161
+++ kdebase.spec	28 Apr 2006 14:50:52 -0000	1.162
@@ -20,7 +20,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.2
-Release: 0.2.fc5
+Release: 0.3.fc5
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -37,7 +37,7 @@
 Source7: mailsettings.cc
 
 Patch0: kde-libtool.patch
-Patch1: kdebase-3.5.2-redhat.patch
+Patch1: kdebase-3.5.2-1-redhat.patch
 Patch2: kdebase-3.3.92-vroot.patch
 Patch3: kdebase-3.x-shortcuts.patch
 Patch4: kdebase-3.2.0-keymap.patch
@@ -53,6 +53,9 @@
 Patch14: kdebase-3.5.1-kdm-readme.patch
 Patch15: kdebase-3.5.1-konsole-fonts.patch
 
+# upstream patches
+Patch100: kdebase-3.5.2-kwin.patch
+
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: libxml2 >= 2.6.5
 Requires: /etc/X11/xdm/Xaccess
@@ -137,6 +140,9 @@
 %patch14 -p1 -b .kdm-readme
 %patch15 -p1 -b .konsole-fonts
 
+# upstream patches
+%patch100 -p1 -b .kwin
+
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
    perl -pi -e "s,kdeprintfax,," kdeprint/Makefile.am
@@ -151,11 +157,6 @@
 %build
 # set some default enviroments
 unset QTDIR && . /etc/profile.d/qt.sh
-FLAGS="$RPM_OPT_FLAGS"
-
-export CXXFLAGS="$FLAGS"
-export CFLAGS="$FLAGS"
-export KDEDIR=%{_prefix}
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
@@ -211,7 +212,6 @@
 install -m 755 mailsettings $RPM_BUILD_ROOT%{_bindir}
 
 # Fix up permissions on some things
-chmod 755 $RPM_BUILD_ROOT%{_bindir}/kcheckpass
 chmod 755 $RPM_BUILD_ROOT%{_bindir}/kdesud
 
 # install pam configuration file
@@ -380,6 +380,8 @@
 %dir %{_libdir}/mozilla
 %dir %{_libdir}/mozilla/plugins
 %{_bindir}/*
+%exclude %{_bindir}/kcheckpass
+%attr(4755,root,root) %{_bindir}/kcheckpass
 %{_libdir}/*.??*
 %{_libdir}/kde3/*
 %{_libdir}/kconf_update_bin
@@ -422,6 +424,12 @@
 %{_includedir}/kde/ksplash/*
 
 %changelog
+* Fri Apr 28 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.3.fc5
+- fix #189790, kcheckpass cannot authenticate users using a LDAP directory
+- fix #189702, kwin crashes when switching windows with Alt-Tab
+- fix startkde to look in /usr and /etc/kde for env/ and shutdown/
+- update dbus patch
+
 * Tue Apr 04 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.2.fc5
 - rebuilt
 


--- kdebase-3.5.2-redhat.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 28 14:59:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 10:59:45 -0400
Subject: rpms/vim/devel .cvsignore, 1.16, 1.17 sources, 1.16, 1.17 vim.spec,
	1.107, 1.108
Message-ID: <200604281459.k3SExjw1001977@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1948

Modified Files:
	.cvsignore sources vim.spec 
Log Message:
- vim-7.0f3 BETA


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	20 Apr 2006 13:06:24 -0000	1.16
+++ .cvsignore	28 Apr 2006 14:59:42 -0000	1.17
@@ -1,4 +1,4 @@
-vim-7.0e-20060419.tar.bz2
-vim-7.0e-extra-20060419.tar.gz
-vim-7.0e-lang-20060419.tar.gz
+vim-7.0f-20060427.tar.bz2
+vim-7.0f-extra-20060427.tar.gz
+vim-7.0f-lang-20060427.tar.gz
 cvim.zip


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	20 Apr 2006 13:06:24 -0000	1.16
+++ sources	28 Apr 2006 14:59:42 -0000	1.17
@@ -1,4 +1,4 @@
-7b0e99d26a5c0107639d249eb7b8e386  vim-7.0e-20060419.tar.bz2
-8de9267fe0deedc4bfa1ffeda25f4ac7  vim-7.0e-extra-20060419.tar.gz
-5810785a36048b94ac7c2a915dce28f6  vim-7.0e-lang-20060419.tar.gz
+469aab10ce1b93c5481edcfa47814087  vim-7.0f-20060427.tar.bz2
+c8aa76ff9f398bce6159d7a0ed5dfaca  vim-7.0f-extra-20060427.tar.gz
+301703d828b118e0a12db9bd2fa9c0da  vim-7.0f-lang-20060427.tar.gz
 1f17af2008ae94359a48be7e865b084f  cvim.zip


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- vim.spec	20 Apr 2006 13:06:24 -0000	1.107
+++ vim.spec	28 Apr 2006 14:59:42 -0000	1.108
@@ -1,4 +1,4 @@
-%define CVSDATE -20060419
+%define CVSDATE -20060427
 %define WITH_SELINUX 1
 %define desktop_file 1
 %if %{desktop_file}
@@ -20,8 +20,8 @@
 
 
 %define baseversion 7.0
-%define beta e
-%define vimdir vim70e
+%define beta f
+%define vimdir vim70f
 %define patchlevel 001
 
 Summary: The VIM editor.
@@ -184,7 +184,7 @@
 %patch3002 -p1
 %patch3003 -p1
 %patch3004 -p1
-%patch3005 -p1
+#patch3005 -p1
 #patch3006 -p1
 
 %patch3009 -p1
@@ -504,6 +504,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Fri Apr 28 2006 Karsten Hopp <karsten at redhat.de> 7.0.f001-1
+- vim-7.0f3 BETA
+
 * Thu Apr 20 2006 Karsten Hopp <karsten at redhat.de> 7.0.e001-1
 - vim-7.0e BETA
 



From fedora-cvs-commits at redhat.com  Fri Apr 28 15:18:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 11:18:27 -0400
Subject: rpms/cairo/devel cairo-1.1.2-XRenderAddGlyphs-4705.patch, NONE,
	1.1 cairo.spec, 1.36, 1.37
Message-ID: <200604281518.k3SFIRVl018727@cvs.devel.redhat.com>

Author: cworth

Update of /cvs/dist/rpms/cairo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18703

Modified Files:
	cairo.spec 
Added Files:
	cairo-1.1.2-XRenderAddGlyphs-4705.patch 
Log Message:
Add cairo-1.1.2-XRenderAddGlyphs-4705.patch

cairo-1.1.2-XRenderAddGlyphs-4705.patch:
 cairo-xlib-surface.c |  191 ++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 138 insertions(+), 53 deletions(-)

--- NEW FILE cairo-1.1.2-XRenderAddGlyphs-4705.patch ---
commit 046cb653e0cbecf19db93a38dd8765fa813b24d9
Author: Jinghua Luo <sunmoon1997 at gmail.com>
Date:   Fri Apr 28 08:10:26 2006 -0700

    Suggested patch to fix bug #4705
    
    https://bugs.freedesktop.org/show_bug.cgi?id=4705

diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
index 0f195bf..3032904 100644
--- a/src/cairo-xlib-surface.c
+++ b/src/cairo-xlib-surface.c
@@ -2006,38 +2006,88 @@ cairo_xlib_surface_set_drawable (cairo_s
     surface->height = height;
 }
 
-typedef struct _cairo_xlib_surface_font_private {
-    Display		*dpy;
+#define GLYPH_INFO_MAX (3)
+typedef struct _cairo_xlib_font_glyph_info {
     GlyphSet		glyphset;
     XRenderPictFormat	*format;
+} cairo_xlib_font_glyph_info_t;
+
+typedef struct _cairo_xlib_surface_font_private {
+    Display		         *dpy;
+    cairo_xlib_font_glyph_info_t glyph_info[GLYPH_INFO_MAX];
+    int                          num_formats;
 } cairo_xlib_surface_font_private_t;
 
 static cairo_status_t
 _cairo_xlib_surface_font_init (Display		    *dpy,
-			       cairo_scaled_font_t  *scaled_font,
-			       cairo_format_t	     format)
+			       cairo_scaled_font_t  *scaled_font)
 {
     cairo_xlib_surface_font_private_t	*font_private;
+    int i;
 
     font_private = malloc (sizeof (cairo_xlib_surface_font_private_t));
     if (!font_private)
 	return CAIRO_STATUS_NO_MEMORY;
 
+    font_private->num_formats = 0;
+    for (i = 0; i < GLYPH_INFO_MAX; i ++) {
+	font_private->glyph_info[i].format = NULL;
+	font_private->glyph_info[i].glyphset = None;
+    }
+
     font_private->dpy = dpy;
-    font_private->format = _CAIRO_FORMAT_XRENDER_FORMAT(dpy, format);
-    font_private->glyphset = XRenderCreateGlyphSet (dpy, font_private->format);
     scaled_font->surface_private = font_private;
     scaled_font->surface_backend = &cairo_xlib_surface_backend;
     return CAIRO_STATUS_SUCCESS;
 }
 
+static cairo_xlib_font_glyph_info_t *
+_cairo_xlib_surface_font_get_glyph_info (cairo_scaled_font_t *scaled_font,
+					 cairo_format_t	     format)
+{
+    cairo_xlib_surface_font_private_t	*font_private = scaled_font->surface_private;
+    cairo_xlib_font_glyph_info_t        *glyph_info = &font_private->glyph_info[0];
+    int foffset;
+    
+    switch (format) {
+    case CAIRO_FORMAT_A1:
+	foffset = 0;
+	break;
+    case CAIRO_FORMAT_A8:
+	foffset = 1;
+	break;
+    case CAIRO_FORMAT_ARGB32:
+	foffset = 2;
+	break;
+    case CAIRO_FORMAT_RGB24:
+    default:
+	ASSERT_NOT_REACHED;
+    }
+    
+    if (glyph_info[foffset].glyphset == None) {
+	glyph_info[foffset].format = _CAIRO_FORMAT_XRENDER_FORMAT(font_private->dpy,
+								  format);
+	glyph_info[foffset].glyphset = XRenderCreateGlyphSet (font_private->dpy, 
+							      glyph_info[foffset].format);
+	font_private->num_formats ++;
+    }
+    
+    return glyph_info + foffset;
+}
+
 static void
 _cairo_xlib_surface_scaled_font_fini (cairo_scaled_font_t *scaled_font)
 {
     cairo_xlib_surface_font_private_t	*font_private = scaled_font->surface_private;
 
     if (font_private) {
-	XRenderFreeGlyphSet (font_private->dpy, font_private->glyphset);
+	int i;
+
+	for (i = 0; i < GLYPH_INFO_MAX; i ++) {
+	    if (font_private->glyph_info[i].glyphset)
+		XRenderFreeGlyphSet (font_private->dpy,
+				     font_private->glyph_info[i].glyphset);
+	}
 	free (font_private);
     }
 }
@@ -2050,8 +2100,10 @@ _cairo_xlib_surface_scaled_glyph_fini (c
 
     if (font_private != NULL && scaled_glyph->surface_private != NULL) {
 	unsigned long	glyph_index = _cairo_scaled_glyph_index(scaled_glyph);
+	cairo_xlib_font_glyph_info_t *glyph_info = scaled_glyph->surface_private;
+
 	XRenderFreeGlyphs (font_private->dpy,
-			   font_private->glyphset,
+			   glyph_info->glyphset,
 			   &glyph_index, 1);
     }
 }
@@ -2074,16 +2126,23 @@ _cairo_xlib_surface_add_glyph (Display *
     unsigned char *data;
     cairo_status_t status;
     cairo_xlib_surface_font_private_t *font_private;
+    cairo_xlib_font_glyph_info_t * cairo_glyph_info;
     cairo_image_surface_t *glyph_surface = scaled_glyph->surface;
 
     if (scaled_font->surface_private == NULL) {
-	status = _cairo_xlib_surface_font_init (dpy, scaled_font, 
-						glyph_surface->format);
+	status = _cairo_xlib_surface_font_init (dpy, scaled_font);
 	if (status)
 	    return status;
     }
     font_private = scaled_font->surface_private;
 
+    cairo_glyph_info = _cairo_xlib_surface_font_get_glyph_info (scaled_font,
+								glyph_surface->format);
+    if (cairo_glyph_info->glyphset == None)
+	return CAIRO_STATUS_NO_MEMORY;
+    
+    scaled_glyph->surface_private = cairo_glyph_info;
+
     /*
      *  Most of the font rendering system thinks of glyph tiles as having
      *  an origin at (0,0) and an x and y bounding box "offset" which
@@ -2188,11 +2247,11 @@ _cairo_xlib_surface_add_glyph (Display *
 
     glyph_index = _cairo_scaled_glyph_index (scaled_glyph);
     
-    XRenderAddGlyphs (dpy, font_private->glyphset,
+    XRenderAddGlyphs (dpy, cairo_glyph_info->glyphset,
 		      &glyph_index, &(glyph_info), 1,
 		      (char *) data,
 		      glyph_surface->stride * glyph_surface->height);
-
+    
     if (data != glyph_surface->data)
 	free (data);
     
@@ -2209,9 +2268,9 @@ _cairo_xlib_surface_old_show_glyphs8  (c
 				       int                     source_x,
 				       int                     source_y,
 				       const cairo_glyph_t    *glyphs,
-				       int                     num_glyphs)
+				       int                     num_glyphs,
+				       cairo_xlib_font_glyph_info_t *glyph_info)
 {
-    cairo_xlib_surface_font_private_t *font_private = scaled_font->surface_private;
     XGlyphElt8 *elts = NULL;
     XGlyphElt8 stack_elts [N_STACK_BUF];
 
@@ -2239,7 +2298,7 @@ _cairo_xlib_surface_old_show_glyphs8  (c
 	chars[i] = glyphs[i].index;
 	elts[i].chars = &(chars[i]);
 	elts[i].nchars = 1;
-	elts[i].glyphset = font_private->glyphset;
+	elts[i].glyphset = glyph_info->glyphset;
 	thisX = (int) floor (glyphs[i].x + 0.5);
 	thisY = (int) floor (glyphs[i].y + 0.5);
 	elts[i].xOff = thisX - lastX;
@@ -2252,7 +2311,7 @@ _cairo_xlib_surface_old_show_glyphs8  (c
 			    _render_operator (op),
 			    src->src_picture,
 			    self->dst_picture,
-			    font_private->format,
+			    glyph_info->format,
 			    source_x + elts[0].xOff, source_y + elts[0].yOff,
 			    0, 0,
 			    elts, num_glyphs);
@@ -2271,9 +2330,9 @@ _cairo_xlib_surface_old_show_glyphs16 (c
 				       int                     source_x,
 				       int                     source_y,
 				       const cairo_glyph_t    *glyphs,
-				       int                     num_glyphs)
+				       int                     num_glyphs,
+				       cairo_xlib_font_glyph_info_t *glyph_info)
 {
-    cairo_xlib_surface_font_private_t *font_private = scaled_font->surface_private;
     XGlyphElt16 *elts = NULL;
     XGlyphElt16 stack_elts [N_STACK_BUF];
 
@@ -2301,7 +2360,7 @@ _cairo_xlib_surface_old_show_glyphs16 (c
 	chars[i] = glyphs[i].index;
 	elts[i].chars = &(chars[i]);
 	elts[i].nchars = 1;
-	elts[i].glyphset = font_private->glyphset;
+	elts[i].glyphset = glyph_info->glyphset;
 	thisX = (int) floor (glyphs[i].x + 0.5);
 	thisY = (int) floor (glyphs[i].y + 0.5);
 	elts[i].xOff = thisX - lastX;
@@ -2314,7 +2373,7 @@ _cairo_xlib_surface_old_show_glyphs16 (c
 			    _render_operator (op),
 			    src->src_picture,
 			    self->dst_picture,
-			    font_private->format,
+			    glyph_info->format,
 			    source_x + elts[0].xOff, source_y + elts[0].yOff,
 			    0, 0,
 			    elts, num_glyphs);
@@ -2326,16 +2385,16 @@ _cairo_xlib_surface_old_show_glyphs16 (c
 }
 
 static cairo_status_t
-_cairo_xlib_surface_old_show_glyphs32 (cairo_scaled_font_t    *scaled_font,
-				       cairo_operator_t        op,
-				       cairo_xlib_surface_t   *src,
-				       cairo_xlib_surface_t   *self,
-				       int                     source_x,
-				       int                     source_y,
-				       const cairo_glyph_t    *glyphs,
-				       int                     num_glyphs)
+_cairo_xlib_surface_old_show_glyphs32 (cairo_scaled_font_t         *scaled_font,
+				       cairo_operator_t            op,
+				       cairo_xlib_surface_t        *src,
+				       cairo_xlib_surface_t        *self,
+				       int                          source_x,
+				       int                          source_y,
+				       const cairo_glyph_t          *glyphs,
+				       int                          num_glyphs,
+				       cairo_xlib_font_glyph_info_t *glyph_info)
 {
-    cairo_xlib_surface_font_private_t *font_private = scaled_font->surface_private;
     XGlyphElt32 *elts = NULL;
     XGlyphElt32 stack_elts [N_STACK_BUF];
 
@@ -2363,7 +2422,7 @@ _cairo_xlib_surface_old_show_glyphs32 (c
 	chars[i] = glyphs[i].index;
 	elts[i].chars = &(chars[i]);
 	elts[i].nchars = 1;
-	elts[i].glyphset = font_private->glyphset;
+	elts[i].glyphset = glyph_info->glyphset;
 	thisX = (int) floor (glyphs[i].x + 0.5);
 	thisY = (int) floor (glyphs[i].y + 0.5);
 	elts[i].xOff = thisX - lastX;
@@ -2376,7 +2435,7 @@ _cairo_xlib_surface_old_show_glyphs32 (c
 			    _render_operator (op),
 			    src->src_picture,
 			    self->dst_picture,
-			    font_private->format,
+			    glyph_info->format,
 			    source_x + elts[0].xOff, source_y + elts[0].yOff,
 			    0, 0,
 			    elts, num_glyphs);
@@ -2409,8 +2468,10 @@ _cairo_xlib_surface_old_show_glyphs (cai
     int glyphs_remaining, chunk_size, max_chunk_size;
     composite_operation_t operation;
     cairo_scaled_glyph_t *scaled_glyph;
+    cairo_xlib_font_glyph_info_t **glyphs_info, **glyphs_info_chunk;
+    cairo_xlib_font_glyph_info_t *stack_glyphs_info[N_STACK_BUF];
     cairo_xlib_surface_font_private_t *font_private;
-    int i;
+    int i, boundary;
     unsigned long max_index = 0;
     
 
@@ -2444,6 +2505,15 @@ _cairo_xlib_surface_old_show_glyphs (cai
     if (status)
 	goto FAIL;
     
+    if (num_glyphs < N_STACK_BUF)
+	glyphs_info = stack_glyphs_info;
+    else
+	glyphs_info = malloc (sizeof(cairo_xlib_font_glyph_info_t *) * num_glyphs);
+    if (!glyphs_info) {
+	status = CAIRO_STATUS_NO_MEMORY;
+	goto FAIL;
+    }
+
     /* Send all unsent glyphs to the server */
     for (i = 0; i < num_glyphs; i++) {
 	if (glyphs[i].index > max_index)
@@ -2453,11 +2523,11 @@ _cairo_xlib_surface_old_show_glyphs (cai
 					     CAIRO_SCALED_GLYPH_INFO_SURFACE,
 					     &scaled_glyph);
 	if (status != CAIRO_STATUS_SUCCESS)
-	    return status;
+	    goto FAIL1;
 	if (scaled_glyph->surface_private == NULL) {
 	    _cairo_xlib_surface_add_glyph (self->dpy, scaled_font, scaled_glyph);
-	    scaled_glyph->surface_private = (void *) 1;
 	}
+	glyphs_info[i] = (cairo_xlib_font_glyph_info_t *)scaled_glyph->surface_private;
     }
     
     _cairo_xlib_surface_ensure_dst_picture (self);
@@ -2471,28 +2541,40 @@ _cairo_xlib_surface_old_show_glyphs (cai
 	max_chunk_size -= sz_xRenderCompositeGlyphs32Req;
     max_chunk_size /= sz_xGlyphElt;
 
-    for (glyphs_remaining = num_glyphs, glyphs_chunk = glyphs;
-	 glyphs_remaining;
-	 glyphs_remaining -= chunk_size, glyphs_chunk += chunk_size)
+    font_private = scaled_font->surface_private;
+
+    for (glyphs_remaining = num_glyphs, glyphs_chunk = glyphs,
+	     glyphs_info_chunk = glyphs_info; glyphs_remaining;
+	 glyphs_remaining -= chunk_size, glyphs_chunk += chunk_size, 
+	     glyphs_info_chunk += chunk_size)
     {
 	chunk_size = MIN (glyphs_remaining, max_chunk_size);
 
+	if (font_private->num_formats > 1 && chunk_size > 1) {
+	    for (boundary = 1; boundary < chunk_size; boundary ++) {
+		if (glyphs_info_chunk[boundary - 1]->glyphset != glyphs_info_chunk[boundary]->glyphset) {
+		    chunk_size = boundary;
+		    break;
+		}
+	    }
+	}
+
 	/* Call the appropriate sub-function. */
 	if (max_index < 256)
 	    status = _cairo_xlib_surface_old_show_glyphs8 (scaled_font, op, src, self,
-					      source_x + attributes.x_offset - dest_x,
-					      source_y + attributes.y_offset - dest_y, 
-					      glyphs_chunk, chunk_size);
+							   source_x + attributes.x_offset - dest_x,
+							   source_y + attributes.y_offset - dest_y, 
+							   glyphs_chunk, chunk_size, glyphs_info_chunk[0]);
 	else if (max_index < 65536)
 	    status = _cairo_xlib_surface_old_show_glyphs16 (scaled_font, op, src, self,
-					       source_x + attributes.x_offset - dest_x,
-					       source_y + attributes.y_offset - dest_y, 
-					       glyphs_chunk, chunk_size);
+							    source_x + attributes.x_offset - dest_x,
+							    source_y + attributes.y_offset - dest_y, 
+							    glyphs_chunk, chunk_size, glyphs_info_chunk[0]);
 	else 
 	    status = _cairo_xlib_surface_old_show_glyphs32 (scaled_font, op, src, self,
-					       source_x + attributes.x_offset - dest_x,
-					       source_y + attributes.y_offset - dest_y, 
-					       glyphs_chunk, chunk_size);
+							    source_x + attributes.x_offset - dest_x,
+							    source_y + attributes.y_offset - dest_y, 
+							    glyphs_chunk, chunk_size, glyphs_info_chunk[0]);
 	if (status != CAIRO_STATUS_SUCCESS)
 	    break;
     }
@@ -2504,14 +2586,17 @@ _cairo_xlib_surface_old_show_glyphs (cai
 							  num_glyphs,
 							  &extents);
 	if (status == CAIRO_STATUS_SUCCESS)
-	    status = _cairo_surface_composite_shape_fixup_unbounded 
-			(&self->base, &attributes, src->width, src->height,
-			 extents.width, extents.height,
-			 source_x, source_y,
-			 dest_x - extents.x, dest_y - extents.y,
-			 dest_x, dest_y,
-			 width, height);
+	    status = _cairo_surface_composite_shape_fixup_unbounded (&self->base, &attributes, src->width, src->height,
+								     extents.width, extents.height,
+								     source_x, source_y,
+								     dest_x - extents.x, dest_y - extents.y,
+								     dest_x, dest_y,
+								     width, height);
     }
+
+ FAIL1:
+    if (glyphs_info != stack_glyphs_info)
+	free (glyphs_info);
  FAIL:
     _cairo_pattern_release_surface (pattern, &src->base, &attributes);
     


Index: cairo.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- cairo.spec	25 Apr 2006 17:41:23 -0000	1.36
+++ cairo.spec	28 Apr 2006 15:18:25 -0000	1.37
@@ -4,7 +4,7 @@
 Summary:   A vector graphics library
 Name:      cairo
 Version:   1.1.2
-Release:   1
+Release:   2
 URL:       http://cairographics.org
 Source0:   %{name}-%{version}.tar.gz
 License:   LGPL/MPL
@@ -24,6 +24,7 @@
 BuildRequires: fontconfig-devel >= %{fontconfig_version}
 
 Patch0: cairo-1.1.2-embedded-bitmaps.patch
+Patch1: cairo-1.1.2-XRenderAddGlyphs-4705.patch
 
 %description 
 Cairo is a vector graphics library designed to provide high-quality
@@ -51,6 +52,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .embedded-bitmaps
+%patch1 -p1 -b .XRenderAddGlyphs-4705
 
 %build
 %configure --enable-warnings --disable-glitz --disable-quartz \
@@ -85,6 +87,10 @@
 %{_datadir}/gtk-doc/*
 
 %changelog
+* Fri Apr 28 2006 Carl Worth <cworth at redhat.com> - 1.1.2-2
+- Add suggested patch for XRenderAddGlyphs crash of bug #4705
+  https://bugs.freedesktop.org/show_bug.cgi?id=4705
+
 * Tue Apr 25 2006 Carl Worth <cworth at redhat.com> - 1.1.2-1
 - Update to new upstream 1.1.2
 - Port forward the embedded bitmaps patch (now committed upstream to



From fedora-cvs-commits at redhat.com  Fri Apr 28 15:39:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 11:39:56 -0400
Subject: rpms/audit/devel audit-1.2.1-header-abuse.patch, NONE,
	1.1 audit-1.2.1-include.patch, NONE, 1.1 audit.spec, 1.88, 1.89
Message-ID: <200604281539.k3SFdusK023959@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23928

Modified Files:
	audit.spec 
Added Files:
	audit-1.2.1-header-abuse.patch audit-1.2.1-include.patch 
Log Message:
Update for kernel headers changes

audit-1.2.1-header-abuse.patch:
 lookup_table.c |    2 --
 1 files changed, 2 deletions(-)

--- NEW FILE audit-1.2.1-header-abuse.patch ---
--- audit-1.2.1/lib/lookup_table.c~	2006-04-07 18:46:34.000000000 +0100
+++ audit-1.2.1/lib/lookup_table.c	2006-04-28 16:38:01.000000000 +0100
@@ -29,9 +29,7 @@
 
 #include "libaudit.h"
 #include "private.h"
-#define __KERNEL__
 #include <sys/syscall.h>
-#undef __KERNEL__
 
 struct transtab {
     int   value;

audit-1.2.1-include.patch:
 libaudit.h |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE audit-1.2.1-include.patch ---
--- audit-1.2.1/lib/libaudit.h~	2006-04-10 19:50:29.000000000 +0100
+++ audit-1.2.1/lib/libaudit.h	2006-04-28 16:34:13.000000000 +0100
@@ -55,12 +55,6 @@ extern "C" {
  * 2500 - 2999 future user space (maybe integrity labels and related events)
  */
 
-#ifndef AUDIT_ADD_RULE
-#define AUDIT_ADD_RULE		1011    /* Add syscall filtering rule */
-#define AUDIT_DEL_RULE		1012    /* Delete syscall filtering rule */
-#define AUDIT_LIST_RULES	1013    /* List syscall filtering rules */
-#endif
-
 #define AUDIT_FIRST_USER_MSG    1100    /* First user space message */
 #define AUDIT_LAST_USER_MSG     1199    /* Last user space message */
 #define AUDIT_USER_AUTH         1100    /* User space authentication */
@@ -252,6 +246,11 @@ typedef enum {
  * fields. It corresponds with AUDIT_ADD_RULE, AUDIT_DEL_RULE and
  * AUDIT_LIST_RULES requests.
  */
+#ifndef AUDIT_ADD_RULE
+#define AUDIT_ADD_RULE		1011    /* Add syscall filtering rule */
+#define AUDIT_DEL_RULE		1012    /* Delete syscall filtering rule */
+#define AUDIT_LIST_RULES	1013    /* List syscall filtering rules */
+
 struct audit_rule_data {
 	uint32_t	flags;  /* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */
 	uint32_t	action; /* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */
@@ -263,6 +262,7 @@ struct audit_rule_data {
 	uint32_t	buflen; /* total length of string fields */
 	char		buf[0]; /* string fields buffer */
 };
+#endif /* AUDIT_ADD_RULE */
 
 /* data structure for who signaled the audit daemon */
 struct audit_sig_info {


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- audit.spec	26 Apr 2006 16:17:04 -0000	1.88
+++ audit.spec	28 Apr 2006 15:39:53 -0000	1.89
@@ -7,6 +7,8 @@
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: %{name}-%{version}.tar.gz
 Patch1: audit-1.1.3-initscript-disabled.patch
+Patch2: audit-1.2.1-include.patch
+Patch3: audit-1.2-1-headerabuse.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtool swig python-devel
 BuildRequires: kernel-headers >= 2.4-9.1.95
@@ -34,7 +36,7 @@
 License: LGPL
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
-Requires: glibc-kernheaders >= 2.4-9.1.95
+Requires: kernel-headers >= 2.6.16
 
 %description libs-devel
 The audit-libs-devel package contains the static libraries and header 
@@ -46,7 +48,7 @@
 License: LGPL
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
-Requires: glibc-kernheaders >= 2.4-9.1.95
+Requires: kernel-headers >= 2.6.16
 
 %description libs-python
 The audit-libs-python package contains the bindings so that libaudit
@@ -56,6 +58,8 @@
 %setup -q
 # When in production, uncomment this so the patch is applied
 #%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 autoreconf -fv --install
@@ -156,6 +160,8 @@
 %changelog
 * Wed Apr 25 2006 David Woodhouse <dwmw2 at redhat.com> 1.2.1-2
 - Require kernel-headers, not glibc-kernheaders
+- Fix redefinition of audit_rule_data with new kernel headers
+- Remove abuse of __KERNEL__ in lookup_table.c
 
 * Sun Apr 16 2006 Steve Grubb <sgrubb at redhat.com> 1.2.1-1
 - New message type for trusted apps



From fedora-cvs-commits at redhat.com  Fri Apr 28 15:53:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 11:53:13 -0400
Subject: rpms/kernel/devel linux-2.6-header-install-git.patch,1.7,1.8
Message-ID: <200604281553.k3SFrDdw019211@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19202

Modified Files:
	linux-2.6-header-install-git.patch 
Log Message:
unifdef linux/unistd.h too

linux-2.6-header-install-git.patch:
 Makefile                                |   17 ++++
 b/include/Kbuild                        |    2 
 b/include/asm-alpha/Kbuild              |    9 ++
 b/include/asm-arm/Kbuild                |    7 +
 b/include/asm-arm26/Kbuild              |    8 ++
 b/include/asm-cris/Kbuild               |    6 +
 b/include/asm-cris/arch-v10/Kbuild      |    3 
 b/include/asm-generic/Kbuild            |    3 
 b/include/asm-generic/Kbuild.asm        |   11 ++
 b/include/asm-h8300/Kbuild              |    6 +
 b/include/asm-i386/Kbuild               |    5 +
 b/include/asm-ia64/Kbuild               |    7 +
 b/include/asm-m32r/Kbuild               |    7 +
 b/include/asm-m68k/Kbuild               |   17 ++++
 b/include/asm-m68knommu/Kbuild          |   12 +++
 b/include/asm-mips/Kbuild               |   15 +++
 b/include/asm-parisc/Kbuild             |    8 ++
 b/include/asm-powerpc/Kbuild            |   10 ++
 b/include/asm-ppc/Kbuild                |    8 ++
 b/include/asm-s390/Kbuild               |    4 +
 b/include/asm-sh/Kbuild                 |    6 +
 b/include/asm-sh64/Kbuild               |    6 +
 b/include/asm-sparc/Kbuild              |   13 +++
 b/include/asm-sparc64/Kbuild            |   16 ++++
 b/include/asm-um/Kbuild                 |   14 +++
 b/include/asm-v850/Kbuild               |   10 ++
 b/include/asm-x86_64/Kbuild             |   11 ++
 b/include/linux/Kbuild                  |   62 ++++++++++++++++
 b/include/linux/byteorder/Kbuild        |    1 
 b/include/linux/dvb/Kbuild              |    2 
 b/include/linux/hdlc/Kbuild             |    1 
 b/include/linux/isdn/Kbuild             |    1 
 b/include/linux/netfilter/Kbuild        |   11 ++
 b/include/linux/netfilter_arp/Kbuild    |    2 
 b/include/linux/netfilter_bridge/Kbuild |    4 +
 b/include/linux/netfilter_ipv4/Kbuild   |   21 +++++
 b/include/linux/netfilter_ipv6/Kbuild   |    5 +
 b/include/linux/nfsd/Kbuild             |    2 
 b/include/linux/raid/Kbuild             |    1 
 b/include/linux/sunrpc/Kbuild           |    1 
 b/include/linux/tc_act/Kbuild           |    1 
 b/include/linux/tc_ematch/Kbuild        |    1 
 b/include/media/Kbuild                  |    2 
 b/include/mtd/Kbuild                    |    2 
 b/include/rdma/Kbuild                   |    1 
 b/include/scsi/Kbuild                   |    2 
 b/include/sound/Kbuild                  |    2 
 b/include/video/Kbuild                  |    1 
 b/scripts/Makefile.headersinst          |  124 ++++++++++++++++++++++++++++++++
 b/scripts/hdrcheck.sh                   |    8 ++
 50 files changed, 499 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-header-install-git.patch	27 Apr 2006 16:56:45 -0000	1.7
+++ linux-2.6-header-install-git.patch	28 Apr 2006 15:53:09 -0000	1.8
@@ -1,5 +1,4 @@
-diff --git a/Makefile b/Makefile
-index a940eae..8d92d78 100644
+unchanged:
 --- a/Makefile
 +++ b/Makefile
 @@ -858,6 +858,21 @@ depend dep:
@@ -33,17 +32,13 @@
  	@echo  ''
  	@echo  'Static analysers'
  	@echo  '  checkstack      - Generate a list of stack hogs'
-diff --git a/include/Kbuild b/include/Kbuild
-new file mode 100644
-index 0000000..ae01565
+unchanged:
 --- /dev/null
 +++ b/include/Kbuild
 @@ -0,0 +1,2 @@
 +header-y += asm-generic/ linux/ scsi/ sound/ mtd/ rdma/ video/ media/
 +header-y += asm-$(ARCH)/ 
-diff --git a/include/asm-alpha/Kbuild b/include/asm-alpha/Kbuild
-new file mode 100644
-index 0000000..57ff88a
+unchanged:
 --- /dev/null
 +++ b/include/asm-alpha/Kbuild
 @@ -0,0 +1,9 @@
@@ -56,9 +51,7 @@
 +	hdreg.h hw_irq.h hwrpb.h init.h jensen.h md.h numnodes.h pal.h \
 +	parport.h pci.h reg.h regdef.h segment.h serial.h sfp-machine.h \
 +	spinlock.h suspend.h sysinfo.h ucontext.h vga.h
-diff --git a/include/asm-arm/Kbuild b/include/asm-arm/Kbuild
-new file mode 100644
-index 0000000..fad30e6
+unchanged:
 --- /dev/null
 +++ b/include/asm-arm/Kbuild
 @@ -0,0 +1,7 @@
@@ -69,9 +62,7 @@
 +	locks.h memory.h numnodes.h nwflash.h parport.h procinfo.h \
 +	segment.h semaphore-helper.h serial.h sizes.h spinlock.h suspend.h \
 +	therm.h traps.h ucontext.h vga.h
-diff --git a/include/asm-arm26/Kbuild b/include/asm-arm26/Kbuild
-new file mode 100644
-index 0000000..8590f0b
+unchanged:
 --- /dev/null
 +++ b/include/asm-arm26/Kbuild
 @@ -0,0 +1,8 @@
@@ -83,9 +74,7 @@
 +	parport.h proc-fns.h procinfo.h segment.h semaphore-helper.h \
 +	serial.h sizes.h spinlock.h suspend.h sysirq.h ucontext.h \
 +	uncompress.h
-diff --git a/include/asm-cris/Kbuild b/include/asm-cris/Kbuild
-new file mode 100644
-index 0000000..8480c8a
+unchanged:
 --- /dev/null
 +++ b/include/asm-cris/Kbuild
 @@ -0,0 +1,6 @@
@@ -95,27 +84,21 @@
 +	fasttimer.h ipc.h rs485.h segment.h semaphore-helper.h ucontext.h
 +
 +header-y += arch-v10/
-diff --git a/include/asm-cris/arch-v10/Kbuild b/include/asm-cris/arch-v10/Kbuild
-new file mode 100644
-index 0000000..1837529
+unchanged:
 --- /dev/null
 +++ b/include/asm-cris/arch-v10/Kbuild
 @@ -0,0 +1,3 @@
 +header-y += bitops.h cache.h checksum.h dma.h elf.h io.h irq.h mmu.h \
 +	offset.h processor.h ptrace.h sv_addr_ag.h svinto.h system.h \
 +	timex.h unistd.h user.h
-diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild
-new file mode 100644
-index 0000000..2558ee8
+unchanged:
 --- /dev/null
 +++ b/include/asm-generic/Kbuild
 @@ -0,0 +1,3 @@
 +header-y += errno-base.h errno.h fcntl.h ioctl.h ipc.h mman.h signal.h	\
 +	statfs.h
 +unifdef-y := resource.h siginfo.h
-diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm
-new file mode 100644
-index 0000000..9e8ae58
+unchanged:
 --- /dev/null
 +++ b/include/asm-generic/Kbuild.asm
 @@ -0,0 +1,11 @@
@@ -130,9 +113,7 @@
 +
 +# There probably shouldn't be exported
 +unifdef-y += elf.h page.h
-diff --git a/include/asm-h8300/Kbuild b/include/asm-h8300/Kbuild
-new file mode 100644
-index 0000000..a45477a
+unchanged:
 --- /dev/null
 +++ b/include/asm-h8300/Kbuild
 @@ -0,0 +1,6 @@
@@ -142,9 +123,7 @@
 +	hw_irq.h init.h ipc.h keyboard.h linux_logo.h md.h \
 +	page_offset.h segment.h semaphore-helper.h sh_bios.h shm.h \
 +	spinlock.h target_time.h traps.h ucontext.h
-diff --git a/include/asm-i386/Kbuild b/include/asm-i386/Kbuild
-new file mode 100644
-index 0000000..5e952fd
+unchanged:
 --- /dev/null
 +++ b/include/asm-i386/Kbuild
 @@ -0,0 +1,5 @@
@@ -153,9 +132,7 @@
 +header-y += boot.h cpufeature.h debugreg.h kprobes.h ldt.h setup.h ucontext.h
 +
 +unifdef-y += mtrr.h vm86.h
-diff --git a/include/asm-ia64/Kbuild b/include/asm-ia64/Kbuild
-new file mode 100644
-index 0000000..44293be
+unchanged:
 --- /dev/null
 +++ b/include/asm-ia64/Kbuild
 @@ -0,0 +1,7 @@
@@ -166,9 +143,7 @@
 +	 ptrace_offsets.h rse.h setup.h ucontext.h
 +
 +unifdef-y += perfmon.h
-diff --git a/include/asm-m32r/Kbuild b/include/asm-m32r/Kbuild
-new file mode 100644
-index 0000000..d3f0f99
+unchanged:
 --- /dev/null
 +++ b/include/asm-m32r/Kbuild
 @@ -0,0 +1,7 @@
@@ -179,9 +154,7 @@
 +	m32102peri.h m32r.h m32r_mp_fpga.h mc146818rtc.h mmzone.h \
 +	numnodes.h pgtable-2level.h rtc.h scatterlist.h segment.h serial.h \
 +	setup.h smp.h spinlock.h string.h syscall.h ucontext.h vga.h
-diff --git a/include/asm-m68k/Kbuild b/include/asm-m68k/Kbuild
-new file mode 100644
-index 0000000..48881b3
+unchanged:
 --- /dev/null
 +++ b/include/asm-m68k/Kbuild
 @@ -0,0 +1,17 @@
@@ -202,9 +175,7 @@
 +	spinlock.h sun3-head.h sun3_pgalloc.h sun3ints.h sun3mmu.h \
 +	sun3x.h sun3xflop.h sun3xprom.h suspend.h swim_iop.h traps.h \
 +	ucontext.h vuid_event.h
-diff --git a/include/asm-m68knommu/Kbuild b/include/asm-m68knommu/Kbuild
-new file mode 100644
-index 0000000..d91668d
+unchanged:
 --- /dev/null
 +++ b/include/asm-m68knommu/Kbuild
 @@ -0,0 +1,12 @@
@@ -220,9 +191,7 @@
 +	mcfuart.h mcfwdebug.h md.h movs.h nap.h nettel.h openprom.h \
 +	oplib.h page_offset.h quicc_simple.h segment.h semaphore-helper.h \
 +	semp3.h shglcore.h shglports.h shm.h spinlock.h traps.h ucontext.h
-diff --git a/include/asm-mips/Kbuild b/include/asm-mips/Kbuild
-new file mode 100644
-index 0000000..e19ec09
+unchanged:
 --- /dev/null
 +++ b/include/asm-mips/Kbuild
 @@ -0,0 +1,15 @@
@@ -241,9 +210,7 @@
 +	serial.h sgialib.h sgiarcs.h sgidefs.h sim.h sni.h spinlock.h \
 +	stackframe.h suspend.h sysmips.h tlbdebug.h traps.h \
 +	tx3912.h ucontext.h vga.h war.h watch.h wbflush.h
-diff --git a/include/asm-parisc/Kbuild b/include/asm-parisc/Kbuild
-new file mode 100644
-index 0000000..b94e3f9
+unchanged:
 --- /dev/null
 +++ b/include/asm-parisc/Kbuild
 @@ -0,0 +1,8 @@
@@ -255,9 +222,7 @@
 +	parport_gsc.h pdc.h pdc_chassis.h pdcpat.h perf.h psw.h real.h \
 +	rt_sigframe.h segment.h semaphore-helper.h serial.h som.h \
 +	spinlock.h superio.h ucontext.h unwind.h
-diff --git a/include/asm-powerpc/Kbuild b/include/asm-powerpc/Kbuild
-new file mode 100644
-index 0000000..ac61d7e
+unchanged:
 --- /dev/null
 +++ b/include/asm-powerpc/Kbuild
 @@ -0,0 +1,10 @@
@@ -271,9 +236,7 @@
 +	ipcbuf.h msgbuf.h shmbuf.h socket.h termbits.h fcntl.h ipc.h	\
 +	poll.h shmparam.h sockios.h ucontext.h ioctl.h linkage.h	\
 +	resource.h sigcontext.h statfs.h
-diff --git a/include/asm-ppc/Kbuild b/include/asm-ppc/Kbuild
-new file mode 100644
-index 0000000..58af928
+unchanged:
 --- /dev/null
 +++ b/include/asm-ppc/Kbuild
 @@ -0,0 +1,8 @@
@@ -285,9 +248,7 @@
 +	m48t35.h machdep.h macio.h mk48t59.h nvram.h ocp_ids.h of_device.h\
 +	ohare.h open_pic.h parport.h ppc_asm.h ppcboot.h reg.h \
 +	segment.h spinlock.h todc.h traps.h ucontext.h vga.h xparameters.h
-diff --git a/include/asm-s390/Kbuild b/include/asm-s390/Kbuild
-new file mode 100644
-index 0000000..0870054
+unchanged:
 --- /dev/null
 +++ b/include/asm-s390/Kbuild
 @@ -0,0 +1,4 @@
@@ -295,9 +256,7 @@
 +
 +unifdef-y += cmb.h
 +header-y += dasd.h debug.h qeth.h sfp-machine.h tape390.h ucontext.h vtoc.h
-diff --git a/include/asm-sh/Kbuild b/include/asm-sh/Kbuild
-new file mode 100644
-index 0000000..7e77613
+unchanged:
 --- /dev/null
 +++ b/include/asm-sh/Kbuild
 @@ -0,0 +1,6 @@
@@ -307,9 +266,7 @@
 +	irq-sh73180.h \
 +	keyboard.h numnodes.h pgtable-2level.h semaphore-helper.h \
 +	serial.h sh_bios.h spinlock.h ubc.h ucontext.h watchdog.h
-diff --git a/include/asm-sh64/Kbuild b/include/asm-sh64/Kbuild
-new file mode 100644
-index 0000000..642b9db
+unchanged:
 --- /dev/null
 +++ b/include/asm-sh64/Kbuild
 @@ -0,0 +1,6 @@
@@ -319,9 +276,7 @@
 +	hw_irq.h ipc.h kmap_types.h mc146818rtc.h platform.h registers.h \
 +	scatterlist.h segment.h semaphore-helper.h serial.h smp.h \
 +	spinlock.h string.h ucontext.h
-diff --git a/include/asm-sparc/Kbuild b/include/asm-sparc/Kbuild
-new file mode 100644
-index 0000000..cecdc61
+unchanged:
 --- /dev/null
 +++ b/include/asm-sparc/Kbuild
 @@ -0,0 +1,13 @@
@@ -338,9 +293,7 @@
 +	solerrno.h spinlock.h sun4paddr.h sun4prom.h sunbpp.h svr4.h \
 +	swift.h sysen.h timer.h traps.h tsunami.h turbosparc.h \
 +	vac-ops.h vaddrs.h vfc_ioctls.h viking.h winmacro.h
-diff --git a/include/asm-sparc64/Kbuild b/include/asm-sparc64/Kbuild
-new file mode 100644
-index 0000000..225df8a
+unchanged:
 --- /dev/null
 +++ b/include/asm-sparc64/Kbuild
 @@ -0,0 +1,16 @@
@@ -360,9 +313,7 @@
 +	sfp-machine.h solerrno.h spinlock.h spitfire.h starfire.h \
 +	sunbpp.h svr4.h timer.h ttable.h uctx.h upa.h utrap.h vga.h \
 +	visasm.h watchdog.h
-diff --git a/include/asm-um/Kbuild b/include/asm-um/Kbuild
-new file mode 100644
-index 0000000..e8f61cb
+unchanged:
 --- /dev/null
 +++ b/include/asm-um/Kbuild
 @@ -0,0 +1,14 @@
@@ -380,9 +331,7 @@
 +	spinlock.h stat.h suspend.h system-generic.h system-i386.h \
 +	system-ppc.h termbits.h termios.h timex.h tlbflush.h types.h \
 +	ucontext.h unaligned.h unistd.h user.h vga.h
-diff --git a/include/asm-v850/Kbuild b/include/asm-v850/Kbuild
-new file mode 100644
-index 0000000..fe2930b
+unchanged:
 --- /dev/null
 +++ b/include/asm-v850/Kbuild
 @@ -0,0 +1,10 @@
@@ -396,9 +345,7 @@
 +	v850e.h v850e2.h v850e2_cache.h v850e_cache.h v850e_intc.h \
 +	v850e_timer_c.h v850e_timer_d.h v850e_uart.h v850e_uarta.h \
 +	v850e_uartb.h v850e_utils.h
-diff --git a/include/asm-x86_64/Kbuild b/include/asm-x86_64/Kbuild
-new file mode 100644
-index 0000000..ed24e73
+unchanged:
 --- /dev/null
 +++ b/include/asm-x86_64/Kbuild
 @@ -0,0 +1,11 @@
@@ -413,10 +360,8 @@
 +	 vsyscall32.h
 +
 +unifdef-y += ia32.h mce.h mtrr.h vsyscall.h
-diff --git a/include/linux/Kbuild b/include/linux/Kbuild
-new file mode 100644
-index 0000000..4b96235
---- /dev/null
+diff -u b/include/linux/Kbuild b/include/linux/Kbuild
+--- b/include/linux/Kbuild
 +++ b/include/linux/Kbuild
 @@ -0,0 +1,62 @@
 +header-y := byteorder/ dvb/ hdlc/ isdn/ nfsd/ raid/ sunrpc/ tc_act/	\
@@ -448,7 +393,7 @@
 +	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 statfs.h stddef.h synclink.h telephony.h ticable.h	\
-+	times.h tiocl.h tipc.h toshiba.h ultrasound.h un.h unistd.h	\
++	times.h tiocl.h tipc.h toshiba.h ultrasound.h un.h		\
 +	utime.h utsname.h version.h video_decoder.h video_encoder.h	\
 +	videotext.h vt.h wavefront.h wireless.h xattr.h x25.h		\
 +	zorro_ids.h
@@ -479,40 +424,30 @@
 +	serial_core.h serial.h serio.h shm.h signal.h smb_fs.h smb.h	\
 +	smb_mount.h socket.h sonet.h sonypi.h soundcard.h stat.h	\
 +	sysctl.h sysv_fs.h tcp.h time.h timex.h tty.h types.h		\
-+	udf_fs_i.h udp.h uinput.h uio.h user.h videodev2.h videodev.h	\
-+	wait.h wanrouter.h watchdog.h xfrm.h zftape.h
-diff --git a/include/linux/byteorder/Kbuild b/include/linux/byteorder/Kbuild
-new file mode 100644
-index 0000000..89e60f3
++	udf_fs_i.h udp.h uinput.h uio.h unistd.h user.h videodev2.h	\
++	videodev.h wait.h wanrouter.h watchdog.h xfrm.h zftape.h
+unchanged:
 --- /dev/null
 +++ b/include/linux/byteorder/Kbuild
 @@ -0,0 +1 @@
 +header-y += big_endian.h generic.h little_endian.h pdp_endian.h swab.h swabb.h
-diff --git a/include/linux/dvb/Kbuild b/include/linux/dvb/Kbuild
-new file mode 100644
-index 0000000..63973af
+unchanged:
 --- /dev/null
 +++ b/include/linux/dvb/Kbuild
 @@ -0,0 +1,2 @@
 +header-y += ca.h frontend.h net.h osd.h version.h
 +unifdef-y := audio.h dmx.h video.h
-diff --git a/include/linux/hdlc/Kbuild b/include/linux/hdlc/Kbuild
-new file mode 100644
-index 0000000..1fb2644
+unchanged:
 --- /dev/null
 +++ b/include/linux/hdlc/Kbuild
 @@ -0,0 +1 @@
 +header-y += ioctl.h
-diff --git a/include/linux/isdn/Kbuild b/include/linux/isdn/Kbuild
-new file mode 100644
-index 0000000..c1727c8
+unchanged:
 --- /dev/null
 +++ b/include/linux/isdn/Kbuild
 @@ -0,0 +1 @@
 +header-y += capicmd.h tpam.h
-diff --git a/include/linux/netfilter/Kbuild b/include/linux/netfilter/Kbuild
-new file mode 100644
-index 0000000..d06311a
+unchanged:
 --- /dev/null
 +++ b/include/linux/netfilter/Kbuild
 @@ -0,0 +1,11 @@
@@ -527,17 +462,13 @@
 +
 +unifdef-y := nf_conntrack_common.h nf_conntrack_ftp.h		\
 +	nf_conntrack_tcp.h nfnetlink.h x_tables.h xt_physdev.h
-diff --git a/include/linux/netfilter_arp/Kbuild b/include/linux/netfilter_arp/Kbuild
-new file mode 100644
-index 0000000..198ec5e
+unchanged:
 --- /dev/null
 +++ b/include/linux/netfilter_arp/Kbuild
 @@ -0,0 +1,2 @@
 +header-y := arpt_mangle.h
 +unifdef-y := arp_tables.h
-diff --git a/include/linux/netfilter_bridge/Kbuild b/include/linux/netfilter_bridge/Kbuild
-new file mode 100644
-index 0000000..5b1aba6
+unchanged:
 --- /dev/null
 +++ b/include/linux/netfilter_bridge/Kbuild
 @@ -0,0 +1,4 @@
@@ -545,9 +476,7 @@
 +	ebt_log.h ebt_mark_m.h ebt_mark_t.h ebt_nat.h ebt_pkttype.h	\
 +	ebt_redirect.h ebt_stp.h ebt_ulog.h ebt_vlan.h
 +unifdef-y := ebtables.h ebt_802_3.h
-diff --git a/include/linux/netfilter_ipv4/Kbuild b/include/linux/netfilter_ipv4/Kbuild
-new file mode 100644
-index 0000000..04e4d27
+unchanged:
 --- /dev/null
 +++ b/include/linux/netfilter_ipv4/Kbuild
 @@ -0,0 +1,21 @@
@@ -572,9 +501,7 @@
 +	ip_conntrack_pptp.h ip_conntrack_proto_gre.h			\
 +	ip_conntrack_tuple.h ip_nat.h ip_nat_rule.h ip_queue.h		\
 +	ip_tables.h
-diff --git a/include/linux/netfilter_ipv6/Kbuild b/include/linux/netfilter_ipv6/Kbuild
-new file mode 100644
-index 0000000..0e64a36
+unchanged:
 --- /dev/null
 +++ b/include/linux/netfilter_ipv6/Kbuild
 @@ -0,0 +1,5 @@
@@ -583,91 +510,67 @@
 +	ip6t_limit.h ip6t_mac.h ip6t_mark.h ip6t_multiport.h ip6t_opts.h \
 +	ip6t_owner.h ip6t_physdev.h ip6t_rt.h
 +unifdef-y := ip6_tables.h
-diff --git a/include/linux/nfsd/Kbuild b/include/linux/nfsd/Kbuild
-new file mode 100644
-index 0000000..c8c5456
+unchanged:
 --- /dev/null
 +++ b/include/linux/nfsd/Kbuild
 @@ -0,0 +1,2 @@
 +unifdef-y := const.h export.h stats.h syscall.h nfsfh.h debug.h auth.h
 +
-diff --git a/include/linux/raid/Kbuild b/include/linux/raid/Kbuild
-new file mode 100644
-index 0000000..73fa27a
+unchanged:
 --- /dev/null
 +++ b/include/linux/raid/Kbuild
 @@ -0,0 +1 @@
 +header-y += md_p.h md_u.h
-diff --git a/include/linux/sunrpc/Kbuild b/include/linux/sunrpc/Kbuild
-new file mode 100644
-index 0000000..0d1d768
+unchanged:
 --- /dev/null
 +++ b/include/linux/sunrpc/Kbuild
 @@ -0,0 +1 @@
 +unifdef-y := debug.h
-diff --git a/include/linux/tc_act/Kbuild b/include/linux/tc_act/Kbuild
-new file mode 100644
-index 0000000..5251a50
+unchanged:
 --- /dev/null
 +++ b/include/linux/tc_act/Kbuild
 @@ -0,0 +1 @@
 +header-y += tc_gact.h tc_ipt.h tc_mirred.h tc_pedit.h
-diff --git a/include/linux/tc_ematch/Kbuild b/include/linux/tc_ematch/Kbuild
-new file mode 100644
-index 0000000..381e930
+unchanged:
 --- /dev/null
 +++ b/include/linux/tc_ematch/Kbuild
 @@ -0,0 +1 @@
 +headers-y := tc_em_cmp.h tc_em_meta.h tc_em_nbyte.h tc_em_text.h
-diff --git a/include/media/Kbuild b/include/media/Kbuild
-new file mode 100644
-index 0000000..9c5d805
+unchanged:
 --- /dev/null
 +++ b/include/media/Kbuild
 @@ -0,0 +1,2 @@
 +header-y := audiochip.h v4l2-common.h
 +unifdef-y := tuner.h
-diff --git a/include/mtd/Kbuild b/include/mtd/Kbuild
-new file mode 100644
-index 0000000..e1da2a5
+unchanged:
 --- /dev/null
 +++ b/include/mtd/Kbuild
 @@ -0,0 +1,2 @@
 +unifdef-y := mtd-abi.h
 +header-y := inftl-user.h jffs2-user.h mtd-user.h nftl-user.h
-diff --git a/include/rdma/Kbuild b/include/rdma/Kbuild
-new file mode 100644
-index 0000000..eb710ba
+unchanged:
 --- /dev/null
 +++ b/include/rdma/Kbuild
 @@ -0,0 +1 @@
 +header-y := ib_user_mad.h
-diff --git a/include/scsi/Kbuild b/include/scsi/Kbuild
-new file mode 100644
-index 0000000..14a033d
+unchanged:
 --- /dev/null
 +++ b/include/scsi/Kbuild
 @@ -0,0 +1,2 @@
 +header-y += scsi.h
 +unifdef-y := scsi_ioctl.h sg.h
-diff --git a/include/sound/Kbuild b/include/sound/Kbuild
-new file mode 100644
-index 0000000..3a5a3df
+unchanged:
 --- /dev/null
 +++ b/include/sound/Kbuild
 @@ -0,0 +1,2 @@
 +header-y := asound_fm.h hdsp.h hdspm.h sfnt_info.h sscape_ioctl.h
 +unifdef-y := asequencer.h asound.h emu10k1.h sb16_csp.h 
-diff --git a/include/video/Kbuild b/include/video/Kbuild
-new file mode 100644
-index 0000000..76a6073
+unchanged:
 --- /dev/null
 +++ b/include/video/Kbuild
 @@ -0,0 +1 @@
 +unifdef-y := sisfb.h
-diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
-new file mode 100644
-index 0000000..ecb78b0
+unchanged:
 --- /dev/null
 +++ b/scripts/Makefile.headersinst
 @@ -0,0 +1,124 @@
@@ -795,9 +698,7 @@
 +# Recursion
 +$(subdir-y):
 +	$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=$(obj)/$@ dst=$(_dst)/$@ rel=../$(rel)
-diff --git a/scripts/hdrcheck.sh b/scripts/hdrcheck.sh
-new file mode 100755
-index 0000000..b3bb683
+unchanged:
 --- /dev/null
 +++ b/scripts/hdrcheck.sh
 @@ -0,0 +1,8 @@



From fedora-cvs-commits at redhat.com  Fri Apr 28 16:25:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 12:25:25 -0400
Subject: rpms/kdebase/FC-5 kdebase-3.5.2-kioslave_media_dbus.patch,1.1,1.2
Message-ID: <200604281625.k3SGPPLk016142@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16089

Modified Files:
	kdebase-3.5.2-kioslave_media_dbus.patch 
Log Message:
update dbus patch



kdebase-3.5.2-kioslave_media_dbus.patch:
 Makefile.am                                 |    5 
 configure.in.in                             |    7 
 kcmodule/managermodule.cpp                  |    4 
 kcmodule/media.desktop                      |    2 
 kfile-plugin/kfile_media.desktop            |    5 
 kfile-plugin/kfilemediaplugin.cpp           |    9 
 libmediacommon/medium.cpp                   |    4 
 libmediacommon/medium.h                     |   21 
 mediaimpl.cpp                               |   15 
 mediamanager/halbackend.cpp                 |  620 +++++++++++++++++++++++++++-
 mediamanager/halbackend.h                   |   19 
 mediamanager/mediamanager.cpp               |   81 +++
 mediamanager/mediamanager.desktop           |    1 
 mediamanager/mediamanager.h                 |    8 
 medianotifier/medianotifier.cpp             |    9 
 medianotifier/medianotifier.desktop         |    8 
 mimetypes/audiocd.desktop                   |    4 
 mimetypes/blankcd.desktop                   |    2 
 mimetypes/blankdvd.desktop                  |    2 
 mimetypes/cdrom_mounted.desktop             |    4 
 mimetypes/cdrom_unmounted.desktop           |    2 
 mimetypes/cdwriter_mounted.desktop          |    2 
 mimetypes/cdwriter_unmounted.desktop        |    2 
 mimetypes/dvdvideo.desktop                  |    4 
 mimetypes/floppy5_mounted.desktop           |    2 
 mimetypes/floppy5_unmounted.desktop         |    2 
 mimetypes/floppy_mounted.desktop            |    2 
 mimetypes/floppy_unmounted.desktop          |    2 
 mimetypes/hdd_mounted.desktop               |    1 
 mimetypes/hdd_unmounted.desktop             |    1 
 mimetypes/nfs_mounted.desktop               |    1 
 mimetypes/nfs_unmounted.desktop             |    1 
 mimetypes/removable_mounted.desktop         |    5 
 mimetypes/removable_unmounted.desktop       |    5 
 mimetypes/smb_mounted.desktop               |    3 
 mimetypes/smb_unmounted.desktop             |    3 
 mimetypes/vcd.desktop                       |    1 
 mounthelper/Makefile.am                     |    2 
 mounthelper/kio_media_mounthelper.cpp       |   51 +-
 propsdlgplugin/Makefile.am                  |   12 
 propsdlgplugin/media_propsdlgplugin.desktop |    7 
 propsdlgplugin/propertiespage.cpp           |  217 +++++++++
 propsdlgplugin/propertiespage.h             |   46 ++
 propsdlgplugin/propertiespagegui.ui         |  390 +++++++++++++++++
 propsdlgplugin/propertiespagegui.ui.h       |   22 
 propsdlgplugin/propsdlgshareplugin.cpp      |  100 ++++
 propsdlgplugin/propsdlgshareplugin.h        |   44 +
 services/media_eject.desktop                |    2 
 services/media_safelyremove.desktop         |    1 
 49 files changed, 1656 insertions(+), 107 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 kdebase-3.5.2-kioslave_media_dbus.patch
Index: kdebase-3.5.2-kioslave_media_dbus.patch
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase-3.5.2-kioslave_media_dbus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-3.5.2-kioslave_media_dbus.patch	30 Mar 2006 13:46:23 -0000	1.1
+++ kdebase-3.5.2-kioslave_media_dbus.patch	28 Apr 2006 16:25:22 -0000	1.2
@@ -1,138 +1,95 @@
-diff -Nur kdebase-3.5.2/kioslave/media.orig/configure.in.in kdebase-3.5.2/kioslave/media/configure.in.in
---- kdebase-3.5.2/kioslave/media.orig/configure.in.in	2005-10-10 17:04:01.000000000 +0200
-+++ kdebase-3.5.2/kioslave/media/configure.in.in	2006-01-25 23:50:00.000000000 +0100
-@@ -90,6 +90,13 @@
-   if test $dbus_inc != FOUND || test $dbus_lib != FOUND ; then 
-     KDE_PKG_CHECK_MODULES( DBUS, "dbus-1", [ DBUS_INCS=$DBUS_CFLAGS; dbus_inc=FOUND; dbus_lib=FOUND; ] , AC_MSG_RESULT( Nothing found on PKG_CONFIG_PATH ) )
-   fi
+--- kdebase-3.5.2/kioslave/media/medianotifier/medianotifier.cpp.kio	2006-03-17 11:17:33.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/medianotifier/medianotifier.cpp	2006-04-28 18:22:09.000000000 +0200
+@@ -54,7 +54,10 @@
+ {
+ 	kdDebug() << "MediaNotifier::onMediumChange( " << name << ", "
+ 	          << allowNotification << ")" << endl;
+-	
 +
-+  dbus_bus_var=`pkg-config --variable=system_bus_default_address dbus-1 2>/dev/null`
-+  if test -z "$dbus_bus_var"; then
-+        dbus_bus_var="unix:path=/var/run/dbus/system_bus_socket"
-+  fi
-+  AC_DEFINE_UNQUOTED(DBUS_SYSTEM_BUS, "$dbus_bus_var", [Define the unix domain path for dbus system bus])
++	if ( !allowNotification )
++	  return;
 +
-   if test $dbus_inc = FOUND && test $dbus_lib = FOUND ; then
-     AC_MSG_RESULT(headers $DBUS_INCS libraries $DBUS_LIBS)
-     dbus=FOUND
-diff -Nur kdebase-3.5.2/kioslave/media.orig/kcmodule/managermodule.cpp kdebase-3.5.2/kioslave/media/kcmodule/managermodule.cpp
---- kdebase-3.5.2/kioslave/media.orig/kcmodule/managermodule.cpp	2005-11-20 20:14:21.000000000 +0100
-+++ kdebase-3.5.2/kioslave/media/kcmodule/managermodule.cpp	2006-01-25 23:49:54.000000000 +0100
-@@ -39,15 +39,15 @@
- 	QString hal_text = view->kcfg_HalBackendEnabled->text();
- 	hal_text += " ("+i18n("No support for HAL on this system")+")";
- 	view->kcfg_HalBackendEnabled->setText( hal_text );
--	view->kcfg_HalBackendEnabled->setEnabled( false );
- #endif
-+	view->kcfg_HalBackendEnabled->setEnabled( false );
- 
- #ifndef COMPILE_LINUXCDPOLLING
- 	QString poll_text = view->kcfg_CdPollingEnabled->text();
- 	poll_text += " ("+i18n("No support for CD polling on this system")+")";
- 	view->kcfg_CdPollingEnabled->setText( poll_text );
--	view->kcfg_CdPollingEnabled->setEnabled( false );
- #endif
-+	view->kcfg_CdPollingEnabled->setEnabled( false );
- 
- 	load();
- }
-diff -Nur kdebase-3.5.2/kioslave/media.orig/kcmodule/media.desktop kdebase-3.5.2/kioslave/media/kcmodule/media.desktop
---- kdebase-3.5.2/kioslave/media.orig/kcmodule/media.desktop	2006-03-17 11:17:33.000000000 +0100
-+++ kdebase-3.5.2/kioslave/media/kcmodule/media.desktop	2006-01-25 23:49:54.000000000 +0100
-@@ -79,7 +79,6 @@
- Comment[fi]=Aseta tallennusmedia
- Comment[fr]=Configurer le m??dia de stockage
- Comment[fy]=Opslachmedia ynstelle
--Comment[ga]=Cumraigh Me??in St??r??la
- Comment[gl]=Configurar Medios de Armacenaxe
- Comment[hu]=A t??rol??eszk??z??k be??ll??t??sa
- Comment[is]=Stillingar geymslumi??la
-@@ -123,7 +122,6 @@
- Keywords[fi]=varasto,media,usb,cdrom,laite
- Keywords[fr]=stockage,media,medium,usb,cdrom,p??riph??rique
- Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart
--Keywords[ga]=st??r??il,st??ras,me??in,me??n,usb,cdrom,dl??thdhiosca,gl??as
- Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo
- Keywords[hu]=t??rol??,adathordoz??,USB,CD-ROM,eszk??z
- Keywords[is]=geymsla,mi??ill,usb,cdrom,t??ki
-diff -Nur kdebase-3.5.2/kioslave/media.orig/kfile-plugin/kfile_media.desktop kdebase-3.5.2/kioslave/media/kfile-plugin/kfile_media.desktop
---- kdebase-3.5.2/kioslave/media.orig/kfile-plugin/kfile_media.desktop	2006-03-17 11:17:33.000000000 +0100
-+++ kdebase-3.5.2/kioslave/media/kfile-plugin/kfile_media.desktop	2006-01-25 23:49:52.000000000 +0100
-@@ -18,12 +18,11 @@
- Name[fi]=Tallenteiden tiedot
- Name[fr]=Informations sur le m??dia
- Name[fy]=Mediumynformaasje
--Name[ga]=Eolas faoin Mhe??n
- Name[gl]=Informaz??n do Meio
- Name[he]=???????? ?????????? ??????????
- Name[hi]=?????????????????? ?????????????????????
- Name[hu]=Adathordoz??-jellemz??k
--Name[is]=Uppl??singar um mi??il
-+Name[is]=Uppl??singar um mi??ill
- Name[it]=Informazioni supporto
- Name[ja]=??????????????????
- Name[km]=??????????????????????????????????????????
-@@ -58,4 +57,4 @@
- Name[zh_TW]=????????????
- ServiceTypes=KFilePlugin
- X-KDE-Library=kfile_media
--MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera
-+MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera,media/camera_mounted,media/camera_unmounted
-diff -Nur kdebase-3.5.2/kioslave/media.orig/kfile-plugin/kfilemediaplugin.cpp kdebase-3.5.2/kioslave/media/kfile-plugin/kfilemediaplugin.cpp
---- kdebase-3.5.2/kioslave/media.orig/kfile-plugin/kfilemediaplugin.cpp	2005-11-08 23:36:07.000000000 +0100
-+++ kdebase-3.5.2/kioslave/media/kfile-plugin/kfilemediaplugin.cpp	2006-01-25 23:49:52.000000000 +0100
-@@ -64,12 +64,16 @@
- 	addMimeType( "media/floppy_unmounted" );
- 	addMimeType( "media/zip_unmounted" );
- 	addMimeType( "media/gphoto2camera" );
-+	addMimeType( "media/camera_mounted" );
-+	addMimeType( "media/camera_unmounted" );	
- }
- 
- bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/)
+ // Update user activity timestamp, otherwise the notification dialog will be shown
+ // in the background due to focus stealing prevention. Entering a new media can
+ // be seen as a kind of user activity after all. It'd be better to update the timestamp
+@@ -95,11 +98,11 @@
  {
--	const Medium medium = askMedium(info);
-+        const Medium medium = askMedium(info);
+ 	QString mimetype = medium.mimetype();
  
-+	kdDebug() << "KFileMediaPlugin::readInfo " << medium.id() << endl;
-+ 
- 	if (medium.id().isNull()) return false;
+-	bool is_cdrom = mimetype.contains( "cd" ) || mimetype.contains( "dvd" );
++	bool is_cdrom = mimetype.startsWith( "cd" ) || mimetype.startsWith( "dvd" );
+ 	bool is_mounted = mimetype.endsWith( "_mounted" );
  	
- 	QString mount_point = medium.mountPoint();
-@@ -161,7 +165,8 @@
- const Medium KFileMediaPlugin::askMedium(KFileMetaInfo &info)
- {
- 	DCOPRef mediamanager("kded", "mediamanager");
--	DCOPReply reply = mediamanager.call( "properties", info.url().fileName() );
-+	kdDebug() << "properties " << info.url() << endl;
-+	DCOPReply reply = mediamanager.call( "properties", info.url().url() );
- 
- 	if ( !reply.isValid() )
+ 	// We autorun only on CD/DVD or removable disks (USB, Firewire)
+-	if ( !( is_cdrom && is_mounted )
++	if ( !( is_cdrom || is_mounted )
+ 	  && mimetype!="media/removable_mounted" )
  	{
-diff -Nur kdebase-3.5.2/kioslave/media.orig/libmediacommon/medium.cpp kdebase-3.5.2/kioslave/media/libmediacommon/medium.cpp
---- kdebase-3.5.2/kioslave/media.orig/libmediacommon/medium.cpp	2005-10-10 17:04:00.000000000 +0200
-+++ kdebase-3.5.2/kioslave/media/libmediacommon/medium.cpp	2006-02-15 23:51:31.000000000 +0100
-@@ -40,6 +40,8 @@
- 	m_properties+= QString::null; /* ICON_NAME */
- 
- 	loadUserLabel();
-+
-+	m_halmounted = false;
- }
- 
- Medium::Medium()
-@@ -57,6 +59,8 @@
- 	m_properties+= QString::null; /* BASE_URL */
- 	m_properties+= QString::null; /* MIME_TYPE */
- 	m_properties+= QString::null; /* ICON_NAME */
-+	
-+	m_halmounted = false;
- }
- 
- const Medium Medium::create(const QStringList &properties)
-diff -Nur kdebase-3.5.2/kioslave/media.orig/libmediacommon/medium.h kdebase-3.5.2/kioslave/media/libmediacommon/medium.h
---- kdebase-3.5.2/kioslave/media.orig/libmediacommon/medium.h	2005-10-10 17:04:00.000000000 +0200
-+++ kdebase-3.5.2/kioslave/media/libmediacommon/medium.h	2006-02-15 23:51:31.000000000 +0100
+ 		return false;
+--- kdebase-3.5.2/kioslave/media/medianotifier/medianotifier.desktop.kio	2006-03-17 11:17:33.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/medianotifier/medianotifier.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -16,23 +16,18 @@
+ Name[el]=???????????????? ?????????????????????? ??????????
+ Name[es]=Demonio de notificaciones de medios
+ Name[et]=Andmekandjate m??rguannete deemon
+-Name[eu]=Euskarrien jakinarazpen daemon-a
+ Name[fi]=Mediahuomautin
+ Name[fr]=D??mon de notifications des m??dia
+ Name[fy]=Medianotifikaasje-daemon
+ Name[hu]=Lemezfigyel?? szolg??ltat??s
+ Name[is]=Mi??ils tilkynningarp??ki
+ Name[it]=Demone notifiche dispositivi
+-Name[ja]=??????????????????????????????
+-Name[km]=?????????????????????????????????????????????????????????????????????????????????????????????????????????
+ Name[lt]=Media prane??im?? tarnyba
+-Name[nb]=Medievarslingsnisse
+ Name[nds]=Medien-Narichtend??moon
+ Name[nl]=Medianotificatie-daemon
+ Name[pl]=Us??uga powiadamiania o no??nikach
+ Name[pt]=Servidor de Notifica????o de Dispositivos
+ Name[pt_BR]=Servidor de Notifica????o de Dispositivos
+-Name[ru]=?????????? ?????????????????????? ???? ???????????????????????? ??????????????????
+ Name[sl]=Demon za obve????anje o nosilcih
+ Name[sr]=?????????? ???? ???????????????????? ?? ????????????????????
+ Name[sr at Latn]=Demon za obave??tenja o medijumima
+@@ -50,13 +45,12 @@
+ Comment[el]=???????? ?????????????????????? ?????????????????? ??????????
+ Comment[es]=Un notificador de medios empotrable
+ Comment[et]=Andmekandja ??hendamisest m??rkuandev deemon
+-Comment[eu]=Euskarri konektatze jakinarazlea
+ Comment[fi]=Liitetyn median huomautin
+ Comment[fr]=Notification de connexion de m??dia
+ Comment[fy]=Meidieling fan oankeppele media
[...4415 lines suppressed...]
++++ kdebase-3.5.2/kioslave/media/mimetypes/hdd_unmounted.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -21,7 +21,6 @@
+ Comment[fi]=Irrotettu kiintolevyosio
+ Comment[fr]=Partition de disque dur non mont??e
+ Comment[fy]=Ofkeppele F??steskiif folume
+-Comment[ga]=Imleabhar Diosca Crua Gan Fheisti??
+ Comment[gl]=Partiz??n do Disco Duro Non Montada
+ Comment[he]=?????????? ???????? ???????? ????????????
+ Comment[hi]=?????????????????????????????? ??????????????? ??????????????? ?????????????????????
+--- kdebase-3.5.2/kioslave/media/mimetypes/floppy5_mounted.desktop.kio	2006-03-17 11:17:34.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/mimetypes/floppy5_mounted.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -52,7 +52,7 @@
+ Comment[pt]=Disquete de 5??" montada
+ Comment[pt_BR]=Disquete  5??" Montado
+ Comment[ro]=Dischet?? 5??" montat??
+-Comment[ru]=???????????????????????????? ?????????????? 5??"
++Comment[ru]=???????????????????????????? ???????????????? 5??"
+ Comment[rw]=Disikete 5??" Yashyizwemo
+ Comment[se]=??atnon 5??-dibmaskearru
+ Comment[sk]=Pripojen?? disketa 5??"
+--- kdebase-3.5.2/kioslave/media/mimetypes/audiocd.desktop.kio	2006-03-17 11:17:34.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/mimetypes/audiocd.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -19,7 +19,7 @@
+ Comment[he]=???????????????? ??????
+ Comment[hi]=??????????????? ????????????
+ Comment[hu]=Hang-CD
+-Comment[is]=Hlj????diskur
++Comment[is]=Hlj???? CD
+ Comment[it]=CD audio
+ Comment[ja]=??????????????? CD
+ Comment[km]=???????????????????????????????????????
+@@ -33,7 +33,7 @@
+ Comment[pt]=CD ??udio
+ Comment[pt_BR]=CD de ??udio
+ Comment[ro]=CD Audio
+-Comment[ru]=?????????? CD
++Comment[ru]=???????????????? CD
+ Comment[rw]=CD y'Inyumvo
+ Comment[se]=Jietna-CD
+ Comment[sl]=Glasbeni CD
+--- kdebase-3.5.2/kioslave/media/mimetypes/cdwriter_unmounted.desktop.kio	2006-03-17 11:17:34.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/mimetypes/cdwriter_unmounted.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -53,7 +53,7 @@
+ Comment[pt]=Gravador de CDs desmontado
+ Comment[pt_BR]=Gravador de CD Desmontado
+ Comment[ro]=CD Writer nemontat
+-Comment[ru]=?????????????????????????????? CD (?? ???????????????????????? ????????????)
++Comment[ru]=?????????????????????????????? CD Writer
+ Comment[rw]=Mwandika CD Yakuwemo
+ Comment[se]=G??lgajuvvon CD-????lli
+ Comment[sk]=Nepripojen?? napa??ovacia mechanika CD
+--- kdebase-3.5.2/kioslave/media/mimetypes/nfs_unmounted.desktop.kio	2006-03-17 11:17:34.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/mimetypes/nfs_unmounted.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -21,7 +21,6 @@
+ Comment[fi]=Irrotettu NFS-jako
+ Comment[fr]=Ressource NFS non mont??e
+ Comment[fy]=Oankeppele NFS-boarne
+-Comment[ga]=Comhroinn NFS Gan Fheisti??
+ Comment[gl]=Compartiz??n NFS non Montada
+ Comment[he]=???????? NFS ??????????
+ Comment[hi]=?????????????????????????????? ????????????????????? ????????????
+--- kdebase-3.5.2/kioslave/media/mimetypes/cdrom_unmounted.desktop.kio	2006-03-17 11:17:34.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/mimetypes/cdrom_unmounted.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -53,7 +53,7 @@
+ Comment[pt]=CD-ROM desmontado
+ Comment[pt_BR]=CD-ROM Desmontado
+ Comment[ro]=CD-ROM nemontat
+-Comment[ru]=?????????????????????????????? CD
++Comment[ru]=?????????????????????????????? CD-ROM
+ Comment[rw]=CD-ROM Yakuwemo
+ Comment[se]=G??lgajuvvon CD-ROM
+ Comment[sk]=Nepripojen?? CD-ROM
+--- kdebase-3.5.2/kioslave/media/mediaimpl.cpp.kio	2005-10-10 17:04:01.000000000 +0200
++++ kdebase-3.5.2/kioslave/media/mediaimpl.cpp	2006-04-28 18:22:09.000000000 +0200
+@@ -226,6 +226,8 @@
+ 
+ 		mp_mounting = &medium;
+ 		
++		
++		/*
+ 		KIO::Job* job = KIO::mount(false, 0,
+ 		                           medium.deviceNode(),
+ 		                           medium.mountPoint());
+@@ -234,6 +236,7 @@
+ 		         this, SLOT( slotMountResult( KIO::Job * ) ) );
+ 		connect( job, SIGNAL( warning( KIO::Job *, const QString & ) ),
+ 		         this, SLOT( slotWarning( KIO::Job *, const QString & ) ) );
++		*/
+ 		kapp->dcopClient()
+ 		->connectDCOPSignal("kded", "mediamanager",
+ 		                    "mediumChanged(QString, bool)",
+@@ -241,7 +244,17 @@
+ 		                    "slotMediumChanged(QString)",
+ 		                    false);
+ 
+-		qApp->eventLoop()->enterLoop();
++		DCOPRef mediamanager("kded", "mediamanager");
++		DCOPReply reply = mediamanager.call( "mount", medium.id());
++		if (reply.isValid())
++		  reply.get(m_lastErrorMessage);
++		else
++		  m_lastErrorMessage = i18n("Internal Error");
++		if (!m_lastErrorMessage.isEmpty())
++		  m_lastErrorCode = KIO::ERR_SLAVE_DEFINED;
++		else {
++		  qApp->eventLoop()->enterLoop();
++		}
+ 
+ 		mp_mounting = 0L;
+ 		
+--- kdebase-3.5.2/kioslave/media/kcmodule/media.desktop.kio	2006-03-17 11:17:33.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/kcmodule/media.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -79,7 +79,6 @@
+ Comment[fi]=Aseta tallennusmedia
+ Comment[fr]=Configurer le m??dia de stockage
+ Comment[fy]=Opslachmedia ynstelle
+-Comment[ga]=Cumraigh Me??in St??r??la
+ Comment[gl]=Configurar Medios de Armacenaxe
+ Comment[hu]=A t??rol??eszk??z??k be??ll??t??sa
+ Comment[is]=Stillingar geymslumi??la
+@@ -123,7 +122,6 @@
+ Keywords[fi]=varasto,media,usb,cdrom,laite
+ Keywords[fr]=stockage,media,medium,usb,cdrom,p??riph??rique
+ Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart
+-Keywords[ga]=st??r??il,st??ras,me??in,me??n,usb,cdrom,dl??thdhiosca,gl??as
+ Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo
+ Keywords[hu]=t??rol??,adathordoz??,USB,CD-ROM,eszk??z
+ Keywords[is]=geymsla,mi??ill,usb,cdrom,t??ki
+--- kdebase-3.5.2/kioslave/media/kcmodule/managermodule.cpp.kio	2005-11-20 20:14:21.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/kcmodule/managermodule.cpp	2006-04-28 18:22:09.000000000 +0200
+@@ -39,15 +39,15 @@
+ 	QString hal_text = view->kcfg_HalBackendEnabled->text();
+ 	hal_text += " ("+i18n("No support for HAL on this system")+")";
+ 	view->kcfg_HalBackendEnabled->setText( hal_text );
+-	view->kcfg_HalBackendEnabled->setEnabled( false );
+ #endif
++	view->kcfg_HalBackendEnabled->setEnabled( false );
+ 
+ #ifndef COMPILE_LINUXCDPOLLING
+ 	QString poll_text = view->kcfg_CdPollingEnabled->text();
+ 	poll_text += " ("+i18n("No support for CD polling on this system")+")";
+ 	view->kcfg_CdPollingEnabled->setText( poll_text );
+-	view->kcfg_CdPollingEnabled->setEnabled( false );
+ #endif
++	view->kcfg_CdPollingEnabled->setEnabled( false );
+ 
+ 	load();
+ }
+--- kdebase-3.5.2/kioslave/media/kfile-plugin/kfilemediaplugin.cpp.kio	2005-11-08 23:36:07.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/kfile-plugin/kfilemediaplugin.cpp	2006-04-28 18:22:09.000000000 +0200
+@@ -64,12 +64,16 @@
+ 	addMimeType( "media/floppy_unmounted" );
+ 	addMimeType( "media/zip_unmounted" );
+ 	addMimeType( "media/gphoto2camera" );
++	addMimeType( "media/camera_mounted" );
++	addMimeType( "media/camera_unmounted" );	
+ }
+ 
+ bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/)
+ {
+-	const Medium medium = askMedium(info);
++        const Medium medium = askMedium(info);
+ 
++	kdDebug() << "KFileMediaPlugin::readInfo " << medium.id() << endl;
++ 
+ 	if (medium.id().isNull()) return false;
+ 	
+ 	QString mount_point = medium.mountPoint();
+@@ -161,7 +165,8 @@
+ const Medium KFileMediaPlugin::askMedium(KFileMetaInfo &info)
+ {
+ 	DCOPRef mediamanager("kded", "mediamanager");
+-	DCOPReply reply = mediamanager.call( "properties", info.url().fileName() );
++	kdDebug() << "properties " << info.url() << endl;
++	DCOPReply reply = mediamanager.call( "properties", info.url().url() );
+ 
+ 	if ( !reply.isValid() )
+ 	{
+--- kdebase-3.5.2/kioslave/media/kfile-plugin/kfile_media.desktop.kio	2006-03-17 11:17:33.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/kfile-plugin/kfile_media.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -18,12 +18,11 @@
+ Name[fi]=Tallenteiden tiedot
+ Name[fr]=Informations sur le m??dia
+ Name[fy]=Mediumynformaasje
+-Name[ga]=Eolas faoin Mhe??n
+ Name[gl]=Informaz??n do Meio
+ Name[he]=???????? ?????????? ??????????
+ Name[hi]=?????????????????? ?????????????????????
+ Name[hu]=Adathordoz??-jellemz??k
+-Name[is]=Uppl??singar um mi??il
++Name[is]=Uppl??singar um mi??ill
+ Name[it]=Informazioni supporto
+ Name[ja]=??????????????????
+ Name[km]=??????????????????????????????????????????
+@@ -58,4 +57,4 @@
+ Name[zh_TW]=????????????
+ ServiceTypes=KFilePlugin
+ X-KDE-Library=kfile_media
+-MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera
++MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera,media/camera_mounted,media/camera_unmounted



From fedora-cvs-commits at redhat.com  Fri Apr 28 16:38:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 12:38:33 -0400
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders.spec, 1.119,
	1.120 sources, 1.32, 1.33
Message-ID: <200604281638.k3SGcXhn018410@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18370

Modified Files:
	glibc-kernheaders.spec sources 
Log Message:
clean up unistd.h


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- glibc-kernheaders.spec	28 Apr 2006 11:56:31 -0000	1.119
+++ glibc-kernheaders.spec	28 Apr 2006 16:38:20 -0000	1.120
@@ -1,7 +1,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -91,6 +91,10 @@
 
 
 %changelog
+* Fri Apr 28 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-20
+- Remove syscall macros from asm-*/unistd.h
+- Clean up asm-generic/signal.h
+
 * Thu Apr 27 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-19
 - Remove device table crap from linux/input.h (#190157)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	28 Apr 2006 11:56:31 -0000	1.32
+++ sources	28 Apr 2006 16:38:20 -0000	1.33
@@ -1 +1 @@
-09f47821e777cfc510a3e8322538b93f  glibc-kernheaders.tar.bz2
+54b5e05d6e954787990202f521205f45  glibc-kernheaders.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr 28 16:39:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 12:39:28 -0400
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders.spec,1.120,1.121
Message-ID: <200604281639.k3SGdS3o018548@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18518

Modified Files:
	glibc-kernheaders.spec 
Log Message:
update Provides:


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- glibc-kernheaders.spec	28 Apr 2006 16:38:20 -0000	1.120
+++ glibc-kernheaders.spec	28 Apr 2006 16:39:24 -0000	1.121
@@ -6,7 +6,7 @@
 Group: Development/System
 ExclusiveOS: Linux
 Obsoletes: kernel-headers
-Provides: kernel-headers = 2.4.2
+Provides: kernel-headers = 2.6.16
 Prereq: fileutils initscripts >= 5.83
 %undefine _enable_debug_packages
 
@@ -94,6 +94,7 @@
 * Fri Apr 28 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-20
 - Remove syscall macros from asm-*/unistd.h
 - Clean up asm-generic/signal.h
+- Update kernel-headers Provides:
 
 * Thu Apr 27 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-19
 - Remove device table crap from linux/input.h (#190157)



From fedora-cvs-commits at redhat.com  Fri Apr 28 16:47:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 12:47:52 -0400
Subject: rpms/libxml2/devel .cvsignore, 1.31, 1.32 libxml2.spec, 1.34,
	1.35 sources, 1.33, 1.34
Message-ID: <200604281647.k3SGlqm7000809@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/libxml2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30195

Modified Files:
	.cvsignore libxml2.spec sources 
Log Message:
Upstream release of 2.6.24, Daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libxml2/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	5 Jan 2006 15:50:02 -0000	1.31
+++ .cvsignore	28 Apr 2006 16:47:50 -0000	1.32
@@ -9,3 +9,4 @@
 libxml2-2.6.21.tar.gz
 libxml2-2.6.22.tar.gz
 libxml2-2.6.23.tar.gz
+libxml2-2.6.24.tar.gz


Index: libxml2.spec
===================================================================
RCS file: /cvs/dist/rpms/libxml2/devel/libxml2.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libxml2.spec	11 Feb 2006 04:20:55 -0000	1.34
+++ libxml2.spec	28 Apr 2006 16:47:50 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.6.23
-Release: 1.2
+Version: 2.6.24
+Release: 1
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz
@@ -127,14 +127,8 @@
 %doc doc/python.html
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.6.23-1.2
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.6.23-1.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Thu Jan  5 2006 Daniel Veillard <veillard at redhat.com>
-- upstream release 2.6.23 see http://xmlsoft.org/news.html
+* Fri Apr 28 2006 Daniel Veillard <veillard at redhat.com>
+- upstream release 2.6.24 see http://xmlsoft.org/news.html
 
 * Thu Jan  2 2003 Daniel Veillard <veillard at redhat.com>
 - integrated drv_libxml2 xml.sax driver from St?phane Bidoul


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libxml2/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	5 Jan 2006 15:50:02 -0000	1.33
+++ sources	28 Apr 2006 16:47:50 -0000	1.34
@@ -1 +1 @@
-0f37385e3ad73cc94db43d6873f4fc3b  libxml2-2.6.23.tar.gz
+a0e913c13b5ddbd336fcca7104da6583  libxml2-2.6.24.tar.gz



From fedora-cvs-commits at redhat.com  Fri Apr 28 16:57:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 12:57:18 -0400
Subject: rpms/kdebase/FC-5 kdebase-3.5.2-dbus.patch,1.2,1.3
Message-ID: <200604281657.k3SGvIKr006303@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6245

Modified Files:
	kdebase-3.5.2-dbus.patch 
Log Message:
update kdebase-3.5.2-dbus.patch


kdebase-3.5.2-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.2/kioslave/media/mediamanager/halbackend.h   |    2 
 9 files changed, 1286 insertions(+), 69 deletions(-)

Index: kdebase-3.5.2-dbus.patch
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase-3.5.2-dbus.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdebase-3.5.2-dbus.patch	4 Apr 2006 09:54:44 -0000	1.2
+++ kdebase-3.5.2-dbus.patch	28 Apr 2006 16:57:14 -0000	1.3
@@ -1298,7 +1298,7 @@
 +}
 +
 +#endif
---- kdebase-3.5.1/kioslave/media/configure.in.in.tn	2006-01-26 15:45:06.000000000 +0100
+--- kdebase-3.5.1/kioslave/media/configure.in.in.dbus	2006-01-26 15:45:06.000000000 +0100
 +++ kdebase-3.5.1/kioslave/media/configure.in.in	2006-01-26 15:53:54.000000000 +0100
 @@ -106,70 +106,6 @@
  
@@ -1416,3 +1416,14 @@
  
  kded_mediamanager_la_SOURCES = mediamanager.cpp mediamanager.skel medialist.cpp backendbase.cpp fstabbackend.cpp removablebackend.cpp mediadirnotify.cpp mediadirnotify.skel
  kded_mediamanager_la_LDFLAGS = $(all_libraries) -module -avoid-version
+--- kdebase-3.5.2/kioslave/media/mediamanager/halbackend.h.tn	2006-04-28 18:53:18.000000000 +0200
++++ kdebase-3.5.2/kioslave/media/mediamanager/halbackend.h	2006-04-28 18:53:35.000000000 +0200
+@@ -40,7 +40,7 @@
+ /* We acknowledge the the dbus API is unstable */
+ #define DBUS_API_SUBJECT_TO_CHANGE
+ /* DBus-Qt bindings */
+-#include <dbus/connection.h>
++#include <connection.h>
+ /* HAL libraries */
+ #include <libhal.h>
+ #include <libhal-storage.h>



From fedora-cvs-commits at redhat.com  Fri Apr 28 17:06:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 13:06:40 -0400
Subject: rpms/audit/devel audit.spec,1.89,1.90
Message-ID: <200604281706.k3SH6eLE007736@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7712

Modified Files:
	audit.spec 
Log Message:
Fir type in patch name



Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- audit.spec	28 Apr 2006 15:39:53 -0000	1.89
+++ audit.spec	28 Apr 2006 17:06:18 -0000	1.90
@@ -8,7 +8,7 @@
 Source0: %{name}-%{version}.tar.gz
 Patch1: audit-1.1.3-initscript-disabled.patch
 Patch2: audit-1.2.1-include.patch
-Patch3: audit-1.2-1-headerabuse.patch
+Patch3: audit-1.2-1-header-abuse.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtool swig python-devel
 BuildRequires: kernel-headers >= 2.4-9.1.95



From fedora-cvs-commits at redhat.com  Fri Apr 28 17:10:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 13:10:25 -0400
Subject: rpms/audit/devel audit.spec,1.90,1.91
Message-ID: <200604281710.k3SHAPio007976@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7950

Modified Files:
	audit.spec 
Log Message:
Fix typo. Harder.



Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- audit.spec	28 Apr 2006 17:06:18 -0000	1.90
+++ audit.spec	28 Apr 2006 17:09:58 -0000	1.91
@@ -8,7 +8,7 @@
 Source0: %{name}-%{version}.tar.gz
 Patch1: audit-1.1.3-initscript-disabled.patch
 Patch2: audit-1.2.1-include.patch
-Patch3: audit-1.2-1-header-abuse.patch
+Patch3: audit-1.2.1-header-abuse.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtool swig python-devel
 BuildRequires: kernel-headers >= 2.4-9.1.95



From fedora-cvs-commits at redhat.com  Fri Apr 28 17:10:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 13:10:46 -0400
Subject: rpms/kernel/devel linux-2.6-header-cleanup-git.patch,1.10,1.11
Message-ID: <200604281710.k3SHAkQf008004@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7991

Modified Files:
	linux-2.6-header-cleanup-git.patch 
Log Message:
simpler fix for the input.h crap

linux-2.6-header-cleanup-git.patch:
 b/include/asm-i386/page.h                            |    5 
 b/include/asm-mips/unistd.h                          |    7 
 b/include/asm-powerpc/unistd.h                       |    8 
 b/include/asm-s390/ptrace.h                          |    6 
 b/include/asm-s390/unistd.h                          |    8 
 b/include/asm-x86_64/page.h                          |    5 
 b/include/linux/elf-em.h                             |   44 ++++
 b/include/linux/input.h                              |    4 
 b/include/linux/unistd.h                             |    2 
 include/acpi/platform/aclinux.h                      |    1 
 include/acpi/processor.h                             |    1 
 include/asm-alpha/bitops.h                           |    1 
 include/asm-alpha/cache.h                            |    1 
 include/asm-alpha/cacheflush.h                       |    1 
 include/asm-alpha/core_cia.h                         |    1 
 include/asm-alpha/core_t2.h                          |    1 
 include/asm-alpha/dma-mapping.h                      |    1 
 include/asm-alpha/dma.h                              |    1 
 include/asm-alpha/floppy.h                           |    1 
 include/asm-alpha/hardirq.h                          |    1 
 include/asm-alpha/hw_irq.h                           |    1 
 include/asm-alpha/ide.h                              |    1 
 include/asm-alpha/io.h                               |    1 
 include/asm-alpha/irq.h                              |    1 
 include/asm-alpha/kmap_types.h                       |    1 
 include/asm-alpha/machvec.h                          |    1 
 include/asm-alpha/mmu_context.h                      |    1 
 include/asm-alpha/mmzone.h                           |    1 
 include/asm-alpha/page.h                             |    1 
 include/asm-alpha/param.h                            |    1 
 include/asm-alpha/pgalloc.h                          |    1 
 include/asm-alpha/pgtable.h                          |    1 
 include/asm-alpha/serial.h                           |    1 
 include/asm-alpha/smp.h                              |    1 
 include/asm-alpha/spinlock.h                         |    1 
 include/asm-alpha/system.h                           |    1 
 include/asm-alpha/tlbflush.h                         |    1 
 include/asm-alpha/unistd.h                           |    7 
 include/asm-arm/apm.h                                |    1 
 include/asm-arm/arch-aaec2000/memory.h               |    1 
 include/asm-arm/arch-cl7500/acornfb.h                |    1 
 include/asm-arm/arch-clps711x/hardware.h             |    1 
 include/asm-arm/arch-clps711x/memory.h               |    1 
 include/asm-arm/arch-clps711x/uncompress.h           |    1 
 include/asm-arm/arch-ebsa285/hardware.h              |    1 
 include/asm-arm/arch-ebsa285/memory.h                |    1 
 include/asm-arm/arch-ebsa285/vmalloc.h               |    1 
 include/asm-arm/arch-integrator/smp.h                |    1 
 include/asm-arm/arch-iop3xx/memory.h                 |    1 
 include/asm-arm/arch-iop3xx/timex.h                  |    1 
 include/asm-arm/arch-iop3xx/uncompress.h             |    1 
 include/asm-arm/arch-ixp4xx/dma.h                    |    1 
 include/asm-arm/arch-lh7a40x/constants.h             |    1 
 include/asm-arm/arch-lh7a40x/irqs.h                  |    1 
 include/asm-arm/arch-lh7a40x/registers.h             |    1 
 include/asm-arm/arch-omap/board.h                    |    1 
 include/asm-arm/arch-omap/hardware.h                 |    1 
 include/asm-arm/arch-omap/system.h                   |    1 
 include/asm-arm/arch-omap/uncompress.h               |    1 
 include/asm-arm/arch-pxa/idp.h                       |    1 
 include/asm-arm/arch-pxa/irqs.h                      |    1 
 include/asm-arm/arch-pxa/pxa-regs.h                  |    1 
 include/asm-arm/arch-pxa/timex.h                     |    1 
 include/asm-arm/arch-realview/smp.h                  |    1 
 include/asm-arm/arch-s3c2410/dma.h                   |    1 
 include/asm-arm/arch-s3c2410/uncompress.h            |    1 
 include/asm-arm/arch-sa1100/assabet.h                |    1 
 include/asm-arm/arch-sa1100/cerf.h                   |    1 
 include/asm-arm/arch-sa1100/collie.h                 |    1 
 include/asm-arm/arch-sa1100/dma.h                    |    1 
 include/asm-arm/arch-sa1100/hardware.h               |    1 
 include/asm-arm/arch-sa1100/ide.h                    |    1 
 include/asm-arm/arch-sa1100/irqs.h                   |    1 
 include/asm-arm/arch-sa1100/memory.h                 |    1 
 include/asm-arm/arch-sa1100/system.h                 |    1 
 include/asm-arm/atomic.h                             |    1 
 include/asm-arm/bug.h                                |    1 
 include/asm-arm/cacheflush.h                         |    1 
 include/asm-arm/cpu.h                                |    1 
 include/asm-arm/dma-mapping.h                        |    1 
 include/asm-arm/dma.h                                |    1 
 include/asm-arm/elf.h                                |    1 
 include/asm-arm/fpstate.h                            |    1 
 include/asm-arm/glue.h                               |    1 
 include/asm-arm/hardirq.h                            |    1 
 include/asm-arm/hardware/dec21285.h                  |    1 
 include/asm-arm/hardware/iomd.h                      |    1 
 include/asm-arm/leds.h                               |    1 
 include/asm-arm/mach/serial_at91rm9200.h             |    1 
 include/asm-arm/mach/serial_sa1100.h                 |    1 
 include/asm-arm/memory.h                             |    1 
 include/asm-arm/page.h                               |    1 
 include/asm-arm/pci.h                                |    1 
 include/asm-arm/proc-fns.h                           |    1 
 include/asm-arm/ptrace.h                             |    1 
 include/asm-arm/smp.h                                |    1 
 include/asm-arm/system.h                             |    1 
 include/asm-arm/tlbflush.h                           |    1 
 include/asm-arm/unistd.h                             |   10 -
 include/asm-arm26/atomic.h                           |    1 
 include/asm-arm26/bug.h                              |    1 
 include/asm-arm26/dma.h                              |    1 
 include/asm-arm26/hardirq.h                          |    1 
 include/asm-arm26/hardware.h                         |    1 
 include/asm-arm26/io.h                               |    1 
 include/asm-arm26/leds.h                             |    1 
 include/asm-arm26/mach-types.h                       |    1 
 include/asm-arm26/page.h                             |    1 
 include/asm-arm26/pgtable.h                          |    1 
 include/asm-arm26/serial.h                           |    1 
 include/asm-arm26/smp.h                              |    1 
 include/asm-arm26/sysirq.h                           |    1 
 include/asm-arm26/system.h                           |    1 
 include/asm-arm26/unistd.h                           |   10 -
 include/asm-cris/arch-v10/io.h                       |    1 
 include/asm-cris/arch-v10/page.h                     |    1 
 include/asm-cris/arch-v10/system.h                   |    1 
 include/asm-cris/arch-v32/io.h                       |    1 
 include/asm-cris/arch-v32/irq.h                      |    1 
 include/asm-cris/arch-v32/page.h                     |    1 
 include/asm-cris/arch-v32/processor.h                |    1 
 include/asm-cris/arch-v32/system.h                   |    1 
 include/asm-cris/eshlibld.h                          |    1 
 include/asm-cris/etraxgpio.h                         |    1 
 include/asm-cris/fasttimer.h                         |    1 
 include/asm-cris/page.h                              |    1 
 include/asm-cris/pci.h                               |    1 
 include/asm-cris/pgtable.h                           |    1 
 include/asm-cris/processor.h                         |    1 
 include/asm-cris/rtc.h                               |    1 
 include/asm-cris/tlbflush.h                          |    1 
 include/asm-cris/unistd.h                            |    9 -
 include/asm-frv/atomic.h                             |    1 
 include/asm-frv/bitops.h                             |    1 
 include/asm-frv/bug.h                                |    1 
 include/asm-frv/cache.h                              |    1 
 include/asm-frv/dma.h                                |    1 
 include/asm-frv/elf.h                                |    1 
 include/asm-frv/fpu.h                                |    1 
 include/asm-frv/hardirq.h                            |    1 
 include/asm-frv/highmem.h                            |    1 
 include/asm-frv/ide.h                                |    1 
 include/asm-frv/io.h                                 |    1 
 include/asm-frv/irq.h                                |    1 
 include/asm-frv/mmu_context.h                        |    1 
 include/asm-frv/page.h                               |    1 
 include/asm-frv/pci.h                                |    1 
 include/asm-frv/pgalloc.h                            |    1 
 include/asm-frv/pgtable.h                            |    1 
 include/asm-frv/processor.h                          |    1 
 include/asm-frv/segment.h                            |    1 
 include/asm-frv/serial.h                             |    1 
 include/asm-frv/smp.h                                |    1 
 include/asm-frv/system.h                             |    1 
 include/asm-frv/tlbflush.h                           |    1 
 include/asm-frv/types.h                              |    1 
 include/asm-frv/unaligned.h                          |    1 
 include/asm-frv/unistd.h                             |    7 
 include/asm-frv/virtconvert.h                        |    1 
 include/asm-generic/bug.h                            |    1 
 include/asm-generic/dma-mapping.h                    |    1 
 include/asm-generic/fcntl.h                          |    1 
 include/asm-generic/local.h                          |    1 
 include/asm-generic/signal.h                         |    7 
 include/asm-generic/tlb.h                            |    1 
 include/asm-h8300/bitops.h                           |    1 
 include/asm-h8300/dma.h                              |    1 
 include/asm-h8300/elf.h                              |    1 
 include/asm-h8300/hardirq.h                          |    1 
 include/asm-h8300/io.h                               |    1 
 include/asm-h8300/keyboard.h                         |    1 
 include/asm-h8300/mmu_context.h                      |    1 
 include/asm-h8300/page.h                             |    1 
 include/asm-h8300/page_offset.h                      |    1 
 include/asm-h8300/param.h                            |    1 
 include/asm-h8300/pgtable.h                          |    1 
 include/asm-h8300/processor.h                        |    1 
 include/asm-h8300/semaphore-helper.h                 |    1 
 include/asm-h8300/shm.h                              |    1 
 include/asm-h8300/system.h                           |    1 
 include/asm-h8300/unaligned.h                        |    1 
 include/asm-h8300/unistd.h                           |    7 
 include/asm-h8300/virtconvert.h                      |    1 
 include/asm-i386/apic.h                              |    1 
 include/asm-i386/atomic.h                            |    1 
 include/asm-i386/bitops.h                            |    1 
 include/asm-i386/bug.h                               |    1 
 include/asm-i386/bugs.h                              |    1 
 include/asm-i386/byteorder.h                         |    1 
 include/asm-i386/cache.h                             |    1 
 include/asm-i386/dma.h                               |    1 
 include/asm-i386/fixmap.h                            |    1 
 include/asm-i386/hardirq.h                           |    1 
 include/asm-i386/highmem.h                           |    1 
 include/asm-i386/hpet.h                              |    1 
 include/asm-i386/hw_irq.h                            |    1 
 include/asm-i386/ide.h                               |    1 
 include/asm-i386/io.h                                |    1 
 include/asm-i386/io_apic.h                           |    1 
 include/asm-i386/irq.h                               |    1 
 include/asm-i386/kmap_types.h                        |    1 
 include/asm-i386/mach-summit/mach_apic.h             |    1 
 include/asm-i386/mmu_context.h                       |    1 
 include/asm-i386/mtrr.h                              |    1 
 include/asm-i386/param.h                             |    1 
 include/asm-i386/pci.h                               |    1 
 include/asm-i386/pgalloc.h                           |    1 
 include/asm-i386/pgtable.h                           |    1 
 include/asm-i386/processor.h                         |    1 
 include/asm-i386/serial.h                            |    1 
 include/asm-i386/smp.h                               |    1 
 include/asm-i386/spinlock.h                          |    1 
 include/asm-i386/string.h                            |    1 
 include/asm-i386/system.h                            |    1 
 include/asm-i386/thread_info.h                       |    1 
 include/asm-i386/timex.h                             |    1 
 include/asm-i386/tlbflush.h                          |    1 
 include/asm-i386/types.h                             |    1 
 include/asm-i386/uaccess.h                           |    1 
 include/asm-i386/unistd.h                            |    7 
 include/asm-ia64/asmmacro.h                          |    1 
 include/asm-ia64/cache.h                             |    1 
 include/asm-ia64/delay.h                             |    1 
 include/asm-ia64/dma-mapping.h                       |    1 
 include/asm-ia64/dma.h                               |    1 
 include/asm-ia64/elf.h                               |    1 
 include/asm-ia64/hardirq.h                           |    1 
 include/asm-ia64/ia32.h                              |    1 
 include/asm-ia64/ide.h                               |    1 
 include/asm-ia64/intrinsics.h                        |    1 
 include/asm-ia64/kmap_types.h                        |    1 
 include/asm-ia64/machvec.h                           |    1 
 include/asm-ia64/meminit.h                           |    1 
 include/asm-ia64/nodedata.h                          |    1 
 include/asm-ia64/numa.h                              |    1 
 include/asm-ia64/page.h                              |    1 
 include/asm-ia64/param.h                             |    1 
 include/asm-ia64/percpu.h                            |    1 
 include/asm-ia64/pgalloc.h                           |    1 
 include/asm-ia64/pgtable.h                           |    1 
 include/asm-ia64/processor.h                         |    1 
 include/asm-ia64/ptrace.h                            |    1 
 include/asm-ia64/smp.h                               |    1 
 include/asm-ia64/sn/simulator.h                      |    1 
 include/asm-ia64/sn/sn_cpuid.h                       |    1 
 include/asm-ia64/sn/sn_sal.h                         |    1 
 include/asm-ia64/sn/xpc.h                            |    1 
 include/asm-ia64/string.h                            |    1 
 include/asm-ia64/system.h                            |    1 
 include/asm-ia64/tlb.h                               |    1 
 include/asm-ia64/tlbflush.h                          |    1 
 include/asm-ia64/unistd.h                            |    1 
 include/asm-m32r/assembler.h                         |    1 
 include/asm-m32r/atomic.h                            |    1 
 include/asm-m32r/bitops.h                            |    1 
 include/asm-m32r/cacheflush.h                        |    1 
 include/asm-m32r/hardirq.h                           |    1 
 include/asm-m32r/ide.h                               |    1 
 include/asm-m32r/irq.h                               |    1 
 include/asm-m32r/kmap_types.h                        |    1 
 include/asm-m32r/m32104ut/m32104ut_pld.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lan.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lcd.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_pld.h             |    1 
 include/asm-m32r/m32r.h                              |    1 
 include/asm-m32r/mmu.h                               |    1 
 include/asm-m32r/mmu_context.h                       |    2 
 include/asm-m32r/opsput/opsput_lan.h                 |    1 
 include/asm-m32r/opsput/opsput_lcd.h                 |    1 
 include/asm-m32r/opsput/opsput_pld.h                 |    1 
 include/asm-m32r/page.h                              |    1 
 include/asm-m32r/pgalloc.h                           |    1 
 include/asm-m32r/pgtable-2level.h                    |    1 
 include/asm-m32r/pgtable.h                           |    1 
 include/asm-m32r/processor.h                         |    1 
 include/asm-m32r/ptrace.h                            |    1 
 include/asm-m32r/rtc.h                               |    1 
 include/asm-m32r/semaphore.h                         |    1 
 include/asm-m32r/serial.h                            |    1 
 include/asm-m32r/sigcontext.h                        |    1 
 include/asm-m32r/smp.h                               |    1 
 include/asm-m32r/spinlock.h                          |    1 
 include/asm-m32r/system.h                            |    1 
 include/asm-m32r/timex.h                             |    1 
 include/asm-m32r/tlbflush.h                          |    1 
 include/asm-m32r/uaccess.h                           |    1 
 include/asm-m32r/unistd.h                            |    5 
 include/asm-m68k/atomic.h                            |    1 
 include/asm-m68k/bug.h                               |    1 
 include/asm-m68k/dma-mapping.h                       |    1 
 include/asm-m68k/dma.h                               |    1 
 include/asm-m68k/dvma.h                              |    1 
 include/asm-m68k/elf.h                               |    1 
 include/asm-m68k/entry.h                             |    1 
 include/asm-m68k/fpu.h                               |    1 
 include/asm-m68k/hardirq.h                           |    1 
 include/asm-m68k/ide.h                               |    1 
 include/asm-m68k/io.h                                |    1 
 include/asm-m68k/irq.h                               |    1 
 include/asm-m68k/mc146818rtc.h                       |    1 
 include/asm-m68k/mmu_context.h                       |    1 
 include/asm-m68k/motorola_pgtable.h                  |    1 
 include/asm-m68k/openprom.h                          |    1 
 include/asm-m68k/page.h                              |    1 
 include/asm-m68k/page_offset.h                       |    1 
 include/asm-m68k/pgalloc.h                           |    1 
 include/asm-m68k/pgtable.h                           |    1 
 include/asm-m68k/processor.h                         |    1 
 include/asm-m68k/semaphore-helper.h                  |    1 
 include/asm-m68k/serial.h                            |    1 
 include/asm-m68k/setup.h                             |    1 
 include/asm-m68k/shm.h                               |    1 
 include/asm-m68k/system.h                            |    1 
 include/asm-m68k/tlbflush.h                          |    1 
 include/asm-m68k/unistd.h                            |    7 
 include/asm-m68k/virtconvert.h                       |    1 
 include/asm-m68knommu/bitops.h                       |    1 
 include/asm-m68knommu/coldfire.h                     |    1 
 include/asm-m68knommu/commproc.h                     |    1 
 include/asm-m68knommu/dma-mapping.h                  |    1 
 include/asm-m68knommu/dma.h                          |    1 
 include/asm-m68knommu/elf.h                          |    1 
 include/asm-m68knommu/elia.h                         |    1 
 include/asm-m68knommu/entry.h                        |    1 
 include/asm-m68knommu/fpu.h                          |    1 
 include/asm-m68knommu/hardirq.h                      |    1 
 include/asm-m68knommu/io.h                           |    1 
 include/asm-m68knommu/irq.h                          |    1 
 include/asm-m68knommu/m5206sim.h                     |    1 
 include/asm-m68knommu/m520xsim.h                     |    1 
 include/asm-m68knommu/m523xsim.h                     |    1 
 include/asm-m68knommu/m5272sim.h                     |    1 
 include/asm-m68knommu/m527xsim.h                     |    1 
 include/asm-m68knommu/m528xsim.h                     |    1 
 include/asm-m68knommu/mcfcache.h                     |    1 
 include/asm-m68knommu/mcfdma.h                       |    1 
 include/asm-m68knommu/mcfmbus.h                      |    1 
 include/asm-m68knommu/mcfne.h                        |    1 
 include/asm-m68knommu/mcfpci.h                       |    1 
 include/asm-m68knommu/mcfpit.h                       |    1 
 include/asm-m68knommu/mcfsim.h                       |    1 
 include/asm-m68knommu/mcfsmc.h                       |    1 
 include/asm-m68knommu/mcftimer.h                     |    1 
 include/asm-m68knommu/mcfuart.h                      |    1 
 include/asm-m68knommu/mcfwdebug.h                    |    1 
 include/asm-m68knommu/mmu_context.h                  |    1 
 include/asm-m68knommu/nettel.h                       |    1 
 include/asm-m68knommu/page.h                         |    1 
 include/asm-m68knommu/page_offset.h                  |    1 
 include/asm-m68knommu/param.h                        |    1 
 include/asm-m68knommu/pgtable.h                      |    1 
 include/asm-m68knommu/processor.h                    |    1 
 include/asm-m68knommu/semaphore-helper.h             |    1 
 include/asm-m68knommu/system.h                       |    1 
 include/asm-m68knommu/unaligned.h                    |    1 
 include/asm-m68knommu/unistd.h                       |    7 
 include/asm-mips/a.out.h                             |    1 
 include/asm-mips/addrspace.h                         |    1 
 include/asm-mips/arc/types.h                         |    1 
 include/asm-mips/asm.h                               |    1 
 include/asm-mips/asmmacro.h                          |    1 
 include/asm-mips/atomic.h                            |    1 
 include/asm-mips/bcache.h                            |    1 
 include/asm-mips/bitops.h                            |    1 
 include/asm-mips/bug.h                               |    1 
 include/asm-mips/bugs.h                              |    1 
 include/asm-mips/byteorder.h                         |    1 
 include/asm-mips/cache.h                             |    1 
 include/asm-mips/checksum.h                          |    1 
 include/asm-mips/cpu-features.h                      |    1 
 include/asm-mips/cpu-info.h                          |    1 
 include/asm-mips/ddb5xxx/ddb5477.h                   |    1 
 include/asm-mips/ddb5xxx/ddb5xxx.h                   |    1 
 include/asm-mips/debug.h                             |    1 
 include/asm-mips/dec/prom.h                          |    1 
 include/asm-mips/delay.h                             |    1 
 include/asm-mips/dma.h                               |    1 
 include/asm-mips/elf.h                               |    1 
 include/asm-mips/fcntl.h                             |    1 
 include/asm-mips/fixmap.h                            |    1 
 include/asm-mips/fpu.h                               |    1 
 include/asm-mips/futex.h                             |    1 
 include/asm-mips/hazards.h                           |    1 
 include/asm-mips/highmem.h                           |    1 
 include/asm-mips/interrupt.h                         |    1 
 include/asm-mips/io.h                                |    1 
 include/asm-mips/ip32/machine.h                      |    1 
 include/asm-mips/irq.h                               |    1 
 include/asm-mips/isadep.h                            |    1 
 include/asm-mips/jmr3927/irq.h                       |    1 
 include/asm-mips/kmap_types.h                        |    1 
 include/asm-mips/local.h                             |    1 
 include/asm-mips/mach-au1x00/au1000.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx_dbdma.h          |    1 
 include/asm-mips/mach-au1x00/au1xxx_ide.h            |    1 
 include/asm-mips/mach-au1x00/au1xxx_psc.h            |    1 
 include/asm-mips/mach-au1x00/ioremap.h               |    1 
 include/asm-mips/mach-cobalt/cpu-feature-overrides.h |    1 
 include/asm-mips/mach-db1x00/db1x00.h                |    1 
 include/asm-mips/mach-generic/ide.h                  |    1 
 include/asm-mips/mach-generic/kmalloc.h              |    1 
 include/asm-mips/mach-generic/spaces.h               |    1 
 include/asm-mips/mach-ip22/spaces.h                  |    1 
 include/asm-mips/mach-ip32/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-ip32/kmalloc.h                 |    1 
 include/asm-mips/mach-mips/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-mips/irq.h                     |    1 
 include/asm-mips/mach-pb1x00/pb1550.h                |    1 
 include/asm-mips/mach-sim/cpu-feature-overrides.h    |    1 
 include/asm-mips/mips-boards/generic.h               |    1 
 include/asm-mips/mipsregs.h                          |    1 
 include/asm-mips/mmu_context.h                       |    1 
 include/asm-mips/mmzone.h                            |    1 
 include/asm-mips/module.h                            |    1 
 include/asm-mips/msgbuf.h                            |    1 
 include/asm-mips/paccess.h                           |    1 
 include/asm-mips/page.h                              |    1 
 include/asm-mips/pci.h                               |    1 
 include/asm-mips/pgalloc.h                           |    1 
 include/asm-mips/pgtable-32.h                        |    1 
 include/asm-mips/pgtable-64.h                        |    1 
 include/asm-mips/pgtable-bits.h                      |    1 
 include/asm-mips/pgtable.h                           |    1 
 include/asm-mips/prefetch.h                          |    1 
 include/asm-mips/processor.h                         |    1 
 include/asm-mips/ptrace.h                            |    1 
 include/asm-mips/reg.h                               |    1 
 include/asm-mips/resource.h                          |    1 
 include/asm-mips/serial.h                            |    1 
 include/asm-mips/sgiarcs.h                           |    1 
 include/asm-mips/sibyte/board.h                      |    1 
 include/asm-mips/sibyte/carmel.h                     |    1 
 include/asm-mips/sibyte/sentosa.h                    |    1 
 include/asm-mips/sibyte/swarm.h                      |    1 
 include/asm-mips/siginfo.h                           |    1 
 include/asm-mips/signal.h                            |    1 
 include/asm-mips/sim.h                               |    1 
 include/asm-mips/smp.h                               |    1 
 include/asm-mips/sn/addrs.h                          |    1 
 include/asm-mips/sn/agent.h                          |    1 
 include/asm-mips/sn/arch.h                           |    1 
 include/asm-mips/sn/io.h                             |    1 
 include/asm-mips/sn/klconfig.h                       |    1 
 include/asm-mips/sn/kldir.h                          |    1 
 include/asm-mips/sn/launch.h                         |    1 
 include/asm-mips/sn/mapped_kernel.h                  |    1 
 include/asm-mips/sn/sn0/addrs.h                      |    1 
 include/asm-mips/sn/sn0/arch.h                       |    1 
 include/asm-mips/sn/sn0/hubmd.h                      |    1 
 include/asm-mips/stackframe.h                        |    1 
 include/asm-mips/string.h                            |    1 
 include/asm-mips/system.h                            |    1 
 include/asm-mips/thread_info.h                       |    1 
 include/asm-mips/tlbflush.h                          |    1 
 include/asm-mips/tx4927/toshiba_rbtx4927.h           |    1 
 include/asm-mips/types.h                             |    1 
 include/asm-mips/uaccess.h                           |    1 
 include/asm-mips/vr41xx/vrc4173.h                    |    1 
 include/asm-mips/war.h                               |    1 
 include/asm-mips/wbflush.h                           |    1 
 include/asm-parisc/atomic.h                          |    1 
 include/asm-parisc/cache.h                           |    1 
 include/asm-parisc/cacheflush.h                      |    1 
 include/asm-parisc/dma-mapping.h                     |    1 
 include/asm-parisc/dma.h                             |    1 
 include/asm-parisc/io.h                              |    1 
 include/asm-parisc/irq.h                             |    1 
 include/asm-parisc/kmap_types.h                      |    1 
 include/asm-parisc/page.h                            |    1 
 include/asm-parisc/param.h                           |    1 
 include/asm-parisc/pci.h                             |    1 
 include/asm-parisc/pdc.h                             |    1 
 include/asm-parisc/pgtable.h                         |    1 
 include/asm-parisc/processor.h                       |    1 
 include/asm-parisc/psw.h                             |    1 
 include/asm-parisc/smp.h                             |    1 
 include/asm-parisc/system.h                          |    1 
 include/asm-parisc/tlbflush.h                        |    1 
 include/asm-parisc/unistd.h                          |    4 
 include/asm-powerpc/abs_addr.h                       |    1 
 include/asm-powerpc/cache.h                          |    1 
 include/asm-powerpc/dma-mapping.h                    |    1 
 include/asm-powerpc/dma.h                            |    1 
 include/asm-powerpc/eeh.h                            |    1 
 include/asm-powerpc/elf.h                            |    7 
 include/asm-powerpc/floppy.h                         |    1 
 include/asm-powerpc/hw_irq.h                         |    1 
 include/asm-powerpc/ide.h                            |    1 
 include/asm-powerpc/iommu.h                          |    1 
 include/asm-powerpc/irq.h                            |    1 
 include/asm-powerpc/iseries/iseries_io.h             |    1 
 include/asm-powerpc/machdep.h                        |    1 
 include/asm-powerpc/mmzone.h                         |    1 
 include/asm-powerpc/paca.h                           |    1 
 include/asm-powerpc/page.h                           |    1 
 include/asm-powerpc/pgtable.h                        |    1 
 include/asm-powerpc/ppc_asm.h                        |    1 
 include/asm-powerpc/prom.h                           |    1 
 include/asm-powerpc/smp.h                            |    1 
 include/asm-powerpc/smu.h                            |    1 
 include/asm-powerpc/spu.h                            |    1 
 include/asm-powerpc/thread_info.h                    |    1 
 include/asm-powerpc/time.h                           |    1 
 include/asm-powerpc/timex.h                          |    1 
 include/asm-powerpc/tlb.h                            |    1 
 include/asm-powerpc/tlbflush.h                       |    1 
 include/asm-powerpc/topology.h                       |    1 
 include/asm-powerpc/types.h                          |    1 
 include/asm-powerpc/vga.h                            |    1 
 include/asm-powerpc/vio.h                            |    1 
 include/asm-ppc/amigahw.h                            |    1 
 include/asm-ppc/bootinfo.h                           |    1 
 include/asm-ppc/commproc.h                           |    1 
 include/asm-ppc/ibm403.h                             |    1 
 include/asm-ppc/ibm44x.h                             |    1 
 include/asm-ppc/ibm4xx.h                             |    1 
 include/asm-ppc/io.h                                 |    1 
 include/asm-ppc/machdep.h                            |    1 
 include/asm-ppc/mmu.h                                |    1 
 include/asm-ppc/mmu_context.h                        |    1 
 include/asm-ppc/mpc8260.h                            |    1 
 include/asm-ppc/mpc83xx.h                            |    1 
 include/asm-ppc/mpc85xx.h                            |    1 
 include/asm-ppc/mpc8xx.h                             |    1 
 include/asm-ppc/mv64x60.h                            |    1 
 include/asm-ppc/ocp.h                                |    1 
 include/asm-ppc/open_pic.h                           |    1 
 include/asm-ppc/page.h                               |    2 
 include/asm-ppc/pc_serial.h                          |    1 
 include/asm-ppc/pgalloc.h                            |    1 
 include/asm-ppc/pgtable.h                            |    1 
 include/asm-ppc/ppc4xx_dma.h                         |    1 
 include/asm-ppc/ppc4xx_pic.h                         |    1 
 include/asm-ppc/serial.h                             |    1 
 include/asm-ppc/smp.h                                |    1 
 include/asm-ppc/time.h                               |    1 
 include/asm-s390/bitops.h                            |    1 
 include/asm-s390/debug.h                             |    1 
 include/asm-s390/hardirq.h                           |    1 
 include/asm-s390/idals.h                             |    1 
 include/asm-s390/local.h                             |    1 
 include/asm-s390/lowcore.h                           |    1 
 include/asm-s390/page.h                              |    6 
 include/asm-s390/pgalloc.h                           |    1 
 include/asm-s390/sfp-machine.h                       |    1 
 include/asm-s390/smp.h                               |    1 
 include/asm-s390/system.h                            |    1 
 include/asm-s390/tlbflush.h                          |    1 
 include/asm-s390/types.h                             |    1 
 include/asm-sh/bug.h                                 |    1 
 include/asm-sh/checksum.h                            |    1 
 include/asm-sh/dma-mapping.h                         |    1 
 include/asm-sh/dma.h                                 |    1 
 include/asm-sh/fixmap.h                              |    1 
 include/asm-sh/hardirq.h                             |    1 
 include/asm-sh/hd64461/hd64461.h                     |    1 
 include/asm-sh/hd64465/hd64465.h                     |    1 
 include/asm-sh/ide.h                                 |    1 
 include/asm-sh/io.h                                  |    1 
 include/asm-sh/irq.h                                 |    1 
 include/asm-sh/keyboard.h                            |    1 
 include/asm-sh/kmap_types.h                          |    1 
 include/asm-sh/machvec.h                             |    1 
 include/asm-sh/machvec_init.h                        |    1 
 include/asm-sh/mpc1211/dma.h                         |    1 
 include/asm-sh/overdrive/overdrive.h                 |    1 
 include/asm-sh/page.h                                |    1 
 include/asm-sh/pgtable.h                             |    1 
 include/asm-sh/serial.h                              |    1 
 include/asm-sh/smp.h                                 |    1 
 include/asm-sh/system.h                              |    1 
 include/asm-sh/types.h                               |    1 
 include/asm-sh/unistd.h                              |    7 
 include/asm-sh/watchdog.h                            |    1 
 include/asm-sh64/bug.h                               |    1 
 include/asm-sh64/dma-mapping.h                       |    1 
 include/asm-sh64/hardirq.h                           |    1 
 include/asm-sh64/ide.h                               |    1 
 include/asm-sh64/irq.h                               |    1 
 include/asm-sh64/mmu_context.h                       |    1 
 include/asm-sh64/page.h                              |    1 
 include/asm-sh64/param.h                             |    1 
 include/asm-sh64/pgtable.h                           |    1 
 include/asm-sh64/system.h                            |    1 
 include/asm-sh64/unistd.h                            |    7 
 include/asm-sparc/asmmacro.h                         |    1 
 include/asm-sparc/atomic.h                           |    1 
 include/asm-sparc/bugs.h                             |    1 
 include/asm-sparc/cacheflush.h                       |    1 
 include/asm-sparc/delay.h                            |    1 
 include/asm-sparc/dma-mapping.h                      |    1 
 include/asm-sparc/dma.h                              |    1 
 include/asm-sparc/elf.h                              |    1 
 include/asm-sparc/fixmap.h                           |    1 
 include/asm-sparc/hardirq.h                          |    1 
 include/asm-sparc/ide.h                              |    1 
 include/asm-sparc/irq.h                              |    1 
 include/asm-sparc/mostek.h                           |    1 
 include/asm-sparc/page.h                             |    1 
 include/asm-sparc/pgalloc.h                          |    1 
 include/asm-sparc/pgtable.h                          |    1 
 include/asm-sparc/sfp-machine.h                      |    1 
 include/asm-sparc/smp.h                              |    1 
 include/asm-sparc/system.h                           |    2 
 include/asm-sparc/timer.h                            |    1 
 include/asm-sparc/tlbflush.h                         |    1 
 include/asm-sparc/unistd.h                           |    4 
 include/asm-sparc/vac-ops.h                          |    1 
 include/asm-sparc/winmacro.h                         |    1 
 include/asm-sparc64/atomic.h                         |    1 
 include/asm-sparc64/bitops.h                         |    1 
 include/asm-sparc64/bugs.h                           |    1 
 include/asm-sparc64/cacheflush.h                     |    1 
 include/asm-sparc64/delay.h                          |    1 
 include/asm-sparc64/dma-mapping.h                    |    1 
 include/asm-sparc64/dma.h                            |    1 
 include/asm-sparc64/floppy.h                         |    1 
 include/asm-sparc64/ide.h                            |    1 
 include/asm-sparc64/irq.h                            |    1 
 include/asm-sparc64/kprobes.h                        |    1 
 include/asm-sparc64/mc146818rtc.h                    |    1 
 include/asm-sparc64/mmu.h                            |    1 
 include/asm-sparc64/oplib.h                          |    1 
 include/asm-sparc64/page.h                           |    1 
 include/asm-sparc64/param.h                          |    1 
 include/asm-sparc64/pgalloc.h                        |    1 
 include/asm-sparc64/pgtable.h                        |    1 
 include/asm-sparc64/processor.h                      |    1 
 include/asm-sparc64/siginfo.h                        |    1 
 include/asm-sparc64/signal.h                         |    1 
 include/asm-sparc64/smp.h                            |    1 
 include/asm-sparc64/spinlock.h                       |    1 
 include/asm-sparc64/system.h                         |    1 
 include/asm-sparc64/timer.h                          |    1 
 include/asm-sparc64/tlb.h                            |    1 
 include/asm-sparc64/tlbflush.h                       |    1 
 include/asm-sparc64/ttable.h                         |    1 
 include/asm-sparc64/unistd.h                         |    4 
 include/asm-um/a.out.h                               |    1 
 include/asm-um/cache.h                               |    1 
 include/asm-um/elf-ppc.h                             |    1 
 include/asm-um/fixmap.h                              |    1 
 include/asm-um/hardirq.h                             |    1 
 include/asm-um/linkage.h                             |    1 
 include/asm-um/mmu_context.h                         |    1 
 include/asm-um/page.h                                |    1 
 include/asm-um/pgalloc.h                             |    1 
 include/asm-um/processor-generic.h                   |    1 
 include/asm-um/ptrace-generic.h                      |    1 
 include/asm-um/smp.h                                 |    1 
 include/asm-um/thread_info.h                         |    1 
 include/asm-v850/atomic.h                            |    1 
 include/asm-v850/bitops.h                            |    1 
 include/asm-v850/dma-mapping.h                       |    1 
 include/asm-v850/hardirq.h                           |    1 
 include/asm-v850/machdep.h                           |    1 
 include/asm-v850/pgtable.h                           |    1 
 include/asm-v850/processor.h                         |    1 
 include/asm-v850/serial.h                            |    1 
 include/asm-v850/unistd.h                            |   12 -
 include/asm-v850/v850e_uart.h                        |    1 
 include/asm-x86_64/apic.h                            |    1 
 include/asm-x86_64/atomic.h                          |    1 
 include/asm-x86_64/bitops.h                          |    1 
 include/asm-x86_64/bugs.h                            |    1 
 include/asm-x86_64/cache.h                           |    1 
 include/asm-x86_64/calling.h                         |    1 
 include/asm-x86_64/dma-mapping.h                     |    1 
 include/asm-x86_64/dma.h                             |    1 
 include/asm-x86_64/dwarf2.h                          |    1 
 include/asm-x86_64/fixmap.h                          |    1 
 include/asm-x86_64/hardirq.h                         |    1 
 include/asm-x86_64/hw_irq.h                          |    1 
 include/asm-x86_64/ia32.h                            |    1 
 include/asm-x86_64/io.h                              |    1 
 include/asm-x86_64/io_apic.h                         |    1 
 include/asm-x86_64/mmu_context.h                     |    1 
 include/asm-x86_64/mmzone.h                          |    1 
 include/asm-x86_64/mtrr.h                            |    1 
 include/asm-x86_64/param.h                           |    1 
 include/asm-x86_64/pci.h                             |    1 
 include/asm-x86_64/processor.h                       |    1 
 include/asm-x86_64/serial.h                          |    1 
 include/asm-x86_64/smp.h                             |    1 
 include/asm-x86_64/spinlock.h                        |    1 
 include/asm-x86_64/swiotlb.h                         |    1 
 include/asm-x86_64/system.h                          |    1 
 include/asm-x86_64/tlbflush.h                        |    1 
 include/asm-x86_64/topology.h                        |    1 
 include/asm-x86_64/uaccess.h                         |    1 
 include/asm-x86_64/unistd.h                          |    7 
 include/asm-xtensa/atomic.h                          |    1 
 include/asm-xtensa/checksum.h                        |    1 
 include/asm-xtensa/delay.h                           |    1 
 include/asm-xtensa/dma.h                             |    1 
 include/asm-xtensa/hardirq.h                         |    1 
 include/asm-xtensa/ide.h                             |    1 
 include/asm-xtensa/io.h                              |    1 
 include/asm-xtensa/irq.h                             |    1 
 include/asm-xtensa/mmu_context.h                     |    1 
 include/asm-xtensa/page.h                            |    1 
 include/asm-xtensa/pgalloc.h                         |    1 
 include/asm-xtensa/platform.h                        |    1 
 include/asm-xtensa/system.h                          |    1 
 include/asm-xtensa/unistd.h                          |   21 --
 include/linux/acct.h                                 |    3 
 include/linux/acpi.h                                 |    1 
 include/linux/agpgart.h                              |    3 
 include/linux/amba/clcd.h                            |    1 
 include/linux/atmdev.h                               |    1 
 include/linux/audit.h                                |    4 
 include/linux/blkdev.h                               |    1 
 include/linux/blkpg.h                                |    1 
 include/linux/blktrace_api.h                         |    1 
 include/linux/blockgroup_lock.h                      |    1 
 include/linux/cache.h                                |    1 
 include/linux/coda.h                                 |    1 
 include/linux/compat.h                               |    1 
 include/linux/cpufreq.h                              |    1 
 include/linux/crypto.h                               |    1 
 include/linux/cyclomx.h                              |    1 
 include/linux/dcookies.h                             |    1 
 include/linux/devfs_fs_kernel.h                      |    1 
 include/linux/device.h                               |    1 
 include/linux/dmi.h                                  |    1 
 include/linux/dnotify.h                              |    1 
 include/linux/elf.h                                  |   59 ------
 include/linux/errqueue.h                             |    1 
 include/linux/ethtool.h                              |  169 +++++++++----------
 include/linux/ext2_fs.h                              |    2 
 include/linux/ext3_fs.h                              |    7 
 include/linux/fs.h                                   |    1 
 include/linux/ftape.h                                |    1 
 include/linux/gameport.h                             |    6 
 include/linux/generic_serial.h                       |    6 
 include/linux/genhd.h                                |   12 -
 include/linux/gfp.h                                  |    1 
 include/linux/hardirq.h                              |    1 
 include/linux/highmem.h                              |    1 
 include/linux/highuid.h                              |    1 
 include/linux/i2c-algo-ite.h                         |    7 
 include/linux/i2c.h                                  |    9 -
 include/linux/ide.h                                  |    1 
 include/linux/if_frad.h                              |    1 
 include/linux/if_tr.h                                |    1 
 include/linux/init.h                                 |    1 
 include/linux/inotify.h                              |    1 
 include/linux/interrupt.h                            |    1 
 include/linux/ipmi.h                                 |    2 
 include/linux/ipv6.h                                 |    1 
 include/linux/irq.h                                  |    1 
 include/linux/irq_cpustat.h                          |    1 
 include/linux/isapnp.h                               |    1 
 include/linux/isdn.h                                 |    1 
 include/linux/isdn/tpam.h                            |    1 
 include/linux/isdn_ppp.h                             |    1 
 include/linux/isdnif.h                               |    1 
 include/linux/kallsyms.h                             |    1 
 include/linux/kernel_stat.h                          |    1 
 include/linux/kmod.h                                 |    1 
 include/linux/kprobes.h                              |    1 
 include/linux/linkage.h                              |    1 
 include/linux/lockd/lockd.h                          |    1 
 include/linux/lockd/nlm.h                            |    1 
 include/linux/mempolicy.h                            |    1 
 include/linux/migrate.h                              |    1 
 include/linux/mii.h                                  |   30 +--
 include/linux/mm.h                                   |    1 
 include/linux/mman.h                                 |   12 -
 include/linux/mmzone.h                               |    1 
 include/linux/module.h                               |    1 
 include/linux/msg.h                                  |    2 
 include/linux/mtd/cfi.h                              |    1 
 include/linux/mtd/map.h                              |    1 
 include/linux/mtd/mtd.h                              |    1 
 include/linux/mtd/nand.h                             |    1 
 include/linux/mtd/physmap.h                          |    1 
 include/linux/mtd/xip.h                              |    1 
 include/linux/ncp_fs.h                               |    5 
 include/linux/net.h                                  |    3 
 include/linux/netdevice.h                            |    1 
 include/linux/netfilter.h                            |    1 
 include/linux/netfilter_arp.h                        |    1 
 include/linux/netfilter_bridge.h                     |    1 
 include/linux/netfilter_ipv4.h                       |    1 
 include/linux/netfilter_ipv4/ip_conntrack.h          |    1 
 include/linux/netfilter_ipv4/listhelp.h              |    1 
 include/linux/nfs.h                                  |    8 
 include/linux/nfs4.h                                 |    6 
 include/linux/nfs_fs.h                               |   39 ++--
 include/linux/nfsd/nfsd.h                            |    1 
 include/linux/nfsd/nfsfh.h                           |    1 
 include/linux/nfsd/syscall.h                         |    1 
 include/linux/numa.h                                 |    1 
 include/linux/parport.h                              |    1 
 include/linux/pci.h                                  |    1 
 include/linux/percpu_counter.h                       |    1 
 include/linux/pm.h                                   |    1 
 include/linux/pm_legacy.h                            |    1 
 include/linux/pmu.h                                  |    1 
 include/linux/preempt.h                              |    1 
 include/linux/proc_fs.h                              |    1 
 include/linux/profile.h                              |    1 
 include/linux/quota.h                                |    4 
 include/linux/quotaops.h                             |    1 
 include/linux/reiserfs_xattr.h                       |    3 
 include/linux/relay.h                                |    1 
 include/linux/rio.h                                  |    1 
 include/linux/rio_drv.h                              |    1 
 include/linux/rmap.h                                 |    1 
 include/linux/rtnetlink.h                            |    1 
 include/linux/rwsem.h                                |    1 
 include/linux/scc.h                                  |    1 
 include/linux/sched.h                                |   94 +++++-----
 include/linux/seccomp.h                              |    1 
 include/linux/sem.h                                  |    2 
 include/linux/seqlock.h                              |    1 
 include/linux/serialP.h                              |    1 
 include/linux/serial_core.h                          |    1 
 include/linux/signal.h                               |    4 
 include/linux/skbuff.h                               |    1 
 include/linux/slab.h                                 |    1 
 include/linux/smb_fs.h                               |    4 
 include/linux/smp.h                                  |    1 
 include/linux/smp_lock.h                             |    1 
 include/linux/socket.h                               |    2 
 include/linux/spinlock.h                             |    1 
 include/linux/stop_machine.h                         |    1 
 include/linux/sunrpc/auth.h                          |    1 
 include/linux/sunrpc/debug.h                         |   24 +-
 include/linux/sunrpc/stats.h                         |    1 
 include/linux/suspend.h                              |    1 
 include/linux/swap.h                                 |    1 
 include/linux/syscalls.h                             |    1 
 include/linux/sysrq.h                                |    1 
 include/linux/tcp.h                                  |    1 
 include/linux/threads.h                              |    1 
 include/linux/timer.h                                |    1 
 include/linux/timex.h                                |    1 
 include/linux/tty.h                                  |    1 
 include/linux/types.h                                |    1 
 include/linux/udp.h                                  |    1 
 include/linux/usb.h                                  |    1 
 include/linux/usb_usual.h                            |    1 
 include/linux/usbdevice_fs.h                         |    2 
 include/linux/vt_buffer.h                            |    1 
 include/linux/vt_kern.h                              |    1 
 include/linux/wait.h                                 |    1 
 include/linux/wanrouter.h                            |    4 
 include/mtd/mtd-abi.h                                |    5 
 include/net/addrconf.h                               |    1 
 include/net/af_unix.h                                |    1 
 include/net/ax25.h                                   |    1 
 include/net/compat.h                                 |    1 
 include/net/dst.h                                    |    1 
 include/net/icmp.h                                   |    1 
 include/net/inet6_hashtables.h                       |    1 
 include/net/inet_hashtables.h                        |    1 
 include/net/inet_sock.h                              |    1 
 include/net/inet_timewait_sock.h                     |    1 
 include/net/ip.h                                     |    1 
 include/net/ip_fib.h                                 |    1 
 include/net/ip_mp_alg.h                              |    1 
 include/net/ip_vs.h                                  |    1 
 include/net/ipv6.h                                   |    1 
 include/net/irda/irda.h                              |    1 
 include/net/irda/irda_device.h                       |    1 
 include/net/irda/irlap.h                             |    1 
 include/net/irda/irlmp.h                             |    1 
 include/net/irda/irlmp_frame.h                       |    1 
 include/net/irda/qos.h                               |    1 
 include/net/ndisc.h                                  |    1 
 include/net/netfilter/nf_conntrack.h                 |    1 
 include/net/pkt_act.h                                |    1 
 include/net/protocol.h                               |    1 
 include/net/raw.h                                    |    1 
 include/net/red.h                                    |    1 
 include/net/route.h                                  |    1 
 include/net/sch_generic.h                            |    1 
 include/net/sctp/sctp.h                              |    1 
 include/net/sock.h                                   |    1 
 include/net/tcp.h                                    |    1 
 include/pcmcia/ss.h                                  |    1 
 include/scsi/scsi_transport_fc.h                     |    1 
 include/scsi/scsi_transport_spi.h                    |    1 
 include/sound/driver.h                               |    1 
 include/video/edid.h                                 |    1 
 include/video/vga.h                                  |    1 
 889 files changed, 394 insertions(+), 1229 deletions(-)

Index: linux-2.6-header-cleanup-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-cleanup-git.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-header-cleanup-git.patch	28 Apr 2006 14:07:00 -0000	1.10
+++ linux-2.6-header-cleanup-git.patch	28 Apr 2006 17:10:41 -0000	1.11
@@ -4834,7 +4834,7 @@
  #include <linux/kernel.h>
  #include <linux/errno.h>
  #include <linux/thread_info.h>
-diff -u b/include/asm-mips/unistd.h b/include/asm-mips/unistd.h
+unchanged:
 --- b/include/asm-mips/unistd.h
 +++ b/include/asm-mips/unistd.h
 @@ -905,6 +905,8 @@
@@ -5443,7 +5443,7 @@
  
  typedef signed char s8;
  typedef unsigned char u8;
-diff -u b/include/asm-powerpc/unistd.h b/include/asm-powerpc/unistd.h
+unchanged:
 --- b/include/asm-powerpc/unistd.h
 +++ b/include/asm-powerpc/unistd.h
 @@ -305,12 +305,12 @@
@@ -5951,7 +5951,7 @@
  
  typedef signed char s8;
  typedef unsigned char u8;
-diff -u b/include/asm-s390/unistd.h b/include/asm-s390/unistd.h
+unchanged:
 --- b/include/asm-s390/unistd.h
 +++ b/include/asm-s390/unistd.h
 @@ -386,6 +386,8 @@
@@ -10735,7 +10735,7 @@
 -
 +#endif /* __KERNEL__ */
  #endif /* __LINUX_MII_H__ */
-diff -u b/include/linux/unistd.h b/include/linux/unistd.h
+unchanged:
 --- b/include/linux/unistd.h
 +++ b/include/linux/unistd.h
 @@ -1,7 +1,9 @@
@@ -10748,136 +10748,27 @@
  
  /*
   * Include machine specific syscallX macros
-unchanged:
---- a/include/linux/input.h
+diff -u b/include/linux/input.h b/include/linux/input.h
+--- b/include/linux/input.h
 +++ b/include/linux/input.h
-@@ -13,7 +13,6 @@ #ifdef __KERNEL__
- #include <linux/time.h>
- #include <linux/list.h>
- #include <linux/device.h>
--#include <linux/mod_devicetable.h>
- #else
- #include <sys/time.h>
- #include <sys/ioctl.h>
-@@ -805,44 +804,6 @@ #define FF_AUTOCENTER	0x61
+@@ -805,6 +805,9 @@
  
  #define FF_MAX		0x7f
  
--struct input_device_id {
--
--	kernel_ulong_t flags;
--
--	struct input_id id;
--
--	kernel_ulong_t evbit[EV_MAX/BITS_PER_LONG+1];
--	kernel_ulong_t keybit[KEY_MAX/BITS_PER_LONG+1];
--	kernel_ulong_t relbit[REL_MAX/BITS_PER_LONG+1];
--	kernel_ulong_t absbit[ABS_MAX/BITS_PER_LONG+1];
--	kernel_ulong_t mscbit[MSC_MAX/BITS_PER_LONG+1];
--	kernel_ulong_t ledbit[LED_MAX/BITS_PER_LONG+1];
--	kernel_ulong_t sndbit[SND_MAX/BITS_PER_LONG+1];
--	kernel_ulong_t ffbit[FF_MAX/BITS_PER_LONG+1];
--	kernel_ulong_t swbit[SW_MAX/BITS_PER_LONG+1];
--
--	kernel_ulong_t driver_info;
--};
--
--/*
-- * Structure for hotplug & device<->driver matching.
-- */
--
--#define INPUT_DEVICE_ID_MATCH_BUS	1
--#define INPUT_DEVICE_ID_MATCH_VENDOR	2
--#define INPUT_DEVICE_ID_MATCH_PRODUCT	4
--#define INPUT_DEVICE_ID_MATCH_VERSION	8
--
--#define INPUT_DEVICE_ID_MATCH_EVBIT	0x010
--#define INPUT_DEVICE_ID_MATCH_KEYBIT	0x020
--#define INPUT_DEVICE_ID_MATCH_RELBIT	0x040
--#define INPUT_DEVICE_ID_MATCH_ABSBIT	0x080
--#define INPUT_DEVICE_ID_MATCH_MSCIT	0x100
--#define INPUT_DEVICE_ID_MATCH_LEDBIT	0x200
--#define INPUT_DEVICE_ID_MATCH_SNDBIT	0x400
--#define INPUT_DEVICE_ID_MATCH_FFBIT	0x800
--#define INPUT_DEVICE_ID_MATCH_SWBIT	0x1000
--
- #ifdef __KERNEL__
- 
- /*
-@@ -851,6 +812,7 @@ #ifdef __KERNEL__
- 
- #include <linux/fs.h>
- #include <linux/timer.h>
-+#include <linux/mod_devicetable.h>
- 
- #define NBITS(x) (((x)/BITS_PER_LONG)+1)
- #define BIT(x)	(1UL<<((x)%BITS_PER_LONG))
-@@ -957,6 +919,7 @@ #define INPUT_DEVICE_ID_MATCH_DEVICE_AND
- 	(INPUT_DEVICE_ID_MATCH_DEVICE | INPUT_DEVICE_ID_MATCH_VERSION)
- 
- struct input_handle;
-+struct input_device_id;
++#ifdef LINUX_MOD_DEVICETABLE_H
++/* We only want this if mod_devicetable.h has been included -- that's
++   either in kernel space, or in scripts/mod/file2alias.c */
+ struct input_device_id {
  
- struct input_handler {
+ 	kernel_ulong_t flags;
+@@ -823,6 +826,7 @@
  
-unchanged:
---- a/include/linux/mod_devicetable.h
-+++ b/include/linux/mod_devicetable.h
-@@ -249,4 +249,42 @@ struct i2c_device_id {
- 	__u16 id;
+ 	kernel_ulong_t driver_info;
  };
++#endif 
  
-+/* Input */
-+#include "input.h"
-+
-+struct input_device_id {
-+
-+	kernel_ulong_t flags;
-+
-+	struct input_id id;
-+
-+	kernel_ulong_t evbit[EV_MAX/BITS_PER_LONG+1];
-+	kernel_ulong_t keybit[KEY_MAX/BITS_PER_LONG+1];
-+	kernel_ulong_t relbit[REL_MAX/BITS_PER_LONG+1];
-+	kernel_ulong_t absbit[ABS_MAX/BITS_PER_LONG+1];
-+	kernel_ulong_t mscbit[MSC_MAX/BITS_PER_LONG+1];
-+	kernel_ulong_t ledbit[LED_MAX/BITS_PER_LONG+1];
-+	kernel_ulong_t sndbit[SND_MAX/BITS_PER_LONG+1];
-+	kernel_ulong_t ffbit[FF_MAX/BITS_PER_LONG+1];
-+	kernel_ulong_t swbit[SW_MAX/BITS_PER_LONG+1];
-+
-+	kernel_ulong_t driver_info;
-+};
-+
-+#define INPUT_DEVICE_ID_MATCH_BUS	1
-+#define INPUT_DEVICE_ID_MATCH_VENDOR	2
-+#define INPUT_DEVICE_ID_MATCH_PRODUCT	4
-+#define INPUT_DEVICE_ID_MATCH_VERSION	8
-+
-+#define INPUT_DEVICE_ID_MATCH_EVBIT	0x010
-+#define INPUT_DEVICE_ID_MATCH_KEYBIT	0x020
-+#define INPUT_DEVICE_ID_MATCH_RELBIT	0x040
-+#define INPUT_DEVICE_ID_MATCH_ABSBIT	0x080
-+#define INPUT_DEVICE_ID_MATCH_MSCIT	0x100
-+#define INPUT_DEVICE_ID_MATCH_LEDBIT	0x200
-+#define INPUT_DEVICE_ID_MATCH_SNDBIT	0x400
-+#define INPUT_DEVICE_ID_MATCH_FFBIT	0x800
-+#define INPUT_DEVICE_ID_MATCH_SWBIT	0x1000
-+
-+
- #endif /* LINUX_MOD_DEVICETABLE_H */
-unchanged:
---- a/scripts/mod/file2alias.c
-+++ b/scripts/mod/file2alias.c
-@@ -37,7 +37,6 @@ typedef unsigned char	__u8;
-  * even potentially has different endianness and word sizes, since
-  * we handle those differences explicitly below */
- #include "../../include/linux/mod_devicetable.h"
--#include "../../include/linux/input.h"
- 
- #define ADD(str, sep, cond, field)                              \
- do {                                                            \
-only in patch2:
+ /*
+  * Structure for hotplug & device<->driver matching.
 unchanged:
 --- a/include/asm-alpha/unistd.h
 +++ b/include/asm-alpha/unistd.h
@@ -10915,7 +10806,6 @@
  
 +#endif /* __KERNEL__ */
  #endif /* _ALPHA_UNISTD_H */
-only in patch2:
 unchanged:
 --- a/include/asm-arm/unistd.h
 +++ b/include/asm-arm/unistd.h
@@ -10969,7 +10859,6 @@
  
 +#endif /* __KERNEL__ */
  #endif /* __ASM_ARM_UNISTD_H */
-only in patch2:
 unchanged:
 --- a/include/asm-arm26/unistd.h
 +++ b/include/asm-arm26/unistd.h
@@ -11023,7 +10912,6 @@
  
 +#endif /* __KERNEL__ */
  #endif /* __ASM_ARM_UNISTD_H */
-only in patch2:
 unchanged:
 --- a/include/asm-cris/unistd.h
 +++ b/include/asm-cris/unistd.h
@@ -11061,7 +10949,6 @@
  
 +#endif /* __KERNEL__ */
  #endif /* _ASM_CRIS_UNISTD_H_ */
-only in patch2:
 unchanged:
 --- a/include/asm-frv/unistd.h
 +++ b/include/asm-frv/unistd.h
@@ -11099,7 +10986,6 @@
  
 +#endif /* __KERNEL__ */
  #endif /* _ASM_UNISTD_H_ */
-only in patch2:
 unchanged:
 --- a/include/asm-h8300/unistd.h
 +++ b/include/asm-h8300/unistd.h
@@ -11143,7 +11029,6 @@
  
 +#endif /* __KERNEL__ */
  #endif /* _ASM_H8300_UNISTD_H_ */
-only in patch2:
 unchanged:
 --- a/include/asm-i386/unistd.h
 +++ b/include/asm-i386/unistd.h
@@ -11187,7 +11072,6 @@
  
 +#endif /* __KERNEL__ */
  #endif /* _ASM_I386_UNISTD_H_ */
-only in patch2:
 unchanged:
 --- a/include/asm-m32r/unistd.h
 +++ b/include/asm-m32r/unistd.h
@@ -11222,7 +11106,6 @@
  
 +#endif /* __KERNEL__ */
  #endif /* _ASM_M32R_UNISTD_H */
-only in patch2:
 unchanged:
 --- a/include/asm-m68k/unistd.h
 +++ b/include/asm-m68k/unistd.h
@@ -11266,7 +11149,6 @@
  
 +#endif /* __KERNEL__ */
  #endif /* _ASM_M68K_UNISTD_H_ */
-only in patch2:
 unchanged:
 --- a/include/asm-m68knommu/unistd.h
 +++ b/include/asm-m68knommu/unistd.h
@@ -11310,7 +11192,6 @@
  
 +#endif /* __KERNEL__ */
  #endif /* _ASM_M68K_UNISTD_H_ */
-only in patch2:
 unchanged:
 --- a/include/asm-parisc/unistd.h
 +++ b/include/asm-parisc/unistd.h
@@ -11344,7 +11225,6 @@
  
 +#endif /* __KERNEL__ */
  #endif /* _ASM_PARISC_UNISTD_H_ */
-only in patch2:
 unchanged:
 --- a/include/asm-sh/unistd.h
 +++ b/include/asm-sh/unistd.h
@@ -11388,7 +11268,6 @@
  
 +#endif /* __KERNEL__ */
  #endif /* __ASM_SH_UNISTD_H */
-only in patch2:
 unchanged:
 --- a/include/asm-sh64/unistd.h
 +++ b/include/asm-sh64/unistd.h
@@ -11432,7 +11311,6 @@
  
 +#endif /* __KERNEL__ */
  #endif /* __ASM_SH64_UNISTD_H */
-only in patch2:
 unchanged:
 --- a/include/asm-sparc/unistd.h
 +++ b/include/asm-sparc/unistd.h
@@ -11466,7 +11344,6 @@
  
 +#endif /* __KERNEL__ */
  #endif /* _SPARC_UNISTD_H */
-only in patch2:
 unchanged:
 --- a/include/asm-sparc64/unistd.h
 +++ b/include/asm-sparc64/unistd.h
@@ -11500,7 +11377,6 @@
  
 +#endif /* __KERNEL__ */
  #endif /* _SPARC64_UNISTD_H */
-only in patch2:
 unchanged:
 --- a/include/asm-v850/unistd.h
 +++ b/include/asm-v850/unistd.h
@@ -11557,7 +11433,6 @@
  
 +#endif /* __KERNEL__ */
  #endif /* __V850_UNISTD_H__ */
-only in patch2:
 unchanged:
 --- a/include/asm-x86_64/unistd.h
 +++ b/include/asm-x86_64/unistd.h
@@ -11601,7 +11476,6 @@
  
 +#endif /* __KERNEL__ */
  #endif
-only in patch2:
 unchanged:
 --- a/include/asm-xtensa/unistd.h
 +++ b/include/asm-xtensa/unistd.h



From fedora-cvs-commits at redhat.com  Fri Apr 28 17:12:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 13:12:20 -0400
Subject: rpms/kdebase/FC-5 kdebase-3.5.2-kwin.patch,1.1,1.2
Message-ID: <200604281712.k3SHCKTk008545@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8458

Modified Files:
	kdebase-3.5.2-kwin.patch 
Log Message:
update kdebase-3.5.2-kwin.patch


kdebase-3.5.2-kwin.patch:
 activation.cpp                  |    2 -
 client.cpp                      |   18 +++++++++++---
 clients/b2/b2client.cpp         |    2 -
 clients/default/kdedefault.cpp  |    2 -
 events.cpp                      |    8 +++---
 geometry.cpp                    |   16 ++++++++++++
 kcmkwin/kwinoptions/windows.cpp |   24 +++++++++++++++++--
 kcmkwin/kwinoptions/windows.h   |    3 ++
 kcmkwin/kwinrules/main.cpp      |    4 +--
 kompmgr/kompmgr.c               |   15 +++++++++---
 layers.cpp                      |   17 ++++++++++++-
 manage.cpp                      |   11 ++++++++
 popupinfo.cpp                   |    1 
 tabbox.cpp                      |   50 +++++++++++++++++++++++++---------------
 useractions.cpp                 |    3 +-
 utils.cpp                       |    9 ++++---
 utils.h                         |   12 ++++++---
 workspace.cpp                   |   35 +++++++++++++++++++++++-----
 workspace.h                     |    4 ++-
 19 files changed, 182 insertions(+), 54 deletions(-)

Index: kdebase-3.5.2-kwin.patch
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase-3.5.2-kwin.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-3.5.2-kwin.patch	28 Apr 2006 14:50:52 -0000	1.1
+++ kdebase-3.5.2-kwin.patch	28 Apr 2006 17:12:15 -0000	1.2
@@ -477,27 +477,6 @@
          }
      return false;
      }
---- kdebase-3.5.2/kwin/utils.h.kwin	2006-03-17 11:17:43.000000000 +0100
-+++ kdebase-3.5.2/kwin/utils.h	2006-04-28 12:30:43.000000000 +0200
-@@ -232,15 +232,13 @@
- inline
- int timestampCompare( Time time1, Time time2 ) // like strcmp()
-     {
--    if( time1 == time2 )
--        return 0;
--    return ( time1 - time2 ) < 1000000000 ? 1 : -1; // time1 > time2 -> 1, handle wrapping
-+    return NET::timestampCompare( time1, time2 );
-     }
- 
- inline
- Time timestampDiff( Time time1, Time time2 ) // returns time2 - time1
--    { // no need to handle wrapping?
--    return time2 - time1;
-+    {
-+    return NET::timestampDiff( time1, time2 );
-     }
- 
- bool isLocalMachine( const QCString& host );
 --- kdebase-3.5.2/kwin/workspace.cpp.kwin	2006-03-17 11:17:43.000000000 +0100
 +++ kdebase-3.5.2/kwin/workspace.cpp	2006-04-28 12:30:43.000000000 +0200
 @@ -512,7 +512,7 @@
@@ -608,3 +587,31 @@
          ClientList should_get_focus; // last is most recent
          ClientList attention_chain;
          
+--- kdebase-3.5.2/kwin/utils.h.kwin	2006-03-17 11:17:43.000000000 +0100
++++ kdebase-3.5.2/kwin/utils.h	2006-04-28 13:54:36.000000000 +0200
+@@ -230,17 +230,21 @@
+     }
+ 
+ inline
+-int timestampCompare( Time time1, Time time2 ) // like strcmp()
++int timestampCompare( unsigned long time1_, unsigned long time2_ ) // like strcmp()
+     {
++    Q_UINT32 time1 = time1_;
++    Q_UINT32 time2 = time2_;
+     if( time1 == time2 )
+         return 0;
+-    return ( time1 - time2 ) < 1000000000 ? 1 : -1; // time1 > time2 -> 1, handle wrapping
++    return Q_UINT32( time1 - time2 ) < 0x7fffffffU ? 1 : -1; // time1 > time2 -> 1, handle wrapping
+     }
+ 
+ inline
+-Time timestampDiff( Time time1, Time time2 ) // returns time2 - time1
++int timestampDiff( unsigned long time1_, unsigned long time2_ ) // returns time2 - time1
+     { // no need to handle wrapping?
+-    return time2 - time1;
++    Q_UINT32 time1 = time1_;
++    Q_UINT32 time2 = time2_;
++    return Q_UINT32( time2 - time1 );
+     }
+ 
+ bool isLocalMachine( const QCString& host );



From fedora-cvs-commits at redhat.com  Fri Apr 28 17:17:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 13:17:01 -0400
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders.spec,1.121,1.122
Message-ID: <200604281717.k3SHH1JU014694@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13181

Modified Files:
	glibc-kernheaders.spec 
Log Message:
remove libaudit hack


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- glibc-kernheaders.spec	28 Apr 2006 16:39:24 -0000	1.121
+++ glibc-kernheaders.spec	28 Apr 2006 17:16:53 -0000	1.122
@@ -1,7 +1,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -29,7 +29,7 @@
 
 %prep
 %setup -q -c
-%patch1 -p0
+#%patch1 -p0
 
 %build
 
@@ -91,6 +91,9 @@
 
 
 %changelog
+* Fri Apr 28 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-21
+- Remove the libaudit workaround hack
+
 * Fri Apr 28 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-20
 - Remove syscall macros from asm-*/unistd.h
 - Clean up asm-generic/signal.h



From fedora-cvs-commits at redhat.com  Fri Apr 28 17:40:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 13:40:45 -0400
Subject: rpms/xen/FC-5 xen-blchanges.patch, NONE, 1.1 xen-check-returns.patch,
	NONE, 1.1 xen-config-allow-http.patch, NONE, 1.1 .cvsignore,
	1.15, 1.16 sources, 1.30, 1.31 xen.spec, 1.107,
	1.108 xenguest-install.py, 1.13, 1.14
Message-ID: <200604281740.k3SHejas029725@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/xen/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv29683

Modified Files:
	.cvsignore sources xen.spec xenguest-install.py 
Added Files:
	xen-blchanges.patch xen-check-returns.patch 
	xen-config-allow-http.patch 
Log Message:
* Fri Apr 28 2006 Jeremy Katz <katzj at redhat.com> - 3.0.2-0.FC5
- update to 3.0.2-2
- add patches for bootloader to run on all domain creations
- make xenguest-install create a persistent uuid
- use libvirt for paravirt domain creation in xenguest-install


xen-blchanges.patch:
 xend/XendBootloader.py |   10 ++--------
 xend/XendDomainInfo.py |   23 ++++++++++++++---------
 xend/image.py          |    6 ++----
 xm/create.py           |    4 +---
 4 files changed, 19 insertions(+), 24 deletions(-)

--- NEW FILE xen-blchanges.patch ---
--- xen-3.0.2-2/tools/python/xen/xend/XendDomainInfo.py.blchanges	2006-04-28 13:23:09.000000000 -0400
+++ xen-3.0.2-2/tools/python/xen/xend/XendDomainInfo.py	2006-04-28 13:24:45.000000000 -0400
@@ -1195,6 +1195,11 @@
                   self.domid,
                   self.info['cpu_weight'])
 
+        # if we have a boot loader but no image, then we need to set things
+        # up by running the boot loader non-interactively
+        if self.infoIsSet('bootloader') and not self.infoIsSet('image'):
+            self.configure_bootloader()
+
         if not self.infoIsSet('image'):
             raise VmError('Missing image in configuration')
 
@@ -1548,24 +1553,24 @@
 
 
     def configure_bootloader(self):
+        """Run the bootloader if we're configured to do so."""        
         if not self.info['bootloader']:
             return
-        # if we're restarting with a bootloader, we need to run it
         blcfg = None
-        config = self.sxpr()
-        # FIXME: this assumes that we want to use the first disk
-        for dev in sxp.children(config, "device"):
-            disk = sxp.child(dev, "vbd")
+        # FIXME: this assumes that we want to use the first disk device
+        for (n,c) in self.info['device']:
+            if not n or not c or n != "vbd":
+                continue
+            disk = sxp.child_value(c, "uname")
             if disk is None:
                 continue
-            fn = blkdev_uname_to_file(sxp.child_value(disk, "uname"))
-            blcfg = bootloader(self.info['bootloader'], fn, 1,
-                               self.info['vcpus'])
+            fn = blkdev_uname_to_file(disk)            
+            blcfg = bootloader(self.info['bootloader'], fn, 1)
         if blcfg is None:
             msg = "Had a bootloader specified, but can't find disk"
             log.error(msg)
             raise VmError(msg)
-        self.info['image'] = sxp.to_string(blcfg)
+        self.info['image'] = blcfg
 
 
     def send_sysrq(self, key):
--- xen-3.0.2-2/tools/python/xen/xend/XendBootloader.py.blchanges	2006-04-13 13:48:39.000000000 -0400
+++ xen-3.0.2-2/tools/python/xen/xend/XendBootloader.py	2006-04-28 13:23:09.000000000 -0400
@@ -19,13 +19,12 @@
 from XendLogging import log
 from XendError import VmError
 
-def bootloader(blexec, disk, quiet = 0, vcpus = None, entry = None):
+def bootloader(blexec, disk, quiet = 0, entry = None):
     """Run the boot loader executable on the given disk and return a
     config image.
     @param blexec  Binary to use as the boot loader
     @param disk Disk to run the boot loader on.
     @param quiet Run in non-interactive mode, just booting the default.
-    @param vcpus Number of vcpus for the domain.
     @param entry Default entry to boot."""
     
     if not os.access(blexec, os.X_OK):
@@ -87,9 +86,4 @@
     pin = sxp.Parser()
     pin.input(ret)
     pin.input_eof()
-
-    config_image = pin.val
-    if vcpus and sxp.child_value(config_image, "vcpus") is None:
-        config_image.append(['vcpus', vcpus])
-
-    return config_image
+    return pin.val
--- xen-3.0.2-2/tools/python/xen/xend/image.py.blchanges	2006-04-13 13:48:39.000000000 -0400
+++ xen-3.0.2-2/tools/python/xen/xend/image.py	2006-04-28 13:23:09.000000000 -0400
@@ -68,7 +68,6 @@
         self.kernel = None
         self.ramdisk = None
         self.cmdline = None
-        self.features = None
 
         self.configure(imageConfig, deviceConfig)
 
@@ -90,7 +89,6 @@
         if args:
             self.cmdline += " " + args
         self.ramdisk = get_cfg("ramdisk", '')
-        self.features = get_cfg("features", '')
         
         self.vm.storeVm(("image/ostype", self.ostype),
                         ("image/kernel", self.kernel),
@@ -177,7 +175,7 @@
         log.debug("cmdline        = %s", self.cmdline)
         log.debug("ramdisk        = %s", self.ramdisk)
         log.debug("vcpus          = %d", self.vm.getVCpuCount())
-        log.debug("features       = %s", self.features)
+        log.debug("features       = %s", self.vm.getFeatures())
 
         return xc.linux_build(dom            = self.vm.getDomid(),
                               image          = self.kernel,
@@ -185,7 +183,7 @@
                               console_evtchn = console_evtchn,
                               cmdline        = self.cmdline,
                               ramdisk        = self.ramdisk,
-                              features       = self.features)
+                              features       = self.vm.getFeatures())
 
 class HVMImageHandler(ImageHandler):
 
--- xen-3.0.2-2/tools/python/xen/xm/create.py.blchanges	2006-04-13 13:48:39.000000000 -0400
+++ xen-3.0.2-2/tools/python/xen/xm/create.py	2006-04-28 13:23:09.000000000 -0400
@@ -451,8 +451,6 @@
         config_image.append(['root', cmdline_root])
     if vals.extra:
         config_image.append(['args', vals.extra])
-    if vals.features:
-        config_image.append(['features', vals.features])
 
     if vals.builder == 'hvm':
         configure_hvm(config_image, vals)
@@ -596,7 +594,7 @@
                 config.append([n, v])
 
     map(add_conf, ['name', 'memory', 'ssidref', 'maxmem', 'restart',
-                   'on_poweroff', 'on_reboot', 'on_crash', 'vcpus'])
+                   'on_poweroff', 'on_reboot', 'on_crash', 'vcpus', 'features'])
     
     if vals.uuid is not None:
         config.append(['uuid', vals.uuid])

xen-check-returns.patch:
 xenstored_core.c |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

--- NEW FILE xen-check-returns.patch ---
--- xen-unstable.hg/tools/xenstore/xenstored_core.c.unused	2006-04-25 22:06:11.000000000 -0400
+++ xen-unstable.hg/tools/xenstore/xenstored_core.c	2006-04-25 22:11:22.000000000 -0400
@@ -173,7 +173,7 @@
 	va_list arglist;
 	char *str;
 	char sbuf[1024];
-	int ret;
+	int ret, dummy;
 
 	if (tracefd < 0)
 		return;
@@ -184,7 +184,7 @@
 	va_end(arglist);
 
 	if (ret <= 1024) {
-		write(tracefd, sbuf, ret);
+		dummy = write(tracefd, sbuf, ret);
 		return;
 	}
 
@@ -192,7 +192,7 @@
 	va_start(arglist, fmt);
 	str = talloc_vasprintf(NULL, fmt, arglist);
 	va_end(arglist);
-	write(tracefd, str, strlen(str));
+	dummy = write(tracefd, str, strlen(str));
 	talloc_free(str);
 }
 
@@ -238,7 +238,8 @@
 static void trigger_reopen_log(int signal __attribute__((unused)))
 {
 	char c = 'A';
-	write(reopen_log_pipe[1], &c, 1);
+	int dummy;
+	dummy = write(reopen_log_pipe[1], &c, 1);
 }
 
 
@@ -1678,7 +1679,8 @@
 		exit(0);
 
 	len = sprintf(buf, "%d\n", getpid());
-	write(fd, buf, len);
+	if (write(fd, buf, len) != len)
+		barf_perror("Writing pid file %s", pidfile);
 }
 
 /* Stevens. */
@@ -1703,7 +1705,8 @@
 
 #ifndef TESTING	/* Relative paths for socket names */
 	/* Move off any mount points we might be in. */
-	chdir("/");
+	if (chdir("/") == -1)
+		barf_perror("Failed to chdir");
 #endif
 	/* Discard our parent's old-fashioned umask prejudices. */
 	umask(0);
@@ -1900,7 +1903,8 @@
 
 		if (FD_ISSET(reopen_log_pipe[0], &inset)) {
 			char c;
-			read(reopen_log_pipe[0], &c, 1);
+			if (read(reopen_log_pipe[0], &c, 1) != 1)
+				barf_perror("read failed");
 			reopen_log();
 		}
 

xen-config-allow-http.patch:
 xend-config.sxp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xen-config-allow-http.patch ---
--- xen-unstable.hg/tools/examples/xend-config.sxp.http	2006-04-25 21:57:10.000000000 -0400
+++ xen-unstable.hg/tools/examples/xend-config.sxp	2006-04-25 21:57:35.000000000 -0400
@@ -14,7 +14,7 @@
 #(logfile /var/log/xend.log)
 #(loglevel DEBUG)
 
-#(xend-http-server no)
+(xend-http-server yes)
 #(xend-unix-server no)
 #(xend-tcp-xmlrpc-server no)
 #(xend-unix-xmlrpc-server yes)
@@ -35,7 +35,7 @@
 # Specifying 'localhost' prevents remote connections.
 # Specifying the empty string '' (the default) allows all connections.
 #(xend-address '')
-#(xend-address localhost)
+(xend-address localhost)
 
 # Address xend should listen on for relocation-socket connections, if
 # xend-relocation-server is set.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xen/FC-5/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	1 Mar 2006 23:04:59 -0000	1.15
+++ .cvsignore	28 Apr 2006 17:40:42 -0000	1.16
@@ -1,2 +1,2 @@
 LibVNCServer-0.7.1.tar.gz
-xen-3.0.1-20060301.tar.bz2
+xen-3.0.2-src.tgz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xen/FC-5/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	1 Mar 2006 23:04:59 -0000	1.30
+++ sources	28 Apr 2006 17:40:42 -0000	1.31
@@ -1,2 +1,2 @@
 54110288b3171551c03467cd60976d55  LibVNCServer-0.7.1.tar.gz
-b6de980106e996ef5fdb845022c69bca  xen-3.0.1-20060301.tar.bz2
+ae26a3f51b2d94aca17fbe4df68fdc1d  xen-3.0.2-src.tgz


Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/FC-5/xen.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- xen.spec	18 Apr 2006 17:10:09 -0000	1.107
+++ xen.spec	28 Apr 2006 17:40:42 -0000	1.108
@@ -4,13 +4,12 @@
 
 Summary: Xen is a virtual machine monitor
 Name:    xen
-Version: 3.0.1
-Release: 5.FC5
+Version: 3.0.2
+Release: 0.FC5
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
-# xen-unstable cs 9022
-Source0: xen-3.0.1-20060301.tar.bz2
+Source0: xen-3.0.2-src.tgz
 Source1: http://download.sf.net/libvncserver/LibVNCServer-%{libvncver}.tar.gz
 Source2: xenguest-install.py
 Source3: xen-udev.rules
@@ -21,10 +20,12 @@
 Patch4: xen-compile-fixes.patch
 Patch6: xen-network-iptables-bridge.patch
 Patch8: xen-vmxballoon-hack.patch
-Patch9: xen-3.0.1-config-allow-http.patch
+Patch9: xen-config-allow-http.patch
 Patch10: xen-3.0.1-m64.patch
 Patch11: xen-3.0.1-cloexec.patch
 Patch12: xen-3.0.1-tempdir.patch
+Patch13: xen-blchanges.patch
+Patch14: xen-check-returns.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel curl-devel
 BuildRequires: libX11-devel python-devel ghostscript tetex-latex 
@@ -38,6 +39,7 @@
 Requires: bridge-utils
 Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires: udev >= 059
+Requires: libvirt-python
 Prereq: chkconfig
 ExclusiveArch: i386 x86_64
 
@@ -55,18 +57,20 @@
 or makes fun of you in front of your friends.
 
 %prep
-%setup -q -n xen-3.0.1 -a 1
-%patch0 -p1 -b .misc
+%setup -q -n xen-3.0.2-2 -a 1
+#patch0 -p1 -b .misc
 %patch1 -p1 -b .init
-%patch2 -p1 -b .kva-mmap
+#patch2 -p1 -b .kva-mmap
 %patch3 -p1 -b .mem-min
 %patch4 -p1 -b .compile
 %patch6 -p1
 %patch8 -p1
 %patch9 -p1 
-%patch10 -p1 -b .m64
+#patch10 -p1 -b .m64
 %patch11 -p1 -b .cloexec
 %patch12 -p1 -b .tempdir
+%patch13 -p1 -b .blchanges
+%patch14 -p1
 
 cp %{SOURCE2} .
 
@@ -165,6 +169,12 @@
 %dir %{_localstatedir}/run/xenstored
 
 %changelog
+* Fri Apr 28 2006 Jeremy Katz <katzj at redhat.com> - 3.0.2-0.FC5
+- update to 3.0.2-2
+- add patches for bootloader to run on all domain creations
+- make xenguest-install create a persistent uuid
+- use libvirt for paravirt domain creation in xenguest-install
+
 * Tue Apr 18 2006 Daniel Veillard <veillard at redhat.com> - 3.0.1-5.FC5
 - augment the close on exec patch with the fix for #188361
 


Index: xenguest-install.py
===================================================================
RCS file: /cvs/dist/rpms/xen/FC-5/xenguest-install.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xenguest-install.py	9 Mar 2006 05:09:29 -0000	1.13
+++ xenguest-install.py	28 Apr 2006 17:40:42 -0000	1.14
@@ -20,6 +20,8 @@
 import random
 from optparse import OptionParser
 
+import libvirt
+
 XENCONFIGPATH="/etc/xen/"
 
 # stolen directly from xend/server/netif.py
@@ -41,6 +43,17 @@
             random.randint(0x00, 0xff) ]
     return ':'.join(map(lambda x: "%02x" % x, mac))
 
+# ... and stolen from xend/uuid.py
+def randomUUID():
+    """Generate a random UUID."""
+
+    return [ random.randint(0, 255) for _ in range(0, 16) ]
+
+def uuidToString(u):
+    return "-".join(["%02x" * 4, "%02x" * 2, "%02x" * 2, "%02x" * 2,
+                     "%02x" * 6]) % tuple(u)
+
+
 def yes_or_no(s):
     s = s.lower()
     if s in ("y", "yes", "1", "true", "t"):
@@ -93,6 +106,11 @@
 
     return disk
 
+def get_uuid(options):
+    if options.uuid:
+        return options.uuid
+    return uuidToString(randomUUID())
+
 def get_mac(options):
     if options.mac:
         return options.mac
@@ -128,7 +146,7 @@
         cdrom = sys.stdin.readline().strip()
     return cdrom
 
-def start_hvm_guest(name, ram, disk, mac, cdrom):
+def start_hvm_guest(name, ram, disk, mac, uuid, cdrom):
     if os.uname()[4] in ("x86_64"):
         qemu = "/usr/lib64/xen/bin/qemu-dm"
     else:
@@ -151,6 +169,7 @@
 name = "%(name)s"
 builder = "hvm"
 memory = "%(ram)s"
+uuid = "%(uuid)s"
 disk = [ '%(type)s:%(disk)s,ioemu:hda,w' ]
 vif = [ 'type=ioemu,bridge=xenbr0,mac=%(mac)s' ]
 on_reboot   = 'restart'
@@ -163,7 +182,7 @@
 nographic = %(noX)d # don't use graphics
 serial='pty' # enable serial console
 """ % {'name': name, 'ram': ram, 'disk': disk, 'mac': mac, 'devmodel': qemu,
-       'hasX': hasX, 'noX': not hasX, 'type': type }
+       'hasX': hasX, 'noX': not hasX, 'type': type, 'uuid': uuid }
     f.write(buf)
     f.close()
 
@@ -246,65 +265,115 @@
     	print "What is the install location? ",
     	src = sys.stdin.readline().strip()
 
-def start_paravirt_install(name, ram, disk, mac, src, extra = ""):
+def start_paravirt_install(name, ram, disk, mac, uuid, src, extra = ""):
+    def writeConfig(cfgdict):
+        cfg = "%s%s" %(XENCONFIGPATH, cfgdict['name'])
+        f = open(cfg, "w+")
+        buf = """# Automatically generated xen config file
+name = "%(name)s"
+memory = "%(ram)s"
+disk = [ '%(disktype)s:%(disk)s,xvda,w' ]
+vif = [ 'mac=%(mac)s' ]
+uuid = "%(uuid)s"
+bootloader="/usr/bin/pygrub"
+
+on_reboot   = 'destroy'
+on_crash    = 'destroy'
+""" % cfgdict
+        f.write(buf)
+        f.close()
+        
     (kfn, ifn) = get_paravirt_install_image(src)
 
     if stat.S_ISBLK(os.stat(disk)[stat.ST_MODE]):
         type = "phy"
     else:
         type = "file"
-    
-    cfg = "%s%s" %(XENCONFIGPATH, name)
-    f = open(cfg, "w+")
-    buf = """# Automatically generated xen config file
-name = "%(name)s"
-memory = "%(ram)s"
-disk = [ '%(type)s:%(disk)s,xvda,w' ]
-vif = [ 'mac=%(mac)s' ]
-#bootloader="/usr/bin/pygrub"
 
-on_reboot   = 'destroy'
-on_crash    = 'destroy'
-""" % {'name': name, 'ram': ram, 'disk': disk, 'mac': mac, 'type': type }
-    f.write(buf)
-    f.close()
+    cfgdict = {'name': name, 'ram': ram, 'ramkb': int(ram) * 1024, 'disk': disk, 'mac': mac, 'disktype': type, 'uuid': uuid, 'kernel': kfn, 'initrd': ifn, 'src': src, 'extra': extra }      
 
-    print "\n\nStarting install..."
+    # FIXME: there's a hack sticking a root= in here because libvirt requires
+    cfgxml = """<domain type='xen'>
+  <name>%(name)s</name>
+  <os>
+    <type>linux</type>
+    <kernel>%(kernel)s</kernel>
+    <initrd>%(initrd)s</initrd>
+    <cmdline> root=/dev/xvd method=%(src)s %(extra)s</cmdline>
+  </os>
+  <memory>%(ramkb)s</memory>
+  <vcpu>1</vcpu>
+  <uuid>%(uuid)s</uuid>
+  <on_reboot>destroy</on_reboot>
+  <on_poweroff>destroy</on_poweroff>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <disk type='%(disktype)s'>
+      <source file='%(disk)s'/>
+      <target dev='xvda'/>
+    </disk>
+    <interface type='bridge'>
+      <source bridge='xenbr0'/>
+      <mac address='%(mac)s'/>
+      <script path='/etc/xen/scripts/vif-bridge'/>
+    </interface>
+  </devices>
+</domain>
+""" % cfgdict
+
+    conn = libvirt.openReadOnly(None)
+    if conn == None:
+        print >> sys.stderr, "Unable to connect to hypervisor, aborting installation"
+        sys.exit(1)
 
-    # this is kind of lame.  we call xm create, then change our
-    # guest config file to use a boot loader instead of the passed kernel
-    cmd = ["/usr/sbin/xm", "create", "-c", "kernel=%s" %(kfn,),
-           "ramdisk=%s" %(ifn,),
-           "extra=method=%s %s" %(src,extra),
-           cfg]
+
+    print "\n\nStarting install..."
+    dom = conn.createLinux(cfgxml, 0)
+    if dom == None:
+        print >> sys.stderr, "Unable to create domain for guest, aborting installation"
+        sys.exit(2)
+
+    # *sigh*  would be nice to have a python version of xmconsole I guess...
+    # and probably not much work at all to throw together, but this will
+    # do for now
+    cmd = ["/usr/sbin/xm", "console", "%s" %(dom.ID(),)]
     child = os.fork()
     if (not child):
         os.execvp(cmd[0], cmd)
         os._exit(1)
 
     time.sleep(5)
-    f = open(cfg, "r")
-    buf = f.read()
-    f.close()
     os.unlink(kfn)
     os.unlink(ifn)
-    
-    buf = buf.replace("#bootloader", "bootloader")
-    buf = buf.replace("'destroy'", "'restart'")
 
-    f = open(cfg, "w+")
-    f.write(buf)
-    f.close()
+    # FIXME: if the domain doesn't exist now, it almost certainly crashed.
+    # it'd be nice to know that for certain...
+    try:
+        d = conn.lookupByID(dom.ID())
+    except libvirt.libvirtError:
+        print ("\n\nIt appears that your installation has crashed.  You should\n"
+               "be able to find more information in the Xen logs")
+        sys.exit(3)
 
+    writeConfig(cfgdict)
+    
     status = -1
     try:
         (pid, status) = os.waitpid(child, 0)
     except OSError, (errno, msg):
         print __name__, "waitpid:", msg
 
-    print ("If your install has exited, you can restart your guest by running\n"
-           "'xm create -c %s'.  Otherwise, you can reconnect to the console\n"
-           "by running 'xm console %s'" %(name, name)) 
+    # ensure there's time for the domain to finish destroying if the
+    # install has finished or the guest crashed
+    time.sleep(1)
+    try:
+        d = conn.lookupByID(dom.ID())
+    except libvirt.libvirtError:
+        print ("If your install completed successfully, you can restart your\n"
+               "guest by running 'xm create -c %s'." %(name,))
+    else:
+        print ("You can reconnect to the console of your guest by running\n"
+               "'xm console %s'" %(name,))
     
 
 def parse_args():
@@ -319,6 +388,8 @@
                       help="Memory to allocate for guest instance in megabytes")
     parser.add_option("-m", "--mac", type="string", dest="mac",
                       help="Fixed MAC address for the guest; if none is given a random address will be used")
+    parser.add_option("-u", "--uuid", type="string", dest="uuid",
+                      help="UUID for the guest; if none is given a random UUID will be generated")
     
     # vmx/svm options
     if is_hvm_capable():
@@ -370,19 +441,20 @@
     ram = get_ram(options)
     disk = get_disk(options)
     mac = get_mac(options)
+    uuid = get_uuid(options)
 
     if is_hvm_capable():
         hvm = get_full_virt(options)
 
     if not hvm:
         src = get_paravirt_install(options)
-        start_paravirt_install(name, ram, disk, mac, src, options.extra)
+        start_paravirt_install(name, ram, disk, mac, uuid, src, options.extra)
     else:
         if get_virt_cdboot(options):
             cdrom = get_virt_cdrom(options)
         else:
             cdrom = None
-        start_hvm_guest(name, ram, disk, mac, cdrom)
+        start_hvm_guest(name, ram, disk, mac, uuid, cdrom)
 
 if __name__ == "__main__":
     main()



From fedora-cvs-commits at redhat.com  Fri Apr 28 19:25:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 15:25:52 -0400
Subject: rpms/glib-java/devel .cvsignore, 1.8, 1.9 glib-java.spec, 1.27,
	1.28 sources, 1.8, 1.9
Message-ID: <200604281925.k3SJPqGb031190@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/glib-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31131

Modified Files:
	.cvsignore glib-java.spec sources 
Log Message:
* Fri Apr 28 2006 Stepan Kasal <skasal at redhat.com>    - 0.2.4-1
- Imported version 0.2.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	1 Mar 2006 21:13:05 -0000	1.8
+++ .cvsignore	28 Apr 2006 19:25:49 -0000	1.9
@@ -1,3 +1 @@
-glib-java-0.2.2.tar.gz
-glib-java-0.2.3.tar.gz
-glib-java-0.2.3.0.20060301.rh1.tar.gz
+glib-java-0.2.4.tar.gz


Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/glib-java.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- glib-java.spec	1 Mar 2006 21:13:05 -0000	1.27
+++ glib-java.spec	28 Apr 2006 19:25:49 -0000	1.28
@@ -14,7 +14,7 @@
 %define name_base glib-java
 Summary:   Base Library for the Java-GNOME libraries 
 Name:      %{java_pkg_prefix}%{name_base}
-Version:   0.2.3.0.20060301.rh1
+Version:   0.2.4
 Release:   1
 URL:       http://java-gnome.sourceforge.net
 Source0:   %{name_base}-%{version}.tar.gz
@@ -117,6 +117,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Fri Apr 28 2006 Stepan Kasal <skasal at redhat.com>    - 0.2.4-1
+- New version.
+
 * Wed Mar 01 2006 Adam Jocksch <ajocksch at redhat.com> - 0.2.3.0.20060301.rh1-1
 - Imported new tarball to address bg #183538.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	1 Mar 2006 21:13:05 -0000	1.8
+++ sources	28 Apr 2006 19:25:49 -0000	1.9
@@ -1 +1 @@
-6b81b808b4fb5e4fca9831277e607697  glib-java-0.2.3.0.20060301.rh1.tar.gz
+12b6a077b927175c182109fc60d57b7f  glib-java-0.2.4.tar.gz



From fedora-cvs-commits at redhat.com  Fri Apr 28 19:47:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 15:47:33 -0400
Subject: rpms/kernel/devel patch-2.6.17-rc3-git2.bz2.sign, NONE,
	1.1 .cvsignore, 1.416, 1.417 kernel-2.6.spec, 1.2176,
	1.2177 linux-2.6-xen.patch, 1.15, 1.16 sources, 1.358,
	1.359 upstream, 1.329, 1.330
Message-ID: <200604281947.k3SJlXt8010033@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8970

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-xen.patch sources 
	upstream 
Added Files:
	patch-2.6.17-rc3-git2.bz2.sign 
Log Message:
rc3-git2



--- NEW FILE patch-2.6.17-rc3-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEUmaryGugalF9Dw4RAva8AKCVjTv+baZf3BuW42TxjjJZtiX2/QCeNN+N
LnaaNX7+IjZn1aHsiMZfUrE=
=3zj4
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -r1.416 -r1.417
--- .cvsignore	27 Apr 2006 03:10:47 -0000	1.416
+++ .cvsignore	28 Apr 2006 19:47:28 -0000	1.417
@@ -4,3 +4,4 @@
 linux-2.6.16.tar.bz2
 xen-20060413.tar.bz2
 patch-2.6.17-rc3.bz2
+patch-2.6.17-rc3-git2.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2176
retrieving revision 1.2177
diff -u -r1.2176 -r1.2177
--- kernel-2.6.spec	28 Apr 2006 14:48:31 -0000	1.2176
+++ kernel-2.6.spec	28 Apr 2006 19:47:28 -0000	1.2177
@@ -9,7 +9,7 @@
 # Whether to apply the Xen patches, leave this enabled.
 %define includexen 1
 # Whether to build the Xen kernels, disable if you want.
-%define buildxen 0
+%define buildxen 1
 %define buildxenPAE 0
 %define builddoc 0
 %define buildkdump 1
@@ -227,6 +227,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.17-rc3.bz2
+Patch2: patch-2.6.17-rc3-git2.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -748,7 +749,7 @@
 
 # Update to latest upstream.
 %patch1 -p1
-#%patch2 -p1
+%patch2 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -1709,6 +1710,9 @@
 %endif
 
 %changelog
+* Fri Apr 28 2006 Dave Jones <davej at redhat.com>
+- 2.6.17rc3-git2
+
 * Fri Apr 28 2006 David Woodhouse <dwmw2 at redhat.com>
 - Disable Xen on the basis that it doesn't build
 - Check for Xen tarball being unclean, abort early even on i386.

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   94 
 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                    | 1170 ++++++++
 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                            |   96 
 arch/i386/kernel/head-xen.S                         |  171 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2748 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  122 
 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                      | 1176 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  354 ++
 arch/i386/kernel/process-xen.c                      |  824 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1854 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  613 ++++
 arch/i386/kernel/swiotlb.c                          |  674 ++++
 arch/i386/kernel/sysenter.c                         |  102 
 arch/i386/kernel/time-xen.c                         | 1097 +++++++
 arch/i386/kernel/traps-xen.c                        | 1137 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/vm86.c                             |    8 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |   49 
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  683 ++++
 arch/i386/mm/highmem-xen.c                          |  123 
 arch/i386/mm/hypervisor.c                           |  424 +++
 arch/i386/mm/init-xen.c                             |  855 ++++++
 arch/i386/mm/ioremap-xen.c                          |  486 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  652 ++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  441 +++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1205 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   51 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/sal.c                              |    3 
 arch/ia64/kernel/setup.c                            |   32 
 arch/ia64/xen/Makefile                              |    5 
 arch/ia64/xen/drivers/Makefile                      |   20 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/drivers/coreMakefile                  |   26 
 arch/ia64/xen/drivers/evtchn_ia64.c                 |  273 +
 arch/ia64/xen/drivers/patches/blkback.c.patch       |   33 
 arch/ia64/xen/drivers/patches/console.c.patch       |   11 
 arch/ia64/xen/drivers/patches/devmem.c.patch        |    2 
 arch/ia64/xen/drivers/patches/gnttab.c.patch        |   33 
 arch/ia64/xen/drivers/patches/privcmd.c.patch       |   30 
 arch/ia64/xen/drivers/xenia64_init.c                |   55 
 arch/ia64/xen/hypercall.S                           |  365 ++
 arch/ia64/xen/xen_ksyms.c                           |   12 
 arch/ia64/xen/xenconsole.c                          |   19 
 arch/ia64/xen/xenentry.S                            |  850 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2032 ++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  367 ++
 arch/ia64/xen/xenpal.S                              |   73 
 arch/ia64/xen/xensetup.S                            |   35 
 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                    |  725 +++++
 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                       |  777 +++++
 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                       |  164 +
 arch/x86_64/kernel/head64-xen.c                     |  140 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2229 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   58 
 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                    | 1002 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  802 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1679 ++++++++++++
 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                      | 1025 +++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/x8664_ksyms-xen.c                |  155 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  644 ++++
 arch/x86_64/mm/init-xen.c                           | 1176 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  390 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   14 
 drivers/char/tpm/Makefile                           |    1 
 drivers/char/tpm/tpm.c                              |   44 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_xen.c                          |  536 +++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 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                                 |  223 +
 drivers/xen/Makefile                                |   22 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  592 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  597 ++++
 drivers/xen/blkback/common.h                        |  145 +
 drivers/xen/blkback/interface.c                     |  181 +
 drivers/xen/blkback/vbd.c                           |  126 
 drivers/xen/blkback/xenbus.c                        |  421 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  819 +++++
 drivers/xen/blkfront/block.h                        |  165 +
 drivers/xen/blkfront/vbd.c                          |  327 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         |  910 ++++++
 drivers/xen/blktap/common.h                         |  110 
 drivers/xen/blktap/interface.c                      |  143 +
 drivers/xen/blktap/xenbus.c                         |  233 +
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  192 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  648 ++++
 drivers/xen/console/xencons_ring.c                  |  151 +
 drivers/xen/core/Makefile                           |   11 
 drivers/xen/core/evtchn.c                           |  867 ++++++
 drivers/xen/core/features.c                         |   29 
 drivers/xen/core/gnttab.c                           |  471 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   57 
 drivers/xen/core/reboot.c                           |  381 ++
 drivers/xen/core/skbuff.c                           |  144 +
 drivers/xen/core/smpboot.c                          |  576 ++++
 drivers/xen/core/xen_proc.c                         |   29 
 drivers/xen/core/xen_sysfs.c                        |  311 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  464 +++
 drivers/xen/net_driver_util.c                       |   68 
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  133 
 drivers/xen/netback/interface.c                     |  328 ++
 drivers/xen/netback/loopback.c                      |  254 +
 drivers/xen/netback/netback.c                       |  864 ++++++
 drivers/xen/netback/xenbus.c                        |  366 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1522 +++++++++++
 drivers/xen/pciback/Makefile                        |   10 
 drivers/xen/pciback/conf_space.c                    |  345 ++
 drivers/xen/pciback/conf_space.h                    |   97 
 drivers/xen/pciback/conf_space_header.c             |  267 +
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  695 +++++
 drivers/xen/pciback/pciback.h                       |   89 
 drivers/xen/pciback/pciback_ops.c                   |   97 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  453 +++
 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                       |  303 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   92 
 drivers/xen/tpmback/interface.c                     |  193 +
 drivers/xen/tpmback/tpmback.c                       | 1061 +++++++
 drivers/xen/tpmback/xenbus.c                        |  316 ++
 drivers/xen/tpmfront/Makefile                       |    2 
 drivers/xen/tpmfront/tpmfront.c                     |  767 +++++
 drivers/xen/tpmfront/tpmfront.h                     |   40 
 drivers/xen/util.c                                  |   80 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  144 +
 drivers/xen/xenbus/xenbus_client.c                  |  284 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  218 +
 drivers/xen/xenbus/xenbus_comms.h                   |   53 
 drivers/xen/xenbus/xenbus_dev.c                     |  255 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1093 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  856 ++++++
 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         |  156 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   81 
 include/asm-i386/mach-xen/asm/hw_irq.h              |   73 
 include/asm-i386/mach-xen/asm/hypercall.h           |  357 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  224 +
 include/asm-i386/mach-xen/asm/io.h                  |  390 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 include/asm-i386/mach-xen/asm/mmu.h                 |   21 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  105 
 include/asm-i386/mach-xen/asm/page.h                |  326 ++
 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      |   85 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  183 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  520 +++
 include/asm-i386/mach-xen/asm/processor.h           |  754 +++++
 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              |  576 ++++
 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         |   69 
 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/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hypercall.h                        |  274 +
 include/asm-ia64/hypervisor.h                       |  138 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/pal.h                              |    1 
 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/fixmap.h            |  114 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  141 +
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  357 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  328 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   33 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  134 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 include/asm-x86_64/mach-xen/asm/page.h              |  317 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   23 
 include/asm-x86_64/mach-xen/asm/pci.h               |  174 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  494 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  153 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  428 +++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/mm.h                                  |   13 
 include/linux/oprofile.h                            |    8 
 include/linux/pfn.h                                 |    2 
 include/linux/skbuff.h                              |   13 
 include/xen/balloon.h                               |   73 
 include/xen/driver_util.h                           |   26 
 include/xen/evtchn.h                                |  126 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   40 
 include/xen/gnttab.h                                |  160 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  187 +
 include/xen/interface/acm_ops.h                     |   98 
 include/xen/interface/arch-ia64.h                   |  337 ++
 include/xen/interface/arch-x86_32.h                 |  200 +
 include/xen/interface/arch-x86_64.h                 |  273 +
 include/xen/interface/callback.h                    |   63 
 include/xen/interface/dom0_ops.h                    |  533 +++
 include/xen/interface/event_channel.h               |  211 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  311 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   94 
 include/xen/interface/hvm/vmx_assist.h              |   97 
 include/xen/interface/io/blkif.h                    |   85 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |   84 
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  265 +
 include/xen/interface/io/tpmif.h                    |   56 
 include/xen/interface/io/xenbus.h                   |   42 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  155 +
 include/xen/interface/nmi.h                         |   59 
 include/xen/interface/physdev.h                     |   71 
 include/xen/interface/sched.h                       |  100 
 include/xen/interface/sched_ctl.h                   |   64 
 include/xen/interface/trace.h                       |   86 
 include/xen/interface/vcpu.h                        |  119 
 include/xen/interface/version.h                     |   64 
 include/xen/interface/xen-compat.h                  |   31 
 include/xen/interface/xen.h                         |  461 +++
 include/xen/interface/xenoprof.h                    |   91 
 include/xen/net_driver_util.h                       |   58 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |  101 
 include/xen/public/privcmd.h                        |   94 
 include/xen/tpmfe.h                                 |   40 
 include/xen/xen_proc.h                              |   23 
 include/xen/xenbus.h                                |  306 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/irq/manage.c                                 |   26 
 lib/Kconfig.debug                                   |   31 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  116 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/skbuff.c                                   |   41 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    9 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |   12 
 net/ipv4/xfrm4_output.c                             |    6 
 scripts/Makefile.xen                                |   14 
 394 files changed, 80578 insertions(+), 264 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/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	27 Apr 2006 07:42:33 -0000	1.15
+++ linux-2.6-xen.patch	28 Apr 2006 19:47:28 -0000	1.16
@@ -188,12 +188,12 @@
  	help
  	  kexec is a system call that implements the ability to shutdown your
  	  current kernel, and to start another kernel.  It is like a reboot
-@@ -756,7 +780,7 @@ config PHYSICAL_START
+@@ -780,7 +780,7 @@ config PHYSICAL_START
  
  config HOTPLUG_CPU
  	bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
--	depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER && !X86_PC
-+	depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER && (!X86_PC || X86_XEN)
+-	depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER
++	depends on SMP && HOTPLUG && EXPERIMENTAL && (!X86_VOYAGER || X86_XEN)
  	---help---
  	  Say Y here to experiment with turning CPUs off and on.  CPUs
  	  can be controlled through /sys/devices/system/cpu.
@@ -83761,15 +83761,17 @@
  	if (!shared) {
  		desc->depth = 0;
  		desc->status &= ~(IRQ_DISABLED | IRQ_AUTODETECT |
-@@ -243,12 +236,6 @@ int setup_irq(unsigned int irq, struct i
+@@ -236,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);
--	printk(KERN_ERR "%s: irq handler mismatch\n", __FUNCTION__);
--	dump_stack();
+-	if (!(new->flags & SA_PROBEIRQ)) {
+-		printk(KERN_ERR "%s: irq handler mismatch\n", __FUNCTION__);
+-		dump_stack();
+-	}
 -	return -EBUSY;
  }
  


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -r1.358 -r1.359
--- sources	27 Apr 2006 03:10:51 -0000	1.358
+++ sources	28 Apr 2006 19:47:29 -0000	1.359
@@ -1,3 +1,4 @@
 9a91b2719949ff0856b40bc467fd47be  linux-2.6.16.tar.bz2
 e8e055329db3aad40a010ded0f8bdcf9  xen-20060413.tar.bz2
 ee23bf1dfd67fcbbad1eb124ec32428c  patch-2.6.17-rc3.bz2
+bd2752cc3ff827e0e8d5ed2979567d55  patch-2.6.17-rc3-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -r1.329 -r1.330
--- upstream	27 Apr 2006 03:10:51 -0000	1.329
+++ upstream	28 Apr 2006 19:47:29 -0000	1.330
@@ -1,2 +1,3 @@
 linux-2.6.16.tar.bz2
 patch-2.6.17-rc3.bz2
+patch-2.6.17-rc3-git2.bz2



From fedora-cvs-commits at redhat.com  Fri Apr 28 19:53:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 15:53:33 -0400
Subject: rpms/openoffice.org/FC-5 openoffice.org.spec,1.656,1.657
Message-ID: <200604281953.k3SJrXOb019808@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19779

Modified Files:
	openoffice.org.spec 
Log Message:
fail safe for buggered jars


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.656
retrieving revision 1.657
diff -u -r1.656 -r1.657
--- openoffice.org.spec	28 Apr 2006 08:55:43 -0000	1.656
+++ openoffice.org.spec	28 Apr 2006 19:53:30 -0000	1.657
@@ -920,6 +920,7 @@
     cat ../unx*.pro/OpenOffice/rpm/logging/en-US/log_*__en-US.log
     echo - ---dump log end---
     unset MAXPROCESS
+    build --dlv_switch -link --all
     if ! dmake openoffice_en-US; then
         echo unparallel openoffice_en-US failure, diskspace: `df -h . | tail -n 1` - trying one last time...
         echo - ---dump log start---



From fedora-cvs-commits at redhat.com  Fri Apr 28 19:54:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 15:54:29 -0400
Subject: rpms/thunderbird/FC-5 .cvsignore, 1.10, 1.11 sources, 1.13,
	1.14 thunderbird.spec, 1.68,
	1.69 firefox-1.5.0.1-dumpstack.patch, 1.1,
	NONE firefox-bug305970.patch, 1.1,
	NONE thunderbird-1.5-bug304720.patch, 1.1, NONE
Message-ID: <200604281954.k3SJsTZ8020204@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/thunderbird/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20177

Modified Files:
	.cvsignore sources thunderbird.spec 
Removed Files:
	firefox-1.5.0.1-dumpstack.patch firefox-bug305970.patch 
	thunderbird-1.5-bug304720.patch 
Log Message:
* Wed Apr 19 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-1.1.fc5
- Update to 1.5.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	28 Jan 2006 06:15:15 -0000	1.10
+++ .cvsignore	28 Apr 2006 19:54:27 -0000	1.11
@@ -8,3 +8,5 @@
 thunderbird-1.5rc1-source.tar.bz2
 thunderbird-1.5-source.tar.bz2
 thunderbird-langpacks-20060127.tar.bz2
+thunderbird-langpacks-1.5.0.2-20060419.tar.bz2
+thunderbird-1.5.0.2-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	28 Jan 2006 06:15:16 -0000	1.13
+++ sources	28 Apr 2006 19:54:27 -0000	1.14
@@ -1,2 +1,2 @@
-781c1cd1a01583d9b666d8c2fe4288e6  thunderbird-1.5-source.tar.bz2
-df32df3b18b0f9af5687d8a0cab08782  thunderbird-langpacks-20060127.tar.bz2
+8e8a91c64ae69aec4fd472b74962f16f  thunderbird-langpacks-1.5.0.2-20060419.tar.bz2
+3f32b847330c9d58297147be19714962  thunderbird-1.5.0.2-source.tar.bz2


Index: thunderbird.spec
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/FC-5/thunderbird.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- thunderbird.spec	13 Mar 2006 19:46:58 -0000	1.68
+++ thunderbird.spec	28 Apr 2006 19:54:27 -0000	1.69
@@ -5,13 +5,10 @@
 
 %define official_branding 1
 
-
-ExcludeArch:    s390x s390 ppc64 ia64
-
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
-Version:	1.5
-Release:	6
+Version:	1.5.0.2
+Release:	1.1.fc5
 Epoch:		0
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPL
@@ -22,7 +19,7 @@
 %define tarball thunderbird-1.5rc1-source.tar.bz2
 %endif
 Source0:        %{tarball}
-Source1:        thunderbird-langpacks-20060127.tar.bz2
+Source1:        thunderbird-langpacks-%{version}-20060419.tar.bz2
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
 Source12:       thunderbird-redhat-default-prefs.js
@@ -37,7 +34,6 @@
 Patch4:         firefox-1.5-with-system-nss.patch
 Patch5:         firefox-1.1-visibility.patch
 Patch6:         firefox-1.1-nss-system-nspr.patch
-Patch7:         firefox-1.5.0.1-dumpstack.patch
 
 Patch10:        thunderbird-0.7.3-psfonts.patch
 Patch11:        thunderbird-0.7.3-gnome-uriloader.patch
@@ -53,8 +49,6 @@
 Patch81:        firefox-nopangoxft.patch
 
 # patches from upstream (Patch100+)
-Patch100:       firefox-bug305970.patch
-Patch101:       thunderbird-1.5-bug304720.patch
 Patch102:       thunderbird-1.5-pango-start.patch
 
 
@@ -99,7 +93,6 @@
 %endif
 
 %patch6 -p1
-%patch7 -p0
 %patch10 -p1 -b .psfonts
 %patch11 -p1 -b .gnome-uriloader
 %patch24 -p1
@@ -107,8 +100,6 @@
 %patch42 -p0
 %patch81 -p1
 
-%patch100 -p1
-%patch101 -p1
 %patch102 -p1
 
 %{__rm} -f .mozconfig
@@ -220,6 +211,12 @@
 #===============================================================================
 
 %changelog
+* Wed Apr 19 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-1.1.fc5
+- Update to 1.5.0.2
+
+* Thu Mar 16 2006 Christopher Aillon <caillon at redhat.com> - 1.5-7
+- Bring the other arches back
+
 * Mon Mar 13 2006 Christopher Aillon <caillon at redhat.com> - 1.5.6
 - Temporarily disable other arches that we don't ship FC5 with, for time
 


--- firefox-1.5.0.1-dumpstack.patch DELETED ---


--- firefox-bug305970.patch DELETED ---


--- thunderbird-1.5-bug304720.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 28 19:54:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 15:54:47 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.677,1.678
Message-ID: <200604281954.k3SJslNN020383@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20352

Modified Files:
	openoffice.org.spec 
Log Message:
failsafe on bad jars


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.677
retrieving revision 1.678
diff -u -r1.677 -r1.678
--- openoffice.org.spec	27 Apr 2006 14:33:58 -0000	1.677
+++ openoffice.org.spec	28 Apr 2006 19:54:45 -0000	1.678
@@ -1274,6 +1274,7 @@
     cat ../unx*.pro/OpenOffice/rpm/logging/en-US/log_*__en-US.log
     echo - ---dump log end---
     unset MAXPROCESS
+    build --dlv_switch -link --all
     if ! dmake openoffice_en-US; then
         echo unparallel openoffice_en-US failure, diskspace: `df -h . | tail -n 1` - trying one last time...
         echo - ---dump log start---
@@ -1285,11 +1286,7 @@
 echo end en-US install time is `date`
 %if %{langpacks}
 echo start langpack install time is `date`
-if ! dmake ooolanguagepack; then
-    echo parallel ooolanguagepack failure, diskspace: `df -h . | tail -n 1` - restarting unparallel build...
-    unset MAXPROCESS
-    dmake ooolanguagepack
-fi
+dmake ooolanguagepack
 echo end langpack install time is `date`, diskspace: `df -h . | tail -n 1`
 %endif
 cd ../..



From fedora-cvs-commits at redhat.com  Fri Apr 28 20:09:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 16:09:09 -0400
Subject: rpms/cairo-java/devel .cvsignore, 1.6, 1.7 cairo-java.spec, 1.25,
	1.26 sources, 1.8, 1.9
Message-ID: <200604282009.k3SK99Ti023166@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/cairo-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23113

Modified Files:
	.cvsignore cairo-java.spec sources 
Log Message:
* Fri Apr 28 2006 Stepan Kasal <skasal at redhat.com>    - 1.0.3-0
- New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Mar 2006 21:19:34 -0000	1.6
+++ .cvsignore	28 Apr 2006 20:09:02 -0000	1.7
@@ -1,2 +1 @@
-cairo-java-1.0.2.tar.gz
-cairo-java-1.0.2.0.20060301.rh1.tar.gz
+cairo-java-1.0.3.tar.gz


Index: cairo-java.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/devel/cairo-java.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- cairo-java.spec	1 Mar 2006 21:24:39 -0000	1.25
+++ cairo-java.spec	28 Apr 2006 20:09:02 -0000	1.26
@@ -11,7 +11,7 @@
 %{!?java_pkg_prefix: %define java_pkg_prefix %{nil}}
 
 %define	name_base	cairo-java
-%define	version		1.0.2.0.20060301.rh1
+%define	version		1.0.3
 %define release 	0
 # exclude while s390x is borked on beehive
 #ExcludeArch: s390x
@@ -27,9 +27,9 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Requires:	%{java_pkg_prefix}gtk2 >= 2.8.0
-Requires: 	%{java_pkg_prefix}cairo >= 1.0.0 
-Requires: 	%{java_pkg_prefix}glib-java >= 0.2.3.0.20060301.rh1
-BuildRequires:	%{java_pkg_prefix}glib-java >= 0.2
+Requires: 	%{java_pkg_prefix}cairo >= 1.0.0
+Requires: 	%{java_pkg_prefix}glib-java >= 0.2.4
+BuildRequires:	%{java_pkg_prefix}glib-java >= 0.2.4
 BuildRequires:  %{c_pkg_prefix}gtk2-devel >= 2.8.0, gcc-java >= 3.3.3
 BuildRequires:	docbook-utils
 BuildRequires:	java-1.4.2-gcj-compat >= 1.4.2
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Fri Apr 28 2006 Stepan Kasal <skasal at redhat.com>    - 1.0.3-0
+- New version.
+
 * Wed Mar 01 2006 Adam Jocksch <ajocksch at redhat.com> - 1.0.2.0.20060301.rh1-0
 - Increased version of required glib-java to 0.2.3.0.20060301.rh1.
 - Imported new tarball to address bg #183538.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	1 Mar 2006 21:19:34 -0000	1.8
+++ sources	28 Apr 2006 20:09:03 -0000	1.9
@@ -1 +1 @@
-0840da879f8a6fa4437023fec1d95635  cairo-java-1.0.2.0.20060301.rh1.tar.gz
+b78cd6b58c8f3b55db4edb5477855525  cairo-java-1.0.3.tar.gz



From fedora-cvs-commits at redhat.com  Fri Apr 28 20:39:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 16:39:17 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2177,1.2178
Message-ID: <200604282039.k3SKdH1r011594@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11550

Modified Files:
	kernel-2.6.spec 
Log Message:
borked



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2177
retrieving revision 1.2178
diff -u -r1.2177 -r1.2178
--- kernel-2.6.spec	28 Apr 2006 19:47:28 -0000	1.2177
+++ kernel-2.6.spec	28 Apr 2006 20:39:13 -0000	1.2178
@@ -9,7 +9,7 @@
 # Whether to apply the Xen patches, leave this enabled.
 %define includexen 1
 # Whether to build the Xen kernels, disable if you want.
-%define buildxen 1
+%define buildxen 0
 %define buildxenPAE 0
 %define builddoc 0
 %define buildkdump 1



From fedora-cvs-commits at redhat.com  Fri Apr 28 21:07:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 17:07:14 -0400
Subject: rpms/dbus/FC-5 dbus-0.61.dbus-connection.c.backport.patch, NONE,
	1.1 dbus.spec, 1.74, 1.75
Message-ID: <200604282107.k3SL7ENU000469@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dbus/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv444

Modified Files:
	dbus.spec 
Added Files:
	dbus-0.61.dbus-connection.c.backport.patch 
Log Message:
- Backport patch from dbus-connection.c
  - Allows interfaces to be NULL in the message header as per the spec
  - Fixes a problem with pendings calls blocking on a data starved socket



dbus-0.61.dbus-connection.c.backport.patch:
 dbus-connection.c |   67 +++++++++++++++++++++++++++++++++---------------------
 1 files changed, 42 insertions(+), 25 deletions(-)

--- NEW FILE dbus-0.61.dbus-connection.c.backport.patch ---
--- dbus-0.61/dbus/dbus-connection.c.backport	2006-04-25 14:26:31.000000000 -0400
+++ dbus-0.61/dbus/dbus-connection.c	2006-04-25 14:26:54.000000000 -0400
@@ -2257,8 +2257,7 @@
   _dbus_return_if_fail (message != NULL);
   _dbus_return_if_fail (preallocated->connection == connection);
   _dbus_return_if_fail (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_METHOD_CALL ||
-                        (dbus_message_get_interface (message) != NULL &&
-                         dbus_message_get_member (message) != NULL));
+                        dbus_message_get_member (message) != NULL);
   _dbus_return_if_fail (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_SIGNAL ||
                         (dbus_message_get_interface (message) != NULL &&
                          dbus_message_get_member (message) != NULL));
@@ -2533,6 +2532,36 @@
   return NULL;
 }
 
+static dbus_bool_t
+check_for_reply_and_update_dispatch_unlocked (DBusPendingCall *pending)
+{
+  DBusMessage *reply;
+  DBusDispatchStatus status;
+  DBusConnection *connection;
+
+  connection = pending->connection;
+
+  reply = check_for_reply_unlocked (connection, pending->reply_serial);
+  if (reply != NULL)
+    {
+      _dbus_verbose ("%s checked for reply\n", _DBUS_FUNCTION_NAME);
+
+      _dbus_verbose ("dbus_connection_send_with_reply_and_block(): got reply\n");
+
+      _dbus_pending_call_complete_and_unlock (pending, reply);
+      dbus_message_unref (reply);
+
+      CONNECTION_LOCK (connection);
+      status = _dbus_connection_get_dispatch_status_unlocked (connection);
+      _dbus_connection_update_dispatch_status_and_unlock (connection, status);
+      dbus_pending_call_unref (pending);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
 /**
  * When a function that blocks has been called with a timeout, and we
  * run out of memory, the time to wait for memory is based on the
@@ -2616,6 +2645,11 @@
                  start_tv_sec, start_tv_usec,
                  end_tv_sec, end_tv_usec);
 
+  /* check to see if we already got the data off the socket */
+  /* from another blocked pending call */
+  if (check_for_reply_and_update_dispatch_unlocked (pending))
+    return;
+
   /* Now we wait... */
   /* always block at least once as we know we don't have the reply yet */
   _dbus_connection_do_iteration_unlocked (connection,
@@ -2645,27 +2679,8 @@
     }
   
   if (status == DBUS_DISPATCH_DATA_REMAINS)
-    {
-      DBusMessage *reply;
-      
-      reply = check_for_reply_unlocked (connection, client_serial);
-      if (reply != NULL)
-        {
-          _dbus_verbose ("%s checked for reply\n", _DBUS_FUNCTION_NAME);
-
-          _dbus_verbose ("dbus_connection_send_with_reply_and_block(): got reply\n");
-          
-          _dbus_pending_call_complete_and_unlock (pending, reply);
-          dbus_message_unref (reply);
-
-          CONNECTION_LOCK (connection);
-          status = _dbus_connection_get_dispatch_status_unlocked (connection);
-          _dbus_connection_update_dispatch_status_and_unlock (connection, status);
-          dbus_pending_call_unref (pending);
-          
-          return;
-        }
-    }
+    if (check_for_reply_and_update_dispatch_unlocked (pending))
+      return;  
   
   _dbus_get_current_time (&tv_sec, &tv_usec);
   
@@ -2874,8 +2889,6 @@
   DBusDispatchStatus dstatus;
   dbus_bool_t dispatched_disconnected;
   
-  _dbus_return_val_if_fail (connection != NULL, FALSE);
-  _dbus_return_val_if_fail (timeout_milliseconds >= 0 || timeout_milliseconds == -1, FALSE);
   dstatus = dbus_connection_get_dispatch_status (connection);
 
   if (dispatch && dstatus == DBUS_DISPATCH_DATA_REMAINS)
@@ -2947,6 +2960,8 @@
 dbus_connection_read_write_dispatch (DBusConnection *connection,
                                      int             timeout_milliseconds)
 {
+  _dbus_return_val_if_fail (connection != NULL, FALSE);
+  _dbus_return_val_if_fail (timeout_milliseconds >= 0 || timeout_milliseconds == -1, FALSE);
    return _dbus_connection_read_write_dispatch(connection, timeout_milliseconds, TRUE);
 }
 
@@ -2970,6 +2985,8 @@
 dbus_connection_read_write (DBusConnection *connection, 
                             int             timeout_milliseconds) 
 { 
+  _dbus_return_val_if_fail (connection != NULL, FALSE);
+  _dbus_return_val_if_fail (timeout_milliseconds >= 0 || timeout_milliseconds == -1, FALSE);
    return _dbus_connection_read_write_dispatch(connection, timeout_milliseconds, FALSE);
 }
 


Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/FC-5/dbus.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- dbus.spec	24 Feb 2006 23:10:54 -0000	1.74
+++ dbus.spec	28 Apr 2006 21:07:08 -0000	1.75
@@ -19,7 +19,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 0.61
-Release: 3
+Release: 3.fc5.1
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL/GPL
@@ -53,6 +53,8 @@
 #make sure we take this out if ABI changes
 Patch4: dbus-0.61-mono-no-abi-version-change.patch 
 
+Patch5: dbus-0.61.dbus-connection.c.backport.patch 
+
 %description
 
 D-BUS is a system for sending messages between applications. It is
@@ -142,6 +144,7 @@
 #make sure we take this out if ABI changes
 %patch4 -p1 -b .mono-no-abi-version-change
 
+%patch5 -p1 -b .backport
 autoreconf -f -i
 
 %build
@@ -342,7 +345,12 @@
 %endif
 
 %changelog
-* Fri Feb 24 2006 John (J5) Palmieri <johnp at redhat.com> 0.61-2
+* Fri Apr 28 2006 John (J5) Palmieri <johnp at redhat.com> - 0.61-3.fc5.1
+- Backport patch from dbus-connection.c
+  - Allows interfaces to be NULL in the message header as per the spec
+  - Fixes a problem with pendings calls blocking on a data starved socket
+
+* Fri Feb 24 2006 John (J5) Palmieri <johnp at redhat.com> 0.61-3
 - ABI hasn't changed so add patch that makes dbus-sharp think
   it is still 0.60 (mono uses hard version names so any change
   means apps need to recompile)



From fedora-cvs-commits at redhat.com  Fri Apr 28 21:18:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 17:18:55 -0400
Subject: rpms/libgtk-java/devel .cvsignore, 1.17, 1.18 libgtk-java.spec, 1.46,
	1.47 sources, 1.17, 1.18 GdkCairoFix.patch, 1.1,
	NONE libgtk-java-glib-timer-gc.patch, 1.2, NONE
Message-ID: <200604282118.k3SLItx9016814@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgtk-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16766

Modified Files:
	.cvsignore libgtk-java.spec sources 
Removed Files:
	GdkCairoFix.patch libgtk-java-glib-timer-gc.patch 
Log Message:
* Fri Apr 28 2006 Stepan Kasal <skasal at redhat.com>    - 2.8.4-0
- New version, which integrates both patches.
- Remove the patches.
- Try to build on s390x again.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	1 Mar 2006 21:35:17 -0000	1.17
+++ .cvsignore	28 Apr 2006 21:18:53 -0000	1.18
@@ -1,3 +1 @@
-libgtk-java-2.8.2.tar.gz
-libgtk-java-2.8.3.tar.gz
-libgtk-java-2.8.3.0.20060301.rh1.tar.gz
+libgtk-java-2.8.4.tar.gz


Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- libgtk-java.spec	15 Mar 2006 16:15:37 -0000	1.46
+++ libgtk-java.spec	28 Apr 2006 21:18:53 -0000	1.47
@@ -12,8 +12,8 @@
 
 
 %define	name_base 	libgtk-java
-%define	version		2.8.3.0.20060301.rh1
-%define release 	2
+%define	version		2.8.4
+%define release 	0
 
 
 Summary:	Java bindings for GTK+
@@ -28,19 +28,14 @@
 BuildRoot:	%{_tmppath}/%{name_base}-%{version}-root
 
 Requires:	%{c_pkg_prefix}gtk2 >= 2.8.0
-Requires:	%{java_pkg_prefix}cairo-java >= 1.0.2.0.20060301.rh1
-Requires:       %{java_pkg_prefix}glib-java >= 0.2.3.0.20060301.rh1
-BuildRequires:  %{java_pkg_prefix}cairo-java-devel >= 1.0.0
-BuildRequires:  %{java_pkg_prefix}glib-java-devel >= 0.2.3
+Requires:	%{java_pkg_prefix}cairo-java >= 1.0.3
+Requires:       %{java_pkg_prefix}glib-java >= 0.2.4
+BuildRequires:  %{java_pkg_prefix}cairo-java-devel >= 1.0.3
+BuildRequires:  %{java_pkg_prefix}glib-java-devel >= 0.2.4
 BuildRequires:  %{c_pkg_prefix}gtk2-devel >= 2.8.0
 BuildRequires:  java-devel >= 1.4.2, gcc-java >= 3.3.3, docbook-utils
 
-# patch that fixes occaision NPE in GdkCairo
-Patch0: GdkCairoFix.patch
-# fixes: http://sourceware.org/bugzilla/show_bug.cgi?id=2333
-Patch10: libgtk-java-glib-timer-gc.patch
-
-ExcludeArch: s390x
+# ExcludeArch: s390x
 
 %description
 libgtk-java is a language binding that allows developers to write GTK
@@ -58,8 +53,6 @@
 %prep
 
 %setup -q -n %{name_base}-%{version}
-%patch0
-%patch10
 
 %build 
 # if either the C or Java packages has a prefix declared, then we will
@@ -130,6 +123,11 @@
 
 
 %changelog
+* Fri Apr 28 2006 Stepan Kasal <skasal at redhat.com>    - 2.8.4-0
+- New version, which integrates both patches.
+- Remove the patches.
+- Try to build on s390x again.
+
 * Wed Mar 15 2006 Phil Muldoon <pmuldoon at redhat.com> - 2.8.3.020060301.rh1-2
 - Added libgtk-java-glib-timer-gc.patch to fix double free on Timer GC
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	1 Mar 2006 21:35:17 -0000	1.17
+++ sources	28 Apr 2006 21:18:53 -0000	1.18
@@ -1 +1 @@
-629c1c2b5f8398154a04a081539ad21f  libgtk-java-2.8.3.0.20060301.rh1.tar.gz
+6fc73a343879ba3a13b9a827a67400fb  libgtk-java-2.8.4.tar.gz


--- GdkCairoFix.patch DELETED ---


--- libgtk-java-glib-timer-gc.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 28 21:43:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 17:43:46 -0400
Subject: rpms/thunderbird/FC-4 sources,1.10,1.11
Message-ID: <200604282143.k3SLhkDH023589@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/thunderbird/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv23560

Modified Files:
	sources 
Log Message:
new sourceball from upstream to fix the previous broken one


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	19 Apr 2006 18:19:21 -0000	1.10
+++ sources	28 Apr 2006 21:43:43 -0000	1.11
@@ -1 +1 @@
-c8bbe2538f6238d72ad3521b9ccc3337  thunderbird-1.0.8-source.tar.bz2
+53506f2a9ff4fd60e34686dd75ee3be1  thunderbird-1.0.8-source.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr 28 22:19:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 18:19:45 -0400
Subject: rpms/gaim/devel gaim.spec,1.116,1.117
Message-ID: <200604282219.k3SMJjqK031800@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31787

Modified Files:
	gaim.spec 
Log Message:
184: silc crash fix (#190152)



Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- gaim.spec	9 Apr 2006 01:00:46 -0000	1.116
+++ gaim.spec	28 Apr 2006 22:19:42 -0000	1.117
@@ -10,10 +10,12 @@
 %define evolution_integration	1
 # OPTION: SILC integration (FC3+)
 %define silc_integration	1
+# OPTION: Standalone NSS (FC5+)
+%define standalone_nss		1
 
 Name:		gaim
 Version:	1.5.0
-Release:        16.fc6
+Release:        17.fc6
 Epoch:		1
 License:	GPL
 Group:		Applications/Internet
@@ -70,6 +72,7 @@
 Patch181: gaim-1.5.0-nss-detect.patch
 Patch182: gaim-1.5.0-logging-compatibility.patch
 Patch183: gaim-1.5.0-msn-block-crash.patch
+Patch184: gaim-1.5.0-silc-CID-71.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -160,9 +163,12 @@
 %patch178 -p0
 %patch179 -p0
 %patch180 -p2
+%if %{standalone_nss}
 %patch181 -p1
+%endif
 %patch182 -p0
 %patch183 -p2
+%patch184 -p2
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}/%{version}-%{release}/g" configure
@@ -277,31 +283,19 @@
 %endif
 
 %changelog
+* Fri Apr 28 2006 Warren Togami <wtogami at redhat.com> - 1:1.5.0-17
+- 184: silc crash fix (#190152)
+
 * Sat Apr 08 2006 Warren Togami <wtogami at redhat.com> - 1:1.5.0-16
 - MSN block crash (#185222 Stu Tomlinson)
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.5.0-15.fc5.1
-- bump again for double-long bug on ppc(64)
-
 * Tue Feb 07 2006 Warren Togami <wtogami at redhat.com> 1:1.5.0-15
 - allow compat with gaim-2.x log format (rlaager)
 
-* Sat Jan 28 2006 David Malcolm <dmalcolm at redhat.com> 1:1.5.0-14
-- rebuild for new e-d-s
-
 * Fri Jan 13 2006 Warren Togami <wtogami at redhat.com> 1:1.5.0-13
 - buildreq desktop-file-utils (ivazquez #176688)
 - detect NSS in a generic way and abort on failure
 
-* Wed Dec 21 2005 Warren Togami <wtogami at redhat.com>
-- rebuild for nss-devel (#176314 nosnilmot)
-
-* Tue Dec 20 2005 Ray Strode <rstrode at redhat.com>
-- rebuilt
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
 * Thu Nov 10 2005 Warren Togami <wtogami at redhat.com> - 1:1.5.0-9
 - Ensure that security opt flags are used (#165795)
 - Many bug fixes from Peter Lawler (#171350)



From fedora-cvs-commits at redhat.com  Sat Apr 29 00:19:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 20:19:43 -0400
Subject: rpms/kernel/devel linux-2.6-header-cleanup-git.patch, 1.11,
	1.12 linux-2.6-header-install-git.patch, 1.8, 1.9
Message-ID: <200604290019.k3T0JhmZ023866@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23822

Modified Files:
	linux-2.6-header-cleanup-git.patch 
	linux-2.6-header-install-git.patch 
Log Message:
fix and export linux/pci.h

linux-2.6-header-cleanup-git.patch:
 b/include/asm-i386/page.h                            |    5 
 b/include/asm-mips/unistd.h                          |    7 
 b/include/asm-powerpc/unistd.h                       |    8 
 b/include/asm-s390/ptrace.h                          |    6 
 b/include/asm-s390/unistd.h                          |    8 
 b/include/asm-x86_64/page.h                          |    5 
 b/include/linux/elf-em.h                             |   44 ++++
 b/include/linux/input.h                              |    4 
 b/include/linux/pci.h                                |    5 
 b/include/linux/unistd.h                             |    2 
 include/acpi/platform/aclinux.h                      |    1 
 include/acpi/processor.h                             |    1 
 include/asm-alpha/bitops.h                           |    1 
 include/asm-alpha/cache.h                            |    1 
 include/asm-alpha/cacheflush.h                       |    1 
 include/asm-alpha/core_cia.h                         |    1 
 include/asm-alpha/core_t2.h                          |    1 
 include/asm-alpha/dma-mapping.h                      |    1 
 include/asm-alpha/dma.h                              |    1 
 include/asm-alpha/floppy.h                           |    1 
 include/asm-alpha/hardirq.h                          |    1 
 include/asm-alpha/hw_irq.h                           |    1 
 include/asm-alpha/ide.h                              |    1 
 include/asm-alpha/io.h                               |    1 
 include/asm-alpha/irq.h                              |    1 
 include/asm-alpha/kmap_types.h                       |    1 
 include/asm-alpha/machvec.h                          |    1 
 include/asm-alpha/mmu_context.h                      |    1 
 include/asm-alpha/mmzone.h                           |    1 
 include/asm-alpha/page.h                             |    1 
 include/asm-alpha/param.h                            |    1 
 include/asm-alpha/pgalloc.h                          |    1 
 include/asm-alpha/pgtable.h                          |    1 
 include/asm-alpha/serial.h                           |    1 
 include/asm-alpha/smp.h                              |    1 
 include/asm-alpha/spinlock.h                         |    1 
 include/asm-alpha/system.h                           |    1 
 include/asm-alpha/tlbflush.h                         |    1 
 include/asm-alpha/unistd.h                           |    7 
 include/asm-arm/apm.h                                |    1 
 include/asm-arm/arch-aaec2000/memory.h               |    1 
 include/asm-arm/arch-cl7500/acornfb.h                |    1 
 include/asm-arm/arch-clps711x/hardware.h             |    1 
 include/asm-arm/arch-clps711x/memory.h               |    1 
 include/asm-arm/arch-clps711x/uncompress.h           |    1 
 include/asm-arm/arch-ebsa285/hardware.h              |    1 
 include/asm-arm/arch-ebsa285/memory.h                |    1 
 include/asm-arm/arch-ebsa285/vmalloc.h               |    1 
 include/asm-arm/arch-integrator/smp.h                |    1 
 include/asm-arm/arch-iop3xx/memory.h                 |    1 
 include/asm-arm/arch-iop3xx/timex.h                  |    1 
 include/asm-arm/arch-iop3xx/uncompress.h             |    1 
 include/asm-arm/arch-ixp4xx/dma.h                    |    1 
 include/asm-arm/arch-lh7a40x/constants.h             |    1 
 include/asm-arm/arch-lh7a40x/irqs.h                  |    1 
 include/asm-arm/arch-lh7a40x/registers.h             |    1 
 include/asm-arm/arch-omap/board.h                    |    1 
 include/asm-arm/arch-omap/hardware.h                 |    1 
 include/asm-arm/arch-omap/system.h                   |    1 
 include/asm-arm/arch-omap/uncompress.h               |    1 
 include/asm-arm/arch-pxa/idp.h                       |    1 
 include/asm-arm/arch-pxa/irqs.h                      |    1 
 include/asm-arm/arch-pxa/pxa-regs.h                  |    1 
 include/asm-arm/arch-pxa/timex.h                     |    1 
 include/asm-arm/arch-realview/smp.h                  |    1 
 include/asm-arm/arch-s3c2410/dma.h                   |    1 
 include/asm-arm/arch-s3c2410/uncompress.h            |    1 
 include/asm-arm/arch-sa1100/assabet.h                |    1 
 include/asm-arm/arch-sa1100/cerf.h                   |    1 
 include/asm-arm/arch-sa1100/collie.h                 |    1 
 include/asm-arm/arch-sa1100/dma.h                    |    1 
 include/asm-arm/arch-sa1100/hardware.h               |    1 
 include/asm-arm/arch-sa1100/ide.h                    |    1 
 include/asm-arm/arch-sa1100/irqs.h                   |    1 
 include/asm-arm/arch-sa1100/memory.h                 |    1 
 include/asm-arm/arch-sa1100/system.h                 |    1 
 include/asm-arm/atomic.h                             |    1 
 include/asm-arm/bug.h                                |    1 
 include/asm-arm/cacheflush.h                         |    1 
 include/asm-arm/cpu.h                                |    1 
 include/asm-arm/dma-mapping.h                        |    1 
 include/asm-arm/dma.h                                |    1 
 include/asm-arm/elf.h                                |    1 
 include/asm-arm/fpstate.h                            |    1 
 include/asm-arm/glue.h                               |    1 
 include/asm-arm/hardirq.h                            |    1 
 include/asm-arm/hardware/dec21285.h                  |    1 
 include/asm-arm/hardware/iomd.h                      |    1 
 include/asm-arm/leds.h                               |    1 
 include/asm-arm/mach/serial_at91rm9200.h             |    1 
 include/asm-arm/mach/serial_sa1100.h                 |    1 
 include/asm-arm/memory.h                             |    1 
 include/asm-arm/page.h                               |    1 
 include/asm-arm/pci.h                                |    1 
 include/asm-arm/proc-fns.h                           |    1 
 include/asm-arm/ptrace.h                             |    1 
 include/asm-arm/smp.h                                |    1 
 include/asm-arm/system.h                             |    1 
 include/asm-arm/tlbflush.h                           |    1 
 include/asm-arm/unistd.h                             |   10 -
 include/asm-arm26/atomic.h                           |    1 
 include/asm-arm26/bug.h                              |    1 
 include/asm-arm26/dma.h                              |    1 
 include/asm-arm26/hardirq.h                          |    1 
 include/asm-arm26/hardware.h                         |    1 
 include/asm-arm26/io.h                               |    1 
 include/asm-arm26/leds.h                             |    1 
 include/asm-arm26/mach-types.h                       |    1 
 include/asm-arm26/page.h                             |    1 
 include/asm-arm26/pgtable.h                          |    1 
 include/asm-arm26/serial.h                           |    1 
 include/asm-arm26/smp.h                              |    1 
 include/asm-arm26/sysirq.h                           |    1 
 include/asm-arm26/system.h                           |    1 
 include/asm-arm26/unistd.h                           |   10 -
 include/asm-cris/arch-v10/io.h                       |    1 
 include/asm-cris/arch-v10/page.h                     |    1 
 include/asm-cris/arch-v10/system.h                   |    1 
 include/asm-cris/arch-v32/io.h                       |    1 
 include/asm-cris/arch-v32/irq.h                      |    1 
 include/asm-cris/arch-v32/page.h                     |    1 
 include/asm-cris/arch-v32/processor.h                |    1 
 include/asm-cris/arch-v32/system.h                   |    1 
 include/asm-cris/eshlibld.h                          |    1 
 include/asm-cris/etraxgpio.h                         |    1 
 include/asm-cris/fasttimer.h                         |    1 
 include/asm-cris/page.h                              |    1 
 include/asm-cris/pci.h                               |    1 
 include/asm-cris/pgtable.h                           |    1 
 include/asm-cris/processor.h                         |    1 
 include/asm-cris/rtc.h                               |    1 
 include/asm-cris/tlbflush.h                          |    1 
 include/asm-cris/unistd.h                            |    9 -
 include/asm-frv/atomic.h                             |    1 
 include/asm-frv/bitops.h                             |    1 
 include/asm-frv/bug.h                                |    1 
 include/asm-frv/cache.h                              |    1 
 include/asm-frv/dma.h                                |    1 
 include/asm-frv/elf.h                                |    1 
 include/asm-frv/fpu.h                                |    1 
 include/asm-frv/hardirq.h                            |    1 
 include/asm-frv/highmem.h                            |    1 
 include/asm-frv/ide.h                                |    1 
 include/asm-frv/io.h                                 |    1 
 include/asm-frv/irq.h                                |    1 
 include/asm-frv/mmu_context.h                        |    1 
 include/asm-frv/page.h                               |    1 
 include/asm-frv/pci.h                                |    1 
 include/asm-frv/pgalloc.h                            |    1 
 include/asm-frv/pgtable.h                            |    1 
 include/asm-frv/processor.h                          |    1 
 include/asm-frv/segment.h                            |    1 
 include/asm-frv/serial.h                             |    1 
 include/asm-frv/smp.h                                |    1 
 include/asm-frv/system.h                             |    1 
 include/asm-frv/tlbflush.h                           |    1 
 include/asm-frv/types.h                              |    1 
 include/asm-frv/unaligned.h                          |    1 
 include/asm-frv/unistd.h                             |    7 
 include/asm-frv/virtconvert.h                        |    1 
 include/asm-generic/bug.h                            |    1 
 include/asm-generic/dma-mapping.h                    |    1 
 include/asm-generic/fcntl.h                          |    1 
 include/asm-generic/local.h                          |    1 
 include/asm-generic/signal.h                         |    7 
 include/asm-generic/tlb.h                            |    1 
 include/asm-h8300/bitops.h                           |    1 
 include/asm-h8300/dma.h                              |    1 
 include/asm-h8300/elf.h                              |    1 
 include/asm-h8300/hardirq.h                          |    1 
 include/asm-h8300/io.h                               |    1 
 include/asm-h8300/keyboard.h                         |    1 
 include/asm-h8300/mmu_context.h                      |    1 
 include/asm-h8300/page.h                             |    1 
 include/asm-h8300/page_offset.h                      |    1 
 include/asm-h8300/param.h                            |    1 
 include/asm-h8300/pgtable.h                          |    1 
 include/asm-h8300/processor.h                        |    1 
 include/asm-h8300/semaphore-helper.h                 |    1 
 include/asm-h8300/shm.h                              |    1 
 include/asm-h8300/system.h                           |    1 
 include/asm-h8300/unaligned.h                        |    1 
 include/asm-h8300/unistd.h                           |    7 
 include/asm-h8300/virtconvert.h                      |    1 
 include/asm-i386/apic.h                              |    1 
 include/asm-i386/atomic.h                            |    1 
 include/asm-i386/bitops.h                            |    1 
 include/asm-i386/bug.h                               |    1 
 include/asm-i386/bugs.h                              |    1 
 include/asm-i386/byteorder.h                         |    1 
 include/asm-i386/cache.h                             |    1 
 include/asm-i386/dma.h                               |    1 
 include/asm-i386/fixmap.h                            |    1 
 include/asm-i386/hardirq.h                           |    1 
 include/asm-i386/highmem.h                           |    1 
 include/asm-i386/hpet.h                              |    1 
 include/asm-i386/hw_irq.h                            |    1 
 include/asm-i386/ide.h                               |    1 
 include/asm-i386/io.h                                |    1 
 include/asm-i386/io_apic.h                           |    1 
 include/asm-i386/irq.h                               |    1 
 include/asm-i386/kmap_types.h                        |    1 
 include/asm-i386/mach-summit/mach_apic.h             |    1 
 include/asm-i386/mmu_context.h                       |    1 
 include/asm-i386/mtrr.h                              |    1 
 include/asm-i386/param.h                             |    1 
 include/asm-i386/pci.h                               |    1 
 include/asm-i386/pgalloc.h                           |    1 
 include/asm-i386/pgtable.h                           |    1 
 include/asm-i386/processor.h                         |    1 
 include/asm-i386/serial.h                            |    1 
 include/asm-i386/smp.h                               |    1 
 include/asm-i386/spinlock.h                          |    1 
 include/asm-i386/string.h                            |    1 
 include/asm-i386/system.h                            |    1 
 include/asm-i386/thread_info.h                       |    1 
 include/asm-i386/timex.h                             |    1 
 include/asm-i386/tlbflush.h                          |    1 
 include/asm-i386/types.h                             |    1 
 include/asm-i386/uaccess.h                           |    1 
 include/asm-i386/unistd.h                            |    7 
 include/asm-ia64/asmmacro.h                          |    1 
 include/asm-ia64/cache.h                             |    1 
 include/asm-ia64/delay.h                             |    1 
 include/asm-ia64/dma-mapping.h                       |    1 
 include/asm-ia64/dma.h                               |    1 
 include/asm-ia64/elf.h                               |    1 
 include/asm-ia64/hardirq.h                           |    1 
 include/asm-ia64/ia32.h                              |    1 
 include/asm-ia64/ide.h                               |    1 
 include/asm-ia64/intrinsics.h                        |    1 
 include/asm-ia64/kmap_types.h                        |    1 
 include/asm-ia64/machvec.h                           |    1 
 include/asm-ia64/meminit.h                           |    1 
 include/asm-ia64/nodedata.h                          |    1 
 include/asm-ia64/numa.h                              |    1 
 include/asm-ia64/page.h                              |    1 
 include/asm-ia64/param.h                             |    1 
 include/asm-ia64/percpu.h                            |    1 
 include/asm-ia64/pgalloc.h                           |    1 
 include/asm-ia64/pgtable.h                           |    1 
 include/asm-ia64/processor.h                         |    1 
 include/asm-ia64/ptrace.h                            |    1 
 include/asm-ia64/smp.h                               |    1 
 include/asm-ia64/sn/simulator.h                      |    1 
 include/asm-ia64/sn/sn_cpuid.h                       |    1 
 include/asm-ia64/sn/sn_sal.h                         |    1 
 include/asm-ia64/sn/xpc.h                            |    1 
 include/asm-ia64/string.h                            |    1 
 include/asm-ia64/system.h                            |    1 
 include/asm-ia64/tlb.h                               |    1 
 include/asm-ia64/tlbflush.h                          |    1 
 include/asm-ia64/unistd.h                            |    1 
 include/asm-m32r/assembler.h                         |    1 
 include/asm-m32r/atomic.h                            |    1 
 include/asm-m32r/bitops.h                            |    1 
 include/asm-m32r/cacheflush.h                        |    1 
 include/asm-m32r/hardirq.h                           |    1 
 include/asm-m32r/ide.h                               |    1 
 include/asm-m32r/irq.h                               |    1 
 include/asm-m32r/kmap_types.h                        |    1 
 include/asm-m32r/m32104ut/m32104ut_pld.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lan.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lcd.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_pld.h             |    1 
 include/asm-m32r/m32r.h                              |    1 
 include/asm-m32r/mmu.h                               |    1 
 include/asm-m32r/mmu_context.h                       |    2 
 include/asm-m32r/opsput/opsput_lan.h                 |    1 
 include/asm-m32r/opsput/opsput_lcd.h                 |    1 
 include/asm-m32r/opsput/opsput_pld.h                 |    1 
 include/asm-m32r/page.h                              |    1 
 include/asm-m32r/pgalloc.h                           |    1 
 include/asm-m32r/pgtable-2level.h                    |    1 
 include/asm-m32r/pgtable.h                           |    1 
 include/asm-m32r/processor.h                         |    1 
 include/asm-m32r/ptrace.h                            |    1 
 include/asm-m32r/rtc.h                               |    1 
 include/asm-m32r/semaphore.h                         |    1 
 include/asm-m32r/serial.h                            |    1 
 include/asm-m32r/sigcontext.h                        |    1 
 include/asm-m32r/smp.h                               |    1 
 include/asm-m32r/spinlock.h                          |    1 
 include/asm-m32r/system.h                            |    1 
 include/asm-m32r/timex.h                             |    1 
 include/asm-m32r/tlbflush.h                          |    1 
 include/asm-m32r/uaccess.h                           |    1 
 include/asm-m32r/unistd.h                            |    5 
 include/asm-m68k/atomic.h                            |    1 
 include/asm-m68k/bug.h                               |    1 
 include/asm-m68k/dma-mapping.h                       |    1 
 include/asm-m68k/dma.h                               |    1 
 include/asm-m68k/dvma.h                              |    1 
 include/asm-m68k/elf.h                               |    1 
 include/asm-m68k/entry.h                             |    1 
 include/asm-m68k/fpu.h                               |    1 
 include/asm-m68k/hardirq.h                           |    1 
 include/asm-m68k/ide.h                               |    1 
 include/asm-m68k/io.h                                |    1 
 include/asm-m68k/irq.h                               |    1 
 include/asm-m68k/mc146818rtc.h                       |    1 
 include/asm-m68k/mmu_context.h                       |    1 
 include/asm-m68k/motorola_pgtable.h                  |    1 
 include/asm-m68k/openprom.h                          |    1 
 include/asm-m68k/page.h                              |    1 
 include/asm-m68k/page_offset.h                       |    1 
 include/asm-m68k/pgalloc.h                           |    1 
 include/asm-m68k/pgtable.h                           |    1 
 include/asm-m68k/processor.h                         |    1 
 include/asm-m68k/semaphore-helper.h                  |    1 
 include/asm-m68k/serial.h                            |    1 
 include/asm-m68k/setup.h                             |    1 
 include/asm-m68k/shm.h                               |    1 
 include/asm-m68k/system.h                            |    1 
 include/asm-m68k/tlbflush.h                          |    1 
 include/asm-m68k/unistd.h                            |    7 
 include/asm-m68k/virtconvert.h                       |    1 
 include/asm-m68knommu/bitops.h                       |    1 
 include/asm-m68knommu/coldfire.h                     |    1 
 include/asm-m68knommu/commproc.h                     |    1 
 include/asm-m68knommu/dma-mapping.h                  |    1 
 include/asm-m68knommu/dma.h                          |    1 
 include/asm-m68knommu/elf.h                          |    1 
 include/asm-m68knommu/elia.h                         |    1 
 include/asm-m68knommu/entry.h                        |    1 
 include/asm-m68knommu/fpu.h                          |    1 
 include/asm-m68knommu/hardirq.h                      |    1 
 include/asm-m68knommu/io.h                           |    1 
 include/asm-m68knommu/irq.h                          |    1 
 include/asm-m68knommu/m5206sim.h                     |    1 
 include/asm-m68knommu/m520xsim.h                     |    1 
 include/asm-m68knommu/m523xsim.h                     |    1 
 include/asm-m68knommu/m5272sim.h                     |    1 
 include/asm-m68knommu/m527xsim.h                     |    1 
 include/asm-m68knommu/m528xsim.h                     |    1 
 include/asm-m68knommu/mcfcache.h                     |    1 
 include/asm-m68knommu/mcfdma.h                       |    1 
 include/asm-m68knommu/mcfmbus.h                      |    1 
 include/asm-m68knommu/mcfne.h                        |    1 
 include/asm-m68knommu/mcfpci.h                       |    1 
 include/asm-m68knommu/mcfpit.h                       |    1 
 include/asm-m68knommu/mcfsim.h                       |    1 
 include/asm-m68knommu/mcfsmc.h                       |    1 
 include/asm-m68knommu/mcftimer.h                     |    1 
 include/asm-m68knommu/mcfuart.h                      |    1 
 include/asm-m68knommu/mcfwdebug.h                    |    1 
 include/asm-m68knommu/mmu_context.h                  |    1 
 include/asm-m68knommu/nettel.h                       |    1 
 include/asm-m68knommu/page.h                         |    1 
 include/asm-m68knommu/page_offset.h                  |    1 
 include/asm-m68knommu/param.h                        |    1 
 include/asm-m68knommu/pgtable.h                      |    1 
 include/asm-m68knommu/processor.h                    |    1 
 include/asm-m68knommu/semaphore-helper.h             |    1 
 include/asm-m68knommu/system.h                       |    1 
 include/asm-m68knommu/unaligned.h                    |    1 
 include/asm-m68knommu/unistd.h                       |    7 
 include/asm-mips/a.out.h                             |    1 
 include/asm-mips/addrspace.h                         |    1 
 include/asm-mips/arc/types.h                         |    1 
 include/asm-mips/asm.h                               |    1 
 include/asm-mips/asmmacro.h                          |    1 
 include/asm-mips/atomic.h                            |    1 
 include/asm-mips/bcache.h                            |    1 
 include/asm-mips/bitops.h                            |    1 
 include/asm-mips/bug.h                               |    1 
 include/asm-mips/bugs.h                              |    1 
 include/asm-mips/byteorder.h                         |    1 
 include/asm-mips/cache.h                             |    1 
 include/asm-mips/checksum.h                          |    1 
 include/asm-mips/cpu-features.h                      |    1 
 include/asm-mips/cpu-info.h                          |    1 
 include/asm-mips/ddb5xxx/ddb5477.h                   |    1 
 include/asm-mips/ddb5xxx/ddb5xxx.h                   |    1 
 include/asm-mips/debug.h                             |    1 
 include/asm-mips/dec/prom.h                          |    1 
 include/asm-mips/delay.h                             |    1 
 include/asm-mips/dma.h                               |    1 
 include/asm-mips/elf.h                               |    1 
 include/asm-mips/fcntl.h                             |    1 
 include/asm-mips/fixmap.h                            |    1 
 include/asm-mips/fpu.h                               |    1 
 include/asm-mips/futex.h                             |    1 
 include/asm-mips/hazards.h                           |    1 
 include/asm-mips/highmem.h                           |    1 
 include/asm-mips/interrupt.h                         |    1 
 include/asm-mips/io.h                                |    1 
 include/asm-mips/ip32/machine.h                      |    1 
 include/asm-mips/irq.h                               |    1 
 include/asm-mips/isadep.h                            |    1 
 include/asm-mips/jmr3927/irq.h                       |    1 
 include/asm-mips/kmap_types.h                        |    1 
 include/asm-mips/local.h                             |    1 
 include/asm-mips/mach-au1x00/au1000.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx_dbdma.h          |    1 
 include/asm-mips/mach-au1x00/au1xxx_ide.h            |    1 
 include/asm-mips/mach-au1x00/au1xxx_psc.h            |    1 
 include/asm-mips/mach-au1x00/ioremap.h               |    1 
 include/asm-mips/mach-cobalt/cpu-feature-overrides.h |    1 
 include/asm-mips/mach-db1x00/db1x00.h                |    1 
 include/asm-mips/mach-generic/ide.h                  |    1 
 include/asm-mips/mach-generic/kmalloc.h              |    1 
 include/asm-mips/mach-generic/spaces.h               |    1 
 include/asm-mips/mach-ip22/spaces.h                  |    1 
 include/asm-mips/mach-ip32/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-ip32/kmalloc.h                 |    1 
 include/asm-mips/mach-mips/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-mips/irq.h                     |    1 
 include/asm-mips/mach-pb1x00/pb1550.h                |    1 
 include/asm-mips/mach-sim/cpu-feature-overrides.h    |    1 
 include/asm-mips/mips-boards/generic.h               |    1 
 include/asm-mips/mipsregs.h                          |    1 
 include/asm-mips/mmu_context.h                       |    1 
 include/asm-mips/mmzone.h                            |    1 
 include/asm-mips/module.h                            |    1 
 include/asm-mips/msgbuf.h                            |    1 
 include/asm-mips/paccess.h                           |    1 
 include/asm-mips/page.h                              |    1 
 include/asm-mips/pci.h                               |    1 
 include/asm-mips/pgalloc.h                           |    1 
 include/asm-mips/pgtable-32.h                        |    1 
 include/asm-mips/pgtable-64.h                        |    1 
 include/asm-mips/pgtable-bits.h                      |    1 
 include/asm-mips/pgtable.h                           |    1 
 include/asm-mips/prefetch.h                          |    1 
 include/asm-mips/processor.h                         |    1 
 include/asm-mips/ptrace.h                            |    1 
 include/asm-mips/reg.h                               |    1 
 include/asm-mips/resource.h                          |    1 
 include/asm-mips/serial.h                            |    1 
 include/asm-mips/sgiarcs.h                           |    1 
 include/asm-mips/sibyte/board.h                      |    1 
 include/asm-mips/sibyte/carmel.h                     |    1 
 include/asm-mips/sibyte/sentosa.h                    |    1 
 include/asm-mips/sibyte/swarm.h                      |    1 
 include/asm-mips/siginfo.h                           |    1 
 include/asm-mips/signal.h                            |    1 
 include/asm-mips/sim.h                               |    1 
 include/asm-mips/smp.h                               |    1 
 include/asm-mips/sn/addrs.h                          |    1 
 include/asm-mips/sn/agent.h                          |    1 
 include/asm-mips/sn/arch.h                           |    1 
 include/asm-mips/sn/io.h                             |    1 
 include/asm-mips/sn/klconfig.h                       |    1 
 include/asm-mips/sn/kldir.h                          |    1 
 include/asm-mips/sn/launch.h                         |    1 
 include/asm-mips/sn/mapped_kernel.h                  |    1 
 include/asm-mips/sn/sn0/addrs.h                      |    1 
 include/asm-mips/sn/sn0/arch.h                       |    1 
 include/asm-mips/sn/sn0/hubmd.h                      |    1 
 include/asm-mips/stackframe.h                        |    1 
 include/asm-mips/string.h                            |    1 
 include/asm-mips/system.h                            |    1 
 include/asm-mips/thread_info.h                       |    1 
 include/asm-mips/tlbflush.h                          |    1 
 include/asm-mips/tx4927/toshiba_rbtx4927.h           |    1 
 include/asm-mips/types.h                             |    1 
 include/asm-mips/uaccess.h                           |    1 
 include/asm-mips/vr41xx/vrc4173.h                    |    1 
 include/asm-mips/war.h                               |    1 
 include/asm-mips/wbflush.h                           |    1 
 include/asm-parisc/atomic.h                          |    1 
 include/asm-parisc/cache.h                           |    1 
 include/asm-parisc/cacheflush.h                      |    1 
 include/asm-parisc/dma-mapping.h                     |    1 
 include/asm-parisc/dma.h                             |    1 
 include/asm-parisc/io.h                              |    1 
 include/asm-parisc/irq.h                             |    1 
 include/asm-parisc/kmap_types.h                      |    1 
 include/asm-parisc/page.h                            |    1 
 include/asm-parisc/param.h                           |    1 
 include/asm-parisc/pci.h                             |    1 
 include/asm-parisc/pdc.h                             |    1 
 include/asm-parisc/pgtable.h                         |    1 
 include/asm-parisc/processor.h                       |    1 
 include/asm-parisc/psw.h                             |    1 
 include/asm-parisc/smp.h                             |    1 
 include/asm-parisc/system.h                          |    1 
 include/asm-parisc/tlbflush.h                        |    1 
 include/asm-parisc/unistd.h                          |    4 
 include/asm-powerpc/abs_addr.h                       |    1 
 include/asm-powerpc/cache.h                          |    1 
 include/asm-powerpc/dma-mapping.h                    |    1 
 include/asm-powerpc/dma.h                            |    1 
 include/asm-powerpc/eeh.h                            |    1 
 include/asm-powerpc/elf.h                            |    7 
 include/asm-powerpc/floppy.h                         |    1 
 include/asm-powerpc/hw_irq.h                         |    1 
 include/asm-powerpc/ide.h                            |    1 
 include/asm-powerpc/iommu.h                          |    1 
 include/asm-powerpc/irq.h                            |    1 
 include/asm-powerpc/iseries/iseries_io.h             |    1 
 include/asm-powerpc/machdep.h                        |    1 
 include/asm-powerpc/mmzone.h                         |    1 
 include/asm-powerpc/paca.h                           |    1 
 include/asm-powerpc/page.h                           |    1 
 include/asm-powerpc/pgtable.h                        |    1 
 include/asm-powerpc/ppc_asm.h                        |    1 
 include/asm-powerpc/prom.h                           |    1 
 include/asm-powerpc/smp.h                            |    1 
 include/asm-powerpc/smu.h                            |    1 
 include/asm-powerpc/spu.h                            |    1 
 include/asm-powerpc/thread_info.h                    |    1 
 include/asm-powerpc/time.h                           |    1 
 include/asm-powerpc/timex.h                          |    1 
 include/asm-powerpc/tlb.h                            |    1 
 include/asm-powerpc/tlbflush.h                       |    1 
 include/asm-powerpc/topology.h                       |    1 
 include/asm-powerpc/types.h                          |    1 
 include/asm-powerpc/vga.h                            |    1 
 include/asm-powerpc/vio.h                            |    1 
 include/asm-ppc/amigahw.h                            |    1 
 include/asm-ppc/bootinfo.h                           |    1 
 include/asm-ppc/commproc.h                           |    1 
 include/asm-ppc/ibm403.h                             |    1 
 include/asm-ppc/ibm44x.h                             |    1 
 include/asm-ppc/ibm4xx.h                             |    1 
 include/asm-ppc/io.h                                 |    1 
 include/asm-ppc/machdep.h                            |    1 
 include/asm-ppc/mmu.h                                |    1 
 include/asm-ppc/mmu_context.h                        |    1 
 include/asm-ppc/mpc8260.h                            |    1 
 include/asm-ppc/mpc83xx.h                            |    1 
 include/asm-ppc/mpc85xx.h                            |    1 
 include/asm-ppc/mpc8xx.h                             |    1 
 include/asm-ppc/mv64x60.h                            |    1 
 include/asm-ppc/ocp.h                                |    1 
 include/asm-ppc/open_pic.h                           |    1 
 include/asm-ppc/page.h                               |    2 
 include/asm-ppc/pc_serial.h                          |    1 
 include/asm-ppc/pgalloc.h                            |    1 
 include/asm-ppc/pgtable.h                            |    1 
 include/asm-ppc/ppc4xx_dma.h                         |    1 
 include/asm-ppc/ppc4xx_pic.h                         |    1 
 include/asm-ppc/serial.h                             |    1 
 include/asm-ppc/smp.h                                |    1 
 include/asm-ppc/time.h                               |    1 
 include/asm-s390/bitops.h                            |    1 
 include/asm-s390/debug.h                             |    1 
 include/asm-s390/hardirq.h                           |    1 
 include/asm-s390/idals.h                             |    1 
 include/asm-s390/local.h                             |    1 
 include/asm-s390/lowcore.h                           |    1 
 include/asm-s390/page.h                              |    6 
 include/asm-s390/pgalloc.h                           |    1 
 include/asm-s390/sfp-machine.h                       |    1 
 include/asm-s390/smp.h                               |    1 
 include/asm-s390/system.h                            |    1 
 include/asm-s390/tlbflush.h                          |    1 
 include/asm-s390/types.h                             |    1 
 include/asm-sh/bug.h                                 |    1 
 include/asm-sh/checksum.h                            |    1 
 include/asm-sh/dma-mapping.h                         |    1 
 include/asm-sh/dma.h                                 |    1 
 include/asm-sh/fixmap.h                              |    1 
 include/asm-sh/hardirq.h                             |    1 
 include/asm-sh/hd64461/hd64461.h                     |    1 
 include/asm-sh/hd64465/hd64465.h                     |    1 
 include/asm-sh/ide.h                                 |    1 
 include/asm-sh/io.h                                  |    1 
 include/asm-sh/irq.h                                 |    1 
 include/asm-sh/keyboard.h                            |    1 
 include/asm-sh/kmap_types.h                          |    1 
 include/asm-sh/machvec.h                             |    1 
 include/asm-sh/machvec_init.h                        |    1 
 include/asm-sh/mpc1211/dma.h                         |    1 
 include/asm-sh/overdrive/overdrive.h                 |    1 
 include/asm-sh/page.h                                |    1 
 include/asm-sh/pgtable.h                             |    1 
 include/asm-sh/serial.h                              |    1 
 include/asm-sh/smp.h                                 |    1 
 include/asm-sh/system.h                              |    1 
 include/asm-sh/types.h                               |    1 
 include/asm-sh/unistd.h                              |    7 
 include/asm-sh/watchdog.h                            |    1 
 include/asm-sh64/bug.h                               |    1 
 include/asm-sh64/dma-mapping.h                       |    1 
 include/asm-sh64/hardirq.h                           |    1 
 include/asm-sh64/ide.h                               |    1 
 include/asm-sh64/irq.h                               |    1 
 include/asm-sh64/mmu_context.h                       |    1 
 include/asm-sh64/page.h                              |    1 
 include/asm-sh64/param.h                             |    1 
 include/asm-sh64/pgtable.h                           |    1 
 include/asm-sh64/system.h                            |    1 
 include/asm-sh64/unistd.h                            |    7 
 include/asm-sparc/asmmacro.h                         |    1 
 include/asm-sparc/atomic.h                           |    1 
 include/asm-sparc/bugs.h                             |    1 
 include/asm-sparc/cacheflush.h                       |    1 
 include/asm-sparc/delay.h                            |    1 
 include/asm-sparc/dma-mapping.h                      |    1 
 include/asm-sparc/dma.h                              |    1 
 include/asm-sparc/elf.h                              |    1 
 include/asm-sparc/fixmap.h                           |    1 
 include/asm-sparc/hardirq.h                          |    1 
 include/asm-sparc/ide.h                              |    1 
 include/asm-sparc/irq.h                              |    1 
 include/asm-sparc/mostek.h                           |    1 
 include/asm-sparc/page.h                             |    1 
 include/asm-sparc/pgalloc.h                          |    1 
 include/asm-sparc/pgtable.h                          |    1 
 include/asm-sparc/sfp-machine.h                      |    1 
 include/asm-sparc/smp.h                              |    1 
 include/asm-sparc/system.h                           |    2 
 include/asm-sparc/timer.h                            |    1 
 include/asm-sparc/tlbflush.h                         |    1 
 include/asm-sparc/unistd.h                           |    4 
 include/asm-sparc/vac-ops.h                          |    1 
 include/asm-sparc/winmacro.h                         |    1 
 include/asm-sparc64/atomic.h                         |    1 
 include/asm-sparc64/bitops.h                         |    1 
 include/asm-sparc64/bugs.h                           |    1 
 include/asm-sparc64/cacheflush.h                     |    1 
 include/asm-sparc64/delay.h                          |    1 
 include/asm-sparc64/dma-mapping.h                    |    1 
 include/asm-sparc64/dma.h                            |    1 
 include/asm-sparc64/floppy.h                         |    1 
 include/asm-sparc64/ide.h                            |    1 
 include/asm-sparc64/irq.h                            |    1 
 include/asm-sparc64/kprobes.h                        |    1 
 include/asm-sparc64/mc146818rtc.h                    |    1 
 include/asm-sparc64/mmu.h                            |    1 
 include/asm-sparc64/oplib.h                          |    1 
 include/asm-sparc64/page.h                           |    1 
 include/asm-sparc64/param.h                          |    1 
 include/asm-sparc64/pgalloc.h                        |    1 
 include/asm-sparc64/pgtable.h                        |    1 
 include/asm-sparc64/processor.h                      |    1 
 include/asm-sparc64/siginfo.h                        |    1 
 include/asm-sparc64/signal.h                         |    1 
 include/asm-sparc64/smp.h                            |    1 
 include/asm-sparc64/spinlock.h                       |    1 
 include/asm-sparc64/system.h                         |    1 
 include/asm-sparc64/timer.h                          |    1 
 include/asm-sparc64/tlb.h                            |    1 
 include/asm-sparc64/tlbflush.h                       |    1 
 include/asm-sparc64/ttable.h                         |    1 
 include/asm-sparc64/unistd.h                         |    4 
 include/asm-um/a.out.h                               |    1 
 include/asm-um/cache.h                               |    1 
 include/asm-um/elf-ppc.h                             |    1 
 include/asm-um/fixmap.h                              |    1 
 include/asm-um/hardirq.h                             |    1 
 include/asm-um/linkage.h                             |    1 
 include/asm-um/mmu_context.h                         |    1 
 include/asm-um/page.h                                |    1 
 include/asm-um/pgalloc.h                             |    1 
 include/asm-um/processor-generic.h                   |    1 
 include/asm-um/ptrace-generic.h                      |    1 
 include/asm-um/smp.h                                 |    1 
 include/asm-um/thread_info.h                         |    1 
 include/asm-v850/atomic.h                            |    1 
 include/asm-v850/bitops.h                            |    1 
 include/asm-v850/dma-mapping.h                       |    1 
 include/asm-v850/hardirq.h                           |    1 
 include/asm-v850/machdep.h                           |    1 
 include/asm-v850/pgtable.h                           |    1 
 include/asm-v850/processor.h                         |    1 
 include/asm-v850/serial.h                            |    1 
 include/asm-v850/unistd.h                            |   12 -
 include/asm-v850/v850e_uart.h                        |    1 
 include/asm-x86_64/apic.h                            |    1 
 include/asm-x86_64/atomic.h                          |    1 
 include/asm-x86_64/bitops.h                          |    1 
 include/asm-x86_64/bugs.h                            |    1 
 include/asm-x86_64/cache.h                           |    1 
 include/asm-x86_64/calling.h                         |    1 
 include/asm-x86_64/dma-mapping.h                     |    1 
 include/asm-x86_64/dma.h                             |    1 
 include/asm-x86_64/dwarf2.h                          |    1 
 include/asm-x86_64/fixmap.h                          |    1 
 include/asm-x86_64/hardirq.h                         |    1 
 include/asm-x86_64/hw_irq.h                          |    1 
 include/asm-x86_64/ia32.h                            |    1 
 include/asm-x86_64/io.h                              |    1 
 include/asm-x86_64/io_apic.h                         |    1 
 include/asm-x86_64/mmu_context.h                     |    1 
 include/asm-x86_64/mmzone.h                          |    1 
 include/asm-x86_64/mtrr.h                            |    1 
 include/asm-x86_64/param.h                           |    1 
 include/asm-x86_64/pci.h                             |    1 
 include/asm-x86_64/processor.h                       |    1 
 include/asm-x86_64/serial.h                          |    1 
 include/asm-x86_64/smp.h                             |    1 
 include/asm-x86_64/spinlock.h                        |    1 
 include/asm-x86_64/swiotlb.h                         |    1 
 include/asm-x86_64/system.h                          |    1 
 include/asm-x86_64/tlbflush.h                        |    1 
 include/asm-x86_64/topology.h                        |    1 
 include/asm-x86_64/uaccess.h                         |    1 
 include/asm-x86_64/unistd.h                          |    7 
 include/asm-xtensa/atomic.h                          |    1 
 include/asm-xtensa/checksum.h                        |    1 
 include/asm-xtensa/delay.h                           |    1 
 include/asm-xtensa/dma.h                             |    1 
 include/asm-xtensa/hardirq.h                         |    1 
 include/asm-xtensa/ide.h                             |    1 
 include/asm-xtensa/io.h                              |    1 
 include/asm-xtensa/irq.h                             |    1 
 include/asm-xtensa/mmu_context.h                     |    1 
 include/asm-xtensa/page.h                            |    1 
 include/asm-xtensa/pgalloc.h                         |    1 
 include/asm-xtensa/platform.h                        |    1 
 include/asm-xtensa/system.h                          |    1 
 include/asm-xtensa/unistd.h                          |   21 --
 include/linux/acct.h                                 |    3 
 include/linux/acpi.h                                 |    1 
 include/linux/agpgart.h                              |    3 
 include/linux/amba/clcd.h                            |    1 
 include/linux/atmdev.h                               |    1 
 include/linux/audit.h                                |    4 
 include/linux/blkdev.h                               |    1 
 include/linux/blkpg.h                                |    1 
 include/linux/blktrace_api.h                         |    1 
 include/linux/blockgroup_lock.h                      |    1 
 include/linux/cache.h                                |    1 
 include/linux/coda.h                                 |    1 
 include/linux/compat.h                               |    1 
 include/linux/cpufreq.h                              |    1 
 include/linux/crypto.h                               |    1 
 include/linux/cyclomx.h                              |    1 
 include/linux/dcookies.h                             |    1 
 include/linux/devfs_fs_kernel.h                      |    1 
 include/linux/device.h                               |    1 
 include/linux/dmi.h                                  |    1 
 include/linux/dnotify.h                              |    1 
 include/linux/elf.h                                  |   59 ------
 include/linux/errqueue.h                             |    1 
 include/linux/ethtool.h                              |  169 +++++++++----------
 include/linux/ext2_fs.h                              |    2 
 include/linux/ext3_fs.h                              |    7 
 include/linux/fs.h                                   |    1 
 include/linux/ftape.h                                |    1 
 include/linux/gameport.h                             |    6 
 include/linux/generic_serial.h                       |    6 
 include/linux/genhd.h                                |   12 -
 include/linux/gfp.h                                  |    1 
 include/linux/hardirq.h                              |    1 
 include/linux/highmem.h                              |    1 
 include/linux/highuid.h                              |    1 
 include/linux/i2c-algo-ite.h                         |    7 
 include/linux/i2c.h                                  |    9 -
 include/linux/ide.h                                  |    1 
 include/linux/if_frad.h                              |    1 
 include/linux/if_tr.h                                |    1 
 include/linux/init.h                                 |    1 
 include/linux/inotify.h                              |    1 
 include/linux/interrupt.h                            |    1 
 include/linux/ipmi.h                                 |    2 
 include/linux/ipv6.h                                 |    1 
 include/linux/irq.h                                  |    1 
 include/linux/irq_cpustat.h                          |    1 
 include/linux/isapnp.h                               |    1 
 include/linux/isdn.h                                 |    1 
 include/linux/isdn/tpam.h                            |    1 
 include/linux/isdn_ppp.h                             |    1 
 include/linux/isdnif.h                               |    1 
 include/linux/kallsyms.h                             |    1 
 include/linux/kernel_stat.h                          |    1 
 include/linux/kmod.h                                 |    1 
 include/linux/kprobes.h                              |    1 
 include/linux/linkage.h                              |    1 
 include/linux/lockd/lockd.h                          |    1 
 include/linux/lockd/nlm.h                            |    1 
 include/linux/mempolicy.h                            |    1 
 include/linux/migrate.h                              |    1 
 include/linux/mii.h                                  |   30 +--
 include/linux/mm.h                                   |    1 
 include/linux/mman.h                                 |   12 -
 include/linux/mmzone.h                               |    1 
 include/linux/module.h                               |    1 
 include/linux/msg.h                                  |    2 
 include/linux/mtd/cfi.h                              |    1 
 include/linux/mtd/map.h                              |    1 
 include/linux/mtd/mtd.h                              |    1 
 include/linux/mtd/nand.h                             |    1 
 include/linux/mtd/physmap.h                          |    1 
 include/linux/mtd/xip.h                              |    1 
 include/linux/ncp_fs.h                               |    5 
 include/linux/net.h                                  |    3 
 include/linux/netdevice.h                            |    1 
 include/linux/netfilter.h                            |    1 
 include/linux/netfilter_arp.h                        |    1 
 include/linux/netfilter_bridge.h                     |    1 
 include/linux/netfilter_ipv4.h                       |    1 
 include/linux/netfilter_ipv4/ip_conntrack.h          |    1 
 include/linux/netfilter_ipv4/listhelp.h              |    1 
 include/linux/nfs.h                                  |    8 
 include/linux/nfs4.h                                 |    6 
 include/linux/nfs_fs.h                               |   39 ++--
 include/linux/nfsd/nfsd.h                            |    1 
 include/linux/nfsd/nfsfh.h                           |    1 
 include/linux/nfsd/syscall.h                         |    1 
 include/linux/numa.h                                 |    1 
 include/linux/parport.h                              |    1 
 include/linux/percpu_counter.h                       |    1 
 include/linux/pm.h                                   |    1 
 include/linux/pm_legacy.h                            |    1 
 include/linux/pmu.h                                  |    1 
 include/linux/preempt.h                              |    1 
 include/linux/proc_fs.h                              |    1 
 include/linux/profile.h                              |    1 
 include/linux/quota.h                                |    4 
 include/linux/quotaops.h                             |    1 
 include/linux/reiserfs_xattr.h                       |    3 
 include/linux/relay.h                                |    1 
 include/linux/rio.h                                  |    1 
 include/linux/rio_drv.h                              |    1 
 include/linux/rmap.h                                 |    1 
 include/linux/rtnetlink.h                            |    1 
 include/linux/rwsem.h                                |    1 
 include/linux/scc.h                                  |    1 
 include/linux/sched.h                                |   94 +++++-----
 include/linux/seccomp.h                              |    1 
 include/linux/sem.h                                  |    2 
 include/linux/seqlock.h                              |    1 
 include/linux/serialP.h                              |    1 
 include/linux/serial_core.h                          |    1 
 include/linux/signal.h                               |    4 
 include/linux/skbuff.h                               |    1 
 include/linux/slab.h                                 |    1 
 include/linux/smb_fs.h                               |    4 
 include/linux/smp.h                                  |    1 
 include/linux/smp_lock.h                             |    1 
 include/linux/socket.h                               |    2 
 include/linux/spinlock.h                             |    1 
 include/linux/stop_machine.h                         |    1 
 include/linux/sunrpc/auth.h                          |    1 
 include/linux/sunrpc/debug.h                         |   24 +-
 include/linux/sunrpc/stats.h                         |    1 
 include/linux/suspend.h                              |    1 
 include/linux/swap.h                                 |    1 
 include/linux/syscalls.h                             |    1 
 include/linux/sysrq.h                                |    1 
 include/linux/tcp.h                                  |    1 
 include/linux/threads.h                              |    1 
 include/linux/timer.h                                |    1 
 include/linux/timex.h                                |    1 
 include/linux/tty.h                                  |    1 
 include/linux/types.h                                |    1 
 include/linux/udp.h                                  |    1 
 include/linux/usb.h                                  |    1 
 include/linux/usb_usual.h                            |    1 
 include/linux/usbdevice_fs.h                         |    2 
 include/linux/vt_buffer.h                            |    1 
 include/linux/vt_kern.h                              |    1 
 include/linux/wait.h                                 |    1 
 include/linux/wanrouter.h                            |    4 
 include/mtd/mtd-abi.h                                |    5 
 include/net/addrconf.h                               |    1 
 include/net/af_unix.h                                |    1 
 include/net/ax25.h                                   |    1 
 include/net/compat.h                                 |    1 
 include/net/dst.h                                    |    1 
 include/net/icmp.h                                   |    1 
 include/net/inet6_hashtables.h                       |    1 
 include/net/inet_hashtables.h                        |    1 
 include/net/inet_sock.h                              |    1 
 include/net/inet_timewait_sock.h                     |    1 
 include/net/ip.h                                     |    1 
 include/net/ip_fib.h                                 |    1 
 include/net/ip_mp_alg.h                              |    1 
 include/net/ip_vs.h                                  |    1 
 include/net/ipv6.h                                   |    1 
 include/net/irda/irda.h                              |    1 
 include/net/irda/irda_device.h                       |    1 
 include/net/irda/irlap.h                             |    1 
 include/net/irda/irlmp.h                             |    1 
 include/net/irda/irlmp_frame.h                       |    1 
 include/net/irda/qos.h                               |    1 
 include/net/ndisc.h                                  |    1 
 include/net/netfilter/nf_conntrack.h                 |    1 
 include/net/pkt_act.h                                |    1 
 include/net/protocol.h                               |    1 
 include/net/raw.h                                    |    1 
 include/net/red.h                                    |    1 
 include/net/route.h                                  |    1 
 include/net/sch_generic.h                            |    1 
 include/net/sctp/sctp.h                              |    1 
 include/net/sock.h                                   |    1 
 include/net/tcp.h                                    |    1 
 include/pcmcia/ss.h                                  |    1 
 include/scsi/scsi_transport_fc.h                     |    1 
 include/scsi/scsi_transport_spi.h                    |    1 
 include/sound/driver.h                               |    1 
 include/video/edid.h                                 |    1 
 include/video/vga.h                                  |    1 
 889 files changed, 396 insertions(+), 1231 deletions(-)

Index: linux-2.6-header-cleanup-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-cleanup-git.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6-header-cleanup-git.patch	28 Apr 2006 17:10:41 -0000	1.11
+++ linux-2.6-header-cleanup-git.patch	29 Apr 2006 00:19:40 -0000	1.12
@@ -9040,12 +9040,24 @@
  #include <linux/jiffies.h>
  #include <linux/proc_fs.h>
  #include <linux/spinlock.h>
-unchanged:
---- a/include/linux/pci.h
+diff -u b/include/linux/pci.h b/include/linux/pci.h
+--- b/include/linux/pci.h
 +++ b/include/linux/pci.h
-@@ -47,7 +47,6 @@ #define PCIIOC_WRITE_COMBINE	(PCIIOC_BAS
+@@ -17,8 +17,6 @@
+ #ifndef LINUX_PCI_H
+ #define LINUX_PCI_H
+ 
+-#include <linux/mod_devicetable.h>
+-
+ /* Include the pci register defines */
+ #include <linux/pci_regs.h>
+ 
+@@ -46,8 +44,9 @@
+ 
  #ifdef __KERNEL__
  
++#include <linux/mod_devicetable.h>
++
  #include <linux/types.h>
 -#include <linux/config.h>
  #include <linux/ioport.h>
@@ -10748,7 +10760,7 @@
  
  /*
   * Include machine specific syscallX macros
-diff -u b/include/linux/input.h b/include/linux/input.h
+unchanged:
 --- b/include/linux/input.h
 +++ b/include/linux/input.h
 @@ -805,6 +805,9 @@

linux-2.6-header-install-git.patch:
 Makefile                                |   17 ++++
 b/include/Kbuild                        |    2 
 b/include/asm-alpha/Kbuild              |    9 ++
 b/include/asm-arm/Kbuild                |    7 +
 b/include/asm-arm26/Kbuild              |    8 ++
 b/include/asm-cris/Kbuild               |    6 +
 b/include/asm-cris/arch-v10/Kbuild      |    3 
 b/include/asm-generic/Kbuild            |    3 
 b/include/asm-generic/Kbuild.asm        |   11 ++
 b/include/asm-h8300/Kbuild              |    6 +
 b/include/asm-i386/Kbuild               |    5 +
 b/include/asm-ia64/Kbuild               |    7 +
 b/include/asm-m32r/Kbuild               |    7 +
 b/include/asm-m68k/Kbuild               |   17 ++++
 b/include/asm-m68knommu/Kbuild          |   12 +++
 b/include/asm-mips/Kbuild               |   15 +++
 b/include/asm-parisc/Kbuild             |    8 ++
 b/include/asm-powerpc/Kbuild            |   10 ++
 b/include/asm-ppc/Kbuild                |    8 ++
 b/include/asm-s390/Kbuild               |    4 +
 b/include/asm-sh/Kbuild                 |    6 +
 b/include/asm-sh64/Kbuild               |    6 +
 b/include/asm-sparc/Kbuild              |   13 +++
 b/include/asm-sparc64/Kbuild            |   16 ++++
 b/include/asm-um/Kbuild                 |   14 +++
 b/include/asm-v850/Kbuild               |   10 ++
 b/include/asm-x86_64/Kbuild             |   11 ++
 b/include/linux/Kbuild                  |   62 ++++++++++++++++
 b/include/linux/byteorder/Kbuild        |    1 
 b/include/linux/dvb/Kbuild              |    2 
 b/include/linux/hdlc/Kbuild             |    1 
 b/include/linux/isdn/Kbuild             |    1 
 b/include/linux/netfilter/Kbuild        |   11 ++
 b/include/linux/netfilter_arp/Kbuild    |    2 
 b/include/linux/netfilter_bridge/Kbuild |    4 +
 b/include/linux/netfilter_ipv4/Kbuild   |   21 +++++
 b/include/linux/netfilter_ipv6/Kbuild   |    5 +
 b/include/linux/nfsd/Kbuild             |    2 
 b/include/linux/raid/Kbuild             |    1 
 b/include/linux/sunrpc/Kbuild           |    1 
 b/include/linux/tc_act/Kbuild           |    1 
 b/include/linux/tc_ematch/Kbuild        |    1 
 b/include/media/Kbuild                  |    2 
 b/include/mtd/Kbuild                    |    2 
 b/include/rdma/Kbuild                   |    1 
 b/include/scsi/Kbuild                   |    2 
 b/include/sound/Kbuild                  |    2 
 b/include/video/Kbuild                  |    1 
 b/scripts/Makefile.headersinst          |  124 ++++++++++++++++++++++++++++++++
 b/scripts/hdrcheck.sh                   |    8 ++
 50 files changed, 499 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-header-install-git.patch	28 Apr 2006 15:53:09 -0000	1.8
+++ linux-2.6-header-install-git.patch	29 Apr 2006 00:19:40 -0000	1.9
@@ -417,8 +417,8 @@
 +	netfilter_bridge.h netfilter_decnet.h netfilter.h		\
 +	netfilter_ipv4.h netfilter_ipv6.h netfilter_logging.h net.h	\
 +	netlink.h nfs3.h nfs4.h nfsacl.h nfs_fs.h nfs.h nfs_idmap.h	\
-+	n_r3964.h nubus.h nvram.h parport.h patchkey.h pktcdvd.h pmu.h	\
-+	ppp-comp.h ptrace.h qnx4_fs.h quota.h random.h reboot.h		\
++	n_r3964.h nubus.h nvram.h parport.h patchkey.h pci.h pktcdvd.h	\
++	pmu.h ppp-comp.h ptrace.h qnx4_fs.h quota.h random.h reboot.h	\
 +	reiserfs_fs.h reiserfs_xattr.h romfs_fs.h route.h rtc.h		\
 +	rtnetlink.h scc.h sched.h sdla.h selinux_netlink.h sem.h	\
 +	serial_core.h serial.h serio.h shm.h signal.h smb_fs.h smb.h	\



From fedora-cvs-commits at redhat.com  Sat Apr 29 00:23:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Apr 2006 20:23:04 -0400
Subject: rpms/lftp/devel .cvsignore, 1.25, 1.26 lftp.spec, 1.46, 1.47 sources,
	1.25, 1.26
Message-ID: <200604290023.k3T0N4I3025135@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/lftp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25113

Modified Files:
	.cvsignore lftp.spec sources 
Log Message:
upgrade to upstream version 3.4.6


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	21 Apr 2006 19:46:22 -0000	1.25
+++ .cvsignore	29 Apr 2006 00:23:02 -0000	1.26
@@ -15,3 +15,4 @@
 lftp-3.4.3.tar.gz
 lftp-3.4.3.tar.bz2
 lftp-3.4.4.tar.bz2
+lftp-3.4.6.tar.bz2


Index: lftp.spec
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- lftp.spec	21 Apr 2006 19:48:27 -0000	1.46
+++ lftp.spec	29 Apr 2006 00:23:02 -0000	1.47
@@ -1,6 +1,6 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
-Version: 	3.4.4
+Version: 	3.4.6
 Release: 	1.FC6
 License: 	GPL
 Group: 		Applications/Internet
@@ -84,6 +84,9 @@
 %{_libdir}/lftp/%{version}/proto-sftp.so
 
 %changelog
+* Fri Apr 28 2006 Jason Vas Dias <jvdias at redhat.com> - 3.4.6-1
+- Upgrade to upstream version 3.4.6
+
 * Fri Apr 21 2006 Jason Vas Dias <jvdias at redhat.com> - 3.4.4-1
 - Upgrade to upstream version 3.4.4
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	21 Apr 2006 19:46:22 -0000	1.25
+++ sources	29 Apr 2006 00:23:02 -0000	1.26
@@ -1 +1 @@
-84af5617bba109b18b5d5f28f55d26e9  lftp-3.4.4.tar.bz2
+ed456c48929f1e60ddde9f2525768136  lftp-3.4.6.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Apr 29 04:47:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Apr 2006 00:47:10 -0400
Subject: rpms/selinux-policy/devel modules-targeted.conf, 1.21,
	1.22 policy-20060411.patch, 1.12, 1.13 selinux-policy.spec,
	1.181, 1.182
Message-ID: <200604290447.k3T4lApg014264@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12655

Modified Files:
	modules-targeted.conf policy-20060411.patch 
	selinux-policy.spec 
Log Message:
* Tue Apr 25 2006 Dan Walsh <dwalsh at redhat.com> 2.2.36-1
- Update to upstream



Index: modules-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- modules-targeted.conf	10 Apr 2006 21:10:33 -0000	1.21
+++ modules-targeted.conf	29 Apr 2006 04:47:05 -0000	1.22
@@ -1043,3 +1043,17 @@
 # 
 mono = base
 
+# Layer: services
+# Module: pyzor
+#
+# Spam Blocker
+# 
+pyzor = base
+
+# Layer: services
+# Module: amavis
+#
+# Anti-virus
+# 
+amavis = base
+

policy-20060411.patch:
 config/appconfig-strict-mls/default_type |    1 
 policy/modules/apps/cdrecord.if          |    2 
 policy/modules/apps/evolution.if         |    2 
 policy/modules/apps/mono.te              |    3 
 policy/modules/apps/mozilla.if           |    2 
 policy/modules/apps/thunderbird.if       |    2 
 policy/modules/kernel/corenetwork.if.in  |   75 +++++++++++++++++++++
 policy/modules/kernel/corenetwork.te.in  |    1 
 policy/modules/kernel/corenetwork.te.m4  |    6 +
 policy/modules/kernel/domain.te          |    1 
 policy/modules/kernel/files.if           |   15 ++++
 policy/modules/kernel/filesystem.if      |   38 +++++++++-
 policy/modules/kernel/kernel.te          |    1 
 policy/modules/services/amavis.te        |    4 +
 policy/modules/services/automount.te     |    1 
 policy/modules/services/cups.te          |    1 
 policy/modules/services/cyrus.if         |   22 ++++++
 policy/modules/services/postfix.te       |    8 ++
 policy/modules/services/procmail.te      |    6 +
 policy/modules/services/pyzor.fc         |    6 +
 policy/modules/services/pyzor.if         |   46 +++++++++++++
 policy/modules/services/pyzor.te         |  109 +++++++++++++++++++++++++++++++
 policy/modules/services/spamassassin.te  |   19 ++---
 policy/modules/system/authlogin.te       |    2 
 policy/modules/system/init.te            |    1 
 policy/modules/system/lvm.te             |    3 
 policy/modules/system/mount.te           |    2 
 policy/modules/system/selinuxutil.te     |    4 +
 policy/modules/system/sysnetwork.te      |    1 
 policy/modules/system/unconfined.if      |   40 +++++++++++
 policy/modules/system/userdomain.te      |   23 +++++-
 policy/modules/system/xen.fc             |    1 
 policy/modules/system/xen.if             |   72 +++++++++++++++++++-
 policy/modules/system/xen.te             |   52 ++++++++++++++
 policy/rolemap                           |    1 
 policy/users                             |    6 -
 36 files changed, 548 insertions(+), 31 deletions(-)

Index: policy-20060411.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060411.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- policy-20060411.patch	25 Apr 2006 10:57:57 -0000	1.12
+++ policy-20060411.patch	29 Apr 2006 04:47:05 -0000	1.13
@@ -1,37 +1,38 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/default_type serefpolicy-2.2.35/config/appconfig-strict-mls/default_type
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/default_type serefpolicy-2.2.36/config/appconfig-strict-mls/default_type
 --- nsaserefpolicy/config/appconfig-strict-mls/default_type	2006-01-06 17:55:17.000000000 -0500
-+++ serefpolicy-2.2.35/config/appconfig-strict-mls/default_type	2006-04-24 20:16:38.000000000 -0400
++++ serefpolicy-2.2.36/config/appconfig-strict-mls/default_type	2006-04-28 22:53:54.000000000 -0400
 @@ -2,3 +2,4 @@
  secadm_r:secadm_t
  staff_r:staff_t
  user_r:user_t
 +auditadm_r:auditadm_t
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.2.35/policy/modules/admin/netutils.te
---- nsaserefpolicy/policy/modules/admin/netutils.te	2006-04-06 14:05:24.000000000 -0400
-+++ serefpolicy-2.2.35/policy/modules/admin/netutils.te	2006-04-24 20:16:38.000000000 -0400
-@@ -97,7 +97,7 @@
- 
- allow ping_t self:tcp_socket create_socket_perms;
- allow ping_t self:udp_socket create_socket_perms;
--allow ping_t self:rawip_socket { create ioctl read write bind getopt setopt };
-+allow ping_t self:{ rawip_socket packet_socket } { create ioctl read write bind getopt setopt };
- 
- corenet_tcp_sendrecv_all_if(ping_t)
- corenet_udp_sendrecv_all_if(ping_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.2.35/policy/modules/admin/usermanage.te
---- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-04-18 22:49:59.000000000 -0400
-+++ serefpolicy-2.2.35/policy/modules/admin/usermanage.te	2006-04-24 20:16:38.000000000 -0400
-@@ -514,6 +514,7 @@
- # Add/remove user home directories
- userdom_home_filetrans_generic_user_home_dir(useradd_t)
- userdom_manage_generic_user_home_content_dirs(useradd_t)
-+userdom_manage_generic_user_home_content_files(useradd_t)
- userdom_manage_staff_home_dirs(useradd_t)
- userdom_generic_user_home_dir_filetrans_generic_user_home_content(useradd_t,notdevfile_class_set)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.2.35/policy/modules/apps/mono.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/cdrecord.if serefpolicy-2.2.36/policy/modules/apps/cdrecord.if
+--- nsaserefpolicy/policy/modules/apps/cdrecord.if	2006-04-18 22:49:59.000000000 -0400
++++ serefpolicy-2.2.36/policy/modules/apps/cdrecord.if	2006-04-28 22:53:54.000000000 -0400
+@@ -152,7 +152,7 @@
+ 		files_dontaudit_list_tmp($1_cdrecord_t)
+ 		files_dontaudit_list_home($1_cdrecord_t)
+ 		fs_dontaudit_list_removable($1_cdrecord_t)
+-		fs_donaudit_read_removable_files($1_cdrecord_t)
++		fs_dontaudit_read_removable_files($1_cdrecord_t)
+ 		userdom_dontaudit_list_user_tmp($1,$1_cdrecord_t)
+ 		userdom_dontaudit_read_user_tmp_files($1,$1_cdrecord_t)
+ 		userdom_dontaudit_list_user_home_dirs($1,$1_cdrecord_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/evolution.if serefpolicy-2.2.36/policy/modules/apps/evolution.if
+--- nsaserefpolicy/policy/modules/apps/evolution.if	2006-04-20 08:17:35.000000000 -0400
++++ serefpolicy-2.2.36/policy/modules/apps/evolution.if	2006-04-28 22:53:54.000000000 -0400
+@@ -303,7 +303,7 @@
+ 		files_dontaudit_list_tmp($1_evolution_t)
+ 		files_dontaudit_list_home($1_evolution_t)
+ 		fs_dontaudit_list_removable($1_evolution_t)
+-		fs_donaudit_read_removable_files($1_evolution_t)
++		fs_dontaudit_read_removable_files($1_evolution_t)
+ 		userdom_dontaudit_list_user_tmp($1,$1_evolution_t)
+ 		userdom_dontaudit_read_user_tmp_files($1,$1_evolution_t)
+ 		userdom_dontaudit_list_user_home_dirs($1,$1_evolution_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.2.36/policy/modules/apps/mono.te
 --- nsaserefpolicy/policy/modules/apps/mono.te	2006-04-18 22:49:59.000000000 -0400
-+++ serefpolicy-2.2.35/policy/modules/apps/mono.te	2006-04-24 20:16:38.000000000 -0400
++++ serefpolicy-2.2.36/policy/modules/apps/mono.te	2006-04-28 22:53:54.000000000 -0400
 @@ -20,8 +20,9 @@
  ifdef(`targeted_policy',`
  	allow mono_t self:process { execheap execmem };
@@ -43,20 +44,142 @@
  	init_dbus_chat_script(mono_t)
  
  	optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.2.35/policy/modules/kernel/corecommands.fc
---- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-04-18 22:49:59.000000000 -0400
-+++ serefpolicy-2.2.35/policy/modules/kernel/corecommands.fc	2006-04-24 20:16:38.000000000 -0400
-@@ -177,6 +177,7 @@
- ifdef(`distro_redhat', `
- /usr/lib/.*/program(/.*)?		gen_context(system_u:object_r:bin_t,s0)
- /usr/share/authconfig/authconfig-gtk\.py -- gen_context(system_u:object_r:bin_t,s0)
-+/usr/share/authconfig/authconfig-tui\.py -- gen_context(system_u:object_r:bin_t,s0)
- /usr/share/cvs/contrib/rcs2log	--	gen_context(system_u:object_r:bin_t,s0)
- /usr/share/hwbrowser/hwbrowser -- gen_context(system_u:object_r:bin_t,s0)
- /usr/share/pwlib/make/ptlib-config --	gen_context(system_u:object_r:bin_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-2.2.35/policy/modules/kernel/domain.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.2.36/policy/modules/apps/mozilla.if
+--- nsaserefpolicy/policy/modules/apps/mozilla.if	2006-03-24 11:15:44.000000000 -0500
++++ serefpolicy-2.2.36/policy/modules/apps/mozilla.if	2006-04-28 22:53:54.000000000 -0400
+@@ -249,7 +249,7 @@
+ 		files_dontaudit_list_tmp($1_mozilla_t)
+ 		files_dontaudit_list_home($1_mozilla_t)
+ 		fs_dontaudit_list_removable($1_mozilla_t)
+-		fs_donaudit_read_removable_files($1_mozilla_t)
++		fs_dontaudit_read_removable_files($1_mozilla_t)
+ 		userdom_dontaudit_list_user_tmp($1,$1_mozilla_t)
+ 		userdom_dontaudit_read_user_tmp_files($1,$1_mozilla_t)
+ 		userdom_dontaudit_list_user_home_dirs($1,$1_mozilla_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderbird.if serefpolicy-2.2.36/policy/modules/apps/thunderbird.if
+--- nsaserefpolicy/policy/modules/apps/thunderbird.if	2006-03-24 11:15:44.000000000 -0500
++++ serefpolicy-2.2.36/policy/modules/apps/thunderbird.if	2006-04-28 22:53:54.000000000 -0400
+@@ -216,7 +216,7 @@
+ 		files_dontaudit_list_home($1_thunderbird_t)
+ 
+ 		fs_dontaudit_list_removable($1_thunderbird_t)
+-		fs_donaudit_read_removable_files($1_thunderbird_t)
++		fs_dontaudit_read_removable_files($1_thunderbird_t)
+ 
+ 		userdom_dontaudit_list_user_tmp($1,$1_thunderbird_t)
+ 		userdom_dontaudit_read_user_tmp_files($1,$1_thunderbird_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.if.in serefpolicy-2.2.36/policy/modules/kernel/corenetwork.if.in
+--- nsaserefpolicy/policy/modules/kernel/corenetwork.if.in	2006-04-27 10:31:32.000000000 -0400
++++ serefpolicy-2.2.36/policy/modules/kernel/corenetwork.if.in	2006-04-28 22:53:54.000000000 -0400
+@@ -1259,3 +1259,78 @@
+ 
+ 	typeattribute $1 corenet_unconfined_type;
+ ')
++
++
++########################################
++## <summary>
++##	Bind TCP sockets to all rpc ports.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`corenet_tcp_bind_all_rpc_ports',`
++	gen_require(`
++		attribute rpc_port_type;
++	')
++
++	allow $1 rpc_port_type:tcp_socket name_bind;
++	allow $1 self:capability net_bind_service;
++')
++
++########################################
++## <summary>
++##	Do not audit attempts to bind TCP sockets to all rpc ports.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process to not audit.
++##	</summary>
++## </param>
++#
++interface(`corenet_dontaudit_tcp_bind_all_rpc_ports',`
++	gen_require(`
++		attribute rpc_port_type;
++	')
++
++	dontaudit $1 rpc_port_type:tcp_socket name_bind;
++')
++
++########################################
++## <summary>
++##	Bind UDP sockets to all rpc ports.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`corenet_udp_bind_all_rpc_ports',`
++	gen_require(`
++		attribute rpc_port_type;
++	')
++
++	allow $1 rpc_port_type:udp_socket name_bind;
++	allow $1 self:capability net_bind_service;
++')
++
++########################################
++## <summary>
++##	Do not audit attempts to bind UDP sockets to all rpc ports.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process to not audit.
++##	</summary>
++## </param>
++#
++interface(`corenet_dontaudit_udp_bind_all_rpc_ports',`
++	gen_require(`
++		attribute rpc_port_type;
++	')
++
++	dontaudit $1 rpc_port_type:udp_socket name_bind;
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.36/policy/modules/kernel/corenetwork.te.in
+--- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-04-18 22:49:59.000000000 -0400
++++ serefpolicy-2.2.36/policy/modules/kernel/corenetwork.te.in	2006-04-28 22:53:54.000000000 -0400
+@@ -10,6 +10,7 @@
+ attribute node_type;
+ attribute port_type;
+ attribute reserved_port_type;
++attribute rpc_port_type;
+ 
+ attribute corenet_unconfined_type;
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.m4 serefpolicy-2.2.36/policy/modules/kernel/corenetwork.te.m4
+--- nsaserefpolicy/policy/modules/kernel/corenetwork.te.m4	2006-01-16 13:55:42.000000000 -0500
++++ serefpolicy-2.2.36/policy/modules/kernel/corenetwork.te.m4	2006-04-28 22:53:54.000000000 -0400
+@@ -46,7 +46,11 @@
+ ') dnl end determine reserved capability depend
+ 
+ define(`declare_ports',`dnl
+-ifelse(eval($3 < 1024),1,`typeattribute $1 reserved_port_type;',`dnl')
++ifelse(eval($3 < 1024),1,`
++typeattribute $1 reserved_port_type;
++#bindresvport in glibc starts searching for reserved ports at 600
++ifelse(eval($3 >= 600),1,`typeattribute $1 rpc_port_type;',`dnl')
++',`dnl')
+ portcon $2 $3 gen_context(system_u:object_r:$1,$4)
+ ifelse(`$5',`',`',`declare_ports($1,shiftn(4,$*))')dnl
+ ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-2.2.36/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2006-04-20 08:17:36.000000000 -0400
-+++ serefpolicy-2.2.35/policy/modules/kernel/domain.te	2006-04-24 20:16:38.000000000 -0400
++++ serefpolicy-2.2.36/policy/modules/kernel/domain.te	2006-04-28 22:53:54.000000000 -0400
 @@ -96,6 +96,7 @@
  	# workaround until role dominance is fixed in
  	# the module compiler
@@ -65,10 +188,10 @@
  	role sysadm_r types domain;
  	role user_r types domain;
  	role staff_r types domain;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.35/policy/modules/kernel/files.if
---- nsaserefpolicy/policy/modules/kernel/files.if	2006-04-24 20:14:39.000000000 -0400
-+++ serefpolicy-2.2.35/policy/modules/kernel/files.if	2006-04-24 20:16:38.000000000 -0400
-@@ -1679,6 +1679,21 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.36/policy/modules/kernel/files.if
+--- nsaserefpolicy/policy/modules/kernel/files.if	2006-04-28 22:50:56.000000000 -0400
++++ serefpolicy-2.2.36/policy/modules/kernel/files.if	2006-04-28 22:53:54.000000000 -0400
+@@ -1699,6 +1699,21 @@
  ')
  
  ########################################
@@ -90,33 +213,9 @@
  ## <summary>
  ##	Read files in /etc that are dynamically
  ##	created on boot, such as mtab.
-@@ -3905,3 +3920,23 @@
- 
- 	typeattribute $1 files_unconfined_type;
- ')
-+
-+########################################
-+## <summary>
-+##     Read kernel files in the /boot directory.
-+## </summary>
-+## <param name="domain">
-+##     <summary>
-+##     Domain allowed access.
-+##     </summary>
-+## </param>
-+#
-+interface(`files_read_kernel_img',`
-+       gen_require(`
-+               type boot_t;
-+       ')
-+
-+       allow $1 boot_t:dir r_dir_perms;
-+       allow $1 boot_t:file { getattr read };
-+       allow $1 boot_t:lnk_file { getattr read };
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.35/policy/modules/kernel/filesystem.if
---- nsaserefpolicy/policy/modules/kernel/filesystem.if	2006-04-18 22:49:59.000000000 -0400
-+++ serefpolicy-2.2.35/policy/modules/kernel/filesystem.if	2006-04-24 20:16:38.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.36/policy/modules/kernel/filesystem.if
+--- nsaserefpolicy/policy/modules/kernel/filesystem.if	2006-04-28 22:50:56.000000000 -0400
++++ serefpolicy-2.2.36/policy/modules/kernel/filesystem.if	2006-04-28 22:53:54.000000000 -0400
 @@ -609,7 +609,7 @@
  		attribute noxattrfs;
  	')
@@ -135,7 +234,7 @@
  	allow $1 noxattrfs:lnk_file r_file_perms;
  ')
  
-@@ -1294,7 +1294,7 @@
+@@ -1277,7 +1277,7 @@
  
  ########################################
  ## <summary>
@@ -144,9 +243,52 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.2.35/policy/modules/kernel/kernel.te
+@@ -1491,7 +1491,7 @@
+ ##	</summary>
+ ## </param>
+ #
+-interface(`fs_donaudit_read_removable_files',`
++interface(`fs_dontaudit_read_removable_files',`
+ 	gen_require(`
+ 		type removable_t;
+ 	')
+@@ -3204,3 +3204,33 @@
+ 
+ 	typeattribute $1 filesystem_unconfined_type;
+ ')
++
++
++
++########################################
++## <summary>
++##	Relabel all filesystem_types on the filesystem,
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the domain perfoming this action.
++##	</summary>
++## </param>
++#
++interface(`fs_relabel_all_filesystem_types',`
++	gen_require(`
++		attribute filesystem_type;
++	')
++
++	allow $1 { filesystem_type }:dir { r_dir_perms relabelfrom relabelto };
++	allow $1 { filesystem_type }:file { getattr relabelfrom relabelto };
++	allow $1 { filesystem_type }:lnk_file { getattr relabelfrom relabelto };
++	allow $1 { filesystem_type }:fifo_file { getattr relabelfrom relabelto };
++	allow $1 { filesystem_type }:sock_file { getattr relabelfrom relabelto };
++	allow $1 { filesystem_type }:blk_file { getattr relabelfrom };
++	allow $1 { filesystem_type }:chr_file { getattr relabelfrom };
++
++	# satisfy the assertions:
++	seutil_relabelto_bin_policy($1)
++')
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.2.36/policy/modules/kernel/kernel.te
 --- nsaserefpolicy/policy/modules/kernel/kernel.te	2006-04-24 20:14:39.000000000 -0400
-+++ serefpolicy-2.2.35/policy/modules/kernel/kernel.te	2006-04-24 20:16:38.000000000 -0400
++++ serefpolicy-2.2.36/policy/modules/kernel/kernel.te	2006-04-28 22:53:54.000000000 -0400
 @@ -28,6 +28,7 @@
  
  ifdef(`enable_mls',`
@@ -155,21 +297,31 @@
  ')
  
  #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.2.35/policy/modules/kernel/terminal.if
---- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-02-13 17:05:45.000000000 -0500
-+++ serefpolicy-2.2.35/policy/modules/kernel/terminal.if	2006-04-24 20:16:38.000000000 -0400
-@@ -174,7 +174,7 @@
- 	')
- 
- 	dev_list_all_dev_nodes($1)
--	allow $1 console_device_t:chr_file write;
-+	allow $1 console_device_t:chr_file { getattr write append };
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.2.36/policy/modules/services/amavis.te
+--- nsaserefpolicy/policy/modules/services/amavis.te	2006-03-24 11:15:50.000000000 -0500
++++ serefpolicy-2.2.36/policy/modules/services/amavis.te	2006-04-28 23:21:20.000000000 -0400
+@@ -146,3 +146,7 @@
+ 	spamassassin_exec(amavis_t)
+ 	spamassassin_exec_client(amavis_t)
  ')
- 
- ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.35/policy/modules/services/cups.te
++
++optional_policy(`
++	pyzor_domtrans(amavis_t)
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.36/policy/modules/services/automount.te
+--- nsaserefpolicy/policy/modules/services/automount.te	2006-04-12 13:44:36.000000000 -0400
++++ serefpolicy-2.2.36/policy/modules/services/automount.te	2006-04-28 22:53:54.000000000 -0400
+@@ -86,6 +86,7 @@
+ # Automount execs showmount when you browse /net.  This is required until
+ # Someone writes a showmount policy
+ corenet_tcp_bind_reserved_port(automount_t)
++corenet_tcp_bind_all_rpc_ports(automount_t)
+ 
+ dev_read_sysfs(automount_t)
+ # for SSP
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.36/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-04-12 13:44:36.000000000 -0400
-+++ serefpolicy-2.2.35/policy/modules/services/cups.te	2006-04-24 20:16:38.000000000 -0400
++++ serefpolicy-2.2.36/policy/modules/services/cups.te	2006-04-28 22:53:54.000000000 -0400
 @@ -79,6 +79,7 @@
  allow cupsd_t self:process { setsched signal_perms };
  allow cupsd_t self:fifo_file rw_file_perms;
@@ -178,47 +330,78 @@
  allow cupsd_t self:unix_dgram_socket create_socket_perms;
  allow cupsd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
  allow cupsd_t self:netlink_route_socket { r_netlink_socket_perms };
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.35/policy/modules/services/pegasus.te
---- nsaserefpolicy/policy/modules/services/pegasus.te	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.2.35/policy/modules/services/pegasus.te	2006-04-24 20:16:38.000000000 -0400
-@@ -79,11 +79,16 @@
- corenet_tcp_connect_pegasus_https_port(pegasus_t)
- corenet_tcp_connect_generic_port(pegasus_t)
- 
-+corecmd_exec_sbin(pegasus_t)
-+corecmd_exec_bin(pegasus_t)
-+corecmd_exec_shell(pegasus_t)
-+
- dev_read_sysfs(pegasus_t)
- dev_read_urand(pegasus_t)
- 
- fs_getattr_all_fs(pegasus_t)
- fs_search_auto_mountpoints(pegasus_t)
-+files_getattr_all_dirs(pegasus_t)
- 
- term_dontaudit_use_console(pegasus_t)
- 
-@@ -98,6 +103,8 @@
- files_read_var_lib_files(pegasus_t)
- files_read_var_lib_symlinks(pegasus_t)
- 
-+hostname_exec(pegasus_t)
-+
- init_use_fds(pegasus_t)
- init_use_script_ptys(pegasus_t)
- init_rw_utmp(pegasus_t)
-@@ -116,6 +123,7 @@
- 	term_dontaudit_use_unallocated_ttys(pegasus_t)
- 	term_dontaudit_use_generic_ptys(pegasus_t)
- 	files_dontaudit_read_root_files(pegasus_t)
-+	unconfined_signull(pegasus_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.if serefpolicy-2.2.36/policy/modules/services/cyrus.if
+--- nsaserefpolicy/policy/modules/services/cyrus.if	2006-02-10 17:05:19.000000000 -0500
++++ serefpolicy-2.2.36/policy/modules/services/cyrus.if	2006-04-28 22:53:54.000000000 -0400
+@@ -20,3 +20,25 @@
+ 	allow $1 cyrus_var_lib_t:dir rw_dir_perms;
+ 	allow $1 cyrus_var_lib_t:file manage_file_perms;
+ ')
++
++
++########################################
++## <summary>
++##	Connect to Cyrus using a unix domain stream socket.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`cyrus_stream_connect',`
++	gen_require(`
++		type cyrus_t, cyrus_var_lib_t;
++	')
++
++	files_search_var_lib($1)
++	allow $1 cyrus_var_lib_t:dir search;
++	allow $1 cyrus_var_lib_t:sock_file write;
++	allow $1 cyrus_t:unix_stream_socket connectto;
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.36/policy/modules/services/postfix.te
+--- nsaserefpolicy/policy/modules/services/postfix.te	2006-04-20 08:17:39.000000000 -0400
++++ serefpolicy-2.2.36/policy/modules/services/postfix.te	2006-04-28 22:53:54.000000000 -0400
+@@ -181,6 +181,10 @@
  ')
  
  optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.2.35/policy/modules/services/procmail.te
++	cyrus_stream_connect(postfix_master_t)
++')
++
++optional_policy(`
+ 	nis_use_ypbind(postfix_master_t)
+ ')
+ 
+@@ -390,6 +394,7 @@
+ allow postfix_pickup_t postfix_public_t:fifo_file rw_file_perms;
+ allow postfix_pickup_t postfix_public_t:sock_file rw_file_perms;
+ 
++postfix_list_spool(postfix_pickup_t)
+ allow postfix_pickup_t postfix_spool_maildrop_t:dir rw_dir_perms;
+ allow postfix_pickup_t postfix_spool_maildrop_t:file r_file_perms;
+ allow postfix_pickup_t postfix_spool_maildrop_t:file unlink;
+@@ -430,6 +435,7 @@
+ allow postfix_postdrop_t postfix_public_t:dir search;
+ allow postfix_postdrop_t postfix_public_t:fifo_file rw_file_perms;
+ 
++postfix_list_spool(postfix_postdrop_t)
+ allow postfix_postdrop_t postfix_spool_maildrop_t:dir rw_dir_perms;
+ allow postfix_postdrop_t postfix_spool_maildrop_t:file create_file_perms;
+ 
+@@ -538,6 +544,8 @@
+ 
+ allow postfix_showq_t postfix_spool_t:file r_file_perms;
+ 
++postfix_list_spool(postfix_showq_t)
++
+ allow postfix_showq_t postfix_spool_maildrop_t:dir { getattr read search };
+ allow postfix_showq_t postfix_spool_maildrop_t:file { read getattr };
+ allow postfix_showq_t postfix_spool_maildrop_t:lnk_file { getattr read };
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.2.36/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2006-03-24 11:15:50.000000000 -0500
-+++ serefpolicy-2.2.35/policy/modules/services/procmail.te	2006-04-24 20:16:38.000000000 -0400
-@@ -95,13 +95,13 @@
++++ serefpolicy-2.2.36/policy/modules/services/procmail.te	2006-04-28 23:05:02.000000000 -0400
+@@ -95,16 +95,20 @@
  
  optional_policy(`
  	mta_read_config(procmail_t)
@@ -233,22 +416,229 @@
  
  	files_getattr_tmp_dirs(procmail_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.35/policy/modules/services/samba.te
---- nsaserefpolicy/policy/modules/services/samba.te	2006-04-19 12:23:07.000000000 -0400
-+++ serefpolicy-2.2.35/policy/modules/services/samba.te	2006-04-24 20:16:38.000000000 -0400
-@@ -106,8 +106,8 @@
- files_tmp_filetrans(samba_net_t, samba_net_tmp_t, { file dir })
- 
- allow samba_net_t samba_var_t:dir rw_dir_perms;
-+allow samba_net_t samba_var_t:file create_file_perms;
- allow samba_net_t samba_var_t:lnk_file create_lnk_perms;
--allow samba_net_t samba_var_t:file create_lnk_perms;
+ 	spamassassin_exec(procmail_t)
+ 	spamassassin_exec_client(procmail_t)
+ ')
++
++optional_policy(`
++	pyzor_domtrans(procmail_t)
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.fc serefpolicy-2.2.36/policy/modules/services/pyzor.fc
+--- nsaserefpolicy/policy/modules/services/pyzor.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.2.36/policy/modules/services/pyzor.fc	2006-04-28 23:11:40.000000000 -0400
+@@ -0,0 +1,6 @@
++/etc/pyzor(/.*)?		gen_context(system_u:object_r:pyzor_etc_t, s0)
++/usr/bin/pyzor		--	gen_context(system_u:object_r:pyzor_exec_t,s0)
++/usr/bin/pyzord		--	gen_context(system_u:object_r:pyzord_exec_t,s0)
++/var/lib/pyzord(/.*)?		gen_context(system_u:object_r:pyzor_var_lib_t,s0)
++/var/log/pyzord.log	--	gen_context(system_u:object_r:pyzord_log_t,s0)
++HOME_DIR/\.pyzor(/.*)?		gen_context(system_u:object_r:ROLE_pyzor_home_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.if serefpolicy-2.2.36/policy/modules/services/pyzor.if
+--- nsaserefpolicy/policy/modules/services/pyzor.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.2.36/policy/modules/services/pyzor.if	2006-04-28 22:53:54.000000000 -0400
+@@ -0,0 +1,46 @@
++## <summary>Pyzor mail delivery agent</summary>
++
++########################################
++## <summary>
++##	Execute pyzor with a domain transition.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`pyzor_domtrans',`
++	gen_require(`
++		type pyzor_exec_t, pyzor_t;
++	')
++
++	files_search_usr($1)
++	corecmd_search_bin($1)
++	domain_auto_trans($1,pyzor_exec_t,pyzor_t)
++
++	allow $1 pyzor_t:fd use;
++	allow pyzor_t $1:fd use;
++	allow pyzor_t $1:fifo_file rw_file_perms;
++	allow pyzor_t $1:process sigchld;
++')
++
++########################################
++## <summary>
++##	Execute pyzor in the caller domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`pyzor_exec',`
++	gen_require(`
++		type pyzor_exec_t;
++	')
++
++	files_search_usr($1)
++	corecmd_search_bin($1)
++	can_exec($1,pyzor_exec_t)
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-2.2.36/policy/modules/services/pyzor.te
+--- nsaserefpolicy/policy/modules/services/pyzor.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.2.36/policy/modules/services/pyzor.te	2006-04-29 00:44:42.000000000 -0400
+@@ -0,0 +1,109 @@
++policy_module(pyzor,1.1.0)
++
++type pyzord_t;
++type pyzord_exec_t;
++domain_type(pyzord_t)
++init_daemon_domain(pyzord_t,pyzord_exec_t)
++role system_r types pyzord_t;
++
++type pyzor_t;
++type pyzor_exec_t;
++domain_type(pyzor_t)
++domain_entry_file(pyzor_t,pyzor_exec_t)
++role system_r types pyzor_t;
++
++type pyzor_var_lib_t;
++files_type(pyzor_var_lib_t)
++
++type pyzor_etc_t;
++files_type(pyzor_etc_t)
++
++type pyzord_log_t;
++logging_log_file(pyzord_log_t)
++
++########################################
++#
++# Local policy
++#
++
++allow pyzord_t self:udp_socket create_socket_perms;
++allow pyzord_t pyzor_port_t:udp_socket name_bind;
++
++allow pyzord_t pyzor_var_lib_t:file create_file_perms;
++allow pyzord_t pyzor_var_lib_t:dir { rw_dir_perms setattr };
++files_var_lib_filetrans(pyzord_t,pyzor_var_lib_t,{ file dir })
++
++allow pyzord_t pyzor_etc_t:file create_file_perms;
++allow pyzord_t pyzor_etc_t:dir r_dir_perms;
++
++allow pyzord_t pyzord_log_t:file create_file_perms;
++allow pyzord_t pyzord_log_t:dir { rw_dir_perms setattr };
++logging_log_filetrans(pyzord_t,pyzord_log_t, { file dir } )
++
++auth_use_nsswitch(pyzord_t)
++
++dev_read_urand(pyzord_t)
++
++can_exec(pyzord_t,pyzor_exec_t)
++
++corenet_raw_sendrecv_all_if(pyzord_t)
++corenet_udp_sendrecv_all_if(pyzord_t)
++corenet_udp_sendrecv_all_nodes(pyzord_t)
++corenet_raw_sendrecv_all_nodes(pyzord_t)
++corenet_udp_sendrecv_all_ports(pyzord_t)
++corenet_non_ipsec_sendrecv(pyzord_t)
++corenet_udp_bind_all_nodes(pyzord_t)
++corecmd_exec_bin(pyzord_t)
++
++files_read_etc_files(pyzord_t)
++
++kernel_read_kernel_sysctls(pyzord_t)
++kernel_read_system_state(pyzord_t)
++
++libs_use_ld_so(pyzord_t)
++libs_use_shared_libs(pyzord_t)
++
++miscfiles_read_localization(pyzord_t)
++
++term_dontaudit_use_generic_ptys(pyzord_t)
++
++# only works until we define a different type for maildir
++userdom_priveleged_home_dir_manager(pyzord_t)
++# Do not audit attempts to access /root.
++userdom_dontaudit_search_sysadm_home_dirs(pyzord_t)
++userdom_dontaudit_search_staff_home_dirs(pyzord_t)
++
++mta_manage_spool(pyzord_t)
++
++optional_policy(`
++	logging_send_syslog_msg(pyzord_t)
++')
++
++optional_policy(`
++	nscd_socket_use(pyzord_t)
++')
++
++########################################
++# pyzor defs
++########################################
++
++auth_use_nsswitch(pyzor_t)
++
++files_read_etc_files(pyzor_t)
++
++libs_use_ld_so(pyzor_t)
++libs_use_shared_libs(pyzor_t)
++
++miscfiles_read_localization(pyzor_t)
++
++files_search_var_lib(pyzor_t)
++allow pyzor_t pyzor_var_lib_t:dir r_dir_perms;
++allow pyzor_t pyzor_var_lib_t:file r_file_perms;
++
++optional_policy(`
++	spamassassin_read_spamd_tmp_files(pyzor_t)
++')
++
++optional_policy(`
++	amavis_manage_lib_files(pyzor_t)
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.2.36/policy/modules/services/spamassassin.te
+--- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-04-20 08:17:39.000000000 -0400
++++ serefpolicy-2.2.36/policy/modules/services/spamassassin.te	2006-04-28 22:53:54.000000000 -0400
+@@ -128,6 +128,7 @@
+ 		userdom_manage_generic_user_home_content_files(spamd_t)
+ 		userdom_manage_generic_user_home_content_symlinks(spamd_t)
+ 	')
++	unconfined_rw_semaphores(spamd_t)
+ ')
+ 
+ tunable_policy(`use_nfs_home_dirs',`
+@@ -143,6 +144,14 @@
+ ')
  
- kernel_read_proc_symlinks(samba_net_t)
+ optional_policy(`
++        postgresql_stream_connect(spamd_t)
++');
++
++optional_policy(`
++	pyzor_domtrans(spamd_t)
++')
++
++optional_policy(`
+ 	amavis_manage_lib_files(spamd_t)
+ ')
+ 
+@@ -167,12 +176,4 @@
+ 	udev_read_db(spamd_t)
+ ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.35/policy/modules/system/authlogin.te
+-ifdef(`TODO',`
+-optional_policy(`
+-# for bayes tokens
+-allow spamd_t var_lib_t:dir { getattr search };
+-allow spamd_t amavisd_lib_t:dir rw_dir_perms;
+-allow spamd_t amavisd_lib_t:file create_file_perms;
+-allow spamd_t amavisd_lib_t:lnk_file create_lnk_perms;
+-')
+-') dnl end TODO
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.36/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2006-04-19 12:23:07.000000000 -0400
-+++ serefpolicy-2.2.35/policy/modules/system/authlogin.te	2006-04-24 20:16:38.000000000 -0400
++++ serefpolicy-2.2.36/policy/modules/system/authlogin.te	2006-04-28 22:53:54.000000000 -0400
 @@ -188,6 +188,8 @@
  storage_setattr_scsi_generic_dev(pam_console_t)
  
@@ -258,9 +648,9 @@
  term_setattr_console(pam_console_t)
  term_getattr_unallocated_ttys(pam_console_t)
  term_setattr_unallocated_ttys(pam_console_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.35/policy/modules/system/init.te
---- nsaserefpolicy/policy/modules/system/init.te	2006-04-20 08:17:40.000000000 -0400
-+++ serefpolicy-2.2.35/policy/modules/system/init.te	2006-04-24 20:16:38.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.36/policy/modules/system/init.te
+--- nsaserefpolicy/policy/modules/system/init.te	2006-04-27 10:31:33.000000000 -0400
++++ serefpolicy-2.2.36/policy/modules/system/init.te	2006-04-28 22:53:54.000000000 -0400
 @@ -348,6 +348,7 @@
  files_mounton_isid_type_dirs(initrc_t)
  files_list_default(initrc_t)
@@ -269,93 +659,65 @@
  
  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.35/policy/modules/system/libraries.fc
---- nsaserefpolicy/policy/modules/system/libraries.fc	2006-04-24 20:14:40.000000000 -0400
-+++ serefpolicy-2.2.35/policy/modules/system/libraries.fc	2006-04-24 20:16:38.000000000 -0400
-@@ -71,13 +71,8 @@
- 
- /usr/(.*/)?nvidia/.*\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
--/usr/lib(64)?/pgsql/test/regress/.*\.so	--	gen_context(system_u:object_r:shlib_t,s0)
--
- /usr/lib/win32/.*			--	gen_context(system_u:object_r:shlib_t,s0)
- 
--/usr/lib(64)?/im/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
--/usr/lib(64)?/iiim/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
--
- /usr/(.*/)?lib(64)?(/.*)?/nvidia/.*\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/libsipphoneapi\.so.*	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
- /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -104,7 +99,6 @@
- /usr/lib(64)?/xorg/modules/extensions/nvidia(-[^/]*)?/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
- ifdef(`distro_redhat',`
--/usr/lib(64)?/.*/program/.*\.so.*		gen_context(system_u:object_r:shlib_t,s0)
- /usr/share/rhn/rhn_applet/eggtrayiconmodule\.so -- gen_context(system_u:object_r:shlib_t,s0)
- 
- # The following are libraries with text relocations in need of execmod permissions
-@@ -118,7 +112,7 @@
- /usr/lib(64)?/libstdc\+\+\.so\.2\.7\.2\.8 --	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/libg\+\+\.so\.2\.7\.2\.8	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/libglide3\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
--/usr/lib(64)?/libglide-v[0-9]*\.so.* 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/lib(64)?/libglide3-v[0-9]*\.so.* 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/libdv\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/helix/plugins/oggfformat\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/helix/plugins/theorarend\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -203,16 +197,12 @@
- /usr/(.*/)?jre.*/libdeploy.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/(.*/)?jre.*/libjvm.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
--/usr/(.*/)?intellinux/nppdf\.so		--	gen_context(system_u:object_r:texrel_shlib_t,s0)
--/usr/(.*/)?intellinux/lib/\.so		--	gen_context(system_u:object_r:texrel_shlib_t,s0)
--/usr/(.*/)?intellinux/plug_ins/.*\.api	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
-+/usr/(local/)?Adobe/(.*/)?intellinux/nppdf\.so	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
-+/usr/(local/)?Adobe/(.*/)?lib/[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:texrel_shlib_t,s0)
-+/usr/(local/)?Adobe/.*\.api	--	gen_context(system_u:object_r:texrel_shlib_t,s0)
- /usr/(.*/)?intellinux/SPPlugins/ADMPlugin\.apl -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- ') dnl end distro_redhat
- 
--ifdef(`distro_suse',`
--/usr/lib(64)?/samba/classic/[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:shlib_t,s0)
--')
--
- #
- # /var
- #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.2.35/policy/modules/system/logging.te
---- nsaserefpolicy/policy/modules/system/logging.te	2006-04-06 15:32:43.000000000 -0400
-+++ serefpolicy-2.2.35/policy/modules/system/logging.te	2006-04-24 20:16:38.000000000 -0400
-@@ -140,7 +140,7 @@
- init_use_fds(auditd_t)
- init_exec(auditd_t)
- init_write_initctl(auditd_t)
--init_use_script_ptys(auditd_t)
-+init_dontaudit_use_script_ptys(auditd_t)
- 
- logging_send_syslog_msg(auditd_t)
- 
-@@ -293,7 +293,7 @@
- 
- fs_search_auto_mountpoints(syslogd_t)
- 
--term_dontaudit_use_console(syslogd_t)
-+term_write_console(syslogd_t)
- # Allow syslog to a terminal
- term_write_unallocated_ttys(syslogd_t)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.2.35/policy/modules/system/sysnetwork.te
---- nsaserefpolicy/policy/modules/system/sysnetwork.te	2006-03-24 11:15:53.000000000 -0500
-+++ serefpolicy-2.2.35/policy/modules/system/sysnetwork.te	2006-04-24 20:36:46.000000000 -0400
-@@ -248,6 +248,7 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.2.36/policy/modules/system/lvm.te
+--- nsaserefpolicy/policy/modules/system/lvm.te	2006-03-24 11:15:53.000000000 -0500
++++ serefpolicy-2.2.36/policy/modules/system/lvm.te	2006-04-28 22:53:54.000000000 -0400
+@@ -205,9 +205,10 @@
+ fs_getattr_xattr_fs(lvm_t)
+ fs_search_auto_mountpoints(lvm_t)
+ fs_read_tmpfs_symlinks(lvm_t)
+-fs_donaudit_read_removable_files(lvm_t)
++fs_dontaudit_read_removable_files(lvm_t)
+ 
+ storage_relabel_fixed_disk(lvm_t)
++storage_dontaudit_read_removable_device(lvm_t)
+ # LVM creates block devices in /dev/mapper or /dev/<vg>
+ # depending on its version
+ # LVM(2) needs to create directores (/dev/mapper, /dev/<vg>)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.36/policy/modules/system/mount.te
+--- nsaserefpolicy/policy/modules/system/mount.te	2006-04-19 12:23:07.000000000 -0400
++++ serefpolicy-2.2.36/policy/modules/system/mount.te	2006-04-28 22:53:54.000000000 -0400
+@@ -126,6 +126,8 @@
+ 	corenet_udp_bind_generic_port(mount_t)
+ 	corenet_tcp_bind_reserved_port(mount_t)
+ 	corenet_udp_bind_reserved_port(mount_t)
++	corenet_tcp_bind_all_rpc_ports(mount_t)
++	corenet_udp_bind_all_rpc_ports(mount_t)
+ 	corenet_tcp_connect_all_ports(mount_t)
+ 
+ 	fs_search_rpc(mount_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.36/policy/modules/system/selinuxutil.te
+--- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-04-04 18:06:38.000000000 -0400
++++ serefpolicy-2.2.36/policy/modules/system/selinuxutil.te	2006-04-28 22:53:54.000000000 -0400
+@@ -393,6 +393,8 @@
+ userdom_use_all_users_fds(restorecon_t)
  
- optional_policy(`
- 	xen_append_log(dhcpc_t)
-+	xen_dontaudit_rw_unix_stream_sockets(dhcpc_t)
- ')
- 
- ########################################
-@@ -285,6 +286,7 @@
+ files_relabel_all_files(restorecon_t)
++fs_relabel_all_filesystem_types(restorecon_t)
++
+ files_list_all(restorecon_t)
+ # this is to satisfy the assertion:
+ auth_relabelto_shadow(restorecon_t)
+@@ -427,6 +429,7 @@
+ 
+ auth_relabel_all_files_except_shadow(restorecond_t )
+ auth_read_all_files_except_shadow(restorecond_t)
++fs_relabel_all_filesystem_types(restorecond_t)
+ 
+ kernel_use_fds(restorecond_t)
+ kernel_rw_pipes(restorecond_t)
+@@ -627,6 +630,7 @@
+ files_read_etc_files(setfiles_t)
+ files_list_all(setfiles_t)
+ files_relabel_all_files(setfiles_t)
++fs_relabel_all_filesystem_types(setfiles_t)
+ 
+ logging_send_syslog_msg(setfiles_t)
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.2.36/policy/modules/system/sysnetwork.te
+--- nsaserefpolicy/policy/modules/system/sysnetwork.te	2006-04-27 10:31:34.000000000 -0400
++++ serefpolicy-2.2.36/policy/modules/system/sysnetwork.te	2006-04-28 22:53:54.000000000 -0400
+@@ -286,6 +286,7 @@
  kernel_read_system_state(ifconfig_t)
  kernel_read_network_state(ifconfig_t)
  kernel_search_network_sysctl(ifconfig_t)
@@ -363,20 +725,15 @@
  
  corenet_rw_tun_tap_dev(ifconfig_t)
  
-@@ -346,4 +348,5 @@
- 
- optional_policy(`
- 	xen_append_log(ifconfig_t)
-+	xen_dontaudit_rw_unix_stream_sockets(ifconfig_t)
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.35/policy/modules/system/unconfined.if
---- nsaserefpolicy/policy/modules/system/unconfined.if	2006-04-12 13:44:38.000000000 -0400
-+++ serefpolicy-2.2.35/policy/modules/system/unconfined.if	2006-04-24 20:16:38.000000000 -0400
-@@ -224,6 +224,24 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.36/policy/modules/system/unconfined.if
+--- nsaserefpolicy/policy/modules/system/unconfined.if	2006-04-27 10:31:34.000000000 -0400
++++ serefpolicy-2.2.36/policy/modules/system/unconfined.if	2006-04-28 22:53:54.000000000 -0400
+@@ -381,6 +381,27 @@
  
  ########################################
  ## <summary>
-+##	Send a SIGNULL signal to the unconfined domain.
++##	Send and receive messages from
++##	unconfined_t over dbus.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -384,25 +741,29 @@
 +##	</summary>
 +## </param>
 +#
-+interface(`unconfined_signull',`
++interface(`unconfined_dbus_chat',`
 +	gen_require(`
 +		type unconfined_t;
++		class dbus send_msg;
 +	')
 +
-+	allow $1 unconfined_t:process signull;
++	allow $1 unconfined_t:dbus send_msg;
++	allow unconfined_t $1:dbus send_msg;
 +')
 +
 +########################################
 +## <summary>
- ##	Send generic signals to the unconfined domain.
+ ##	Add an alias type to the unconfined domain.
  ## </summary>
- ## <param name="domain">
-@@ -363,6 +381,27 @@
- 
- ########################################
- ## <summary>
-+##	Send and receive messages from
-+##	unconfined_t over dbus.
+ ## <desc>
+@@ -410,3 +431,22 @@
+ 		errprint(`Warning: $0($1) has no effect in strict policy.'__endline__)
+ 	')
+ ')
++
++########################################
++## <summary>
++##	Communicate with  unconfined user SysV sempaphores.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -410,33 +771,18 @@
 +##	</summary>
 +## </param>
 +#
-+interface(`unconfined_dbus_chat',`
++interface(`unconfined_rw_semaphores',`
 +	gen_require(`
-+		type unconfined_t;
-+		class dbus send_msg;
++			type unconfined_t;
 +	')
 +
-+	allow $1 unconfined_t:dbus send_msg;
-+	allow unconfined_t $1:dbus send_msg;
++	allow $1 unconfined_t:sem rw_sem_perms;
 +')
 +
-+########################################
-+## <summary>
- ##	Add an alias type to the unconfined domain.
- ## </summary>
- ## <desc>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.35/policy/modules/system/userdomain.te
---- nsaserefpolicy/policy/modules/system/userdomain.te	2006-04-24 20:14:40.000000000 -0400
-+++ serefpolicy-2.2.35/policy/modules/system/userdomain.te	2006-04-24 20:16:38.000000000 -0400
-@@ -6,6 +6,7 @@
- 
- 	ifdef(`enable_mls',`
- 		role secadm_r;
-+		role auditadm_r;
- 	')
- ')
- 
-@@ -67,6 +68,7 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.36/policy/modules/system/userdomain.te
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2006-04-28 22:50:57.000000000 -0400
++++ serefpolicy-2.2.36/policy/modules/system/userdomain.te	2006-04-28 22:53:54.000000000 -0400
+@@ -67,6 +67,7 @@
  	# Define some type aliases to help with compatibility with
  	# macros and domains from the "strict" policy.
  	unconfined_alias_domain(secadm_t)
@@ -444,7 +790,7 @@
  	unconfined_alias_domain(sysadm_t)
  
  	# User home directory type.
-@@ -82,6 +84,7 @@
+@@ -82,6 +83,7 @@
  
  	# compatibility for switching from strict
  #	dominance { role secadm_r { role system_r; }}
@@ -452,7 +798,7 @@
  #	dominance { role sysadm_r { role system_r; }}
  #	dominance { role user_r { role system_r; }}
  #	dominance { role staff_r { role system_r; }}
-@@ -105,9 +108,10 @@
+@@ -105,9 +107,10 @@
  
  	ifdef(`enable_mls',`
  		allow secadm_r system_r;
@@ -464,7 +810,7 @@
  	')
  
  	optional_policy(`
-@@ -128,8 +132,19 @@
+@@ -128,8 +131,19 @@
  
  	ifdef(`enable_mls',`
  		admin_user_template(secadm)
@@ -484,7 +830,7 @@
  	')
  
  	# this should be tunable_policy, but
-@@ -179,10 +194,13 @@
+@@ -179,10 +193,13 @@
  		mls_file_downgrade(secadm_t)
  		init_exec(secadm_t)
  		logging_read_audit_log(secadm_t)
@@ -499,7 +845,7 @@
  	', `
  		logging_read_audit_log(sysadm_t)
  		logging_run_auditctl(sysadm_t,sysadm_r,admin_terminal)
-@@ -240,6 +258,7 @@
+@@ -240,6 +257,7 @@
  
  		ifdef(`enable_mls',`
  			consoletype_exec(secadm_t)
@@ -507,7 +853,7 @@
  		')
  	')
  
-@@ -252,6 +271,7 @@
+@@ -252,6 +270,7 @@
  
  		ifdef(`enable_mls',`
  			dmesg_exec(secadm_t)
@@ -515,48 +861,164 @@
  		')
  	')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.2.35/policy/modules/system/xen.if
---- nsaserefpolicy/policy/modules/system/xen.if	2006-03-23 16:08:51.000000000 -0500
-+++ serefpolicy-2.2.35/policy/modules/system/xen.if	2006-04-24 20:16:38.000000000 -0400
-@@ -47,6 +47,24 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-2.2.36/policy/modules/system/xen.fc
+--- nsaserefpolicy/policy/modules/system/xen.fc	2006-03-23 16:08:51.000000000 -0500
++++ serefpolicy-2.2.36/policy/modules/system/xen.fc	2006-04-28 22:53:54.000000000 -0400
+@@ -14,3 +14,4 @@
+ /var/run/xend\.pid	--      gen_context(system_u:object_r:xend_var_run_t,s0)
+ /var/run/xenstore\.pid	--	gen_context(system_u:object_r:xenstored_var_run_t,s0)
+ /var/run/xenstored(/.*)?	gen_context(system_u:object_r:xenstored_var_run_t,s0)
++/usr/sbin/xm		--	gen_context(system_u:object_r:xm_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.2.36/policy/modules/system/xen.if
+--- nsaserefpolicy/policy/modules/system/xen.if	2006-04-27 10:31:34.000000000 -0400
++++ serefpolicy-2.2.36/policy/modules/system/xen.if	2006-04-28 22:53:54.000000000 -0400
+@@ -47,13 +47,12 @@
  
  ########################################
  ## <summary>
+-##	Do not audit attempts to read and write
+-##	Xen unix domain stream sockets.
 +##     Don't audit leaked file descriptor.
-+## </summary>
-+## <param name="domain">
+ ## </summary>
+ ## <param name="domain">
+-##	<summary>
+-##	Domain to don't audit.
+-##	</summary>
 +##     <summary>
 +##     Domain to don't audit.
 +##     </summary>
+ ## </param>
+ #
+ interface(`xen_dontaudit_rw_unix_stream_sockets',`
+@@ -84,3 +83,66 @@
+ 	allow $1 xenstored_var_run_t:sock_file { getattr write };
+ 	allow $1 xenstored_t:unix_stream_socket connectto;
+ ')
++
++########################################
++## <summary>
++##	Connect to xend over an unix stream socket.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
 +## </param>
 +#
-+interface(`xen_dontaudit_rw_unix_stream_sockets',`
-+       gen_require(`
-+               type xend_t;
-+       ')
++interface(`xen_connect',`
++	gen_require(`
++		type xend_t, xend_var_run_t;
++	')
 +
-+       dontaudit $1 xend_t:unix_stream_socket { read write };
++	files_search_pids($1)
++	allow $1 xend_var_run_t:dir search;
++	allow $1 xend_var_run_t:sock_file getattr;
++	allow $1 xend_t:unix_stream_socket connectto;
 +')
 +
 +########################################
 +## <summary>
- ##	Connect to xenstored over an unix stream socket.
- ## </summary>
- ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.2.35/policy/modules/system/xen.te
---- nsaserefpolicy/policy/modules/system/xen.te	2006-04-18 22:50:01.000000000 -0400
-+++ serefpolicy-2.2.35/policy/modules/system/xen.te	2006-04-24 20:16:38.000000000 -0400
-@@ -125,6 +125,7 @@
- 
- files_read_etc_files(xend_t)
- files_read_kernel_symbol_table(xend_t)
-+files_read_kernel_img(xend_t)
- 
- storage_raw_read_fixed_disk(xend_t)
++##	Write to xend over an unix stream socket.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`xen_writeto',`
++	gen_require(`
++		type xend_var_run_t;
++	')
++
++	allow $1 xend_var_run_t:sock_file write;
++')
++
++
++########################################
++## <summary>
++##	Execute a domain transition to run xm.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`xm_domtrans',`
++	gen_requires(`
++		type xm_t, xm_exec_t;
++	')
++
++	domain_auto_trans($1,xm_exec_t,xm_t)
++
++	allow $1 xm_t:fd use;
++	allow xm_t $1:fd use;
++	allow xm_t:$1:fifo_file rw_file_perms;
++	allow xm_t $1:process sigchld;
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.2.36/policy/modules/system/xen.te
+--- nsaserefpolicy/policy/modules/system/xen.te	2006-04-27 10:31:34.000000000 -0400
++++ serefpolicy-2.2.36/policy/modules/system/xen.te	2006-04-28 22:53:54.000000000 -0400
+@@ -224,3 +224,55 @@
+ miscfiles_read_localization(xenstored_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/rolemap serefpolicy-2.2.35/policy/rolemap
+ xen_append_log(xenstored_t)
++
++########################################
++#
++# Declarations
++#
++
++type xm_t;
++type xm_exec_t;
++domain_type(xm_t)
++init_daemon_domain(xm_t, xm_exec_t)
++
++########################################
++#
++# xm 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(xm_t)
++libs_use_ld_so(xm_t)
++libs_use_shared_libs(xm_t)
++miscfiles_read_localization(xm_t)
++# 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;
++
++
++# james -- aujdit2allow
++
++corecmd_exec_bin(xm_t)
++corecmd_exec_sbin(xm_t)
++
++kernel_read_system_state(xm_t)
++kernel_read_kernel_sysctls(xm_t)
++kernel_read_xen_state(xm_t)
++kernel_write_xen_state(xm_t)
++term_use_all_terms(xm_t)
++
++dev_read_urand(xm_t)
++
++xen_append_log(xm_t)
++xen_connect(xm_t)
++xen_writeto(xm_t)
++
++xen_stream_connect_xenstore(xm_t)
++allow xm_t self:capability dac_override;
++
++
++# allow xm_t root_t:dir search;
++# Need to relabel files for xen
++auth_read_all_files_except_shadow(xm_t)
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/rolemap serefpolicy-2.2.36/policy/rolemap
 --- nsaserefpolicy/policy/rolemap	2006-01-26 15:38:41.000000000 -0500
-+++ serefpolicy-2.2.35/policy/rolemap	2006-04-24 20:16:38.000000000 -0400
++++ serefpolicy-2.2.36/policy/rolemap	2006-04-28 22:53:54.000000000 -0400
 @@ -15,5 +15,6 @@
  
  	ifdef(`enable_mls',`
@@ -564,9 +1026,9 @@
 +		auditadm_t auditadm auditadm_t
  	')
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.2.35/policy/users
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.2.36/policy/users
 --- nsaserefpolicy/policy/users	2006-02-15 17:02:30.000000000 -0500
-+++ serefpolicy-2.2.35/policy/users	2006-04-24 20:16:38.000000000 -0400
++++ serefpolicy-2.2.36/policy/users	2006-04-28 22:53:54.000000000 -0400
 @@ -29,7 +29,7 @@
  gen_user(user_u, user, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255)
  ',`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- selinux-policy.spec	25 Apr 2006 15:19:51 -0000	1.181
+++ selinux-policy.spec	29 Apr 2006 04:47:05 -0000	1.182
@@ -15,13 +15,12 @@
 %define CHECKPOLICYVER 1.30.1-2
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.35
-Release: 2
+Version: 2.2.36
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
 patch: policy-20060411.patch
-patch2: xm.patch
 Source1: modules-targeted.conf
 Source2: booleans-targeted.conf
 Source3: Makefile.devel
@@ -151,7 +150,6 @@
 %prep 
 %setup -q -n serefpolicy-%{version}
 %patch -p1
-%patch2 -p1
 
 %install
 # Build targeted policy
@@ -269,6 +267,8 @@
 %triggerpostun targeted -- selinux-policy-targeted <= 2.0.7
 %rebuildpolicy targeted
 
+%rebuildpolicy targeted
+
 %files targeted
 %fileList targeted
 
@@ -295,9 +295,6 @@
 %relabel mls
 ln -sf ../devel/include /usr/share/selinux/mls/include
 
-%triggerpostun mls -- mls <= 2.0.7
-%{rebuildpolicy} mls 
-
 %files mls
 %fileList mls
 
@@ -325,6 +322,12 @@
 %relabel strict
 ln -sf ../devel/include /usr/share/selinux/strict/include
 
+%triggerpostun strict -- selinux-policy-strict <= 2.2.35-2
+cd /usr/share/selinux/strict
+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 
 
@@ -334,6 +337,9 @@
 %endif
 
 %changelog
+* Tue Apr 25 2006 Dan Walsh <dwalsh at redhat.com> 2.2.36-1
+- Update to upstream
+
 * Tue Apr 25 2006 James Antill <jantill at redhat.com> 2.2.35-2
 - Add xm policy
 - Fix policygentool



From fedora-cvs-commits at redhat.com  Sat Apr 29 10:18:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Apr 2006 06:18:27 -0400
Subject: rpms/libgtk-java/devel libgtk-java.spec,1.47,1.48
Message-ID: <200604291018.k3TAIRiw027200@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgtk-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27170

Modified Files:
	libgtk-java.spec 
Log Message:
typo


Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- libgtk-java.spec	28 Apr 2006 21:18:53 -0000	1.47
+++ libgtk-java.spec	29 Apr 2006 10:18:25 -0000	1.48
@@ -146,7 +146,7 @@
 * Mon Jan 30 2006 Adam Jocksch <ajocksch at redhat.com> - 2.8.3-1
 - updated tarball to libgtk-java-2.8.3.tar.gz.
 
-* Thu Dec 22 2005 Andrw Cagney <cagney at redhat.com> - 2.8.2-0
+* Thu Dec 22 2005 Andrew Cagney <cagney at redhat.com> - 2.8.2-0
                   Adam Jocksch <ajocksch at redhat.com>
 - import libgtk-java-2.8.2.tar.gz
 



From fedora-cvs-commits at redhat.com  Sat Apr 29 12:16:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Apr 2006 08:16:04 -0400
Subject: rpms/libgtk-java/devel libgtk-java.spec,1.48,1.49
Message-ID: <200604291216.k3TCG40u016418@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgtk-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16308

Modified Files:
	libgtk-java.spec 
Log Message:
- Fix typo in %post.


Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- libgtk-java.spec	29 Apr 2006 10:18:25 -0000	1.48
+++ libgtk-java.spec	29 Apr 2006 12:15:59 -0000	1.49
@@ -98,7 +98,7 @@
 
 %post
 /sbin/ldconfig
-libgtk-java-glib-timer-gc.patch
+
 %postun
 /sbin/ldconfig
 
@@ -126,6 +126,7 @@
 * Fri Apr 28 2006 Stepan Kasal <skasal at redhat.com>    - 2.8.4-0
 - New version, which integrates both patches.
 - Remove the patches.
+- Fix typo in %post.
 - Try to build on s390x again.
 
 * Wed Mar 15 2006 Phil Muldoon <pmuldoon at redhat.com> - 2.8.3.020060301.rh1-2



From fedora-cvs-commits at redhat.com  Sat Apr 29 12:35:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Apr 2006 08:35:10 -0400
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders.spec, 1.122,
	1.123 sources, 1.33, 1.34
Message-ID: <200604291235.k3TCZANO003100@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3059

Modified Files:
	glibc-kernheaders.spec sources 
Log Message:
add pci.h


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- glibc-kernheaders.spec	28 Apr 2006 17:16:53 -0000	1.122
+++ glibc-kernheaders.spec	29 Apr 2006 12:34:56 -0000	1.123
@@ -1,7 +1,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -91,6 +91,9 @@
 
 
 %changelog
+* Sat Apr 29 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-22
+- Add linux/pci.h
+
 * Fri Apr 28 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-21
 - Remove the libaudit workaround hack
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	28 Apr 2006 16:38:20 -0000	1.33
+++ sources	29 Apr 2006 12:35:05 -0000	1.34
@@ -1 +1 @@
-54b5e05d6e954787990202f521205f45  glibc-kernheaders.tar.bz2
+e537a5cf0bf0ce95b0ef3c7410375ef0  glibc-kernheaders.tar.bz2